summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-08-05 15:49:05 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-08-05 15:49:05 -0400
commit1f62caae43888293be59bb6342be6b13af838bfa (patch)
tree54b6caa37ee74cd7f5393965c8e03759f624bd33 /src
parent195137b001d7e985d18c40b26f160de08dccb5fa (diff)
Some cleanup
Diffstat (limited to 'src')
-rw-r--r--src/link_rfu.c4
-rw-r--r--src/pokedex.c2
-rwxr-xr-xsrc/pokenav_unk_5.c2
-rw-r--r--src/pokenav_unk_6.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/link_rfu.c b/src/link_rfu.c
index 1f3ae4f3c..4b0b0a2a5 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -2482,7 +2482,7 @@ void WipeTrainerNameRecords(void)
}
}
-void nullsub_5(const char *unused_0, u8 unused_1, u8 unused_2)
+void nullsub_5(const void *unused_0, u8 unused_1, u8 unused_2)
{
// debug?
}
@@ -2512,7 +2512,7 @@ void sub_800E604(void)
sub_800D724(&gUnknown_03005000.unk_9e8);
CpuFill16(0, gSendCmd, sizeof gSendCmd);
CpuFill16(0, gRecvCmds, sizeof gRecvCmds);
- CpuFill16(0, gLinkPlayers, sizeof gLinkPlayers)
+ CpuFill16(0, gLinkPlayers, sizeof gLinkPlayers);
}
void sub_800E6D0(void)
diff --git a/src/pokedex.c b/src/pokedex.c
index da3f06bf1..0e532ed92 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1319,7 +1319,7 @@ void CB2_Pokedex(void)
default:
SetVBlankCallback(NULL);
sub_80C09B0(0);
- DmaFillLarge16(3, 0, (u8 *)VRAM, VRAM_SIZE, 0x1000)
+ DmaFillLarge16(3, 0, (u8 *)VRAM, VRAM_SIZE, 0x1000);
DmaClear32(3, OAM, OAM_SIZE);
DmaClear16(3, PLTT, PLTT_SIZE);
gMain.state = 1;
diff --git a/src/pokenav_unk_5.c b/src/pokenav_unk_5.c
index c4e4f38ce..5226a34b3 100755
--- a/src/pokenav_unk_5.c
+++ b/src/pokenav_unk_5.c
@@ -194,7 +194,7 @@ void sub_81CC524(void)
u32 sub_81CC554(void)
{
struct Pokenav5Struct *state = GetSubstructPtr(3);
- state->unk10(state);
+ return state->unk10(state);
}
static u32 sub_81CC568(struct Pokenav5Struct *state)
diff --git a/src/pokenav_unk_6.c b/src/pokenav_unk_6.c
index 638884d3f..7b357ffb4 100644
--- a/src/pokenav_unk_6.c
+++ b/src/pokenav_unk_6.c
@@ -365,7 +365,7 @@ u8 *sub_81CD624(u8 *str, u16 id, bool8 arg3)
str_ = str; // For some reason, a variable is needed to match.
while (*str_ != EOS)
- *(str_++);
+ (str_++);
*(str_++) = EXT_CTRL_CODE_BEGIN;
*(str_++) = 0x12;