ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 03:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clear includes

Browse Source
This commit is contained in:
DizzyEggg 2018-12-24 00:02:29 +01:00
parent 81b38c00e4
commit 9320fe8f85
34 changed files with 753 additions and 785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/battle.h
View File

@ -302,11 +302,10 @@ struct BattleResults
u8 playerSwitchesCounter; // 0x2
u8 unk3; // 0x3
u8 unk4; // 0x4
u8 playerMonWasDamaged:1; // 0x5
u8 playerMonWasDamaged:1; // 0x5
u8 usedMasterBall:1; // 0x5
u8 caughtMonBall:4; // 0x5
u8 shinyWildMon:1; // 0x5
u8 unk5_7:1; // 0x5
u16 playerMon1Species; // 0x6
u8 playerMon1Name[POKEMON_NAME_LENGTH + 1]; // 0x8
u8 battleTurnCounter; // 0x13
@ -411,12 +410,12 @@ struct BattleStruct
{
u8 turnEffectsTracker;
u8 turnEffectsBattlerId;
u8 filler2;
u8 unused_0;
u8 turnCountersTracker;
u8 wrappedMove[MAX_BATTLERS_COUNT * 2]; // Leftover from Ruby's ewram access.
u8 moveTarget[MAX_BATTLERS_COUNT];
u8 expGetterMonId;
u8 field_11;
u8 unused_1;
u8 wildVictorySong;
u8 dynamicMoveType;
u8 wrappedBy[MAX_BATTLERS_COUNT];
@ -437,28 +436,25 @@ struct BattleStruct
u8 field_60[4][3];
u8 runTries;
u8 caughtMonNick[POKEMON_NAME_LENGTH + 1];
u8 field_78;
u8 unused_2;
u8 safariGoNearCounter;
u8 safariPkblThrowCounter;
u8 safariEscapeFactor;
u8 safariCatchFactor;
u8 field_7D;
u8 field_7E;
u8 field_7D; // unknown spriteId
u8 field_7E; // unknown spriteId
u8 formToChangeInto;
u8 chosenMovePositions[MAX_BATTLERS_COUNT];
u8 stateIdAfterSelScript[MAX_BATTLERS_COUNT];
u8 field_88;
u8 field_89;
u8 field_8A;
u8 field_8B;
u8 field_8C;
u8 field_8D;
u8 unused_3[3];
u8 field_8B; // related to player's pokemon switching
u8 unused_4[2];
u8 stringMoveType;
u8 expGetterBattlerId;
u8 field_90;
u8 field_91;
u8 field_92;
u8 field_93;
u8 unused_5;
u8 field_91; // related to gAbsentBattlerFlags, possibly absent flags turn ago?
u8 field_92; // battle palace related
u8 field_93; // related to choosing pokemon?
u8 wallyBattleState;
u8 wallyMovesState;
u8 wallyWaitFrames;
@ -481,11 +477,11 @@ struct BattleStruct
u8 switchInItemsCounter;
u8 arenaTurnCounter;
u8 turnSideTracker;
u8 fillerDC[0xDF-0xDC];
u8 unused_6[3];
u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party.
u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte]
u16 castformPalette[MAX_BATTLERS_COUNT][16];
u8 field_180;
u8 field_180; // weird field, used in battle_main.c, once accessed as an array of u32 overwriting the field below
u8 field_181;
u8 field_182;
u8 field_183;
@ -496,7 +492,7 @@ struct BattleStruct
u8 atkCancellerTracker;
struct BattleTvMovePoints tvMovePoints;
struct BattleTv tv;
u8 notSureWhatFieldLol[0x28];
u8 unused_7[0x28];
u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
s8 arenaMindPoints[2];
s8 arenaSkillPoints[2];

3
include/credits.h
View File

@ -7,5 +7,6 @@
extern EWRAM_DATA bool8 gHasHallOfFameRecords;
// Exported ROM declarations
void sub_8175620(void);
#endif //GUARD_CREDITS_H
#endif // GUARD_CREDITS_H

1
include/event_object_movement.h
View File

@ -60,6 +60,7 @@ struct LockedAnimEventObjects
extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
extern const struct OamData gEventObjectBaseOam_32x8;
extern const struct OamData gEventObjectBaseOam_32x32;
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
extern const u8 gReflectionEffectPaletteMap[];

3
include/menu.h
View File

@ -95,5 +95,8 @@ s8 Menu_ProcessInputGridLayout(void);
u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted);
s8 Menu_ProcessInputNoWrapAround_other(void);
void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile);
void sub_8198314(void);
void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram);
#endif // GUARD_MENU_H

95
include/party_menu.h
View File

@ -26,7 +26,8 @@ enum
PARTY_GIVE_ITEM,
};
struct Struct203CEC8 {
struct Struct203CEC8
{
MainCallback exitCallback;
TaskFunc unk4;
u8 unk8_0:4;
@ -41,42 +42,76 @@ struct Struct203CEC8 {
};
extern struct Struct203CEC8 gUnknown_0203CEC8;
extern u8 gUnknown_0203CEE8;
extern u8 gUnknown_0203CEE9;
extern MainCallback gPostMenuFieldCallback;
extern u8 gSelectedOrderFromParty[4];
extern u8 gUnknown_0203CF00[3];
extern const u16 gUnknown_0861500C[]; // tutor table
bool8 pokemon_has_move(struct Pokemon *, u16);
void sub_81B58A8(void);
void DoWallyTutorialBagMenu(void);
u8 pokemon_ailments_get_primary(u32 status);
u8 *GetMonNickname(struct Pokemon *mon, u8 *dst);
void sub_81B0FCC(u8 slot, u8 b);
bool8 IsMultiBattle(void);
u8 GetCursorSelectionMonId(void);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
void sub_81B7F60(void);
void sub_81B0FCC(u8 partyIdx, u8 a);
u8 sub_81B1360(void);
void sub_81B1370(u8 taskId);
void display_pokemon_menu_message(u32 windowId);
void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
u8 sub_81B1B5C(const u8 *a, u8 b);
u8 sub_81B1BD4(void);
u8* GetMonNickname(struct Pokemon *mon, u8 *dest);
u8 sub_81B1B5C(const u8* str, u8 b);
bool8 sub_81B1BD4(void);
void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func);
u8 pokemon_ailments_get_primary(u32 status);
u8 sub_81B205C(struct Pokemon *mon);
void display_pokemon_menu_message(u32 stringID);
void sub_81B47E0(u8 taskId);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 sub_81B5820(void);
bool8 sub_81B5884(void);
void sub_81B58A8(void);
bool8 hm_prepare_waterfall(void);
bool8 sub_81B5974(void);
void LoadHeldItemIcons(void);
void sub_81B5D4C(u8 *a, u8 *b, u8 c);
void sub_81B617C(void);
void ItemUseCB_Medicine(u8 taskId, TaskFunc task);
void sub_81B67C8(u8 taskId, TaskFunc task);
void dp05_ether(u8 taskId, TaskFunc task);
void dp05_pp_up(u8 taskId, TaskFunc task);
u16 ItemIdToBattleMoveId(u16 item);
bool8 sub_81B6D14(u16 move);
bool8 pokemon_has_move(struct Pokemon *mon, u16 move);
void sub_81B6DC4(u8 taskId, TaskFunc task);
void dp05_rare_candy(u8 taskId, TaskFunc task);
void sub_81B79E8(u8 taskId, TaskFunc task);
void sub_81B7C74(u8 taskId, TaskFunc task);
u8 GetItemEffectType(u16 item);
void CB2_PartyMenuFromStartMenu(void);
void sub_81B7F60(void);
void sub_81B8448(void);
void sub_81B8518(u8 unused);
u8 sub_81B1360(void);
void sub_81B8904(u8 arg0, void (*callback)(void));
void OpenPartyMenuInBattle(u8 caseId);
u16 ItemIdToBattleMoveId(u16 itemId);
u8 sub_81B205C(struct Pokemon* a);
void sub_81B617C(void);
u8 sub_81B6D14(u16 a);
void sub_81B8558(void);
void sub_81B8904(u8 initArg, MainCallback callback);
void sub_81B892C(void);
void sub_81B8958(void);
void OpenPartyMenuInBattle(u8 arg);
void sub_81B89F0(void);
void sub_81B8C68(void);
void sub_81B8D64(u8 battlerId, u8 multiplayerFlag);
void sub_81B8E80(u8 battlerId, u8 unk, u8 arrayIndex);
void sub_81B8FB0(u8 slot, u8 slot2);
u8 pokemon_order_func(u8 slot);
void sub_81B9150(void);
void sub_81B9328(void);
bool8 hm_add_c3_without_phase_2(void);
extern void dp05_ether(u8, TaskFunc);
extern void dp05_pp_up(u8, TaskFunc);
extern void dp05_rare_candy(u8, TaskFunc);
extern void sub_81B67C8(u8, TaskFunc);
extern void sub_81B79E8(u8, TaskFunc);
extern void sub_81B6DC4(u8, TaskFunc);
extern void sub_81B7C74(u8, TaskFunc);
void sub_81B9404(void);
void sub_81B94B0(void);
void sub_81B951C(void);
void sub_81B9620(void);
void sub_81B95E0(void);
void sub_81B98DC(void);
void sub_81B9918(void);
void sub_81B9770(void);
void sub_81B9718(void);
void sub_81B96D0(void);
void sub_81B968C(void);
#endif // GUARD_PARTY_MENU_H

2
include/pokemon_summary_screen.h
View File

@ -8,6 +8,8 @@ void sub_81C4F98(u8, void(*)(void));
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
u8 sub_81C1B94(void);
void SummaryScreen_SetUnknownTaskId(u8 a0);
void SummaryScreen_DestroyUnknownTask(void);
// The Pokemon Summary Screen can operate in different modes. Certain features,
// such as move re-ordering, are available in the different modes.

46
include/strings.h
View File

@ -1875,4 +1875,50 @@ extern const u8 gText_PartyFull[];
extern const u8 gText_Box[];
extern const u8 gText_JustOnePkmn[];
// battle main
extern const u8 gText_LinkStandby3[];
extern const u8 gText_BattleRecordCouldntBeSaved[];
extern const u8 gText_Poison[];
extern const u8 gText_Sleep[];
extern const u8 gText_Paralysis[];
extern const u8 gText_Burn[];
extern const u8 gText_Ice[];
extern const u8 gText_Confusion[];
extern const u8 gText_Love[];
// battle message
extern const u8 gText_PkmnBoxSomeonesPCFull[];
extern const u8 gText_PkmnBoxLanettesPCFull[];
extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredLanettesPC[];
// hall of fame
extern const u8 gText_SavingDontTurnOffPower[];
extern const u8 gText_LeagueChamp[];
extern const u8 gText_HOFNumber[];
extern const u8 gText_PickNextCancel[];
extern const u8 gText_PickCancel[];
extern const u8 gText_UnkCtrlF800Exit[];
extern const u8 gText_HOFCorrupted[];
extern const u8 gText_WelcomeToHOF[];
extern const u8 gText_Number[];
extern const u8 gText_Level[];
extern const u8 gText_IDNumber[];
extern const u8 gText_Name[];
extern const u8 gText_MainMenuTime[];
// daycare
extern const u8 gText_MaleSymbol4[];
extern const u8 gText_FemaleSymbol4[];
extern const u8 gText_GenderlessSymbol[];
extern const u8 gText_NewLine2[];
extern const u8 gText_Exit4[];
extern const u8 gText_Lv[];
extern const u8 gExpandedPlaceholder_Empty[];
extern const u8 gText_Exit[];
extern const u8 gDaycareText_GetAlongVeryWell[];
extern const u8 gDaycareText_GetAlong[];
extern const u8 gDaycareText_DontLikeOther[];
extern const u8 gDaycareText_PlayOther[];
#endif //GUARD_STRINGS_H

2
src/battle_controller_link_opponent.c
View File

@ -6,6 +6,7 @@
#include "battle_interface.h"
#include "battle_message.h"
#include "battle_setup.h"
#include "battle_tower.h"
#include "battle_tv.h"
#include "bg.h"
#include "data2.h"
@ -33,7 +34,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern void sub_81851A8(u8 *);
extern u16 sub_8068B48(void);
extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
// this file's functions
static void LinkOpponentHandleGetMonData(void);

2
src/battle_controller_link_partner.c
View File

@ -6,6 +6,7 @@
#include "battle_interface.h"
#include "battle_message.h"
#include "battle_setup.h"
#include "battle_tower.h"
#include "battle_tv.h"
#include "bg.h"
#include "data2.h"
@ -31,7 +32,6 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern void sub_81851A8(u8 *);
extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
// this file's functions
static void LinkPartnerHandleGetMonData(void);

3
src/battle_controller_player.c
View File

@ -34,9 +34,6 @@
#include "constants/songs.h"
#include "constants/trainers.h"
extern u8 gUnknown_0203CEE8;
extern u8 gUnknown_0203CEE9;
extern u8 gUnknown_0203CF00[];
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];

3
src/battle_controllers.c
View File

@ -6,6 +6,7 @@
#include "battle_message.h"
#include "cable_club.h"
#include "link.h"
#include "party_menu.h"
#include "pokemon.h"
#include "recorded_battle.h"
#include "task.h"
@ -19,8 +20,6 @@ static EWRAM_DATA u8 sUnknown_02022D0A = 0;
EWRAM_DATA struct UnusedControllerStruct gUnknown_02022D0C = {};
static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {};
extern void sub_81B8D64(u8 battlerId, u8 arg1); // party_menu
// this file's funcionts
static void CreateTasksForSendRecvLinkBuffers(void);
static void InitLinkBtlControllers(void);

7
src/battle_dome.c
View File

@ -19,6 +19,7 @@
#include "window.h"
#include "palette.h"
#include "decompress.h"
#include "party_menu.h"
#include "menu.h"
#include "sound.h"
#include "pokemon_icon.h"
@ -57,12 +58,6 @@ struct UnkStruct_860DD10
u16 src;
};
extern void sub_81B8558(void);
extern u8 gSelectedOrderFromParty[];
extern const struct SpriteTemplate gUnknown_0860CFA8;
// text
extern const u8 gTrainerClassNames[][0xD];

4
src/battle_factory_screen.c
View File

@ -131,10 +131,6 @@ struct FactorySwapMonsStruct
bool8 unk30;
};
extern const u16 gBattleFrontierHeldItems[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct FacilityMon gSlateportBattleTentMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
extern const u32 gUnknown_085B18AC[];
// This file's functions.

5
src/battle_gfx_sfx_util.c
View File

@ -15,6 +15,7 @@
#include "task.h"
#include "sprite.h"
#include "sound.h"
#include "party_menu.h"
#include "m4a.h"
#include "constants/species.h"
#include "decompress.h"
@ -42,10 +43,6 @@ extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
extern const u8 gEnemyMonElevation[];
extern u8 sub_80688F8(u8, u8 battlerId);
extern u8 pokemon_order_func(u8); // party menu
extern void sub_81B8C68(void);
// this file's functions
static u8 sub_805D4A8(u16 move);
static u16 BattlePalaceGetTargetRetValue(void);

16
src/battle_main.c
View File

@ -39,6 +39,7 @@
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "text.h"
#include "trig.h"
@ -58,7 +59,6 @@
extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern u8 gUnknown_0203CF00[];
extern const u16 gBattleTextboxPalette[];
extern const struct BgTemplate gBattleBgTemplates[];
@ -69,22 +69,8 @@ extern const u8 *const gBattlescriptsForRunningByItem[];
extern const u8 *const gBattlescriptsForUsingItem[];
extern const u8 *const gBattlescriptsForSafariActions[];
// strings
extern const u8 gText_LinkStandby3[];
extern const u8 gText_BattleRecordCouldntBeSaved[];
extern const u8 gText_Poison[];
extern const u8 gText_Sleep[];
extern const u8 gText_Paralysis[];
extern const u8 gText_Burn[];
extern const u8 gText_Ice[];
extern const u8 gText_Confusion[];
extern const u8 gText_Love[];
// functions
extern void sub_81B9150(void);
extern void sub_80B3AF8(u8 taskId); // cable club
extern void sub_81B8FB0(u8, u8); // party menu
extern u8 pokemon_order_func(u8); // party menu
// this file's functions
static void CB2_InitBattleInternal(void);

9
src/battle_message.c
View File

@ -14,6 +14,7 @@
#include "palette.h"
#include "recorded_battle.h"
#include "string_util.h"
#include "strings.h"
#include "text.h"
#include "window.h"
#include "constants/battle_string_ids.h"
@ -40,15 +41,7 @@ extern u8 gUnknown_0203C7B4;
extern const u8 gTrainerClassNames[][13];
extern const u16 gUnknown_08D85620[];
// strings
extern const u8 gText_PkmnBoxSomeonesPCFull[];
extern const u8 gText_PkmnBoxLanettesPCFull[];
extern const u8 gText_PkmnTransferredSomeonesPC[];
extern const u8 gText_PkmnTransferredLanettesPC[];
extern u8 GetFrontierBrainTrainerClass(void); // battle_frontier_2
extern u8 GetTrainerHillOpponentClass(u16 trainerId); // pokenav
extern void CopyFrontierBrainTrainerName(u8 *txtPtr); // battle_frontier_2
extern void GetTrainerHillTrainerName(u8 *txtPtr, u16 trainerId); // pokenav
extern void CopyTrainerHillTrainerText(u8 arg0, u16 trainerId); // pokenav

5
src/battle_pyramid.c
View File

@ -8,7 +8,9 @@
#include "save.h"
#include "strings.h"
#include "fieldmap.h"
#include "party_menu.h"
#include "palette.h"
#include "field_screen_effect.h"
#include "field_message_box.h"
#include "random.h"
#include "item.h"
@ -32,9 +34,6 @@
#include "constants/moves.h"
#include "constants/species.h"
extern u8 gSelectedOrderFromParty[3];
extern void door_upload_tiles(void);
extern const struct MapLayout *const gMapLayouts[];
extern const u16 gUnknown_08D856C8[][16];

8
src/battle_script_commands.c
View File

@ -46,22 +46,18 @@
#include "battle_arena.h"
#include "battle_pike.h"
#include "battle_pyramid.h"
#include "field_specials.h"
#include "pokemon_summary_screen.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const u8* const gBattleScriptsForMoveEffects[];
// functions
extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon* party, u8 monPartyId, u8 monCount, void (*callback)(void), u16 move); // pokemon summary screen
extern u8 sub_81C1B94(void); // pokemon summary screen
extern void sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s
extern void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s
extern void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s
extern u8* GetMonNickname(struct Pokemon* mon, u8* dst); // party_menu
extern void sub_81B8E80(u8 battlerId, u8, u8); // party menu
extern bool8 IsMultiBattle(void); // ?
extern u8 sub_813B21C(void);
extern u16 get_unknown_box_id(void);
#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))

8
src/battle_setup.c
View File

@ -24,6 +24,7 @@
#include "window.h"
#include "event_object_movement.h"
#include "event_scripts.h"
#include "tv.h"
#include "trainer_see.h"
#include "field_message_box.h"
#include "sound.h"
@ -36,6 +37,9 @@
#include "gym_leader_rematch.h"
#include "battle_pike.h"
#include "battle_pyramid.h"
#include "fldeff_misc.h"
#include "field_control_avatar.h"
#include "fldeff_groundshake.h"
#include "constants/map_types.h"
#include "constants/battle_frontier.h"
@ -57,12 +61,8 @@ struct TrainerBattleParameter
};
extern bool32 InTrainerHill(void);
extern bool32 FldEffPoison_IsActive(void);
extern void RestartWildEncounterImmunitySteps(void);
extern void ClearPoisonStepCounter(void);
extern void sub_81BE72C(void);
extern void sub_808BCF4(void);
extern void sub_80EECC8(void);
extern void sub_80AF6F0(void);
extern u16 sub_81D6180(u8 localId);
extern bool8 GetTrainerHillTrainerFlag(u8 eventObjId);

100
src/battle_tower.c
View File

@ -31,8 +31,6 @@
#include "constants/species.h"
#include "constants/easy_chat.h"
extern const u16 gUnknown_085DFA46[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[];
@ -942,55 +940,55 @@ struct
const u8 *const *strings;
} const gUnknown_085DD500[] =
{
{FACILITY_CLASS_LASS, gUnknown_085DD118},
{FACILITY_CLASS_YOUNGSTER, gUnknown_085DD12C},
{FACILITY_CLASS_HIKER, gUnknown_085DD140},
{FACILITY_CLASS_BEAUTY, gUnknown_085DD154},
{FACILITY_CLASS_FISHERMAN, gUnknown_085DD168},
{FACILITY_CLASS_LADY, gUnknown_085DD17C},
{FACILITY_CLASS_CYCLING_TRIATHLETE_F, gUnknown_085DD190},
{FACILITY_CLASS_BUG_CATCHER, gUnknown_085DD1A4},
{FACILITY_CLASS_SCHOOL_KID_M, gUnknown_085DD1B8},
{FACILITY_CLASS_RICH_BOY, gUnknown_085DD1CC},
{FACILITY_CLASS_BLACK_BELT, gUnknown_085DD1E0},
{FACILITY_CLASS_TUBER_F, gUnknown_085DD1F4},
{FACILITY_CLASS_HEX_MANIAC, gUnknown_085DD208},
{FACILITY_CLASS_PKMN_BREEDER_M, gUnknown_085DD21C},
{FACILITY_CLASS_RUNNING_TRIATHLETE_F, gUnknown_085DD230},
{FACILITY_CLASS_RUNNING_TRIATHLETE_M, gUnknown_085DD244},
{FACILITY_CLASS_BATTLE_GIRL, gUnknown_085DD258},
{FACILITY_CLASS_CYCLING_TRIATHLETE_M, gUnknown_085DD26C},
{FACILITY_CLASS_TUBER_M, gUnknown_085DD280},
{FACILITY_CLASS_GUITARIST, gUnknown_085DD294},
{FACILITY_CLASS_GENTLEMAN, gUnknown_085DD2A8},
{FACILITY_CLASS_POKEFAN_M, gUnknown_085DD2BC},
{FACILITY_CLASS_EXPERT_M, gUnknown_085DD2D0},
{FACILITY_CLASS_EXPERT_F, gUnknown_085DD2E4},
{FACILITY_CLASS_DRAGON_TAMER, gUnknown_085DD2F8},
{FACILITY_CLASS_BIRD_KEEPER, gUnknown_085DD30C},
{FACILITY_CLASS_NINJA_BOY, gUnknown_085DD320},
{FACILITY_CLASS_PARASOL_LADY, gUnknown_085DD334},
{FACILITY_CLASS_BUG_MANIAC, gUnknown_085DD348},
{FACILITY_CLASS_SAILOR, gUnknown_085DD35C},
{FACILITY_CLASS_COLLECTOR, gUnknown_085DD370},
{FACILITY_CLASS_PKMN_RANGER_M, gUnknown_085DD384},
{FACILITY_CLASS_PKMN_RANGER_F, gUnknown_085DD398},
{FACILITY_CLASS_AROMA_LADY, gUnknown_085DD3AC},
{FACILITY_CLASS_RUIN_MANIAC, gUnknown_085DD3C0},
{FACILITY_CLASS_COOLTRAINER_M, gUnknown_085DD3D4},
{FACILITY_CLASS_COOLTRAINER_F, gUnknown_085DD3E8},
{FACILITY_CLASS_POKEMANIAC, gUnknown_085DD3FC},
{FACILITY_CLASS_KINDLER, gUnknown_085DD410},
{FACILITY_CLASS_CAMPER, gUnknown_085DD424},
{FACILITY_CLASS_PICNICKER, gUnknown_085DD438},
{FACILITY_CLASS_PSYCHIC_M, gUnknown_085DD44C},
{FACILITY_CLASS_PSYCHIC_F, gUnknown_085DD460},
{FACILITY_CLASS_SCHOOL_KID_F, gUnknown_085DD474},
{FACILITY_CLASS_POKEMON_BREEDER_F, gUnknown_085DD488},
{FACILITY_CLASS_POKEFAN_F, gUnknown_085DD49C},
{FACILITY_CLASS_SWIMMER_F, gUnknown_085DD4B0},
{FACILITY_CLASS_SWIMMING_TRIATHLETE_M, gUnknown_085DD4C4},
{FACILITY_CLASS_SWIMMING_TRIATHLETE_F, gUnknown_085DD4D8},
{FACILITY_CLASS_LASS, gUnknown_085DD118},
{FACILITY_CLASS_YOUNGSTER, gUnknown_085DD12C},
{FACILITY_CLASS_HIKER, gUnknown_085DD140},
{FACILITY_CLASS_BEAUTY, gUnknown_085DD154},
{FACILITY_CLASS_FISHERMAN, gUnknown_085DD168},
{FACILITY_CLASS_LADY, gUnknown_085DD17C},
{FACILITY_CLASS_CYCLING_TRIATHLETE_F, gUnknown_085DD190},
{FACILITY_CLASS_BUG_CATCHER, gUnknown_085DD1A4},
{FACILITY_CLASS_SCHOOL_KID_M, gUnknown_085DD1B8},
{FACILITY_CLASS_RICH_BOY, gUnknown_085DD1CC},
{FACILITY_CLASS_BLACK_BELT, gUnknown_085DD1E0},
{FACILITY_CLASS_TUBER_F, gUnknown_085DD1F4},
{FACILITY_CLASS_HEX_MANIAC, gUnknown_085DD208},
{FACILITY_CLASS_PKMN_BREEDER_M, gUnknown_085DD21C},
{FACILITY_CLASS_RUNNING_TRIATHLETE_F, gUnknown_085DD230},
{FACILITY_CLASS_RUNNING_TRIATHLETE_M, gUnknown_085DD244},
{FACILITY_CLASS_BATTLE_GIRL, gUnknown_085DD258},
{FACILITY_CLASS_CYCLING_TRIATHLETE_M, gUnknown_085DD26C},
{FACILITY_CLASS_TUBER_M, gUnknown_085DD280},
{FACILITY_CLASS_GUITARIST, gUnknown_085DD294},
{FACILITY_CLASS_GENTLEMAN, gUnknown_085DD2A8},
{FACILITY_CLASS_POKEFAN_M, gUnknown_085DD2BC},
{FACILITY_CLASS_EXPERT_M, gUnknown_085DD2D0},
{FACILITY_CLASS_EXPERT_F, gUnknown_085DD2E4},
{FACILITY_CLASS_DRAGON_TAMER, gUnknown_085DD2F8},
{FACILITY_CLASS_BIRD_KEEPER, gUnknown_085DD30C},
{FACILITY_CLASS_NINJA_BOY, gUnknown_085DD320},
{FACILITY_CLASS_PARASOL_LADY, gUnknown_085DD334},
{FACILITY_CLASS_BUG_MANIAC, gUnknown_085DD348},
{FACILITY_CLASS_SAILOR, gUnknown_085DD35C},
{FACILITY_CLASS_COLLECTOR, gUnknown_085DD370},
{FACILITY_CLASS_PKMN_RANGER_M, gUnknown_085DD384},
{FACILITY_CLASS_PKMN_RANGER_F, gUnknown_085DD398},
{FACILITY_CLASS_AROMA_LADY, gUnknown_085DD3AC},
{FACILITY_CLASS_RUIN_MANIAC, gUnknown_085DD3C0},
{FACILITY_CLASS_COOLTRAINER_M, gUnknown_085DD3D4},
{FACILITY_CLASS_COOLTRAINER_F, gUnknown_085DD3E8},
{FACILITY_CLASS_POKEMANIAC, gUnknown_085DD3FC},
{FACILITY_CLASS_KINDLER, gUnknown_085DD410},
{FACILITY_CLASS_CAMPER, gUnknown_085DD424},
{FACILITY_CLASS_PICNICKER, gUnknown_085DD438},
{FACILITY_CLASS_PSYCHIC_M, gUnknown_085DD44C},
{FACILITY_CLASS_PSYCHIC_F, gUnknown_085DD460},
{FACILITY_CLASS_SCHOOL_KID_F, gUnknown_085DD474},
{FACILITY_CLASS_POKEMON_BREEDER_F, gUnknown_085DD488},
{FACILITY_CLASS_POKEFAN_F, gUnknown_085DD49C},
{FACILITY_CLASS_SWIMMER_F, gUnknown_085DD4B0},
{FACILITY_CLASS_SWIMMING_TRIATHLETE_M, gUnknown_085DD4C4},
{FACILITY_CLASS_SWIMMING_TRIATHLETE_F, gUnknown_085DD4D8},
{FACILITY_CLASS_SWIMMER_M, gUnknown_085DD4EC}
};

6
src/battle_transition.c
View File

@ -3,8 +3,10 @@
#include "battle_transition.h"
#include "bg.h"
#include "decompress.h"
#include "event_object_movement.h"
#include "field_camera.h"
#include "field_effect.h"
#include "field_weather.h"
#include "gpu_regs.h"
#include "main.h"
#include "alloc.h"
@ -57,10 +59,6 @@ struct StructRectangularSpiral
typedef bool8 (*TransitionStateFunc)(struct Task *task);
typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
extern const struct OamData gEventObjectBaseOam_32x32;
extern void SetWeatherScreenFadeOut(void);
// this file's functions
static void LaunchBattleTransitionTask(u8 transitionId);
static void Task_BattleTransitionMain(u8 taskId);

5
src/battle_util2.c
View File

@ -3,17 +3,14 @@
#include "battle_controllers.h"
#include "alloc.h"
#include "pokemon.h"
#include "party_menu.h"
#include "event_data.h"
#include "constants/abilities.h"
#include "random.h"
#include "battle_scripts.h"
extern u8 gUnknown_0203CF00[];
extern void sub_81D55D0(void);
extern void sub_81D5694(void);
extern u8 pokemon_order_func(u8);
extern void sub_81B8FB0(u8, u8);
void AllocateBattleResources(void)
{

2
src/bike.c
View File

@ -19,8 +19,6 @@ extern u8 sub_808B9BC(u8 direction);
extern u8 sub_808B9A4(u8 direction);
extern u8 sub_808C1B4(u8 direction);
extern u8 sub_808B9D4(u8 direction);
extern void Overworld_ClearSavedMusic(void);
extern void Overworld_PlaySpecialMapMusic(void);
// this file's functions
static void MovePlayerOnMachBike(u8, u16, u16);

1
src/credits.c
View File

@ -1102,7 +1102,6 @@ static const struct SpriteTemplate gUnknown_085E7068 =
.callback = sub_81772B8,
};
void sub_8175620(void);
static void sub_8175744(u8 taskIdA);
static void sub_8175774(u8 taskIdA);
static void sub_8175808(u8 taskIdA);

21
src/daycare.c
View File

@ -16,33 +16,16 @@
#include "menu.h"
#include "international_string_util.h"
#include "script.h"
#include "strings.h"
#include "task.h"
#include "window.h"
#include "party_menu.h"
#include "list_menu.h"
#include "overworld.h"
#define EGG_MOVES_ARRAY_COUNT 10
#define EGG_LVL_UP_MOVES_ARRAY_COUNT 50
// text
extern const u8 gText_MaleSymbol4[];
extern const u8 gText_FemaleSymbol4[];
extern const u8 gText_GenderlessSymbol[];
extern const u8 gText_NewLine2[];
extern const u8 gText_Exit4[];
extern const u8 gText_Lv[];
extern const u8 gExpandedPlaceholder_Empty[];
extern const u8 gText_Exit[];
extern const u8 gDaycareText_GetAlongVeryWell[];
extern const u8 gDaycareText_GetAlong[];
extern const u8 gDaycareText_DontLikeOther[];
extern const u8 gDaycareText_PlayOther[];
extern u8 GetCursorSelectionMonId(void);
extern u16 ItemIdToBattleMoveId(u16);
extern void sub_819746C(u8, bool8);
extern void sub_81B9328(void);
// this file's functions
static void ClearDaycareMonMail(struct DayCareMail *mail);
static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);

31
src/hall_of_fame.c
View File

@ -14,7 +14,9 @@
#include "constants/songs.h"
#include "decompress.h"
#include "save.h"
#include "strings.h"
#include "window.h"
#include "credits.h"
#include "bg.h"
#include "constants/species.h"
#include "constants/game_stat.h"
@ -28,6 +30,7 @@
#include "event_data.h"
#include "overworld.h"
#include "menu.h"
#include "fldeff_misc.h"
#include "trainer_pokemon_sprites.h"
#include "data2.h"
#include "rom_81520A8.h"
@ -59,37 +62,11 @@ static EWRAM_DATA u32 sUnknown_0203BCD4 = 0;
static EWRAM_DATA struct HallofFameTeam *sHofMonPtr = NULL;
static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
extern bool8 gHasHallOfFameRecords;
extern struct MusicPlayerInfo gMPlayInfo_BGM;
#define HALL_OF_FAME_MAX_TEAMS 50
// strings
extern const u8 gText_SavingDontTurnOffPower[];
extern const u8 gText_LeagueChamp[];
extern const u8 gText_HOFNumber[];
extern const u8 gText_PickNextCancel[];
extern const u8 gText_PickCancel[];
extern const u8 gText_UnkCtrlF800Exit[];
extern const u8 gText_HOFCorrupted[];
extern const u8 gText_WelcomeToHOF[];
extern const u8 gText_Number[];
extern const u8 gText_Level[];
extern const u8 gText_IDNumber[];
extern const u8 gText_Name[];
extern const u8 gText_MainMenuTime[];
extern void sub_8175620(void);
extern bool8 sub_80F9C30(void);
extern void sub_8198314(void);
extern void ReturnFromHallOfFamePC(void);
extern void sub_8198180(const u8 *src, u8, u8);
extern void sub_80F9BF4(u16, u16, u8);
extern void sub_81980F0(u8, u8, u8, u8, u16);
extern void sub_80F9BCC(u16, u16, u8);
extern bool8 sub_80F9C1C(void);
extern void sub_81971D0(void);
extern void sub_8197200(void);
// this file's functions
static void ClearVramOamPltt_LoadHofPal(void);
@ -1088,7 +1065,7 @@ static void Task_HofPC_HandleExit(u8 taskId)
static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{
sub_8198180(gText_UnkCtrlF800Exit, 8, 1);
sub_8198180(gText_UnkCtrlF800Exit, 8, TRUE);
NewMenuHelpers_DrawDialogueFrame(0, 0);
AddTextPrinterParameterized2(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, 3);

1076
src/party_menu.c
View File

File diff suppressed because it is too large Load Diff

9
src/pokeblock.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "alloc.h"
#include "battle.h"
#include "battle_controllers.h"
#include "battle_message.h"
@ -6,14 +7,15 @@
#include "bg.h"
#include "decompress.h"
#include "event_data.h"
#include "field_screen_effect.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "international_string_util.h"
#include "item.h"
#include "item_menu.h"
#include "lilycove_lady.h"
#include "list_menu.h"
#include "main.h"
#include "alloc.h"
#include "menu.h"
#include "menu_helpers.h"
#include "overworld.h"
@ -70,14 +72,9 @@ enum
PKBL_GIVE_TO_LADY
};
extern u16 gSpecialVar_ItemId;
extern const u16 gUnknown_0860F074[];
extern void CB2_ReturnToField(void);
extern bool8 sub_81221EC(void);
extern void sub_80AF168(void);
// this file's functions
static void CB2_InitPokeblockMenu(void);
static bool8 InitPokeblockMenu(void);

10
src/pokemon.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "alloc.h"
#include "apprentice.h"
#include "battle.h"
#include "battle_controllers.h"
@ -12,12 +13,14 @@
#include "item.h"
#include "link.h"
#include "main.h"
#include "alloc.h"
#include "overworld.h"
#include "m4a.h"
#include "party_menu.h"
#include "pokedex.h"
#include "pokeblock.h"
#include "pokemon.h"
#include "pokemon_animation.h"
#include "pokemon_summary_screen.h"
#include "pokemon_storage_system.h"
#include "pokenav.h"
#include "random.h"
@ -68,15 +71,10 @@ extern const struct CompressedSpritePalette gMonPaletteTable[];
extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
extern const u8 gTrainerClassNames[][13];
extern u8 pokemon_order_func(u8);
extern u16 get_unknown_box_id(void);
extern u8 StorageGetCurrentBox(void);
extern void set_unknown_box_id(u8);
extern void sub_803FA70(u8 battlerId);
extern u8 sav1_map_get_name(void);
extern bool8 sub_806F104(void);
extern u8 sub_81D63C8(u16 trainerOpponentId);
extern void SummaryScreen_SetUnknownTaskId(u8);
// this file's functions
static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);

3
src/pokemon_animation.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "battle.h"
#include "pokemon.h"
#include "pokemon_animation.h"
#include "sprite.h"
@ -18,8 +19,6 @@ struct UnkAnimStruct
s16 field_8;
};
extern u16 gBattlerPartyIndexes[];
// this file's functions
static void pokemonanimfunc_00(struct Sprite *sprite);
static void pokemonanimfunc_01(struct Sprite *sprite);

5
src/pokemon_storage_system.c
View File

@ -8,6 +8,7 @@
#include "event_data.h"
#include "field_screen_effect.h"
#include "field_weather.h"
#include "fldeff_misc.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "international_string_util.h"
@ -462,10 +463,6 @@ EWRAM_DATA static u8 sMovingMonOrigBoxId = 0;
EWRAM_DATA static u8 sMovingMonOrigBoxPos = 0;
EWRAM_DATA static bool8 sCanOnlyMove = 0;
extern void sub_80F9BCC(u16, u16, u8);
extern void sub_80F9BF4(u16, u16, u8);
extern bool8 sub_80F9C1C(void);
extern bool8 sub_80F9C30(void);
extern void sub_80C6D80(u8 *arg0, void *arg1, u8 arg2, u8 arg3, s32 arg4);
extern const struct CompressedSpriteSheet gMonFrontPicTable[];

6
src/pokemon_summary_screen.c
View File

@ -5,6 +5,7 @@
#include "frontier_util.h"
#include "battle_message.h"
#include "battle_tent.h"
#include "battle_factory.h"
#include "bg.h"
#include "contest.h"
#include "contest_effect.h"
@ -45,8 +46,6 @@
#include "constants/songs.h"
#include "constants/species.h"
extern bool8 sub_81A6BF4(void);
static EWRAM_DATA struct UnkSummaryStruct
{
/*0x00*/ union {
@ -129,7 +128,6 @@ struct UnkStruct_61CC04
};
// forward declarations
bool8 IsMultiBattle(void);
static bool8 SummaryScreen_LoadGraphics(void);
static void SummaryScreen_LoadingCB2(void);
static void InitBGs(void);
@ -238,8 +236,6 @@ static void sub_81C4568(u8 a, u8 b);
static u8 sub_81C45F4(struct Pokemon *a, s16 *b);
static u8 sub_81C47B4(struct Pokemon *unused);
static void sub_81C4844(struct Sprite *);
void SummaryScreen_SetUnknownTaskId(u8 a);
void SummaryScreen_DestroyUnknownTask(void);
static void sub_81C48F0(void);
static void CreateMonMarkingsSprite(struct Pokemon *mon);
static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon);

3
src/sound.c
View File

@ -28,7 +28,6 @@ IWRAM_DATA static u16 sFanfareCounter;
// iwram common
bool8 gDisableMusic;
extern u32 gBattleTypeFlags;
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2;
@ -37,8 +36,6 @@ extern struct ToneData gCryTable[];
extern struct ToneData gCryTable2[];
extern const struct Fanfare sFanfares[];
extern u16 SpeciesToCryId(u16);
static void Task_Fanfare(u8 taskId);
static void CreateFanfareTask(void);
static void Task_DuckBGMForPokemonCry(u8 taskId);

2
src/text.c
View File

@ -9,12 +9,12 @@
#include "window.h"
#include "text.h"
#include "blit.h"
#include "menu.h"
#include "dynamic_placeholder_text_util.h"
extern u8 GetKeypadIconWidth(u8 keypadIconId);
extern u16 Font6Func(struct TextPrinter *textPrinter);
extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
extern int GetPlayerTextSpeed();
EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
EWRAM_DATA struct TextPrinter gTextPrinters[NUM_TEXT_PRINTERS] = {0};