From 7f48f7faf356947746fef065cfbec425011cbe29 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 25 Oct 2024 08:44:20 -0700 Subject: [PATCH] Identify unk_020021B0 -> charcode_util --- include/{unk_020021B0.h => charcode_util.h} | 6 +++--- platinum.us/main.lsf | 2 +- src/battle/battle_lib.c | 2 +- src/{unk_020021B0.c => charcode_util.c} | 2 +- src/meson.build | 2 +- src/overlay006/ov6_02246444.c | 2 +- src/overlay059/ov59_021D2B44.c | 2 +- src/overlay088/ov88_0223B140.c | 2 +- src/overlay094/ov94_022414B8.c | 2 +- src/overlay104/ov104_0222DCE0.c | 2 +- src/pokemon.c | 2 +- src/trainer_data.c | 2 +- src/trainer_info.c | 2 +- src/unk_0200C440.c | 2 +- src/unk_02027F84.c | 2 +- src/unk_02028124.c | 2 +- src/unk_0202B37C.c | 2 +- src/unk_0202E840.c | 2 +- src/unk_02030A80.c | 2 +- src/unk_02030CE8.c | 2 +- src/unk_02051D8C.c | 2 +- src/unk_0206CCB0.c | 2 +- src/unk_02071D40.c | 2 +- src/unk_0207A6DC.c | 2 +- src/unk_0208694C.c | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) rename include/{unk_020021B0.h => charcode_util.h} (79%) rename src/{unk_020021B0.c => charcode_util.c} (98%) diff --git a/include/unk_020021B0.h b/include/charcode_util.h similarity index 79% rename from include/unk_020021B0.h rename to include/charcode_util.h index bd34c1697..427cd969a 100644 --- a/include/unk_020021B0.h +++ b/include/charcode_util.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_020021B0_H -#define POKEPLATINUM_UNK_020021B0_H +#ifndef POKEPLATINUM_CHARCODE_UTIL_H +#define POKEPLATINUM_CHARCODE_UTIL_H u16 *GF_strcpy(u16 *param0, const u16 *param1); u16 *sub_020021D0(u16 *param0, const u16 *param1, u32 param2); @@ -10,4 +10,4 @@ u16 *sub_02002278(u16 *param0, u16 param1, u32 param2); u16 *sub_02002294(u16 *param0, u32 param1); u16 *sub_020022A4(u16 *param0, s32 param1, u32 param2, u32 param3); -#endif // POKEPLATINUM_UNK_020021B0_H +#endif // POKEPLATINUM_CHARCODE_UTIL_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 81824aefb..0b31872d5 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -19,7 +19,7 @@ Static main Object main.nef.p/src_unk_0200112C.c.o Object main.nef.p/src_game_version.c.o Object main.nef.p/src_unk_02001AF4.c.o - Object main.nef.p/src_unk_020021B0.c.o + Object main.nef.p/src_charcode_util.c.o Object main.nef.p/src_render_text.c.o Object main.nef.p/src_font.c.o Object main.nef.p/src_palette.c.o diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c index 610a86d68..c51ae692f 100644 --- a/src/battle/battle_lib.c +++ b/src/battle/battle_lib.c @@ -31,6 +31,7 @@ #include "battle/scripts/sub_seq.naix" #include "battle/struct_ov16_0225BFFC_decl.h" +#include "charcode_util.h" #include "flags.h" #include "heap.h" #include "item.h" @@ -43,7 +44,6 @@ #include "strbuf.h" #include "trainer_data.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_020366A0.h" #include "unk_0208C098.h" diff --git a/src/unk_020021B0.c b/src/charcode_util.c similarity index 98% rename from src/unk_020021B0.c rename to src/charcode_util.c index 00e920480..c0ac0ec81 100644 --- a/src/unk_020021B0.c +++ b/src/charcode_util.c @@ -1,4 +1,4 @@ -#include "unk_020021B0.h" +#include "charcode_util.h" #include #include diff --git a/src/meson.build b/src/meson.build index 1e6448fca..764ff7f95 100644 --- a/src/meson.build +++ b/src/meson.build @@ -17,7 +17,7 @@ pokeplatinum_c = files( 'strbuf.c', 'unk_0200112C.c', 'unk_02001AF4.c', - 'unk_020021B0.c', + 'charcode_util.c', 'render_text.c', 'font.c', 'palette.c', diff --git a/src/overlay006/ov6_02246444.c b/src/overlay006/ov6_02246444.c index d11f7c3ce..b569a4638 100644 --- a/src/overlay006/ov6_02246444.c +++ b/src/overlay006/ov6_02246444.c @@ -12,10 +12,10 @@ #include "overlay006/struct_ov6_022465F4_decl.h" #include "savedata/save_table.h" +#include "charcode_util.h" #include "heap.h" #include "save_player.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_0202E2CC.h" struct UnkStruct_ov6_022465F4_t { diff --git a/src/overlay059/ov59_021D2B44.c b/src/overlay059/ov59_021D2B44.c index 1a5bd13da..b2561fc76 100644 --- a/src/overlay059/ov59_021D2B44.c +++ b/src/overlay059/ov59_021D2B44.c @@ -9,12 +9,12 @@ #include "savedata/save_table.h" +#include "charcode_util.h" #include "communication_information.h" #include "heap.h" #include "save_player.h" #include "savedata.h" #include "trainer_info.h" -#include "unk_020021B0.h" __attribute__((aligned(4))) static const u8 Unk_ov59_021D33B0[] = { 0x2, diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index b9e3aeea9..5b45d6853 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -25,6 +25,7 @@ #include "bag.h" #include "bg_window.h" #include "cell_actor.h" +#include "charcode_util.h" #include "communication_information.h" #include "communication_system.h" #include "core_sys.h" @@ -55,7 +56,6 @@ #include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" -#include "unk_020021B0.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006224.h" diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 2dd54efbc..0df655bea 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -25,6 +25,7 @@ #include "overlay094/struct_ov94_02242AAC.h" #include "bg_window.h" +#include "charcode_util.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -40,7 +41,6 @@ #include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" -#include "unk_020021B0.h" #include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index ed1b67ed4..51cbf4fed 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -15,6 +15,7 @@ #include "overlay104/struct_ov104_0223A348_sub2.h" #include "cell_actor.h" +#include "charcode_util.h" #include "communication_information.h" #include "communication_system.h" #include "flags.h" @@ -29,7 +30,6 @@ #include "strbuf.h" #include "string_template.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_0201D15C.h" #include "unk_0202C858.h" #include "unk_02038F8C.h" diff --git a/src/pokemon.c b/src/pokemon.c index bf44123e1..0a686ecf2 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -33,6 +33,7 @@ #include "overlay005/struct_ov5_021DE5D0.h" #include "cell_actor.h" +#include "charcode_util.h" #include "flags.h" #include "heap.h" #include "inlines.h" @@ -48,7 +49,6 @@ #include "strbuf.h" #include "trainer_data.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_02005474.h" #include "unk_02006224.h" #include "unk_0200C6E4.h" diff --git a/src/trainer_data.c b/src/trainer_data.c index 020ec2490..9c789603b 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -10,6 +10,7 @@ #include "data/trainer_class_genders.h" #include "overlay006/battle_params.h" +#include "charcode_util.h" #include "heap.h" #include "message.h" #include "narc.h" @@ -19,7 +20,6 @@ #include "savedata_misc.h" #include "strbuf.h" #include "trainer_data.h" -#include "unk_020021B0.h" #include "unk_0201D15C.h" static void TrainerData_BuildParty(BattleParams *battleParams, int battler, int heapID); diff --git a/src/trainer_info.c b/src/trainer_info.c index 9897b2c70..6c119d921 100644 --- a/src/trainer_info.c +++ b/src/trainer_info.c @@ -5,9 +5,9 @@ #include "constants/charcode.h" +#include "charcode_util.h" #include "heap.h" #include "strbuf.h" -#include "unk_020021B0.h" #define MONEY_MAX 999999 diff --git a/src/unk_0200C440.c b/src/unk_0200C440.c index 447923129..c1e8114b3 100644 --- a/src/unk_0200C440.c +++ b/src/unk_0200C440.c @@ -4,9 +4,9 @@ #include #include "bg_window.h" +#include "charcode_util.h" #include "graphics.h" #include "heap.h" -#include "unk_020021B0.h" typedef struct UnkStruct_0200C440_t { void *unk_00; diff --git a/src/unk_02027F84.c b/src/unk_02027F84.c index 7f64d73fc..11b68f53e 100644 --- a/src/unk_02027F84.c +++ b/src/unk_02027F84.c @@ -5,9 +5,9 @@ #include "struct_defs/struct_02027F8C.h" +#include "charcode_util.h" #include "heap.h" #include "savedata.h" -#include "unk_020021B0.h" int PalPad_SaveSize(void) { diff --git a/src/unk_02028124.c b/src/unk_02028124.c index 3519c05dc..c5a5650b9 100644 --- a/src/unk_02028124.c +++ b/src/unk_02028124.c @@ -9,6 +9,7 @@ #include "struct_defs/struct_02028430.h" #include "struct_defs/union_02028328.h" +#include "charcode_util.h" #include "heap.h" #include "party.h" #include "pokemon.h" @@ -16,7 +17,6 @@ #include "save_player.h" #include "savedata.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_02014A84.h" static int sub_020284E8(UnkStruct_0202818C *param0, int param1); diff --git a/src/unk_0202B37C.c b/src/unk_0202B37C.c index 6614be5d1..cb2693a90 100644 --- a/src/unk_0202B37C.c +++ b/src/unk_0202B37C.c @@ -6,9 +6,9 @@ #include "struct_defs/struct_0202B4A0.h" #include "struct_defs/struct_0202B510.h" +#include "charcode_util.h" #include "savedata.h" #include "strbuf.h" -#include "unk_020021B0.h" #include "unk_0201D15C.h" UnkStruct_0202B4A0 *Unk_021C079C; diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c index 597493e1a..48030a426 100644 --- a/src/unk_0202E840.c +++ b/src/unk_0202E840.c @@ -12,13 +12,13 @@ #include "struct_defs/struct_0202EA80.h" #include "struct_defs/struct_0202EE10.h" +#include "charcode_util.h" #include "game_records.h" #include "heap.h" #include "save_player.h" #include "savedata.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_0202B37C.h" #include "unk_0203061C.h" diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index f685cc483..0b6b69a6b 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -9,6 +9,7 @@ #include "struct_defs/struct_0202F298_sub1.h" #include "struct_defs/struct_02030A80.h" +#include "charcode_util.h" #include "heap.h" #include "pokemon.h" #include "save_player.h" @@ -16,7 +17,6 @@ #include "savedata_misc.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_02014A84.h" #include "unk_02014D38.h" #include "unk_02025CB0.h" diff --git a/src/unk_02030CE8.c b/src/unk_02030CE8.c index 95882e218..4ffb47cf9 100644 --- a/src/unk_02030CE8.c +++ b/src/unk_02030CE8.c @@ -8,10 +8,10 @@ #include "overlay096/struct_ov96_0223B574.h" +#include "charcode_util.h" #include "save_player.h" #include "savedata.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_0201D15C.h" #include "unk_0202C858.h" diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 710823154..924ecd37d 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -22,6 +22,7 @@ #include "savedata/save_table.h" #include "bag.h" +#include "charcode_util.h" #include "communication_system.h" #include "core_sys.h" #include "field_overworld_state.h" @@ -40,7 +41,6 @@ #include "savedata.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_02025CB0.h" #include "unk_0202602C.h" #include "unk_0202631C.h" diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index 311b12339..9ff9f447f 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -34,6 +34,7 @@ #include "savedata/save_table.h" #include "bag.h" +#include "charcode_util.h" #include "field_system.h" #include "heap.h" #include "inlines.h" @@ -48,7 +49,6 @@ #include "strbuf.h" #include "string_template.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_0201D15C.h" #include "unk_0202631C.h" #include "unk_02027B70.h" diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 68987f541..93c6c4daf 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -14,6 +14,7 @@ #include "field/field_system.h" +#include "charcode_util.h" #include "field_system.h" #include "game_records.h" #include "heap.h" @@ -21,7 +22,6 @@ #include "save_player.h" #include "savedata.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_0202631C.h" #include "unk_0202854C.h" #include "unk_0202C7FC.h" diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c index 7a83bd2c7..3127a43f8 100644 --- a/src/unk_0207A6DC.c +++ b/src/unk_0207A6DC.c @@ -19,13 +19,13 @@ #include "battle/battle_io.h" #include "battle/ov16_0223DF00.h" +#include "charcode_util.h" #include "communication_system.h" #include "heap.h" #include "party.h" #include "sys_task.h" #include "sys_task_manager.h" #include "trainer_info.h" -#include "unk_020021B0.h" #include "unk_02027F84.h" #include "unk_0202CC64.h" #include "unk_0202F1D4.h" diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 1acb0fe76..082f4d1d0 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -12,6 +12,7 @@ #include "bg_window.h" #include "cell_actor.h" +#include "charcode_util.h" #include "core_sys.h" #include "font.h" #include "game_options.h" @@ -29,7 +30,6 @@ #include "string_template.h" #include "sys_task_manager.h" #include "text.h" -#include "unk_020021B0.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200679C.h"