Merge pull request #300 from CecilArmitais/decomp-continued

[Claude] Decompiled 538 functions; cleared 50 asm files; six shared-type corrections

asm/include/main_02000DE0.inc

@@ -1,4 +1,8 @@
 #pragma once
+.public DEFAULT_MEMORY_ARENA_MEMORY
+.public Debug_FatalError
+.public Debug_Print0
+.public MEMORY_ALLOCATION_ARENA_GETTERS
 .public _02090B40
 .public _02090B70
 .public _02090BA0
@@ -7,11 +11,6 @@
 .public _020B3384
 .public _020B33A0
 .public _020B33C0
-.public Debug_FatalError
-.public Debug_Print0
-.public DEFAULT_MEMORY_ARENA_MEMORY
-.public MemLocateSet
-.public MEMORY_ALLOCATION_ARENA_GETTERS
 .public sub_02002C40
 .public sub_02002CAC
 .public sub_02002CB4

asm/include/main_02001D68.inc

@@ -1,6 +1,5 @@
 #pragma once
 .public FixedPoint64IsNegative
 .public FixedPoint64IsZero
-.public NATURAL_LOG_VALUE_TABLE
 .public NegateFixedPoint64
 .public UFixedPoint64CmpLt

asm/include/main_02003328.inc

@@ -1,60 +0,0 @@
-#pragma once
-.public _020924D8
-.public _020AEF7C
-.public _020AEFB4
-.public _020AEFC8
-.public _020AEFDC
-.public _020AF000
-.public _020AF028
-.public _020AF050
-.public _020AF078
-.public _020AF154
-.public _0229B220
-.public _0229B248
-.public _0229F248
-.public _fadd
-.public _fflt
-.public _fmul
-.public Debug_Print0
-.public GetHeldButtons
-.public GetReleasedStylus
-.public GX_VBlankIntr
-.public HaltProcessDisp
-.public KeyWaitInit
-.public MainLoop
-.public OS_CreateVAlarm
-.public OS_EnableIrqMask
-.public OS_InitVAlarm
-.public OS_IRQTable
-.public OS_SetIrqFunction
-.public OS_SetPeriodicVAlarm
-.public OS_SleepThread
-.public OS_WakeupThreadDirect
-.public PM_SetLcdPower
-.public Rand16Bit
-.public sub_02002580
-.public sub_020025F8
-.public sub_02002628
-.public sub_0200265C
-.public sub_02002670
-.public sub_020026B8
-.public sub_02002778
-.public sub_020027E8
-.public sub_020027F8
-.public sub_02002858
-.public sub_02002950
-.public sub_020029A0
-.public sub_020029B8
-.public sub_02002A44
-.public sub_02002C40
-.public sub_02003A40
-.public sub_02003B5C
-.public sub_02005EAC
-.public sub_02006098
-.public sub_02006D4C
-.public sub_02006DEC
-.public sub_020082E0
-.public sub_02017D20
-.public sub_0201849C
-.public sub_020820E8
-.public WaitForever

asm/include/main_02003DB8.inc

@@ -1,18 +0,0 @@
-#pragma once
-.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
-.public sub_02002824
-.public sub_020029B8
-.public sub_020081C8
-.public sub_020081F0
-.public sub_0200B76C
-.public sub_020184A8

asm/include/main_0200BC60.inc

@@ -1,3 +0,0 @@
-#pragma once
-.public sub_0200B928
-.public UpdateFadeStatus

asm/include/main_0200D1F0.inc

@@ -1,28 +0,0 @@
-#pragma once
-.public _02094D0C
-.public _02097F34
-.public _02097F50
-.public _02097F58
-.public _02097F68
-.public _02097F6C
-.public _02097F7C
-.public _02097F90
-.public _02097F9C
-.public _02097FAC
-.public _02097FB8
-.public _02097FC4
-.public _02097FE4
-.public BAG_ITEMS_PTR_MIRROR
-.public GetDisplayedBuyPrice
-.public GetDisplayedSellPrice
-.public GetItemActionName
-.public GetItemCategory
-.public GetItemName
-.public GetItemPaletteId
-.public GetMoneyQuantity
-.public InitItem
-.public MoneyQuantityToString__02023B30
-.public strcpy
-.public strncpy
-.public sub_0200EB64
-.public vsprintf

asm/include/main_0200F884.inc

@@ -1,18 +0,0 @@
-#pragma once
-.public AddMoneyCarried
-.public AreItemsEquivalent
-.public BAG_ITEMS_PTR_MIRROR
-.public BulkItemToItem
-.public GetCurrentBagCapacity
-.public GetMoneyQuantity
-.public GetRankStorageSize
-.public IsItemInTimeDarkness
-.public IsItemValidVeneer
-.public IsThrownItem
-.public IsTreasureBox
-.public ItemZInit
-.public MemAlloc
-.public MemFree
-.public RemoveEmptyItems
-.public SetItemAcquired
-.public SortItemList

asm/include/main_02011580.inc

@@ -1,9 +1,8 @@
 #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_02013E54.inc

@@ -1,6 +1,5 @@
 #pragma once
-.public _s32_div_f
 .public DUNGEON_MOVE_TABLES
 .public GetInfoMoveGround
 .public Rand16Bit
-.public RECOIL_MOVE_LIST
+.public _s32_div_f

asm/include/main_02026268.inc

@@ -1,15 +1,14 @@
 #pragma once
-.public _020AFD04
 .public AnalyzeText
 .public DrawChar
 .public GetColorCodePaletteOffset
 .public PreprocessStringFromId
+.public _020AFD04
 .public sub_02020B4C
 .public sub_02020B60
 .public sub_02020B74
 .public sub_02020B94
 .public sub_02020BC4
-.public sub_02020D7C
 .public sub_02022118
 .public sub_02025C7C
 .public sub_02025E84

asm/include/main_020276C0.inc

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

asm/include/main_020278C4.inc

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

asm/include/main_0202A3E4.inc

@@ -1,8 +1,4 @@
 #pragma once
-.public _0209AE34
-.public _0209AE44
-.public _020AFDAC
-.public CreateParentMenuInternal
 .public CreateTextBox
 .public FileClose
 .public FileRom_HandleOpen
@@ -11,10 +7,12 @@
 .public FileRom_InitDataTransfer
 .public FileRom_StopDataTransfer
 .public FileRom_Veneer_FileInit
-.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_0202AB94.inc

@@ -1,36 +0,0 @@
-#pragma once
-.public CalcMenuHeightDiv8__02031AA4
-.public GetPageItemYOffset
-.public GetSelectedMenuItemIdx
-.public GetTotalNumMenuItems
-.public GetWindowContents
-.public GetWindowRectangle
-.public InitWindowInput
-.public IsEmptyString
-.public IsMenuOptionActive
-.public MemAlloc
-.public NewWindowScreenCheck
-.public PlayWindowInputSound
-.public PreprocessStringFromId
-.public SIMPLE_MENU_DEFAULT_WINDOW_PARAMS
-.public sub_020263C8
-.public sub_020265A8
-.public sub_02027B1C
-.public sub_0202810C
-.public sub_0202812C
-.public sub_0202830C
-.public sub_02028948
-.public sub_0202A03C
-.public sub_02031A5C
-.public sub_02031C74
-.public sub_02031C84
-.public sub_02031C98
-.public sub_02032070
-.public sub_02032160
-.public sub_020323F8
-.public sub_0203250C
-.public sub_02032684
-.public sub_02032984
-.public sub_02033758
-.public UpdateSimpleMenu
-.public UpdateWindow

asm/include/main_0202B5C8.inc

@@ -1,13 +1,11 @@
 #pragma once
-.public GetMaxItemsOnPage
 .public GetNumItemsOnPage
 .public GetPageItemYOffset
 .public GetPageStart
 .public GetSelectedMenuItemIdx
-.public GetTotalNumMenuItems
-.public GetWindowContents
 .public IsMenuOptionActive
 .public PlayWindowInputSound
+.public UpdateWindow
 .public sub_020263C8
 .public sub_02027B1C
 .public sub_0202810C
@@ -23,4 +21,3 @@
 .public sub_0203250C
 .public sub_02032684
 .public sub_02033758
-.public UpdateWindow

asm/include/main_0202F190.inc

@@ -1,38 +0,0 @@
-#pragma once
-.public _0209AF6C
-.public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS
-.public DeleteWindow
-.public GetPressedButtons
-.public GetWindowContents
-.public InitPortraitParams
-.public IsValidPortrait
-.public LoadPortrait
-.public MemAlloc
-.public MemcpySimple
-.public MemFree
-.public NewWindowScreenCheck
-.public PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS
-.public PreprocessString
-.public PreprocessStringFromId
-.public sub_0202613C
-.public sub_02026184
-.public sub_02026194
-.public sub_020261A4
-.public sub_020261B4
-.public sub_020261C4
-.public sub_020261D4
-.public sub_020261E4
-.public sub_02026204
-.public sub_020265A8
-.public sub_02026E3C
-.public sub_02027040
-.public sub_02027B1C
-.public sub_02028080
-.public sub_0202810C
-.public sub_0202811C
-.public sub_0202812C
-.public sub_0202836C
-.public sub_02028770
-.public sub_02048240
-.public TEXT_BOX_DEFAULT_WINDOW_PARAMS
-.public UpdateAreaNameBox

asm/include/main_020308C4.inc

@@ -1,8 +1,6 @@
 #pragma once
-.public DeleteWindow
 .public GetSelectedItemOnPage
 .public GetSelectedMenuItemIdx
 .public GetWindowContents
-.public MemFree
 .public sub_020289B8
 .public sub_02028A08

asm/include/main_0203CAF0.inc

@@ -1,262 +1,50 @@
 #pragma once
+.public AppendStandardStringToMission
+.public ClearWindow
+.public ClosePortraitBox
+.public CloseTextBox
+.public CreatePortraitBox
+.public CreateTextBox
+.public DrawTextInWindow
+.public GetDexNumber
+.public GetNextIqSkill
+.public GetSpeciesString
+.public GetType
+.public GetTypeStringId
+.public HidePortraitBox
+.public InitPortraitParams
+.public InitPortraitParamsWithMonsterId
+.public InitPreprocessorArgs
+.public IsTextboxState3
+.public MISSION_REWARD_STRUCT_MAIN_PTR
+.public MemAlloc
+.public MemZero
+.public PreprocessString
+.public PreprocessStringFromId
+.public SetPortraitEmotion
+.public SetPortraitLayout
+.public SetPortraitOffset
+.public ShowPortraitInPortraitBox
+.public StringFromId
+.public StrncpySimpleNoPadSafe
+.public TEAM_MEMBER_TABLE_PTR
+.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 AddItemToStorage
-.public AddMoneyCarried
-.public AppendStandardStringToMission
-.public ApplyLevelUpBoostsToGroundMonster
-.public Arm9LoadUnkFieldNa0x2029EC8
-.public Arm9StoreUnkFieldNa0x2029ED8
-.public BAG_ITEMS_PTR_MIRROR
-.public CanMonsterUseMove
-.public ClearBagSelectedItemTable
-.public ClearWindow
-.public CloseAdvancedMenu
-.public CloseAdvancedTextBox
-.public CloseCollectionMenu
-.public CloseDialogueBox
-.public CloseParentMenu
-.public ClosePortraitBox
-.public CloseScrollBox
-.public CloseSimpleMenu
-.public CloseTextBox
-.public CopyNStringFromId
-.public CountNbOfItemsInStorage
-.public CreateAdvancedMenu
-.public CreateAdvancedTextBox
-.public CreateCollectionMenu
-.public CreateParentMenuFromStringIds
-.public CreatePortraitBox
-.public CreateScrollBoxMulti
-.public CreateScrollBoxSingle
-.public CreateSimpleMenuFromStringIds
-.public CreateTextBox
-.public DisableIqSkill
-.public DrawTextInWindow
-.public FormatMoveStringMore
-.public GetActiveTeamMember
-.public GetActualSellPrice
-.public GetAdvancedMenuResult
-.public GetAdvancedTextBoxFlags2
-.public GetDexNumber
-.public GetDigitInputResult
-.public GetDungeonResultString
-.public GetEggSpecies
-.public GetHeldButtons
-.public GetIqSkillStringId
-.public GetItemAtIdx
-.public GetItemCategory
-.public GetKeyboardStatus
-.public GetKeyboardStringResult
-.public GetLearnableIqSkills
-.public GetMaxPp
-.public GetMoneyCarried
-.public GetMonsterName
-.public GetMoveRangeId
-.public GetMoveType
-.public GetNameRaw
-.public GetNameWithGender
-.public GetNbItemsInBag
-.public GetNextIqSkill
-.public GetPpIncrease
-.public GetPressedButtons
-.public GetRank
-.public GetRankUpEntry
-.public GetReleasedStylus
-.public GetResolvedPerformanceProgressFlag
-.public GetSimpleMenuResult__0202AEA4
-.public GetSimpleMenuResult__0202B870
-.public GetSpeciesString
-.public GetStringFromFileVeneer
-.public GetType
-.public GetTypeStringId
-.public GetWindowIdPageStart
-.public GetWindowIdSelectedMenuItemIdx
-.public HidePortraitBox
-.public InitMove
-.public InitPortraitParams
-.public InitPortraitParamsWithMonsterId
-.public InitPreprocessorArgs
-.public InitUnkStorageStruct0x410
-.public IqSkillFlagTest
-.public Is2TurnsMove
-.public IsAdvancedMenuActive2
-.public IsAdvancedTextBoxActive
-.public IsCollectionMenuActive
-.public IsCollectionMenuState3
-.public IsDeoxys
-.public IsGummi
-.public IsMonsterIllegalForMissions
-.public IsNot2TurnsMoveOrSketch
-.public IsParentMenuActive
-.public IsScrollBoxActive
-.public IsShoppableItem
-.public IsSimpleMenuActive
-.public IsStorableItem
-.public IsTextboxState3
-.public IsThrownItem
-.public IsTouchScreenNotOff
-.public LAST_NEW_MOVE
-.public LoadScriptVariableValue
-.public MaybeGetColoredFormattedItemName
-.public MaybeGetUncoloredFormattedItemName
-.public MemAlloc
-.public memcpy
-.public MemcpySimple
-.public MemFree
-.public MemZero
-.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
-.public PreprocessString
-.public PreprocessStringFromId
-.public RandIntSafe
-.public RemoveEmptyItemsInBag
-.public ResumeAdvancedMenu
-.public SetAdvancedTextBoxField0x1C2
-.public SetAdvancedTextBoxState5
-.public SetCollectionMenuField0x1BC
-.public SetCollectionMenuVoidFn
-.public SetCollectionMenuWidth
-.public SetEggHatchTimer
-.public SetEggSpecies
-.public SetPortraitEmotion
-.public SetPortraitLayout
-.public SetPortraitOffset
-.public SetUnkAdvancedTextBoxFn
-.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 sub_02001808
-.public sub_020063F4
-.public sub_02006498
-.public sub_02006BFC
-.public sub_0200FD48
-.public sub_02013E54
-.public sub_02013F58
-.public sub_02017C50
-.public sub_02017C74
 .public sub_02024D7C
-.public sub_02025D50
-.public sub_02027B1C
-.public sub_0202810C
-.public sub_0202812C
-.public sub_02028354
-.public sub_020288DC
-.public sub_0202A2A4
-.public sub_0202C1E4
-.public sub_0202C620
-.public sub_0202C75C
-.public sub_0202D068
-.public sub_0202D0EC
-.public sub_0202D16C
 .public sub_0202F954
-.public sub_020307EC
-.public sub_020308E4
-.public sub_02030908
-.public sub_02030978
-.public sub_02030A50
-.public sub_02030A64
-.public sub_02030A74
-.public sub_02030A90
-.public sub_02030EF0
-.public sub_02037468
-.public sub_0203909C
-.public sub_02039218
-.public sub_0203931C
-.public sub_02042B20
-.public sub_02042BE0
-.public sub_0204426C
-.public sub_020442CC
-.public sub_02044308
-.public sub_0204440C
-.public sub_02044474
-.public sub_020444B0
-.public sub_02044568
-.public sub_020445C8
-.public sub_02045FD0
-.public sub_02046028
-.public sub_02046A20
-.public sub_02046B04
-.public sub_02046BA0
-.public sub_02046BE8
-.public sub_02046C78
-.public sub_02046D20
-.public sub_02050C10
-.public sub_02052E2C
-.public sub_02053A0C
-.public sub_02055D4C
 .public sub_02056410
 .public sub_020564B0
 .public sub_02056F60
-.public sub_0205A4B4
 .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_0203EFD4.inc

@@ -0,0 +1,176 @@
+#pragma once
+.public Arm9LoadUnkFieldNa0x2029EC8
+.public Arm9StoreUnkFieldNa0x2029ED8
+.public BAG_ITEMS_PTR_MIRROR
+.public CanMonsterUseMove
+.public ClearBagSelectedItemTable
+.public CloseAdvancedMenu
+.public CloseAdvancedTextBox
+.public CloseCollectionMenu
+.public CloseDialogueBox
+.public CloseParentMenu
+.public ClosePortraitBox
+.public CloseScrollBox
+.public CopyNStringFromId
+.public CountNbOfItemsInStorage
+.public CreateAdvancedMenu
+.public CreateAdvancedTextBox
+.public CreateCollectionMenu
+.public CreatePortraitBox
+.public CreateScrollBoxMulti
+.public CreateScrollBoxSingle
+.public DisableIqSkill
+.public DrawTextInWindow
+.public FormatMoveStringMore
+.public GetActiveTeamMember
+.public GetActualSellPrice
+.public GetAdvancedMenuResult
+.public GetAdvancedTextBoxFlags2
+.public GetDigitInputResult
+.public GetDungeonResultString
+.public GetHeldButtons
+.public GetIqSkillStringId
+.public GetItemAtIdx
+.public GetLearnableIqSkills
+.public GetMaxPp
+.public GetMoneyCarried
+.public GetMonsterName
+.public GetMoveRangeId
+.public GetMoveType
+.public GetNbItemsInBag
+.public GetPpIncrease
+.public GetPressedButtons
+.public GetReleasedStylus
+.public GetResolvedPerformanceProgressFlag
+.public GetStringFromFileVeneer
+.public GetWindowIdPageStart
+.public GetWindowIdSelectedMenuItemIdx
+.public InitMove
+.public InitPreprocessorArgs
+.public IqSkillFlagTest
+.public Is2TurnsMove
+.public IsAdvancedMenuActive2
+.public IsAdvancedTextBoxActive
+.public IsCollectionMenuActive
+.public IsCollectionMenuState3
+.public IsDeoxys
+.public IsGummi
+.public IsNot2TurnsMoveOrSketch
+.public IsScrollBoxActive
+.public IsShoppableItem
+.public IsStorableItem
+.public IsTouchScreenNotOff
+.public LAST_NEW_MOVE
+.public MISSION_REWARD_STRUCT_MAIN_PTR
+.public MaybeGetColoredFormattedItemName
+.public MaybeGetUncoloredFormattedItemName
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public PlayAdvancedTextBoxInputSound
+.public PlaySeByIdVolumeWrapper
+.public PlaySeVolumeWrapper
+.public PreprocessString
+.public RemoveEmptyItemsInBag
+.public ResumeAdvancedMenu
+.public STATUSES_FULL_DESCRIPTION_STRING_IDS
+.public SetAdvancedTextBoxField0x1C2
+.public SetAdvancedTextBoxState5
+.public SetCollectionMenuField0x1BC
+.public SetCollectionMenuVoidFn
+.public SetCollectionMenuWidth
+.public SetUnkAdvancedTextBoxFn
+.public SetUnkAdvancedTextBoxWindowFn
+.public ShowPortraitInPortraitBox
+.public StrncpySimpleNoPadSafe
+.public TEAM_MEMBER_TABLE_PTR
+.public UNK_STORAGE_STRUCT_0XC
+.public UpdateWindow
+.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 _020AFE78
+.public _020AFE7C
+.public _020AFE8C
+.public _020AFE90
+.public _020AFE98
+.public _022AADFC
+.public _022AAE00
+.public _022AAE2A
+.public _022AAE2E
+.public _022AAE58
+.public memcpy
+.public strcat
+.public strcpy
+.public sub_02001808
+.public sub_020063F4
+.public sub_02006498
+.public sub_02006BFC
+.public sub_0200FD48
+.public sub_02013E54
+.public sub_02013F58
+.public sub_02017C74
+.public sub_02025D50
+.public sub_02027B1C
+.public sub_0202810C
+.public sub_0202812C
+.public sub_02028354
+.public sub_020288DC
+.public sub_0202A2A4
+.public sub_0202C1E4
+.public sub_0202C620
+.public sub_0202C75C
+.public sub_0202D068
+.public sub_0202D0EC
+.public sub_0202D16C
+.public sub_020307EC
+.public sub_020308E4
+.public sub_02030908
+.public sub_02030978
+.public sub_02030A50
+.public sub_02030A64
+.public sub_02030A74
+.public sub_02030A90
+.public sub_02030EF0
+.public sub_02042B20
+.public sub_02042BE0
+.public sub_0204426C
+.public sub_020442CC
+.public sub_02044308
+.public sub_0204440C
+.public sub_02044474
+.public sub_020444B0
+.public sub_02044568
+.public sub_020445C8
+.public sub_02046A20
+.public sub_02046B04
+.public sub_02046BA0
+.public sub_02046D20
+.public sub_02056410
+.public sub_020564B0
+.public sub_02056F60
+.public sub_0205A4B4
+.public sub_0205B0B8
+.public vsprintf

asm/include/main_02048B74.inc

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

asm/include/main_0204FA70.inc

@@ -1,2 +0,0 @@
-#pragma once
-.public ADVENTURE_LOG_PTR

asm/include/main_02050300.inc

@@ -1,7 +0,0 @@
-#pragma once
-.public ADVENTURE_LOG_PTR
-.public GetAdventureLogCompleted
-.public IsItemValidVeneer
-.public NormalizeTreasureBox
-.public SetAdventureLogCompleted
-.public SetResolvedPerformanceProgressFlag

asm/include/main_020504BC.inc

@@ -1,18 +0,0 @@
-#pragma once
-.public _0209E6BD
-.public _022AB924
-.public ADVENTURE_LOG_PTR
-.public ARM9_UNKNOWN_DATA__NA_209E6BC
-.public ComputeSpecialCounters
-.public CONVERSION2_TYPE_TABLE
-.public Copy16BitsFrom
-.public Copy16BitsTo
-.public CopyNStringFromId
-.public GetRankUpEntry
-.public GetResolvedPerformanceProgressFlag
-.public GetStringFromFileVeneer
-.public MemZero
-.public StrncpyName
-.public StrncpySimpleNoPad
-.public StrncpySimpleNoPadSafe
-.public TEAM_NAME

asm/include/main_02051098.inc

@@ -1,7 +0,0 @@
-#pragma once
-.public _020AFF80
-.public _020AFF88
-.public CopyBitsFrom
-.public CopyBitsTo
-.public DUNGEON_RESTRICTIONS
-.public MT_TABLE

asm/include/main_020515C4.inc

@@ -1,10 +1,8 @@
 #pragma once
-.public _020A1864
 .public CopyBitsFrom
 .public CopyBitsTo
 .public DUNGEON_RESTRICTIONS
-.public DungeonFloorToGroupFloor
 .public GetItemIdFromList
 .public GetNbFloorsPlusOne
-.public MISSION_FLOORS_FORBIDDEN
 .public RandIntSafe
+.public _020A1864

asm/include/main_02051804.inc

@@ -1,13 +1,12 @@
 #pragma once
-.public _020B09B0
 .public CopyColorToPaletteDataRgba
+.public MTi_CpuClear32
+.public MTi_CpuCopy32
 .public MarkPaletteDataAsNeedingUpdate
 .public MemAlloc
 .public MemFree
 .public MemZero
-.public MTi_CpuClear32
-.public MTi_CpuCopy32
-.public RANK_UP_TABLE
+.public _020B09B0
 .public sub_0200302C
 .public sub_020030FC
 .public sub_0200A124

asm/include/main_02052060.inc

@@ -1,26 +0,0 @@
-#pragma once
-.public _020A31B8
-.public _020A31D4
-.public _020A31E4
-.public _020A31F4
-.public _020A31FC
-.public _020A45C8_JP
-.public _020B09B0
-.public _020B09C0
-.public _s32_div_f
-.public ARM9_UNKNOWN_PTR__NA_20A2C84
-.public CopyColorToPaletteDataRgba
-.public GetBaseForm
-.public LoadFileFromRom
-.public LoadM2nAndN2m
-.public MarkPaletteDataAsNeedingUpdate
-.public MemFree
-.public MONSTER_DATA_TABLE_PTR
-.public StringFromId
-.public strncpy
-.public sub_02051804
-.public sub_02051D8C
-.public sub_02051E60
-.public sub_02051FF0
-.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
-.public vsprintf

asm/include/main_02055528.inc

@@ -1,3 +0,0 @@
-#pragma once
-.public GetGameMode
-.public TEAM_MEMBER_TABLE_PTR

asm/include/main_02055894.inc

@@ -1,26 +0,0 @@
-#pragma once
-.public _020A3350
-.public _022B5788
-.public Debug_Print0
-.public EnableAllLearnableIqSkills
-.public GetBaseDefensiveStat
-.public GetBaseHp
-.public GetBaseOffensiveStat
-.public GetItemMoveId16
-.public GetNameRaw
-.public GetTeamMember
-.public IsValidTeamMember
-.public RecolorNameString
-.public RecolorTeamMemberNameString
-.public SetActiveTeam
-.public SetPokemonJoined
-.public StrcmpMonsterName
-.public StrncpyName
-.public StrncpySimple
-.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_0205A340.inc

@@ -1,9 +0,0 @@
-#pragma once
-.public GetLvlUpEntry
-.public GetNameString
-.public StrcpyName
-.public StrncmpSimple
-.public StrncpyName
-.public sub_02025304_JP
-.public sub_02055CCC
-.public sub_02055D7C

asm/include/main_0205B39C.inc

@@ -1,6 +0,0 @@
-#pragma once
-.public _020A353C
-.public _020A3544
-.public _020A354C
-.public AllocateTemp1024ByteBufferFromPool
-.public strcat

asm/include/main_0205B478.inc

@@ -1,5 +0,0 @@
-#pragma once
-.public _020B0A54
-.public _022B57BC
-.public MemsetSimple
-.public sub_0204A198

asm/include/main_0205D1F4.inc

@@ -1,37 +0,0 @@
-#pragma once
-.public CanDungeonBeUsedForMission
-.public CanMonsterBeUsedForMission
-.public CanMonsterBeUsedForMissionWrapper
-.public CheckItemForMissionType
-.public CheckMonsterForMissionType
-.public ClearMissionData
-.public GetAllPossibleMonsters
-.public GetMaxItemsAllowed
-.public GetMaxMembersAllowed
-.public GetMissionSpecificFixedRoom
-.public GetSecondFormIfValid
-.public IsAvailableItem
-.public IsForbiddenFloor
-.public IsMissionValid
-.public IsStorableItem
-.public IsThrownItem
-.public LoadMissionTemplates
-.public MemAlloc
-.public MemFree
-.public MISSION_DELIVER_LIST_PTR
-.public MtNext
-.public RandInt
-.public RandIntSafe
-.public RollRandomItemReward
-.public sub_0205CF58
-.public sub_0205E090
-.public sub_0205E1E8
-.public sub_0205E258
-.public sub_020627F4
-.public sub_02062814
-.public sub_0206282C
-.public sub_02062900
-.public sub_02062AD0
-.public sub_02062C4C
-.public sub_02062D40
-.public sub_02063424

asm/include/main_02062AE4.inc

@@ -1,20 +1,13 @@
 #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 Debug_Print0
 .public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
+.public Debug_Print0
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DungeonSwapIdToIdx
 .public EnqueueRender3dTiling
 .public FemaleToMaleForm
 .public FillPaletteDataRgba
-.public GetBaseForm
 .public GetDungeonMode
 .public GetExclusiveItem
 .public GetHero
@@ -26,31 +19,36 @@
 .public GetScenarioBalance
 .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
@@ -70,4 +68,3 @@
 .public sub_0205E090
 .public sub_0206220C
 .public sub_02064FE4
-.public UnloadFile

asm/include/overlay_10_022BCE44.inc

@@ -1,6 +1,4 @@
 #pragma once
-.public _s32_div_f
-.public abs
 .public CreateInventoryMenu
 .public Debug_Print0
 .public DeleteWanTableEntryVeneer
@@ -25,6 +23,17 @@
 .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
@@ -70,10 +79,6 @@
 .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
@@ -87,7 +92,6 @@
 .public sub_02027B1C
 .public sub_0202810C
 .public sub_0202812C
-.public sub_0202830C
 .public sub_020287C4
 .public sub_02028980
 .public sub_0202A0B0
@@ -118,9 +122,4 @@
 .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_11_022EDD14.inc

@@ -2,28 +2,23 @@
 .public BmaLayerNrlDecompressor
 .public CopyColorToPaletteDataRgba
 .public DecompressAtNormalVeneer
-.public FillPaletteDataRgba
 .public GetAtSize
-.public GroundBg_CloseOpenedFiles
 .public GroundBg_Init
 .public LoadBackgroundAttributes
 .public LoadFileFromRom
 .public MarkPaletteDataAsNeedingUpdate
 .public MemAlloc
-.public Memcpy16
 .public MemFree
+.public Memcpy16
+.public PointsToZero
+.public UnloadFile
 .public ov11_022EC08C
 .public ov11_022EE620
-.public ov11_022EE8CC
-.public ov11_022EE9B0
-.public ov11_02320BE8
 .public ov11_02320BF0
-.public ov11_02320BF4
 .public ov11_02320C18
 .public ov11_02320C28
 .public ov11_02320C80
 .public ov11_02324CBC
-.public PointsToZero
 .public sprintf
 .public sub_02015328
 .public sub_02016300
@@ -31,5 +26,3 @@
 .public sub_020163E4
 .public sub_0201641C
 .public sub_02016468
-.public UnloadFile
-.public ZInit8

asm/include/overlay_11_022FE5F8.inc

@@ -1,40 +1,25 @@
 #pragma once
 .public AddItemToBagNoHeld
 .public AnyDungeonRequestsDone
-.public AppendStandardStringToMission
-.public ApplyGummiBoostsToGroundMonster
-.public ApplyGummiBoostsToTeamMember
 .public ApplyLevelUpBoostsToGroundMonster
-.public BAG_ITEMS_PTR_MIRROR
 .public C_ROUTINES
 .public CheckInventoryMenuField0x1A0
 .public CheckParentMenuField0x1A0
-.public CheckTeamMemberIdx
 .public CloseAdvancedMenu
-.public CloseAdvancedTextBox
 .public CloseAreaNameBox
-.public CloseCollectionMenu
 .public CloseDialogueBox
 .public CloseInventoryMenu
 .public CloseParentMenu
 .public CloseScrollBox
 .public CloseSimpleMenu
-.public CloseSynthBin
 .public CloseTextBox
-.public CloseTextBox2
 .public CopyItemAtIdx
 .public CopyMenuControlWindowExtraInfo
 .public CopyOrInitPreprocessorArgs
-.public CountNbItemsOfTypeInBag
-.public CountNbItemsOfTypeInStorage
 .public CreateAdvancedMenu
-.public CreateAdvancedTextBox
 .public CreateAreaNameBox
-.public CreateCollectionMenu
 .public CreateDialogueBox
 .public CreateInventoryMenuOuter
-.public CreateMonsterSummaryFromTeamMember
-.public CreateParentMenu
 .public CreateParentMenuFromStringIds
 .public CreateScrollBoxSingle
 .public CreateSimpleMenu
@@ -47,35 +32,22 @@
 .public DigitInputMenuInit
 .public DigitInputMenuReturn
 .public DrawTextInWindow
-.public DungeonMoveToGroundMove
 .public DungeonSwapIdxToId
-.public EnableIqSkill
 .public EVENTS
-.public EXCLUSIVE_ITEM_REQUIREMENTS_PTR
 .public FreeMissionRewardStructMain
 .public FuncThatCallsRunNextOpcode
 .public GetActiveRosterIndex
 .public GetActiveTeamMember
-.public GetActorMatchingStorageId
 .public GetAdvancedMenuCurrentOption
 .public GetAdvancedMenuResult
-.public GetCroagunkItemTemplates
-.public GetCurrentBagCapacity
-.public GetDexNumber
 .public GetDungeonMode
-.public GetExclusiveItemType
 .public GetExecuteSpecialEpisodeType
 .public GetFirstEmptyMemberIdx
 .public GetFirstMatchingMemberIdx
 .public GetGameMode
 .public GetHero
-.public GetInfoMoveGround
-.public GetItemAtIdx
-.public GetItemCategoryVeneer
-.public GetItemMoveId16
 .public GetKeyboardStatus
 .public GetKeyboardStringResult
-.public GetLearnableIqSkills
 .public GetMaxReachedFloor
 .public GetMoneyCarried
 .public GetNameRaw
@@ -91,23 +63,14 @@
 .public GetStringFromFileVeneer
 .public GetTeamMember
 .public GetWindowContents
-.public GetWindowIdPageStart
-.public GetWindowIdSelectedItemOnPage
-.public GetWindowIdSelectedMenuItemIdx
 .public InitMenu
-.public InitMove
 .public InitPortraitParams
 .public InitPreprocessorArgs
 .public IsAdvancedMenuActive
 .public IsAdvancedMenuActive2
-.public IsAdvancedTextBoxActive
 .public IsAreaNameBoxActive
 .public IsBagFull
-.public IsCollectionMenuActive
-.public IsCollectionMenuState3
 .public IsDialogueBoxActive
-.public IsGummi
-.public IsHM
 .public IsInventoryMenuActive
 .public IsInventoryMenuState3
 .public IsMonsterOnTeam
@@ -117,23 +80,55 @@
 .public ItemZInit
 .public LoadFileFromRomVeneer
 .public LoadScriptVariableValue
-.public LoadSynthBin
 .public MaybeGetColoredFormattedItemName
 .public MaybeGetFormattedItemName
-.public MaybeGetUncoloredFormattedItemName
 .public MemAlloc
-.public memcpy
-.public MemcpySimple
 .public MemFree
-.public MemZero
 .public NewWindowScreenCheck
+.public PlaySeVolumeWrapper
+.public PopInventoryMenuField0x1A3
+.public PreprocessString
+.public PreprocessStringFromId
+.public PrintBadgeMark
+.public PrintIqSkillsMenu
+.public RemoveItemNoHole
+.public ResetAttributeBitfieldLivePerformer
+.public ResumeAdvancedMenu
+.public ReturnScriptMenuResult
+.public ReturnScriptMenuResultZero
+.public SaveScriptVariableValue
+.public SaveScriptVariableValueBytes
+.public SetAnimDataFields2
+.public SetAreaNameBoxState3
+.public SetAttributeBitfieldLivePerformer
+.public SetInventoryMenuState0
+.public SetInventoryMenuState6
+.public SetNewFriendActor
+.public SetParentMenuState7
+.public ShowDialogueBox
+.public ShowKeyboard
+.public ShowStringIdInDialogueBox
+.public ShowStringInDialogueBox
+.public SortItemsInBag
+.public StrcpyName
+.public StrcpySimple
+.public StrncpyName
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
+.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 ov10_022BCC60
 .public ov10_022BCC7C
 .public ov10_022BCCB0
 .public ov10_022BCD10
 .public ov10_022BCDA8
 .public ov10_022BCDBC
-.public ov10_022BCDF4
 .public ov10_022BD394
 .public ov11_022DC504
 .public ov11_022E45F4
@@ -157,11 +152,16 @@
 .public ov11_022F6FA8
 .public ov11_022F7188
 .public ov11_022F74A0
+.public ov11_02307334
+.public ov11_02308D1C
+.public ov11_02309040
+.public ov11_023090DC
+.public ov11_02309DF8
+.public ov11_0230A07C
 .public ov11_0230CFF4
 .public ov11_0230D000
 .public ov11_0230D220
 .public ov11_0230D71C
-.public ov11_0230D92C
 .public ov11_0230E964
 .public ov11_0230F138
 .public ov11_0230F1EC
@@ -255,44 +255,6 @@
 .public ov11_02322C20
 .public ov11_02322C38
 .public ov11_02322C50
-.public ov11_02322C78
-.public ov11_02322C88
-.public ov11_02322C98
-.public ov11_02322CA8
-.public ov11_02322CB8
-.public ov11_02322CC8
-.public ov11_02322CD8
-.public ov11_02322CF0
-.public ov11_02322D10
-.public ov11_02322D38
-.public ov11_02322D60
-.public ov11_02322D88
-.public ov11_02322DB0
-.public ov11_02322DB8
-.public ov11_02322DC8
-.public ov11_02322DD0
-.public ov11_02322DE0
-.public ov11_02322DF0
-.public ov11_02322E00
-.public ov11_02322E28
-.public ov11_02322E58
-.public ov11_02322E7C
-.public ov11_02322EA0
-.public ov11_02322EAC
-.public ov11_02322EBC
-.public ov11_02322ECC
-.public ov11_02322EDC
-.public ov11_02322F24
-.public ov11_02322F30
-.public ov11_02322F40
-.public ov11_02322F58
-.public ov11_02322F5C
-.public ov11_02322F80
-.public ov11_02322F84
-.public ov11_02322F98
-.public ov11_02322FD4
-.public ov11_02322FE4
-.public ov11_02322FF4
 .public ov11_02324D04
 .public ov11_02324D08
 .public ov11_02324D0C
@@ -316,87 +278,29 @@
 .public ov11_02324D84
 .public ov11_02324D88
 .public ov11_02324D8C
-.public ov11_02324D90
-.public ov11_02324D94
-.public ov11_02324D98
 .public ov11_0238A074
 .public ov11_0238A078
 .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
-.public sub_0200FD48
-.public sub_02010044
-.public sub_02011420
 .public sub_02017C50
-.public sub_02017C74
 .public sub_02025304_JP
-.public sub_020262E0
 .public sub_020265A8
 .public sub_02027B1C
 .public sub_0202810C
 .public sub_0202812C
 .public sub_020282F4
-.public sub_02028354
 .public sub_0202836C
-.public sub_0202A03C
-.public sub_0202B030
-.public sub_0202C620
-.public sub_0202C75C
-.public sub_0202D07C
-.public sub_0202D0EC
 .public sub_0202F16C
 .public sub_0202F190
 .public sub_0202F2C4
 .public sub_0202F334
 .public sub_0202F3F8
 .public sub_0202F954
-.public sub_020307EC
 .public sub_02034840
 .public sub_0203559C
 .public sub_02035CE4
@@ -417,70 +321,19 @@
 .public sub_0203D538
 .public sub_0203F150
 .public sub_0203F398
-.public sub_0203F974
 .public sub_0203F990
-.public sub_0203FA64
-.public sub_0203FBD4
-.public sub_0203FD14
-.public sub_0203FD2C
-.public sub_0203FD38
-.public sub_0203FD80
-.public sub_0203FDEC
-.public sub_0204018C
-.public sub_0204019C
-.public sub_020407C0
-.public sub_020407EC
-.public sub_02041094
-.public sub_020410A4
-.public sub_02041154
-.public sub_02041364
-.public sub_02041394
-.public sub_02041484
-.public sub_020415BC
-.public sub_02041614
-.public sub_020416FC
-.public sub_020417A8
-.public sub_02041A00
-.public sub_02041A18
 .public sub_02041B7C
 .public sub_020420F4
-.public sub_02044688
-.public sub_02044800
-.public sub_020448EC
-.public sub_02046A20
-.public sub_02046B04
-.public sub_02046BA0
-.public sub_02046BE8
-.public sub_02046C30
-.public sub_02046C78
-.public sub_02046D20
-.public sub_0204707C
-.public sub_020470D0
-.public sub_02047148
-.public sub_02047150
-.public sub_02047188
 .public sub_02048764
 .public sub_02048794
 .public sub_0204CF0C
-.public sub_0204E210
 .public sub_02052E2C
-.public sub_02053A0C
-.public sub_02053CA0
-.public sub_02053D1C
-.public sub_020546E8
-.public sub_02055894
 .public sub_02055B20
 .public sub_02055D4C
 .public sub_02055DD0
-.public sub_02055FCC
-.public sub_02056094
 .public sub_0205633C
-.public sub_020564B0
 .public sub_02057180
 .public sub_020572EC
-.public sub_020582E0
-.public sub_020586F0
-.public sub_02058794
 .public sub_0205B028
 .public sub_02064FFC
 .public sub_02065C08
@@ -494,22 +347,3 @@
 .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_02309EE4.inc

@@ -0,0 +1,131 @@
+#pragma once
+.public AppendStandardStringToMission
+.public BAG_ITEMS_PTR_MIRROR
+.public CheckTeamMemberIdx
+.public CloseAdvancedTextBox
+.public CloseCollectionMenu
+.public CloseParentMenu
+.public CloseScrollBox
+.public CloseSynthBin
+.public CountNbItemsOfTypeInBag
+.public CountNbItemsOfTypeInStorage
+.public CreateAdvancedTextBox
+.public CreateCollectionMenu
+.public CreateParentMenuFromStringIds
+.public DrawTextInWindow
+.public DungeonMoveToGroundMove
+.public EXCLUSIVE_ITEM_REQUIREMENTS_PTR
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetActorMatchingStorageId
+.public GetCroagunkItemTemplates
+.public GetCurrentBagCapacity
+.public GetExclusiveItemType
+.public GetGameMode
+.public GetInfoMoveGround
+.public GetItemAtIdx
+.public GetSimpleMenuResult__0202AEA4
+.public GetTeamMember
+.public GetWindowIdPageStart
+.public GetWindowIdSelectedMenuItemIdx
+.public InitMenu
+.public InitMove
+.public InitPreprocessorArgs
+.public IsAdvancedTextBoxActive
+.public IsCollectionMenuActive
+.public IsCollectionMenuState3
+.public IsParentMenuActive
+.public LoadSynthBin
+.public MaybeGetColoredFormattedItemName
+.public MaybeGetUncoloredFormattedItemName
+.public MemAlloc
+.public MemFree
+.public MemZero
+.public MemcpySimple
+.public PlaySeVolumeWrapper
+.public PreprocessStringFromId
+.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 SetCollectionMenuField0x1A4
+.public SetCollectionMenuField0x1C8
+.public SetWindowTitle
+.public SwapShopFreeDoublePointer
+.public UpdateWindow
+.public ov11_02301174
+.public ov11_02322DC8
+.public ov11_02322DF0
+.public ov11_02322EAC
+.public ov11_02322EBC
+.public ov11_02322ECC
+.public ov11_02322EDC
+.public ov11_02322F24
+.public ov11_02322F30
+.public ov11_02322F40
+.public ov11_02322F58
+.public ov11_02322F5C
+.public ov11_02322F80
+.public ov11_02322F84
+.public ov11_02322F98
+.public ov11_02322FD4
+.public ov11_02322FE4
+.public ov11_02322FF4
+.public ov11_02324D94
+.public ov11_02324D98
+.public strcat
+.public strcpy
+.public sub_020037A4
+.public sub_0200FD48
+.public sub_02010044
+.public sub_02011420
+.public sub_02017C50
+.public sub_02017C74
+.public sub_020262E0
+.public sub_0202836C
+.public sub_0202A03C
+.public sub_0202C620
+.public sub_0202C75C
+.public sub_0202D07C
+.public sub_0202D0EC
+.public sub_0203FA64
+.public sub_0203FD14
+.public sub_0203FD38
+.public sub_0203FD80
+.public sub_0204018C
+.public sub_020407C0
+.public sub_020407EC
+.public sub_02041094
+.public sub_020410A4
+.public sub_02041154
+.public sub_02041364
+.public sub_02041394
+.public sub_02041484
+.public sub_020416FC
+.public sub_020417A8
+.public sub_02041A00
+.public sub_02041A18
+.public sub_02046A20
+.public sub_02046B04
+.public sub_02046BA0
+.public sub_02046BE8
+.public sub_02046C30
+.public sub_02046C78
+.public sub_02046D20
+.public sub_0204707C
+.public sub_020470D0
+.public sub_02047148
+.public sub_02047150
+.public sub_02047188
+.public sub_0204E210
+.public sub_02053A0C
+.public sub_020546E8
+.public sub_02055894
+.public sub_02056094
+.public sub_0205633C
+.public sub_020564B0

asm/include/overlay_29_022DC314.inc

@@ -1,18 +0,0 @@
-#pragma once
-.public _020AFC70
-.public Debug_Print0
-.public LoadFileFromRom
-.public ov29_0234FD04
-.public ov29_0234FD14
-.public ov29_0234FD48
-.public ov29_0234FD4C
-.public ov29_0234FD50
-.public ov29_0234FD54
-.public ov29_023534E8
-.public ov29_02353880
-.public Render3dSetPaletteBase
-.public Render3dSetTextureParams
-.public Render3dTextureNoSetup
-.public sub_02008BF4
-.public sub_0201E050
-.public sub_0201E380

asm/include/overlay_29_022E2B68.inc

@@ -1,18 +1,16 @@
 #pragma once
-.public abs
 .public CanSeeInvisibleMonsters
-.public DrawMinimapTile
 .public DUNGEON_PTR
-.public EntityIsValid__022E1A1C
+.public DrawMinimapTile
 .public EntityIsValid__022E32E8
-.public GetForcedLossReason
-.public GetMessageLogPreprocessorArgs
-.public GetMonsterName
-.public GetTrapName
 .public HasDropeyeStatus
 .public IsBlinded
 .public IsPositionActuallyInSight
 .public ItemIsActive__022E330C
+.public TeamMemberHasEnabledIqSkill
+.public UpdateMinimap
+.public UpdateTrapsVisibility
+.public abs
 .public ov29_022E34C8
 .public ov29_022E3534
 .public ov29_022E3A58
@@ -21,13 +19,5 @@
 .public ov29_0233711C
 .public ov29_023372A4
 .public ov29_0237C84C
-.public PrepareItemForPrinting2
-.public SetPreprocessorArgsStringToName
-.public strcpy
-.public StringFromId
 .public sub_02009194
 .public sub_020091B0
-.public SubstitutePlaceholderTrapTags
-.public TeamMemberHasEnabledIqSkill
-.public UpdateMinimap
-.public UpdateTrapsVisibility

asm/include/overlay_29_022E335C.inc

@@ -1,23 +0,0 @@
-#pragma once
-.public AdvanceFrame
-.public AnimationDelayOrSomething
-.public AnimationHasMoreFrames
-.public DisplayUi
-.public DUNGEON_PTR
-.public EntityIsValid__022E37B8
-.public GetEffectAnimationWanOffset
-.public GetPixelOffsetFromSprite
-.public GetTileSafe
-.public InitOamAdjustmentInfo
-.public LogMessageByIdWithPopupCheckUser
-.public ov10_022BF274
-.public ov10_022BF2B4
-.public ov10_022BFD20
-.public ov29_022E2C6C
-.public ov29_0235110C
-.public ov29_0235354C
-.public ScreenEffectActive
-.public ShouldDisplayEntityAdvanced
-.public UpdateCamera
-.public UpdateMinimap
-.public UpdateTrapsVisibility

asm/include/overlay_29_022E37DC.inc

@@ -3,8 +3,8 @@
 .public AnimationHasMoreFrames
 .public DUNGEON_PTR
 .public EntityIsValid__022E37B8
-.public GetEffectAnimationWanOffset
 .public InitOamAdjustmentInfo
+.public UpdateStatusIconFlags
 .public ov10_022BDC68
 .public ov10_022BF274
 .public ov10_022BF2B4
@@ -14,20 +14,3 @@
 .public ov29_022E6E40
 .public ov29_022ED0F4
 .public ov29_0235354C
-.public PlayEffectAnimationEntity
-.public PlaySeByIdIfShouldDisplayEntity
-.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

asm/include/overlay_29_022E4BB4.inc

@@ -1,5 +0,0 @@
-#pragma once
-.public DUNGEON_PTR
-.public GetEffectAnimationWanOffset
-.public ov29_0230D618
-.public PlayEffectAnimationEntity

asm/include/overlay_29_022E5650.inc

@@ -1,41 +0,0 @@
-#pragma once
-.public AdvanceFrame
-.public AnimationHasMoreFrames
-.public ChangeDungeonMusic
-.public ChangeMonsterAnimation
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
-.public DungeonGoesUp
-.public EntityIsValid__022E37B8
-.public FillPixelOffsetArrayFromSprite
-.public GetEffectAnimationWanOffset
-.public GetFloorType
-.public GetLeader
-.public InitOamAdjustmentInfo
-.public IsCurrentFixedRoomBossFight
-.public LogMessageByIdWithPopup
-.public ov10_022BDC68
-.public ov10_022BEC08
-.public ov10_022BEC94
-.public ov10_022BF274
-.public ov10_022BF2B4
-.public ov10_022BF45C
-.public ov29_022E2CA0
-.public ov29_022E6A00
-.public ov29_022E6C08
-.public ov29_022E6CE0
-.public ov29_022EA370
-.public ov29_02339148
-.public ov29_0234B1A4
-.public ov29_02351194
-.public ov29_0235119C
-.public ov29_023511DC
-.public ov29_0235122C
-.public ov29_0235124C
-.public PlayEffectAnimationEntity
-.public PlayEffectAnimationPixelPos
-.public PlayEffectAnimationPos
-.public PlayMeByIdIfNot998
-.public PlaySeByIdIfNotSilence
-.public ShouldDisplayEntityWrapper
-.public SubstitutePlaceholderStringTags

asm/include/overlay_29_022E7EC4.inc

@@ -1,49 +0,0 @@
-#pragma once
-.public DUNGEON_FRAMES_PASSED
-.public DUNGEON_PTR
-.public DungeonChangeTopScreenType
-.public DungeonGetSpriteIndex
-.public FreeDungeonControlsMenu
-.public FreeTopScreen
-.public GetIdleAnimationId
-.public GetPlayerGender
-.public GetTopScreenOption
-.public InitDungeonControlsMenu
-.public IsTeamStatsOnTopScreen
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public ov10_022C1E50
-.public ov10_022C1E80
-.public ov10_022C21D8
-.public ov10_022C2278
-.public ov10_022C22A0
-.public ov29_022DC694
-.public ov29_022DC6D0
-.public ov29_022DC6DC
-.public ov29_022DC6E8
-.public ov29_022DC728
-.public ov29_022DC738
-.public ov29_022DC76C
-.public ov29_022DC778
-.public ov29_022DC77C
-.public ov29_022E8708
-.public ov29_022E8CE8
-.public ov29_022E8F78
-.public ov29_022E8FCC
-.public ov29_022E8FF8
-.public ov29_022E9008
-.public ov29_022E9014
-.public ov29_02339138
-.public ov29_02339D7C
-.public ov29_0233A0E8
-.public ov29_0233A1BC
-.public ov29_0234B4E0
-.public SetMinimapDataE447
-.public SetMinimapDataE448
-.public sub_02048384
-.public sub_020483B8
-.public sub_020483D8
-.public sub_02048400
-.public TOP_SCREEN_STATUS_PTR
-.public UpdateMinimap

asm/include/overlay_29_022E9298.inc

@@ -1,4 +0,0 @@
-#pragma once
-.public DUNGEON_PTR
-.public GetTile
-.public GetVisibilityRange

asm/include/overlay_29_022E9488.inc

@@ -1,9 +0,0 @@
-#pragma once
-.public AddSimpleObjToOam
-.public DUNGEON_PTR
-.public OBJ_GRAPHICS_CONTROLS_PTR
-.public ov29_0237C888
-.public ov29_0237C88A
-.public ov29_0237C88E
-.public ov29_0237C890
-.public ov29_0237C892

asm/include/overlay_29_022E9628.inc

@@ -1,8 +0,0 @@
-#pragma once
-.public abs
-.public DUNGEON_PTR
-.public DungeonRandInt
-.public GetLeader
-.public GetTile
-.public MemAlloc
-.public MemFree

asm/include/overlay_29_022E9FE0.inc

@@ -1,36 +0,0 @@
-#pragma once
-.public _s32_div_f
-.public ChangeSimpleObjTexture
-.public DisplayMonstersAndItems
-.public DisplayUi
-.public DUNGEON_BUTTON_INPUT
-.public DUNGEON_FRAMES_PASSED
-.public DUNGEON_PTR
-.public FlashLeaderIcon
-.public GetAlertBoxLoadingStatus
-.public GetBottomScreenOption
-.public GetTile
-.public GetTopScreenOption
-.public HandleTopScreenFades
-.public InitWeirdMinimapMatrix
-.public OBJ_GRAPHICS_CONTROLS_PTR
-.public ov29_022DD8B4
-.public ov29_022DDEF8
-.public ov29_022DE11C
-.public ov29_022DE134
-.public ov29_022DE638
-.public ov29_022E335C
-.public ov29_022E8C10
-.public ov29_022ED800
-.public ov29_0230473C
-.public ov29_02335F40
-.public ov29_02339FF4
-.public ov29_0233A248
-.public ov29_0234B1A4
-.public ov29_0234B854
-.public ov29_02353540
-.public ov29_02353560
-.public RenderWeather3D
-.public sub_02051E20
-.public UpdateCamera
-.public UpdateMinimap

asm/include/overlay_29_022EAB50.inc

@@ -1,5 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public DungeonRandRange
-.public IqSkillIsEnabled
-.public RoundUpDiv256

asm/include/overlay_29_022EAD68.inc

@@ -1,13 +1,10 @@
 #pragma once
-.public _s32_div_f
 .public AdvanceFrame
 .public ChangeDungeonMusic
 .public DUNGEON_PTR
-.public DungeonRandInt
 .public FIXED_ROOM_PROPERTIES_TABLE
 .public IsCurrentFixedRoomBossFight
-.public MUSIC_ID_TABLE
+.public MusicTableIdxToMusicId
 .public ov29_022EAE40
-.public RANDOM_MUSIC_ID_TABLE
 .public sub_02017B18
 .public sub_02017C68

asm/include/overlay_29_022EC62C.inc

@@ -1,29 +1,12 @@
 #pragma once
-.public _s32_div_f
 .public AbilityIsActiveVeneer
-.public AdvanceFrame
-.public ChangeDungeonMusic
-.public DisplayActions
 .public DUNGEON_PTR
 .public EntityIsValid__022EC608
-.public EntityIsValid__022ECDC0
 .public ExecuteMonsterAction
-.public GetForcedLossReason
 .public GetLeader
-.public GetMonsterName
-.public HandleFaint
+.public IsFloorOver
 .public IsFloorOver2
-.public LogMessageByIdWithPopupCheckUser
-.public ov10_022C6320
-.public ov29_022E5DBC
-.public ov29_022EAEF0
-.public ov29_022F2FE4
-.public ov29_023522B6
-.public ov29_02352380
-.public ov29_02352390
-.public ov29_02353598
-.public ov29_0237C974
 .public RunMonsterAi
 .public TryForcedLoss
-.public TryPointCameraToMonster
 .public TrySpawnMonsterAndTickSpawnCounter
+.public ov29_023522B6

asm/include/overlay_29_022EC85C.inc

@@ -0,0 +1,19 @@
+#pragma once
+.public AdvanceFrame
+.public ChangeDungeonMusic
+.public DUNGEON_PTR
+.public DisplayActions
+.public GetForcedLossReason
+.public GetLeader
+.public HandleFaint
+.public IsFloorOver
+.public LogMessageByIdWithPopupCheckUser
+.public TryPointCameraToMonster
+.public _s32_div_f
+.public ov10_022C6320
+.public ov29_022E5DBC
+.public ov29_022EAEF0
+.public ov29_022F2FE4
+.public ov29_02352380
+.public ov29_02352390
+.public ov29_02353598

asm/include/overlay_29_022EFB20.inc

@@ -1,12 +0,0 @@
-#pragma once
-.public DUNGEON_PTR
-.public EntityIsValid__022F0590
-.public ov29_022DE5F0
-.public ov29_022EA370
-.public ov29_0234B1A4
-.public ov29_0234D630
-.public ov29_0234D8A0
-.public ov29_023535A4
-.public ov29_0237C9A0
-.public SetAnimationControlPausedFlag
-.public WaitUntilAlertBoxPauseIsOver

asm/include/overlay_29_022EFBAC.inc

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

asm/include/overlay_29_022F07BC.inc

@@ -1,19 +1,15 @@
 #pragma once
 .public AddMoneyCarried
 .public AdvanceFrame
-.public AnimationDelayOrSomething
 .public AppendStandardStringToMission
 .public CheckMonsterTeamMemberIdx
 .public CloseTextBox
 .public CreateTextBox
-.public DrawTextInWindow
 .public DUNGEON_BUTTON_INPUT
 .public DUNGEON_PTR
+.public DrawTextInWindow
 .public EntityIsValid__022F0590
-.public ExecuteMoveEffect
 .public GetBottomScreenOption
-.public GetDirectionTowardsPosition
-.public GetLeader
 .public GetLeaderMonster
 .public GetMessageLogPreprocessorArgs
 .public GetMoneyCarried
@@ -26,15 +22,24 @@
 .public MakeMonsterIdleInDirection2
 .public MemAlloc
 .public MemFree
+.public PlaySeByIdVolumeWrapper
+.public PreprocessString
+.public SetMessageLogPreprocessorArgsSpeakerId
+.public SetMessageLogPreprocessorArgsSpeakerId0x30000
+.public SetMessageLogPreprocessorArgsStringToName
+.public SetTopScreenOption
+.public SubstitutePlaceholderStringTags
+.public UnkMapRelatedFunc
+.public UpdateAiTargetPos
+.public UpdateMinimap
+.public UpdateWindow
 .public ov29_022DE608
 .public ov29_022E0B44
 .public ov29_022E0C4C
 .public ov29_022E0DD8
 .public ov29_022E0DF0
-.public ov29_022E81F8
 .public ov29_022EA370
 .public ov29_022F3B98
-.public ov29_02322DDC
 .public ov29_02338F58
 .public ov29_02339190
 .public ov29_023391C0
@@ -43,7 +48,6 @@
 .public ov29_0234B1A4
 .public ov29_0234D650
 .public ov29_0234D65C
-.public ov29_0234D668
 .public ov29_0234D690
 .public ov29_0234D860
 .public ov29_0234D878
@@ -53,19 +57,6 @@
 .public ov29_023535A4
 .public ov29_0237C6A4
 .public ov29_0237CFBB
-.public PlaySeByIdVolumeWrapper
-.public PreprocessString
-.public SetMessageLogPreprocessorArgsSpeakerId
-.public SetMessageLogPreprocessorArgsSpeakerId0x30000
-.public SetMessageLogPreprocessorArgsStringToName
-.public SetTopScreenOption
 .public sub_02001AB0
 .public sub_02006B70
 .public sub_02027B1C
-.public SubstitutePlaceholderStringTags
-.public TryPointCameraToMonster
-.public UnkMapRelatedFunc
-.public UpdateAiTargetPos
-.public UpdateMinimap
-.public UpdateWindow
-.public WaitUntilAlertBoxPauseIsOver

asm/include/overlay_29_022F740C.inc

@@ -1,13 +0,0 @@
-#pragma once
-.public DirectoryFileMngr_GetDirectoryFileSize
-.public DUNGEON_PTR
-.public GendersEqualNotGenderless
-.public GetMonsterGender
-.public GetSpriteFileSize
-.public GetSpriteIndex__020526EC
-.public IsShaymin
-.public LoadWanTableEntryFromPack
-.public LoadWanTableEntryFromPackUseProvidedMemory
-.public MemAlloc
-.public ov29_0237C9B0
-.public WAN_TABLE

asm/include/overlay_29_022FB678.inc

@@ -1,19 +0,0 @@
-#pragma once
-.public _020A1870
-.public Conversion2IsActive
-.public DIRECTIONS_XY
-.public DisplayAnimatedNumbers
-.public DUNGEON_PTR
-.public EntityIsValid__022F7364
-.public GetMaxPp
-.public GetMoveBasePp
-.public GetTile
-.public IqSkillIsEnabled
-.public IsMonster__022F9720
-.public IsSecretBazaarNpcBehavior
-.public ov29_02348100
-.public PlayMissSfx__022E611C
-.public ResetTypeChanges
-.public TeamMemberHasEnabledIqSkill
-.public UpdateMapSurveyorFlag
-.public UpdateMinimap

asm/include/overlay_29_022FBC4C.inc

@@ -1,5 +0,0 @@
-#pragma once
-.public DUNGEON_PTR
-.public EntityIsValid__022F7364
-.public GetBodySize
-.public IsMonster__022F9720

asm/include/overlay_29_022FF3F4.inc

@@ -1,7 +0,0 @@
-#pragma once
-.public EndTwoTurnMove
-.public IsChargingTwoTurnMove
-.public LogMessageByIdWithPopupCheckUser
-.public SetActionUseMovePlayer
-.public SetMonsterActionFields
-.public SubstitutePlaceholderStringTags

asm/include/overlay_29_02301940.inc

@@ -1,5 +0,0 @@
-#pragma once
-.public DefenderAbilityIsActive__02301A0C
-.public GetApparentWeather
-.public LogMessageByIdWithPopupCheckUserTarget
-.public SubstitutePlaceholderStringTags

asm/include/overlay_29_02301D84.inc

@@ -1,5 +0,0 @@
-#pragma once
-.public DefenderAbilityIsActive__02301A0C
-.public DUNGEON_PTR
-.public EntityIsValid__023000E4
-.public ShouldTreatMonsterAsAlly

asm/include/overlay_29_02302388.inc

@@ -1,21 +0,0 @@
-#pragma once
-.public _s32_div_f
-.public DUNGEON_PTR
-.public EntityIsValid__023000E4
-.public EXCLUSIVE_ITEM_EXP_BOOST
-.public ExclusiveItemEffectFlagTest
-.public ExclusiveItemEffectIsActive__022FFF28
-.public EXP_ELITE_EXP_BOOST
-.public GetExclusiveItemWithEffectFromBag
-.public IqSkillIsEnabled
-.public IsBlinded
-.public IsExperienceLocked
-.public ItemIsActive__023026CC
-.public LeafGuardIsActive
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MIRACLE_CHEST_EXP_BOOST
-.public MultiplyByFixedPoint
-.public ov29_02301A84
-.public PrepareItemForPrinting__02345728
-.public SubstitutePlaceholderStringTags
-.public WONDER_CHEST_EXP_BOOST

asm/include/overlay_29_023026FC.inc

@@ -1,21 +0,0 @@
-#pragma once
-.public AllocateTemp1024ByteBufferFromPool
-.public CreateTemporaryEntity
-.public DUNGEON_PTR
-.public DungeonGetSpriteIndex
-.public DungeonRandInt
-.public EntityIsValid__02302A38
-.public EvolveMonster
-.public GetEvolutions
-.public GetForcedLossReason
-.public GetMessageLogPreprocessorArgs
-.public GetUnlockedTacticFlags
-.public IsExpEnabledInDungeon
-.public IsOnMonsterSpawnList
-.public LevelUp
-.public LogMessageByIdWithPopup
-.public ov29_02302C04
-.public ov29_02302CC8
-.public ov29_023527F8
-.public SetMessageLogPreprocessorArgsNumberVal
-.public SetPreprocessorArgsStringToName

asm/include/overlay_29_023047DC.inc

@@ -1,46 +0,0 @@
-#pragma once
-.public _s32_div_f
-.public ActivateEndOfTurnEffects
-.public ActivateTerrainEffects
-.public AdvanceFrame
-.public CheckLeaderTile
-.public CheckNonLeaderTile
-.public CheckVariousStatuses2__02301244
-.public CheckVariousStatuses__023016DC
-.public DiscoverMinimap
-.public DUNGEON_PTR
-.public DungeonGetSpriteIndex
-.public EnemyEvolution
-.public EnsureCanStandCurrentTile
-.public EntityIsValid__023047B8
-.public EntityIsValid__0230558C
-.public GetDirectionTowardsPosition
-.public GetShadowSize
-.public GetSpeedOption
-.public GetTileAtEntity
-.public HandleShopTransaction
-.public IncrementEntityPixelPosXY
-.public IsFloorOver
-.public IsFloorOver2
-.public IsWaterTileset
-.public ov29_022E8104
-.public ov29_022EA370
-.public ov29_022EF9BC
-.public ov29_02305814
-.public ov29_02307DD0
-.public ov29_02346888
-.public ov29_0234AD10
-.public ov29_0235173C
-.public ov29_0235173E
-.public ov29_02352808
-.public ov29_0237C9C1
-.public ov29_0237C9CC
-.public Rand16Bit
-.public SECONDARY_TERRAIN_TYPES
-.public SetAndPlayAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public ShouldDisplayEntityWrapper
-.public sub_02053038
-.public TryForcedLoss
-.public UpdateEntityPixelPos
-.public WaitUntilAlertBoxTextIsLoaded

asm/include/overlay_29_023055B0.inc

@@ -1,52 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public CalcSpeedStageWrapper
-.public ChangeMonsterAnimation
-.public CheckVariousStatuses2__02301244
-.public DUNGEON_PTR
-.public EndBlinkerClassStatus
-.public EndBurnClassStatus
-.public EndCringeClassStatus
-.public EndCurseClassStatus
-.public EndFrozenClassStatus
-.public EndLeechSeedClassStatus
-.public EndMiracleEyeStatus
-.public EndMuzzledStatus
-.public EndSleepClassStatus
-.public EndSureShotClassStatus
-.public EntityIsValid__0230558C
-.public EntityIsValid__02305C04
-.public GetDirectionTowardsPosition
-.public GetIdleAnimationId
-.public GetLeader
-.public GetTileAtEntity
-.public GetTrapInfo
-.public HasHeldItem
-.public IqSkillIsEnabled
-.public IsFloorOver
-.public IsMonsterDrowsy
-.public IsMonsterMuzzled
-.public IsMonsterVisuallyImpaired
-.public IsTeamMemberOnFirstTurnInFixedRoom
-.public LogMessageByIdWithPopupCheckUser
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MonsterHasAttackInterferingStatus
-.public MonsterHasImmobilizingStatus
-.public MonsterHasLeechSeedStatus
-.public MonsterHasMiracleEyeStatus
-.public MonsterHasNegativeStatus
-.public MonsterHasNonvolatileNonsleepStatus
-.public MonsterHasSkillInterferingStatus
-.public MonsterHasWhifferStatus
-.public ov29_022E2CA0
-.public ov29_022E3A58
-.public ov29_022E543C
-.public ov29_022EA370
-.public ov29_02337D68
-.public ov29_02353318
-.public SubstitutePlaceholderStringTags
-.public TryNonLeaderItemPickUp
-.public TryTriggerMonsterHouse
-.public TryTriggerTrap
-.public UpdateStatusIconFlags
-.public UpdateTrapsVisibility

asm/include/overlay_29_02305C3C.inc

@@ -0,0 +1,32 @@
+#pragma once
+.public ApplyDamageAndEffectsWrapper
+.public CalcSpeedStageWrapper
+.public CalcStatusDuration
+.public ChangeMonsterAnimationToIdle
+.public EndNegativeStatusCondition
+.public EntityIsValid__02305C04
+.public IsProtectedFromNegativeStatus
+.public LogMessageByIdWithPopupCheckUserTarget
+.public MonsterHasNegativeStatus
+.public SafeguardIsActive
+.public SubInitMonster
+.public SubstitutePlaceholderStringTags
+.public TransferNegativeBlinkerClassStatus
+.public TryIncreaseHp
+.public TryInflictExposedStatus
+.public TryInflictPerishSongStatus
+.public TryInflictSleepStatus
+.public UpdateStatusIconFlags
+.public ov10_022C45A0
+.public ov10_022C45A8
+.public ov10_022C4868
+.public ov29_022E543C
+.public ov29_02306DCC
+.public ov29_02306F00
+.public ov29_02307078
+.public ov29_02307198
+.public ov29_0230737C
+.public ov29_023076C0
+.public ov29_023077FC
+.public ov29_02307A2C
+.public ov29_02307B0C

asm/include/overlay_29_02306258.inc

@@ -0,0 +1,12 @@
+#pragma once
+.public CalcSpeedStageWrapper
+.public DUNGEON_PTR
+.public EntityIsValid__02305C04
+.public FreeOtherWrappedMonsters
+.public LogMessageByIdWithPopupCheckUser
+.public LogMessageByIdWithPopupCheckUserTarget
+.public ResetTypeChanges
+.public SubstitutePlaceholderStringTags
+.public UpdateStatusIconFlags
+.public ov29_022E65F4
+.public ov29_022E6798

asm/include/overlay_29_023068C4.inc

@@ -1,41 +1,23 @@
 #pragma once
-.public abs
 .public AdvanceFrame
-.public ApplyDamageAndEffectsWrapper
 .public CalcSpeedStageWrapper
-.public CalcStatusDuration
 .public ChangeMonsterAnimationToIdle
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
-.public EndNegativeStatusCondition
+.public EndCurseClassStatus
+.public EndFrozenClassStatus
+.public EndReflectClassStatus
+.public EndSleepClassStatus
 .public EnsureCanStandCurrentTile
 .public EntityIsValid__02305C04
 .public EntityIsValid__02307EF8
-.public FreeOtherWrappedMonsters
 .public GetIdleAnimationId
 .public GetMonsterApparentId
 .public GetType
-.public HandleShopTransaction
-.public IsProtectedFromNegativeStatus
 .public ItemIsActive__02307F1C
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserTarget
-.public MonsterHasNegativeStatus
-.public ov10_022C45A0
-.public ov10_022C45A8
-.public ov10_022C4868
-.public ov29_022E543C
-.public ov29_022E65F4
-.public ov29_022E6798
-.public ov29_022FA1D8
-.public ov29_022FB984
-.public ov29_02304830
-.public ov29_02311C28
-.public ov29_02321134
-.public SafeguardIsActive
-.public SubInitMonster
 .public SubstitutePlaceholderStringTags
-.public TryIncreaseHp
 .public TryInflictBadlyPoisonedStatus
 .public TryInflictBlinkerStatus
 .public TryInflictBurnStatus
@@ -48,7 +30,6 @@
 .public TryInflictDropeyeStatus
 .public TryInflictEmbargoStatus
 .public TryInflictEncoreStatus
-.public TryInflictExposedStatus
 .public TryInflictGastroAcidStatus
 .public TryInflictHealBlockStatus
 .public TryInflictInfatuatedStatus
@@ -57,12 +38,18 @@
 .public TryInflictMuzzledStatus
 .public TryInflictParalysisStatus
 .public TryInflictPausedStatus
-.public TryInflictPerishSongStatus
 .public TryInflictPoisonedStatus
 .public TryInflictShadowHoldStatus
-.public TryInflictSleepStatus
 .public TryInflictTauntStatus
 .public TryInflictWhifferStatus
+.public TryRemoveSnatchedMonsterFromDungeonStruct
 .public UpdateMinimap
 .public UpdateStatusIconFlags
 .public UpdateTrapsVisibility
+.public abs
+.public HandleShopTransaction
+.public ov29_022FA1D8
+.public ov29_022FB984
+.public ov29_02304830
+.public ov29_02311C28
+.public ov29_02321134

asm/include/overlay_29_02307F4C.inc

@@ -1,15 +0,0 @@
-#pragma once
-.public AdvanceFrame
-.public AnimationDelayOrSomething
-.public DUNGEON_PTR
-.public DungeonRandInt
-.public DungeonRandRange
-.public EntityIsValid__02307EF8
-.public GetMonsterIdToSpawn
-.public GetTileAtEntity
-.public GetTileSafe
-.public MewSpawnCheck
-.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS
-.public MultiplyByFixedPoint
-.public ov10_022C4560
-.public SpawnMonster

asm/include/overlay_29_023085DC.inc

@@ -1,48 +1,3 @@
 #pragma once
-.public abs
-.public ApplyDamage
-.public ApplyDamageAndEffectsWrapper
-.public ARENA_TRAP_ACTIVATION_CHANCE
-.public ATK_STAT_IDX
-.public BoostOffensiveStat
-.public CategoryIsNotPhysical
-.public CUTE_CHARM_INFATUATE_CHANCE
-.public DefenderAbilityIsActive__0230A940
-.public DUNGEON_PTR
 .public DungeonRandInt
-.public EntityIsValid__02308FBC
-.public ExclusiveItemEffectIsActive__0230A9B8
-.public GendersNotEqualNotGenderless
-.public GravityIsActive
-.public HasLowHealth
-.public HasTypeAffectedByGravity
-.public IqSkillIsEnabled
-.public IsEitherMonsterInvalid
-.public LevitateIsActive
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MAGNET_PULL_ACTIVATION_CHANCE
-.public MonsterIsType
-.public ov10_022C442C
-.public ov10_022C4464
-.public ov10_022C44C0
-.public ov10_022C4550
-.public ov10_022C45AC
-.public ov10_022C45B0
-.public ov10_022C45B4
-.public ov10_022C45C0
-.public ov10_022C4638
-.public ov10_022C467C
-.public ov29_022E3F24
-.public ov29_022E40C0
-.public ov29_022E45D0
-.public ov29_022E57D4
-.public ov29_022E5E84
-.public ov29_02300D50
-.public ov29_0230F728
-.public ov29_023380FC
-.public ov29_023535DC
-.public RAPID_SPIN_BINDING_REMOVAL
-.public ResetDamageData
-.public SHADOW_TAG_ACTIVATION_CHANCE
-.public TryHurl
 .public UpdateAiTargetPos

asm/include/overlay_29_02308FE0.inc

@@ -1,121 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public abs
-.public ActivateMotorDrive
-.public AddExpSpecial
-.public AdvanceFrame
-.public AftermathCheck
-.public BAG_ITEMS_PTR_MIRROR
-.public CanEnemyEvolve
-.public CanSeeTarget
-.public ChangeDungeonMusic
-.public ChangeMonsterAnimation
-.public ChangeMonsterAnimationToIdle
-.public DAMAGE_STRING_IDS
-.public DEFEAT_STRING_IDS
-.public DefenderAbilityIsActive__0230A940
-.public DisplayAnimatedNumbers
-.public DUNGEON_PTR
-.public DungeonRandOutcome__022EAB20
-.public EndCurseClassStatus
-.public EndInvisibleClassStatus
-.public EndLeechSeedStatusForAllTargets
-.public EntityIsValid__02308FBC
-.public ExclusiveItemEffectIsActive__0230A9B8
-.public ExclusiveItemEffectIsActiveWithLogging
-.public FillRecruitInfo
-.public FreeOtherWrappedMonsters
-.public GetActiveTeamMember
-.public GetDamageTurnOption
-.public GetDirectionTowardsPosition
-.public GetExp
-.public GetIdleAnimationId
-.public GetTileAtEntity
-.public HandleFaint
-.public IqSkillIsEnabled
-.public IsBlinded
-.public IsCurrentMissionType
-.public IsExperienceLocked
-.public IsMonsterIdInNormalRangeVeneer
-.public IsMonsterLoneOutlaw
-.public IsSecretBazaarNpcBehavior
-.public IsSpecialStoryAlly
-.public ItemIsActive__0230A9DC
-.public ItemZInit
-.public JoinedAtRangeCheck2Veneer
-.public LogMessageByIdWithPopup
-.public LogMessageByIdWithPopupCheckUser
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MoveMonsterToPos
-.public MusicTableIdxToMusicId
-.public ov10_022BDC68
-.public ov10_022BF964
-.public ov10_022C45C4
-.public ov10_022C45FC
-.public ov10_022C4834
-.public ov10_022C593C
-.public ov29_022E5478
-.public ov29_022E550C
-.public ov29_022E66D8
-.public ov29_022E81F8
-.public ov29_022EA370
-.public ov29_022EAF20
-.public ov29_022ECD84
-.public ov29_022EFB20
-.public ov29_022EFB84
-.public ov29_022F0534
-.public ov29_022F05E4
-.public ov29_022F0780
-.public ov29_022F9AF4
-.public ov29_022FB98C
-.public ov29_022FBD24
-.public ov29_02303E0C
-.public ov29_02304830
-.public ov29_02307C48
-.public ov29_02307DC0
-.public ov29_0230D628
-.public ov29_0230D688
-.public ov29_0230D7D4
-.public ov29_0233847C
-.public ov29_02344B9C
-.public ov29_0234969C
-.public ov29_0234B1A4
-.public ov29_02353218
-.public ov29_02353220
-.public ov29_02353224
-.public ov29_02353228
-.public ov29_0235322C
-.public ov29_02353230
-.public ov29_02353234
-.public ov29_023535D4
-.public ov29_0237CA6C
-.public PlayEffectAnimationEntity
-.public PlayMissSfx__022E611C
-.public PlayMissSfx__022E6150
-.public RecruitCheck
-.public RemoveHolderForItemInBag
-.public RestorePpAllMovesSetFlags
-.public RestoreRandomMovePP
-.public SET_DAMAGE_STATUS_DAMAGE
-.public SetMessageLogPreprocessorArgsNumberVal
-.public SetMonsterFlag2
-.public SetPokemonBattled
-.public SetUnkMusicFlag
-.public ShouldDisplayEntityWrapper
-.public SpawnDroppedItemWrapper
-.public SubInitMonster
-.public SubstitutePlaceholderStringTags
-.public TalkToSecretBazaarNpcStandard
-.public TerminateEffectWrapper
-.public TryEndPetrifiedOrSleepStatus
-.public TryIncreaseHp
-.public TryRecruit
-.public TrySpawnEnemyItemDrop
-.public TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS
-.public UnfreezeAnim
-.public UpdateAiTargetPos
-.public UpdateEntityPixelPos
-.public UpdateShopkeeperModeAfterAttack
-.public UpdateStatusIconFlags
-.public UpdateTrapsVisibility
-.public WaitUntilAlertBoxPauseIsOver

asm/include/overlay_29_0230AA8C.inc

@@ -1,12 +1,8 @@
 #pragma once
-.public AFTERMATH_CHANCE
-.public DefenderAbilityIsActive__0230A940
 .public DUNGEON_PTR
-.public DungeonRandOutcome__022EAB20
 .public GetTypeMatchup
 .public GhostImmunityIsActive
 .public IsTypeIneffectiveAgainstGhost
-.public ov29_02352838
 .public ScrappyShouldActivate
-.public TryAftermathExplosion
 .public TYPE_MATCHUP_COMBINATOR_TABLE
+.public ov29_02352838

asm/include/overlay_29_0230ABF0.inc

@@ -1,2 +0,0 @@
-#pragma once
-.public ExclusiveItemEffectIsActive__0230A9B8

asm/include/overlay_29_0230AD04.inc

@@ -1,45 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public BURN_DAMAGE_MULTIPLIER
-.public CLOUDY_DAMAGE_MULTIPLIER
-.public DAMAGE_MULTIPLIER_0_5
-.public DAMAGE_MULTIPLIER_1_5
-.public DAMAGE_MULTIPLIER_2
-.public DefenderAbilityIsActive__0230A940
-.public DUNGEON_PTR
-.public EntityIsValid__02308FBC
-.public ExclusiveItemEffectIsActive__0230A9B8
-.public FixedPoint32To64
-.public FixedPoint64IsZero
-.public FlashFireShouldActivate
-.public GetApparentWeather
-.public GetTypeMatchup
-.public GhostImmunityIsActive
-.public IntToFixedPoint64
-.public IqSkillIsEnabled
-.public IsFloating
-.public IsTypeIneffectiveAgainstGhost
-.public LevitateIsActive
-.public LogMessageByIdWithPopupCheckParticipants
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MATCHUP_IMMUNE_MULTIPLIER
-.public MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER
-.public MATCHUP_NEUTRAL_MULTIPLIER
-.public MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER
-.public MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER
-.public MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER
-.public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER
-.public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER
-.public MonsterIsType
-.public MultiplyFixedPoint64
-.public ov29_02352838
-.public PlayEffectAnimation0x1A9__022E61C8
-.public PlayEffectAnimation0x1A9__022E6214
-.public PlayEffectAnimation0x1A9__022E64C4
-.public PlayEffectAnimation0x1A9__022E6510
-.public ScrappyShouldActivate
-.public SOLID_ROCK_MULTIPLIER
-.public TECHNICIAN_MOVE_POWER_THRESHOLD
-.public TINTED_LENS_MULTIPLIER
-.public TYPE_MATCHUP_COMBINATOR_TABLE
-.public UpdateStateFlags

asm/include/overlay_29_0230BBAC.inc

@@ -1,100 +0,0 @@
-#pragma once
-.public _s32_div_f
-.public AbilityIsActiveVeneer
-.public AddFixedPoint64
-.public AdvanceFrame
-.public AIR_BLADE_DAMAGE_MULTIPLIER
-.public ApplyDamageAndEffects
-.public AURA_BOW_STAT_BOOST
-.public AuraBowIsActive
-.public CalcTypeBasedDamageEffects
-.public CeilFixedPoint
-.public ClampedLn
-.public CreateTemporaryEntity
-.public DAMAGE_FORMULA_AT_PREFACTOR
-.public DAMAGE_FORMULA_CONSTANT_SHIFT
-.public DAMAGE_FORMULA_DEF_PREFACTOR
-.public DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR
-.public DAMAGE_FORMULA_FLV_SHIFT
-.public DAMAGE_FORMULA_LN_ARG_PREFACTOR
-.public DAMAGE_FORMULA_LN_PREFACTOR
-.public DAMAGE_FORMULA_MAX_BASE
-.public DAMAGE_FORMULA_MIN_BASE
-.public DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER
-.public DAMAGE_MULTIPLIER_0_5
-.public DAMAGE_MULTIPLIER_1_5
-.public DAMAGE_MULTIPLIER_2
-.public Debug_Print0
-.public DEF_SCARF_STAT_BOOST
-.public DefenderAbilityIsActive__0230A940
-.public DEFENSIVE_STAT_STAGE_MULTIPLIERS
-.public DivideFixedPoint64
-.public DUNGEON_PTR
-.public DungeonRandInt
-.public EntityIsValid__02308FBC
-.public ExclusiveItemDefenseBoost
-.public ExclusiveItemEffectIsActive__0230A9B8
-.public ExclusiveItemEffectIsActiveWithLogging
-.public ExclusiveItemOffenseBoost
-.public FixedPoint32To64
-.public FixedPoint64CmpLt
-.public FixedPoint64ToInt
-.public FixedRoomIsSubstituteRoom
-.public FlashFireShouldActivate
-.public GendersEqualNotGenderless
-.public GendersNotEqualNotGenderless
-.public GenerateStandardItem
-.public GetApparentWeather
-.public GetEquivItemIndex
-.public GetItemAtIdx
-.public GetMonsterGenderVeneer
-.public GetMoveCategory
-.public GetTypeMatchup
-.public IntToFixedPoint64
-.public IqSkillIsEnabled
-.public IsMonster__0230A994
-.public IsPunchMove
-.public IsRecoilMove
-.public IsRegularAttackOrProjectile
-.public ItemIsActive__0230A9DC
-.public LogMessageByIdWithPopupCheckUserTarget
-.public ME_FIRST_MULTIPLIER
-.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 ov10_022BF964
-.public ov10_022C45B4
-.public ov29_02352838
-.public ov29_02352894
-.public ov29_02352984
-.public ov29_02352990
-.public ov29_0235299C
-.public ov29_023535D4
-.public PlayEffectAnimation0x171
-.public PlayEffectAnimation0x171Full
-.public PlayEffectAnimation0x18E
-.public PlayEffectAnimation0x1A9__022E6130
-.public PlayEffectAnimation0x1A9__022E617C
-.public PlayEffectAnimationEntity
-.public PointCameraToMonster
-.public POWER_BAND_STAT_BOOST
-.public POWER_PITCHER_DAMAGE_MULTIPLIER
-.public ResetDamageData
-.public RoundUpDiv256
-.public SCOPE_LENS_CRIT_RATE_BOOST
-.public SetItemAcquired
-.public SPECIAL_BAND_STAT_BOOST
-.public SubstitutePlaceholderStringTags
-.public SUPER_LUCK_CRIT_RATE_BOOST
-.public TerminateEffectWrapper
-.public TYPE_ADVANTAGE_MASTER_CRIT_RATE
-.public TYPE_MATCHUP_COMBINATOR_TABLE
-.public UpdateStateFlags
-.public ZINC_BAND_STAT_BOOST

asm/include/overlay_29_0230E064.inc

@@ -1,57 +0,0 @@
-#pragma once
-.public abs
-.public CanSeeTarget
-.public ChangeMonsterAnimationToIdle
-.public DUNGEON_PTR
-.public DungeonModeSetupAndShowNameKeyboard
-.public EnableAllLearnableIqSkills
-.public EnsureCanStandCurrentTile
-.public GetActiveTeamMember
-.public GetDirectionTowardsPosition
-.public GetMessageLogPreprocessorArgs
-.public GetNameString
-.public GetRecoloredNameOfTeamMemberAtIdx
-.public GetRecoloredTeamMemberName
-.public HandleFaint
-.public InitTeamMember
-.public IsMonsterOnTeam
-.public LogMessageByIdWithPopupCheckUser
-.public MonsterIsType
-.public ov10_022C4410
-.public ov10_022C441C
-.public ov10_022C443C
-.public ov10_022C447C
-.public ov10_022C44FC
-.public ov10_022C46FC
-.public ov10_022C4700
-.public ov10_022C4704
-.public ov10_022C4708
-.public ov10_022C470C
-.public ov29_022E1B28
-.public ov29_022E68BC
-.public ov29_022E8104
-.public ov29_022E81F8
-.public ov29_022EACAC
-.public ov29_02305F60
-.public ov29_0230E5A8
-.public ov29_0230E5FC
-.public ov29_0230E658
-.public ov29_0234B1A4
-.public ov29_0234D630
-.public ov29_0234D7C0
-.public ov29_0234D838
-.public ov29_0234D8A0
-.public ov29_0234EE10
-.public RECRUITMENT_LEVEL_BOOST_TABLE
-.public RemoveMonsterFromTile
-.public SetMessageLogPreprocessorArgsString
-.public SetPokemonJoined
-.public SetPreprocessorArgsIdVal
-.public SetPreprocessorArgsStringToName
-.public SpecificRecruitCheck
-.public StrcpySimple
-.public StrncpyName
-.public StrncpySimpleNoPad
-.public sub_02056698
-.public SubstitutePlaceholderStringTags
-.public WaitUntilAlertBoxPauseIsOver

asm/include/overlay_29_0230F02C.inc

@@ -1,39 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public abs
-.public AddMoneyCarried
-.public AI_THROWN_ITEM_ACTION_CHOICE_COUNT
-.public BAG_ITEMS_PTR_MIRROR
-.public CanSeeTarget
-.public DUNGEON_PTR
-.public DungeonRandOutcome__022EAB20
-.public EntityIsValid__0230F008
-.public GetAiUseItemProbability
-.public GetCurrentBagCapacity
-.public GetExclusiveItemForMonsterFromBag
-.public GetItemCategoryVeneer
-.public GetItemInfo
-.public GetMoneyQuantity
-.public GetTileAtEntity
-.public GetTreatmentBetweenMonsters
-.public HasHeldItem
-.public IqSkillIsEnabled
-.public IsAuraBow
-.public IsExperienceLocked
-.public IsFloorOver
-.public IsItemUnkMissionItem2
-.public ItemIsActive__0230F810
-.public LogMessageByIdWithPopup
-.public ov29_022F9EA0
-.public ov29_02345004
-.public ov29_02347040
-.public ov29_02348D3C
-.public ov29_02348DD8
-.public ov29_02348ECC
-.public PlaySeByIdIfNotSilence
-.public PrepareItemForPrinting__02345728
-.public RemoveGroundItem
-.public ShouldMonsterRunAwayAndShowEffect
-.public SubstitutePlaceholderStringTags
-.public UseSingleUseItemSelf
-.public UseThrowableItem

asm/include/overlay_29_0230F9A4.inc

@@ -1,93 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public ApplyDamageAndEffectsWrapper
-.public BAD_POISON_DAMAGE_COOLDOWN
-.public BAD_POISON_DAMAGE_TABLE
-.public BAD_WEATHER_DAMAGE
-.public BinToDecFixedPoint
-.public BoostSpeedOneStage
-.public BURN_DAMAGE
-.public BURN_DAMAGE_COOLDOWN
-.public CeilFixedPoint
-.public CheckVariousStatuses2__02301244
-.public CheckVariousStatuses__023016DC
-.public CONSTRICTION_DAMAGE
-.public CURSE_DAMAGE_COOLDOWN
-.public DisplayActions
-.public DUNGEON_PTR
-.public DungeonRandInt
-.public DungeonRandOutcome__022EAB20
-.public EndBurnClassStatus
-.public EndMagnetRiseStatus
-.public EndNegativeStatusCondition
-.public EndNegativeStatusConditionWrapper
-.public EnsureCanStandCurrentTile
-.public EntityIsValid__02311010
-.public ExclusiveItemEffectIsActive__0230F8AC
-.public ExclusiveItemEffectIsActive__02311064
-.public ExclusiveItemEffectIsActiveWithLogging
-.public GenerateStandardItem
-.public GetApparentWeather
-.public GetTileAtEntity
-.public GravityIsActive
-.public HasHeldItem
-.public INGRAIN_BONUS_REGEN
-.public INGRAIN_BONUS_REGEN_COOLDOWN
-.public InitMove
-.public IqSkillIsEnabled
-.public IsFloating
-.public IsFloorOver
-.public IsMonster__0230F980
-.public IsTileGround
-.public ItemIsActive__02311034
-.public LEECH_SEED_DAMAGE_COOLDOWN
-.public LEECH_SEED_HP_DRAIN
-.public LogMessageByIdWithPopupCheckUser
-.public MonsterCannotAttack
-.public MonsterHasNegativeStatus
-.public MonsterIsType
-.public MultiplyFixedPoint64
-.public ov10_022C4454
-.public ov10_022C464C
-.public ov10_022C4650
-.public ov10_022C4664
-.public ov10_022C4A5C
-.public ov10_022C4BBC
-.public ov10_022C4BE4
-.public ov10_022C4FC4
-.public ov29_022E34A8_EU
-.public ov29_022E53F0
-.public ov29_022E543C
-.public ov29_022EA370
-.public ov29_022EC62C
-.public ov29_022F2FE4
-.public ov29_022F42F8
-.public ov29_022FB718
-.public ov29_02322374
-.public ov29_02344B9C
-.public ov29_023460DC
-.public ov29_02347184
-.public ov29_0234908C
-.public ov29_023529A8
-.public PlayEffectAnimationEntityStandard
-.public PlaySeByIdIfNotSilence
-.public POISON_DAMAGE
-.public POISON_DAMAGE_COOLDOWN
-.public SetPreprocessorArgsIdVal
-.public SHED_SKIN_ACTIVATION_CHANCE
-.public SpawnDroppedItemWrapper
-.public SPEED_BOOST_TURNS
-.public sub_02050FF8
-.public SubFixedPoint
-.public SubstitutePlaceholderStringTags
-.public TickStatusTurnCounter
-.public TreasureBoxDropsEnabled
-.public TryActivateBadDreams
-.public TryEndPetrifiedOrSleepStatus
-.public TryGenerateUnownStoneDrop
-.public TryIncreaseHp
-.public TryWarp
-.public TryWeatherFormChange
-.public WaitUntilAlertBoxTextIsLoadedWrapper
-.public WRAP_DAMAGE
-.public WRAP_DAMAGE_COOLDOWN

asm/include/overlay_29_02314810.inc

@@ -1,31 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public BoostSpeed
-.public CalcSpeedStage
-.public CalcSpeedStageWrapper
-.public CalcStatusDuration
-.public CONFUSED_TURN_RANGE
-.public DungeonRandInt
-.public DungeonRandOutcome__022EAB20
-.public EntityIsValid__023118B4
-.public EntityIsValid__02315118
-.public ExclusiveItemEffectIsActive__023147EC
-.public GetExclusiveItemWithEffectFromBag
-.public IsProtectedFromNegativeStatus
-.public ItemIsActive__0231513C
-.public LogMessageByIdWithPopupCheckUserTarget
-.public LowerSpeed
-.public ov10_022C4618
-.public ov29_022E41CC
-.public ov29_022E543C
-.public ov29_022E60E4
-.public ov29_02353318
-.public PlaySpeedDownEffect
-.public PlaySpeedUpEffect
-.public PrepareItemForPrinting__02345728
-.public SafeguardIsActive
-.public SetPreprocessorArgsIdVal
-.public SPEED_BOOST_TURN_RANGE
-.public SPEED_LOWER_TURN_RANGE
-.public SubstitutePlaceholderStringTags
-.public UpdateStatusIconFlags

asm/include/overlay_29_0231AFB4.inc

@@ -1,11 +0,0 @@
-#pragma once
-.public BoostSpeedOneStage
-.public DUNGEON_PTR
-.public EntityIsValid__0231B194
-.public GetTreasureBoxChances
-.public LogMessageByIdWithPopupCheckParticipants
-.public LogMessageByIdWithPopupCheckUserTarget
-.public ov29_022E4110
-.public ov29_0232E80C
-.public PrepareItemForPrinting__02345728
-.public SubstitutePlaceholderStringTags

asm/include/overlay_29_0231B1B8.inc

@@ -1,10 +0,0 @@
-#pragma once
-.public ApplyDamageAndEffectsWrapper
-.public DUNGEON_PTR
-.public EntityIsValid__0231B194
-.public IsMonster__0231B318
-.public IsMonsterSleeping
-.public IsValidTargetEntity
-.public ov10_022C4530
-.public SetPreprocessorArgsIdVal
-.public TryEndPetrifiedOrSleepStatus

asm/include/overlay_29_0231B33C.inc

@@ -1,117 +1,25 @@
 #pragma once
 .public AbilityIsActiveVeneer
-.public AddHeldItemToBag
 .public AnimationDelayOrSomething
-.public APPLES_AND_BERRIES_ITEM_IDS
-.public ApplyBlastSeedEffect
-.public ApplyCalciumEffect
-.public ApplyCheriBerryEffect
-.public ApplyDoughSeedEffect
-.public ApplyGinsengEffect
-.public ApplyGonePebbleEffect
-.public ApplyGracideaEffect
-.public ApplyGravelyrockEffect
-.public ApplyGrimyFoodEffect
-.public ApplyGummiBoostsDungeonMode
-.public ApplyHungerSeedEffect
-.public ApplyIronEffect
-.public ApplyKeyEffect
-.public ApplyMixElixirEffect
-.public ApplyPechaBerryEffect
-.public ApplyProteinEffect
-.public ApplyRawstBerryEffect
-.public ApplyViaSeedEffect
-.public ApplyVileSeedEffect
-.public ApplyViolentSeedEffect
-.public ApplyZincEffect
-.public BoostIQ
 .public BoostSpeedOneStage
-.public CACNEA_SPIKE_POWER
-.public CalcDamageFixedNoCategory
-.public CALCIUM_STAT_BOOST
-.public CalcStatusDuration
-.public CheckVariousConditions__0230156C
-.public CORSOLA_TWIG_POWER
-.public DealDamageProjectile
-.public DetermineMonsterShadow
 .public DUNGEON_PTR
+.public DetermineMonsterShadow
 .public DungeonGetSpriteIndex
-.public EndNegativeStatusConditionWrapper
-.public EnemyEvolution
-.public EntityIsValid__0231CBC8
-.public ExclusiveItemEffectFlagTest
 .public FemaleToMaleForm
 .public FreezeAnim
-.public GEO_PEBBLE_DAMAGE
 .public GetActiveTeamMember
 .public GetIdleAnimationId
-.public GetItemCategoryVeneer
-.public GOLD_FANG_POWER
-.public GOLD_THORN_POWER
-.public GRAVELEROCK_DAMAGE
-.public GUMMI_STAT_BOOST
-.public InitMove
-.public IqSkillIsEnabled
-.public IRON_STAT_BOOST
-.public IRON_THORN_POWER
-.public IsBagFull
 .public IsShaymin
 .public IsSkyExclusiveDungeon
-.public LevelUpItemEffect
-.public LIFE_SEED_HP_BOOST
-.public LogMessageByIdWithPopupCheckUserTarget
-.public ORAN_BERRY_FULL_HP_BOOST
-.public ORAN_BERRY_HP_RESTORATION
-.public OREN_BERRY_DAMAGE
-.public ov10_022C44EC
-.public ov10_022C4558
-.public ov10_022C4574
+.public SetMonsterTypeAndAbility
+.public SwapMonsterWanFileIndex
+.public UnfreezeAnim
 .public ov10_022C457C
-.public ov10_022C4864
 .public ov29_022E3590
-.public ov29_022E5A00
-.public ov29_022E5AE4
 .public ov29_022E60E4
 .public ov29_022E81F8
 .public ov29_022E9FD0
 .public ov29_022EA370
-.public ov29_022F9EA0
-.public ov29_022FB920
-.public ov29_022FB9BC
 .public ov29_02304830
-.public ov29_0230F9A4
-.public PlaySeByIdIfNotSilence
-.public PrepareItemForPrinting__02345728
-.public PROTEIN_STAT_BOOST
-.public RARE_FOSSIL_DAMAGE
-.public RestoreAllMovePP
-.public SetMonsterTypeAndAbility
-.public SILVER_SPIKE_POWER
-.public SITRUS_BERRY_FULL_HP_BOOST
-.public SITRUS_BERRY_HP_RESTORATION
-.public SLEEP_TURN_RANGE
-.public SpawnDroppedItemWrapper
-.public STICK_POWER
 .public sub_020017EC
 .public sub_0201CF80
-.public SubstitutePlaceholderStringTags
-.public SwapMonsterWanFileIndex
-.public TryDecreaseLevel
-.public TryIncreaseBelly
-.public TryIncreaseHp
-.public TryInflictBlinkerStatus
-.public TryInflictConfusedStatus
-.public TryInflictCrossEyedStatus
-.public TryInflictDropeyeStatus
-.public TryInflictEyedropStatus
-.public TryInflictInvisibleStatus
-.public TryInflictPetrifiedStatus
-.public TryInflictSleeplessStatus
-.public TryInflictSleepStatus
-.public TryInflictSlipStatus
-.public TryWarp
-.public UnfreezeAnim
-.public UpdateShopkeeperModeAfterAttack
-.public WaitUntilAlertBoxPauseIsOver
-.public WONDER_GUMMI_STAT_BOOST
-.public ZINC_STAT_BOOST

asm/include/overlay_29_0231EA04.inc

@@ -1,22 +0,0 @@
-#pragma once
-.public ActivateTerrainEffects
-.public DetermineAllMonsterShadow
-.public DetermineTileWalkableNeighbors
-.public DUNGEON_PTR
-.public EnsureCanStandCurrentTile
-.public EntityIsValid__0231EDD8
-.public FloorSecondaryTerrainIsChasm
-.public GetMoveCategory
-.public GetTile
-.public GetTileSafe
-.public InitMove
-.public IsFullFloorFixedRoom
-.public LogMessageByIdWithPopupCheckUser
-.public ov29_022EA370
-.public ov29_02305814
-.public ov29_0233665C
-.public ov29_0233785C
-.public ov29_0233FB1C
-.public StairsAlwaysReachable
-.public UpdateMinimap
-.public UpdateTrapsVisibility

asm/include/overlay_29_0231EDFC.inc

@@ -1,33 +0,0 @@
-#pragma once
-.public _s32_div_f
-.public AbilityIsActiveVeneer
-.public AdvanceFrame
-.public CalcDamageFixedNoCategory
-.public CannotMoveToTile
-.public CanSeeTarget
-.public ChangeMonsterAnimation
-.public ChangeMonsterAnimationToIdle
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
-.public DungeonRandInt
-.public DungeonRandRange
-.public EntityIsValid__0231F570
-.public GetDirectionTowardsPosition
-.public GetTile
-.public GetTreatmentBetweenMonsters
-.public HasDropeyeStatus
-.public HURL_DAMAGE
-.public InitMove
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MoveMonsterToPos
-.public ov29_022E9298
-.public ov29_022EA370
-.public ov29_0232033C
-.public ov29_02321238
-.public PlaySeByIdIfNotSilence
-.public ShouldDisplayEntityWrapper
-.public SinAbs4096
-.public SubstitutePlaceholderStringTags
-.public TryWarp
-.public TwoTurnMoveForcedMiss
-.public UpdateEntityPixelPos

asm/include/overlay_29_02320788.inc

@@ -1,47 +0,0 @@
-#pragma once
-.public AbilityIsActiveVeneer
-.public ActivateTerrainEffects
-.public AdvanceFrame
-.public AreTileJumpsAllowed
-.public CalcDamageFixedNoCategory
-.public CannotStandOnTile
-.public CannotStandOnTileNoMonsterCheck
-.public ChangeMonsterAnimationToIdle
-.public DetermineTileWalkableNeighbors
-.public DiscoverMinimap
-.public DUNGEON_FRAMES_PASSED
-.public DUNGEON_PTR
-.public EntityIsValid__02320764
-.public ExclusiveItemEffectIsActiveWithLogging
-.public EXPLOSION_FIXED_DAMAGES
-.public FindClosestUnoccupiedTileWithin2
-.public FindUnoccupiedTileWithin3
-.public GetApparentWeather
-.public GetLeader
-.public GetRandomTile
-.public GetTileSafe
-.public HandleShopTransaction
-.public InitMove
-.public IsFloorOver
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MonsterIsType
-.public MoveMonsterToPos
-.public ov29_022E5560
-.public ov29_022E55F0
-.public ov29_022E5650
-.public ov29_022F42F8
-.public ov29_02305814
-.public ov29_02321238
-.public ov29_02336694
-.public ov29_023529B8
-.public RemoveGroundItem
-.public ShouldDisplayEntityWrapper
-.public sub_01FFB62C
-.public SubstitutePlaceholderStringTags
-.public TryEndPetrifiedOrSleepStatus
-.public TryInflictPetrifiedStatus
-.public TwoTurnMoveForcedMiss
-.public UpdateCamera
-.public UpdateEntityPixelPos
-.public UpdateMinimap
-.public UpdateTrapsVisibility

asm/include/overlay_29_0232C310.inc

@@ -1,12 +0,0 @@
-#pragma once
-.public AddHeldItemToBag
-.public DealDamage
-.public DefenderAbilityIsActiveMoveEffects__0232BDD0
-.public DungeonRandOutcomeUserTargetInteraction
-.public EntityIsValidMoveEffects__0232C500
-.public IsBagFull
-.public ItemZInit
-.public LogMessageByIdWithPopupCheckUserTarget
-.public ov29_022F9EA0
-.public RemoveEquivItem
-.public SubstitutePlaceholderStringTags

asm/include/overlay_29_0233544C.inc

@@ -1,35 +1,26 @@
 #pragma once
-.public _020AFC70
-.public _s32_div_f
-.public AbilityIsActiveVeneer
-.public CalcSpeedStageWrapper
 .public CalcStatusDuration
-.public CASTFORM_WEATHER_ATTRIBUTE_TABLE
 .public CeilFixedPoint
-.public Conversion2IsActive
-.public DetermineMonsterShadow
 .public DUNGEON_FRAMES_PASSED
 .public DUNGEON_PTR
-.public DungeonGetSpriteIndex
 .public DungeonGoesUp
-.public EntityIsValid__023350D8
 .public GetApparentWeather
-.public GetIdleAnimationId
 .public GetLanguage
 .public GetLeader
-.public GetMonsterApparentId
-.public GetType
-.public GetWeatherColorTable
 .public HasLowHealth
 .public InitRender3dElement64
 .public IsCurrentFixedRoomBossFight
 .public LoadWteFromFileDirectory
 .public LoadWtuFromBin
 .public LogMessageByIdWithPopupCheckUser
-.public ov29_022DE608
-.public ov29_022E65F4
+.public ProcessWte
+.public SPORT_CONDITION_TURN_RANGE
+.public SetBothScreensWindowColorToDefault
+.public SetScreenWindowsColor
+.public TickStatusTurnCounter
+.public _020AFC70
+.public _s32_div_f
 .public ov29_022E9A6C
-.public ov29_02304830
 .public ov29_02334E70
 .public ov29_02352B4C
 .public ov29_0235371C
@@ -37,11 +28,6 @@
 .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_02336450.inc

@@ -1,24 +1,16 @@
 #pragma once
-.public CannotStandOnTileNoMonsterCheck
-.public CanSeePosition
-.public Debug_Print0
 .public DEFAULT_TILE
-.public DetermineMonsterShadow
-.public DIRECTIONS_XY
-.public DrawMinimapTile
 .public DUNGEON_PTR
-.public EntityIsValid__02337CA8
+.public Debug_Print0
 .public FloorSecondaryTerrainIsChasm
 .public GetBgRegionArea
-.public GetGridsOption
-.public GetLeader
 .public GetTile
 .public GetTileSafe
-.public GetVisibilityRange
 .public InitTilesetBuffer
 .public IsCurrentFixedRoomBossFight
-.public IsSecretBazaar
 .public MOBILITY_TYPE_TO_DUNGEON_MOBILITY_TYPE
+.public RandIntSafe
+.public SECONDARY_TERRAIN_TYPES
 .public ov10_022C2588
 .public ov10_022C25EC
 .public ov10_022C2638
@@ -26,17 +18,10 @@
 .public ov10_022C26A0
 .public ov10_022C2720
 .public ov29_022DE0EC
-.public ov29_022E66C4
 .public ov29_022E9F80
 .public ov29_02352B60
 .public ov29_02352B74
 .public ov29_02352B88
-.public ov29_02352B9C
-.public ov29_02352D58
 .public ov29_02352F14
 .public ov29_0237CAA0
 .public ov29_0237CAAC
-.public RandIntSafe
-.public SECONDARY_TERRAIN_TYPES
-.public sub_02051D8C
-.public sub_02051E60

asm/include/overlay_29_0233711C.inc

@@ -0,0 +1,23 @@
+#pragma once
+.public CanSeePosition
+.public CannotStandOnTileNoMonsterCheck
+.public DIRECTIONS_XY
+.public DUNGEON_PTR
+.public DetermineMonsterShadow
+.public DetermineTileWalkableNeighbors
+.public DrawMinimapTile
+.public EntityIsValid__02337CA8
+.public GetGridsOption
+.public GetLeader
+.public GetTile
+.public GetTileSafe
+.public GetVisibilityRange
+.public IsSecretBazaar
+.public UpdateTrapsVisibility
+.public ov29_022E66C4
+.public ov29_02336694
+.public ov29_02336DB0
+.public ov29_02352B9C
+.public ov29_02352D58
+.public sub_02051D8C
+.public sub_02051E60

asm/include/overlay_29_02337EC0.inc

@@ -1,13 +0,0 @@
-#pragma once
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
-.public DungeonRandInt
-.public DungeonRandRange
-.public GetMonsterIdFromSpawnEntry
-.public GetTile
-.public GetTileSafe
-.public IqSkillIsEnabled
-.public MemAlloc
-.public MemFree
-.public RandInt
-.public ShouldTreatMonsterAsAlly

asm/include/overlay_29_0233AE84.inc

@@ -1,22 +1,29 @@
 #pragma once
-.public _s32_div_f
-.public abs
-.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN
-.public DIRECTIONS_XY
+.public AssignGridCellConnections
+.public AssignRooms
+.public CreateGridCellConnections
+.public CreateRoomsAndAnchors
 .public DUNGEON_PTR
 .public DungeonRandInt
 .public DungeonRandRange
+.public EnsureConnectedGrid
 .public FLOOR_GENERATION_STATUS
-.public GetFloorType
+.public FinalizeJunctions
+.public GenerateExtraHallways
+.public GenerateKecleonShop
+.public GenerateMazeRoom
+.public GenerateMonsterHouse
+.public GenerateRoomImperfections
+.public GenerateSecondaryStructures
+.public GetGridPositions
 .public GetNextFixedRoomAction
 .public GetTile
 .public GetTileSafe
 .public HIDDEN_STAIRS_SPAWN_BLOCKED
+.public InitDungeonGrid
 .public IsCurrentTilesetBackground
-.public IsDestinationFloorWithMonster
-.public IsOutlawMonsterHouseFloor
+.public PlaceFixedRoomTile
+.public ResetHiddenStairsSpawn
+.public _s32_div_f
 .public ov29_0234217C
 .public ov29_02342594
-.public PlaceFixedRoomTile
-.public PosIsOutOfBounds
-.public ResetHiddenStairsSpawn

asm/include/overlay_29_0233CF84.inc

@@ -0,0 +1,9 @@
+#pragma once
+.public DungeonRandInt
+.public DungeonRandRange
+.public FLOOR_GENERATION_STATUS
+.public GenerateMaze
+.public GetTileSafe
+.public IsNextToHallway
+.public SetSpawnFlag5
+.public _s32_div_f

asm/include/overlay_29_0233F424.inc

@@ -0,0 +1,13 @@
+#pragma once
+.public CreateHallway
+.public DUNGEON_PTR
+.public DungeonRandInt
+.public DungeonRandRange
+.public FLOOR_GENERATION_STATUS
+.public GetFloorType
+.public GetTile
+.public GetTileSafe
+.public IsDestinationFloorWithMonster
+.public IsOutlawMonsterHouseFloor
+.public PosIsOutOfBounds
+.public abs

asm/include/overlay_29_02345AD8.inc

@@ -1,34 +1,37 @@
 #pragma once
-.public _s32_div_f
-.public AddSimpleObjToOam
 .public AdvanceFrame
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
 .public DISPLACEMENTS_WITHIN_3
+.public DUNGEON_PTR
+.public DisplayItem
 .public DisplayMessage2
 .public DrawMinimapTile
-.public DUNGEON_PTR
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public EntityIsValid__02345698
 .public GenerateItem
-.public GetActualBuyPrice
-.public GetActualSellPrice
 .public GetExclusiveItem
-.public GetItemInfo
-.public GetItemSpriteId
 .public GetMissionRank__0204FAE0
 .public GetTile
-.public GetTileSafe
 .public GetTreasureBoxChances
 .public IncrementEntityPixelPosXY
 .public IsCurrentFixedRoomBossFight
 .public IsMarowakTrainingMaze
-.public IsShoppableItem
 .public IsUnown
 .public LogMessageByIdQuiet
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserUnknown
-.public OBJ_GRAPHICS_CONTROLS_PTR
+.public PlayDungeonTipSound__022EB66C
+.public RetrieveFromItemList1
+.public RevealAttackedTile
+.public SECONDARY_TERRAIN_TYPES
+.public SetEntityPixelPosXY
+.public SetPreprocessorArgsIdVal
+.public SinAbs4096
+.public SpawnItem
+.public SubstitutePlaceholderItemTags
+.public UNOWN_STONE_DROP_CHANCE
+.public _s32_div_f
 .public ov10_022C44C8
 .public ov10_022C48EC
 .public ov29_022E563C
@@ -36,18 +39,3 @@
 .public ov29_02344BF8
 .public ov29_02347378
 .public ov29_023531BC
-.public ov29_023537B4
-.public ov29_023537BC
-.public ov29_0237C864
-.public PlayDungeonTipSound__022EB66C
-.public RetrieveFromItemList1
-.public RevealAttackedTile
-.public SECONDARY_TERRAIN_TYPES
-.public SetEntityPixelPosXY
-.public SetPreprocessorArgsIdVal
-.public ShouldDisplayEntityWrapper
-.public SinAbs4096
-.public SpawnItem
-.public sub_0200D1FC
-.public SubstitutePlaceholderItemTags
-.public UNOWN_STONE_DROP_CHANCE