merge with master

2026-08-23 19:14:58 -05:00 · 2025-08-24 23:42:49 +02:00
parent 56a0879ec5 87bf762e54
commit 080e5153ae
277 changed files with 44043 additions and 43405 deletions
--- a/asm/get_category_string.s
+++ b/asm/get_category_string.s
@@ -0,0 +1,35 @@
+	.include "asm/macros.inc"
+	.include "get_category_string.inc"
+
+	.text
+
+	arm_func_start GetCategoryString
+GetCategoryString: ; 0x0205275C
+	stmdb sp!, {r3, r4, r5, lr}
+	mov r5, r0
+	bl AllocateTemp1024ByteBufferFromPool
+	mov r4, r0
+	mov r0, r5
+	mov r1, #0x258
+	bl _s32_div_f
+#if defined(EUROPE)
+	add r0, r1, #0x79
+	add r0, r0, #0x2400
+#elif defined(JAPAN)
+	add r0, r1, #0x1a40
+#else
+	add r0, r1, #0x77
+	add r0, r0, #0x2400
+#endif
+	mov r0, r0, lsl #0x10
+	mov r0, r0, lsr #0x10
+	bl StringFromId
+	mov r2, r0
+	ldr r1, _020527A4 ; =_020A3200
+	mov r0, r4
+	bl SprintfStatic__02052418
+	mov r0, r4
+	ldmia sp!, {r3, r4, r5, pc}
+	.align 2, 0
+_020527A4: .word _020A3200
+	arm_func_end GetCategoryString
--- a/asm/include/get_category_string.inc
+++ b/asm/include/get_category_string.inc
@@ -0,0 +1,6 @@
+#pragma once
+.public _020A3200
+.public _s32_div_f
+.public AllocateTemp1024ByteBufferFromPool
+.public SprintfStatic__02052418
+.public StringFromId
--- a/asm/include/itcm.inc
+++ b/asm/include/itcm.inc
@@ -18,7 +18,6 @@
 .public AreMovesEnabled
 .public CanAiMonsterMoveInDirection
 .public CanAiUseMove
-.public MonsterCannotAttack
 .public CanSeeTarget
 .public CanTargetEntity
 .public CanTargetPosition
@@ -56,6 +55,7 @@
 .public MemcpyFast
 .public MemsetFast
 .public MONSTER_DATA_TABLE_PTR
+.public MonsterCannotAttack
 .public OS_IRQTable
 .public ov29_022E935C
 .public ov29_022FBDF0
--- a/asm/include/itcm_01FFBD20.inc
+++ b/asm/include/itcm_01FFBD20.inc
@@ -9,6 +9,6 @@
 .public GetTreatmentBetweenMonsters
 .public InitMove
 .public IsMonster__0231A9D4
-.public ResetAiCanAttackInDirection
 .public ov29_0231B008
+.public ResetAiCanAttackInDirection
 .public TryAddTargetToAiTargetList
--- a/asm/include/main_02003328.inc
+++ b/asm/include/main_02003328.inc
@@ -1,7 +1,5 @@
 #pragma once
 .public _020924D8
-.public _020924E8
-.public _020924F8
 .public _020AEF7C
 .public _020AEFB4
 .public _020AEFC8
@@ -11,7 +9,6 @@
 .public _020AF050
 .public _020AF078
 .public _020AF154
-.public _0229B21C
 .public _0229B220
 .public _0229B248
 .public _0229F248
@@ -26,9 +23,7 @@
 .public KeyWaitInit
 .public MainLoop
 .public OS_IRQTable
-.public PlayBgmById
 .public Rand16Bit
-.public StopBgmCommand
 .public sub_02002580
 .public sub_020025F8
 .public sub_02002628
@@ -39,25 +34,19 @@
 .public sub_020027E8
 .public sub_020027F8
 .public sub_02002858
-.public sub_02002860
 .public sub_02002950
 .public sub_020029A0
 .public sub_020029B8
 .public sub_02002A44
 .public sub_02002C40
+.public sub_02003A40
+.public sub_02003B5C
 .public sub_02005EAC
 .public sub_02006098
 .public sub_02006D4C
 .public sub_02006DEC
-.public sub_020081C8
 .public sub_020082E0
 .public sub_02017D20
-.public sub_02017DB4
-.public sub_02017FF0
-.public sub_02018024
-.public sub_02018118
-.public sub_02018278
-.public sub_02018428
 .public sub_0201849C
 .public sub_02078A98
 .public sub_02078C68
@@ -66,7 +55,6 @@
 .public sub_0207B370
 .public sub_0207B4A4
 .public sub_0207B4B8
-.public sub_0207B584
 .public sub_020820E8
 .public sub_02082420
 .public WaitForever
--- a/asm/include/main_020038D8.inc
+++ b/asm/include/main_020038D8.inc
@@ -0,0 +1,35 @@
+#pragma once
+.public _020924E8
+.public _020924F8
+.public _020AEF7C
+.public _020AF000
+.public _020AF028
+.public _020AF050
+.public _0229B21C
+.public _0229B220
+.public Debug_Print0
+.public DisableAllInterrupts
+.public EnableAllInterrupts
+.public PlayBgmById
+.public StopBgmCommand
+.public sub_02002580
+.public sub_020025F8
+.public sub_02002628
+.public sub_0200265C
+.public sub_02002670
+.public sub_020026B8
+.public sub_020027F8
+.public sub_02002860
+.public sub_020029A0
+.public sub_02002A44
+.public sub_020081C8
+.public sub_02017DB4
+.public sub_02017FF0
+.public sub_02018024
+.public sub_02018118
+.public sub_02018278
+.public sub_02018428
+.public sub_02078A98
+.public sub_02079888
+.public sub_02079940
+.public sub_0207B584
--- a/asm/include/main_0200EB30.inc
+++ b/asm/include/main_0200EB30.inc
@@ -1,5 +1,5 @@
 #pragma once
-.public ARM9_UNKNOWN_TABLE__NA_2097FF8
+.public BABY_EXCLUSIVE_ITEM_PAIRS
 .public BAG_ITEMS_PTR_MIRROR
 .public IsItemValid
 .public ITEM_DATA_TABLE_PTRS
--- a/asm/include/main_02010FC4.inc
+++ b/asm/include/main_02010FC4.inc
@@ -1,78 +1,4 @@
 #pragma once
-.public ApplyExclusiveItemStatBoosts
-.public BAG_ITEMS_PTR_MIRROR
-.public CALCIUM_STAT_BOOST
-.public ConvertStorageItemAtIdxToBulkItem
-.public CopyBitsFrom
-.public CopyBitsTo
-.public CountNbItemsOfTypeInBag
-.public CountNbItemsOfTypeInStorage
-.public CountNbOfItemsInStorage
-.public DUNGEON_MOVE_TABLES
-.public Debug_Print0
-.public EXCLUSIVE_ITEM_EFFECT_DATA
-.public ExclusiveItemEffectFlagTest
-.public FemaleToMaleForm
-.public GINSENG_CHANCE_3
-.public GUMMI_STAT_BOOST
-.public GetBaseFormCastformDeoxysCherrim
-.public GetCurrentBagCapacity
-.public GetDungeonResultString
-.public GetEquivBulkItemIdxInStorage
-.public GetExclusiveItem
-.public GetExclusiveItemOffset
-.public GetExclusiveItemParameter
-.public GetExclusiveItemType
-.public GetFamilyIndex
-.public GetFirstUnequippedItemOfType
-.public GetItemAtIdx
-.public GetItemCategory
-.public GetItemCategoryVeneer
-.public GetMaxPp
-.public GetMoveBasePowerGround
-.public GetMoveMaxGinsengBoostGround
-.public GetNbItemsInBag
-.public GetPartyMembers
-.public GetRank
-.public GetScenarioBalance
-.public GetTeamMember
-.public GetType
-.public HasMonsterBeenAttackedInDungeons
-.public IQ_GUMMI_GAIN_TABLE
-.public IRON_STAT_BOOST
-.public InitBulkItem
-.public Is2TurnsMove
-.public IsGummi
-.public IsMonsterValid
-.public IsTicketItem
-.public LIFE_SEED_HP_BOOST
-.public LoadFileFromRom
-.public LoadScriptVariableValue
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public OpenWaza
-.public PROTEIN_STAT_BOOST
-.public RECYCLE_SHOP_ITEM_LIST
-.public Rand16Bit
-.public RandInt
-.public RandIntSafe
-.public RandRange
-.public RemoveEmptyItemsInBag
-.public RemoveItem
-.public RemoveItemAtIdxInStorage
-.public SITRUS_BERRY_FULL_HP_BOOST
-.public SaveScriptVariableValue
-.public SelectWaza
-.public SetExclusiveItemEffect
-.public SetNbRecycled
-.public StringFromId
-.public TYPE_SPECIFIC_EXCLUSIVE_ITEMS
-.public UnloadFile
-.public WONDER_GUMMI_IQ_GAIN
-.public WONDER_GUMMI_STAT_BOOST
-.public ZINC_STAT_BOOST
-.public ZInit8
 .public _0209889C
 .public _020988A4
 .public _020988A8
@@ -97,8 +23,76 @@
 .public _020AF700
 .public _022A4BD8
 .public _s32_div_f
+.public ApplyExclusiveItemStatBoosts
+.public BAG_ITEMS_PTR_MIRROR
+.public CALCIUM_STAT_BOOST
+.public ConvertStorageItemAtIdxToBulkItem
+.public CopyBitsFrom
+.public CopyBitsTo
+.public CountNbItemsOfTypeInBag
+.public CountNbItemsOfTypeInStorage
+.public CountNbOfItemsInStorage
+.public Debug_Print0
+.public DUNGEON_MOVE_TABLES
+.public EXCLUSIVE_ITEM_EFFECT_DATA
+.public ExclusiveItemEffectFlagTest
+.public FemaleToMaleForm
+.public GetBaseFormCastformDeoxysCherrim
+.public GetCurrentBagCapacity
+.public GetDungeonResultString
+.public GetEquivBulkItemIdxInStorage
+.public GetExclusiveItem
+.public GetExclusiveItemOffset
+.public GetExclusiveItemParameter
+.public GetExclusiveItemType
+.public GetFamilyIndex
+.public GetFirstUnequippedItemOfType
+.public GetItemAtIdx
+.public GetItemCategory
+.public GetItemCategoryVeneer
+.public GetMaxPp
+.public GetMoveBasePowerGround
+.public GetMoveMaxGinsengBoostGround
+.public GetNbItemsInBag
+.public GetPartyMembers
+.public GetRank
+.public GetScenarioBalance
+.public GetTeamMember
+.public GetType
+.public GINSENG_CHANCE_3
+.public GUMMI_STAT_BOOST
+.public HasMonsterBeenAttackedInDungeons
+.public InitBulkItem
+.public IQ_GUMMI_GAIN_TABLE
+.public IRON_STAT_BOOST
+.public Is2TurnsMove
+.public IsGummi
+.public IsMonsterValid
+.public IsTicketItem
+.public LIFE_SEED_HP_BOOST
+.public LoadFileFromRom
+.public LoadScriptVariableValue
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public OpenWaza
+.public PROTEIN_STAT_BOOST
+.public Rand16Bit
+.public RandInt
+.public RandIntSafe
+.public RandRange
+.public RECYCLE_SHOP_ITEM_LIST
+.public RemoveEmptyItemsInBag
+.public RemoveItem
+.public RemoveItemAtIdxInStorage
+.public ReturnEggExclusiveItem
+.public SaveScriptVariableValue
+.public SelectWaza
+.public SetExclusiveItemEffect
+.public SetNbRecycled
+.public SITRUS_BERRY_FULL_HP_BOOST
+.public StringFromId
 .public sub_0200D1F0
-.public sub_0200EB90
 .public sub_02010044
 .public sub_0201007C
 .public sub_02050974
@@ -108,4 +102,10 @@
 .public sub_02054FEC
 .public sub_02055020
 .public sub_02055054
+.public TYPE_SPECIFIC_EXCLUSIVE_ITEMS
+.public UnloadFile
 .public vsprintf
+.public WONDER_GUMMI_IQ_GAIN
+.public WONDER_GUMMI_STAT_BOOST
+.public ZINC_STAT_BOOST
+.public ZInit8
--- a/asm/include/main_02013864.inc
+++ b/asm/include/main_02013864.inc
@@ -1,3 +1,3 @@
 #pragma once
-.public DUNGEON_MOVE_TABLES
 .public _02098D64
+.public DUNGEON_MOVE_TABLES
--- a/asm/include/main_02013B70.inc
+++ b/asm/include/main_02013B70.inc
@@ -1,3 +1,3 @@
 #pragma once
-.public DUNGEON_MOVE_TABLES
 .public _s32_div_f
+.public DUNGEON_MOVE_TABLES
--- a/asm/include/main_02013C30.inc
+++ b/asm/include/main_02013C30.inc
@@ -1,132 +1,4 @@
 #pragma once
-.public AUDIO_COMMANDS_BUFFER
-.public ArrayCopy32
-.public ArrayFill32
-.public BagHasExclusiveItemTypeForMonster
-.public CopyAndInterleave
-.public CopyAndInterleave0
-.public CopyBitsFrom
-.public CopyBitsTo
-.public CopyStringFromId
-.public DUNGEON_MOVE_TABLES
-.public Debug_FatalError
-.public Debug_GetDebugFlag
-.public Debug_Print
-.public Debug_Print0
-.public DirectoryFileMngr_GetDirectoryFileSize
-.public DirectoryFileMngr_LoadDirectoryFile
-.public DirectoryFileMngr_OpenDirectoryFile
-.public DseBgm_IsPlaying
-.public DseBgm_Load
-.public DseBgm_SetFades
-.public DseBgm_SetSignalCallback
-.public DseBgm_Stop
-.public DseBgm_Unload
-.public DseDriver_ConfigureHeap
-.public DseDriver_Init
-.public DseDriver_LoadDefaultSettings
-.public DseSe_GetUsedBankIDs
-.public DseSe_HasPlayingInstances
-.public DseSe_Load
-.public DseSe_Play
-.public DseSe_Stop
-.public DseSe_StopAll
-.public DseSe_Unload
-.public DseSequence_GetParameter
-.public DseSwd_IsBankLoading
-.public DseSwd_LoadBank
-.public DseSwd_LoadMainBank
-.public DseSwd_LoadWaves
-.public DseSwd_Unload
-.public DungeonGoesUp
-.public DungeonSwapIdxToId
-.public ENTITIES
-.public EnqueueRender3dTexture
-.public FileClose
-.public FileGetSize
-.public FileRom_HandleOpen
-.public FileRom_HandleRead
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
-.public FileRom_Veneer_FileInit
-.public G3i_LookAt_
-.public G3i_OrthoW_
-.public GXS_BeginLoadBGExtPltt
-.public GXS_BeginLoadOBJExtPltt
-.public GXS_EndLoadBGExtPltt
-.public GXS_EndLoadOBJExtPltt
-.public GX_BeginLoadBGExtPltt
-.public GX_BeginLoadOBJExtPltt
-.public GX_BeginLoadTex
-.public GX_BeginLoadTexPltt
-.public GX_EndLoadBGExtPltt
-.public GX_EndLoadOBJExtPltt
-.public GX_EndLoadTex
-.public GX_EndLoadTexPltt
-.public GX_LoadTex
-.public GX_LoadTexPltt
-.public GetAbility
-.public GetAbilityString
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetActorMatchingStorageId
-.public GetCurrentBagCapacity
-.public GetDsFirmwareUserSettingsVeneer
-.public GetExecuteSpecialEpisodeType
-.public GetGameMode
-.public GetInfoMoveGround
-.public GetIqSkillStringId
-.public GetItemMoveId16
-.public GetItemNameFormatted
-.public GetMainTeamName
-.public GetMonsterGender
-.public GetMonsterGenderVeneer
-.public GetMoveActualAccuracy
-.public GetMoveBasePowerFromId
-.public GetMoveName
-.public GetNameString
-.public GetNbFloors
-.public GetNbFloorsPlusOne
-.public GetPerformanceFlagWithChecks
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetTypeStringId
-.public IqSkillFlagTest
-.public LANGUAGE_INFO_DATA
-.public LoadFileFromRom
-.public LoadScriptVariableValue
-.public LoadScriptVariableValueAtIndex
-.public LoadStringFile
-.public MOVE_ACCURACY_STARS_TABLE
-.public MOVE_POWER_STARS_TABLE
-.public MemAlloc
-.public MemArenaAlloc
-.public MemFree
-.public MemLocateSet
-.public MemLocateUnset
-.public MemZero
-.public MemZero32
-.public Memcpy32
-.public MultiplyByFixedPoint
-.public NewRender3dQuadrilateral
-.public NewRender3dRectangle
-.public NewRender3dTexture
-.public NewRender3dTiling
-.public PUNCH_MOVE_LIST
-.public PointsToZero
-.public RECOIL_MOVE_LIST
-.public RENDER_3D
-.public RENDER_3D_FUNCTIONS_64
-.public Rand16Bit
-.public Render3dProcessQueue
-.public ResumeBgm
-.public Rgb8ToRgb5
-.public StringFromId
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public WAN_TABLE
-.public ZInit8
 .public _02098EA8
 .public _02098EE0
 .public _02098F60
@@ -390,15 +262,139 @@
 .public _022A5970
 .public _s32_div_f
 .public _u32_div_f
+.public ArrayCopy32
+.public ArrayFill32
+.public AUDIO_COMMANDS_BUFFER
+.public BagHasExclusiveItemTypeForMonster
+.public CopyAndInterleave
+.public CopyAndInterleave0
+.public CopyBitsFrom
+.public CopyBitsTo
+.public CopyStringFromId
+.public Debug_FatalError
+.public Debug_GetDebugFlag
+.public Debug_Print
+.public Debug_Print0
+.public DirectoryFileMngr_GetDirectoryFileSize
+.public DirectoryFileMngr_LoadDirectoryFile
+.public DirectoryFileMngr_OpenDirectoryFile
+.public DseBgm_IsPlaying
+.public DseBgm_Load
+.public DseBgm_SetFades
+.public DseBgm_SetSignalCallback
+.public DseBgm_Stop
+.public DseBgm_Unload
+.public DseDriver_ConfigureHeap
+.public DseDriver_Init
+.public DseDriver_LoadDefaultSettings
+.public DseSe_GetUsedBankIDs
+.public DseSe_HasPlayingInstances
+.public DseSe_Load
+.public DseSe_Play
+.public DseSe_Stop
+.public DseSe_StopAll
+.public DseSe_Unload
+.public DseSequence_GetParameter
+.public DseSwd_IsBankLoading
+.public DseSwd_LoadBank
+.public DseSwd_LoadMainBank
+.public DseSwd_LoadWaves
+.public DseSwd_Unload
+.public DUNGEON_MOVE_TABLES
+.public DungeonGoesUp
+.public DungeonSwapIdxToId
+.public EnqueueRender3dTexture
+.public ENTITIES
+.public FileClose
+.public FileGetSize
+.public FileRom_HandleOpen
+.public FileRom_HandleRead
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
+.public G3i_LookAt_
+.public G3i_OrthoW_
+.public GetAbility
+.public GetAbilityString
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetActorMatchingStorageId
+.public GetCurrentBagCapacity
+.public GetDsFirmwareUserSettingsVeneer
+.public GetExecuteSpecialEpisodeType
+.public GetGameMode
+.public GetInfoMoveGround
+.public GetIqSkillStringId
+.public GetItemMoveId16
+.public GetItemNameFormatted
+.public GetMainTeamName
+.public GetMonsterGender
+.public GetMonsterGenderVeneer
+.public GetMoveActualAccuracy
+.public GetMoveBasePowerFromId
+.public GetMoveName
+.public GetNameString
+.public GetNbFloors
+.public GetNbFloorsPlusOne
+.public GetPerformanceFlagWithChecks
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetTypeStringId
+.public GX_BeginLoadBGExtPltt
+.public GX_BeginLoadOBJExtPltt
+.public GX_BeginLoadTex
+.public GX_BeginLoadTexPltt
+.public GX_EndLoadBGExtPltt
+.public GX_EndLoadOBJExtPltt
+.public GX_EndLoadTex
+.public GX_EndLoadTexPltt
+.public GX_LoadTex
+.public GX_LoadTexPltt
+.public GXS_BeginLoadBGExtPltt
+.public GXS_BeginLoadOBJExtPltt
+.public GXS_EndLoadBGExtPltt
+.public GXS_EndLoadOBJExtPltt
+.public IqSkillFlagTest
+.public LANGUAGE_INFO_DATA
+.public LoadFileFromRom
+.public LoadScriptVariableValue
+.public LoadScriptVariableValueAtIndex
+.public LoadStringFile
+.public MemAlloc
+.public MemArenaAlloc
+.public Memcpy32
+.public MemFree
+.public MemLocateSet
+.public MemLocateUnset
 .public memset
+.public MemZero
+.public MemZero32
+.public MOVE_ACCURACY_STARS_TABLE
+.public MOVE_POWER_STARS_TABLE
+.public MultiplyByFixedPoint
+.public NewRender3dQuadrilateral
+.public NewRender3dRectangle
+.public NewRender3dTexture
+.public NewRender3dTiling
 .public ov10_022BDADC
 .public ov10_022C2528
+.public PointsToZero
+.public PUNCH_MOVE_LIST
+.public Rand16Bit
+.public RECOIL_MOVE_LIST
+.public Render3dProcessQueue
+.public RENDER_3D
+.public RENDER_3D_FUNCTIONS_64
+.public ResumeBgm
+.public Rgb8ToRgb5
 .public sprintf
 .public strcat
 .public strcmp
 .public strcpy
+.public StringFromId
 .public strlen
 .public strncmp
+.public StrncpySimpleNoPadSafe
 .public strstr
 .public sub_01FF8F04
 .public sub_02002778
@@ -476,4 +472,8 @@
 .public sub_0207C9C4
 .public sub_0207C9E4
 .public sub_0207CC10
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
 .public vsprintf
+.public WAN_TABLE
+.public ZInit8
--- a/asm/include/main_02034974.inc
+++ b/asm/include/main_02034974.inc
@@ -1,241 +1,4 @@
 #pragma once
-.public AddItemToStorage
-.public AddMoneyCarried
-.public ApplyLevelUpBoostsToGroundMonster
-.public Arm9LoadUnkFieldNa0x2029EC8
-.public Arm9StoreUnkFieldNa0x2029ED8
-.public BAG_ITEMS_PTR_MIRROR
-.public CanMonsterUseMove
-.public CardBackupError
-.public CardPullOutWithStatus
-.public CheckDebugMenuField0x1A4
-.public CheckOptionsMenuField0x1A4
-.public CheckParentMenuField0x1A0
-.public ClearAdventureLogStruct
-.public ClearWindow
-.public CloseAdvancedMenu
-.public CloseAdvancedTextBox
-.public CloseAdvancedTextBox2
-.public CloseCollectionMenu
-.public CloseDebugMenu
-.public CloseDialogueBox
-.public CloseOptionsMenu
-.public CloseParentMenu
-.public ClosePortraitBox
-.public CloseScrollBox
-.public CloseSimpleMenu
-.public CloseTeamSelectionMenu
-.public CloseTextBox
-.public CloseTextBox2
-.public ConvertStorageItemAtIdxToItem
-.public CopyBitsFrom
-.public CopyBitsTo
-.public CopyNStringFromId
-.public CopyProgressInfoFromScratchFrom
-.public CopyProgressInfoFromScratchTo
-.public CountNbOfItemsInStorage
-.public CountNbOfValidItemsInStorage
-.public CountNbOfValidItemsInTimeDarknessInStorage
-.public CreateAdvancedMenu
-.public CreateAdvancedTextBox
-.public CreateAdvancedTextBoxWithArg
-.public CreateCollectionMenu
-.public CreateDebugMenu
-.public CreateDialogueBox
-.public CreateOptionsMenu
-.public CreateParentMenu
-.public CreateParentMenuFromStringIds
-.public CreatePortraitBox
-.public CreateScrollBoxMulti
-.public CreateScrollBoxSingle
-.public CreateSimpleMenu
-.public CreateSimpleMenuFromStringIds
-.public CreateTeamSelectionMenu
-.public CreateTextBox
-.public CreateTextBoxWithArg
-.public DEFAULT_HERO_ID
-.public DUNGEON_PTR
-.public Debug_GetDebugFlag
-.public Debug_GetLogFlag
-.public Debug_Print0
-.public Debug_SetDebugFlag
-.public Debug_SetLogFlag
-.public DisableIqSkill
-.public DrawTextInWindow
-.public DrawTileGrid
-.public DumpScriptVariableValues
-.public EnableAllLearnableIqSkills
-.public EventFlagBackup
-.public EventFlagResume
-.public FORBIDDEN_FORGOT_MOVE_LIST
-.public FemaleToMaleForm
-.public FormatMoveStringMore
-.public GAME_MODE
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetActualSellPrice
-.public GetAdvancedMenuCurrentOption
-.public GetAdvancedMenuResult
-.public GetAdvancedTextBoxFlags2
-.public GetAdventureLogDungeonFloor
-.public GetCurrentBagCapacity
-.public GetDexNumber
-.public GetDungeonResultString
-.public GetEvolutionPossibilities
-.public GetExecuteSpecialEpisodeType
-.public GetHeldButtons
-.public GetHero
-.public GetHeroMemberIdx
-.public GetInfoGroundMoveset
-.public GetIqSkillStringId
-.public GetItemAtIdx
-.public GetItemCategory
-.public GetItemCategoryVeneer
-.public GetItemMoveId16
-.public GetKeyM2NSwitch
-.public GetLanguageType
-.public GetLearnableIqSkills
-.public GetMainCharacter1MemberIdx
-.public GetMainCharacter2MemberIdx
-.public GetMainCharacter3MemberIdx
-.public GetMaxPp
-.public GetMoneyCarried
-.public GetMonsterGenderVeneer
-.public GetMonsterName
-.public GetMoveRangeId
-.public GetMoveType
-.public GetNameRaw
-.public GetNameString
-.public GetNameWithGender
-.public GetNbItemsInBag
-.public GetNextIqSkill
-.public GetOptionsMenuResult
-.public GetOptionsMenuStates
-.public GetPartner
-.public GetPartnerMemberIdx
-.public GetPerformanceFlagWithChecks
-.public GetPpIncrease
-.public GetPressedButtons
-.public GetRank
-.public GetRankUpEntry
-.public GetReleasedStylus
-.public GetRngSeed
-.public GetSimpleMenuResult
-.public GetSpecialEpisodeType
-.public GetSpeciesString
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetTime
-.public GetType
-.public GetTypeStringId
-.public GetWindow
-.public HidePortraitBox
-.public InitMove
-.public InitPortraitParams
-.public InitPortraitParamsWithMonsterId
-.public InitPreprocessorArgs
-.public InitScriptVariableValues
-.public IqSkillFlagTest
-.public Is2TurnsMove
-.public IsAdvancedMenuActive2
-.public IsAdvancedTextBoxActive
-.public IsCollectionMenuActive
-.public IsCollectionMenuState3
-.public IsDebugMenuActive
-.public IsDeoxys
-.public IsDialogueBoxActive
-.public IsExclusiveItemIdForMonster
-.public IsExperienceLocked
-.public IsGummi
-.public IsItemInTimeDarkness
-.public IsItemValidVeneer
-.public IsMainCharacter
-.public IsMonsterIllegalForMissions
-.public IsMovesetValidInTimeDarkness
-.public IsNot2TurnsMoveOrSketch
-.public IsOptionsMenuActive
-.public IsParentMenuActive
-.public IsScrollBoxActive
-.public IsShaymin
-.public IsShoppableItem
-.public IsSimpleMenuActive
-.public IsStorableItem
-.public IsStorageFull
-.public IsTeamSelectionMenuActive
-.public IsTeamSelectionMenuState3
-.public IsThrownItem
-.public IsTreasureBox
-.public IsValidPortrait
-.public IsValidTeamMember
-.public KEYBOARD_STRING_IDS
-.public LAST_NEW_MOVE
-.public LearnMoves
-.public LoadOverlay
-.public LoadScriptVariableValue
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
-.public MemsetSimple
-.public NOTIFY_NOTE
-.public OS_GetLockID
-.public OverlayIsLoaded
-.public PARTNER_TALK_KIND_TABLE
-.public PlayAdvancedTextBoxInputSound
-.public PlayBgmByIdVeneer
-.public PlaySeVolumeWrapper
-.public PreprocessString
-.public PreprocessStringFromId
-.public Rand32Bit
-.public RandInt
-.public RandIntSafe
-.public ReadItemsFromSave
-.public ReadMonsterInfoFromSave
-.public ReadStringFromDialogueBox
-.public RemoveEmptyItemsInBag
-.public ResetGlobalProgress
-.public RestoreScriptVariableValues
-.public ResumeAdvancedMenu
-.public SPECIAL_EPISODE_MAIN_CHARACTERS
-.public STATUSES_FULL_DESCRIPTION_STRING_IDS
-.public SaveScriptVariableValue
-.public SaveScriptVariableValueBytes
-.public SetActiveInventory
-.public SetActiveKecleonShop
-.public SetActiveTeam
-.public SetAdvancedTextBoxField0x1C2
-.public SetAdvancedTextBoxPartialMenu
-.public SetAdvancedTextBoxState5
-.public SetBothScreensWindowsColor
-.public SetCollectionMenuField0x1BC
-.public SetCollectionMenuVoidFn
-.public SetCollectionMenuWidth
-.public SetMainTeamName
-.public SetPortraitEmotion
-.public SetPortraitLayout
-.public SetPortraitOffset
-.public SetRngSeed
-.public SetSimpleMenuField0x1AC
-.public SetTeamSetupHeroAndPartnerOnly
-.public SetUnkAdvancedTextBoxFn
-.public SetUnkAdvancedTextBoxWindowFn
-.public ShowDialogueBox
-.public ShowPortraitInPortraitBox
-.public ShowStringIdInDialogueBox
-.public ShowStringInDialogueBox
-.public SortItemsInBag
-.public SortItemsInStorage
-.public StoreDefaultTeamData
-.public StrcpySimple
-.public StringFromId
-.public StrncpyName
-.public StrncpySimple
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public TryPointCameraToMonster
-.public UpdateWindow
-.public WriteItemsToSave
-.public WriteMonsterInfoToSave
 .public _0209B08C
 .public _0209B09C
 .public _0209B0EC
@@ -289,7 +52,6 @@
 .public _0209C5D0
 .public _0209C5E0
 .public _0209C604
-.public _0209C60C
 .public _0209C618
 .public _0209C628
 .public _0209C638
@@ -303,108 +65,6 @@
 .public _0209C764
 .public _0209C798
 .public _0209C7B8
-.public _0209C7CC
-.public _0209C7D4
-.public _0209C7E4
-.public _0209C7F4
-.public _0209C820
-.public _0209C82C
-.public _0209C83C
-.public _0209C844
-.public _0209C846
-.public _0209C850
-.public _0209C85C
-.public _0209C86C
-.public _0209C884
-.public _0209C89C
-.public _0209C8A8
-.public _0209C8B8
-.public _0209C8C8
-.public _0209C928
-.public _0209C92C
-.public _0209C93C
-.public _0209C94C
-.public _0209C95C
-.public _0209C96C
-.public _0209C97C
-.public _0209C98C
-.public _0209C99C
-.public _0209C9AC
-.public _0209C9B0
-.public _0209C9CC
-.public _0209C9D4
-.public _0209C9DC
-.public _0209C9E4
-.public _0209C9F4
-.public _0209C9FC
-.public _0209CA08
-.public _0209CA18
-.public _0209CA2C
-.public _0209CA3C
-.public _0209CA48
-.public _0209CA58
-.public _0209CA68
-.public _0209CA78
-.public _0209CA88
-.public _0209CA98
-.public _0209CAB4
-.public _0209CB0C
-.public _0209CB3C
-.public _0209CB4C
-.public _0209CB6C
-.public _0209CB78
-.public _0209CB88
-.public _0209CB98
-.public _0209CBA8
-.public _0209CBB0
-.public _0209CBB8
-.public _0209CBC0
-.public _0209CBC8
-.public _0209CBD0
-.public _0209CBD8
-.public _0209CBE0
-.public _0209CBE8
-.public _0209CC0C
-.public _0209CC18
-.public _0209CC28
-.public _0209CC38
-.public _0209CC48
-.public _0209CC60
-.public _0209CC80
-.public _0209CC90
-.public _0209CCA0
-.public _0209CCB0
-.public _0209CCC0
-.public _0209CCD0
-.public _0209CCE0
-.public _0209CD4C
-.public _0209CD6C
-.public _0209CD84
-.public _0209CD94
-.public _0209CDA4
-.public _0209CDB8
-.public _0209CDD0
-.public _0209CDE0
-.public _0209CDF8
-.public _0209CE10
-.public _0209CE40
-.public _0209CE50
-.public _0209CE54
-.public _0209CE58
-.public _0209CE68
-.public _0209CE78
-.public _0209CE88
-.public _0209CE89
-.public _0209E912
-.public _020A2808
-.public _020A281C
-.public _020A2830
-.public _020A2844
-.public _020A2858
-.public _020A286C
-.public _020A2880
-.public _020A2894
-.public _020A28A8
 .public _020AFDB8
 .public _020AFDBC
 .public _020AFDD0
@@ -415,129 +75,115 @@
 .public _020AFE40
 .public _020AFE58
 .public _020AFE5C
-.public _020AFE70
-.public _020AFE74
-.public _020AFE78
-.public _020AFE7C
-.public _020AFE8C
-.public _020AFE90
-.public _020AFE98
-.public _020AFEA8
-.public _020AFEB4
-.public _020AFEC8
-.public _020AFECC
-.public _020AFED0
-.public _020AFED4
-.public _020AFED8
-.public _020AFEDC
-.public _020AFEE0
-.public _020AFEE4
-.public _020AFEE8
-.public _020AFEEC
-.public _020AFEF4
-.public _020AFF00
-.public _020AFF14
-.public _020AFF38
-.public _020AFF40
-.public _020AFF4C
-.public _020AFF54
-.public _020AFF5C
-.public _020AFF64
-.public _020AFF68
-.public _020AFF6C
 .public _020B12A0_JP
 .public _022AADF8
-.public _022AADFC
-.public _022AAE00
-.public _022AAE2A
-.public _022AAE2E
-.public _022AAE58
-.public _022AAE64
-.public _022AAE68
-.public _022AAE70
-.public _022AAE74
-.public _022AAE78
-.public _022AAEA4
-.public _022AAEA8
-.public _022AAEAC
-.public _022AB09C
-.public _022AB0A0
-.public _022AB0A1
-.public _022AB0A2
-.public _022AB0A9
-.public _f2d
-.public _fsub
 .public _s32_div_f
-.public memcpy
+.public CheckDebugMenuField0x1A4
+.public CheckOptionsMenuField0x1A4
+.public CheckParentMenuField0x1A0
+.public CloseAdvancedMenu
+.public CloseAdvancedTextBox
+.public CloseDebugMenu
+.public CloseDialogueBox
+.public CloseOptionsMenu
+.public CloseParentMenu
+.public ClosePortraitBox
+.public CloseSimpleMenu
+.public CloseTeamSelectionMenu
+.public CloseTextBox
+.public CreateAdvancedMenu
+.public CreateAdvancedTextBox
+.public CreateDebugMenu
+.public CreateDialogueBox
+.public CreateOptionsMenu
+.public CreateParentMenuFromStringIds
+.public CreatePortraitBox
+.public CreateSimpleMenu
+.public CreateSimpleMenuFromStringIds
+.public CreateTeamSelectionMenu
+.public CreateTextBox
+.public Debug_GetDebugFlag
+.public Debug_GetLogFlag
+.public Debug_Print0
+.public Debug_SetDebugFlag
+.public Debug_SetLogFlag
+.public DrawTextInWindow
+.public FemaleToMaleForm
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetAdvancedMenuResult
+.public GetDexNumber
+.public GetEvolutionPossibilities
+.public GetHeldButtons
+.public GetHero
+.public GetHeroMemberIdx
+.public GetItemMoveId16
+.public GetKeyM2NSwitch
+.public GetMainCharacter1MemberIdx
+.public GetMainCharacter2MemberIdx
+.public GetMainCharacter3MemberIdx
+.public GetNameString
+.public GetOptionsMenuResult
+.public GetOptionsMenuStates
+.public GetPartner
+.public GetPartnerMemberIdx
+.public GetPressedButtons
+.public GetSimpleMenuResult
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetType
+.public GetWindow
+.public HidePortraitBox
+.public InitPortraitParams
+.public IsAdvancedMenuActive2
+.public IsAdvancedTextBoxActive
+.public IsDebugMenuActive
+.public IsDialogueBoxActive
+.public IsMainCharacter
+.public IsMovesetValidInTimeDarkness
+.public IsOptionsMenuActive
+.public IsParentMenuActive
+.public IsShaymin
+.public IsSimpleMenuActive
+.public IsTeamSelectionMenuActive
+.public IsTeamSelectionMenuState3
+.public IsValidPortrait
+.public IsValidTeamMember
+.public KEYBOARD_STRING_IDS
+.public LoadOverlay
+.public MemAlloc
+.public MemcpySimple
+.public MemFree
+.public MemZero
 .public ov11_022E6E68
-.public ov11_023061CC
-.public ov11_023061E4
-.public ov11_02306C64
-.public ov11_02306C9C
-.public ov11_0230D000
-.public ov11_0230D220
 .public ov11_0230D71C
-.public ov11_0230D92C
-.public ov11_02310BDC
-.public ov11_02310C18
-.public ov29_022E2A78
-.public ov29_022EA62C
-.public ov29_023002F0
-.public ov29_02347100
+.public OverlayIsLoaded
+.public PlaySeVolumeWrapper
+.public PreprocessStringFromId
+.public SaveScriptVariableValueBytes
+.public SetAdvancedTextBoxField0x1C2
+.public SetAdvancedTextBoxState5
+.public SetMainTeamName
+.public SetNotifyNote
+.public SetSimpleMenuField0x1AC
+.public ShowDialogueBox
+.public ShowPortraitInPortraitBox
+.public ShowStringIdInDialogueBox
+.public ShowStringInDialogueBox
 .public sprintf
-.public strcat
 .public strcpy
-.public strlen
-.public strncmp
-.public strncpy
-.public sub_02001808
-.public sub_02002580
-.public sub_020027F8
-.public sub_02003B94
-.public sub_02003BC8
+.public StrcpySimple
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
 .public sub_020063F4
-.public sub_02006498
-.public sub_02006BFC
-.public sub_02006C8C
-.public sub_0200C5DC
-.public sub_0200CABC
-.public sub_0200CAD4
-.public sub_0200CAE4
-.public sub_0200D310
-.public sub_0200D65C
-.public sub_0200D670
-.public sub_0200FD48
-.public sub_02010044
-.public sub_02010060
-.public sub_02010154
-.public sub_0201077C
-.public sub_02010794
-.public sub_020107F4
-.public sub_02012AB8
-.public sub_02013190
-.public sub_020131F0
-.public sub_02013E54
-.public sub_02013F58
-.public sub_02017C50
-.public sub_02017C74
-.public sub_02017C80
-.public sub_0202059C
-.public sub_020205C0
 .public sub_0202065C
 .public sub_020236FC
 .public sub_0202372C
 .public sub_02024B94
-.public sub_02024D7C
 .public sub_020251F0
 .public sub_02025C7C
 .public sub_02025D50
-.public sub_02025E84
-.public sub_0202613C
-.public sub_020261D4
-.public sub_02026204
 .public sub_02026268
-.public sub_020262E0
-.public sub_020264A4
 .public sub_020264F8
 .public sub_020265A8
 .public sub_02027180
@@ -545,27 +191,11 @@
 .public sub_0202810C
 .public sub_0202812C
 .public sub_020282F4
-.public sub_02028324
 .public sub_02028354
 .public sub_0202836C
-.public sub_020288DC
 .public sub_020288FC
-.public sub_02029F88
-.public sub_02029FBC
 .public sub_0202A2A4
-.public sub_0202AAE8
-.public sub_0202AB80
 .public sub_0202ABB0
-.public sub_0202C1E4
-.public sub_0202C620
-.public sub_0202C654
-.public sub_0202C6D4
-.public sub_0202C748
-.public sub_0202C75C
-.public sub_0202D068
-.public sub_0202D0EC
-.public sub_0202D134
-.public sub_0202D16C
 .public sub_0202D59C
 .public sub_0202DF64
 .public sub_0202F16C
@@ -575,19 +205,8 @@
 .public sub_0202F3F8
 .public sub_0202F954
 .public sub_0202F9B8
-.public sub_020307EC
-.public sub_020308E4
-.public sub_02030908
 .public sub_02030940
-.public sub_02030978
 .public sub_020309B8
-.public sub_02030A18
-.public sub_02030A50
-.public sub_02030A64
-.public sub_02030A74
-.public sub_02030A90
-.public sub_02030AAC
-.public sub_02030EF0
 .public sub_0203111C
 .public sub_0203115C
 .public sub_0203117C
@@ -602,69 +221,27 @@
 .public sub_020347F0
 .public sub_02034840
 .public sub_020348E4
-.public sub_0204B028
-.public sub_0204C9F4
-.public sub_0204CDB8
+.public sub_0203C784
+.public sub_0203C9A0
+.public sub_02048078
+.public sub_0204964C
+.public sub_0204AB78
+.public sub_0204AB98
+.public sub_0204AF98
+.public sub_0204AFAC
 .public sub_0204DA1C
-.public sub_0204E154
-.public sub_0204E19C
 .public sub_0204E210
 .public sub_0204E3C8
-.public sub_0204F9B8
-.public sub_02050974
-.public sub_02050990
-.public sub_020509BC
-.public sub_02050C10
-.public sub_02050CF8
-.public sub_02050D84
-.public sub_02052C74
-.public sub_02052CD8
-.public sub_02052CE8
-.public sub_02052E2C
 .public sub_02052FF8
-.public sub_02053568
-.public sub_02053628
-.public sub_02053660
-.public sub_02053A0C
 .public sub_02053D1C
-.public sub_020547C8
-.public sub_020547D8
-.public sub_02054804
 .public sub_02054F18
-.public sub_02055B78
-.public sub_02055D4C
-.public sub_02056228
 .public sub_02056410
 .public sub_02056460
 .public sub_020564B0
 .public sub_020568A4
-.public sub_02056B58
-.public sub_02056BD4
 .public sub_02056F60
-.public sub_02058460
 .public sub_020584F8
-.public sub_020584FC
-.public sub_020597B0
-.public sub_02059A74
 .public sub_02059B08
-.public sub_0205A4B4
-.public sub_0205B028
-.public sub_0205B0A0
-.public sub_0205B0B8
-.public sub_0205B478
-.public sub_0205BD9C
-.public sub_0205BFB0
-.public sub_0205C75C
-.public sub_0205FAB0
-.public sub_0205FC20
-.public sub_0206637C
-.public sub_02079094
-.public sub_0207B9EC
-.public sub_0208346C
-.public sub_0208347C
-.public sub_02083A18
-.public sub_02083B00
-.public sub_02083B14
-.public sub_02083B3C
-.public sub_02084304
+.public TEAM_MEMBER_TABLE_PTR
+.public UpdateWindow
 .public vsprintf
--- a/asm/include/main_0203C774.inc
+++ b/asm/include/main_0203C774.inc
@@ -0,0 +1,525 @@
+#pragma once
+.public _0209C60C
+.public _0209C7CC
+.public _0209C7D4
+.public _0209C7E4
+.public _0209C7F4
+.public _0209C820
+.public _0209C82C
+.public _0209C83C
+.public _0209C844
+.public _0209C846
+.public _0209C850
+.public _0209C85C
+.public _0209C86C
+.public _0209C884
+.public _0209C89C
+.public _0209C8A8
+.public _0209C8B8
+.public _0209C8C8
+.public _0209C928
+.public _0209C92C
+.public _0209C93C
+.public _0209C94C
+.public _0209C95C
+.public _0209C96C
+.public _0209C97C
+.public _0209C98C
+.public _0209C99C
+.public _0209C9AC
+.public _0209C9B0
+.public _0209C9CC
+.public _0209C9D4
+.public _0209C9DC
+.public _0209C9E4
+.public _0209C9F4
+.public _0209C9FC
+.public _0209CA08
+.public _0209CA18
+.public _0209CA2C
+.public _0209CA3C
+.public _0209CA48
+.public _0209CA58
+.public _0209CA68
+.public _0209CA78
+.public _0209CA88
+.public _0209CA98
+.public _0209CAB4
+.public _0209CB0C
+.public _0209CB3C
+.public _0209CB4C
+.public _0209CB6C
+.public _0209CB78
+.public _0209CB88
+.public _0209CB98
+.public _0209CBA8
+.public _0209CBB0
+.public _0209CBB8
+.public _0209CBC0
+.public _0209CBC8
+.public _0209CBD0
+.public _0209CBD8
+.public _0209CBE0
+.public _0209CBE8
+.public _0209CC0C
+.public _0209CC18
+.public _0209CC28
+.public _0209CC38
+.public _0209CC48
+.public _0209CC60
+.public _0209CC80
+.public _0209CC90
+.public _0209CCA0
+.public _0209CCB0
+.public _0209CCC0
+.public _0209CCD0
+.public _0209CCE0
+.public _0209CD4C
+.public _0209CD6C
+.public _0209CD84
+.public _0209CD94
+.public _0209CDA4
+.public _0209CDB8
+.public _0209CDD0
+.public _0209CDE0
+.public _0209CDF8
+.public _0209CE10
+.public _0209CE40
+.public _0209CE50
+.public _0209CE54
+.public _0209CE58
+.public _0209CE68
+.public _0209CE78
+.public _0209CE88
+.public _0209CE89
+.public _0209E912
+.public _020A2808
+.public _020A281C
+.public _020A2830
+.public _020A2844
+.public _020A2858
+.public _020A286C
+.public _020A2880
+.public _020A2894
+.public _020A28A8
+.public _020AFE5C
+.public _020AFE70
+.public _020AFE74
+.public _020AFE78
+.public _020AFE7C
+.public _020AFE8C
+.public _020AFE90
+.public _020AFE98
+.public _020AFEA8
+.public _020AFEB4
+.public _020AFEC8
+.public _020AFECC
+.public _020AFED0
+.public _020AFED4
+.public _020AFED8
+.public _020AFEDC
+.public _020AFEE0
+.public _020AFEE4
+.public _020AFEE8
+.public _020AFEEC
+.public _020AFEF4
+.public _020AFF00
+.public _020AFF14
+.public _020AFF38
+.public _020AFF40
+.public _020AFF4C
+.public _020AFF54
+.public _020AFF5C
+.public _020AFF64
+.public _020AFF68
+.public _020AFF6C
+.public _022AADFC
+.public _022AAE00
+.public _022AAE2A
+.public _022AAE2E
+.public _022AAE58
+.public _022AAE64
+.public _022AAE68
+.public _022AAE70
+.public _022AAE74
+.public _022AAE78
+.public _022AAEA4
+.public _022AAEA8
+.public _022AAEAC
+.public _022AB09C
+.public _022AB0A0
+.public _022AB0A1
+.public _022AB0A2
+.public _022AB0A9
+.public _f2d
+.public _fsub
+.public _s32_div_f
+.public AddItemToStorage
+.public AddMoneyCarried
+.public ApplyLevelUpBoostsToGroundMonster
+.public Arm9LoadUnkFieldNa0x2029EC8
+.public Arm9StoreUnkFieldNa0x2029ED8
+.public BAG_ITEMS_PTR_MIRROR
+.public CanMonsterUseMove
+.public CardBackupError
+.public CardPullOutWithStatus
+.public ClearAdventureLogStruct
+.public ClearWindow
+.public CloseAdvancedMenu
+.public CloseAdvancedTextBox
+.public CloseAdvancedTextBox2
+.public CloseCollectionMenu
+.public CloseDialogueBox
+.public CloseParentMenu
+.public ClosePortraitBox
+.public CloseScrollBox
+.public CloseSimpleMenu
+.public CloseTextBox
+.public CloseTextBox2
+.public ConvertStorageItemAtIdxToItem
+.public CopyBitsFrom
+.public CopyBitsTo
+.public CopyNStringFromId
+.public CopyProgressInfoFromScratchFrom
+.public CopyProgressInfoFromScratchTo
+.public CountNbOfItemsInStorage
+.public CountNbOfValidItemsInStorage
+.public CountNbOfValidItemsInTimeDarknessInStorage
+.public CreateAdvancedMenu
+.public CreateAdvancedTextBox
+.public CreateAdvancedTextBoxWithArg
+.public CreateCollectionMenu
+.public CreateDialogueBox
+.public CreateParentMenu
+.public CreateParentMenuFromStringIds
+.public CreatePortraitBox
+.public CreateScrollBoxMulti
+.public CreateScrollBoxSingle
+.public CreateSimpleMenu
+.public CreateSimpleMenuFromStringIds
+.public CreateTextBox
+.public CreateTextBoxWithArg
+.public Debug_GetDebugFlag
+.public Debug_Print0
+.public DEFAULT_HERO_ID
+.public DisableIqSkill
+.public DrawTextInWindow
+.public DrawTileGrid
+.public DumpScriptVariableValues
+.public DUNGEON_PTR
+.public EnableAllLearnableIqSkills
+.public EventFlagBackup
+.public EventFlagResume
+.public FORBIDDEN_FORGOT_MOVE_LIST
+.public FormatMoveStringMore
+.public GAME_MODE
+.public GetActiveTeamMember
+.public GetActualSellPrice
+.public GetAdvancedMenuCurrentOption
+.public GetAdvancedMenuResult
+.public GetAdvancedTextBoxFlags2
+.public GetAdventureLogDungeonFloor
+.public GetCurrentBagCapacity
+.public GetDexNumber
+.public GetDungeonResultString
+.public GetExecuteSpecialEpisodeType
+.public GetHeldButtons
+.public GetHero
+.public GetHeroMemberIdx
+.public GetInfoGroundMoveset
+.public GetIqSkillStringId
+.public GetItemAtIdx
+.public GetItemCategory
+.public GetItemCategoryVeneer
+.public GetKeyboardStatus
+.public GetKeyboardStringResult
+.public GetLanguageType
+.public GetLearnableIqSkills
+.public GetMaxPp
+.public GetMoneyCarried
+.public GetMonsterGenderVeneer
+.public GetMonsterName
+.public GetMoveRangeId
+.public GetMoveType
+.public GetNameRaw
+.public GetNameWithGender
+.public GetNbItemsInBag
+.public GetNextIqSkill
+.public GetPartner
+.public GetPartnerMemberIdx
+.public GetPerformanceFlagWithChecks
+.public GetPpIncrease
+.public GetPressedButtons
+.public GetRank
+.public GetRankUpEntry
+.public GetReleasedStylus
+.public GetRngSeed
+.public GetSimpleMenuResult
+.public GetSpecialEpisodeType
+.public GetSpeciesString
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetTime
+.public GetType
+.public GetTypeStringId
+.public HidePortraitBox
+.public InitMove
+.public InitPortraitParams
+.public InitPortraitParamsWithMonsterId
+.public InitPreprocessorArgs
+.public InitScriptVariableValues
+.public IqSkillFlagTest
+.public Is2TurnsMove
+.public IsAdvancedMenuActive2
+.public IsAdvancedTextBoxActive
+.public IsCollectionMenuActive
+.public IsCollectionMenuState3
+.public IsDeoxys
+.public IsDialogueBoxActive
+.public IsExclusiveItemIdForMonster
+.public IsExperienceLocked
+.public IsGummi
+.public IsItemInTimeDarkness
+.public IsItemValidVeneer
+.public IsMonsterIllegalForMissions
+.public IsNot2TurnsMoveOrSketch
+.public IsParentMenuActive
+.public IsScrollBoxActive
+.public IsShoppableItem
+.public IsSimpleMenuActive
+.public IsStorableItem
+.public IsStorageFull
+.public IsThrownItem
+.public IsTreasureBox
+.public LAST_NEW_MOVE
+.public LearnMoves
+.public LoadScriptVariableValue
+.public MemAlloc
+.public memcpy
+.public MemcpySimple
+.public MemFree
+.public MemsetSimple
+.public MemZero
+.public NOTIFY_NOTE
+.public OS_GetLockID
+.public ov11_023061CC
+.public ov11_023061E4
+.public ov11_02306C64
+.public ov11_02306C9C
+.public ov11_0230D000
+.public ov11_0230D220
+.public ov11_0230D92C
+.public ov11_02310BDC
+.public ov11_02310C18
+.public ov29_022E2A78
+.public ov29_022EA62C
+.public ov29_023002F0
+.public ov29_02347100
+.public PARTNER_TALK_KIND_TABLE
+.public PlayAdvancedTextBoxInputSound
+.public PlayBgmByIdVeneer
+.public PlaySeByIdVolumeWrapper
+.public PlaySeVolumeWrapper
+.public PreprocessString
+.public PreprocessStringFromId
+.public Rand32Bit
+.public RandInt
+.public RandIntSafe
+.public ReadItemsFromSave
+.public ReadMonsterInfoFromSave
+.public ReadStringFromDialogueBox
+.public RemoveEmptyItemsInBag
+.public ResetGlobalProgress
+.public RestoreScriptVariableValues
+.public ResumeAdvancedMenu
+.public SaveScriptVariableValue
+.public SaveScriptVariableValueBytes
+.public SetActiveInventory
+.public SetActiveKecleonShop
+.public SetActiveTeam
+.public SetAdvancedTextBoxField0x1C2
+.public SetAdvancedTextBoxPartialMenu
+.public SetAdvancedTextBoxState5
+.public SetBothScreensWindowsColor
+.public SetCollectionMenuField0x1BC
+.public SetCollectionMenuVoidFn
+.public SetCollectionMenuWidth
+.public SetPortraitEmotion
+.public SetPortraitLayout
+.public SetPortraitOffset
+.public SetRngSeed
+.public SetTeamSetupHeroAndPartnerOnly
+.public SetUnkAdvancedTextBoxFn
+.public SetUnkAdvancedTextBoxWindowFn
+.public ShowDialogueBox
+.public ShowKeyboard
+.public ShowPortraitInPortraitBox
+.public ShowStringIdInDialogueBox
+.public ShowStringInDialogueBox
+.public SortItemsInBag
+.public SortItemsInStorage
+.public SPECIAL_EPISODE_MAIN_CHARACTERS
+.public STATUSES_FULL_DESCRIPTION_STRING_IDS
+.public StoreDefaultTeamData
+.public strcat
+.public strcpy
+.public StrcpySimple
+.public StringFromId
+.public strlen
+.public strncmp
+.public strncpy
+.public StrncpyName
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
+.public sub_02001808
+.public sub_02002580
+.public sub_020027F8
+.public sub_02003B94
+.public sub_02003BC8
+.public sub_020063F4
+.public sub_02006498
+.public sub_02006BFC
+.public sub_02006C8C
+.public sub_0200C5DC
+.public sub_0200CABC
+.public sub_0200CAD4
+.public sub_0200CAE4
+.public sub_0200D310
+.public sub_0200D65C
+.public sub_0200D670
+.public sub_0200FD48
+.public sub_02010044
+.public sub_02010060
+.public sub_02010154
+.public sub_0201077C
+.public sub_02010794
+.public sub_020107F4
+.public sub_02012AB8
+.public sub_02013190
+.public sub_020131F0
+.public sub_02013E54
+.public sub_02013F58
+.public sub_02017C50
+.public sub_02017C74
+.public sub_0202059C
+.public sub_020205C0
+.public sub_02024D7C
+.public sub_02025D50
+.public sub_02025E84
+.public sub_0202613C
+.public sub_020261D4
+.public sub_02026204
+.public sub_02026268
+.public sub_020262E0
+.public sub_020264A4
+.public sub_020265A8
+.public sub_02027180
+.public sub_02027B1C
+.public sub_0202810C
+.public sub_0202812C
+.public sub_020282F4
+.public sub_02028324
+.public sub_02028354
+.public sub_0202836C
+.public sub_020288DC
+.public sub_02029F88
+.public sub_02029FBC
+.public sub_0202A2A4
+.public sub_0202AAE8
+.public sub_0202AB80
+.public sub_0202ABB0
+.public sub_0202C1E4
+.public sub_0202C620
+.public sub_0202C654
+.public sub_0202C6D4
+.public sub_0202C748
+.public sub_0202C75C
+.public sub_0202D068
+.public sub_0202D0EC
+.public sub_0202D134
+.public sub_0202D16C
+.public sub_0202F16C
+.public sub_0202F2C4
+.public sub_0202F334
+.public sub_0202F954
+.public sub_0202F9B8
+.public sub_020307EC
+.public sub_020308E4
+.public sub_02030908
+.public sub_02030940
+.public sub_02030978
+.public sub_02030A18
+.public sub_02030A50
+.public sub_02030A64
+.public sub_02030A74
+.public sub_02030A90
+.public sub_02030AAC
+.public sub_02030EF0
+.public sub_020348E4
+.public sub_02034974
+.public sub_02034A38
+.public sub_02037468
+.public sub_0203909C
+.public sub_02039218
+.public sub_0203931C
+.public sub_0204B028
+.public sub_0204C9F4
+.public sub_0204CDB8
+.public sub_0204E154
+.public sub_0204E19C
+.public sub_0204F9B8
+.public sub_02050974
+.public sub_02050990
+.public sub_020509BC
+.public sub_02050C10
+.public sub_02050CF8
+.public sub_02050D84
+.public sub_02052C74
+.public sub_02052CD8
+.public sub_02052CE8
+.public sub_02052E2C
+.public sub_02053568
+.public sub_02053628
+.public sub_02053660
+.public sub_02053A0C
+.public sub_020547C8
+.public sub_020547D8
+.public sub_02054804
+.public sub_02055B78
+.public sub_02055D4C
+.public sub_02056228
+.public sub_02056410
+.public sub_020564B0
+.public sub_02056B58
+.public sub_02056BD4
+.public sub_02056F60
+.public sub_02058460
+.public sub_020584FC
+.public sub_020597B0
+.public sub_02059A74
+.public sub_0205A4B4
+.public sub_0205B028
+.public sub_0205B0A0
+.public sub_0205B0B8
+.public sub_0205B478
+.public sub_0205BD9C
+.public sub_0205BFB0
+.public sub_0205C75C
+.public sub_0205FAB0
+.public sub_0205FC20
+.public sub_0206637C
+.public sub_02079094
+.public sub_0207B9EC
+.public sub_0208346C
+.public sub_0208347C
+.public sub_02083A18
+.public sub_02083B00
+.public sub_02083B14
+.public sub_02083B3C
+.public sub_02084304
+.public TEAM_MEMBER_TABLE_PTR
+.public TryPointCameraToMonster
+.public UpdateWindow
+.public vsprintf
+.public WriteItemsToSave
+.public WriteMonsterInfoToSave
--- a/asm/include/main_0204B018.inc
+++ b/asm/include/main_0204B018.inc
@@ -1,87 +1,4 @@
 #pragma once
-.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
-.public ADVENTURE_LOG_PTR
-.public ARM9_UNKNOWN_DATA__NA_209E6BC
-.public ARM9_UNKNOWN_TABLE__NA_209E12C
-.public ARM9_UNKNOWN_TABLE__NA_209E164
-.public ARM9_UNKNOWN_TABLE__NA_209E280
-.public AddMoneyCarried
-.public ApplyLevelUpBoostsToGroundMonster
-.public CLIENT_LEVEL_TABLE
-.public Copy16BitsFrom
-.public CopyNStringFromId
-.public DEBUG_SPECIAL_EPISODE_NUMBER
-.public DUNGEON_DATA_LIST
-.public Debug_FatalError
-.public Debug_Print
-.public Debug_Print0
-.public DungeonSwapIdToIdx
-.public DungeonSwapIdxToId
-.public FemaleToMaleForm
-.public FileClose
-.public FileRom_HandleOpen
-.public FileRom_HandleRead
-.public FileRom_HandleSeek
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
-.public FileRom_Veneer_FileInit
-.public GAME_MODE
-.public GLOBAL_PROGRESS_PTR
-.public GUEST_MONSTER_DATA
-.public GetBaseFormCastformCherrimDeoxys
-.public GetBodySize
-.public GetDexNumber
-.public GetDexNumberVeneer
-.public GetDungeonModeSpecial
-.public GetGameMode
-.public GetLanguageType
-.public GetMaxItemsAllowed
-.public GetMaxMembersAllowed
-.public GetMoneyCarried
-.public GetMoneyStored
-.public GetNameString
-.public GetNbItemsInBag
-.public GetNotifyNote
-.public GetPartyMembers
-.public GetRankUpEntry
-.public GetSosMailCount
-.public GetStringFromFileVeneer
-.public GuestMonsterToGroundMonster
-.public IsItemValidVeneer
-.public IsLevelResetDungeon
-.public IsMoneyAllowed
-.public IsRealMove
-.public IsRecruitingAllowed
-.public KAOMADO_FILEPATH
-.public KAOMADO_STREAM
-.public MISSION_FLOOR_RANKS_PTRS
-.public MemAlloc
-.public MemZero
-.public MemcpySimple
-.public NormalizeTreasureBox
-.public OUTLAW_LEVEL_TABLE
-.public OUTLAW_MINION_LEVEL_TABLE
-.public PENDING_DUNGEON_ID
-.public PLAY_TIME_SECONDS
-.public PORTRAIT_LAYOUTS
-.public RandInt
-.public SCRIPT_VARS
-.public SCRIPT_VARS_LOCALS
-.public SCRIPT_VARS_VALUES
-.public SECONDARY_TERRAIN_TYPES
-.public SetMoneyCarried
-.public SetMoneyStored
-.public SetNotifyNote
-.public StringFromId
-.public StrncpyName
-.public StrncpySimpleNoPad
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public TEAM_NAME
-.public VERSION_EXCLUSIVE_MONSTERS
-.public WONDER_MAIL_BITS_MAP
-.public WONDER_MAIL_BITS_SWAP
-.public WONDER_MAIL_ENCRYPTION_TABLE
 .public _0209CEAC
 .public _0209CF0C
 .public _0209CF28
@@ -126,6 +43,83 @@
 .public _022AB69C
 .public _022AB924
 .public _s32_div_f
+.public AddMoneyCarried
+.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
+.public ADVENTURE_LOG_PTR
+.public ApplyLevelUpBoostsToGroundMonster
+.public ARM9_UNKNOWN_DATA__NA_209E6BC
+.public ARM9_UNKNOWN_TABLE__NA_209E12C
+.public ARM9_UNKNOWN_TABLE__NA_209E164
+.public ARM9_UNKNOWN_TABLE__NA_209E280
+.public CLIENT_LEVEL_TABLE
+.public Copy16BitsFrom
+.public CopyNStringFromId
+.public Debug_FatalError
+.public Debug_Print
+.public Debug_Print0
+.public DEBUG_SPECIAL_EPISODE_NUMBER
+.public DUNGEON_DATA_LIST
+.public DungeonSwapIdToIdx
+.public DungeonSwapIdxToId
+.public FemaleToMaleForm
+.public FileClose
+.public FileRom_HandleOpen
+.public FileRom_HandleRead
+.public FileRom_HandleSeek
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
+.public GAME_MODE
+.public GetBaseFormCastformCherrimDeoxys
+.public GetBodySize
+.public GetDexNumber
+.public GetDexNumberVeneer
+.public GetDungeonModeSpecial
+.public GetGameMode
+.public GetLanguageType
+.public GetMaxItemsAllowed
+.public GetMaxMembersAllowed
+.public GetMoneyCarried
+.public GetMoneyStored
+.public GetNameString
+.public GetNbItemsInBag
+.public GetNotifyNote
+.public GetPartyMembers
+.public GetRankUpEntry
+.public GetSosMailCount
+.public GetStringFromFileVeneer
+.public GLOBAL_PROGRESS_PTR
+.public GUEST_MONSTER_DATA
+.public GuestMonsterToGroundMonster
+.public IsItemValidVeneer
+.public IsLevelResetDungeon
+.public IsMoneyAllowed
+.public IsRealMove
+.public IsRecruitingAllowed
+.public KAOMADO_FILEPATH
+.public KAOMADO_STREAM
+.public MemAlloc
+.public MemcpySimple
+.public MemZero
+.public MISSION_FLOOR_RANKS_PTRS
+.public NormalizeTreasureBox
+.public OUTLAW_LEVEL_TABLE
+.public OUTLAW_MINION_LEVEL_TABLE
+.public PENDING_DUNGEON_ID
+.public PLAY_TIME_SECONDS
+.public PORTRAIT_LAYOUTS
+.public RandInt
+.public SCRIPT_VARS
+.public SCRIPT_VARS_LOCALS
+.public SCRIPT_VARS_VALUES
+.public SECONDARY_TERRAIN_TYPES
+.public SetMoneyCarried
+.public SetMoneyStored
+.public SetNotifyNote
+.public StringFromId
+.public StrncpyName
+.public StrncpySimpleNoPad
+.public StrncpySimpleNoPadSafe
 .public sub_02004F80
 .public sub_0200C4CC
 .public sub_02048BFC
@@ -144,3 +138,9 @@
 .public sub_0205F00C
 .public sub_0205FD88
 .public sub_0205FE80
+.public TEAM_MEMBER_TABLE_PTR
+.public TEAM_NAME
+.public VERSION_EXCLUSIVE_MONSTERS
+.public WONDER_MAIL_BITS_MAP
+.public WONDER_MAIL_BITS_SWAP
+.public WONDER_MAIL_ENCRYPTION_TABLE
--- a/asm/include/main_02051098.inc
+++ b/asm/include/main_02051098.inc
@@ -1,7 +1,4 @@
 #pragma once
-.public CopyBitsFrom
-.public CopyBitsTo
-.public DUNGEON_RESTRICTIONS
 .public _020A0C68
 .public _020A0C69
 .public _020A0C6A
@@ -10,3 +7,6 @@
 .public _020AFF7C
 .public _020AFF80
 .public _020AFF88
+.public CopyBitsFrom
+.public CopyBitsTo
+.public DUNGEON_RESTRICTIONS
--- a/asm/include/main_02051504.inc
+++ b/asm/include/main_02051504.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public _020A1864
 .public CopyBitsFrom
 .public CopyBitsTo
 .public DUNGEON_RESTRICTIONS
@@ -7,4 +8,3 @@
 .public GetNbFloorsPlusOne
 .public MISSION_FLOORS_FORBIDDEN
 .public RandIntSafe
-.public _020A1864
--- a/asm/include/main_02051788.inc
+++ b/asm/include/main_02051788.inc
@@ -1,7 +1,16 @@
 #pragma once
+.public _020A20B1
+.public _020A31B8
+.public _020A31D4
+.public _020A31E4
+.public _020A31F4
+.public _020A31FC
+.public _020A45C8_JP
+.public _020B09B0
+.public _020B09C0
+.public _s32_div_f
 .public ARM9_UNKNOWN_PTR__NA_20A2C84
 .public ARM9_UNKNOWN_TABLE__NA_20A20B0
-.public AllocateTemp1024ByteBufferFromPool
 .public ArrayCopy32
 .public ArrayFill32
 .public BAG_CAPACITY_TABLE
@@ -11,27 +20,12 @@
 .public GetBaseForm
 .public LoadFileFromRom
 .public LoadM2nAndN2m
-.public MONSTER_DATA_TABLE_PTR
-.public MONSTER_SPRITE_DATA
 .public MemAlloc
 .public MemFree
 .public MemZero
+.public MONSTER_DATA_TABLE_PTR
 .public RANK_UP_TABLE
 .public StringFromId
-.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
-.public UnloadFile
-.public _020A20B1
-.public _020A2D09
-.public _020A31B8
-.public _020A31D4
-.public _020A31E4
-.public _020A31F4
-.public _020A31FC
-.public _020A3200
-.public _020A45C8_JP
-.public _020B09B0
-.public _020B09C0
-.public _s32_div_f
 .public strncpy
 .public sub_0200302C
 .public sub_020030FC
@@ -50,4 +44,6 @@
 .public sub_0200B3C0
 .public sub_0200B3D4
 .public sub_0200B3FC
+.public UnloadFile
+.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
 .public vsprintf
--- a/asm/include/main_020527E0.inc
+++ b/asm/include/main_020527E0.inc
@@ -0,0 +1,4 @@
+#pragma once
+.public _020A2D09
+.public _s32_div_f
+.public MONSTER_SPRITE_DATA
--- a/asm/include/main_02052890.inc
+++ b/asm/include/main_02052890.inc
@@ -1,2 +0,0 @@
-#pragma once
-.public MONSTER_DATA_TABLE_PTR
--- a/asm/include/main_02052A7C.inc
+++ b/asm/include/main_02052A7C.inc
@@ -1,56 +1,4 @@
 #pragma once
-.public Debug_Print0
-.public DecompressAtNormalVeneer
-.public DexNumbersEqual
-.public DirectoryFileMngr_OpenDirectoryFile
-.public DungeonToGroundMoveset
-.public EnableAllLearnableIqSkills
-.public FORBIDDEN_FORGOT_MOVE_LIST
-.public FemaleToMaleForm
-.public GetBaseHp
-.public GetDexNumber
-.public GetInfoGroundMoveset
-.public GetInfoMoveGround
-.public GetKeyM2NSwitch
-.public GetKeyN2MSwitch
-.public GetLanguage
-.public GetMonsterGender
-.public GetMovesetEggPtr
-.public GetMovesetHmTmPtr
-.public GetMovesetIdx__02013CAC
-.public GetMovesetLevelUpPtr
-.public GetNameRaw
-.public GetNameString
-.public GetNbMoves
-.public GetSpriteSize
-.public GroundToDungeonMoveset
-.public HIDDEN_POWER_BASE_POWER_TABLE
-.public HandleSir0Translation
-.public IsShaymin
-.public IsValidTeamMember
-.public ItemZInit
-.public LEVEL_UP_DATA_DECOMPRESS_BUFFER
-.public LEVEL_UP_DATA_MONSTER_ID
-.public LoadFileFromRom
-.public LoadMonsterMd
-.public MONSTER_DATA_TABLE_PTR
-.public MemAlloc
-.public MemFree
-.public PointsToZero
-.public Rand16Bit
-.public RandIntSafe
-.public RemoveActiveMembersFromAllTeams
-.public RemoveActiveMembersFromRescueTeam
-.public RemoveActiveMembersFromSpecialEpisodeTeam
-.public SprintfStatic__02052418
-.public StrcpyName
-.public StrncmpSimple
-.public StrncpyName
-.public StrncpySimple
-.public TEAM_MEMBER_TABLE
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public ZInit8
 .public _020A1880
 .public _020A1884
 .public _020A189C
@@ -69,6 +17,57 @@
 .public _020B12F4_EU
 .public _020B1308_EU
 .public _s32_div_f
+.public Debug_Print0
+.public DecompressAtNormalVeneer
+.public DexNumbersEqual
+.public DirectoryFileMngr_OpenDirectoryFile
+.public DungeonToGroundMoveset
+.public EnableAllLearnableIqSkills
+.public FemaleToMaleForm
+.public FORBIDDEN_FORGOT_MOVE_LIST
+.public GetBaseDefensiveStat
+.public GetBaseHp
+.public GetBaseOffensiveStat
+.public GetDexNumber
+.public GetInfoGroundMoveset
+.public GetInfoMoveGround
+.public GetKeyM2NSwitch
+.public GetKeyN2MSwitch
+.public GetLanguage
+.public GetMonsterGender
+.public GetMonsterPreEvolution
+.public GetMovesetEggPtr
+.public GetMovesetHmTmPtr
+.public GetMovesetIdx__02013CAC
+.public GetMovesetLevelUpPtr
+.public GetNameRaw
+.public GetNameString
+.public GetNbMoves
+.public GetSpriteSize
+.public GroundToDungeonMoveset
+.public HandleSir0Translation
+.public HIDDEN_POWER_BASE_POWER_TABLE
+.public IsShaymin
+.public IsValidTeamMember
+.public ItemZInit
+.public LEVEL_UP_DATA_DECOMPRESS_BUFFER
+.public LEVEL_UP_DATA_MONSTER_ID
+.public LoadFileFromRom
+.public LoadMonsterMd
+.public MemAlloc
+.public MemFree
+.public MONSTER_DATA_TABLE_PTR
+.public PointsToZero
+.public Rand16Bit
+.public RandIntSafe
+.public RemoveActiveMembersFromAllTeams
+.public RemoveActiveMembersFromRescueTeam
+.public RemoveActiveMembersFromSpecialEpisodeTeam
+.public SprintfStatic__02052418
+.public StrcpyName
+.public StrncmpSimple
+.public StrncpyName
+.public StrncpySimple
 .public sub_01FF8F28
 .public sub_02015090
 .public sub_02025304_JP
@@ -82,4 +81,8 @@
 .public sub_020560B8
 .public sub_020564B0
 .public sub_02056504
+.public TEAM_MEMBER_TABLE
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
 .public vsprintf
+.public ZInit8
--- a/asm/include/main_02054AD4.inc
+++ b/asm/include/main_02054AD4.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/main_02054C24.inc
+++ b/asm/include/main_02054C24.inc
@@ -1,82 +1,6 @@
 #pragma once
-.public _020A190C
-.public _020A333C
-.public _020A3340
-.public _020A3350
-.public _020A336C
-.public _020A3398
-.public _020A33B8
-.public _020A33D4
-.public _020A340C
-.public _020A343C
-.public _020A344C
-.public _020A3450
-.public _020A3468
-.public _020AFC28
-.public _020AFC4C
-.public _020B0A4C
-.public _022B5788
-.public _022B578C
-.public AddMoneyCarried
-.public CleanStickyItemsInBag
-.public CopyAndInterleaveWrapper
-.public CopyTacticString
-.public Debug_Print0
-.public DirectoryFileMngr_OpenDirectoryFile
 .public FemaleToMaleForm
-.public GetBaseDefensiveStat
 .public GetBaseFormBurmyWormadamShellosGastrodonCherrim
-.public GetBaseFormCastformCherrimDeoxys
-.public GetBaseHp
-.public GetBaseOffensiveStat
-.public GetBodySize
 .public GetDexNumber
-.public GetGameMode
-.public GetIqGroup
-.public GetItemAtIdx
-.public GetItemMoveId16
-.public GetMaxMembersAllowed
-.public GetMaxPp
-.public GetMonsterGender
-.public GetNameRaw
-.public GetPerformanceFlagWithChecks
-.public GetShadowSize
-.public GroundToDungeonMoveset
-.public HandleSir0Translation
-.public IQ_GROUP_SKILLS
-.public IQ_SKILL_RESTRICTIONS
-.public IQ_SKILLS
-.public IqSkillFlagTest
 .public IsDeoxys
-.public IsLevelResetDungeon
-.public IsSkyExclusiveDungeon
 .public IsUnown
-.public ItemZInit
-.public MemZero
-.public RemoveHolderForItemInBag
-.public RemovePokeItemsInBag
-.public SetHolderForItemInBag
-.public SetPokemonJoined
-.public ShuffleHiddenPower
-.public SprintfStatic__02054A60
-.public StrcmpMonsterName
-.public StrncpyName
-.public StrncpySimple
-.public StrncpySimpleNoPadSafe
-.public sub_0200D8AC
-.public sub_0200FA0C
-.public sub_0201B43C
-.public sub_0201B9F8
-.public sub_0201F598
-.public sub_0204E584
-.public sub_02052CF4
-.public sub_02052E2C
-.public sub_020530D4
-.public sub_02053174
-.public sub_0205349C
-.public sub_020534BC
-.public sub_02053D1C
-.public sub_02053F10
-.public TACTICS_UNLOCK_LEVEL_TABLE
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
--- a/asm/include/main_02054E4C.inc
+++ b/asm/include/main_02054E4C.inc
@@ -0,0 +1,77 @@
+#pragma once
+.public _020A190C
+.public _020A333C
+.public _020A3340
+.public _020A3350
+.public _020A336C
+.public _020A3398
+.public _020A33B8
+.public _020A33D4
+.public _020A340C
+.public _020A343C
+.public _020A344C
+.public _020A3450
+.public _020A3468
+.public _020AFC28
+.public _020AFC4C
+.public _020B0A4C
+.public _022B5788
+.public _022B578C
+.public AddMoneyCarried
+.public CleanStickyItemsInBag
+.public CopyAndInterleaveWrapper
+.public CopyTacticString
+.public Debug_Print0
+.public DirectoryFileMngr_OpenDirectoryFile
+.public GetBaseDefensiveStat
+.public GetBaseFormCastformCherrimDeoxys
+.public GetBaseHp
+.public GetBaseOffensiveStat
+.public GetBodySize
+.public GetGameMode
+.public GetIqGroup
+.public GetItemAtIdx
+.public GetItemMoveId16
+.public GetMaxMembersAllowed
+.public GetMaxPp
+.public GetMonsterGender
+.public GetNameRaw
+.public GetPerformanceFlagWithChecks
+.public GetShadowSize
+.public GroundToDungeonMoveset
+.public HandleSir0Translation
+.public IQ_GROUP_SKILLS
+.public IQ_SKILL_RESTRICTIONS
+.public IQ_SKILLS
+.public IqSkillFlagTest
+.public IsLevelResetDungeon
+.public IsSkyExclusiveDungeon
+.public ItemZInit
+.public MemZero
+.public RemoveHolderForItemInBag
+.public RemovePokeItemsInBag
+.public SetHolderForItemInBag
+.public SetPokemonJoined
+.public ShuffleHiddenPower
+.public SprintfStatic__02054A60
+.public StrcmpMonsterName
+.public StrncpyName
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
+.public sub_0200D8AC
+.public sub_0200FA0C
+.public sub_0201B43C
+.public sub_0201B9F8
+.public sub_0201F598
+.public sub_0204E584
+.public sub_02052CF4
+.public sub_02052E2C
+.public sub_020530D4
+.public sub_02053174
+.public sub_0205349C
+.public sub_020534BC
+.public sub_02053D1C
+.public sub_02053F10
+.public TACTICS_UNLOCK_LEVEL_TABLE
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
--- a/asm/include/main_02058F24.inc
+++ b/asm/include/main_02058F24.inc
@@ -363,6 +363,7 @@
 .public SetSpecialEpisodeType
 .public SetSpriteIdForAnimationControl
 .public ShowPortraitInPortraitBox
+.public SinAbs4096
 .public SPECIAL_BAND_STAT_BOOST
 .public STATUS_NAME_STRING_IDS
 .public strcat
@@ -374,7 +375,6 @@
 .public StrncpyName
 .public StrncpySimple
 .public StrncpySimpleNoPadSafe
-.public sin_4096
 .public sub_02001980
 .public sub_02001AB0
 .public sub_020022C4
--- a/asm/include/main_0206C9BC.inc
+++ b/asm/include/main_0206C9BC.inc
@@ -1,12 +1,7 @@
 #pragma once
 .public _020B0B7C
-.public _020B0D50
-.public _020B1310
-.public _020B1394
-.public _022B7370
 .public _022B7380
 .public _022B7388
-.public _022B7988
 .public _022B7990
 .public _022B7994
 .public _022B7998
@@ -35,27 +30,38 @@
 .public DRIVER_WORK
 .public Dse_SetError
 .public Dse_SetError2
+.public DseChannel_AllocateNote
+.public DseChannel_ChangeNote
+.public DseChannel_DeallocateVoices
+.public DseChannel_ReleaseNote
 .public DseMem_AllocateUser
+.public DseSynth_AllocateNew
+.public DseSynth_ClearHeldNotes
+.public DseSynth_ResetAllVoiceTimersAndVolumes
+.public DseSynth_ResetAndSetBankAndSequence
+.public DseSynth_RestoreHeldNotes
+.public DseSynth_SetBend
+.public DseSynth_SetGlobalVolumeIndex
+.public DseSynth_SetPan
+.public DseSynth_SetVolume
+.public DseSynth_StopChannels
+.public DseSynth_Unload
 .public DseUtil_ByteSwap32
-.public DseUtil_GetRandomNumber
+.public DseVoice_Cleanup
+.public DseVoice_CountNumActiveInChannel
+.public DseVoice_Deallocate
+.public DseVoice_PlayNote
+.public DseVoice_ReleaseNote
+.public DseVoice_UpdateHardware
+.public DseVoice_UpdateParameters
 .public FileInit
 .public GetTimer0Control
 .public SMD_EVENTS_FUN_TABLE
 .public SoundEnvelope_ForceVolume
-.public SoundEnvelope_Release
-.public SoundEnvelope_Reset
-.public SoundEnvelope_SetParameters
-.public SoundEnvelope_Stop
-.public SoundEnvelope_Stop2
-.public SoundEnvelope_Tick
-.public SoundEnvelopeParameters_CheckValidity
-.public SoundEnvelopeParameters_Reset
 .public SoundLfoBank_Reset
-.public SoundLfoBank_Set
-.public SoundLfoBank_SetConstEnvelopes
-.public SoundLfoBank_Tick
 .public StartThread
 .public sub_0206C688
+.public sub_02072BB8
 .public sub_02079800
 .public sub_02079888
 .public sub_02079940
@@ -66,19 +72,12 @@
 .public sub_0207C8E0
 .public sub_0207C944
 .public sub_0207C984
-.public sub_0207CA04
-.public sub_0207CA24
-.public sub_0207CA4C
-.public sub_0207CA6C
-.public sub_0207CAB8
-.public sub_0207CAE0
 .public sub_0207CB54
 .public sub_0207CD44
 .public sub_0207CF14
-.public sub_0207D470
 .public sub_0207F6C4
 .public sub_0207F70C
 .public sub_0207F748
 .public sub_0207F808
 .public sub_0207F828
-.public UpdateTrackVolumeEnvelopes
+.public UpdateChannels
--- a/asm/include/main_0207B854.inc
+++ b/asm/include/main_0207B854.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/main_0207B87C.inc
+++ b/asm/include/main_0207B87C.inc
@@ -1,15 +1,14 @@
 #pragma once
+.public _022B99A8
+.public _022B99D0
+.public _022B99D4
+.public _022B99D8
 .public ArrayCopy16
 .public EnableIrqFlag
 .public GetTimer0Control
 .public MemcpyFast
 .public OS_GetLockID
 .public SetIrqFlag
-.public WaitForever2
-.public _022B99A8
-.public _022B99D0
-.public _022B99D4
-.public _022B99D8
 .public sub_01FF97CC
 .public sub_02078C3C
 .public sub_02078CC8
@@ -19,3 +18,4 @@
 .public sub_0207DAFC
 .public sub_0207DB20
 .public sub_02083434
+.public WaitForever2
--- a/asm/include/main_020897DC.inc
+++ b/asm/include/main_020897DC.inc
@@ -1,25 +1,4 @@
 #pragma once
-.public ARM9_UNKNOWN_DATA__NA_209EAAC
-.public GetCharWidth
-.public IsAOrBPressed
-.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1
-.public TryAppendToSlice
-.public TryAssignByteWrapper
-.public UpdateAdvancedMenu
-.public UpdateAdvancedTextBox
-.public UpdateAlertBox
-.public UpdateAreaNameBox
-.public UpdateCollectionMenu
-.public UpdateControlsChart
-.public UpdateDebugMenu
-.public UpdateDialogueBox
-.public UpdateOptionsMenu
-.public UpdateParentMenu
-.public UpdatePortraitBox
-.public UpdateScrollBox
-.public UpdateSimpleMenu
-.public UpdateTeamSelectionMenu
-.public UpdateTextBox
 .public _020908D4
 .public _020908DC
 .public _020908E4
@@ -315,7 +294,11 @@
 .public _022BCA70
 .public __vsprintf_internal
 .public __vsprintf_internal_slice
+.public ARM9_UNKNOWN_DATA__NA_209EAAC
+.public GetCharWidth
+.public IsAOrBPressed
 .public memset
+.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1
 .public snprintf
 .public sprintf
 .public sub_02005D14
@@ -444,5 +427,22 @@
 .public sub_02087F10
 .public sub_02088510
 .public sub_020895F4
+.public TryAppendToSlice
+.public TryAssignByteWrapper
+.public UpdateAdvancedMenu
+.public UpdateAdvancedTextBox
+.public UpdateAlertBox
+.public UpdateAreaNameBox
+.public UpdateCollectionMenu
+.public UpdateControlsChart
+.public UpdateDebugMenu
+.public UpdateDialogueBox
+.public UpdateOptionsMenu
+.public UpdateParentMenu
+.public UpdatePortraitBox
+.public UpdateScrollBox
+.public UpdateSimpleMenu
+.public UpdateTeamSelectionMenu
+.public UpdateTextBox
 .public vsprintf
 .public wcstombs
--- a/asm/include/main_rodata_020A1BB0.inc
+++ b/asm/include/main_rodata_020A1BB0.inc
@@ -1,110 +1,4 @@
 #pragma once
-.public ACTOR_LIST
-.public BaseFormsEqual
-.public DseTrackEvent_Dummy1Byte
-.public DseTrackEvent_Dummy2Bytes
-.public DseTrackEvent_Dummy2Bytes2
-.public DseTrackEvent_EndTrack
-.public DseTrackEvent_ForceLfoEnvelopeLevel
-.public DseTrackEvent_Invalid
-.public DseTrackEvent_MainLoopBegin
-.public DseTrackEvent_OctaveDelta
-.public DseTrackEvent_PanDelta
-.public DseTrackEvent_PanFade
-.public DseTrackEvent_RestoreEnvelopeDefaults
-.public DseTrackEvent_SetBank
-.public DseTrackEvent_SetBankLsb
-.public DseTrackEvent_SetBankMsb
-.public DseTrackEvent_SetBpm
-.public DseTrackEvent_SetBpm2
-.public DseTrackEvent_SetEnvelopeAttackBegin
-.public DseTrackEvent_SetEnvelopeAttackTime
-.public DseTrackEvent_SetEnvelopeDecayTimeAndSustainLevel
-.public DseTrackEvent_SetEnvelopeHoldTime
-.public DseTrackEvent_SetEnvelopeReleaseTime
-.public DseTrackEvent_SetEnvelopeSustainTime
-.public DseTrackEvent_SetExpression
-.public DseTrackEvent_SetFlagBit1Unknown
-.public DseTrackEvent_SetHoldNotes
-.public DseTrackEvent_SetInstrument
-.public DseTrackEvent_SetKeyBend
-.public DseTrackEvent_SetKeyBendRange
-.public DseTrackEvent_SetLfoParameter
-.public DseTrackEvent_SetNoteDurationMultiplier
-.public DseTrackEvent_SetNoteRandomRegion
-.public DseTrackEvent_SetOctave
-.public DseTrackEvent_SetOptionalVolume
-.public DseTrackEvent_SetPan
-.public DseTrackEvent_SetTuning
-.public DseTrackEvent_SetTuningJitterAmplitude
-.public DseTrackEvent_SetUnknown2
-.public DseTrackEvent_SetVolume
-.public DseTrackEvent_SetupKeyBendLfo
-.public DseTrackEvent_SetupKeyBendLfoEnvelope
-.public DseTrackEvent_SetupLfo
-.public DseTrackEvent_SetupLfoEnvelope
-.public DseTrackEvent_SetupPanLfo
-.public DseTrackEvent_SetupPanLfoEnvelope
-.public DseTrackEvent_SetupVolumeLfo
-.public DseTrackEvent_SetupVolumeLfoEnvelope
-.public DseTrackEvent_Signal
-.public DseTrackEvent_SongVolumeFade
-.public DseTrackEvent_SubLoopBegin
-.public DseTrackEvent_SubLoopBreakOnLastIteration
-.public DseTrackEvent_SubLoopEnd
-.public DseTrackEvent_TuningDeltaCoarse
-.public DseTrackEvent_TuningDeltaFine
-.public DseTrackEvent_TuningDeltaFull
-.public DseTrackEvent_TuningFade
-.public DseTrackEvent_UseKeyBendLfo
-.public DseTrackEvent_UseLfo
-.public DseTrackEvent_UsePanLfo
-.public DseTrackEvent_UseVolumeLfo
-.public DseTrackEvent_VolumeDelta
-.public DseTrackEvent_VolumeFade
-.public DseTrackEvent_Wait16
-.public DseTrackEvent_Wait24
-.public DseTrackEvent_Wait8
-.public DseTrackEvent_WaitDelta
-.public DseTrackEvent_WaitSame
-.public DseTrackEvent_WaitUntilFadeout
-.public GetKeyM2N
-.public GetKeyM2NBaseForm
-.public GetKeyN2M
-.public GetKeyN2MBaseForm
-.public LEVEL_LIST
-.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_2
-.public RANK_STRINGS_1
-.public RANK_STRINGS_2
-.public RANK_STRINGS_3
-.public REMOTE_STRINGS
-.public Render3d64Nothing
-.public Render3d64Quadrilateral
-.public Render3d64Rectangle
-.public Render3d64RectangleMulticolor
-.public Render3d64Texture
-.public Render3d64Texture0x7
-.public Render3d64Tiling
-.public Render3d64WindowFrame
-.public STRING_BALANCE_M_LEVEL_BIN
-.public STRING_DUNGEON_DUNGEON_BIN
-.public STRING_EFFECT_EFFECT_BIN
-.public STRING_MONSTER_MONSTER_BIN
-.public STRING_MONSTER_M_ATTACK_BIN
-.public STRING_MONSTER_M_GROUND_BIN
-.public SoundLfoWave_FullNoiseFunc
-.public SoundLfoWave_FullSquareFunc
-.public SoundLfoWave_FullTriangleFunc
-.public SoundLfoWave_HalfNoiseFunc
-.public SoundLfoWave_HalfSquareFunc
-.public SoundLfoWave_HalfTriangleFunc
-.public SoundLfoWave_InvalidFunc
-.public SoundLfoWave_ReverseSawFunc
-.public SoundLfoWave_SawFunc
-.public TryAssignByte
-.public UNOWN_SPECIES_ADDITIONAL_CHARS
-.public ValidateLegendaryChallengeMission
-.public ValidateNormalChallengeMission
 .public _02092474
 .public _0209247C
 .public _02092484
@@ -1693,7 +1587,109 @@
 .public _022BC770
 .public _022BC870
 .public _022BC970
+.public ACTOR_LIST
+.public BaseFormsEqual
+.public DseTrackEvent_Dummy1Byte
+.public DseTrackEvent_Dummy2Bytes
+.public DseTrackEvent_Dummy2Bytes2
+.public DseTrackEvent_EndTrack
+.public DseTrackEvent_ForceLfoEnvelopeLevel
+.public DseTrackEvent_Invalid
+.public DseTrackEvent_MainLoopBegin
+.public DseTrackEvent_OctaveDelta
+.public DseTrackEvent_PanDelta
+.public DseTrackEvent_PanFade
+.public DseTrackEvent_RestoreEnvelopeDefaults
+.public DseTrackEvent_SetBank
+.public DseTrackEvent_SetBankLsb
+.public DseTrackEvent_SetBankMsb
+.public DseTrackEvent_SetBpm
+.public DseTrackEvent_SetBpm2
+.public DseTrackEvent_SetEnvelopeAttackBegin
+.public DseTrackEvent_SetEnvelopeAttackTime
+.public DseTrackEvent_SetEnvelopeDecayTimeAndSustainLevel
+.public DseTrackEvent_SetEnvelopeHoldTime
+.public DseTrackEvent_SetEnvelopeReleaseTime
+.public DseTrackEvent_SetEnvelopeSustainTime
+.public DseTrackEvent_SetExpression
+.public DseTrackEvent_SetFlagBit1Unknown
+.public DseTrackEvent_SetHoldNotes
+.public DseTrackEvent_SetInstrument
+.public DseTrackEvent_SetKeyBend
+.public DseTrackEvent_SetKeyBendRange
+.public DseTrackEvent_SetLfoParameter
+.public DseTrackEvent_SetNoteDurationMultiplier
+.public DseTrackEvent_SetNoteRandomRegion
+.public DseTrackEvent_SetOctave
+.public DseTrackEvent_SetOptionalVolume
+.public DseTrackEvent_SetPan
+.public DseTrackEvent_SetTuning
+.public DseTrackEvent_SetTuningJitterAmplitude
+.public DseTrackEvent_SetUnknown2
+.public DseTrackEvent_SetupKeyBendLfo
+.public DseTrackEvent_SetupKeyBendLfoEnvelope
+.public DseTrackEvent_SetupLfo
+.public DseTrackEvent_SetupLfoEnvelope
+.public DseTrackEvent_SetupPanLfo
+.public DseTrackEvent_SetupPanLfoEnvelope
+.public DseTrackEvent_SetupVolumeLfo
+.public DseTrackEvent_SetupVolumeLfoEnvelope
+.public DseTrackEvent_SetVolume
+.public DseTrackEvent_Signal
+.public DseTrackEvent_SongVolumeFade
+.public DseTrackEvent_SubLoopBegin
+.public DseTrackEvent_SubLoopBreakOnLastIteration
+.public DseTrackEvent_SubLoopEnd
+.public DseTrackEvent_TuningDeltaCoarse
+.public DseTrackEvent_TuningDeltaFine
+.public DseTrackEvent_TuningDeltaFull
+.public DseTrackEvent_TuningFade
+.public DseTrackEvent_UseKeyBendLfo
+.public DseTrackEvent_UseLfo
+.public DseTrackEvent_UsePanLfo
+.public DseTrackEvent_UseVolumeLfo
+.public DseTrackEvent_VolumeDelta
+.public DseTrackEvent_VolumeFade
+.public DseTrackEvent_Wait16
+.public DseTrackEvent_Wait24
+.public DseTrackEvent_Wait8
+.public DseTrackEvent_WaitDelta
+.public DseTrackEvent_WaitSame
+.public DseTrackEvent_WaitUntilFadeout
+.public GetKeyM2N
+.public GetKeyM2NBaseForm
+.public GetKeyN2M
+.public GetKeyN2MBaseForm
+.public LEVEL_LIST
 .public mbtowc
+.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_2
+.public RANK_STRINGS_1
+.public RANK_STRINGS_2
+.public RANK_STRINGS_3
+.public REMOTE_STRINGS
+.public Render3d64Nothing
+.public Render3d64Quadrilateral
+.public Render3d64Rectangle
+.public Render3d64RectangleMulticolor
+.public Render3d64Texture
+.public Render3d64Texture0x7
+.public Render3d64Tiling
+.public Render3d64WindowFrame
+.public SoundLfoWave_FullNoiseFunc
+.public SoundLfoWave_FullSquareFunc
+.public SoundLfoWave_FullTriangleFunc
+.public SoundLfoWave_HalfNoiseFunc
+.public SoundLfoWave_HalfSquareFunc
+.public SoundLfoWave_HalfTriangleFunc
+.public SoundLfoWave_InvalidFunc
+.public SoundLfoWave_ReverseSawFunc
+.public SoundLfoWave_SawFunc
+.public STRING_BALANCE_M_LEVEL_BIN
+.public STRING_DUNGEON_DUNGEON_BIN
+.public STRING_EFFECT_EFFECT_BIN
+.public STRING_MONSTER_M_ATTACK_BIN
+.public STRING_MONSTER_M_GROUND_BIN
+.public STRING_MONSTER_MONSTER_BIN
 .public sub_02003620
 .public sub_02003780
 .public sub_02007EC0
@@ -1766,3 +1762,7 @@
 .public sub_0209081C
 .public sub_0209086C
 .public sub_020908A0
+.public TryAssignByte
+.public UNOWN_SPECIES_ADDITIONAL_CHARS
+.public ValidateLegendaryChallengeMission
+.public ValidateNormalChallengeMission
--- a/asm/include/overlay_02.inc
+++ b/asm/include/overlay_02.inc
@@ -164,6 +164,7 @@
 .public ov00_02318158
 .public ov00_02318160
 .public ov00_023250C8
+.public PM_ForceToPowerOff
 .public SetIrqFlag
 .public StartThread
 .public strcpy
@@ -256,7 +257,6 @@
 .public sub_020818B0
 .public sub_020819D4
 .public sub_020819EC
-.public sub_0208200C
 .public sub_02082420
 .public sub_020824A4
 .public sub_02082514
--- a/asm/include/overlay_10_022BCC7C.inc
+++ b/asm/include/overlay_10_022BCC7C.inc
@@ -90,6 +90,7 @@
 .public ov29_022EA428
 .public ov29_0234C584
 .public ov29_0234C5EC
+.public PlaySeByIdVolumeWrapper
 .public PreprocessString
 .public Rand16Bit
 .public SetAndPlayAnimationForAnimationControl
@@ -109,7 +110,6 @@
 .public sub_0200B330
 .public sub_0200B3FC
 .public sub_0200D310
-.public sub_02017C80
 .public sub_0201B43C
 .public sub_0201C108
 .public sub_0201C138
--- a/asm/include/overlay_10_022C2588.inc
+++ b/asm/include/overlay_10_022C2588.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public _020B0A5C
 .public BAG_ITEMS_PTR_MIRROR
 .public CleanStickyItemsInBag
 .public Debug_GetDebugFlag
@@ -31,21 +32,9 @@
 .public LoadWteFromFileDirectory
 .public MemAlloc
 .public MemFree
-.public MemZero
 .public MemsetSimple
+.public MemZero
 .public MultiplyByFixedPoint
-.public ProcessWte
-.public RandInt
-.public RemoveEmptyItemsInBag
-.public RemoveHolderForItemInBag
-.public RunDungeonMode
-.public SaveScriptVariableValue
-.public SetMoneyCarried
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public UnloadOverlay
-.public UnloadWte
-.public _020B0A5C
 .public ov10_022C434C
 .public ov10_022DC094
 .public ov10_022DC0B8
@@ -57,6 +46,13 @@
 .public ov10_022DC190
 .public ov10_022DC218
 .public ov10_022DC224
+.public ProcessWte
+.public RandInt
+.public RemoveEmptyItemsInBag
+.public RemoveHolderForItemInBag
+.public RunDungeonMode
+.public SaveScriptVariableValue
+.public SetMoneyCarried
 .public sub_02001AB0
 .public sub_0200C4CC
 .public sub_02017A68
@@ -88,3 +84,7 @@
 .public sub_0205BBFC
 .public sub_0205BC94
 .public sub_0205F504
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
+.public UnloadOverlay
+.public UnloadWte
--- a/asm/include/overlay_10_rodata_022C4584.inc
+++ b/asm/include/overlay_10_rodata_022C4584.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/overlay_10_rodata_022C464C.inc
+++ b/asm/include/overlay_10_rodata_022C464C.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/overlay_10_rodata_022C490C.inc
+++ b/asm/include/overlay_10_rodata_022C490C.inc
@@ -17,6 +17,10 @@
 .public DoMoveCrunch
 .public DoMoveCrushClaw
 .public DoMoveCurse
+.public DoMoveDamage__02325DC0
+.public DoMoveDamage__0232A500
+.public DoMoveDamage__0232B8B0
+.public DoMoveDamage__0232DD88
 .public DoMoveDamageBoostAllStats
 .public DoMoveDamageBurn10FlameWheel
 .public DoMoveDamageConfuse10
@@ -42,10 +46,6 @@
 .public DoMoveDamageStealItem
 .public DoMoveDamageWeightDependent
 .public DoMoveDamageWithRecoil
-.public DoMoveDamage__02325DC0
-.public DoMoveDamage__0232A500
-.public DoMoveDamage__0232B8B0
-.public DoMoveDamage__0232DD88
 .public DoMoveDefog
 .public DoMoveDestinyBond
 .public DoMoveDoubleEdge
@@ -72,8 +72,8 @@
 .public DoMoveGust
 .public DoMoveGyroBall
 .public DoMoveHammerArm
-.public DoMoveHeadSmash
 .public DoMoveHeadbutt
+.public DoMoveHeadSmash
 .public DoMoveHeartSwap
 .public DoMoveHiddenPower
 .public DoMoveHornDrill
@@ -123,8 +123,8 @@
 .public DoMoveSwapItems
 .public DoMoveTaunt
 .public DoMoveThunderFang
-.public DoMoveThunderWave
 .public DoMoveThundershock
+.public DoMoveThunderWave
 .public DoMoveTickle
 .public DoMoveTorment
 .public DoMoveToxic
--- a/asm/include/overlay_11.inc
+++ b/asm/include/overlay_11.inc
@@ -35,6 +35,7 @@
 .public FreeTeamStats
 .public G3X_Reset
 .public GROUND_MEMORY_ARENA_1
+.public GenerateCroagunkItems
 .public GenerateDailyMissions
 .public GenerateKecleonItems1
 .public GenerateKecleonItems2
@@ -63,6 +64,7 @@
 .public GetRank
 .public GetReleasedStylus
 .public GetScenarioBalance
+.public GetScriptEntityMonsterId
 .public GetSosMailCount
 .public GetStringFromFileVeneer
 .public GetTalkLine
@@ -102,6 +104,7 @@
 .public OVERLAY11_DEBUG_STRINGS
 .public PlayBgmByIdVeneer
 .public PlayBgmByIdVolumeVeneer
+.public PlaySeByIdVolumeWrapper
 .public PreprocessString
 .public PreprocessStringFromId
 .public RECRUITMENT_TABLE_LEVELS
@@ -565,7 +568,6 @@
 .public sub_0201080C
 .public sub_02011220
 .public sub_02011FA0
-.public sub_02012B7C
 .public sub_02017A68
 .public sub_02017A80
 .public sub_02017AB0
@@ -585,7 +587,6 @@
 .public sub_02017C5C
 .public sub_02017C68
 .public sub_02017C74
-.public sub_02017C80
 .public sub_02017C90
 .public sub_02017C9C
 .public sub_02017CA8
@@ -700,7 +701,6 @@
 .public sub_020630A4
 .public sub_02064FFC
 .public sub_02065050
-.public sub_02065974
 .public sub_02065B80
 .public sub_02065BC8
 .public sub_02065BD8
@@ -715,4 +715,4 @@
 .public sub_0206C120
 .public sub_0206C134
 .public sub_0206C144
-.public sub_0206C164
+.public sub_0206C164
--- a/asm/include/overlay_14.inc
+++ b/asm/include/overlay_14.inc
@@ -45,6 +45,7 @@
 .public ov11_022F6FE0
 .public ov11_022F7058
 .public PlayBgmByIdVeneer
+.public PlaySeByIdVolumeWrapper
 .public PortraitBoxNeedsUpdate
 .public PreprocessString
 .public RandRange
@@ -63,7 +64,6 @@
 .public sub_020063F4
 .public sub_02017B70
 .public sub_02017B7C
-.public sub_02017C80
 .public sub_0202BC60
 .public sub_0202F334
 .public sub_0202F954
--- a/asm/include/overlay_15_0238A234.inc
+++ b/asm/include/overlay_15_0238A234.inc
@@ -27,13 +27,13 @@
 .public ov15_0238B10C
 .public ov15_0238B114
 .public OVERLAY15_UNKNOWN_POINTER__NA_238B180
+.public PlaySeByIdVolumeWrapper
 .public PlaySeVolumeWrapper
 .public SetAdvancedTextBoxField0x1C2
 .public SetAdvancedTextBoxField0x1C4
 .public SetAdvancedTextBoxState5
 .public ShowDialogueBox
 .public ShowStringIdInDialogueBox
-.public sub_02017C80
 .public sub_020288DC
 .public sub_0202F954
 .public sub_020395CC
--- a/asm/include/overlay_17.inc
+++ b/asm/include/overlay_17.inc
@@ -4,91 +4,23 @@
 .public ClosePortraitBox
 .public CloseScrollBox
 .public CloseSimpleMenu
-.public CreateDialogueBox
-.public CreatePortraitBox
-.public CreateSimpleMenuFromStringIds
-.public GetActiveRosterIndex
-.public GetGameMode
-.public GetMainCharacter1MemberIdx
-.public GetPartnerMemberIdx
-.public GetPerformanceFlagWithChecks
-.public GetPressedButtons
-.public GetSimpleMenuResult
-.public GetTeamMember
 .public HidePortraitBox
-.public InitPortraitParamsWithMonsterId
 .public InitPreprocessorArgs
 .public IsAdvancedTextBoxActive
 .public IsDialogueBoxActive
-.public IsMainCharacter
 .public IsScrollBoxActive
 .public IsSimpleMenuActive
 .public MemAlloc
-.public MemFree
-.public ov11_022DC504
-.public ov11_022E6E68
 .public ov11_0238A08C
-.public PlaySeVolumeWrapper
+.public OVERLAY17_UNKNOWN_POINTER__NA_238BE00
 .public PortraitBoxNeedsUpdate
-.public PrintIqSkillsMenu
 .public SetAdvancedTextBoxState5
-.public SetPortraitEmotion
-.public SetPortraitLayout
 .public SetScrollBoxState7
-.public ShowDialogueBox
-.public ShowPortraitInPortraitBox
-.public ShowStringIdInDialogueBox
-.public sub_02017C10
-.public sub_02017C50
 .public sub_0202F334
-.public sub_020307EC
 .public sub_02034A38
-.public sub_02039C3C
 .public sub_0203A51C
-.public sub_0203A5A8
-.public sub_0203A5F0
 .public sub_0203A618
-.public sub_0203A638
-.public sub_0203A998
 .public sub_0203A9B8
-.public sub_0203A9EC
-.public sub_0203AA20
-.public sub_0203AAB0
-.public sub_0203AF0C
 .public sub_0203C760
-.public sub_0203C7E4
-.public sub_0203C874
-.public sub_0203C8E0
-.public sub_0203C910
-.public sub_0203C940
-.public sub_0203C9C4
-.public sub_0203C9E4
-.public sub_0203F150
-.public sub_0203F398
-.public sub_0203F990
-.public sub_0203FA64
-.public sub_0203FD38
-.public sub_0203FD80
-.public sub_0204018C
 .public sub_020407C0
-.public sub_020407EC
-.public sub_02041094
-.public sub_02041178
-.public sub_020417A8
 .public sub_02041A00
-.public sub_02041A18
-.public sub_02041B7C
-.public sub_020420F4
-.public sub_02055B20
-.public sub_02056410
-.public sub_020564B0
-.public sub_02056554
-.public sub_020566C4
-.public sub_02056F60
-.public sub_02057180
-.public sub_020572EC
-.public sub_02057444
-.public sub_02058138
-.public sub_0205B028
-.public TEAM_MEMBER_TABLE_PTR
-.public TryAddMonsterToActiveTeam
--- a/asm/include/overlay_17_0238A754.inc
+++ b/asm/include/overlay_17_0238A754.inc
@@ -0,0 +1,91 @@
+#pragma once
+.public ASSEMBLY_MAIN_MENU_ITEMS_1
+.public ASSEMBLY_MAIN_MENU_ITEMS_2
+.public ASSEMBLY_MENU_ITEMS_CONFIRM
+.public ASSEMBLY_SUBMENU_ITEMS_1
+.public ASSEMBLY_SUBMENU_ITEMS_2
+.public ASSEMBLY_SUBMENU_ITEMS_3
+.public ASSEMBLY_SUBMENU_ITEMS_4
+.public ASSEMBLY_SUBMENU_ITEMS_5
+.public ASSEMBLY_SUBMENU_ITEMS_6
+.public ASSEMBLY_SUBMENU_ITEMS_7
+.public ASSEMBLY_WINDOW_PARAMS_1
+.public ASSEMBLY_WINDOW_PARAMS_2
+.public ASSEMBLY_WINDOW_PARAMS_3
+.public ASSEMBLY_WINDOW_PARAMS_4
+.public ASSEMBLY_WINDOW_PARAMS_5
+.public CreateDialogueBox
+.public CreatePortraitBox
+.public CreateSimpleMenuFromStringIds
+.public GetActiveRosterIndex
+.public GetGameMode
+.public GetMainCharacter1MemberIdx
+.public GetPartnerMemberIdx
+.public GetPerformanceFlagWithChecks
+.public GetPressedButtons
+.public GetSimpleMenuResult
+.public GetTeamMember
+.public InitPortraitParamsWithMonsterId
+.public IsDialogueBoxActive
+.public IsMainCharacter
+.public IsSimpleMenuActive
+.public ov11_022DC504
+.public ov11_022E6E68
+.public ov17_0238A278
+.public ov17_0238A364
+.public OVERLAY17_FUNCTION_POINTER_TABLE
+.public OVERLAY17_UNKNOWN_POINTER__NA_238BE00
+.public PlaySeVolumeWrapper
+.public PrintIqSkillsMenu
+.public SetPortraitEmotion
+.public SetPortraitLayout
+.public ShowDialogueBox
+.public ShowPortraitInPortraitBox
+.public ShowStringIdInDialogueBox
+.public sub_02017C10
+.public sub_02017C50
+.public sub_020307EC
+.public sub_02039C3C
+.public sub_0203A51C
+.public sub_0203A5A8
+.public sub_0203A5F0
+.public sub_0203A638
+.public sub_0203A998
+.public sub_0203A9EC
+.public sub_0203AA20
+.public sub_0203AAB0
+.public sub_0203AF0C
+.public sub_0203C7E4
+.public sub_0203C874
+.public sub_0203C8E0
+.public sub_0203C910
+.public sub_0203C940
+.public sub_0203C9C4
+.public sub_0203C9E4
+.public sub_0203F150
+.public sub_0203F398
+.public sub_0203F990
+.public sub_0203FA64
+.public sub_0203FD38
+.public sub_0203FD80
+.public sub_0204018C
+.public sub_020407EC
+.public sub_02041094
+.public sub_02041178
+.public sub_020417A8
+.public sub_02041A18
+.public sub_02041B7C
+.public sub_020420F4
+.public sub_02055B20
+.public sub_02056410
+.public sub_020564B0
+.public sub_02056554
+.public sub_020566C4
+.public sub_02056F60
+.public sub_02057180
+.public sub_020572EC
+.public sub_02057444
+.public sub_02058138
+.public sub_0205B028
+.public TEAM_MEMBER_TABLE_PTR
+.public TryAddMonsterToActiveTeam
--- a/asm/include/overlay_18.inc
+++ b/asm/include/overlay_18.inc
@@ -36,6 +36,7 @@
 .public MemFree
 .public ov11_022E6E68
 .public ov11_0238A090
+.public PlaySeByIdVolumeWrapper
 .public PlaySeVolumeWrapper
 .public PortraitBoxNeedsUpdate
 .public PreprocessString
@@ -50,7 +51,6 @@
 .public ShowStringIdInDialogueBox
 .public StrncpySimpleNoPadSafe
 .public sub_02017C74
-.public sub_02017C80
 .public sub_02026268
 .public sub_02027B1C
 .public sub_0202BC60
--- a/asm/include/overlay_21.inc
+++ b/asm/include/overlay_21.inc
@@ -53,6 +53,7 @@
 .public ov11_0230D220
 .public ov11_0230D92C
 .public ov11_02310C2C
+.public PlaySeByIdVolumeWrapper
 .public PlaySeVolumeWrapper
 .public PreprocessString
 .public PrintIqSkillsMenu
@@ -70,7 +71,6 @@
 .public sub_0201007C
 .public sub_02013150
 .public sub_02017C74
-.public sub_02017C80
 .public sub_02026268
 .public sub_02027B1C
 .public sub_0202836C
--- a/asm/include/overlay_22.inc
+++ b/asm/include/overlay_22.inc
@@ -37,6 +37,7 @@
 .public ov11_022DC504
 .public ov11_022E6E68
 .public ov11_0238A130
+.public PlaySeByIdVolumeWrapper
 .public PlaySeVolumeWrapper
 .public PreprocessString
 .public RemoveEmptyItemsInBag
@@ -63,7 +64,6 @@
 .public sub_02010BA4
 .public sub_02010BC0
 .public sub_02017C74
-.public sub_02017C80
 .public sub_0202836C
 .public sub_0202C620
 .public sub_0202C748
--- a/asm/include/overlay_24.inc
+++ b/asm/include/overlay_24.inc
@@ -34,6 +34,7 @@
 .public ov11_0230D220
 .public ov11_02310BDC
 .public Rand16Bit
+.public ReturnEggExclusiveItem
 .public SetPokemonJoined
 .public SetPortraitEmotion
 .public SetPortraitLayout
@@ -48,7 +49,6 @@
 .public StrncpySimple
 .public StrncpySimpleNoPadSafe
 .public sub_0200D670
-.public sub_0200EB90
 .public sub_0201077C
 .public sub_02010794
 .public sub_020107AC
--- a/asm/include/overlay_25.inc
+++ b/asm/include/overlay_25.inc
@@ -38,6 +38,7 @@
 .public ov11_0230BCF8
 .public ov11_0230BD28
 .public ov11_0230C910
+.public PlaySeByIdVolumeWrapper
 .public PreprocessString
 .public RemoveItemByIdAndStackNoHole
 .public SetPortraitEmotion
@@ -47,7 +48,6 @@
 .public ShowStringIdInDialogueBox
 .public sub_0200D670
 .public sub_02017C74
-.public sub_02017C80
 .public sub_02026268
 .public sub_02027B1C
 .public sub_0202836C
--- a/asm/include/overlay_26.inc
+++ b/asm/include/overlay_26.inc
@@ -8,6 +8,7 @@
 .public GetGameMode
 .public GetMaxItemsAllowed
 .public GetOutlawLeaderLevel
+.public GetScriptEntityMonsterId
 .public IncrementExclusiveMonsterCounts
 .public IncrementNbAdventures
 .public IncrementNbDungeonsCleared
@@ -58,4 +59,3 @@
 .public sub_0205F9D4
 .public sub_02062E5C
 .public sub_0206351C
-.public sub_02065974
--- a/asm/include/overlay_29_022DC314.inc
+++ b/asm/include/overlay_29_022DC314.inc
@@ -1,10 +1,7 @@
 #pragma once
+.public _020AFC70
 .public Debug_Print0
 .public LoadFileFromRom
-.public Render3dSetPaletteBase
-.public Render3dSetTextureParams
-.public Render3dTextureNoSetup
-.public _020AFC70
 .public ov29_0234FD04
 .public ov29_0234FD14
 .public ov29_0234FD48
@@ -13,6 +10,9 @@
 .public ov29_0234FD54
 .public ov29_023534E8
 .public ov29_02353880
+.public Render3dSetPaletteBase
+.public Render3dSetTextureParams
+.public Render3dTextureNoSetup
 .public sub_02008BF4
 .public sub_0201E050
 .public sub_0201E380
--- a/asm/include/overlay_29_022DC65C.inc
+++ b/asm/include/overlay_29_022DC65C.inc
@@ -1,7 +1,9 @@
 #pragma once
-.public DUNGEON_PTR
+.public _020AFC4C
+.public _s32_div_f
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DrawTeamStats
+.public DUNGEON_PTR
 .public FreeMapAndTeam
 .public FreeTeamStats
 .public GetDefaultTileTextureId
@@ -10,10 +12,6 @@
 .public MemAlloc
 .public MemFree
 .public MemZero
-.public UnloadFile
-.public UpdateTeamStats
-.public _020AFC4C
-.public _s32_div_f
 .public ov10_022C0814
 .public ov10_022C096C
 .public ov10_022C0998
@@ -80,3 +78,5 @@
 .public sub_02063734
 .public sub_02063770
 .public sub_02063830
+.public UnloadFile
+.public UpdateTeamStats
--- a/asm/include/overlay_29_022DEBA4.inc
+++ b/asm/include/overlay_29_022DEBA4.inc
@@ -4,24 +4,24 @@
 .public ClearHiddenStairs
 .public CloseFixedBin
 .public CountItemsOnFloorForAcuteSniffer
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public Debug_Print0
 .public DeleteAllMonsterSpriteFiles
 .public DetermineAllMonsterShadow
 .public DetermineAllTilesWalkableNeighbors
+.public DIRECTIONS_XY
 .public DisplayFloorCard
 .public DisplayFloorTip
 .public DisplayMessage
 .public DisplayMessage2
+.public DUNGEON_PTR
 .public DungeonGoesUp
 .public DungeonRandInt
 .public DungeonRngUnsetSecondary
 .public EnemyEvolution
 .public EntityIsValid__022E0354
-.public FIXED_ROOM_REVISIT_OVERRIDES
 .public FadeToBlack
 .public FillMissionDestinationInfo
+.public FIXED_ROOM_REVISIT_OVERRIDES
 .public FreeLoadedAttackSpriteAndMore
 .public FreeTopScreenStatus
 .public GenerateDungeonRngSeed
@@ -54,36 +54,6 @@
 .public LoadWeather3DFiles
 .public MemZero
 .public OpenFixedBin
-.public Rand16Bit
-.public ReevaluateSnatchMonster
-.public RefillTeam
-.public ResetGravity
-.public RunFractionalTurn
-.public SetBaseStatsMovesGroundMonster
-.public SetBothScreensWindowColorToDefault
-.public SetDungeonRngPreseed
-.public SetDungeonRngPreseed23Bit
-.public SetEntityPixelPosXY
-.public SetForcedLossReason
-.public SetHiddenFloorField
-.public SetHiddenStairsField
-.public SetMaxReachedFloor
-.public SetMinimapDataE447
-.public SpawnInitialMonsters
-.public SpawnShopkeepers
-.public SpawnTeam
-.public StartFadeDungeonWrapper
-.public TryActivateArtificialWeatherAbilities
-.public TryActivateIqBooster
-.public TryActivateSlowStart
-.public TryActivateWeather
-.public TryForcedLoss
-.public TryInflictBurnStatusWholeTeam
-.public TrySpawnDoughSeedPoke
-.public UpdateMinimap
-.public UpdateShouldBoostHiddenStairsSpawnChance
-.public UpdateShouldBoostKecleonShopSpawnChance
-.public UpdateTrapsVisibility
 .public ov10_022BDAB0
 .public ov10_022BDB54
 .public ov10_022BDB60
@@ -243,6 +213,25 @@
 .public ov29_023510C0
 .public ov29_023510C8
 .public ov29_02353563
+.public Rand16Bit
+.public ReevaluateSnatchMonster
+.public RefillTeam
+.public ResetGravity
+.public RunFractionalTurn
+.public SetBaseStatsMovesGroundMonster
+.public SetBothScreensWindowColorToDefault
+.public SetDungeonRngPreseed
+.public SetDungeonRngPreseed23Bit
+.public SetEntityPixelPosXY
+.public SetForcedLossReason
+.public SetHiddenFloorField
+.public SetHiddenStairsField
+.public SetMaxReachedFloor
+.public SetMinimapDataE447
+.public SpawnInitialMonsters
+.public SpawnShopkeepers
+.public SpawnTeam
+.public StartFadeDungeonWrapper
 .public sub_02001808
 .public sub_02009194
 .public sub_020091B0
@@ -259,3 +248,14 @@
 .public sub_0205B77C
 .public sub_020634F4
 .public sub_02063504
+.public TryActivateArtificialWeatherAbilities
+.public TryActivateIqBooster
+.public TryActivateSlowStart
+.public TryActivateWeather
+.public TryForcedLoss
+.public TryInflictBurnStatusWholeTeam
+.public TrySpawnDoughSeedPoke
+.public UpdateMinimap
+.public UpdateShouldBoostHiddenStairsSpawnChance
+.public UpdateShouldBoostKecleonShopSpawnChance
+.public UpdateTrapsVisibility
--- a/asm/include/overlay_29_022E0378.inc
+++ b/asm/include/overlay_29_022E0378.inc
@@ -1,7 +1,7 @@
 #pragma once
 .public CalcSpeedStageWrapper
-.public DUNGEON_PTR
 .public DisplayMessage2
+.public DUNGEON_PTR
 .public EntityIsValid__022E0354
 .public FixedRoomIsSubstituteRoom
 .public GetForcedLossReason
@@ -15,12 +15,12 @@
 .public IsFloorOver
 .public IsJirachiChallengeFloor
 .public IsMoneyAllowed
-.public RemoveAllItems
-.public SECONDARY_TERRAIN_TYPES
-.public SetMoneyCarried
-.public SubInitMonster
 .public ov29_022E0A18
 .public ov29_022E68BC
 .public ov29_0234B034
 .public ov29_0234B0B4
 .public ov29_0237CFC0
+.public RemoveAllItems
+.public SECONDARY_TERRAIN_TYPES
+.public SetMoneyCarried
+.public SubInitMonster
--- a/asm/include/overlay_29_022E08A0.inc
+++ b/asm/include/overlay_29_022E08A0.inc
@@ -1,8 +1,11 @@
 #pragma once
+.public _020AFC28
+.public _020AFC4C
+.public _020AFC70
 .public AnimationDelayOrSomething
 .public CopyAndInterleaveWrapper
-.public DUNGEON_PTR
 .public DirectoryFileMngr_OpenDirectoryFile
+.public DUNGEON_PTR
 .public DungeonGoesUp
 .public GetBgRegionArea
 .public GetFloorType
@@ -16,13 +19,6 @@
 .public LoadWteFromFileDirectory
 .public Memcpy32
 .public Memset32
-.public SetMinimapDataE447
-.public StartFadeDungeonWrapper
-.public UnloadFile
-.public UnloadWte
-.public _020AFC28
-.public _020AFC4C
-.public _020AFC70
 .public ov10_022C4D54
 .public ov29_022DE15C
 .public ov29_022DE854
@@ -46,6 +42,8 @@
 .public ov29_0237C6A4
 .public ov29_0237C6B8
 .public ov29_0237C6D4
+.public SetMinimapDataE447
+.public StartFadeDungeonWrapper
 .public sub_020063F4
 .public sub_02006564
 .public sub_02006BFC
@@ -60,3 +58,5 @@
 .public sub_0201E380
 .public sub_0201F598
 .public sub_0204AE80
+.public UnloadFile
+.public UnloadWte
--- a/asm/include/overlay_29_022E1618.inc
+++ b/asm/include/overlay_29_022E1618.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/overlay_29_022EB44C.inc
+++ b/asm/include/overlay_29_022EB44C.inc
@@ -5,17 +5,9 @@
 .public GetItemCategoryVeneer
 .public GetItemInfo
 .public GetTile
-.public ITEM_CATEGORY_ACTIONS
 .public IsHM
+.public ITEM_CATEGORY_ACTIONS
 .public ItemZInit
-.public RemoveEmptyItemsInBagWrapper
-.public RemoveEquivItemNoHole
-.public RemoveGroundItem
-.public RemoveItem
-.public SetItemAcquired
-.public SetMonsterActionFields
-.public ShouldDisplayEntityWrapper
-.public SpawnItem
 .public ov29_02347040
 .public ov29_02352074
 .public ov29_0237C918
@@ -24,3 +16,11 @@
 .public ov29_0237C920
 .public ov29_0237C922
 .public ov29_0237C96C
+.public RemoveEmptyItemsInBagWrapper
+.public RemoveEquivItemNoHole
+.public RemoveGroundItem
+.public RemoveItem
+.public SetItemAcquired
+.public SetMonsterActionFields
+.public ShouldDisplayEntityWrapper
+.public SpawnItem
--- a/asm/include/overlay_29_022EBCE8.inc
+++ b/asm/include/overlay_29_022EBCE8.inc
@@ -1,28 +1,28 @@
 #pragma once
+.public abs
 .public AdvanceFrame
 .public CalcSpeedStageWrapper
 .public ChangeLeader
-.public DUNGEON_PTR
 .public DecrementWindCounter
 .public DisplayActions
+.public DUNGEON_PTR
 .public EnemyEvolution
 .public EntityIsValid__022EC608
 .public ExecuteMonsterAction
 .public FRACTIONAL_TURN_SEQUENCE
 .public GetLeader
 .public IsFloorOver
+.public ov29_022E81F8
+.public ov29_022EF9C8
+.public ov29_0230FC24
+.public ov29_02348FD8
+.public ov29_023522B6
 .public RunMonsterAi
 .public SetLeaderAction
+.public sub_01FFBDF4
 .public TickStatusAndHealthRegen
 .public TryActivateArtificialWeatherAbilities
 .public TryActivateWeather
 .public TryForcedLoss
 .public TryRestoreRoostTyping
 .public TrySpawnMonsterAndActivatePlusMinus
-.public abs
-.public ov29_022E81F8
-.public ov29_022EF9C8
-.public ov29_0230FC24
-.public ov29_02348FD8
-.public ov29_023522B6
-.public sub_01FFBDF4
--- a/asm/include/overlay_29_022ECDE4.inc
+++ b/asm/include/overlay_29_022ECDE4.inc
@@ -1,4 +1,6 @@
 #pragma once
+.public _020AFC4C
+.public _020AFC70
 .public AdvanceFrame
 .public AreLateGameTrapsEnabled
 .public CreateMonsterSummaryFromMonster
@@ -10,13 +12,8 @@
 .public GetTileSafe
 .public InitRender3dElement64
 .public LoadWteFromFileDirectory
-.public MemZero
-.public ProcessWte
-.public SpawnTrap
-.public StringFromId
-.public _020AFC4C
-.public _020AFC70
 .public memset
+.public MemZero
 .public ov29_022E7A30
 .public ov29_02352690
 .public ov29_02352698
@@ -25,7 +22,10 @@
 .public ov29_0237C864
 .public ov29_0237C974
 .public ov29_0237C99C
+.public ProcessWte
+.public SpawnTrap
 .public strcpy
+.public StringFromId
 .public sub_0201B9F8
 .public sub_0201E080
 .public sub_0201F2A0
--- a/asm/include/overlay_29_022EDCBC.inc
+++ b/asm/include/overlay_29_022EDCBC.inc
@@ -1,8 +1,8 @@
 #pragma once
 .public ApplyTrapEffect
 .public BindTrapToTile
-.public DUNGEON_PTR
 .public DrawMinimapTile
+.public DUNGEON_PTR
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public EnemyEvolution
@@ -16,15 +16,15 @@
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserTarget
 .public LogMessageByIdWithPopupCheckUserUnknown
-.public SpawnTrap
-.public SubstitutePlaceholderStringTags
-.public TRAP_BUSTER_ACTIVATION_CHANCE
-.public UpdateShopkeeperModeAfterTrap
-.public UpdateTrapsVisibility
 .public ov29_022E2CA0
 .public ov29_022E56A0
 .public ov29_022E58B0
 .public ov29_022E7A30
 .public ov29_022F9840
 .public ov29_0234B034
+.public SpawnTrap
 .public sub_02024FC8
+.public SubstitutePlaceholderStringTags
+.public TRAP_BUSTER_ACTIVATION_CHANCE
+.public UpdateShopkeeperModeAfterTrap
+.public UpdateTrapsVisibility
--- a/asm/include/overlay_29_022EE36C.inc
+++ b/asm/include/overlay_29_022EE36C.inc
@@ -57,13 +57,13 @@
 .public ov29_022FB920
 .public ov29_022FBD80
 .public ov29_02304A48
-.public ov29_02344B44
 .public ov29_02346344
-.public ov29_0234B084
+.public PrepareItemForPrinting__02345728
 .public RemoveEmptyItemsInBagWrapper
 .public RemoveGroundItem
 .public RemoveHeldItemNoHole
 .public SetFlagsForHeldItemInBag
+.public SetPreprocessorArgsIdVal
 .public ShouldDisplayEntityWrapper
 .public SLEEP_TURN_RANGE
 .public SPATK_STAT_IDX
--- a/asm/include/overlay_29_022F05B4.inc
+++ b/asm/include/overlay_29_022F05B4.inc
@@ -10,6 +10,7 @@
 .public AnimationDelayOrSomething
 .public BAG_ITEMS_PTR_MIRROR
 .public CanMonsterMoveInDirection
+.public CanMonsterMoveOrSwapWithAllyInDirection
 .public CanSeeTarget
 .public CeilFixedPoint
 .public ChangeMonsterAnimation
@@ -111,7 +112,6 @@
 .public ov29_023009CC
 .public ov29_02300FCC
 .public ov29_0230105C
-.public CanMonsterMoveOrSwapWithAllyInDirection
 .public ov29_023055B0
 .public ov29_02321164
 .public ov29_02322DDC
@@ -123,7 +123,6 @@
 .public ov29_02339D7C
 .public ov29_0233A0E8
 .public ov29_0233A248
-.public ov29_02344B44
 .public ov29_02346E5C
 .public ov29_02346FB8
 .public ov29_02348D3C
@@ -163,9 +162,11 @@
 .public ov29_0237CFBB
 .public PlayExclamationPointEffect__022E47D4
 .public PlayQuestionMarkEffect
+.public PlaySeByIdVolumeWrapper
 .public PlaySeVolumeWrapper
 .public PointCameraToMonster
 .public PositionHasMonster
+.public PrepareItemForPrinting__02345728
 .public PreprocessString
 .public RemoveEmptyItemsInBagWrapper
 .public RemoveEquivItemNoHole
@@ -181,7 +182,6 @@
 .public SpawnItem
 .public sub_02001AB0
 .public sub_02006B70
-.public sub_02017C80
 .public sub_0201B9F8
 .public sub_0201CF90
 .public sub_02026268
--- a/asm/include/overlay_29_022F52B0.inc
+++ b/asm/include/overlay_29_022F52B0.inc
@@ -9,6 +9,7 @@
 .public ExclusiveItemEffectFlagTest
 .public GetItemCategoryVeneer
 .public GetItemToUse
+.public HandleCurvedProjectileThrow
 .public IqSkillIsEnabled
 .public ItemIsActive__022F5994
 .public ItemZInit
@@ -25,13 +26,12 @@
 .public ov29_02304A48
 .public ov29_0230F9A4
 .public ov29_02343D30
-.public ov29_02344B44
-.public ov29_02344B70
 .public ov29_02346FB8
 .public ov29_02347000
 .public ov29_02347518
-.public HandleCurvedProjectileThrow
 .public ov29_0234B034
+.public PrepareItemForPrinting__02345728
+.public PrepareItemForPrinting__02345754
 .public RemoveEmptyItemsInBagWrapper
 .public RemoveEquivItemNoHole
 .public RemoveGroundItem
--- a/asm/include/overlay_29_022F59C4.inc
+++ b/asm/include/overlay_29_022F59C4.inc
@@ -39,7 +39,6 @@
 .public ov29_0230040C
 .public ov29_023009CC
 .public ov29_02304AFC
-.public TryEndPetrifiedOrSleepStatus
 .public ov29_0231AE3C
 .public ov29_0232145C
 .public ov29_02322374
@@ -63,6 +62,7 @@
 .public sub_02024FB8
 .public SubstitutePlaceholderStringTags
 .public TryActivateTruant
+.public TryEndPetrifiedOrSleepStatus
 .public UpdateMapSurveyorFlag
 .public UpdateMovePp
 .public YesNoMenu
--- a/asm/include/overlay_29_022F740C.inc
+++ b/asm/include/overlay_29_022F740C.inc
@@ -1,6 +1,6 @@
 #pragma once
-.public DUNGEON_PTR
 .public DirectoryFileMngr_GetDirectoryFileSize
+.public DUNGEON_PTR
 .public GendersEqualNotGenderless
 .public GetMonsterGender
 .public GetSpriteFileSize
@@ -9,5 +9,5 @@
 .public LoadWanTableEntryFromPack
 .public LoadWanTableEntryFromPackUseProvidedMemory
 .public MemAlloc
-.public WAN_TABLE
 .public ov29_0237C9B0
+.public WAN_TABLE
--- a/asm/include/overlay_29_022F7768.inc
+++ b/asm/include/overlay_29_022F7768.inc
@@ -3,14 +3,14 @@
 .public CanAttackInDirection
 .public CeilFixedPoint
 .public CheckTeamMemberIdx
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DeleteWanTableEntryVeneer
 .public DetermineMonsterShadow
+.public DIRECTIONS_XY
 .public DiscoverMinimap
 .public DisplayMessage
 .public DisplayMessage2
 .public DrawMinimapTile
+.public DUNGEON_PTR
 .public EnableAllLearnableIqSkills
 .public EndFrozenClassStatus
 .public EntityIsValid__022F7364
@@ -39,18 +39,6 @@
 .public LEADER_PTR
 .public MemFree
 .public OpenMessageLog
-.public PopulateActiveMonsterPtrs
-.public RemoveHolderForItemInBag
-.public RevertGiratinaAndShaymin
-.public SetForcedLossReason
-.public SetMissionTargetEnemyDefeated
-.public ShouldMonsterRunAway
-.public StoryRestrictionsEnabled
-.public TEAM_MEMBER_TABLE_PTR
-.public UpdateMapSurveyorFlag
-.public UpdateMinimap
-.public WAN_TABLE
-.public YesNoMenu
 .public ov29_022DDB68
 .public ov29_022E1C0C
 .public ov29_022E2470
@@ -76,8 +64,20 @@
 .public ov29_0234B1A4
 .public ov29_0234EF24
 .public ov29_0237C9B0
+.public PopulateActiveMonsterPtrs
+.public RemoveHolderForItemInBag
+.public RevertGiratinaAndShaymin
+.public SetForcedLossReason
+.public SetMissionTargetEnemyDefeated
+.public ShouldMonsterRunAway
+.public StoryRestrictionsEnabled
 .public sub_02053250
 .public sub_0205349C
 .public sub_02056228
 .public sub_020566C4
 .public sub_020585B4
+.public TEAM_MEMBER_TABLE_PTR
+.public UpdateMapSurveyorFlag
+.public UpdateMinimap
+.public WAN_TABLE
+.public YesNoMenu
--- a/asm/include/overlay_29_022F9194.inc
+++ b/asm/include/overlay_29_022F9194.inc
@@ -15,11 +15,11 @@
 .public LogMessageByIdWithPopupCheckUserTarget
 .public LowerSpeed
 .public MonsterIsType
-.public SubstitutePlaceholderStringTags
-.public TryEndStatusWithAbility
-.public WEATHER_BALL_TYPE_TABLE
 .public ov10_022C4C6E
 .public ov10_022C4C70
 .public ov29_022E6260
 .public ov29_022E647C
-.public ov29_0234B084
+.public SetPreprocessorArgsIdVal
+.public SubstitutePlaceholderStringTags
+.public TryEndStatusWithAbility
+.public WEATHER_BALL_TYPE_TABLE
--- a/asm/include/overlay_29_022F9744.inc
+++ b/asm/include/overlay_29_022F9744.inc
@@ -11,10 +11,10 @@
 .public CheckVariousStatuses
 .public CheckVariousStatuses2
 .public Conversion2IsActive
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DefenderAbilityIsActive__022F96CC
+.public DIRECTIONS_XY
 .public DiscoverMinimap
+.public DUNGEON_PTR
 .public DungeonRandInt
 .public EnableIqSkill
 .public EndBurnClassStatus
@@ -48,19 +48,6 @@
 .public LogMessageByIdWithPopup
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserTarget
-.public PointCameraToMonster
-.public RestoreAllMovePP
-.public SECONDARY_TERRAIN_TYPES
-.public SetActionPassTurnOrWalk
-.public ShouldDisplayEntityWrapper
-.public ShowPpRestoreEffect
-.public SubFixedPoint
-.public SubstitutePlaceholderStringTags
-.public TryInflictBurnStatus
-.public TryInflictPausedStatus
-.public UpdateCamera
-.public UpdateMinimap
-.public UpdateStatusIconFlags
 .public ov29_022E0A04
 .public ov29_022E4160
 .public ov29_022E68BC
@@ -76,12 +63,25 @@
 .public ov29_02304A48
 .public ov29_02307CE0
 .public ov29_02307DD0
-.public ov29_02344B44
 .public ov29_0234B034
-.public ov29_0234B084
+.public PointCameraToMonster
+.public PrepareItemForPrinting__02345728
+.public RestoreAllMovePP
+.public SECONDARY_TERRAIN_TYPES
+.public SetActionPassTurnOrWalk
+.public SetPreprocessorArgsIdVal
+.public ShouldDisplayEntityWrapper
+.public ShowPpRestoreEffect
 .public sub_0201405C
 .public sub_02017C50
 .public sub_0204AEF0
 .public sub_02050FF8
 .public sub_02052E2C
 .public sub_02056228
+.public SubFixedPoint
+.public SubstitutePlaceholderStringTags
+.public TryInflictBurnStatus
+.public TryInflictPausedStatus
+.public UpdateCamera
+.public UpdateMinimap
+.public UpdateStatusIconFlags
--- a/asm/include/overlay_29_022FACBC.inc
+++ b/asm/include/overlay_29_022FACBC.inc
@@ -20,13 +20,13 @@
 .public ItemZInit
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserTarget
+.public ov29_022E6928
+.public ov29_022EA370
+.public ov29_0230F9A4
+.public ov29_0234B09C
+.public PrepareItemForPrinting__02345728
 .public RandInt
 .public RemoveEquivItem
 .public ShouldTryEatItem
 .public SubstitutePlaceholderStringTags
 .public TryIncreaseHp
-.public ov29_022E6928
-.public ov29_022EA370
-.public ov29_0230F9A4
-.public ov29_02344B44
-.public ov29_0234B09C
--- a/asm/include/overlay_29_022FB678.inc
+++ b/asm/include/overlay_29_022FB678.inc
@@ -1,8 +1,9 @@
 #pragma once
+.public _020A1870
 .public Conversion2IsActive
 .public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DisplayAnimatedNumbers
+.public DUNGEON_PTR
 .public EntityIsValid__022F7364
 .public GetMaxPp
 .public GetMoveBasePp
@@ -10,10 +11,9 @@
 .public IqSkillIsEnabled
 .public IsMonster__022F9720
 .public IsSecretBazaarNpcBehavior
-.public TeamMemberHasEnabledIqSkill
-.public UpdateMapSurveyorFlag
-.public UpdateMinimap
-.public _020A1870
 .public ov29_022E576C
 .public ov29_02307CE0
 .public ov29_02348100
+.public TeamMemberHasEnabledIqSkill
+.public UpdateMapSurveyorFlag
+.public UpdateMinimap
--- a/asm/include/overlay_29_022FE4BC.inc
+++ b/asm/include/overlay_29_022FE4BC.inc
@@ -3,7 +3,6 @@
 .public AdvanceFrame
 .public AnimationDelayOrSomething
 .public CanMonsterMoveInDirection
-.public MonsterCannotAttack
 .public CannotStandOnTile
 .public DIRECTIONS_XY
 .public DisplayActions
@@ -12,11 +11,13 @@
 .public EnsureCanStandCurrentTile
 .public EntityIsValid__022FED98
 .public GetHiddenStairsField
+.public HandleHeldItemSwaps
 .public HasHeldItem
 .public IqSkillIsEnabled
 .public IsChargingAnyTwoTurnMove
 .public IsFloorOver
 .public LogMessageByIdWithPopupCheckUser
+.public MonsterCannotAttack
 .public MonsterCanThrowItems
 .public MoveMonsterToPos
 .public ov10_022C4F3C
@@ -31,7 +32,6 @@
 .public ov29_022F4350
 .public ov29_022F4370
 .public ov29_022F44F0
-.public ov29_022F45CC
 .public ov29_022F48D8
 .public ov29_022F49E0
 .public ov29_022F4BDC
--- a/asm/include/overlay_29_022FEDBC.inc
+++ b/asm/include/overlay_29_022FEDBC.inc
@@ -1,12 +1,12 @@
 #pragma once
 .public ActivateFlashFire
 .public CanMonsterUseMove
-.public MonsterCannotAttack
 .public DUNGEON_PTR
 .public DungeonRandInt
 .public EntityIsValid__022FED98
 .public IsMonsterSleeping
 .public LogMessageByIdWithPopupCheckUser
+.public MonsterCannotAttack
 .public ov29_022E56A0
 .public ov29_022FAA04
 .public ov29_02322374
--- a/asm/include/overlay_29_022FFF4C.inc
+++ b/asm/include/overlay_29_022FFF4C.inc
@@ -1,13 +1,13 @@
 #pragma once
 .public AbilityIsActive
 .public CalcSpeedStage
-.public EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST
 .public EntityIsValid__023000E4
+.public EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST
 .public ExclusiveItemEffectIsActive__022FFF28
 .public GetApparentWeather
 .public GetExclusiveItemWithEffectFromBag
 .public LogMessageByIdWithPopupCheckUser
+.public ov29_022E655C
+.public PrepareItemForPrinting__02345728
 .public SubstitutePlaceholderStringTags
 .public UpdateStateFlags
-.public ov29_022E655C
-.public ov29_02344B44
--- a/asm/include/overlay_29_02300FCC.inc
+++ b/asm/include/overlay_29_02300FCC.inc
@@ -1,4 +1,6 @@
 #pragma once
+.public DIRECTIONAL_BIT_MASKS__02352788
+.public DIRECTIONAL_BIT_MASKS__02352790
 .public DIRECTIONS_XY
 .public GetDirectionalMobilityType
 .public GetMobilityTypeCheckSlipAndFloating
@@ -6,5 +8,3 @@
 .public IqSkillIsEnabled
 .public IsCurrentTilesetBackground
 .public ItemIsActive__022FF898
-.public DIRECTIONAL_BIT_MASKS__02352788
-.public DIRECTIONAL_BIT_MASKS__02352790
--- a/asm/include/overlay_29_023016D8.inc
+++ b/asm/include/overlay_29_023016D8.inc
@@ -1,4 +1,4 @@
 #pragma once
 .public AbilityIsActive
-.public UpdateStateFlags
 .public PlayEffectAnimation0x29
+.public UpdateStateFlags
--- a/asm/include/overlay_29_02301A84.inc
+++ b/asm/include/overlay_29_02301A84.inc
@@ -8,5 +8,5 @@
 .public MistIsActive
 .public ov29_02314DC4
 .public ov29_02324BE8
-.public ov29_02344B44
+.public PrepareItemForPrinting__02345728
 .public SubstitutePlaceholderStringTags
--- a/asm/include/overlay_29_02301D84.inc
+++ b/asm/include/overlay_29_02301D84.inc
@@ -1,7 +1,7 @@
 #pragma once
 .public AbilityIsActive
-.public DUNGEON_PTR
 .public DefenderAbilityIsActive__02301A0C
+.public DUNGEON_PTR
 .public EntityIsValid__023000E4
 .public GravityIsActive
 .public ov29_022FAFD4
--- a/asm/include/overlay_29_02302388.inc
+++ b/asm/include/overlay_29_02302388.inc
@@ -16,6 +16,6 @@
 .public MIRACLE_CHEST_EXP_BOOST
 .public MultiplyByFixedPoint
 .public ov29_02301A84
-.public ov29_02344B44
+.public PrepareItemForPrinting__02345728
 .public SubstitutePlaceholderStringTags
 .public WONDER_CHEST_EXP_BOOST
--- a/asm/include/overlay_29_02302A5C.inc
+++ b/asm/include/overlay_29_02302A5C.inc
@@ -55,7 +55,6 @@
 .public ov29_02338988
 .public ov29_0234B034
 .public ov29_0234B06C
-.public ov29_0234B084
 .public ov29_0234B09C
 .public ov29_0234B4E0
 .public ov29_0234CFA0
@@ -76,6 +75,7 @@
 .public Rand16Bit
 .public SetAndPlayAnimationForAnimationControl
 .public SetMonsterTypeAndAbility
+.public SetPreprocessorArgsIdVal
 .public SetSpriteIdForAnimationControl
 .public SpawnMonster
 .public strcat
--- a/asm/include/overlay_29_023085DC.inc
+++ b/asm/include/overlay_29_023085DC.inc
@@ -5,6 +5,7 @@
 .public ATK_STAT_IDX
 .public BoostOffensiveStat
 .public CategoryIsNotPhysical
+.public CUTE_CHARM_INFATUATE_CHANCE
 .public DefenderAbilityIsActive__0230A940
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -22,7 +23,6 @@
 .public ov10_022C4460
 .public ov10_022C4464
 .public ov10_022C44C0
-.public ov10_022C4524
 .public ov10_022C4550
 .public ov10_022C4564
 .public ov10_022C45AC
--- a/asm/include/overlay_29_02308FE0.inc
+++ b/asm/include/overlay_29_02308FE0.inc
@@ -74,7 +74,6 @@
 .public ov29_02303E0C
 .public ov29_02304830
 .public ov29_02304A48
-.public TryEndPetrifiedOrSleepStatus
 .public ov29_02307C48
 .public ov29_02307DC0
 .public ov29_0230D628
@@ -110,6 +109,7 @@
 .public sub_0204AF00
 .public SubInitMonster
 .public SubstitutePlaceholderStringTags
+.public TryEndPetrifiedOrSleepStatus
 .public TryIncreaseHp
 .public TryRecruit
 .public TrySpawnEnemyItemDrop
--- a/asm/include/overlay_29_0230AA0C.inc
+++ b/asm/include/overlay_29_0230AA0C.inc
@@ -133,7 +133,6 @@
 .public ov29_0230E658
 .public ov29_02337EC0
 .public ov29_0234B034
-.public ov29_0234B084
 .public ov29_0234B0B4
 .public ov29_0234B1A4
 .public ov29_0234BA54
@@ -168,6 +167,7 @@
 .public SCOPE_LENS_CRIT_RATE_BOOST
 .public SetItemAcquired
 .public SetPokemonJoined
+.public SetPreprocessorArgsIdVal
 .public SOLID_ROCK_MULTIPLIER
 .public SPECIAL_BAND_STAT_BOOST
 .public StrcpySimple
--- a/asm/include/overlay_29_0230F02C.inc
+++ b/asm/include/overlay_29_0230F02C.inc
@@ -25,13 +25,13 @@
 .public ov29_022EACCC
 .public ov29_022F52BC
 .public ov29_022F9EA0
-.public ov29_02344B44
 .public ov29_02345004
 .public ov29_02347040
 .public ov29_02348D00
 .public ov29_02348D3C
 .public ov29_02348DD8
 .public ov29_02348ECC
+.public PrepareItemForPrinting__02345728
 .public RemoveGroundItem
 .public ShouldMonsterRunAwayAndShowEffect
 .public sub_0200D8AC
--- a/asm/include/overlay_29_0230F9A4.inc
+++ b/asm/include/overlay_29_0230F9A4.inc
@@ -7,7 +7,6 @@
 .public BoostSpeedOneStage
 .public BURN_DAMAGE
 .public BURN_DAMAGE_COOLDOWN
-.public MonsterCannotAttack
 .public CeilFixedPoint
 .public CheckVariousStatuses
 .public CheckVariousStatuses2
@@ -34,10 +33,12 @@
 .public IsFloating
 .public IsFloorOver
 .public IsMonster__0230F980
+.public IsTileGround
 .public ItemIsActive__02311034
 .public LEECH_SEED_DAMAGE_COOLDOWN
 .public LEECH_SEED_HP_DRAIN
 .public LogMessageByIdWithPopupCheckUser
+.public MonsterCannotAttack
 .public MonsterHasNegativeStatus
 .public MonsterIsType
 .public MultiplyFixedPoint64
@@ -66,19 +67,17 @@
 .public ov29_022F2FE4
 .public ov29_022F42F8
 .public ov29_022FB718
-.public TryEndPetrifiedOrSleepStatus
 .public ov29_02322374
-.public IsTileGround
 .public ov29_02344B9C
 .public ov29_023460DC
 .public ov29_02347184
 .public ov29_0234908C
-.public ov29_0234B084
 .public ov29_0234B294
 .public ov29_023529A8
 .public PlayEffectAnimationEntityStandard
 .public POISON_DAMAGE
 .public POISON_DAMAGE_COOLDOWN
+.public SetPreprocessorArgsIdVal
 .public SpawnDroppedItemWrapper
 .public SPEED_BOOST_TURNS
 .public sub_02050FF8
@@ -87,6 +86,7 @@
 .public TickStatusTurnCounter
 .public TreasureBoxDropsEnabled
 .public TryActivateBadDreams
+.public TryEndPetrifiedOrSleepStatus
 .public TryGenerateUnownStoneDrop
 .public TryIncreaseHp
 .public TryWarp
--- a/asm/include/overlay_29_02311088.inc
+++ b/asm/include/overlay_29_02311088.inc
@@ -26,12 +26,12 @@
 .public IsFloorOver
 .public ItemIsActive__02311034
 .public LogMessageByIdWithPopupCheckUser
+.public ov10_022C4674
+.public ov10_022C46F8
+.public ov29_0234B294
+.public ov29_02353318
 .public RAIN_ABILITY_BONUS_REGEN
 .public SubstitutePlaceholderStringTags
 .public TickStatusTurnCounter
 .public UpdateStatusIconFlags
 .public WISH_BONUS_REGEN
-.public ov10_022C4674
-.public ov10_022C46F8
-.public ov29_0234B294
-.public ov29_02353318
--- a/asm/include/overlay_29_02311C28.inc
+++ b/asm/include/overlay_29_02311C28.inc
@@ -5,12 +5,12 @@
 .public CalcStatusDuration
 .public ChangeShayminForme
 .public CopyStringFromId
+.public DefenderAbilityIsActive__02311B94
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
-.public DefenderAbilityIsActive__02311B94
 .public EntityIsValid__023118B4
-.public ExclusiveItemEffectIsActiveWithLogging
 .public ExclusiveItemEffectIsActive__023147EC
+.public ExclusiveItemEffectIsActiveWithLogging
 .public GetExclusiveItemWithEffectFromBag
 .public GetTile
 .public GetTileAtEntity
@@ -21,13 +21,6 @@
 .public LogMessageByIdWithPopupCheckUserTarget
 .public MonsterIsType
 .public MultiplyByFixedPoint
-.public PlayExclamationPointEffect__022E5D4C
-.public SECONDARY_TERRAIN_TYPES
-.public SafeguardIsActive
-.public SubstitutePlaceholderStringTags
-.public TryActivateQuickFeet
-.public TryActivateSteadfast
-.public UpdateStatusIconFlags
 .public ov10_022C4728
 .public ov10_022C479C
 .public ov10_022C47A0
@@ -73,7 +66,14 @@
 .public ov29_023018AC
 .public ov29_02304A48
 .public ov29_02304A84
-.public ov29_02344B44
 .public ov29_0234B034
-.public ov29_0234B084
 .public ov29_0234B0B4
+.public PlayExclamationPointEffect__022E5D4C
+.public PrepareItemForPrinting__02345728
+.public SafeguardIsActive
+.public SECONDARY_TERRAIN_TYPES
+.public SetPreprocessorArgsIdVal
+.public SubstitutePlaceholderStringTags
+.public TryActivateQuickFeet
+.public TryActivateSteadfast
+.public UpdateStatusIconFlags
--- a/asm/include/overlay_29_02314810.inc
+++ b/asm/include/overlay_29_02314810.inc
@@ -12,10 +12,6 @@
 .public IsProtectedFromNegativeStatus
 .public ItemIsActive__0231513C
 .public LogMessageByIdWithPopupCheckUserTarget
-.public SPEED_BOOST_TURN_RANGE
-.public SafeguardIsActive
-.public SubstitutePlaceholderStringTags
-.public UpdateStatusIconFlags
 .public ov10_022C4618
 .public ov10_022C488C
 .public ov10_022C4890
@@ -24,6 +20,10 @@
 .public ov29_022E451C
 .public ov29_022E543C
 .public ov29_022E60E4
-.public ov29_02344B44
-.public ov29_0234B084
 .public ov29_02353318
+.public PrepareItemForPrinting__02345728
+.public SafeguardIsActive
+.public SetPreprocessorArgsIdVal
+.public SPEED_BOOST_TURN_RANGE
+.public SubstitutePlaceholderStringTags
+.public UpdateStatusIconFlags
--- a/asm/include/overlay_29_02317844.inc
+++ b/asm/include/overlay_29_02317844.inc
@@ -5,6 +5,7 @@
 .public DungeonRandInt
 .public EndInvisibleClassStatus
 .public EntityIsValid__02315118
+.public GASTRO_ACID_TURN_RANGE
 .public GetMaxPp
 .public GetMaxPpWrapper
 .public GetMobilityType
@@ -17,7 +18,6 @@
 .public ov10_022C4628
 .public ov10_022C4764
 .public ov10_022C4768
-.public ov10_022C476C
 .public ov10_022C4774
 .public ov10_022C4778
 .public ov10_022C477C
--- a/asm/include/overlay_29_02318E70.inc
+++ b/asm/include/overlay_29_02318E70.inc
@@ -3,9 +3,6 @@
 .public CalcStatusDuration
 .public EntityIsValid__02318E4C
 .public LogMessageByIdWithPopupCheckUserTarget
-.public SubstitutePlaceholderStringTags
-.public UpdateStatusIconFlags
-.public ov10_022C472C
 .public ov10_022C4730
 .public ov10_022C4734
 .public ov10_022C4738
@@ -30,3 +27,6 @@
 .public ov29_022E415C
 .public ov29_022E41AC
 .public ov29_022E543C
+.public REFLECT_LIGHT_SCREEN_TURN_RANGE
+.public SubstitutePlaceholderStringTags
+.public UpdateStatusIconFlags
--- a/asm/include/overlay_29_02319880.inc
+++ b/asm/include/overlay_29_02319880.inc
@@ -1,26 +0,0 @@
-#pragma once
-.public AI_CAN_ATTACK_IN_DIRECTION
-.public AI_POTENTIAL_ATTACK_TARGETS
-.public AI_POTENTIAL_ATTACK_TARGET_DIRECTIONS
-.public AI_POTENTIAL_ATTACK_TARGET_WEIGHTS
-.public CanAttackInDirection
-.public CanSeeTarget
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
-.public DungeonRandInt
-.public EntityIsValid__02319F8C
-.public GetDirectionTowardsPosition
-.public GetEntityMoveTargetAndRange
-.public GetMoveTargetAndRange
-.public GetMoveTypeForMonster
-.public GetTile
-.public IqSkillIsEnabled
-.public IsUsableWhileTaunted
-.public IsAiTargetEligible
-.public IsBlinded
-.public IsTargetInRange
-.public ResetAiCanAttackInDirection
-.public StatusCheckerCheck
-.public TryAddTargetToAiTargetList
-.public WeightMoveWithIqSkills
-.public abs
--- a/asm/include/overlay_29_0231A364.inc
+++ b/asm/include/overlay_29_0231A364.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public _s32_div_f
 .public AbilityIsActiveVeneer
 .public CanAttackInDirection
 .public DIRECTIONS_XY
@@ -9,6 +10,5 @@
 .public HasHeldItem
 .public IqSkillIsEnabled
 .public IsBlinded
-.public _s32_div_f
 .public ov29_0230B7D4
 .public ov29_0230F8D0
--- a/asm/include/overlay_29_0231A7A0.inc
+++ b/asm/include/overlay_29_0231A7A0.inc
@@ -3,6 +3,6 @@
 .public ExclusiveItemEffectIsActive__0231A87C
 .public IqSkillIsEnabled
 .public LogMessageByIdWithPopupCheckUser
+.public ov10_022C459C
 .public PlayExclamationPointEffect__022E4880
 .public SubstitutePlaceholderStringTags
-.public ov10_022C459C
--- a/asm/include/overlay_29_0231A8A0.inc
+++ b/asm/include/overlay_29_0231A8A0.inc
@@ -6,8 +6,8 @@
 .public IsFloorOver
 .public IsMonster__0231A9D4
 .public LogMessageByIdWithPopupCheckUser
+.public ov29_022FA574
+.public ov29_0232145C
 .public ShouldUsePp
 .public TryActivateTruant
 .public UpdateMovePp
-.public ov29_022FA574
-.public ov29_0232145C
--- a/asm/include/overlay_29_0231A9F8.inc
+++ b/asm/include/overlay_29_0231A9F8.inc
@@ -9,12 +9,12 @@
 .public InitMove
 .public IsFloorOver
 .public LogMessageByIdWithPopupCheckUser
-.public RemoveUsedItem
-.public SubstitutePlaceholderStringTags
-.public TryActivateTruant
-.public UpdateAiTargetPos
 .public ov29_022EB4E8
 .public ov29_022FBAB4
 .public ov29_02321274
 .public ov29_02322374
-.public ov29_02344B44
+.public PrepareItemForPrinting__02345728
+.public RemoveUsedItem
+.public SubstitutePlaceholderStringTags
+.public TryActivateTruant
+.public UpdateAiTargetPos
--- a/asm/include/overlay_29_0231AD38.inc
+++ b/asm/include/overlay_29_0231AD38.inc
@@ -10,11 +10,11 @@
 .public LogMessageByIdWithPopupCheckParticipants
 .public LogMessageByIdWithPopupCheckUserTarget
 .public NATURAL_GIFT_ITEM_TABLE
-.public SetActionUseMoveAi
-.public SubstitutePlaceholderStringTags
-.public WEATHER_BALL_TYPE_TABLE
 .public ov29_022E4110
 .public ov29_022FB9E0
 .public ov29_0232145C
 .public ov29_0232E80C
-.public ov29_02344B44
+.public PrepareItemForPrinting__02345728
+.public SetActionUseMoveAi
+.public SubstitutePlaceholderStringTags
+.public WEATHER_BALL_TYPE_TABLE
--- a/asm/include/overlay_29_0231B1B8.inc
+++ b/asm/include/overlay_29_0231B1B8.inc
@@ -6,5 +6,5 @@
 .public IsMonsterSleeping
 .public ov10_022C4530
 .public ov29_022E28D4
+.public SetPreprocessorArgsIdVal
 .public TryEndPetrifiedOrSleepStatus
-.public ov29_0234B084
--- a/asm/include/overlay_29_0231B33C.inc
+++ b/asm/include/overlay_29_0231B33C.inc
@@ -82,8 +82,8 @@
 .public ov29_022FB9BC
 .public ov29_02304830
 .public ov29_0230F9A4
-.public ov29_02344B44
 .public ov29_0234BA54
+.public PrepareItemForPrinting__02345728
 .public PROTEIN_STAT_BOOST
 .public RARE_FOSSIL_DAMAGE
 .public RestoreAllMovePP
--- a/asm/include/overlay_29_0231CBEC.inc
+++ b/asm/include/overlay_29_0231CBEC.inc
@@ -82,8 +82,6 @@
 .public ov29_023021F0
 .public ov29_023038D4
 .public ov29_02339FF4
-.public ov29_02344B44
-.public ov29_0234B084
 .public ov29_0234B09C
 .public ov29_0234BA54
 .public ov29_023529AC
@@ -94,10 +92,12 @@
 .public ov31_02386204
 .public ov31_02386308
 .public ov31_023877EC
+.public PrepareItemForPrinting__02345728
 .public RemoveUsedItem
 .public RestoreAllMovePP
 .public SetDoughSeedFlag
 .public SetMonsterActionFields
+.public SetPreprocessorArgsIdVal
 .public ShouldDisplayEntityWrapper
 .public SPATK_STAT_IDX
 .public sub_02050FF8
--- a/asm/include/overlay_29_0231EDFC.inc
+++ b/asm/include/overlay_29_0231EDFC.inc
@@ -26,7 +26,7 @@
 .public ov29_0232033C
 .public ov29_02321238
 .public ShouldDisplayEntityWrapper
-.public sin_4096
+.public SinAbs4096
 .public SubstitutePlaceholderStringTags
 .public TryWarp
 .public TwoTurnMoveForcedMiss
--- a/asm/include/overlay_29_0231F594.inc
+++ b/asm/include/overlay_29_0231F594.inc
@@ -24,7 +24,7 @@
 .public ov29_023457C8
 .public RemoveGroundItem
 .public SetEntityPixelPosXY
+.public SinAbs4096
 .public SpawnItem
-.public sin_4096
 .public UpdateMinimap
 .public UpdateTrapsVisibility
--- a/asm/include/overlay_29_0231FC20.inc
+++ b/asm/include/overlay_29_0231FC20.inc
@@ -18,11 +18,11 @@
 .public ov29_022E56A0
 .public ov29_022F9C74
 .public ov29_022FFB90
-.public TryEndPetrifiedOrSleepStatus
 .public ov29_0232033C
 .public ov29_02321238
 .public ov29_0232124C
 .public ShouldDisplayEntityWrapper
 .public SubstitutePlaceholderStringTags
+.public TryEndPetrifiedOrSleepStatus
 .public TwoTurnMoveForcedMiss
 .public UpdateEntityPixelPos
--- a/asm/include/overlay_29_023201A0.inc
+++ b/asm/include/overlay_29_023201A0.inc
@@ -29,7 +29,7 @@
 .public ov29_02353700
 .public RemoveGroundItem
 .public ShouldDisplayEntityWrapper
-.public sin_4096
+.public SinAbs4096
 .public SubstitutePlaceholderStringTags
 .public UpdateEntityPixelPos
 .public UpdateMinimap
--- a/asm/include/overlay_29_02320788.inc
+++ b/asm/include/overlay_29_02320788.inc
@@ -35,7 +35,6 @@
 .public ov29_022FF958
 .public ov29_02304A48
 .public ov29_02305814
-.public TryEndPetrifiedOrSleepStatus
 .public ov29_02322374
 .public ov29_023247B4
 .public ov29_02336694
@@ -46,6 +45,7 @@
 .public ShouldDisplayEntityWrapper
 .public sub_01FFB62C
 .public SubstitutePlaceholderStringTags
+.public TryEndPetrifiedOrSleepStatus
 .public TryInflictPetrifiedStatus
 .public TwoTurnMoveForcedMiss
 .public UpdateCamera
--- a/asm/include/overlay_29_0232145C.inc
+++ b/asm/include/overlay_29_0232145C.inc
@@ -9,7 +9,6 @@
 .public BuildMoveTargetList
 .public CalcStatusDuration
 .public CanMonsterUseMove
-.public MonsterCannotAttack
 .public DungeonRandInt
 .public EndFrozenClassStatus
 .public EndLeechSeedClassStatus
@@ -39,6 +38,7 @@
 .public LowerSpeed
 .public METRONOME_NEXT_INDEX
 .public METRONOME_TABLE
+.public MonsterCannotAttack
 .public NATURE_POWER_TABLE
 .public NIGHTMARE_TURN_RANGE
 .public ov10_022BFD6C
@@ -62,9 +62,9 @@
 .public ov29_023383A8
 .public ov29_02344B9C
 .public ov29_0234B034
-.public ov29_0234B084
 .public ov29_0235370C
 .public ov29_0237CA68
+.public SetPreprocessorArgsIdVal
 .public SLEEP_TURN_RANGE
 .public StringFromId
 .public sub_0201D1B0
--- a/Show More
+++ b/Show More