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

Decompile DRA func_801028AC (#818)

Browse Source 
Another function, not sure what it really does besides messing with a
bunch of primitives.

Some clues in the rodata (particularly 00 00 00 00 bytes) indicated that
we should merge these C files, so I did.

An issue with maspsx was discovered in the process of decompiling this
one. I submitted a PR to maspsx which was accepted, and therefore I also
updated maspsx in this PR in order to capture the fix.

For some reason this was included as:

```
#if defined(VERSION_US)
INCLUDE_ASM("asm/us/dra/nonmatchings/627C4", func_801028AC);
#elif defined(VERSION_HD)
INCLUDE_ASM("asm/hd/dra/nonmatchings/627C4", func_801028AC);
#endif
```
But that wasn't actually needed, the functions are identical. Not sure
why it was that way but it's fixed now.
This commit is contained in:
bismurphy 2023-12-07 11:24:33 -05:00 committed by GitHub
parent a85699787d
commit 80e9af288e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 626 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/splat.hd.dra.yaml
View File

@ -85,9 +85,9 @@ segments:
- [0x3CC18, .rodata, 5D6C4]
- [0x3CC60, rodata]
- [0x3CC78, .rodata, 627C4] # jtbl_800DCC78
- [0x3CC98, rodata] # jtbl_800DCC98
- [0x3CCC0, .rodata, 62D70]
- [0x3CCC0, .rodata, 62D70] # HandleSaveMenu, all the strings
- [0x3CC98, .rodata, 627C4] # jtbl_800DCC98
- [0x3CCC0, .rodata, 627C4]
- [0x3CCC0, .rodata, 627C4] # HandleSaveMenu, all the strings
- [0x3CED4, .rodata, 63ED4] # jtbl_800DCED4
- [0x3CEF0, rodata]
- [0x40C74, .rodata, cd]
@ -169,7 +169,6 @@ segments:
- [0x53010, c, 5298C]
- [0x5D678, c, 5D6C4]
- [0x62654, c, 627C4]
- [0x62C00, c, 62D70]
- [0x63D1C, c, 63ED4]
- [0x67200, c, cd]
- [0x69100, c, 692E8]

7
config/splat.us.dra.yaml
View File

@ -95,9 +95,9 @@ segments:
- [0x3CBAC, .rodata, 5D6C4] # func_800FD6C4
- [0x3CBF4, rodata]
- [0x3CC0C, .rodata, 627C4]
- [0x3CC2C, rodata] # func_801028AC
- [0x3CC54, .rodata, 62D70] # func_80102D70
- [0x3CC70, .rodata, 62D70] # HandleSaveMenu, all the strings
- [0x3CC2C, .rodata, 627C4] # func_801028AC
- [0x3CC54, .rodata, 627C4] # func_80102D70
- [0x3CC70, .rodata, 627C4] # HandleSaveMenu, all the strings
- [0x3CDC0, .rodata, 63ED4] # func_80103ED4
- [0x3CDDC, rodata]
- [0x40D38, .rodata, cd] # To be merged with 40D38
@ -175,7 +175,6 @@ segments:
- [0x5298C, c, 5298C]
- [0x5D6C4, c, 5D6C4]
- [0x627C4, c, 627C4]
- [0x62D70, c, 62D70]
- [0x63ED4, c, 63ED4]
- [0x673C0, c, cd]
- [0x692E8, c, 692E8]

11
config/symbols.hd.dra.txt
View File

@ -228,15 +228,6 @@ func_800E5D30 = 0x800E63E4;
VSyncHandler = 0x800E8250;
func_800E7E08 = 0x800E84A0;
LoadFileSim = 0x800E8894;
MemcardInit = 0x800E997C;
MemcardParse = 0x800E99A4;
GetMemcardFreeBlockCount = 0x800E9BA0;
MemcardDetectSave = 0x800E9BC8;
MemcardWriteFile = 0x800E9D80;
MemcardClose = 0x800E9E9C;
func_800E9880 = 0x800E9F18;
StoreSaveData = 0x800EA2AC;
MakeMemcardPath = 0x800EAB44;
func_800EA538 = 0x800EABF0;
func_800EA5E4 = 0x800EAC9C;
func_800EA720 = 0x800EADD8;
@ -296,9 +287,7 @@ HandleTransformationMP = 0x800FEE50;
func_800FF0F4 = 0x800FF0A0;
func_80100B50 = 0x801009E0;
func_801025F4 = 0x80102484;
func_801026BC = 0x8010254C;
func_801027C4 = 0x80102654;
func_801028AC = 0x8010273C;
func_80102CD8 = 0x80102B68;
func_80102DEC = 0x80102C7C;
func_80102E04 = 0x80102C94;

624
src/dra/627C4.c
View File

@ -47,11 +47,133 @@ void func_801027C4(u32 arg0) {
}
}
#if defined(VERSION_US)
INCLUDE_ASM("asm/us/dra/nonmatchings/627C4", func_801028AC);
#elif defined(VERSION_HD)
INCLUDE_ASM("asm/hd/dra/nonmatchings/627C4", func_801028AC);
#endif
void func_801028AC(s32 arg0) {
Primitive* prim1;
Primitive* prim2;
s32 prim1clut;
s32* D_801379A8_ptr;
prim1 = &g_PrimBuf[D_8013799C];
prim2 = prim1->next;
prim1clut = prim1->clut;
switch (D_801379A4) {
case 0:
prim2->blendMode = prim1->blendMode = BLEND_VISIBLE;
break;
case 2:
case 6:
case 7:
prim1->r0 = prim1->g0 = prim1->b0 = prim2->r0 = prim2->g0 = prim2->b0 =
prim1->x1;
if (prim1clut == 0) {
if (D_801379A4 - 1 == 1) {
prim1->x1 += 0x20;
} else if (D_801379A4 - 1 == 6) {
prim1->x1 += 8;
} else {
prim1->x1 += 2;
}
if ((D_801379A4 - 1) == 6) {
if (prim1->x1 >= 0x40) {
prim1->x1 = 0x40;
prim1->clut++;
}
func_801026BC(prim1->x1);
} else {
if (prim1->x1 >= 0x100) {
prim1->x1 = 0xFF;
prim1->clut++;
}
}
}
prim1->blendMode = prim2->blendMode = 0xD1;
break;
case 8:
prim1->r0 = prim1->g0 = prim1->b0 = prim2->r0 = prim2->g0 = prim2->b0 =
0x40 - prim1->x1;
if (prim1clut == 0) {
prim1->x1 += 8;
if (prim1->x1 >= 0x40) {
prim1->x1 = 0x40;
prim1->clut++;
}
func_801026BC(0x40 - prim1->x1);
} else {
func_801026BC(0);
D_801379A4 = 0;
}
prim1->blendMode = prim2->blendMode = 0xD1;
break;
case 3:
prim1->r0 = prim1->g0 = prim1->b0 = prim2->r0 = prim2->g0 = prim2->b0 =
~prim1->x1;
if (prim1clut == 0) {
prim1->x1 += 0x20;
if (prim1->x1 >= 0x100) {
prim1->x1 = 0xFF;
prim1->clut++;
}
} else {
D_801379A4 = 0;
}
prim1->blendMode = prim2->blendMode = 0xD1;
break;
}
if (arg0 != 0) {
return;
}
prim1 = prim2->next;
prim2 = prim1->next;
prim1clut = prim1->clut;
D_801379A8_ptr = &D_801379A8;
switch (*D_801379A8_ptr - 1) {
case -1:
prim2->blendMode = prim1->blendMode = BLEND_VISIBLE;
return;
case 0:
prim1->r0 = prim1->g0 = prim1->b0 = prim2->r0 = prim2->g0 = prim2->b0 =
prim1->x1;
if (prim1clut == 0) {
prim1->x1 += 8;
if (prim1->x1 >= 0x100) {
prim1->y1 = 4;
prim1->clut++;
prim1->x1 -= 8;
}
prim1->blendMode = prim2->blendMode = 0x2031;
} else if (prim1clut != 1) {
prim1->x1 -= 4;
if (prim1->x1 < 0) {
prim1->blendMode = prim2->blendMode = BLEND_VISIBLE;
*D_801379A8_ptr = 0;
}
} else {
if (--prim1->y1 == -1) {
prim1->clut++;
}
}
return;
case 3:
prim1->b0 = prim2->b0 = 0;
prim1->r0 = prim1->g0 = prim2->r0 = prim2->g0 = prim1->x1;
if (prim1clut == 0) {
if (++prim1->x1 >= 0x20) {
prim1->y1 = 0xA0;
prim1->clut++;
prim1->x1--;
}
prim1->blendMode = prim2->blendMode = 0x2051;
} else if (prim1clut == 1) {
if (--prim1->y1 == -1) {
prim1->clut++;
}
} else if (--prim1->x1 < 0) {
prim1->blendMode = prim2->blendMode = BLEND_VISIBLE;
*D_801379A8_ptr = 0;
}
}
}
void func_80102CD8(s32 start) {
D_801379AC.start = start;
@ -66,3 +188,495 @@ void func_80102D08(void) {
D_801379AC.unk8 = 0;
}
}
void func_80102D70(void) {
switch (D_801379AC.start) {
case 2:
func_80102D08();
g_backbufferX = D_801379AC.unk8;
break;
case 1:
case 3:
case 4:
case 6:
func_80102D08();
g_backbufferY = D_801379AC.unk8;
case 0:
case 5:
default:
break;
}
}
void func_80102DEC(s32 context) {
D_80137E64 = 0;
D_80137E68 = context;
}
s32 func_80102E04(void) {
u32 new_var2 = D_80137E68;
s32 temp_s0 = D_80137E64;
switch (temp_s0) {
case 0:
MemcardInit();
D_80137E50 = 4;
D_80137E64++;
break;
case 1:
if (MemcardFormat(new_var2, 0) != temp_s0) {
D_80137E50 = D_80137E50 - 1;
if (D_80137E50 == -1) {
temp_s0 = -1;
return temp_s0;
}
} else {
return 1;
}
break;
}
return 0;
}
void func_80102EB8(void) {
Primitive *poly1, *poly2, *poly3;
s32 i;
D_80137E58 = AllocPrimitives(PRIM_GT4, 3);
poly1 = &g_PrimBuf[D_80137E58];
D_80137E5C = AllocPrimitives(PRIM_G4, 3);
poly2 = &g_PrimBuf[D_80137E5C];
D_80137E60 = AllocPrimitives(PRIM_LINE_G2, 12);
poly3 = &g_PrimBuf[D_80137E60];
for (i = 0; i < 3; i++) {
SetTexturedPrimRect(poly1, 98, 79, 96, 0, 0, 0);
func_801072DC(poly1);
poly1->tpage = 0x10;
poly1->clut = 0x1A1;
poly1->priority = g_unkGraphicsStruct.g_zEntityCenter.S16.unk0 + 32;
poly1->blendMode = BLEND_VISIBLE;
poly1->p1 = 0;
SetPrimRect(poly2, 80, 79, 96, 0);
func_801072DC(poly2);
func_801071CC(poly2, 96, 0);
func_801071CC(poly2, 96, 1);
poly2->g0 = poly2->g1 = poly2->g2 = poly2->g3 = poly2->r0 = poly2->r1 =
poly2->r2 = poly2->r3 = 0;
poly2->tpage = 0x1F;
poly2->priority = g_unkGraphicsStruct.g_zEntityCenter.S16.unk0 + 31;
poly2->blendMode = BLEND_VISIBLE;
poly1 = poly1->next;
poly2 = poly2->next;
}
for (i = 0; i < 12; i++) {
func_80107250(poly3, 255);
poly3->priority = g_unkGraphicsStruct.g_zEntityCenter.S16.unk0 + 32;
poly3->blendMode = BLEND_VISIBLE;
poly3 = poly3->next;
}
}
void func_801030B4(s32 arg0, POLY_GT4* poly, s32 arg2) {
s32 var_v1;
if (arg2 == arg0) {
if (g_Timer & 0x20) {
var_v1 = (g_Timer & 0x1F) + 0x60;
} else {
var_v1 = 0x7F - (g_Timer & 0x1F);
}
poly->r0 = poly->r1 = var_v1 - 16;
poly->r2 = poly->r3 = var_v1 + 16;
poly->b0 = poly->b1 = poly->b2 = poly->b3 = 0;
poly->pad3 = 0x404;
} else {
poly->b1 = 96;
poly->b0 = 96;
poly->b3 = 128;
poly->b2 = 128;
poly->r0 = poly->r1 = poly->r2 = poly->r3 = 0;
poly->pad3 = 0x415;
}
}
POLY_GT4* func_80103148(POLY_GT4* poly1, POLY_GT4* arg1) {
poly1->x0 = arg1->x0 - 1;
poly1->y0 = arg1->y0 - 1;
poly1->x1 = arg1->x1;
poly1->y1 = arg1->y0 - 1;
poly1->pad3 = 0;
poly1 = (POLY_GT4*)poly1->tag;
poly1->x0 = arg1->x0 - 1;
poly1->y0 = arg1->y0 - 1;
poly1->x1 = arg1->x0 - 1;
poly1->y1 = arg1->y2;
poly1->pad3 = 0;
poly1 = (POLY_GT4*)poly1->tag;
poly1->x0 = arg1->x0 - 1;
poly1->y0 = arg1->y2;
poly1->x1 = arg1->x1;
poly1->y1 = arg1->y2;
poly1->pad3 = 0;
poly1 = (POLY_GT4*)poly1->tag;
poly1->x0 = arg1->x1;
poly1->y0 = arg1->y0 - 1;
poly1->x1 = arg1->x1;
poly1->y1 = arg1->y2;
poly1->pad3 = 0;
return (POLY_GT4*)poly1->tag;
}
s32 HandleSaveMenu(s32 arg0) {
// For some reason, US and HD have different controls for confirm and exit,
// so we handle that with a couple of constants.
#if defined(VERSION_US)
const s32 CONFIRM = PAD_CROSS;
const s32 EXIT = PAD_TRIANGLE;
#elif defined(VERSION_HD)
const s32 CONFIRM = (PAD_START | PAD_SQUARE | PAD_CIRCLE);
const s32 EXIT = PAD_CROSS;
#endif
Primitive* prim1;
Primitive* prim2;
Primitive* prim3;
u8 temp_t0;
s32 temp_a1;
prim2 = &g_PrimBuf[D_80137E58];
temp_t0 = prim2->p1;
prim1 = &g_PrimBuf[D_80137E5C];
prim3 = &g_PrimBuf[D_80137E60];
if (arg0 == 0) {
if (temp_t0 == 0) {
prim2->blendMode = 0;
prim1->blendMode = 0x404;
if (D_80137E4C == 6) {
PlaySfx(SE_UI_START);
} else {
PlaySfx(SE_UI_OVERWRITE_MSG);
}
if (D_80137E4C == 6) {
#if defined(VERSION_US)
func_800F9D88("Data saved．", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("セーブしました　　　", 0, 1);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 7) {
#if defined(VERSION_US)
func_800F9D88("Memory Card", 0, 1);
func_800F9D88(" not found．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("メモリーカードが　　", 0, 1);
func_800F9D40("ささっていません　　", 1, 0);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 8) {
#if defined(VERSION_US)
func_800F9D88("Memory Card", 0, 1);
func_800F9D88("is Defective．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("メモリーカードが　　", 0, 1);
func_800F9D40("　壊れています　　　", 1, 0);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 9) {
#if defined(VERSION_US)
func_800F9D88("Memory Card is", 0, 1);
func_800F9D88("not formatted．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("　メモリーカードが　", 0, 1);
func_800F9D40("初期化されていません", 1, 0);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 10) {
if (D_80137E54 == 2) {
#if defined(VERSION_US)
func_800F9D88("Cannot", 0, 1);
func_800F9D88("overwrite file．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("　　上書き　　　　　", 0, 1);
func_800F9D40("　できません　　　　", 1, 0);
#endif
} else if (D_80137E54 == 3) {
#if defined(VERSION_US)
func_800F9D88("No game", 0, 1);
func_800F9D88("data found．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("データがないため　　", 0, 1);
func_800F9D40("上書きできません　　", 1, 0);
#endif
} else {
#if defined(VERSION_US)
func_800F9D88(" ０ memory", 0, 1);
func_800F9D88("blocks available．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("空きブロックが　　　", 0, 1);
func_800F9D40("　足りません　　　　", 1, 0);
#endif
}
prim2->p1 += 2;
}
if (D_80137E4C == 11) {
#if defined(VERSION_US)
func_800F9D88(" Memory card", 0, 1);
func_800F9D88(" format error．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("　メモリーカードの　", 0, 1);
func_800F9D40("初期化に失敗しました　", 1, 0);
#endif
prim2->p1 += 2;
}
} else {
if ((D_80137E4C == 7 || D_80137E4C == 8) && (temp_t0 < 33)) {
SetTexturedPrimRect(prim2, 80, 96 - temp_t0, 96, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 72, 96 - temp_t0, 112, temp_t0);
func_80103148(prim3, prim1);
} else if (
(D_80137E4C == 9 || D_80137E4C == 11) && (temp_t0 < 33)) {
SetTexturedPrimRect(
prim2, 68, 96 - temp_t0, 120, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 60, 96 - temp_t0, 136, temp_t0);
func_80103148(prim3, prim1);
} else if (D_80137E4C == 10 && temp_t0 < 33) {
#if defined(VERSION_US)
// silly logic here. if 2 or 3, it's 0, otherwise it's -10
temp_a1 = (-(!(D_80137E54 == 2 || D_80137E54 == 3))) & -10;
SetTexturedPrimRect(
prim2, temp_a1 + 80, 96 - temp_t0, 112, temp_t0, 0, 0);
prim2->p1 += 2;
if (D_80137E54 == 2 || D_80137E54 == 3) {
SetPrimRect(prim1, 72, 96 - temp_t0, 112, temp_t0);
} else {
SetPrimRect(prim1, 68, 96 - temp_t0, 120, temp_t0);
}
#elif defined(VERSION_HD)
temp_a1 = (-(!(D_80137E54 ^ 3))) & -6;
SetTexturedPrimRect(
prim2, temp_a1 + 86, 96 - temp_t0, 96, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 72, 96 - temp_t0, 112, temp_t0);
#endif
func_80103148(prim3, prim1);
} else if (temp_t0 < 17) {
SetTexturedPrimRect(prim2, 86, 80 - temp_t0, 96, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 80, 80 - temp_t0, 96, temp_t0);
func_80103148(prim3, prim1);
} else {
func_80103148(prim3, prim1);
if (D_80137E4C == 6) {
prim2->p1 += 2;
}
if ((prim2->p1 >= 224) || (g_pads[0].tapped & CONFIRM)) {
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
return 1;
}
}
}
// Seems this one shouldn't be needed since the else's would send it to
// the end anyway?
return 0;
} else if (arg0 == 1) {
if (temp_t0 == 0) {
PlaySfx(SE_UI_OVERWRITE_MSG);
prim2->p1 += 2;
#if defined(VERSION_US)
func_800F9D88(" Select the slot．", 0, 1);
func_800F9D88(" Slot １", 1, 0);
func_800F9D88(" Slot ２", 2, 0);
#elif defined(VERSION_HD)
func_800F9D40("スロットを選んで下さい　", 0, 1);
func_800F9D40("スロット１　", 1, 0);
func_800F9D40("スロット２　", 2, 0);
#endif
SetTexturedPrimRect(prim2, 56, 79, 144, 0, 0, 0);
prim2->blendMode = 0;
prim1->blendMode = 0x404;
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(0, prim1, D_80097924);
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(1, prim1, D_80097924);
} else if (temp_t0 < 17) {
prim2->p1 += 2;
SetTexturedPrimRect(prim2, 62, 80 - temp_t0, 144, temp_t0, 0, 0);
SetPrimRect(prim1, 56, 80 - temp_t0, 144, temp_t0);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 54, 104 - temp_t0, 64, temp_t0, 0, 16);
SetPrimRect(prim1, 52, 104 - temp_t0, 64, temp_t0);
func_801030B4(0, prim1, D_80097924);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 142, 104 - temp_t0, 64, temp_t0, 0, 32);
SetPrimRect(prim1, 140, 104 - temp_t0, 64, temp_t0);
func_801030B4(1, prim1, D_80097924);
func_80103148(prim3, prim1);
} else {
if (g_pads[0].tapped & PAD_LEFT) {
if (D_80097924 != 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80097924 = 0;
}
if (g_pads[0].tapped & PAD_RIGHT) {
if (D_80097924 == 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80097924 = 1;
}
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(0, prim1, D_80097924);
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(1, prim1, D_80097924);
func_80103148(prim3, prim1);
if (g_pads[0].tapped & EXIT) {
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
D_80097924 = -1;
return 2;
}
if (g_pads[0].tapped & CONFIRM) {
PlaySfx(SE_UI_CONFIRM);
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
D_8006C378 = -1;
return 1;
}
}
} else {
if (temp_t0 == 0) {
PlaySfx(SE_UI_OVERWRITE_MSG);
prim2->p1 += 2;
if (arg0 == 2) {
#if defined(VERSION_US)
func_800F9D88(" Wish to format？", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("初期化してもいいですか　", 0, 1);
#endif
D_80137E6C = 1;
}
if (arg0 == 3) {
#if defined(VERSION_US)
func_800F9D88(" Overwrite data？", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("　　上書きしますか　　　", 0, 1);
#endif
D_80137E6C = 0;
}
if (arg0 == 4) {
#if defined(VERSION_US)
func_800F9D88(" Wish to save？", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("　　セーブしますか　　　", 0, 1);
#endif
D_80137E6C = 0;
}
#if defined(VERSION_US)
func_800F9D88("Yes ", 1, 0);
func_800F9D88(" No ", 2, 0);
#elif defined(VERSION_HD)
func_800F9D40("はい　　", 1, 0);
func_800F9D40("いいえ　", 2, 0);
#endif
SetTexturedPrimRect(prim2, 56, 79, 144, 0, 0, 0);
prim2->blendMode = 0;
prim1->blendMode = 0x404;
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(0, prim1, D_80137E6C);
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(1, prim1, D_80137E6C);
} else if (temp_t0 < 17) {
prim2->p1 += 2;
SetTexturedPrimRect(prim2, 62, 80 - temp_t0, 144, temp_t0, 0, 0);
SetPrimRect(prim1, 56, 80 - temp_t0, 144, temp_t0);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 72, 104 - temp_t0, 24, temp_t0, 0, 16);
SetPrimRect(prim1, 60, 104 - temp_t0, 48, temp_t0);
func_801030B4(0, prim1, D_80137E6C);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 154, 104 - temp_t0, 36, temp_t0, 0, 32);
SetPrimRect(prim1, 148, 104 - temp_t0, 48, temp_t0);
func_801030B4(1, prim1, D_80137E6C);
func_80103148(prim3, prim1);
} else {
if (g_pads[0].tapped & PAD_LEFT) {
if (D_80137E6C != 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80137E6C = 0;
}
if (g_pads[0].tapped & PAD_RIGHT) {
if (D_80137E6C == 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80137E6C = 1;
}
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(0, prim1, D_80137E6C);
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(1, prim1, D_80137E6C);
func_80103148(prim3, prim1);
if (g_pads[0].tapped & EXIT) {
D_80137E6C = 1;
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
return 1;
} else if (g_pads[0].tapped & CONFIRM) {
PlaySfx(SE_UI_CONFIRM);
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
return 1;
}
}
}
return 0;
}
void func_80103EAC(void) {
D_80137E4C = 0;
MemcardInfoInit();
}

495
src/dra/62D70.c
View File

@ -1,495 +0,0 @@
#include "dra.h"
#include "objects.h"
#include "sfx.h"
void func_80102D70(void) {
switch (D_801379AC.start) {
case 2:
func_80102D08();
g_backbufferX = D_801379AC.unk8;
break;
case 1:
case 3:
case 4:
case 6:
func_80102D08();
g_backbufferY = D_801379AC.unk8;
case 0:
case 5:
default:
break;
}
}
void func_80102DEC(s32 context) {
D_80137E64 = 0;
D_80137E68 = context;
}
s32 func_80102E04(void) {
u32 new_var2 = D_80137E68;
s32 temp_s0 = D_80137E64;
switch (temp_s0) {
case 0:
MemcardInit();
D_80137E50 = 4;
D_80137E64++;
break;
case 1:
if (MemcardFormat(new_var2, 0) != temp_s0) {
D_80137E50 = D_80137E50 - 1;
if (D_80137E50 == -1) {
temp_s0 = -1;
return temp_s0;
}
} else {
return 1;
}
break;
}
return 0;
}
void func_80102EB8(void) {
Primitive *poly1, *poly2, *poly3;
s32 i;
D_80137E58 = AllocPrimitives(PRIM_GT4, 3);
poly1 = &g_PrimBuf[D_80137E58];
D_80137E5C = AllocPrimitives(PRIM_G4, 3);
poly2 = &g_PrimBuf[D_80137E5C];
D_80137E60 = AllocPrimitives(PRIM_LINE_G2, 12);
poly3 = &g_PrimBuf[D_80137E60];
for (i = 0; i < 3; i++) {
SetTexturedPrimRect(poly1, 98, 79, 96, 0, 0, 0);
func_801072DC(poly1);
poly1->tpage = 0x10;
poly1->clut = 0x1A1;
poly1->priority = g_unkGraphicsStruct.g_zEntityCenter.S16.unk0 + 32;
poly1->blendMode = BLEND_VISIBLE;
poly1->p1 = 0;
SetPrimRect(poly2, 80, 79, 96, 0);
func_801072DC(poly2);
func_801071CC(poly2, 96, 0);
func_801071CC(poly2, 96, 1);
poly2->g0 = poly2->g1 = poly2->g2 = poly2->g3 = poly2->r0 = poly2->r1 =
poly2->r2 = poly2->r3 = 0;
poly2->tpage = 0x1F;
poly2->priority = g_unkGraphicsStruct.g_zEntityCenter.S16.unk0 + 31;
poly2->blendMode = BLEND_VISIBLE;
poly1 = poly1->next;
poly2 = poly2->next;
}
for (i = 0; i < 12; i++) {
func_80107250(poly3, 255);
poly3->priority = g_unkGraphicsStruct.g_zEntityCenter.S16.unk0 + 32;
poly3->blendMode = BLEND_VISIBLE;
poly3 = poly3->next;
}
}
void func_801030B4(s32 arg0, POLY_GT4* poly, s32 arg2) {
s32 var_v1;
if (arg2 == arg0) {
if (g_Timer & 0x20) {
var_v1 = (g_Timer & 0x1F) + 0x60;
} else {
var_v1 = 0x7F - (g_Timer & 0x1F);
}
poly->r0 = poly->r1 = var_v1 - 16;
poly->r2 = poly->r3 = var_v1 + 16;
poly->b0 = poly->b1 = poly->b2 = poly->b3 = 0;
poly->pad3 = 0x404;
} else {
poly->b1 = 96;
poly->b0 = 96;
poly->b3 = 128;
poly->b2 = 128;
poly->r0 = poly->r1 = poly->r2 = poly->r3 = 0;
poly->pad3 = 0x415;
}
}
POLY_GT4* func_80103148(POLY_GT4* poly1, POLY_GT4* arg1) {
poly1->x0 = arg1->x0 - 1;
poly1->y0 = arg1->y0 - 1;
poly1->x1 = arg1->x1;
poly1->y1 = arg1->y0 - 1;
poly1->pad3 = 0;
poly1 = (POLY_GT4*)poly1->tag;
poly1->x0 = arg1->x0 - 1;
poly1->y0 = arg1->y0 - 1;
poly1->x1 = arg1->x0 - 1;
poly1->y1 = arg1->y2;
poly1->pad3 = 0;
poly1 = (POLY_GT4*)poly1->tag;
poly1->x0 = arg1->x0 - 1;
poly1->y0 = arg1->y2;
poly1->x1 = arg1->x1;
poly1->y1 = arg1->y2;
poly1->pad3 = 0;
poly1 = (POLY_GT4*)poly1->tag;
poly1->x0 = arg1->x1;
poly1->y0 = arg1->y0 - 1;
poly1->x1 = arg1->x1;
poly1->y1 = arg1->y2;
poly1->pad3 = 0;
return (POLY_GT4*)poly1->tag;
}
s32 HandleSaveMenu(s32 arg0) {
// For some reason, US and HD have different controls for confirm and exit,
// so we handle that with a couple of constants.
#if defined(VERSION_US)
const s32 CONFIRM = PAD_CROSS;
const s32 EXIT = PAD_TRIANGLE;
#elif defined(VERSION_HD)
const s32 CONFIRM = (PAD_START | PAD_SQUARE | PAD_CIRCLE);
const s32 EXIT = PAD_CROSS;
#endif
Primitive* prim1;
Primitive* prim2;
Primitive* prim3;
u8 temp_t0;
s32 temp_a1;
prim2 = &g_PrimBuf[D_80137E58];
temp_t0 = prim2->p1;
prim1 = &g_PrimBuf[D_80137E5C];
prim3 = &g_PrimBuf[D_80137E60];
if (arg0 == 0) {
if (temp_t0 == 0) {
prim2->blendMode = 0;
prim1->blendMode = 0x404;
if (D_80137E4C == 6) {
PlaySfx(SE_UI_START);
} else {
PlaySfx(SE_UI_OVERWRITE_MSG);
}
if (D_80137E4C == 6) {
#if defined(VERSION_US)
func_800F9D88("Data saved．", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("セーブしました　　　", 0, 1);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 7) {
#if defined(VERSION_US)
func_800F9D88("Memory Card", 0, 1);
func_800F9D88(" not found．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("メモリーカードが　　", 0, 1);
func_800F9D40("ささっていません　　", 1, 0);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 8) {
#if defined(VERSION_US)
func_800F9D88("Memory Card", 0, 1);
func_800F9D88("is Defective．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("メモリーカードが　　", 0, 1);
func_800F9D40("　壊れています　　　", 1, 0);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 9) {
#if defined(VERSION_US)
func_800F9D88("Memory Card is", 0, 1);
func_800F9D88("not formatted．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("　メモリーカードが　", 0, 1);
func_800F9D40("初期化されていません", 1, 0);
#endif
prim2->p1 += 2;
}
if (D_80137E4C == 10) {
if (D_80137E54 == 2) {
#if defined(VERSION_US)
func_800F9D88("Cannot", 0, 1);
func_800F9D88("overwrite file．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("　　上書き　　　　　", 0, 1);
func_800F9D40("　できません　　　　", 1, 0);
#endif
} else if (D_80137E54 == 3) {
#if defined(VERSION_US)
func_800F9D88("No game", 0, 1);
func_800F9D88("data found．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("データがないため　　", 0, 1);
func_800F9D40("上書きできません　　", 1, 0);
#endif
} else {
#if defined(VERSION_US)
func_800F9D88(" ０ memory", 0, 1);
func_800F9D88("blocks available．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("空きブロックが　　　", 0, 1);
func_800F9D40("　足りません　　　　", 1, 0);
#endif
}
prim2->p1 += 2;
}
if (D_80137E4C == 11) {
#if defined(VERSION_US)
func_800F9D88(" Memory card", 0, 1);
func_800F9D88(" format error．", 1, 0);
#elif defined(VERSION_HD)
func_800F9D40("　メモリーカードの　", 0, 1);
func_800F9D40("初期化に失敗しました　", 1, 0);
#endif
prim2->p1 += 2;
}
} else {
if ((D_80137E4C == 7 || D_80137E4C == 8) && (temp_t0 < 33)) {
SetTexturedPrimRect(prim2, 80, 96 - temp_t0, 96, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 72, 96 - temp_t0, 112, temp_t0);
func_80103148(prim3, prim1);
} else if (
(D_80137E4C == 9 || D_80137E4C == 11) && (temp_t0 < 33)) {
SetTexturedPrimRect(
prim2, 68, 96 - temp_t0, 120, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 60, 96 - temp_t0, 136, temp_t0);
func_80103148(prim3, prim1);
} else if (D_80137E4C == 10 && temp_t0 < 33) {
#if defined(VERSION_US)
// silly logic here. if 2 or 3, it's 0, otherwise it's -10
temp_a1 = (-(!(D_80137E54 == 2 || D_80137E54 == 3))) & -10;
SetTexturedPrimRect(
prim2, temp_a1 + 80, 96 - temp_t0, 112, temp_t0, 0, 0);
prim2->p1 += 2;
if (D_80137E54 == 2 || D_80137E54 == 3) {
SetPrimRect(prim1, 72, 96 - temp_t0, 112, temp_t0);
} else {
SetPrimRect(prim1, 68, 96 - temp_t0, 120, temp_t0);
}
#elif defined(VERSION_HD)
temp_a1 = (-(!(D_80137E54 ^ 3))) & -6;
SetTexturedPrimRect(
prim2, temp_a1 + 86, 96 - temp_t0, 96, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 72, 96 - temp_t0, 112, temp_t0);
#endif
func_80103148(prim3, prim1);
} else if (temp_t0 < 17) {
SetTexturedPrimRect(prim2, 86, 80 - temp_t0, 96, temp_t0, 0, 0);
prim2->p1 += 2;
SetPrimRect(prim1, 80, 80 - temp_t0, 96, temp_t0);
func_80103148(prim3, prim1);
} else {
func_80103148(prim3, prim1);
if (D_80137E4C == 6) {
prim2->p1 += 2;
}
if ((prim2->p1 >= 224) || (g_pads[0].tapped & CONFIRM)) {
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
return 1;
}
}
}
// Seems this one shouldn't be needed since the else's would send it to
// the end anyway?
return 0;
} else if (arg0 == 1) {
if (temp_t0 == 0) {
PlaySfx(SE_UI_OVERWRITE_MSG);
prim2->p1 += 2;
#if defined(VERSION_US)
func_800F9D88(" Select the slot．", 0, 1);
func_800F9D88(" Slot １", 1, 0);
func_800F9D88(" Slot ２", 2, 0);
#elif defined(VERSION_HD)
func_800F9D40("スロットを選んで下さい　", 0, 1);
func_800F9D40("スロット１　", 1, 0);
func_800F9D40("スロット２　", 2, 0);
#endif
SetTexturedPrimRect(prim2, 56, 79, 144, 0, 0, 0);
prim2->blendMode = 0;
prim1->blendMode = 0x404;
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(0, prim1, D_80097924);
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(1, prim1, D_80097924);
} else if (temp_t0 < 17) {
prim2->p1 += 2;
SetTexturedPrimRect(prim2, 62, 80 - temp_t0, 144, temp_t0, 0, 0);
SetPrimRect(prim1, 56, 80 - temp_t0, 144, temp_t0);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 54, 104 - temp_t0, 64, temp_t0, 0, 16);
SetPrimRect(prim1, 52, 104 - temp_t0, 64, temp_t0);
func_801030B4(0, prim1, D_80097924);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 142, 104 - temp_t0, 64, temp_t0, 0, 32);
SetPrimRect(prim1, 140, 104 - temp_t0, 64, temp_t0);
func_801030B4(1, prim1, D_80097924);
func_80103148(prim3, prim1);
} else {
if (g_pads[0].tapped & PAD_LEFT) {
if (D_80097924 != 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80097924 = 0;
}
if (g_pads[0].tapped & PAD_RIGHT) {
if (D_80097924 == 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80097924 = 1;
}
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(0, prim1, D_80097924);
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(1, prim1, D_80097924);
func_80103148(prim3, prim1);
if (g_pads[0].tapped & EXIT) {
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
D_80097924 = -1;
return 2;
}
if (g_pads[0].tapped & CONFIRM) {
PlaySfx(SE_UI_CONFIRM);
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
D_8006C378 = -1;
return 1;
}
}
} else {
if (temp_t0 == 0) {
PlaySfx(SE_UI_OVERWRITE_MSG);
prim2->p1 += 2;
if (arg0 == 2) {
#if defined(VERSION_US)
func_800F9D88(" Wish to format？", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("初期化してもいいですか　", 0, 1);
#endif
D_80137E6C = 1;
}
if (arg0 == 3) {
#if defined(VERSION_US)
func_800F9D88(" Overwrite data？", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("　　上書きしますか　　　", 0, 1);
#endif
D_80137E6C = 0;
}
if (arg0 == 4) {
#if defined(VERSION_US)
func_800F9D88(" Wish to save？", 0, 1);
#elif defined(VERSION_HD)
func_800F9D40("　　セーブしますか　　　", 0, 1);
#endif
D_80137E6C = 0;
}
#if defined(VERSION_US)
func_800F9D88("Yes ", 1, 0);
func_800F9D88(" No ", 2, 0);
#elif defined(VERSION_HD)
func_800F9D40("はい　　", 1, 0);
func_800F9D40("いいえ　", 2, 0);
#endif
SetTexturedPrimRect(prim2, 56, 79, 144, 0, 0, 0);
prim2->blendMode = 0;
prim1->blendMode = 0x404;
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(0, prim1, D_80137E6C);
prim2 = prim2->next;
prim1 = prim1->next;
prim2->blendMode = 0;
func_801030B4(1, prim1, D_80137E6C);
} else if (temp_t0 < 17) {
prim2->p1 += 2;
SetTexturedPrimRect(prim2, 62, 80 - temp_t0, 144, temp_t0, 0, 0);
SetPrimRect(prim1, 56, 80 - temp_t0, 144, temp_t0);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 72, 104 - temp_t0, 24, temp_t0, 0, 16);
SetPrimRect(prim1, 60, 104 - temp_t0, 48, temp_t0);
func_801030B4(0, prim1, D_80137E6C);
prim3 = func_80103148(prim3, prim1);
prim2 = prim2->next;
prim1 = prim1->next;
SetTexturedPrimRect(prim2, 154, 104 - temp_t0, 36, temp_t0, 0, 32);
SetPrimRect(prim1, 148, 104 - temp_t0, 48, temp_t0);
func_801030B4(1, prim1, D_80137E6C);
func_80103148(prim3, prim1);
} else {
if (g_pads[0].tapped & PAD_LEFT) {
if (D_80137E6C != 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80137E6C = 0;
}
if (g_pads[0].tapped & PAD_RIGHT) {
if (D_80137E6C == 0) {
PlaySfx(SE_UI_OVERWRITE_SELECT);
}
D_80137E6C = 1;
}
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(0, prim1, D_80137E6C);
prim3 = func_80103148(prim3, prim1);
prim1 = prim1->next;
func_801030B4(1, prim1, D_80137E6C);
func_80103148(prim3, prim1);
if (g_pads[0].tapped & EXIT) {
D_80137E6C = 1;
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
return 1;
} else if (g_pads[0].tapped & CONFIRM) {
PlaySfx(SE_UI_CONFIRM);
FreePrimitives(D_80137E58);
FreePrimitives(D_80137E5C);
FreePrimitives(D_80137E60);
return 1;
}
}
}
return 0;
}
void func_80103EAC(void) {
D_80137E4C = 0;
MemcardInfoInit();
}

2
tools/maspsx

@ -1 +1 @@
Subproject commit 1e50b30ce24030bc123ff45687d960eacab61447
Subproject commit ba5af4fe40aa1b11854dd6f059d8586197825b6b