Merge pull request #45 from AnonymousRandomPerson/main

Synced from pmdsky-debug

asm/include/main_02054C24.inc

@@ -213,6 +213,7 @@
 .public DEF_SCARF_STAT_BOOST
 .public DeleteWanTableEntryVeneer
 .public DEMO_TEAMS
+.public DrawTextInWindow
 .public DRIVER_WORK
 .public DUNGEON_SWAP_ID_TABLE
 .public DungeonGoesUp
@@ -488,7 +489,6 @@
 .public sub_0202568C
 .public sub_02025888
 .public sub_02025AD8
-.public sub_02026214
 .public sub_02026268
 .public sub_02026358
 .public sub_020264F8

asm/include/overlay_00.inc

@@ -23,6 +23,7 @@
 .public EnableIrqFlag
 .public FileInit
 .public GetDebugFlag
+.public GetFadeStatus
 .public GetLanguage
 .public GetProcessorMode
 .public LoadOverlay
@@ -101,7 +102,6 @@
 .public sub_0200BB74
 .public sub_0200BC54
 .public sub_0200BD14
-.public sub_0200BD2C
 .public sub_02017A68
 .public sub_02017A80
 .public sub_02017ACC

asm/include/overlay_01.inc

@@ -29,6 +29,7 @@
 .public CreateTextBox
 .public DebugPrint0
 .public DeleteWanTableEntryVeneer
+.public DrawTextInWindow
 .public EnableIrqFlag
 .public FemaleToMaleForm
 .public GetAdvancedMenuCurrentOption
@@ -273,7 +274,6 @@
 .public sub_02025480
 .public sub_02025888
 .public sub_02025D50
-.public sub_02026214
 .public sub_02026268
 .public sub_0202676C
 .public sub_0202737C

asm/include/overlay_03.inc

@@ -10,6 +10,7 @@
 .public CreateAdvancedTextBox
 .public CreateScrollBoxSingle
 .public DebugPrint0
+.public DrawTextInWindow
 .public GetAdvancedMenuCurrentOption
 .public GetAdvancedMenuResult
 .public GetHeldButtons
@@ -127,7 +128,6 @@
 .public sub_02010154
 .public sub_02025404
 .public sub_0202561C
-.public sub_02026214
 .public sub_0202836C
 .public sub_02029F88
 .public sub_02029FBC

asm/include/overlay_05.inc

@@ -1,6 +1,7 @@
 #pragma once
 .public CloseAdvancedMenu
 .public CreateAdvancedMenu
+.public DrawTextInWindow
 .public GetAdvancedMenuCurrentOption
 .public GetAdvancedMenuResult
 .public GetAdventureLogDungeonFloor
@@ -73,7 +74,6 @@
 .public sub_02003BC8
 .public sub_02003BFC
 .public sub_02006C8C
-.public sub_02026214
 .public sub_02027AF0
 .public sub_0202836C
 .public sub_02029F88

asm/include/overlay_07.inc

@@ -6,6 +6,7 @@
 .public CreateCollectionMenu
 .public CreateOptionsMenu
 .public CreateTextBox
+.public DrawTextInWindow
 .public GetKeyboardStatus
 .public GetKeyboardStringResult
 .public GetLanguageType
@@ -113,7 +114,6 @@
 .public sub_02003BC8
 .public sub_02003BFC
 .public sub_0202065C
-.public sub_02026214
 .public sub_020264F8
 .public sub_02027AF0
 .public sub_02027B1C

asm/include/overlay_09.inc

@@ -3,6 +3,7 @@
 .public CloseDialogueBox
 .public CreateDialogueBox
 .public DeleteWindow
+.public DrawTextInWindow
 .public GetPressedButtons
 .public GetStringFromFileVeneer
 .public GetWindowContents
@@ -38,7 +39,6 @@
 .public sub_02017B18
 .public sub_02017B70
 .public sub_02017B7C
-.public sub_02026214
 .public sub_020263C8
 .public sub_020265A8
 .public sub_02027AF0

asm/include/overlay_10.inc

@@ -7,6 +7,7 @@
 .public BAG_ITEMS_PTR_MIRROR
 .public CalcMenuHeightDiv8__020329E4
 .public CleanStickyItemsInBag
+.public ClearWindow
 .public ClosePortraitBox
 .public CloseTextBox
 .public CloseTextBox2
@@ -157,6 +158,7 @@
 .public DoMoveWillOWisp
 .public DoMoveWrap
 .public DoMoveYawn
+.public DrawTextInWindow
 .public ExplorersOfSkyMain
 .public GendersEqual
 .public GetBgRegionArea
@@ -209,7 +211,6 @@
 .public ov29_022EA428
 .public ov29_0234C584
 .public ov29_0234C5EC
-.public ov29_0234C668
 .public PreprocessString
 .public ProcessWte
 .public Rand16Bit
@@ -226,6 +227,7 @@
 .public SetPortraitOffset
 .public SetSpriteIdForAnimationControl
 .public ShowPortraitInPortraitBox
+.public StartFadeDungeonWrapper
 .public strcmp
 .public strcpy
 .public sub_02001808
@@ -258,12 +260,10 @@
 .public sub_0201F2A0
 .public sub_0201F598
 .public sub_02025010_EU
-.public sub_02026214
 .public sub_020263C8
 .public sub_020265A8
 .public sub_02027AF0
 .public sub_02027B1C
-.public sub_02027B58
 .public sub_0202810C
 .public sub_0202812C
 .public sub_0202830C

asm/include/overlay_11.inc

@@ -61,6 +61,8 @@
 .public DecompressAtNormalVeneer
 .public DeleteWanTableEntryVeneer
 .public DeleteWindow
+.public DrawTeamStats
+.public DrawTextInWindow
 .public DungeonMoveToGroundMove
 .public DungeonRequestsDoneWrapper
 .public DungeonSwapIdxToId
@@ -78,6 +80,7 @@
 .public FileOpen
 .public FileRead
 .public FileSeek
+.public FreeTeamStats
 .public GenerateDailyMissions
 .public GenerateKecleonItems1
 .public GenerateKecleonItems2
@@ -96,6 +99,7 @@
 .public GetDungeonModeSpecial
 .public GetExclusiveItemType
 .public GetExecuteSpecialEpisodeType
+.public GetFadeStatus
 .public GetFirstEmptyMemberIdx
 .public GetFirstUnequippedItemOfType
 .public GetGameMode
@@ -220,11 +224,8 @@
 .public ov10_022C0814
 .public ov10_022C096C
 .public ov10_022C0998
-.public ov10_022C09E8
-.public ov10_022C0CE0
 .public ov10_022C11D8
 .public ov10_022C1398
-.public ov10_022C13B4
 .public ov10_022C1D40
 .public ov10_022C1D78
 .public ov10_022C2300
@@ -440,7 +441,6 @@
 .public sub_0200BC60
 .public sub_0200BCB0
 .public sub_0200BD14
-.public sub_0200BD2C
 .public sub_0200BD50
 .public sub_0200CF6C
 .public sub_0200D310
@@ -517,7 +517,6 @@
 .public sub_0201F36C
 .public sub_0201F464
 .public sub_020236FC
-.public sub_02026214
 .public sub_02026268
 .public sub_020262E0
 .public sub_020265A8
@@ -809,6 +808,7 @@
 .public TRIG_TABLE
 .public UnloadFile
 .public UnloadOverlay
+.public UpdateTeamStats
 .public vsprintf
 .public WAN_TABLE
 .public ZInit8

asm/include/overlay_13.inc

@@ -10,6 +10,7 @@
 .public CreatePortraitBox
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
+.public DrawTextInWindow
 .public FemaleToMaleForm
 .public GetAdvancedMenuCurrentOption
 .public GetAdvancedMenuResult
@@ -59,7 +60,6 @@
 .public sub_02017C74
 .public sub_02017CB4
 .public sub_0201F2E4
-.public sub_02026214
 .public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202836C

asm/include/overlay_14.inc

@@ -2,6 +2,7 @@
 .public _s32_div_f
 .public AnimRelatedFunction__022F6F14
 .public AnimRelatedFunction__022F7064
+.public ClearWindow
 .public CloseAdvancedMenu
 .public CloseDialogueBox
 .public ClosePortraitBox
@@ -13,6 +14,7 @@
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
 .public DebugPrint0
+.public DrawTextInWindow
 .public FemaleToMaleForm
 .public GetHero
 .public GetHeroMemberIdx
@@ -62,9 +64,7 @@
 .public sub_02017B70
 .public sub_02017B7C
 .public sub_02017C80
-.public sub_02026214
 .public sub_02027AF0
-.public sub_02027B58
 .public sub_0202BC60
 .public sub_0202F334
 .public sub_0202F954

asm/include/overlay_15.inc

@@ -12,6 +12,7 @@
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
 .public DebugPrint0
+.public DrawTextInWindow
 .public GetMoneyCarried
 .public GetMoneyStored
 .public GetSimpleMenuResult
@@ -33,7 +34,6 @@
 .public ShowPortraitInPortraitBox
 .public ShowStringIdInDialogueBox
 .public sub_02017C80
-.public sub_02026214
 .public sub_02026268
 .public sub_02027AF0
 .public sub_02027B1C

asm/include/overlay_18.inc

@@ -12,6 +12,7 @@
 .public CreatePortraitBox
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
+.public DrawTextInWindow
 .public GetAdvancedMenuCurrentOption
 .public GetAdvancedMenuResult
 .public GetEncodedHalfword
@@ -49,7 +50,6 @@
 .public StrncpySimpleNoPadSafe
 .public sub_02017C74
 .public sub_02017C80
-.public sub_02026214
 .public sub_02026268
 .public sub_02027AF0
 .public sub_02027B1C

asm/include/overlay_20.inc

@@ -14,6 +14,7 @@
 .public CreateSimpleMenu
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBoxWithArg
+.public DrawTextInWindow
 .public GetItemAtIdx
 .public GetSimpleMenuField0x1A4
 .public GetSimpleMenuResult
@@ -76,7 +77,6 @@
 .public sub_02017C10
 .public sub_02017C50
 .public sub_02025D50
-.public sub_02026214
 .public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202A03C

asm/include/overlay_21.inc

@@ -13,6 +13,7 @@
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
 .public DebugPrint0
+.public DrawTextInWindow
 .public GetMoneyCarried
 .public GetPressedButtons
 .public GetSimpleMenuResult
@@ -70,7 +71,6 @@
 .public sub_02013150
 .public sub_02017C74
 .public sub_02017C80
-.public sub_02026214
 .public sub_02026268
 .public sub_02027AF0
 .public sub_02027B1C

asm/include/overlay_25.inc

@@ -12,6 +12,7 @@
 .public CreateScrollBoxSingle
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
+.public DrawTextInWindow
 .public GetMoneyCarried
 .public GetNbItemsInBag
 .public GetPressedButtons
@@ -47,7 +48,6 @@
 .public sub_0200D670
 .public sub_02017C74
 .public sub_02017C80
-.public sub_02026214
 .public sub_02026268
 .public sub_02027AF0
 .public sub_02027B1C

asm/include/overlay_28.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public DrawTextInWindow
 .public GetStringFromFileVeneer
 .public MemAlloc
 .public MemFree
@@ -9,7 +10,6 @@
 .public sub_02025B80
 .public sub_02025B90
 .public sub_02025C14
-.public sub_02026214
 .public sub_02027170
 .public sub_02027228
 .public sub_0202810C