Merge pull request #35 from AnonymousRandomPerson/main

Synced from pmdsky-debug
2026-09-27 04:38:15 -05:00 · 2023-11-01 19:00:59 -04:00
parent 1962c36e24 e302619f59
commit e58f0ff16d
11 changed files with 124 additions and 124 deletions
--- a/asm/include/overlay_01.inc
+++ b/asm/include/overlay_01.inc
@@ -31,6 +31,7 @@
 .public GetKeyboardStringResult
 .public GetLanguage
 .public GetLanguageType
+.public GetMainTeamNameWithCheck
 .public GetMaxReachedFloor
 .public GetNameRaw
 .public GetNameString
@@ -57,7 +58,6 @@
 .public GetSpriteIndex__020526EC
 .public GetStringFromFileVeneer
 .public GetTeamMember
-.public GetMainTeamNameWithCheck
 .public GetVictoriesOnOneFloor
 .public InitAnimationControl
 .public InitPreprocessorArgs
@@ -213,17 +213,19 @@
 .public RandInt
 .public SetAnimationForAnimationControl
 .public SetIrqFlag
+.public SetMainTeamName
 .public SetScenarioScriptVar
 .public SetSpriteIdForAnimationControl
-.public SetMainTeamName
 .public ShowKeyboard
 .public ShowMessageInDBox
+.public ShowStringInDBox
 .public sprintf
 .public strcmp
 .public strcpy
 .public StrcpySimple
 .public StringFromMessageId
 .public StrncmpSimple
+.public StrncpyName
 .public StrncpySimpleNoPadSafe
 .public sub_02002448
 .public sub_02003B5C
@@ -249,7 +251,6 @@
 .public sub_0201D12C
 .public sub_0202065C
 .public sub_020245D0
-.public StrncpyName
 .public sub_02025404
 .public sub_0202544C
 .public sub_02025480
@@ -281,7 +282,6 @@
 .public sub_0202BCBC
 .public sub_0202BD48
 .public sub_0202C38C
-.public sub_0202F23C
 .public sub_0202F334
 .public sub_0202F8C4
 .public sub_0202F8FC
--- a/asm/include/overlay_11.inc
+++ b/asm/include/overlay_11.inc
@@ -10,10 +10,12 @@
 .public _020F0090
 .public _02130214
 .public abs
-.public AddItemToBagNoHeld
 .public AddBulkItemToStorage
+.public AddItemToBagNoHeld
 .public AnimationControlGetAllocForMaxFrame
 .public AnyDungeonRequestsDone
+.public ApplyGummiBoostsToGroundMonster
+.public ApplyGummiBoostsToTeamMember
 .public BAG_ITEMS_PTR_MIRROR
 .public CheckMissionRestrictions
 .public ClampComponentAbs
@@ -27,6 +29,7 @@
 .public CreateAdvancedMenu
 .public CreateDBox
 .public CreateMemArena
+.public CreateMonsterSummaryFromTeamMember
 .public CreateNormalMenu
 .public CreatePortraitBox
 .public DataTransferInit
@@ -38,6 +41,7 @@
 .public DungeonMoveToGroundMove
 .public DungeonRequestsDoneWrapper
 .public DungeonSwapIdxToId
+.public EnableAllLearnableIqSkills
 .public EnableIqSkill
 .public ENTITIES
 .public EntryOverlay13
@@ -56,6 +60,8 @@
 .public FreeNormalMenu
 .public FreePortraitBox
 .public GenerateDailyMissions
+.public GenerateKecleonItems1
+.public GenerateKecleonItems2
 .public GetAcceptedMission
 .public GetActiveRosterIndex
 .public GetActiveTeamMember
@@ -75,15 +81,13 @@
 .public GetFirstEmptyMemberIdx
 .public GetFirstUnequippedItemOfType
 .public GetGameMode
-.public GetMoneyCarried
 .public GetHeldButtons
 .public GetHero
+.public GetHpBoostFromExclusiveItems
 .public GetInfoMoveGround
 .public GetItemAtIdx
 .public GetItemCategoryVeneer
 .public GetItemMoveId16
-.public GenerateKecleonItems1
-.public GenerateKecleonItems2
 .public GetKeyboardStatus
 .public GetKeyboardStringResult
 .public GetLanguage
@@ -92,6 +96,7 @@
 .public GetMainCharacter1MemberIdx
 .public GetMainCharacter2MemberIdx
 .public GetMaxReachedFloor
+.public GetMoneyCarried
 .public GetNameRaw
 .public GetNameWithGender
 .public GetNbItemsInBag
@@ -113,12 +118,15 @@
 .public IncrementNbBigTreasureWins
 .public IncrementNbDungeonsCleared
 .public IncrementNbSkyGiftsSent
+.public InitBulkItem
 .public InitMainTeamAfterQuiz
 .public InitMove
 .public InitPortraitBox
 .public InitPortraitBoxWithMonsterId
 .public InitPreprocessorArgs
 .public InitRender3dElement64
+.public InitSpecialEpisodeExtraPartner
+.public InitSpecialEpisodePartners
 .public InitStandardItem
 .public IqSkillFlagTest
 .public IsAdvancedMenuActive
@@ -128,6 +136,7 @@
 .public IsHM
 .public IsMonsterOnTeam
 .public IsNormalMenuActive
+.public IsStorageFull
 .public ItemAtTableIdx
 .public ItemZInit
 .public KeyWaitInit
@@ -279,22 +288,20 @@
 .public PreprocessStringFromMessageId
 .public PrintIqSkillsMenu
 .public RandInt
+.public RandomizeDemoActors
 .public RandRange
+.public RemoveBulkItemInStorage
 .public RemoveItemNoHole
 .public RemoveItemNoHoleCheck
-.public RemoveBulkItemInStorage
 .public Render3dElement64
 .public SaveScriptVariableValue
 .public SaveScriptVariableValueAtIndex
 .public SaveScriptVariableValueBytes
-.public ScriptSpecialProcess0x17
-.public ScriptSpecialProcess0x3
-.public IsStorageFull
-.public ScriptSpecialProcess0x3D
-.public ScriptSpecialProcess0x3E
-.public ScriptSpecialProcess0x4
 .public SendAudioCommandWrapperVeneer
 .public SentryRunState
+.public SetActorTalkMain
+.public SetActorTalkMainAndActorTalkSub
+.public SetActorTalkSub
 .public SetAdventureLogCompleted
 .public SetAnimationForAnimationControl
 .public SetDungeonConquest
@@ -312,14 +319,17 @@
 .public ShowKeyboard
 .public ShowMessageInDBox
 .public ShowPortraitBox
+.public ShowStringInDBox
+.public SortItemsInBag
 .public SpecialProcAddItemToBag
-.public StrcpyName
 .public sprintf
 .public strcat
 .public StrcmpMonsterName
 .public strcpy
+.public StrcpyName
 .public StrcpySimple
 .public StringFromMessageId
+.public StrncpyName
 .public StrncpySimple
 .public StrncpySimpleNoPad
 .public StrncpySimpleNoPadSafe
@@ -400,20 +410,15 @@
 .public sub_0200BD2C
 .public sub_0200BD50
 .public sub_0200CF6C
-.public InitBulkItem
 .public sub_0200D310
 .public sub_0200D65C
 .public sub_0200D670
-.public SortItemsInBag
 .public sub_0200FD48
 .public sub_02010044
 .public sub_0201080C
 .public sub_02011220
-.public GetHpBoostFromExclusiveItems
 .public sub_02011420
 .public sub_020114F8
-.public ApplyGummiBoostsToGroundMonster
-.public ApplyGummiBoostsToTeamMember
 .public sub_02011FA0
 .public sub_02012B7C
 .public sub_020130B8
@@ -482,7 +487,6 @@
 .public sub_0201F36C
 .public sub_0201F464
 .public sub_020236FC
-.public StrncpyName
 .public sub_02026214
 .public sub_02026268
 .public sub_020262E0
@@ -532,7 +536,6 @@
 .public sub_0202E6E4
 .public sub_0202F16C
 .public sub_0202F190
-.public sub_0202F23C
 .public sub_0202F2C4
 .public sub_0202F334
 .public sub_0202F3F8
@@ -723,8 +726,6 @@
 .public sub_02058794
 .public sub_0205882C
 .public sub_02058AFC
-.public EnableAllLearnableIqSkills
-.public CreateMonsterSummaryFromTeamMember
 .public sub_0205B028
 .public sub_0205B584
 .public sub_0205B77C
@@ -758,7 +759,6 @@
 .public sub_02065050
 .public sub_0206549C
 .public sub_02065974
-.public sub_02065B3C
 .public sub_02065B80
 .public sub_02065BC8
 .public sub_02065BD8
--- a/asm/include/overlay_27.inc
+++ b/asm/include/overlay_27.inc
@@ -1,18 +1,25 @@
 #pragma once
+.public AddItemToStorage
 .public AddMoneyCarried
+.public AddMoneyStored
 .public BAG_ITEMS_PTR_MIRROR
+.public ConvertStorageItemAtIdxToBulkItem
+.public ConvertStorageItemAtIdxToItem
 .public CopyItemAtIdx
+.public CountNbOfItemsInStorage
 .public CreateDBox
 .public CreateNormalMenu
 .public DebugPrint0
 .public FreeDBox
 .public FreeNormalMenu
 .public FreePortraitBox
-.public GetMoneyCarried
 .public GetItemAtIdx
+.public GetMoneyCarried
+.public GetMoneyStored
 .public GetNbItemsInBag
 .public GetNormalMenuResult
 .public GetPressedButtons
+.public GetRankStorageSize
 .public InitPortraitBoxWithMonsterId
 .public InitPreprocessorArgs
 .public IsDBoxActive
@@ -29,28 +36,22 @@
 .public PreprocessStringFromMessageId
 .public RemoveEmptyItemsInBag
 .public RemoveItem
+.public RemoveItemAtIdxInStorage
 .public RemoveItemNoHole
 .public SetPortraitLayout
 .public ShowDBox
 .public ShowMessageInDBox
+.public ShowStringInDBox
 .public sub_0200D670
 .public sub_0200FD48
-.public CountNbOfItemsInStorage
-.public ConvertStorageItemAtIdxToBulkItem
-.public ConvertStorageItemAtIdxToItem
 .public sub_0201007C
 .public sub_02010154
-.public RemoveItemAtIdxInStorage
-.public AddItemToStorage
-.public GetMoneyStored
-.public AddMoneyStored
 .public sub_02017CCC
 .public sub_0202836C
 .public sub_0202A66C
 .public sub_0202E3CC
 .public sub_0202E6C8
 .public sub_0202E6E4
-.public sub_0202F23C
 .public sub_0202F2C4
 .public sub_02034A38
 .public sub_02042258
@@ -83,5 +84,4 @@
 .public sub_02044094
 .public sub_020440B8
 .public sub_020440DC
-.public GetRankStorageSize
 .public sub_020582E0
--- a/asm/include/overlay_29_023498A0.inc
+++ b/asm/include/overlay_29_023498A0.inc
@@ -195,6 +195,7 @@
 .public ShouldDisplayEntityWrapper
 .public ShouldMonsterHeadToStairs
 .public ShowPortraitBox
+.public ShowStringInDBox
 .public StringFromMessageId
 .public strlen
 .public strncmp
@@ -252,7 +253,6 @@
 .public sub_0202AABC
 .public sub_0202AB94
 .public sub_0202ABB0
-.public sub_0202F23C
 .public sub_0202F334
 .public sub_0202F474
 .public sub_0202FFB0
--- a/asm/include/overlay_31.inc
+++ b/asm/include/overlay_31.inc
@@ -15,6 +15,7 @@
 .public CheckTeamMemberIdx
 .public CheckTeamMemberIdxVeneer
 .public CreateDBox
+.public CreateMonsterSummaryFromMonster
 .public DebugPrint0
 .public DisableDungeonSubMenuOption
 .public DisplayMessage
@@ -27,7 +28,6 @@
 .public GetCurrentBagCapacity
 .public GetDexNumber
 .public GetFloorType
-.public GetMoneyCarried
 .public GetItemAction
 .public GetItemCategoryVeneer
 .public GetItemInfo
@@ -39,6 +39,7 @@
 .public GetLeaderChangeFlag
 .public GetLeaderMonster
 .public GetMaxPp
+.public GetMoneyCarried
 .public GetMonsterIdFromSpawnEntry
 .public GetMonsterName
 .public GetNbItemsInBag
@@ -49,6 +50,7 @@
 .public GetTeamMemberIndex
 .public GetTile
 .public GetTrapInfo
+.public GetUnlockedTactics
 .public HideTileGrid
 .public InitPreprocessorArgs
 .public IqSkillFlagTest
@@ -114,7 +116,6 @@
 .public ov29_022EBC2C
 .public ov29_022ECDE4
 .public ov29_022F0B9C
-.public CreateMonsterSummaryFromMonster
 .public ov29_022F9C40
 .public ov29_023002F0
 .public ov29_02300818
@@ -150,6 +151,8 @@
 .public PrintIqSkillsMenu
 .public SetMonsterActionFields
 .public ShouldMonsterRunAwayVariation
+.public ShowStringInDBox
+.public SortItemsInBag
 .public SpecificRecruitCheck
 .public strcpy
 .public StringFromMessageId
@@ -157,7 +160,6 @@
 .public sub_0200B3D4
 .public sub_0200D310
 .public sub_0200D894
-.public SortItemsInBag
 .public sub_02017C74
 .public sub_02017C80
 .public sub_02017CCC
@@ -186,7 +188,6 @@
 .public sub_0202E3CC
 .public sub_0202E6C8
 .public sub_0202E6E4
-.public sub_0202F23C
 .public sub_0202F334
 .public sub_0202F474
 .public sub_0202F8C4
@@ -241,7 +242,6 @@
 .public sub_02053CA0
 .public sub_02054F44
 .public sub_020585B4
-.public GetUnlockedTactics
 .public TryPointCameraToMonster
 .public UpdateMapSurveyorFlag
 .public vsprintf
--- a/asm/main_0200C4CC.s
+++ b/asm/main_0200C4CC.s
@@ -419,7 +419,7 @@ sub_0200CA8C: ; 0x0200CA8C
 	ldr r0, _0200CAB8 ; =BAG_ITEMS_PTR_MIRROR
 	str r1, [r0]
 	bl LoadItemPspi2n
-	bl sub_0200EBCC
+	bl SetActiveInventoryToMain
 	bl sub_0200FD38
 	bl sub_02010590
 	bl sub_02011AB8
@@ -432,9 +432,9 @@ _0200CAB8: .word BAG_ITEMS_PTR_MIRROR
 	arm_func_start sub_0200CABC
 sub_0200CABC: ; 0x0200CABC
 	stmdb sp!, {r3, lr}
-	bl sub_0200EBDC
+	bl AllInventoriesZInit
 	bl sub_0200FD3C
-	bl sub_02010594
+	bl AllKecleonShopsZInit
 	bl sub_02011AB8
 	ldmia sp!, {r3, pc}
 	arm_func_end sub_0200CABC
@@ -442,17 +442,17 @@ sub_0200CABC: ; 0x0200CABC
 	arm_func_start sub_0200CAD4
 sub_0200CAD4: ; 0x0200CAD4
 	stmdb sp!, {r3, lr}
-	bl sub_0200EC48
-	bl sub_02010654
+	bl SpecialEpisodeInventoryZInit
+	bl SpecialEpisodeKecleonShopZInit
 	ldmia sp!, {r3, pc}
 	arm_func_end sub_0200CAD4

 	arm_func_start sub_0200CAE4
 sub_0200CAE4: ; 0x0200CAE4
-	ldr ip, _0200CAEC ; =sub_0200EC90
+	ldr ip, _0200CAEC ; =RescueInventoryZInit
 	bx ip
 	.align 2, 0
-_0200CAEC: .word sub_0200EC90
+_0200CAEC: .word RescueInventoryZInit
 	arm_func_end sub_0200CAE4

 	arm_func_start GetItemCategoryVeneer
@@ -3033,17 +3033,17 @@ _0200EBB8:
 _0200EBC8: .word ARM9_UNKNOWN_TABLE__NA_2097FF8
 	arm_func_end sub_0200EB90

-	arm_func_start sub_0200EBCC
-sub_0200EBCC: ; 0x0200EBCC
+	arm_func_start SetActiveInventoryToMain
+SetActiveInventoryToMain: ; 0x0200EBCC
 	ldr ip, _0200EBD8 ; =SetActiveInventory
 	mov r0, #0
 	bx ip
 	.align 2, 0
 _0200EBD8: .word SetActiveInventory
-	arm_func_end sub_0200EBCC
+	arm_func_end SetActiveInventoryToMain

-	arm_func_start sub_0200EBDC
-sub_0200EBDC: ; 0x0200EBDC
+	arm_func_start AllInventoriesZInit
+AllInventoriesZInit: ; 0x0200EBDC
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	mov sl, #0
 	ldr r6, _0200EC44 ; =BAG_ITEMS_PTR_MIRROR
@@ -3074,10 +3074,10 @@ _0200EC00:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 _0200EC44: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end sub_0200EBDC
+	arm_func_end AllInventoriesZInit

-	arm_func_start sub_0200EC48
-sub_0200EC48: ; 0x0200EC48
+	arm_func_start SpecialEpisodeInventoryZInit
+SpecialEpisodeInventoryZInit: ; 0x0200EC48
 	stmdb sp!, {r4, r5, r6, lr}
 	ldr r5, _0200EC8C ; =BAG_ITEMS_PTR_MIRROR
 	mov r6, #0
@@ -3098,10 +3098,10 @@ _0200EC58:
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
 _0200EC8C: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end sub_0200EC48
+	arm_func_end SpecialEpisodeInventoryZInit

-	arm_func_start sub_0200EC90
-sub_0200EC90: ; 0x0200EC90
+	arm_func_start RescueInventoryZInit
+RescueInventoryZInit: ; 0x0200EC90
 	stmdb sp!, {r4, r5, r6, lr}
 	ldr r5, _0200ECD4 ; =BAG_ITEMS_PTR_MIRROR
 	mov r6, #0
@@ -3122,7 +3122,7 @@ _0200ECA0:
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
 _0200ECD4: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end sub_0200EC90
+	arm_func_end RescueInventoryZInit

 	arm_func_start SetActiveInventory
 SetActiveInventory: ; 0x0200ECD8
@@ -5172,8 +5172,8 @@ sub_02010590: ; 0x02010590
 	bx lr
 	arm_func_end sub_02010590

-	arm_func_start sub_02010594
-sub_02010594: ; 0x02010594
+	arm_func_start AllKecleonShopsZInit
+AllKecleonShopsZInit: ; 0x02010594
 	stmdb sp!, {r4, r5, r6, lr}
 	mov r2, #0
 	ldr ip, _02010650 ; =BAG_ITEMS_PTR_MIRROR
@@ -5226,10 +5226,10 @@ _020105E0:
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
 _02010650: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end sub_02010594
+	arm_func_end AllKecleonShopsZInit

-	arm_func_start sub_02010654
-sub_02010654: ; 0x02010654
+	arm_func_start SpecialEpisodeKecleonShopZInit
+SpecialEpisodeKecleonShopZInit: ; 0x02010654
 	stmdb sp!, {r3, lr}
 	mov lr, #0
 	ldr r2, _020106C0 ; =BAG_ITEMS_PTR_MIRROR
@@ -5261,10 +5261,10 @@ _02010694:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _020106C0: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end sub_02010654
+	arm_func_end SpecialEpisodeKecleonShopZInit

-	arm_func_start sub_020106C4
-sub_020106C4: ; 0x020106C4
+	arm_func_start SetActiveKecleonShop
+SetActiveKecleonShop: ; 0x020106C4
 	ldr r2, _02010708 ; =BAG_ITEMS_PTR_MIRROR
 	ldr r1, [r2]
 	add r1, r1, #0x1000
@@ -5284,7 +5284,7 @@ sub_020106C4: ; 0x020106C4
 	bx lr
 	.align 2, 0
 _02010708: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end sub_020106C4
+	arm_func_end SetActiveKecleonShop

 	arm_func_start GetMoneyStored
 GetMoneyStored: ; 0x0201070C
@@ -42917,8 +42917,8 @@ _0202F200:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	arm_func_end ShowMessageInDBox

-	arm_func_start sub_0202F23C
-sub_0202F23C: ; 0x0202F23C
+	arm_func_start ShowStringInDBox
+ShowStringInDBox: ; 0x0202F23C
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r7, r1
 	mov r6, r2
@@ -42955,7 +42955,7 @@ _0202F288:
 	add r2, r4, #0x128
 	bl sub_02026194
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
-	arm_func_end sub_0202F23C
+	arm_func_end ShowStringInDBox

 	arm_func_start sub_0202F2C4
 sub_0202F2C4: ; 0x0202F2C4
@@ -50299,7 +50299,7 @@ _0203525C:
 	ldrh r1, [r3, #0x14]
 	add r2, r3, #0x68
 	add r3, r3, #0x18
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	ldr r0, _02035598 ; =_020AFDBC
 	mov r1, #1
 	ldr r0, [r0, #8]
@@ -71702,7 +71702,7 @@ sub_020472F0: ; 0x020472F0
 	mov r3, r4
 	ldrsb r0, [r1]
 	ldrh r1, [r1, #0x68]
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
@@ -73090,8 +73090,8 @@ sub_020484C0: ; 0x020484C0
 	ldmia sp!, {r3, pc}
 	arm_func_end sub_020484C0

-	arm_func_start sub_020484E8
-sub_020484E8: ; 0x020484E8
+	arm_func_start InitSpecialEpisodeHero
+InitSpecialEpisodeHero: ; 0x020484E8
 	stmdb sp!, {r4, lr}
 	bl GetSpecialEpisodeType
 	mov r4, r0
@@ -73155,7 +73155,7 @@ _020485B4: .word _020A2844
 _020485B8: .word _020A2880
 _020485BC: .word _020A2894
 _020485C0: .word FORBIDDEN_FORGOT_MOVE_LIST
-	arm_func_end sub_020484E8
+	arm_func_end InitSpecialEpisodeHero

 	arm_func_start sub_020485C4
 sub_020485C4: ; 0x020485C4
@@ -73203,7 +73203,7 @@ sub_02048624: ; 0x02048624
 	mov r0, #0
 	bl SetActiveInventory
 	mov r0, #0
-	bl sub_020106C4
+	bl SetActiveKecleonShop
 	mov r0, #0
 	bl SetActiveTeam
 	ldmia sp!, {r3, pc}
@@ -73220,7 +73220,7 @@ sub_02048644: ; 0x02048644
 	mov r0, #2
 	bl SetActiveInventory
 	mov r0, #0
-	bl sub_020106C4
+	bl SetActiveKecleonShop
 	mov r0, #2
 	bl SetActiveTeam
 	b _020486D8
@@ -73230,7 +73230,7 @@ _02048678:
 	mov r0, #2
 	bl SetActiveInventory
 	mov r0, #0
-	bl sub_020106C4
+	bl SetActiveKecleonShop
 	mov r0, #2
 	bl SetActiveTeam
 	b _020486D8
@@ -73240,7 +73240,7 @@ _0204869C:
 	mov r0, #1
 	bl SetActiveInventory
 	mov r0, #1
-	bl sub_020106C4
+	bl SetActiveKecleonShop
 	mov r0, #1
 	bl SetActiveTeam
 	b _020486D8
@@ -73248,7 +73248,7 @@ _020486C0:
 	mov r0, #0
 	bl SetActiveInventory
 	mov r0, #0
-	bl sub_020106C4
+	bl SetActiveKecleonShop
 	mov r0, #0
 	bl SetActiveTeam
 _020486D8:
@@ -73286,7 +73286,7 @@ sub_0204872C: ; 0x0204872C
 	mov r0, #0
 	bl SetActiveInventory
 	mov r0, #0
-	bl sub_020106C4
+	bl SetActiveKecleonShop
 	mov r0, #0
 	bl SetActiveTeam
 	ldmia sp!, {r3, pc}
@@ -73500,8 +73500,8 @@ _02048A04: .word _020AFF14
 _02048A08: .word PARTNER_TALK_KIND_TABLE
 	arm_func_end InitMainTeamAfterQuiz

-	arm_func_start ScriptSpecialProcess0x3
-ScriptSpecialProcess0x3: ; 0x02048A0C
+	arm_func_start InitSpecialEpisodePartners
+InitSpecialEpisodePartners: ; 0x02048A0C
 	stmdb sp!, {r3, lr}
 	bl GetExecuteSpecialEpisodeType
 	cmp r0, #4
@@ -73538,10 +73538,10 @@ _02048A74: .word _020A28A8
 _02048A78: .word _020A2858
 _02048A7C: .word _020A281C
 _02048A80: .word _020A286C
-	arm_func_end ScriptSpecialProcess0x3
+	arm_func_end InitSpecialEpisodePartners

-	arm_func_start ScriptSpecialProcess0x4
-ScriptSpecialProcess0x4: ; 0x02048A84
+	arm_func_start InitSpecialEpisodeExtraPartner
+InitSpecialEpisodeExtraPartner: ; 0x02048A84
 	stmdb sp!, {r3, lr}
 	bl GetExecuteSpecialEpisodeType
 	cmp r0, #4
@@ -73562,7 +73562,7 @@ _02048AB8:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _02048AC0: .word SPECIAL_EPISODE_MAIN_CHARACTERS
-	arm_func_end ScriptSpecialProcess0x4
+	arm_func_end InitSpecialEpisodeExtraPartner

 	arm_func_start sub_02048AC4
 sub_02048AC4: ; 0x02048AC4
@@ -109560,33 +109560,33 @@ sub_02065B14: ; 0x02065B14
 _02065B38: .word ENTITIES
 	arm_func_end sub_02065B14

-	arm_func_start sub_02065B3C
-sub_02065B3C: ; 0x02065B3C
+	arm_func_start SetActorTalkMainAndActorTalkSub
+SetActorTalkMainAndActorTalkSub: ; 0x02065B3C
 	ldr r2, _02065B4C ; =_020B0B08
 	strh r0, [r2, #0x18]
 	strh r1, [r2, #0x16]
 	bx lr
 	.align 2, 0
 _02065B4C: .word _020B0B08
-	arm_func_end sub_02065B3C
+	arm_func_end SetActorTalkMainAndActorTalkSub

-	arm_func_start ScriptSpecialProcess0x3D
-ScriptSpecialProcess0x3D: ; 0x02065B50
+	arm_func_start SetActorTalkMain
+SetActorTalkMain: ; 0x02065B50
 	ldr r1, _02065B5C ; =_020B0B08
 	strh r0, [r1, #0x18]
 	bx lr
 	.align 2, 0
 _02065B5C: .word _020B0B08
-	arm_func_end ScriptSpecialProcess0x3D
+	arm_func_end SetActorTalkMain

-	arm_func_start ScriptSpecialProcess0x3E
-ScriptSpecialProcess0x3E: ; 0x02065B60
+	arm_func_start SetActorTalkSub
+SetActorTalkSub: ; 0x02065B60
 	ldr r1, _02065B6C ; =_020B0B08
 	strh r0, [r1, #0x16]
 	bx lr
 	.align 2, 0
 _02065B6C: .word _020B0B08
-	arm_func_end ScriptSpecialProcess0x3E
+	arm_func_end SetActorTalkSub

 	arm_func_start sub_02065B70
 sub_02065B70: ; 0x02065B70
@@ -109686,8 +109686,8 @@ _02065C38:
 _02065C44: .word _022B7310
 	arm_func_end sub_02065C08

-	arm_func_start ScriptSpecialProcess0x17
-ScriptSpecialProcess0x17: ; 0x02065C48
+	arm_func_start RandomizeDemoActors
+RandomizeDemoActors: ; 0x02065C48
 	stmdb sp!, {r3, lr}
 	mov r0, #0x12
 	bl RandInt
@@ -109704,7 +109704,7 @@ ScriptSpecialProcess0x17: ; 0x02065C48
 _02065C78: .word DEMO_TEAMS
 _02065C7C: .word _020A68CA
 _02065C80: .word _020B0B08
-	arm_func_end ScriptSpecialProcess0x17
+	arm_func_end RandomizeDemoActors

 	arm_func_start sub_02065C84
 sub_02065C84: ; 0x02065C84
@@ -110101,7 +110101,7 @@ _020661B0:
 	mov r0, #3
 	bl sub_0204B018
 	bl sub_02048644
-	bl sub_020484E8
+	bl InitSpecialEpisodeHero
 	mov r0, #2
 	mov r1, #0x36
 	mov r2, #0
--- a/asm/overlay_01.s
+++ b/asm/overlay_01.s
@@ -13165,7 +13165,7 @@ _023344EC:
 	mov r3, #0
 	ldrsb r0, [r2, #1]
 	add r2, r2, #0xac
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	ldr r0, _02334618 ; =ov01_0233B8C8
 	ldr r1, _0233461C ; =ov01_02334F2C
 	bl sub_0202F8C4
@@ -14976,7 +14976,7 @@ _02335D2C:
 	add r2, sp, #8
 	ldrsb r0, [r0]
 	mov r3, r4
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	ldr r0, _02335F58 ; =ov01_0233C1A8
 	ldr r0, [r0]
 	ldr r0, [r0, #0xd8]
@@ -15089,7 +15089,7 @@ _02335F0C:
 	add r2, sp, #8
 	ldrsb r0, [r0, #3]
 	mov r3, #0
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	ldr r1, _02335F58 ; =ov01_0233C1A8
 	mov r4, #0
 	ldr r0, [r1]
--- a/asm/overlay_11.s
+++ b/asm/overlay_11.s
@@ -12916,11 +12916,11 @@ _022E7254:
 	mov r0, #0
 	b _022E7AC0
 _022E7260:
-	bl ScriptSpecialProcess0x3
+	bl InitSpecialEpisodePartners
 	mov r0, #0
 	b _022E7AC0
 _022E726C:
-	bl ScriptSpecialProcess0x4
+	bl InitSpecialEpisodeExtraPartner
 	mov r0, #0
 	b _022E7AC0
 _022E7278:
@@ -13169,7 +13169,7 @@ _022E75C0:
 	movne r0, #0
 	b _022E7AC0
 _022E75D0:
-	bl ScriptSpecialProcess0x17
+	bl RandomizeDemoActors
 	mov r0, #0
 	b _022E7AC0
 _022E75DC:
@@ -13521,13 +13521,13 @@ _022E7A88:
 _022E7A94:
 	mov r0, r7, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ScriptSpecialProcess0x3D
+	bl SetActorTalkMain
 	mov r0, #0
 	b _022E7AC0
 _022E7AA8:
 	mov r0, r7, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ScriptSpecialProcess0x3E
+	bl SetActorTalkSub
 	mov r0, #0
 	b _022E7AC0
 _022E7ABC:
@@ -33759,7 +33759,7 @@ ov11_022F8A20: ; 0x022F8A20
 	cmpne r1, r2
 	moveq r0, #0
 	beq _022F8A98
-	bl ScriptSpecialProcess0x3E
+	bl SetActorTalkSub
 	add r1, r4, #0x100
 	ldrsh r0, [r4, #6]
 	ldrsh r1, [r1, #0x24]
@@ -33812,7 +33812,7 @@ ov11_022F8AF4: ; 0x022F8AF4
 	ldrsh r0, [r0, #2]
 	cmp r0, r2
 	beq _022F8B48
-	bl ScriptSpecialProcess0x3D
+	bl SetActorTalkMain
 	mov r0, r4
 	bl ov11_022F8A20
 	cmp r0, #0
@@ -33842,7 +33842,7 @@ ov11_022F8B54: ; 0x022F8B54
 	ldrsh r0, [r0, #2]
 	cmp r0, r2
 	beq _022F8BA8
-	bl ScriptSpecialProcess0x3D
+	bl SetActorTalkMain
 	mov r0, r4
 	bl ov11_022FC83C
 	cmp r0, #0
@@ -33878,7 +33878,7 @@ ov11_022F8BB4: ; 0x022F8BB4
 	bl KeyWaitInit
 	ldrsh r0, [r4, #2]
 	mvn r1, #0
-	bl sub_02065B3C
+	bl SetActorTalkMainAndActorTalkSub
 	mov r0, #1
 	ldmia sp!, {r4, pc}
 _022F8C0C:
@@ -35648,7 +35648,7 @@ _022FA450:
 _022FA47C:
 	ldrsh r0, [r4, #2]
 	mov r1, #0xa
-	bl sub_02065B3C
+	bl SetActorTalkMainAndActorTalkSub
 	mov r0, r4
 	mov r1, #0xa
 	bl ov11_022F8AA8
@@ -38310,7 +38310,7 @@ ov11_022FC83C: ; 0x022FC83C
 	cmpne r1, r0
 	moveq r0, #0
 	beq _022FC8B4
-	bl ScriptSpecialProcess0x3E
+	bl SetActorTalkSub
 	add r1, r4, #0x100
 	ldrsh r0, [r4, #0xa]
 	ldrsh r1, [r1, #0x28]
@@ -43244,7 +43244,7 @@ _023008EC:
 	ldr r3, [r2, #4]
 	add r2, r3, #0x58
 	add r3, r3, #8
-	bl sub_0202F23C
+	bl ShowStringInDBox
 _02300904:
 	ldr r0, _02300A20 ; =ov11_02324D24
 	ldmia r0, {r1, r2}
@@ -43514,7 +43514,7 @@ _02300C74:
 	ldr r3, [r2, #4]
 	add r2, r3, #0x58
 	add r3, r3, #8
-	bl sub_0202F23C
+	bl ShowStringInDBox
 _02300C8C:
 	ldr r0, _02300D58 ; =ov11_02324D2C
 	ldr r2, [r0, #4]
--- a/asm/overlay_27.s
+++ b/asm/overlay_27.s
@@ -476,7 +476,7 @@ _0238A78C:
 	ldrsb r0, [r2, #8]
 	ldrh r1, [r2, #0x34]
 	add r2, r2, #0x38
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	mov r4, #1
 _0238A7D4:
 	cmp r4, #0
@@ -523,7 +523,7 @@ _0238A830:
 	ldrsb r0, [r1, #8]
 	ldrh r1, [r1, #0x36]
 	add r2, r2, #0x400
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	mov r4, #1
 _0238A880:
 	cmp r4, #0
--- a/asm/overlay_29_023498A0.s
+++ b/asm/overlay_29_023498A0.s
@@ -5276,7 +5276,7 @@ _0234DD64:
 	add r1, r0, #0x400
 	ldrsb r0, [r0, #0x10]
 	ldrh r1, [r1, #0x64]
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
 _0234DD88: .word ov29_02382800
--- a/asm/overlay_31.s
+++ b/asm/overlay_31.s
@@ -3185,7 +3185,7 @@ HandleMovesMenu: ; 0x02385404
 	ldr r0, [sp, #0x14]
 	ldr r1, _02385F7C ; =0x00000404
 	mov r3, #0
-	bl sub_0202F23C
+	bl ShowStringInDBox
 	b _023854AC
 _0238547C:
 	ldr r0, _02385F80 ; =DUNGEON_D_BOX_LAYOUT_16
@@ -3199,7 +3199,7 @@ _0238547C:
 	ldr r0, [sp, #0x14]
 	ldr r1, _02385F7C ; =0x00000404
 	mov r3, #0
-	bl sub_0202F23C
+	bl ShowStringInDBox
 _023854AC:
 	ldr r0, [sp]
 	ldr r6, [r0]