Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-30 08:20:37 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Decompile a few functions related to HUD drawing

Browse Source
This commit is contained in:
Luciano Ciccariello 2022-02-26 19:01:35 +00:00
parent f236b8734e
commit c6dd0f36d5
3 changed files with 135 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/symbols.txt
View File

@ -1131,6 +1131,7 @@ DrawSettingsButton = 0x800F6FA4;
DrawSettingsReverseCloak = 0x800F70DC;
DrawSettingsSound = 0x800F7168;
DrawPauseMenu = 0x800F74B4;
DrawHudRichter = 0x80100750;
SetPolyRect = 0x80107330;
CopyMapOverlayCallback = 0x801074BC;
nullsub_10 = 0x801362A4;

19
include/dra.h
View File

@ -487,6 +487,16 @@ extern s32 D_8013784C;
extern s32 D_80137960;
extern s32 D_80137964;
extern s32 D_80137968;
extern s32 D_80137970;
extern s32 D_80137974;
extern u32 D_80137978;
extern u32 D_8013797C;
extern s32 D_80137980;
extern s32 D_80137984;
extern u32 D_80137988;
extern u32 D_8013798C;
extern s32 D_80137990;
extern s32 D_80137994;
extern s32 D_80137E4C;
extern s32 D_80137E64;
extern s32 D_80137E68;
@ -494,6 +504,7 @@ extern s32 D_80138F20;
extern s32 D_80138F28;
extern s32 D_80138F7C;
extern s16 D_80139000;
extern s16 D_80139008;
extern s16 D_8013901C;
extern u8 D_80139020;
extern s8 D_801390C4;
@ -503,6 +514,7 @@ extern s16 D_801390DE;
extern s16 D_801390E0;
extern s16 D_801396EA;
extern u16 D_801396F4;
extern s32 D_801397FC;
extern s32 D_8013980C;
extern u8 D_80139810;
extern s32 D_80139828;
@ -534,7 +546,7 @@ void func_800EA5E4(s32);
void func_800EDA70(s32 *arg0);
void func_800EDAE4(void);
s16 func_800EDC80(u8 arg0, s32 arg1);
s16 func_800EDD9C(u8 arg0, s32 arg1);
s32 func_800EDD9C(u8 arg0, s32 arg1);
void func_800EDE78(s32 index);
s32 func_800F087C(u32, u32);
bool SetNextRoomToLoad(u32 chunkX, u32 chunkY);
@ -573,8 +585,9 @@ void func_80102DEC(s32 arg0);
void func_80103EAC(void);
void func_80106590(Entity*);
void func_801065F4(s16 startIndex);
void func_801071CC(s32, u8, s32);
void func_80107250(s32 arg0, s32 arg1);
void func_801071CC(POLY_GT4 *poly, u8, s32);
void func_80107250(POLY_GT4 *poly, s32 arg1);
void func_80107360(POLY_GT4 *poly, s32 x, s32 y, s32 width, s32 height, s8 u, s8 v);
void SetPolyRect(POLY_GT4 *poly, s32 x, s32 y, s32 width, s32 height);
void func_8010D584(s16 arg0);
void func_8010E0A8(void);

126
src/dra/42398.c
View File

@ -373,7 +373,7 @@ block_9:
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800EDD9C);
#else
s16 func_800EDD9C(u8 arg0, s32 arg1) {
s32 func_800EDD9C(u8 arg0, s32 arg1) {
s32 temp_s2;
u8 temp_v0;
u8* phi_s0;
@ -1426,7 +1426,111 @@ INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800FF708);
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800FF7B8);
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_80100750);
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/42398", DrawHudRichter);
#else
void DrawHudRichter(void) {
POLY_GT4* poly;
D_80137978 = 0x190;
D_8013797C = 0x190;
D_801397FC = 0;
D_80139008 = 0;
D_80137994 = 0;
D_8003C744 = NULL;
D_80137980 = 50;
D_80137984 = 0;
D_80137990 = 0;
D_8013798C = 0x9C40U / 400U;
D_80137988 = 0x9C40U / 400U;
D_80137970 = func_800EDD9C(4U, 9);
poly = &D_80086FEC[D_80137970];
func_80107360(poly, 2, 22, 32, 96, 0, 0);
poly->tpage = 0x1B;
poly->clut = 0x101;
poly->pad2 = 0x1EF;
poly->pad3 = 0x2000;
poly = poly->tag;
func_80107360(poly, D_80137980 + 216, 22, 32, 96, 32, 0);
poly->tpage = 0x1BU;
poly->clut = 0x100;
poly->pad2 = 0x1EF;
poly->pad3 = 0x2000U;
poly = poly->tag;
func_80107360(poly, 4, 112, 9, 3, 64, 89);
poly->tpage = 0x1B;
poly->clut = 0x105;
poly->pad2 = 0x1F0;
poly->pad3 = 0x2000;
poly = poly->tag;
func_80107360(poly, D_80137980 + 228, 112, 9, 3, 64, 89);
poly->tpage = 0x1BU;
poly->clut = 0x103U;
poly->pad2 = 0x1F0U;
poly->pad3 = 0x2000U;
poly->p1 = 0;
poly->p2 = 6;
poly = poly->tag;
func_80107360(poly, D_80137980 + 236, 112, 9, 3, 64, 89);
poly->tpage = 0x1B;
poly->clut = 0x103;
poly->pad2 = 0x1F0;
poly->pad3 = 0x2000;
poly = poly->tag;
func_80107360(poly, 14, 27, 8, 8, 0, 96);
poly->tpage = 0x1BU;
poly->clut = 0x103U;
poly->pad2 = 0x1F0U;
poly->pad3 = 0x2000U;
poly = poly->tag;
func_80107360(poly, 22, 27, 8, 8, 0, 96);
poly->tpage = 0x1B;
poly->clut = 0x103;
poly->pad2 = 0x1F0;
poly->pad3 = 0x2000;
poly = poly->tag;
func_80107360(poly, 18, 38, 8, 8, 0, 0);
poly->tpage = 0x1BU;
poly->clut = 0x102;
poly->pad2 = 0x1F0U;
poly->pad3 = 0x2000U;
poly = poly->tag;
func_80107360(poly, 33, 20, 64, 24, 64, 40);
poly->tpage = 0x1B;
poly->clut = 0x103;
poly->pad2 = 0x1EF;
poly->pad3 = 0x2000;
D_80137974 = func_800EDD9C(4, 16);
poly = &D_80086FEC[D_80137974];
if (poly != 0) {
s32 phi_s1 = 0x20;
s32 phi_s0 = 0xD8;
do {
func_80107360(poly, phi_s0, 22, 2, 96, phi_s1, 0);
func_801072DC(poly);
poly->tpage = 0x1B;
poly->clut = 0x100;
poly->pad2 = 0x1EE;
poly->pad3 = 8;
poly->p1 = (rand() & 0x3F) + 1;
poly->p2 = 0;
poly = poly->tag;
phi_s0 += 2;
phi_s1 += 2;
} while (poly != 0);
}
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_80100B50);
@ -1518,16 +1622,20 @@ INCLUDE_ASM("asm/dra/nonmatchings/42398", func_8010715C);
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_801071CC);
void func_80107250(s32 context, s32 arg1) {
func_801071CC(context, arg1, 0);
func_801071CC(context, arg1, 1);
func_801071CC(context, arg1, 2);
func_801071CC(context, arg1, 3);
void func_80107250(POLY_GT4 *poly, s32 arg1) {
func_801071CC(poly, arg1, 0);
func_801071CC(poly, arg1, 1);
func_801071CC(poly, arg1, 2);
func_801071CC(poly, arg1, 3);
}
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_801072BC);
void func_801072BC(POLY_GT4 *poly) {
func_80107250(poly, 0);
}
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_801072DC);
void func_801072DC(POLY_GT4 *poly) {
func_80107250(poly, 0x80);
}
void func_801072FC(POLY_G4* poly) {
poly->r0 = 0;