Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 05:00:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

continue moving data

Browse Source
This commit is contained in:
Seth Barberee 2024-03-17 14:15:20 -07:00
parent 9abab93ad3
commit f5bd176a12
5 changed files with 78 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
data/data_80D47B8.s
View File

@ -1,98 +1,7 @@
.section .rodata
@ START menu_input
.align 2, 0
.global UnkData_80D47C4
UnkData_80D47C4:
.byte 0x01, 0x00, 0x10, 0x00
.global gUnknown_80D47C8
gUnknown_80D47C8: @ 80D47C8
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x1a, 0x00, 0x0c, 0x00
.byte 0x0c, 0x00, 0x00, 0x00
.4byte UnkData_80D47C4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80D4828
gUnknown_80D4828: @ 80D4828
.string "{COLOR_1}%c%s\0"
.align 2,0
.global gUnknown_80D4830
gUnknown_80D4830: @ 80D4830
.4byte 1
.4byte 10
.4byte 100
.4byte 1000
.4byte 10000
.4byte 100000
.4byte 1000000
.4byte 10000000
.4byte 100000000
@ END menu_input
@ START code_80130A8
.asciz "pksdir0"
.global gUnknown_80D485C
gUnknown_80D485C: @ 80D485C
.4byte Yes_80D4878
.byte 0x01, 0x00, 0x00, 0x00
.4byte No_80D4874
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.4byte -1
.global No_80D4874
No_80D4874:
.string "No\0"
.align 2,0
.global Yes_80D4878
Yes_80D4878:
.string "*Yes\0"
.align 2,0
.global gUnknown_80D4880
gUnknown_80D4880: @ 80D4880
.4byte Yes_80D489C
.byte 0x01, 0x00, 0x00, 0x00
.4byte No_80D4898
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00 @ End of table
.4byte -1
.global No_80D4898
No_80D4898:
.string "*No\0"
.global Yes_80D489C
Yes_80D489C:
.string "Yes\0"
.align 2,0
.global gUnknown_80D48A0
gUnknown_80D48A0: @ 80D48A0
@ -155,4 +64,4 @@ gUnknown_80D4908: @ 80D4908
gUnknown_80D4910: @ 80D4910
.string "$\0"
@ END code_80130A8
@ END code_80130A8

1
ld_script.txt
View File

@ -436,6 +436,7 @@ SECTIONS {
src/quick_save_read.o(.rodata);
src/quick_save_write.o(.rodata);
src/menu_input.o(.rodata);
src/code_80140DC.o(.rodata);
data/data_80D47B8.o(.rodata);
src/common_strings.o(.rodata);
data/data_80DAF70.o(.rodata);

7
src/code_80140DC.c
View File

@ -1,18 +1,19 @@
#include "constants/input.h"
#include "global.h"
#include "globaldata.h"
#include "menu_input.h"
#include "sprite.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
extern s32 gUnknown_202E744;
extern s32 gUnknown_202E738;
extern s32 gUnknown_202E73C;
extern s32 gUnknown_202E740;
extern s32 gUnknown_202E744;
extern MenuItem gUnknown_80D485C[];
extern MenuItem gUnknown_80D4880[];
#include "data/code_80140DC.h"
// TODO: move to menu_input
extern UnkTextStruct2 gUnknown_80D47C8[4];
void sub_80140B4(UnkTextStruct2 *a0)

25
src/data/code_80140DC.h Normal file
View File

@ -0,0 +1,25 @@
const u8 Yes_80D4878[];
const u8 No_80D4874[];
const MenuItem gUnknown_80D485C[] =
{
{Yes_80D4878, 1},
{No_80D4874, 0},
{NULL, -1}
};
ALIGNED(4) const u8 No_80D4874[] = "No";
ALIGNED(4) const u8 Yes_80D4878[] = "*Yes";
const u8 Yes_80D489C[];
const u8 No_80D4898[];
const MenuItem gUnknown_80D4880[] =
{
{Yes_80D489C, 1},
{No_80D4898, 0},
{NULL, -1}
};
ALIGNED(4) const u8 No_80D4898[] = "*No";
ALIGNED(4) const u8 Yes_80D489C[] = "Yes";

51
src/menu_input.c
View File

@ -14,9 +14,53 @@
#include "text2.h"
#include "util.h"
// data_80D47B8.s
extern const u8 gUnknown_80D4828[];
extern const s32 gUnknown_80D4830[9];
const u32 gDefaultMenuTextColors[3] = { COLOR_WHITE_2, COLOR_RED, COLOR_RED };
const u8 UnkData_80D47C4[] = {0x01, 0x00, 0x10, 0x00};
const UnkTextStruct2 gUnknown_80D47C8[4] = {
0x00, 0x00, 0x00, 0x00,
0x06,
0x02, 0x02,
0x1a, 0x0c,
0x0c, 0x00,
UnkData_80D47C4,
0x00, 0x00, 0x00, 0x00,
0x03,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
NULL,
0x00, 0x00, 0x00, 0x00,
0x03,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
NULL,
0x00, 0x00, 0x00, 0x00,
0x03,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
NULL,
};
ALIGNED(4) const u8 gUnknown_80D4828[] = _("{COLOR_1}%c%s");
const s32 gUnknown_80D4830[9] = {
1,
10,
100,
1000,
10000,
100000,
1000000,
10000000,
100000000
};
// text.s
extern s16 sub_8009614(u32, u32);
@ -26,7 +70,6 @@ static void sub_801332C(s16 *);
static void sub_8013470(MenuInputStruct *);
static bool8 sub_8013DD0(unkStructFor8013AA0 *);
const u32 gDefaultMenuTextColors[3] = { COLOR_WHITE_2, COLOR_RED, COLOR_RED };
u32 sub_8012A64(MenuInputStructSub *r0, s32 r1)
{