Merge pull request #79 from AnonymousRandomPerson/main

Integrate decomped functions from igidrau and Seti

asm/include/overlay_15.inc → asm/include/overlay_15_0238A234.inc

@@ -1,46 +1,40 @@
 #pragma once
 .public AddMoneyCarried
 .public AddMoneyStored
+.public BANK_MAIN_MENU_ITEMS
+.public BANK_WINDOW_PARAMS_2
+.public BANK_WINDOW_PARAMS_3
+.public BANK_WINDOW_PARAMS_4
 .public CloseAdvancedTextBox
-.public CloseDialogueBox
-.public ClosePortraitBox
 .public CloseSimpleMenu
 .public CloseTextBox
 .public CreateAdvancedTextBox
-.public CreateDialogueBox
-.public CreatePortraitBox
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
 .public Debug_Print0
-.public DrawTextInWindow
 .public GetMoneyCarried
 .public GetMoneyStored
 .public GetSimpleMenuResult
-.public HidePortraitBox
-.public InitPortraitParamsWithMonsterId
-.public InitPreprocessorArgs
 .public IsDialogueBoxActive
-.public MemAlloc
-.public MemFree
-.public ov11_022E6E68
+.public OVERLAY15_UNKNOWN_POINTER__NA_238B180
 .public PlaySeVolumeWrapper
-.public PreprocessStringFromId
 .public SetAdvancedTextBoxField0x1C2
 .public SetAdvancedTextBoxField0x1C4
 .public SetAdvancedTextBoxState5
-.public SetPortraitEmotion
-.public SetPortraitLayout
 .public ShowDialogueBox
-.public ShowPortraitInPortraitBox
 .public ShowStringIdInDialogueBox
+.public ov15_0238AD78
+.public ov15_0238ADC4
+.public ov15_0238AE6C
+.public ov15_0238B0CC
+.public ov15_0238B0D4
+.public ov15_0238B0E0
+.public ov15_0238B0E8
+.public ov15_0238B0F4
+.public ov15_0238B10C
+.public ov15_0238B114
 .public sub_02017C80
-.public sub_02026268
-.public sub_02027B1C
-.public sub_0202836C
 .public sub_020288DC
-.public sub_0202F2C4
 .public sub_0202F954
 .public sub_020395CC
 .public sub_020396E4
-.public sub_02039B0C
-.public UpdateWindow

asm/include/overlay_15_0238ADC4.inc

@@ -0,0 +1,7 @@
+#pragma once
+.public DrawTextInWindow
+.public GetMoneyCarried
+.public GetMoneyStored
+.public PreprocessStringFromId
+.public UpdateWindow
+.public sub_02027B1C

asm/include/overlay_15_0238AE98.inc

@@ -0,0 +1,16 @@
+#pragma once
+.public CloseDialogueBox
+.public ClosePortraitBox
+.public Debug_Print0
+.public HidePortraitBox
+.public IsDialogueBoxActive
+.public MemFree
+.public OVERLAY15_UNKNOWN_POINTER__NA_238B180
+.public ov11_022E6E68
+.public ov15_0238A234
+.public ov15_0238B11C
+.public ov15_0238B12C
+.public ov15_0238B13C
+.public ov15_0238B150
+.public sub_0202836C
+.public sub_0202F2C4

asm/include/overlay_31.inc → asm/include/overlay_31_02382FBC.inc

@@ -1,5 +1,4 @@
 #pragma once
-.public _020A1870
 .public AddDungeonSubMenuOption
 .public AdvanceFrame
 .public AiMovement
@@ -11,7 +10,6 @@
 .public BaseFormsEqual
 .public CanAiUseMove
 .public CanMonsterSpawn
-.public CeilFixedPoint
 .public CheckTeamMemberIdxVeneer
 .public CheckVariousConditions
 .public CheckVariousStatuses2
@@ -33,19 +31,48 @@
 .public CreateScrollBoxSingle
 .public CreateTextBox
 .public CreateTextBoxWithArg
+.public DUNGEON_PTR
+.public DUNGEON_SUBMENU_ITEMS_1
+.public DUNGEON_SUBMENU_ITEMS_5
+.public DUNGEON_SUBMENU_ITEMS_6
+.public DUNGEON_WINDOW_PARAMS_10
+.public DUNGEON_WINDOW_PARAMS_11
+.public DUNGEON_WINDOW_PARAMS_12
+.public DUNGEON_WINDOW_PARAMS_13
+.public DUNGEON_WINDOW_PARAMS_14
+.public DUNGEON_WINDOW_PARAMS_15
+.public DUNGEON_WINDOW_PARAMS_16
+.public DUNGEON_WINDOW_PARAMS_17
+.public DUNGEON_WINDOW_PARAMS_18
+.public DUNGEON_WINDOW_PARAMS_19
+.public DUNGEON_WINDOW_PARAMS_20
+.public DUNGEON_WINDOW_PARAMS_21
+.public DUNGEON_WINDOW_PARAMS_22
+.public DUNGEON_WINDOW_PARAMS_23
+.public DUNGEON_WINDOW_PARAMS_24
+.public DUNGEON_WINDOW_PARAMS_25
+.public DUNGEON_WINDOW_PARAMS_26
+.public DUNGEON_WINDOW_PARAMS_27
+.public DUNGEON_WINDOW_PARAMS_28
+.public DUNGEON_WINDOW_PARAMS_29
+.public DUNGEON_WINDOW_PARAMS_30
+.public DUNGEON_WINDOW_PARAMS_31
+.public DUNGEON_WINDOW_PARAMS_32
+.public DUNGEON_WINDOW_PARAMS_5
+.public DUNGEON_WINDOW_PARAMS_6
+.public DUNGEON_WINDOW_PARAMS_7
+.public DUNGEON_WINDOW_PARAMS_8
+.public DUNGEON_WINDOW_PARAMS_9
 .public Debug_Print0
 .public DisableDungeonSubMenuOption
 .public DisplayMessage
 .public DrawTextInWindow
 .public DrawTileGrid
-.public DUNGEON_PTR
 .public FormatMoveString
 .public FormatMoveStringMore
 .public GetActiveTeamMember
-.public GetApparentWeather
 .public GetCurrentBagCapacity
 .public GetDexNumber
-.public GetFloorType
 .public GetItemAction
 .public GetItemCategoryVeneer
 .public GetItemInfo
@@ -57,7 +84,6 @@
 .public GetLeaderChangeFlag
 .public GetLeaderMonster
 .public GetMaxPp
-.public GetMoneyCarried
 .public GetMonsterIdFromSpawnEntry
 .public GetMonsterName
 .public GetNbItemsInBag
@@ -70,7 +96,6 @@
 .public GetTile
 .public GetTrapInfo
 .public GetUnlockedTactics
-.public GetWindow
 .public GetWindowRectangle
 .public HideTileGrid
 .public InitPreprocessorArgs
@@ -91,12 +116,48 @@
 .public JoinedAtRangeCheck2Veneer
 .public LogMessageByIdWithPopupCheckUser
 .public MemAlloc
-.public memcpy
 .public MemFree
-.public memset
 .public MemZero
 .public MonsterCanThrowItems
 .public MonsterHasEmbargoStatus
+.public OVERLAY31_JP_STRING
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A268
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A26C
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A270
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A27C
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A280
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A284
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A288
+.public OVERLAY31_UNKNOWN_POINTER__NA_238A28C
+.public OVERLAY31_UNKNOWN_STRING_IDS
+.public OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0
+.public OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8
+.public OVERLAY31_UNKNOWN_STRUCT__NA_238A144
+.public OVERLAY31_UNKNOWN_STRUCT__NA_238A190
+.public PlaySeVolumeWrapper
+.public PlayWindowInputSound
+.public PopInventoryMenuField0x1A3
+.public PositionHasItem
+.public PreprocessString
+.public PreprocessStringFromId
+.public PrintIqSkillsMenu
+.public ResumeParentMenu
+.public SetAdvancedTextBoxField0x1C2
+.public SetAdvancedTextBoxField0x1C4
+.public SetAdvancedTextBoxState5
+.public SetMonsterActionFields
+.public ShowStringInDialogueBox
+.public SortItemsInBag
+.public SpecificRecruitCheck
+.public StringFromId
+.public TeamMemberHasEnabledIqSkill
+.public TryPointCameraToMonster
+.public UpdateMapSurveyorFlag
+.public UpdateWindow
+.public YesNoMenu
+.public _020A1870
+.public memcpy
+.public memset
 .public ov10_022BCC60
 .public ov10_022BCC7C
 .public ov10_022BCCB0
@@ -107,9 +168,7 @@
 .public ov10_022BCE44
 .public ov10_022BD394
 .public ov10_022BD474
-.public ov29_02056264
 .public ov29_022E08F4
-.public ov29_022E0C2C
 .public ov29_022E1618
 .public ov29_022E1620
 .public ov29_022E2A78
@@ -156,39 +215,45 @@
 .public ov29_0234F77C
 .public ov29_0234FB50
 .public ov29_0234FB60
-.public ov29_0234FB6C
 .public ov29_0234FBD4
 .public ov29_0235352C
 .public ov29_0237C91C
 .public ov29_0238280C
-.public OVERLAY31_UNKNOWN_STRING_IDS
-.public PlaySeVolumeWrapper
-.public PlayWindowInputSound
-.public PopInventoryMenuField0x1A3
-.public PositionHasItem
-.public PositionIsOnHiddenStairs
-.public PreprocessString
-.public PreprocessStringFromId
-.public PrintIqSkillsMenu
-.public ResumeParentMenu
-.public SetAdvancedTextBoxField0x1C2
-.public SetAdvancedTextBoxField0x1C4
-.public SetAdvancedTextBoxState5
-.public SetMonsterActionFields
-.public ShouldMonsterRunAwayVariation
-.public ShowStringInDialogueBox
-.public SortItemsInBag
-.public SpecificRecruitCheck
+.public ov31_02382B54
+.public ov31_02382DAC
+.public ov31_02389E22
+.public ov31_02389F5C
+.public ov31_0238A044
+.public ov31_0238A04C
+.public ov31_0238A054
+.public ov31_0238A05C
+.public ov31_0238A064
+.public ov31_0238A06C
+.public ov31_0238A074
+.public ov31_0238A07C
+.public ov31_0238A084
+.public ov31_0238A0A8
+.public ov31_0238A0B0
+.public ov31_0238A0B8
+.public ov31_0238A0C0
+.public ov31_0238A0C8
+.public ov31_0238A0D0
+.public ov31_0238A0D8
+.public ov31_0238A0E0
+.public ov31_0238A0E8
+.public ov31_0238A154
+.public ov31_0238A228
+.public ov31_0238A23C
+.public ov31_0238A2A0
+.public ov31_0238A2A8
+.public StairsSubheadingCallback
 .public strcpy
-.public StringFromId
 .public sub_02001808
 .public sub_0200B3D4
 .public sub_0200D310
 .public sub_0200D894
 .public sub_02017C74
 .public sub_02017C80
-.public sub_02025888
-.public sub_020265A8
 .public sub_02027B1C
 .public sub_0202810C
 .public sub_0202812C
@@ -216,7 +281,6 @@
 .public sub_0203FD14
 .public sub_0203FD38
 .public sub_0203FD44
-.public sub_0203FE5C
 .public sub_0204018C
 .public sub_0204019C
 .public sub_020407C0
@@ -237,14 +301,8 @@
 .public sub_020420F4
 .public sub_0204AEA0
 .public sub_0204F10C
-.public sub_0204F9E0
 .public sub_02053CA0
 .public sub_02054F44
 .public sub_02056228
 .public sub_020585B4
-.public TeamMemberHasEnabledIqSkill
-.public TryPointCameraToMonster
-.public UpdateMapSurveyorFlag
-.public UpdateWindow
 .public vsprintf
-.public YesNoMenu