diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc index c9799fb9..071a0858 100644 --- a/asm/include/itcm.inc +++ b/asm/include/itcm.inc @@ -18,7 +18,6 @@ .public AreMovesEnabled .public CanAiMonsterMoveInDirection .public CanAiUseMove -.public MonsterCannotAttack .public CanSeeTarget .public CanTargetEntity .public CanTargetPosition @@ -56,6 +55,7 @@ .public MemcpyFast .public MemsetFast .public MONSTER_DATA_TABLE_PTR +.public MonsterCannotAttack .public OS_IRQTable .public ov29_022E935C .public ov29_022FBDF0 diff --git a/asm/include/itcm_01FFBD20.inc b/asm/include/itcm_01FFBD20.inc index 9b17c4eb..ddbde918 100644 --- a/asm/include/itcm_01FFBD20.inc +++ b/asm/include/itcm_01FFBD20.inc @@ -9,6 +9,6 @@ .public GetTreatmentBetweenMonsters .public InitMove .public IsMonster__0231A9D4 -.public ResetAiCanAttackInDirection .public ov29_0231B008 +.public ResetAiCanAttackInDirection .public TryAddTargetToAiTargetList diff --git a/asm/include/main_02003328.inc b/asm/include/main_02003328.inc index f683d1ed..80cfada3 100644 --- a/asm/include/main_02003328.inc +++ b/asm/include/main_02003328.inc @@ -1,14 +1,4 @@ #pragma once -.public Debug_Print0 -.public GX_VBlankIntr -.public GetHeldButtons -.public GetReleasedStylus -.public HaltProcessDisp -.public KeyWaitInit -.public MainLoop -.public OS_IRQTable -.public Rand16Bit -.public WaitForever .public _020924D8 .public _020AEF7C .public _020AEFB4 @@ -25,6 +15,15 @@ .public _fadd .public _fflt .public _fmul +.public Debug_Print0 +.public GetHeldButtons +.public GetReleasedStylus +.public GX_VBlankIntr +.public HaltProcessDisp +.public KeyWaitInit +.public MainLoop +.public OS_IRQTable +.public Rand16Bit .public sub_02002580 .public sub_020025F8 .public sub_02002628 @@ -58,3 +57,4 @@ .public sub_0207B4B8 .public sub_020820E8 .public sub_02082420 +.public WaitForever diff --git a/asm/include/main_020038D8.inc b/asm/include/main_020038D8.inc index eee804d6..f70cc250 100644 --- a/asm/include/main_020038D8.inc +++ b/asm/include/main_020038D8.inc @@ -1,9 +1,4 @@ #pragma once -.public Debug_Print0 -.public DisableAllInterrupts -.public EnableAllInterrupts -.public PlayBgmById -.public StopBgmCommand .public _020924E8 .public _020924F8 .public _020AEF7C @@ -12,6 +7,11 @@ .public _020AF050 .public _0229B21C .public _0229B220 +.public Debug_Print0 +.public DisableAllInterrupts +.public EnableAllInterrupts +.public PlayBgmById +.public StopBgmCommand .public sub_02002580 .public sub_020025F8 .public sub_02002628 diff --git a/asm/include/main_02010FC4.inc b/asm/include/main_02010FC4.inc index ac7f8266..9e7bd2dc 100644 --- a/asm/include/main_02010FC4.inc +++ b/asm/include/main_02010FC4.inc @@ -1,78 +1,4 @@ #pragma once -.public ApplyExclusiveItemStatBoosts -.public BAG_ITEMS_PTR_MIRROR -.public CALCIUM_STAT_BOOST -.public ConvertStorageItemAtIdxToBulkItem -.public CopyBitsFrom -.public CopyBitsTo -.public CountNbItemsOfTypeInBag -.public CountNbItemsOfTypeInStorage -.public CountNbOfItemsInStorage -.public DUNGEON_MOVE_TABLES -.public Debug_Print0 -.public EXCLUSIVE_ITEM_EFFECT_DATA -.public ExclusiveItemEffectFlagTest -.public FemaleToMaleForm -.public GINSENG_CHANCE_3 -.public GUMMI_STAT_BOOST -.public GetBaseFormCastformDeoxysCherrim -.public GetCurrentBagCapacity -.public GetDungeonResultString -.public GetEquivBulkItemIdxInStorage -.public GetExclusiveItem -.public GetExclusiveItemOffset -.public GetExclusiveItemParameter -.public GetExclusiveItemType -.public GetFamilyIndex -.public GetFirstUnequippedItemOfType -.public GetItemAtIdx -.public GetItemCategory -.public GetItemCategoryVeneer -.public GetMaxPp -.public GetMoveBasePowerGround -.public GetMoveMaxGinsengBoostGround -.public GetNbItemsInBag -.public GetPartyMembers -.public GetRank -.public GetScenarioBalance -.public GetTeamMember -.public GetType -.public HasMonsterBeenAttackedInDungeons -.public IQ_GUMMI_GAIN_TABLE -.public IRON_STAT_BOOST -.public InitBulkItem -.public Is2TurnsMove -.public IsGummi -.public IsMonsterValid -.public IsTicketItem -.public LIFE_SEED_HP_BOOST -.public LoadFileFromRom -.public LoadScriptVariableValue -.public MemAlloc -.public MemFree -.public MemZero -.public OpenWaza -.public PROTEIN_STAT_BOOST -.public RECYCLE_SHOP_ITEM_LIST -.public Rand16Bit -.public RandInt -.public RandIntSafe -.public RandRange -.public RemoveEmptyItemsInBag -.public RemoveItem -.public RemoveItemAtIdxInStorage -.public SITRUS_BERRY_FULL_HP_BOOST -.public SaveScriptVariableValue -.public SelectWaza -.public SetExclusiveItemEffect -.public SetNbRecycled -.public StringFromId -.public TYPE_SPECIFIC_EXCLUSIVE_ITEMS -.public UnloadFile -.public WONDER_GUMMI_IQ_GAIN -.public WONDER_GUMMI_STAT_BOOST -.public ZINC_STAT_BOOST -.public ZInit8 .public _0209889C .public _020988A4 .public _020988A8 @@ -97,6 +23,74 @@ .public _020AF700 .public _022A4BD8 .public _s32_div_f +.public ApplyExclusiveItemStatBoosts +.public BAG_ITEMS_PTR_MIRROR +.public CALCIUM_STAT_BOOST +.public ConvertStorageItemAtIdxToBulkItem +.public CopyBitsFrom +.public CopyBitsTo +.public CountNbItemsOfTypeInBag +.public CountNbItemsOfTypeInStorage +.public CountNbOfItemsInStorage +.public Debug_Print0 +.public DUNGEON_MOVE_TABLES +.public EXCLUSIVE_ITEM_EFFECT_DATA +.public ExclusiveItemEffectFlagTest +.public FemaleToMaleForm +.public GetBaseFormCastformDeoxysCherrim +.public GetCurrentBagCapacity +.public GetDungeonResultString +.public GetEquivBulkItemIdxInStorage +.public GetExclusiveItem +.public GetExclusiveItemOffset +.public GetExclusiveItemParameter +.public GetExclusiveItemType +.public GetFamilyIndex +.public GetFirstUnequippedItemOfType +.public GetItemAtIdx +.public GetItemCategory +.public GetItemCategoryVeneer +.public GetMaxPp +.public GetMoveBasePowerGround +.public GetMoveMaxGinsengBoostGround +.public GetNbItemsInBag +.public GetPartyMembers +.public GetRank +.public GetScenarioBalance +.public GetTeamMember +.public GetType +.public GINSENG_CHANCE_3 +.public GUMMI_STAT_BOOST +.public HasMonsterBeenAttackedInDungeons +.public InitBulkItem +.public IQ_GUMMI_GAIN_TABLE +.public IRON_STAT_BOOST +.public Is2TurnsMove +.public IsGummi +.public IsMonsterValid +.public IsTicketItem +.public LIFE_SEED_HP_BOOST +.public LoadFileFromRom +.public LoadScriptVariableValue +.public MemAlloc +.public MemFree +.public MemZero +.public OpenWaza +.public PROTEIN_STAT_BOOST +.public Rand16Bit +.public RandInt +.public RandIntSafe +.public RandRange +.public RECYCLE_SHOP_ITEM_LIST +.public RemoveEmptyItemsInBag +.public RemoveItem +.public RemoveItemAtIdxInStorage +.public SaveScriptVariableValue +.public SelectWaza +.public SetExclusiveItemEffect +.public SetNbRecycled +.public SITRUS_BERRY_FULL_HP_BOOST +.public StringFromId .public sub_0200D1F0 .public sub_0200EB90 .public sub_02010044 @@ -108,4 +102,10 @@ .public sub_02054FEC .public sub_02055020 .public sub_02055054 +.public TYPE_SPECIFIC_EXCLUSIVE_ITEMS +.public UnloadFile .public vsprintf +.public WONDER_GUMMI_IQ_GAIN +.public WONDER_GUMMI_STAT_BOOST +.public ZINC_STAT_BOOST +.public ZInit8 diff --git a/asm/include/main_02013864.inc b/asm/include/main_02013864.inc index 6fb85d9b..17e25973 100644 --- a/asm/include/main_02013864.inc +++ b/asm/include/main_02013864.inc @@ -1,3 +1,3 @@ #pragma once -.public DUNGEON_MOVE_TABLES .public _02098D64 +.public DUNGEON_MOVE_TABLES diff --git a/asm/include/main_02013B70.inc b/asm/include/main_02013B70.inc index f501d9b0..04347391 100644 --- a/asm/include/main_02013B70.inc +++ b/asm/include/main_02013B70.inc @@ -1,3 +1,3 @@ #pragma once -.public DUNGEON_MOVE_TABLES .public _s32_div_f +.public DUNGEON_MOVE_TABLES diff --git a/asm/include/main_02013C30.inc b/asm/include/main_02013C30.inc index 482bb415..51aad9b1 100644 --- a/asm/include/main_02013C30.inc +++ b/asm/include/main_02013C30.inc @@ -1,132 +1,4 @@ #pragma once -.public AUDIO_COMMANDS_BUFFER -.public ArrayCopy32 -.public ArrayFill32 -.public BagHasExclusiveItemTypeForMonster -.public CopyAndInterleave -.public CopyAndInterleave0 -.public CopyBitsFrom -.public CopyBitsTo -.public CopyStringFromId -.public DUNGEON_MOVE_TABLES -.public Debug_FatalError -.public Debug_GetDebugFlag -.public Debug_Print -.public Debug_Print0 -.public DirectoryFileMngr_GetDirectoryFileSize -.public DirectoryFileMngr_LoadDirectoryFile -.public DirectoryFileMngr_OpenDirectoryFile -.public DseBgm_IsPlaying -.public DseBgm_Load -.public DseBgm_SetFades -.public DseBgm_SetSignalCallback -.public DseBgm_Stop -.public DseBgm_Unload -.public DseDriver_ConfigureHeap -.public DseDriver_Init -.public DseDriver_LoadDefaultSettings -.public DseSe_GetUsedBankIDs -.public DseSe_HasPlayingInstances -.public DseSe_Load -.public DseSe_Play -.public DseSe_Stop -.public DseSe_StopAll -.public DseSe_Unload -.public DseSequence_GetParameter -.public DseSwd_IsBankLoading -.public DseSwd_LoadBank -.public DseSwd_LoadMainBank -.public DseSwd_LoadWaves -.public DseSwd_Unload -.public DungeonGoesUp -.public DungeonSwapIdxToId -.public ENTITIES -.public EnqueueRender3dTexture -.public FileClose -.public FileGetSize -.public FileRom_HandleOpen -.public FileRom_HandleRead -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer -.public FileRom_Veneer_FileInit -.public G3i_LookAt_ -.public G3i_OrthoW_ -.public GXS_BeginLoadBGExtPltt -.public GXS_BeginLoadOBJExtPltt -.public GXS_EndLoadBGExtPltt -.public GXS_EndLoadOBJExtPltt -.public GX_BeginLoadBGExtPltt -.public GX_BeginLoadOBJExtPltt -.public GX_BeginLoadTex -.public GX_BeginLoadTexPltt -.public GX_EndLoadBGExtPltt -.public GX_EndLoadOBJExtPltt -.public GX_EndLoadTex -.public GX_EndLoadTexPltt -.public GX_LoadTex -.public GX_LoadTexPltt -.public GetAbility -.public GetAbilityString -.public GetActiveRosterIndex -.public GetActiveTeamMember -.public GetActorMatchingStorageId -.public GetCurrentBagCapacity -.public GetDsFirmwareUserSettingsVeneer -.public GetExecuteSpecialEpisodeType -.public GetGameMode -.public GetInfoMoveGround -.public GetIqSkillStringId -.public GetItemMoveId16 -.public GetItemNameFormatted -.public GetMainTeamName -.public GetMonsterGender -.public GetMonsterGenderVeneer -.public GetMoveActualAccuracy -.public GetMoveBasePowerFromId -.public GetMoveName -.public GetNameString -.public GetNbFloors -.public GetNbFloorsPlusOne -.public GetPerformanceFlagWithChecks -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetTypeStringId -.public IqSkillFlagTest -.public LANGUAGE_INFO_DATA -.public LoadFileFromRom -.public LoadScriptVariableValue -.public LoadScriptVariableValueAtIndex -.public LoadStringFile -.public MOVE_ACCURACY_STARS_TABLE -.public MOVE_POWER_STARS_TABLE -.public MemAlloc -.public MemArenaAlloc -.public MemFree -.public MemLocateSet -.public MemLocateUnset -.public MemZero -.public MemZero32 -.public Memcpy32 -.public MultiplyByFixedPoint -.public NewRender3dQuadrilateral -.public NewRender3dRectangle -.public NewRender3dTexture -.public NewRender3dTiling -.public PUNCH_MOVE_LIST -.public PointsToZero -.public RECOIL_MOVE_LIST -.public RENDER_3D -.public RENDER_3D_FUNCTIONS_64 -.public Rand16Bit -.public Render3dProcessQueue -.public ResumeBgm -.public Rgb8ToRgb5 -.public StringFromId -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public UnloadFile -.public WAN_TABLE -.public ZInit8 .public _02098EA8 .public _02098EE0 .public _02098F60 @@ -390,15 +262,139 @@ .public _022A5970 .public _s32_div_f .public _u32_div_f +.public ArrayCopy32 +.public ArrayFill32 +.public AUDIO_COMMANDS_BUFFER +.public BagHasExclusiveItemTypeForMonster +.public CopyAndInterleave +.public CopyAndInterleave0 +.public CopyBitsFrom +.public CopyBitsTo +.public CopyStringFromId +.public Debug_FatalError +.public Debug_GetDebugFlag +.public Debug_Print +.public Debug_Print0 +.public DirectoryFileMngr_GetDirectoryFileSize +.public DirectoryFileMngr_LoadDirectoryFile +.public DirectoryFileMngr_OpenDirectoryFile +.public DseBgm_IsPlaying +.public DseBgm_Load +.public DseBgm_SetFades +.public DseBgm_SetSignalCallback +.public DseBgm_Stop +.public DseBgm_Unload +.public DseDriver_ConfigureHeap +.public DseDriver_Init +.public DseDriver_LoadDefaultSettings +.public DseSe_GetUsedBankIDs +.public DseSe_HasPlayingInstances +.public DseSe_Load +.public DseSe_Play +.public DseSe_Stop +.public DseSe_StopAll +.public DseSe_Unload +.public DseSequence_GetParameter +.public DseSwd_IsBankLoading +.public DseSwd_LoadBank +.public DseSwd_LoadMainBank +.public DseSwd_LoadWaves +.public DseSwd_Unload +.public DUNGEON_MOVE_TABLES +.public DungeonGoesUp +.public DungeonSwapIdxToId +.public EnqueueRender3dTexture +.public ENTITIES +.public FileClose +.public FileGetSize +.public FileRom_HandleOpen +.public FileRom_HandleRead +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer +.public FileRom_Veneer_FileInit +.public G3i_LookAt_ +.public G3i_OrthoW_ +.public GetAbility +.public GetAbilityString +.public GetActiveRosterIndex +.public GetActiveTeamMember +.public GetActorMatchingStorageId +.public GetCurrentBagCapacity +.public GetDsFirmwareUserSettingsVeneer +.public GetExecuteSpecialEpisodeType +.public GetGameMode +.public GetInfoMoveGround +.public GetIqSkillStringId +.public GetItemMoveId16 +.public GetItemNameFormatted +.public GetMainTeamName +.public GetMonsterGender +.public GetMonsterGenderVeneer +.public GetMoveActualAccuracy +.public GetMoveBasePowerFromId +.public GetMoveName +.public GetNameString +.public GetNbFloors +.public GetNbFloorsPlusOne +.public GetPerformanceFlagWithChecks +.public GetStringFromFileVeneer +.public GetTeamMember +.public GetTypeStringId +.public GX_BeginLoadBGExtPltt +.public GX_BeginLoadOBJExtPltt +.public GX_BeginLoadTex +.public GX_BeginLoadTexPltt +.public GX_EndLoadBGExtPltt +.public GX_EndLoadOBJExtPltt +.public GX_EndLoadTex +.public GX_EndLoadTexPltt +.public GX_LoadTex +.public GX_LoadTexPltt +.public GXS_BeginLoadBGExtPltt +.public GXS_BeginLoadOBJExtPltt +.public GXS_EndLoadBGExtPltt +.public GXS_EndLoadOBJExtPltt +.public IqSkillFlagTest +.public LANGUAGE_INFO_DATA +.public LoadFileFromRom +.public LoadScriptVariableValue +.public LoadScriptVariableValueAtIndex +.public LoadStringFile +.public MemAlloc +.public MemArenaAlloc +.public Memcpy32 +.public MemFree +.public MemLocateSet +.public MemLocateUnset .public memset +.public MemZero +.public MemZero32 +.public MOVE_ACCURACY_STARS_TABLE +.public MOVE_POWER_STARS_TABLE +.public MultiplyByFixedPoint +.public NewRender3dQuadrilateral +.public NewRender3dRectangle +.public NewRender3dTexture +.public NewRender3dTiling .public ov10_022BDADC .public ov10_022C2528 +.public PointsToZero +.public PUNCH_MOVE_LIST +.public Rand16Bit +.public RECOIL_MOVE_LIST +.public Render3dProcessQueue +.public RENDER_3D +.public RENDER_3D_FUNCTIONS_64 +.public ResumeBgm +.public Rgb8ToRgb5 .public sprintf .public strcat .public strcmp .public strcpy +.public StringFromId .public strlen .public strncmp +.public StrncpySimpleNoPadSafe .public strstr .public sub_01FF8F04 .public sub_02002778 @@ -476,4 +472,8 @@ .public sub_0207C9C4 .public sub_0207C9E4 .public sub_0207CC10 +.public TEAM_MEMBER_TABLE_PTR +.public UnloadFile .public vsprintf +.public WAN_TABLE +.public ZInit8 diff --git a/asm/include/main_02034974.inc b/asm/include/main_02034974.inc index 8463fd25..d222ca94 100644 --- a/asm/include/main_02034974.inc +++ b/asm/include/main_02034974.inc @@ -1,99 +1,4 @@ #pragma once -.public CheckDebugMenuField0x1A4 -.public CheckOptionsMenuField0x1A4 -.public CheckParentMenuField0x1A0 -.public CloseAdvancedMenu -.public CloseAdvancedTextBox -.public CloseDebugMenu -.public CloseDialogueBox -.public CloseOptionsMenu -.public CloseParentMenu -.public ClosePortraitBox -.public CloseSimpleMenu -.public CloseTeamSelectionMenu -.public CloseTextBox -.public CreateAdvancedMenu -.public CreateAdvancedTextBox -.public CreateDebugMenu -.public CreateDialogueBox -.public CreateOptionsMenu -.public CreateParentMenuFromStringIds -.public CreatePortraitBox -.public CreateSimpleMenu -.public CreateSimpleMenuFromStringIds -.public CreateTeamSelectionMenu -.public CreateTextBox -.public Debug_GetDebugFlag -.public Debug_GetLogFlag -.public Debug_Print0 -.public Debug_SetDebugFlag -.public Debug_SetLogFlag -.public DrawTextInWindow -.public FemaleToMaleForm -.public GetActiveRosterIndex -.public GetActiveTeamMember -.public GetAdvancedMenuResult -.public GetDexNumber -.public GetEvolutionPossibilities -.public GetHeldButtons -.public GetHero -.public GetHeroMemberIdx -.public GetItemMoveId16 -.public GetKeyM2NSwitch -.public GetMainCharacter1MemberIdx -.public GetMainCharacter2MemberIdx -.public GetMainCharacter3MemberIdx -.public GetNameString -.public GetOptionsMenuResult -.public GetOptionsMenuStates -.public GetPartner -.public GetPartnerMemberIdx -.public GetPressedButtons -.public GetSimpleMenuResult -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetType -.public GetWindow -.public HidePortraitBox -.public InitPortraitParams -.public IsAdvancedMenuActive2 -.public IsAdvancedTextBoxActive -.public IsDebugMenuActive -.public IsDialogueBoxActive -.public IsMainCharacter -.public IsMovesetValidInTimeDarkness -.public IsOptionsMenuActive -.public IsParentMenuActive -.public IsShaymin -.public IsSimpleMenuActive -.public IsTeamSelectionMenuActive -.public IsTeamSelectionMenuState3 -.public IsValidPortrait -.public IsValidTeamMember -.public KEYBOARD_STRING_IDS -.public LoadOverlay -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple -.public OverlayIsLoaded -.public PlaySeVolumeWrapper -.public PreprocessStringFromId -.public SaveScriptVariableValueBytes -.public SetAdvancedTextBoxField0x1C2 -.public SetAdvancedTextBoxState5 -.public SetMainTeamName -.public SetNotifyNote -.public SetSimpleMenuField0x1AC -.public ShowDialogueBox -.public ShowPortraitInPortraitBox -.public ShowStringIdInDialogueBox -.public ShowStringInDialogueBox -.public StrcpySimple -.public StrncpySimple -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public UpdateWindow .public _0209B08C .public _0209B09C .public _0209B0EC @@ -173,10 +78,103 @@ .public _020B12A0_JP .public _022AADF8 .public _s32_div_f +.public CheckDebugMenuField0x1A4 +.public CheckOptionsMenuField0x1A4 +.public CheckParentMenuField0x1A0 +.public CloseAdvancedMenu +.public CloseAdvancedTextBox +.public CloseDebugMenu +.public CloseDialogueBox +.public CloseOptionsMenu +.public CloseParentMenu +.public ClosePortraitBox +.public CloseSimpleMenu +.public CloseTeamSelectionMenu +.public CloseTextBox +.public CreateAdvancedMenu +.public CreateAdvancedTextBox +.public CreateDebugMenu +.public CreateDialogueBox +.public CreateOptionsMenu +.public CreateParentMenuFromStringIds +.public CreatePortraitBox +.public CreateSimpleMenu +.public CreateSimpleMenuFromStringIds +.public CreateTeamSelectionMenu +.public CreateTextBox +.public Debug_GetDebugFlag +.public Debug_GetLogFlag +.public Debug_Print0 +.public Debug_SetDebugFlag +.public Debug_SetLogFlag +.public DrawTextInWindow +.public FemaleToMaleForm +.public GetActiveRosterIndex +.public GetActiveTeamMember +.public GetAdvancedMenuResult +.public GetDexNumber +.public GetEvolutionPossibilities +.public GetHeldButtons +.public GetHero +.public GetHeroMemberIdx +.public GetItemMoveId16 +.public GetKeyM2NSwitch +.public GetMainCharacter1MemberIdx +.public GetMainCharacter2MemberIdx +.public GetMainCharacter3MemberIdx +.public GetNameString +.public GetOptionsMenuResult +.public GetOptionsMenuStates +.public GetPartner +.public GetPartnerMemberIdx +.public GetPressedButtons +.public GetSimpleMenuResult +.public GetStringFromFileVeneer +.public GetTeamMember +.public GetType +.public GetWindow +.public HidePortraitBox +.public InitPortraitParams +.public IsAdvancedMenuActive2 +.public IsAdvancedTextBoxActive +.public IsDebugMenuActive +.public IsDialogueBoxActive +.public IsMainCharacter +.public IsMovesetValidInTimeDarkness +.public IsOptionsMenuActive +.public IsParentMenuActive +.public IsShaymin +.public IsSimpleMenuActive +.public IsTeamSelectionMenuActive +.public IsTeamSelectionMenuState3 +.public IsValidPortrait +.public IsValidTeamMember +.public KEYBOARD_STRING_IDS +.public LoadOverlay +.public MemAlloc +.public MemcpySimple +.public MemFree +.public MemZero .public ov11_022E6E68 .public ov11_0230D71C +.public OverlayIsLoaded +.public PlaySeVolumeWrapper +.public PreprocessStringFromId +.public SaveScriptVariableValueBytes +.public SetAdvancedTextBoxField0x1C2 +.public SetAdvancedTextBoxState5 +.public SetMainTeamName +.public SetNotifyNote +.public SetSimpleMenuField0x1AC +.public ShowDialogueBox +.public ShowPortraitInPortraitBox +.public ShowStringIdInDialogueBox +.public ShowStringInDialogueBox .public sprintf .public strcpy +.public StrcpySimple +.public StrncpySimple +.public StrncpySimpleNoPadSafe .public sub_020063F4 .public sub_0202065C .public sub_020236FC @@ -244,4 +242,6 @@ .public sub_02056F60 .public sub_020584F8 .public sub_02059B08 +.public TEAM_MEMBER_TABLE_PTR +.public UpdateWindow .public vsprintf diff --git a/asm/include/main_0203C774.inc b/asm/include/main_0203C774.inc index dc9f9b00..d891668b 100644 --- a/asm/include/main_0203C774.inc +++ b/asm/include/main_0203C774.inc @@ -1,206 +1,4 @@ #pragma once -.public AddItemToStorage -.public AddMoneyCarried -.public ApplyLevelUpBoostsToGroundMonster -.public Arm9LoadUnkFieldNa0x2029EC8 -.public Arm9StoreUnkFieldNa0x2029ED8 -.public BAG_ITEMS_PTR_MIRROR -.public CanMonsterUseMove -.public CardBackupError -.public CardPullOutWithStatus -.public ClearAdventureLogStruct -.public ClearWindow -.public CloseAdvancedMenu -.public CloseAdvancedTextBox -.public CloseAdvancedTextBox2 -.public CloseCollectionMenu -.public CloseDialogueBox -.public CloseParentMenu -.public ClosePortraitBox -.public CloseScrollBox -.public CloseSimpleMenu -.public CloseTextBox -.public CloseTextBox2 -.public ConvertStorageItemAtIdxToItem -.public CopyBitsFrom -.public CopyBitsTo -.public CopyNStringFromId -.public CopyProgressInfoFromScratchFrom -.public CopyProgressInfoFromScratchTo -.public CountNbOfItemsInStorage -.public CountNbOfValidItemsInStorage -.public CountNbOfValidItemsInTimeDarknessInStorage -.public CreateAdvancedMenu -.public CreateAdvancedTextBox -.public CreateAdvancedTextBoxWithArg -.public CreateCollectionMenu -.public CreateDialogueBox -.public CreateParentMenu -.public CreateParentMenuFromStringIds -.public CreatePortraitBox -.public CreateScrollBoxMulti -.public CreateScrollBoxSingle -.public CreateSimpleMenu -.public CreateSimpleMenuFromStringIds -.public CreateTextBox -.public CreateTextBoxWithArg -.public DEFAULT_HERO_ID -.public DUNGEON_PTR -.public Debug_GetDebugFlag -.public Debug_Print0 -.public DisableIqSkill -.public DrawTextInWindow -.public DrawTileGrid -.public DumpScriptVariableValues -.public EnableAllLearnableIqSkills -.public EventFlagBackup -.public EventFlagResume -.public FORBIDDEN_FORGOT_MOVE_LIST -.public FormatMoveStringMore -.public GAME_MODE -.public GetActiveTeamMember -.public GetActualSellPrice -.public GetAdvancedMenuCurrentOption -.public GetAdvancedMenuResult -.public GetAdvancedTextBoxFlags2 -.public GetAdventureLogDungeonFloor -.public GetCurrentBagCapacity -.public GetDexNumber -.public GetDungeonResultString -.public GetExecuteSpecialEpisodeType -.public GetHeldButtons -.public GetHero -.public GetHeroMemberIdx -.public GetInfoGroundMoveset -.public GetIqSkillStringId -.public GetItemAtIdx -.public GetItemCategory -.public GetItemCategoryVeneer -.public GetKeyboardStatus -.public GetKeyboardStringResult -.public GetLanguageType -.public GetLearnableIqSkills -.public GetMaxPp -.public GetMoneyCarried -.public GetMonsterGenderVeneer -.public GetMonsterName -.public GetMoveRangeId -.public GetMoveType -.public GetNameRaw -.public GetNameWithGender -.public GetNbItemsInBag -.public GetNextIqSkill -.public GetPartner -.public GetPartnerMemberIdx -.public GetPerformanceFlagWithChecks -.public GetPpIncrease -.public GetPressedButtons -.public GetRank -.public GetRankUpEntry -.public GetReleasedStylus -.public GetRngSeed -.public GetSimpleMenuResult -.public GetSpecialEpisodeType -.public GetSpeciesString -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetTime -.public GetType -.public GetTypeStringId -.public HidePortraitBox -.public InitMove -.public InitPortraitParams -.public InitPortraitParamsWithMonsterId -.public InitPreprocessorArgs -.public InitScriptVariableValues -.public IqSkillFlagTest -.public Is2TurnsMove -.public IsAdvancedMenuActive2 -.public IsAdvancedTextBoxActive -.public IsCollectionMenuActive -.public IsCollectionMenuState3 -.public IsDeoxys -.public IsDialogueBoxActive -.public IsExclusiveItemIdForMonster -.public IsExperienceLocked -.public IsGummi -.public IsItemInTimeDarkness -.public IsItemValidVeneer -.public IsMonsterIllegalForMissions -.public IsNot2TurnsMoveOrSketch -.public IsParentMenuActive -.public IsScrollBoxActive -.public IsShoppableItem -.public IsSimpleMenuActive -.public IsStorableItem -.public IsStorageFull -.public IsThrownItem -.public IsTreasureBox -.public LAST_NEW_MOVE -.public LearnMoves -.public LoadScriptVariableValue -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple -.public MemsetSimple -.public NOTIFY_NOTE -.public OS_GetLockID -.public PARTNER_TALK_KIND_TABLE -.public PlayAdvancedTextBoxInputSound -.public PlayBgmByIdVeneer -.public PlaySeVolumeWrapper -.public PreprocessString -.public PreprocessStringFromId -.public Rand32Bit -.public RandInt -.public RandIntSafe -.public ReadItemsFromSave -.public ReadMonsterInfoFromSave -.public ReadStringFromDialogueBox -.public RemoveEmptyItemsInBag -.public ResetGlobalProgress -.public RestoreScriptVariableValues -.public ResumeAdvancedMenu -.public SPECIAL_EPISODE_MAIN_CHARACTERS -.public STATUSES_FULL_DESCRIPTION_STRING_IDS -.public SaveScriptVariableValue -.public SaveScriptVariableValueBytes -.public SetActiveInventory -.public SetActiveKecleonShop -.public SetActiveTeam -.public SetAdvancedTextBoxField0x1C2 -.public SetAdvancedTextBoxPartialMenu -.public SetAdvancedTextBoxState5 -.public SetBothScreensWindowsColor -.public SetCollectionMenuField0x1BC -.public SetCollectionMenuVoidFn -.public SetCollectionMenuWidth -.public SetPortraitEmotion -.public SetPortraitLayout -.public SetPortraitOffset -.public SetRngSeed -.public SetTeamSetupHeroAndPartnerOnly -.public SetUnkAdvancedTextBoxFn -.public SetUnkAdvancedTextBoxWindowFn -.public ShowDialogueBox -.public ShowKeyboard -.public ShowPortraitInPortraitBox -.public ShowStringIdInDialogueBox -.public ShowStringInDialogueBox -.public SortItemsInBag -.public SortItemsInStorage -.public StoreDefaultTeamData -.public StrcpySimple -.public StringFromId -.public StrncpyName -.public StrncpySimple -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public TryPointCameraToMonster -.public UpdateWindow -.public WriteItemsToSave -.public WriteMonsterInfoToSave .public _0209C60C .public _0209C7CC .public _0209C7D4 @@ -356,7 +154,154 @@ .public _f2d .public _fsub .public _s32_div_f +.public AddItemToStorage +.public AddMoneyCarried +.public ApplyLevelUpBoostsToGroundMonster +.public Arm9LoadUnkFieldNa0x2029EC8 +.public Arm9StoreUnkFieldNa0x2029ED8 +.public BAG_ITEMS_PTR_MIRROR +.public CanMonsterUseMove +.public CardBackupError +.public CardPullOutWithStatus +.public ClearAdventureLogStruct +.public ClearWindow +.public CloseAdvancedMenu +.public CloseAdvancedTextBox +.public CloseAdvancedTextBox2 +.public CloseCollectionMenu +.public CloseDialogueBox +.public CloseParentMenu +.public ClosePortraitBox +.public CloseScrollBox +.public CloseSimpleMenu +.public CloseTextBox +.public CloseTextBox2 +.public ConvertStorageItemAtIdxToItem +.public CopyBitsFrom +.public CopyBitsTo +.public CopyNStringFromId +.public CopyProgressInfoFromScratchFrom +.public CopyProgressInfoFromScratchTo +.public CountNbOfItemsInStorage +.public CountNbOfValidItemsInStorage +.public CountNbOfValidItemsInTimeDarknessInStorage +.public CreateAdvancedMenu +.public CreateAdvancedTextBox +.public CreateAdvancedTextBoxWithArg +.public CreateCollectionMenu +.public CreateDialogueBox +.public CreateParentMenu +.public CreateParentMenuFromStringIds +.public CreatePortraitBox +.public CreateScrollBoxMulti +.public CreateScrollBoxSingle +.public CreateSimpleMenu +.public CreateSimpleMenuFromStringIds +.public CreateTextBox +.public CreateTextBoxWithArg +.public Debug_GetDebugFlag +.public Debug_Print0 +.public DEFAULT_HERO_ID +.public DisableIqSkill +.public DrawTextInWindow +.public DrawTileGrid +.public DumpScriptVariableValues +.public DUNGEON_PTR +.public EnableAllLearnableIqSkills +.public EventFlagBackup +.public EventFlagResume +.public FORBIDDEN_FORGOT_MOVE_LIST +.public FormatMoveStringMore +.public GAME_MODE +.public GetActiveTeamMember +.public GetActualSellPrice +.public GetAdvancedMenuCurrentOption +.public GetAdvancedMenuResult +.public GetAdvancedTextBoxFlags2 +.public GetAdventureLogDungeonFloor +.public GetCurrentBagCapacity +.public GetDexNumber +.public GetDungeonResultString +.public GetExecuteSpecialEpisodeType +.public GetHeldButtons +.public GetHero +.public GetHeroMemberIdx +.public GetInfoGroundMoveset +.public GetIqSkillStringId +.public GetItemAtIdx +.public GetItemCategory +.public GetItemCategoryVeneer +.public GetKeyboardStatus +.public GetKeyboardStringResult +.public GetLanguageType +.public GetLearnableIqSkills +.public GetMaxPp +.public GetMoneyCarried +.public GetMonsterGenderVeneer +.public GetMonsterName +.public GetMoveRangeId +.public GetMoveType +.public GetNameRaw +.public GetNameWithGender +.public GetNbItemsInBag +.public GetNextIqSkill +.public GetPartner +.public GetPartnerMemberIdx +.public GetPerformanceFlagWithChecks +.public GetPpIncrease +.public GetPressedButtons +.public GetRank +.public GetRankUpEntry +.public GetReleasedStylus +.public GetRngSeed +.public GetSimpleMenuResult +.public GetSpecialEpisodeType +.public GetSpeciesString +.public GetStringFromFileVeneer +.public GetTeamMember +.public GetTime +.public GetType +.public GetTypeStringId +.public HidePortraitBox +.public InitMove +.public InitPortraitParams +.public InitPortraitParamsWithMonsterId +.public InitPreprocessorArgs +.public InitScriptVariableValues +.public IqSkillFlagTest +.public Is2TurnsMove +.public IsAdvancedMenuActive2 +.public IsAdvancedTextBoxActive +.public IsCollectionMenuActive +.public IsCollectionMenuState3 +.public IsDeoxys +.public IsDialogueBoxActive +.public IsExclusiveItemIdForMonster +.public IsExperienceLocked +.public IsGummi +.public IsItemInTimeDarkness +.public IsItemValidVeneer +.public IsMonsterIllegalForMissions +.public IsNot2TurnsMoveOrSketch +.public IsParentMenuActive +.public IsScrollBoxActive +.public IsShoppableItem +.public IsSimpleMenuActive +.public IsStorableItem +.public IsStorageFull +.public IsThrownItem +.public IsTreasureBox +.public LAST_NEW_MOVE +.public LearnMoves +.public LoadScriptVariableValue +.public MemAlloc .public memcpy +.public MemcpySimple +.public MemFree +.public MemsetSimple +.public MemZero +.public NOTIFY_NOTE +.public OS_GetLockID .public ov11_023061CC .public ov11_023061E4 .public ov11_02306C64 @@ -370,11 +315,62 @@ .public ov29_022EA62C .public ov29_023002F0 .public ov29_02347100 +.public PARTNER_TALK_KIND_TABLE +.public PlayAdvancedTextBoxInputSound +.public PlayBgmByIdVeneer +.public PlaySeByIdVolumeWrapper +.public PlaySeVolumeWrapper +.public PreprocessString +.public PreprocessStringFromId +.public Rand32Bit +.public RandInt +.public RandIntSafe +.public ReadItemsFromSave +.public ReadMonsterInfoFromSave +.public ReadStringFromDialogueBox +.public RemoveEmptyItemsInBag +.public ResetGlobalProgress +.public RestoreScriptVariableValues +.public ResumeAdvancedMenu +.public SaveScriptVariableValue +.public SaveScriptVariableValueBytes +.public SetActiveInventory +.public SetActiveKecleonShop +.public SetActiveTeam +.public SetAdvancedTextBoxField0x1C2 +.public SetAdvancedTextBoxPartialMenu +.public SetAdvancedTextBoxState5 +.public SetBothScreensWindowsColor +.public SetCollectionMenuField0x1BC +.public SetCollectionMenuVoidFn +.public SetCollectionMenuWidth +.public SetPortraitEmotion +.public SetPortraitLayout +.public SetPortraitOffset +.public SetRngSeed +.public SetTeamSetupHeroAndPartnerOnly +.public SetUnkAdvancedTextBoxFn +.public SetUnkAdvancedTextBoxWindowFn +.public ShowDialogueBox +.public ShowKeyboard +.public ShowPortraitInPortraitBox +.public ShowStringIdInDialogueBox +.public ShowStringInDialogueBox +.public SortItemsInBag +.public SortItemsInStorage +.public SPECIAL_EPISODE_MAIN_CHARACTERS +.public STATUSES_FULL_DESCRIPTION_STRING_IDS +.public StoreDefaultTeamData .public strcat .public strcpy +.public StrcpySimple +.public StringFromId .public strlen .public strncmp .public strncpy +.public StrncpyName +.public StrncpySimple +.public StrncpySimpleNoPadSafe .public sub_02001808 .public sub_02002580 .public sub_020027F8 @@ -405,7 +401,6 @@ .public sub_02013F58 .public sub_02017C50 .public sub_02017C74 -.public sub_02017C80 .public sub_0202059C .public sub_020205C0 .public sub_02024D7C @@ -522,4 +517,9 @@ .public sub_02083B14 .public sub_02083B3C .public sub_02084304 +.public TEAM_MEMBER_TABLE_PTR +.public TryPointCameraToMonster +.public UpdateWindow .public vsprintf +.public WriteItemsToSave +.public WriteMonsterInfoToSave diff --git a/asm/include/main_0204B018.inc b/asm/include/main_0204B018.inc index 065e1a27..7960757c 100644 --- a/asm/include/main_0204B018.inc +++ b/asm/include/main_0204B018.inc @@ -1,87 +1,4 @@ #pragma once -.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS -.public ADVENTURE_LOG_PTR -.public ARM9_UNKNOWN_DATA__NA_209E6BC -.public ARM9_UNKNOWN_TABLE__NA_209E12C -.public ARM9_UNKNOWN_TABLE__NA_209E164 -.public ARM9_UNKNOWN_TABLE__NA_209E280 -.public AddMoneyCarried -.public ApplyLevelUpBoostsToGroundMonster -.public CLIENT_LEVEL_TABLE -.public Copy16BitsFrom -.public CopyNStringFromId -.public DEBUG_SPECIAL_EPISODE_NUMBER -.public DUNGEON_DATA_LIST -.public Debug_FatalError -.public Debug_Print -.public Debug_Print0 -.public DungeonSwapIdToIdx -.public DungeonSwapIdxToId -.public FemaleToMaleForm -.public FileClose -.public FileRom_HandleOpen -.public FileRom_HandleRead -.public FileRom_HandleSeek -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer -.public FileRom_Veneer_FileInit -.public GAME_MODE -.public GLOBAL_PROGRESS_PTR -.public GUEST_MONSTER_DATA -.public GetBaseFormCastformCherrimDeoxys -.public GetBodySize -.public GetDexNumber -.public GetDexNumberVeneer -.public GetDungeonModeSpecial -.public GetGameMode -.public GetLanguageType -.public GetMaxItemsAllowed -.public GetMaxMembersAllowed -.public GetMoneyCarried -.public GetMoneyStored -.public GetNameString -.public GetNbItemsInBag -.public GetNotifyNote -.public GetPartyMembers -.public GetRankUpEntry -.public GetSosMailCount -.public GetStringFromFileVeneer -.public GuestMonsterToGroundMonster -.public IsItemValidVeneer -.public IsLevelResetDungeon -.public IsMoneyAllowed -.public IsRealMove -.public IsRecruitingAllowed -.public KAOMADO_FILEPATH -.public KAOMADO_STREAM -.public MISSION_FLOOR_RANKS_PTRS -.public MemAlloc -.public MemZero -.public MemcpySimple -.public NormalizeTreasureBox -.public OUTLAW_LEVEL_TABLE -.public OUTLAW_MINION_LEVEL_TABLE -.public PENDING_DUNGEON_ID -.public PLAY_TIME_SECONDS -.public PORTRAIT_LAYOUTS -.public RandInt -.public SCRIPT_VARS -.public SCRIPT_VARS_LOCALS -.public SCRIPT_VARS_VALUES -.public SECONDARY_TERRAIN_TYPES -.public SetMoneyCarried -.public SetMoneyStored -.public SetNotifyNote -.public StringFromId -.public StrncpyName -.public StrncpySimpleNoPad -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public TEAM_NAME -.public VERSION_EXCLUSIVE_MONSTERS -.public WONDER_MAIL_BITS_MAP -.public WONDER_MAIL_BITS_SWAP -.public WONDER_MAIL_ENCRYPTION_TABLE .public _0209CEAC .public _0209CF0C .public _0209CF28 @@ -126,6 +43,83 @@ .public _022AB69C .public _022AB924 .public _s32_div_f +.public AddMoneyCarried +.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS +.public ADVENTURE_LOG_PTR +.public ApplyLevelUpBoostsToGroundMonster +.public ARM9_UNKNOWN_DATA__NA_209E6BC +.public ARM9_UNKNOWN_TABLE__NA_209E12C +.public ARM9_UNKNOWN_TABLE__NA_209E164 +.public ARM9_UNKNOWN_TABLE__NA_209E280 +.public CLIENT_LEVEL_TABLE +.public Copy16BitsFrom +.public CopyNStringFromId +.public Debug_FatalError +.public Debug_Print +.public Debug_Print0 +.public DEBUG_SPECIAL_EPISODE_NUMBER +.public DUNGEON_DATA_LIST +.public DungeonSwapIdToIdx +.public DungeonSwapIdxToId +.public FemaleToMaleForm +.public FileClose +.public FileRom_HandleOpen +.public FileRom_HandleRead +.public FileRom_HandleSeek +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer +.public FileRom_Veneer_FileInit +.public GAME_MODE +.public GetBaseFormCastformCherrimDeoxys +.public GetBodySize +.public GetDexNumber +.public GetDexNumberVeneer +.public GetDungeonModeSpecial +.public GetGameMode +.public GetLanguageType +.public GetMaxItemsAllowed +.public GetMaxMembersAllowed +.public GetMoneyCarried +.public GetMoneyStored +.public GetNameString +.public GetNbItemsInBag +.public GetNotifyNote +.public GetPartyMembers +.public GetRankUpEntry +.public GetSosMailCount +.public GetStringFromFileVeneer +.public GLOBAL_PROGRESS_PTR +.public GUEST_MONSTER_DATA +.public GuestMonsterToGroundMonster +.public IsItemValidVeneer +.public IsLevelResetDungeon +.public IsMoneyAllowed +.public IsRealMove +.public IsRecruitingAllowed +.public KAOMADO_FILEPATH +.public KAOMADO_STREAM +.public MemAlloc +.public MemcpySimple +.public MemZero +.public MISSION_FLOOR_RANKS_PTRS +.public NormalizeTreasureBox +.public OUTLAW_LEVEL_TABLE +.public OUTLAW_MINION_LEVEL_TABLE +.public PENDING_DUNGEON_ID +.public PLAY_TIME_SECONDS +.public PORTRAIT_LAYOUTS +.public RandInt +.public SCRIPT_VARS +.public SCRIPT_VARS_LOCALS +.public SCRIPT_VARS_VALUES +.public SECONDARY_TERRAIN_TYPES +.public SetMoneyCarried +.public SetMoneyStored +.public SetNotifyNote +.public StringFromId +.public StrncpyName +.public StrncpySimpleNoPad +.public StrncpySimpleNoPadSafe .public sub_02004F80 .public sub_0200C4CC .public sub_02048BFC @@ -144,3 +138,9 @@ .public sub_0205F00C .public sub_0205FD88 .public sub_0205FE80 +.public TEAM_MEMBER_TABLE_PTR +.public TEAM_NAME +.public VERSION_EXCLUSIVE_MONSTERS +.public WONDER_MAIL_BITS_MAP +.public WONDER_MAIL_BITS_SWAP +.public WONDER_MAIL_ENCRYPTION_TABLE diff --git a/asm/include/main_02051098.inc b/asm/include/main_02051098.inc index 5b44259f..e0e22f57 100644 --- a/asm/include/main_02051098.inc +++ b/asm/include/main_02051098.inc @@ -1,7 +1,4 @@ #pragma once -.public CopyBitsFrom -.public CopyBitsTo -.public DUNGEON_RESTRICTIONS .public _020A0C68 .public _020A0C69 .public _020A0C6A @@ -10,3 +7,6 @@ .public _020AFF7C .public _020AFF80 .public _020AFF88 +.public CopyBitsFrom +.public CopyBitsTo +.public DUNGEON_RESTRICTIONS diff --git a/asm/include/main_02051504.inc b/asm/include/main_02051504.inc index 3bea2e2a..ee539950 100644 --- a/asm/include/main_02051504.inc +++ b/asm/include/main_02051504.inc @@ -1,4 +1,5 @@ #pragma once +.public _020A1864 .public CopyBitsFrom .public CopyBitsTo .public DUNGEON_RESTRICTIONS @@ -7,4 +8,3 @@ .public GetNbFloorsPlusOne .public MISSION_FLOORS_FORBIDDEN .public RandIntSafe -.public _020A1864 diff --git a/asm/include/main_02051788.inc b/asm/include/main_02051788.inc index 00891dca..7f552ca8 100644 --- a/asm/include/main_02051788.inc +++ b/asm/include/main_02051788.inc @@ -1,25 +1,4 @@ #pragma once -.public ARM9_UNKNOWN_PTR__NA_20A2C84 -.public ARM9_UNKNOWN_TABLE__NA_20A20B0 -.public AllocateTemp1024ByteBufferFromPool -.public ArrayCopy32 -.public ArrayFill32 -.public BAG_CAPACITY_TABLE -.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES -.public DecompressAtNormalVeneer -.public GetAtSize -.public GetBaseForm -.public LoadFileFromRom -.public LoadM2nAndN2m -.public MONSTER_DATA_TABLE_PTR -.public MONSTER_SPRITE_DATA -.public MemAlloc -.public MemFree -.public MemZero -.public RANK_UP_TABLE -.public StringFromId -.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE -.public UnloadFile .public _020A20B1 .public _020A2D09 .public _020A31B8 @@ -32,6 +11,25 @@ .public _020B09B0 .public _020B09C0 .public _s32_div_f +.public AllocateTemp1024ByteBufferFromPool +.public ARM9_UNKNOWN_PTR__NA_20A2C84 +.public ARM9_UNKNOWN_TABLE__NA_20A20B0 +.public ArrayCopy32 +.public ArrayFill32 +.public BAG_CAPACITY_TABLE +.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES +.public DecompressAtNormalVeneer +.public GetAtSize +.public GetBaseForm +.public LoadFileFromRom +.public LoadM2nAndN2m +.public MemAlloc +.public MemFree +.public MemZero +.public MONSTER_DATA_TABLE_PTR +.public MONSTER_SPRITE_DATA +.public RANK_UP_TABLE +.public StringFromId .public strncpy .public sub_0200302C .public sub_020030FC @@ -50,4 +48,6 @@ .public sub_0200B3C0 .public sub_0200B3D4 .public sub_0200B3FC +.public UnloadFile +.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE .public vsprintf diff --git a/asm/include/main_0205297C.inc b/asm/include/main_0205297C.inc index be2afaa2..cea97cca 100644 --- a/asm/include/main_0205297C.inc +++ b/asm/include/main_0205297C.inc @@ -1,56 +1,4 @@ #pragma once -.public Debug_Print0 -.public DecompressAtNormalVeneer -.public DexNumbersEqual -.public DirectoryFileMngr_OpenDirectoryFile -.public DungeonToGroundMoveset -.public EnableAllLearnableIqSkills -.public FORBIDDEN_FORGOT_MOVE_LIST -.public FemaleToMaleForm -.public GetBaseHp -.public GetDexNumber -.public GetInfoGroundMoveset -.public GetInfoMoveGround -.public GetKeyM2NSwitch -.public GetKeyN2MSwitch -.public GetLanguage -.public GetMonsterGender -.public GetMovesetEggPtr -.public GetMovesetHmTmPtr -.public GetMovesetIdx__02013CAC -.public GetMovesetLevelUpPtr -.public GetNameRaw -.public GetNameString -.public GetNbMoves -.public GetSpriteSize -.public GroundToDungeonMoveset -.public HIDDEN_POWER_BASE_POWER_TABLE -.public HandleSir0Translation -.public IsShaymin -.public IsValidTeamMember -.public ItemZInit -.public LEVEL_UP_DATA_DECOMPRESS_BUFFER -.public LEVEL_UP_DATA_MONSTER_ID -.public LoadFileFromRom -.public LoadMonsterMd -.public MONSTER_DATA_TABLE_PTR -.public MemAlloc -.public MemFree -.public PointsToZero -.public Rand16Bit -.public RandIntSafe -.public RemoveActiveMembersFromAllTeams -.public RemoveActiveMembersFromRescueTeam -.public RemoveActiveMembersFromSpecialEpisodeTeam -.public SprintfStatic__02052418 -.public StrcpyName -.public StrncmpSimple -.public StrncpyName -.public StrncpySimple -.public TEAM_MEMBER_TABLE -.public TEAM_MEMBER_TABLE_PTR -.public UnloadFile -.public ZInit8 .public _020A1880 .public _020A1884 .public _020A189C @@ -69,6 +17,54 @@ .public _020B12F4_EU .public _020B1308_EU .public _s32_div_f +.public Debug_Print0 +.public DecompressAtNormalVeneer +.public DexNumbersEqual +.public DirectoryFileMngr_OpenDirectoryFile +.public DungeonToGroundMoveset +.public EnableAllLearnableIqSkills +.public FemaleToMaleForm +.public FORBIDDEN_FORGOT_MOVE_LIST +.public GetBaseHp +.public GetDexNumber +.public GetInfoGroundMoveset +.public GetInfoMoveGround +.public GetKeyM2NSwitch +.public GetKeyN2MSwitch +.public GetLanguage +.public GetMonsterGender +.public GetMovesetEggPtr +.public GetMovesetHmTmPtr +.public GetMovesetIdx__02013CAC +.public GetMovesetLevelUpPtr +.public GetNameRaw +.public GetNameString +.public GetNbMoves +.public GetSpriteSize +.public GroundToDungeonMoveset +.public HandleSir0Translation +.public HIDDEN_POWER_BASE_POWER_TABLE +.public IsShaymin +.public IsValidTeamMember +.public ItemZInit +.public LEVEL_UP_DATA_DECOMPRESS_BUFFER +.public LEVEL_UP_DATA_MONSTER_ID +.public LoadFileFromRom +.public LoadMonsterMd +.public MemAlloc +.public MemFree +.public MONSTER_DATA_TABLE_PTR +.public PointsToZero +.public Rand16Bit +.public RandIntSafe +.public RemoveActiveMembersFromAllTeams +.public RemoveActiveMembersFromRescueTeam +.public RemoveActiveMembersFromSpecialEpisodeTeam +.public SprintfStatic__02052418 +.public StrcpyName +.public StrncmpSimple +.public StrncpyName +.public StrncpySimple .public sub_01FF8F28 .public sub_02015090 .public sub_02025304_JP @@ -82,4 +78,8 @@ .public sub_020560B8 .public sub_020564B0 .public sub_02056504 +.public TEAM_MEMBER_TABLE +.public TEAM_MEMBER_TABLE_PTR +.public UnloadFile .public vsprintf +.public ZInit8 diff --git a/asm/include/main_02054AD4.inc b/asm/include/main_02054AD4.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/main_02054AD4.inc +++ b/asm/include/main_02054AD4.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/main_02058F24.inc b/asm/include/main_02058F24.inc index 96bb4974..db5af7f8 100644 --- a/asm/include/main_02058F24.inc +++ b/asm/include/main_02058F24.inc @@ -363,6 +363,7 @@ .public SetSpecialEpisodeType .public SetSpriteIdForAnimationControl .public ShowPortraitInPortraitBox +.public sin_4096 .public SPECIAL_BAND_STAT_BOOST .public STATUS_NAME_STRING_IDS .public strcat @@ -374,7 +375,6 @@ .public StrncpyName .public StrncpySimple .public StrncpySimpleNoPadSafe -.public sin_4096 .public sub_02001980 .public sub_02001AB0 .public sub_020022C4 diff --git a/asm/include/main_0206C9BC.inc b/asm/include/main_0206C9BC.inc index 44d8157b..60e21ad9 100644 --- a/asm/include/main_0206C9BC.inc +++ b/asm/include/main_0206C9BC.inc @@ -1,39 +1,4 @@ #pragma once -.public ArrayFill32Fast -.public DRIVER_WORK -.public DseChannel_AllocateNote -.public DseChannel_ChangeNote -.public DseChannel_DeallocateVoices -.public DseChannel_ReleaseNote -.public DseMem_AllocateUser -.public DseSynth_AllocateNew -.public DseSynth_ClearHeldNotes -.public DseSynth_ResetAllVoiceTimersAndVolumes -.public DseSynth_ResetAndSetBankAndSequence -.public DseSynth_RestoreHeldNotes -.public DseSynth_SetBend -.public DseSynth_SetGlobalVolumeIndex -.public DseSynth_SetPan -.public DseSynth_SetVolume -.public DseSynth_StopChannels -.public DseSynth_Unload -.public DseUtil_ByteSwap32 -.public DseVoice_Cleanup -.public DseVoice_CountNumActiveInChannel -.public DseVoice_Deallocate -.public DseVoice_PlayNote -.public DseVoice_ReleaseNote -.public DseVoice_UpdateHardware -.public DseVoice_UpdateParameters -.public Dse_SetError -.public Dse_SetError2 -.public FileInit -.public GetTimer0Control -.public SMD_EVENTS_FUN_TABLE -.public SoundEnvelope_ForceVolume -.public SoundLfoBank_Reset -.public StartThread -.public UpdateChannels .public _020B0B7C .public _022B7380 .public _022B7388 @@ -61,6 +26,40 @@ .public _fmul .public _s32_div_f .public _u32_div_f +.public ArrayFill32Fast +.public DRIVER_WORK +.public Dse_SetError +.public Dse_SetError2 +.public DseChannel_AllocateNote +.public DseChannel_ChangeNote +.public DseChannel_DeallocateVoices +.public DseChannel_ReleaseNote +.public DseMem_AllocateUser +.public DseSynth_AllocateNew +.public DseSynth_ClearHeldNotes +.public DseSynth_ResetAllVoiceTimersAndVolumes +.public DseSynth_ResetAndSetBankAndSequence +.public DseSynth_RestoreHeldNotes +.public DseSynth_SetBend +.public DseSynth_SetGlobalVolumeIndex +.public DseSynth_SetPan +.public DseSynth_SetVolume +.public DseSynth_StopChannels +.public DseSynth_Unload +.public DseUtil_ByteSwap32 +.public DseVoice_Cleanup +.public DseVoice_CountNumActiveInChannel +.public DseVoice_Deallocate +.public DseVoice_PlayNote +.public DseVoice_ReleaseNote +.public DseVoice_UpdateHardware +.public DseVoice_UpdateParameters +.public FileInit +.public GetTimer0Control +.public SMD_EVENTS_FUN_TABLE +.public SoundEnvelope_ForceVolume +.public SoundLfoBank_Reset +.public StartThread .public sub_0206C688 .public sub_02072BB8 .public sub_02079800 @@ -81,3 +80,4 @@ .public sub_0207F748 .public sub_0207F808 .public sub_0207F828 +.public UpdateChannels diff --git a/asm/include/main_0207B854.inc b/asm/include/main_0207B854.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/main_0207B854.inc +++ b/asm/include/main_0207B854.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/main_0207B87C.inc b/asm/include/main_0207B87C.inc index cfd3cebe..edff0b98 100644 --- a/asm/include/main_0207B87C.inc +++ b/asm/include/main_0207B87C.inc @@ -1,15 +1,14 @@ #pragma once +.public _022B99A8 +.public _022B99D0 +.public _022B99D4 +.public _022B99D8 .public ArrayCopy16 .public EnableIrqFlag .public GetTimer0Control .public MemcpyFast .public OS_GetLockID .public SetIrqFlag -.public WaitForever2 -.public _022B99A8 -.public _022B99D0 -.public _022B99D4 -.public _022B99D8 .public sub_01FF97CC .public sub_02078C3C .public sub_02078CC8 @@ -19,3 +18,4 @@ .public sub_0207DAFC .public sub_0207DB20 .public sub_02083434 +.public WaitForever2 diff --git a/asm/include/main_020897DC.inc b/asm/include/main_020897DC.inc index c690056a..356ba4f4 100644 --- a/asm/include/main_020897DC.inc +++ b/asm/include/main_020897DC.inc @@ -1,25 +1,4 @@ #pragma once -.public ARM9_UNKNOWN_DATA__NA_209EAAC -.public GetCharWidth -.public IsAOrBPressed -.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1 -.public TryAppendToSlice -.public TryAssignByteWrapper -.public UpdateAdvancedMenu -.public UpdateAdvancedTextBox -.public UpdateAlertBox -.public UpdateAreaNameBox -.public UpdateCollectionMenu -.public UpdateControlsChart -.public UpdateDebugMenu -.public UpdateDialogueBox -.public UpdateOptionsMenu -.public UpdateParentMenu -.public UpdatePortraitBox -.public UpdateScrollBox -.public UpdateSimpleMenu -.public UpdateTeamSelectionMenu -.public UpdateTextBox .public _020908D4 .public _020908DC .public _020908E4 @@ -315,7 +294,11 @@ .public _022BCA70 .public __vsprintf_internal .public __vsprintf_internal_slice +.public ARM9_UNKNOWN_DATA__NA_209EAAC +.public GetCharWidth +.public IsAOrBPressed .public memset +.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1 .public snprintf .public sprintf .public sub_02005D14 @@ -444,5 +427,22 @@ .public sub_02087F10 .public sub_02088510 .public sub_020895F4 +.public TryAppendToSlice +.public TryAssignByteWrapper +.public UpdateAdvancedMenu +.public UpdateAdvancedTextBox +.public UpdateAlertBox +.public UpdateAreaNameBox +.public UpdateCollectionMenu +.public UpdateControlsChart +.public UpdateDebugMenu +.public UpdateDialogueBox +.public UpdateOptionsMenu +.public UpdateParentMenu +.public UpdatePortraitBox +.public UpdateScrollBox +.public UpdateSimpleMenu +.public UpdateTeamSelectionMenu +.public UpdateTextBox .public vsprintf .public wcstombs diff --git a/asm/include/main_rodata_020A1BB0.inc b/asm/include/main_rodata_020A1BB0.inc index 7df1c67e..305cef59 100644 --- a/asm/include/main_rodata_020A1BB0.inc +++ b/asm/include/main_rodata_020A1BB0.inc @@ -1,110 +1,4 @@ #pragma once -.public ACTOR_LIST -.public BaseFormsEqual -.public DseTrackEvent_Dummy1Byte -.public DseTrackEvent_Dummy2Bytes -.public DseTrackEvent_Dummy2Bytes2 -.public DseTrackEvent_EndTrack -.public DseTrackEvent_ForceLfoEnvelopeLevel -.public DseTrackEvent_Invalid -.public DseTrackEvent_MainLoopBegin -.public DseTrackEvent_OctaveDelta -.public DseTrackEvent_PanDelta -.public DseTrackEvent_PanFade -.public DseTrackEvent_RestoreEnvelopeDefaults -.public DseTrackEvent_SetBank -.public DseTrackEvent_SetBankLsb -.public DseTrackEvent_SetBankMsb -.public DseTrackEvent_SetBpm -.public DseTrackEvent_SetBpm2 -.public DseTrackEvent_SetEnvelopeAttackBegin -.public DseTrackEvent_SetEnvelopeAttackTime -.public DseTrackEvent_SetEnvelopeDecayTimeAndSustainLevel -.public DseTrackEvent_SetEnvelopeHoldTime -.public DseTrackEvent_SetEnvelopeReleaseTime -.public DseTrackEvent_SetEnvelopeSustainTime -.public DseTrackEvent_SetExpression -.public DseTrackEvent_SetFlagBit1Unknown -.public DseTrackEvent_SetHoldNotes -.public DseTrackEvent_SetInstrument -.public DseTrackEvent_SetKeyBend -.public DseTrackEvent_SetKeyBendRange -.public DseTrackEvent_SetLfoParameter -.public DseTrackEvent_SetNoteDurationMultiplier -.public DseTrackEvent_SetNoteRandomRegion -.public DseTrackEvent_SetOctave -.public DseTrackEvent_SetOptionalVolume -.public DseTrackEvent_SetPan -.public DseTrackEvent_SetTuning -.public DseTrackEvent_SetTuningJitterAmplitude -.public DseTrackEvent_SetUnknown2 -.public DseTrackEvent_SetVolume -.public DseTrackEvent_SetupKeyBendLfo -.public DseTrackEvent_SetupKeyBendLfoEnvelope -.public DseTrackEvent_SetupLfo -.public DseTrackEvent_SetupLfoEnvelope -.public DseTrackEvent_SetupPanLfo -.public DseTrackEvent_SetupPanLfoEnvelope -.public DseTrackEvent_SetupVolumeLfo -.public DseTrackEvent_SetupVolumeLfoEnvelope -.public DseTrackEvent_Signal -.public DseTrackEvent_SongVolumeFade -.public DseTrackEvent_SubLoopBegin -.public DseTrackEvent_SubLoopBreakOnLastIteration -.public DseTrackEvent_SubLoopEnd -.public DseTrackEvent_TuningDeltaCoarse -.public DseTrackEvent_TuningDeltaFine -.public DseTrackEvent_TuningDeltaFull -.public DseTrackEvent_TuningFade -.public DseTrackEvent_UseKeyBendLfo -.public DseTrackEvent_UseLfo -.public DseTrackEvent_UsePanLfo -.public DseTrackEvent_UseVolumeLfo -.public DseTrackEvent_VolumeDelta -.public DseTrackEvent_VolumeFade -.public DseTrackEvent_Wait16 -.public DseTrackEvent_Wait24 -.public DseTrackEvent_Wait8 -.public DseTrackEvent_WaitDelta -.public DseTrackEvent_WaitSame -.public DseTrackEvent_WaitUntilFadeout -.public GetKeyM2N -.public GetKeyM2NBaseForm -.public GetKeyN2M -.public GetKeyN2MBaseForm -.public LEVEL_LIST -.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_2 -.public RANK_STRINGS_1 -.public RANK_STRINGS_2 -.public RANK_STRINGS_3 -.public REMOTE_STRINGS -.public Render3d64Nothing -.public Render3d64Quadrilateral -.public Render3d64Rectangle -.public Render3d64RectangleMulticolor -.public Render3d64Texture -.public Render3d64Texture0x7 -.public Render3d64Tiling -.public Render3d64WindowFrame -.public STRING_BALANCE_M_LEVEL_BIN -.public STRING_DUNGEON_DUNGEON_BIN -.public STRING_EFFECT_EFFECT_BIN -.public STRING_MONSTER_MONSTER_BIN -.public STRING_MONSTER_M_ATTACK_BIN -.public STRING_MONSTER_M_GROUND_BIN -.public SoundLfoWave_FullNoiseFunc -.public SoundLfoWave_FullSquareFunc -.public SoundLfoWave_FullTriangleFunc -.public SoundLfoWave_HalfNoiseFunc -.public SoundLfoWave_HalfSquareFunc -.public SoundLfoWave_HalfTriangleFunc -.public SoundLfoWave_InvalidFunc -.public SoundLfoWave_ReverseSawFunc -.public SoundLfoWave_SawFunc -.public TryAssignByte -.public UNOWN_SPECIES_ADDITIONAL_CHARS -.public ValidateLegendaryChallengeMission -.public ValidateNormalChallengeMission .public _02092474 .public _0209247C .public _02092484 @@ -1693,7 +1587,109 @@ .public _022BC770 .public _022BC870 .public _022BC970 +.public ACTOR_LIST +.public BaseFormsEqual +.public DseTrackEvent_Dummy1Byte +.public DseTrackEvent_Dummy2Bytes +.public DseTrackEvent_Dummy2Bytes2 +.public DseTrackEvent_EndTrack +.public DseTrackEvent_ForceLfoEnvelopeLevel +.public DseTrackEvent_Invalid +.public DseTrackEvent_MainLoopBegin +.public DseTrackEvent_OctaveDelta +.public DseTrackEvent_PanDelta +.public DseTrackEvent_PanFade +.public DseTrackEvent_RestoreEnvelopeDefaults +.public DseTrackEvent_SetBank +.public DseTrackEvent_SetBankLsb +.public DseTrackEvent_SetBankMsb +.public DseTrackEvent_SetBpm +.public DseTrackEvent_SetBpm2 +.public DseTrackEvent_SetEnvelopeAttackBegin +.public DseTrackEvent_SetEnvelopeAttackTime +.public DseTrackEvent_SetEnvelopeDecayTimeAndSustainLevel +.public DseTrackEvent_SetEnvelopeHoldTime +.public DseTrackEvent_SetEnvelopeReleaseTime +.public DseTrackEvent_SetEnvelopeSustainTime +.public DseTrackEvent_SetExpression +.public DseTrackEvent_SetFlagBit1Unknown +.public DseTrackEvent_SetHoldNotes +.public DseTrackEvent_SetInstrument +.public DseTrackEvent_SetKeyBend +.public DseTrackEvent_SetKeyBendRange +.public DseTrackEvent_SetLfoParameter +.public DseTrackEvent_SetNoteDurationMultiplier +.public DseTrackEvent_SetNoteRandomRegion +.public DseTrackEvent_SetOctave +.public DseTrackEvent_SetOptionalVolume +.public DseTrackEvent_SetPan +.public DseTrackEvent_SetTuning +.public DseTrackEvent_SetTuningJitterAmplitude +.public DseTrackEvent_SetUnknown2 +.public DseTrackEvent_SetupKeyBendLfo +.public DseTrackEvent_SetupKeyBendLfoEnvelope +.public DseTrackEvent_SetupLfo +.public DseTrackEvent_SetupLfoEnvelope +.public DseTrackEvent_SetupPanLfo +.public DseTrackEvent_SetupPanLfoEnvelope +.public DseTrackEvent_SetupVolumeLfo +.public DseTrackEvent_SetupVolumeLfoEnvelope +.public DseTrackEvent_SetVolume +.public DseTrackEvent_Signal +.public DseTrackEvent_SongVolumeFade +.public DseTrackEvent_SubLoopBegin +.public DseTrackEvent_SubLoopBreakOnLastIteration +.public DseTrackEvent_SubLoopEnd +.public DseTrackEvent_TuningDeltaCoarse +.public DseTrackEvent_TuningDeltaFine +.public DseTrackEvent_TuningDeltaFull +.public DseTrackEvent_TuningFade +.public DseTrackEvent_UseKeyBendLfo +.public DseTrackEvent_UseLfo +.public DseTrackEvent_UsePanLfo +.public DseTrackEvent_UseVolumeLfo +.public DseTrackEvent_VolumeDelta +.public DseTrackEvent_VolumeFade +.public DseTrackEvent_Wait16 +.public DseTrackEvent_Wait24 +.public DseTrackEvent_Wait8 +.public DseTrackEvent_WaitDelta +.public DseTrackEvent_WaitSame +.public DseTrackEvent_WaitUntilFadeout +.public GetKeyM2N +.public GetKeyM2NBaseForm +.public GetKeyN2M +.public GetKeyN2MBaseForm +.public LEVEL_LIST .public mbtowc +.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_2 +.public RANK_STRINGS_1 +.public RANK_STRINGS_2 +.public RANK_STRINGS_3 +.public REMOTE_STRINGS +.public Render3d64Nothing +.public Render3d64Quadrilateral +.public Render3d64Rectangle +.public Render3d64RectangleMulticolor +.public Render3d64Texture +.public Render3d64Texture0x7 +.public Render3d64Tiling +.public Render3d64WindowFrame +.public SoundLfoWave_FullNoiseFunc +.public SoundLfoWave_FullSquareFunc +.public SoundLfoWave_FullTriangleFunc +.public SoundLfoWave_HalfNoiseFunc +.public SoundLfoWave_HalfSquareFunc +.public SoundLfoWave_HalfTriangleFunc +.public SoundLfoWave_InvalidFunc +.public SoundLfoWave_ReverseSawFunc +.public SoundLfoWave_SawFunc +.public STRING_BALANCE_M_LEVEL_BIN +.public STRING_DUNGEON_DUNGEON_BIN +.public STRING_EFFECT_EFFECT_BIN +.public STRING_MONSTER_M_ATTACK_BIN +.public STRING_MONSTER_M_GROUND_BIN +.public STRING_MONSTER_MONSTER_BIN .public sub_02003620 .public sub_02003780 .public sub_02007EC0 @@ -1766,3 +1762,7 @@ .public sub_0209081C .public sub_0209086C .public sub_020908A0 +.public TryAssignByte +.public UNOWN_SPECIES_ADDITIONAL_CHARS +.public ValidateLegendaryChallengeMission +.public ValidateNormalChallengeMission diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index 5bc44402..2f6210cb 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -164,6 +164,7 @@ .public ov00_02318158 .public ov00_02318160 .public ov00_023250C8 +.public PM_ForceToPowerOff .public SetIrqFlag .public StartThread .public strcpy @@ -256,7 +257,6 @@ .public sub_020818B0 .public sub_020819D4 .public sub_020819EC -.public sub_0208200C .public sub_02082420 .public sub_020824A4 .public sub_02082514 diff --git a/asm/include/overlay_10_022BCC7C.inc b/asm/include/overlay_10_022BCC7C.inc index c4110efa..c71f5035 100644 --- a/asm/include/overlay_10_022BCC7C.inc +++ b/asm/include/overlay_10_022BCC7C.inc @@ -90,6 +90,7 @@ .public ov29_022EA428 .public ov29_0234C584 .public ov29_0234C5EC +.public PlaySeByIdVolumeWrapper .public PreprocessString .public Rand16Bit .public SetAndPlayAnimationForAnimationControl @@ -109,7 +110,6 @@ .public sub_0200B330 .public sub_0200B3FC .public sub_0200D310 -.public sub_02017C80 .public sub_0201B43C .public sub_0201C108 .public sub_0201C138 diff --git a/asm/include/overlay_10_022C2588.inc b/asm/include/overlay_10_022C2588.inc index 2637b1ee..096a7cc4 100644 --- a/asm/include/overlay_10_022C2588.inc +++ b/asm/include/overlay_10_022C2588.inc @@ -1,4 +1,5 @@ #pragma once +.public _020B0A5C .public BAG_ITEMS_PTR_MIRROR .public CleanStickyItemsInBag .public Debug_GetDebugFlag @@ -31,21 +32,9 @@ .public LoadWteFromFileDirectory .public MemAlloc .public MemFree -.public MemZero .public MemsetSimple +.public MemZero .public MultiplyByFixedPoint -.public ProcessWte -.public RandInt -.public RemoveEmptyItemsInBag -.public RemoveHolderForItemInBag -.public RunDungeonMode -.public SaveScriptVariableValue -.public SetMoneyCarried -.public TEAM_MEMBER_TABLE_PTR -.public UnloadFile -.public UnloadOverlay -.public UnloadWte -.public _020B0A5C .public ov10_022C434C .public ov10_022DC094 .public ov10_022DC0B8 @@ -57,6 +46,13 @@ .public ov10_022DC190 .public ov10_022DC218 .public ov10_022DC224 +.public ProcessWte +.public RandInt +.public RemoveEmptyItemsInBag +.public RemoveHolderForItemInBag +.public RunDungeonMode +.public SaveScriptVariableValue +.public SetMoneyCarried .public sub_02001AB0 .public sub_0200C4CC .public sub_02017A68 @@ -88,3 +84,7 @@ .public sub_0205BBFC .public sub_0205BC94 .public sub_0205F504 +.public TEAM_MEMBER_TABLE_PTR +.public UnloadFile +.public UnloadOverlay +.public UnloadWte diff --git a/asm/include/overlay_10_rodata_022C4584.inc b/asm/include/overlay_10_rodata_022C4584.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_10_rodata_022C4584.inc +++ b/asm/include/overlay_10_rodata_022C4584.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_10_rodata_022C464C.inc b/asm/include/overlay_10_rodata_022C464C.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_10_rodata_022C464C.inc +++ b/asm/include/overlay_10_rodata_022C464C.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_10_rodata_022C490C.inc b/asm/include/overlay_10_rodata_022C490C.inc index e8f77d4c..c8cff483 100644 --- a/asm/include/overlay_10_rodata_022C490C.inc +++ b/asm/include/overlay_10_rodata_022C490C.inc @@ -17,6 +17,10 @@ .public DoMoveCrunch .public DoMoveCrushClaw .public DoMoveCurse +.public DoMoveDamage__02325DC0 +.public DoMoveDamage__0232A500 +.public DoMoveDamage__0232B8B0 +.public DoMoveDamage__0232DD88 .public DoMoveDamageBoostAllStats .public DoMoveDamageBurn10FlameWheel .public DoMoveDamageConfuse10 @@ -42,10 +46,6 @@ .public DoMoveDamageStealItem .public DoMoveDamageWeightDependent .public DoMoveDamageWithRecoil -.public DoMoveDamage__02325DC0 -.public DoMoveDamage__0232A500 -.public DoMoveDamage__0232B8B0 -.public DoMoveDamage__0232DD88 .public DoMoveDefog .public DoMoveDestinyBond .public DoMoveDoubleEdge @@ -72,8 +72,8 @@ .public DoMoveGust .public DoMoveGyroBall .public DoMoveHammerArm -.public DoMoveHeadSmash .public DoMoveHeadbutt +.public DoMoveHeadSmash .public DoMoveHeartSwap .public DoMoveHiddenPower .public DoMoveHornDrill @@ -123,8 +123,8 @@ .public DoMoveSwapItems .public DoMoveTaunt .public DoMoveThunderFang -.public DoMoveThunderWave .public DoMoveThundershock +.public DoMoveThunderWave .public DoMoveTickle .public DoMoveTorment .public DoMoveToxic diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 24babdfd..5b277fb9 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -316,6 +316,7 @@ .public OverlayIsLoaded .public PlayBgmByIdVeneer .public PlayBgmByIdVolumeVeneer +.public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper .public PointsToZero .public PopInventoryMenuField0x1A3 @@ -493,7 +494,6 @@ .public sub_02017C5C .public sub_02017C68 .public sub_02017C74 -.public sub_02017C80 .public sub_02017C90 .public sub_02017C9C .public sub_02017CA8 diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index d0a3f230..51711a07 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -45,6 +45,7 @@ .public ov11_022F6FE0 .public ov11_022F7058 .public PlayBgmByIdVeneer +.public PlaySeByIdVolumeWrapper .public PortraitBoxNeedsUpdate .public PreprocessString .public RandRange @@ -63,7 +64,6 @@ .public sub_020063F4 .public sub_02017B70 .public sub_02017B7C -.public sub_02017C80 .public sub_0202BC60 .public sub_0202F334 .public sub_0202F954 diff --git a/asm/include/overlay_15_0238A234.inc b/asm/include/overlay_15_0238A234.inc index 6b085f9c..0d81b624 100644 --- a/asm/include/overlay_15_0238A234.inc +++ b/asm/include/overlay_15_0238A234.inc @@ -27,13 +27,13 @@ .public ov15_0238B10C .public ov15_0238B114 .public OVERLAY15_UNKNOWN_POINTER__NA_238B180 +.public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper .public SetAdvancedTextBoxField0x1C2 .public SetAdvancedTextBoxField0x1C4 .public SetAdvancedTextBoxState5 .public ShowDialogueBox .public ShowStringIdInDialogueBox -.public sub_02017C80 .public sub_020288DC .public sub_0202F954 .public sub_020395CC diff --git a/asm/include/overlay_17.inc b/asm/include/overlay_17.inc index 625fffa8..521da1ad 100644 --- a/asm/include/overlay_17.inc +++ b/asm/include/overlay_17.inc @@ -11,11 +11,11 @@ .public IsScrollBoxActive .public IsSimpleMenuActive .public MemAlloc +.public ov11_0238A08C .public OVERLAY17_UNKNOWN_POINTER__NA_238BE00 .public PortraitBoxNeedsUpdate .public SetAdvancedTextBoxState5 .public SetScrollBoxState7 -.public ov11_0238A08C .public sub_0202F334 .public sub_02034A38 .public sub_0203A51C diff --git a/asm/include/overlay_17_0238A754.inc b/asm/include/overlay_17_0238A754.inc index dcfe3924..75ed0b37 100644 --- a/asm/include/overlay_17_0238A754.inc +++ b/asm/include/overlay_17_0238A754.inc @@ -29,6 +29,10 @@ .public IsDialogueBoxActive .public IsMainCharacter .public IsSimpleMenuActive +.public ov11_022DC504 +.public ov11_022E6E68 +.public ov17_0238A278 +.public ov17_0238A364 .public OVERLAY17_FUNCTION_POINTER_TABLE .public OVERLAY17_UNKNOWN_POINTER__NA_238BE00 .public PlaySeVolumeWrapper @@ -38,12 +42,6 @@ .public ShowDialogueBox .public ShowPortraitInPortraitBox .public ShowStringIdInDialogueBox -.public TEAM_MEMBER_TABLE_PTR -.public TryAddMonsterToActiveTeam -.public ov11_022DC504 -.public ov11_022E6E68 -.public ov17_0238A278 -.public ov17_0238A364 .public sub_02017C10 .public sub_02017C50 .public sub_020307EC @@ -89,3 +87,5 @@ .public sub_02057444 .public sub_02058138 .public sub_0205B028 +.public TEAM_MEMBER_TABLE_PTR +.public TryAddMonsterToActiveTeam diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index 150c6631..d5489e83 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -36,6 +36,7 @@ .public MemFree .public ov11_022E6E68 .public ov11_0238A090 +.public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper .public PortraitBoxNeedsUpdate .public PreprocessString @@ -50,7 +51,6 @@ .public ShowStringIdInDialogueBox .public StrncpySimpleNoPadSafe .public sub_02017C74 -.public sub_02017C80 .public sub_02026268 .public sub_02027B1C .public sub_0202BC60 diff --git a/asm/include/overlay_21.inc b/asm/include/overlay_21.inc index 329da80d..ecfc04e8 100644 --- a/asm/include/overlay_21.inc +++ b/asm/include/overlay_21.inc @@ -53,6 +53,7 @@ .public ov11_0230D220 .public ov11_0230D92C .public ov11_02310C2C +.public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper .public PreprocessString .public PrintIqSkillsMenu @@ -70,7 +71,6 @@ .public sub_0201007C .public sub_02013150 .public sub_02017C74 -.public sub_02017C80 .public sub_02026268 .public sub_02027B1C .public sub_0202836C diff --git a/asm/include/overlay_22.inc b/asm/include/overlay_22.inc index 9a8a161f..f63ca571 100644 --- a/asm/include/overlay_22.inc +++ b/asm/include/overlay_22.inc @@ -37,6 +37,7 @@ .public ov11_022DC504 .public ov11_022E6E68 .public ov11_0238A130 +.public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper .public PreprocessString .public RemoveEmptyItemsInBag @@ -63,7 +64,6 @@ .public sub_02010BA4 .public sub_02010BC0 .public sub_02017C74 -.public sub_02017C80 .public sub_0202836C .public sub_0202C620 .public sub_0202C748 diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc index 797adf5a..8dd06513 100644 --- a/asm/include/overlay_25.inc +++ b/asm/include/overlay_25.inc @@ -38,6 +38,7 @@ .public ov11_0230BCF8 .public ov11_0230BD28 .public ov11_0230C910 +.public PlaySeByIdVolumeWrapper .public PreprocessString .public RemoveItemByIdAndStackNoHole .public SetPortraitEmotion @@ -47,7 +48,6 @@ .public ShowStringIdInDialogueBox .public sub_0200D670 .public sub_02017C74 -.public sub_02017C80 .public sub_02026268 .public sub_02027B1C .public sub_0202836C diff --git a/asm/include/overlay_29_022DC314.inc b/asm/include/overlay_29_022DC314.inc index 560de786..dd3a5e13 100644 --- a/asm/include/overlay_29_022DC314.inc +++ b/asm/include/overlay_29_022DC314.inc @@ -1,10 +1,7 @@ #pragma once +.public _020AFC70 .public Debug_Print0 .public LoadFileFromRom -.public Render3dSetPaletteBase -.public Render3dSetTextureParams -.public Render3dTextureNoSetup -.public _020AFC70 .public ov29_0234FD04 .public ov29_0234FD14 .public ov29_0234FD48 @@ -13,6 +10,9 @@ .public ov29_0234FD54 .public ov29_023534E8 .public ov29_02353880 +.public Render3dSetPaletteBase +.public Render3dSetTextureParams +.public Render3dTextureNoSetup .public sub_02008BF4 .public sub_0201E050 .public sub_0201E380 diff --git a/asm/include/overlay_29_022DC65C.inc b/asm/include/overlay_29_022DC65C.inc index d0130acc..9bed57be 100644 --- a/asm/include/overlay_29_022DC65C.inc +++ b/asm/include/overlay_29_022DC65C.inc @@ -1,7 +1,9 @@ #pragma once -.public DUNGEON_PTR +.public _020AFC4C +.public _s32_div_f .public DirectoryFileMngr_OpenDirectoryFile .public DrawTeamStats +.public DUNGEON_PTR .public FreeMapAndTeam .public FreeTeamStats .public GetDefaultTileTextureId @@ -10,10 +12,6 @@ .public MemAlloc .public MemFree .public MemZero -.public UnloadFile -.public UpdateTeamStats -.public _020AFC4C -.public _s32_div_f .public ov10_022C0814 .public ov10_022C096C .public ov10_022C0998 @@ -80,3 +78,5 @@ .public sub_02063734 .public sub_02063770 .public sub_02063830 +.public UnloadFile +.public UpdateTeamStats diff --git a/asm/include/overlay_29_022DEBA4.inc b/asm/include/overlay_29_022DEBA4.inc index bc43de8d..6892008a 100644 --- a/asm/include/overlay_29_022DEBA4.inc +++ b/asm/include/overlay_29_022DEBA4.inc @@ -4,24 +4,24 @@ .public ClearHiddenStairs .public CloseFixedBin .public CountItemsOnFloorForAcuteSniffer -.public DIRECTIONS_XY -.public DUNGEON_PTR .public Debug_Print0 .public DeleteAllMonsterSpriteFiles .public DetermineAllMonsterShadow .public DetermineAllTilesWalkableNeighbors +.public DIRECTIONS_XY .public DisplayFloorCard .public DisplayFloorTip .public DisplayMessage .public DisplayMessage2 +.public DUNGEON_PTR .public DungeonGoesUp .public DungeonRandInt .public DungeonRngUnsetSecondary .public EnemyEvolution .public EntityIsValid__022E0354 -.public FIXED_ROOM_REVISIT_OVERRIDES .public FadeToBlack .public FillMissionDestinationInfo +.public FIXED_ROOM_REVISIT_OVERRIDES .public FreeLoadedAttackSpriteAndMore .public FreeTopScreenStatus .public GenerateDungeonRngSeed @@ -54,36 +54,6 @@ .public LoadWeather3DFiles .public MemZero .public OpenFixedBin -.public Rand16Bit -.public ReevaluateSnatchMonster -.public RefillTeam -.public ResetGravity -.public RunFractionalTurn -.public SetBaseStatsMovesGroundMonster -.public SetBothScreensWindowColorToDefault -.public SetDungeonRngPreseed -.public SetDungeonRngPreseed23Bit -.public SetEntityPixelPosXY -.public SetForcedLossReason -.public SetHiddenFloorField -.public SetHiddenStairsField -.public SetMaxReachedFloor -.public SetMinimapDataE447 -.public SpawnInitialMonsters -.public SpawnShopkeepers -.public SpawnTeam -.public StartFadeDungeonWrapper -.public TryActivateArtificialWeatherAbilities -.public TryActivateIqBooster -.public TryActivateSlowStart -.public TryActivateWeather -.public TryForcedLoss -.public TryInflictBurnStatusWholeTeam -.public TrySpawnDoughSeedPoke -.public UpdateMinimap -.public UpdateShouldBoostHiddenStairsSpawnChance -.public UpdateShouldBoostKecleonShopSpawnChance -.public UpdateTrapsVisibility .public ov10_022BDAB0 .public ov10_022BDB54 .public ov10_022BDB60 @@ -243,6 +213,25 @@ .public ov29_023510C0 .public ov29_023510C8 .public ov29_02353563 +.public Rand16Bit +.public ReevaluateSnatchMonster +.public RefillTeam +.public ResetGravity +.public RunFractionalTurn +.public SetBaseStatsMovesGroundMonster +.public SetBothScreensWindowColorToDefault +.public SetDungeonRngPreseed +.public SetDungeonRngPreseed23Bit +.public SetEntityPixelPosXY +.public SetForcedLossReason +.public SetHiddenFloorField +.public SetHiddenStairsField +.public SetMaxReachedFloor +.public SetMinimapDataE447 +.public SpawnInitialMonsters +.public SpawnShopkeepers +.public SpawnTeam +.public StartFadeDungeonWrapper .public sub_02001808 .public sub_02009194 .public sub_020091B0 @@ -259,3 +248,14 @@ .public sub_0205B77C .public sub_020634F4 .public sub_02063504 +.public TryActivateArtificialWeatherAbilities +.public TryActivateIqBooster +.public TryActivateSlowStart +.public TryActivateWeather +.public TryForcedLoss +.public TryInflictBurnStatusWholeTeam +.public TrySpawnDoughSeedPoke +.public UpdateMinimap +.public UpdateShouldBoostHiddenStairsSpawnChance +.public UpdateShouldBoostKecleonShopSpawnChance +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022E0378.inc b/asm/include/overlay_29_022E0378.inc index aa7731f0..934b8909 100644 --- a/asm/include/overlay_29_022E0378.inc +++ b/asm/include/overlay_29_022E0378.inc @@ -1,7 +1,7 @@ #pragma once .public CalcSpeedStageWrapper -.public DUNGEON_PTR .public DisplayMessage2 +.public DUNGEON_PTR .public EntityIsValid__022E0354 .public FixedRoomIsSubstituteRoom .public GetForcedLossReason @@ -15,12 +15,12 @@ .public IsFloorOver .public IsJirachiChallengeFloor .public IsMoneyAllowed -.public RemoveAllItems -.public SECONDARY_TERRAIN_TYPES -.public SetMoneyCarried -.public SubInitMonster .public ov29_022E0A18 .public ov29_022E68BC .public ov29_0234B034 .public ov29_0234B0B4 .public ov29_0237CFC0 +.public RemoveAllItems +.public SECONDARY_TERRAIN_TYPES +.public SetMoneyCarried +.public SubInitMonster diff --git a/asm/include/overlay_29_022E08A0.inc b/asm/include/overlay_29_022E08A0.inc index b1a0e72d..fc52fc88 100644 --- a/asm/include/overlay_29_022E08A0.inc +++ b/asm/include/overlay_29_022E08A0.inc @@ -1,8 +1,11 @@ #pragma once +.public _020AFC28 +.public _020AFC4C +.public _020AFC70 .public AnimationDelayOrSomething .public CopyAndInterleaveWrapper -.public DUNGEON_PTR .public DirectoryFileMngr_OpenDirectoryFile +.public DUNGEON_PTR .public DungeonGoesUp .public GetBgRegionArea .public GetFloorType @@ -16,13 +19,6 @@ .public LoadWteFromFileDirectory .public Memcpy32 .public Memset32 -.public SetMinimapDataE447 -.public StartFadeDungeonWrapper -.public UnloadFile -.public UnloadWte -.public _020AFC28 -.public _020AFC4C -.public _020AFC70 .public ov10_022C4D54 .public ov29_022DE15C .public ov29_022DE854 @@ -46,6 +42,8 @@ .public ov29_0237C6A4 .public ov29_0237C6B8 .public ov29_0237C6D4 +.public SetMinimapDataE447 +.public StartFadeDungeonWrapper .public sub_020063F4 .public sub_02006564 .public sub_02006BFC @@ -60,3 +58,5 @@ .public sub_0201E380 .public sub_0201F598 .public sub_0204AE80 +.public UnloadFile +.public UnloadWte diff --git a/asm/include/overlay_29_022E1618.inc b/asm/include/overlay_29_022E1618.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_29_022E1618.inc +++ b/asm/include/overlay_29_022E1618.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_29_022EB44C.inc b/asm/include/overlay_29_022EB44C.inc index c87c3a64..650a8b7f 100644 --- a/asm/include/overlay_29_022EB44C.inc +++ b/asm/include/overlay_29_022EB44C.inc @@ -5,17 +5,9 @@ .public GetItemCategoryVeneer .public GetItemInfo .public GetTile -.public ITEM_CATEGORY_ACTIONS .public IsHM +.public ITEM_CATEGORY_ACTIONS .public ItemZInit -.public RemoveEmptyItemsInBagWrapper -.public RemoveEquivItemNoHole -.public RemoveGroundItem -.public RemoveItem -.public SetItemAcquired -.public SetMonsterActionFields -.public ShouldDisplayEntityWrapper -.public SpawnItem .public ov29_02347040 .public ov29_02352074 .public ov29_0237C918 @@ -24,3 +16,11 @@ .public ov29_0237C920 .public ov29_0237C922 .public ov29_0237C96C +.public RemoveEmptyItemsInBagWrapper +.public RemoveEquivItemNoHole +.public RemoveGroundItem +.public RemoveItem +.public SetItemAcquired +.public SetMonsterActionFields +.public ShouldDisplayEntityWrapper +.public SpawnItem diff --git a/asm/include/overlay_29_022EBCE8.inc b/asm/include/overlay_29_022EBCE8.inc index 3fc6677c..53a0772a 100644 --- a/asm/include/overlay_29_022EBCE8.inc +++ b/asm/include/overlay_29_022EBCE8.inc @@ -1,28 +1,28 @@ #pragma once +.public abs .public AdvanceFrame .public CalcSpeedStageWrapper .public ChangeLeader -.public DUNGEON_PTR .public DecrementWindCounter .public DisplayActions +.public DUNGEON_PTR .public EnemyEvolution .public EntityIsValid__022EC608 .public ExecuteMonsterAction .public FRACTIONAL_TURN_SEQUENCE .public GetLeader .public IsFloorOver +.public ov29_022E81F8 +.public ov29_022EF9C8 +.public ov29_0230FC24 +.public ov29_02348FD8 +.public ov29_023522B6 .public RunMonsterAi .public SetLeaderAction +.public sub_01FFBDF4 .public TickStatusAndHealthRegen .public TryActivateArtificialWeatherAbilities .public TryActivateWeather .public TryForcedLoss .public TryRestoreRoostTyping .public TrySpawnMonsterAndActivatePlusMinus -.public abs -.public ov29_022E81F8 -.public ov29_022EF9C8 -.public ov29_0230FC24 -.public ov29_02348FD8 -.public ov29_023522B6 -.public sub_01FFBDF4 diff --git a/asm/include/overlay_29_022ECDE4.inc b/asm/include/overlay_29_022ECDE4.inc index 9706ca5f..66008d2d 100644 --- a/asm/include/overlay_29_022ECDE4.inc +++ b/asm/include/overlay_29_022ECDE4.inc @@ -1,4 +1,6 @@ #pragma once +.public _020AFC4C +.public _020AFC70 .public AdvanceFrame .public AreLateGameTrapsEnabled .public CreateMonsterSummaryFromMonster @@ -10,13 +12,8 @@ .public GetTileSafe .public InitRender3dElement64 .public LoadWteFromFileDirectory -.public MemZero -.public ProcessWte -.public SpawnTrap -.public StringFromId -.public _020AFC4C -.public _020AFC70 .public memset +.public MemZero .public ov29_022E7A30 .public ov29_02352690 .public ov29_02352698 @@ -25,7 +22,10 @@ .public ov29_0237C864 .public ov29_0237C974 .public ov29_0237C99C +.public ProcessWte +.public SpawnTrap .public strcpy +.public StringFromId .public sub_0201B9F8 .public sub_0201E080 .public sub_0201F2A0 diff --git a/asm/include/overlay_29_022EDCBC.inc b/asm/include/overlay_29_022EDCBC.inc index dba8e5c0..1798b1e4 100644 --- a/asm/include/overlay_29_022EDCBC.inc +++ b/asm/include/overlay_29_022EDCBC.inc @@ -1,8 +1,8 @@ #pragma once .public ApplyTrapEffect .public BindTrapToTile -.public DUNGEON_PTR .public DrawMinimapTile +.public DUNGEON_PTR .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EnemyEvolution @@ -16,15 +16,15 @@ .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public LogMessageByIdWithPopupCheckUserUnknown -.public SpawnTrap -.public SubstitutePlaceholderStringTags -.public TRAP_BUSTER_ACTIVATION_CHANCE -.public UpdateShopkeeperModeAfterTrap -.public UpdateTrapsVisibility .public ov29_022E2CA0 .public ov29_022E56A0 .public ov29_022E58B0 .public ov29_022E7A30 .public ov29_022F9840 .public ov29_0234B034 +.public SpawnTrap .public sub_02024FC8 +.public SubstitutePlaceholderStringTags +.public TRAP_BUSTER_ACTIVATION_CHANCE +.public UpdateShopkeeperModeAfterTrap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index 8b165e6c..04c3a518 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -57,13 +57,13 @@ .public ov29_022FB920 .public ov29_022FBD80 .public ov29_02304A48 -.public ov29_02344B44 .public ov29_02346344 -.public ov29_0234B084 +.public PrepareItemForPrinting__02345728 .public RemoveEmptyItemsInBagWrapper .public RemoveGroundItem .public RemoveHeldItemNoHole .public SetFlagsForHeldItemInBag +.public SetPreprocessorArgsIdVal .public ShouldDisplayEntityWrapper .public SLEEP_TURN_RANGE .public SPATK_STAT_IDX diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 1d10d4ef..5df14a93 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -10,6 +10,7 @@ .public AnimationDelayOrSomething .public BAG_ITEMS_PTR_MIRROR .public CanMonsterMoveInDirection +.public CanMonsterMoveOrSwapWithAllyInDirection .public CanSeeTarget .public CeilFixedPoint .public ChangeMonsterAnimation @@ -111,7 +112,6 @@ .public ov29_023009CC .public ov29_02300FCC .public ov29_0230105C -.public CanMonsterMoveOrSwapWithAllyInDirection .public ov29_023055B0 .public ov29_02321164 .public ov29_02322DDC @@ -123,7 +123,6 @@ .public ov29_02339D7C .public ov29_0233A0E8 .public ov29_0233A248 -.public ov29_02344B44 .public ov29_02346E5C .public ov29_02346FB8 .public ov29_02348D3C @@ -163,9 +162,11 @@ .public ov29_0237CFBB .public PlayExclamationPointEffect__022E47D4 .public PlayQuestionMarkEffect +.public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper .public PointCameraToMonster .public PositionHasMonster +.public PrepareItemForPrinting__02345728 .public PreprocessString .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole @@ -181,7 +182,6 @@ .public SpawnItem .public sub_02001AB0 .public sub_02006B70 -.public sub_02017C80 .public sub_0201B9F8 .public sub_0201CF90 .public sub_02026268 diff --git a/asm/include/overlay_29_022F52B0.inc b/asm/include/overlay_29_022F52B0.inc index 0ea33cbb..ab6c33a3 100644 --- a/asm/include/overlay_29_022F52B0.inc +++ b/asm/include/overlay_29_022F52B0.inc @@ -9,6 +9,7 @@ .public ExclusiveItemEffectFlagTest .public GetItemCategoryVeneer .public GetItemToUse +.public HandleCurvedProjectileThrow .public IqSkillIsEnabled .public ItemIsActive__022F5994 .public ItemZInit @@ -25,13 +26,12 @@ .public ov29_02304A48 .public ov29_0230F9A4 .public ov29_02343D30 -.public ov29_02344B44 -.public ov29_02344B70 .public ov29_02346FB8 .public ov29_02347000 .public ov29_02347518 -.public HandleCurvedProjectileThrow .public ov29_0234B034 +.public PrepareItemForPrinting__02345728 +.public PrepareItemForPrinting__02345754 .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole .public RemoveGroundItem diff --git a/asm/include/overlay_29_022F59C4.inc b/asm/include/overlay_29_022F59C4.inc index ae3c62be..d33d73df 100644 --- a/asm/include/overlay_29_022F59C4.inc +++ b/asm/include/overlay_29_022F59C4.inc @@ -39,7 +39,6 @@ .public ov29_0230040C .public ov29_023009CC .public ov29_02304AFC -.public TryEndPetrifiedOrSleepStatus .public ov29_0231AE3C .public ov29_0232145C .public ov29_02322374 @@ -63,6 +62,7 @@ .public sub_02024FB8 .public SubstitutePlaceholderStringTags .public TryActivateTruant +.public TryEndPetrifiedOrSleepStatus .public UpdateMapSurveyorFlag .public UpdateMovePp .public YesNoMenu diff --git a/asm/include/overlay_29_022F740C.inc b/asm/include/overlay_29_022F740C.inc index 783b5d91..6b959c27 100644 --- a/asm/include/overlay_29_022F740C.inc +++ b/asm/include/overlay_29_022F740C.inc @@ -1,6 +1,6 @@ #pragma once -.public DUNGEON_PTR .public DirectoryFileMngr_GetDirectoryFileSize +.public DUNGEON_PTR .public GendersEqualNotGenderless .public GetMonsterGender .public GetSpriteFileSize @@ -9,5 +9,5 @@ .public LoadWanTableEntryFromPack .public LoadWanTableEntryFromPackUseProvidedMemory .public MemAlloc -.public WAN_TABLE .public ov29_0237C9B0 +.public WAN_TABLE diff --git a/asm/include/overlay_29_022F7768.inc b/asm/include/overlay_29_022F7768.inc index bf21afdd..4e5f8b2c 100644 --- a/asm/include/overlay_29_022F7768.inc +++ b/asm/include/overlay_29_022F7768.inc @@ -3,14 +3,14 @@ .public CanAttackInDirection .public CeilFixedPoint .public CheckTeamMemberIdx -.public DIRECTIONS_XY -.public DUNGEON_PTR .public DeleteWanTableEntryVeneer .public DetermineMonsterShadow +.public DIRECTIONS_XY .public DiscoverMinimap .public DisplayMessage .public DisplayMessage2 .public DrawMinimapTile +.public DUNGEON_PTR .public EnableAllLearnableIqSkills .public EndFrozenClassStatus .public EntityIsValid__022F7364 @@ -39,18 +39,6 @@ .public LEADER_PTR .public MemFree .public OpenMessageLog -.public PopulateActiveMonsterPtrs -.public RemoveHolderForItemInBag -.public RevertGiratinaAndShaymin -.public SetForcedLossReason -.public SetMissionTargetEnemyDefeated -.public ShouldMonsterRunAway -.public StoryRestrictionsEnabled -.public TEAM_MEMBER_TABLE_PTR -.public UpdateMapSurveyorFlag -.public UpdateMinimap -.public WAN_TABLE -.public YesNoMenu .public ov29_022DDB68 .public ov29_022E1C0C .public ov29_022E2470 @@ -76,8 +64,20 @@ .public ov29_0234B1A4 .public ov29_0234EF24 .public ov29_0237C9B0 +.public PopulateActiveMonsterPtrs +.public RemoveHolderForItemInBag +.public RevertGiratinaAndShaymin +.public SetForcedLossReason +.public SetMissionTargetEnemyDefeated +.public ShouldMonsterRunAway +.public StoryRestrictionsEnabled .public sub_02053250 .public sub_0205349C .public sub_02056228 .public sub_020566C4 .public sub_020585B4 +.public TEAM_MEMBER_TABLE_PTR +.public UpdateMapSurveyorFlag +.public UpdateMinimap +.public WAN_TABLE +.public YesNoMenu diff --git a/asm/include/overlay_29_022F9194.inc b/asm/include/overlay_29_022F9194.inc index e62589ba..1936adce 100644 --- a/asm/include/overlay_29_022F9194.inc +++ b/asm/include/overlay_29_022F9194.inc @@ -15,11 +15,11 @@ .public LogMessageByIdWithPopupCheckUserTarget .public LowerSpeed .public MonsterIsType -.public SubstitutePlaceholderStringTags -.public TryEndStatusWithAbility -.public WEATHER_BALL_TYPE_TABLE .public ov10_022C4C6E .public ov10_022C4C70 .public ov29_022E6260 .public ov29_022E647C -.public ov29_0234B084 +.public SetPreprocessorArgsIdVal +.public SubstitutePlaceholderStringTags +.public TryEndStatusWithAbility +.public WEATHER_BALL_TYPE_TABLE diff --git a/asm/include/overlay_29_022F9744.inc b/asm/include/overlay_29_022F9744.inc index 687640a5..f9489b42 100644 --- a/asm/include/overlay_29_022F9744.inc +++ b/asm/include/overlay_29_022F9744.inc @@ -11,10 +11,10 @@ .public CheckVariousStatuses .public CheckVariousStatuses2 .public Conversion2IsActive -.public DIRECTIONS_XY -.public DUNGEON_PTR .public DefenderAbilityIsActive__022F96CC +.public DIRECTIONS_XY .public DiscoverMinimap +.public DUNGEON_PTR .public DungeonRandInt .public EnableIqSkill .public EndBurnClassStatus @@ -48,19 +48,6 @@ .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget -.public PointCameraToMonster -.public RestoreAllMovePP -.public SECONDARY_TERRAIN_TYPES -.public SetActionPassTurnOrWalk -.public ShouldDisplayEntityWrapper -.public ShowPpRestoreEffect -.public SubFixedPoint -.public SubstitutePlaceholderStringTags -.public TryInflictBurnStatus -.public TryInflictPausedStatus -.public UpdateCamera -.public UpdateMinimap -.public UpdateStatusIconFlags .public ov29_022E0A04 .public ov29_022E4160 .public ov29_022E68BC @@ -76,12 +63,25 @@ .public ov29_02304A48 .public ov29_02307CE0 .public ov29_02307DD0 -.public ov29_02344B44 .public ov29_0234B034 -.public ov29_0234B084 +.public PointCameraToMonster +.public PrepareItemForPrinting__02345728 +.public RestoreAllMovePP +.public SECONDARY_TERRAIN_TYPES +.public SetActionPassTurnOrWalk +.public SetPreprocessorArgsIdVal +.public ShouldDisplayEntityWrapper +.public ShowPpRestoreEffect .public sub_0201405C .public sub_02017C50 .public sub_0204AEF0 .public sub_02050FF8 .public sub_02052E2C .public sub_02056228 +.public SubFixedPoint +.public SubstitutePlaceholderStringTags +.public TryInflictBurnStatus +.public TryInflictPausedStatus +.public UpdateCamera +.public UpdateMinimap +.public UpdateStatusIconFlags diff --git a/asm/include/overlay_29_022FACBC.inc b/asm/include/overlay_29_022FACBC.inc index 7db5f36e..c04b00cc 100644 --- a/asm/include/overlay_29_022FACBC.inc +++ b/asm/include/overlay_29_022FACBC.inc @@ -20,13 +20,13 @@ .public ItemZInit .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget +.public ov29_022E6928 +.public ov29_022EA370 +.public ov29_0230F9A4 +.public ov29_0234B09C +.public PrepareItemForPrinting__02345728 .public RandInt .public RemoveEquivItem .public ShouldTryEatItem .public SubstitutePlaceholderStringTags .public TryIncreaseHp -.public ov29_022E6928 -.public ov29_022EA370 -.public ov29_0230F9A4 -.public ov29_02344B44 -.public ov29_0234B09C diff --git a/asm/include/overlay_29_022FB678.inc b/asm/include/overlay_29_022FB678.inc index 4079ad09..c1d564b1 100644 --- a/asm/include/overlay_29_022FB678.inc +++ b/asm/include/overlay_29_022FB678.inc @@ -1,8 +1,9 @@ #pragma once +.public _020A1870 .public Conversion2IsActive .public DIRECTIONS_XY -.public DUNGEON_PTR .public DisplayAnimatedNumbers +.public DUNGEON_PTR .public EntityIsValid__022F7364 .public GetMaxPp .public GetMoveBasePp @@ -10,10 +11,9 @@ .public IqSkillIsEnabled .public IsMonster__022F9720 .public IsSecretBazaarNpcBehavior -.public TeamMemberHasEnabledIqSkill -.public UpdateMapSurveyorFlag -.public UpdateMinimap -.public _020A1870 .public ov29_022E576C .public ov29_02307CE0 .public ov29_02348100 +.public TeamMemberHasEnabledIqSkill +.public UpdateMapSurveyorFlag +.public UpdateMinimap diff --git a/asm/include/overlay_29_022FE4BC.inc b/asm/include/overlay_29_022FE4BC.inc index 7bffaf22..d521ec30 100644 --- a/asm/include/overlay_29_022FE4BC.inc +++ b/asm/include/overlay_29_022FE4BC.inc @@ -3,7 +3,6 @@ .public AdvanceFrame .public AnimationDelayOrSomething .public CanMonsterMoveInDirection -.public MonsterCannotAttack .public CannotStandOnTile .public DIRECTIONS_XY .public DisplayActions @@ -12,11 +11,13 @@ .public EnsureCanStandCurrentTile .public EntityIsValid__022FED98 .public GetHiddenStairsField +.public HandleHeldItemSwaps .public HasHeldItem .public IqSkillIsEnabled .public IsChargingAnyTwoTurnMove .public IsFloorOver .public LogMessageByIdWithPopupCheckUser +.public MonsterCannotAttack .public MonsterCanThrowItems .public MoveMonsterToPos .public ov10_022C4F3C @@ -31,7 +32,6 @@ .public ov29_022F4350 .public ov29_022F4370 .public ov29_022F44F0 -.public ov29_022F45CC .public ov29_022F48D8 .public ov29_022F49E0 .public ov29_022F4BDC diff --git a/asm/include/overlay_29_022FEDBC.inc b/asm/include/overlay_29_022FEDBC.inc index 8a5cd7fb..32c482ff 100644 --- a/asm/include/overlay_29_022FEDBC.inc +++ b/asm/include/overlay_29_022FEDBC.inc @@ -1,12 +1,12 @@ #pragma once .public ActivateFlashFire .public CanMonsterUseMove -.public MonsterCannotAttack .public DUNGEON_PTR .public DungeonRandInt .public EntityIsValid__022FED98 .public IsMonsterSleeping .public LogMessageByIdWithPopupCheckUser +.public MonsterCannotAttack .public ov29_022E56A0 .public ov29_022FAA04 .public ov29_02322374 diff --git a/asm/include/overlay_29_022FFF4C.inc b/asm/include/overlay_29_022FFF4C.inc index d77480ad..05a105b1 100644 --- a/asm/include/overlay_29_022FFF4C.inc +++ b/asm/include/overlay_29_022FFF4C.inc @@ -1,13 +1,13 @@ #pragma once .public AbilityIsActive .public CalcSpeedStage -.public EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST .public EntityIsValid__023000E4 +.public EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST .public ExclusiveItemEffectIsActive__022FFF28 .public GetApparentWeather .public GetExclusiveItemWithEffectFromBag .public LogMessageByIdWithPopupCheckUser +.public ov29_022E655C +.public PrepareItemForPrinting__02345728 .public SubstitutePlaceholderStringTags .public UpdateStateFlags -.public ov29_022E655C -.public ov29_02344B44 diff --git a/asm/include/overlay_29_02300FCC.inc b/asm/include/overlay_29_02300FCC.inc index 41d36e31..416df489 100644 --- a/asm/include/overlay_29_02300FCC.inc +++ b/asm/include/overlay_29_02300FCC.inc @@ -1,4 +1,6 @@ #pragma once +.public DIRECTIONAL_BIT_MASKS__02352788 +.public DIRECTIONAL_BIT_MASKS__02352790 .public DIRECTIONS_XY .public GetDirectionalMobilityType .public GetMobilityTypeCheckSlipAndFloating @@ -6,5 +8,3 @@ .public IqSkillIsEnabled .public IsCurrentTilesetBackground .public ItemIsActive__022FF898 -.public DIRECTIONAL_BIT_MASKS__02352788 -.public DIRECTIONAL_BIT_MASKS__02352790 diff --git a/asm/include/overlay_29_023016D8.inc b/asm/include/overlay_29_023016D8.inc index f8427fbc..53423515 100644 --- a/asm/include/overlay_29_023016D8.inc +++ b/asm/include/overlay_29_023016D8.inc @@ -1,4 +1,4 @@ #pragma once .public AbilityIsActive -.public UpdateStateFlags .public PlayEffectAnimation0x29 +.public UpdateStateFlags diff --git a/asm/include/overlay_29_02301A84.inc b/asm/include/overlay_29_02301A84.inc index 05bb8588..347fbeaa 100644 --- a/asm/include/overlay_29_02301A84.inc +++ b/asm/include/overlay_29_02301A84.inc @@ -8,5 +8,5 @@ .public MistIsActive .public ov29_02314DC4 .public ov29_02324BE8 -.public ov29_02344B44 +.public PrepareItemForPrinting__02345728 .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_02301D84.inc b/asm/include/overlay_29_02301D84.inc index 625aaec3..95d79e9a 100644 --- a/asm/include/overlay_29_02301D84.inc +++ b/asm/include/overlay_29_02301D84.inc @@ -1,7 +1,7 @@ #pragma once .public AbilityIsActive -.public DUNGEON_PTR .public DefenderAbilityIsActive__02301A0C +.public DUNGEON_PTR .public EntityIsValid__023000E4 .public GravityIsActive .public ov29_022FAFD4 diff --git a/asm/include/overlay_29_02302388.inc b/asm/include/overlay_29_02302388.inc index 821c92cc..37f11755 100644 --- a/asm/include/overlay_29_02302388.inc +++ b/asm/include/overlay_29_02302388.inc @@ -16,6 +16,6 @@ .public MIRACLE_CHEST_EXP_BOOST .public MultiplyByFixedPoint .public ov29_02301A84 -.public ov29_02344B44 +.public PrepareItemForPrinting__02345728 .public SubstitutePlaceholderStringTags .public WONDER_CHEST_EXP_BOOST diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc index 3f85d335..00183db2 100644 --- a/asm/include/overlay_29_02302A5C.inc +++ b/asm/include/overlay_29_02302A5C.inc @@ -55,7 +55,6 @@ .public ov29_02338988 .public ov29_0234B034 .public ov29_0234B06C -.public ov29_0234B084 .public ov29_0234B09C .public ov29_0234B4E0 .public ov29_0234CFA0 @@ -76,6 +75,7 @@ .public Rand16Bit .public SetAndPlayAnimationForAnimationControl .public SetMonsterTypeAndAbility +.public SetPreprocessorArgsIdVal .public SetSpriteIdForAnimationControl .public SpawnMonster .public strcat diff --git a/asm/include/overlay_29_023085DC.inc b/asm/include/overlay_29_023085DC.inc index a247cd3b..f4aca94d 100644 --- a/asm/include/overlay_29_023085DC.inc +++ b/asm/include/overlay_29_023085DC.inc @@ -5,6 +5,7 @@ .public ATK_STAT_IDX .public BoostOffensiveStat .public CategoryIsNotPhysical +.public CUTE_CHARM_INFATUATE_CHANCE .public DefenderAbilityIsActive__0230A940 .public DUNGEON_PTR .public DungeonRandInt @@ -22,7 +23,6 @@ .public ov10_022C4460 .public ov10_022C4464 .public ov10_022C44C0 -.public ov10_022C4524 .public ov10_022C4550 .public ov10_022C4564 .public ov10_022C45AC diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index 16078930..93e66cdf 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -74,7 +74,6 @@ .public ov29_02303E0C .public ov29_02304830 .public ov29_02304A48 -.public TryEndPetrifiedOrSleepStatus .public ov29_02307C48 .public ov29_02307DC0 .public ov29_0230D628 @@ -110,6 +109,7 @@ .public sub_0204AF00 .public SubInitMonster .public SubstitutePlaceholderStringTags +.public TryEndPetrifiedOrSleepStatus .public TryIncreaseHp .public TryRecruit .public TrySpawnEnemyItemDrop diff --git a/asm/include/overlay_29_0230AA0C.inc b/asm/include/overlay_29_0230AA0C.inc index a1d7f87b..fffefb46 100644 --- a/asm/include/overlay_29_0230AA0C.inc +++ b/asm/include/overlay_29_0230AA0C.inc @@ -133,7 +133,6 @@ .public ov29_0230E658 .public ov29_02337EC0 .public ov29_0234B034 -.public ov29_0234B084 .public ov29_0234B0B4 .public ov29_0234B1A4 .public ov29_0234BA54 @@ -168,6 +167,7 @@ .public SCOPE_LENS_CRIT_RATE_BOOST .public SetItemAcquired .public SetPokemonJoined +.public SetPreprocessorArgsIdVal .public SOLID_ROCK_MULTIPLIER .public SPECIAL_BAND_STAT_BOOST .public StrcpySimple diff --git a/asm/include/overlay_29_0230F02C.inc b/asm/include/overlay_29_0230F02C.inc index d0d2a931..e56d584a 100644 --- a/asm/include/overlay_29_0230F02C.inc +++ b/asm/include/overlay_29_0230F02C.inc @@ -25,13 +25,13 @@ .public ov29_022EACCC .public ov29_022F52BC .public ov29_022F9EA0 -.public ov29_02344B44 .public ov29_02345004 .public ov29_02347040 .public ov29_02348D00 .public ov29_02348D3C .public ov29_02348DD8 .public ov29_02348ECC +.public PrepareItemForPrinting__02345728 .public RemoveGroundItem .public ShouldMonsterRunAwayAndShowEffect .public sub_0200D8AC diff --git a/asm/include/overlay_29_0230F9A4.inc b/asm/include/overlay_29_0230F9A4.inc index 8ba62f5b..91e66fc4 100644 --- a/asm/include/overlay_29_0230F9A4.inc +++ b/asm/include/overlay_29_0230F9A4.inc @@ -7,7 +7,6 @@ .public BoostSpeedOneStage .public BURN_DAMAGE .public BURN_DAMAGE_COOLDOWN -.public MonsterCannotAttack .public CeilFixedPoint .public CheckVariousStatuses .public CheckVariousStatuses2 @@ -34,10 +33,12 @@ .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 @@ -66,19 +67,17 @@ .public ov29_022F2FE4 .public ov29_022F42F8 .public ov29_022FB718 -.public TryEndPetrifiedOrSleepStatus .public ov29_02322374 -.public IsTileGround .public ov29_02344B9C .public ov29_023460DC .public ov29_02347184 .public ov29_0234908C -.public ov29_0234B084 .public ov29_0234B294 .public ov29_023529A8 .public PlayEffectAnimationEntityStandard .public POISON_DAMAGE .public POISON_DAMAGE_COOLDOWN +.public SetPreprocessorArgsIdVal .public SpawnDroppedItemWrapper .public SPEED_BOOST_TURNS .public sub_02050FF8 @@ -87,6 +86,7 @@ .public TickStatusTurnCounter .public TreasureBoxDropsEnabled .public TryActivateBadDreams +.public TryEndPetrifiedOrSleepStatus .public TryGenerateUnownStoneDrop .public TryIncreaseHp .public TryWarp diff --git a/asm/include/overlay_29_02311088.inc b/asm/include/overlay_29_02311088.inc index 08ab09a1..f2ea5572 100644 --- a/asm/include/overlay_29_02311088.inc +++ b/asm/include/overlay_29_02311088.inc @@ -26,12 +26,12 @@ .public IsFloorOver .public ItemIsActive__02311034 .public LogMessageByIdWithPopupCheckUser +.public ov10_022C4674 +.public ov10_022C46F8 +.public ov29_0234B294 +.public ov29_02353318 .public RAIN_ABILITY_BONUS_REGEN .public SubstitutePlaceholderStringTags .public TickStatusTurnCounter .public UpdateStatusIconFlags .public WISH_BONUS_REGEN -.public ov10_022C4674 -.public ov10_022C46F8 -.public ov29_0234B294 -.public ov29_02353318 diff --git a/asm/include/overlay_29_02311C28.inc b/asm/include/overlay_29_02311C28.inc index 2f067a1a..d5161fab 100644 --- a/asm/include/overlay_29_02311C28.inc +++ b/asm/include/overlay_29_02311C28.inc @@ -5,12 +5,12 @@ .public CalcStatusDuration .public ChangeShayminForme .public CopyStringFromId +.public DefenderAbilityIsActive__02311B94 .public DIRECTIONS_XY .public DUNGEON_PTR -.public DefenderAbilityIsActive__02311B94 .public EntityIsValid__023118B4 -.public ExclusiveItemEffectIsActiveWithLogging .public ExclusiveItemEffectIsActive__023147EC +.public ExclusiveItemEffectIsActiveWithLogging .public GetExclusiveItemWithEffectFromBag .public GetTile .public GetTileAtEntity @@ -21,13 +21,6 @@ .public LogMessageByIdWithPopupCheckUserTarget .public MonsterIsType .public MultiplyByFixedPoint -.public PlayExclamationPointEffect__022E5D4C -.public SECONDARY_TERRAIN_TYPES -.public SafeguardIsActive -.public SubstitutePlaceholderStringTags -.public TryActivateQuickFeet -.public TryActivateSteadfast -.public UpdateStatusIconFlags .public ov10_022C4728 .public ov10_022C479C .public ov10_022C47A0 @@ -73,7 +66,14 @@ .public ov29_023018AC .public ov29_02304A48 .public ov29_02304A84 -.public ov29_02344B44 .public ov29_0234B034 -.public ov29_0234B084 .public ov29_0234B0B4 +.public PlayExclamationPointEffect__022E5D4C +.public PrepareItemForPrinting__02345728 +.public SafeguardIsActive +.public SECONDARY_TERRAIN_TYPES +.public SetPreprocessorArgsIdVal +.public SubstitutePlaceholderStringTags +.public TryActivateQuickFeet +.public TryActivateSteadfast +.public UpdateStatusIconFlags diff --git a/asm/include/overlay_29_02314810.inc b/asm/include/overlay_29_02314810.inc index 85c63d73..02408b90 100644 --- a/asm/include/overlay_29_02314810.inc +++ b/asm/include/overlay_29_02314810.inc @@ -12,10 +12,6 @@ .public IsProtectedFromNegativeStatus .public ItemIsActive__0231513C .public LogMessageByIdWithPopupCheckUserTarget -.public SPEED_BOOST_TURN_RANGE -.public SafeguardIsActive -.public SubstitutePlaceholderStringTags -.public UpdateStatusIconFlags .public ov10_022C4618 .public ov10_022C488C .public ov10_022C4890 @@ -24,6 +20,10 @@ .public ov29_022E451C .public ov29_022E543C .public ov29_022E60E4 -.public ov29_02344B44 -.public ov29_0234B084 .public ov29_02353318 +.public PrepareItemForPrinting__02345728 +.public SafeguardIsActive +.public SetPreprocessorArgsIdVal +.public SPEED_BOOST_TURN_RANGE +.public SubstitutePlaceholderStringTags +.public UpdateStatusIconFlags diff --git a/asm/include/overlay_29_02317844.inc b/asm/include/overlay_29_02317844.inc index 985b1b60..7804d4c6 100644 --- a/asm/include/overlay_29_02317844.inc +++ b/asm/include/overlay_29_02317844.inc @@ -5,6 +5,7 @@ .public DungeonRandInt .public EndInvisibleClassStatus .public EntityIsValid__02315118 +.public GASTRO_ACID_TURN_RANGE .public GetMaxPp .public GetMaxPpWrapper .public GetMobilityType @@ -17,7 +18,6 @@ .public ov10_022C4628 .public ov10_022C4764 .public ov10_022C4768 -.public ov10_022C476C .public ov10_022C4774 .public ov10_022C4778 .public ov10_022C477C diff --git a/asm/include/overlay_29_02318E70.inc b/asm/include/overlay_29_02318E70.inc index 5d820d81..c2379108 100644 --- a/asm/include/overlay_29_02318E70.inc +++ b/asm/include/overlay_29_02318E70.inc @@ -3,9 +3,6 @@ .public CalcStatusDuration .public EntityIsValid__02318E4C .public LogMessageByIdWithPopupCheckUserTarget -.public SubstitutePlaceholderStringTags -.public UpdateStatusIconFlags -.public ov10_022C472C .public ov10_022C4730 .public ov10_022C4734 .public ov10_022C4738 @@ -30,3 +27,6 @@ .public ov29_022E415C .public ov29_022E41AC .public ov29_022E543C +.public REFLECT_LIGHT_SCREEN_TURN_RANGE +.public SubstitutePlaceholderStringTags +.public UpdateStatusIconFlags diff --git a/asm/include/overlay_29_02319880.inc b/asm/include/overlay_29_02319880.inc index 1a12536f..95e222fb 100644 --- a/asm/include/overlay_29_02319880.inc +++ b/asm/include/overlay_29_02319880.inc @@ -1,8 +1,9 @@ #pragma once +.public abs .public AI_CAN_ATTACK_IN_DIRECTION -.public AI_POTENTIAL_ATTACK_TARGETS .public AI_POTENTIAL_ATTACK_TARGET_DIRECTIONS .public AI_POTENTIAL_ATTACK_TARGET_WEIGHTS +.public AI_POTENTIAL_ATTACK_TARGETS .public CanAttackInDirection .public CanSeeTarget .public DIRECTIONS_XY @@ -15,12 +16,11 @@ .public GetMoveTypeForMonster .public GetTile .public IqSkillIsEnabled -.public IsUsableWhileTaunted .public IsAiTargetEligible .public IsBlinded .public IsTargetInRange +.public IsUsableWhileTaunted .public ResetAiCanAttackInDirection .public StatusCheckerCheck .public TryAddTargetToAiTargetList .public WeightMoveWithIqSkills -.public abs diff --git a/asm/include/overlay_29_0231A364.inc b/asm/include/overlay_29_0231A364.inc index 0000360b..d189f0b8 100644 --- a/asm/include/overlay_29_0231A364.inc +++ b/asm/include/overlay_29_0231A364.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public AbilityIsActiveVeneer .public CanAttackInDirection .public DIRECTIONS_XY @@ -9,6 +10,5 @@ .public HasHeldItem .public IqSkillIsEnabled .public IsBlinded -.public _s32_div_f .public ov29_0230B7D4 .public ov29_0230F8D0 diff --git a/asm/include/overlay_29_0231A7A0.inc b/asm/include/overlay_29_0231A7A0.inc index baaab640..7cc21de9 100644 --- a/asm/include/overlay_29_0231A7A0.inc +++ b/asm/include/overlay_29_0231A7A0.inc @@ -3,6 +3,6 @@ .public ExclusiveItemEffectIsActive__0231A87C .public IqSkillIsEnabled .public LogMessageByIdWithPopupCheckUser +.public ov10_022C459C .public PlayExclamationPointEffect__022E4880 .public SubstitutePlaceholderStringTags -.public ov10_022C459C diff --git a/asm/include/overlay_29_0231A8A0.inc b/asm/include/overlay_29_0231A8A0.inc index d4a1cc4e..3802029f 100644 --- a/asm/include/overlay_29_0231A8A0.inc +++ b/asm/include/overlay_29_0231A8A0.inc @@ -6,8 +6,8 @@ .public IsFloorOver .public IsMonster__0231A9D4 .public LogMessageByIdWithPopupCheckUser +.public ov29_022FA574 +.public ov29_0232145C .public ShouldUsePp .public TryActivateTruant .public UpdateMovePp -.public ov29_022FA574 -.public ov29_0232145C diff --git a/asm/include/overlay_29_0231A9F8.inc b/asm/include/overlay_29_0231A9F8.inc index ecf2ba88..43505d33 100644 --- a/asm/include/overlay_29_0231A9F8.inc +++ b/asm/include/overlay_29_0231A9F8.inc @@ -9,12 +9,12 @@ .public InitMove .public IsFloorOver .public LogMessageByIdWithPopupCheckUser -.public RemoveUsedItem -.public SubstitutePlaceholderStringTags -.public TryActivateTruant -.public UpdateAiTargetPos .public ov29_022EB4E8 .public ov29_022FBAB4 .public ov29_02321274 .public ov29_02322374 -.public ov29_02344B44 +.public PrepareItemForPrinting__02345728 +.public RemoveUsedItem +.public SubstitutePlaceholderStringTags +.public TryActivateTruant +.public UpdateAiTargetPos diff --git a/asm/include/overlay_29_0231AD38.inc b/asm/include/overlay_29_0231AD38.inc index 0318e07c..8e33a5dd 100644 --- a/asm/include/overlay_29_0231AD38.inc +++ b/asm/include/overlay_29_0231AD38.inc @@ -10,11 +10,11 @@ .public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUserTarget .public NATURAL_GIFT_ITEM_TABLE -.public SetActionUseMoveAi -.public SubstitutePlaceholderStringTags -.public WEATHER_BALL_TYPE_TABLE .public ov29_022E4110 .public ov29_022FB9E0 .public ov29_0232145C .public ov29_0232E80C -.public ov29_02344B44 +.public PrepareItemForPrinting__02345728 +.public SetActionUseMoveAi +.public SubstitutePlaceholderStringTags +.public WEATHER_BALL_TYPE_TABLE diff --git a/asm/include/overlay_29_0231B1B8.inc b/asm/include/overlay_29_0231B1B8.inc index 292a79a7..e61f4b36 100644 --- a/asm/include/overlay_29_0231B1B8.inc +++ b/asm/include/overlay_29_0231B1B8.inc @@ -6,5 +6,5 @@ .public IsMonsterSleeping .public ov10_022C4530 .public ov29_022E28D4 +.public SetPreprocessorArgsIdVal .public TryEndPetrifiedOrSleepStatus -.public ov29_0234B084 diff --git a/asm/include/overlay_29_0231B33C.inc b/asm/include/overlay_29_0231B33C.inc index 81bed5e2..583bf624 100644 --- a/asm/include/overlay_29_0231B33C.inc +++ b/asm/include/overlay_29_0231B33C.inc @@ -82,8 +82,8 @@ .public ov29_022FB9BC .public ov29_02304830 .public ov29_0230F9A4 -.public ov29_02344B44 .public ov29_0234BA54 +.public PrepareItemForPrinting__02345728 .public PROTEIN_STAT_BOOST .public RARE_FOSSIL_DAMAGE .public RestoreAllMovePP diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index 1a87d6b3..e867f89d 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -82,8 +82,6 @@ .public ov29_023021F0 .public ov29_023038D4 .public ov29_02339FF4 -.public ov29_02344B44 -.public ov29_0234B084 .public ov29_0234B09C .public ov29_0234BA54 .public ov29_023529AC @@ -94,10 +92,12 @@ .public ov31_02386204 .public ov31_02386308 .public ov31_023877EC +.public PrepareItemForPrinting__02345728 .public RemoveUsedItem .public RestoreAllMovePP .public SetDoughSeedFlag .public SetMonsterActionFields +.public SetPreprocessorArgsIdVal .public ShouldDisplayEntityWrapper .public SPATK_STAT_IDX .public sub_02050FF8 diff --git a/asm/include/overlay_29_0231F594.inc b/asm/include/overlay_29_0231F594.inc index ba7cb5ea..a7558b2b 100644 --- a/asm/include/overlay_29_0231F594.inc +++ b/asm/include/overlay_29_0231F594.inc @@ -24,7 +24,7 @@ .public ov29_023457C8 .public RemoveGroundItem .public SetEntityPixelPosXY -.public SpawnItem .public sin_4096 +.public SpawnItem .public UpdateMinimap .public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_0231FC20.inc b/asm/include/overlay_29_0231FC20.inc index 8d70f0b5..1bfbd01d 100644 --- a/asm/include/overlay_29_0231FC20.inc +++ b/asm/include/overlay_29_0231FC20.inc @@ -18,11 +18,11 @@ .public ov29_022E56A0 .public ov29_022F9C74 .public ov29_022FFB90 -.public TryEndPetrifiedOrSleepStatus .public ov29_0232033C .public ov29_02321238 .public ov29_0232124C .public ShouldDisplayEntityWrapper .public SubstitutePlaceholderStringTags +.public TryEndPetrifiedOrSleepStatus .public TwoTurnMoveForcedMiss .public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_02320788.inc b/asm/include/overlay_29_02320788.inc index 57ee5b0f..e6f34d5a 100644 --- a/asm/include/overlay_29_02320788.inc +++ b/asm/include/overlay_29_02320788.inc @@ -35,7 +35,6 @@ .public ov29_022FF958 .public ov29_02304A48 .public ov29_02305814 -.public TryEndPetrifiedOrSleepStatus .public ov29_02322374 .public ov29_023247B4 .public ov29_02336694 @@ -46,6 +45,7 @@ .public ShouldDisplayEntityWrapper .public sub_01FFB62C .public SubstitutePlaceholderStringTags +.public TryEndPetrifiedOrSleepStatus .public TryInflictPetrifiedStatus .public TwoTurnMoveForcedMiss .public UpdateCamera diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index 54f39558..dba14558 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -9,7 +9,6 @@ .public BuildMoveTargetList .public CalcStatusDuration .public CanMonsterUseMove -.public MonsterCannotAttack .public DungeonRandInt .public EndFrozenClassStatus .public EndLeechSeedClassStatus @@ -39,6 +38,7 @@ .public LowerSpeed .public METRONOME_NEXT_INDEX .public METRONOME_TABLE +.public MonsterCannotAttack .public NATURE_POWER_TABLE .public NIGHTMARE_TURN_RANGE .public ov10_022BFD6C @@ -62,9 +62,9 @@ .public ov29_023383A8 .public ov29_02344B9C .public ov29_0234B034 -.public ov29_0234B084 .public ov29_0235370C .public ov29_0237CA68 +.public SetPreprocessorArgsIdVal .public SLEEP_TURN_RANGE .public StringFromId .public sub_0201D1B0 diff --git a/asm/include/overlay_29_02322DDC.inc b/asm/include/overlay_29_02322DDC.inc index 97f69d31..a8c3b9f2 100644 --- a/asm/include/overlay_29_02322DDC.inc +++ b/asm/include/overlay_29_02322DDC.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public AdvanceFrame .public AnimationDelayOrSomething .public DIRECTIONS_XY @@ -18,10 +19,6 @@ .public IsChargingTwoTurnMove .public LogMessageQuiet .public LogMessageWithPopup -.public PlayMoveAnimation -.public ShouldDisplayEntityWrapper -.public TwoTurnMoveForcedMiss -.public _s32_div_f .public ov10_022BDE50 .public ov10_022BE9E8 .public ov10_022BEB2C @@ -38,11 +35,14 @@ .public ov29_02324E78 .public ov29_023250D4 .public ov29_0234B034 -.public ov29_0234B084 .public ov29_0234B4CC .public ov29_0235175C .public ov29_02352A54 .public ov29_02352A6C +.public PlayMoveAnimation +.public SetPreprocessorArgsIdVal +.public ShouldDisplayEntityWrapper .public sin_4096 .public sub_02001980 .public sub_0201CF90 +.public TwoTurnMoveForcedMiss diff --git a/asm/include/overlay_29_0232393C.inc b/asm/include/overlay_29_0232393C.inc index 4e330920..7dab1c15 100644 --- a/asm/include/overlay_29_0232393C.inc +++ b/asm/include/overlay_29_0232393C.inc @@ -1,15 +1,16 @@ #pragma once +.public _s32_div_f .public AbilityIsActiveVeneer .public AdvanceFrame .public AnimationDelayOrSomething +.public DefenderAbilityIsActive__02322D64 .public DETECT_BAND_MOVE_ACCURACY_DROP .public DIRECTIONS_XY .public DUNGEON_PTR -.public DefenderAbilityIsActive__02322D64 .public DungeonRandInt .public DungeonRandRange -.public EXCL_ITEM_EFFECTS_EVASION_BOOST .public EntityIsValid__02321438 +.public EXCL_ITEM_EFFECTS_EVASION_BOOST .public ExclusiveItemEffectIsActive__02323918 .public GetApparentWeather .public GetEntityMoveTargetAndRange @@ -24,11 +25,6 @@ .public MALE_ACCURACY_STAGE_MULTIPLIERS .public MALE_EVASION_STAGE_MULTIPLIERS .public MoveIsNotPhysical -.public PlayMoveAnimation -.public PositionHasMonster -.public QUICK_DODGER_MOVE_ACCURACY_DROP -.public TwoTurnMoveForcedMiss -.public _s32_div_f .public ov10_022BDE50 .public ov10_022BEB2C .public ov29_022E28D4 @@ -42,4 +38,8 @@ .public ov29_0234B4CC .public ov29_02352A8C .public ov29_0235370C +.public PlayMoveAnimation +.public PositionHasMonster +.public QUICK_DODGER_MOVE_ACCURACY_DROP .public sin_4096 +.public TwoTurnMoveForcedMiss diff --git a/asm/include/overlay_29_02324698.inc b/asm/include/overlay_29_02324698.inc index 05cb54a8..fc333ce5 100644 --- a/asm/include/overlay_29_02324698.inc +++ b/asm/include/overlay_29_02324698.inc @@ -18,9 +18,9 @@ .public GetNaturePowerVariant .public GetSpriteIndex__02052708 .public Is2TurnsMove -.public IsUsableWhileTaunted .public IsCopyingMove .public IsFloorOver +.public IsUsableWhileTaunted .public LogMessageByIdWithPopupCheckUser .public NATURE_POWER_TABLE .public ov10_022BF01C diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index 5de2c26c..1d0990d1 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -50,6 +50,7 @@ .public IRON_TAIL_LOWER_DEFENSE_CHANCE .public IsChargingTwoTurnMove .public IsMonsterSleeping +.public IsTileGround .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerHitChanceStat @@ -74,7 +75,6 @@ .public ov29_02318D58 .public ov29_02318D98 .public ov29_02332F18 -.public IsTileGround .public ov29_0234B034 .public ov29_0234BA54 .public ov29_02352AD8 diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index c9534aa3..10a0110b 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -41,6 +41,7 @@ .public InitMove .public IsChargingTwoTurnMove .public IsSameMove +.public IsTileGround .public LevitateIsActive .public LICK_PARALYZE_CHANCE .public LogMessageByIdWithPopupCheckUserTarget @@ -65,9 +66,7 @@ .public ov29_02318BBC .public ov29_02318D58 .public ov29_0232A834 -.public IsTileGround .public ov29_0234B034 -.public ov29_0234B084 .public ov29_0234C738 .public ov29_02352B18 .public POISON_FANG_POISON_CHANCE @@ -75,6 +74,7 @@ .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole .public SACRED_FIRE_BURN_CHANCE +.public SetPreprocessorArgsIdVal .public SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE .public ShouldDisplayEntityAdvanced .public SMOG_POISON_CHANCE diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc index 6610490c..eec4f99e 100644 --- a/asm/include/overlay_29_0232A3FC.inc +++ b/asm/include/overlay_29_0232A3FC.inc @@ -78,7 +78,6 @@ .public ov29_02321260 .public ov29_02324D60 .public ov29_02332F18 -.public ov29_0234B084 .public ov29_02352B1C .public ov29_0237CA84 .public POISON_TAIL_POISON_CHANCE @@ -87,6 +86,7 @@ .public RevealTrapsNearby .public SECRET_POWER_EFFECT_CHANCE .public SetEntityPixelPosXY +.public SetPreprocessorArgsIdVal .public SKULL_BASH_DAMAGE_MULTIPLIER .public SLEEP_TURN_RANGE .public SPATK_STAT_IDX diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index 972a2e62..77dbf2df 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/asm/include/overlay_29_0232C524.inc @@ -90,7 +90,6 @@ .public ov29_0231F6E4 .public ov29_02332F18 .public ov29_02336694 -.public ov29_0234B084 .public ov29_0234B0B4 .public ov29_0234BA54 .public ov29_02352B38 @@ -101,6 +100,7 @@ .public RevealStairs .public RevealWholeFloor .public ROOST_HP_RESTORATION_TABLE +.public SetPreprocessorArgsIdVal .public SHADOW_FORCE_DAMAGE_MULTIPLIER .public SLEEP_TURN_RANGE .public SPATK_STAT_IDX diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index a75c7198..08767602 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -1,16 +1,15 @@ #pragma once -.public ATK_STAT_IDX .public AbilityIsActiveVeneer .public AnimationDelayOrSomething .public ApplyDamageAndEffectsWrapper .public AreEntitiesAdjacent +.public ATK_STAT_IDX .public CalcDamage .public CanBeSnatched .public CanHitWithRegularAttack .public CeilFixedPoint -.public DIRECTIONS_XY -.public DUNGEON_PTR .public DefenderAbilityIsActive__02332A0C +.public DIRECTIONS_XY .public DisplayAnimatedNumbers .public DoMoveAbsorb .public DoMoveAcupressure @@ -53,6 +52,9 @@ .public DoMoveCrunch .public DoMoveCrushClaw .public DoMoveCurse +.public DoMoveDamage__02325DC0 +.public DoMoveDamage__0232A500 +.public DoMoveDamage__0232B8B0 .public DoMoveDamageBoostAllStats .public DoMoveDamageBurn10 .public DoMoveDamageBurn10FlameWheel @@ -80,9 +82,6 @@ .public DoMoveDamageStealItem .public DoMoveDamageWeightDependent .public DoMoveDamageWithRecoil -.public DoMoveDamage__02325DC0 -.public DoMoveDamage__0232A500 -.public DoMoveDamage__0232B8B0 .public DoMoveDecoy .public DoMoveDefendOrder .public DoMoveDefenseCurl @@ -134,16 +133,16 @@ .public DoMoveHail .public DoMoveHammerArm .public DoMoveHaze -.public DoMoveHeadSmash .public DoMoveHeadbutt +.public DoMoveHeadSmash .public DoMoveHealBlock +.public DoMoveHealingWish .public DoMoveHealOrder .public DoMoveHealStatus -.public DoMoveHealingWish .public DoMoveHeartSwap .public DoMoveHelpingHand -.public DoMoveHiJumpKick .public DoMoveHiddenPower +.public DoMoveHiJumpKick .public DoMoveHornDrill .public DoMoveHpGauge .public DoMoveHurl @@ -186,8 +185,8 @@ .public DoMoveNastyPlot .public DoMoveNaturalGift .public DoMoveNaturePower -.public DoMoveNightShade .public DoMoveNightmare +.public DoMoveNightShade .public DoMoveNoMove .public DoMoveOctazooka .public DoMoveOhko @@ -212,9 +211,9 @@ .public DoMovePowerTrick .public DoMovePresent .public DoMoveProtect -.public DoMovePsychUp .public DoMovePsychoBoost .public DoMovePsychoShift +.public DoMovePsychUp .public DoMovePsywave .public DoMoveRage .public DoMoveRainDance @@ -264,8 +263,8 @@ .public DoMoveSolarBeam .public DoMoveSonicBoom .public DoMoveSpikes -.public DoMoveSpitUp .public DoMoveSpite +.public DoMoveSpitUp .public DoMoveSplash .public DoMoveSport .public DoMoveStayAway @@ -292,10 +291,10 @@ .public DoMoveTailGlow .public DoMoveTakeaway .public DoMoveTaunt -.public DoMoveThunderFang -.public DoMoveThunderWave .public DoMoveThunderbolt +.public DoMoveThunderFang .public DoMoveThundershock +.public DoMoveThunderWave .public DoMoveTickle .public DoMoveTorment .public DoMoveToxic @@ -317,8 +316,8 @@ .public DoMoveVitalThrow .public DoMoveWakeUpSlap .public DoMoveWarp -.public DoMoveWaterSpout .public DoMoveWaterfall +.public DoMoveWaterSpout .public DoMoveWeatherBall .public DoMoveWhirlpool .public DoMoveWildCall @@ -328,9 +327,10 @@ .public DoMoveWrap .public DoMoveYawn .public DoMoveZapCannon +.public DUNGEON_PTR .public DungeonRandInt -.public DungeonRandOutcomeUserAction .public DungeonRandOutcome__022EAB20 +.public DungeonRandOutcomeUserAction .public EntityIsValid__0232E840 .public ExclusiveItemEffectIsActive__023329E8 .public FOREWARN_FORCED_MISS_CHANCE @@ -362,21 +362,6 @@ .public MirrorMoveIsActive .public MonsterCannotAttack .public MoveHitCheck -.public PerformDamageSequence -.public PlayMoveAnimation -.public ROLLOUT_ICE_BALL_MISSED -.public SPATK_STAT_IDX -.public ShouldDisplayEntityWrapper -.public SubFixedPoint -.public SubstitutePlaceholderStringTags -.public TryActivateConversion2 -.public TryActivateFrisk -.public TryActivateNondamagingDefenderAbility -.public TryActivateNondamagingDefenderExclusiveItem -.public TryActivateTraceAndColorChange -.public TryWarp -.public TwoTurnMoveForcedMiss -.public UpdateShopkeeperModeAfterAttack .public ov10_022BFD6C .public ov10_022C4480 .public ov10_022C4504 @@ -400,7 +385,6 @@ .public ov29_02301C2C .public ov29_02304A48 .public ov29_02304C3C -.public TryEndPetrifiedOrSleepStatus .public ov29_02314DC4 .public ov29_0231AD38 .public ov29_023201D0 @@ -410,10 +394,26 @@ .public ov29_0232E744 .public ov29_02333044 .public ov29_023381C0 -.public ov29_02344B44 .public ov29_0234B034 .public ov29_02353718 .public ov29_0237CA68 .public ov29_0237CA74 .public ov29_0237CA80 +.public PerformDamageSequence +.public PlayMoveAnimation +.public PrepareItemForPrinting__02345728 +.public ROLLOUT_ICE_BALL_MISSED +.public ShouldDisplayEntityWrapper +.public SPATK_STAT_IDX .public sub_02050FF8 +.public SubFixedPoint +.public SubstitutePlaceholderStringTags +.public TryActivateConversion2 +.public TryActivateFrisk +.public TryActivateNondamagingDefenderAbility +.public TryActivateNondamagingDefenderExclusiveItem +.public TryActivateTraceAndColorChange +.public TryEndPetrifiedOrSleepStatus +.public TryWarp +.public TwoTurnMoveForcedMiss +.public UpdateShopkeeperModeAfterAttack diff --git a/asm/include/overlay_29_02332A0C.inc b/asm/include/overlay_29_02332A0C.inc index 5b1d161c..3096a7bd 100644 --- a/asm/include/overlay_29_02332A0C.inc +++ b/asm/include/overlay_29_02332A0C.inc @@ -1,5 +1,6 @@ #pragma once .public AbilityIsActiveVeneer +.public abs .public ApplyDamageAndEffects .public CalcDamage .public CanAttackInDirection @@ -7,8 +8,8 @@ .public CanSeeTarget .public CeilFixedPoint .public Conversion2IsActive -.public DUNGEON_PTR .public DisplayAnimatedNumbers +.public DUNGEON_PTR .public EntityIsValid__0232E840 .public EntityIsValid__02333FAC .public GetApparentWeather @@ -28,8 +29,6 @@ .public MonsterHasNegativeStatus .public MonsterIsType .public MoveHitCheck -.public ShouldDisplayEntityWrapper -.public abs .public ov10_022C6322 .public ov29_022E576C .public ov29_0230040C @@ -37,3 +36,4 @@ .public ov29_02304A48 .public ov29_0230D088 .public ov29_0234B034 +.public ShouldDisplayEntityWrapper diff --git a/asm/include/overlay_29_02334D58.inc b/asm/include/overlay_29_02334D58.inc index baa90b34..3325f7b8 100644 --- a/asm/include/overlay_29_02334D58.inc +++ b/asm/include/overlay_29_02334D58.inc @@ -1,4 +1,5 @@ #pragma once +.public abs .public AdvanceFrame .public AnimationDelayOrSomething .public DUNGEON_PTR @@ -9,11 +10,10 @@ .public GetWeatherColorTable .public IsSecretFloor .public LogMessageByIdWithPopupCheckUser -.public TryActivateArtificialWeatherAbilities -.public TryActivateWeather -.public TryWeatherFormChange -.public abs .public ov29_022DE608 .public ov29_022E5FE8 .public ov29_02338A4C .public ov29_02353562 +.public TryActivateArtificialWeatherAbilities +.public TryActivateWeather +.public TryWeatherFormChange diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index 11d05144..86d9bb0e 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/asm/include/overlay_29_02337CCC.inc @@ -1,10 +1,10 @@ #pragma once -.public DUNGEON_PTR .public DetermineMonsterShadow .public DetermineTileWalkableNeighbors .public DrawMinimapTile +.public DUNGEON_PTR .public EntityIsValid__02337CA8 .public GetTileSafe -.public UpdateTrapsVisibility .public ov29_022E66C4 .public ov29_02336694 +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_02337EC0.inc b/asm/include/overlay_29_02337EC0.inc index 1213949a..50402b98 100644 --- a/asm/include/overlay_29_02337EC0.inc +++ b/asm/include/overlay_29_02337EC0.inc @@ -10,5 +10,5 @@ .public MemAlloc .public MemFree .public MemZero -.public RandInt .public ov29_022FAFD4 +.public RandInt diff --git a/asm/include/overlay_29_0233861C.inc b/asm/include/overlay_29_0233861C.inc index 9aa3a345..e7a886ce 100644 --- a/asm/include/overlay_29_0233861C.inc +++ b/asm/include/overlay_29_0233861C.inc @@ -80,8 +80,8 @@ .public ResetInnerBoundaryTileRows .public SECONDARY_TERRAIN_TYPES .public ShouldMinimapDisplayEntity -.public StairsAlwaysReachable .public sin_4096 +.public StairsAlwaysReachable .public sub_0200A174 .public sub_0200B330 .public sub_0200B3FC diff --git a/asm/include/overlay_29_02340CE4.inc b/asm/include/overlay_29_02340CE4.inc index 6f39b317..01ed23ec 100644 --- a/asm/include/overlay_29_02340CE4.inc +++ b/asm/include/overlay_29_02340CE4.inc @@ -1,4 +1,6 @@ #pragma once +.public _s32_div_f +.public abs .public DUNGEON_PTR .public DungeonRandInt .public DungeonRandRange @@ -12,5 +14,3 @@ .public MONSTER_HOUSE_MAX_MONSTER_SPAWNS .public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS .public SpawnStairs -.public _s32_div_f -.public abs diff --git a/asm/include/overlay_29_02341E6C.inc b/asm/include/overlay_29_02341E6C.inc index 5c860b50..2178320a 100644 --- a/asm/include/overlay_29_02341E6C.inc +++ b/asm/include/overlay_29_02341E6C.inc @@ -1,6 +1,7 @@ #pragma once -.public DUNGEON_PTR +.public _s32_div_f .public DetermineAllTilesWalkableNeighbors +.public DUNGEON_PTR .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandRange @@ -22,11 +23,11 @@ .public GetPerformanceFlagWithChecks .public GetSpecialTargetItem .public GetTileSafe +.public HandleSir0Translation .public HIDDEN_STAIRS_SPAWN_BLOCKED .public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER -.public HandleSir0Translation -.public InitOtherMonsterData .public InitializeTile +.public InitOtherMonsterData .public IsCurrentMissionType .public IsDestinationFloor .public IsFullFloorFixedRoom @@ -40,21 +41,6 @@ .public MemFree .public MemZero .public MultiplyByFixedPoint -.public PointsToZero -.public SHOP_ITEM_CHANCES -.public SetMonsterLevelAndId -.public SetShouldBoostHiddenStairsSpawnChance -.public SetShouldBoostKecleonShopSpawnChance -.public ShouldBoostHiddenStairsSpawnChance -.public ShouldBoostKecleonShopSpawnChance -.public SpawnEnemyTrapAtPos -.public SpawnMonster -.public TREASURE_BOX_1_ITEM_IDS -.public UnloadFile -.public UpdateMinimap -.public UpdateTrapsVisibility -.public ZInit8 -.public _s32_div_f .public ov10_022C4B34 .public ov10_022C6C75 .public ov10_022C6C77 @@ -73,3 +59,17 @@ .public ov29_02353110 .public ov29_023534F0 .public ov29_0237CFC0 +.public PointsToZero +.public SetMonsterLevelAndId +.public SetShouldBoostHiddenStairsSpawnChance +.public SetShouldBoostKecleonShopSpawnChance +.public SHOP_ITEM_CHANCES +.public ShouldBoostHiddenStairsSpawnChance +.public ShouldBoostKecleonShopSpawnChance +.public SpawnEnemyTrapAtPos +.public SpawnMonster +.public TREASURE_BOX_1_ITEM_IDS +.public UnloadFile +.public UpdateMinimap +.public UpdateTrapsVisibility +.public ZInit8 diff --git a/asm/include/overlay_29_02344178.inc b/asm/include/overlay_29_02344178.inc index f6fed190..024d8aa9 100644 --- a/asm/include/overlay_29_02344178.inc +++ b/asm/include/overlay_29_02344178.inc @@ -19,9 +19,6 @@ .public IsSecretRoom .public LoadScriptVariableValue .public MemZero -.public SpawnItem -.public StartFadeDungeonWrapper -.public SubstitutePlaceholderStringTags .public ov10_022C6C74 .public ov29_022E7BB8 .public ov29_022EFB20 @@ -44,4 +41,7 @@ .public ov29_0234C738 .public ov29_02353798 .public ov29_0237CFFC +.public SpawnItem +.public StartFadeDungeonWrapper .public sub_02056880 +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_02344B1C.inc b/asm/include/overlay_29_02344B1C.inc index d6fa441f..6c269712 100644 --- a/asm/include/overlay_29_02344B1C.inc +++ b/asm/include/overlay_29_02344B1C.inc @@ -35,7 +35,6 @@ .public ov29_02348D3C .public ov29_02348DD8 .public ov29_02348ECC -.public ov29_0234B084 .public ov29_023531A0 .public ov29_023531A4 .public ov29_023531BC @@ -44,8 +43,9 @@ .public RemoveEmptyItemsInBag .public RemoveEquivItemNoHole .public RemoveGroundItem +.public SetPreprocessorArgsIdVal .public ShouldMonsterRunAwayAndShowEffect .public SpawnItemEntity .public sub_0200D8AC -.public sub_02024FE8 +.public SubstitutePlaceholderItemTags .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index 3bc5248d..f2164c48 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -35,7 +35,6 @@ .public ov29_02338430 .public ov29_02344BF8 .public ov29_02347378 -.public ov29_0234B084 .public ov29_023531BC .public ov29_023537B4 .public ov29_023537BC @@ -43,11 +42,12 @@ .public RetrieveFromItemList1 .public SECONDARY_TERRAIN_TYPES .public SetEntityPixelPosXY +.public SetPreprocessorArgsIdVal .public ShouldDisplayEntityWrapper -.public SpawnItem .public sin_4096 +.public SpawnItem .public sub_0200D1FC .public sub_0201B9F8 -.public sub_02024FE8 .public sub_0204F7A8 +.public SubstitutePlaceholderItemTags .public UNOWN_STONE_DROP_CHANCE diff --git a/asm/include/overlay_29_02346834.inc b/asm/include/overlay_29_02346834.inc index 0786b461..a5a957c6 100644 --- a/asm/include/overlay_29_02346834.inc +++ b/asm/include/overlay_29_02346834.inc @@ -51,18 +51,17 @@ .public ov29_022FBA54 .public ov29_022FBA70 .public ov29_023009A0 -.public TryEndPetrifiedOrSleepStatus -.public ov29_02344B44 -.public ov29_02344B70 .public ov29_023457C8 .public ov29_0234B4CC .public ov29_023516FC .public ov29_023531C8 +.public PrepareItemForPrinting__02345728 +.public PrepareItemForPrinting__02345754 .public RemoveEmptyItemsInBag .public SetEntityPixelPosXY .public SetItemAcquired -.public SpawnDroppedItem .public sin_4096 +.public SpawnDroppedItem .public sub_0200CF6C .public sub_0200D894 .public sub_0200D8AC @@ -70,6 +69,7 @@ .public sub_02057CE8 .public SubstitutePlaceholderStringTags .public TestItemAiFlag +.public TryEndPetrifiedOrSleepStatus .public TwoTurnMoveForcedMiss .public UpdateEntityPixelPos .public YesNoMenu diff --git a/asm/include/overlay_29_02348020.inc b/asm/include/overlay_29_02348020.inc index 6bb810a7..4ac43daf 100644 --- a/asm/include/overlay_29_02348020.inc +++ b/asm/include/overlay_29_02348020.inc @@ -1,10 +1,11 @@ #pragma once +.public _020A1878 .public AdvanceFrame .public CanSeeTarget .public CheckAcceptedMissionByTypeAndDungeon -.public DUNGEON_PTR .public DisplayMessage .public DisplayMessage2 +.public DUNGEON_PTR .public DungeonRandInt .public EntityIsValid__0234987C .public ExclusiveItemEffectFlagTest @@ -27,12 +28,6 @@ .public MemAlloc .public MemFree .public MemZero -.public StartFadeDungeonWrapper -.public SubstitutePlaceholderStringTags -.public THROWN_ITEM_HIT_CHANCE -.public TrySpawnGoldenChamber -.public YesNoMenu -.public _020A1878 .public ov10_022C48E4 .public ov29_022E09E8 .public ov29_022E0DD8 @@ -41,7 +36,6 @@ .public ov29_022E0E44 .public ov29_022FB9BC .public ov29_023009CC -.public ov29_02344B44 .public ov29_02344B9C .public ov29_02349A70 .public ov29_02349AD4 @@ -56,6 +50,8 @@ .public ov29_0234C738 .public ov29_023537C4 .public ov29_0237C694 +.public PrepareItemForPrinting__02345728 +.public StartFadeDungeonWrapper .public strcpy .public sub_02011220 .public sub_02015328 @@ -67,3 +63,7 @@ .public sub_02024FB8 .public sub_02051DFC .public sub_02051EB8 +.public SubstitutePlaceholderStringTags +.public THROWN_ITEM_HIT_CHANCE +.public TrySpawnGoldenChamber +.public YesNoMenu diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 3bcedf56..1af20d8d 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -7,9 +7,9 @@ .public ChangeDungeonMusic .public CloseAlertBox .public CreateAlertBox -.public DUNGEON_PTR .public DisplayMessage .public DisplayMessage2 +.public DUNGEON_PTR .public DungeonRandInt .public EndNegativeStatusConditionWrapper .public EntityIsValid__0234987C @@ -47,16 +47,6 @@ .public MemFree .public MemZero .public MusicTableIdxToMusicId -.public PositionIsOnStairs -.public PreprocessString -.public RemoveEmptyItemsInBagWrapper -.public RemoveGroundItem -.public SetPortraitLayout -.public ShouldDisplayEntityWrapper -.public ShouldMonsterHeadToStairs -.public StringFromId -.public SubstitutePlaceholderStringTags -.public YesNoMenu .public ov10_022BFD20 .public ov29_022E09E8 .public ov29_022E0B60 @@ -78,7 +68,6 @@ .public ov29_02300B04 .public ov29_0231AF24 .public ov29_0233A248 -.public ov29_02344B44 .public ov29_02344B9C .public ov29_02348888 .public ov29_02348A18 @@ -92,6 +81,15 @@ .public ov29_023537C8 .public ov29_023537CC .public ov29_0237C694 +.public PositionIsOnStairs +.public PrepareItemForPrinting__02345728 +.public PreprocessString +.public RemoveEmptyItemsInBagWrapper +.public RemoveGroundItem +.public SetPortraitLayout +.public ShouldDisplayEntityWrapper +.public ShouldMonsterHeadToStairs +.public StringFromId .public strlen .public strncmp .public strncpy @@ -109,3 +107,5 @@ .public sub_02048240 .public sub_0204833C .public sub_02048360 +.public SubstitutePlaceholderStringTags +.public YesNoMenu diff --git a/asm/include/overlay_29_0234BEE0.inc b/asm/include/overlay_29_0234BEE0.inc index ccadb1da..85331ac3 100644 --- a/asm/include/overlay_29_0234BEE0.inc +++ b/asm/include/overlay_29_0234BEE0.inc @@ -10,8 +10,6 @@ .public MemAlloc .public MemFree .public MemZero -.public OverlayIsLoaded -.public UnloadOverlay .public ov10_022BF764 .public ov10_022BF7D4 .public ov29_022DC670 @@ -42,6 +40,7 @@ .public ov29_023537D8 .public ov29_023537E4 .public ov30_02382A34 +.public OverlayIsLoaded .public sub_0200383C .public sub_020038D8 .public sub_020038E8 @@ -85,3 +84,4 @@ .public sub_02034710 .public sub_02034A80 .public sub_0204F9CC +.public UnloadOverlay diff --git a/asm/include/overlay_29_0234CA84.inc b/asm/include/overlay_29_0234CA84.inc index e89f2777..6f8c6101 100644 --- a/asm/include/overlay_29_0234CA84.inc +++ b/asm/include/overlay_29_0234CA84.inc @@ -1,7 +1,7 @@ #pragma once -.public DUNGEON_PTR .public Debug_Print0 .public DisplayMessageInternal +.public DUNGEON_PTR .public FixedRoomIsSubstituteRoom .public GetDungeonTipShown .public GetGameMode @@ -17,12 +17,6 @@ .public LoadOverlay .public LoadScriptVariableValue .public LogMessageByIdQuiet -.public OverlayIsLoaded -.public SetBothScreensWindowsColor -.public SetDungeonTipShown -.public StringFromId -.public UnloadOverlay -.public WriteQuicksaveData .public ov29_022EA428 .public ov29_022EACBC .public ov29_0231ADA8 @@ -66,4 +60,10 @@ .public ov29_023537E8 .public ov29_0237D000 .public ov30_023842F4 +.public OverlayIsLoaded +.public SetBothScreensWindowsColor +.public SetDungeonTipShown +.public StringFromId .public sub_02025784 +.public UnloadOverlay +.public WriteQuicksaveData diff --git a/asm/include/overlay_29_rodata_02352780.inc b/asm/include/overlay_29_rodata_02352780.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_29_rodata_02352780.inc +++ b/asm/include/overlay_29_rodata_02352780.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_31_02382FBC.inc b/asm/include/overlay_31_02382FBC.inc index 2194899b..4877d50a 100644 --- a/asm/include/overlay_31_02382FBC.inc +++ b/asm/include/overlay_31_02382FBC.inc @@ -3,21 +3,21 @@ .public CloseParentMenu .public CreateAdvancedTextBox .public CreateParentMenuFromStringIds +.public DrawTextInWindow .public DUNGEON_SUBMENU_ITEMS_1 .public DUNGEON_WINDOW_PARAMS_5 .public DUNGEON_WINDOW_PARAMS_6 .public DUNGEON_WINDOW_PARAMS_7 -.public DrawTextInWindow .public GetLeader .public IsAdvancedTextBoxActive .public IsParentMenuActive .public MemFree +.public ov29_0237C91C +.public ov31_02389E22 +.public ov31_0238A2A0 .public OVERLAY31_UNKNOWN_STRING_IDS .public SetAdvancedTextBoxField0x1C4 .public SetMonsterActionFields .public StairsSubheadingCallback .public StringFromId -.public ov29_0237C91C -.public ov31_02389E22 -.public ov31_0238A2A0 .public sub_0202ABB0 diff --git a/asm/include/overlay_31_023833D8.inc b/asm/include/overlay_31_023833D8.inc index b3e431a6..9f9bf4ee 100644 --- a/asm/include/overlay_31_023833D8.inc +++ b/asm/include/overlay_31_023833D8.inc @@ -1,9 +1,9 @@ #pragma once -.public OVERLAY31_UNKNOWN_POINTER__NA_238A268 .public ov31_02383328 .public ov31_0238335C .public ov31_023833B4 .public ov31_0238A2A8 +.public OVERLAY31_UNKNOWN_POINTER__NA_238A268 .public sub_020355DC .public sub_02035CE4 .public sub_0204AEA0 diff --git a/asm/include/overlay_31_023838E4.inc b/asm/include/overlay_31_023838E4.inc index 4d2cc086..e052c60f 100644 --- a/asm/include/overlay_31_023838E4.inc +++ b/asm/include/overlay_31_023838E4.inc @@ -1,4 +1,5 @@ #pragma once +.public _020A1870 .public AddDungeonSubMenuOption .public AdvanceFrame .public AiMovement @@ -30,6 +31,11 @@ .public CreateScrollBoxSingle .public CreateTextBox .public CreateTextBoxWithArg +.public Debug_Print0 +.public DisableDungeonSubMenuOption +.public DisplayMessage +.public DrawTextInWindow +.public DrawTileGrid .public DUNGEON_PTR .public DUNGEON_SUBMENU_ITEMS_5 .public DUNGEON_SUBMENU_ITEMS_6 @@ -57,11 +63,6 @@ .public DUNGEON_WINDOW_PARAMS_31 .public DUNGEON_WINDOW_PARAMS_32 .public DUNGEON_WINDOW_PARAMS_9 -.public Debug_Print0 -.public DisableDungeonSubMenuOption -.public DisplayMessage -.public DrawTextInWindow -.public DrawTileGrid .public EntityIsValid__02383658 .public FormatMoveString .public FormatMoveStringMore @@ -111,43 +112,12 @@ .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_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_STRUCT__NA_2389FE8 -.public OVERLAY31_UNKNOWN_STRUCT__NA_238A144 -.public OVERLAY31_UNKNOWN_STRUCT__NA_238A190 -.public PlaySeVolumeWrapper -.public PlayWindowInputSound -.public PopInventoryMenuField0x1A3 -.public PreprocessString -.public PreprocessStringFromId -.public PrintIqSkillsMenu -.public ResumeParentMenu -.public SetAdvancedTextBoxField0x1C2 -.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 @@ -194,7 +164,6 @@ .public ov29_02347100 .public ov29_02348D00 .public ov29_0234B034 -.public ov29_0234B084 .public ov29_0234E988 .public ov29_0234EA18 .public ov29_0234EBCC @@ -236,12 +205,38 @@ .public ov31_0238A154 .public ov31_0238A228 .public ov31_0238A23C +.public OVERLAY31_JP_STRING +.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_STRUCT__NA_2389FE8 +.public OVERLAY31_UNKNOWN_STRUCT__NA_238A144 +.public OVERLAY31_UNKNOWN_STRUCT__NA_238A190 +.public PlaySeByIdVolumeWrapper +.public PlaySeVolumeWrapper +.public PlayWindowInputSound +.public PopInventoryMenuField0x1A3 +.public PreprocessString +.public PreprocessStringFromId +.public PrintIqSkillsMenu +.public ResumeParentMenu +.public SetAdvancedTextBoxField0x1C2 +.public SetAdvancedTextBoxState5 +.public SetMonsterActionFields +.public SetPreprocessorArgsIdVal +.public ShowStringInDialogueBox +.public SortItemsInBag +.public SpecificRecruitCheck .public strcpy +.public StringFromId .public sub_02001808 .public sub_0200B3D4 .public sub_0200D310 .public sub_02017C74 -.public sub_02017C80 .public sub_02027B1C .public sub_0202810C .public sub_0202812C @@ -289,4 +284,9 @@ .public sub_02054F44 .public sub_02056228 .public sub_020585B4 +.public TeamMemberHasEnabledIqSkill +.public TryPointCameraToMonster +.public UpdateMapSurveyorFlag +.public UpdateWindow .public vsprintf +.public YesNoMenu diff --git a/asm/main_02013C30.s b/asm/main_02013C30.s index 1d463817..1d7f59f5 100644 --- a/asm/main_02013C30.s +++ b/asm/main_02013C30.s @@ -5496,14 +5496,14 @@ sub_02017C74: ; 0x02017C74 _02017C7C: .word PlaySeByIdVolume arm_func_end sub_02017C74 - arm_func_start sub_02017C80 -sub_02017C80: ; 0x02017C80 + arm_func_start PlaySeByIdVolumeWrapper +PlaySeByIdVolumeWrapper: ; 0x02017C80 ldr ip, _02017C8C ; =PlaySeByIdVolume mov r1, #0x100 bx ip .align 2, 0 _02017C8C: .word PlaySeByIdVolume - arm_func_end sub_02017C80 + arm_func_end PlaySeByIdVolumeWrapper arm_func_start sub_02017C90 sub_02017C90: ; 0x02017C90 @@ -17595,7 +17595,7 @@ _0202194C: bl AtoiTag mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _02021AA0 _02021984: ldr r0, _02021ED4 ; =_020997E4 @@ -22104,8 +22104,8 @@ GetDungeonResultString: ; 0x02024FD8 _02024FE4: .word _022A5268 arm_func_end GetDungeonResultString - arm_func_start sub_02024FE8 -sub_02024FE8: ; 0x02024FE8 + arm_func_start SubstitutePlaceholderItemTags +SubstitutePlaceholderItemTags: ; 0x02024FE8 stmdb sp!, {r3, r4, r5, lr} cmp r1, #0 beq _02025030 @@ -22147,7 +22147,7 @@ _02025068: _02025070: .word _022A596A _02025074: .word _022A5969 _02025078: .word _022A5970 - arm_func_end sub_02024FE8 + arm_func_end SubstitutePlaceholderItemTags arm_func_start sub_0202507C sub_0202507C: ; 0x0202507C diff --git a/asm/main_0203C774.s b/asm/main_0203C774.s index 1d2a6655..f98e20ad 100644 --- a/asm/main_0203C774.s +++ b/asm/main_0203C774.s @@ -5287,7 +5287,7 @@ _02040E34: cmpeq r0, #0 bne _02040E6C ldr r0, _02040FA4 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _02040E78 _02040E6C: ldr r0, _02040F9C ; =0x00003F07 @@ -6486,7 +6486,7 @@ _02041CF8: tst r0, #8 beq _02041D54 ldr r0, _020420D0 ; =0x00003F04 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r0, _020420BC ; =_020AFE90 ldr r0, [r0, #4] ldrsb r0, [r0] @@ -6511,7 +6511,7 @@ _02041D54: cmp r0, #0 beq _02041D7C ldr r0, _020420D4 ; =0x00003F03 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _020420B0 _02041D7C: ldrsb r0, [r1] @@ -6594,7 +6594,7 @@ _02041E84: ldr r0, [r3, #0x790] bl DisableIqSkill ldr r0, _020420D8 ; =0x00003F07 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper _02041E98: ldr r0, _020420BC ; =_020AFE90 ldr r0, [r0, #4] diff --git a/asm/main_0207F894.s b/asm/main_0207F894.s index 8cc87b36..c4f1206e 100644 --- a/asm/main_0207F894.s +++ b/asm/main_0207F894.s @@ -2953,8 +2953,8 @@ _02081FF0: _02082008: .word 0x00996A00 arm_func_end sub_02081F60 - arm_func_start sub_0208200C -sub_0208200C: ; 0x0208200C + arm_func_start PM_ForceToPowerOff +PM_ForceToPowerOff: ; 0x0208200C stmdb sp!, {r3, lr} ldr r0, _02082030 ; =_02081A7C add r1, sp, #0 @@ -2966,7 +2966,7 @@ sub_0208200C: ; 0x0208200C ldmia sp!, {r3, pc} .align 2, 0 _02082030: .word sub_02081A7C - arm_func_end sub_0208200C + arm_func_end PM_ForceToPowerOff arm_func_start sub_02082034 sub_02082034: ; 0x02082034 @@ -3170,7 +3170,7 @@ _020822C4: ldrh r0, [r1] strh r8, [r1] beq _020822F8 - bl sub_0208200C + bl PM_ForceToPowerOff _020822F8: ldr r0, _0208230C ; =_022BB6AC ldr r0, [r0, #0x18] @@ -5952,14 +5952,14 @@ sub_020845F8: ; 0x020845F8 and r0, r0, #0x8000 movs r0, r0, asr #0xf beq _02084660 - bl sub_0208200C + bl PM_ForceToPowerOff cmp r0, #4 bne _02084658 ldr r4, _02084680 ; =0x000A3A47 _02084644: mov r0, r4 bl sub_0207B854 - bl sub_0208200C + bl PM_ForceToPowerOff cmp r0, #4 beq _02084644 _02084658: diff --git a/asm/overlay_02.s b/asm/overlay_02.s index b577530e..6bbec6c3 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -26434,7 +26434,7 @@ ov02_0233A420: ; 0x0233A420 ldmneia sp!, {r3, pc} mov r0, #0x1000000 bl sub_0207B854 - bl sub_0208200C + bl PM_ForceToPowerOff ldmia sp!, {r3, pc} arm_func_end ov02_0233A420 @@ -27739,7 +27739,7 @@ ov02_0233B470: ; 0x0233B470 ldmneia sp!, {r3, pc} mov r0, #0x1000000 bl sub_0207B854 - bl sub_0208200C + bl PM_ForceToPowerOff ldmia sp!, {r3, pc} arm_func_end ov02_0233B470 diff --git a/asm/overlay_10_022BCC7C.s b/asm/overlay_10_022BCC7C.s index 4e48caff..b38c6952 100644 --- a/asm/overlay_10_022BCC7C.s +++ b/asm/overlay_10_022BCC7C.s @@ -3212,7 +3212,7 @@ _022BF6D4: bne _022BF724 mov r0, r1, lsl #0x10 mov r0, r0, lsr #0x10 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper _022BF724: mvn r0, #0 str r0, [r6, #0x58] diff --git a/asm/overlay_10_022C4394.s b/asm/overlay_10_022C4394.s index bea77b63..d90aa555 100644 --- a/asm/overlay_10_022C4394.s +++ b/asm/overlay_10_022C4394.s @@ -248,8 +248,8 @@ SMOG_POISON_CHANCE: .global ov10_022C4520 ov10_022C4520: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C4524 -ov10_022C4524: + .global CUTE_CHARM_INFATUATE_CHANCE +CUTE_CHARM_INFATUATE_CHANCE: .byte 0x0C, 0x00, 0x00, 0x00 .global LICK_PARALYZE_CHANCE LICK_PARALYZE_CHANCE: diff --git a/asm/overlay_10_rodata_022C464C.s b/asm/overlay_10_rodata_022C464C.s index e3b9f966..683bea95 100644 --- a/asm/overlay_10_rodata_022C464C.s +++ b/asm/overlay_10_rodata_022C464C.s @@ -170,8 +170,8 @@ NIGHTMARE_TURN_RANGE: .global ov10_022C4728 ov10_022C4728: .byte 0x7F, 0x00, 0x7F, 0x00 - .global ov10_022C472C -ov10_022C472C: + .global REFLECT_LIGHT_SCREEN_TURN_RANGE +REFLECT_LIGHT_SCREEN_TURN_RANGE: .byte 0x0A, 0x00, 0x0C, 0x00 .global ov10_022C4730 ov10_022C4730: @@ -218,8 +218,8 @@ ov10_022C4764: .global ov10_022C4768 ov10_022C4768: .byte 0x08, 0x00, 0x10, 0x00 - .global ov10_022C476C -ov10_022C476C: + .global GASTRO_ACID_TURN_RANGE +GASTRO_ACID_TURN_RANGE: .byte 0x04, 0x00, 0x0A, 0x00 .global ov10_022C4770 ov10_022C4770: diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 11462773..abfb1aeb 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -6918,7 +6918,7 @@ _022E22A0: bl ScriptParamToInt mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _022E2464 _022E22B8: ldrh r0, [r5, #2] diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 5f0e2e1c..ab83b641 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -1452,7 +1452,7 @@ _0238B574: cmp r0, #3 bne _0238B5BC ldr r0, _0238B6D4 ; =0x00002C05 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper _0238B5BC: ldr r6, _0238B694 ; =SENTRY_DUTY_PTR ldr r0, [r6] @@ -2998,7 +2998,7 @@ _0238CA10: mov r2, #1 add r1, r1, #0x3000 strb r2, [r1, #0x870] - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r1, _0238CA54 ; =SENTRY_DUTY_PTR mov r3, #2 ldr r0, [r1] @@ -3129,7 +3129,7 @@ _0238CBEC: mov r2, #0 add r1, r1, #0x3000 str r2, [r1, #0x8ac] - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r2, _0238CFA4 ; =SENTRY_DUTY_PTR ldr r1, [r2] add r0, r1, #0x3000 @@ -3156,7 +3156,7 @@ _0238CC5C: cmp r0, #3 bne _0238CC7C ldr r0, _0238CFB0 ; =0x00003F03 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _0238CCE0 _0238CC7C: ldr r0, [r1, #0x898] @@ -3191,7 +3191,7 @@ _0238CCE0: tst r0, #0xf0 beq _0238CCF4 ldr r0, _0238CFB4 ; =0x00003F01 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper _0238CCF4: ldr r0, _0238CFA4 ; =SENTRY_DUTY_PTR ldr r0, [r0] @@ -3357,7 +3357,7 @@ _0238CF1C: bne _0238CF5C bl ov14_0238AC40 ldr r0, _0238CFC0 ; =0x00002C06 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r0, _0238CFA4 ; =SENTRY_DUTY_PTR mov r1, #1 ldr r0, [r0] @@ -3374,7 +3374,7 @@ _0238CF5C: bne _0238CF9C bl ov14_0238AC40 ldr r0, _0238CFC0 ; =0x00002C06 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r0, _0238CFA4 ; =SENTRY_DUTY_PTR mov r1, #1 ldr r0, [r0] @@ -3654,7 +3654,7 @@ SentryState10: ; 0x0238D320 bl ClearWindow _0238D368: ldr r0, _0238D394 ; =0x00002C08 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r0, _0238D390 ; =SENTRY_DUTY_PTR mvn r3, #0 ldr r2, [r0] @@ -3738,7 +3738,7 @@ SentryState15: ; 0x0238D428 ldmia sp!, {r3, pc} _0238D450: mov r0, #0x304 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper mov r0, #0x16 bl SentrySetStateIntermediate ldmia sp!, {r3, pc} @@ -3853,7 +3853,7 @@ SentryState1A: ; 0x0238D588 ldmia sp!, {r3, pc} _0238D5B0: mov r0, #0x304 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper mov r0, #0x1b bl SentrySetStateIntermediate ldmia sp!, {r3, pc} diff --git a/asm/overlay_15_0238A234.s b/asm/overlay_15_0238A234.s index d63114d2..4cc9da73 100644 --- a/asm/overlay_15_0238A234.s +++ b/asm/overlay_15_0238A234.s @@ -121,7 +121,7 @@ _0238A3A0: rsb r0, r0, #0 bl AddMoneyCarried ldr r0, _0238A4E0 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper mov r0, #9 bl ov15_0238A4E8 b _0238A4D4 @@ -171,7 +171,7 @@ _0238A444: ldr r0, [r0, #0xc] bl AddMoneyCarried ldr r0, _0238A4E0 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper mov r0, #0xc bl ov15_0238A4E8 b _0238A4D4 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 4455e495..e6f1c406 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -2803,7 +2803,7 @@ _0238C5EC: cmp r0, #0 bne _0238C614 ldr r0, _0238C71C ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _0238C620 _0238C614: ldr r0, _0238C718 ; =0x00003F07 @@ -2851,7 +2851,7 @@ _0238C68C: b _0238C6E4 _0238C6A8: ldr r0, _0238C718 ; =0x00003F07 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper mov r0, #0x21 bl ov18_0238BE28 b _0238C6E4 diff --git a/asm/overlay_21.s b/asm/overlay_21.s index 3d082c6c..f50fdbcf 100644 --- a/asm/overlay_21.s +++ b/asm/overlay_21.s @@ -2108,7 +2108,7 @@ _0238BDA0: mov r0, #0x11 bl ov21_0238A140 ldr r0, _0238C8D8 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _0238C7E4 _0238BDB8: bl ov21_0238C920 diff --git a/asm/overlay_22.s b/asm/overlay_22.s index ff788785..bbd7c0ef 100644 --- a/asm/overlay_22.s +++ b/asm/overlay_22.s @@ -4618,7 +4618,7 @@ _0238E1C0: bl ov22_0238ABD4 _0238E1C8: ldr r0, _0238E7A0 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper bl ov22_0238E7E4 mov r0, #0x12 bl ov22_0238ADD8 @@ -4657,7 +4657,7 @@ _0238E22C: bl RemoveItemNoHoleCheck bl sub_02042AF8 ldr r0, _0238E7A0 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper bl ov22_0238E7E4 mov r0, #0x1e bl ov22_0238ADD8 @@ -4693,7 +4693,7 @@ _0238E2A4: b _0238E734 _0238E2D8: ldr r0, _0238E7A0 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldr r0, [r0, #0x28] @@ -4767,7 +4767,7 @@ _0238E3DC: bl ov22_0238AC18 _0238E3E0: ldr r0, _0238E7A0 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper bl ov22_0238E7E4 mov r0, #0x1b bl ov22_0238ADD8 @@ -4811,7 +4811,7 @@ _0238E43C: b _0238E734 _0238E480: ldr r0, _0238E7A0 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldr r0, [r0, #0x28] diff --git a/asm/overlay_25.s b/asm/overlay_25.s index f29abae5..f78c938f 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -187,7 +187,7 @@ _0238A3D8: mov r0, #0x11 bl ov25_0238A694 ldr r0, _0238A684 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _0238A674 _0238A3EC: bl ov25_0238B380 diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index ba916e1a..637eccc2 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -162,7 +162,7 @@ _022EE574: add r1, sp, #0 ldr r1, [r1, r5, lsl #2] mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 add r0, sp, #0 ldr r1, [r0, r5, lsl #2] ldrb r0, [r1] @@ -673,7 +673,7 @@ _022EEA68: mov r0, #0 strb r0, [r1, #6] ldrh r1, [r1, #4] - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal add r1, sp, #0 ldr r1, [r1, r6, lsl #2] mov r0, r4 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index 74e10788..ed717333 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -180,7 +180,7 @@ ov29_022F07BC: ; 0x022F07BC rsb r0, r0, #0 bl AddMoneyCarried ldr r0, _022F07D4 ; =0x00001308 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldmia sp!, {r3, pc} .align 2, 0 _022F07D4: .word 0x00001308 @@ -644,7 +644,7 @@ _022F0D78: tst r3, #6 beq _022F0D98 ldr r0, _022F0ED8 ; =0x00003F03 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper b _022F0E30 _022F0D98: ldrb r0, [r5] @@ -4519,7 +4519,7 @@ _022F43AC: beq _022F440C add r1, r8, r7 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F44D8 ; =0x00000BA9 mov r0, r6 bl LogMessageByIdWithPopupCheckUser @@ -4535,7 +4535,7 @@ _022F441C: blt _022F43AC mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r0, _022F44DC ; =0x00003F07 bl ov29_022EACCC cmp r5, #0 @@ -4575,7 +4575,7 @@ _022F4494: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F44EC ; =0x00000BAE mov r0, r6 bl LogMessageByIdWithPopupCheckUser @@ -4627,7 +4627,7 @@ _022F4518: beq _022F4578 add r1, r3, r2 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F45C0 ; =0x00000BA9 mov r0, sl bl LogMessageByIdWithPopupCheckUser @@ -4638,7 +4638,7 @@ _022F4578: add r1, r3, r2 bic ip, ip, #0x10 strb ip, [r3, r2] - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r0, _022F45C4 ; =0x00003F07 bl ov29_022EACCC cmp sb, #0 @@ -4665,8 +4665,8 @@ _022F45C8: .word 0x00000BAD #endif arm_func_end ov29_022F44F0 - arm_func_start ov29_022F45CC -ov29_022F45CC: ; 0x022F45CC + arm_func_start HandleHeldItemSwaps +HandleHeldItemSwaps: ; 0x022F45CC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x14 mov sl, r0 @@ -4701,7 +4701,7 @@ ov29_022F45CC: ; 0x022F45CC beq _022F4668 mov r1, r5 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 #ifdef JAPAN ldr r1, _022F5EB8 ; =0x000008EF mov r0, sl @@ -4729,7 +4729,7 @@ _022F4668: beq _022F46C0 add r1, sb, #0x62 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F48C0 ; =0x00000BAF mov r0, sl bl LogMessageByIdWithPopupCheckUser @@ -4787,10 +4787,10 @@ _022F4770: _022F4778: add r1, sp, #6 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 add r1, sp, #0xc mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r0, _022F48C4 ; =0x00001317 bl ov29_022EACCC ldr r1, _022F48C8 ; =0x00000BB2 @@ -4837,7 +4837,7 @@ _022F482C: _022F4834: add r1, sp, #0 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r0, _022F48C4 ; =0x00001317 bl ov29_022EACCC ldr r1, _022F48D0 ; =0x00000BB3 @@ -4891,7 +4891,7 @@ _022F48C8: .word 0x00000BB2 + OV29_022F45CC_OFFSET _022F48CC: .word 0x00000BAE + OV29_022F45CC_OFFSET _022F48D0: .word 0x00000BB3 + OV29_022F45CC_OFFSET _022F48D4: .word DUNGEON_PTR - arm_func_end ov29_022F45CC + arm_func_end HandleHeldItemSwaps arm_func_start ov29_022F48D8 ov29_022F48D8: ; 0x022F48D8 @@ -4910,7 +4910,7 @@ ov29_022F48D8: ; 0x022F48D8 mov r0, #0 beq _022F4928 add r1, r5, #0x62 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F49D0 ; =0x00000BAE mov r0, r6 bl LogMessageByIdWithPopupCheckUser @@ -4926,7 +4926,7 @@ _022F4928: bic r2, r2, #0x10 strh r3, [sp, #4] strb r2, [sp] - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r0, #0 mov r1, r4 mov r2, r0 @@ -4998,7 +4998,7 @@ ov29_022F49E0: ; 0x022F49E0 beq _022F4A44 add r1, r5, #0x62 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F4BCC ; =0x00000BAE mov r0, r7 bl LogMessageByIdWithPopupCheckUser @@ -5015,7 +5015,7 @@ _022F4A44: beq _022F4A84 mov r1, r6 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F4BCC ; =0x00000BAE mov r0, r7 bl LogMessageByIdWithPopupCheckUser @@ -5029,10 +5029,10 @@ _022F4A84: ldrb r2, [r6] bic r2, r2, #0x10 strb r2, [r6] - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r1, r6 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r1, r4 mov r0, #1 mov r2, #0 @@ -5160,7 +5160,7 @@ ov29_022F4BF8: ; 0x022F4BF8 mov r4, r0 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldrb r1, [r6, #0x4e] cmp r1, #0x80 bne _022F4C3C @@ -5230,7 +5230,7 @@ _022F4D08: mov r0, #0 bic r2, r2, #0x10 strb r2, [r4] - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r1, r4 add r0, r5, #4 mov r2, #1 @@ -5316,7 +5316,7 @@ _022F4DFC: beq _022F4E48 mov r1, r7 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F5040 ; =0x00000BAE mov r0, r8 bl LogMessageByIdWithPopupCheckUser @@ -5332,7 +5332,7 @@ _022F4E48: beq _022F4E84 mov r1, r7 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 #ifdef JAPAN mov r0, r8 mov r1, #0x8f0 @@ -5448,10 +5448,10 @@ _022F4FDC: bl RemoveEmptyItemsInBagWrapper add r1, sp, #6 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 add r1, sp, #0 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r0, _022F5054 ; =0x00001317 bl ov29_022EACCC ldr r1, _022F5058 ; =0x00000BBD @@ -5509,7 +5509,7 @@ ov29_022F505C: ; 0x022F505C mov r6, r0 mov r1, r6 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldrb r1, [r5, #0x4e] cmp r1, #0x33 bhs _022F50E8 @@ -5524,7 +5524,7 @@ ov29_022F505C: ; 0x022F505C beq _022F50E8 mov r1, r6 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 #ifdef JAPAN mov r0, r7 mov r1, #0x8f0 @@ -5567,7 +5567,7 @@ _022F513C: mov r4, r0 mov r1, r4 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldrh r2, [r6] add r0, r7, #4 mov r1, #1 diff --git a/asm/overlay_29_022F52B0.s b/asm/overlay_29_022F52B0.s index d2442f94..d173a36d 100644 --- a/asm/overlay_29_022F52B0.s +++ b/asm/overlay_29_022F52B0.s @@ -67,7 +67,7 @@ _022F5334: mov r4, r0 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 bl ov29_0234B034 mov r2, r5 mov r1, #0 @@ -205,7 +205,7 @@ _022F550C: beq _022F5558 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F5980 ; =0x00000BAE mov r0, sb bl LogMessageByIdWithPopupCheckUser @@ -231,7 +231,7 @@ _022F5578: beq _022F55B8 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _022F5980 ; =0x00000BAE mov r0, sb bl LogMessageByIdWithPopupCheckUser @@ -383,7 +383,7 @@ _022F579C: _022F57A4: add r1, sp, #0xc mov r0, #0 - bl ov29_02344B70 + bl PrepareItemForPrinting__02345754 bl ov29_0234B034 mov r1, #0 mov r2, r8 diff --git a/asm/overlay_29_022F9194.s b/asm/overlay_29_022F9194.s index c8281569..adb505c8 100644 --- a/asm/overlay_29_022F9194.s +++ b/asm/overlay_29_022F9194.s @@ -408,7 +408,7 @@ _022F9658: bl SubstitutePlaceholderStringTags ldrb r1, [r6, #0x5e] mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _022F96C8 ; =0x00000C19 mov r0, sb mov r1, r8 diff --git a/asm/overlay_29_022F9744.s b/asm/overlay_29_022F9744.s index d87c269d..565ffcb5 100644 --- a/asm/overlay_29_022F9744.s +++ b/asm/overlay_29_022F9744.s @@ -41,7 +41,7 @@ TryActivateConversion2: ; 0x022F9744 bl SubstitutePlaceholderStringTags mov r1, r4 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal mov r0, r7 mov r1, r6 ldr r2, _022F97EC ; =0x00000C16 @@ -822,7 +822,7 @@ _022FA0E4: bl sub_02017C50 mov r0, #0 and r1, r8, #0xff - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r1, _022FA140 ; =0x00000C1C mov r0, #0 bl LogMessageByIdWithPopup @@ -1715,7 +1715,7 @@ _022FAB58: bl SubstitutePlaceholderStringTags mov r0, #1 mov r1, #0x37 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal #ifdef JAPAN ldr r1, _022FC21C ; =0x0000095F mov r0, r5 @@ -1773,7 +1773,7 @@ _022FAC04: bl GetExclusiveItemWithEffectFromBag mov r0, #1 add r1, sp, #0xc - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 cmp sl, #0 bne _022FAC60 ldr r1, _022FAC94 ; =0x00000C23 diff --git a/asm/overlay_29_022FACBC.s b/asm/overlay_29_022FACBC.s index 8fc0c0ea..32957fa5 100644 --- a/asm/overlay_29_022FACBC.s +++ b/asm/overlay_29_022FACBC.s @@ -518,7 +518,7 @@ _022FB24C: bl SubstitutePlaceholderStringTags add r1, r4, #0x62 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _022FB510 ; =0x00000C24 mov r0, sl mov r1, sb @@ -563,7 +563,7 @@ _022FB31C: bl SubstitutePlaceholderStringTags add r1, r4, #0x62 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _022FB510 ; =0x00000C24 mov r0, sl mov r1, sb @@ -654,7 +654,7 @@ _022FB430: bl SubstitutePlaceholderStringTags mov r1, r6 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r0, sl mov r1, sb ldr r2, _022FB518 ; =0x00000C25 diff --git a/asm/overlay_29_022FE4BC.s b/asm/overlay_29_022FE4BC.s index d667dcf8..b258c5d8 100644 --- a/asm/overlay_29_022FE4BC.s +++ b/asm/overlay_29_022FE4BC.s @@ -394,7 +394,7 @@ _022FF45C: b _022FF5E0 _022FF468: mov r0, r6 - bl ov29_022F45CC + bl HandleHeldItemSwaps b _022FF5E0 _022FF474: mov r0, r6 @@ -1041,7 +1041,7 @@ _022FEA30: b _022FEBB4 _022FEA3C: mov r0, sb - bl ov29_022F45CC + bl HandleHeldItemSwaps b _022FEBB4 _022FEA48: mov r0, sb diff --git a/asm/overlay_29_022FFF4C.s b/asm/overlay_29_022FFF4C.s index 051fe154..c908dc60 100644 --- a/asm/overlay_29_022FFF4C.s +++ b/asm/overlay_29_022FFF4C.s @@ -111,7 +111,7 @@ _02300068: bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 #ifdef JAPAN mov r0, sl mov r1, #0x970 diff --git a/asm/overlay_29_02301A84.s b/asm/overlay_29_02301A84.s index ce621487..41691ca2 100644 --- a/asm/overlay_29_02301A84.s +++ b/asm/overlay_29_02301A84.s @@ -36,7 +36,7 @@ ov29_02301A84: ; 0x02301A84 bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _02301B28 ; =0x00000C39 mov r0, r5 mov r1, r4 diff --git a/asm/overlay_29_02302388.s b/asm/overlay_29_02302388.s index f1554212..430be18a 100644 --- a/asm/overlay_29_02302388.s +++ b/asm/overlay_29_02302388.s @@ -88,7 +88,7 @@ IsProtectedFromNegativeStatus: ; 0x02302430 bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _023024DC ; =0x00000C39 mov r0, r6 mov r1, r5 diff --git a/asm/overlay_29_02302A5C.s b/asm/overlay_29_02302A5C.s index 099d9ddf..1af150ed 100644 --- a/asm/overlay_29_02302A5C.s +++ b/asm/overlay_29_02302A5C.s @@ -166,7 +166,7 @@ _02302C6C: bl SubstitutePlaceholderStringTags mov r0, r5 and r1, r7, #0xff - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal mov r0, sl mov r1, sb mov r2, r4 @@ -975,7 +975,7 @@ _02303718: bl ov29_0230040C mov r1, r4 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r1, _023038C4 ; =0x0000131B mov r0, sb bl ov29_022E56A0 @@ -1212,7 +1212,7 @@ _02303A30: bl SubstitutePlaceholderStringTags mov r1, r5 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r1, _02303B08 ; =0x0000131B mov r0, sl bl ov29_022E56A0 diff --git a/asm/overlay_29_023085DC.s b/asm/overlay_29_023085DC.s index c5bd547d..33f5be04 100644 --- a/asm/overlay_29_023085DC.s +++ b/asm/overlay_29_023085DC.s @@ -616,7 +616,7 @@ _02308E20: bne _02308E80 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308FB0 ; =ov10_022C4524 + ldr r1, _02308FB0 ; =CUTE_CHARM_INFATUATE_CHANCE ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -720,7 +720,7 @@ _02308FA0: .word ov10_022C4550 _02308FA4: .word ov10_022C45C0 _02308FA8: .word ov10_022C45AC _02308FAC: .word ov10_022C467C -_02308FB0: .word ov10_022C4524 +_02308FB0: .word CUTE_CHARM_INFATUATE_CHANCE _02308FB4: .word ov10_022C4638 _02308FB8: .word DUNGEON_PTR arm_func_end ApplyDamageAndEffects diff --git a/asm/overlay_29_0230AA0C.s b/asm/overlay_29_0230AA0C.s index d994f2c5..1de9a59a 100644 --- a/asm/overlay_29_0230AA0C.s +++ b/asm/overlay_29_0230AA0C.s @@ -4144,7 +4144,7 @@ _0230E2D4: bl ov29_0234B0B4 mov r0, #1 mov r1, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r0, _0230E568 ; =0x00000C7E bl ov29_0230E658 ldrsh r1, [r8, #2] diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s index bd64ab7d..b09d3fe8 100644 --- a/asm/overlay_29_0230F02C.s +++ b/asm/overlay_29_0230F02C.s @@ -91,7 +91,7 @@ _0230F22C: beq _0230F274 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r0, #0 mov r1, r8 mov r2, r0 @@ -130,7 +130,7 @@ _0230F2B0: bl AddMoneyCarried mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 add r0, r8, #4 mov r1, #1 bl RemoveGroundItem @@ -235,7 +235,7 @@ _0230F408: bl ov29_02347040 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 add r0, r8, #4 mov r1, #1 bl RemoveGroundItem @@ -301,7 +301,7 @@ _0230F508: bne _0230F544 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _0230F64C ; =0x00000C62 mov r0, r8 bl LogMessageByIdWithPopup @@ -331,7 +331,7 @@ _0230F564: bl ov29_022F9EA0 mov r1, r4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 add r0, r8, #4 mov r1, #1 bl RemoveGroundItem @@ -362,7 +362,7 @@ _0230F5BC: b _0230F624 _0230F5F8: mov r1, r4 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 add r0, r8, #4 mov r1, #1 bl RemoveGroundItem diff --git a/asm/overlay_29_0230F9A4.s b/asm/overlay_29_0230F9A4.s index 226c3ff3..4657c1ee 100644 --- a/asm/overlay_29_0230F9A4.s +++ b/asm/overlay_29_0230F9A4.s @@ -658,7 +658,7 @@ _02310298: bne _02310360 mov r0, #2 mov r1, #0x5a - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r0, _02310A9C ; =ov10_022C46EC mov r2, #0x19 ldrsh r1, [r0] @@ -683,7 +683,7 @@ _02310304: bne _02310360 mov r0, #2 mov r1, #0x55 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r0, _02310A9C ; =ov10_022C46EC ldr r3, _02310AA0 ; =0x0000025F ldrsh r1, [r0] diff --git a/asm/overlay_29_02311C28.s b/asm/overlay_29_02311C28.s index 532e7a32..b40174fc 100644 --- a/asm/overlay_29_02311C28.s +++ b/asm/overlay_29_02311C28.s @@ -1519,7 +1519,7 @@ TryInflictShadowHoldStatus: ; 0x02312F78 bl SubstitutePlaceholderStringTags mov r0, #1 mov r1, #0x2b - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal cmp r4, #0 bne _02313024 ldr r2, _0231311C ; =0x00000D28 @@ -3209,7 +3209,7 @@ _023145F4: bl GetExclusiveItemWithEffectFromBag add r1, sp, #4 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _023147D8 ; =0x00000DA1 mov r0, sl mov r1, sb diff --git a/asm/overlay_29_02314810.s b/asm/overlay_29_02314810.s index 52f62d5c..d766a19c 100644 --- a/asm/overlay_29_02314810.s +++ b/asm/overlay_29_02314810.s @@ -307,7 +307,7 @@ _02314B74: orr r1, r1, #1 strh r1, [r2, #2] ldrh r1, [r2, #4] - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal mov r0, r8 mov r1, r7 mov r5, #1 @@ -459,7 +459,7 @@ ExclusiveItemEffectIsActiveWithLogging: ; 0x02314D40 bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r0, r7 mov r1, r6 mov r2, r4 @@ -491,7 +491,7 @@ ov29_02314DC4: ; 0x02314DC4 bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r0, r7 mov r1, r6 mov r2, r5 diff --git a/asm/overlay_29_02317844.s b/asm/overlay_29_02317844.s index 7e498099..e19f6bbe 100644 --- a/asm/overlay_29_02317844.s +++ b/asm/overlay_29_02317844.s @@ -878,7 +878,7 @@ TryInflictGastroAcidStatus: ; 0x0231827C mov r1, r6 bl TryRemoveSnatchedMonsterFromDungeonStruct mov r3, #4 - ldr r1, _023183B0 ; =ov10_022C476C + ldr r1, _023183B0 ; =GASTRO_ACID_TURN_RANGE mov r0, r6 mov r2, #1 strb r3, [r4, #0xd8] @@ -917,7 +917,7 @@ _023183A0: mov r0, #1 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_023183B0: .word ov10_022C476C +_023183B0: .word GASTRO_ACID_TURN_RANGE _023183B4: .word DUNGEON_PTR #ifdef JAPAN _023183B8: .word 0x00000ABB diff --git a/asm/overlay_29_02318E70.s b/asm/overlay_29_02318E70.s index 3ba86bcd..c276f410 100644 --- a/asm/overlay_29_02318E70.s +++ b/asm/overlay_29_02318E70.s @@ -282,7 +282,7 @@ TryInflictReflectStatus: ; 0x0231918C ldrb r0, [r4, #0xd5] cmp r0, #1 beq _02319204 - ldr r1, _02319220 ; =ov10_022C472C + ldr r1, _02319220 ; =REFLECT_LIGHT_SCREEN_TURN_RANGE mov r3, #1 mov r0, r5 mov r2, #0 @@ -307,7 +307,7 @@ _02319214: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02319220: .word ov10_022C472C +_02319220: .word REFLECT_LIGHT_SCREEN_TURN_RANGE #ifdef JAPAN _02319224: .word 0x00000A36 _02319228: .word 0x00000A37 diff --git a/asm/overlay_29_0231A9F8.s b/asm/overlay_29_0231A9F8.s index d19a200b..ca163f26 100644 --- a/asm/overlay_29_0231A9F8.s +++ b/asm/overlay_29_0231A9F8.s @@ -26,7 +26,7 @@ ov29_0231A9F8: ; 0x0231A9F8 tst r0, #0xff beq _0231AA60 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _0231AC90 ; =0x00000DF8 mov r0, r7 bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_0231AD38.s b/asm/overlay_29_0231AD38.s index 13217d06..ab2ebad5 100644 --- a/asm/overlay_29_0231AD38.s +++ b/asm/overlay_29_0231AD38.s @@ -362,7 +362,7 @@ _0231B150: bl SubstitutePlaceholderStringTags add r1, r6, #0x62 mov r0, #2 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _0231B190 ; =0x00000C3C mov r0, r5 mov r1, r4 diff --git a/asm/overlay_29_0231B1B8.s b/asm/overlay_29_0231B1B8.s index 3ed2c11b..2440a454 100644 --- a/asm/overlay_29_0231B1B8.s +++ b/asm/overlay_29_0231B1B8.s @@ -54,7 +54,7 @@ _0231B240: blt _0231B1EC mov r0, #2 mov r1, #0x69 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r0, _0231B310 ; =ov10_022C4530 mov r8, #0 ldrsh r7, [r0] diff --git a/asm/overlay_29_0231B33C.s b/asm/overlay_29_0231B33C.s index a30fcd94..f1b44649 100644 --- a/asm/overlay_29_0231B33C.s +++ b/asm/overlay_29_0231B33C.s @@ -380,7 +380,7 @@ _0231B7D4: bl ov29_022EACCC mov r1, r6 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 mov r0, #0 mov r1, r7 mov r2, r0 @@ -422,7 +422,7 @@ _0231B860: beq _0231B8E4 mov r1, r6 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _0231C6CC ; =0x00000BE7 mov r0, r8 mov r1, r7 diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 3406b694..fb79beec 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -289,7 +289,7 @@ _0231CF18: beq _0231CF64 ldrh r1, [r7, #4] mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal #ifdef JAPAN ldr r2, _0231E440 ; =0x0000092F mov r0, sb @@ -714,7 +714,7 @@ CanMonsterUseItem: ; 0x0231D4A4 tst r2, #0xff beq _0231D4E4 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _0231D52C ; =0x00000BE7 mov r0, r4 bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 3839d1bd..20ac1bdd 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -169,7 +169,7 @@ _02321684: bne _023216AC ldrh r1, [r4, #4] mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r1, _02321A5C ; =0x00000E7F mov r0, sl bl LogMessageByIdWithPopupCheckUser @@ -1368,7 +1368,7 @@ _02322694: mov r0, r5, lsl #0x10 mov r1, r0, asr #0x10 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r1, [sp, #0x20] mov r0, r6 bl LogMessageWithPopupCheckUser diff --git a/asm/overlay_29_02322DDC.s b/asm/overlay_29_02322DDC.s index 84cb463a..4c46fde2 100644 --- a/asm/overlay_29_02322DDC.s +++ b/asm/overlay_29_02322DDC.s @@ -53,7 +53,7 @@ _02322E80: mov r0, r7, lsl #0x10 mov r1, r0, asr #0x10 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal b _02322EAC _02322E94: cmp r7, #0 @@ -61,7 +61,7 @@ _02322E94: mov r0, r7, lsl #0x10 mov r1, r0, asr #0x10 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal _02322EAC: ldrh r1, [sb, #4] ldr r0, _02322F74 ; =0x00000163 diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s index 3ac80100..ae3685d7 100644 --- a/asm/overlay_29_02328030.s +++ b/asm/overlay_29_02328030.s @@ -691,7 +691,7 @@ _02328864: bl InitMove ldrh r1, [r8, #4] mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldrh r1, [r8, #2] ldr r2, _023288C0 ; =0x00000DB7 mov r0, sl @@ -1783,7 +1783,7 @@ _02329604: mov r1, #1 strb r1, [r7, #0xff] ldrh r1, [r4, #4] - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02329660 ; =0x00000DB5 mov r0, sl mov r1, sb diff --git a/asm/overlay_29_0232A3FC.s b/asm/overlay_29_0232A3FC.s index b20fd36c..077039ac 100644 --- a/asm/overlay_29_0232A3FC.s +++ b/asm/overlay_29_0232A3FC.s @@ -1431,7 +1431,7 @@ _0232B578: bl SubstitutePlaceholderStringTags mov r1, r6 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal #ifdef JAPAN mov r0, r5 mov r1, r4 diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index d1e2280d..5b0f9d71 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -2155,7 +2155,7 @@ DoMoveWorrySeed: ; 0x0232DDAC bl SubstitutePlaceholderStringTags mov r0, #1 mov r1, #0x2a - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _0232DE1C ; =0x00000F13 mov r0, r6 mov r1, r5 diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index f22af8ea..dbeb8a63 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -570,7 +570,7 @@ _0232EFDC: beq _0232F060 mov r0, #0 add r1, sp, #0xac - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r2, _0232F80C ; =0x00000EB5 mov r0, sb mov r1, r4 diff --git a/asm/overlay_29_02344B1C.s b/asm/overlay_29_02344B1C.s index 43fa5fdd..f1179462 100644 --- a/asm/overlay_29_02344B1C.s +++ b/asm/overlay_29_02344B1C.s @@ -23,44 +23,44 @@ ov29_02344B30: ; 0x02344B30 _02344B40: .word ov29_023537B0 arm_func_end ov29_02344B30 - arm_func_start ov29_02344B44 -ov29_02344B44: ; 0x02344B44 + arm_func_start PrepareItemForPrinting__02345728 +PrepareItemForPrinting__02345728: ; 0x02344B44 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 orr r1, r5, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02344B6C ; =ov29_023531BC mov r0, r5 mov r1, r4 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02344B6C: .word ov29_023531BC - arm_func_end ov29_02344B44 + arm_func_end PrepareItemForPrinting__02345728 - arm_func_start ov29_02344B70 -ov29_02344B70: ; 0x02344B70 + arm_func_start PrepareItemForPrinting__02345754 +PrepareItemForPrinting__02345754: ; 0x02344B70 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 orr r1, r5, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02344B98 ; =ov29_023531A4 mov r0, r5 mov r1, r4 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02344B98: .word ov29_023531A4 - arm_func_end ov29_02344B70 + arm_func_end PrepareItemForPrinting__02345754 arm_func_start ov29_02344B9C ov29_02344B9C: ; 0x02344B9C - ldr ip, _02344BA4 ; =ov29_0234B084 + ldr ip, _02344BA4 ; =SetPreprocessorArgsIdVal bx ip .align 2, 0 -_02344BA4: .word ov29_0234B084 +_02344BA4: .word SetPreprocessorArgsIdVal arm_func_end ov29_02344B9C arm_func_start ov29_02344BA8 @@ -72,7 +72,7 @@ ov29_02344BA8: ; 0x02344BA8 mov r1, r2 ldr r2, _02344BCC ; =ov29_023531BC str ip, [r3, #0x10] - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags ldmia sp!, {r3, pc} .align 2, 0 _02344BCC: .word ov29_023531BC @@ -454,11 +454,11 @@ TryLeaderItemPickUp: ; 0x02345058 beq _02345508 mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags mov r0, #0 mov r1, r4 mov r2, r0 @@ -476,11 +476,11 @@ _02345108: beq _02345508 mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags mov r0, #0 mov r1, r4 mov r2, r0 @@ -512,11 +512,11 @@ _0234515C: bl AddMoneyCarried mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345510 ; =ov29_023531BC mov r0, #0 mov r1, r5 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags mov r0, sl mov r1, #1 bl RemoveGroundItem @@ -608,11 +608,11 @@ _023452D8: bl ov29_02347040 mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags mov r0, sl mov r1, #1 bl RemoveGroundItem @@ -665,11 +665,11 @@ _023453B4: beq _02345508 mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags mov r0, #0 mov r1, r4 mov r2, r0 @@ -693,11 +693,11 @@ _02345418: strh r2, [r7, #0x64] ldrh r2, [r5, #4] strh r2, [r7, #0x66] - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags mov r0, sl mov r1, #1 bl RemoveGroundItem @@ -723,11 +723,11 @@ _02345480: b _02345500 _023454BC: mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags mov r0, sl mov r1, #1 bl RemoveGroundItem diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index b51f7c2f..c7913420 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -403,11 +403,11 @@ _02345C3C: _02345C44: mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02345D6C ; =ov29_023531BC mov r1, r7 mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags cmp r5, #0 beq _02345CF4 ldrsh r0, [sp, #0xc] @@ -643,11 +643,11 @@ _02345F74: _02345F7C: mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _02346054 ; =ov29_023531BC ldr r1, [sp, #4] mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags cmp r4, #0 beq _02345FC4 bl ov29_022EACBC @@ -1102,11 +1102,11 @@ _023465B4: _023465E4: mov r0, #0 mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _023467D4 ; =ov29_023531BC mov r1, sl mov r0, #0 - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags ldr r1, _023467D8 ; =0x00000BDC ldr r0, [sp, #4] bl LogMessageByIdWithPopupCheckUser @@ -1207,11 +1207,11 @@ _02346724: beq _023467B4 mov r0, fp mov r1, #0x40000 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r2, _023467D4 ; =ov29_023531BC mov r0, #0 mov r1, sl - bl sub_02024FE8 + bl SubstitutePlaceholderItemTags ldr r0, [sp, #4] ldr r1, _023467D8 ; =0x00000BDC bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_02346834.s b/asm/overlay_29_02346834.s index 86e9644b..7ccf9dd1 100644 --- a/asm/overlay_29_02346834.s +++ b/asm/overlay_29_02346834.s @@ -1628,7 +1628,7 @@ _02347988: bl SubstitutePlaceholderStringTags ldr r1, [sp, #8] mov r0, #0 - bl ov29_02344B70 + bl PrepareItemForPrinting__02345754 #ifdef JAPAN mov r0, sl mov r1, r7 @@ -1684,7 +1684,7 @@ _02347A38: bl SubstitutePlaceholderStringTags ldr r1, [sp, #8] mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldrb r0, [r8] #ifdef JAPAN mov r1, r7 @@ -1767,7 +1767,7 @@ _02347AF4: _02347B1C: ldr r1, [sp, #8] mov r0, #0 - bl ov29_02344B70 + bl PrepareItemForPrinting__02345754 ldr r1, _02347B4C ; =0x00000BE5 mov r0, sl bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_02348020.s b/asm/overlay_29_02348020.s index 84d164a5..c3fbf720 100644 --- a/asm/overlay_29_02348020.s +++ b/asm/overlay_29_02348020.s @@ -887,7 +887,7 @@ ov29_02348B28: ; 0x02348B28 bl ov29_0234B06C mov r1, r4 mov r0, #1 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _02348B98 ; =0x00000E17 mov r0, #0 mov r2, #1 @@ -1147,7 +1147,7 @@ _02348E64: bl SubstitutePlaceholderStringTags mov r1, r5 mov r0, #0 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldr r1, _02348EC8 ; =0x00000BD2 mov r0, r6 bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index 5cb20ca3..c29370df 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -913,7 +913,7 @@ _0234A47C: ldr r1, [r1] ldr r1, [r1, #0x384] add r1, r1, r4 - bl ov29_02344B44 + bl PrepareItemForPrinting__02345728 ldrsh r4, [sb, #4] add r0, sp, #0x14 mov r2, #0 @@ -1421,7 +1421,7 @@ _0234AAC4: bl GetSpecialTargetItem mov r1, r0 mov r0, #1 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal #ifdef JAPAN mov r0, #0 mov r1, #0xb80 @@ -1930,8 +1930,8 @@ ov29_0234B06C: ; 0x0234B06C _0234B080: .word ov29_023537CC arm_func_end ov29_0234B06C - arm_func_start ov29_0234B084 -ov29_0234B084: ; 0x0234B084 + arm_func_start SetPreprocessorArgsIdVal +SetPreprocessorArgsIdVal: ; 0x0234B084 ldr r2, _0234B098 ; =ov29_023537CC ldr r2, [r2, #4] add r0, r2, r0, lsl #2 @@ -1939,7 +1939,7 @@ ov29_0234B084: ; 0x0234B084 bx lr .align 2, 0 _0234B098: .word ov29_023537CC - arm_func_end ov29_0234B084 + arm_func_end SetPreprocessorArgsIdVal arm_func_start ov29_0234B09C ov29_0234B09C: ; 0x0234B09C diff --git a/asm/overlay_31_023838E4.s b/asm/overlay_31_023838E4.s index c6a05936..29573d12 100644 --- a/asm/overlay_31_023838E4.s +++ b/asm/overlay_31_023838E4.s @@ -627,7 +627,7 @@ _023841A4: tst r0, #8 beq _023842DC ldr r0, _023848D0 ; =0x00003F04 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper ldr r0, _02384898 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A26C ldr r0, [r0] add r0, r0, #0x1100 @@ -3745,7 +3745,7 @@ _02386950: bl sub_02041154 mov r1, r0 mov r0, #0 - bl ov29_0234B084 + bl SetPreprocessorArgsIdVal ldr r0, _02386B0C ; =OVERLAY31_UNKNOWN_POINTER__NA_238A270 ldr r0, [r0] cmp r0, #4 @@ -7220,7 +7220,7 @@ _0238A838: ldrb r5, [r1, #0xb8] bl ov31_02389D80 ldr r0, _02389900 ; =0x00003F02 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper bl ov29_022EBA70 mov r0, #0x2f mov r1, #0 @@ -7292,7 +7292,7 @@ _0238A998: cmp r1, r0 bne _0238A9AC ldr r0, _02389900 ; =0x00003F02 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper _0238A9AC: cmp r8, #0 bge _0238A9C8 @@ -7335,7 +7335,7 @@ _0238AA04: b _0238AB68 _0238AA3C: ldr r0, _02389900 ; =0x00003F02 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper bl sub_02001808 cmp r0, #0xa000 bge _0238AA64 @@ -7518,7 +7518,7 @@ _02389578: ldrb r6, [r1, #0xb8] bl ov31_02389D80 ldr r0, _02389900 ; =0x00003F02 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper bl ov29_022EBA70 mov r0, #0x2f mov r1, #0 @@ -7590,7 +7590,7 @@ _023896DC: cmp r1, r0 bne _023896F0 ldr r0, _02389900 ; =0x00003F02 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper _023896F0: cmp r8, #0 bge _0238970C @@ -7633,7 +7633,7 @@ _02389748: b _023898AC _02389780: ldr r0, _02389900 ; =0x00003F02 - bl sub_02017C80 + bl PlaySeByIdVolumeWrapper bl sub_02001808 cmp r0, #0xa000 bge _023897A8 diff --git a/lib/DSE/asm/include/main_02071AC0.inc b/lib/DSE/asm/include/main_02071AC0.inc index f0545f97..b8189f18 100644 --- a/lib/DSE/asm/include/main_02071AC0.inc +++ b/lib/DSE/asm/include/main_02071AC0.inc @@ -1,3 +1,3 @@ #pragma once -.public DseChannel_SetBank .public _u32_div_f +.public DseChannel_SetBank diff --git a/lib/DSE/asm/include/main_02071EB4.inc b/lib/DSE/asm/include/main_02071EB4.inc index d4166821..64f71d3f 100644 --- a/lib/DSE/asm/include/main_02071EB4.inc +++ b/lib/DSE/asm/include/main_02071EB4.inc @@ -1,25 +1,4 @@ #pragma once -.public DRIVER_WORK -.public DseMem_Allocate -.public DseMem_Free -.public DseSwd_GetBankById -.public DseSwd_GetInstrument -.public DseSwd_GetNextSplitInRange -.public DseUtil_GetRandomNumber -.public ReadWaviEntry -.public SoundEnvelopeParameters_CheckValidity -.public SoundEnvelopeParameters_Reset -.public SoundEnvelope_Release -.public SoundEnvelope_Reset -.public SoundEnvelope_SetParameters -.public SoundEnvelope_Stop -.public SoundEnvelope_Stop2 -.public SoundEnvelope_Tick -.public SoundLfoBank_Reset -.public SoundLfoBank_Set -.public SoundLfoBank_SetConstEnvelopes -.public SoundLfoBank_Tick -.public UpdateTrackVolumeEnvelopes .public _020B0D50 .public _020B1310 .public _020B1394 @@ -30,6 +9,26 @@ .public _022B8330 .public _022B9584 .public _s32_div_f +.public DRIVER_WORK +.public DseMem_Allocate +.public DseMem_Free +.public DseSwd_GetBankById +.public DseSwd_GetInstrument +.public DseSwd_GetNextSplitInRange +.public DseUtil_GetRandomNumber +.public ReadWaviEntry +.public SoundEnvelope_Release +.public SoundEnvelope_Reset +.public SoundEnvelope_SetParameters +.public SoundEnvelope_Stop +.public SoundEnvelope_Stop2 +.public SoundEnvelope_Tick +.public SoundEnvelopeParameters_CheckValidity +.public SoundEnvelopeParameters_Reset +.public SoundLfoBank_Reset +.public SoundLfoBank_Set +.public SoundLfoBank_SetConstEnvelopes +.public SoundLfoBank_Tick .public sub_0207C8B8 .public sub_0207C8E0 .public sub_0207CA04 @@ -39,3 +38,4 @@ .public sub_0207CAB8 .public sub_0207CAE0 .public sub_0207D470 +.public UpdateTrackVolumeEnvelopes diff --git a/src/dungeon_projectile_throw.c b/src/dungeon_projectile_throw.c index a5b155c3..43c6ef87 100644 --- a/src/dungeon_projectile_throw.c +++ b/src/dungeon_projectile_throw.c @@ -28,7 +28,7 @@ extern bool8 ov29_023457C8(struct entity *entity, bool8 hallucinating, u8 a2, u8 extern void AdvanceFrame(u32); extern bool8 TwoTurnMoveForcedMiss(struct entity *target, struct move *move); extern bool8 DoesProjectileHitTarget(struct entity *user, struct entity *target); -extern void ov29_02344B70(u8 *buffer, struct item *item); +extern void PrepareItemForPrinting__02345754(u8 *buffer, struct item *item); extern void SubstitutePlaceholderStringTags(u8 *string_id, struct entity *entity, u32 param_3); extern void ov29_02304A84(struct entity *entity, u32 new_dir); extern void LogMessageByIdWithPopupCheckUserTarget(struct entity *user, struct entity *target, u32 message_id); @@ -192,7 +192,7 @@ void HandleCurvedProjectileThrow(struct entity *thrower, struct item *item, stru hitResult.did_hit = DoesProjectileHitTarget(thrower, hitResult.target); } - ov29_02344B70(0, item); + PrepareItemForPrinting__02345754(0, item); SubstitutePlaceholderStringTags(0, hitResult.target, 0); if (hitResult.did_hit) { bool8 immobiSlpEndMsg;