Merge pull request #123 from AnonymousRandomPerson/main

Synced from pmdsky-debug

asm/include/main_0200ED1C.inc

@@ -301,6 +301,7 @@
 .public BulkItemToItem
 .public CALCIUM_STAT_BOOST
 .public CopyAndInterleave
+.public CopyAndInterleave0
 .public CopyBitsFrom
 .public CopyBitsTo
 .public CopyStringFromId
@@ -474,7 +475,6 @@
 .public strlen
 .public strncmp
 .public strstr
-.public sub_01FF80B0
 .public sub_01FF8F04
 .public sub_02002778
 .public sub_020027E8

asm/include/main_0202598C.inc

@@ -119,6 +119,7 @@
 .public CURSOR_ANIMATION_CONTROL
 .public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
 .public DecompressAtHalf
+.public DelayWteFree
 .public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
 .public FileClose
 .public FileRom_HandleOpen
@@ -186,7 +187,6 @@
 .public sub_0201D110
 .public sub_0201D9C8
 .public sub_0201E12C
-.public sub_0201E13C
 .public sub_0201F2A0
 .public sub_02020A9C
 .public sub_02020B14

asm/include/main_02034974.inc

@@ -1,270 +1,4 @@
 #pragma once
-.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
-.public ADVENTURE_LOG_PTR
-.public ARM9_UNKNOWN_DATA__NA_209E6BC
-.public ARM9_UNKNOWN_TABLE__NA_209E12C
-.public ARM9_UNKNOWN_TABLE__NA_209E164
-.public ARM9_UNKNOWN_TABLE__NA_209E280
-.public AddItemToStorage
-.public AddMoneyCarried
-.public ApplyLevelUpBoostsToGroundMonster
-.public Arm9LoadUnkFieldNa0x2029EC8
-.public Arm9StoreUnkFieldNa0x2029ED8
-.public BAG_ITEMS_PTR_MIRROR
-.public CLIENT_LEVEL_TABLE
-.public CanMonsterUseMove
-.public CardBackupError
-.public CardPullOutWithStatus
-.public CheckDebugMenuField0x1A4
-.public CheckOptionsMenuField0x1A4
-.public CheckParentMenuField0x1A0
-.public ClearWindow
-.public CloseAdvancedMenu
-.public CloseAdvancedTextBox
-.public CloseAdvancedTextBox2
-.public CloseCollectionMenu
-.public CloseDebugMenu
-.public CloseDialogueBox
-.public CloseOptionsMenu
-.public CloseParentMenu
-.public ClosePortraitBox
-.public CloseScrollBox
-.public CloseSimpleMenu
-.public CloseTeamSelectionMenu
-.public CloseTextBox
-.public CloseTextBox2
-.public ConvertStorageItemAtIdxToItem
-.public Copy16BitsFrom
-.public CopyNStringFromId
-.public CountNbOfItemsInStorage
-.public CountNbOfValidItemsInStorage
-.public CountNbOfValidItemsInTimeDarknessInStorage
-.public CreateAdvancedMenu
-.public CreateAdvancedTextBox
-.public CreateAdvancedTextBoxWithArg
-.public CreateCollectionMenu
-.public CreateDebugMenu
-.public CreateDialogueBox
-.public CreateOptionsMenu
-.public CreateParentMenu
-.public CreateParentMenuFromStringIds
-.public CreatePortraitBox
-.public CreateScrollBoxMulti
-.public CreateScrollBoxSingle
-.public CreateSimpleMenu
-.public CreateSimpleMenuFromStringIds
-.public CreateTeamSelectionMenu
-.public CreateTextBox
-.public CreateTextBoxWithArg
-.public DEBUG_SPECIAL_EPISODE_NUMBER
-.public DEFAULT_HERO_ID
-.public DUNGEON_DATA_LIST
-.public DUNGEON_PTR
-.public Debug_FatalError
-.public Debug_GetDebugFlag
-.public Debug_GetLogFlag
-.public Debug_Print
-.public Debug_Print0
-.public Debug_SetDebugFlag
-.public Debug_SetLogFlag
-.public DisableIqSkill
-.public DrawTextInWindow
-.public DrawTileGrid
-.public DungeonSwapIdToIdx
-.public DungeonSwapIdxToId
-.public EnableAllLearnableIqSkills
-.public FORBIDDEN_FORGOT_MOVE_LIST
-.public FemaleToMaleForm
-.public FileClose
-.public FileRom_HandleOpen
-.public FileRom_HandleRead
-.public FileRom_HandleSeek
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
-.public FileRom_Veneer_FileInit
-.public FormatMoveStringMore
-.public GAME_MODE
-.public GLOBAL_PROGRESS_PTR
-.public GUEST_MONSTER_DATA
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetActualSellPrice
-.public GetAdvancedMenuCurrentOption
-.public GetAdvancedMenuResult
-.public GetAdvancedTextBoxFlags2
-.public GetBaseFormCastformCherrimDeoxys
-.public GetBodySize
-.public GetCurrentBagCapacity
-.public GetDexNumber
-.public GetDexNumberVeneer
-.public GetDungeonModeSpecial
-.public GetDungeonResultString
-.public GetEvolutionPossibilities
-.public GetHeldButtons
-.public GetHero
-.public GetHeroMemberIdx
-.public GetInfoGroundMoveset
-.public GetIqSkillStringId
-.public GetItemAtIdx
-.public GetItemCategory
-.public GetItemCategoryVeneer
-.public GetItemMoveId16
-.public GetKeyM2NSwitch
-.public GetLanguageType
-.public GetLearnableIqSkills
-.public GetMainCharacter1MemberIdx
-.public GetMainCharacter2MemberIdx
-.public GetMainCharacter3MemberIdx
-.public GetMaxItemsAllowed
-.public GetMaxMembersAllowed
-.public GetMaxPp
-.public GetMoneyCarried
-.public GetMoneyStored
-.public GetMonsterGenderVeneer
-.public GetMonsterName
-.public GetMoveRangeId
-.public GetMoveType
-.public GetNameRaw
-.public GetNameString
-.public GetNameWithGender
-.public GetNbItemsInBag
-.public GetNextIqSkill
-.public GetOptionsMenuResult
-.public GetOptionsMenuStates
-.public GetPartner
-.public GetPartnerMemberIdx
-.public GetPartyMembers
-.public GetPpIncrease
-.public GetPressedButtons
-.public GetRankUpEntry
-.public GetReleasedStylus
-.public GetRngSeed
-.public GetSimpleMenuResult
-.public GetSosMailCount
-.public GetSpeciesString
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetTime
-.public GetType
-.public GetWindow
-.public GuestMonsterToGroundMonster
-.public HidePortraitBox
-.public InitMove
-.public InitPreprocessorArgs
-.public IqSkillFlagTest
-.public Is2TurnsMove
-.public IsAdvancedMenuActive2
-.public IsAdvancedTextBoxActive
-.public IsCollectionMenuActive
-.public IsCollectionMenuState3
-.public IsDebugMenuActive
-.public IsDeoxys
-.public IsDialogueBoxActive
-.public IsExclusiveItemIdForMonster
-.public IsExperienceLocked
-.public IsGummi
-.public IsItemInTimeDarkness
-.public IsItemValidVeneer
-.public IsLevelResetDungeon
-.public IsMainCharacter
-.public IsMoneyAllowed
-.public IsMovesetValidInTimeDarkness
-.public IsNot2TurnsMoveOrSketch
-.public IsOptionsMenuActive
-.public IsParentMenuActive
-.public IsRealMove
-.public IsRecruitingAllowed
-.public IsScrollBoxActive
-.public IsShaymin
-.public IsShoppableItem
-.public IsSimpleMenuActive
-.public IsStorableItem
-.public IsStorageFull
-.public IsTeamSelectionMenuActive
-.public IsTeamSelectionMenuState3
-.public IsThrownItem
-.public IsTreasureBox
-.public IsValidTeamMember
-.public KAOMADO_FILEPATH
-.public KAOMADO_STREAM
-.public KEYBOARD_STRING_IDS
-.public LAST_NEW_MOVE
-.public LearnMoves
-.public LoadOverlay
-.public MISSION_FLOOR_RANKS_PTRS
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
-.public MemsetSimple
-.public NOTIFY_NOTE
-.public NormalizeTreasureBox
-.public OS_GetLockID
-.public OUTLAW_LEVEL_TABLE
-.public OUTLAW_MINION_LEVEL_TABLE
-.public OverlayIsLoaded
-.public PARTNER_TALK_KIND_TABLE
-.public PENDING_DUNGEON_ID
-.public PLAY_TIME_SECONDS
-.public PORTRAIT_LAYOUTS
-.public PlayAdvancedTextBoxInputSound
-.public PlayBgmByIdVeneer
-.public PlaySeVolumeWrapper
-.public PreprocessString
-.public PreprocessStringFromId
-.public Rand32Bit
-.public RandInt
-.public RandIntSafe
-.public ReadItemsFromSave
-.public ReadMonsterInfoFromSave
-.public ReadStringFromDialogueBox
-.public RemoveEmptyItemsInBag
-.public ResumeAdvancedMenu
-.public SCRIPT_VARS
-.public SCRIPT_VARS_LOCALS
-.public SCRIPT_VARS_VALUES
-.public SECONDARY_TERRAIN_TYPES
-.public SPECIAL_EPISODE_MAIN_CHARACTERS
-.public STATUSES_FULL_DESCRIPTION_STRING_IDS
-.public SetActiveInventory
-.public SetActiveKecleonShop
-.public SetActiveTeam
-.public SetAdvancedTextBoxField0x1C2
-.public SetAdvancedTextBoxPartialMenu
-.public SetAdvancedTextBoxState5
-.public SetBothScreensWindowsColor
-.public SetCollectionMenuField0x1BC
-.public SetCollectionMenuVoidFn
-.public SetCollectionMenuWidth
-.public SetMoneyCarried
-.public SetMoneyStored
-.public SetRngSeed
-.public SetSimpleMenuField0x1AC
-.public SetTeamSetupHeroAndPartnerOnly
-.public SetUnkAdvancedTextBoxFn
-.public SetUnkAdvancedTextBoxWindowFn
-.public ShowDialogueBox
-.public ShowPortraitInPortraitBox
-.public ShowStringIdInDialogueBox
-.public ShowStringInDialogueBox
-.public SortItemsInBag
-.public SortItemsInStorage
-.public StrcpySimple
-.public StringFromId
-.public StrncpyName
-.public StrncpySimple
-.public StrncpySimpleNoPad
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public TEAM_NAME
-.public TryPointCameraToMonster
-.public UpdateWindow
-.public VERSION_EXCLUSIVE_MONSTERS
-.public WONDER_MAIL_BITS_MAP
-.public WONDER_MAIL_BITS_SWAP
-.public WONDER_MAIL_ENCRYPTION_TABLE
-.public WriteItemsToSave
-.public WriteMonsterInfoToSave
 .public _0209B08C
 .public _0209B09C
 .public _0209B0EC
@@ -540,7 +274,210 @@
 .public _f2d
 .public _fsub
 .public _s32_div_f
+.public AddItemToStorage
+.public AddMoneyCarried
+.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
+.public ADVENTURE_LOG_PTR
+.public ApplyLevelUpBoostsToGroundMonster
+.public ARM9_UNKNOWN_DATA__NA_209E6BC
+.public ARM9_UNKNOWN_TABLE__NA_209E12C
+.public ARM9_UNKNOWN_TABLE__NA_209E164
+.public ARM9_UNKNOWN_TABLE__NA_209E280
+.public Arm9LoadUnkFieldNa0x2029EC8
+.public Arm9StoreUnkFieldNa0x2029ED8
+.public BAG_ITEMS_PTR_MIRROR
+.public CanMonsterUseMove
+.public CardBackupError
+.public CardPullOutWithStatus
+.public CheckDebugMenuField0x1A4
+.public CheckOptionsMenuField0x1A4
+.public CheckParentMenuField0x1A0
+.public ClearWindow
+.public CLIENT_LEVEL_TABLE
+.public CloseAdvancedMenu
+.public CloseAdvancedTextBox
+.public CloseAdvancedTextBox2
+.public CloseCollectionMenu
+.public CloseDebugMenu
+.public CloseDialogueBox
+.public CloseOptionsMenu
+.public CloseParentMenu
+.public ClosePortraitBox
+.public CloseScrollBox
+.public CloseSimpleMenu
+.public CloseTeamSelectionMenu
+.public CloseTextBox
+.public CloseTextBox2
+.public ConvertStorageItemAtIdxToItem
+.public Copy16BitsFrom
+.public CopyNStringFromId
+.public CountNbOfItemsInStorage
+.public CountNbOfValidItemsInStorage
+.public CountNbOfValidItemsInTimeDarknessInStorage
+.public CreateAdvancedMenu
+.public CreateAdvancedTextBox
+.public CreateAdvancedTextBoxWithArg
+.public CreateCollectionMenu
+.public CreateDebugMenu
+.public CreateDialogueBox
+.public CreateOptionsMenu
+.public CreateParentMenu
+.public CreateParentMenuFromStringIds
+.public CreatePortraitBox
+.public CreateScrollBoxMulti
+.public CreateScrollBoxSingle
+.public CreateSimpleMenu
+.public CreateSimpleMenuFromStringIds
+.public CreateTeamSelectionMenu
+.public CreateTextBox
+.public CreateTextBoxWithArg
+.public Debug_FatalError
+.public Debug_GetDebugFlag
+.public Debug_GetLogFlag
+.public Debug_Print
+.public Debug_Print0
+.public Debug_SetDebugFlag
+.public Debug_SetLogFlag
+.public DEBUG_SPECIAL_EPISODE_NUMBER
+.public DEFAULT_HERO_ID
+.public DisableIqSkill
+.public DrawTextInWindow
+.public DrawTileGrid
+.public DUNGEON_DATA_LIST
+.public DUNGEON_PTR
+.public DungeonSwapIdToIdx
+.public DungeonSwapIdxToId
+.public EnableAllLearnableIqSkills
+.public FemaleToMaleForm
+.public FileClose
+.public FileRom_HandleOpen
+.public FileRom_HandleRead
+.public FileRom_HandleSeek
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
+.public FORBIDDEN_FORGOT_MOVE_LIST
+.public FormatMoveStringMore
+.public GAME_MODE
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetActualSellPrice
+.public GetAdvancedMenuCurrentOption
+.public GetAdvancedMenuResult
+.public GetAdvancedTextBoxFlags2
+.public GetBaseFormCastformCherrimDeoxys
+.public GetBodySize
+.public GetCurrentBagCapacity
+.public GetDexNumber
+.public GetDexNumberVeneer
+.public GetDungeonModeSpecial
+.public GetDungeonResultString
+.public GetEvolutionPossibilities
+.public GetHeldButtons
+.public GetHero
+.public GetHeroMemberIdx
+.public GetInfoGroundMoveset
+.public GetIqSkillStringId
+.public GetItemAtIdx
+.public GetItemCategory
+.public GetItemCategoryVeneer
+.public GetItemMoveId16
+.public GetKeyM2NSwitch
+.public GetLanguageType
+.public GetLearnableIqSkills
+.public GetMainCharacter1MemberIdx
+.public GetMainCharacter2MemberIdx
+.public GetMainCharacter3MemberIdx
+.public GetMaxItemsAllowed
+.public GetMaxMembersAllowed
+.public GetMaxPp
+.public GetMoneyCarried
+.public GetMoneyStored
+.public GetMonsterGenderVeneer
+.public GetMonsterName
+.public GetMoveRangeId
+.public GetMoveType
+.public GetNameRaw
+.public GetNameString
+.public GetNameWithGender
+.public GetNbItemsInBag
+.public GetNextIqSkill
+.public GetOptionsMenuResult
+.public GetOptionsMenuStates
+.public GetPartner
+.public GetPartnerMemberIdx
+.public GetPartyMembers
+.public GetPpIncrease
+.public GetPressedButtons
+.public GetRankUpEntry
+.public GetReleasedStylus
+.public GetRngSeed
+.public GetSimpleMenuResult
+.public GetSosMailCount
+.public GetSpeciesString
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetTime
+.public GetType
+.public GetWindow
+.public GLOBAL_PROGRESS_PTR
+.public GUEST_MONSTER_DATA
+.public GuestMonsterToGroundMonster
+.public HidePortraitBox
+.public InitMove
+.public InitPreprocessorArgs
+.public IqSkillFlagTest
+.public Is2TurnsMove
+.public IsAdvancedMenuActive2
+.public IsAdvancedTextBoxActive
+.public IsCollectionMenuActive
+.public IsCollectionMenuState3
+.public IsDebugMenuActive
+.public IsDeoxys
+.public IsDialogueBoxActive
+.public IsExclusiveItemIdForMonster
+.public IsExperienceLocked
+.public IsGummi
+.public IsItemInTimeDarkness
+.public IsItemValidVeneer
+.public IsLevelResetDungeon
+.public IsMainCharacter
+.public IsMoneyAllowed
+.public IsMovesetValidInTimeDarkness
+.public IsNot2TurnsMoveOrSketch
+.public IsOptionsMenuActive
+.public IsParentMenuActive
+.public IsRealMove
+.public IsRecruitingAllowed
+.public IsScrollBoxActive
+.public IsShaymin
+.public IsShoppableItem
+.public IsSimpleMenuActive
+.public IsStorableItem
+.public IsStorageFull
+.public IsTeamSelectionMenuActive
+.public IsTeamSelectionMenuState3
+.public IsThrownItem
+.public IsTreasureBox
+.public IsValidTeamMember
+.public KAOMADO_FILEPATH
+.public KAOMADO_STREAM
+.public KEYBOARD_STRING_IDS
+.public LAST_NEW_MOVE
+.public LearnMoves
+.public LoadOverlay
+.public MemAlloc
 .public memcpy
+.public MemcpySimple
+.public MemFree
+.public MemsetSimple
+.public MemZero
+.public MISSION_FLOOR_RANKS_PTRS
+.public NormalizeTreasureBox
+.public NOTIFY_NOTE
+.public OS_GetLockID
+.public OUTLAW_LEVEL_TABLE
+.public OUTLAW_MINION_LEVEL_TABLE
 .public ov11_022E6E68
 .public ov11_023061CC
 .public ov11_023061E4
@@ -556,12 +493,65 @@
 .public ov29_022EA62C
 .public ov29_023002F0
 .public ov29_02347100
+.public OverlayIsLoaded
+.public PARTNER_TALK_KIND_TABLE
+.public PENDING_DUNGEON_ID
+.public PLAY_TIME_SECONDS
+.public PlayAdvancedTextBoxInputSound
+.public PlayBgmByIdVeneer
+.public PlaySeVolumeWrapper
+.public PORTRAIT_LAYOUTS
+.public PreprocessString
+.public PreprocessStringFromId
+.public Rand32Bit
+.public RandInt
+.public RandIntSafe
+.public ReadItemsFromSave
+.public ReadMonsterInfoFromSave
+.public ReadStringFromDialogueBox
+.public RemoveEmptyItemsInBag
+.public ResumeAdvancedMenu
+.public SCRIPT_VARS
+.public SCRIPT_VARS_LOCALS
+.public SCRIPT_VARS_VALUES
+.public SECONDARY_TERRAIN_TYPES
+.public SetActiveInventory
+.public SetActiveKecleonShop
+.public SetActiveTeam
+.public SetAdvancedTextBoxField0x1C2
+.public SetAdvancedTextBoxPartialMenu
+.public SetAdvancedTextBoxState5
+.public SetBothScreensWindowsColor
+.public SetCollectionMenuField0x1BC
+.public SetCollectionMenuVoidFn
+.public SetCollectionMenuWidth
+.public SetMoneyCarried
+.public SetMoneyStored
+.public SetRngSeed
+.public SetSimpleMenuField0x1AC
+.public SetTeamSetupHeroAndPartnerOnly
+.public SetUnkAdvancedTextBoxFn
+.public SetUnkAdvancedTextBoxWindowFn
+.public ShowDialogueBox
+.public ShowPortraitInPortraitBox
+.public ShowStringIdInDialogueBox
+.public ShowStringInDialogueBox
+.public SortItemsInBag
+.public SortItemsInStorage
+.public SPECIAL_EPISODE_MAIN_CHARACTERS
 .public sprintf
+.public STATUSES_FULL_DESCRIPTION_STRING_IDS
 .public strcat
 .public strcpy
+.public StrcpySimple
+.public StringFromId
 .public strlen
 .public strncmp
 .public strncpy
+.public StrncpyName
+.public StrncpySimple
+.public StrncpySimpleNoPad
+.public StrncpySimpleNoPadSafe
 .public sub_02001808
 .public sub_02002580
 .public sub_020027F8
@@ -739,4 +729,14 @@
 .public sub_02083B14
 .public sub_02083B3C
 .public sub_02084304
+.public TEAM_MEMBER_TABLE_PTR
+.public TEAM_NAME
+.public TryPointCameraToMonster
+.public UpdateWindow
+.public VERSION_EXCLUSIVE_MONSTERS
 .public vsprintf
+.public WONDER_MAIL_BITS_MAP
+.public WONDER_MAIL_BITS_SWAP
+.public WONDER_MAIL_ENCRYPTION_TABLE
+.public WriteItemsToSave
+.public WriteMonsterInfoToSave

asm/include/main_02051098.inc

@@ -1,66 +1,4 @@
 #pragma once
-.public ARM9_UNKNOWN_PTR__NA_20A2C84
-.public ARM9_UNKNOWN_TABLE__NA_20A20B0
-.public AllocateTemp1024ByteBufferFromPool
-.public ArrayCopy32
-.public ArrayFill32
-.public BAG_CAPACITY_TABLE
-.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES
-.public CopyBitsFrom
-.public CopyBitsTo
-.public DUNGEON_RESTRICTIONS
-.public Debug_Print0
-.public DecompressAtNormalVeneer
-.public DexNumbersEqual
-.public DirectoryFileMngr_OpenDirectoryFile
-.public DungeonFloorToGroupFloor
-.public DungeonToGroundMoveset
-.public EnableAllLearnableIqSkills
-.public FORBIDDEN_FORGOT_MOVE_LIST
-.public FemaleToMaleForm
-.public GetAtSize
-.public GetInfoGroundMoveset
-.public GetInfoMoveGround
-.public GetItemIdFromList
-.public GetKeyM2NSwitch
-.public GetKeyN2MSwitch
-.public GetLanguage
-.public GetMovesetEggPtr
-.public GetMovesetHmTmPtr
-.public GetMovesetIdx__02013CAC
-.public GetMovesetLevelUpPtr
-.public GetNbFloorsPlusOne
-.public GetNbMoves
-.public GroundToDungeonMoveset
-.public HIDDEN_POWER_BASE_POWER_TABLE
-.public HandleSir0Translation
-.public IsValidTeamMember
-.public ItemZInit
-.public LEVEL_UP_DATA_DECOMPRESS_BUFFER
-.public LEVEL_UP_DATA_MONSTER_ID
-.public LoadFileFromRom
-.public MISSION_FLOORS_FORBIDDEN
-.public MONSTER_SPRITE_DATA
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public PointsToZero
-.public RANK_UP_TABLE
-.public Rand16Bit
-.public RandIntSafe
-.public RemoveActiveMembersFromAllTeams
-.public RemoveActiveMembersFromRescueTeam
-.public RemoveActiveMembersFromSpecialEpisodeTeam
-.public StrcpyName
-.public StringFromId
-.public StrncmpSimple
-.public StrncpyName
-.public StrncpySimple
-.public TEAM_MEMBER_TABLE
-.public TEAM_MEMBER_TABLE_PTR
-.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
-.public UnloadFile
-.public ZInit8
 .public _020A0C68
 .public _020A0C69
 .public _020A0C6A
@@ -100,7 +38,64 @@
 .public _020B12F4_EU
 .public _020B1308_EU
 .public _s32_div_f
+.public AllocateTemp1024ByteBufferFromPool
+.public ARM9_UNKNOWN_PTR__NA_20A2C84
+.public ARM9_UNKNOWN_TABLE__NA_20A20B0
+.public ArrayCopy32
+.public ArrayFill32
+.public BAG_CAPACITY_TABLE
+.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES
+.public CopyBitsFrom
+.public CopyBitsTo
+.public Debug_Print0
+.public DecompressAtNormalVeneer
+.public DexNumbersEqual
+.public DirectoryFileMngr_OpenDirectoryFile
+.public DUNGEON_RESTRICTIONS
+.public DungeonFloorToGroupFloor
+.public DungeonToGroundMoveset
+.public EnableAllLearnableIqSkills
+.public FemaleToMaleForm
+.public FORBIDDEN_FORGOT_MOVE_LIST
+.public GetAtSize
+.public GetInfoGroundMoveset
+.public GetInfoMoveGround
+.public GetItemIdFromList
+.public GetKeyM2NSwitch
+.public GetKeyN2MSwitch
+.public GetLanguage
+.public GetMovesetEggPtr
+.public GetMovesetHmTmPtr
+.public GetMovesetIdx__02013CAC
+.public GetMovesetLevelUpPtr
+.public GetNbFloorsPlusOne
+.public GetNbMoves
+.public GroundToDungeonMoveset
+.public HandleSir0Translation
+.public HIDDEN_POWER_BASE_POWER_TABLE
+.public IsValidTeamMember
+.public ItemZInit
+.public LEVEL_UP_DATA_DECOMPRESS_BUFFER
+.public LEVEL_UP_DATA_MONSTER_ID
+.public LoadFileFromRom
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public MISSION_FLOORS_FORBIDDEN
+.public MONSTER_SPRITE_DATA
+.public PointsToZero
+.public Rand16Bit
+.public RandIntSafe
+.public RANK_UP_TABLE
+.public RemoveActiveMembersFromAllTeams
+.public RemoveActiveMembersFromRescueTeam
+.public RemoveActiveMembersFromSpecialEpisodeTeam
+.public StrcpyName
+.public StringFromId
+.public StrncmpSimple
 .public strncpy
+.public StrncpyName
+.public StrncpySimple
 .public sub_01FF8F28
 .public sub_0200302C
 .public sub_020030FC
@@ -131,4 +126,9 @@
 .public sub_020560B8
 .public sub_020564B0
 .public sub_02056504
+.public TEAM_MEMBER_TABLE
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
+.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
 .public vsprintf
+.public ZInit8

asm/include/main_02054C24.inc

@@ -1,4 +1,22 @@
 #pragma once
+.public _020A190C
+.public _020A333C
+.public _020A3340
+.public _020A3350
+.public _020A336C
+.public _020A3398
+.public _020A33B8
+.public _020A33D4
+.public _020A340C
+.public _020A343C
+.public _020A344C
+.public _020A3450
+.public _020A3468
+.public _020AFC28
+.public _020AFC4C
+.public _020B0A4C
+.public _022B5788
+.public _022B578C
 .public AddMoneyCarried
 .public CleanStickyItemsInBag
 .public CopyAndInterleaveWrapper
@@ -26,8 +44,8 @@
 .public GroundToDungeonMoveset
 .public HandleSir0Translation
 .public IQ_GROUP_SKILLS
-.public IQ_SKILLS
 .public IQ_SKILL_RESTRICTIONS
+.public IQ_SKILLS
 .public IqSkillFlagTest
 .public IsDeoxys
 .public IsLevelResetDungeon
@@ -45,27 +63,6 @@
 .public StrncpyName
 .public StrncpySimple
 .public StrncpySimpleNoPadSafe
-.public TACTICS_UNLOCK_LEVEL_TABLE
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public _020A190C
-.public _020A333C
-.public _020A3340
-.public _020A3350
-.public _020A336C
-.public _020A3398
-.public _020A33B8
-.public _020A33D4
-.public _020A340C
-.public _020A343C
-.public _020A344C
-.public _020A3450
-.public _020A3468
-.public _020AFC28
-.public _020AFC4C
-.public _020B0A4C
-.public _022B5788
-.public _022B578C
 .public sub_0200D8AC
 .public sub_0200FA0C
 .public sub_0201B43C
@@ -80,3 +77,6 @@
 .public sub_020534BC
 .public sub_02053D1C
 .public sub_02053F10
+.public TACTICS_UNLOCK_LEVEL_TABLE
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile

asm/include/main_02058F24.inc

@@ -1,225 +1,4 @@
 #pragma once
-.public ARM9_UNKNOWN_FUNCTION_TABLE__NA_20A3CF4
-.public ARM9_UNKNOWN_TABLE__NA_20A3CC8
-.public ARM9_UNKNOWN_TABLE__NA_20A3CE4
-.public ARM9_UNKNOWN_TABLE__NA_20A68BC
-.public AURA_BOW_STAT_BOOST
-.public AllocateTemp1024ByteBufferFromPool
-.public ArrayFill32Fast
-.public BulkItemToItem
-.public CanEvolve
-.public CloseCollectionMenu
-.public ClosePortraitBox
-.public Copy16BitsFrom
-.public CopyBitsFrom
-.public CopyBitsTo
-.public CopyMovesetFrom
-.public CopyMovesetTo
-.public CopyNStringFromId
-.public CreateCollectionMenu
-.public CreatePortraitBox
-.public DEF_SCARF_STAT_BOOST
-.public DEMO_TEAMS
-.public DRIVER_WORK
-.public DUNGEON_SWAP_ID_TABLE
-.public Debug_GetDebugFlag
-.public Debug_Print0
-.public DeleteWanTableEntryVeneer
-.public DexNumbersEqual
-.public DirectoryFileMngr_ExtractAllDirectoryFiles
-.public DirectoryFileMngr_OpenDirectoryFile
-.public DrawTextInWindow
-.public DungeonGoesUp
-.public ENTITIES
-.public EVENTS
-.public EnableAllLearnableIqSkills
-.public EnqueueRender3dTiling
-.public ExplorersOfSkyMain
-.public FemaleToMaleForm
-.public FileInit
-.public FindItemInInventory
-.public GetAbility
-.public GetAbilityDescStringId
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetAdventureLogDungeonFloor
-.public GetBaseForm
-.public GetBaseFormBurmyWormadamShellosGastrodonCherrim
-.public GetBodySize
-.public GetCategoryString
-.public GetDungeonMode
-.public GetEvoParameters
-.public GetExclusiveItem
-.public GetExecuteSpecialEpisodeType
-.public GetFirstMatchingMemberIdx
-.public GetHero
-.public GetHeroMemberIdx
-.public GetHpBoostFromExclusiveItems
-.public GetIqGroup
-.public GetIqSkillStringId
-.public GetLanguageType
-.public GetLearnableIqSkills
-.public GetLvlUpEntry
-.public GetMainCharacter1
-.public GetMainCharacter1MemberIdx
-.public GetMainCharacter2
-.public GetMainCharacter2MemberIdx
-.public GetMainCharacter3
-.public GetMainCharacter3MemberIdx
-.public GetMainTeamNameWithCheck
-.public GetMaxItemsAllowed
-.public GetMaxMembersAllowed
-.public GetMaxReachedFloor
-.public GetMaxRescueAttempts
-.public GetMonsterGenderVeneer
-.public GetNameRaw
-.public GetNameString
-.public GetNbFloors
-.public GetPartner
-.public GetPartnerMemberIdx
-.public GetPartyMembers
-.public GetPerformanceFlagWithChecks
-.public GetRank
-.public GetScenarioBalance
-.public GetSecondFormIfValid
-.public GetSpecialEpisodeType
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetTimer0Control
-.public GetType
-.public GetTypeStringId
-.public GlobalProgressAlloc
-.public HandleSir0TranslationVeneer
-.public HasMonsterBeenAttackedInDungeons
-.public IQ_GROUP_SKILLS
-.public IQ_SKILLS
-.public ITEM_DELIVERY_TABLE
-.public InitAnimationControlWithSet__0201C0B0
-.public InitKaomadoStream
-.public InitPreprocessorArgs
-.public InitScriptVariableValues
-.public InitSpecialEpisodeHero
-.public InitWanTable
-.public IqSkillFlagTest
-.public IsAuraBow
-.public IsCollectionMenuActive
-.public IsForbiddenFloor
-.public IsInvalidForMission
-.public IsItemAvailableInDungeonGroup
-.public IsItemInBag
-.public IsItemInTimeDarkness
-.public IsItemInTreasureBoxes
-.public IsItemValidVeneer
-.public IsMonsterOnTeam
-.public IsMonsterValid
-.public IsMovesetValid
-.public IsMovesetValidInTimeDarkness
-.public IsSpecialEpisodeOpen
-.public IsStorableItem
-.public IsThrownItem
-.public IsValidTargetItem
-.public JOB_MENU_ITEMS_1
-.public JOB_MENU_ITEMS_10
-.public JOB_MENU_ITEMS_11
-.public JOB_MENU_ITEMS_12
-.public JOB_MENU_ITEMS_13
-.public JOB_MENU_ITEMS_2
-.public JOB_MENU_ITEMS_3
-.public JOB_MENU_ITEMS_4
-.public JOB_MENU_ITEMS_5
-.public JOB_MENU_ITEMS_6
-.public JOB_MENU_ITEMS_7
-.public JOB_MENU_ITEMS_8
-.public JOB_MENU_ITEMS_9
-.public JOB_WINDOW_PARAMS_1
-.public JOB_WINDOW_PARAMS_2
-.public JoinedAtRangeCheck2
-.public KeyWaitInit
-.public LoadFileFromRom
-.public LoadOverlay
-.public LoadScriptVariableValue
-.public LoadTblTalk
-.public LoadWanTableEntry
-.public LoadWazaP
-.public LoadWteFromRom
-.public MAP_MARKER_PLACEMENTS
-.public MISSION_BANNED_MONSTERS
-.public MISSION_BANNED_STORY_MONSTERS
-.public MISSION_DELIVER_LIST_PTR
-.public MISSION_DUNGEON_UNLOCK_TABLE
-.public MISSION_MENU_STRING_IDS_1
-.public MISSION_MENU_STRING_IDS_2
-.public MISSION_RANK_POINTS
-.public MISSION_STRING_IDS
-.public MUNCH_BELT_STAT_BOOST
-.public MainGame
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
-.public MemsetSimple
-.public MissionToWonderMailPassword
-.public MultiplyByFixedPoint
-.public NO_SEND_ITEM_TABLE
-.public NoteLoadBase
-.public NoteSaveBase
-.public OverlayIsLoaded
-.public POWER_BAND_STAT_BOOST
-.public PlaySeVolumeWrapper
-.public PreprocessString
-.public PreprocessStringFromId
-.public RANK_STRING_PTR_TABLE
-.public REMOTE_STRING_PTR_TABLE
-.public Rand16Bit
-.public RandInt
-.public RandIntSafe
-.public RandRangeSafe
-.public ReadSaveHeader
-.public RemoveFirstUnequippedItemOfType
-.public RetrieveFromItemList2
-.public SMD_EVENTS_FUN_TABLE
-.public SPECIAL_BAND_STAT_BOOST
-.public STATUS_NAME_STRING_IDS
-.public SaveScriptVariableValue
-.public SetAdventureLogStructLocation
-.public SetAnimationForAnimationControl
-.public SetBothScreensWindowsColor
-.public SetCollectionMenuField0x1B2
-.public SetPokemonJoined
-.public SetQuestionMarks
-.public SetScenarioScriptVar
-.public SetSpecialEpisodeType
-.public SetSpriteIdForAnimationControl
-.public ShowPortraitInPortraitBox
-.public SoundEnvelopeParameters_CheckValidity
-.public SoundEnvelopeParameters_Reset
-.public SoundEnvelope_ForceVolume
-.public SoundEnvelope_Release
-.public SoundEnvelope_Reset
-.public SoundEnvelope_SetParameters
-.public SoundEnvelope_Stop
-.public SoundEnvelope_Stop2
-.public SoundEnvelope_Tick
-.public SoundLfoBank_Reset
-.public SoundLfoBank_Set
-.public SoundLfoBank_SetConstEnvelopes
-.public SoundLfoBank_Tick
-.public StartThread
-.public StrcpyName
-.public StringFromId
-.public StrncmpSimple
-.public StrncpyName
-.public StrncpySimple
-.public StrncpySimpleNoPadSafe
-.public TACTIC_NAME_STRING_IDS
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public UnloadOverlay
-.public UpdateTrackVolumeEnvelopes
-.public UpdateWindow
-.public WAN_TABLE
-.public ZINC_BAND_STAT_BOOST
-.public ZinitScriptVariable
 .public _020A1870
 .public _020A18FC
 .public _020A1904
@@ -391,7 +170,172 @@
 .public _fmul
 .public _s32_div_f
 .public _u32_div_f
+.public AllocateTemp1024ByteBufferFromPool
+.public ARM9_UNKNOWN_FUNCTION_TABLE__NA_20A3CF4
+.public ARM9_UNKNOWN_TABLE__NA_20A3CC8
+.public ARM9_UNKNOWN_TABLE__NA_20A3CE4
+.public ARM9_UNKNOWN_TABLE__NA_20A68BC
+.public ArrayFill32Fast
+.public AURA_BOW_STAT_BOOST
+.public BulkItemToItem
+.public CanEvolve
+.public CloseCollectionMenu
+.public ClosePortraitBox
+.public Copy16BitsFrom
+.public CopyBitsFrom
+.public CopyBitsTo
+.public CopyMovesetFrom
+.public CopyMovesetTo
+.public CopyNStringFromId
+.public CreateCollectionMenu
+.public CreatePortraitBox
+.public Debug_GetDebugFlag
+.public Debug_Print0
+.public DEF_SCARF_STAT_BOOST
+.public DelayWteFree
+.public DeleteWanTableEntryVeneer
+.public DEMO_TEAMS
+.public DexNumbersEqual
+.public DirectoryFileMngr_ExtractAllDirectoryFiles
+.public DirectoryFileMngr_OpenDirectoryFile
+.public DrawTextInWindow
+.public DRIVER_WORK
+.public DUNGEON_SWAP_ID_TABLE
+.public DungeonGoesUp
+.public EnableAllLearnableIqSkills
+.public EnqueueRender3dTiling
+.public ENTITIES
+.public EVENTS
+.public ExplorersOfSkyMain
+.public FemaleToMaleForm
+.public FileInit
+.public FindItemInInventory
+.public GetAbility
+.public GetAbilityDescStringId
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetAdventureLogDungeonFloor
+.public GetBaseForm
+.public GetBaseFormBurmyWormadamShellosGastrodonCherrim
+.public GetBodySize
+.public GetCategoryString
+.public GetDungeonMode
+.public GetEvoParameters
+.public GetExclusiveItem
+.public GetExecuteSpecialEpisodeType
+.public GetFirstMatchingMemberIdx
+.public GetHero
+.public GetHeroMemberIdx
+.public GetHpBoostFromExclusiveItems
+.public GetIqGroup
+.public GetIqSkillStringId
+.public GetLanguageType
+.public GetLearnableIqSkills
+.public GetLvlUpEntry
+.public GetMainCharacter1
+.public GetMainCharacter1MemberIdx
+.public GetMainCharacter2
+.public GetMainCharacter2MemberIdx
+.public GetMainCharacter3
+.public GetMainCharacter3MemberIdx
+.public GetMainTeamNameWithCheck
+.public GetMaxItemsAllowed
+.public GetMaxMembersAllowed
+.public GetMaxReachedFloor
+.public GetMaxRescueAttempts
+.public GetMonsterGenderVeneer
+.public GetNameRaw
+.public GetNameString
+.public GetNbFloors
+.public GetPartner
+.public GetPartnerMemberIdx
+.public GetPartyMembers
+.public GetPerformanceFlagWithChecks
+.public GetRank
+.public GetScenarioBalance
+.public GetSecondFormIfValid
+.public GetSpecialEpisodeType
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetTimer0Control
+.public GetType
+.public GetTypeStringId
+.public GlobalProgressAlloc
+.public HandleSir0TranslationVeneer
+.public HasMonsterBeenAttackedInDungeons
+.public InitAnimationControlWithSet__0201C0B0
+.public InitKaomadoStream
+.public InitPreprocessorArgs
+.public InitScriptVariableValues
+.public InitSpecialEpisodeHero
+.public InitWanTable
+.public IQ_GROUP_SKILLS
+.public IQ_SKILLS
+.public IqSkillFlagTest
+.public IsAuraBow
+.public IsCollectionMenuActive
+.public IsForbiddenFloor
+.public IsInvalidForMission
+.public IsItemAvailableInDungeonGroup
+.public IsItemInBag
+.public IsItemInTimeDarkness
+.public IsItemInTreasureBoxes
+.public IsItemValidVeneer
+.public IsMonsterOnTeam
+.public IsMonsterValid
+.public IsMovesetValid
+.public IsMovesetValidInTimeDarkness
+.public IsSpecialEpisodeOpen
+.public IsStorableItem
+.public IsThrownItem
+.public IsValidTargetItem
+.public ITEM_DELIVERY_TABLE
+.public JOB_MENU_ITEMS_1
+.public JOB_MENU_ITEMS_10
+.public JOB_MENU_ITEMS_11
+.public JOB_MENU_ITEMS_12
+.public JOB_MENU_ITEMS_13
+.public JOB_MENU_ITEMS_2
+.public JOB_MENU_ITEMS_3
+.public JOB_MENU_ITEMS_4
+.public JOB_MENU_ITEMS_5
+.public JOB_MENU_ITEMS_6
+.public JOB_MENU_ITEMS_7
+.public JOB_MENU_ITEMS_8
+.public JOB_MENU_ITEMS_9
+.public JOB_WINDOW_PARAMS_1
+.public JOB_WINDOW_PARAMS_2
+.public JoinedAtRangeCheck2
+.public KeyWaitInit
+.public LoadFileFromRom
+.public LoadOverlay
+.public LoadScriptVariableValue
+.public LoadTblTalk
+.public LoadWanTableEntry
+.public LoadWazaP
+.public LoadWteFromRom
+.public MainGame
+.public MAP_MARKER_PLACEMENTS
+.public MemAlloc
+.public MemcpySimple
+.public MemFree
 .public memset
+.public MemsetSimple
+.public MemZero
+.public MISSION_BANNED_MONSTERS
+.public MISSION_BANNED_STORY_MONSTERS
+.public MISSION_DELIVER_LIST_PTR
+.public MISSION_DUNGEON_UNLOCK_TABLE
+.public MISSION_MENU_STRING_IDS_1
+.public MISSION_MENU_STRING_IDS_2
+.public MISSION_RANK_POINTS
+.public MISSION_STRING_IDS
+.public MissionToWonderMailPassword
+.public MultiplyByFixedPoint
+.public MUNCH_BELT_STAT_BOOST
+.public NO_SEND_ITEM_TABLE
+.public NoteLoadBase
+.public NoteSaveBase
 .public ov00_022BE0C8
 .public ov01_02337B3C
 .public ov01_02337B68
@@ -412,9 +356,57 @@
 .public ov10_022C24DC
 .public ov11_022E82CC
 .public ov11_022E96E4
+.public OverlayIsLoaded
+.public PlaySeVolumeWrapper
+.public POWER_BAND_STAT_BOOST
+.public PreprocessString
+.public PreprocessStringFromId
+.public Rand16Bit
+.public RandInt
+.public RandIntSafe
+.public RandRangeSafe
+.public RANK_STRING_PTR_TABLE
+.public ReadSaveHeader
+.public REMOTE_STRING_PTR_TABLE
+.public RemoveFirstUnequippedItemOfType
+.public RetrieveFromItemList2
+.public SaveScriptVariableValue
+.public SetAdventureLogStructLocation
+.public SetAnimationForAnimationControl
+.public SetBothScreensWindowsColor
+.public SetCollectionMenuField0x1B2
+.public SetPokemonJoined
+.public SetQuestionMarks
+.public SetScenarioScriptVar
+.public SetSpecialEpisodeType
+.public SetSpriteIdForAnimationControl
+.public ShowPortraitInPortraitBox
+.public SMD_EVENTS_FUN_TABLE
+.public SoundEnvelope_ForceVolume
+.public SoundEnvelope_Release
+.public SoundEnvelope_Reset
+.public SoundEnvelope_SetParameters
+.public SoundEnvelope_Stop
+.public SoundEnvelope_Stop2
+.public SoundEnvelope_Tick
+.public SoundEnvelopeParameters_CheckValidity
+.public SoundEnvelopeParameters_Reset
+.public SoundLfoBank_Reset
+.public SoundLfoBank_Set
+.public SoundLfoBank_SetConstEnvelopes
+.public SoundLfoBank_Tick
+.public SPECIAL_BAND_STAT_BOOST
+.public StartThread
+.public STATUS_NAME_STRING_IDS
 .public strcat
 .public strcpy
+.public StrcpyName
+.public StringFromId
 .public strncat
+.public StrncmpSimple
+.public StrncpyName
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
 .public sub_020018D0
 .public sub_02001980
 .public sub_02001AB0
@@ -457,7 +449,6 @@
 .public sub_0201E020
 .public sub_0201E050
 .public sub_0201E12C
-.public sub_0201E13C
 .public sub_0201E380
 .public sub_0201E7D8
 .public sub_0201F208
@@ -597,4 +588,13 @@
 .public sub_0207F748
 .public sub_0207F808
 .public sub_0207F828
+.public TACTIC_NAME_STRING_IDS
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
+.public UnloadOverlay
+.public UpdateTrackVolumeEnvelopes
+.public UpdateWindow
 .public vsprintf
+.public WAN_TABLE
+.public ZINC_BAND_STAT_BOOST
+.public ZinitScriptVariable

asm/include/main_0207F894.inc

@@ -1,23 +1,4 @@
 #pragma once
-.public ArrayCopy32
-.public ArrayFill32
-.public ArrayFill32Fast
-.public CopyAndInterleave
-.public EnableIrqFlag
-.public FileInit
-.public GetIrqFlag
-.public MIi_UncompressBackward
-.public MemcpyFast
-.public MemsetFast
-.public OS_GetLockID
-.public OSi_ReferSymbol
-.public SVC_CpuSet
-.public SVC_WaitByLoop
-.public SetIrqFlag
-.public StartThread
-.public ThreadExit
-.public WaitForInterrupt
-.public WaitForever2
 .public _02000BC4
 .public _020AEC5C
 .public _020B2BB4
@@ -66,6 +47,20 @@
 .public _022BCA74
 .public _f2d
 .public _ll_udiv
+.public ArrayCopy32
+.public ArrayFill32
+.public ArrayFill32Fast
+.public CopyAndInterleave
+.public EnableIrqFlag
+.public FileInit
+.public GetIrqFlag
+.public MemcpyFast
+.public MemsetFast
+.public MIi_UncompressBackward
+.public OS_GetLockID
+.public OSi_ReferSymbol
+.public SetIrqFlag
+.public StartThread
 .public sub_02078A98
 .public sub_02078C3C
 .public sub_02078C68
@@ -111,3 +106,8 @@
 .public sub_0207F70C
 .public sub_0207F818
 .public sub_02086B7C
+.public SVC_CpuSet
+.public SVC_WaitByLoop
+.public ThreadExit
+.public WaitForever2
+.public WaitForInterrupt

asm/include/overlay_10.inc

@@ -1,10 +1,10 @@
 #pragma once
 .public CalcMenuHeightDiv8__020329E4
 .public GetWindowRectangle
-.public INVENTORY_MENU_DEFAULT_WINDOW_PARAMS
 .public InitInventoryMenuInput
+.public INVENTORY_MENU_DEFAULT_WINDOW_PARAMS
 .public MemAlloc
 .public NewWindowScreenCheck
-.public UpdateInventoryMenu
 .public sub_020265A8
 .public sub_0203299C
+.public UpdateInventoryMenu

asm/include/overlay_10_022BCC7C.inc

@@ -1,4 +1,8 @@
 #pragma once
+.public _020AFC4C
+.public _020B0A5C
+.public _s32_div_f
+.public abs
 .public BAG_ITEMS_PTR_MIRROR
 .public CleanStickyItemsInBag
 .public ClearWindow
@@ -16,6 +20,7 @@
 .public DeleteWindow
 .public DirectoryFileMngr_GetDirectoryFileSize
 .public DirectoryFileMngr_OpenDirectoryFile
+.public DoesNotSaveWhenEntering
 .public DoMoveAbsorb
 .public DoMoveAttract
 .public DoMoveBeatUp
@@ -34,6 +39,10 @@
 .public DoMoveCrunch
 .public DoMoveCrushClaw
 .public DoMoveCurse
+.public DoMoveDamage__02325DC0
+.public DoMoveDamage__0232A500
+.public DoMoveDamage__0232B8B0
+.public DoMoveDamage__0232DD88
 .public DoMoveDamageBoostAllStats
 .public DoMoveDamageBurn10FlameWheel
 .public DoMoveDamageConfuse10
@@ -59,10 +68,6 @@
 .public DoMoveDamageStealItem
 .public DoMoveDamageWeightDependent
 .public DoMoveDamageWithRecoil
-.public DoMoveDamage__02325DC0
-.public DoMoveDamage__0232A500
-.public DoMoveDamage__0232B8B0
-.public DoMoveDamage__0232DD88
 .public DoMoveDefog
 .public DoMoveDestinyBond
 .public DoMoveDoubleEdge
@@ -89,8 +94,8 @@
 .public DoMoveGust
 .public DoMoveGyroBall
 .public DoMoveHammerArm
-.public DoMoveHeadSmash
 .public DoMoveHeadbutt
+.public DoMoveHeadSmash
 .public DoMoveHeartSwap
 .public DoMoveHiddenPower
 .public DoMoveHornDrill
@@ -140,8 +145,8 @@
 .public DoMoveSwapItems
 .public DoMoveTaunt
 .public DoMoveThunderFang
-.public DoMoveThunderWave
 .public DoMoveThundershock
+.public DoMoveThunderWave
 .public DoMoveTickle
 .public DoMoveTorment
 .public DoMoveToxic
@@ -155,7 +160,6 @@
 .public DoMoveWillOWisp
 .public DoMoveWrap
 .public DoMoveYawn
-.public DoesNotSaveWhenEntering
 .public DrawTextInWindow
 .public EFFECT_ANIMATION_INFO
 .public ExplorersOfSkyMain
@@ -177,7 +181,6 @@
 .public GroundMainLoop
 .public HandleSir0Translation
 .public HidePortraitBox
-.public ITEM_ANIMATION_INFO
 .public IncrementNbFriendRescues
 .public InitAnimationControlWithSet__0201C0B0
 .public InitEventFlagScriptVars
@@ -187,49 +190,20 @@
 .public InitRender3dElement64
 .public IsLosableItem
 .public IsNoLossPenaltyDungeon
+.public ITEM_ANIMATION_INFO
 .public ItemZInit
 .public LoadFileFromRom
 .public LoadOverlay
 .public LoadScriptVariableValue
 .public LoadWanTableEntryFromPack
 .public LoadWteFromFileDirectory
-.public MOVE_ANIMATION_INFO
 .public MemAlloc
-.public MemFree
-.public MemZero
 .public Memcpy32
+.public MemFree
 .public MemsetSimple
+.public MemZero
+.public MOVE_ANIMATION_INFO
 .public MultiplyByFixedPoint
-.public PreprocessString
-.public ProcessWte
-.public Rand16Bit
-.public RandInt
-.public RemoveEmptyItemsInBag
-.public RemoveHolderForItemInBag
-.public RunDungeonMode
-.public SPECIAL_MONSTER_MOVE_ANIMATION_INFO
-.public SaveScriptVariableValue
-.public SetAndPlayAnimationForAnimationControl
-.public SetAnimationForAnimationControl
-.public SetMoneyCarried
-.public SetPortraitEmotion
-.public SetPortraitLayout
-.public SetPortraitOffset
-.public SetSpriteIdForAnimationControl
-.public ShowPortraitInPortraitBox
-.public StartFadeDungeonWrapper
-.public SwitchAnimationControlToNextFrame
-.public TEAM_MEMBER_TABLE_PTR
-.public TRAP_ANIMATION_INFO
-.public UnloadFile
-.public UnloadOverlay
-.public UnloadWte
-.public UpdateWindow
-.public WAN_TABLE
-.public _020AFC4C
-.public _020B0A5C
-.public _s32_div_f
-.public abs
 .public ov10_022C43A4
 .public ov10_022C43B0
 .public ov10_022C43C0
@@ -294,6 +268,24 @@
 .public ov29_022EA428
 .public ov29_0234C584
 .public ov29_0234C5EC
+.public PreprocessString
+.public ProcessWte
+.public Rand16Bit
+.public RandInt
+.public RemoveEmptyItemsInBag
+.public RemoveHolderForItemInBag
+.public RunDungeonMode
+.public SaveScriptVariableValue
+.public SetAndPlayAnimationForAnimationControl
+.public SetAnimationForAnimationControl
+.public SetMoneyCarried
+.public SetPortraitEmotion
+.public SetPortraitLayout
+.public SetPortraitOffset
+.public SetSpriteIdForAnimationControl
+.public ShowPortraitInPortraitBox
+.public SPECIAL_MONSTER_MOVE_ANIMATION_INFO
+.public StartFadeDungeonWrapper
 .public strcmp
 .public strcpy
 .public sub_02001808
@@ -398,4 +390,12 @@
 .public sub_020640DC
 .public sub_0206423C
 .public sub_020642A8
+.public SwitchAnimationControlToNextFrame
+.public TEAM_MEMBER_TABLE_PTR
+.public TRAP_ANIMATION_INFO
+.public UnloadFile
+.public UnloadOverlay
+.public UnloadWte
+.public UpdateWindow
 .public vsprintf
+.public WAN_TABLE

asm/include/overlay_11.inc

@@ -63,6 +63,7 @@
 .public Debug_Print
 .public Debug_Print0
 .public DecompressAtNormalVeneer
+.public DelayWteFree
 .public DeleteWanTableEntryVeneer
 .public DeleteWindow
 .public DrawTeamStats
@@ -519,7 +520,6 @@
 .public sub_0201DF38
 .public sub_0201E020
 .public sub_0201E12C
-.public sub_0201E13C
 .public sub_0201E7D8
 .public sub_0201F2A0
 .public sub_0201F2E4

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_022E2810.inc

@@ -1,7 +1,8 @@
 #pragma once
+.public abs
 .public CanSeeInvisibleMonsters
-.public DUNGEON_PTR
 .public DrawMinimapTile
+.public DUNGEON_PTR
 .public EntityIsValid__022E1A1C
 .public EntityIsValid__022E32E8
 .public GetForcedLossReason
@@ -11,11 +12,6 @@
 .public IsPositionActuallyInSight
 .public IsPositionInSight
 .public ItemIsActive__022E330C
-.public StringFromId
-.public TeamMemberHasEnabledIqSkill
-.public UpdateMinimap
-.public UpdateTrapsVisibility
-.public abs
 .public ov29_022E34C8
 .public ov29_022E3534
 .public ov29_022E3A58
@@ -30,5 +26,9 @@
 .public ov29_0234B034
 .public ov29_0237C84C
 .public strcpy
+.public StringFromId
 .public sub_02009194
 .public sub_020091B0
+.public TeamMemberHasEnabledIqSkill
+.public UpdateMinimap
+.public UpdateTrapsVisibility

asm/include/overlay_29_022E335C.inc

@@ -2,16 +2,12 @@
 .public AdvanceFrame
 .public AnimationDelayOrSomething
 .public AnimationHasMoreFrames
-.public DUNGEON_PTR
 .public DisplayUi
+.public DUNGEON_PTR
 .public EntityIsValid__022E37B8
 .public GetEffectAnimationField0x19
 .public GetTileSafe
 .public LogMessageByIdWithPopupCheckUser
-.public ShouldDisplayEntityAdvanced
-.public UpdateCamera
-.public UpdateMinimap
-.public UpdateTrapsVisibility
 .public ov10_022BF274
 .public ov10_022BF2B4
 .public ov10_022BF8E8
@@ -19,5 +15,9 @@
 .public ov29_022E2C6C
 .public ov29_0235110C
 .public ov29_0235354C
+.public ShouldDisplayEntityAdvanced
 .public sub_0201C000
 .public sub_0201CF90
+.public UpdateCamera
+.public UpdateMinimap
+.public UpdateTrapsVisibility

asm/include/overlay_29_022E37DC.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public abs
 .public AdvanceFrame
 .public AnimationHasMoreFrames
 .public CanMonsterSpawn
@@ -9,9 +10,9 @@
 .public CloseTextBox2
 .public CreateTextBox
 .public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DisplayAnimatedNumbers
 .public DrawTextInWindow
+.public DUNGEON_PTR
 .public DungeonFloorToGroupFloor
 .public DungeonGetSpriteIndex
 .public DungeonGetTotalSpriteFileSize
@@ -56,35 +57,6 @@
 .public MemZero
 .public MonsterIsType
 .public NeedsItemToSpawn
-.public PlayEffectAnimationEntity
-.public RandIntSafe
-.public STATUS_ICON_ARRAY_BIDE
-.public STATUS_ICON_ARRAY_BLINDED
-.public STATUS_ICON_ARRAY_BURN
-.public STATUS_ICON_ARRAY_CRINGE
-.public STATUS_ICON_ARRAY_CURSE
-.public STATUS_ICON_ARRAY_FREEZE
-.public STATUS_ICON_ARRAY_INVISIBLE
-.public STATUS_ICON_ARRAY_LEECH_SEED
-.public STATUS_ICON_ARRAY_LONG_TOSS
-.public STATUS_ICON_ARRAY_MAGNET_RISE
-.public STATUS_ICON_ARRAY_MIRACLE_EYE
-.public STATUS_ICON_ARRAY_MUZZLED
-.public STATUS_ICON_ARRAY_REFLECT
-.public STATUS_ICON_ARRAY_SLEEP
-.public STATUS_ICON_ARRAY_SURE_SHOT
-.public SetMinimapDataE447
-.public SetMinimapDataE448
-.public SetMonsterId
-.public ShouldDisplayEntityWrapper
-.public StartFadeDungeonWrapper
-.public StringFromId
-.public SubstitutePlaceholderStringTags
-.public TOP_SCREEN_STATUS_PTR
-.public UnloadFile
-.public UpdateMinimap
-.public UpdateWindow
-.public abs
 .public ov10_022BDC68
 .public ov10_022BDE50
 .public ov10_022BEC08
@@ -153,6 +125,29 @@
 .public ov29_0235354C
 .public ov29_02353558
 .public ov29_0237C850
+.public PlayEffectAnimationEntity
+.public RandIntSafe
+.public SetMinimapDataE447
+.public SetMinimapDataE448
+.public SetMonsterId
+.public ShouldDisplayEntityWrapper
+.public StartFadeDungeonWrapper
+.public STATUS_ICON_ARRAY_BIDE
+.public STATUS_ICON_ARRAY_BLINDED
+.public STATUS_ICON_ARRAY_BURN
+.public STATUS_ICON_ARRAY_CRINGE
+.public STATUS_ICON_ARRAY_CURSE
+.public STATUS_ICON_ARRAY_FREEZE
+.public STATUS_ICON_ARRAY_INVISIBLE
+.public STATUS_ICON_ARRAY_LEECH_SEED
+.public STATUS_ICON_ARRAY_LONG_TOSS
+.public STATUS_ICON_ARRAY_MAGNET_RISE
+.public STATUS_ICON_ARRAY_MIRACLE_EYE
+.public STATUS_ICON_ARRAY_MUZZLED
+.public STATUS_ICON_ARRAY_REFLECT
+.public STATUS_ICON_ARRAY_SLEEP
+.public STATUS_ICON_ARRAY_SURE_SHOT
+.public StringFromId
 .public sub_0200B330
 .public sub_0200B3D4
 .public sub_0201C000
@@ -164,3 +159,8 @@
 .public sub_02048400
 .public sub_0204AEA0
 .public sub_0204AF58
+.public SubstitutePlaceholderStringTags
+.public TOP_SCREEN_STATUS_PTR
+.public UnloadFile
+.public UpdateMinimap
+.public UpdateWindow

asm/include/overlay_29_022E91A4.inc

@@ -1,11 +1,11 @@
 #pragma once
+.public _020AFC4C
+.public abs
 .public DUNGEON_PTR
 .public EntityIsValid__022E95F4
 .public GetTile
 .public GetVisibilityRange
 .public LEADER_PTR
-.public _020AFC4C
-.public abs
 .public ov29_0237C888
 .public ov29_0237C88A
 .public ov29_0237C88E

asm/include/overlay_29_022ECDE4.inc

@@ -1,10 +1,12 @@
 #pragma once
+.public _020AFC4C
+.public _020AFC70
 .public AdvanceFrame
 .public ApplyTrapEffect
 .public AreLateGameTrapsEnabled
 .public CreateMonsterSummaryFromMonster
-.public DUNGEON_PTR
 .public DrawMinimapTile
+.public DUNGEON_PTR
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public EnemyEvolution
@@ -23,17 +25,8 @@
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserTarget
 .public LogMessageByIdWithPopupCheckUserUnknown
-.public MemZero
-.public ProcessWte
-.public SpawnTrap
-.public StringFromId
-.public SubstitutePlaceholderStringTags
-.public TRAP_BUSTER_ACTIVATION_CHANCE
-.public UpdateShopkeeperModeAfterTrap
-.public UpdateTrapsVisibility
-.public _020AFC4C
-.public _020AFC70
 .public memset
+.public MemZero
 .public ov29_022E2CA0
 .public ov29_022E56A0
 .public ov29_022E58B0
@@ -47,8 +40,15 @@
 .public ov29_0237C864
 .public ov29_0237C974
 .public ov29_0237C99C
+.public ProcessWte
+.public SpawnTrap
 .public strcpy
+.public StringFromId
 .public sub_0201B9F8
 .public sub_0201E080
 .public sub_0201F2A0
 .public sub_02024FC8
+.public SubstitutePlaceholderStringTags
+.public TRAP_BUSTER_ACTIVATION_CHANCE
+.public UpdateShopkeeperModeAfterTrap
+.public UpdateTrapsVisibility

asm/include/overlay_29_022F52B0.inc

@@ -2,8 +2,8 @@
 .public ApplyItemEffect
 .public CanMonsterUseItem
 .public ChangeMonsterAnimation
-.public DUNGEON_PTR
 .public DecrementStackItem
+.public DUNGEON_PTR
 .public DungeonRandInt
 .public EntityIsValid__022F528C
 .public ExclusiveItemEffectFlagTest
@@ -15,14 +15,6 @@
 .public LogItemBlockedByEmbargo
 .public LogMessageByIdWithPopupCheckUser
 .public MonsterHasEmbargoStatus
-.public RemoveEmptyItemsInBagWrapper
-.public RemoveEquivItemNoHole
-.public RemoveGroundItem
-.public RemoveUsedItem
-.public ShouldDisplayEntityWrapper
-.public ShouldMonsterRunAwayVariation
-.public SpawnItem
-.public TryTriggerMonsterHouse
 .public ov29_022E56A0
 .public ov29_022E5728
 .public ov29_022E9A9C
@@ -40,3 +32,11 @@
 .public ov29_02347518
 .public ov29_02347BC8
 .public ov29_0234B034
+.public RemoveEmptyItemsInBagWrapper
+.public RemoveEquivItemNoHole
+.public RemoveGroundItem
+.public RemoveUsedItem
+.public ShouldDisplayEntityWrapper
+.public ShouldMonsterRunAwayVariation
+.public SpawnItem
+.public TryTriggerMonsterHouse

asm/include/overlay_29_022F59C4.inc

@@ -1,12 +1,13 @@
 #pragma once
+.public _s32_div_f
 .public AllocateTemp1024ByteBufferFromPool
 .public AreMovesEnabled
 .public CheckTeamMemberIdxVeneer
 .public CheckVariousStatuses2
 .public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DisplayMessage
 .public DisplayMessage2
+.public DUNGEON_PTR
 .public EnemyEvolution
 .public EntityIsValid__022F528C
 .public EntityIsValid__022F62A8
@@ -28,13 +29,6 @@
 .public IsMonsterIdInNormalRangeVeneer
 .public IsSecretBazaarNpcBehavior
 .public LogMessageByIdWithPopupCheckUser
-.public ShouldUsePp
-.public SubstitutePlaceholderStringTags
-.public TryActivateTruant
-.public UpdateMapSurveyorFlag
-.public UpdateMovePp
-.public YesNoMenu
-.public _s32_div_f
 .public ov29_022E690C
 .public ov29_022E8104
 .public ov29_022E81F8
@@ -62,7 +56,13 @@
 .public ov29_02352750
 .public ov29_02352758
 .public ov29_0237CA80
+.public ShouldUsePp
 .public strcpy
 .public strncpy
 .public sub_02020880
 .public sub_02024FB8
+.public SubstitutePlaceholderStringTags
+.public TryActivateTruant
+.public UpdateMapSurveyorFlag
+.public UpdateMovePp
+.public YesNoMenu

asm/include/overlay_29_022FEDBC.inc

@@ -17,14 +17,14 @@
 .public IsMonsterSleeping
 .public ItemIsActive__022FF898
 .public LogMessageByIdWithPopupCheckUser
-.public SetActionPassTurnOrWalk
-.public SetActionUseMovePlayer
-.public SetMonsterActionFields
-.public SubstitutePlaceholderStringTags
-.public TickStatusTurnCounter
 .public ov29_022E56A0
 .public ov29_022FAA04
 .public ov29_02300DCC
 .public ov29_02318D58
 .public ov29_02322374
 .public ov29_0237C9B8
+.public SetActionPassTurnOrWalk
+.public SetActionUseMovePlayer
+.public SetMonsterActionFields
+.public SubstitutePlaceholderStringTags
+.public TickStatusTurnCounter

asm/include/overlay_29_022FF8C8.inc

@@ -1,9 +1,9 @@
 #pragma once
 .public AbilityIsActive
 .public DUNGEON_PTR
+.public EntityIsValid__023000E4
 .public EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST
 .public EXCL_ITEM_EFFECTS_WEATHER_MOVE_SPEED_BOOST
-.public EntityIsValid__023000E4
 .public ExclusiveItemEffectFlagTest
 .public GetApparentWeather
 .public GetExclusiveItemWithEffectFromBag
@@ -15,7 +15,7 @@
 .public ItemIsActive__022FF898
 .public LogMessageByIdWithPopupCheckUser
 .public MonsterIsType
-.public SubstitutePlaceholderStringTags
-.public UpdateStateFlags
 .public ov29_022E655C
 .public ov29_02344B44
+.public SubstitutePlaceholderStringTags
+.public UpdateStateFlags

asm/include/overlay_29_02301D84.inc

@@ -1,7 +1,7 @@
 #pragma once
 .public AbilityIsActive
-.public DUNGEON_PTR
 .public DefenderAbilityIsActive__02301A0C
+.public DUNGEON_PTR
 .public EntityIsValid__023000E4
 .public GravityIsActive
 .public ov29_022FAFD4

asm/include/overlay_29_02301FBC.inc

@@ -1,16 +1,17 @@
 #pragma once
+.public _s32_div_f
 .public AbilityIsActive
 .public CanLearnIqSkill
 .public CanSeeTarget
 .public CanThrowItems
-.public DUNGEON_PTR
 .public DisableIqSkill
-.public EXCLUSIVE_ITEM_EXP_BOOST
-.public EXP_ELITE_EXP_BOOST
+.public DUNGEON_PTR
 .public EnableIqSkill
 .public EntityIsValid__023000E4
+.public EXCLUSIVE_ITEM_EXP_BOOST
 .public ExclusiveItemEffectFlagTest
 .public ExclusiveItemEffectIsActive__022FFF28
+.public EXP_ELITE_EXP_BOOST
 .public GetEntityNaturalGiftInfo
 .public GetEntityWeatherBallType
 .public GetExclusiveItemWithEffectFromBag
@@ -31,9 +32,8 @@
 .public MIN_IQ_ITEM_MASTER
 .public MIRACLE_CHEST_EXP_BOOST
 .public MultiplyByFixedPoint
-.public SubstitutePlaceholderStringTags
-.public WONDER_CHEST_EXP_BOOST
-.public _s32_div_f
 .public ov29_022FBDE0
 .public ov29_02301A84
 .public ov29_02344B44
+.public SubstitutePlaceholderStringTags
+.public WONDER_CHEST_EXP_BOOST

asm/include/overlay_29_02307F4C.inc

@@ -8,8 +8,8 @@
 .public GetMonsterIdToSpawn
 .public GetTileAtEntity
 .public GetTileSafe
-.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS
 .public MewSpawnCheck
+.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS
 .public MultiplyByFixedPoint
-.public SpawnMonster
 .public ov10_022C4560
+.public SpawnMonster

asm/include/overlay_29_0230AA0C.inc

@@ -1,17 +1,19 @@
 #pragma once
-.public AFTERMATH_CHANCE
-.public AIR_BLADE_DAMAGE_MULTIPLIER
-.public AURA_BOW_STAT_BOOST
+.public _s32_div_f
 .public AbilityIsActiveVeneer
+.public abs
 .public AddFixedPoint64
 .public AdvanceFrame
+.public AFTERMATH_CHANCE
+.public AIR_BLADE_DAMAGE_MULTIPLIER
 .public ApplyDamageAndEffects
+.public AURA_BOW_STAT_BOOST
 .public AuraBowIsActive
 .public BURN_DAMAGE_MULTIPLIER
-.public CLOUDY_DAMAGE_MULTIPLIER
 .public CanSeeTarget
 .public CeilFixedPoint
 .public ClampedLn
+.public CLOUDY_DAMAGE_MULTIPLIER
 .public DAMAGE_FORMULA_AT_PREFACTOR
 .public DAMAGE_FORMULA_CONSTANT_SHIFT
 .public DAMAGE_FORMULA_DEF_PREFACTOR
@@ -25,13 +27,13 @@
 .public DAMAGE_MULTIPLIER_0_5
 .public DAMAGE_MULTIPLIER_1_5
 .public DAMAGE_MULTIPLIER_2
-.public DEFENSIVE_STAT_STAGE_MULTIPLIERS
-.public DEF_SCARF_STAT_BOOST
-.public DUNGEON_PTR
-.public DebugRecruitingEnabled
 .public Debug_Print0
+.public DebugRecruitingEnabled
+.public DEF_SCARF_STAT_BOOST
 .public DefenderAbilityIsActive__0230A940
+.public DEFENSIVE_STAT_STAGE_MULTIPLIERS
 .public DivideFixedPoint64
+.public DUNGEON_PTR
 .public DungeonModeSetupAndShowNameKeyboard
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
@@ -39,8 +41,8 @@
 .public EnsureCanStandCurrentTile
 .public EntityIsValid__02308FBC
 .public ExclusiveItemDefenseBoost
-.public ExclusiveItemEffectIsActiveWithLogging
 .public ExclusiveItemEffectIsActive__0230A9B8
+.public ExclusiveItemEffectIsActiveWithLogging
 .public ExclusiveItemOffenseBoost
 .public FixedPoint32To64
 .public FixedPoint64CmpLt
@@ -72,8 +74,8 @@
 .public IsFloating
 .public IsFullFloorFixedRoom
 .public IsLegendaryChallengeFloor
-.public IsMonsterOnTeam
 .public IsMonster__0230A994
+.public IsMonsterOnTeam
 .public IsPunchMove
 .public IsRecoilMove
 .public IsRecruitingAllowed
@@ -93,52 +95,16 @@
 .public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER
 .public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER
 .public ME_FIRST_MULTIPLIER
-.public MUNCH_BELT_STAT_BOOST
 .public MemZero
 .public MonsterHasNegativeStatus
 .public MonsterIsType
 .public MoveIsNotPhysical
 .public MultiplyByFixedPoint
 .public MultiplyFixedPoint64
+.public MUNCH_BELT_STAT_BOOST
 .public NearbyAllyIqSkillIsEnabled
 .public OFFENSIVE_STAT_STAGE_MULTIPLIERS
 .public OtherMonsterAbilityIsActive
-.public POWER_BAND_STAT_BOOST
-.public POWER_PITCHER_DAMAGE_MULTIPLIER
-.public PlayEffectAnimation0x171
-.public PlayEffectAnimation0x171Full
-.public PlayEffectAnimation0x18E
-.public PlayEffectAnimation0x1A9__022E6130
-.public PlayEffectAnimation0x1A9__022E617C
-.public PlayEffectAnimation0x1A9__022E61C8
-.public PlayEffectAnimation0x1A9__022E6214
-.public PlayEffectAnimation0x1A9__022E64C4
-.public PlayEffectAnimation0x1A9__022E6510
-.public PlayEffectAnimationEntity
-.public PointCameraToMonster
-.public RECRUITMENT_LEVEL_BOOST_TABLE
-.public ResetDamageData
-.public RoundUpDiv256
-.public SCOPE_LENS_CRIT_RATE_BOOST
-.public SOLID_ROCK_MULTIPLIER
-.public SPECIAL_BAND_STAT_BOOST
-.public SUPER_LUCK_CRIT_RATE_BOOST
-.public SetItemAcquired
-.public SetPokemonJoined
-.public StrcpySimple
-.public StrncpyName
-.public StrncpySimpleNoPad
-.public SubstitutePlaceholderStringTags
-.public TECHNICIAN_MOVE_POWER_THRESHOLD
-.public TINTED_LENS_MULTIPLIER
-.public TYPE_ADVANTAGE_MASTER_CRIT_RATE
-.public TYPE_MATCHUP_COMBINATOR_TABLE
-.public TYPE_MATCHUP_TABLE
-.public TryAftermathExplosion
-.public UpdateStateFlags
-.public ZINC_BAND_STAT_BOOST
-.public _s32_div_f
-.public abs
 .public ov10_022BDE50
 .public ov10_022BF964
 .public ov10_022C4410
@@ -183,6 +149,40 @@
 .public ov29_02352990
 .public ov29_0235299C
 .public ov29_023535D4
+.public PlayEffectAnimation0x171
+.public PlayEffectAnimation0x171Full
+.public PlayEffectAnimation0x18E
+.public PlayEffectAnimation0x1A9__022E6130
+.public PlayEffectAnimation0x1A9__022E617C
+.public PlayEffectAnimation0x1A9__022E61C8
+.public PlayEffectAnimation0x1A9__022E6214
+.public PlayEffectAnimation0x1A9__022E64C4
+.public PlayEffectAnimation0x1A9__022E6510
+.public PlayEffectAnimationEntity
+.public PointCameraToMonster
+.public POWER_BAND_STAT_BOOST
+.public POWER_PITCHER_DAMAGE_MULTIPLIER
+.public RECRUITMENT_LEVEL_BOOST_TABLE
+.public ResetDamageData
+.public RoundUpDiv256
+.public SCOPE_LENS_CRIT_RATE_BOOST
+.public SetItemAcquired
+.public SetPokemonJoined
+.public SOLID_ROCK_MULTIPLIER
+.public SPECIAL_BAND_STAT_BOOST
+.public StrcpySimple
+.public StrncpyName
+.public StrncpySimpleNoPad
 .public sub_02056698
 .public sub_020584FC
 .public sub_020585B4
+.public SubstitutePlaceholderStringTags
+.public SUPER_LUCK_CRIT_RATE_BOOST
+.public TECHNICIAN_MOVE_POWER_THRESHOLD
+.public TINTED_LENS_MULTIPLIER
+.public TryAftermathExplosion
+.public TYPE_ADVANTAGE_MASTER_CRIT_RATE
+.public TYPE_MATCHUP_COMBINATOR_TABLE
+.public TYPE_MATCHUP_TABLE
+.public UpdateStateFlags
+.public ZINC_BAND_STAT_BOOST

asm/include/overlay_29_0230E5A8.inc

@@ -11,6 +11,12 @@
 .public GetTile
 .public LogMessageByIdWithPopup
 .public MewSpawnCheck
+.public ov29_022E62F0
+.public ov29_022FBC94
+.public ov29_022FD318
+.public ov29_0234B034
+.public ov29_0234BB50
+.public ov29_0234D6C8
 .public PreprocessString
 .public SPAWN_CAP_NO_MONSTER_HOUSE
 .public SPAWN_CAP_WITH_MONSTER_HOUSE
@@ -18,14 +24,8 @@
 .public SPAWN_COOLDOWN_THIEF_ALERT
 .public SpawnMonster
 .public StringFromId
-.public SubstitutePlaceholderStringTags
-.public ov29_022E62F0
-.public ov29_022FBC94
-.public ov29_022FD318
-.public ov29_0234B034
-.public ov29_0234BB50
-.public ov29_0234D6C8
 .public sub_020534BC
 .public sub_02055CCC
 .public sub_02055D7C
 .public sub_02056830
+.public SubstitutePlaceholderStringTags

asm/include/overlay_29_0230F02C.inc

@@ -1,7 +1,8 @@
 #pragma once
-.public AI_THROWN_ITEM_ACTION_CHOICE_COUNT
 .public AbilityIsActiveVeneer
+.public abs
 .public AddMoneyCarried
+.public AI_THROWN_ITEM_ACTION_CHOICE_COUNT
 .public BAG_ITEMS_PTR_MIRROR
 .public CanSeeTarget
 .public DUNGEON_PTR
@@ -21,11 +22,6 @@
 .public IsFloorOver
 .public ItemIsActive__0230F810
 .public LogMessageByIdWithPopup
-.public RemoveGroundItem
-.public ShouldMonsterRunAwayVariation
-.public SubstitutePlaceholderStringTags
-.public UseThrowableItem
-.public abs
 .public ov29_022EACCC
 .public ov29_022F52BC
 .public ov29_022F9EA0
@@ -36,4 +32,8 @@
 .public ov29_02348D3C
 .public ov29_02348DD8
 .public ov29_02348ECC
+.public RemoveGroundItem
+.public ShouldMonsterRunAwayVariation
 .public sub_0200D8AC
+.public SubstitutePlaceholderStringTags
+.public UseThrowableItem

asm/include/overlay_29_02311064.inc

@@ -26,12 +26,12 @@
 .public IsFloorOver
 .public ItemIsActive__02311034
 .public LogMessageByIdWithPopupCheckUser
+.public ov10_022C4674
+.public ov10_022C46F8
+.public ov29_0234B294
+.public ov29_02353318
 .public RAIN_ABILITY_BONUS_REGEN
 .public SubstitutePlaceholderStringTags
 .public TickStatusTurnCounter
 .public UpdateStatusIconFlags
 .public WISH_BONUS_REGEN
-.public ov10_022C4674
-.public ov10_022C46F8
-.public ov29_0234B294
-.public ov29_02353318

asm/include/overlay_29_023118D8.inc

@@ -7,8 +7,8 @@
 .public IsProtectedFromNegativeStatus
 .public ItemIsActive__02311BF8
 .public LogMessageByIdWithPopupCheckUserTarget
+.public ov29_022E3E74
+.public ov29_02304A48
 .public SafeguardIsActive
 .public SubstitutePlaceholderStringTags
 .public TryActivateQuickFeet
-.public ov29_022E3E74
-.public ov29_02304A48

asm/include/overlay_29_02311C28.inc

@@ -6,9 +6,9 @@
 .public CalcStatusDuration
 .public ChangeShayminForme
 .public CopyStringFromId
+.public DefenderAbilityIsActive__02311B94
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
-.public DefenderAbilityIsActive__02311B94
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public EntityIsValid__023118B4
@@ -25,12 +25,6 @@
 .public LogMessageByIdWithPopupCheckUserTarget
 .public MonsterIsType
 .public MultiplyByFixedPoint
-.public SECONDARY_TERRAIN_TYPES
-.public SPEED_BOOST_TURN_RANGE
-.public SafeguardIsActive
-.public SubstitutePlaceholderStringTags
-.public TryActivateSteadfast
-.public UpdateStatusIconFlags
 .public ov10_022C4618
 .public ov10_022C4728
 .public ov10_022C479C
@@ -90,3 +84,9 @@
 .public ov29_0234B084
 .public ov29_0234B0B4
 .public ov29_02353318
+.public SafeguardIsActive
+.public SECONDARY_TERRAIN_TYPES
+.public SPEED_BOOST_TURN_RANGE
+.public SubstitutePlaceholderStringTags
+.public TryActivateSteadfast
+.public UpdateStatusIconFlags

asm/include/overlay_29_0231516C.inc

@@ -1,16 +1,17 @@
 #pragma once
-.public ATK_STAT_IDX
+.public _s32_div_f
 .public AbilityIsActiveVeneer
 .public AdvanceFrame
 .public AiMovement
 .public AnimationDelayOrSomething
+.public ATK_STAT_IDX
 .public BoostDefensiveStat
 .public BoostOffensiveStat
 .public CalcStatusDuration
 .public CeilFixedPoint
-.public DUNGEON_PTR
 .public DetermineMonsterShadow
 .public DisplayAnimatedNumbers
+.public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonRandInt
 .public EndCurseClassStatus
@@ -32,18 +33,6 @@
 .public MonsterIsType
 .public MonsterSpawnListPartialCopy
 .public MultiplyByFixedPoint
-.public PERISH_SONG_TURN_RANGE
-.public SafeguardIsActive
-.public ShouldDisplayEntityWrapper
-.public SubFixedPoint
-.public SubstitutePlaceholderStringTags
-.public TryActivateQuickFeet
-.public TryRemoveSnatchedMonsterFromDungeonStruct
-.public UpdateCamera
-.public UpdateMinimap
-.public UpdateStatusIconFlags
-.public UpdateTrapsVisibility
-.public _s32_div_f
 .public ov10_022C4470
 .public ov10_022C44B0
 .public ov10_022C4784
@@ -95,9 +84,20 @@
 .public ov29_02304830
 .public ov29_0234B09C
 .public ov29_0234B0B4
+.public PERISH_SONG_TURN_RANGE
+.public SafeguardIsActive
+.public ShouldDisplayEntityWrapper
 .public strcpy
 .public sub_02001888
 .public sub_02024FB8
 .public sub_02050EBC
 .public sub_02050F78
 .public sub_02050FF8
+.public SubFixedPoint
+.public SubstitutePlaceholderStringTags
+.public TryActivateQuickFeet
+.public TryRemoveSnatchedMonsterFromDungeonStruct
+.public UpdateCamera
+.public UpdateMinimap
+.public UpdateStatusIconFlags
+.public UpdateTrapsVisibility

asm/include/overlay_29_02319FB0.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public _s32_div_f
 .public AbilityIsActiveVeneer
 .public CanAttackInDirection
 .public DIRECTIONS_XY
@@ -14,7 +15,6 @@
 .public IsBlinded
 .public IsMonsterSleeping
 .public MonsterHasNegativeStatus
-.public _s32_div_f
 .public ov29_023007DC
 .public ov29_0230B7D4
 .public ov29_0230F8D0

asm/include/overlay_29_0231A7A0.inc

@@ -9,10 +9,10 @@
 .public IsFloorOver
 .public IsMonster__0231A9D4
 .public LogMessageByIdWithPopupCheckUser
-.public SubstitutePlaceholderStringTags
-.public TryActivateTruant
-.public UpdateMovePp
 .public ov10_022C459C
 .public ov29_022E3ED0
 .public ov29_022FA574
 .public ov29_0232145C
+.public SubstitutePlaceholderStringTags
+.public TryActivateTruant
+.public UpdateMovePp

asm/include/overlay_29_0231CBEC.inc

@@ -1,6 +1,7 @@
 #pragma once
-.public ATK_STAT_IDX
+.public _020A1894
 .public AbilityIsActiveVeneer
+.public ATK_STAT_IDX
 .public BoostIQ
 .public BoostOffensiveStat
 .public CalcDamageFixedNoCategory
@@ -9,19 +10,15 @@
 .public ChangeShayminForme
 .public CheckVariousStatuses2
 .public ClearMonsterActionFields
-.public DUNGEON_PTR
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DisplayMessage2
+.public DUNGEON_PTR
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public EndBurnClassStatus
 .public EndFrozenClassStatus
 .public EntityIsValid__0231CBC8
 .public FemaleToMaleForm
-.public GINSENG_CHANCE_3
-.public GUMMI_BELLY_RESTORE_TABLE
-.public GUMMI_IQ_STRING_IDS
-.public GUMMI_LIKE_STRING_IDS
 .public GetActiveTeamMember
 .public GetApparentWeather
 .public GetDoughSeedFlag
@@ -30,6 +27,10 @@
 .public GetMoveMaxGinsengBoost
 .public GetPerformanceFlagWithChecks
 .public GetWeatherColorTable
+.public GINSENG_CHANCE_3
+.public GUMMI_BELLY_RESTORE_TABLE
+.public GUMMI_IQ_STRING_IDS
+.public GUMMI_LIKE_STRING_IDS
 .public HandleMovesMenuWrapper0
 .public HandleMovesMenuWrapper1
 .public HandleSir0Translation
@@ -45,26 +46,6 @@
 .public LowerDefensiveStat
 .public LowerOffensiveStat
 .public MusicTableIdxToMusicId
-.public RemoveUsedItem
-.public RestoreAllMovePP
-.public SPATK_STAT_IDX
-.public SetDoughSeedFlag
-.public SetMonsterActionFields
-.public ShouldDisplayEntityWrapper
-.public SubstitutePlaceholderStringTags
-.public TryDecreaseBelly
-.public TryIncreaseBelly
-.public TryInflictBurnStatus
-.public TryInflictEndureStatus
-.public TryInflictParalysisStatus
-.public TryInflictPoisonedStatus
-.public TryInflictShadowHoldStatus
-.public TryWarp
-.public UnloadFile
-.public UpdateMinimap
-.public WONDER_GUMMI_IQ_GAIN
-.public YesNoMenu
-.public _020A1894
 .public ov10_022C44CC
 .public ov10_022C44E8
 .public ov10_022C45D4
@@ -113,5 +94,24 @@
 .public ov31_02386204
 .public ov31_02386308
 .public ov31_023877EC
+.public RemoveUsedItem
+.public RestoreAllMovePP
+.public SetDoughSeedFlag
+.public SetMonsterActionFields
+.public ShouldDisplayEntityWrapper
+.public SPATK_STAT_IDX
 .public sub_02050FF8
 .public sub_02053D1C
+.public SubstitutePlaceholderStringTags
+.public TryDecreaseBelly
+.public TryIncreaseBelly
+.public TryInflictBurnStatus
+.public TryInflictEndureStatus
+.public TryInflictParalysisStatus
+.public TryInflictPoisonedStatus
+.public TryInflictShadowHoldStatus
+.public TryWarp
+.public UnloadFile
+.public UpdateMinimap
+.public WONDER_GUMMI_IQ_GAIN
+.public YesNoMenu

asm/include/overlay_29_0231E8F0.inc

@@ -1,8 +1,8 @@
 #pragma once
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DetermineAllMonsterShadow
 .public DetermineTileWalkableNeighbors
+.public DIRECTIONS_XY
+.public DUNGEON_PTR
 .public EAT_ITEM_EFFECT_IGNORE_LIST
 .public EnsureCanStandCurrentTile
 .public EntityIsValid__0231EDD8
@@ -15,9 +15,6 @@
 .public IsFullFloorFixedRoom
 .public IsItemValidVeneer
 .public LogMessageByIdWithPopupCheckUser
-.public StairsAlwaysReachable
-.public UpdateMinimap
-.public UpdateTrapsVisibility
 .public ov29_022E0378
 .public ov29_022EA370
 .public ov29_022F9C74
@@ -25,3 +22,6 @@
 .public ov29_0233665C
 .public ov29_0233785C
 .public ov29_0233FB1C
+.public StairsAlwaysReachable
+.public UpdateMinimap
+.public UpdateTrapsVisibility

asm/include/overlay_29_023350FC.inc

@@ -1,12 +1,14 @@
 #pragma once
+.public _020AFC70
+.public _s32_div_f
 .public AbilityIsActiveVeneer
-.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
 .public CalcSpeedStageWrapper
 .public CalcStatusDuration
+.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
 .public CeilFixedPoint
 .public Conversion2IsActive
-.public DUNGEON_PTR
 .public DetermineMonsterShadow
+.public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonGoesUp
 .public EntityIsValid__023350D8
@@ -23,13 +25,6 @@
 .public LoadWteFromFileDirectory
 .public LoadWtuFromBin
 .public LogMessageByIdWithPopupCheckUser
-.public ProcessWte
-.public SPORT_CONDITION_TURN_RANGE
-.public SetBothScreensWindowColorToDefault
-.public SetScreenWindowsColor
-.public TickStatusTurnCounter
-.public _020AFC70
-.public _s32_div_f
 .public ov29_022DE608
 .public ov29_022E65F4
 .public ov29_022E9A6C
@@ -42,6 +37,11 @@
 .public ov29_0237CA8C
 .public ov29_0237CA90
 .public ov29_0237CA96
+.public ProcessWte
+.public SetBothScreensWindowColorToDefault
+.public SetScreenWindowsColor
+.public SPORT_CONDITION_TURN_RANGE
 .public sub_0201E020
 .public sub_0201E080
 .public sub_0201F2A0
+.public TickStatusTurnCounter

asm/include/overlay_29_02336164.inc

@@ -1,10 +1,10 @@
 #pragma once
-.public DEFAULT_TILE
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public Debug_Print0
+.public DEFAULT_TILE
 .public DetermineMonsterShadow
+.public DIRECTIONS_XY
 .public DrawMinimapTile
+.public DUNGEON_PTR
 .public EntityIsValid__02337CA8
 .public GetBgRegionArea
 .public GetLeader
@@ -15,8 +15,6 @@
 .public IsCurrentFixedRoomBossFight
 .public IsGoldenChamber
 .public IsSecretBazaar
-.public RandIntSafe
-.public SECONDARY_TERRAIN_TYPES
 .public ov10_022C2588
 .public ov10_022C25EC
 .public ov10_022C2638
@@ -39,6 +37,8 @@
 .public ov29_0237CAA0
 .public ov29_0237CAAC
 .public ov29_0237CAB8
+.public RandIntSafe
+.public SECONDARY_TERRAIN_TYPES
 .public sub_0204AED0
 .public sub_02051D8C
 .public sub_02051E60

asm/include/overlay_29_0233861C.inc

@@ -5,6 +5,7 @@
 .public abs
 .public ConvertWallsToChasms
 .public CORNER_CARDINAL_NEIGHBOR_IS_OPEN
+.public DelayWteFree
 .public DIRECTIONS_XY
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DUNGEON_PTR
@@ -86,7 +87,6 @@
 .public sub_0200B3FC
 .public sub_0200C008
 .public sub_0201B9F8
-.public sub_0201E13C
 .public sub_0201F2A0
 .public sub_0204AEA0
 .public sub_0204AEC0

asm/include/overlay_29_023456BC.inc

@@ -1,10 +1,12 @@
 #pragma once
+.public _020AFC4C
+.public _s32_div_f
 .public AdvanceFrame
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
 .public DISPLACEMENTS_WITHIN_3
-.public DUNGEON_PTR
 .public DisplayMessage2
 .public DrawMinimapTile
+.public DUNGEON_PTR
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public EntityIsValid__02345698
@@ -25,14 +27,6 @@
 .public LogMessageByIdQuiet
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserUnknown
-.public RetrieveFromItemList1
-.public SECONDARY_TERRAIN_TYPES
-.public SetEntityPixelPosXY
-.public ShouldDisplayEntityWrapper
-.public SpawnItem
-.public UNOWN_STONE_DROP_CHANCE
-.public _020AFC4C
-.public _s32_div_f
 .public ov10_022C44C8
 .public ov10_022C48EC
 .public ov29_022E563C
@@ -46,8 +40,14 @@
 .public ov29_023537B4
 .public ov29_023537BC
 .public ov29_0237C864
+.public RetrieveFromItemList1
+.public SECONDARY_TERRAIN_TYPES
+.public SetEntityPixelPosXY
+.public ShouldDisplayEntityWrapper
+.public SpawnItem
 .public sub_020018D0
 .public sub_0200D1FC
 .public sub_0201B9F8
 .public sub_02024FE8
 .public sub_0204F7A8
+.public UNOWN_STONE_DROP_CHANCE

asm/include/overlay_29_02346834.inc

@@ -1,4 +1,6 @@
 #pragma once
+.public _s32_div_f
+.public abs
 .public AddMoneyCarried
 .public AdvanceFrame
 .public ApplyItemEffect
@@ -6,8 +8,8 @@
 .public CleanStickyItemsInBag
 .public ClearItem
 .public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DoesProjectileHitTarget
+.public DUNGEON_PTR
 .public DungeonRand16Bit
 .public DungeonRandInt
 .public EntityIsValid__02345698
@@ -39,17 +41,6 @@
 .public LogMessageByIdWithPopupCheckUserTarget
 .public MONEY_QUANTITY_TABLE
 .public MonsterHasEmbargoStatus
-.public RemoveEmptyItemsInBag
-.public SetEntityPixelPosXY
-.public SetItemAcquired
-.public SpawnDroppedItem
-.public SubstitutePlaceholderStringTags
-.public TestItemAiFlag
-.public TwoTurnMoveForcedMiss
-.public UpdateEntityPixelPos
-.public YesNoMenu
-.public _s32_div_f
-.public abs
 .public ov10_022C4CD8
 .public ov29_022E09E8
 .public ov29_022E9488
@@ -67,9 +58,18 @@
 .public ov29_0234B4CC
 .public ov29_023516FC
 .public ov29_023531C8
+.public RemoveEmptyItemsInBag
+.public SetEntityPixelPosXY
+.public SetItemAcquired
+.public SpawnDroppedItem
 .public sub_020018D0
 .public sub_0200CF6C
 .public sub_0200D894
 .public sub_0200D8AC
 .public sub_02053D1C
 .public sub_02057CE8
+.public SubstitutePlaceholderStringTags
+.public TestItemAiFlag
+.public TwoTurnMoveForcedMiss
+.public UpdateEntityPixelPos
+.public YesNoMenu

asm/itcm.s

@@ -57,8 +57,8 @@ _01FF80AC:
 	ldmia sp!, {r0, r1, r2, r3, r4, r5, r6, r7, pc}
 	arm_func_end CopyAndInterleave
 
-	arm_func_start sub_01FF80B0
-sub_01FF80B0: ; 0x01FF80B0
+	arm_func_start CopyAndInterleave0
+CopyAndInterleave0: ; 0x01FF80B0
 	stmdb sp!, {r0, r1, r2, r3, r4, r5, r6, r7, lr}
 	and r3, r3, #0xf
 	mov r6, #0
@@ -89,7 +89,7 @@ _01FF80C4:
 	blt _01FF80C4
 _01FF811C:
 	ldmia sp!, {r0, r1, r2, r3, r4, r5, r6, r7, pc}
-	arm_func_end sub_01FF80B0
+	arm_func_end CopyAndInterleave0
 _01FF8120:
 	.word Render3dRectangle
 	.word Render3dQuadrilateral

asm/main_0200ED1C.s

@@ -15470,8 +15470,8 @@ sub_0201AAD8: ; 0x0201AAD8
 	bx lr
 	arm_func_end sub_0201AAD8
 
-	arm_func_start sub_0201AB0C
-sub_0201AB0C: ; 0x0201AB0C
+	arm_func_start ExecuteCopyToFlatVramCommand
+ExecuteCopyToFlatVramCommand: ; 0x0201AB0C
 	stmdb sp!, {r3, lr}
 	mov ip, r0
 	ldr r1, [ip, #4]
@@ -15500,7 +15500,7 @@ _0201AB60:
 	ldr r2, [ip]
 	ldr r0, [ip, #8]
 	mov r2, r2, asr #1
-	bl sub_01FF80B0
+	bl CopyAndInterleave0
 	ldmia sp!, {r3, pc}
 _0201AB7C:
 	ldr r1, [ip, #8]
@@ -15508,7 +15508,7 @@ _0201AB7C:
 	mov r0, #0
 	bl ArrayFill32
 	ldmia sp!, {r3, pc}
-	arm_func_end sub_0201AB0C
+	arm_func_end ExecuteCopyToFlatVramCommand
 
 	arm_func_start sub_0201AB90
 sub_0201AB90: ; 0x0201AB90
@@ -15522,8 +15522,8 @@ sub_0201AB90: ; 0x0201AB90
 _0201ABA8: .word MemZero
 	arm_func_end sub_0201AB90
 
-	arm_func_start sub_0201ABAC
-sub_0201ABAC: ; 0x0201ABAC
+	arm_func_start DecodeFragmentByteAssemblyTable
+DecodeFragmentByteAssemblyTable: ; 0x0201ABAC
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
 	sub sp, sp, #0x18
 	mov r7, #0
@@ -15541,7 +15541,7 @@ _0201ABCC:
 	bl sub_0201AAD8
 	mov r4, r0
 	mov r0, r5
-	bl sub_0201AB0C
+	bl ExecuteCopyToFlatVramCommand
 	add r8, r8, r4
 	add r7, r7, r4
 _0201ABF8:
@@ -15551,7 +15551,7 @@ _0201ABF8:
 	mov r0, r7
 	add sp, sp, #0x18
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
-	arm_func_end sub_0201ABAC
+	arm_func_end DecodeFragmentByteAssemblyTable
 
 	arm_func_start sub_0201AC10
 sub_0201AC10: ; 0x0201AC10
@@ -15659,7 +15659,7 @@ sub_0201AD44: ; 0x0201AD44
 	b _0201AD70
 _0201AD5C:
 	add r0, r6, r4, lsl #4
-	bl sub_0201AB0C
+	bl ExecuteCopyToFlatVramCommand
 	add r0, r4, #1
 	mov r0, r0, lsl #0x10
 	mov r4, r0, asr #0x10
@@ -16115,14 +16115,14 @@ sub_0201B2DC: ; 0x0201B2DC
 	bhs _0201B344
 	mov r2, ip
 	add r1, r5, lr
-	bl sub_0201ABAC
+	bl DecodeFragmentByteAssemblyTable
 	mov ip, r0
 	b _0201B37C
 _0201B344:
 	mov r3, ip
 	add r1, r5, lr
 	mov r2, #2
-	bl sub_0201ABAC
+	bl DecodeFragmentByteAssemblyTable
 	mov ip, r0
 	b _0201B37C
 _0201B35C:
@@ -16132,7 +16132,7 @@ _0201B35C:
 	mov r0, r1
 	mov r2, ip
 	add r1, r5, lr
-	bl sub_0201ABAC
+	bl DecodeFragmentByteAssemblyTable
 	mov ip, r0
 _0201B37C:
 	mov r0, ip
@@ -19428,11 +19428,11 @@ sub_0201DE10: ; 0x0201DE10
 	ldr r0, _0201DE48 ; =_020AFC70
 	ldr r0, [r0]
 	add r0, r0, #0xbc
-	bl sub_0201E230
+	bl PerformPlannedTextureVramTransfer
 	ldr r0, _0201DE48 ; =_020AFC70
 	ldr r0, [r0]
 	add r0, r0, #0xbc
-	bl sub_0201E1D4
+	bl ResetPlannedVramTransfer
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0201DE48: .word _020AFC70
@@ -19606,7 +19606,7 @@ sub_0201E050: ; 0x0201E050
 	mov r1, r0
 	mov r2, lr
 	add r0, ip, #0xbc
-	bl sub_0201E1E0
+	bl PlanCopyTextureToTextureVram
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0201E07C: .word _020AFC70
@@ -19623,7 +19623,7 @@ sub_0201E080: ; 0x0201E080
 	mov r1, r0
 	mov r3, r2
 	add r0, ip, #0xbc
-	bl sub_0201E1E0
+	bl PlanCopyTextureToTextureVram
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0201E0AC: .word _020AFC70
@@ -19647,7 +19647,7 @@ ProcessWte: ; 0x0201E0B0
 	ldr r0, [r0]
 	mov r2, ip
 	add r0, r0, #0xbc
-	bl sub_0201E1E0
+	bl PlanCopyTextureToTextureVram
 _0201E0F4:
 	ldr r0, [r6, #0x18]
 	cmp r0, #0
@@ -19676,8 +19676,8 @@ sub_0201E12C: ; 0x0201E12C
 _0201E138: .word ProcessWte
 	arm_func_end sub_0201E12C
 
-	arm_func_start sub_0201E13C
-sub_0201E13C: ; 0x0201E13C
+	arm_func_start DelayWteFree
+DelayWteFree: ; 0x0201E13C
 	stmdb sp!, {r3, r4, lr}
 	sub sp, sp, #4
 	mov r2, #2
@@ -19689,7 +19689,7 @@ sub_0201E13C: ; 0x0201E13C
 	ldr r1, [r4]
 	mov r3, r2
 	add r0, r0, #0xbc
-	bl sub_0201E1E0
+	bl PlanCopyTextureToTextureVram
 	mov r0, #0
 	str r0, [r4]
 	str r0, [r4, #4]
@@ -19697,7 +19697,7 @@ sub_0201E13C: ; 0x0201E13C
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
 _0201E180: .word _020AFC70
-	arm_func_end sub_0201E13C
+	arm_func_end DelayWteFree
 
 	arm_func_start sub_0201E184
 sub_0201E184: ; 0x0201E184
@@ -19727,15 +19727,15 @@ sub_0201E190: ; 0x0201E190
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	arm_func_end sub_0201E190
 
-	arm_func_start sub_0201E1D4
-sub_0201E1D4: ; 0x0201E1D4
+	arm_func_start ResetPlannedVramTransfer
+ResetPlannedVramTransfer: ; 0x0201E1D4
 	mov r1, #0
 	strh r1, [r0, #0xc]
 	bx lr
-	arm_func_end sub_0201E1D4
+	arm_func_end ResetPlannedVramTransfer
 
-	arm_func_start sub_0201E1E0
-sub_0201E1E0: ; 0x0201E1E0
+	arm_func_start PlanCopyTextureToTextureVram
+PlanCopyTextureToTextureVram: ; 0x0201E1E0
 	stmdb sp!, {r4, lr}
 	ldrsh r4, [r0, #0xc]
 	cmp r4, #0x80
@@ -19756,10 +19756,10 @@ sub_0201E1E0: ; 0x0201E1E0
 	strh r1, [r0, #0xc]
 	ldrsh r0, [r0, #0xc]
 	ldmia sp!, {r4, pc}
-	arm_func_end sub_0201E1E0
+	arm_func_end PlanCopyTextureToTextureVram
 
-	arm_func_start sub_0201E230
-sub_0201E230: ; 0x0201E230
+	arm_func_start PerformPlannedTextureVramTransfer
+PerformPlannedTextureVramTransfer: ; 0x0201E230
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	mov r4, r0
 	ldrsh r7, [r4, #0xc]
@@ -19825,7 +19825,7 @@ _0201E304:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 _0201E310: .word _022A4F38
-	arm_func_end sub_0201E230
+	arm_func_end PerformPlannedTextureVramTransfer
 
 	arm_func_start sub_0201E314
 sub_0201E314: ; 0x0201E314
@@ -19935,7 +19935,7 @@ _0201E444:
 	mov r3, r8
 	add r1, r1, r5, lsl #9
 	add r2, r2, r5, lsl #9
-	bl sub_0201E1E0
+	bl PlanCopyTextureToTextureVram
 	ldr r0, [r6, #0x1c]
 	strb r7, [r0, r5]
 _0201E47C:

asm/main_0202598C.s

@@ -2999,7 +2999,7 @@ _020271C4:
 	strh r2, [ip, #0x58]
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	mov r0, r4
 	bl sub_02027228
 	mov r0, r4

asm/main_02058F24.s

@@ -21817,7 +21817,7 @@ sub_0206ABB0: ; 0x0206ABB0
 	mov r3, r2
 	bl sub_0201E12C
 	add r0, sp, #8
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r1, [r4, #0x20]
 	add r0, sp, #0x10
 	str r1, [r4, #0x18]
@@ -21837,7 +21837,7 @@ sub_0206ABB0: ; 0x0206ABB0
 	mov r3, #0
 	bl sub_0201E12C
 	add r0, sp, #0x10
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r1, [r4, #0x20]
 	add r0, sp, #0x10
 	str r1, [r4, #8]
@@ -21857,7 +21857,7 @@ sub_0206ABB0: ; 0x0206ABB0
 	mov r3, #0
 	bl sub_0201E12C
 	add r0, sp, #0x10
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, [r4, #0x20]
 	mov r2, #0
 	str r0, [r4, #0x10]

asm/overlay_11.s

@@ -27121,7 +27121,7 @@ _022F29A4:
 	mov r3, r1
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r1, _022F2AAC ; =ov11_023212B0
 	add r0, sp, #0
 	mov r2, #0
@@ -27132,7 +27132,7 @@ _022F29A4:
 	mov r3, #0
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, _022F2AB0 ; =ov11_023212C8
 	mov r1, #0
 	bl sub_0201DF38
@@ -27150,7 +27150,7 @@ _022F2A14:
 	mov r3, r1
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, _022F2AB8 ; =ov11_023212F8
 	mov r1, #0
 	bl sub_0201DF38
@@ -27168,7 +27168,7 @@ _022F2A58:
 	mov r3, r1
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, _022F2AC0 ; =ov11_02321328
 	mov r1, #0
 	bl sub_0201DF38
@@ -67833,7 +67833,7 @@ _0231419C:
 	mov r3, r1
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, _02314604 ; =ov11_02324B24
 	mov r1, #0
 	bl sub_0201DF38
@@ -67936,7 +67936,7 @@ _02314320:
 	mov r3, r1
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, _0231462C ; =ov11_02324B54
 	mov r1, #0
 	bl sub_0201DF38
@@ -68058,7 +68058,7 @@ _023144EC:
 	mov r3, r1
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, _02314658 ; =ov11_02324B84
 	mov r1, #0
 	bl sub_0201DF38
@@ -70223,7 +70223,7 @@ ov11_02316330: ; 0x02316330
 	mov r3, #0
 	bl sub_0201E12C
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 	ldr r0, _023163AC ; =ov11_02324BB4
 	mov r1, #0
 	bl sub_0201DF38

asm/overlay_29_0233861C.s

@@ -316,7 +316,7 @@ _023388E8:
 	mov r3, fp
 	bl ProcessWte
 	mov r0, r8
-	bl sub_0201E13C
+	bl DelayWteFree
 	add sl, sl, #1
 	cmp sl, #3
 	blt _023388E8
@@ -397,7 +397,7 @@ ov29_023389C4: ; 0x023389C4
 	mov r3, #0
 	bl ProcessWte
 	add r0, sp, #0
-	bl sub_0201E13C
+	bl DelayWteFree
 _02338A34:
 	add sp, sp, #8
 	ldmia sp!, {r4, pc}