From 033cb66335f847c909528e99c34d04c5ad66542e Mon Sep 17 00:00:00 2001 From: Akashi Akira Date: Tue, 9 May 2023 03:17:29 +0100 Subject: [PATCH] string_control_code --- arm9/arm9.lsf | 2 +- arm9/src/font.c | 4 ++-- arm9/src/mail_message.c | 6 ++--- arm9/src/render_text.c | 2 +- arm9/src/script_buffers.c | 23 +++++++++---------- .../{unk_0201B8B8.c => string_control_code.c} | 2 +- arm9/src/unk_02021590.c | 6 ++--- .../{unk_0201B8B8.h => string_control_code.h} | 6 ++--- 8 files changed, 25 insertions(+), 26 deletions(-) rename arm9/src/{unk_0201B8B8.c => string_control_code.c} (94%) rename include/{unk_0201B8B8.h => string_control_code.h} (62%) diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 3a60013b5..9cf88cdc6 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -58,7 +58,7 @@ Static arm9 Object unk_0201B1A8.o Object unk_0201B4E8.o Object unk_0201B6D0.o - Object unk_0201B8B8.o + Object string_control_code.o Object math_util.o Object text.o Object unk_0201C24C.o diff --git a/arm9/src/font.c b/arm9/src/font.c index a0d1057b2..4018d1027 100644 --- a/arm9/src/font.c +++ b/arm9/src/font.c @@ -4,9 +4,9 @@ #include "graphic/font.naix" #include "render_text.h" #include "string16.h" -#include "unk_02021590.h" +#include "string_control_code.h" #include "text.h" -#include "unk_0201B8B8.h" +#include "unk_02021590.h" struct UnkStruct_02002C14 *UNK_02106FC8; diff --git a/arm9/src/mail_message.c b/arm9/src/mail_message.c index 751a3ff0a..d8c1ac710 100644 --- a/arm9/src/mail_message.c +++ b/arm9/src/mail_message.c @@ -1,9 +1,9 @@ #include "global.h" -#include "msgdata.h" -#include "script_buffers.h" -#include "unk_0201B8B8.h" #include "mail_message.h" +#include "msgdata.h" #include "msgdata/msg.naix" +#include "script_buffers.h" +#include "string_control_code.h" #pragma thumb on diff --git a/arm9/src/render_text.c b/arm9/src/render_text.c index b62964a22..2c9986d7d 100644 --- a/arm9/src/render_text.c +++ b/arm9/src/render_text.c @@ -3,10 +3,10 @@ #include "constants/sndseq.h" #include "font.h" #include "game_init.h" +#include "string_control_code.h" #include "string_util.h" #include "text.h" #include "unk_020051F4.h" -#include "unk_0201B8B8.h" u16 unk00; diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 37df6a71f..4f74b3aac 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -1,21 +1,20 @@ #include "global.h" +#include "script_buffers.h" +#include "filesystem.h" +#include "graphic/font.naix" #include "heap.h" -#include "string16.h" -#include "player_data.h" #include "msgdata.h" +#include "msgdata/msg.naix" +#include "player_data.h" #include "pokemon.h" #include "pokemon_storage_system.h" -#include "unk_02015CC0.h" -#include "unk_020286F8.h" -#include "filesystem.h" -#include "unk_0201B8B8.h" -#include "trainer_data.h" -#include "script_buffers.h" -#include "unk_02024E64.h" -#include "text.h" #include "string16.h" -#include "msgdata/msg.naix" -#include "graphic/font.naix" +#include "string_control_code.h" +#include "text.h" +#include "trainer_data.h" +#include "unk_02015CC0.h" +#include "unk_02024E64.h" +#include "unk_020286F8.h" #pragma thumb on diff --git a/arm9/src/unk_0201B8B8.c b/arm9/src/string_control_code.c similarity index 94% rename from arm9/src/unk_0201B8B8.c rename to arm9/src/string_control_code.c index b8e978f27..14b49be67 100644 --- a/arm9/src/unk_0201B8B8.c +++ b/arm9/src/string_control_code.c @@ -1,5 +1,5 @@ #include "global.h" -#include "unk_0201B8B8.h" +#include "string_control_code.h" #pragma thumb on diff --git a/arm9/src/unk_02021590.c b/arm9/src/unk_02021590.c index c37ce589c..9a9f1cb34 100644 --- a/arm9/src/unk_02021590.c +++ b/arm9/src/unk_02021590.c @@ -1,8 +1,8 @@ #include "global.h" -#include "heap.h" -#include "filesystem.h" #include "unk_02021590.h" -#include "unk_0201B8B8.h" +#include "filesystem.h" +#include "heap.h" +#include "string_control_code.h" #include "string_util.h" static const u8 sGlyphShapes[][2] = { diff --git a/include/unk_0201B8B8.h b/include/string_control_code.h similarity index 62% rename from include/unk_0201B8B8.h rename to include/string_control_code.h index 26dd80174..55bab2266 100644 --- a/include/unk_0201B8B8.h +++ b/include/string_control_code.h @@ -1,9 +1,9 @@ -#ifndef POKEDIAMOND_UNK_0201B8B88_H -#define POKEDIAMOND_UNK_0201B8B88_H +#ifndef POKEDIAMOND_STRING_CONTROL_CODE_H +#define POKEDIAMOND_STRING_CONTROL_CODE_H const u16 * MsgArray_SkipControlCode(const u16 * r4); u32 MsgArray_GetControlCode(const u16 * r4); BOOL MsgArray_ControlCodeIsStrVar(const u16 * r4); u32 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4); -#endif //POKEDIAMOND_UNK_0201B8B88_H +#endif //POKEDIAMOND_STRING_CONTROL_CODE_H