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

Eliminate more externs

Browse Source
This commit is contained in:
Phlosioneer 2019-03-02 02:44:02 -05:00
parent 0f6cc27e81
commit ee69426838
35 changed files with 82 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/agb_flash.h
View File

@ -8,5 +8,6 @@
// Exported ROM declarations
u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
u16 IdentifyFlash(void);
#endif //GUARD_AGB_FLASH_H

1
include/easy_chat.h
View File

@ -134,5 +134,6 @@ u16 EasyChat_GetNumWordsInGroup(u8);
u16 sub_811EE90(u16);
void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType);
void sub_811F8BC(void);
void sub_811EFC0(u8 additionalPhraseId);
#endif // GUARD_EASYCHAT_H

5
include/field_effect.h
View File

@ -36,6 +36,10 @@ bool8 FieldEffectCmd_end(u8 **script, u32 *val);
bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val);
bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val);
bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val);
void sub_80B6B68(void);
void sub_80B6E4C(u8 a0, u8 priority);
void sub_80B75D8(u8 priority);
void sub_80B7A74(u8 priority);
void sub_80B9C28(s16*, u8);
void sub_80B9C54(s16*, u8);
@ -47,5 +51,6 @@ void sub_80B7A58(struct Sprite*);
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);
void StartEscapeRopeFieldEffect(void);
#endif //GUARD_FIELD_EFFECTS_H

3
include/field_player_avatar.h
View File

@ -70,5 +70,8 @@ void sub_808C1B4(u8 direction);
void sub_808B9D4(u8 direction);
void sub_808D194(void);
void sub_808D1C8(void);
bool32 sub_808D1B4(void);
bool32 sub_808D1E8(void);
void sub_808C0A8(u8 a);
#endif // GUARD_FIELD_PLAYER_AVATAR_H

1
include/field_specials.h
View File

@ -27,5 +27,6 @@ void ResetCyclingRoadChallengeData(void);
bool8 warp0_in_pokecenter(void);
void ResetFanClub(void);
bool8 sub_813B21C(void);
void set_unknown_box_id(u8 id);
#endif // GUARD_FIELD_SPECIALS_H

7
include/fieldmap.h
View File

@ -9,6 +9,8 @@
#define NUM_PALS_TOTAL 13
#define MAX_MAP_DATA_SIZE 0x2800
#include "main.h"
extern struct BackupMapLayout gBackupMapLayout;
u32 MapGridGetMetatileIdAt(int, int);
@ -39,9 +41,14 @@ void apply_map_tileset2_palette(struct MapLayout const *mapLayout);
void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout);
void copy_map_tileset1_to_vram(const struct MapLayout *);
void copy_map_tileset2_to_vram(const struct MapLayout *);
struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection);
struct MapConnection *sub_8088A8C(s16 x, s16 y);
void SpriteCB_PokeballGlow(struct Sprite *);
void SpriteCB_PokecenterMonitor(struct Sprite *);
void SpriteCB_HallOfFameMonitor(struct Sprite *);
// field_region_map.c
void FieldInitRegionMap(MainCallback callback);
#endif //GUARD_FIELDMAP_H

3
include/hall_of_fame.h
View File

@ -6,4 +6,7 @@ void CB2_DoHallOfFameScreenDontSaveData(void);
void CB2_DoHallOfFamePC(void);
void sub_8175280(void);
// hof_pc.c
void ReturnFromHallOfFamePC(void);
#endif // GUARD_HALL_OF_FAME_H

4
include/item_menu.h
View File

@ -2,6 +2,7 @@
#define GUARD_item_menu_H
#include "item.h"
#include "menu_helpers.h"
#define RETURN_LOCATION_FIELD 0
#define RETURN_LOCATION_BATTLE 1
@ -83,6 +84,9 @@ void DoWallyTutorialBagMenu(void);
void ResetBagScrollPositions(void);
void sub_81AABF0(void (*callback)(void));
void CB2_ChooseBerry(void);
void unknown_ItemMenu_Confirm(u8 taskId);
void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
void sub_81AB9A8(u8 pocketId);
#endif //GUARD_item_menu_H

1
include/link.h
View File

@ -262,6 +262,7 @@ bool32 sub_800A07C(void);
void sub_800AB98(void);
void sub_800AA04(u8 a0);
void sub_800B4C0(void);
bool32 sub_800B504(void);
extern u16 gLinkPartnersHeldKeys[6];
extern u32 gLinkDebugSeed;

1
include/rom_8011DC0.h
View File

@ -17,5 +17,6 @@ u16 mevent_081445C0(u8);
void sub_801B990(u32, u32);
u8 sub_8013F78(void);
bool32 sub_802C908(u16);
void nullsub_89(u8 taskId);
#endif //GUARD_rom_8011DC0_H

2
include/script_menu.h
View File

@ -14,5 +14,7 @@ u8 CreateWindowFromRect(u8, u8, u8, u8);
void sub_80E2A78(u8);
int display_text_and_get_width(const u8*, int);
int sub_80E2D5C(int arg0, int tileWidth);
bool16 ScrSpecial_CreatePCMenu(void);
void ScriptMenu_DisplayPCStartupPrompt(void);
#endif //GUARD_SCRIPT_MENU_H

4
src/field_player_avatar.c
View File

@ -2125,7 +2125,7 @@ void sub_808D194(void)
sub_808D1FC(CreateTask(sub_808D1FC, 0));
}
bool8 sub_808D1B4(void)
bool32 sub_808D1B4(void)
{
return FuncIsActiveTask(sub_808D1FC);
}
@ -2135,7 +2135,7 @@ void sub_808D1C8(void)
sub_808D094(CreateTask(sub_808D094, 0));
}
bool8 sub_808D1E8(void)
bool32 sub_808D1E8(void)
{
return FuncIsActiveTask(sub_808D094);
}

11
src/field_screen_effect.c
View File

@ -32,16 +32,7 @@
#include "constants/rgb.h"
#include "trainer_hill.h"
#include "event_obj_lock.h"
extern void sub_80B6B68(void);
extern void sub_80B6E4C(u8, u8);
extern void sub_80B75D8(u8);
extern void sub_80B7A74(u8);
extern void sub_808C0A8(u8);
extern u8 GetMapPairFadeToType(u8, u8);
extern u8 GetMapPairFadeFromType(u8, u8);
extern bool32 sub_808D1B4(void);
extern bool32 sub_808D1E8(void);
#include "fldeff.h"
extern const u16 gUnknown_82EC7CC[];

2
src/field_specials.c
View File

@ -81,8 +81,6 @@ extern const u16 gEventObjectPalette17[];
extern const u16 gEventObjectPalette33[];
extern const u16 gEventObjectPalette34[];
extern void BlendPalettes(u32, u8, u16);
extern void FieldInitRegionMap(MainCallback callback);
void UpdateMovedLilycoveFanClubMembers(void);
void sub_813BF60(void);

5
src/frontier_util.c
View File

@ -35,8 +35,7 @@
#include "constants/moves.h"
#include "constants/items.h"
#include "constants/event_objects.h"
extern u8 gSelectedOrderFromParty[];
#include "party_menu.h"
struct FrontierBrainMon
{
@ -48,8 +47,6 @@ struct FrontierBrainMon
u16 moves[4];
};
extern void sub_81B8558(void);
// This file's functions.
static void sub_81A17A0(void);
static void sub_81A1830(void);

2
src/hall_of_fame.c
View File

@ -66,8 +66,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
#define HALL_OF_FAME_MAX_TEAMS 50
extern void ReturnFromHallOfFamePC(void);
// this file's functions
static void ClearVramOamPltt_LoadHofPal(void);
static void sub_8174F70(void);

4
src/hof_pc.c
View File

@ -7,10 +7,6 @@
#include "script_menu.h"
#include "task.h"
extern void Overworld_PlaySpecialMapMusic(void);
extern bool16 ScrSpecial_CreatePCMenu(void);
extern void ScriptMenu_DisplayPCStartupPrompt(void);
static void ReshowPCMenuAfterHallOfFamePC(void);
static void Task_WaitForPaletteFade(u8);

47
src/ice.c
View File

@ -21,30 +21,29 @@ struct HailStruct {
};
static void sub_810B6C4(struct Sprite *);
extern void sub_810B848(struct Sprite *);
extern void AnimIcePunchSwirlingParticle(struct Sprite *);
extern void AnimIceBeamParticle(struct Sprite *);
extern void AnimIceEffectParticle(struct Sprite *);
extern void AnimFlickerIceEffectParticle(struct Sprite *);
extern void AnimSwirlingSnowball_Step1(struct Sprite *);
extern void AnimSwirlingSnowball_Step2(struct Sprite *);
extern void AnimSwirlingSnowball_Step3(struct Sprite *);
extern void AnimSwirlingSnowball_End(struct Sprite *);
extern void AnimMoveParticleBeyondTarget(struct Sprite *);
extern void AnimWiggleParticleTowardsTarget(struct Sprite *);
extern void AnimWaveFromCenterOfTarget(struct Sprite *);
extern void InitSwirlingFogAnim(struct Sprite *);
extern void AnimSwirlingFogAnim(struct Sprite *);
extern void AnimThrowMistBall(struct Sprite *);
extern void InitPoisonGasCloudAnim(struct Sprite *);
extern void MovePoisonGasCloud(struct Sprite *);
extern void AnimHailBegin(struct Sprite *);
extern void AnimHailContinue(struct Sprite *);
extern void sub_80A8EE4(struct Sprite *);
extern void InitIceBallAnim(struct Sprite *);
extern void AnimThrowIceBall(struct Sprite *);
extern void InitIceBallParticle(struct Sprite *);
extern void AnimIceBallParticle(struct Sprite *);
void sub_810B848(struct Sprite *);
void AnimIcePunchSwirlingParticle(struct Sprite *);
void AnimIceBeamParticle(struct Sprite *);
void AnimIceEffectParticle(struct Sprite *);
void AnimFlickerIceEffectParticle(struct Sprite *);
void AnimSwirlingSnowball_Step1(struct Sprite *);
void AnimSwirlingSnowball_Step2(struct Sprite *);
void AnimSwirlingSnowball_Step3(struct Sprite *);
void AnimSwirlingSnowball_End(struct Sprite *);
void AnimMoveParticleBeyondTarget(struct Sprite *);
void AnimWiggleParticleTowardsTarget(struct Sprite *);
void AnimWaveFromCenterOfTarget(struct Sprite *);
void InitSwirlingFogAnim(struct Sprite *);
void AnimSwirlingFogAnim(struct Sprite *);
void AnimThrowMistBall(struct Sprite *);
void InitPoisonGasCloudAnim(struct Sprite *);
void MovePoisonGasCloud(struct Sprite *);
void AnimHailBegin(struct Sprite *);
void AnimHailContinue(struct Sprite *);
void InitIceBallAnim(struct Sprite *);
void AnimThrowIceBall(struct Sprite *);
void InitIceBallParticle(struct Sprite *);
void AnimIceBallParticle(struct Sprite *);
void AnimTask_Haze2(u8);
void AnimTask_OverlayFogTiles(u8);
void AnimTask_Hail2(u8);

1
src/item_menu.c
View File

@ -140,7 +140,6 @@ void unknown_ItemMenu_Confirm2(u8 taskId);
void unknown_item_menu_type(u8 taskId);
void item_menu_type_2(u8 taskId);
void display_sell_item_ask_str(u8 taskId);
void unknown_ItemMenu_Confirm(u8 taskId);
void display_deposit_item_ask_str(u8 taskId);
void item_menu_type_b(u8 taskId);
void BagMenuActuallyToss(u8 taskId);

30
src/item_use.c
View File

@ -8,13 +8,15 @@
#include "coins.h"
#include "data2.h"
#include "event_data.h"
#include "fieldmap.h"
#include "event_object_movement.h"
#include "fieldmap.h"
#include "field_effect.h"
#include "field_player_avatar.h"
#include "field_screen_effect.h"
#include "field_weather.h"
#include "item.h"
#include "item_menu.h"
#include "item_use.h"
#include "mail.h"
#include "main.h"
#include "menu.h"
@ -39,29 +41,13 @@
#include "constants/vars.h"
#include "event_obj_lock.h"
extern void unknown_ItemMenu_Confirm(u8 taskId);
extern void sub_81C5B14(u8 taskId);
extern void ItemUseOutOfBattle_TMHM(u8 a);
extern void ItemUseOutOfBattle_EvolutionStone(u8 b);
extern bool8 IsPlayerFacingSurfableFishableWater(void);
extern bool8 sub_81221AC(void);
extern u8 Route102_EventScript_274482[];
extern u8 Route102_EventScript_2744C0[];
extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
extern int sub_80247BC(void);
extern struct MapHeader* mapconnection_get_mapheader(struct MapConnection *connection);
extern void SetUpItemUseCallback(u8 taskId);
extern void ItemUseCB_Medicine(u8, TaskFunc);
extern void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
extern void sub_81C5924(void);
extern void sub_81C59BC(void);
extern void sub_81AB9A8(u8);
extern void StartEscapeRopeFieldEffect(void);
extern u8* sub_806CF78(u16);
extern void sub_81B89F0(void);
extern u8 GetItemEffectType(u16);
extern struct MapConnection *sub_8088A8C(s16, s16);
extern s32 sub_80247BC(void);
void SetUpItemUseCallback(u8 taskId);
void MapPostLoadHook_UseItem(void);
void sub_80AF6D4(void);
void Task_CallItemUseOnFieldCallback(u8 taskId);
@ -404,12 +390,12 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y)
bool8 sub_80FD730(struct MapConnection *connection, int x, int y)
{
struct MapHeader *mapHeader;
u16 localX, localY;
u32 localOffset;
s32 localLength;
mapHeader = mapconnection_get_mapheader(connection);
struct MapHeader const *const mapHeader = mapconnection_get_mapheader(connection);
switch (connection->direction)
{

2
src/link.c
View File

@ -1893,7 +1893,7 @@ u32 GetLinkRecvQueueLength(void)
return gLink.recvQueue.count;
}
bool8 sub_800B504(void)
bool32 sub_800B504(void)
{
if (GetLinkRecvQueueLength() > 2)
{

2
src/link_rfu.c
View File

@ -17,9 +17,9 @@
#include "text.h"
#include "constants/species.h"
#include "save.h"
#include "rom_8011DC0.h"
extern u16 gHeldKeyCodeToSend;
extern void nullsub_89(u8 taskId);
struct UnkRfuStruct_1 gUnknown_03004140;
struct UnkRfuStruct_2 gUnknown_03005000;

2
src/load_save.c
View File

@ -11,10 +11,10 @@
#include "trainer_hill.h"
#include "gba/flash_internal.h"
#include "decoration_inventory.h"
#include "agb_flash.h"
static void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
extern bool16 IdentifyFlash(void);
extern void ApplyNewEncryptionKeyToBerryPowder(u32 key);
#define SAVEBLOCK_MOVE_RANGE 128

5
src/main.c
View File

@ -24,9 +24,6 @@
#include "main.h"
#include "trainer_hill.h"
extern void sub_800B9B8(void);
extern u8 gUnknown_03002748;
static void VBlankIntr(void);
static void HBlankIntr(void);
static void VCountIntr(void);
@ -313,8 +310,6 @@ void SetSerialCallback(IntrCallback callback)
gMain.serialCallback = callback;
}
extern void CopyBufferedValuesToGpuRegs(void);
static void VBlankIntr(void)
{
if (gWirelessCommType != 0)

2
src/match_call.c
View File

@ -111,8 +111,6 @@ static void PopulateSpeciesFromTrainerParty(int, u8 *);
static void PopulateBattleFrontierFacilityName(int, u8 *);
static void PopulateBattleFrontierStreak(int, u8 *);
extern void sub_81973A4(void);
#define TEXT_ID(topic, id) (((topic) << 8) | ((id) & 0xFF))
static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =

24
src/menu.c
View File

@ -122,20 +122,18 @@ const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] =
{ 8, 8, 0xAF }, // Unused (Small dark pokeball)
};
// Forward declarations
extern void sub_81973A4(void);
extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8);
extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
extern void sub_81977BC(u8, u8, u8, u8, u8, u8);
extern void sub_8197804(u8, u8, u8, u8, u8, u8);
extern void sub_8197BB4(u8, u8, u8, u8, u8, u8);
extern void sub_8197E30(u8, u8, u8, u8, u8, u8);
extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8);
extern void sub_81980A8(u8, u8, u8, u8, u8, u8);
extern u8 Menu_MoveCursor(s8);
extern u8 sub_8199134(s8, s8);
extern void sub_8198C78(void);
extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
void DrawStandardFrame(u8, u8, u8, u8, u8, u8);
void DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
void sub_81977BC(u8, u8, u8, u8, u8, u8);
void sub_8197804(u8, u8, u8, u8, u8, u8);
void sub_8197BB4(u8, u8, u8, u8, u8, u8);
void sub_8197E30(u8, u8, u8, u8, u8, u8);
void DrawWindowBorder(u8, u8, u8, u8, u8, u8);
void sub_81980A8(u8, u8, u8, u8, u8, u8);
void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
void sub_8198C78(void);
void InitStandardTextBoxWindows(void)
{

2
src/menu_helpers.c
View File

@ -18,8 +18,6 @@
#include "constants/items.h"
#include "constants/maps.h"
extern bool32 sub_800B504(void);
// this file's functions
static void Task_ContinueTaskAfterMessagePrints(u8 taskId);
static void Task_CallYesOrNoCallback(u8 taskId);

2
src/mystery_event_script.c
View File

@ -17,8 +17,6 @@
#include "mystery_event_msg.h"
#include "pokemon_storage_system.h"
extern void sub_811EFC0(u8);
extern ScrCmdFunc gMysteryEventScriptCmdTable[];
extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];

3
src/option_menu.c
View File

@ -13,8 +13,7 @@
#include "text_window.h"
#include "international_string_util.h"
#include "strings.h"
extern void SetPokemonCryStereo(u32 val);
#include "gba/m4a_internal.h"
// Task data
enum

2
src/poison.c
View File

@ -3,8 +3,6 @@
#include "trig.h"
#include "constants/rgb.h"
extern void sub_80A77C8(struct Sprite *);
void sub_810DBAC(struct Sprite *);
void sub_810DC2C(struct Sprite *);
void sub_810DCD0(struct Sprite *);

2
src/pokeblock_feed.c
View File

@ -55,8 +55,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const u16 gUnknown_0860F074[];
extern bool8 sub_81221EC(void);
// this file's functions
static void HandleInitBackgrounds(void);
static void HandleInitWindows(void);

5
src/pokemon.c
View File

@ -10,6 +10,7 @@
#include "battle_tower.h"
#include "event_data.h"
#include "evolution_scene.h"
#include "field_specials.h"
#include "item.h"
#include "link.h"
#include "main.h"
@ -72,10 +73,6 @@ extern const struct CompressedSpritePalette gMonPaletteTable[];
extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
extern const u8 gTrainerClassNames[][13];
extern u16 get_unknown_box_id(void);
extern void set_unknown_box_id(u8);
extern bool8 sub_806F104(void);
// this file's functions
static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType);

4
src/pokemon_size_record.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "event_data.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_size_record.h"
#include "string_util.h"
@ -15,9 +16,6 @@ struct UnknownStruct
u16 unk4;
};
extern u16 GetPokedexHeightWeight(u16 dexNo, bool8 height);
extern u16 SpeciesToNationalPokedexNum(u16 species);
static const struct UnknownStruct sBigMonSizeTable[] =
{
{ 290, 1, 0 },

2
src/script_menu.c
View File

@ -1312,7 +1312,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId)
#undef tWindowId
bool8 ScrSpecial_CreatePCMenu(void)
bool16 ScrSpecial_CreatePCMenu(void)
{
if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
{

1
src/water.c
View File

@ -41,7 +41,6 @@ extern void sub_8108BE0(struct Sprite *);
extern void sub_8108C08(struct Sprite *);
extern void sub_8108C54(struct Sprite *);
extern void sub_8108CDC(struct Sprite *);
extern void sub_80A8EE4(struct Sprite *);
void sub_810756C(u8);
void sub_81076F4(u8);
void sub_8107B84(u8);