diff --git a/asm/include/main_02003DB8.inc b/asm/include/main_02003DB8.inc index cc2d8c73..48a26eb6 100644 --- a/asm/include/main_02003DB8.inc +++ b/asm/include/main_02003DB8.inc @@ -53,6 +53,7 @@ .public Debug_Print .public Debug_Print0 .public FileInit +.public GetDsFirmwareUserSettings .public GetOverlayInfo .public GX_BeginLoadBGExtPltt .public GX_BeginLoadOBJExtPltt @@ -102,7 +103,6 @@ .public sub_02079888 .public sub_0207A270 .public sub_0207A324 -.public sub_0207BA08 .public sub_0207BE6C .public sub_0207BF04 .public sub_0207BFA4 diff --git a/asm/include/main_020082C4.inc b/asm/include/main_020082C4.inc index ba66776c..92e14208 100644 --- a/asm/include/main_020082C4.inc +++ b/asm/include/main_020082C4.inc @@ -82,6 +82,7 @@ .public CART_REMOVED_IMG_DATA .public Debug_FatalError .public Debug_Print0 +.public DebugPrintSystemClock .public DecompressAtFromMemoryPointer .public G2x_SetBlendAlpha_ .public G3X_ClearFifo @@ -152,7 +153,6 @@ .public sub_02005D30 .public sub_02005E10 .public sub_02006ED4 -.public sub_02006EF8 .public sub_02007004 .public sub_02007380 .public sub_02007384 diff --git a/asm/include/main_0200ED1C.inc b/asm/include/main_0200ED1C.inc index 88c6a553..a8c603ef 100644 --- a/asm/include/main_0200ED1C.inc +++ b/asm/include/main_0200ED1C.inc @@ -362,6 +362,7 @@ .public GetBagCapacity .public GetBagCapacitySpecialEpisode .public GetBaseFormCastformDeoxysCherrim +.public GetDsFirmwareUserSettingsVeneer .public GetExclusiveItem .public GetExclusiveItemParameter .public GetExclusiveItemType @@ -491,7 +492,6 @@ .public sub_0200302C .public sub_020030FC .public sub_02003AB0 -.public sub_02004F74 .public sub_02006220 .public sub_020063A0 .public sub_020063D4 diff --git a/asm/include/main_02034974.inc b/asm/include/main_02034974.inc index dad82a2b..0fb9e8d9 100644 --- a/asm/include/main_02034974.inc +++ b/asm/include/main_02034974.inc @@ -1,280 +1,4 @@ #pragma once -.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS -.public ADVENTURE_LOG_PTR -.public ARM9_UNKNOWN_DATA__NA_209E6BC -.public ARM9_UNKNOWN_PTR__NA_20A2C84 -.public ARM9_UNKNOWN_TABLE__NA_209E12C -.public ARM9_UNKNOWN_TABLE__NA_209E164 -.public ARM9_UNKNOWN_TABLE__NA_209E280 -.public ARM9_UNKNOWN_TABLE__NA_20A20B0 -.public AddItemToStorage -.public AddMoneyCarried -.public AllocateTemp1024ByteBufferFromPool -.public Arm9LoadUnkFieldNa0x2029EC8 -.public Arm9StoreUnkFieldNa0x2029ED8 -.public ArrayCopy32 -.public ArrayFill32 -.public BAG_CAPACITY_TABLE -.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES -.public BAG_ITEMS_PTR_MIRROR -.public CLIENT_LEVEL_TABLE -.public CanMonsterUseMove -.public CardBackupError -.public CardPullOutWithStatus -.public CheckDebugMenuField0x1A4 -.public CheckOptionsMenuField0x1A4 -.public CheckParentMenuField0x1A0 -.public ClearWindow -.public CloseAdvancedMenu -.public CloseAdvancedTextBox -.public CloseAdvancedTextBox2 -.public CloseCollectionMenu -.public CloseDebugMenu -.public CloseDialogueBox -.public CloseOptionsMenu -.public CloseParentMenu -.public ClosePortraitBox -.public CloseScrollBox -.public CloseSimpleMenu -.public CloseTeamSelectionMenu -.public CloseTextBox -.public CloseTextBox2 -.public ConvertStorageItemAtIdxToItem -.public CopyNStringFromId -.public CountNbOfItemsInStorage -.public CountNbOfValidItemsInStorage -.public CountNbOfValidItemsInTimeDarknessInStorage -.public CreateAdvancedMenu -.public CreateAdvancedTextBox -.public CreateAdvancedTextBoxWithArg -.public CreateCollectionMenu -.public CreateDebugMenu -.public CreateDialogueBox -.public CreateOptionsMenu -.public CreateParentMenu -.public CreateParentMenuFromStringIds -.public CreatePortraitBox -.public CreateScrollBoxMulti -.public CreateScrollBoxSingle -.public CreateSimpleMenu -.public CreateSimpleMenuFromStringIds -.public CreateTeamSelectionMenu -.public CreateTextBox -.public CreateTextBoxWithArg -.public DEFAULT_HERO_ID -.public DUNGEON_DATA_LIST -.public DUNGEON_PTR -.public DUNGEON_RESTRICTIONS -.public Debug_FatalError -.public Debug_GetDebugFlag -.public Debug_GetLogFlag -.public Debug_Print -.public Debug_Print0 -.public Debug_SetDebugFlag -.public Debug_SetLogFlag -.public DecompressAtNormalVeneer -.public DexNumbersEqual -.public DirectoryFileMngr_OpenDirectoryFile -.public DisableIqSkill -.public DrawTextInWindow -.public DrawTileGrid -.public DungeonSwapIdToIdx -.public DungeonSwapIdxToId -.public DungeonToGroundMoveset -.public EnableAllLearnableIqSkills -.public FORBIDDEN_FORGOT_MOVE_LIST -.public FemaleToMaleForm -.public FileClose -.public FileRom_HandleOpen -.public FileRom_HandleRead -.public FileRom_HandleSeek -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer -.public FileRom_Veneer_FileInit -.public FormatMoveStringMore -.public GAME_MODE -.public GLOBAL_PROGRESS_PTR -.public GUEST_MONSTER_DATA -.public GetActiveRosterIndex -.public GetActiveTeamMember -.public GetActualSellPrice -.public GetAdvancedMenuCurrentOption -.public GetAdvancedMenuResult -.public GetAdvancedTextBoxFlags2 -.public GetAtSize -.public GetCurrentBagCapacity -.public GetDungeonModeSpecial -.public GetDungeonResultString -.public GetEvolutionPossibilities -.public GetHeldButtons -.public GetHero -.public GetHeroMemberIdx -.public GetInfoGroundMoveset -.public GetInfoMoveGround -.public GetIqSkillStringId -.public GetItemAtIdx -.public GetItemCategory -.public GetItemCategoryVeneer -.public GetItemIdFromList -.public GetItemMoveId16 -.public GetKeyM2NSwitch -.public GetKeyN2MSwitch -.public GetLanguage -.public GetLanguageType -.public GetLearnableIqSkills -.public GetMainCharacter1MemberIdx -.public GetMainCharacter2MemberIdx -.public GetMainCharacter3MemberIdx -.public GetMaxPp -.public GetMoneyCarried -.public GetMoneyStored -.public GetMonsterName -.public GetMoveRangeId -.public GetMoveType -.public GetMovesetEggPtr -.public GetMovesetHmTmPtr -.public GetMovesetIdx__02013CAC -.public GetMovesetLevelUpPtr -.public GetNbItemsInBag -.public GetNbMoves -.public GetNextIqSkill -.public GetPartner -.public GetPartnerMemberIdx -.public GetPartyMembers -.public GetPpIncrease -.public GetPressedButtons -.public GetReleasedStylus -.public GetRngSeed -.public GetSimpleMenuResult -.public GetSosMailCount -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetTime -.public GetWindow -.public GroundToDungeonMoveset -.public HIDDEN_POWER_BASE_POWER_TABLE -.public HandleSir0Translation -.public HidePortraitBox -.public InitMove -.public InitPreprocessorArgs -.public IqSkillFlagTest -.public Is2TurnsMove -.public IsAdvancedMenuActive2 -.public IsAdvancedTextBoxActive -.public IsCollectionMenuActive -.public IsCollectionMenuState3 -.public IsDebugMenuActive -.public IsDialogueBoxActive -.public IsExclusiveItemIdForMonster -.public IsExperienceLocked -.public IsGummi -.public IsItemInTimeDarkness -.public IsItemValidVeneer -.public IsMainCharacter -.public IsMovesetValidInTimeDarkness -.public IsNot2TurnsMoveOrSketch -.public IsOptionsMenuActive -.public IsParentMenuActive -.public IsRealMove -.public IsScrollBoxActive -.public IsShoppableItem -.public IsSimpleMenuActive -.public IsStorableItem -.public IsStorageFull -.public IsTeamSelectionMenuActive -.public IsTeamSelectionMenuState3 -.public IsThrownItem -.public IsTreasureBox -.public IsValidTeamMember -.public ItemZInit -.public KAOMADO_FILEPATH -.public KEYBOARD_STRING_IDS -.public LearnMoves -.public LoadFileFromRom -.public LoadOverlay -.public MISSION_FLOORS_FORBIDDEN -.public MISSION_FLOOR_RANKS_PTRS -.public MONSTER_SPRITE_DATA -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple -.public MemsetSimple -.public NOTIFY_NOTE -.public NormalizeTreasureBox -.public OS_GetLockID -.public OUTLAW_LEVEL_TABLE -.public OUTLAW_MINION_LEVEL_TABLE -.public OverlayIsLoaded -.public PARTNER_TALK_KIND_TABLE -.public PORTRAIT_LAYOUTS -.public PlayAdvancedTextBoxInputSound -.public PlayBgmByIdVeneer -.public PlaySeVolumeWrapper -.public PointsToZero -.public PreprocessString -.public PreprocessStringFromId -.public RANK_UP_TABLE -.public Rand16Bit -.public Rand32Bit -.public RandInt -.public RandIntSafe -.public ReadItemsFromSave -.public ReadMonsterInfoFromSave -.public ReadStringFromDialogueBox -.public RemoveActiveMembersFromAllTeams -.public RemoveActiveMembersFromRescueTeam -.public RemoveActiveMembersFromSpecialEpisodeTeam -.public RemoveEmptyItemsInBag -.public ResumeAdvancedMenu -.public SCRIPT_VARS -.public SCRIPT_VARS_LOCALS -.public SECONDARY_TERRAIN_TYPES -.public SPECIAL_EPISODE_MAIN_CHARACTERS -.public STATUSES_FULL_DESCRIPTION_STRING_IDS -.public SetActiveInventory -.public SetActiveKecleonShop -.public SetActiveTeam -.public SetAdvancedTextBoxField0x1C2 -.public SetAdvancedTextBoxPartialMenu -.public SetAdvancedTextBoxState5 -.public SetBothScreensWindowsColor -.public SetCollectionMenuField0x1BC -.public SetCollectionMenuVoidFn -.public SetCollectionMenuWidth -.public SetMoneyCarried -.public SetMoneyStored -.public SetRngSeed -.public SetSimpleMenuField0x1AC -.public SetTeamSetupHeroAndPartnerOnly -.public SetUnkAdvancedTextBoxFn -.public SetUnkAdvancedTextBoxWindowFn -.public ShowDialogueBox -.public ShowPortraitInPortraitBox -.public ShowStringIdInDialogueBox -.public ShowStringInDialogueBox -.public SortItemsInBag -.public SortItemsInStorage -.public StrcpyName -.public StrcpySimple -.public StringFromId -.public StrncmpSimple -.public StrncpyName -.public StrncpySimple -.public StrncpySimpleNoPad -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public TryPointCameraToMonster -.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE -.public UnloadFile -.public UpdateWindow -.public VERSION_EXCLUSIVE_MONSTERS -.public WONDER_MAIL_BITS_MAP -.public WONDER_MAIL_BITS_SWAP -.public WONDER_MAIL_ENCRYPTION_TABLE -.public WriteItemsToSave -.public WriteMonsterInfoToSave -.public ZInit8 .public _0209B08C .public _0209B09C .public _0209B0EC @@ -598,7 +322,215 @@ .public _f2d .public _fsub .public _s32_div_f +.public AddItemToStorage +.public AddMoneyCarried +.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS +.public ADVENTURE_LOG_PTR +.public AllocateTemp1024ByteBufferFromPool +.public ARM9_UNKNOWN_DATA__NA_209E6BC +.public ARM9_UNKNOWN_PTR__NA_20A2C84 +.public ARM9_UNKNOWN_TABLE__NA_209E12C +.public ARM9_UNKNOWN_TABLE__NA_209E164 +.public ARM9_UNKNOWN_TABLE__NA_209E280 +.public ARM9_UNKNOWN_TABLE__NA_20A20B0 +.public Arm9LoadUnkFieldNa0x2029EC8 +.public Arm9StoreUnkFieldNa0x2029ED8 +.public ArrayCopy32 +.public ArrayFill32 +.public BAG_CAPACITY_TABLE +.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES +.public BAG_ITEMS_PTR_MIRROR +.public CanMonsterUseMove +.public CardBackupError +.public CardPullOutWithStatus +.public CheckDebugMenuField0x1A4 +.public CheckOptionsMenuField0x1A4 +.public CheckParentMenuField0x1A0 +.public ClearWindow +.public CLIENT_LEVEL_TABLE +.public CloseAdvancedMenu +.public CloseAdvancedTextBox +.public CloseAdvancedTextBox2 +.public CloseCollectionMenu +.public CloseDebugMenu +.public CloseDialogueBox +.public CloseOptionsMenu +.public CloseParentMenu +.public ClosePortraitBox +.public CloseScrollBox +.public CloseSimpleMenu +.public CloseTeamSelectionMenu +.public CloseTextBox +.public CloseTextBox2 +.public ConvertStorageItemAtIdxToItem +.public CopyNStringFromId +.public CountNbOfItemsInStorage +.public CountNbOfValidItemsInStorage +.public CountNbOfValidItemsInTimeDarknessInStorage +.public CreateAdvancedMenu +.public CreateAdvancedTextBox +.public CreateAdvancedTextBoxWithArg +.public CreateCollectionMenu +.public CreateDebugMenu +.public CreateDialogueBox +.public CreateOptionsMenu +.public CreateParentMenu +.public CreateParentMenuFromStringIds +.public CreatePortraitBox +.public CreateScrollBoxMulti +.public CreateScrollBoxSingle +.public CreateSimpleMenu +.public CreateSimpleMenuFromStringIds +.public CreateTeamSelectionMenu +.public CreateTextBox +.public CreateTextBoxWithArg +.public Debug_FatalError +.public Debug_GetDebugFlag +.public Debug_GetLogFlag +.public Debug_Print +.public Debug_Print0 +.public Debug_SetDebugFlag +.public Debug_SetLogFlag +.public DecompressAtNormalVeneer +.public DEFAULT_HERO_ID +.public DexNumbersEqual +.public DirectoryFileMngr_OpenDirectoryFile +.public DisableIqSkill +.public DrawTextInWindow +.public DrawTileGrid +.public DUNGEON_DATA_LIST +.public DUNGEON_PTR +.public DUNGEON_RESTRICTIONS +.public DungeonSwapIdToIdx +.public DungeonSwapIdxToId +.public DungeonToGroundMoveset +.public EnableAllLearnableIqSkills +.public FemaleToMaleForm +.public FileClose +.public FileRom_HandleOpen +.public FileRom_HandleRead +.public FileRom_HandleSeek +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer +.public FileRom_Veneer_FileInit +.public FORBIDDEN_FORGOT_MOVE_LIST +.public FormatMoveStringMore +.public GAME_MODE +.public GetActiveRosterIndex +.public GetActiveTeamMember +.public GetActualSellPrice +.public GetAdvancedMenuCurrentOption +.public GetAdvancedMenuResult +.public GetAdvancedTextBoxFlags2 +.public GetAtSize +.public GetCurrentBagCapacity +.public GetDungeonModeSpecial +.public GetDungeonResultString +.public GetEvolutionPossibilities +.public GetHeldButtons +.public GetHero +.public GetHeroMemberIdx +.public GetInfoGroundMoveset +.public GetInfoMoveGround +.public GetIqSkillStringId +.public GetItemAtIdx +.public GetItemCategory +.public GetItemCategoryVeneer +.public GetItemIdFromList +.public GetItemMoveId16 +.public GetKeyM2NSwitch +.public GetKeyN2MSwitch +.public GetLanguage +.public GetLanguageType +.public GetLearnableIqSkills +.public GetMainCharacter1MemberIdx +.public GetMainCharacter2MemberIdx +.public GetMainCharacter3MemberIdx +.public GetMaxPp +.public GetMoneyCarried +.public GetMoneyStored +.public GetMonsterName +.public GetMoveRangeId +.public GetMovesetEggPtr +.public GetMovesetHmTmPtr +.public GetMovesetIdx__02013CAC +.public GetMovesetLevelUpPtr +.public GetMoveType +.public GetNbItemsInBag +.public GetNbMoves +.public GetNextIqSkill +.public GetOptionsMenuResult +.public GetOptionsMenuStates +.public GetPartner +.public GetPartnerMemberIdx +.public GetPartyMembers +.public GetPpIncrease +.public GetPressedButtons +.public GetReleasedStylus +.public GetRngSeed +.public GetSimpleMenuResult +.public GetSosMailCount +.public GetStringFromFileVeneer +.public GetTeamMember +.public GetTime +.public GetWindow +.public GLOBAL_PROGRESS_PTR +.public GroundToDungeonMoveset +.public GUEST_MONSTER_DATA +.public HandleSir0Translation +.public HIDDEN_POWER_BASE_POWER_TABLE +.public HidePortraitBox +.public InitMove +.public InitPreprocessorArgs +.public IqSkillFlagTest +.public Is2TurnsMove +.public IsAdvancedMenuActive2 +.public IsAdvancedTextBoxActive +.public IsCollectionMenuActive +.public IsCollectionMenuState3 +.public IsDebugMenuActive +.public IsDialogueBoxActive +.public IsExclusiveItemIdForMonster +.public IsExperienceLocked +.public IsGummi +.public IsItemInTimeDarkness +.public IsItemValidVeneer +.public IsMainCharacter +.public IsMovesetValidInTimeDarkness +.public IsNot2TurnsMoveOrSketch +.public IsOptionsMenuActive +.public IsParentMenuActive +.public IsRealMove +.public IsScrollBoxActive +.public IsShoppableItem +.public IsSimpleMenuActive +.public IsStorableItem +.public IsStorageFull +.public IsTeamSelectionMenuActive +.public IsTeamSelectionMenuState3 +.public IsThrownItem +.public IsTreasureBox +.public IsValidTeamMember +.public ItemZInit +.public KAOMADO_FILEPATH +.public KEYBOARD_STRING_IDS +.public LearnMoves +.public LoadFileFromRom +.public LoadOverlay +.public MemAlloc .public memcpy +.public MemcpySimple +.public MemFree +.public MemsetSimple +.public MemZero +.public MISSION_FLOOR_RANKS_PTRS +.public MISSION_FLOORS_FORBIDDEN +.public MONSTER_SPRITE_DATA +.public NormalizeTreasureBox +.public NOTIFY_NOTE +.public OS_GetLockID +.public OUTLAW_LEVEL_TABLE +.public OUTLAW_MINION_LEVEL_TABLE .public ov11_022E6E68 .public ov11_023061CC .public ov11_023061E4 @@ -614,12 +546,70 @@ .public ov29_022EA62C .public ov29_023002F0 .public ov29_02347100 +.public OverlayIsLoaded +.public PARTNER_TALK_KIND_TABLE +.public PlayAdvancedTextBoxInputSound +.public PlayBgmByIdVeneer +.public PlaySeVolumeWrapper +.public PointsToZero +.public PORTRAIT_LAYOUTS +.public PreprocessString +.public PreprocessStringFromId +.public Rand16Bit +.public Rand32Bit +.public RandInt +.public RandIntSafe +.public RANK_UP_TABLE +.public ReadItemsFromSave +.public ReadMonsterInfoFromSave +.public ReadStringFromDialogueBox +.public RemoveActiveMembersFromAllTeams +.public RemoveActiveMembersFromRescueTeam +.public RemoveActiveMembersFromSpecialEpisodeTeam +.public RemoveEmptyItemsInBag +.public ResumeAdvancedMenu +.public SCRIPT_VARS +.public SCRIPT_VARS_LOCALS +.public SECONDARY_TERRAIN_TYPES +.public SetActiveInventory +.public SetActiveKecleonShop +.public SetActiveTeam +.public SetAdvancedTextBoxField0x1C2 +.public SetAdvancedTextBoxPartialMenu +.public SetAdvancedTextBoxState5 +.public SetBothScreensWindowsColor +.public SetCollectionMenuField0x1BC +.public SetCollectionMenuVoidFn +.public SetCollectionMenuWidth +.public SetMoneyCarried +.public SetMoneyStored +.public SetRngSeed +.public SetSimpleMenuField0x1AC +.public SetTeamSetupHeroAndPartnerOnly +.public SetUnkAdvancedTextBoxFn +.public SetUnkAdvancedTextBoxWindowFn +.public ShowDialogueBox +.public ShowPortraitInPortraitBox +.public ShowStringIdInDialogueBox +.public ShowStringInDialogueBox +.public SortItemsInBag +.public SortItemsInStorage +.public SPECIAL_EPISODE_MAIN_CHARACTERS .public sprintf +.public STATUSES_FULL_DESCRIPTION_STRING_IDS .public strcat .public strcpy +.public StrcpyName +.public StrcpySimple +.public StringFromId .public strlen .public strncmp +.public StrncmpSimple .public strncpy +.public StrncpyName +.public StrncpySimple +.public StrncpySimpleNoPad +.public StrncpySimpleNoPadSafe .public sub_01FF8F28 .public sub_02001808 .public sub_02002580 @@ -719,8 +709,6 @@ .public sub_0202D134 .public sub_0202D16C .public sub_0202D59C -.public sub_0202D5B0 -.public sub_0202D5E4 .public sub_0202DF64 .public sub_0202F16C .public sub_0202F190 @@ -813,4 +801,16 @@ .public sub_02083B14 .public sub_02083B3C .public sub_02084304 +.public TEAM_MEMBER_TABLE_PTR +.public TryPointCameraToMonster +.public UnloadFile +.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE +.public UpdateWindow +.public VERSION_EXCLUSIVE_MONSTERS .public vsprintf +.public WONDER_MAIL_BITS_MAP +.public WONDER_MAIL_BITS_SWAP +.public WONDER_MAIL_ENCRYPTION_TABLE +.public WriteItemsToSave +.public WriteMonsterInfoToSave +.public ZInit8 diff --git a/asm/include/main_020897DC.inc b/asm/include/main_020897DC.inc index 01a04a95..0a706d85 100644 --- a/asm/include/main_020897DC.inc +++ b/asm/include/main_020897DC.inc @@ -1952,6 +1952,7 @@ .public DseTrackEvent_WaitDelta .public DseTrackEvent_WaitSame .public DseTrackEvent_WaitUntilFadeout +.public GetCharWidth .public GetKeyM2N .public GetKeyM2NBaseForm .public GetKeyN2M @@ -2036,7 +2037,6 @@ .public sub_02026070 .public sub_020260B4 .public sub_020260C4 -.public sub_0202654C .public sub_02026594 .public sub_020350D4 .public sub_02035154 diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index 6cb99255..a3f79da8 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -32,6 +32,7 @@ .public EnableIrqFlag .public FileInit .public G3X_Reset +.public GetDsFirmwareUserSettings .public GetFadeStatus .public GetLanguage .public GetProcessorMode @@ -185,7 +186,6 @@ .public sub_0207B1E8 .public sub_0207B854 .public sub_0207B9EC -.public sub_0207BA08 .public sub_0207BB50 .public sub_0207BC4C .public sub_0207BD3C diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 249eb5cf..9673c807 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -32,6 +32,7 @@ .public CreateTextBox .public Debug_Print0 .public DeleteWanTableEntryVeneer +.public DrawChar .public DrawTextInWindow .public EnableIrqFlag .public FemaleToMaleForm @@ -282,7 +283,6 @@ .public sub_02025480 .public sub_02025D50 .public sub_02026268 -.public sub_0202676C .public sub_0202737C .public sub_02027B1C .public sub_020288FC diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index 8d4300d1..5bc44402 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -21,6 +21,7 @@ .public G2S_GetBG0ScrPtr .public G2x_ChangeBlendBrightness_ .public G2x_SetBlendBrightness_ +.public GetDsFirmwareUserSettings .public GetLanguage .public GX_DisableBankForARM7 .public GX_DisableBankForBG @@ -200,7 +201,6 @@ .public sub_0207B854 .public sub_0207B860 .public sub_0207B9EC -.public sub_0207BA08 .public sub_0207C650 .public sub_0207C7DC .public sub_0207C7FC diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc index e8d60317..ccf49830 100644 --- a/asm/include/overlay_07.inc +++ b/asm/include/overlay_07.inc @@ -13,6 +13,7 @@ .public GetKeyboardStringResult .public GetLanguageType .public GetMainTeamNameWithCheck +.public GetOptionsMenuResult .public GetStringFromFileVeneer .public InitPreprocessorArgs .public IsCollectionMenuActive @@ -126,7 +127,6 @@ .public sub_0202C75C .public sub_0202D07C .public sub_0202D59C -.public sub_0202D5E4 .public sub_0202F954 .public sub_02037468 .public sub_0203909C diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc index 31abbab5..8f30b5d5 100644 --- a/asm/include/overlay_08.inc +++ b/asm/include/overlay_08.inc @@ -8,6 +8,7 @@ .public Debug_Print0 .public DS_DOWNLOAD_TEAMS .public FileInit +.public GetDsFirmwareUserSettings .public GetLanguage .public GetPressedButtons .public InitPreprocessorArgs @@ -63,7 +64,6 @@ .public sub_02046C78 .public sub_02046D20 .public sub_0207B9EC -.public sub_0207BA08 .public sub_0207F6C4 .public sub_0207F70C .public WaitForever2 diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc index d360a818..70670b13 100644 --- a/asm/include/overlay_13.inc +++ b/asm/include/overlay_13.inc @@ -14,6 +14,7 @@ .public FemaleToMaleForm .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult +.public GetDsFirmwareUserSettingsVeneer .public GetKeyboardStatus .public GetKeyboardStringResult .public GetMonsterGenderVeneer @@ -70,7 +71,6 @@ .public StrcpyName .public StrcpySimple .public StrncpySimpleNoPadSafe -.public sub_02004F74 .public sub_02017B7C .public sub_02017C74 .public sub_02017CB4 diff --git a/asm/include/overlay_15_0238B054.inc b/asm/include/overlay_15_0238B054.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_15_0238B054.inc +++ b/asm/include/overlay_15_0238B054.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_29_02300BF8.inc b/asm/include/overlay_29_02300BF8.inc index 2b41ab8b..65d36a34 100644 --- a/asm/include/overlay_29_02300BF8.inc +++ b/asm/include/overlay_29_02300BF8.inc @@ -1,6 +1,6 @@ #pragma once .public IsChargingAnyTwoTurnMove .public IsExperienceLocked -.public ShouldMonsterRunAway .public ov29_023008DC .public ov29_02300D00 +.public ShouldMonsterRunAway diff --git a/asm/include/overlay_29_02300D00.inc b/asm/include/overlay_29_02300D00.inc index c5080499..ca7d458b 100644 --- a/asm/include/overlay_29_02300D00.inc +++ b/asm/include/overlay_29_02300D00.inc @@ -10,8 +10,6 @@ .public IsCurrentTilesetBackground .public IsTacticSet .public ItemIsActive__022FF898 -.public SECONDARY_TERRAIN_TYPES -.public ShouldMonsterRunAway .public ov29_0235171E .public ov29_02352770 .public ov29_02352778 @@ -19,3 +17,5 @@ .public ov29_02352788 .public ov29_02352790 .public ov29_02352798 +.public SECONDARY_TERRAIN_TYPES +.public ShouldMonsterRunAway diff --git a/asm/include/overlay_29_0233861C.inc b/asm/include/overlay_29_0233861C.inc index 387331fa..1d50425b 100644 --- a/asm/include/overlay_29_0233861C.inc +++ b/asm/include/overlay_29_0233861C.inc @@ -1,9 +1,13 @@ #pragma once -.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN +.public _020AFC4C +.public _020AFC70 +.public _s32_div_f +.public abs .public ConvertWallsToChasms +.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN .public DIRECTIONS_XY -.public DUNGEON_PTR .public DirectoryFileMngr_OpenDirectoryFile +.public DUNGEON_PTR .public DungeonRandInt .public DungeonRandRange .public GenerateSecondaryTerrainFormations @@ -16,8 +20,8 @@ .public GetTile .public GetTileSafe .public GetTrapInfo -.public HIDDEN_STAIRS_SPAWN_BLOCKED .public HandleSir0Translation +.public HIDDEN_STAIRS_SPAWN_BLOCKED .public InitRender3dElement64 .public IsCurrentMissionType .public IsCurrentMissionTypeExact @@ -35,27 +39,9 @@ .public MarkEnemySpawns .public MarkNonEnemySpawns .public MarkShopkeeperSpawn -.public MemZero .public Memcpy32 +.public MemZero .public MultiplyByFixedPoint -.public PlaceFixedRoomTile -.public PlayEffectAnimationPos -.public PosIsOutOfBounds -.public ProcessWte -.public ResetHiddenStairsSpawn -.public ResetImportantSpawnPositions -.public ResetInnerBoundaryTileRows -.public SECONDARY_TERRAIN_TYPES -.public ShouldMinimapDisplayEntity -.public StairsAlwaysReachable -.public TILESET_PROPERTIES -.public TeamMemberHasExclusiveItemEffectActive -.public UnloadFile -.public UpdateTrapsVisibility -.public _020AFC4C -.public _020AFC70 -.public _s32_div_f -.public abs .public ov10_022BFD20 .public ov10_022C6326 .public ov29_022DE288 @@ -84,6 +70,16 @@ .public ov29_0237CD40 .public ov29_0237CFB8 .public ov29_0237CFBC +.public PlaceFixedRoomTile +.public PlayEffectAnimationPos +.public PosIsOutOfBounds +.public ProcessWte +.public ResetHiddenStairsSpawn +.public ResetImportantSpawnPositions +.public ResetInnerBoundaryTileRows +.public SECONDARY_TERRAIN_TYPES +.public ShouldMinimapDisplayEntity +.public StairsAlwaysReachable .public sub_020018D0 .public sub_0200A174 .public sub_0200B330 @@ -95,3 +91,7 @@ .public sub_0204AEA0 .public sub_0204AEC0 .public sub_0204AF30 +.public TeamMemberHasExclusiveItemEffectActive +.public TILESET_PROPERTIES +.public UnloadFile +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_02340CE4.inc b/asm/include/overlay_29_02340CE4.inc index e085bc50..a312d8e0 100644 --- a/asm/include/overlay_29_02340CE4.inc +++ b/asm/include/overlay_29_02340CE4.inc @@ -1,7 +1,9 @@ #pragma once +.public _s32_div_f +.public abs .public CountStickyItemsInBag -.public DUNGEON_PTR .public DetermineAllTilesWalkableNeighbors +.public DUNGEON_PTR .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandRange @@ -32,12 +34,12 @@ .public GetSpecialTargetItem .public GetTile .public GetTileSafe +.public HandleSir0Translation .public HIDDEN_STAIRS_SPAWN_BLOCKED .public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER -.public HandleSir0Translation +.public InitializeTile .public InitOtherMonsterData .public InitStandardItem -.public InitializeTile .public IsBagFull .public IsCurrentMissionType .public IsDestinationFloor @@ -51,32 +53,12 @@ .public LoadFileFromRom .public LoadScriptVariableValue .public LogMessageByIdWithPopupCheckUser -.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS -.public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS .public MemAlloc .public MemFree .public MemZero +.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS +.public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS .public MultiplyByFixedPoint -.public PointsToZero -.public PosIsOutOfBounds -.public SHOP_ITEM_CHANCES -.public SetMonsterLevelAndId -.public SetShouldBoostHiddenStairsSpawnChance -.public SetShouldBoostKecleonShopSpawnChance -.public ShouldBoostHiddenStairsSpawnChance -.public ShouldBoostKecleonShopSpawnChance -.public SpawnEnemyTrapAtPos -.public SpawnItem -.public SpawnMonster -.public StartFadeDungeonWrapper -.public SubstitutePlaceholderStringTags -.public TREASURE_BOX_1_ITEM_IDS -.public UnloadFile -.public UpdateMinimap -.public UpdateTrapsVisibility -.public ZInit8 -.public _s32_div_f -.public abs .public ov10_022C4B34 .public ov10_022C6C74 .public ov10_022C6C75 @@ -119,4 +101,22 @@ .public ov29_0237CFBC .public ov29_0237CFC0 .public ov29_0237CFFC +.public PointsToZero +.public PosIsOutOfBounds +.public SetMonsterLevelAndId +.public SetShouldBoostHiddenStairsSpawnChance +.public SetShouldBoostKecleonShopSpawnChance +.public SHOP_ITEM_CHANCES +.public ShouldBoostHiddenStairsSpawnChance +.public ShouldBoostKecleonShopSpawnChance +.public SpawnEnemyTrapAtPos +.public SpawnItem +.public SpawnMonster +.public StartFadeDungeonWrapper .public sub_02056880 +.public SubstitutePlaceholderStringTags +.public TREASURE_BOX_1_ITEM_IDS +.public UnloadFile +.public UpdateMinimap +.public UpdateTrapsVisibility +.public ZInit8 diff --git a/asm/main_02003DB8.s b/asm/main_02003DB8.s index 54c3854f..fcfe8065 100644 --- a/asm/main_02003DB8.s +++ b/asm/main_02003DB8.s @@ -1282,13 +1282,13 @@ _02004F6C: .word 0x00000020 _02004F70: .word 0x00000021 arm_func_end UnloadOverlay - arm_func_start sub_02004F74 -sub_02004F74: ; 0x02004F74 - ldr ip, _02004F7C ; =sub_0207BA08 + arm_func_start GetDsFirmwareUserSettingsVeneer +GetDsFirmwareUserSettingsVeneer: ; 0x02004F74 + ldr ip, _02004F7C ; =GetDsFirmwareUserSettings bx ip .align 2, 0 -_02004F7C: .word sub_0207BA08 - arm_func_end sub_02004F74 +_02004F7C: .word GetDsFirmwareUserSettings + arm_func_end GetDsFirmwareUserSettingsVeneer arm_func_start sub_02004F80 sub_02004F80: ; 0x02004F80 @@ -3693,17 +3693,17 @@ sub_02006ED4: ; 0x02006ED4 bx lr arm_func_end sub_02006ED4 - arm_func_start sub_02006EF8 -sub_02006EF8: ; 0x02006EF8 + arm_func_start DebugPrintSystemClock +DebugPrintSystemClock: ; 0x02006EF8 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x3c bl sub_0208266C add r0, sp, #0x20 - bl sub_02006F68 + bl GetSystemClock add r0, sp, #0x20 add r1, sp, #0 ldr r4, _02006F34 ; =_0209277C - bl sub_02006FB8 + bl SprintfSystemClock ldr r0, _02006F38 ; =_0209278C add r2, sp, #0 mov r1, r4 @@ -3713,7 +3713,7 @@ sub_02006EF8: ; 0x02006EF8 .align 2, 0 _02006F34: .word _0209277C _02006F38: .word _0209278C - arm_func_end sub_02006EF8 + arm_func_end DebugPrintSystemClock arm_func_start sub_02006F3C sub_02006F3C: ; 0x02006F3C @@ -3730,8 +3730,8 @@ sub_02006F3C: ; 0x02006F3C bx lr arm_func_end sub_02006F3C - arm_func_start sub_02006F68 -sub_02006F68: ; 0x02006F68 + arm_func_start GetSystemClock +GetSystemClock: ; 0x02006F68 stmdb sp!, {r4, lr} sub sp, sp, #0x28 mov r4, r0 @@ -3752,10 +3752,10 @@ sub_02006F68: ; 0x02006F68 bl sub_02006F3C add sp, sp, #0x28 ldmia sp!, {r4, pc} - arm_func_end sub_02006F68 + arm_func_end GetSystemClock - arm_func_start sub_02006FB8 -sub_02006FB8: ; 0x02006FB8 + arm_func_start SprintfSystemClock +SprintfSystemClock: ; 0x02006FB8 stmdb sp!, {r3, lr} sub sp, sp, #0x10 mov r3, r0 @@ -3776,7 +3776,7 @@ sub_02006FB8: ; 0x02006FB8 ldmia sp!, {r3, pc} .align 2, 0 _02007000: .word _02092798 - arm_func_end sub_02006FB8 + arm_func_end SprintfSystemClock arm_func_start sub_02007004 sub_02007004: ; 0x02007004 diff --git a/asm/main_020082C4.s b/asm/main_020082C4.s index 1c019d0f..1e58b8cd 100644 --- a/asm/main_020082C4.s +++ b/asm/main_020082C4.s @@ -75,7 +75,7 @@ _02008388: blt _02008388 mov r0, r8 bl sub_02007004 - bl sub_02006EF8 + bl DebugPrintSystemClock bl sub_02007380 bl sub_02007384 ldr r0, _02008434 ; =_0209297C diff --git a/asm/main_0200ED1C.s b/asm/main_0200ED1C.s index d6a96040..a27fe5bd 100644 --- a/asm/main_0200ED1C.s +++ b/asm/main_0200ED1C.s @@ -22364,7 +22364,7 @@ sub_0202057C: ; 0x0202057C stmdb sp!, {lr} sub sp, sp, #0x54 add r0, sp, #0 - bl sub_02004F74 + bl GetDsFirmwareUserSettingsVeneer ldrsb r0, [sp] bl sub_020205C0 #ifdef EUROPE diff --git a/asm/main_0202598C.s b/asm/main_0202598C.s index f843d3f2..327d4f5d 100644 --- a/asm/main_0202598C.s +++ b/asm/main_0202598C.s @@ -873,7 +873,7 @@ sub_02026048: ; 0x02026048 ldr ip, [r0, #0x110] str ip, [sp] ldrsb r0, [r0] - bl sub_0202676C + bl DrawChar ldmia sp!, {r3, pc} arm_func_end sub_02026048 @@ -1314,12 +1314,12 @@ sub_020264F8: ; 0x020264F8 mov r1, r6 mov r2, r5 mov r3, r4 - bl sub_0202676C + bl DrawChar ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end sub_020264F8 - arm_func_start sub_0202654C -sub_0202654C: ; 0x0202654C + arm_func_start GetCharWidth +GetCharWidth: ; 0x0202654C stmdb sp!, {r3, lr} ldr r1, _02026590 ; =_020AFD04 mov r3, r0 @@ -1348,7 +1348,7 @@ _0202657C: ldmia sp!, {r3, pc} .align 2, 0 _02026590: .word _020AFD04 - arm_func_end sub_0202654C + arm_func_end GetCharWidth arm_func_start sub_02026594 sub_02026594: ; 0x02026594 @@ -1369,12 +1369,12 @@ _020265A4: .word _020AFD04 arm_func_start sub_020265A8 sub_020265A8: ; 0x020265A8 ldr ip, _020265B8 ; =sub_02022118 - ldr r1, _020265BC ; =sub_0202654C + ldr r1, _020265BC ; =GetCharWidth ldr r2, _020265C0 ; =sub_02026594 bx ip .align 2, 0 _020265B8: .word sub_02022118 -_020265BC: .word sub_0202654C +_020265BC: .word GetCharWidth _020265C0: .word sub_02026594 arm_func_end sub_020265A8 @@ -1515,8 +1515,8 @@ _02026764: bx lr arm_func_end GetColorCodePaletteOffset - arm_func_start sub_0202676C -sub_0202676C: ; 0x0202676C + arm_func_start DrawChar +DrawChar: ; 0x0202676C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} #ifdef JAPAN sub sp, sp, #0x34 @@ -2252,7 +2252,7 @@ _02026B0C: _02026B14: .word _020AFD04 _02026B18: .word _022A7A5C #endif - arm_func_end sub_0202676C + arm_func_end DrawChar arm_func_start sub_02026B1C sub_02026B1C: ; 0x02026B1C @@ -10759,8 +10759,8 @@ sub_0202D59C: ; 0x0202D59C ldmia sp!, {r3, pc} arm_func_end sub_0202D59C - arm_func_start sub_0202D5B0 -sub_0202D5B0: ; 0x0202D5B0 + arm_func_start GetOptionsMenuStates +GetOptionsMenuStates: ; 0x0202D5B0 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 bl GetWindowContents @@ -10776,10 +10776,10 @@ _0202D5D0: cmp r0, #0 beq _0202D5C4 ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0202D5B0 + arm_func_end GetOptionsMenuStates - arm_func_start sub_0202D5E4 -sub_0202D5E4: ; 0x0202D5E4 + arm_func_start GetOptionsMenuResult +GetOptionsMenuResult: ; 0x0202D5E4 stmdb sp!, {r3, lr} bl GetWindowContents ldrb r1, [r0, #0x1a4] @@ -10794,7 +10794,7 @@ sub_0202D5E4: ; 0x0202D5E4 _0202D610: mov r0, #0 ldmia sp!, {r3, pc} - arm_func_end sub_0202D5E4 + arm_func_end GetOptionsMenuResult arm_func_start UpdateOptionsMenu UpdateOptionsMenu: ; 0x0202D618 diff --git a/asm/main_02034974.s b/asm/main_02034974.s index 419c4e44..645b963e 100644 --- a/asm/main_02034974.s +++ b/asm/main_02034974.s @@ -1192,7 +1192,7 @@ _02035920: ldr r0, _02035CCC ; =_020AFDD0 ldr r0, [r0, #4] ldrsb r0, [r0] - bl sub_0202D5E4 + bl GetOptionsMenuResult ldr r1, _02035CCC ; =_020AFDD0 tst r0, #0xff strb r0, [r1, #1] @@ -1644,7 +1644,7 @@ _02035F64: ldr r0, _0203630C ; =_020AFDD8 ldr r0, [r0, #4] ldrsb r0, [r0] - bl sub_0202D5E4 + bl GetOptionsMenuResult ldr r1, _0203630C ; =_020AFDD8 tst r0, #0xff strb r0, [r1] @@ -1679,7 +1679,7 @@ _02035FE8: ldr r0, _0203630C ; =_020AFDD8 ldr r1, [r0, #4] ldrsb r0, [r1], #0xb0 - bl sub_0202D5B0 + bl GetOptionsMenuStates ldr r0, _0203630C ; =_020AFDD8 ldr r0, [r0, #4] add r0, r0, r4, lsl #2 diff --git a/asm/main_0207B854.s b/asm/main_0207B854.s index 4c0f85ac..7f6872d9 100644 --- a/asm/main_0207B854.s +++ b/asm/main_0207B854.s @@ -148,8 +148,8 @@ _0207BA00: .word MemcpyFast _0207BA04: .word 0x027FFCF4 arm_func_end sub_0207B9EC - arm_func_start sub_0207BA08 -sub_0207BA08: ; 0x0207BA08 + arm_func_start GetDsFirmwareUserSettings +GetDsFirmwareUserSettings: ; 0x0207BA08 stmdb sp!, {r4, lr} ldr ip, _0207BA88 ; =0x027FFC80 mov r4, r0 @@ -184,7 +184,7 @@ sub_0207BA08: ; 0x0207BA08 ldmia sp!, {r4, pc} .align 2, 0 _0207BA88: .word 0x027FFC80 - arm_func_end sub_0207BA08 + arm_func_end GetDsFirmwareUserSettings arm_func_start CountLeadingZeros CountLeadingZeros: ; 0x0207BA8C diff --git a/asm/main_020897DC.s b/asm/main_020897DC.s index e8a50dd8..5be2f585 100644 --- a/asm/main_020897DC.s +++ b/asm/main_020897DC.s @@ -13208,7 +13208,7 @@ _0209AB9C: .word sub_02026000 .word sub_02026020 .word sub_02026038 - .word sub_0202654C + .word GetCharWidth .word sub_02026594 .word sub_02026048 .word sub_02026060 @@ -13544,7 +13544,7 @@ _0209AB9C: .word sub_02026000 .word sub_02026020 .word sub_02026038 - .word sub_0202654C + .word GetCharWidth .word sub_02026594 .word sub_02026048 .word sub_02026060 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index ea61caaa..b886c904 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -39108,7 +39108,7 @@ _022DCBB8: add r8, r8, #2 blt _022DCBB8 add r0, sp, #0x38 - bl sub_0207BA08 + bl GetDsFirmwareUserSettings ldrb r0, [sp, #0x38] ldr r2, _022DCD80 ; =ov00_02318D08 mov r1, #3 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 487374ce..b1c2e4d7 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -14588,7 +14588,7 @@ _02334F74: mov r2, r5 #endif str r6, [sp] - bl sub_0202676C + bl DrawChar _02334F94: add r8, r8, #1 add r7, r7, #2 @@ -14642,7 +14642,7 @@ _02334FF8: str r0, [sp] mov r0, sl add r2, r4, #0x14 - bl sub_0202676C + bl DrawChar _02335034: add r0, r6, #1 mov r0, r0, lsl #0x10 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index e419286f..a064e450 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -41171,7 +41171,7 @@ ov02_02346174: ; 0x02346174 mov r0, #2 bl ov02_02334DE8 add r0, sp, #0x16 - bl sub_0207BA08 + bl GetDsFirmwareUserSettings add r1, sp, #0 mov r0, #0 mov r2, #0x16 @@ -44617,7 +44617,7 @@ _02348D3C: add r1, r1, #0x1300 strh r0, [r1, #0x7c] add r0, sp, #0 - bl sub_0207BA08 + bl GetDsFirmwareUserSettings ldr r1, _02348E1C ; =ov02_0235AB58 ldr r0, _02348E28 ; =ov02_02352E04 ldr r1, [r1] @@ -45928,7 +45928,7 @@ ov02_02349F3C: ; 0x02349F3C mov r5, r0 add r0, sp, #0x28 mov r4, r1 - bl sub_0207BA08 + bl GetDsFirmwareUserSettings ldrb r2, [sp, #0x12] ldrb r1, [sp, #0x29] ldrh r3, [sp, #0x42] diff --git a/asm/overlay_07.s b/asm/overlay_07.s index 136feb49..c624038f 100644 --- a/asm/overlay_07.s +++ b/asm/overlay_07.s @@ -5536,7 +5536,7 @@ _02340FFC: bne _023410A0 add r0, r4, #0x200 ldrsb r0, [r0, #0xb8] - bl sub_0202D5E4 + bl GetOptionsMenuResult cmp r0, #0 beq _02341098 ldr r0, [r4, #0x2bc] diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 818cd908..94a53bcc 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -497,7 +497,7 @@ _0233CF8C: cmp r6, #3 blt _0233CF8C add r0, sp, #0 - bl sub_0207BA08 + bl GetDsFirmwareUserSettings ldr r0, _0233D0E0 ; =ov08_0233EC28 ldrb r1, [sp, #1] ldr r4, [r0, #4] diff --git a/asm/overlay_13.s b/asm/overlay_13.s index 60c87fa4..cc234959 100644 --- a/asm/overlay_13.s +++ b/asm/overlay_13.s @@ -101,7 +101,7 @@ _0238A6B4: b _0238A6F4 _0238A6E0: add r0, sp, #0xd4 - bl sub_02004F74 + bl GetDsFirmwareUserSettingsVeneer ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldrb r1, [sp, #0xd5] ldr r0, [r0]