From eccd14b8c463d3544ed76bcc6b75ffdc27be7d1c Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 19 Oct 2024 18:56:42 -0700 Subject: [PATCH] Document colored_arrow.c --- include/colored_arrow.h | 19 +++++++ include/constants/charcode.h | 4 +- include/overlay023/struct_ov23_02248D20.h | 5 +- include/struct_decls/struct_020149F0_decl.h | 6 -- include/unk_020149F0.h | 14 ----- platinum.us/main.lsf | 2 +- src/colored_arrow.c | 59 ++++++++++++++++++++ src/meson.build | 2 +- src/overlay020/ov20_021D2EA4.c | 13 ++--- src/overlay023/ov23_02248C08.c | 10 ++-- src/overlay098/ov98_022471C8.c | 11 ++-- src/unk_0200112C.c | 13 ++--- src/unk_02001AF4.c | 11 ++-- src/unk_020149F0.c | 62 --------------------- src/unk_0205A0D8.c | 15 +++-- src/unk_0209ACF4.c | 15 +++-- 16 files changed, 127 insertions(+), 134 deletions(-) create mode 100644 include/colored_arrow.h delete mode 100644 include/struct_decls/struct_020149F0_decl.h delete mode 100644 include/unk_020149F0.h create mode 100644 src/colored_arrow.c delete mode 100644 src/unk_020149F0.c diff --git a/include/colored_arrow.h b/include/colored_arrow.h new file mode 100644 index 0000000000..9d7d65a5f0 --- /dev/null +++ b/include/colored_arrow.h @@ -0,0 +1,19 @@ +#ifndef POKEPLATINUM_COLORED_ARROW_H +#define POKEPLATINUM_COLORED_ARROW_H + +#include "struct_defs/struct_0205AA50.h" + +#include "strbuf.h" +#include "text.h" + +typedef struct ColoredArrow { + TextColor color; + Strbuf *strbuf; +} ColoredArrow; + +ColoredArrow *ColoredArrow_New(u32 heapID); +void ColoredArrow_Free(ColoredArrow *arrow); +void ColoredArrow_SetColor(ColoredArrow *arrow, TextColor color); +void ColoredArrow_Print(const ColoredArrow *arrow, Window *window, u32 xOffset, u32 yOffset); + +#endif // POKEPLATINUM_COLORED_ARROW_H diff --git a/include/constants/charcode.h b/include/constants/charcode.h index f178055462..4762691da9 100644 --- a/include/constants/charcode.h +++ b/include/constants/charcode.h @@ -20,7 +20,9 @@ enum { CHAR_JP_MINUS = 0x00F1, - CHAR_EN_0 = 0x0121, + CHAR_MENU_ARROW = 0x011F, + CHAR_WIDE_AMPERSAND, + CHAR_EN_0, CHAR_EN_1, CHAR_EN_2, CHAR_EN_3, diff --git a/include/overlay023/struct_ov23_02248D20.h b/include/overlay023/struct_ov23_02248D20.h index f2df37575f..557f3d020e 100644 --- a/include/overlay023/struct_ov23_02248D20.h +++ b/include/overlay023/struct_ov23_02248D20.h @@ -3,17 +3,18 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "overlay023/funcptr_ov23_02248D20.h" +#include "colored_arrow.h" + typedef struct { UnkFuncPtr_ov23_02248D20 unk_00; UndergroundData *unk_04; ResourceMetadata *unk_08; BmpList *unk_0C; - UnkStruct_020149F0 *unk_10; + ColoredArrow *unk_10; u16 unk_14; u16 unk_16; u16 unk_18; diff --git a/include/struct_decls/struct_020149F0_decl.h b/include/struct_decls/struct_020149F0_decl.h deleted file mode 100644 index 3fec9427be..0000000000 --- a/include/struct_decls/struct_020149F0_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_020149F0_DECL_H -#define POKEPLATINUM_STRUCT_020149F0_DECL_H - -typedef struct UnkStruct_020149F0_t UnkStruct_020149F0; - -#endif // POKEPLATINUM_STRUCT_020149F0_DECL_H diff --git a/include/unk_020149F0.h b/include/unk_020149F0.h deleted file mode 100644 index 14011b5199..0000000000 --- a/include/unk_020149F0.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef POKEPLATINUM_UNK_020149F0_H -#define POKEPLATINUM_UNK_020149F0_H - -#include "struct_decls/struct_020149F0_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "text.h" - -UnkStruct_020149F0 *sub_020149F0(u32 param0); -void sub_02014A20(UnkStruct_020149F0 *param0); -void sub_02014A40(UnkStruct_020149F0 *param0, TextColor param1); -void sub_02014A58(const UnkStruct_020149F0 *param0, Window *param1, u32 param2, u32 param3); - -#endif // POKEPLATINUM_UNK_020149F0_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 3aa929e60c..343fa4fb94 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -54,7 +54,7 @@ Static main Object main.nef.p/src_unk_02013A04.c.o Object main.nef.p/src_screen_scroll_manager.c.o Object main.nef.p/src_unk_02014000.c.o - Object main.nef.p/src_unk_020149F0.c.o + Object main.nef.p/src_colored_arrow.c.o Object main.nef.p/src_unk_02014A84.c.o Object main.nef.p/src_unk_02014D38.c.o Object main.nef.p/src_unk_02015064.c.o diff --git a/src/colored_arrow.c b/src/colored_arrow.c new file mode 100644 index 0000000000..1b4c07e711 --- /dev/null +++ b/src/colored_arrow.c @@ -0,0 +1,59 @@ +#include "colored_arrow.h" + +#include +#include + +#include "constants/charcode.h" + +#include "struct_defs/struct_0205AA50.h" + +#include "charcode.h" +#include "heap.h" +#include "strbuf.h" +#include "text.h" +#include "unk_02018340.h" + +ColoredArrow *ColoredArrow_New(u32 heapID) +{ + static const charcode_t chars[] = { + CHAR_MENU_ARROW, + CHAR_EOS, + }; + ColoredArrow *arrow = Heap_AllocFromHeap(heapID, sizeof(ColoredArrow)); + + if (arrow) { + arrow->color = TEXT_COLOR(1, 2, 15); + arrow->strbuf = Strbuf_Init(4, heapID); + Strbuf_CopyChars(arrow->strbuf, chars); + } + + return arrow; +} + +void ColoredArrow_Free(ColoredArrow *arrow) +{ + GF_ASSERT(arrow != NULL); + + if (arrow) { + if (arrow->strbuf) { + Strbuf_Free(arrow->strbuf); + } + + Heap_FreeToHeap(arrow); + } +} + +void ColoredArrow_SetColor(ColoredArrow *arrow, TextColor color) +{ + GF_ASSERT(arrow != NULL); + + if (arrow) { + arrow->color = color; + } +} + +void ColoredArrow_Print(const ColoredArrow *arrow, Window *window, u32 xOffset, u32 yOffset) +{ + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, arrow->strbuf, xOffset, yOffset, TEXT_SPEED_NO_TRANSFER, arrow->color, NULL); + sub_0201ACCC(window); +} diff --git a/src/meson.build b/src/meson.build index db9851eb8b..c42ec4c8e7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -50,7 +50,7 @@ pokeplatinum_c = files( 'unk_02013A04.c', 'screen_scroll_manager.c', 'unk_02014000.c', - 'unk_020149F0.c', + 'colored_arrow.c', 'unk_02014A84.c', 'unk_02014D38.c', 'unk_02015064.c', diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 0a49eb6276..96e0b562e2 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020998EC_decl.h" #include "struct_defs/struct_0205AA50.h" @@ -16,6 +15,7 @@ #include "cell_actor.h" #include "charcode.h" +#include "colored_arrow.h" #include "font.h" #include "heap.h" #include "message.h" @@ -24,7 +24,6 @@ #include "text.h" #include "unk_02006E3C.h" #include "unk_0200DA60.h" -#include "unk_020149F0.h" #include "unk_02014D38.h" #include "unk_02018340.h" @@ -51,7 +50,7 @@ typedef struct UnkStruct_ov20_021D30F8_t { CellActor *unk_44; MessageLoader *unk_48; Strbuf *unk_4C; - UnkStruct_020149F0 *unk_50; + ColoredArrow *unk_50; UnkStruct_ov20_021D34CC unk_54[2]; u32 unk_5C; u32 unk_60; @@ -85,7 +84,7 @@ UnkStruct_ov20_021D30F8 *ov20_021D2EA4(UnkStruct_ov20_021D2128 *param0, const Un v0->unk_44 = NULL; v0->unk_4C = Strbuf_Init(128, 35); v0->unk_48 = MessageLoader_Init(0, 26, 437, 35); - v0->unk_50 = sub_020149F0(35); + v0->unk_50 = ColoredArrow_New(35); return v0; } @@ -93,7 +92,7 @@ UnkStruct_ov20_021D30F8 *ov20_021D2EA4(UnkStruct_ov20_021D2128 *param0, const Un void ov20_021D2EF0(UnkStruct_ov20_021D30F8 *param0) { if (param0->unk_50) { - sub_02014A20(param0->unk_50); + ColoredArrow_Free(param0->unk_50); } if (param0->unk_3C) { @@ -545,7 +544,7 @@ void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1) Text_AddPrinterWithParamsAndColor(¶m0->unk_2C, FONT_SYSTEM, param0->unk_4C, 14, 0 + 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL); Window_Show(¶m0->unk_2C, 0, param0->unk_60, 14); - sub_02014A58(param0->unk_50, ¶m0->unk_2C, 0, 0 + (param1 * 16)); + ColoredArrow_Print(param0->unk_50, ¶m0->unk_2C, 0, 0 + (param1 * 16)); sub_0201A954(¶m0->unk_2C); } @@ -553,7 +552,7 @@ void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1) void ov20_021D381C(UnkStruct_ov20_021D30F8 *param0, int param1) { BGL_WindowColor(¶m0->unk_2C, 9, 0, 0, 14, 4 * 8); - sub_02014A58(param0->unk_50, ¶m0->unk_2C, 0, 0 + (param1 * 16)); + ColoredArrow_Print(param0->unk_50, ¶m0->unk_2C, 0, 0 + (param1 * 16)); } void ov20_021D384C(UnkStruct_ov20_021D30F8 *param0) diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c index acd2b8db85..e4943a0909 100644 --- a/src/overlay023/ov23_02248C08.c +++ b/src/overlay023/ov23_02248C08.c @@ -13,12 +13,12 @@ #include "overlay023/struct_ov23_02248D20.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "colored_arrow.h" #include "core_sys.h" #include "heap.h" #include "unk_0200112C.h" #include "unk_02005474.h" #include "unk_02013A04.h" -#include "unk_020149F0.h" #include "unk_0202854C.h" UnkStruct_ov23_02248D20 *ov23_02248C08(UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData *param5, BOOL param6) @@ -32,9 +32,9 @@ UnkStruct_ov23_02248D20 *ov23_02248C08(UnkStruct_ov84_02240FA8 *param0, u16 para if (v0->unk_00) { v0->unk_04 = param5; v0->unk_1E = param6; - v0->unk_10 = sub_020149F0(param3); + v0->unk_10 = ColoredArrow_New(param3); - sub_02014A40(v0->unk_10, TEXT_COLOR(8, 9, 15)); + ColoredArrow_SetColor(v0->unk_10, TEXT_COLOR(8, 9, 15)); v0->unk_1D = param3; @@ -79,7 +79,7 @@ static void ov23_02248CA4(u16 param0, u16 param1, UnkStruct_ov23_02248D20 *param int v4 = (v0 - param0) * v3 + sub_02001504(param2->unk_0C, 8); Window *v5 = (Window *)sub_02001504(param2->unk_0C, 18); - sub_02014A58(param2->unk_10, v5, v2, v4); + ColoredArrow_Print(param2->unk_10, v5, v2, v4); } } @@ -211,7 +211,7 @@ void ov23_02248EF8(UnkStruct_ov23_02248D20 *param0, u16 *param1, u16 *param2) sub_02001384(v0, param1, param2); if (param0->unk_00) { - sub_02014A20(param0->unk_10); + ColoredArrow_Free(param0->unk_10); Heap_FreeToHeap(param0->unk_08); } diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 79b5f3fc89..09c629ae49 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -8,7 +8,6 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02025CCC_decl.h" #include "struct_decls/struct_0202B370_decl.h" @@ -27,6 +26,7 @@ #include "overlay098/ov98_022499C8.h" #include "overlay098/struct_ov98_02246E88.h" +#include "colored_arrow.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -50,7 +50,6 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "unk_020149F0.h" #include "unk_02017728.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" @@ -102,7 +101,7 @@ typedef struct { int unk_C0; Window unk_C4; Window unk_D4; - UnkStruct_020149F0 * unk_E4; + ColoredArrow *unk_E4; s32 unk_E8; UnkStruct_ov61_0222C3B0 unk_EC; } UnkStruct_ov98_02247704; @@ -935,7 +934,7 @@ static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) v0 = MessageLoader_GetNewStrbuf(param0->unk_34, 43); Text_AddPrinterWithParams(¶m0->unk_D4, FONT_SYSTEM, v0, Unk_ov98_02249D60[1][0] + 12, Unk_ov98_02249D60[1][1], TEXT_SPEED_NO_TRANSFER, NULL); Strbuf_Free(v0); - sub_02014A58(param0->unk_E4, ¶m0->unk_D4, Unk_ov98_02249D60[param0->unk_B0][0], Unk_ov98_02249D60[param0->unk_B0][1]); + ColoredArrow_Print(param0->unk_E4, ¶m0->unk_D4, Unk_ov98_02249D60[param0->unk_B0][0], Unk_ov98_02249D60[param0->unk_B0][1]); sub_0201A954(¶m0->unk_D4); } @@ -1134,7 +1133,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) add r0, #0xd4 bl sub_0201A954 mov r0, #0x6d - bl sub_020149F0 + bl ColoredArrow_New add r1, r5, #0 add r1, #0xe4 str r0, [r1, #0] @@ -1362,7 +1361,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) add r0, r5, #0 add r0, #0xe4 ldr r0, [r0, #0] - bl sub_02014A20 + bl ColoredArrow_Free ldr r0, [r5, #4] mov r1, #3 bl sub_02019EBC diff --git a/src/unk_0200112C.c b/src/unk_0200112C.c index 798c4041ca..082ef19bcf 100644 --- a/src/unk_0200112C.c +++ b/src/unk_0200112C.c @@ -5,16 +5,15 @@ #include #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_020149F0_decl.h" #include "struct_defs/struct_02013A04_t.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "colored_arrow.h" #include "core_sys.h" #include "font.h" #include "heap.h" #include "text.h" -#include "unk_020149F0.h" #include "unk_02018340.h" typedef struct { @@ -30,7 +29,7 @@ typedef struct { typedef struct UnkStruct_0200112C_t { UnkStruct_ov84_02240FA8 unk_00; UnkStruct_0200112C_sub1 unk_1F; - UnkStruct_020149F0 *unk_24; + ColoredArrow *unk_24; u16 unk_28; u16 unk_2A; u8 unk_2C; @@ -54,7 +53,7 @@ BmpList *sub_0200112C(const UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 par BmpList *v0 = (BmpList *)Heap_AllocFromHeap(param3, sizeof(BmpList)); v0->unk_00 = *param0; - v0->unk_24 = sub_020149F0(param3); + v0->unk_24 = ColoredArrow_New(param3); v0->unk_28 = param1; v0->unk_2A = param2; v0->unk_2C = 0; @@ -74,7 +73,7 @@ BmpList *sub_0200112C(const UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 par v0->unk_00.unk_12 = v0->unk_00.unk_10; } - sub_02014A40(v0->unk_24, TEXT_COLOR(v0->unk_00.unk_17_4, v0->unk_00.unk_18_4, v0->unk_00.unk_18_0)); + ColoredArrow_SetColor(v0->unk_24, TEXT_COLOR(v0->unk_00.unk_17_4, v0->unk_00.unk_18_4, v0->unk_00.unk_18_0)); BGL_FillWindow(v0->unk_00.unk_0C, v0->unk_00.unk_18_0); sub_02001688(v0, v0->unk_28, 0, v0->unk_00.unk_12); sub_02001720(v0); @@ -159,7 +158,7 @@ void sub_02001384(BmpList *param0, u16 *param1, u16 *param2) *param2 = param0->unk_2A; } - sub_02014A20(param0->unk_24); + ColoredArrow_Free(param0->unk_24); Heap_FreeToHeapExplicit(param0->unk_30, param0); } @@ -362,7 +361,7 @@ static void sub_02001720(BmpList *param0) switch (param0->unk_00.unk_1A_15) { case 0: - sub_02014A58(param0->unk_24, param0->unk_00.unk_0C, v0, v1); + ColoredArrow_Print(param0->unk_24, param0->unk_00.unk_0C, v0, v1); break; case 1: break; diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index 9591f30398..2e5405bc66 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" @@ -12,6 +11,7 @@ #include "overlay061/struct_ov61_0222C884.h" +#include "colored_arrow.h" #include "core_sys.h" #include "font.h" #include "heap.h" @@ -20,12 +20,11 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "unk_020149F0.h" #include "unk_02018340.h" typedef struct UIControlData_t { UnkStruct_02081CF4 unk_00; - UnkStruct_020149F0 *unk_0C; + ColoredArrow *unk_0C; u32 unk_10; u8 unk_14; u8 unk_15; @@ -52,7 +51,7 @@ UIControlData *sub_02001AF4(const UnkStruct_02081CF4 *param0, u8 param1, u8 para UIControlData *v0 = (UIControlData *)Heap_AllocFromHeap(param4, sizeof(UIControlData)); v0->unk_00 = *param0; - v0->unk_0C = sub_020149F0(param4); + v0->unk_0C = ColoredArrow_New(param4); v0->unk_10 = param5; v0->unk_15 = param3; v0->unk_16 = sub_02001F1C(v0); @@ -87,7 +86,7 @@ void sub_02001BC4(UIControlData *param0, u8 *param1) *param1 = param0->unk_15; } - sub_02014A20(param0->unk_0C); + ColoredArrow_Free(param0->unk_0C); Heap_FreeToHeapExplicit(param0->unk_1C, param0); } @@ -367,7 +366,7 @@ static void sub_02001FE8(UIControlData *param0) } sub_02002018(param0, &v0, &v1, param0->unk_15); - sub_02014A58(param0->unk_0C, param0->unk_00.unk_04, v0, v1); + ColoredArrow_Print(param0->unk_0C, param0->unk_00.unk_04, v0, v1); } static void sub_02002018(UIControlData *param0, u8 *param1, u8 *param2, u8 param3) diff --git a/src/unk_020149F0.c b/src/unk_020149F0.c deleted file mode 100644 index d69aafbc69..0000000000 --- a/src/unk_020149F0.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "unk_020149F0.h" - -#include -#include - -#include "struct_decls/struct_020149F0_decl.h" -#include "struct_defs/struct_0205AA50.h" - -#include "heap.h" -#include "strbuf.h" -#include "text.h" -#include "unk_02018340.h" - -struct UnkStruct_020149F0_t { - TextColor unk_00; - Strbuf *unk_04; -}; - -UnkStruct_020149F0 *sub_020149F0(u32 param0) -{ - static const u16 v0[] = { - 0x11f, - 0xffff - }; - UnkStruct_020149F0 *v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020149F0)); - - if (v1) { - v1->unk_00 = TEXT_COLOR(1, 2, 15); - v1->unk_04 = Strbuf_Init(4, param0); - Strbuf_CopyChars(v1->unk_04, v0); - } - - return v1; -} - -void sub_02014A20(UnkStruct_020149F0 *param0) -{ - GF_ASSERT(param0 != NULL); - - if (param0) { - if (param0->unk_04) { - Strbuf_Free(param0->unk_04); - } - - Heap_FreeToHeap(param0); - } -} - -void sub_02014A40(UnkStruct_020149F0 *param0, TextColor param1) -{ - GF_ASSERT(param0 != NULL); - - if (param0) { - param0->unk_00 = param1; - } -} - -void sub_02014A58(const UnkStruct_020149F0 *param0, Window *param1, u32 param2, u32 param3) -{ - Text_AddPrinterWithParamsAndColor(param1, FONT_SYSTEM, param0->unk_04, param2, param3, TEXT_SPEED_NO_TRANSFER, param0->unk_00, NULL); - sub_0201ACCC(param1); -} diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 1b7ab43ca6..8a586d71ed 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/pokemon_summary.h" @@ -16,6 +15,7 @@ #include "overlay005/ov5_021D0D80.h" #include "bag.h" +#include "colored_arrow.h" #include "comm_player_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -38,7 +38,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_020149F0.h" #include "unk_02018340.h" #include "unk_0202602C.h" #include "unk_0202D778.h" @@ -76,7 +75,7 @@ typedef struct { Window unk_54; Window unk_64; TrainerInfo *unk_74; - UnkStruct_020149F0 *unk_78; + ColoredArrow *unk_78; Window *unk_7C; u8 unk_80; s8 unk_81; @@ -678,7 +677,7 @@ void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1) Window_Init(&v0->unk_54); Window_Init(&v0->unk_64); - v0->unk_78 = sub_020149F0(11); + v0->unk_78 = ColoredArrow_New(11); v0->unk_88 = sub_0203895C(); v0->unk_4C = NULL; v0->unk_48 = NULL; @@ -733,7 +732,7 @@ static void sub_0205AC28(UnkStruct_0205A0D8 *param0) StringTemplate_Free(param0->unk_28); Strbuf_Free(param0->unk_0C); Strbuf_Free(param0->unk_10); - sub_02014A20(param0->unk_78); + ColoredArrow_Free(param0->unk_78); sub_0205AAA0(param0, 1); } @@ -893,7 +892,7 @@ static void sub_0205ADF8(UnkStruct_0205A0D8 *param0, int param1) } BGL_WindowColor(v0, 15, 0, 0, 16, v0->unk_08 * 8); - sub_02014A58(param0->unk_78, ¶m0->unk_54, 0, param1 * 16); + ColoredArrow_Print(param0->unk_78, ¶m0->unk_54, 0, param1 * 16); Window_Show(¶m0->unk_54, 0, 1, 11); param0->unk_81 = param1; @@ -923,7 +922,7 @@ static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1) param0->unk_81 = param1; BGL_WindowColor(v0, 15, 0, 0, 16, v0->unk_08 * 8); - sub_02014A58(param0->unk_78, param0->unk_7C, 0, param1 * 16); + ColoredArrow_Print(param0->unk_78, param0->unk_7C, 0, param1 * 16); Window_Show(param0->unk_7C, 0, 1, 11); } @@ -960,7 +959,7 @@ static int sub_0205AFE4(UnkStruct_0205A0D8 *param0) Sound_PlayEffect(1500); BGL_WindowColor(param0->unk_7C, 15, 0, 0, 16, param0->unk_7C->unk_08 * 8); - sub_02014A58(param0->unk_78, param0->unk_7C, 0, param0->unk_81 * 16); + ColoredArrow_Print(param0->unk_78, param0->unk_7C, 0, param0->unk_81 * 16); sub_0201ACCC(param0->unk_7C); return 0; diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index 9b4021b243..b4b1835a2b 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -3,7 +3,6 @@ #include #include -#include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_defs/sentence.h" @@ -12,6 +11,7 @@ #include "field/field_system.h" #include "overlay005/ov5_021D0D80.h" +#include "colored_arrow.h" #include "core_sys.h" #include "heap.h" #include "message.h" @@ -22,7 +22,6 @@ #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "unk_020149F0.h" #include "unk_02014A84.h" #include "unk_02018340.h" #include "unk_0202D05C.h" @@ -37,7 +36,7 @@ typedef struct { Strbuf *unk_08; StringTemplate *unk_0C; MessageLoader *unk_10; - UnkStruct_020149F0 *unk_14; + ColoredArrow *unk_14; Window unk_18; Window unk_28; Window unk_38; @@ -73,7 +72,7 @@ void sub_0209ACF4(TaskManager *param0) v1->unk_08 = Strbuf_Init(400, 32); v1->unk_0C = StringTemplate_Default(32); v1->unk_10 = MessageLoader_Init(1, 26, 420, 32); - v1->unk_14 = sub_020149F0(32); + v1->unk_14 = ColoredArrow_New(32); v1->unk_50 = sub_0209747C(2, 0, v1->fieldSystem->saveData, 32); sub_02097520(v1->unk_50); @@ -89,7 +88,7 @@ void sub_0209ACF4(TaskManager *param0) static void sub_0209AD84(UnkStruct_0209AD84 *param0) { sub_020974EC(param0->unk_50); - sub_02014A20(param0->unk_14); + ColoredArrow_Free(param0->unk_14); Strbuf_Free(param0->unk_04); Strbuf_Free(param0->unk_08); StringTemplate_Free(param0->unk_0C); @@ -308,7 +307,7 @@ static void sub_0209B12C(UnkStruct_0209AD84 *param0) Text_AddPrinterWithParams(v0, FONT_SYSTEM, param0->unk_08, 12, v1 * 16, TEXT_SPEED_NO_TRANSFER, NULL); } - sub_02014A58(param0->unk_14, v0, 0, 0); + ColoredArrow_Print(param0->unk_14, v0, 0, 0); } param0->unk_68 = v0; @@ -340,7 +339,7 @@ static void sub_0209B1D8(UnkStruct_0209AD84 *param0) Text_AddPrinterWithParams(v0, FONT_SYSTEM, param0->unk_08, 12, v1 * 16, TEXT_SPEED_NO_TRANSFER, NULL); } - sub_02014A58(param0->unk_14, v0, 0, 0); + ColoredArrow_Print(param0->unk_14, v0, 0, 0); } param0->unk_68 = v0; @@ -400,7 +399,7 @@ static int sub_0209B288(UnkStruct_0209AD84 *param0) { BGL_WindowColor(param0->unk_68, 15, 0, 0, 12, param0->unk_68->unk_08 * 8); - sub_02014A58(param0->unk_14, param0->unk_68, 0, param0->unk_5C * 16); + ColoredArrow_Print(param0->unk_14, param0->unk_68, 0, param0->unk_5C * 16); sub_0201ACCC(param0->unk_68); Sound_PlayEffect(1500); }