summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/unk_02038C78.s46
-rw-r--r--arm9/global.inc46
-rw-r--r--arm9/src/scrcmd_sound.c53
-rw-r--r--include/scrcmd.h45
4 files changed, 93 insertions, 97 deletions
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index a43768aa..38588cd5 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -222,27 +222,27 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0046
.word ScrCmd_Unk0047
.word ScrCmd_Unk0048
- .word FUN_020414E0
- .word FUN_020414FC
- .word FUN_02041518
- .word FUN_02041558
- .word ScrCmd_waitcry
- .word ScrCmd_playbgm
- .word FUN_020415BC
- .word FUN_020413E8
- .word FUN_020413F8
- .word FUN_0204140C
- .word FUN_02041424
- .word FUN_0204143C
- .word FUN_02041478
- .word FUN_0204149C
- .word FUN_020414B8
- .word FUN_020414CC
- .word FUN_020415E0
- .word FUN_02041618
- .word FUN_02041644
- .word FUN_02041650
- .word FUN_02041664
+ .word ScrCmd_Unk0049
+ .word ScrCmd_Unk004A
+ .word ScrCmd_Unk004B
+ .word ScrCmd_Unk004C
+ .word ScrCmd_PlayCryWait
+ .word ScrCmd_PlayBgm
+ .word ScrCmd_Unk004F
+ .word ScrCmd_Unk0050
+ .word ScrCmd_Unk0051
+ .word ScrCmd_Unk0052
+ .word ScrCmd_Unk0053
+ .word ScrCmd_Unk0054
+ .word ScrCmd_Unk0055
+ .word ScrCmd_Unk0056
+ .word ScrCmd_Unk0057
+ .word ScrCmd_Unk0058
+ .word ScrCmd_Unk0059
+ .word ScrCmd_Unk005A
+ .word ScrCmd_Unk005B
+ .word ScrCmd_Unk005C
+ .word ScrCmd_Unk005D
.word FUN_0203AFC4
.word FUN_0203B148
.word FUN_0203B1F0
@@ -792,7 +792,7 @@ gScriptCmdTable: ; 0x020F355C
.word ScrCmd_Unk0280
.word FUN_02044A0C
.word FUN_0203F484
- .word FUN_02041674
+ .word ScrCmd_Unk0283
.word FUN_0203F4D8
.word FUN_0203F508
.word FUN_0203F5D4
@@ -835,7 +835,7 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_0203B7F0
.word FUN_0203FB4C
.word FUN_0203B790
- .word FUN_020413C0
+ .word ScrCmd_Unk02AE
.word FUN_0203FB64
.word FUN_0203FB94
.word FUN_0203FBA0
diff --git a/arm9/global.inc b/arm9/global.inc
index 91c312ad..38ec47f4 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -3196,29 +3196,29 @@
.extern FUN_02041194
.extern FUN_020411C4
.extern FUN_02041340
-.extern FUN_020413C0
-.extern FUN_020413E8
-.extern FUN_020413F8
-.extern FUN_0204140C
-.extern FUN_02041424
-.extern FUN_0204143C
-.extern FUN_02041478
-.extern FUN_0204149C
-.extern FUN_020414B8
-.extern FUN_020414CC
-.extern FUN_020414E0
-.extern FUN_020414FC
-.extern FUN_02041518
-.extern FUN_02041558
-.extern ScrCmd_waitcry
-.extern ScrCmd_playbgm
-.extern FUN_020415BC
-.extern FUN_020415E0
-.extern FUN_02041618
-.extern FUN_02041644
-.extern FUN_02041650
-.extern FUN_02041664
-.extern FUN_02041674
+.extern ScrCmd_Unk02AE
+.extern ScrCmd_Unk0050
+.extern ScrCmd_Unk0051
+.extern ScrCmd_Unk0052
+.extern ScrCmd_Unk0053
+.extern ScrCmd_Unk0054
+.extern ScrCmd_Unk0055
+.extern ScrCmd_Unk0056
+.extern ScrCmd_Unk0057
+.extern ScrCmd_Unk0058
+.extern ScrCmd_Unk0049
+.extern ScrCmd_Unk004A
+.extern ScrCmd_Unk004B
+.extern ScrCmd_Unk004C
+.extern ScrCmd_PlayCryWait
+.extern ScrCmd_PlayBgm
+.extern ScrCmd_Unk004F
+.extern ScrCmd_Unk0059
+.extern ScrCmd_Unk005A
+.extern ScrCmd_Unk005B
+.extern ScrCmd_Unk005C
+.extern ScrCmd_Unk005D
+.extern ScrCmd_Unk0283
.extern FUN_020416A8
.extern FUN_02041770
.extern FUN_020417E0
diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c
index 437c87c2..5acaae1e 100644
--- a/arm9/src/scrcmd_sound.c
+++ b/arm9/src/scrcmd_sound.c
@@ -28,46 +28,43 @@ extern BOOL FUN_02005670(void);
extern void FUN_0200488C(u16, u16);
-THUMB_FUNC BOOL FUN_020413C0(struct ScriptContext *ctx)
+THUMB_FUNC BOOL ScrCmd_Unk02AE(struct ScriptContext *ctx)
{
- u16 unk0;
- u16 *unk1;
-
- unk0 = ScriptReadHalfword(ctx);
- unk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+ u16 unk0 = ScriptReadHalfword(ctx);
+ u16 *unk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
*unk1 = FUN_02005410(unk0);
return FALSE;
}
-THUMB_FUNC BOOL FUN_020413E8(struct ScriptContext *ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0050(struct ScriptContext *ctx)
{
FUN_0200521C(ScriptReadHalfword(ctx));
return FALSE;
}
-THUMB_FUNC BOOL FUN_020413F8(struct ScriptContext *ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0051(struct ScriptContext *ctx)
{
u32 unk0 = FUN_02004124(ScriptReadHalfword(ctx));
FUN_02005350(unk0, 0);
return FALSE;
}
-THUMB_FUNC BOOL FUN_0204140C(struct ScriptContext *ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0052(struct ScriptContext *ctx)
{
u16 unk0 = FUN_0204ABA8(ctx->unk80, *ctx->unk80->mapId);
FUN_0200521C(unk0);
return FALSE;
}
-THUMB_FUNC BOOL FUN_02041424(struct ScriptContext *ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0053(struct ScriptContext *ctx)
{
FUN_0204AB20(ctx->unk80, ScriptReadHalfword(ctx));
return FALSE;
}
-THUMB_FUNC BOOL FUN_0204143C(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0054(struct ScriptContext *ctx)
{
u16 unk1 = ScriptReadHalfword(ctx);
u16 unk2 = ScriptReadHalfword(ctx);
@@ -88,7 +85,7 @@ THUMB_FUNC BOOL FUN_02041464(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL FUN_02041478(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0055(struct ScriptContext* ctx)
{
u16 unk = ScriptReadHalfword(ctx);
@@ -98,7 +95,7 @@ THUMB_FUNC BOOL FUN_02041478(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC BOOL FUN_0204149C(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0056(struct ScriptContext* ctx)
{
u8 PtrIndx0 = ScriptReadByte(ctx);
@@ -109,13 +106,13 @@ THUMB_FUNC BOOL FUN_0204149C(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL FUN_020414B8(struct ScriptContext *ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0057(struct ScriptContext* ctx)
{
FUN_02005308(4, ScriptReadHalfword(ctx));
return FALSE;
}
-THUMB_FUNC BOOL FUN_020414CC(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0058(struct ScriptContext* ctx)
{
u8 PtrIndx0 = ScriptReadByte(ctx);
FUN_020040F4(PtrIndx0);
@@ -123,21 +120,21 @@ THUMB_FUNC BOOL FUN_020414CC(struct ScriptContext* ctx)
}
-THUMB_FUNC BOOL FUN_020414E0(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0049(struct ScriptContext* ctx)
{
u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
FUN_020054C8(unk);
return FALSE;
}
-THUMB_FUNC BOOL FUN_020414FC(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk004A(struct ScriptContext* ctx)
{
u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
FUN_020054F0(unk, 0);
return FALSE;
}
-THUMB_FUNC BOOL FUN_02041518(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk004B(struct ScriptContext* ctx)
{
u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -155,7 +152,7 @@ THUMB_FUNC BOOL FUN_02041540(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL FUN_02041558(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk004C(struct ScriptContext* ctx)
{
u16 unk0 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
u16 unused = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
@@ -163,7 +160,7 @@ THUMB_FUNC BOOL FUN_02041558(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_waitcry(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_PlayCryWait(struct ScriptContext* ctx)
{
SetupNativeScript(ctx, FUN_02041598);
return TRUE;
@@ -179,7 +176,7 @@ THUMB_FUNC BOOL FUN_02041598(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL ScrCmd_playbgm(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_PlayBgm(struct ScriptContext* ctx)
{
u16 bgm_id = ScriptReadHalfword(ctx);
PlayBGM(bgm_id);
@@ -187,7 +184,7 @@ THUMB_FUNC BOOL ScrCmd_playbgm(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL FUN_020415BC(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk004F(struct ScriptContext* ctx)
{
SetupNativeScript(ctx, FUN_020415CC);
return TRUE;
@@ -202,7 +199,7 @@ THUMB_FUNC BOOL FUN_020415CC(struct ScriptContext* ctx)
return FALSE;
}
-THUMB_FUNC BOOL FUN_020415E0(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0059(struct ScriptContext* ctx)
{
u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
@@ -219,7 +216,7 @@ THUMB_FUNC BOOL FUN_020415E0(struct ScriptContext* ctx)
}
}
-THUMB_FUNC BOOL FUN_02041618(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk005A(struct ScriptContext* ctx)
{
u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
@@ -235,14 +232,14 @@ THUMB_FUNC BOOL FUN_02041618(struct ScriptContext* ctx)
}
}
-THUMB_FUNC BOOL FUN_02041644(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk005B(struct ScriptContext* ctx)
{
#pragma unused(ctx)
FUN_02005E64();
return TRUE;
}
-THUMB_FUNC BOOL FUN_02041650(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk005C(struct ScriptContext* ctx)
{
void* unk = FUN_02029EF8(ctx->unk80->saveBlock2);
FUN_02005E6C(unk);
@@ -250,14 +247,14 @@ THUMB_FUNC BOOL FUN_02041650(struct ScriptContext* ctx)
return TRUE;
}
-THUMB_FUNC BOOL FUN_02041664(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk005D(struct ScriptContext* ctx)
{
#pragma unused(ctx)
FUN_0200433C(0x3F, 0, 0);
return TRUE;
}
-THUMB_FUNC BOOL FUN_02041674(struct ScriptContext* ctx)
+THUMB_FUNC BOOL ScrCmd_Unk0283(struct ScriptContext* ctx)
{
u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
u16 unk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
diff --git a/include/scrcmd.h b/include/scrcmd.h
index 6d52972d..c246279d 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -151,33 +151,32 @@ BOOL ScrCmd_GetSealNamePlural(struct ScriptContext* ctx);
BOOL ScrCmd_CapitalizeFirstChar(struct ScriptContext* ctx);
//scrcmd_sound.c
-BOOL FUN_020413C0(struct ScriptContext *ctx);
-BOOL FUN_020413E8(struct ScriptContext *ctx);
-BOOL FUN_020413F8(struct ScriptContext *ctx);
-BOOL FUN_0204140C(struct ScriptContext *ctx);
-BOOL FUN_02041424(struct ScriptContext *ctx);
-BOOL FUN_0204143C(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk02AE(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0050(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0051(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0052(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0053(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0054(struct ScriptContext *ctx);
BOOL FUN_02041464(struct ScriptContext *ctx);
-BOOL FUN_02041478(struct ScriptContext* ctx);
-BOOL FUN_0204149C(struct ScriptContext* ctx);
-BOOL FUN_020414B8(struct ScriptContext *ctx);
-BOOL FUN_020414CC(struct ScriptContext* ctx);
-BOOL FUN_020414E0(struct ScriptContext* ctx);
-BOOL FUN_020414FC(struct ScriptContext* ctx);
-BOOL FUN_02041518(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0055(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0056(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0058(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0049(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk004A(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk004B(struct ScriptContext* ctx);
BOOL FUN_02041540(struct ScriptContext* ctx);
-BOOL FUN_02041558(struct ScriptContext* ctx);
-BOOL ScrCmd_waitcry(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk004C(struct ScriptContext* ctx);
+BOOL ScrCmd_PlayCryWait(struct ScriptContext* ctx);
BOOL FUN_02041598(struct ScriptContext* ctx);
-BOOL FUN_020415BC(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk004F(struct ScriptContext* ctx);
BOOL FUN_020415CC(struct ScriptContext* ctx);
-BOOL ScrCmd_playbgm(struct ScriptContext* ctx);
-BOOL FUN_020415E0(struct ScriptContext* ctx);
-BOOL FUN_02041618(struct ScriptContext* ctx);
-BOOL FUN_02041644(struct ScriptContext* ctx);
-BOOL FUN_02041650(struct ScriptContext* ctx);
-BOOL FUN_02041664(struct ScriptContext* ctx);
-BOOL FUN_02041674(struct ScriptContext* ctx);
+BOOL ScrCmd_PlayBgm(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0059(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk005A(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk005B(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk005C(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk005D(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0283(struct ScriptContext *ctx);
//scrcmd_8.c
BOOL ScrCmd_Unk021D(struct ScriptContext* ctx);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:17:40 +0000