summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c1
-rw-r--r--src/blend_palette.c1
-rw-r--r--src/coins.c1
-rw-r--r--src/decompress.c2
-rw-r--r--src/field_camera.c2
-rw-r--r--src/field_door.c2
-rw-r--r--src/field_player_avatar.c4
-rw-r--r--src/fieldmap.c18
-rw-r--r--src/intro.c2
-rw-r--r--src/item.c2
-rw-r--r--src/link.c30
-rw-r--r--src/load_save.c13
-rw-r--r--src/main.c13
-rw-r--r--src/matsuda_debug_menu.c179
-rw-r--r--src/pokedex.c4
-rw-r--r--src/pokemon_1.c3
-rw-r--r--src/pokemon_size_record.c1
-rw-r--r--src/rom4.c31
-rw-r--r--src/save.c1
-rw-r--r--src/scrcmd.c4
-rw-r--r--src/sprite.c10
-rw-r--r--src/start_menu.c18
-rw-r--r--src/text.c3
-rw-r--r--src/trainer_card.c20
-rw-r--r--src/truck_scene.c4
-rw-r--r--src/weather.c2
26 files changed, 168 insertions, 203 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 4822cd585..0174c794f 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -448,7 +448,6 @@ u8 GetWildBattleTransition(void)
u8 GetTrainerBattleTransition(void)
{
struct Trainer *trainer;
- u8 trainerClass;
u8 partyCount;
u8 flashVar;
u8 level;
diff --git a/src/blend_palette.c b/src/blend_palette.c
index c9503388f..843c50ac1 100644
--- a/src/blend_palette.c
+++ b/src/blend_palette.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "blend_palette.h"
#include "palette.h"
void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor)
diff --git a/src/coins.c b/src/coins.c
index c07a0c7c7..87d96f2bb 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -29,7 +29,6 @@ void PrintCoins(s32 a, u8 b, u8 c, u8 d)
u8 string[16];
u8 *ptr;
u8 r1;
- u8 r6;
u8 foo;
ConvertIntToDecimalString(string, a);
diff --git a/src/decompress.c b/src/decompress.c
index 7f8ed9271..ebfd78ffb 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -107,7 +107,7 @@ void sub_800D378(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s
DrawSpindaSpots(f, g, dest, r7);
}
-static void Unused_LZDecompressWramIndirect(const void **src, void *dest)
+void Unused_LZDecompressWramIndirect(const void **src, void *dest)
{
LZ77UnCompWram(*src, dest);
}
diff --git a/src/field_camera.c b/src/field_camera.c
index b9a813bdf..c55d8e2a3 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -427,7 +427,7 @@ void CameraUpdate(void)
gUnknown_03004898 -= r8;
}
-static void camera_move_and_redraw(int a, int b)
+void camera_move_and_redraw(int a, int b)
{
CameraMove(a, b);
UpdateFieldObjectsForCameraUpdate(a, b);
diff --git a/src/field_door.c b/src/field_door.c
index da57988ca..ff0537c42 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -186,7 +186,7 @@ static s8 cur_mapdata_get_door_x2_at(struct DoorGraphics *gfx, u32 x, u32 y)
return gfx->unk2;
}
-static void unref_sub_805869C(u32 x, u32 y)
+void unref_sub_805869C(u32 x, u32 y)
{
StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y);
}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 708544b87..32835a431 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -821,7 +821,7 @@ u8 PlayerGetZCoord(void)
return gMapObjects[gPlayerAvatar.mapObjectId].elevation;
}
-static void unref_sub_8059790(s16 a, s16 b)
+void unref_sub_8059790(s16 a, s16 b)
{
sub_805C058(&gMapObjects[gPlayerAvatar.mapObjectId], a, b);
}
@@ -874,7 +874,7 @@ u8 GetPlayerAvatarGraphicsIdByStateId(u8 a)
return GetPlayerAvatarGraphicsIdByStateIdAndGender(a, gPlayerAvatar.gender);
}
-static u8 unref_sub_8059888(u8 a)
+u8 unref_sub_8059888(u8 a)
{
switch (a)
{
diff --git a/src/fieldmap.c b/src/fieldmap.c
index cd9baa217..0470d33ff 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -156,8 +156,8 @@ void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int
void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
int x, y;
- int x2, y2;
- int width, height;
+ int x2;
+ int width;
int cWidth;
if (connectedMapHeader) {
@@ -190,9 +190,9 @@ void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
}
void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
- int x, y;
+ int x;
int x2, y2;
- int width, height;
+ int width;
int cWidth, cHeight;
if (connectedMapHeader) {
@@ -229,9 +229,9 @@ void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
- int x, y;
+ int y;
int x2, y2;
- int width, height;
+ int height;
int cWidth, cHeight;
if (connectedMapHeader) {
cWidth = connectedMapHeader->mapData->width;
@@ -265,9 +265,9 @@ void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connected
void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connectedMapHeader, s32 offset) {
int x, y;
- int x2, y2;
- int width, height;
- int cWidth, cHeight;
+ int y2;
+ int height;
+ int cHeight;
if (connectedMapHeader) {
cHeight = connectedMapHeader->mapData->height;
x = mapHeader->mapData->width + 7;
diff --git a/src/intro.c b/src/intro.c
index 13e35976e..dfc1d6a4c 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -520,8 +520,6 @@ static void task_intro_13(u8 taskId)
static void task_intro_14(u8 taskId)
{
- u8 newTaskId;
-
REG_WIN0H = 0xF0;
REG_WIN0V = 0xA0;
REG_WININ = 0x1C;
diff --git a/src/item.c b/src/item.c
index 84ab4c1c8..3f74b5925 100644
--- a/src/item.c
+++ b/src/item.c
@@ -58,7 +58,7 @@ void CopyItemName(u16 itemId, u8 *string)
}
//Unreferenced
-static s8 CountUsedBagPocketSlots(u8 pocket)
+s8 CountUsedBagPocketSlots(u8 pocket)
{
u8 i;
diff --git a/src/link.c b/src/link.c
index 56635def2..d2b5770e9 100644
--- a/src/link.c
+++ b/src/link.c
@@ -41,8 +41,8 @@ extern u16 word_3004858;
extern u8 gMultiText_LinkError[];
static void InitLinkTestBG(u8, u8, u8, u8);
-static void InitLinkTestBG_Unused(u8, u8, u8, u8);
-static void LinkTestScreen();
+void InitLinkTestBG_Unused(u8, u8, u8, u8);
+void LinkTestScreen();
static void InitLocalLinkPlayer(void);
static void VBlankCB_LinkTest(void);
static void InitLink(void);
@@ -60,15 +60,15 @@ static void LinkCB_BlockSendBegin(void);
static void LinkCB_BlockSend(void);
static void LinkCB_BlockSendEnd(void);
static void sub_8007E04(void);
-static u32 sub_8007E40(void);
+u32 sub_8007E40(void);
static void SetBlockReceivedFlag(u8);
static u16 LinkTestCalcBlockChecksum(void *, u16);
static void PrintHexDigit(u8, u8, u8);
static void PrintHex(u32, u8, u8, u8);
static void LinkCB_RequestPlayerDataExchange(void);
static void Task_PrintTestData(u8);
-static bool8 sub_8008224(void);
-static u8 GetDummy2(void);
+bool8 sub_8008224(void);
+u8 GetDummy2(void);
static void sub_8008350(void);
static void sub_800837C(void);
static void sub_80083E0(void);
@@ -90,8 +90,8 @@ static void DoRecv(void);
static void DoSend(void);
static void StopTimer(void);
static void SendRecvDone(void);
-static void ResetSendBuffer(void);
-static void ResetRecvBuffer(void);
+void ResetSendBuffer(void);
+void ResetRecvBuffer(void);
static struct BlockTransfer sBlockSend;
static struct BlockTransfer sBlockRecv[MAX_LINK_PLAYERS];
@@ -212,7 +212,7 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB
}
}
-static void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
+void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
{
LoadPalette(sLinkTestDigitPalette, 16 * paletteNum, 32);
DmaCopy16(3, sLinkTestDigitTiles, BG_CHAR_ADDR(charBaseBlock), 0x220);
@@ -223,7 +223,7 @@ static void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u
*gBGControlRegs[bgNum] = (screenBaseBlock << 8) | (charBaseBlock << 2);
}
-static void LinkTestScreen(void)
+void LinkTestScreen(void)
{
s32 i;
ResetSpriteData();
@@ -840,7 +840,7 @@ void sub_8007E24(void)
gLinkCallback = sub_8007E04;
}
-static u32 sub_8007E40(void)
+u32 sub_8007E40(void)
{
return dword_20238BC;
}
@@ -1025,7 +1025,7 @@ u8 sub_8008218(void)
return gSavedMultiplayerId;
}
-static bool8 sub_8008224(void)
+bool8 sub_8008224(void)
{
s32 count = 0;
s32 i;
@@ -1072,7 +1072,7 @@ bool8 IsLinkMaster(void)
return EXTRACT_MASTER(gLinkStatus);
}
-static u8 GetDummy2(void)
+u8 GetDummy2(void)
{
return sDummy2;
}
@@ -1236,7 +1236,7 @@ void CB2_LinkError(void)
static void CB2_PrintErrorMessage(void)
{
- u8 array[64]; // unused
+ u8 array[64] __attribute__((unused)); // unused
switch (gMain.state)
{
@@ -1772,7 +1772,7 @@ static void SendRecvDone(void)
}
}
-static void ResetSendBuffer(void)
+void ResetSendBuffer(void)
{
u8 i;
u8 j;
@@ -1785,7 +1785,7 @@ static void ResetSendBuffer(void)
gLink.sendQueue.data[i][j] = 0xEFFF;
}
-static void ResetRecvBuffer(void)
+void ResetRecvBuffer(void)
{
u8 i;
u8 j;
diff --git a/src/load_save.c b/src/load_save.c
index 6f12718f0..0d4f1238d 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,7 +1,9 @@
#include "global.h"
+#include "load_save.h"
+#include "asm.h"
#include "main.h"
-#include "rom4.h"
#include "pokemon.h"
+#include "rom4.h"
extern u8 gPlayerPartyCount;
extern u32 gUnknown_3004820;
@@ -18,9 +20,6 @@ struct LoadedSaveData
extern struct LoadedSaveData gLoadedSaveData[];
-extern u16 IdentifyFlash(void);
-extern void gpu_sync_bg_hide();
-
void CheckForFlashMemory(void)
{
if(!IdentifyFlash())
@@ -32,7 +31,7 @@ void CheckForFlashMemory(void)
gUnknown_3004820 = 0;
}
-u8 GetSecretBase2Field_9(void)
+bool32 GetSecretBase2Field_9(void)
{
return gSaveBlock2.specialSaveWarp;
}
@@ -78,7 +77,7 @@ void LoadPlayerParty(void)
gPlayerParty[i] = gSaveBlock1.playerParty[i];
}
-void SaveMapObjects(void)
+static void SaveMapObjects(void)
{
int i;
@@ -86,7 +85,7 @@ void SaveMapObjects(void)
gSaveBlock1.mapObjects[i] = gMapObjects[i];
}
-void LoadMapObjects(void)
+static void LoadMapObjects(void)
{
int i;
diff --git a/src/main.c b/src/main.c
index ad131547b..c443de69b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,17 +1,18 @@
#include "global.h"
#include "main.h"
#include "asm.h"
-#include "play_time.h"
-#include "m4a.h"
-#include "gba/m4a_internal.h"
#include "gba/flash_internal.h"
-#include "siirtc.h"
-#include "rtc.h"
+#include "gba/m4a_internal.h"
+#include "intro.h"
#include "link.h"
+#include "load_save.h"
+#include "m4a.h"
+#include "play_time.h"
#include "rng.h"
#include "rom4.h"
+#include "rtc.h"
+#include "siirtc.h"
#include "sound.h"
-#include "intro.h"
extern struct SoundInfo gSoundInfo;
extern u32 gUnknown_3004820;
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index 18f644cbb..df2ca3206 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -1,12 +1,15 @@
#include "global.h"
+#include "asm.h"
+#include "link.h"
#include "main.h"
#include "menu.h"
#include "palette.h"
-#include "task.h"
-#include "link.h"
-#include "text.h"
+#include "rom4.h"
#include "sprite.h"
+#include "start_menu.h"
#include "string_util.h"
+#include "task.h"
+#include "text.h"
#define BIT(n) (1 << (n))
@@ -16,30 +19,6 @@ extern u8 gContestPlayerMonIndex;
extern u16 gScriptContestCategory;
extern u16 gScriptContestRank;
extern u8 (*gCallback_03004AE8)(void);
-extern void sub_80034D4(u8 *, u8 *);
-extern void sub_80AF668(void);
-extern void sub_80C2358(void);
-extern void sub_8071C20(void);
-extern void sub_80AA10C(void);
-extern void sub_80A9C98(u8);
-extern void sub_80C8734(void);
-extern void sub_80A9CC0(u8);
-extern void sub_80C88AC(u8);
-extern void sub_80A9CDC(u8);
-extern void sub_80C8E1C(u8);
-extern void sub_80A9D58(u8);
-extern void sub_80C8EBC(u8);
-extern void sub_80A9DBC(u8);
-extern u8 sub_80C4B34(u8 *);
-extern void sub_80B0F28(u8);
-extern void sub_80C8F34(u8);
-extern void sub_80A9DD8(u8);
-extern void sub_80A9F10(u8);
-extern void sub_805469C(void);
-extern void sub_80AE398(u8, u8);
-extern void sub_80AE098(u8);
-extern void sub_80AA5BC(u8);
-extern u32 sub_80AE770(u8, u8);
extern struct Window gMenuWindow;
@@ -64,16 +43,16 @@ extern u8 gMatsudaDebugMenu_GoBackText[];
extern u8 gMatsudaDebugMenu_BattlePointsText[];
extern u8 gMatsudaDebugMenu_StartText[];
-extern u8 gUnknown_083C92BC[];
-extern u8 gUnknown_083C92B4[];
+extern struct SpritePalette gUnknown_083C92BC;
+extern struct SpriteSheet gUnknown_083C92B4;
extern struct SpriteTemplate gSpriteTemplate_83C92CC;
extern u8 gMoveNames[][13];
extern u8 gMatsudaDebugMenu_UnknownByteArray[];
-extern u32 gMatsudaDebugMenuTextList1[];
-extern u32 gMatsudaDebugMenuTextList2[];
-extern u32 gMatsudaDebugMenuTextList3[];
+extern u8* gMatsudaDebugMenuTextList1[];
+extern u8* gMatsudaDebugMenuTextList2[];
+extern u8* gMatsudaDebugMenuTextList3[];
extern u8 gMatsudaDebugMenuContestTopLeft[][2];
struct ContestPokemon
@@ -97,24 +76,24 @@ extern struct ContestPokemon gContestMons[];
extern bool8 gReceivedRemoteLinkPlayers;
extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2];
-struct DebugMenuAction
-{
- u8 *text;
- u8 (*func)(void);
-};
-
-extern struct DebugMenuAction gMatsudaDebugMenuActions[];
-
-s8 sub_80A9B78(void);
-void sub_80A9BE4(u8 taskId);
-void sub_80A9E04(u8 taskId);
-void sub_80A9E3C(u8 taskId);
-void sub_80A9ED8(u8);
-void sub_80A9E80(u8);
-void sub_80AA280(u8);
-void sub_80AA5E8(u8);
-void sub_80AA614(u8, u8);
-void sub_80AA658(u8);
+extern struct MenuAction gMatsudaDebugMenuActions[];
+
+static bool8 sub_80A9B78(void);
+static void sub_80A9BE4(u8 taskId);
+static void sub_80A9C98(u8);
+static void sub_80A9CC0(u8);
+static void sub_80A9CDC(u8);
+static void sub_80A9D58(u8);
+static void sub_80A9DBC(u8);
+static void sub_80A9DD8(u8);
+static void sub_80A9E04(u8 taskId);
+static void sub_80A9E3C(u8 taskId);
+static void sub_80A9E80(u8);
+static void sub_80A9ED8(u8);
+static void sub_80A9F10(u8);
+static void sub_80AA10C(void);
+static void sub_80AA5BC(u8);
+static void sub_80AA614(u8, u8);
u8 unref_sub_80A9B28(void)
{
@@ -126,20 +105,20 @@ u8 unref_sub_80A9B28(void)
return 0;
}
-s8 sub_80A9B78(void)
+static bool8 sub_80A9B78(void)
{
s8 choice = ProcessMenuInput();
switch(choice)
{
case -2:
- return 0;
+ return FALSE;
default:
gCallback_03004AE8 = gMatsudaDebugMenuActions[choice].func;
- return 0;
+ return FALSE;
case -1:
sub_8071C20();
- return 1;
+ return TRUE;
}
}
@@ -150,7 +129,7 @@ s8 MatsudaDebugMenu_ContestResults(void)
return 1;
}
-void sub_80A9BE4(u8 taskId)
+static void sub_80A9BE4(u8 taskId)
{
if(!gPaletteFade.active)
{
@@ -189,23 +168,23 @@ s8 MatsudaDebugMenu_CommTest(void)
return 1;
}
-void sub_80A9C98(u8 taskId)
+static void sub_80A9C98(u8 taskId)
{
sub_80AE098(0);
SetTaskFuncWithFollowupFunc(taskId, sub_80C8734, sub_80A9CC0);
}
-void sub_80A9CC0(u8 taskId)
+static void sub_80A9CC0(u8 taskId)
{
SetTaskFuncWithFollowupFunc(taskId, sub_80C88AC, sub_80A9CDC);
}
-void sub_80A9CDC(u8 taskId)
+static void sub_80A9CDC(u8 taskId)
{
SetTaskFuncWithFollowupFunc(taskId, sub_80C8E1C, sub_80A9D58);
}
-void sub_80A9CF8(u8 taskId)
+static void sub_80A9CF8(u8 taskId)
{
if(gReceivedRemoteLinkPlayers == FALSE)
{
@@ -215,13 +194,13 @@ void sub_80A9CF8(u8 taskId)
}
}
-void sub_80A9D30(u8 taskId)
+static void sub_80A9D30(u8 taskId)
{
sub_800832C();
gTasks[taskId].func = sub_80A9CF8;
}
-void sub_80A9D58(u8 taskId)
+static void sub_80A9D58(u8 taskId)
{
int i;
u8 dest[4];
@@ -229,31 +208,31 @@ void sub_80A9D58(u8 taskId)
for(i = 0; i < 4; i++)
dest[i] = gTasks[taskId].data[5 + i];
- gUnknown_0203869B = sub_80C4B34(&dest);
+ gUnknown_0203869B = sub_80C4B34(dest);
sub_80AE82C((u8)gScriptContestCategory);
sub_80B0F28(0);
SetTaskFuncWithFollowupFunc(taskId, sub_80C8EBC, sub_80A9DBC);
}
-void sub_80A9DBC(u8 taskId)
+static void sub_80A9DBC(u8 taskId)
{
SetTaskFuncWithFollowupFunc(taskId, sub_80C8F34, sub_80A9DD8);
}
-void sub_80A9DD8(u8 taskId)
+static void sub_80A9DD8(u8 taskId)
{
DestroyTask(gTasks[taskId].data[10]);
DestroyTask(taskId);
sub_8071C20();
}
-void sub_80A9E04(u8 taskId)
+static void sub_80A9E04(u8 taskId)
{
if(gMain.newKeys == 2)
gTasks[(u8)gTasks[taskId].data[10]].func = sub_80A9D30;
}
-void sub_80A9E3C(u8 taskId)
+static void sub_80A9E3C(u8 taskId)
{
u8 i;
@@ -266,7 +245,7 @@ void sub_80A9E3C(u8 taskId)
gTasks[taskId].func = sub_80A9E80;
}
-void sub_80A9E80(u8 taskId)
+static void sub_80A9E80(u8 taskId)
{
TaskFunc func;
@@ -292,7 +271,7 @@ void sub_80A9E80(u8 taskId)
}
}
-void sub_80A9ED8(u8 taskId)
+static void sub_80A9ED8(u8 taskId)
{
gTasks[taskId].data[0] = gTasks[taskId].data[0] + 1;
if((gTasks[taskId].data[0]) == 101)
@@ -303,7 +282,7 @@ void sub_80A9ED8(u8 taskId)
}
}
-void sub_80A9F10(u8 taskId)
+static void sub_80A9F10(u8 taskId)
{
if(gReceivedRemoteLinkPlayers)
{
@@ -316,7 +295,7 @@ void sub_80A9F10(u8 taskId)
}
}
-void sub_80A9F50(void)
+static void sub_80A9F50(void)
{
REG_DISPCNT = DISPCNT_OBJ_1D_MAP;
REG_DISPCNT |= DISPCNT_OBJ_ON | DISPCNT_BG0_ON;
@@ -338,7 +317,7 @@ void sub_80A9F50(void)
gUnknown_030041B8 = 0;
}
-void sub_80A9FE4(void)
+static void sub_80A9FE4(void)
{
u8 *addr;
u32 i;
@@ -360,11 +339,11 @@ void sub_80A9FE4(void)
break;
}
}
- sub_80034D4(VRAM, &ptr);
+ sub_80034D4((void *)VRAM, ptr);
LoadFontDefaultPalette(&gWindowConfig_81E6C3C);
}
-void sub_80AA064(void)
+static void sub_80AA064(void)
{
AnimateSprites();
BuildOamBuffer();
@@ -374,7 +353,7 @@ void sub_80AA064(void)
SetMainCallback2(sub_805469C);
}
-void sub_80AA090(void)
+static void sub_80AA090(void)
{
REG_BG0HOFS = gUnknown_030042A4;
REG_BG0VOFS = gUnknown_030042A0;
@@ -390,7 +369,7 @@ void sub_80AA090(void)
sub_8089668();
}
-void sub_80AA10C(void)
+static void sub_80AA10C(void)
{
u8 i;
u8 zero;
@@ -428,8 +407,8 @@ void sub_80AA10C(void)
sub_80AA5E8(gScriptContestRank);
sub_8003460(&gMenuWindow, gMatsudaDebugMenu_GoBackText, 0xD6, 0x12, 0x12);
sub_8003460(&gMenuWindow, gMatsudaDebugMenu_BattlePointsText, 0xDC, zero, 0xC);
- LoadSpriteSheet(gUnknown_083C92B4);
- LoadSpritePalette(gUnknown_083C92BC);
+ LoadSpriteSheet(&gUnknown_083C92B4);
+ LoadSpritePalette(&gUnknown_083C92BC);
sub_80AA280(3);
sub_80AA658(3);
sub_80AA614(3, zero);
@@ -445,7 +424,7 @@ void sub_80AA280(u8 var)
u8 i;
FillWindowRect_DefaultPalette(&gMenuWindow, 0, 0, 0, 0x1E, 3);
- StringCopy(unk_2000000, &gMatsudaDebugMenu_StartText);
+ StringCopy(unk_2000000, gMatsudaDebugMenu_StartText);
StringAppend(unk_2000000, &gUnknown_0203857D[var][0]);
for(i = 0; i < 4; i++)
@@ -462,43 +441,43 @@ void sub_80AA280(u8 var)
}
}
-void sub_80AA340(u8 var)
+static void sub_80AA340(u8 var)
{
ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].cool, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]);
}
-void sub_80AA388(u8 var)
+static void sub_80AA388(u8 var)
{
ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].cute, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]);
}
-void sub_80AA3D0(u8 var)
+static void sub_80AA3D0(u8 var)
{
ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].beauty, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]);
}
-void sub_80AA418(u8 var)
+static void sub_80AA418(u8 var)
{
ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].smart, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]);
}
-void sub_80AA460(u8 var)
+static void sub_80AA460(u8 var)
{
ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].tough, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]);
}
-void sub_80AA4A8(u8 var)
+static void sub_80AA4A8(u8 var)
{
ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].sheen, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]);
}
-void sub_80AA4F0(u8 var1, u8 var2)
+static void sub_80AA4F0(u8 var1, u8 var2)
{
FillWindowRect_DefaultPalette(&gMenuWindow, 0, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1], gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1] + 1);
sub_8003460(&gMenuWindow, gMoveNames[gContestMons[var1].moves[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]);
@@ -506,7 +485,7 @@ void sub_80AA4F0(u8 var1, u8 var2)
sub_8003460(&gMenuWindow, gStringVar1, 0xFA + var2 * 6, gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1]);
}
-void sub_80AA5BC(u8 var)
+static void sub_80AA5BC(u8 var)
{
sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12);
}
@@ -516,7 +495,7 @@ void sub_80AA5E8(u8 var)
sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4);
}
-void sub_80AA614(u8 var1, u8 var2)
+static void sub_80AA614(u8 var1, u8 var2)
{
u16 var = sub_80AE770(var1, var2);
@@ -541,16 +520,16 @@ void sub_80AA658(u8 var)
void SetDebugMonForContest(void)
{
- SetMonData(&gPlayerParty, MON_DATA_COOL, &gContestMons[gContestPlayerMonIndex].cool);
- SetMonData(&gPlayerParty, MON_DATA_CUTE, &gContestMons[gContestPlayerMonIndex].cute);
- SetMonData(&gPlayerParty, MON_DATA_BEAUTY, &gContestMons[gContestPlayerMonIndex].beauty);
- SetMonData(&gPlayerParty, MON_DATA_SMART, &gContestMons[gContestPlayerMonIndex].smart);
- SetMonData(&gPlayerParty, MON_DATA_TOUGH, &gContestMons[gContestPlayerMonIndex].tough);
- SetMonData(&gPlayerParty, MON_DATA_SHEEN, &gContestMons[gContestPlayerMonIndex].sheen);
- SetMonData(&gPlayerParty, MON_DATA_MOVE1, &gContestMons[gContestPlayerMonIndex].moves[0]);
- SetMonData(&gPlayerParty, MON_DATA_MOVE2, &gContestMons[gContestPlayerMonIndex].moves[1]);
- SetMonData(&gPlayerParty, MON_DATA_MOVE3, &gContestMons[gContestPlayerMonIndex].moves[2]);
- SetMonData(&gPlayerParty, MON_DATA_MOVE4, &gContestMons[gContestPlayerMonIndex].moves[3]);
+ SetMonData(&gPlayerParty[0], MON_DATA_COOL, &gContestMons[gContestPlayerMonIndex].cool);
+ SetMonData(&gPlayerParty[0], MON_DATA_CUTE, &gContestMons[gContestPlayerMonIndex].cute);
+ SetMonData(&gPlayerParty[0], MON_DATA_BEAUTY, &gContestMons[gContestPlayerMonIndex].beauty);
+ SetMonData(&gPlayerParty[0], MON_DATA_SMART, &gContestMons[gContestPlayerMonIndex].smart);
+ SetMonData(&gPlayerParty[0], MON_DATA_TOUGH, &gContestMons[gContestPlayerMonIndex].tough);
+ SetMonData(&gPlayerParty[0], MON_DATA_SHEEN, &gContestMons[gContestPlayerMonIndex].sheen);
+ SetMonData(&gPlayerParty[0], MON_DATA_MOVE1, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[0]);
+ SetMonData(&gPlayerParty[0], MON_DATA_MOVE2, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[1]);
+ SetMonData(&gPlayerParty[0], MON_DATA_MOVE3, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[2]);
+ SetMonData(&gPlayerParty[0], MON_DATA_MOVE4, (const u8 *) &gContestMons[gContestPlayerMonIndex].moves[3]);
}
// too complicated
@@ -735,7 +714,7 @@ _080AA89C: .4byte gUnknown_083C92A8\n\
.syntax divided");
}
-void sub_80AA8A0(struct Sprite *sprite, s8 var1, u8 var2)
+static void sub_80AA8A0(struct Sprite *sprite, s8 var1, u8 var2)
{
if(var1 == 1)
{
@@ -765,7 +744,7 @@ void sub_80AA8F8(struct Sprite *sprite, s8 var1)
sub_80AA8A0(sprite, var1, 3);
}
-u8 sub_80AA908(u32 a1, u8 a2, s8 a3) // first param is unused.
+static u8 sub_80AA908(u32 a1, u8 a2, s8 a3) // first param is unused.
{
s16 val = a2 + a3;
@@ -826,7 +805,7 @@ void sub_80AAA84(struct Sprite *sprite, u8 var2)
}
// a similar function is at 0x80AA908, however, it apparently returns the wrong type (u8 vs u16).
-u16 sub_80AAAC8(u32 a1, u16 a2, s8 a3) // first param is unused.
+static u16 sub_80AAAC8(u32 a1, u16 a2, s8 a3) // first param is unused.
{
s16 val = a2 + a3;
diff --git a/src/pokedex.c b/src/pokedex.c
index aa832a681..54fa5912c 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -170,7 +170,6 @@ void sub_808C0B8(void)
void ClearPokedexView(struct PokedexView *pokedexView)
{
u16 i;
- struct UnknownStruct3 *p;
for(i = 0; i <= 385; i++)
{
@@ -1732,7 +1731,6 @@ void sub_808E6BC(void)
u8 sub_808E71C(void)
{
u16 r2;
- u16 r3;
u16 r4 = gPokedexView->selectedPokemon;
if((gMain.newKeys & DPAD_UP) && r4)
@@ -2177,8 +2175,6 @@ void sub_808F168(struct Sprite *sprite)
if(gPokedexView->menuIsOpen != 0 && gPokedexView->menuY == r1)
{
- u8 data2;
-
sprite->invisible = 0;
sprite->pos2.y = gPokedexView->menuCursorPos * 16;
sprite->pos2.x = gSineTable[(u8)sprite->data2] / 64;
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 3971e08dd..7ee413a18 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -200,7 +200,7 @@ void CreateMonWithGenderNatureLetter(struct Pokemon *mon, u16 species, u8 level,
do
{
personality = Random32();
- actualLetter = ((((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | personality & 0x3) % 28);
+ actualLetter = ((((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 28);
}
while (nature != GetNatureFromPersonality(personality)
|| gender != GetGenderFromSpeciesAndPersonality(species, personality)
@@ -422,7 +422,6 @@ void CalculateMonStats(struct Pokemon *mon)
u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
s32 level = GetLevelFromMonExp(mon);
s32 newMaxHP;
- u8 nature;
SetMonData(mon, MON_DATA_LEVEL, (u8 *)&level);
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 11c00dbe2..21f386f2d 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -61,7 +61,6 @@ static u32 GetMonSize(u16 species, u16 b)
u64 unk0;
u32 r7;
u32 var;
- struct UnknownStruct *s;
r7 = sub_8090D54(SpeciesToNationalPokedexNum(species), 0);
var = TranslateBigMonSizeTableIndex(b);
diff --git a/src/rom4.c b/src/rom4.c
index 19f59001b..b81007fd5 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -4,30 +4,31 @@
#include "asm_fieldmap.h"
#include "battle_setup.h"
#include "berry.h"
+#include "field_camera.h"
+#include "field_effect.h"
#include "field_map_obj.h"
+#include "field_message_box.h"
#include "field_player_avatar.h"
+#include "flag.h"
+#include "heal_location.h"
+#include "link.h"
+#include "load_save.h"
+#include "main.h"
#include "menu.h"
-#include "weather.h"
-#include "task.h"
-#include "tileset_anim.h"
-#include "start_menu.h"
-#include "play_time.h"
-#include "truck_scene.h"
#include "new_game.h"
-#include "heal_location.h"
-#include "field_message_box.h"
+#include "palette.h"
+#include "play_time.h"
+#include "rng.h"
#include "safari_zone.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
-#include "rng.h"
-#include "main.h"
-#include "palette.h"
-#include "link.h"
-#include "flag.h"
+#include "start_menu.h"
+#include "task.h"
+#include "tileset_anim.h"
+#include "truck_scene.h"
#include "var.h"
-#include "field_camera.h"
-#include "field_effect.h"
+#include "weather.h"
#include "wild_encounter.h"
#ifdef SAPPHIRE
diff --git a/src/save.c b/src/save.c
index 88f19f15c..1f527bbc0 100644
--- a/src/save.c
+++ b/src/save.c
@@ -2,6 +2,7 @@
#include "save.h"
#include "asm.h"
#include "gba/gba.h"
+#include "load_save.h"
#include "rom4.h"
#include "gba/flash_internal.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 8051b0cb0..ef77966c6 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1697,7 +1697,7 @@ bool8 ScrCmd_setanimation(struct ScriptContext *ctx)
return FALSE;
}
-bool8 sub_8067B48()
+static bool8 sub_8067B48()
{
if (!FieldEffectActiveListContains(gUnknown_0202E8BC))
return TRUE;
@@ -1775,7 +1775,7 @@ bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx)
return FALSE;
}
-bool8 IsDoorAnimationStopped()
+static bool8 IsDoorAnimationStopped()
{
if (!FieldIsDoorAnimationRunning())
return TRUE;
diff --git a/src/sprite.c b/src/sprite.c
index 78a8608ad..b468b3f0a 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -61,10 +61,8 @@ static void ClearSpriteCopyRequests(void);
static void ResetOamMatrices(void);
static void ResetSprite(struct Sprite *sprite);
static s16 AllocSpriteTiles(u16 tileCount);
-static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
+u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, struct SpriteFrameImage *images);
-static void CopyFromSprites(u8 *dest);
-static void CopyToSprites(u8 *src);
static void ResetAllSprites(void);
static void BeginAnim(struct Sprite *sprite);
static void ContinueAnim(struct Sprite *sprite);
@@ -786,7 +784,7 @@ static s16 AllocSpriteTiles(u16 tileCount)
return start;
}
-static u8 SpriteTileAllocBitmapOp(u16 bit, u8 op)
+u8 SpriteTileAllocBitmapOp(u16 bit, u8 op)
{
u8 index = bit / 8;
u8 shift = bit % 8;
@@ -855,7 +853,7 @@ void RequestSpriteCopy(u8 *src, u8 *dest, u16 size)
}
}
-static void CopyFromSprites(u8 *dest)
+void CopyFromSprites(u8 *dest)
{
u32 i;
u8 *src = (u8 *)gSprites;
@@ -867,7 +865,7 @@ static void CopyFromSprites(u8 *dest)
}
}
-static void CopyToSprites(u8 *src)
+void CopyToSprites(u8 *src)
{
u32 i;
u8 *dest = (u8 *)gSprites;
diff --git a/src/start_menu.c b/src/start_menu.c
index ee941b715..f02665ad1 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1,10 +1,19 @@
#include "global.h"
#include "start_menu.h"
#include "asm.h"
+#include "field_player_avatar.h"
+#include "flag.h"
+#include "load_save.h"
#include "main.h"
+#include "map_obj_lock.h"
#include "menu.h"
+#include "option_menu.h"
#include "palette.h"
#include "pokedex.h"
+#include "rom4.h"
+#include "safari_zone.h"
+#include "save.h"
+#include "save_menu_util.h"
#include "script.h"
#include "songs.h"
#include "sound.h"
@@ -12,15 +21,7 @@
#include "string_util.h"
#include "task.h"
#include "trainer_card.h"
-#include "flag.h"
-#include "rom4.h"
-#include "safari_zone.h"
-#include "field_player_avatar.h"
#include "weather.h"
-#include "save.h"
-#include "option_menu.h"
-#include "map_obj_lock.h"
-#include "save_menu_util.h"
//Menu actions
enum {
@@ -76,7 +77,6 @@ static void BuildStartMenuActions_Link(void);
static void DisplaySafariBallsWindow(void);
static bool32 PrintStartMenuItemsMultistep(s16 *a, u32 b);
static bool32 InitStartMenuMultistep(s16 *a, s16 *b);
-static void sub_8071230(void);
static void Task_StartMenu(u8 taskId);
static u8 StartMenu_InputProcessCallback(void);
static u8 SaveCallback1(void);
diff --git a/src/text.c b/src/text.c
index c632a4fa6..fb7c085a2 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1918,7 +1918,7 @@ static void MultistepLoadFont_LoadGlyph(struct Window *win, u16 startOffset, u8
}
}
-static void EmptyFunc(void)
+void EmptyFunc(void)
{
}
@@ -3662,7 +3662,6 @@ void ConvertInternationalString(u8 *s, u8 language)
if (language == CHARSET_JAPANESE)
{
u8 i;
- u8 length;
StripExtCtrlCodes(s);
i = StringLength(s);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index a04ad4359..560e8ece3 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -81,7 +81,7 @@ static void sub_809323C(void);
static void sub_8093254(void);
static void sub_80932AC(Callback callBack);
static void sub_80932E4(u8 arg1, Callback callBack);
-static void sub_8093324(void);
+void sub_8093324(void);
static void nullsub_60(u8);
static u32 sav12_xor_get_clamped_above(u8 index, u32 maxVal);
static u8 sub_80934F4(struct TrainerCard *);
@@ -91,7 +91,7 @@ static void sub_8093598(void);
static void sub_80935EC(void);
static void sub_8093610(void);
static void sub_8093688(void);
-static void sub_80936D4(void);
+void sub_80936D4(void);
static void sub_80937A4(void);
static void sub_80937BC(void);
static void sub_80937D8(void);
@@ -106,13 +106,13 @@ static void sub_80939DC(u8 taskId);
static void sub_8093A28(void);
static u8 sub_8093A48(void);
static void sub_8093A68(u8 taskId);
-static void sub_8093D7C(void);
+void sub_8093D7C(void);
static void sub_8093DAC(void);
static void sub_8093DC8(void);
static void sub_8093DEC(void);
static void sub_8093E04(void);
static void sub_8093E28(void);
-static void sub_8093EA0(void);
+void sub_8093EA0(void);
static void sub_8093EF8(void);
static void sub_8093F14(void);
static void sub_8093F48(void);
@@ -142,7 +142,7 @@ static void TrainerCard_Back_PrintLinkPokeblocks_Label(void);
static void TrainerCard_Back_PrintLinkPokeblocks(void);
static void TrainerCard_Back_PrintPokemonTrades_Label(void);
static void TrainerCard_Back_PrintPokemonTrades(void);
-static void unref_sub_8094588(u16 left, u16 top);
+void unref_sub_8094588(u16 left, u16 top);
void sub_8093110(Callback arg1) {
sub_80932AC(arg1);
@@ -253,7 +253,7 @@ static void sub_80932E4(u8 arg1, Callback callBack) {
StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32) callBack);
}
-static void sub_8093324(void) {
+void sub_8093324(void) {
u8 taskId = FindTaskIdByFunc(nullsub_60);
struct Task *task = &gTasks[taskId];
unk_2000000.var_1 = task->data[TD_0];
@@ -592,7 +592,7 @@ _080936D0: .4byte 0x02000000\n\
#endif
-static void sub_80936D4(void) {
+void sub_80936D4(void) {
unk_2000000.var_7 = FALSE;
unk_2000000.var_8 = FALSE;
unk_2000000.var_9 = FALSE;
@@ -1338,7 +1338,7 @@ bool8 sub_8093D50(void) {
}
__attribute__((naked))
-static void sub_8093D7C(void) {
+void sub_8093D7C(void) {
asm(".syntax unified\n\
ldr r1, _08093DA0 @ =gUnknown_03004DE0\n\
ldr r0, _08093DA4 @ =REG_VCOUNT\n\
@@ -1471,7 +1471,7 @@ _08093E9C: .4byte 0x80000200\n\
.syntax divided\n");
}
-static void sub_8093EA0(void) {
+void sub_8093EA0(void) {
LoadPalette(gUnknown_083B5EF8[unk_2000000.var_2], 0, 48 * 2);
LoadPalette(gBadgesPalette, 48, 16 * 2);
LoadPalette(gUnknown_083B5F4C, 64, 16 * 2);
@@ -2016,7 +2016,7 @@ static void TrainerCard_Back_PrintPokemonTrades(void) {
MenuPrint_RightAligned(buffer, 28, 9);
}
-static void unref_sub_8094588(u16 left, u16 top) {
+void unref_sub_8094588(u16 left, u16 top) {
u8 *text = gOtherText_Boy;
if (gSaveBlock2.playerGender == FEMALE) {
diff --git a/src/truck_scene.c b/src/truck_scene.c
index 4e45bd165..64eca498c 100644
--- a/src/truck_scene.c
+++ b/src/truck_scene.c
@@ -12,8 +12,6 @@ extern s8 gTruckCamera_HorizontalTable[];
s32 GetTruckCameraBobbingY(int a1)
{
- s32 result;
-
if (!(a1 % 120))
return -1;
else if ((a1 % 10) <= 4)
@@ -24,8 +22,6 @@ s32 GetTruckCameraBobbingY(int a1)
s32 GetTruckBoxMovement(int a1) // for the box movement?
{
- s32 result;
-
if (!((a1 + 120) % 180))
return -1;
diff --git a/src/weather.c b/src/weather.c
index c16faaed8..520185441 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -192,7 +192,7 @@ void sub_807CB10(void) {
v4 += v11;
dunno = v4 - v9;
if (dunno > 0) {
- v4 -= dunno + ((u16)dunno >> 15) >> 1;
+ v4 -= (dunno + ((u16)dunno >> 15)) >> 1;
}
v1[v6][v2] = v4 >> 8;
if (v1[v6][v2] > 0x1f) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 11:13:16 +0000