Merge pull request #250 from AnonymousRandomPerson/master
Some checks failed
GithubCI / build (push) Has been cancelled

This commit is contained in:
Seth Barberee 2024-11-01 20:57:08 -07:00 committed by GitHub
commit 6d4e2c2a07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 19 deletions

View File

@ -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

View File

@ -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;

View File

@ -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;
@ -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)
{ }

View File

@ -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)