Synced from pmdsky-debug

pret · Nov 1, 2023 · e302619 · e302619
1 parent 1962c36
commit e302619
Show file tree

Hide file tree

Showing 11 changed files with 124 additions and 124 deletions.
diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc
@@ -31,6 +31,7 @@
 .public GetKeyboardStringResult
 .public GetLanguage
 .public GetLanguageType
+.public GetMainTeamNameWithCheck
 .public GetMaxReachedFloor
 .public GetNameRaw
 .public GetNameString
@@ -57,7 +58,6 @@
 .public GetSpriteIndex__020526EC
 .public GetStringFromFileVeneer
 .public GetTeamMember
-.public GetMainTeamNameWithCheck
 .public GetVictoriesOnOneFloor
 .public InitAnimationControl
 .public InitPreprocessorArgs
@@ -213,17 +213,19 @@
 .public RandInt
 .public SetAnimationForAnimationControl
 .public SetIrqFlag
+.public SetMainTeamName
 .public SetScenarioScriptVar
 .public SetSpriteIdForAnimationControl
-.public SetMainTeamName
 .public ShowKeyboard
 .public ShowMessageInDBox
+.public ShowStringInDBox
 .public sprintf
 .public strcmp
 .public strcpy
 .public StrcpySimple
 .public StringFromMessageId
 .public StrncmpSimple
+.public StrncpyName
 .public StrncpySimpleNoPadSafe
 .public sub_02002448
 .public sub_02003B5C
@@ -249,7 +251,6 @@
 .public sub_0201D12C
 .public sub_0202065C
 .public sub_020245D0
-.public StrncpyName
 .public sub_02025404
 .public sub_0202544C
 .public sub_02025480
@@ -281,7 +282,6 @@
 .public sub_0202BCBC
 .public sub_0202BD48
 .public sub_0202C38C
-.public sub_0202F23C
 .public sub_0202F334
 .public sub_0202F8C4
 .public sub_0202F8FC

diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc
@@ -10,10 +10,12 @@
 .public _020F0090
 .public _02130214
 .public abs
-.public AddItemToBagNoHeld
 .public AddBulkItemToStorage
+.public AddItemToBagNoHeld
 .public AnimationControlGetAllocForMaxFrame
 .public AnyDungeonRequestsDone
+.public ApplyGummiBoostsToGroundMonster
+.public ApplyGummiBoostsToTeamMember
 .public BAG_ITEMS_PTR_MIRROR
 .public CheckMissionRestrictions
 .public ClampComponentAbs
@@ -27,6 +29,7 @@
 .public CreateAdvancedMenu
 .public CreateDBox
 .public CreateMemArena
+.public CreateMonsterSummaryFromTeamMember
 .public CreateNormalMenu
 .public CreatePortraitBox
 .public DataTransferInit
@@ -38,6 +41,7 @@
 .public DungeonMoveToGroundMove
 .public DungeonRequestsDoneWrapper
 .public DungeonSwapIdxToId
+.public EnableAllLearnableIqSkills
 .public EnableIqSkill
 .public ENTITIES
 .public EntryOverlay13
@@ -56,6 +60,8 @@
 .public FreeNormalMenu
 .public FreePortraitBox
 .public GenerateDailyMissions
+.public GenerateKecleonItems1
+.public GenerateKecleonItems2
 .public GetAcceptedMission
 .public GetActiveRosterIndex
 .public GetActiveTeamMember
@@ -75,15 +81,13 @@
 .public GetFirstEmptyMemberIdx
 .public GetFirstUnequippedItemOfType
 .public GetGameMode
-.public GetMoneyCarried
 .public GetHeldButtons
 .public GetHero
+.public GetHpBoostFromExclusiveItems
 .public GetInfoMoveGround
 .public GetItemAtIdx
 .public GetItemCategoryVeneer
 .public GetItemMoveId16
-.public GenerateKecleonItems1
-.public GenerateKecleonItems2
 .public GetKeyboardStatus
 .public GetKeyboardStringResult
 .public GetLanguage
@@ -92,6 +96,7 @@
 .public GetMainCharacter1MemberIdx
 .public GetMainCharacter2MemberIdx
 .public GetMaxReachedFloor
+.public GetMoneyCarried
 .public GetNameRaw
 .public GetNameWithGender
 .public GetNbItemsInBag
@@ -113,12 +118,15 @@
 .public IncrementNbBigTreasureWins
 .public IncrementNbDungeonsCleared
 .public IncrementNbSkyGiftsSent
+.public InitBulkItem
 .public InitMainTeamAfterQuiz
 .public InitMove
 .public InitPortraitBox
 .public InitPortraitBoxWithMonsterId
 .public InitPreprocessorArgs
 .public InitRender3dElement64
+.public InitSpecialEpisodeExtraPartner
+.public InitSpecialEpisodePartners
 .public InitStandardItem
 .public IqSkillFlagTest
 .public IsAdvancedMenuActive
@@ -128,6 +136,7 @@
 .public IsHM
 .public IsMonsterOnTeam
 .public IsNormalMenuActive
+.public IsStorageFull
 .public ItemAtTableIdx
 .public ItemZInit
 .public KeyWaitInit
@@ -279,22 +288,20 @@
 .public PreprocessStringFromMessageId
 .public PrintIqSkillsMenu
 .public RandInt
+.public RandomizeDemoActors
 .public RandRange
+.public RemoveBulkItemInStorage
 .public RemoveItemNoHole
 .public RemoveItemNoHoleCheck
-.public RemoveBulkItemInStorage
 .public Render3dElement64
 .public SaveScriptVariableValue
 .public SaveScriptVariableValueAtIndex
 .public SaveScriptVariableValueBytes
-.public ScriptSpecialProcess0x17
-.public ScriptSpecialProcess0x3
-.public IsStorageFull
-.public ScriptSpecialProcess0x3D
-.public ScriptSpecialProcess0x3E
-.public ScriptSpecialProcess0x4
 .public SendAudioCommandWrapperVeneer
 .public SentryRunState
+.public SetActorTalkMain
+.public SetActorTalkMainAndActorTalkSub
+.public SetActorTalkSub
 .public SetAdventureLogCompleted
 .public SetAnimationForAnimationControl
 .public SetDungeonConquest
@@ -312,14 +319,17 @@
 .public ShowKeyboard
 .public ShowMessageInDBox
 .public ShowPortraitBox
+.public ShowStringInDBox
+.public SortItemsInBag
 .public SpecialProcAddItemToBag
-.public StrcpyName
 .public sprintf
 .public strcat
 .public StrcmpMonsterName
 .public strcpy
+.public StrcpyName
 .public StrcpySimple
 .public StringFromMessageId
+.public StrncpyName
 .public StrncpySimple
 .public StrncpySimpleNoPad
 .public StrncpySimpleNoPadSafe
@@ -400,20 +410,15 @@
 .public sub_0200BD2C
 .public sub_0200BD50
 .public sub_0200CF6C
-.public InitBulkItem
 .public sub_0200D310
 .public sub_0200D65C
 .public sub_0200D670
-.public SortItemsInBag
 .public sub_0200FD48
 .public sub_02010044
 .public sub_0201080C
 .public sub_02011220
-.public GetHpBoostFromExclusiveItems
 .public sub_02011420
 .public sub_020114F8
-.public ApplyGummiBoostsToGroundMonster
-.public ApplyGummiBoostsToTeamMember
 .public sub_02011FA0
 .public sub_02012B7C
 .public sub_020130B8
@@ -482,7 +487,6 @@
 .public sub_0201F36C
 .public sub_0201F464
 .public sub_020236FC
-.public StrncpyName
 .public sub_02026214
 .public sub_02026268
 .public sub_020262E0
@@ -532,7 +536,6 @@
 .public sub_0202E6E4
 .public sub_0202F16C
 .public sub_0202F190
-.public sub_0202F23C
 .public sub_0202F2C4
 .public sub_0202F334
 .public sub_0202F3F8
@@ -723,8 +726,6 @@
 .public sub_02058794
 .public sub_0205882C
 .public sub_02058AFC
-.public EnableAllLearnableIqSkills
-.public CreateMonsterSummaryFromTeamMember
 .public sub_0205B028
 .public sub_0205B584
 .public sub_0205B77C
@@ -758,7 +759,6 @@
 .public sub_02065050
 .public sub_0206549C
 .public sub_02065974
-.public sub_02065B3C
 .public sub_02065B80
 .public sub_02065BC8
 .public sub_02065BD8

diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc
@@ -1,18 +1,25 @@
 #pragma once
+.public AddItemToStorage
 .public AddMoneyCarried
+.public AddMoneyStored
 .public BAG_ITEMS_PTR_MIRROR
+.public ConvertStorageItemAtIdxToBulkItem
+.public ConvertStorageItemAtIdxToItem
 .public CopyItemAtIdx
+.public CountNbOfItemsInStorage
 .public CreateDBox
 .public CreateNormalMenu
 .public DebugPrint0
 .public FreeDBox
 .public FreeNormalMenu
 .public FreePortraitBox
-.public GetMoneyCarried
 .public GetItemAtIdx
+.public GetMoneyCarried
+.public GetMoneyStored
 .public GetNbItemsInBag
 .public GetNormalMenuResult
 .public GetPressedButtons
+.public GetRankStorageSize
 .public InitPortraitBoxWithMonsterId
 .public InitPreprocessorArgs
 .public IsDBoxActive
@@ -29,28 +36,22 @@
 .public PreprocessStringFromMessageId
 .public RemoveEmptyItemsInBag
 .public RemoveItem
+.public RemoveItemAtIdxInStorage
 .public RemoveItemNoHole
 .public SetPortraitLayout
 .public ShowDBox
 .public ShowMessageInDBox
+.public ShowStringInDBox
 .public sub_0200D670
 .public sub_0200FD48
-.public CountNbOfItemsInStorage
-.public ConvertStorageItemAtIdxToBulkItem
-.public ConvertStorageItemAtIdxToItem
 .public sub_0201007C
 .public sub_02010154
-.public RemoveItemAtIdxInStorage
-.public AddItemToStorage
-.public GetMoneyStored
-.public AddMoneyStored
 .public sub_02017CCC
 .public sub_0202836C
 .public sub_0202A66C
 .public sub_0202E3CC
 .public sub_0202E6C8
 .public sub_0202E6E4
-.public sub_0202F23C
 .public sub_0202F2C4
 .public sub_02034A38
 .public sub_02042258
@@ -83,5 +84,4 @@
 .public sub_02044094
 .public sub_020440B8
 .public sub_020440DC
-.public GetRankStorageSize
 .public sub_020582E0
diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc
@@ -195,6 +195,7 @@
 .public ShouldDisplayEntityWrapper
 .public ShouldMonsterHeadToStairs
 .public ShowPortraitBox
+.public ShowStringInDBox
 .public StringFromMessageId
 .public strlen
 .public strncmp
@@ -252,7 +253,6 @@
 .public sub_0202AABC
 .public sub_0202AB94
 .public sub_0202ABB0
-.public sub_0202F23C
 .public sub_0202F334
 .public sub_0202F474
 .public sub_0202FFB0

diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc
@@ -15,6 +15,7 @@
 .public CheckTeamMemberIdx
 .public CheckTeamMemberIdxVeneer
 .public CreateDBox
+.public CreateMonsterSummaryFromMonster
 .public DebugPrint0
 .public DisableDungeonSubMenuOption
 .public DisplayMessage
@@ -27,7 +28,6 @@
 .public GetCurrentBagCapacity
 .public GetDexNumber
 .public GetFloorType
-.public GetMoneyCarried
 .public GetItemAction
 .public GetItemCategoryVeneer
 .public GetItemInfo
@@ -39,6 +39,7 @@
 .public GetLeaderChangeFlag
 .public GetLeaderMonster
 .public GetMaxPp
+.public GetMoneyCarried
 .public GetMonsterIdFromSpawnEntry
 .public GetMonsterName
 .public GetNbItemsInBag
@@ -49,6 +50,7 @@
 .public GetTeamMemberIndex
 .public GetTile
 .public GetTrapInfo
+.public GetUnlockedTactics
 .public HideTileGrid
 .public InitPreprocessorArgs
 .public IqSkillFlagTest
@@ -114,7 +116,6 @@
 .public ov29_022EBC2C
 .public ov29_022ECDE4
 .public ov29_022F0B9C
-.public CreateMonsterSummaryFromMonster
 .public ov29_022F9C40
 .public ov29_023002F0
 .public ov29_02300818
@@ -150,14 +151,15 @@
 .public PrintIqSkillsMenu
 .public SetMonsterActionFields
 .public ShouldMonsterRunAwayVariation
+.public ShowStringInDBox
+.public SortItemsInBag
 .public SpecificRecruitCheck
 .public strcpy
 .public StringFromMessageId
 .public sub_02001808
 .public sub_0200B3D4
 .public sub_0200D310
 .public sub_0200D894
-.public SortItemsInBag
 .public sub_02017C74
 .public sub_02017C80
 .public sub_02017CCC
@@ -186,7 +188,6 @@
 .public sub_0202E3CC
 .public sub_0202E6C8
 .public sub_0202E6E4
-.public sub_0202F23C
 .public sub_0202F334
 .public sub_0202F474
 .public sub_0202F8C4
@@ -241,7 +242,6 @@
 .public sub_02053CA0
 .public sub_02054F44
 .public sub_020585B4
-.public GetUnlockedTactics
 .public TryPointCameraToMonster
 .public UpdateMapSurveyorFlag
 .public vsprintf