Merge pull request #187 from Kelebek1/fragment54

fragment54
2026-03-21 17:24:20 -05:00 · 2025-04-17 10:31:30 +01:00 · 2025-04-17 10:31:30 +01:00 · e18993fef7
commit e18993fef7
parent ea52bb1c2b 428a989adb
3 changed files with 328 additions and 20 deletions
--- a/src/fragments/54/fragment54.c
+++ b/src/fragments/54/fragment54.c
@ -1,35 +1,318 @@
-#include "global.h"
+#include "fragment54.h"
+#include "src/1CF30.h"
+#include "src/20470.h"
+#include "src/29BA0.h"
+#include "src/2E110.h"
+#include "src/3FB0.h"
+#include "src/49790.h"
+#include "src/DDC0.h"
+#include "src/F420.h"
+#include "src/memory.h"
+#include "src/stage_loader.h"

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00020.s")
+static char** D_82B01140;
+static BinArchive* D_82B01144;
+static void* D_82B01148;
+static s16 D_82B0114C;

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B000F4.s")
+static u8 D_82B01120[] = {
+    0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0F, 0x00, 0x00,
+};

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B0029C.s")
+static s8 D_82B0112C[] = {
+    0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x03,
+};

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B003B8.s")
+void func_82B00020(s16 arg0, s16 arg1) {
+    gSPDisplayList(gDisplayListHead++, D_8006F518);

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B005AC.s")
+    func_8001C6AC(arg0, arg1, 0x30, 0x18, D_2006C00, 0x30, 0);
+    func_8001C6AC(arg0, arg1 + 0x18, 0x30, 0x18, D_2007500, 0x30, 0);

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00814.s")
+    gSPDisplayList(gDisplayListHead++, D_8006F630);
+}

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00994.s")
+void func_82B000F4(s16 arg0, s16 arg1, s16 arg2, Color_RGBA8* arg3, Color_RGBA8* arg4) {
+    gSPDisplayList(gDisplayListHead++, D_8006F558);

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00A50.s")
+    gDPSetEnvColor(gDisplayListHead++, arg3->r, arg3->g, arg3->b, 255);
+    gDPSetPrimColor(gDisplayListHead++, 0, 0, arg4->r, arg4->g, arg4->b, 255);

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00B3C.s")
+    func_8001CADC(arg0, arg1, 0x10, 0x20, D_20003C0, 0x10, 0);
+    func_8001CADC((arg0 + arg2) - 0x10, arg1, 0x10, 0x20, D_20005C0, 0x10, 0);
+    func_8001C330(arg0 + 0x10, arg1, arg2 - 0x20, 0x20, 0, 0, 0, 0x400, 0);

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00BC8.s")
+    gSPDisplayList(gDisplayListHead++, D_8006F630);
+}

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00C24.s")
+void func_82B0029C(void) {
+    Color_RGBA8 sp2C;
+    Color_RGBA8 sp28;

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00CB4.s")
+    func_8000E820(&sp2C, 0x64, 0x64, 0xC8);
+    func_8000E820(&sp28, 0x28, 0x28, 0x8C);
+    func_82B000F4(0x48, 0x28, 0x208, &sp2C, &sp28);
+    func_82B00020(0x30, 0x20);
+    func_8001F3F4();
+    func_8001EBE0(0x10, 0);
+    func_8001F324(0, 0, 0, 0xFF);
+    func_8001F1E8(0x6A, 0x2C, func_8002D7C0(NULL, 0, D_82B01140, D_82B0112C[D_800AE540.unk_0000]));
+    func_8001F324(0xFF, 0xFF, 0x77, 0xFF);
+    func_8001F1E8(0x68, 0x2A, func_8002D7C0(NULL, 0, D_82B01140, D_82B0112C[D_800AE540.unk_0000]));
+    func_8001F444();
+}

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00DD0.s")
+void func_82B003B8(s16 arg0, s16 arg1, s16 arg2, s16 arg3) {
+    static s16 D_82B01138 = 0;

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00E84.s")
+    s16 sp56 = SINS(D_82B01138) * 2;
+    UNUSED s32 pad[2];

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00FAC.s")
+    gSPDisplayList(gDisplayListHead++, D_8006F518);
+    gDPSetEnvColor(gDisplayListHead++, 240, 212, 104, 255);

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B00FFC.s")
+    func_8001CADC(arg0 + sp56, arg1 + sp56, 0x10, 0x10, D_2000C80, 0x10, 0);
+    func_8001CADC(arg0 + sp56, ((arg1 + arg3) - sp56) - 0x10, 0x10, 0x10, D_2000F80, 0x10, 0);
+    func_8001CADC(((arg0 + arg2) - sp56) - 0x10, arg1 + sp56, 0x10, 0x10, D_2000D80, 0x10, 0);
+    func_8001CADC(((arg0 + arg2) - sp56) - 0x10, ((arg1 + arg3) - sp56) - 0x10, 0x10, 0x10, D_2000E80, 0x10, 0);

-#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/54/fragment54/func_82B0104C.s")
+    gSPDisplayList(gDisplayListHead++, D_8006F630);
+
+    D_82B01138 += 0x2000;
+}
+
+void func_82B005AC(s16 arg0, s16 arg1, s16 arg2, s16 arg3) {
+    gSPDisplayList(gDisplayListHead++, D_8006F518);
+
+    func_8001CADC(arg0 - 3, arg1 - 3, 8, 8, D_2000340, 8, 0);
+    func_8001CADC((arg0 + arg2) - 5, arg1 - 3, 8, 8, D_2000380, 8, 0);
+    func_8001C330(arg0 + 4, arg1 - 3, arg2 - 8, 8, 0, 0, 0, 0x400, 0);
+    func_8001CADC(arg0 - 3, (arg1 + arg3) - 5, 8, 8, D_20002C0, 8, 0);
+    func_8001C330(arg0 - 3, arg1 + 4, 8, arg3 - 8, 0, 0, 0x400, 0, 0);
+    func_8001CADC((arg0 + arg2) - 5, (arg1 + arg3) - 5, 8, 8, D_2000300, 8, 0);
+    func_8001C330(arg0 + 4, (arg1 + arg3) - 5, arg2 - 8, 8, 0, 0, 0, 0x400, 0);
+    func_8001C330((arg0 + arg2) - 5, arg1 + 4, 8, arg3 - 8, 0, 0, 0x400, 0, 0);
+
+    gSPDisplayList(gDisplayListHead++, D_8006F630);
+}
+
+void func_82B00814(s16 arg0, s16 arg1, s16 arg2, char* arg3) {
+    UNUSED s32 pad;
+
+    if (arg2 >= 0xA) {
+        arg1 += ((0x30 - arg2) / 2);
+        func_82B005AC(arg0, arg1, 0x98, arg2);
+
+        gSPDisplayList(gDisplayListHead++, D_8006F470);
+
+        func_8001C560(arg0 + 4, arg1 + 4, 0x90, arg2 - 8, 0x1E, 0x1E, 0x82);
+
+        gSPDisplayList(gDisplayListHead++, D_8006F630);
+
+        if ((arg2 - 8) == 0x28) {
+            func_8001F3F4();
+            func_8001EBE0(0x10, 0);
+            func_8001F1E8((arg0 - (func_8001F5B0(0x10, 0, arg3) / 2)) + 0x4C, arg1 + 0xB, arg3);
+            func_8001F444();
+        }
+    }
+}
+
+void func_82B00994(s16 arg0) {
+    UNUSED s32 pad;
+
+    func_82B00814(0x50, 0x180, arg0 * 6, func_8002D7C0(NULL, 0, D_82B01140, 4));
+    func_82B00814(0xF4, 0x180, arg0 * 6, func_8002D7C0(NULL, 0, D_82B01140, 5));
+    func_82B00814(0x198, 0x180, arg0 * 6, func_8002D7C0(NULL, 0, D_82B01140, 6));
+}
+
+s32 func_82B00A50(void) {
+    u32 var_v1 = 'exec';
+
+    if (BTN_IS_PRESSED(gPlayer1Controller, BTN_A)) {
+        func_80048B90(0x1C);
+        var_v1 = 'btnA';
+    } else if (BTN_IS_PRESSED(gPlayer1Controller, BTN_B)) {
+        func_80048B90(3);
+        var_v1 = 'btnB';
+    } else if (BTN_IS_PRESSED(gPlayer1Controller, BTN_DLEFT)) {
+        func_80048B90(1);
+        var_v1 = 'exec';
+        D_82B0114C -= 1;
+        if (D_82B0114C < 0) {
+            D_82B0114C = 2;
+        }
+    } else if (BTN_IS_PRESSED(gPlayer1Controller, BTN_DRIGHT)) {
+        func_80048B90(1);
+        var_v1 = 'exec';
+        D_82B0114C++;
+        if (D_82B0114C >= 3) {
+            D_82B0114C = 0;
+        }
+    }
+    return var_v1;
+}
+
+void func_82B00B3C(s16 arg0) {
+    func_800079C4();
+    func_8001D924(D_82B01148);
+    func_82B0029C();
+    func_82B00994(arg0);
+    if (arg0 == 8) {
+        func_82B003B8((D_82B0114C * 0xA4) + 0x50, 0x180, 0x98, 0x30);
+    }
+    func_80007778();
+}
+
+void func_82B00BC8(void) {
+    if (func_80007604 != NULL) {
+        func_80006C6C(8);
+        while (func_80007604() != 0) {
+            func_800290B4();
+            func_82B00B3C(0);
+        }
+    }
+}
+
+void func_82B00C24(void) {
+    if ((D_800AE540.unk_0000 == 7) || (D_800AE540.unk_0000 == 8)) {
+        func_8000D278(0x10);
+    }
+
+    func_80007990(0xFFFF);
+    func_80006CB4(8);
+
+    while (func_80007604() != 1) {
+        func_800290B4();
+        func_82B00B3C(0);
+    }
+
+    func_800077B4(2);
+}
+
+s16 func_82B00CB4(void) {
+    s16 i;
+    s16 var_v1;
+    u32 temp_s1 = 'exec';
+
+    D_82B0114C = 0;
+    func_82B00BC8();
+    func_80048B90(4);
+
+    for (i = 1; i < 8; i++) {
+        func_800290B4();
+        func_82B00B3C(i);
+    }
+
+    while (temp_s1 == 'exec') {
+        func_800290B4();
+        temp_s1 = func_82B00A50();
+        func_82B00B3C(i);
+    }
+
+    for (i = 7; i >= 0; i--) {
+        func_800290B4();
+        func_82B00B3C(i);
+    }
+
+    func_82B00B3C(i);
+
+    if (temp_s1 == 'btnA') {
+        var_v1 = D_82B0114C + 1;
+    } else {
+        if (D_800AE540.unk_0000 != 0) {
+            func_82B00C24();
+        }
+        var_v1 = 0;
+    }
+    return var_v1;
+}
+
+void func_82B00DD0(unk_func_80027FA0* arg0) {
+    D_82B01144 = func_800044F4(backgrounds_ROM_START, battle_headers_ROM_START, 1, 1);
+
+    if (D_800AE540.unk_0000 == 7) {
+        if (arg0->unk_04 < 8) {
+            D_82B01148 = func_8000484C(D_82B01144, 0xD);
+        } else {
+            D_82B01148 = func_8000484C(D_82B01144, 0x10);
+        }
+    } else {
+        D_82B01148 = func_8000484C(D_82B01144, D_82B01120[D_800AE540.unk_0000]);
+    }
+}
+
+s32 func_82B00E84(void) {
+    s16 sp26;
+    unk_func_80027FA0 sp1C;
+    s16 temp_v0;
+
+    main_pool_push_state('menu');
+
+    func_80028AFC(2);
+    func_80027FA0(&sp1C, D_800AE540.unk_11F2);
+    func_8001E94C(0x10, 0);
+
+    ASSET_LOAD(D_1000000, common_menu1_ui, 0);
+    ASSET_LOAD(D_2000000, common_menu2_ui, 0);
+
+    func_82B00DD0(&sp1C);
+    func_8002D510();
+
+    D_82B01140 = func_8002D5AC(0x18);
+    D_82B0114C = 0;
+
+    if (D_800AE540.unk_0000 == 7) {
+        if (sp1C.unk_04 < 8) {
+            func_8000D1F0(0x2A);
+        } else {
+            func_8000D1F0(0x27);
+        }
+    }
+
+    func_80007754();
+    sp26 = func_82B00CB4();
+    func_8000771C();
+
+    main_pool_pop_state('menu');
+
+    return sp26;
+}
+
+s32 func_82B00FAC(void) {
+    FRAGMENT_LOAD_AND_CALL(fragment61, 1, 0);
+    return 4;
+}
+
+s32 func_82B00FFC(void) {
+    FRAGMENT_LOAD_AND_CALL(fragment55, 0, 0);
+    return 4;
+}
+
+s32 func_82B0104C(UNUSED s32 arg0, UNUSED s32 arg1) {
+    s16 sp2E;
+    s32 var_v1;
+    s32 var_v1_2;
+
+    sp2E = 4;
+    main_pool_push_state('SUBT');
+
+    while (sp2E >= 2) {
+        switch (sp2E) {
+            case 2:
+                sp2E = func_82B00FFC();
+                break;
+
+            case 3:
+                sp2E = func_82B00FAC();
+                break;
+
+            case 4:
+                sp2E = func_82B00E84();
+                break;
+        }
+    }
+
+    main_pool_pop_state('SUBT');
+    return sp2E;
+}
--- a/src/fragments/54/fragment54.h
+++ b/src/fragments/54/fragment54.h
@ -0,0 +1,25 @@
+#ifndef _FRAGMENT54_H_
+#define _FRAGMENT54_H_
+
+#include "global.h"
+#include "src/26820.h"
+
+void func_82B00020(s16 arg0, s16 arg1);
+void func_82B000F4(s16 arg0, s16 arg1, s16 arg2, Color_RGBA8* arg3, Color_RGBA8* arg4);
+void func_82B0029C(void);
+void func_82B003B8(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
+void func_82B005AC(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
+void func_82B00814(s16 arg0, s16 arg1, s16 arg2, char* arg3);
+void func_82B00994(s16 arg0);
+s32 func_82B00A50(void);
+void func_82B00B3C(s16 arg0);
+void func_82B00BC8(void);
+void func_82B00C24(void);
+s16 func_82B00CB4(void);
+void func_82B00DD0(unk_func_80027FA0* arg0);
+s32 func_82B00E84(void);
+s32 func_82B00FAC(void);
+s32 func_82B00FFC(void);
+s32 func_82B0104C(UNUSED s32 arg0, UNUSED s32 arg1);
+
+#endif // _FRAGMENT54_H_
--- a/yamls/us/rom.yaml
+++ b/yamls/us/rom.yaml
@ -1939,9 +1939,9 @@
    subsegments:
    - [0x2BDAC0, textbin,  fragments/54/fragment54_header]
    - [0x2BDAE0, c,    fragments/54/fragment54]
-    - [0x2BEBE0, data, fragments/54/fragment54_data]
+    - [0x2BEBE0, .data, fragments/54/fragment54]

-    - {vram: 0x82B01140, type:  bss, name: fragments/54/fragment54_bss}
+    - {vram: 0x82B01140, type:  .bss, name: fragments/54/fragment54}

  - name: fragment54_relocs
    type: code