Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Label sub_80099F0 as SetFontsBaseColor #250

Merged
merged 1 commit into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/code_8009804.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ void sub_80098BC(u32 *, const u32 *, u32);
void sub_80098F8(u32);
void sub_8009908(void);
void sub_80099C0(void);
void sub_80099F0(RGB);
void SetFontsBaseColor(RGB);

#endif // GUARD_CODE_8009804_H
2 changes: 1 addition & 1 deletion src/code_8009804.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ void sub_80099C0(void)
CpuCopy(BG_SCREEN_ADDR(13), gUnknown_202B038[1], BG_SCREEN_SIZE);
}

void sub_80099F0(RGB a0)
void SetFontsBaseColor(RGB a0)
{
s32 i;

Expand Down
33 changes: 17 additions & 16 deletions src/code_809C5C4.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@
#include "ground_main.h"
#include "code_80A26CC.h"

struct unkStruct_3001B68
{
struct unkStruct_3001B68
{
u32 unk0;
u32 unk4;
u16 unk8;
u16 unkA;
u8 unkC;
u32 unk4;
u16 unk8;
u16 unkA;
u8 unkC;
u8 unkD;
u8 unkE;
u32 unk10;
s16 unk14;
s16 unk16;
u8 unkE;
u32 unk10;
s16 unk14;
s16 unk16;
u8 unk18;
u8 unk19;
u32 unk1C;
u8 unk20;
u8 unk19;
u32 unk1C;
u8 unk20;
};

IWRAM_DATA struct unkStruct_3001B68 *gUnknown_3001B68 = {0};


struct unkStruct_20399E0
{
{
u32 unk0;
s32 unk4;
u32 unk8;
s32 unk4;
u32 unk8;
};

extern struct unkStruct_20399E0 *gUnknown_20399E0;
Expand Down Expand Up @@ -157,6 +157,7 @@ u8 sub_809C740(void)
return 0;
}

// Called in a number of places, like when the player changes the team leader in sub_80278B4().
void nullsub_104(void)
{ }

Expand Down
2 changes: 1 addition & 1 deletion src/game_options.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ void SetWindowBGColor(void)
{0x28, 0x80, 0x48} // Green
};

sub_80099F0(winColors[gGameOptionsRef->windowColor & NUM_WINDOW_COLORS]);
SetFontsBaseColor(winColors[gGameOptionsRef->windowColor & NUM_WINDOW_COLORS]);
}

bool8 sub_8094C48(void)
Expand Down