From 4bf6afa1440117e65ed0232ca41a75ed8912b516 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 29 Sep 2023 23:56:15 -0400 Subject: [PATCH] Data for adventure_log --- charmap.txt | 1 + data/friend_rescue.s | 3 +- include/adventure_log.h | 4 +- include/structs/str_802C39C.h | 6 +- src/adventure_log.c | 170 +++++++++++++++------------------- src/adventure_log_menu.c | 2 +- src/code_8031D70.c | 1 - src/data/adventure_log.h | 24 +++++ 8 files changed, 107 insertions(+), 104 deletions(-) create mode 100644 src/data/adventure_log.h diff --git a/charmap.txt b/charmap.txt index f82649885..1a0f11334 100644 --- a/charmap.txt +++ b/charmap.txt @@ -266,6 +266,7 @@ APOSTROPHE = 7E 32 37 @ ~27 COMMA = 7E 32 63 @ ~2c QUOTE_START = 7E 39 33 @ ~93 QUOTE_END = 7E 39 34 @ ~94 +UNK_95 = 7E 39 35 @ ~95 - Seems to be a special (?) symbol @ Placeholders for message arguments to swap out for names within strings. ARG_VALUE_0 = 24 64 30 @ $d0 diff --git a/data/friend_rescue.s b/data/friend_rescue.s index d42b65fb0..4b6ed2227 100644 --- a/data/friend_rescue.s +++ b/data/friend_rescue.s @@ -1,6 +1,7 @@ .section .rodata -@ friend_rescue.c + .align 2,0 + .string "pksdir0\0" .global gUnknown_80E2068 gUnknown_80E2068: @ 80E2068 diff --git a/include/adventure_log.h b/include/adventure_log.h index 74b0eae9d..f1c33815a 100644 --- a/include/adventure_log.h +++ b/include/adventure_log.h @@ -7,7 +7,7 @@ // size: 0xA0 typedef struct AdventureLog { - MenuInputStruct input; + /* 0x0 */ MenuInputStruct input; u32 unk34; UnkTextStruct2 *unk38; UnkTextStruct2 unk3C[4]; @@ -16,6 +16,6 @@ typedef struct AdventureLog void CleanAdventureLogScreen(void); bool8 CreateAdventureLogScreen(u32 kind); -u32 HandleAdventureLogInput(u8); +u32 HandleAdventureLogInput(bool8); #endif // GUARD_ADVENTURE_LOG_H \ No newline at end of file diff --git a/include/structs/str_802C39C.h b/include/structs/str_802C39C.h index c1c7f7a9b..c52f61d3d 100644 --- a/include/structs/str_802C39C.h +++ b/include/structs/str_802C39C.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CODE_STR_802C39C_H -#define GUARD_CODE_STR_802C39C_H +#ifndef GUARD_STR_802C39C_H +#define GUARD_STR_802C39C_H #include "structs/str_wonder_mail.h" @@ -29,4 +29,4 @@ typedef struct unkStruct_802C39C /* 0x54 */ WonderMail *mail; } unkStruct_802C39C; -#endif // GUARD_CODE_STR_802C39C_H \ No newline at end of file +#endif // GUARD_STR_802C39C_H \ No newline at end of file diff --git a/src/adventure_log.c b/src/adventure_log.c index ae9fe8aec..5cc46126b 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -10,33 +10,14 @@ #include "text1.h" #include "text2.h" -static EWRAM_DATA_2 AdventureLog *sAdventureLog = {0}; - -static const UnkTextStruct2 sUnknown_80E1FF0 = { - 0x00, 0x00, 0x00, 0x00, - 0x03, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - NULL -}; -static const UnkTextStruct2 sUnknown_80E2008 = { - 0x00, 0x00, 0x00, 0x00, - 0x06, - 0x02, 0x02, - 0x1A, 0x04, - 0x06, 0x00, - NULL -}; - -static const u8 sAdventureLogHeaderText[] = "Adventure Log"; -static const u8 sAdventureLogTextPlaceholder[] = "~95~95~95~95~95~95~95~95~95~95~95~95~95~95~95 "; // string of ??????? -static const u8 sFill1[] = "pksdir0"; - -// ??? extern u32 gUnknown_202DE30; +static EWRAM_DATA_2 AdventureLog *sAdventureLog = {0}; + +#include "data/adventure_log.h" + static void DisplayAdventureLog(); + static void sub_8032084(); bool8 CreateAdventureLogScreen(u32 kind) @@ -56,9 +37,9 @@ bool8 CreateAdventureLogScreen(u32 kind) return TRUE; } -u32 HandleAdventureLogInput(u8 param_1) +u32 HandleAdventureLogInput(bool8 a0) { - if (param_1 == 0) { + if (!a0) { sub_8013660(&sAdventureLog->input); return 0; } @@ -114,66 +95,66 @@ static void sub_8032084(void) NAKED static void sub_8032084(void) { - asm_unified("\tpush {r4,lr}\n" - "\tldr r4, _080320F4\n" - "\tldr r0, [r4]\n" - "\tldrh r1, [r0, 0x20]\n" - "\tadds r0, 0x9C\n" - "\tmovs r2, 0\n" - "\tstrb r1, [r0]\n" - "\tldr r0, [r4]\n" - "\tldrh r1, [r0, 0x1E]\n" - "\tadds r0, 0x9D\n" - "\tstrb r1, [r0]\n" - "\tldr r0, [r4]\n" - "\tadds r0, 0x9E\n" - "\tmovs r1, 0xB\n" - "\tstrb r1, [r0]\n" - "\tldr r0, [r4]\n" - "\tadds r0, 0x9F\n" - "\tstrb r2, [r0]\n" - "\tldr r0, [r4]\n" - "\tmovs r1, 0x1A\n" - "\tldrsh r0, [r0, r1]\n" - "\tmovs r1, 0xC\n" - "\tbl sub_80095E4\n" - "\tadds r0, 0x2\n" - "\tlsls r0, 16\n" - "\tldr r2, [r4]\n" - "\tldr r3, [r2, 0x34]\n" - "\tlsls r1, r3, 1\n" - "\tadds r1, r3\n" - "\tlsls r1, 3\n" - "\tadds r1, r2, r1\n" - "\tadds r1, 0x4A\n" - "\tasrs r3, r0, 16\n" - "\tlsrs r0, 16\n" - "\tstrh r0, [r1]\n" - "\tldr r1, [r2, 0x34]\n" - "\tlsls r0, r1, 1\n" - "\tadds r0, r1\n" - "\tlsls r0, 3\n" - "\tadds r2, r0\n" - "\tadds r3, 0x2\n" - "\tadds r2, 0x4C\n" - "\tstrh r3, [r2]\n" - "\tbl ResetUnusedInputStruct\n" - "\tldr r0, [r4]\n" - "\tadds r0, 0x3C\n" - "\tmovs r1, 0x1\n" - "\tmovs r2, 0x1\n" - "\tbl sub_800641C\n" - "\tpop {r4}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.align 2, 0\n" + asm_unified("\tpush {r4,lr}\n" + "\tldr r4, _080320F4\n" + "\tldr r0, [r4]\n" + "\tldrh r1, [r0, 0x20]\n" + "\tadds r0, 0x9C\n" + "\tmovs r2, 0\n" + "\tstrb r1, [r0]\n" + "\tldr r0, [r4]\n" + "\tldrh r1, [r0, 0x1E]\n" + "\tadds r0, 0x9D\n" + "\tstrb r1, [r0]\n" + "\tldr r0, [r4]\n" + "\tadds r0, 0x9E\n" + "\tmovs r1, 0xB\n" + "\tstrb r1, [r0]\n" + "\tldr r0, [r4]\n" + "\tadds r0, 0x9F\n" + "\tstrb r2, [r0]\n" + "\tldr r0, [r4]\n" + "\tmovs r1, 0x1A\n" + "\tldrsh r0, [r0, r1]\n" + "\tmovs r1, 0xC\n" + "\tbl sub_80095E4\n" + "\tadds r0, 0x2\n" + "\tlsls r0, 16\n" + "\tldr r2, [r4]\n" + "\tldr r3, [r2, 0x34]\n" + "\tlsls r1, r3, 1\n" + "\tadds r1, r3\n" + "\tlsls r1, 3\n" + "\tadds r1, r2, r1\n" + "\tadds r1, 0x4A\n" + "\tasrs r3, r0, 16\n" + "\tlsrs r0, 16\n" + "\tstrh r0, [r1]\n" + "\tldr r1, [r2, 0x34]\n" + "\tlsls r0, r1, 1\n" + "\tadds r0, r1\n" + "\tlsls r0, 3\n" + "\tadds r2, r0\n" + "\tadds r3, 0x2\n" + "\tadds r2, 0x4C\n" + "\tstrh r3, [r2]\n" + "\tbl ResetUnusedInputStruct\n" + "\tldr r0, [r4]\n" + "\tadds r0, 0x3C\n" + "\tmovs r1, 0x1\n" + "\tmovs r2, 0x1\n" + "\tbl sub_800641C\n" + "\tpop {r4}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" "_080320F4: .4byte sAdventureLog"); } #endif static void DisplayAdventureLog(void) { - s32 counter; + s32 i; s32 r4; // r4 s32 r6; // r6 u8 temp; @@ -184,56 +165,53 @@ static void DisplayAdventureLog(void) r4 = sAdventureLog->input.unk1E * 8; r6 = r4; r6 += 10; - // Draw Header - xxx_call_draw_string(r6, 0, sAdventureLogHeaderText, sAdventureLog->unk34, 0); + xxx_call_draw_string(r6, 0, sAdventureLogText, sAdventureLog->unk34, 0); + r4 += 4; - r6 = r4 + sAdventureLog->unk9C[2] * 8; - // Draw Page # + r6 = r4 + (sAdventureLog->unk9C[2] * 8); sub_8012BC4(r6, 0, sAdventureLog->input.unk1E + 1, 1, 7, sAdventureLog->unk34); - for (counter = 0; counter < sAdventureLog->input.unk1A; counter++) { - temp = sAdventureLog->input.unk1E * sAdventureLog->input.unk1C + counter; + for (i = 0; i < sAdventureLog->input.unk1A; i++) { + temp = (sAdventureLog->input.unk1E * sAdventureLog->input.unk1C) + i; if (sub_8097710(temp)) { switch (temp) { case 12: v1 = sub_80978B8(); gUnknown_202DE30 = (s16)v1; - xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, counter), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); + xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, i), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); break; case 7: v2 = sub_8097880(); gUnknown_202DE30 = (s16)v2; - xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, counter), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); + xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, i), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); break; case 11: v3 = sub_8097838(); gUnknown_202DE30 = (s16)v3; - xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, counter), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); + xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, i), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); break; case 8: v4 = sub_80977B8(); gUnknown_202DE30 = v4; - xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, counter), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); + xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, i), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); break; case 9: v5 = sub_80977F8(); gUnknown_202DE30 = v5; - xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, counter), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); + xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, i), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); break; case 10: v6 = sub_8097870(); gUnknown_202DE30 = (s16)v6; // fallthrough default: - xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, counter), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); + xxx_format_and_draw(8, sub_8013800(&sAdventureLog->input, i), GetAdventureLogLine(temp), sAdventureLog->unk34, 0); break; } } - else { - // Draw the ?????????? across the row - xxx_call_draw_string(8, sub_8013800(&sAdventureLog->input, counter), sAdventureLogTextPlaceholder, sAdventureLog->unk34, 0); - } + else + xxx_call_draw_string(8, sub_8013800(&sAdventureLog->input, i), sPlaceholder, sAdventureLog->unk34, 0); } sub_80073E0(sAdventureLog->unk34); diff --git a/src/adventure_log_menu.c b/src/adventure_log_menu.c index 523c9da43..dc103b024 100644 --- a/src/adventure_log_menu.c +++ b/src/adventure_log_menu.c @@ -21,7 +21,7 @@ u32 UpdateAdventureLogMenu(void) u32 nextMenu; nextMenu = MENU_NO_SCREEN_CHANGE; - switch (HandleAdventureLogInput(1)) { + switch (HandleAdventureLogInput(TRUE)) { case 0: case 1: break; diff --git a/src/code_8031D70.c b/src/code_8031D70.c index 918172eb1..de4544ff9 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -46,7 +46,6 @@ const UnkTextStruct2 gUnknown_80E1FC4 = { }; ALIGNED(4) const u8 gUnknown_80E1FDC[] = "Password"; -ALIGNED(4) static const u8 fill0[] = "pksdir0"; extern void sub_803D2C0(u8 *, unkStruct_203B480 *); diff --git a/src/data/adventure_log.h b/src/data/adventure_log.h new file mode 100644 index 000000000..036970198 --- /dev/null +++ b/src/data/adventure_log.h @@ -0,0 +1,24 @@ +ALIGNED(4) static const u8 sFill[] = _("pksdir0"); + +static const UnkTextStruct2 sUnknown_80E1FF0 = +{ + 0, 0, 0, 0, + 3, + 0, 0, + 0, 0, + 0, 0, + NULL +}; + +static const UnkTextStruct2 sUnknown_80E2008 = +{ + 0, 0, 0, 0, + 6, + 2, 2, + 26, 4, + 6, 0, + NULL +}; + +ALIGNED(4) static const u8 sAdventureLogText[] = _("Adventure Log"); +ALIGNED(4) static const u8 sPlaceholder[] = _("{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95}{UNK_95} "); \ No newline at end of file