Merge pull request #293 from AnonymousRandomPerson/main

Synced from pmdsky-debug

asm/include/main_020024E4.inc

@@ -1,4 +1,9 @@
 #pragma once
+.public _020AEF30
+.public _0229AFC0
+.public _0229AFCC
+.public _0229AFE4
+.public _0229B004
 .public OS_CreateThread
 .public OS_GetThreadPriority
 .public OS_InitMutex
@@ -8,8 +13,3 @@
 .public OS_SleepThreadDirect
 .public OS_UnlockMutex
 .public OSi_ThreadInfo
-.public _020AEF30
-.public _0229AFC0
-.public _0229AFCC
-.public _0229AFE4
-.public _0229B004

asm/include/main_02002910.inc

@@ -1,4 +1,10 @@
 #pragma once
+.public _020AEF58
+.public _0229B0E8
+.public _0229B0F0
+.public _0229B0F8
+.public _0229B110
+.public _0229B114
 .public Card_LockBackup
 .public Card_LockRom
 .public Card_UnlockBackup
@@ -16,12 +22,6 @@
 .public OS_TryLockMutex
 .public OS_UnlockMutex
 .public OSi_ThreadInfo
-.public _020AEF58
-.public _0229B0E8
-.public _0229B0F0
-.public _0229B0F8
-.public _0229B110
-.public _0229B114
 .public sub_02002580
 .public sub_02002670
 .public sub_020026B8

asm/include/main_02003DB8.inc

@@ -1,12 +1,12 @@
 #pragma once
-.public Card_TerminateForPulledOut
-.public Debug_Print0
-.public OS_SleepThread
-.public OS_WaitIrq
 .public _02092540
 .public _020AEF7C
 .public _020AF050
 .public _020AF078
+.public Card_TerminateForPulledOut
+.public Debug_Print0
+.public OS_SleepThread
+.public OS_WaitIrq
 .public sub_02002448
 .public sub_02002580
 .public sub_020025F8

asm/include/main_020040AC.inc

@@ -1,13 +1,16 @@
 #pragma once
+.public _02092558
+.public _020925A0
+.public _020925B4
 .public CardPullOutWithStatus
 .public DC_FlushAll
 .public Debug_FatalError
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
 .public FS_LoadOverlayImage
 .public FS_LoadOverlayInfo
 .public FS_StartOverlay
 .public FS_UnloadOverlay
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
 .public GetDsFirmwareUserSettings
 .public IC_InvalidateAll
 .public LOADED_OVERLAY_GROUP_0
@@ -15,6 +18,3 @@
 .public MATHi_CRC32InitTable
 .public MemAlloc
 .public MemFree
-.public _02092558
-.public _020925A0
-.public _020925B4

asm/include/main_02004FF8.inc

@@ -1,37 +1,4 @@
 #pragma once
-.public CardPullOutWithStatus
-.public Card_IsPulledOut
-.public DC_FlushAll
-.public Debug_Print
-.public Debug_Print0
-.public FS_CloseFile
-.public FS_InitFile
-.public FS_OpenFile
-.public FS_ReadFile
-.public FS_SeekFile
-.public FileRom_StopDataTransfer
-.public GXS_BeginLoadBGExtPltt
-.public GXS_EndLoadBGExtPltt
-.public GX_BeginLoadBGExtPltt
-.public GX_BeginLoadOBJExtPltt
-.public GX_EndLoadBGExtPltt
-.public GX_EndLoadOBJExtPltt
-.public MI_DmaCopy16Async
-.public MI_DmaCopy32Async
-.public MI_DmaSend16Async
-.public MI_DmaSend32Async
-.public MI_IsDmaBusy
-.public MemFree
-.public MemLocateSet
-.public RandInt
-.public Rtc_GetDateTime
-.public Rtc_Init
-.public TOUCHSCREEN_STATUS
-.public TP_GetUserInfo
-.public TP_Init
-.public TP_RequestSamplingAsync
-.public TP_SetCalibrateParam
-.public TP_WaitCalibratedResult
 .public _020925C8
 .public _020925F8
 .public _02092670
@@ -72,6 +39,33 @@
 .public _fmul
 .public _s32_div_f
 .public abs
+.public Card_IsPulledOut
+.public CardPullOutWithStatus
+.public DC_FlushAll
+.public Debug_Print
+.public Debug_Print0
+.public FileRom_StopDataTransfer
+.public FS_CloseFile
+.public FS_InitFile
+.public FS_OpenFile
+.public FS_ReadFile
+.public FS_SeekFile
+.public GX_BeginLoadBGExtPltt
+.public GX_BeginLoadOBJExtPltt
+.public GX_EndLoadBGExtPltt
+.public GX_EndLoadOBJExtPltt
+.public GXS_BeginLoadBGExtPltt
+.public GXS_EndLoadBGExtPltt
+.public MemFree
+.public MemLocateSet
+.public MI_DmaCopy16Async
+.public MI_DmaCopy32Async
+.public MI_DmaSend16Async
+.public MI_DmaSend32Async
+.public MI_IsDmaBusy
+.public RandInt
+.public Rtc_GetDateTime
+.public Rtc_Init
 .public sprintf
 .public sqrtf
 .public strcat
@@ -96,3 +90,9 @@
 .public sub_020031C0
 .public sub_0200844C
 .public sub_0200846C
+.public TOUCHSCREEN_STATUS
+.public TP_GetUserInfo
+.public TP_Init
+.public TP_RequestSamplingAsync
+.public TP_SetCalibrateParam
+.public TP_WaitCalibratedResult

asm/include/main_02009648.inc

@@ -1,7 +1,6 @@
 #pragma once
 .public G2x_SetBlendAlpha_
 .public G3X_SetClearColor
-.public GXS_SetGraphicsMode
 .public GX_SetBankForBG
 .public GX_SetBankForBGExtPltt
 .public GX_SetBankForOBJ
@@ -12,6 +11,7 @@
 .public GX_SetBankForTex
 .public GX_SetBankForTexPltt
 .public GX_SetGraphicsMode
+.public GXS_SetGraphicsMode
 .public sub_02009120
 .public sub_020091CC
 .public sub_020091F8

asm/include/main_0200C5B4.inc

@@ -1,12 +1,12 @@
 #pragma once
+.public _02094C0C
 .public AllocateTemp1024ByteBufferFromPool
-.public DUNGEON_RETURN_STATUS_TABLE
 .public DrawTextInWindow
+.public DUNGEON_RETURN_STATUS_TABLE
 .public GetDungeonResultMsg
 .public GetStringFromFileVeneer
 .public GetWindow
 .public MaybeGetColoredFormattedItemName
 .public PreprocessString
 .public StringFromId
-.public _02094C0C
 .public sub_020265A8

asm/include/main_02010FC4.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public _020A1878
 .public ApplyExclusiveItemStatBoosts
 .public BAG_ITEMS_PTR_MIRROR
 .public EXCLUSIVE_ITEM_EFFECT_DATA
@@ -15,4 +16,3 @@
 .public MemFree
 .public MemZero
 .public SetExclusiveItemEffect
-.public _020A1878

asm/include/main_02011528.inc

@@ -1,9 +1,9 @@
 #pragma once
 .public ApplyGummiBoostsGroundMode
 .public CALCIUM_STAT_BOOST
-.public GINSENG_CHANCE_3
 .public GetMoveBasePowerGround
 .public GetMoveMaxGinsengBoostGround
+.public GINSENG_CHANCE_3
 .public IRON_STAT_BOOST
 .public LIFE_SEED_HP_BOOST
 .public ModifyDefensiveStat

asm/include/main_02011850.inc

@@ -1,8 +1,9 @@
 #pragma once
+.public _0209889C
 .public BAG_ITEMS_PTR_MIRROR
 .public CountValidRecycleShopItems
-.public GUMMI_STAT_BOOST
 .public GetType
+.public GUMMI_STAT_BOOST
 .public IQ_GUMMI_GAIN_TABLE
 .public IsGummi
 .public IsMonsterAffectedByGravelyrockGroundMode
@@ -14,8 +15,7 @@
 .public ModifyOffensiveStat
 .public RandIntSafe
 .public SaveScriptVariableValue
-.public WONDER_GUMMI_IQ_GAIN
-.public WONDER_GUMMI_STAT_BOOST
-.public _0209889C
 .public sub_0200D1F0
 .public sub_0201297C
+.public WONDER_GUMMI_IQ_GAIN
+.public WONDER_GUMMI_STAT_BOOST

asm/include/main_02011F60.inc

@@ -1,15 +1,15 @@
 #pragma once
+.public _020988A4
+.public _020988A8
+.public _s32_div_f
 .public BAG_ITEMS_PTR_MIRROR
 .public CountValidRecycleShopItems
 .public FreeRecycleOfferItems
 .public GetRank
 .public GetScenarioBalance
 .public LoadScriptVariableValue
-.public RECYCLE_SHOP_ITEM_LIST
 .public Rand16Bit
+.public RECYCLE_SHOP_ITEM_LIST
 .public SaveScriptVariableValue
 .public SetNbRecycled
-.public _020988A4
-.public _020988A8
-.public _s32_div_f
 .public sub_02011B3C

asm/include/main_02012294.inc

@@ -1,4 +1,22 @@
 #pragma once
+.public _020988D0
+.public _020988D4
+.public _020988D8
+.public _02098CB4
+.public _02098CCC
+.public _02098D24
+.public _02098D48
+.public _02098D68
+.public _02098DE4
+.public _02098DF4
+.public _02098E04
+.public _02098E0C
+.public _02098E14
+.public _02098E58
+.public _02098E9C
+.public _020AF6D0
+.public _020AF700
+.public _022A4BD8
 .public BAG_ITEMS_PTR_MIRROR
 .public BitstreamDebug
 .public ConvertStorageItemAtIdxToBulkItem
@@ -7,8 +25,8 @@
 .public CountNbItemsOfTypeInBag
 .public CountNbItemsOfTypeInStorage
 .public CountNbOfItemsInStorage
-.public DUNGEON_MOVE_TABLES
 .public Debug_Print0
+.public DUNGEON_MOVE_TABLES
 .public FemaleToMaleForm
 .public GetBaseFormCastformDeoxysCherrim
 .public GetDungeonResultString
@@ -35,36 +53,18 @@
 .public MemAlloc
 .public MemFree
 .public OpenWaza
-.public RECYCLE_SHOP_ITEM_LIST
 .public RandInt
 .public RandRange
+.public RECYCLE_SHOP_ITEM_LIST
 .public RemoveEmptyItemsInBag
 .public RemoveItem
 .public RemoveItemAtIdxInStorage
 .public ReturnEggExclusiveItem
-.public SYNTH_BIN_FILE_PTR
 .public SelectWaza
 .public StringFromId
+.public sub_02010044
+.public SYNTH_BIN_FILE_PTR
 .public TYPE_SPECIFIC_EXCLUSIVE_ITEMS
 .public UnloadFile
-.public ZInit8
-.public _020988D0
-.public _020988D4
-.public _020988D8
-.public _02098CB4
-.public _02098CCC
-.public _02098D24
-.public _02098D48
-.public _02098D68
-.public _02098DE4
-.public _02098DF4
-.public _02098E04
-.public _02098E0C
-.public _02098E14
-.public _02098E58
-.public _02098E9C
-.public _020AF6D0
-.public _020AF700
-.public _022A4BD8
-.public sub_02010044
 .public vsprintf
+.public ZInit8

asm/include/main_020151E4.inc

@@ -1,35 +1,4 @@
 #pragma once
-.public AtoiTagVeneer
-.public BagHasExclusiveItemTypeForMonster
-.public CopyColorToPaletteDataRgba
-.public DUNGEON_MOVE_TABLES
-.public DeleteWanTableEntryVeneer
-.public DisplayAndSwitchAnimationControlCurrentFrame
-.public DungeonGoesUp
-.public GetAbility
-.public GetNbFloors
-.public GetStringFromFileVeneer
-.public HandleSir0Translation
-.public InitAnimationControlWithSet__0201C0B0
-.public InitPreprocessorArgs
-.public IqSkillFlagTest
-.public LoadFileFromRom
-.public LoadWanTableEntry
-.public MarkPaletteDataAsNeedingUpdate
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemZero32
-.public MultiplyByFixedPoint
-.public PreprocessString
-.public Rand16Bit
-.public SetAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public StopBgmCommand
-.public StrcmpTagVeneer
-.public StringFromId
-.public UnloadFile
-.public WAN_TABLE
 .public _02098EA8
 .public _02098EE0
 .public _02098F60
@@ -66,9 +35,38 @@
 .public _022A4BE8
 .public _s32_div_f
 .public _u32_div_f
+.public AtoiTagVeneer
+.public BagHasExclusiveItemTypeForMonster
+.public CopyColorToPaletteDataRgba
+.public DeleteWanTableEntryVeneer
+.public DisplayAndSwitchAnimationControlCurrentFrame
+.public DUNGEON_MOVE_TABLES
+.public DungeonGoesUp
+.public GetAbility
+.public GetNbFloors
+.public GetStringFromFileVeneer
+.public HandleSir0Translation
+.public InitAnimationControlWithSet__0201C0B0
+.public InitPreprocessorArgs
+.public IqSkillFlagTest
+.public LoadFileFromRom
+.public LoadWanTableEntry
+.public MarkPaletteDataAsNeedingUpdate
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public MemZero32
+.public MultiplyByFixedPoint
 .public ov10_022BDADC
 .public ov10_022C2528
+.public PreprocessString
+.public Rand16Bit
+.public SetAnimationForAnimationControl
+.public SetSpriteIdForAnimationControl
+.public StopBgmCommand
+.public StrcmpTagVeneer
 .public strcpy
+.public StringFromId
 .public strlen
 .public strncmp
 .public sub_0200A174
@@ -107,4 +105,6 @@
 .public sub_0206ADA0
 .public sub_0206ADB8
 .public sub_0206BA5C
+.public UnloadFile
 .public vsprintf
+.public WAN_TABLE

asm/include/main_02017D20.inc

@@ -1,67 +1,4 @@
 #pragma once
-.public AUDIO_COMMANDS_BUFFER
-.public AddObjToUngroupedOamObjs
-.public ClearGroupedOamObjsAndGroups
-.public CopyAndInterleave
-.public CopyAndInterleave0
-.public DC_FlushRange
-.public Debug_GetDebugFlag
-.public Debug_Print
-.public Debug_Print0
-.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 FileClose
-.public FileGetSize
-.public FileRom_HandleOpen
-.public FileRom_HandleRead
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
-.public FileRom_Veneer_FileInit
-.public FillPaletteDataRgba
-.public GXS_BeginLoadBGExtPltt
-.public GXS_BeginLoadOBJExtPltt
-.public GXS_EndLoadBGExtPltt
-.public GXS_EndLoadOBJExtPltt
-.public GX_BeginLoadBGExtPltt
-.public GX_BeginLoadOBJExtPltt
-.public GX_EndLoadBGExtPltt
-.public GX_EndLoadOBJExtPltt
-.public InitOamInfo
-.public MTi_CpuClear32
-.public MTi_CpuCopy32
-.public MarkPaletteDataAsNeedingUpdate
-.public MemAlloc
-.public MemArenaAlloc
-.public MemLocateSet
-.public MemLocateUnset
-.public MemZero
-.public Memcpy32
-.public PointsToZero
-.public ResumeBgm
-.public SND_Init
-.public Snd_LockChannel
-.public Snd_UnlockChannel
-.public ZInit8
 .public _0209916C
 .public _0209918C
 .public _020991C8
@@ -139,6 +76,68 @@
 .public _022A4EF4
 .public _022A4EFC
 .public _s32_div_f
+.public AddObjToUngroupedOamObjs
+.public AUDIO_COMMANDS_BUFFER
+.public ClearGroupedOamObjsAndGroups
+.public CopyAndInterleave
+.public CopyAndInterleave0
+.public DC_FlushRange
+.public Debug_GetDebugFlag
+.public Debug_Print
+.public Debug_Print0
+.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 FileClose
+.public FileGetSize
+.public FileRom_HandleOpen
+.public FileRom_HandleRead
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
+.public FillPaletteDataRgba
+.public GX_BeginLoadBGExtPltt
+.public GX_BeginLoadOBJExtPltt
+.public GX_EndLoadBGExtPltt
+.public GX_EndLoadOBJExtPltt
+.public GXS_BeginLoadBGExtPltt
+.public GXS_BeginLoadOBJExtPltt
+.public GXS_EndLoadBGExtPltt
+.public GXS_EndLoadOBJExtPltt
+.public InitOamInfo
+.public MarkPaletteDataAsNeedingUpdate
+.public MemAlloc
+.public MemArenaAlloc
+.public Memcpy32
+.public MemLocateSet
+.public MemLocateUnset
+.public MemZero
+.public MTi_CpuClear32
+.public MTi_CpuCopy32
+.public PointsToZero
+.public ResumeBgm
+.public SND_Init
+.public Snd_LockChannel
+.public Snd_UnlockChannel
 .public sprintf
 .public sub_02002778
 .public sub_020027E8
@@ -165,3 +164,4 @@
 .public sub_0206C6BC
 .public sub_0206C754
 .public sub_0206F5C8
+.public ZInit8

asm/include/main_0201BAC8.inc

@@ -1,8 +1,8 @@
 #pragma once
+.public _020AFC28
 .public MemAlloc
 .public MemZero
 .public OBJ_GRAPHICS_CONTROLS_PTR
-.public _020AFC28
 .public sub_0201AB90
 .public sub_0201AC10
 .public sub_0201AC20

asm/include/main_0201C000.inc

@@ -1,4 +1,10 @@
 #pragma once
+.public _020996E0
+.public _020AFC30
+.public _020AFC3C
+.public _020AFC50
+.public _020AFC70
+.public _s32_div_f
 .public AddWanFragmentToOam
 .public Debug_Print0
 .public EnqueueRender3dTexture
@@ -8,17 +14,11 @@
 .public Rand16Bit
 .public Rgb8ToRgb5
 .public SpriteTypeInWanTable
-.public WAN_TABLE
-.public WanTableSpriteHasAnimationGroup
-.public _020996E0
-.public _020AFC30
-.public _020AFC3C
-.public _020AFC50
-.public _020AFC70
-.public _s32_div_f
 .public sub_0201B388
 .public sub_0201B53C
 .public sub_0201D1B0
 .public sub_0201DC4C
 .public sub_0201E050
 .public sub_0201E408
+.public WAN_TABLE
+.public WanTableSpriteHasAnimationGroup

asm/include/main_0201D738.inc

@@ -1,20 +1,4 @@
 #pragma once
-.public DirectoryFileMngr_OpenDirectoryFile
-.public DisplayAndSwitchAnimationControlCurrentFrame
-.public GX_BeginLoadTex
-.public GX_BeginLoadTexPltt
-.public GX_EndLoadTex
-.public GX_EndLoadTexPltt
-.public GX_LoadTex
-.public GX_LoadTexPltt
-.public GeomSwapBuffers
-.public HandleSir0Translation
-.public LoadFileFromRom
-.public LoadObjPalette
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public OBJ_GRAPHICS_CONTROLS_PTR
 .public _02099714
 .public _0209971C
 .public _02099720
@@ -25,6 +9,22 @@
 .public _020AFC70
 .public _022A4F38
 .public _s32_div_f
+.public DirectoryFileMngr_OpenDirectoryFile
+.public DisplayAndSwitchAnimationControlCurrentFrame
+.public GeomSwapBuffers
+.public GX_BeginLoadTex
+.public GX_BeginLoadTexPltt
+.public GX_EndLoadTex
+.public GX_EndLoadTexPltt
+.public GX_LoadTex
+.public GX_LoadTexPltt
+.public HandleSir0Translation
+.public LoadFileFromRom
+.public LoadObjPalette
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public OBJ_GRAPHICS_CONTROLS_PTR
 .public strcat
 .public strcpy
 .public strncmp

asm/include/main_0201E3AC.inc

@@ -1,59 +1,4 @@
 #pragma once
-.public CopyStringFromId
-.public Debug_FatalError
-.public Debug_GetDebugFlag
-.public Debug_Print0
-.public DungeonGoesUp
-.public DungeonSwapIdxToId
-.public ENTITIES
-.public G3i_LookAt_
-.public G3i_OrthoW_
-.public GetAbilityString
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetActorMatchingStorageId
-.public GetCurrentBagCapacity
-.public GetDsFirmwareUserSettingsVeneer
-.public GetExecuteSpecialEpisodeType
-.public GetGameMode
-.public GetIqSkillStringId
-.public GetItemMoveId16
-.public GetItemNameFormatted
-.public GetMainTeamName
-.public GetMonsterGender
-.public GetMonsterGenderVeneer
-.public GetMoveActualAccuracy
-.public GetMoveBasePowerFromId
-.public GetMoveName
-.public GetNameString
-.public GetNbFloorsPlusOne
-.public GetResolvedPerformanceProgressFlag
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetTypeStringId
-.public LANGUAGE_INFO_DATA
-.public LoadScriptVariableValue
-.public LoadScriptVariableValueAtIndex
-.public LoadScriptVariableValueString
-.public LoadStringFile
-.public MOVE_ACCURACY_STARS_TABLE
-.public MOVE_POWER_STARS_TABLE
-.public MaybeGetFormattedItemName
-.public MemAlloc
-.public MemZero
-.public NewRender3dQuadrilateral
-.public NewRender3dRectangle
-.public NewRender3dTexture
-.public NewRender3dTiling
-.public PlanCopyTextureToTextureVram
-.public PlaySeByIdVolumeWrapper
-.public RENDER_3D
-.public RENDER_3D_FUNCTIONS_64
-.public Render3dProcessQueue
-.public Rgb8ToRgb5
-.public StringFromId
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
 .public _020997A4
 .public _020997B4
 .public _020997E4
@@ -197,9 +142,63 @@
 .public _022A5970
 .public _s32_div_f
 .public _u32_div_f
+.public CopyStringFromId
+.public Debug_FatalError
+.public Debug_GetDebugFlag
+.public Debug_Print0
+.public DungeonGoesUp
+.public DungeonSwapIdxToId
+.public ENTITIES
+.public G3i_LookAt_
+.public G3i_OrthoW_
+.public GetAbilityString
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetActorMatchingStorageId
+.public GetCurrentBagCapacity
+.public GetDsFirmwareUserSettingsVeneer
+.public GetExecuteSpecialEpisodeType
+.public GetGameMode
+.public GetIqSkillStringId
+.public GetItemMoveId16
+.public GetItemNameFormatted
+.public GetMainTeamName
+.public GetMonsterGender
+.public GetMonsterGenderVeneer
+.public GetMoveActualAccuracy
+.public GetMoveBasePowerFromId
+.public GetMoveName
+.public GetNameString
+.public GetNbFloorsPlusOne
+.public GetResolvedPerformanceProgressFlag
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetTypeStringId
+.public LANGUAGE_INFO_DATA
+.public LoadScriptVariableValue
+.public LoadScriptVariableValueAtIndex
+.public LoadScriptVariableValueString
+.public LoadStringFile
+.public MaybeGetFormattedItemName
+.public MemAlloc
+.public MemZero
+.public MOVE_ACCURACY_STARS_TABLE
+.public MOVE_POWER_STARS_TABLE
+.public NewRender3dQuadrilateral
+.public NewRender3dRectangle
+.public NewRender3dTexture
+.public NewRender3dTiling
+.public PlanCopyTextureToTextureVram
+.public PlaySeByIdVolumeWrapper
+.public Render3dProcessQueue
+.public RENDER_3D
+.public RENDER_3D_FUNCTIONS_64
+.public Rgb8ToRgb5
 .public strcat
 .public strcpy
+.public StringFromId
 .public strlen
+.public StrncpySimpleNoPadSafe
 .public strstr
 .public sub_01FF8F04
 .public sub_02006220
@@ -220,4 +219,5 @@
 .public sub_02065BF0
 .public sub_02065CD8
 .public sub_0206A90C
+.public TEAM_MEMBER_TABLE_PTR
 .public vsprintf

asm/include/main_0202598C.inc

@@ -1,22 +1,4 @@
 #pragma once
-.public DrawChar
-.public FileRom_HandleRead
-.public FileRom_HandleSeek
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
-.public GetColorCodePaletteOffset
-.public GetHeldButtons
-.public GetPressedButtons
-.public GetReleasedStylus
-.public GetWindow
-.public GetWindowRectangle
-.public HandleSir0Translation
-.public IsTouchScreenNotOff
-.public LoadFileFromRom
-.public RandInt
-.public TBL_TALK_GROUP_STRING_ID_START
-.public UnloadFile
-.public UpdateWindow
 .public _0209AB60
 .public _0209AB9C
 .public _0209ABF0
@@ -37,6 +19,21 @@
 .public _022A7A64
 .public _022A92B4_JP
 .public _022A92C4
+.public DrawChar
+.public FileRom_HandleRead
+.public FileRom_HandleSeek
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public GetColorCodePaletteOffset
+.public GetHeldButtons
+.public GetPressedButtons
+.public GetReleasedStylus
+.public GetWindow
+.public GetWindowRectangle
+.public HandleSir0Translation
+.public IsTouchScreenNotOff
+.public LoadFileFromRom
+.public RandInt
 .public sprintf
 .public sub_01FF905C
 .public sub_01FF9130_JP
@@ -54,3 +51,6 @@
 .public sub_02028324
 .public sub_020288DC
 .public sub_020288FC
+.public TBL_TALK_GROUP_STRING_ID_START
+.public UnloadFile
+.public UpdateWindow

asm/include/main_020261F4.inc

@@ -1,9 +1,9 @@
 #pragma once
+.public _020AFD04
 .public AnalyzeText
 .public DrawChar
 .public GetColorCodePaletteOffset
 .public PreprocessStringFromId
-.public _020AFD04
 .public sub_02020B4C
 .public sub_02020B60
 .public sub_02020B74

asm/include/main_0202676C.inc

@@ -1,15 +1,4 @@
 #pragma once
-.public DecompressAtHalf
-.public DelayWteFree
-.public GetWindow
-.public LoadAlert
-.public LoadCursors
-.public LoadFileFromRom
-.public LoadWteFromRom
-.public MemZero
-.public Memcpy32
-.public UnloadFile
-.public WINDOW_LIST
 .public _0209AC4C
 .public _0209AC50
 .public _0209AC54
@@ -38,7 +27,16 @@
 .public _022A88E4
 .public _022A92B4_JP
 .public _022A92B8_JP
+.public DecompressAtHalf
+.public DelayWteFree
+.public GetWindow
+.public LoadAlert
+.public LoadCursors
+.public LoadFileFromRom
+.public LoadWteFromRom
+.public Memcpy32
 .public memset
+.public MemZero
 .public sub_0200A124
 .public sub_0200A29C
 .public sub_0200B2C4
@@ -51,3 +49,5 @@
 .public sub_0202903C
 .public sub_02029A50
 .public sub_0202A124
+.public UnloadFile
+.public WINDOW_LIST

asm/include/main_020276C0.inc

@@ -1,12 +1,12 @@
 #pragma once
+.public _022A7A6C
+.public _022A7A74
+.public _022A7B1C
 .public GetPaletteBaseAddress__020278A8
 .public InitRender3dElement64
 .public InitWindowTrailer
 .public MemAlloc
-.public WINDOW_LIST
-.public _022A7A6C
-.public _022A7A74
-.public _022A7B1C
 .public sub_020278C4
 .public sub_02027B1C
 .public sub_02029A50
+.public WINDOW_LIST

asm/include/main_020278C4.inc

@@ -1,5 +1,5 @@
 #pragma once
-.public WINDOW_LIST
 .public _022A7A6C
 .public _022A8990
 .public _022A8991
+.public WINDOW_LIST

asm/include/main_02027B88.inc

@@ -1,10 +1,10 @@
 #pragma once
-.public InitWindowTrailer
-.public WINDOW_LIST
 .public _0209AC64
 .public _0209ACAC
 .public _020AFD4C
 .public _020AFD98
 .public _022A7A6C
 .public _022A7AE4
+.public InitWindowTrailer
 .public sub_0200B3FC
+.public WINDOW_LIST

asm/include/main_02028354.inc

@@ -1,17 +1,4 @@
 #pragma once
-.public CURSOR_16_ANIMATION_CONTROL
-.public CURSOR_16_SPRITE_ID
-.public CURSOR_ANIMATION_CONTROL
-.public GetPageItemYOffset
-.public GetPaletteBaseAddress__020278A8
-.public InitAnimationControlWithSet__0201C0B0
-.public LoadWanTableEntry
-.public Memcpy32
-.public PREV_MENU_ITEMS
-.public SetAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public WAN_TABLE
-.public WINDOW_LIST
 .public _0209AC64
 .public _0209AC78
 .public _0209ACA8
@@ -34,7 +21,18 @@
 .public _022A8992
 .public _022A9A5C
 .public _022AA35C
+.public CURSOR_16_ANIMATION_CONTROL
+.public CURSOR_16_SPRITE_ID
+.public CURSOR_ANIMATION_CONTROL
+.public GetPageItemYOffset
+.public GetPaletteBaseAddress__020278A8
+.public InitAnimationControlWithSet__0201C0B0
+.public LoadWanTableEntry
+.public Memcpy32
 .public memset
+.public PREV_MENU_ITEMS
+.public SetAnimationForAnimationControl
+.public SetSpriteIdForAnimationControl
 .public sub_0200302C
 .public sub_020030FC
 .public sub_0200A174
@@ -60,3 +58,5 @@
 .public sub_02033350
 .public sub_02033390
 .public sub_020333B4
+.public WAN_TABLE
+.public WINDOW_LIST

asm/include/main_02029EE8.inc

@@ -1,4 +1,7 @@
 #pragma once
+.public _0209AE20
+.public _020AFDA0
+.public _020AFDA8
 .public ALERT_ANIMATION_CONTROL
 .public ALERT_SPRITE_ID
 .public DisplayAndSwitchAnimationControlCurrentFrame
@@ -8,12 +11,9 @@
 .public MemAlloc
 .public SetAnimationForAnimationControl
 .public SetSpriteIdForAnimationControl
-.public WAN_TABLE
-.public _0209AE20
-.public _020AFDA0
-.public _020AFDA8
 .public sub_02025D90
 .public sub_020334A8
 .public sub_020335A8
 .public sub_02033BC0
 .public sub_02034360
+.public WAN_TABLE

asm/include/main_0202A3E4.inc

@@ -1,4 +1,7 @@
 #pragma once
+.public _0209AE34
+.public _0209AE44
+.public _020AFDAC
 .public CreateParentMenuInternal
 .public CreateTextBox
 .public FileClose
@@ -11,10 +14,7 @@
 .public GetStringFromFileVeneer
 .public MemAlloc
 .public MemFree
-.public UpdateWindow
-.public _0209AE34
-.public _0209AE44
-.public _020AFDAC
 .public sub_02026E3C
 .public sub_02027040
 .public sub_02027A08
+.public UpdateWindow

asm/include/main_0202A690.inc

@@ -9,10 +9,10 @@
 .public MemFree
 .public NewWindowScreenCheck
 .public PARENT_MENU_DEFAULT_WINDOW_PARAMS
-.public UpdateParentMenu
-.public UpdateWindow
 .public strcpy
 .public sub_020265A8
 .public sub_020287C4
 .public sub_02031A5C
 .public sub_02032984
+.public UpdateParentMenu
+.public UpdateWindow

asm/include/main_0202AB94.inc

@@ -13,8 +13,6 @@
 .public PlayWindowInputSound
 .public PreprocessStringFromId
 .public SIMPLE_MENU_DEFAULT_WINDOW_PARAMS
-.public UpdateSimpleMenu
-.public UpdateWindow
 .public sub_020263C8
 .public sub_020265A8
 .public sub_02027B1C
@@ -34,3 +32,5 @@
 .public sub_02032684
 .public sub_02032984
 .public sub_02033758
+.public UpdateSimpleMenu
+.public UpdateWindow

asm/include/main_0202B568.inc

@@ -8,7 +8,6 @@
 .public GetWindowContents
 .public IsMenuOptionActive
 .public PlayWindowInputSound
-.public UpdateWindow
 .public sub_020263C8
 .public sub_02027B1C
 .public sub_0202810C
@@ -24,3 +23,4 @@
 .public sub_0203250C
 .public sub_02032684
 .public sub_02033758
+.public UpdateWindow

asm/include/main_0202BA20.inc

@@ -6,7 +6,7 @@
 .public InitWindowInput
 .public MemAlloc
 .public NewWindowScreenCheck
-.public UpdateAdvancedMenu
 .public sub_020265A8
 .public sub_02031A5C
 .public sub_02032984
+.public UpdateAdvancedMenu

asm/include/main_0202BD10.inc

@@ -1,6 +1,6 @@
 #pragma once
-.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
 .public CalcMenuHeightDiv8__02031AA4
+.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
 .public GetNumItemsOnPage
 .public GetPageItemYOffset
 .public GetPageStart
@@ -12,8 +12,6 @@
 .public MemAlloc
 .public NewWindowScreenCheck
 .public PlayWindowInputSound
-.public UpdateCollectionMenu
-.public UpdateWindow
 .public sub_02026358
 .public sub_02026428
 .public sub_020265A8
@@ -32,3 +30,5 @@
 .public sub_0203250C
 .public sub_02032684
 .public sub_02033758
+.public UpdateCollectionMenu
+.public UpdateWindow

asm/include/main_0202C7E4.inc

@@ -6,7 +6,6 @@
 .public GetWindowContents
 .public IsMenuOptionActive
 .public PlayWindowInputSound
-.public UpdateWindow
 .public sub_02025D90
 .public sub_02026358
 .public sub_02026428
@@ -26,3 +25,4 @@
 .public sub_020324C4
 .public sub_02032684
 .public sub_02033758
+.public UpdateWindow

asm/include/main_0202D0EC.inc

@@ -1,8 +1,13 @@
 #pragma once
+.public _0209AEE0
+.public _0209AEEC
+.public _0209AEF4
+.public _0209AEFC
+.public _0209AF04
 .public CalcMenuHeightDiv8__02031AA4
 .public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
-.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
 .public DeleteWindow
+.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
 .public DrawTextInWindow
 .public GetCurrentPage
 .public GetNumItemsOnPage
@@ -25,13 +30,6 @@
 .public PreprocessString
 .public PreprocessStringFromId
 .public SCROLL_BOX_DEFAULT_WINDOW_PARAMS
-.public UpdateDialogueBox
-.public UpdateWindow
-.public _0209AEE0
-.public _0209AEEC
-.public _0209AEF4
-.public _0209AEFC
-.public _0209AF04
 .public strcpy
 .public sub_02006C8C
 .public sub_02021F44
@@ -66,3 +64,5 @@
 .public sub_020323F8
 .public sub_02032684
 .public sub_02033758
+.public UpdateDialogueBox
+.public UpdateWindow

asm/include/main_0202F190.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public _0209AF6C
 .public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS
 .public DeleteWindow
 .public GetPressedButtons
@@ -7,15 +8,12 @@
 .public IsValidPortrait
 .public LoadPortrait
 .public MemAlloc
-.public MemFree
 .public MemcpySimple
+.public MemFree
 .public NewWindowScreenCheck
 .public PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS
 .public PreprocessString
 .public PreprocessStringFromId
-.public TEXT_BOX_DEFAULT_WINDOW_PARAMS
-.public UpdateAreaNameBox
-.public _0209AF6C
 .public sub_0202613C
 .public sub_02026184
 .public sub_02026194
@@ -36,3 +34,5 @@
 .public sub_0202836C
 .public sub_02028770
 .public sub_02048240
+.public TEXT_BOX_DEFAULT_WINDOW_PARAMS
+.public UpdateAreaNameBox

asm/include/main_0202FD50.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public _s32_div_f
 .public ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS
 .public ALERT_BOX_DEFAULT_WINDOW_PARAMS
 .public AnalyzeText
@@ -14,9 +15,6 @@
 .public MemZero
 .public NewWindowScreenCheck
 .public PreprocessString
-.public UpdateAdvancedTextBox
-.public UpdateWindow
-.public _s32_div_f
 .public sub_01FF9128
 .public sub_01FF929C
 .public sub_02020B60
@@ -30,3 +28,5 @@
 .public sub_0202810C
 .public sub_0202812C
 .public sub_0202836C
+.public UpdateAdvancedTextBox
+.public UpdateWindow

asm/include/main_02030A90.inc

@@ -16,8 +16,6 @@
 .public NewWindowScreenCheck
 .public PlaySeVolumeWrapper
 .public PlayWindowInputSound
-.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS
-.public UpdateWindow
 .public sub_020063A0
 .public sub_020063F4
 .public sub_02006BFC
@@ -54,3 +52,5 @@
 .public sub_020336FC
 .public sub_02033758
 .public sub_0203C984
+.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS
+.public UpdateWindow

asm/include/main_02032960.inc

@@ -1,9 +1,9 @@
 #pragma once
+.public _s32_div_f
 .public InventoryMenuNext10Pages
 .public InventoryMenuPrevious10Pages
 .public InventoryMenuPreviousPage
 .public PlaySeVolumeWrapper
-.public _s32_div_f
 .public sub_02006BFC
 .public sub_02006C8C
 .public sub_02031908

asm/include/main_02033414.inc

@@ -1,19 +1,4 @@
 #pragma once
-.public AppendStandardStringToMission
-.public DrawTextInWindow
-.public GetCurrentPage
-.public GetTotalNumPages
-.public InventoryMenuNext10Pages
-.public InventoryMenuNextPage
-.public InventoryMenuPrevious10Pages
-.public InventoryMenuPreviousPage
-.public MENU_CONTROL_PTR
-.public MemAlloc
-.public NULL_OVERLAY_LOAD_ENTRY
-.public PlayWindowInputSound
-.public PreprocessString
-.public PreprocessStringFromId
-.public UnloadOverlay
 .public _0209AFC4
 .public _0209AFDC
 .public _0209AFE4
@@ -37,6 +22,20 @@
 .public _0209B074
 .public _0209B07C
 .public _0209B084
+.public AppendStandardStringToMission
+.public DrawTextInWindow
+.public GetCurrentPage
+.public GetTotalNumPages
+.public InventoryMenuNext10Pages
+.public InventoryMenuNextPage
+.public InventoryMenuPrevious10Pages
+.public InventoryMenuPreviousPage
+.public MemAlloc
+.public MENU_CONTROL_PTR
+.public NULL_OVERLAY_LOAD_ENTRY
+.public PlayWindowInputSound
+.public PreprocessString
+.public PreprocessStringFromId
 .public sub_02006C8C
 .public sub_02025D50
 .public sub_02026594
@@ -55,3 +54,4 @@
 .public sub_020333B4
 .public sub_020333D8
 .public sub_020469BC
+.public UnloadOverlay

asm/include/main_02034974.inc

@@ -1,4 +1,40 @@
 #pragma once
+.public _0209B09C
+.public _0209B0EC
+.public _0209B0FC
+.public _0209B10C
+.public _0209B11C
+.public _0209B134
+.public _0209B1B8
+.public _0209B1C8
+.public _0209B1D8
+.public _0209B1F0
+.public _0209B208
+.public _0209B218
+.public _0209B228
+.public _0209B244
+.public _0209B254
+.public _0209B264
+.public _0209B28C
+.public _0209B298
+.public _0209B2B8
+.public _0209B2C4
+.public _0209B2D0
+.public _0209B2DC
+.public _0209B2EC
+.public _0209B2FC
+.public _0209B31C
+.public _0209B32C
+.public _0209B32E
+.public _0209B3B4
+.public _0209B3B6
+.public _020AFDBC
+.public _020AFDD0
+.public _020AFDD8
+.public _020AFDE0
+.public _020AFDE8
+.public _020AFDF0
+.public _s32_div_f
 .public CheckDebugMenuField0x1A4
 .public CheckOptionsMenuField0x1A4
 .public CheckParentMenuField0x1A0
@@ -42,11 +78,11 @@
 .public IsSimpleMenuActive
 .public IsValidPortrait
 .public LoadOverlay
-.public MENU_CONTROL_PTR
 .public MemAlloc
+.public MemcpySimple
 .public MemFree
 .public MemZero
-.public MemcpySimple
+.public MENU_CONTROL_PTR
 .public NULL_OVERLAY_LOAD_ENTRY
 .public OverlayIsLoaded
 .public OverlayLoadEntriesEqual
@@ -59,44 +95,8 @@
 .public ShowPortraitInPortraitBox
 .public ShowStringIdInDialogueBox
 .public ShowStringInDialogueBox
-.public StrcpySimple
-.public _0209B09C
-.public _0209B0EC
-.public _0209B0FC
-.public _0209B10C
-.public _0209B11C
-.public _0209B134
-.public _0209B1B8
-.public _0209B1C8
-.public _0209B1D8
-.public _0209B1F0
-.public _0209B208
-.public _0209B218
-.public _0209B228
-.public _0209B244
-.public _0209B254
-.public _0209B264
-.public _0209B28C
-.public _0209B298
-.public _0209B2B8
-.public _0209B2C4
-.public _0209B2D0
-.public _0209B2DC
-.public _0209B2EC
-.public _0209B2FC
-.public _0209B31C
-.public _0209B32C
-.public _0209B32E
-.public _0209B3B4
-.public _0209B3B6
-.public _020AFDBC
-.public _020AFDD0
-.public _020AFDD8
-.public _020AFDE0
-.public _020AFDE8
-.public _020AFDF0
-.public _s32_div_f
 .public strcpy
+.public StrcpySimple
 .public sub_020063F4
 .public sub_02027180
 .public sub_020282F4

asm/include/main_02037570.inc

@@ -1,75 +1,4 @@
 #pragma once
-.public AppendStandardStringToMission
-.public CloseAdvancedMenu
-.public CloseAdvancedTextBox
-.public CloseDialogueBox
-.public CloseSimpleMenu
-.public CloseTeamSelectionMenu
-.public CloseTextBox
-.public CreateAdvancedMenu
-.public CreateAdvancedTextBox
-.public CreateDialogueBox
-.public CreateSimpleMenuFromStringIds
-.public CreateTeamSelectionMenu
-.public CreateTextBox
-.public Debug_Print0
-.public DrawTextInWindow
-.public FemaleToMaleForm
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetAdvancedMenuResult
-.public GetAppointedLeaderMemberIdx
-.public GetDexNumber
-.public GetDigitInputResult
-.public GetEvolutionPossibilities
-.public GetHero
-.public GetHeroMemberIdx
-.public GetItemMoveId16
-.public GetKeyM2NSwitch
-.public GetKeyboardStatus
-.public GetKeyboardStringResult
-.public GetMainCharacter1MemberIdx
-.public GetMainCharacter2MemberIdx
-.public GetMainCharacter3MemberIdx
-.public GetNameString
-.public GetPartner
-.public GetPartnerMemberIdx
-.public GetPressedButtons
-.public GetSimpleMenuResult__0202B870
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetType
-.public GetWindow
-.public IsAdvancedMenuActive2
-.public IsAdvancedTextBoxActive
-.public IsDialogueBoxActive
-.public IsMainCharacter
-.public IsMovesetValidInTimeDarkness
-.public IsShaymin
-.public IsSimpleMenuActive
-.public IsTeamSelectionMenuActive
-.public IsTeamSelectionMenuState3
-.public IsTextboxState3
-.public IsValidTeamMember
-.public KEYBOARD_STRING_IDS
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
-.public PlaySeVolumeWrapper
-.public PreprocessStringFromId
-.public ReturnScriptMenuResultZero
-.public SaveScriptVariableValueBytes
-.public SetAdvancedTextBoxField0x1C2
-.public SetAdvancedTextBoxState5
-.public SetMainTeamName
-.public ShowKeyboard
-.public ShowStringIdInDialogueBox
-.public StrcpySimple
-.public StrncpySimple
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public UpdateWindow
 .public _0209B288
 .public _0209B28C
 .public _0209B2C4
@@ -124,9 +53,78 @@
 .public _020B12A0_JP
 .public _022AADF8
 .public _s32_div_f
+.public AppendStandardStringToMission
+.public CloseAdvancedMenu
+.public CloseAdvancedTextBox
+.public CloseDialogueBox
+.public CloseSimpleMenu
+.public CloseTeamSelectionMenu
+.public CloseTextBox
+.public CreateAdvancedMenu
+.public CreateAdvancedTextBox
+.public CreateDialogueBox
+.public CreateSimpleMenuFromStringIds
+.public CreateTeamSelectionMenu
+.public CreateTextBox
+.public Debug_Print0
+.public DrawTextInWindow
+.public FemaleToMaleForm
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetAdvancedMenuResult
+.public GetAppointedLeaderMemberIdx
+.public GetDexNumber
+.public GetDigitInputResult
+.public GetEvolutionPossibilities
+.public GetHero
+.public GetHeroMemberIdx
+.public GetItemMoveId16
+.public GetKeyboardStatus
+.public GetKeyboardStringResult
+.public GetKeyM2NSwitch
+.public GetMainCharacter1MemberIdx
+.public GetMainCharacter2MemberIdx
+.public GetMainCharacter3MemberIdx
+.public GetNameString
+.public GetPartner
+.public GetPartnerMemberIdx
+.public GetPressedButtons
+.public GetSimpleMenuResult__0202B870
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetType
+.public GetWindow
+.public IsAdvancedMenuActive2
+.public IsAdvancedTextBoxActive
+.public IsDialogueBoxActive
+.public IsMainCharacter
+.public IsMovesetValidInTimeDarkness
+.public IsShaymin
+.public IsSimpleMenuActive
+.public IsTeamSelectionMenuActive
+.public IsTeamSelectionMenuState3
+.public IsTextboxState3
+.public IsValidTeamMember
+.public KEYBOARD_STRING_IDS
+.public MemAlloc
+.public MemcpySimple
+.public MemFree
+.public MemZero
 .public ov11_0230D71C
+.public PlaySeVolumeWrapper
+.public PreprocessStringFromId
+.public ReturnScriptMenuResultZero
+.public SaveScriptVariableValueBytes
+.public SetAdvancedTextBoxField0x1C2
+.public SetAdvancedTextBoxState5
+.public SetMainTeamName
+.public ShowKeyboard
+.public ShowStringIdInDialogueBox
 .public sprintf
 .public strcpy
+.public StrcpySimple
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
 .public sub_020063F4
 .public sub_0202065C
 .public sub_0202372C
@@ -170,4 +168,6 @@
 .public sub_02056F60
 .public sub_020584F8
 .public sub_02059B08
+.public TEAM_MEMBER_TABLE_PTR
+.public UpdateWindow
 .public vsprintf

asm/include/main_0203C774.inc

@@ -1,11 +1,11 @@
 #pragma once
-.public MemAlloc
-.public StringFromId
-.public UpdateWindow
 .public _0209C60C
 .public _020AFE5C
 .public _020AFE70
+.public MemAlloc
+.public StringFromId
 .public sub_020262E0
 .public sub_02027B1C
 .public sub_0203C984
 .public sub_0203C9A0
+.public UpdateWindow

asm/include/main_0203CAF0.inc

@@ -1,4 +1,53 @@
 #pragma once
+.public _0209C7CC
+.public _0209C7D4
+.public _0209C7E4
+.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 _0209E912
+.public _020AFE70
+.public _020AFE78
+.public _020AFE7C
+.public _020AFE8C
+.public _020AFE90
+.public _020AFE98
+.public _022AADFC
+.public _022AAE00
+.public _022AAE2A
+.public _022AAE2E
+.public _022AAE58
+.public _s32_div_f
 .public AddItemToStorage
 .public AddMoneyCarried
 .public AppendStandardStringToMission
@@ -96,13 +145,22 @@
 .public IsTouchScreenNotOff
 .public LAST_NEW_MOVE
 .public LoadScriptVariableValue
-.public MISSION_REWARD_STRUCT_MAIN_PTR
 .public MaybeGetColoredFormattedItemName
 .public MaybeGetUncoloredFormattedItemName
 .public MemAlloc
+.public memcpy
+.public MemcpySimple
 .public MemFree
 .public MemZero
-.public MemcpySimple
+.public MISSION_REWARD_STRUCT_MAIN_PTR
+.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 PlayAdvancedTextBoxInputSound
 .public PlaySeByIdVolumeWrapper
 .public PlaySeVolumeWrapper
@@ -111,7 +169,6 @@
 .public RandIntSafe
 .public RemoveEmptyItemsInBag
 .public ResumeAdvancedMenu
-.public STATUSES_FULL_DESCRIPTION_STRING_IDS
 .public SetAdvancedTextBoxField0x1C2
 .public SetAdvancedTextBoxState5
 .public SetCollectionMenuField0x1BC
@@ -126,73 +183,13 @@
 .public SetUnkAdvancedTextBoxWindowFn
 .public ShowKeyboard
 .public ShowPortraitInPortraitBox
+.public STATUSES_FULL_DESCRIPTION_STRING_IDS
+.public strcat
+.public strcpy
 .public StrcpySimple
 .public StringFromId
 .public StrncpySimple
 .public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public UNK_STORAGE_STRUCT_0XC
-.public UpdateWindow
-.public _0209C7CC
-.public _0209C7D4
-.public _0209C7E4
-.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 _0209E912
-.public _020AFE70
-.public _020AFE78
-.public _020AFE7C
-.public _020AFE8C
-.public _020AFE90
-.public _020AFE98
-.public _022AADFC
-.public _022AAE00
-.public _022AAE2A
-.public _022AAE2E
-.public _022AAE58
-.public _s32_div_f
-.public memcpy
-.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 strcat
-.public strcpy
 .public sub_02001808
 .public sub_020063F4
 .public sub_02006498
@@ -259,4 +256,7 @@
 .public sub_0205B028
 .public sub_0205B0A0
 .public sub_0205B0B8
+.public TEAM_MEMBER_TABLE_PTR
+.public UNK_STORAGE_STRUCT_0XC
+.public UpdateWindow
 .public vsprintf

asm/include/main_02042BE0.inc

@@ -1,4 +1,6 @@
 #pragma once
+.public _0209CA48
+.public _0209CA58
 .public BAG_ITEMS_PTR_MIRROR
 .public CountSelectedStorageItems
 .public CreateCollectionMenu
@@ -10,10 +12,6 @@
 .public PlaySeVolumeWrapper
 .public SetCollectionMenuVoidFn
 .public SortItemsInBag
-.public UNK_STORAGE_STRUCT_0X14
-.public UNK_STORAGE_STRUCT_0XC
-.public _0209CA48
-.public _0209CA58
 .public sub_0202C654
 .public sub_0202D068
 .public sub_0202D16C
@@ -28,3 +26,5 @@
 .public sub_0204426C
 .public sub_02044308
 .public sub_0204440C
+.public UNK_STORAGE_STRUCT_0X14
+.public UNK_STORAGE_STRUCT_0XC

asm/include/main_020432B4.inc

@@ -1,8 +1,8 @@
 #pragma once
+.public _0209CA3C
 .public ConvertStorageItemAtIdxToItem
 .public CountNbOfItemsInStorage
 .public CountNbOfValidItemsInStorage
 .public CountNbOfValidItemsInTimeDarknessInStorage
 .public MaybeGetColoredFormattedItemName
 .public UNK_STORAGE_STRUCT_0X14
-.public _0209CA3C

asm/include/main_0204357C.inc

@@ -1,96 +1,4 @@
 #pragma once
-.public AppendStandardStringToMission
-.public Arm9LoadUnkFieldNa0x2029EC8
-.public BAG_ITEMS_PTR_MIRROR
-.public ClearStorageSelectedItemTable
-.public CloseAdvancedMenu
-.public CloseAdvancedTextBox
-.public CloseAdvancedTextBox2
-.public CloseDialogueBox
-.public CloseParentMenu
-.public CloseScrollBox
-.public CloseSimpleMenu
-.public CloseTextBox
-.public CloseTextBox2
-.public CopyMenuControlWindowExtraInfo
-.public CountNbOfItemsInStorage
-.public CountSelectedStorageItems
-.public CreateAdvancedMenu
-.public CreateAdvancedTextBox
-.public CreateAdvancedTextBoxWithArg
-.public CreateDialogueBox
-.public CreateParentMenu
-.public CreateParentMenuFromStringIds
-.public CreateScrollBoxSingle
-.public CreateSimpleMenu
-.public CreateSimpleMenuFromStringIds
-.public CreateTextBox
-.public CreateTextBoxWithArg
-.public DUNGEON_PTR
-.public DrawTextInWindow
-.public DrawTileGrid
-.public FreeUnkStorageStruct0x18c0
-.public GetActiveTeamMember
-.public GetAdvancedMenuCurrentOption
-.public GetAdvancedMenuResult
-.public GetAdvancedTextBoxFlags2
-.public GetCurrentBagCapacity
-.public GetItemAtIdx
-.public GetItemCategoryVeneer
-.public GetMoneyCarried
-.public GetMonsterOrTrapName
-.public GetNameRaw
-.public GetNbItemsInBag
-.public GetPressedButtons
-.public GetRecoloredNameOfTeamMemberAtIdx
-.public GetReleasedStylus
-.public GetSimpleMenuResult__0202AEA4
-.public GetSimpleMenuResult__0202B870
-.public GetStringFromFileVeneer
-.public GetType
-.public GetWindowIdSelectedItemOnPage
-.public InitMenu
-.public InitMenuWithWindowExtraInfo
-.public InitPreprocessorArgs
-.public InitUnkStorageStruct0x18c0
-.public IsAdvancedMenuActive2
-.public IsAdvancedTextBoxActive
-.public IsDialogueBoxActive
-.public IsExclusiveItemIdForMonster
-.public IsExperienceLocked
-.public IsItemInTimeDarkness
-.public IsItemValidVeneer
-.public IsParentMenuActive
-.public IsScrollBoxActive
-.public IsSimpleMenuActive
-.public IsTextboxState3
-.public IsTouchScreenNotOff
-.public IsTreasureBox
-.public MaybeGetColoredFormattedItemName
-.public MaybeGetFormattedItemName
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public PlayBgmByIdVeneer
-.public PlaySeVolumeWrapper
-.public PreprocessString
-.public PreprocessStringFromId
-.public ReadStringFromDialogueBox
-.public SetAdvancedTextBoxField0x1C2
-.public SetAdvancedTextBoxPartialMenu
-.public ShowDialogueBox
-.public ShowStringIdInDialogueBox
-.public ShowStringInDialogueBox
-.public SortItemsInStorage
-.public StringFromId
-.public TEAM_MEMBER_TABLE_PTR
-.public TryPointCameraToMonster
-.public UNK_STORAGE_STRUCT_0X14
-.public UNK_STORAGE_STRUCT_0X410_PTR
-.public UNK_STORAGE_STRUCT_0X8_PTR_1
-.public UNK_STORAGE_STRUCT_0X8_PTR_2
-.public UNK_STORAGE_WINDOW_STRUCT_0XC_PTR
-.public UpdateWindow
 .public _0209CA68
 .public _0209CA78
 .public _0209CA88
@@ -135,10 +43,94 @@
 .public _022AAE64
 .public _022AAE68
 .public _s32_div_f
+.public AppendStandardStringToMission
+.public Arm9LoadUnkFieldNa0x2029EC8
+.public BAG_ITEMS_PTR_MIRROR
+.public ClearStorageSelectedItemTable
+.public CloseAdvancedMenu
+.public CloseAdvancedTextBox
+.public CloseAdvancedTextBox2
+.public CloseDialogueBox
+.public CloseParentMenu
+.public CloseScrollBox
+.public CloseSimpleMenu
+.public CloseTextBox
+.public CloseTextBox2
+.public CopyMenuControlWindowExtraInfo
+.public CountNbOfItemsInStorage
+.public CountSelectedStorageItems
+.public CreateAdvancedMenu
+.public CreateAdvancedTextBox
+.public CreateAdvancedTextBoxWithArg
+.public CreateDialogueBox
+.public CreateParentMenu
+.public CreateParentMenuFromStringIds
+.public CreateScrollBoxSingle
+.public CreateSimpleMenu
+.public CreateSimpleMenuFromStringIds
+.public CreateTextBox
+.public CreateTextBoxWithArg
+.public DrawTextInWindow
+.public DrawTileGrid
+.public DUNGEON_PTR
+.public FreeUnkStorageStruct0x18c0
+.public GetActiveTeamMember
+.public GetAdvancedMenuCurrentOption
+.public GetAdvancedMenuResult
+.public GetAdvancedTextBoxFlags2
+.public GetCurrentBagCapacity
+.public GetItemAtIdx
+.public GetItemCategoryVeneer
+.public GetMoneyCarried
+.public GetMonsterOrTrapName
+.public GetNameRaw
+.public GetNbItemsInBag
+.public GetPressedButtons
+.public GetRecoloredNameOfTeamMemberAtIdx
+.public GetReleasedStylus
+.public GetSimpleMenuResult__0202AEA4
+.public GetSimpleMenuResult__0202B870
+.public GetStringFromFileVeneer
+.public GetType
+.public GetWindowIdSelectedItemOnPage
+.public InitMenu
+.public InitMenuWithWindowExtraInfo
+.public InitPreprocessorArgs
+.public InitUnkStorageStruct0x18c0
+.public IsAdvancedMenuActive2
+.public IsAdvancedTextBoxActive
+.public IsDialogueBoxActive
+.public IsExclusiveItemIdForMonster
+.public IsExperienceLocked
+.public IsItemInTimeDarkness
+.public IsItemValidVeneer
+.public IsParentMenuActive
+.public IsScrollBoxActive
+.public IsSimpleMenuActive
+.public IsTextboxState3
+.public IsTouchScreenNotOff
+.public IsTreasureBox
+.public MaybeGetColoredFormattedItemName
+.public MaybeGetFormattedItemName
+.public MemAlloc
+.public MemFree
+.public MemZero
 .public ov29_022EA62C
 .public ov29_023002F0
 .public ov29_02347100
+.public PlayBgmByIdVeneer
+.public PlaySeVolumeWrapper
+.public PreprocessString
+.public PreprocessStringFromId
+.public ReadStringFromDialogueBox
+.public SetAdvancedTextBoxField0x1C2
+.public SetAdvancedTextBoxPartialMenu
+.public ShowDialogueBox
+.public ShowStringIdInDialogueBox
+.public ShowStringInDialogueBox
+.public SortItemsInStorage
 .public strcpy
+.public StringFromId
 .public strlen
 .public strncmp
 .public sub_020063F4
@@ -186,3 +178,11 @@
 .public sub_02054804
 .public sub_02056228
 .public sub_02058460
+.public TEAM_MEMBER_TABLE_PTR
+.public TryPointCameraToMonster
+.public UNK_STORAGE_STRUCT_0X14
+.public UNK_STORAGE_STRUCT_0X410_PTR
+.public UNK_STORAGE_STRUCT_0X8_PTR_1
+.public UNK_STORAGE_STRUCT_0X8_PTR_2
+.public UNK_STORAGE_WINDOW_STRUCT_0XC_PTR
+.public UpdateWindow

asm/include/main_020484C0.inc

@@ -1,4 +1,9 @@
 #pragma once
+.public _020A2808
+.public _020A2830
+.public _020A2844
+.public _020A2880
+.public _020A2894
 .public AssignSpecialEpisodePc
 .public EventFlagBackup
 .public EventFlagResume
@@ -15,11 +20,6 @@
 .public SetBothScreensWindowsColor
 .public SetSpecialEpisodeOpenOld
 .public SetTeamSetupHeroAndPartnerOnly
-.public _020A2808
-.public _020A2830
-.public _020A2844
-.public _020A2880
-.public _020A2894
 .public sub_0200CAD4
 .public sub_0200CAE4
 .public sub_02048B48

asm/include/main_02048764.inc

@@ -1,4 +1,10 @@
 #pragma once
+.public _020A281C
+.public _020A2858
+.public _020A286C
+.public _020A28A8
+.public _020AFF00
+.public _020AFF14
 .public ApplyLevelUpBoostsToGroundMonster
 .public DEFAULT_HERO_ID
 .public EnableAllLearnableIqSkills
@@ -17,18 +23,12 @@
 .public NOTIFY_NOTE
 .public PARTNER_TALK_KIND_TABLE
 .public Rand32Bit
-.public SPECIAL_EPISODE_MAIN_CHARACTERS
 .public SaveScriptVariableValue
 .public SaveScriptVariableValueBytes
 .public SetBothScreensWindowsColor
 .public SetTeamSetupHeroAndPartnerOnly
+.public SPECIAL_EPISODE_MAIN_CHARACTERS
 .public StrncpyName
-.public _020A281C
-.public _020A2858
-.public _020A286C
-.public _020A28A8
-.public _020AFF00
-.public _020AFF14
 .public sub_02048C0C
 .public sub_02048C3C
 .public sub_02048C4C

asm/include/main_02048B74.inc

@@ -1,5 +1,5 @@
 #pragma once
-.public Debug_Print0
 .public _0209CD4C
 .public _020AFF38
 .public _022AAE70
+.public Debug_Print0

asm/include/main_02048C5C.inc

@@ -1,5 +1,5 @@
 #pragma once
-.public MemsetSimple
-.public ReadStringSave
 .public _022AAE74
 .public _022AAE78
+.public MemsetSimple
+.public ReadStringSave

asm/include/main_02048CF8.inc

@@ -1,14 +1,43 @@
 #pragma once
+.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 _020AFF40
+.public _020AFF4C
+.public _020AFF54
+.public _020AFF5C
+.public _020AFF64
+.public _020AFF68
+.public _020AFF6C
+.public _022AAE74
+.public _022AAEA4
+.public _022AAEA8
+.public _022AAEAC
+.public _022AB09C
+.public _f2d
+.public _fsub
 .public BitstreamDebug
-.public CARD_Init
-.public CardBackupError
-.public CardPullOutWithStatus
 .public Card_GetBackupTotalSize
 .public Card_GetCurrentBackupType
 .public Card_IdentifyBackup
+.public CARD_Init
 .public Card_LockBackup
 .public Card_UnlockBackup
+.public CardBackupError
 .public Cardi_RequestStreamCommand
+.public CardPullOutWithStatus
 .public CheckStringSave
 .public CloseDialogueBox
 .public CopyBitsFrom
@@ -46,37 +75,6 @@
 .public SetNotifyNote
 .public SetRngSeed
 .public ShowStringIdInDialogueBox
-.public WriteItemsToSave
-.public WriteMonsterInfoToSave
-.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 _020AFF40
-.public _020AFF4C
-.public _020AFF54
-.public _020AFF5C
-.public _020AFF64
-.public _020AFF68
-.public _020AFF6C
-.public _022AAE74
-.public _022AAEA4
-.public _022AAEA8
-.public _022AAEAC
-.public _022AB09C
-.public _f2d
-.public _fsub
 .public sub_02002580
 .public sub_020027F8
 .public sub_02003B94
@@ -104,3 +102,5 @@
 .public sub_0205BFB0
 .public sub_0205FAB0
 .public sub_0205FC20
+.public WriteItemsToSave
+.public WriteMonsterInfoToSave

asm/include/main_0204D368.inc

@@ -1,4 +1,6 @@
 #pragma once
+.public _0209E010
+.public _0209E011
 .public ARM9_UNKNOWN_TABLE__NA_209E164
 .public BitstreamDebug
 .public CopyBitsFrom
@@ -10,10 +12,10 @@
 .public FileRom_InitDataTransfer
 .public FileRom_StopDataTransfer
 .public FileRom_Veneer_FileInit
-.public GLOBAL_PROGRESS_PTR
 .public GetDexNumber
 .public GetDungeonTipShown
 .public GetMonsterFlag1
+.public GLOBAL_PROGRESS_PTR
 .public HasMonsterBeenAttackedInDungeons
 .public InitBitstreamForRead
 .public InitBitstreamForWrite
@@ -25,5 +27,3 @@
 .public SetMonsterFlag1
 .public SetMonsterFlag2
 .public VERSION_EXCLUSIVE_MONSTERS
-.public _0209E010
-.public _0209E011

asm/include/main_0204F0A0.inc

@@ -1,4 +1,9 @@
 #pragma once
+.public _0209E3A1
+.public _0209E3A2
+.public _0209E3A3
+.public _022AB4F8
+.public _022AB5AC
 .public DUNGEON_DATA_LIST
 .public DungeonSwapIdToIdx
 .public DungeonSwapIdxToId
@@ -24,11 +29,6 @@
 .public OUTLAW_MINION_LEVEL_TABLE
 .public SECONDARY_TERRAIN_TYPES
 .public StrncpyName
-.public TEAM_MEMBER_TABLE_PTR
-.public _0209E3A1
-.public _0209E3A2
-.public _0209E3A3
-.public _022AB4F8
-.public _022AB5AC
 .public sub_0204CEE0
 .public sub_0205EE40
+.public TEAM_MEMBER_TABLE_PTR

asm/include/main_020504BC.inc

@@ -1,8 +1,10 @@
 #pragma once
+.public _0209E6BD
+.public _022AB924
 .public ADVENTURE_LOG_PTR
 .public ARM9_UNKNOWN_DATA__NA_209E6BC
-.public CONVERSION2_TYPE_TABLE
 .public ComputeSpecialCounters
+.public CONVERSION2_TYPE_TABLE
 .public Copy16BitsFrom
 .public Copy16BitsTo
 .public CopyNStringFromId
@@ -14,5 +16,3 @@
 .public StrncpySimpleNoPad
 .public StrncpySimpleNoPadSafe
 .public TEAM_NAME
-.public _0209E6BD
-.public _022AB924

asm/include/main_02054E4C.inc

@@ -1,10 +1,10 @@
 #pragma once
+.public _020A333C
+.public _020A3340
+.public _020B0A4C
+.public _022B5788
 .public GetGameMode
 .public MemZero
 .public SprintfStatic__02054A60
 .public StrncpySimpleNoPadSafe
 .public TEAM_MEMBER_TABLE_PTR
-.public _020A333C
-.public _020A3340
-.public _020B0A4C
-.public _022B5788

asm/include/main_02055894.inc

@@ -1,4 +1,6 @@
 #pragma once
+.public _020A3350
+.public _022B5788
 .public Debug_Print0
 .public EnableAllLearnableIqSkills
 .public GetBaseDefensiveStat
@@ -15,12 +17,10 @@
 .public StrcmpMonsterName
 .public StrncpyName
 .public StrncpySimple
-.public TEAM_MEMBER_TABLE_PTR
-.public TryAddMonsterToActiveTeam
-.public _020A3350
-.public _022B5788
 .public sub_02052CF4
 .public sub_02053D1C
 .public sub_02053F10
 .public sub_020564B0
 .public sub_02056554
+.public TEAM_MEMBER_TABLE_PTR
+.public TryAddMonsterToActiveTeam

asm/include/main_02056960.inc

@@ -6,10 +6,10 @@
 .public GetMainCharacter3MemberIdx
 .public GetPartnerMemberIdx
 .public IsMainCharacter
-.public TEAM_MEMBER_TABLE_PTR
-.public TryAddMonsterToActiveTeam
 .public sub_02056410
 .public sub_020564B0
 .public sub_02056554
 .public sub_02057464
 .public sub_02058138
+.public TEAM_MEMBER_TABLE_PTR
+.public TryAddMonsterToActiveTeam

asm/include/main_02056EB8.inc

@@ -1,4 +1,15 @@
 #pragma once
+.public _020A336C
+.public _020A3398
+.public _020A33B8
+.public _020A33D4
+.public _020A340C
+.public _020A343C
+.public _020A344C
+.public _020A3450
+.public _020A3468
+.public _020AFC28
+.public _022B578C
 .public AddMoneyCarried
 .public AddSimpleObjToOam
 .public CheckTeamMemberIdx
@@ -37,20 +48,6 @@
 .public SetHolderForItemInBag
 .public ShuffleHiddenPower
 .public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public TryAddMonsterToActiveTeam
-.public UnloadFile
-.public _020A336C
-.public _020A3398
-.public _020A33B8
-.public _020A33D4
-.public _020A340C
-.public _020A343C
-.public _020A344C
-.public _020A3450
-.public _020A3468
-.public _020AFC28
-.public _022B578C
 .public sub_0200FA0C
 .public sub_0204E584
 .public sub_02052E2C
@@ -72,3 +69,6 @@
 .public sub_020565F4
 .public sub_020566C4
 .public sub_020568DC
+.public TEAM_MEMBER_TABLE_PTR
+.public TryAddMonsterToActiveTeam
+.public UnloadFile

asm/include/main_0205EDA4.inc

@@ -1,10 +1,23 @@
 #pragma once
+.public _020A3CA0
+.public _020A3CBC
+.public _020A462C
+.public _020A4644
+.public _020A4654
+.public _020A4664
+.public _020A4674
+.public _020A4678
+.public _020A4688
+.public _020A4698
+.public _020A46A8
+.public _020B0AFC
+.public _s32_div_f
 .public AlreadyHasSimilarMission
 .public AppendStandardStringToMission
 .public BitstreamDebug
-.public CHALLENGE_NORMAL_FIXED_ROOM_IDS
 .public CanDungeonBeUsedForMission
 .public CanMonsterBeUsedForMissionWrapper
+.public CHALLENGE_NORMAL_FIXED_ROOM_IDS
 .public CheckDungeonMissionUnlockConditions
 .public Copy16BitsFrom
 .public Copy16BitsTo
@@ -42,6 +55,11 @@
 .public IsMissionTypeSpecialEpisode
 .public IsSpecialEpisodeBeaten
 .public LoadFileFromRom
+.public MaybeGetFormattedItemName
+.public MemAlloc
+.public MemcpySimple
+.public MemFree
+.public MemZero
 .public MISSION_BANNED_MONSTERS
 .public MISSION_DELIVER_LIST_PTR
 .public MISSION_DUNGEON_UNLOCK_TABLE
@@ -50,43 +68,22 @@
 .public MISSION_RANK_POINTS
 .public MISSION_STRING_IDS
 .public MISSION_VALIDATION_FUNCTION_LIST
-.public MaybeGetFormattedItemName
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
 .public MissionToWonderMailPassword
 .public OUTLAW_HIDEOUT_FIXED_ROOM_IDS
 .public PreprocessString
 .public PreprocessStringFromId
-.public RANK_STRING_PTR_TABLE
-.public REMOTE_STRING_PTR_TABLE
-.public RESCUE_BIN_UNPACK
 .public Rand16Bit
 .public RandInt
 .public RandIntSafe
+.public RANK_STRING_PTR_TABLE
+.public REMOTE_STRING_PTR_TABLE
 .public RemoveFirstUnequippedItemOfType
-.public StringFromId
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public TREASURE_MEMO_FIXED_ROOM_IDS
-.public WriteMissionMtState
-.public _020A3CA0
-.public _020A3CBC
-.public _020A462C
-.public _020A4644
-.public _020A4654
-.public _020A4664
-.public _020A4674
-.public _020A4678
-.public _020A4688
-.public _020A4698
-.public _020A46A8
-.public _020B0AFC
-.public _s32_div_f
+.public RESCUE_BIN_UNPACK
 .public strcat
 .public strcpy
+.public StringFromId
 .public strncat
+.public StrncpySimpleNoPadSafe
 .public sub_020022C4
 .public sub_020022D0
 .public sub_020251F0
@@ -97,4 +94,7 @@
 .public sub_0205E3F8
 .public sub_0205E48C
 .public sub_0205E50C
+.public TEAM_MEMBER_TABLE_PTR
+.public TREASURE_MEMO_FIXED_ROOM_IDS
 .public vsprintf
+.public WriteMissionMtState

asm/include/main_02062A68.inc

@@ -1,8 +1,14 @@
 #pragma once
+.public _020A3CAD
+.public _020A46B0
+.public _020A46D0
+.public _020AFC70
+.public _020B0B04
+.public _s32_div_f
 .public CAFE_MISSION_REWARD_TYPE_WEIGHTS
 .public CopyColorToPaletteDataRgba
-.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
 .public Debug_Print0
+.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DungeonSwapIdToIdx
 .public EnqueueRender3dTiling
@@ -21,37 +27,30 @@
 .public GetType
 .public HandleSir0TranslationVeneer
 .public HasMonsterBeenAttackedInDungeons
-.public ITEM_DELIVERY_TABLE
 .public IsForbiddenFloor
 .public IsItemAvailableInDungeonGroup
 .public IsItemInTimeDarkness
 .public IsMonsterMissionAllowed
 .public IsMonsterValid
 .public IsStoryBeforePoint
+.public ITEM_DELIVERY_TABLE
+.public MarkPaletteDataAsNeedingUpdate
+.public MemAlloc
+.public MemcpySimple
+.public MemFree
+.public MemZero
 .public MISSION_BANNED_STORY_MONSTERS
 .public MISSION_DUNGEON_UNLOCK_TABLE
 .public MISSION_RANK_POINTS
-.public MarkPaletteDataAsNeedingUpdate
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
 .public MultiplyByFixedPoint
 .public NO_SEND_ITEM_TABLE
 .public OUTLAW_MISSION_REWARD_TYPE_WEIGHTS
-.public RANK_STRING_PTR_TABLE
-.public RESCUE_BIN_UNPACK
 .public RandInt
 .public RandIntSafe
 .public RandRangeSafe
+.public RANK_STRING_PTR_TABLE
+.public RESCUE_BIN_UNPACK
 .public RetrieveFromItemList2
-.public UnloadFile
-.public _020A3CAD
-.public _020A46B0
-.public _020A46D0
-.public _020AFC70
-.public _020B0B04
-.public _s32_div_f
 .public sub_02001AB0
 .public sub_020090A0
 .public sub_020090C0
@@ -71,3 +70,4 @@
 .public sub_0205E090
 .public sub_0206220C
 .public sub_02064FE4
+.public UnloadFile

asm/include/main_02065998.inc

@@ -8,6 +8,6 @@
 .public GetPartnerMemberIdx
 .public GetRecruitMentryIdBySpecies
 .public GetUnitNpcIds
-.public OverlayIsLoaded
 .public ov11_022E96E4
+.public OverlayIsLoaded
 .public sub_02065050

asm/include/main_02065C84.inc

@@ -1,4 +1,6 @@
 #pragma once
+.public _020A9208
+.public _022B7320
 .public BulkItemToItem
 .public CopyFrameTypeOption
 .public Debug_Print0
@@ -20,6 +22,8 @@
 .public LoadWazaP
 .public MainGame
 .public NoteLoadBase
+.public ov00_022BE0C8
+.public ov11_022E82CC
 .public OverlayIsLoaded
 .public ReadSaveHeader
 .public SetAdventureLogStructLocation
@@ -27,13 +31,6 @@
 .public SetGameMode
 .public SetScenarioProgressScriptVar
 .public SetSpecialEpisodeType
-.public UnloadOverlay
-.public WAN_TABLE
-.public ZeroInitScriptVariable
-.public _020A9208
-.public _022B7320
-.public ov00_022BE0C8
-.public ov11_022E82CC
 .public sub_020024A0
 .public sub_0200CA8C
 .public sub_0201D7A8
@@ -59,3 +56,6 @@
 .public sub_02052C3C
 .public sub_0205B44C
 .public sub_0205C73C
+.public UnloadOverlay
+.public WAN_TABLE
+.public ZeroInitScriptVariable

asm/include/main_020664B8.inc

@@ -1,4 +1,41 @@
 #pragma once
+.public _020A9268
+.public _020A9278
+.public _020A9288
+.public _020A9298
+.public _020A92A8
+.public _020A92EC
+.public _020A9304
+.public _020A931C
+.public _020A9334
+.public _020A9364
+.public _020A937C
+.public _020A9394
+.public _020A93B4
+.public _020B0A54
+.public _020B0B24
+.public _020B0B2C
+.public _020B0B2D
+.public _020B0B2E
+.public _020B0B2F
+.public _020B0B30
+.public _020B0B31
+.public _020B0B32
+.public _020B0B33
+.public _020B0B34
+.public _020B0B35
+.public _020B0B36
+.public _020B0B37
+.public _020B0B38
+.public _020B0B39
+.public _020B0B3A
+.public _020B0B3B
+.public _020B0B3C
+.public _020B0B3D
+.public _020B0B3E
+.public _020B0B3F
+.public _020B0B44
+.public _020B0B48
 .public AddMissionToJobList
 .public AlreadyHaveMission
 .public CanDungeonBeUsedForMission
@@ -53,51 +90,6 @@
 .public MemFree
 .public MemZero
 .public NoteSaveBase
-.public PlaySeVolumeWrapper
-.public PreprocessStringFromId
-.public SetCollectionMenuField0x1B2
-.public SetQuestionMarks
-.public SetSpecialEpisodeOpen
-.public ShowPortraitInPortraitBox
-.public StrncpySimpleNoPadSafe
-.public UpdateWindow
-.public _020A9268
-.public _020A9278
-.public _020A9288
-.public _020A9298
-.public _020A92A8
-.public _020A92EC
-.public _020A9304
-.public _020A931C
-.public _020A9334
-.public _020A9364
-.public _020A937C
-.public _020A9394
-.public _020A93B4
-.public _020B0A54
-.public _020B0B24
-.public _020B0B2C
-.public _020B0B2D
-.public _020B0B2E
-.public _020B0B2F
-.public _020B0B30
-.public _020B0B31
-.public _020B0B32
-.public _020B0B33
-.public _020B0B34
-.public _020B0B35
-.public _020B0B36
-.public _020B0B37
-.public _020B0B38
-.public _020B0B39
-.public _020B0B3A
-.public _020B0B3B
-.public _020B0B3C
-.public _020B0B3D
-.public _020B0B3E
-.public _020B0B3F
-.public _020B0B44
-.public _020B0B48
 .public ov01_02337B3C
 .public ov01_02337B68
 .public ov01_02337BA0
@@ -110,6 +102,13 @@
 .public ov03_0233CDC8
 .public ov03_0233CDD8
 .public ov03_0233CDE4
+.public PlaySeVolumeWrapper
+.public PreprocessStringFromId
+.public SetCollectionMenuField0x1B2
+.public SetQuestionMarks
+.public SetSpecialEpisodeOpen
+.public ShowPortraitInPortraitBox
+.public StrncpySimpleNoPadSafe
 .public sub_02003B94
 .public sub_02003BC8
 .public sub_0202836C
@@ -160,3 +159,4 @@
 .public sub_0205F710
 .public sub_0205FA38
 .public sub_0206276C
+.public UpdateWindow

asm/include/main_0206A878.inc

@@ -1,23 +1,4 @@
 #pragma once
-.public CosAbs4096
-.public Debug_Print0
-.public DelayWteFree
-.public DeleteWanTableEntryVeneer
-.public DisplayAndSwitchAnimationControlCurrentFrame
-.public GetExecuteSpecialEpisodeType
-.public InitAnimationControlWithSet__0201C0B0
-.public LoadWanTableEntry
-.public LoadWteFromRom
-.public MAP_MARKER_PLACEMENTS
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MultiplyByFixedPoint
-.public Rand16Bit
-.public SetAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public SinAbs4096
-.public WAN_TABLE
 .public _020A94BC
 .public _020A94C6
 .public _020A94D2
@@ -33,11 +14,29 @@
 .public _020B0B5C
 .public _020B0B60
 .public _s32_div_f
+.public CosAbs4096
+.public Debug_Print0
+.public DelayWteFree
+.public DeleteWanTableEntryVeneer
+.public DisplayAndSwitchAnimationControlCurrentFrame
+.public GetExecuteSpecialEpisodeType
+.public InitAnimationControlWithSet__0201C0B0
+.public LoadWanTableEntry
+.public LoadWteFromRom
+.public MAP_MARKER_PLACEMENTS
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public MultiplyByFixedPoint
 .public ov10_022C2340
 .public ov10_022C23B0
 .public ov10_022C23EC
 .public ov10_022C2450
 .public ov10_022C24DC
+.public Rand16Bit
+.public SetAnimationForAnimationControl
+.public SetSpriteIdForAnimationControl
+.public SinAbs4096
 .public sub_0201D12C
 .public sub_0201D9C8
 .public sub_0201DF38
@@ -51,3 +50,4 @@
 .public sub_0201F36C
 .public sub_02024934
 .public sub_0206A7CC
+.public WAN_TABLE

asm/include/main_0206C1BC.inc

@@ -1,4 +1,12 @@
 #pragma once
+.public _020B1290
+.public _022B7331
+.public _022B7334
+.public _022B7340
+.public _022B734C
+.public _022B7A30
+.public _022B8330
+.public _022B9130
 .public DRIVER_WORK
 .public DseBgm_StopAll
 .public DseBgm_SysSetupNoteList
@@ -16,14 +24,6 @@
 .public OS_InitAlarm
 .public OS_InitTick
 .public OS_SetTick
-.public _020B1290
-.public _022B7331
-.public _022B7334
-.public _022B7340
-.public _022B734C
-.public _022B7A30
-.public _022B8330
-.public _022B9130
 .public sub_0206C184
 .public sub_0206C19C
 .public sub_0206DC78

asm/include/main_0206C9BC.inc

@@ -1,55 +1,4 @@
 #pragma once
-.public DC_FlushRange
-.public DC_WaitWriteBufferEmpty
-.public DRIVER_WORK
-.public DseChannel_AllocateNote
-.public DseChannel_ChangeNote
-.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 DseVoice_Cleanup
-.public DseVoice_Deallocate
-.public DseVoice_PlayNote
-.public DseVoice_ReleaseNote
-.public DseVoice_UpdateHardware
-.public DseVoice_UpdateParameters
-.public Dse_SetError
-.public Dse_SetError2
-.public FS_CloseFile
-.public FS_InitFile
-.public FS_OpenFile
-.public FS_ReadFileAsync
-.public FS_SeekFile
-.public FS_WaitAsync
-.public MTi_CpuClearFast
-.public OS_CreateThread
-.public OS_GetTickLo
-.public OS_JoinThread
-.public OS_Sleep
-.public OS_SleepThread
-.public OS_WakeupThreadDirect
-.public SMD_EVENTS_FUN_TABLE
-.public Snd_FlushCommand
-.public Snd_RecvCommandReply
-.public Snd_SetOutputSelector
-.public Snd_SetupAlarm
-.public Snd_SetupCapture
-.public Snd_StartTimer
-.public Snd_StopTimer
-.public SoundEnvelope_ForceVolume
-.public SoundLfoBank_Reset
-.public UpdateChannels
 .public _020B0B7C
 .public _022B7380
 .public _022B7388
@@ -77,5 +26,56 @@
 .public _fmul
 .public _s32_div_f
 .public _u32_div_f
+.public DC_FlushRange
+.public DC_WaitWriteBufferEmpty
+.public DRIVER_WORK
+.public Dse_SetError
+.public Dse_SetError2
+.public DseChannel_AllocateNote
+.public DseChannel_ChangeNote
+.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 DseVoice_Cleanup
+.public DseVoice_Deallocate
+.public DseVoice_PlayNote
+.public DseVoice_ReleaseNote
+.public DseVoice_UpdateHardware
+.public DseVoice_UpdateParameters
+.public FS_CloseFile
+.public FS_InitFile
+.public FS_OpenFile
+.public FS_ReadFileAsync
+.public FS_SeekFile
+.public FS_WaitAsync
+.public MTi_CpuClearFast
+.public OS_CreateThread
+.public OS_GetTickLo
+.public OS_JoinThread
+.public OS_Sleep
+.public OS_SleepThread
+.public OS_WakeupThreadDirect
+.public SMD_EVENTS_FUN_TABLE
+.public Snd_FlushCommand
+.public Snd_RecvCommandReply
+.public Snd_SetOutputSelector
+.public Snd_SetupAlarm
+.public Snd_SetupCapture
+.public Snd_StartTimer
+.public Snd_StopTimer
+.public SoundEnvelope_ForceVolume
+.public SoundLfoBank_Reset
 .public sub_0206C688
 .public sub_02072BB8
+.public UpdateChannels

asm/include/overlay_00.inc

@@ -1,6 +1,14 @@
 #pragma once
-.public CRYPTO_RC4Init
+.public _02000BDC
+.public _02000BF4
+.public _02000C1C
+.public _02000C34
+.public _ll_udiv
+.public _s32_div_f
+.public _start_AutoloadDoneCallback
+.public _u32_div_f
 .public Crypto_RC4Encrypt
+.public CRYPTO_RC4Init
 .public DC_FlushRange
 .public DC_InvalidateRange
 .public DC_StoreRange
@@ -91,11 +99,18 @@
 .public InitWfcSettingsOverlay
 .public LoadOverlay
 .public MATH_CalcCRC16
+.public Math_CountPopulation
 .public MATHi_CRC16InitTable
 .public MATHi_CRC16Update
 .public MD5_Digest
 .public MD5_Init
 .public MD5_Update
+.public MemAlloc
+.public memcmp
+.public MemcpySimple
+.public MemFree
+.public memmove
+.public MemZero
 .public MI_CpuCopy8
 .public MI_CpuFill8
 .public MI_DmaCopy16
@@ -106,11 +121,6 @@
 .public MTi_CpuCopy16
 .public MTi_CpuCopy32
 .public MTi_CpuCopy32Fast
-.public Math_CountPopulation
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
 .public OS_CancelAlarm
 .public OS_CreateAlarm
 .public OS_CreateThread
@@ -147,30 +157,6 @@
 .public OS_YieldThread
 .public OSi_ReferSymbol
 .public OSi_ThreadInfo
-.public PXI_Init
-.public PXI_IsCallbackReady
-.public PXI_SendWordByFifo
-.public PXI_SetFifoRecvCallback
-.public PlayBgmByIdVeneer
-.public RandInt
-.public Rtc_ConvertDateTimeToSecond
-.public Rtc_GetDate
-.public Rtc_GetTime
-.public Rtc_Init
-.public SetIrqFlag
-.public Std_CopyLString
-.public UnloadOverlay
-.public WaitForever2
-.public _02000BDC
-.public _02000BF4
-.public _02000C1C
-.public _02000C34
-.public _ll_udiv
-.public _s32_div_f
-.public _start_AutoloadDoneCallback
-.public _u32_div_f
-.public memcmp
-.public memmove
 .public ov00_02317F44
 .public ov00_02317F54
 .public ov00_02317F5C
@@ -331,6 +317,18 @@
 .public ov01_023310B8
 .public ov01_02337914
 .public ov01_0233AE64
+.public PlayBgmByIdVeneer
+.public PXI_Init
+.public PXI_IsCallbackReady
+.public PXI_SendWordByFifo
+.public PXI_SetFifoRecvCallback
+.public RandInt
+.public Rtc_ConvertDateTimeToSecond
+.public Rtc_GetDate
+.public Rtc_GetTime
+.public Rtc_Init
+.public SetIrqFlag
+.public Std_CopyLString
 .public strcmp
 .public strlen
 .public strncmp
@@ -388,3 +386,5 @@
 .public sub_0205B77C
 .public sub_0205B80C
 .public sub_02079990
+.public UnloadOverlay
+.public WaitForever2

asm/include/overlay_00_022DB2F8.inc

@@ -1,5 +1,23 @@
 #pragma once
+.public _020AECB0
+.public _020AED30
+.public _020AEDB0
+.public _022BCA70
+.public _d2f
+.public _dadd
+.public _ddiv
+.public _dflt
+.public _dmul
+.public _dsub
+.public _ll_udiv
+.public _s32_div_f
+.public _u32_div_f
+.public abs
+.public atof
+.public atoi
+.public bind
 .public CloseVeneer
+.public connect
 .public Cps_GetSslLowThreadPriority
 .public Cps_Resolve
 .public Cps_SetRootCa
@@ -51,6 +69,11 @@
 .public Dwci_SetBuddyFriendData
 .public Dwci_SetReverseBuddyFlag
 .public EnableIrqFlag
+.public fclose
+.public fcntl
+.public fread
+.public fseek
+.public ftell
 .public GetDsFirmwareUserSettings
 .public Gt2Accept
 .public Gt2AddressToString
@@ -78,22 +101,26 @@
 .public MATH_CalcCRC16
 .public MATH_CalcCRC32
 .public MATH_CalcCRC8
+.public Math_CalcSha1
 .public MATHi_CRC16InitTable
 .public MATHi_CRC32InitTable
 .public MATHi_CRC8InitTable
-.public MD5Final_Ghi
-.public MD5Init_Ghi
-.public MD5Update_Ghi
 .public MD5_Digest
 .public MD5_Init
 .public MD5_Update
+.public MD5Final_Ghi
+.public MD5Init_Ghi
+.public MD5Update_Ghi
+.public memcmp
+.public memcpy
+.public memmove
+.public memset
 .public MI_CpuCopy8
 .public MI_CpuFill8
 .public MTi_CpuClear16
 .public MTi_CpuClear32
 .public MTi_CpuCopy16
 .public MTi_CpuCopy32
-.public Math_CalcSha1
 .public NnBeginNegotiationWithSocket
 .public NnCancel
 .public NnFreeNegotiateList
@@ -119,78 +146,6 @@
 .public OS_VsPrintf
 .public OS_WakeupThreadDirect
 .public OSi_ThreadInfo
-.public PXI_IsCallbackReady
-.public PXI_SendWordByFifo
-.public PXI_SetFifoRecvCallback
-.public Qr2_Buffer_AddA
-.public Rtc_ConvertDateTimeToSecond
-.public Rtc_GetDate
-.public Rtc_GetDateTime
-.public Rtc_GetTime
-.public Rtc_Init
-.public SVC_WaitByLoop
-.public SbServerGetIntValueA
-.public SbServerGetPrivateInetAddress
-.public SbServerGetPrivateQueryPort
-.public SbServerGetPublicInetAddress
-.public SbServerGetPublicQueryPort
-.public SbServerHasPrivateAddress
-.public ServerBrowserClear
-.public ServerBrowserFree
-.public ServerBrowserGetMyPublicIpAddr
-.public ServerBrowserGetServer
-.public ServerBrowserLimitUpdateA
-.public ServerBrowserSendMessageToServerA
-.public ServerBrowserSendNatNegotiateCookieToServerA
-.public ServerBrowserState
-.public ServerBrowserThink
-.public SetIrqFlag
-.public Soc_GetHostByName
-.public Soc_GetHostID
-.public Soc_GetSockName
-.public Soc_InetAtoN
-.public Soc_Poll
-.public Soc_Shutdown
-.public Soc_U32to4U8
-.public Socl_EnableSsl
-.public Socl_GetHostID
-.public Socl_Resolve
-.public Std_CompareNString
-.public Std_CompareString__020852CC
-.public Std_GetStringLength
-.public Std_TsScanf
-.public WaitForever2
-.public Wcm_GetApEssid
-.public Wcm_GetApMacAddress
-.public Wcm_GetLinkLevel
-.public Wcm_GetPhase
-.public _020AECB0
-.public _020AED30
-.public _020AEDB0
-.public _022BCA70
-.public _d2f
-.public _dadd
-.public _ddiv
-.public _dflt
-.public _dmul
-.public _dsub
-.public _ll_udiv
-.public _s32_div_f
-.public _u32_div_f
-.public abs
-.public atof
-.public atoi
-.public bind
-.public connect
-.public fclose
-.public fcntl
-.public fread
-.public fseek
-.public ftell
-.public memcmp
-.public memcpy
-.public memmove
-.public memset
 .public ov00_02318268
 .public ov00_0231826C
 .public ov00_02318274
@@ -945,7 +900,11 @@
 .public ov00_02328A18
 .public ov00_02328B18
 .public ov00_02328C18
+.public PXI_IsCallbackReady
+.public PXI_SendWordByFifo
+.public PXI_SetFifoRecvCallback
 .public qr2_buffer_add_int
+.public Qr2_Buffer_AddA
 .public qr2_init_socketa
 .public qr2_keybuffer_add
 .public qr2_parse_querya
@@ -959,12 +918,47 @@
 .public recv
 .public recvfrom
 .public rewind
+.public Rtc_ConvertDateTimeToSecond
+.public Rtc_GetDate
+.public Rtc_GetDateTime
+.public Rtc_GetTime
+.public Rtc_Init
+.public SbServerGetIntValueA
+.public SbServerGetPrivateInetAddress
+.public SbServerGetPrivateQueryPort
+.public SbServerGetPublicInetAddress
+.public SbServerGetPublicQueryPort
+.public SbServerHasPrivateAddress
 .public send
 .public sendto
+.public ServerBrowserClear
+.public ServerBrowserFree
+.public ServerBrowserGetMyPublicIpAddr
+.public ServerBrowserGetServer
+.public ServerBrowserLimitUpdateA
+.public ServerBrowserSendMessageToServerA
+.public ServerBrowserSendNatNegotiateCookieToServerA
+.public ServerBrowserState
+.public ServerBrowserThink
+.public SetIrqFlag
 .public snprintf
+.public Soc_GetHostByName
+.public Soc_GetHostID
+.public Soc_GetSockName
+.public Soc_InetAtoN
+.public Soc_Poll
+.public Soc_Shutdown
+.public Soc_U32to4U8
 .public socket
+.public Socl_EnableSsl
+.public Socl_GetHostID
+.public Socl_Resolve
 .public sprintf
 .public srand
+.public Std_CompareNString
+.public Std_CompareString__020852CC
+.public Std_GetStringLength
+.public Std_TsScanf
 .public strcat
 .public strchr
 .public strcmp
@@ -976,4 +970,10 @@
 .public strstr
 .public strtol
 .public strtoul
+.public SVC_WaitByLoop
+.public WaitForever2
+.public Wcm_GetApEssid
+.public Wcm_GetApMacAddress
+.public Wcm_GetLinkLevel
+.public Wcm_GetPhase
 .public wcslen

asm/include/overlay_00_0230D398.inc

@@ -3,6 +3,9 @@
 .public ArrayFree_Gsi
 .public ArrayLength_Gsi
 .public ArrayNth_Gsi
+.public current_time_gsi
+.public gsifree
+.public gsimalloc
 .public Gt2StringToAddress
 .public Gti2CloseSocket
 .public Gti2CreateSocket
@@ -25,13 +28,10 @@
 .public Gti2SendReject
 .public Gti2SocketConnectionsThink
 .public Gti2SocketSend
-.public TableMap_Gsi
-.public TableRemove_Gsi
-.public current_time_gsi
-.public gsifree
-.public gsimalloc
 .public memcpy
 .public memmove
 .public msleep_gsi
 .public ov00_02328E18
 .public strlen
+.public TableMap_Gsi
+.public TableRemove_Gsi

asm/include/overlay_00_0230E460.inc

@@ -1,4 +1,10 @@
 #pragma once
+.public _020AECB0
+.public _020AEDB0
+.public _msl_strnicmp__0208E248
+.public _s32_div_f
+.public _u32_div_f
+.public abs
 .public ArrayAppend_Gsi
 .public ArrayClear_Gsi
 .public ArrayDeleteAt_Gsi
@@ -8,6 +14,7 @@
 .public ArrayNew_Gsi
 .public ArrayNth_Gsi
 .public ArrayRemoveAt_Gsi
+.public atoi
 .public BucketAdd_Gsi
 .public BucketAvg_Gsi
 .public BucketConcat_Gsi
@@ -17,8 +24,14 @@
 .public BucketSub_Gsi
 .public CanReceiveOnSocket
 .public CanSendOnSocket
+.public current_time_gsi
+.public getlocalhost_gsi
+.public getsockname_gsi
 .public GoaGetLastError
+.public goastrdup
 .public GsDebugAssert
+.public gsifree
+.public gsimalloc
 .public Gt2CloseAllConnectionsHard
 .public Gti2AllocateBuffer
 .public Gti2BufferShorten
@@ -39,61 +52,19 @@
 .public Gti2GetResponse
 .public Gti2NewIncomingConnection
 .public Gti2PingCallback
-.public Gti2ReceiveFilterCallback
 .public Gti2ReceivedCallback
+.public Gti2ReceiveFilterCallback
 .public Gti2SocketErrorCallback
 .public Gti2UnrecognizedMessageCallback
-.public IsPrivateIP
-.public OS_SnPrintf
-.public OS_VsPrintf
-.public PlayerOpFloat
-.public PlayerOpInt
-.public PlayerOpString
-.public ServerOpFloat
-.public ServerOpInt
-.public ServerOpString
-.public Soc_GetHostByName
-.public Soc_InetNtoA
-.public SocketBind
-.public SocketClose
-.public SocketConnect
-.public SocketCreate
-.public SocketRecv
-.public SocketRecvFrom
-.public SocketSend
-.public SocketSendTo
-.public SocketShutDown_Gsi
-.public SocketStartUp_Ghi
-.public Std_TsScanf
-.public TableCount_Gsi
-.public TableEnter_Gsi
-.public TableFree_Gsi
-.public TableLookup_Gsi
-.public TableMapSafe2_Gsi
-.public TableNew2_Gsi
-.public TableRemove_Gsi
-.public TeamOpFloat
-.public TeamOpInt
-.public TeamOpString
-.public _020AECB0
-.public _020AEDB0
-.public _msl_strnicmp__0208E248
-.public _s32_div_f
-.public _u32_div_f
-.public abs
-.public atoi
-.public current_time_gsi
-.public getlocalhost_gsi
-.public getsockname_gsi
-.public goastrdup
-.public gsifree
-.public gsimalloc
 .public inet_addr_gsi
+.public IsPrivateIP
 .public memcmp
 .public memcpy
 .public memmove
 .public memset
 .public msleep_gsi
+.public OS_SnPrintf
+.public OS_VsPrintf
 .public ov00_02317FC0
 .public ov00_02317FD4
 .public ov00_02317FE8
@@ -291,8 +262,27 @@
 .public ov09_0233CA80
 .public ov09_0233CBC8
 .public ov09_0233CBF8
+.public PlayerOpFloat
+.public PlayerOpInt
+.public PlayerOpString
 .public rand
+.public ServerOpFloat
+.public ServerOpInt
+.public ServerOpString
+.public Soc_GetHostByName
+.public Soc_InetNtoA
+.public SocketBind
+.public SocketClose
+.public SocketConnect
+.public SocketCreate
+.public SocketRecv
+.public SocketRecvFrom
+.public SocketSend
+.public SocketSendTo
+.public SocketShutDown_Gsi
+.public SocketStartUp_Ghi
 .public srand
+.public Std_TsScanf
 .public strcasecmp
 .public strchr
 .public strcmp
@@ -300,3 +290,13 @@
 .public strlen
 .public strncmp
 .public strstr
+.public TableCount_Gsi
+.public TableEnter_Gsi
+.public TableFree_Gsi
+.public TableLookup_Gsi
+.public TableMapSafe2_Gsi
+.public TableNew2_Gsi
+.public TableRemove_Gsi
+.public TeamOpFloat
+.public TeamOpInt
+.public TeamOpString

asm/include/overlay_01.inc

@@ -1,12 +1,16 @@
 #pragma once
+.public _020B0A5C
+.public _ll_udiv
+.public _s32_div_f
+.public _u32_div_f
+.public _ull_mod
 .public AllocateTemp1024ByteBufferFromPool
 .public AppendStandardStringToMission
 .public BAG_ITEMS_PTR_MIRROR
 .public BitstreamDebug
-.public CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS
-.public CONTINUE_CHOICE
 .public CheckParentMenuField0x1A0
 .public CheckSimpleMenuField0x1A0
+.public CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS
 .public CloseAdvancedMenu
 .public CloseAdvancedTextBox
 .public CloseControlsChart
@@ -15,6 +19,7 @@
 .public CloseSimpleMenu
 .public CloseTextBox
 .public ComputeSpecialCounters
+.public CONTINUE_CHOICE
 .public Copy16BitsFrom
 .public Copy16BitsTo
 .public CopyBitsFrom
@@ -118,89 +123,13 @@
 .public MAIN_MENU_WINDOW_PARAMS_7
 .public MAIN_MENU_WINDOW_PARAMS_8
 .public MAIN_MENU_WINDOW_PARAMS_9
-.public MTi_CpuCopy32
 .public MaybeGetFormattedItemName
 .public MemAlloc
-.public MemFree
-.public MemZero
 .public MemcpySimple
+.public MemFree
 .public MemsetSimple
-.public PRINTS_STRUCT
-.public PlaySeVolumeWrapper
-.public PreprocessString
-.public PreprocessStringFromId
-.public PrintClearMark
-.public PrintSpecialEpisodeClearMark
-.public RandInt
-.public ResumeAdvancedMenu
-.public ResumeParentMenu
-.public SUBMENU
-.public SetAdvancedTextBoxState5
-.public SetAnimationForAnimationControl
-.public SetDebugSpecialEpisodeNumber
-.public SetIrqFlag
-.public SetMainTeamName
-.public SetScenarioProgressScriptVar
-.public SetSpriteIdForAnimationControl
-.public ShowKeyboard
-.public ShowStringIdInDialogueBox
-.public ShowStringInDialogueBox
-.public StrcpyName
-.public StrcpySimple
-.public StringFromId
-.public StrncmpSimple
-.public StrncpyName
-.public StrncpySimpleNoPadSafe
-.public UpdateWindow
-.public WAN_TABLE
-.public WM_Disable
-.public WM_Enable
-.public WM_EndDataSharing__022C1278
-.public WM_EndScan
-.public WM_Finish
-.public WM_GetAllowedChannel
-.public WM_GetDispersionBeaconPeriod
-.public WM_GetDispersionScanPeriod
-.public WM_GetLinkLevel
-.public WM_GetNextTgid
-.public WM_Init
-.public WM_MeasureChannel
-.public WM_PowerOff
-.public WM_PowerOn
-.public WM_ReadStatus
-.public WM_Reset
-.public WM_SetEntry
-.public WM_SetIndCallback
-.public WM_SetMpDataToPortEx
-.public WM_SetParentParameter
-.public WM_SetPortCallback
-.public WM_StartConnectEx
-.public WM_StartDataSharing
-.public WM_StartMP
-.public WM_StartParent
-.public WM_StartScan
-.public Wbt_AidbitmapToAid
-.public Wbt_CancelCurrentCommand
-.public Wbt_End
-.public Wbt_GetBlock
-.public Wbt_GetBlockInfo
-.public Wbt_InitChild
-.public Wbt_InitParent
-.public Wbt_MpChildRecvHook
-.public Wbt_MpChildSendHook
-.public Wbt_MpParentRecvHook
-.public Wbt_MpParentSendHook
-.public Wbt_PrintBtList
-.public Wbt_PutUserData
-.public Wbt_RegisterBlock
-.public Wbt_RequestSync
-.public Wbt_SetOwnAid
-.public Wbt_UnregisterBlock
-.public _020B0A5C
-.public _ll_udiv
-.public _s32_div_f
-.public _u32_div_f
-.public _ull_mod
+.public MemZero
+.public MTi_CpuCopy32
 .public ov00_022BCA80
 .public ov00_022BCBAC
 .public ov00_022BCCC8
@@ -331,9 +260,34 @@
 .public ov01_0233CA70
 .public ov01_0233CA78
 .public ov09_0233D964
+.public PlaySeVolumeWrapper
+.public PreprocessString
+.public PreprocessStringFromId
+.public PrintClearMark
+.public PRINTS_STRUCT
+.public PrintSpecialEpisodeClearMark
+.public RandInt
+.public ResumeAdvancedMenu
+.public ResumeParentMenu
+.public SetAdvancedTextBoxState5
+.public SetAnimationForAnimationControl
+.public SetDebugSpecialEpisodeNumber
+.public SetIrqFlag
+.public SetMainTeamName
+.public SetScenarioProgressScriptVar
+.public SetSpriteIdForAnimationControl
+.public ShowKeyboard
+.public ShowStringIdInDialogueBox
+.public ShowStringInDialogueBox
 .public sprintf
 .public strcmp
 .public strcpy
+.public StrcpyName
+.public StrcpySimple
+.public StringFromId
+.public StrncmpSimple
+.public StrncpyName
+.public StrncpySimpleNoPadSafe
 .public sub_02002448
 .public sub_020062FC
 .public sub_020063F4
@@ -407,4 +361,50 @@
 .public sub_0205B5A8
 .public sub_0205BBA4
 .public sub_020851AC
+.public SUBMENU
+.public UpdateWindow
 .public vsprintf
+.public WAN_TABLE
+.public Wbt_AidbitmapToAid
+.public Wbt_CancelCurrentCommand
+.public Wbt_End
+.public Wbt_GetBlock
+.public Wbt_GetBlockInfo
+.public Wbt_InitChild
+.public Wbt_InitParent
+.public Wbt_MpChildRecvHook
+.public Wbt_MpChildSendHook
+.public Wbt_MpParentRecvHook
+.public Wbt_MpParentSendHook
+.public Wbt_PrintBtList
+.public Wbt_PutUserData
+.public Wbt_RegisterBlock
+.public Wbt_RequestSync
+.public Wbt_SetOwnAid
+.public Wbt_UnregisterBlock
+.public WM_Disable
+.public WM_Enable
+.public WM_EndDataSharing__022C1278
+.public WM_EndScan
+.public WM_Finish
+.public WM_GetAllowedChannel
+.public WM_GetDispersionBeaconPeriod
+.public WM_GetDispersionScanPeriod
+.public WM_GetLinkLevel
+.public WM_GetNextTgid
+.public WM_Init
+.public WM_MeasureChannel
+.public WM_PowerOff
+.public WM_PowerOn
+.public WM_ReadStatus
+.public WM_Reset
+.public WM_SetEntry
+.public WM_SetIndCallback
+.public WM_SetMpDataToPortEx
+.public WM_SetParentParameter
+.public WM_SetPortCallback
+.public WM_StartConnectEx
+.public WM_StartDataSharing
+.public WM_StartMP
+.public WM_StartParent
+.public WM_StartScan

asm/include/overlay_01_02337634.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public _s32_div_f
 .public CardBackupError
 .public CreateMainMenus
 .public Debug_Print0
@@ -10,13 +11,10 @@
 .public InitPreprocessorArgs
 .public IsTouchScreenNotOff
 .public MemAlloc
+.public MemcpySimple
 .public MemFree
 .public MemZero
-.public MemcpySimple
 .public NoteSaveBase
-.public PRINTS_STRINGS
-.public StrcpyName
-.public _s32_div_f
 .public ov00_022BCA80
 .public ov00_022BCBAC
 .public ov00_022BCC30
@@ -290,6 +288,8 @@
 .public ov07_0233F6E0
 .public ov07_0233F758
 .public ov07_0233FCD8
+.public PRINTS_STRINGS
+.public StrcpyName
 .public sub_02003B5C
 .public sub_02003B94
 .public sub_02003BC8

asm/include/overlay_04_0233CAF8.inc

@@ -32,12 +32,6 @@
 .public MemFree
 .public MemZero
 .public NoteSaveBase
-.public PlaySeVolumeWrapper
-.public RandInt
-.public RemoveItemAtIdxInStorage
-.public StrncpySimpleNoPadSafe
-.public UnloadFile
-.public ZeroInitMissionRewardDataStruct
 .public ov01_0232B540
 .public ov01_0232B5D0
 .public ov01_0232E94C
@@ -80,6 +74,10 @@
 .public ov04_0233F640
 .public ov04_0233F644
 .public ov04_0233F670
+.public PlaySeVolumeWrapper
+.public RandInt
+.public RemoveItemAtIdxInStorage
+.public StrncpySimpleNoPadSafe
 .public sub_02003B5C
 .public sub_02003B94
 .public sub_02003BC8
@@ -112,3 +110,5 @@
 .public sub_02046C78
 .public sub_02046D20
 .public sub_0204A018
+.public UnloadFile
+.public ZeroInitMissionRewardDataStruct

asm/include/overlay_06_0233CAB8.inc

@@ -20,13 +20,10 @@
 .public IsSpecialEpisodeOpen
 .public IsTouchScreenNotOff
 .public MemAlloc
+.public MemcpySimple
 .public MemFree
 .public MemZero
-.public MemcpySimple
 .public NoteSaveBase
-.public SetSpecialEpisodeOpen
-.public ShowKeyboard
-.public WonderMailPasswordToMission
 .public ov00_022BCA80
 .public ov00_022BCBAC
 .public ov00_022BD264
@@ -80,6 +77,8 @@
 .public ov06_0233EEE0
 .public ov06_0233EEEC
 .public ov06_0233EEF0
+.public SetSpecialEpisodeOpen
+.public ShowKeyboard
 .public sub_02003B94
 .public sub_02003BC8
 .public sub_02003BFC
@@ -116,3 +115,4 @@
 .public sub_02069D40
 .public sub_02069D94
 .public sub_02069DC0
+.public WonderMailPasswordToMission

asm/include/overlay_10_022BCDF4.inc

@@ -1,4 +1,6 @@
 #pragma once
+.public _s32_div_f
+.public abs
 .public CreateInventoryMenu
 .public Debug_Print0
 .public DeleteWanTableEntryVeneer
@@ -23,17 +25,6 @@
 .public MemFree
 .public MemZero
 .public OBJ_GRAPHICS_CONTROLS_PTR
-.public PlaySeByIdVolumeWrapper
-.public SetAnimationControlPausedFlag
-.public SetAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public SwitchAnimationControlToNextFrame
-.public TEAM_MEMBER_TABLE_PTR
-.public UnkMapRelatedFunc
-.public UpdateWindow
-.public WAN_TABLE
-.public _s32_div_f
-.public abs
 .public ov10_022BCCB0
 .public ov10_022BFE3C
 .public ov10_022BFE54
@@ -79,6 +70,10 @@
 .public ov11_023061CC
 .public ov11_02306C64
 .public ov11_02306C9C
+.public PlaySeByIdVolumeWrapper
+.public SetAnimationControlPausedFlag
+.public SetAnimationForAnimationControl
+.public SetSpriteIdForAnimationControl
 .public strcpy
 .public sub_02001808
 .public sub_0201C108
@@ -123,4 +118,9 @@
 .public sub_020640DC
 .public sub_0206423C
 .public sub_020642A8
+.public SwitchAnimationControlToNextFrame
+.public TEAM_MEMBER_TABLE_PTR
+.public UnkMapRelatedFunc
+.public UpdateWindow
 .public vsprintf
+.public WAN_TABLE

asm/include/overlay_10_022BFF78.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public abs
 .public ClearWindow
 .public ClosePortraitBox
 .public CloseTextBox
@@ -9,6 +10,7 @@
 .public DeleteWanTableEntryVeneer
 .public DisplayAndSwitchAnimationControlCurrentFrame
 .public DrawTextInWindow
+.public FillPixelOffsetArrayFromSprite
 .public GendersEqual
 .public GetBgRegionArea
 .public GetBodySize
@@ -22,24 +24,10 @@
 .public LoadWanTableEntryFromPack
 .public MarkPaletteDataAsNeedingUpdate
 .public MemAlloc
+.public Memcpy32
 .public MemFree
 .public MemZero
-.public Memcpy32
 .public MultiplyByFixedPoint
-.public PreprocessString
-.public Rand16Bit
-.public SetAndPlayAnimationForAnimationControl
-.public SetPortraitEmotion
-.public SetPortraitLayout
-.public SetPortraitOffset
-.public SetSpriteIdForAnimationControl
-.public ShowPortraitInPortraitBox
-.public StartFadeDungeonWrapper
-.public SwitchAnimationControlToNextFrame
-.public UnkMapRelatedFunc
-.public UpdateWindow
-.public WAN_TABLE
-.public abs
 .public ov10_022BD744
 .public ov10_022BDCA4
 .public ov10_022BFE0C
@@ -71,13 +59,21 @@
 .public ov29_022DD83C
 .public ov29_0234C584
 .public ov29_0234C5EC
+.public PreprocessString
+.public Rand16Bit
+.public SetAndPlayAnimationForAnimationControl
+.public SetPortraitEmotion
+.public SetPortraitLayout
+.public SetPortraitOffset
+.public SetSpriteIdForAnimationControl
+.public ShowPortraitInPortraitBox
+.public StartFadeDungeonWrapper
 .public strcmp
 .public strcpy
 .public sub_0200B330
 .public sub_0200B3FC
 .public sub_0201C138
 .public sub_0201CF80
-.public sub_0201D034
 .public sub_0201D12C
 .public sub_0201D1B0
 .public sub_02025010_EU
@@ -93,4 +89,8 @@
 .public sub_02063FF4
 .public sub_02064014
 .public sub_0206409C
+.public SwitchAnimationControlToNextFrame
+.public UnkMapRelatedFunc
+.public UpdateWindow
 .public vsprintf
+.public WAN_TABLE

asm/include/overlay_11.inc

@@ -1,4 +1,10 @@
 #pragma once
+.public _020A1870
+.public _020A548A
+.public _020A5490
+.public _fdiv
+.public _ffix
+.public _fflt
 .public CalcAndUpdateScriptVarWithOtherScriptVar
 .public CalcAndUpdateScriptVarWithOtherValue
 .public CalcScriptVariablesVeneer
@@ -42,53 +48,15 @@
 .public IsStoryBeforeOrAtPoint
 .public IsStoryBeforePoint
 .public ItemAtTableIdx
-.public LOCK_NOTIFY_ARRAY
 .public LoadAndCompareScriptVarAndValue
 .public LoadAndCompareScriptVars
 .public LoadFileFromRom
 .public LoadScriptVariableValue
 .public LoadScriptVariableValueAtIndex
 .public LoadScriptVariableValueSum
+.public LOCK_NOTIFY_ARRAY
 .public MemAlloc
 .public MemFree
-.public OVERLAY11_DEBUG_STRINGS
-.public PlayBgmByIdVeneer
-.public PlayBgmByIdVolumeVeneer
-.public PlaySeByIdVolumeWrapper
-.public PreprocessString
-.public RandInt
-.public SCRIPT_COMMAND_PARSING_DATA
-.public SCRIPT_OP_CODES
-.public SaveScriptVariableValue
-.public SaveScriptVariableValueAtIndex
-.public ScriptParamToFixedPoint16
-.public ScriptParamToInt
-.public ScriptSpecialProcess0x16
-.public ScriptSpecialProcessCall
-.public SetAdventureLogCompleted
-.public SetEnterDungeon
-.public SetPortraitEmotion
-.public SetPortraitLayout
-.public SetPortraitOffset
-.public SetResolvedPerformanceProgressFlag
-.public SetScenarioProgressScriptVar
-.public SetSpecialEpisodeBeaten
-.public SetWorldMapLevel
-.public UnloadFile
-.public UnlockActorRoutines
-.public UnlockMainRoutine
-.public UnlockObjectRoutines
-.public UnlockPerformerRoutines
-.public UpdateTeamStats
-.public WorldMapSetCamera
-.public WorldMapSetMode
-.public ZeroInitScriptVariable
-.public _020A1870
-.public _020A548A
-.public _020A5490
-.public _fdiv
-.public _ffix
-.public _fflt
 .public ov10_022C0814
 .public ov10_022C096C
 .public ov10_022C0998
@@ -305,6 +273,29 @@
 .public ov11_02324EA4
 .public ov11_02324ECC
 .public ov11_02324F1C
+.public OVERLAY11_DEBUG_STRINGS
+.public PlayBgmByIdVeneer
+.public PlayBgmByIdVolumeVeneer
+.public PlaySeByIdVolumeWrapper
+.public PreprocessString
+.public RandInt
+.public SaveScriptVariableValue
+.public SaveScriptVariableValueAtIndex
+.public SCRIPT_COMMAND_PARSING_DATA
+.public SCRIPT_OP_CODES
+.public ScriptParamToFixedPoint16
+.public ScriptParamToInt
+.public ScriptSpecialProcess0x16
+.public ScriptSpecialProcessCall
+.public SetAdventureLogCompleted
+.public SetEnterDungeon
+.public SetPortraitEmotion
+.public SetPortraitLayout
+.public SetPortraitOffset
+.public SetResolvedPerformanceProgressFlag
+.public SetScenarioProgressScriptVar
+.public SetSpecialEpisodeBeaten
+.public SetWorldMapLevel
 .public sprintf
 .public sub_0200514C
 .public sub_020051A0
@@ -358,3 +349,12 @@
 .public sub_02065CB0
 .public sub_02065CB4
 .public sub_0206C0EC
+.public UnloadFile
+.public UnlockActorRoutines
+.public UnlockMainRoutine
+.public UnlockObjectRoutines
+.public UnlockPerformerRoutines
+.public UpdateTeamStats
+.public WorldMapSetCamera
+.public WorldMapSetMode
+.public ZeroInitScriptVariable

asm/include/overlay_11_022E46FC.inc

@@ -72,8 +72,8 @@
 .public LoadRecycleShopOverlayInit
 .public LoadRecycleShopOverlayResume
 .public LoadRuleDungeonEffectsOverlay
-.public LoadScriptVarValuePair
 .public LoadScriptVariableValue
+.public LoadScriptVarValuePair
 .public LoadSpecialEpisodeDiscardOverlay1
 .public LoadSpecialEpisodeDiscardOverlay2
 .public LoadSpindaCafeOverlayInit
@@ -83,28 +83,6 @@
 .public MemFree
 .public MemZero
 .public MissionRewardValidateDungeonId
-.public PrepareMenuAcceptTeamMember
-.public PreprocessStringFromId
-.public RandomizeDemoActors
-.public RemoveBulkItemInStorage
-.public RemoveItemNoHole
-.public ReturnToTitleScreen
-.public SaveScriptVariableValue
-.public ScriptSpecialProcess0x16
-.public SetActorTalkMain
-.public SetActorTalkSub
-.public SetNewFriendActor
-.public SetRandomRequestNpcs1And2
-.public SetScenarioProgressScriptVar
-.public SetTeamSetupHeroAndPartnerOnly
-.public SetTeamSetupHeroOnly
-.public SetupAndShowKeyboard
-.public SpecialProcAddItemToBag
-.public StatusUpdate
-.public StrcpyName
-.public UnloadOverlay
-.public WasMissionCompletedToday
-.public ZeroInitScriptVariable
 .public ov11_022DC89C
 .public ov11_022DCB28
 .public ov11_022E45F4
@@ -222,7 +200,26 @@
 .public ov11_02324F94
 .public ov28_0238A140
 .public ov28_0238A468
+.public PrepareMenuAcceptTeamMember
+.public PreprocessStringFromId
+.public RandomizeDemoActors
+.public RemoveBulkItemInStorage
+.public RemoveItemNoHole
+.public ReturnToTitleScreen
+.public SaveScriptVariableValue
+.public ScriptSpecialProcess0x16
+.public SetActorTalkMain
+.public SetActorTalkSub
+.public SetNewFriendActor
+.public SetRandomRequestNpcs1And2
+.public SetScenarioProgressScriptVar
+.public SetTeamSetupHeroAndPartnerOnly
+.public SetTeamSetupHeroOnly
+.public SetupAndShowKeyboard
+.public SpecialProcAddItemToBag
 .public sprintf
+.public StatusUpdate
+.public StrcpyName
 .public sub_020051A0
 .public sub_02005494
 .public sub_020057A8
@@ -265,3 +262,6 @@
 .public sub_0206C134
 .public sub_0206C144
 .public sub_0206C164
+.public UnloadOverlay
+.public WasMissionCompletedToday
+.public ZeroInitScriptVariable

asm/include/overlay_11_022E7FB8.inc

@@ -1,3 +1,3 @@
 #pragma once
-.public UNIONALL_RAM_ADDRESS
 .public ov11_022DC89C
+.public UNIONALL_RAM_ADDRESS

asm/include/overlay_11_022E8090.inc

@@ -13,7 +13,6 @@
 .public DecrementEggHatchTimer
 .public FreeMissionRewardStructMain
 .public G3X_Reset
-.public GROUND_MEMORY_ARENA_1
 .public GenerateCroagunkItems
 .public GenerateDailyMissions
 .public GenerateKecleonItems1
@@ -25,6 +24,7 @@
 .public GetReleasedStylus
 .public GetResolvedPerformanceProgressFlag
 .public GetScenarioBalance
+.public GROUND_MEMORY_ARENA_1
 .public GroupOamAttributesBothScreens
 .public HandleMenus
 .public HandleUnlocks
@@ -39,22 +39,6 @@
 .public MemArenaAlloc
 .public MemFree
 .public MemsetSimple
-.public RECRUITMENT_TABLE_LEVELS
-.public RECRUITMENT_TABLE_LOCATIONS
-.public RECRUITMENT_TABLE_SPECIES
-.public RollRandomItemReward
-.public SaveScriptVariableValue
-.public SetBaseStatsMovesGroundMonster
-.public SetDungeonConquest
-.public SetMemAllocatorParams
-.public SetPortraitLayout
-.public SetRandomRequestNpcs1And2
-.public ShowPortraitInPortraitBox
-.public ShowStringIdInDialogueBox
-.public StrncpyName
-.public UpdateRecycleShop
-.public WasMissionCompletedToday
-.public ZeroInitScriptVariable
 .public ov10_022BF7D4
 .public ov11_022DC6C4
 .public ov11_022DC718
@@ -151,6 +135,19 @@
 .public ov11_02324F98
 .public ov11_02324F9C
 .public ov11_02324FA0
+.public RECRUITMENT_TABLE_LEVELS
+.public RECRUITMENT_TABLE_LOCATIONS
+.public RECRUITMENT_TABLE_SPECIES
+.public RollRandomItemReward
+.public SaveScriptVariableValue
+.public SetBaseStatsMovesGroundMonster
+.public SetDungeonConquest
+.public SetMemAllocatorParams
+.public SetPortraitLayout
+.public SetRandomRequestNpcs1And2
+.public ShowPortraitInPortraitBox
+.public ShowStringIdInDialogueBox
+.public StrncpyName
 .public sub_020012D8
 .public sub_020017B4
 .public sub_0200383C
@@ -210,3 +207,6 @@
 .public sub_02062DC4
 .public sub_0206309C
 .public sub_0206C0D8
+.public UpdateRecycleShop
+.public WasMissionCompletedToday
+.public ZeroInitScriptVariable

asm/include/overlay_11_022EA024.inc

@@ -1,25 +1,22 @@
 #pragma once
+.public _fdiv
+.public _ffix
+.public _fflt
 .public C_ROUTINE_NAMES
 .public ClampComponentAbs
 .public Debug_GetDebugFlag
 .public EuclideanNorm__020050B0
-.public GROUND_WAN_FILES_TABLE
 .public GetFadeStatus
 .public GetHeldButtons
 .public GetPressedButtons
 .public GetReleasedStylus
 .public GetSpeedOption
+.public GROUND_WAN_FILES_TABLE
 .public HandleFadesVeneer
 .public IsTouchScreenUseAnywhere
 .public KeyWaitInit
 .public MemAlloc
 .public MemFree
-.public RandRange
-.public SCRIPT_OP_CODE_NAMES
-.public UnlockScriptingLock
-.public _fdiv
-.public _ffix
-.public _fflt
 .public ov10_022BDB54
 .public ov10_022BDB60
 .public ov10_022BDBA4
@@ -1484,6 +1481,8 @@
 .public ov11_0238916C
 .public ov11_023891F4
 .public ov11_023891F8
+.public RandRange
+.public SCRIPT_OP_CODE_NAMES
 .public sub_0200514C
 .public sub_02008F3C
 .public sub_02009120
@@ -1503,3 +1502,4 @@
 .public sub_0200BD50
 .public sub_0201F2A0
 .public sub_0206C0FC
+.public UnlockScriptingLock

asm/include/overlay_11_022EE5E4.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public _s32_div_f
 .public ACTOR_FUNCTION_TABLE
 .public AnimationControlGetAllocForMaxFrame
 .public CopyColorToPaletteDataRgba
@@ -15,13 +16,14 @@
 .public FillOamAttributeInfo
 .public FillPaletteDataRgba
 .public FuncThatCallsRunNextOpcode
-.public GROUND_STATE_MAP
-.public GROUND_STATE_PTRS
-.public GROUND_WEATHER_TABLE
 .public GetCollidingEventId
 .public GetCollidingObjectId
 .public GetCoroutineInfo
+.public GetPixelOffsetFromSprite
 .public GetSpriteIndex__02052724
+.public GROUND_STATE_MAP
+.public GROUND_STATE_PTRS
+.public GROUND_WEATHER_TABLE
 .public GroundBg_FreeAll
 .public GroundBg_Init
 .public InitAnimationControlWithSet__0201C0B0
@@ -39,24 +41,10 @@
 .public LoadWteFromRom
 .public MarkPaletteDataAsNeedingUpdate
 .public MemAlloc
+.public Memcpy32
 .public MemFree
 .public MemZero
-.public Memcpy32
 .public OBJECTS
-.public PlaySeVolumeWrapper
-.public RandInt
-.public Render3dElement64
-.public SETANIMATION_TABLE
-.public ScriptStationLoadTalk
-.public SetActorTalkMain
-.public SetActorTalkMainAndActorTalkSub
-.public SetActorTalkSub
-.public SetAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public SwitchAnimationControlToNextFrame
-.public UnlockRoutine
-.public WAN_TABLE
-.public _s32_div_f
 .public ov10_022BDA84
 .public ov10_022BDB80
 .public ov10_022BDC0C
@@ -254,6 +242,16 @@
 .public ov11_0238A068
 .public ov16_0238CC94
 .public ov16_0238CCA8
+.public PlaySeVolumeWrapper
+.public RandInt
+.public Render3dElement64
+.public ScriptStationLoadTalk
+.public SetActorTalkMain
+.public SetActorTalkMainAndActorTalkSub
+.public SetActorTalkSub
+.public SETANIMATION_TABLE
+.public SetAnimationForAnimationControl
+.public SetSpriteIdForAnimationControl
 .public sprintf
 .public sub_0200302C
 .public sub_020030FC
@@ -276,7 +274,6 @@
 .public sub_0200B3C0
 .public sub_020163AC
 .public sub_0201C108
-.public sub_0201CF90
 .public sub_0201D100
 .public sub_0201D18C
 .public sub_0201D1B0
@@ -298,3 +295,6 @@
 .public sub_0206ADB8
 .public sub_0206B9DC
 .public sub_0206BA5C
+.public SwitchAnimationControlToNextFrame
+.public UnlockRoutine
+.public WAN_TABLE

asm/include/overlay_11_022FAC54.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public abs
 .public ChangeActorAnimation
 .public Debug_Print
 .public DeleteLiveActor
@@ -8,15 +9,8 @@
 .public LoadObjectAnimData
 .public MemAlloc
 .public MemFree
-.public OBJECTS
 .public OBJECT_FUNCTION_TABLE
-.public SetActorTalkSub
-.public SetAnimDataFields2
-.public SetAnimDataFieldsWrapper
-.public SetAttributeBitfieldLiveActor
-.public SetPositionLiveActor
-.public UnlockRoutine
-.public abs
+.public OBJECTS
 .public ov11_022DC934
 .public ov11_022DC958
 .public ov11_022DC9A0
@@ -62,6 +56,12 @@
 .public ov11_02322074
 .public ov11_02324CF8
 .public ov11_02324D00
+.public SetActorTalkSub
+.public SetAnimDataFields2
+.public SetAnimDataFieldsWrapper
+.public SetAttributeBitfieldLiveActor
+.public SetPositionLiveActor
 .public sub_02005430
 .public sub_020054C0
 .public sub_02006DC8
+.public UnlockRoutine

asm/include/overlay_11_022FD308.inc

@@ -6,10 +6,6 @@
 .public InitScriptRoutine
 .public MemAlloc
 .public MemFree
-.public PERFORMER_FUNCTION_TABLE
-.public SetAnimDataFields2
-.public SetAnimDataFieldsWrapper
-.public UnlockRoutine
 .public ov11_022DC934
 .public ov11_022DC958
 .public ov11_022DC9A0
@@ -43,3 +39,7 @@
 .public ov11_02322324
 .public ov11_02324D00
 .public ov11_02324D04
+.public PERFORMER_FUNCTION_TABLE
+.public SetAnimDataFields2
+.public SetAnimDataFieldsWrapper
+.public UnlockRoutine

asm/include/overlay_11_022FE4AC.inc

@@ -1 +1,2 @@
 #pragma once
+

asm/include/overlay_11_022FE5F8.inc

@@ -49,9 +49,9 @@
 .public DrawTextInWindow
 .public DungeonMoveToGroundMove
 .public DungeonSwapIdxToId
+.public EnableIqSkill
 .public EVENTS
 .public EXCLUSIVE_ITEM_REQUIREMENTS_PTR
-.public EnableIqSkill
 .public FreeMissionRewardStructMain
 .public FuncThatCallsRunNextOpcode
 .public GetActiveRosterIndex
@@ -122,69 +122,11 @@
 .public MaybeGetFormattedItemName
 .public MaybeGetUncoloredFormattedItemName
 .public MemAlloc
+.public memcpy
+.public MemcpySimple
 .public MemFree
 .public MemZero
-.public MemcpySimple
 .public NewWindowScreenCheck
-.public PlaySeVolumeWrapper
-.public PopInventoryMenuField0x1A3
-.public PreprocessString
-.public PreprocessStringFromId
-.public PrintBadgeMark
-.public PrintIqSkillsMenu
-.public RecolorNameString
-.public RemoveItemNoHole
-.public RemoveItemNoHoleCheck
-.public ResetAttributeBitfieldLivePerformer
-.public ResumeAdvancedMenu
-.public ResumeParentMenu
-.public ReturnScriptMenuResult
-.public ReturnScriptMenuResultZero
-.public SWAP_SHOP_CLUMSET_ONE_STAR_STR
-.public SWAP_SHOP_CLUMSET_THREE_STAR_STR
-.public SWAP_SHOP_CLUMSET_TWO_STAR_STR
-.public SWAP_SHOP_INVENTORY_PTRS
-.public SWAP_SHOP_ONE_STAR_STR
-.public SWAP_SHOP_RED_TEXT_TAG_STR
-.public SWAP_SHOP_THREE_STAR_STR
-.public SWAP_SHOP_TWO_STAR_STR
-.public SWAP_SHOP_UNCENTER_TEXT_TAG_STR
-.public SaveScriptVariableValue
-.public SaveScriptVariableValueBytes
-.public SetAnimDataFields2
-.public SetAreaNameBoxState3
-.public SetAttributeBitfieldLivePerformer
-.public SetCollectionMenuField0x1A4
-.public SetCollectionMenuField0x1C8
-.public SetInventoryMenuState0
-.public SetInventoryMenuState6
-.public SetItemAcquired
-.public SetNewFriendActor
-.public SetParentMenuState7
-.public SetWindowTitle
-.public ShowDialogueBox
-.public ShowKeyboard
-.public ShowStringIdInDialogueBox
-.public ShowStringInDialogueBox
-.public SortItemsInBag
-.public StrcmpMonsterName
-.public StrcpyName
-.public StrcpySimple
-.public StringFromId
-.public StrncpyName
-.public StrncpySimple
-.public StrncpySimpleNoPad
-.public StrncpySimpleNoPadSafe
-.public SwapShopFreeDoublePointer
-.public TEAM_INFO_BOX_DEFAULT_WINDOW_PARAMS
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public UpdateWindow
-.public ValidateTeamMembers
-.public WorldMapSetCamera
-.public WorldMapSetMode
-.public ZeroInitMissionRewardDataStruct
-.public memcpy
 .public ov10_022BCC60
 .public ov10_022BCC7C
 .public ov10_022BCCB0
@@ -382,9 +324,49 @@
 .public ov11_0238A080
 .public ov11_0238A084
 .public ov11_0238A088
+.public PlaySeVolumeWrapper
+.public PopInventoryMenuField0x1A3
+.public PreprocessString
+.public PreprocessStringFromId
+.public PrintBadgeMark
+.public PrintIqSkillsMenu
+.public RecolorNameString
+.public RemoveItemNoHole
+.public RemoveItemNoHoleCheck
+.public ResetAttributeBitfieldLivePerformer
+.public ResumeAdvancedMenu
+.public ResumeParentMenu
+.public ReturnScriptMenuResult
+.public ReturnScriptMenuResultZero
+.public SaveScriptVariableValue
+.public SaveScriptVariableValueBytes
+.public SetAnimDataFields2
+.public SetAreaNameBoxState3
+.public SetAttributeBitfieldLivePerformer
+.public SetCollectionMenuField0x1A4
+.public SetCollectionMenuField0x1C8
+.public SetInventoryMenuState0
+.public SetInventoryMenuState6
+.public SetItemAcquired
+.public SetNewFriendActor
+.public SetParentMenuState7
+.public SetWindowTitle
+.public ShowDialogueBox
+.public ShowKeyboard
+.public ShowStringIdInDialogueBox
+.public ShowStringInDialogueBox
+.public SortItemsInBag
 .public sprintf
 .public strcat
+.public StrcmpMonsterName
 .public strcpy
+.public StrcpyName
+.public StrcpySimple
+.public StringFromId
+.public StrncpyName
+.public StrncpySimple
+.public StrncpySimpleNoPad
+.public StrncpySimpleNoPadSafe
 .public sub_020037A4
 .public sub_02008BA8
 .public sub_0200CF6C
@@ -512,4 +494,22 @@
 .public sub_02067664
 .public sub_0206A84C
 .public sub_0206C110
+.public SWAP_SHOP_CLUMSET_ONE_STAR_STR
+.public SWAP_SHOP_CLUMSET_THREE_STAR_STR
+.public SWAP_SHOP_CLUMSET_TWO_STAR_STR
+.public SWAP_SHOP_INVENTORY_PTRS
+.public SWAP_SHOP_ONE_STAR_STR
+.public SWAP_SHOP_RED_TEXT_TAG_STR
+.public SWAP_SHOP_THREE_STAR_STR
+.public SWAP_SHOP_TWO_STAR_STR
+.public SWAP_SHOP_UNCENTER_TEXT_TAG_STR
+.public SwapShopFreeDoublePointer
+.public TEAM_INFO_BOX_DEFAULT_WINDOW_PARAMS
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
+.public UpdateWindow
+.public ValidateTeamMembers
 .public vsprintf
+.public WorldMapSetCamera
+.public WorldMapSetMode
+.public ZeroInitMissionRewardDataStruct

asm/include/overlay_11_0230CE30.inc

@@ -1,4 +1,8 @@
 #pragma once
+.public _fdiv
+.public _ffix
+.public _fflt
+.public _s32_div_f
 .public AnimRelatedFunction__022F6F14
 .public AppendStandardStringToMission
 .public ClampComponentAbs
@@ -11,10 +15,9 @@
 .public Debug_Print
 .public DelayWteFree
 .public DrawTextInWindow
-.public EVENTS
 .public EuclideanNorm__020050B0
+.public EVENTS
 .public FX_Atan2Idx
-.public GROUND_WEATHER_TABLE
 .public GetAcceptedMission
 .public GetDungeonMode
 .public GetExecuteSpecialEpisodeType
@@ -25,6 +28,7 @@
 .public GetMissionRankWithCapAndModifiersAndCap
 .public GetPartner
 .public GetTopScreenOption
+.public GROUND_WEATHER_TABLE
 .public GroundBg_FreeAll
 .public GroundBg_Init
 .public InitAnimDataFromOtherAnimDataVeneer
@@ -39,17 +43,6 @@
 .public LoadWteFromRom
 .public MemAlloc
 .public MemFree
-.public OverlayIsLoaded
-.public SentryUpdateDisplay
-.public SetAnimDataFields2
-.public TRIG_TABLE
-.public UpdateWindow
-.public VEC_Distance
-.public WORLD_MAP_MODE
-.public _fdiv
-.public _ffix
-.public _fflt
-.public _s32_div_f
 .public ov11_022DC240
 .public ov11_022DC368
 .public ov11_022DC3A0
@@ -243,6 +236,9 @@
 .public ov16_0238CCBC
 .public ov16_0238CCD8
 .public ov16_0238CCF0
+.public OverlayIsLoaded
+.public SentryUpdateDisplay
+.public SetAnimDataFields2
 .public sub_0200514C
 .public sub_020055C8
 .public sub_02008F64
@@ -272,3 +268,7 @@
 .public sub_0206A96C
 .public sub_0206A9DC
 .public sub_0206AA40
+.public TRIG_TABLE
+.public UpdateWindow
+.public VEC_Distance
+.public WORLD_MAP_MODE

asm/include/overlay_16.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public _s32_div_f
 .public CloseAdvancedMenu
 .public CloseDialogueBox
 .public ClosePortraitBox
@@ -8,15 +9,15 @@
 .public CreatePortraitBox
 .public CreateSimpleMenuFromStringIds
 .public Debug_Print0
-.public EVOLUTION_HP_BONUS
-.public EVOLUTION_PHYSICAL_STAT_BONUSES
-.public EVOLUTION_SPECIAL_STAT_BONUSES
 .public EVO_MAIN_MENU_ITEMS
 .public EVO_MENU_ITEMS_CONFIRM
 .public EVO_SUBMENU_ITEMS
 .public EVO_WINDOW_PARAMS_4
 .public EVO_WINDOW_PARAMS_5
 .public EVO_WINDOW_PARAMS_6
+.public EVOLUTION_HP_BONUS
+.public EVOLUTION_PHYSICAL_STAT_BONUSES
+.public EVOLUTION_SPECIAL_STAT_BONUSES
 .public GetActiveTeamMember
 .public GetAdvancedMenuResult
 .public GetEvolutionPossibilities
@@ -44,6 +45,10 @@
 .public IsValidTeamMember
 .public MemAlloc
 .public MemFree
+.public ov11_0230D220
+.public ov11_02310BDC
+.public ov16_0238CE04
+.public ov16_0238CE28
 .public OVERLAY16_UNKNOWN_POINTER__NA_238CE40
 .public PreprocessString
 .public Rand16Bit
@@ -63,12 +68,6 @@
 .public StrncpyName
 .public StrncpySimple
 .public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public _s32_div_f
-.public ov11_0230D220
-.public ov11_02310BDC
-.public ov16_0238CE04
-.public ov16_0238CE28
 .public sub_02017C50
 .public sub_02017C74
 .public sub_02017CB4
@@ -102,3 +101,4 @@
 .public sub_020582E0
 .public sub_02059B08
 .public sub_0205B008
+.public TEAM_MEMBER_TABLE_PTR

asm/include/overlay_16_0238CD08.inc

@@ -1 +1,2 @@
 #pragma once
+

asm/include/overlay_17_0238A754.inc

@@ -25,6 +25,8 @@
 .public InitPortraitParamsWithMonsterId
 .public IsDialogueBoxActive
 .public IsMainCharacter
+.public ov17_0238A278
+.public ov17_0238A364
 .public OVERLAY17_FUNCTION_POINTER_TABLE
 .public OVERLAY17_UNKNOWN_POINTER__NA_238BE00
 .public ReturnScriptMenuResultZero
@@ -33,8 +35,6 @@
 .public ShowDialogueBox
 .public ShowPortraitInPortraitBox
 .public ShowStringIdInDialogueBox
-.public ov17_0238A278
-.public ov17_0238A364
 .public sub_02039C3C
 .public sub_0203A998
 .public sub_0203C7E4

asm/include/overlay_17_0238B2B4.inc

@@ -4,11 +4,6 @@
 .public GetSimpleMenuResult__0202B870
 .public IsMePlaying
 .public IsSimpleMenuActive
-.public OVERLAY17_UNKNOWN_POINTER__NA_238BE00
-.public PlaySeVolumeWrapper
-.public PrintIqSkillsMenu
-.public TEAM_MEMBER_TABLE_PTR
-.public TryAddMonsterToActiveTeam
 .public ov11_022DC504
 .public ov17_0238B028
 .public ov17_0238B048
@@ -24,6 +19,9 @@
 .public ov17_0238B260
 .public ov17_0238B278
 .public ov17_0238B290
+.public OVERLAY17_UNKNOWN_POINTER__NA_238BE00
+.public PlaySeVolumeWrapper
+.public PrintIqSkillsMenu
 .public sub_02017C50
 .public sub_020307EC
 .public sub_0203A51C
@@ -53,3 +51,5 @@
 .public sub_020572EC
 .public sub_02057444
 .public sub_02058138
+.public TEAM_MEMBER_TABLE_PTR
+.public TryAddMonsterToActiveTeam

asm/include/overlay_18.inc

@@ -52,6 +52,9 @@
 .public LINK_SHOP_WINDOW_PARAMS_9
 .public MemAlloc
 .public MemFree
+.public ov11_0238A090
+.public ov18_0238D5F8
+.public ov18_0238D608
 .public OVERLAY18_FUNCTION_POINTER_TABLE
 .public PortraitBoxNeedsUpdate
 .public PreprocessString
@@ -64,11 +67,6 @@
 .public ShowPortraitInPortraitBox
 .public ShowStringIdInDialogueBox
 .public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public UpdateWindow
-.public ov11_0238A090
-.public ov18_0238D5F8
-.public ov18_0238D608
 .public sub_02027B1C
 .public sub_0202BC60
 .public sub_0202F334
@@ -97,4 +95,6 @@
 .public sub_020572EC
 .public sub_020573A0
 .public sub_0205B028
+.public TEAM_MEMBER_TABLE_PTR
+.public UpdateWindow
 .public vsprintf

asm/include/overlay_18_0238C114.inc

@@ -4,11 +4,10 @@
 .public GetSimpleMenuResult__0202B870
 .public IsSimpleMenuActive
 .public LINK_SHOP_PTR
+.public ov18_0238BE28
 .public PlaySeByIdVolumeWrapper
 .public PlaySeVolumeWrapper
 .public PrintIqSkillsMenu
-.public TEAM_MEMBER_TABLE_PTR
-.public ov18_0238BE28
 .public sub_02017C74
 .public sub_020307EC
 .public sub_0203A51C
@@ -41,3 +40,4 @@
 .public sub_02041B7C
 .public sub_020420F4
 .public sub_020572EC
+.public TEAM_MEMBER_TABLE_PTR

asm/include/overlay_18_0238CAB0.inc

@@ -6,7 +6,6 @@
 .public IsAdvancedMenuActive2
 .public IsSimpleMenuActive
 .public LINK_SHOP_PTR
-.public ResumeAdvancedMenu
 .public memcpy
 .public ov18_0238ADA8
 .public ov18_0238BE28
@@ -65,6 +64,7 @@
 .public ov18_0238D22C
 .public ov18_0238D23C
 .public ov18_0238D260
+.public ResumeAdvancedMenu
 .public sub_0202C1E4
 .public sub_0203FD14
 .public sub_0203FD2C

asm/include/overlay_29_022DC7E4.inc

@@ -1,8 +1,9 @@
 #pragma once
+.public _s32_div_f
 .public AddSimpleObjToOam
 .public ChangeSimpleObjTexture
-.public DUNGEON_PTR
 .public DirectoryFileMngr_OpenDirectoryFile
+.public DUNGEON_PTR
 .public FillPaletteInitInfo
 .public GetDefaultTileTextureId
 .public HandleSir0Translation
@@ -12,8 +13,6 @@
 .public MemFree
 .public MemZero
 .public OBJ_GRAPHICS_CONTROLS_PTR
-.public UnloadFile
-.public _s32_div_f
 .public ov29_022DC78C
 .public ov29_02350F88
 .public ov29_02350F8C
@@ -66,3 +65,4 @@
 .public sub_02063734
 .public sub_02063770
 .public sub_02063830
+.public UnloadFile

asm/include/overlay_29_022E08F4.inc

@@ -1,8 +1,6 @@
 #pragma once
 .public DUNGEON_PTR
 .public GetScenarioBalance
-.public StartFadeDungeonWrapper
-.public WaitUntilFadeIsFinished
 .public ov29_022DE15C
 .public ov29_022DE854
 .public ov29_022E0DFC
@@ -11,3 +9,5 @@
 .public ov29_022E8778
 .public ov29_022EA370
 .public ov29_0233A248
+.public StartFadeDungeonWrapper
+.public WaitUntilFadeIsFinished

asm/include/overlay_29_022E0A18.inc

@@ -1,9 +1,11 @@
 #pragma once
+.public _020AFC28
+.public _020AFC70
 .public AnimationDelayOrSomething
 .public CopyAndInterleaveWrapper
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DUNGEON_BUTTON_INPUT
 .public DUNGEON_PTR
-.public DirectoryFileMngr_OpenDirectoryFile
 .public DungeonGoesUp
 .public FadeToBlack
 .public FillPaletteInitInfo
@@ -21,11 +23,6 @@
 .public Memcpy32
 .public Memset32
 .public OBJ_GRAPHICS_CONTROLS_PTR
-.public SetMinimapDataE447
-.public UnloadFile
-.public UnloadWte
-.public _020AFC28
-.public _020AFC70
 .public ov10_022C4D54
 .public ov29_022E8BFC
 .public ov29_022E9FD0
@@ -41,6 +38,7 @@
 .public ov29_0237C6A4
 .public ov29_0237C6B8
 .public ov29_0237C6D4
+.public SetMinimapDataE447
 .public sub_020063F4
 .public sub_02006564
 .public sub_02006BFC
@@ -52,3 +50,5 @@
 .public sub_02009454
 .public sub_020094C4
 .public sub_0201E380
+.public UnloadFile
+.public UnloadWte

asm/include/overlay_29_022E1AD4.inc

@@ -9,8 +9,6 @@
 .public HasDropeyeStatus
 .public HiddenStairsPresent
 .public IsPositionActuallyInSight
-.public PopulateActiveMonsterPtrs
-.public SECONDARY_TERRAIN_TYPES
 .public ov29_022DE954
 .public ov29_022DE9F8
 .public ov29_022DEA10
@@ -20,3 +18,5 @@
 .public ov29_02304830
 .public ov29_0237C754
 .public ov29_0237C79C
+.public PopulateActiveMonsterPtrs
+.public SECONDARY_TERRAIN_TYPES

asm/include/overlay_29_022E335C.inc

@@ -5,7 +5,8 @@
 .public DisplayUi
 .public DUNGEON_PTR
 .public EntityIsValid__022E37B8
-.public GetEffectAnimationField0x19
+.public GetEffectAnimationWanOffset
+.public GetPixelOffsetFromSprite
 .public GetTileSafe
 .public InitOamAdjustmentInfo
 .public LogMessageByIdWithPopupCheckUser
@@ -17,7 +18,6 @@
 .public ov29_0235354C
 .public ScreenEffectActive
 .public ShouldDisplayEntityAdvanced
-.public sub_0201CF90
 .public UpdateCamera
 .public UpdateMinimap
 .public UpdateTrapsVisibility

asm/include/overlay_29_022E37DC.inc

@@ -3,8 +3,17 @@
 .public AnimationHasMoreFrames
 .public DUNGEON_PTR
 .public EntityIsValid__022E37B8
-.public GetEffectAnimationField0x19
+.public GetEffectAnimationWanOffset
 .public InitOamAdjustmentInfo
+.public ov10_022BDC68
+.public ov10_022BF274
+.public ov10_022BF2B4
+.public ov10_022BF9CC
+.public ov29_022DE5D8
+.public ov29_022DE5F0
+.public ov29_022E6E40
+.public ov29_022ED0F4
+.public ov29_0235354C
 .public PlayEffectAnimationEntity
 .public PlaySeByIdIfShouldDisplayEntity
 .public STATUS_ICON_ARRAY_BIDE
@@ -22,12 +31,3 @@
 .public STATUS_ICON_ARRAY_REFLECT
 .public STATUS_ICON_ARRAY_SLEEP
 .public STATUS_ICON_ARRAY_SURE_SHOT
-.public ov10_022BDC68
-.public ov10_022BF274
-.public ov10_022BF2B4
-.public ov10_022BF9CC
-.public ov29_022DE5D8
-.public ov29_022DE5F0
-.public ov29_022E6E40
-.public ov29_022ED0F4
-.public ov29_0235354C