summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/render_text.c60
-rw-r--r--arm9/src/scrcmd_sound.c5
-rw-r--r--arm9/src/text_02054590.c6
-rw-r--r--arm9/src/unk_0206015C.c6
4 files changed, 38 insertions, 39 deletions
diff --git a/arm9/src/render_text.c b/arm9/src/render_text.c
index d28fb946..42333278 100644
--- a/arm9/src/render_text.c
+++ b/arm9/src/render_text.c
@@ -173,7 +173,7 @@ THUMB_FUNC u32 RenderText(struct TextPrinter *printer)
}
printer->state = 2;
- FUN_0200284C(printer);
+ TextPrinterInitDownArrowCounters(printer);
printer->printerTemplate.currentChar.raw =
MsgArray_SkipControlCode(printer->printerTemplate.currentChar.raw);
@@ -181,7 +181,7 @@ THUMB_FUNC u32 RenderText(struct TextPrinter *printer)
}
printer->state = 3;
- FUN_0200284C(printer);
+ TextPrinterInitDownArrowCounters(printer);
printer->printerTemplate.currentChar.raw =
MsgArray_SkipControlCode(printer->printerTemplate.currentChar.raw);
@@ -194,12 +194,12 @@ THUMB_FUNC u32 RenderText(struct TextPrinter *printer)
case 0x25BC:
printer->state = 2;
- FUN_0200284C(printer);
+ TextPrinterInitDownArrowCounters(printer);
return 3;
case 0x25BD:
printer->state = 3;
- FUN_0200284C(printer);
+ TextPrinterInitDownArrowCounters(printer);
return 3;
}
@@ -216,18 +216,18 @@ THUMB_FUNC u32 RenderText(struct TextPrinter *printer)
return 0;
case 1:
- if (FUN_02002B3C(printer) != 0)
+ if (TextPrinterWait(printer) != 0)
{
- FUN_02002A00(printer);
+ TextPrinterClearDownArrow(printer);
printer->state = 0;
}
return 3;
case 2:
- if (FUN_02002B18(printer) != 0)
+ if (TextPrinterWaitWithDownArrow(printer) != 0)
{
- FUN_02002A00(printer);
+ TextPrinterClearDownArrow(printer);
FillWindowPixelBuffer(
printer->printerTemplate.window, printer->printerTemplate.bgColor);
printer->printerTemplate.currentX = printer->printerTemplate.x;
@@ -237,9 +237,9 @@ THUMB_FUNC u32 RenderText(struct TextPrinter *printer)
return 3;
case 3:
- if (FUN_02002B18(printer) != 0)
+ if (TextPrinterWaitWithDownArrow(printer) != 0)
{
- FUN_02002A00(printer);
+ TextPrinterClearDownArrow(printer);
printer->scrollDistance = (u8)(GetFontAttribute(printer->printerTemplate.fontId, 1) +
printer->printerTemplate.lineSpacing);
printer->printerTemplate.currentX = printer->printerTemplate.x;
@@ -300,7 +300,7 @@ THUMB_FUNC void FUN_02002840(u16 flag)
unk00 = flag;
}
-THUMB_FUNC void FUN_0200284C(struct TextPrinter *printer)
+THUMB_FUNC void TextPrinterInitDownArrowCounters(struct TextPrinter *printer)
{
struct TextPrinterSubStruct *subStruct =
(struct TextPrinterSubStruct *)(&printer->subStructFields);
@@ -315,7 +315,7 @@ THUMB_FUNC void FUN_0200284C(struct TextPrinter *printer)
subStruct->downArrowDelay = 0;
}
-THUMB_FUNC void FUN_02002878(struct TextPrinter *printer)
+THUMB_FUNC void TextPrinterDrawDownArrow(struct TextPrinter *printer)
{
struct TextPrinterSubStruct *subStruct =
(struct TextPrinterSubStruct *)(&printer->subStructFields);
@@ -376,7 +376,7 @@ THUMB_FUNC void FUN_02002878(struct TextPrinter *printer)
subStruct->downArrowYPosIdx++;
}
-THUMB_FUNC void FUN_02002A00(struct TextPrinter *printer)
+THUMB_FUNC void TextPrinterClearDownArrow(struct TextPrinter *printer)
{
u8 bg_id = GetWindowBgId(printer->printerTemplate.window);
u8 x = GetWindowX(printer->printerTemplate.window);
@@ -403,64 +403,64 @@ THUMB_FUNC void FUN_02002A00(struct TextPrinter *printer)
BgCommitTilemapBufferToVram(printer->printerTemplate.window->bgConfig, bg_id);
}
-extern void FUN_020054C8(u16);
+extern void PlaySE(u16);
-THUMB_FUNC u32 FUN_02002A94(struct TextPrinter *printer)
+THUMB_FUNC BOOL TextPrinterContinue(struct TextPrinter *printer)
{
#pragma unused(printer)
if ((gMain.newKeys & 3) != 0 || (gMain.touchNew != 0 && gTextFlags.unk0_4 != 0))
{
- FUN_020054C8(0x5DC);
+ PlaySE(0x5DC);
gTextFlags.unk0_7 = 1;
- return 1;
+ return TRUE;
}
- return 0;
+ return FALSE;
}
-THUMB_FUNC u32 FUN_02002ADC(struct TextPrinter *printer)
+THUMB_FUNC BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer)
{
struct TextPrinterSubStruct *subStruct =
(struct TextPrinterSubStruct *)(&printer->subStructFields);
if (subStruct->autoScrollDelay == 100)
{
- return 1;
+ return TRUE;
}
subStruct->autoScrollDelay++;
if (gTextFlags.unk0_5)
{
- return FUN_02002A94(printer);
+ return TextPrinterContinue(printer);
}
- return 0;
+ return FALSE;
}
-THUMB_FUNC u32 FUN_02002B18(struct TextPrinter *printer)
+THUMB_FUNC BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer)
{
if (gTextFlags.autoScroll)
{
- return FUN_02002ADC(printer);
+ return TextPrinterWaitAutoMode(printer);
}
- FUN_02002878(printer);
+ TextPrinterDrawDownArrow(printer);
- return FUN_02002A94(printer);
+ return TextPrinterContinue(printer);
}
-THUMB_FUNC u8 FUN_02002B3C(struct TextPrinter *printer)
+THUMB_FUNC u8 TextPrinterWait(struct TextPrinter *printer)
{
if (gTextFlags.autoScroll)
{
- return (u8)FUN_02002ADC(printer);
+ return (u8)TextPrinterWaitAutoMode(printer);
}
- return (u8)FUN_02002A94(printer);
+ return (u8)TextPrinterContinue(printer);
}
-THUMB_FUNC void FUN_02002B60(u32 param0)
+THUMB_FUNC void TextFlags_SetCanABSpeedUpPrint(BOOL param0)
{
gTextFlags.canABSpeedUpPrint = param0;
}
diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c
index ec5ab7f8..1251c612 100644
--- a/arm9/src/scrcmd_sound.c
+++ b/arm9/src/scrcmd_sound.c
@@ -18,7 +18,7 @@ extern void FUN_0200538C(u32, u16, u32);
extern void FUN_020053CC(u16, u16);
extern BOOL FUN_02005404(void);
extern u16 FUN_02005410(u16);
-extern void FUN_020054C8(u16);
+extern void PlaySE(u16);
extern void FUN_020054F0(u16, u32);
extern void FUN_020047C8(u8, u8);
extern void FUN_020040F4(u8);
@@ -123,7 +123,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0058(struct ScriptContext* ctx)
THUMB_FUNC BOOL ScrCmd_PlayFanfare(struct ScriptContext* ctx)
{
u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
- FUN_020054C8(unk);
+ PlaySE(unk);
return FALSE;
}
@@ -263,4 +263,3 @@ THUMB_FUNC BOOL ScrCmd_SetVolume(struct ScriptContext* ctx)
return FALSE;
}
-
diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c
index d4984f78..766862f1 100644
--- a/arm9/src/text_02054590.c
+++ b/arm9/src/text_02054590.c
@@ -10,7 +10,7 @@ extern void FUN_0200CD68(
struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
extern void FUN_0200D0BC(struct Window *param0, u32 param1, u32 param2, u32 param3);
-extern void FUN_02002B60(u8 param0);
+extern void TextFlags_SetCanABSpeedUpPrint(u8 param0);
extern void FUN_02002B7C(u32 param0);
extern void FUN_02002BB8(u32 param0);
@@ -59,7 +59,7 @@ THUMB_FUNC void FUN_0205464C(struct Window *param0)
THUMB_FUNC u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3)
{
- FUN_02002B60(param3);
+ TextFlags_SetCanABSpeedUpPrint(param3);
FUN_02002B7C(0);
FUN_02002BB8(0);
return AddTextPrinterParameterized(window, 1, str, 0, 0, (u32)Options_GetTextFrameDelay(options), NULL);
@@ -67,7 +67,7 @@ THUMB_FUNC u16 FUN_02054658(struct Window * window, struct String *str, struct O
THUMB_FUNC u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5)
{
- FUN_02002B60(a4);
+ TextFlags_SetCanABSpeedUpPrint(a4);
FUN_02002B7C(a5);
FUN_02002BB8(0);
return AddTextPrinterParameterized(window, fontId, str, 0, 0, speed, NULL);
diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c
index a217f52c..0bf3a15a 100644
--- a/arm9/src/unk_0206015C.c
+++ b/arm9/src/unk_0206015C.c
@@ -21,7 +21,7 @@ extern THUMB_FUNC void MOD06_02245190(u32);
extern THUMB_FUNC void MOD06_02245198(u8, u32);
extern THUMB_FUNC u32 MOD06_022451F0(u32);
-extern THUMB_FUNC void FUN_020054C8(u32);
+extern THUMB_FUNC void PlaySE(u32);
extern THUMB_FUNC void FUN_02049160(struct UnkStruct_0204639C*, u32);
extern THUMB_FUNC void FUN_0204AF84(struct UnkStruct_0204639C*);
extern THUMB_FUNC void FUN_0204AF3C(struct UnkStruct_0204639C *);
@@ -97,7 +97,7 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0)
MOD06_02244DC4(unkStruct1->unk0, unkAddr);
MOD06_02244EF8(unkStruct1->unk0);
unkStruct1->unkE = 0;
- FUN_020054C8(1657);
+ PlaySE(1657);
FUN_0204C1B4(unkStruct0, 0x3, 0x11, 0x0000FFFF, 0, 6, 1, 0xb);
unkStruct1->action = 5;
}
@@ -117,7 +117,7 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0)
MOD06_02245198(unkStruct1->unkD, unkStruct1->unk4);
unkStruct1->unk8 = MOD06_022451F0(unkStruct1->unk4);
- FUN_020054C8(1657);
+ PlaySE(1657);
FUN_0204C1B4(unkStruct0, 0x3, 0x10, 0x0000FFFF, 0, 6, 1, 0xb);
unkStruct1->action = 6;
break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 00:24:12 +0000