diff --git a/asm/include/main_02051098.inc b/asm/include/main_02051098.inc index fc838b62..44e15ef9 100644 --- a/asm/include/main_02051098.inc +++ b/asm/include/main_02051098.inc @@ -1,7 +1,7 @@ #pragma once -.public _020AFF7C .public _020AFF80 .public _020AFF88 .public CopyBitsFrom .public CopyBitsTo .public DUNGEON_RESTRICTIONS +.public MT_TABLE diff --git a/asm/include/main_0205B5A8.inc b/asm/include/main_0205B5A8.inc index 13b28e80..9967ad84 100644 --- a/asm/include/main_0205B5A8.inc +++ b/asm/include/main_0205B5A8.inc @@ -2,14 +2,14 @@ .public _020A3678 .public GetLanguageType .public GetStringFromFileVeneer +.public MtInit +.public MtNext .public Rand16Bit .public RandInt +.public ReadMissionMtStateLower .public StrcpyName .public sub_02025304_JP -.public sub_020510E8 -.public sub_02051134 .public sub_0205B6EC .public sub_0205B738 .public sub_0205BAB0 -.public sub_020634F4 -.public sub_02063504 +.public WriteMissionMtState diff --git a/asm/include/main_0205BA0C.inc b/asm/include/main_0205BA0C.inc index a2ea6435..36831735 100644 --- a/asm/include/main_0205BA0C.inc +++ b/asm/include/main_0205BA0C.inc @@ -4,10 +4,10 @@ .public GetLanguageType .public GetMainTeamNameWithCheck .public GetMaxRescueAttempts +.public MtInit +.public MtNext .public Rand16Bit .public RandInt -.public sub_020510E8 -.public sub_02051134 +.public ReadMissionMtStateLower .public sub_0205B560 -.public sub_020634F4 -.public sub_02063504 +.public WriteMissionMtState diff --git a/asm/include/main_0205D1F4.inc b/asm/include/main_0205D1F4.inc index 2fdef09a..1a7b3d87 100644 --- a/asm/include/main_0205D1F4.inc +++ b/asm/include/main_0205D1F4.inc @@ -19,10 +19,10 @@ .public MemAlloc .public MemFree .public MISSION_DELIVER_LIST_PTR +.public MtNext .public RandInt .public RandIntSafe .public RollRandomItemReward -.public sub_02051134 .public sub_0205CF58 .public sub_0205E090 .public sub_0205E1E8 diff --git a/asm/include/main_0205E48C.inc b/asm/include/main_0205E48C.inc index 96555fd0..314b9099 100644 --- a/asm/include/main_0205E48C.inc +++ b/asm/include/main_0205E48C.inc @@ -10,14 +10,14 @@ .public GetRandomMissionTemplate .public GetResolvedPerformanceProgressFlag .public MISSION_DELIVER_LIST_PTR +.public MtInit +.public MtNext .public Rand16Bit .public RandRangeSafe -.public sub_020510E8 -.public sub_02051134 +.public ReadMissionMtStateLower .public sub_0205E9A8 .public sub_0205EB28 .public sub_0205EB5C .public sub_02062548 -.public sub_020634F4 -.public sub_02063504 .public SumValidMissionCategoryWeights +.public WriteMissionMtState diff --git a/asm/include/main_0205EB00.inc b/asm/include/main_0205EB00.inc index 81adf5ff..e95209e4 100644 --- a/asm/include/main_0205EB00.inc +++ b/asm/include/main_0205EB00.inc @@ -2,4 +2,4 @@ .public GetAllPossibleMonsters .public MISSION_DELIVER_LIST_PTR .public RandInt -.public sub_02065B94 +.public SetRandomRequestNpc03KindVar diff --git a/asm/include/main_0205EDA4.inc b/asm/include/main_0205EDA4.inc index 54e26ce7..9a7f0984 100644 --- a/asm/include/main_0205EDA4.inc +++ b/asm/include/main_0205EDA4.inc @@ -31,7 +31,6 @@ .public _020A93B4 .public _020AFC70 .public _020B0A54 -.public _020B0AD8 .public _020B0AFC .public _020B0B04 .public _020B0B08 @@ -224,6 +223,7 @@ .public ReadSaveHeader .public REMOTE_STRING_PTR_TABLE .public RemoveFirstUnequippedItemOfType +.public RESCUE_BIN_UNPACK .public RetrieveFromItemList2 .public SaveScriptVariableValue .public SetAdventureLogStructLocation diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 28ae6e86..d7d53116 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -107,6 +107,7 @@ .public IqSkillFlagTest .public IsBagFull .public IsDialogueBoxActive +.public IsMePlaying .public IsMonsterOnTeam .public IsStorageFull .public IsStoryAfterPoint @@ -513,6 +514,7 @@ .public SetDungeonConquest .public SetEnterDungeon .public SetMemAllocatorParams +.public SetNewFriendActor .public SetPortraitEmotion .public SetPortraitLayout .public SetPortraitOffset @@ -523,6 +525,7 @@ .public SetTeamSetupHeroAndPartnerOnly .public SetTeamSetupHeroOnly .public SetupAndShowKeyboard +.public SetWorldMapLevel .public ShowPortraitInPortraitBox .public ShowStringIdInDialogueBox .public SpecialProcAddItemToBag @@ -598,7 +601,6 @@ .public sub_02017BEC .public sub_02017BF8 .public sub_02017C04 -.public sub_02017C10 .public sub_02017C50 .public sub_02017C5C .public sub_02017C68 @@ -646,7 +648,6 @@ .public sub_02048614 .public sub_02049338 .public sub_0204964C -.public sub_0204CDE8 .public sub_0204CE48 .public sub_0204D018 .public sub_0204E6FC @@ -690,7 +691,6 @@ .public sub_0206309C .public sub_02064FFC .public sub_02065050 -.public sub_02065BC8 .public sub_02065BD8 .public sub_02065C08 .public sub_02065CB0 diff --git a/asm/include/overlay_11_022EE5E4.inc b/asm/include/overlay_11_022EE5E4.inc index 4af1e482..db1371c9 100644 --- a/asm/include/overlay_11_022EE5E4.inc +++ b/asm/include/overlay_11_022EE5E4.inc @@ -131,6 +131,7 @@ .public InitPreprocessorArgs .public InitRender3dElement64 .public InitScriptRoutine +.public IsAcceptedMissionSlotEmpty .public IsAdvancedMenuActive .public IsAdvancedMenuActive2 .public IsAdvancedTextBoxActive @@ -770,6 +771,7 @@ .public SetInventoryMenuState0 .public SetInventoryMenuState6 .public SetItemAcquired +.public SetNewFriendActor .public SetParentMenuState7 .public SetSpriteIdForAnimationControl .public ShowDialogueBox @@ -963,7 +965,6 @@ .public sub_0205882C .public sub_02058AFC .public sub_0205B028 -.public sub_0205F0F0 .public sub_02061F44 .public sub_02061F90 .public sub_02062DB4 @@ -972,7 +973,6 @@ .public sub_02065014 .public sub_02065050 .public sub_0206549C -.public sub_02065BC8 .public sub_02065C08 .public sub_020664B8 .public sub_02066510 diff --git a/asm/include/overlay_17_0238A754.inc b/asm/include/overlay_17_0238A754.inc index ba9045e7..a69d9684 100644 --- a/asm/include/overlay_17_0238A754.inc +++ b/asm/include/overlay_17_0238A754.inc @@ -28,6 +28,7 @@ .public InitPortraitParamsWithMonsterId .public IsDialogueBoxActive .public IsMainCharacter +.public IsMePlaying .public IsSimpleMenuActive .public ov11_022DC504 .public ov17_0238A278 @@ -42,7 +43,6 @@ .public ShowDialogueBox .public ShowPortraitInPortraitBox .public ShowStringIdInDialogueBox -.public sub_02017C10 .public sub_02017C50 .public sub_020307EC .public sub_02039C3C diff --git a/asm/include/overlay_20.inc b/asm/include/overlay_20.inc index 1be08424..8a900097 100644 --- a/asm/include/overlay_20.inc +++ b/asm/include/overlay_20.inc @@ -33,6 +33,7 @@ .public InitStandardItem .public IsBagFull .public IsCollectionMenuActive +.public IsMePlaying .public IsScriptMenuReturnDisabled .public IsScrollBoxActive .public IsSimpleMenuActive @@ -75,7 +76,6 @@ .public sub_020125CC .public sub_0201271C .public sub_02012874 -.public sub_02017C10 .public sub_02017C50 .public sub_02025D50 .public sub_02027B1C diff --git a/asm/include/overlay_24.inc b/asm/include/overlay_24.inc index 8843836d..964ae40c 100644 --- a/asm/include/overlay_24.inc +++ b/asm/include/overlay_24.inc @@ -28,6 +28,7 @@ .public InitPreprocessorArgs .public IsBagFull .public IsDialogueBoxActive +.public IsMePlaying .public MemAlloc .public MemFree .public ov11_022DC504 @@ -55,7 +56,6 @@ .public StrncpySimple .public StrncpySimpleNoPadSafe .public sub_0200D670 -.public sub_02017C10 .public sub_02017C50 .public sub_02017CB4 .public sub_02025304_JP diff --git a/asm/include/overlay_29_022DEBA4.inc b/asm/include/overlay_29_022DEBA4.inc index d8a3fc21..4715dd80 100644 --- a/asm/include/overlay_29_022DEBA4.inc +++ b/asm/include/overlay_29_022DEBA4.inc @@ -5,6 +5,7 @@ .public CloseFixedBin .public CopySpawnEntriesOnce .public CountItemsOnFloorForAcuteSniffer +.public CreateMonsterSummaryFromEntityOuter .public Debug_Print0 .public DeleteAllMonsterSpriteFiles .public DetermineAllMonsterShadow @@ -58,6 +59,8 @@ .public LoadScriptVariableValue .public LoadWeather3DFiles .public MemZero +.public MtInit +.public MtNext .public OpenFixedBin .public ov10_022BDAB0 .public ov10_022BDB54 @@ -107,9 +110,7 @@ .public ov29_022EA418 .public ov29_022EAD68 .public ov29_022EAEAC -.public ov29_022EAF34 .public ov29_022EAF48 -.public ov29_022ECDE4 .public ov29_022ECF78 .public ov29_022ECFB8 .public ov29_022ED030 @@ -210,6 +211,7 @@ .public ov29_023510C8 .public ov29_02353563 .public Rand16Bit +.public ReadMissionMtStateLower .public ReevaluateSnatchMonster .public RefillTeam .public ResetGravity @@ -227,6 +229,7 @@ .public SetMessageLogPreprocessorArgsFlagVal .public SetMessageLogPreprocessorArgsNumberVal .public SetMinimapDataE447 +.public SetUnkMusicFlag .public SpawnInitialMonsters .public SpawnShopkeepers .public SpawnTeam @@ -237,16 +240,12 @@ .public sub_020091B0 .public sub_02017B00 .public sub_0204F1B4 -.public sub_020510E8 -.public sub_02051134 .public sub_02051DFC .public sub_02051ED4 .public sub_02057E90 .public sub_02057EF4 .public sub_02058644 .public sub_0205B77C -.public sub_020634F4 -.public sub_02063504 .public TryActivateArtificialWeatherAbilities .public TryActivateIqBooster .public TryActivateSlowStart @@ -260,3 +259,4 @@ .public UpdateShouldBoostKecleonShopSpawnChance .public UpdateTrapsVisibility .public WaitUntilAlertBoxTextIsLoaded +.public WriteMissionMtState diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc index 25c39ef0..759d74de 100644 --- a/asm/include/overlay_29_022E37DC.inc +++ b/asm/include/overlay_29_022E37DC.inc @@ -59,7 +59,6 @@ .public ov29_022DE5F0 .public ov29_022E2CA0 .public ov29_022EA370 -.public ov29_022EACE4 .public ov29_022ED0F4 .public ov29_0230D618 .public ov29_02339148 @@ -80,6 +79,7 @@ .public ov29_023515CC .public ov29_0235354C .public PlayEffectAnimationEntity +.public PlayMeByIdIfNot998 .public PlaySeByIdIfNotSilence .public RandIntSafe .public SetMonsterId diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index 48f39bc2..ecc1e340 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -9,6 +9,7 @@ .public ChangeMonsterAnimation .public DIRECTIONS_XY .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST +.public DisplayLinkedMovesWarnings .public DrawMinimapTile .public DUNGEON_PTR .public DungeonRandInt @@ -51,7 +52,6 @@ .public ov29_022E8104 .public ov29_022E81F8 .public ov29_022EA370 -.public ov29_022FA574 .public ov29_022FB920 .public ov29_022FBD80 .public ov29_02304A48 diff --git a/asm/include/overlay_29_022F59C4.inc b/asm/include/overlay_29_022F59C4.inc index 0758e487..8fd71c79 100644 --- a/asm/include/overlay_29_022F59C4.inc +++ b/asm/include/overlay_29_022F59C4.inc @@ -5,6 +5,7 @@ .public CheckTeamMemberIdxVeneer .public CheckVariousStatuses2__02301244 .public DIRECTIONS_XY +.public DisplayLinkedMovesWarnings .public DisplayMessage .public DisplayMessage2 .public DUNGEON_PTR @@ -38,7 +39,6 @@ .public ov29_022F3B8C .public ov29_022F6748 .public ov29_022F87C0 -.public ov29_022FA574 .public ov29_023009CC .public ov29_02304AFC .public ov29_0231AE3C diff --git a/asm/include/overlay_29_022F7768.inc b/asm/include/overlay_29_022F7768.inc index 02e87005..c366e615 100644 --- a/asm/include/overlay_29_022F7768.inc +++ b/asm/include/overlay_29_022F7768.inc @@ -3,6 +3,7 @@ .public CanAttackInDirection .public CeilFixedPoint .public CheckTeamMemberIdx +.public CreateMonsterSummaryFromEntityOuter .public DeleteWanTableEntryVeneer .public DetermineMonsterShadow .public DIRECTIONS_XY @@ -29,6 +30,7 @@ .public GetTile .public GetTileAtEntity .public GetTileSafe +.public InitializeTeamMemberFromMentry .public IQ_SKILLS .public IsBehaviorLoneOutlaw .public IsLevelResetDungeon @@ -49,7 +51,6 @@ .public ov29_022E8104 .public ov29_022E81F8 .public ov29_022EA370 -.public ov29_022ECDE4 .public ov29_022EF7C4 .public ov29_022F9B8C .public ov29_022FE048 @@ -72,7 +73,6 @@ .public SetMissionTargetEnemyDefeated .public ShouldMonsterRunAway .public StoryRestrictionsEnabled -.public sub_02053250 .public sub_0205349C .public sub_02056228 .public sub_020566C4 diff --git a/asm/include/overlay_29_022FC9C0.inc b/asm/include/overlay_29_022FC9C0.inc index 30796a58..77062bbb 100644 --- a/asm/include/overlay_29_022FC9C0.inc +++ b/asm/include/overlay_29_022FC9C0.inc @@ -2,6 +2,7 @@ .public AddHeldItemToBag .public CalcSpeedStageWrapper .public CASTFORM_WEATHER_ATTRIBUTE_TABLE +.public CountActiveMonsters .public CreateEnemyEntity .public DIRECTIONS_XY .public DUNGEON_PTR @@ -81,7 +82,6 @@ .public ov29_022F9EA0 .public ov29_022FA1D8 .public ov29_022FB83C -.public ov29_022FBC4C .public ov29_022FBF08 .public ov29_022FBF30 .public ov29_022FC468 diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index 7858af96..01cf8e83 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -59,7 +59,6 @@ .public ov29_022E81F8 .public ov29_022EA370 .public ov29_022EAF20 -.public ov29_022EAF34 .public ov29_022ECD84 .public ov29_022EFB20 .public ov29_022EFB84 @@ -104,6 +103,7 @@ .public SetMessageLogPreprocessorArgsNumberVal .public SetMonsterFlag2 .public SetPokemonBattled +.public SetUnkMusicFlag .public ShouldDisplayEntityWrapper .public SpawnDroppedItemWrapper .public SubInitMonster diff --git a/asm/include/overlay_29_0231A8A0.inc b/asm/include/overlay_29_0231A8A0.inc index acfe888d..8f07dceb 100644 --- a/asm/include/overlay_29_0231A8A0.inc +++ b/asm/include/overlay_29_0231A8A0.inc @@ -1,12 +1,12 @@ #pragma once .public AreMovesEnabled +.public DisplayLinkedMovesWarnings .public DUNGEON_PTR .public EntityIsValid__02319F8C .public GetNumberOfAttacks .public IsFloorOver .public IsMonster__0231A9D4 .public LogMessageByIdWithPopupCheckUser -.public ov29_022FA574 .public ShouldUsePp .public TryActivateTruant .public UpdateMovePp diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index c05acbfb..dd4e33a7 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -11,6 +11,7 @@ .public CheckVariousStatuses2__02301244 .public CheckVariousStatuses2__02301308 .public ClearMonsterActionFields +.public ConvertTmToUsedTm .public DirectoryFileMngr_OpenDirectoryFile .public DisplayMessage2 .public DoesMonsterHaveMove @@ -33,6 +34,7 @@ .public GetResolvedPerformanceProgressFlag .public GetWeatherColorTable .public GINSENG_CHANCE_3 +.public GonePebbleGradualPaletteShift .public GUMMI_BELLY_RESTORE_TABLE .public GUMMI_IQ_STRING_IDS .public GUMMI_LIKE_STRING_IDS @@ -63,15 +65,12 @@ .public ov29_022E5BD8 .public ov29_022EA370 .public ov29_022EAF20 -.public ov29_022EAF34 -.public ov29_022EB668 .public ov29_022EFB20 .public ov29_022EFB84 .public ov29_022F04F0 .public ov29_022F0518 .public ov29_022F05E4 .public ov29_022F0780 -.public ov29_022F085C .public ov29_022F8830 .public ov29_022F9C34 .public ov29_022FA02C @@ -95,6 +94,7 @@ .public SetMessageLogPreprocessorArgsNumberVal .public SetMonsterActionFields .public SetPreprocessorArgsIdVal +.public SetUnkMusicFlag .public ShouldDisplayEntityWrapper .public SPATK_STAT_IDX .public sub_02050FF8 diff --git a/asm/include/overlay_29_02348020.inc b/asm/include/overlay_29_02348020.inc index 6bd014bb..676cf189 100644 --- a/asm/include/overlay_29_02348020.inc +++ b/asm/include/overlay_29_02348020.inc @@ -2,6 +2,7 @@ .public _020A1878 .public AdvanceFrame .public CanSeeTarget +.public ClearMissionDestinationInfo .public DisplayMessage .public DisplayMessage2 .public DUNGEON_BUTTON_INPUT @@ -37,10 +38,8 @@ .public ov29_022FB9BC .public ov29_023009CC .public ov29_02344B9C -.public ov29_023496EC .public ov29_023497C8 .public ov29_02349818 -.public ov29_02349AD4 .public ov29_0234C738 .public ov29_023537C4 .public PrepareItemForPrinting__02345728 @@ -60,5 +59,6 @@ .public sub_02051EB8 .public SubstitutePlaceholderStringTags .public THROWN_ITEM_HIT_CHANCE +.public TryCompleteMission .public TrySpawnGoldenChamber .public YesNoMenu diff --git a/asm/include/overlay_29_02348D3C.inc b/asm/include/overlay_29_02348D3C.inc index 53000d13..ae180f06 100644 --- a/asm/include/overlay_29_02348D3C.inc +++ b/asm/include/overlay_29_02348D3C.inc @@ -12,12 +12,12 @@ .public ov29_02348ABC .public ov29_02348B28 .public ov29_02348BA0 -.public ov29_02349AD4 .public ov29_0234A244 .public ov29_0234A790 .public ov29_0234A8BC .public ov29_0234AA98 .public ov29_0234ABB0 -.public ov29_0234AC8C .public PrepareItemForPrinting__02345728 .public SubstitutePlaceholderStringTags +.public TreasureMemoComplete +.public TryCompleteMission diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 4ba46b7b..e90c5214 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -37,39 +37,39 @@ .public IsDestinationFloorWithHiddenOutlaw .public IsExperienceLocked .public IsJirachiChallengeFloor +.public IsMePlaying .public ItemZInit .public LogMessageById +.public MissionExitPrompt .public MusicTableIdxToMusicId .public ov29_022E550C .public ov29_022E8244 .public ov29_022EAC8C -.public ov29_022EACE4 .public ov29_022EAEFC -.public ov29_022EAF34 .public ov29_022FA3D4 .public ov29_023009CC .public ov29_02300B04 .public ov29_02344B9C .public ov29_02348888 -.public ov29_02348A18 .public ov29_023491B8 .public ov29_023496B0 .public ov29_0234AEE8 .public ov29_0234AF34 .public ov29_0234D630 -.public ov29_0234D70C .public ov29_0234D838 .public ov29_0234D8A0 .public ov29_023537C8 +.public PlayMeByIdIfNot998 .public PositionIsOnStairs .public PrepareItemForPrinting__02345728 +.public PrintMissionCompleteString .public RemoveEmptyItemsInBagWrapper .public RemoveGroundItem .public SetDungeonEscapeFields .public SetMessageLogPreprocessorArgsStringToName .public SetPortraitLayout .public SetPreprocessorArgsIdVal -.public sub_02017C10 +.public SetUnkMusicFlag .public SubstitutePlaceholderStringTags .public TeleportFleeingOutlaw .public UnkMapRelatedFunc diff --git a/asm/include/overlay_29_0234AEE8.inc b/asm/include/overlay_29_0234AEE8.inc index 0b8518fc..a707e523 100644 --- a/asm/include/overlay_29_0234AEE8.inc +++ b/asm/include/overlay_29_0234AEE8.inc @@ -18,6 +18,7 @@ .public MemFree .public MemZero .public MESSAGE_LOG_INFO +.public MissionExitPrompt .public MusicTableIdxToMusicId .public ov10_022BFD20 .public ov29_022E0B60 @@ -25,12 +26,11 @@ .public ov29_022E68F0 .public ov29_022E9FC0 .public ov29_022EAEFC -.public ov29_022EAF34 .public ov29_022F2FE4 .public ov29_0233A248 -.public ov29_02348A18 .public ov29_02353214 .public PreprocessString +.public SetUnkMusicFlag .public ShouldDisplayEntityWrapper .public StringFromId .public strlen diff --git a/asm/include/overlay_29_0234BEE0.inc b/asm/include/overlay_29_0234BEE0.inc index 7d660495..75d763c7 100644 --- a/asm/include/overlay_29_0234BEE0.inc +++ b/asm/include/overlay_29_0234BEE0.inc @@ -9,6 +9,7 @@ .public GetAndStoreButtonInput .public GroupOamAttributesBothScreens .public HandleMenus +.public InitDungeonPaletteStruct .public InitRender3dElement64 .public MemAlloc .public MemFree @@ -25,7 +26,6 @@ .public ov29_022DDFFC .public ov29_022DE0A0 .public ov29_022DE0CC -.public ov29_022DE300 .public ov29_022DE498 .public ov29_022DE868 .public ov29_022E0CFC diff --git a/asm/include/overlay_31_023838E4.inc b/asm/include/overlay_31_023838E4.inc index 910cbbe4..fad92179 100644 --- a/asm/include/overlay_31_023838E4.inc +++ b/asm/include/overlay_31_023838E4.inc @@ -26,6 +26,7 @@ .public CreateDialogueBox .public CreateInventoryMenu .public CreateInventoryMenuOuter +.public CreateMonsterSummaryFromEntityOuter .public CreateMonsterSummaryFromMonster .public CreateParentMenu .public CreateParentMenuFromStringIds @@ -160,7 +161,6 @@ .public ov29_022EBBA8 .public ov29_022EBBE8 .public ov29_022EBC2C -.public ov29_022ECDE4 .public ov29_022F9C34 .public ov29_023002F0 .public ov29_023021F0 diff --git a/asm/main_02014D18.s b/asm/main_02014D18.s index d4d18bf6..40dec979 100644 --- a/asm/main_02014D18.s +++ b/asm/main_02014D18.s @@ -4099,8 +4099,8 @@ sub_02017C04: ; 0x02017C04 _02017C0C: .word sub_02018194 arm_func_end sub_02017C04 - arm_func_start sub_02017C10 -sub_02017C10: ; 0x02017C10 + arm_func_start IsMePlaying +IsMePlaying: ; 0x02017C10 stmdb sp!, {r4, lr} mov r4, r0 bl sub_020181E0 @@ -4120,7 +4120,7 @@ _02017C44: ldmia sp!, {r4, pc} .align 2, 0 _02017C4C: .word 0x000003E6 - arm_func_end sub_02017C10 + arm_func_end IsMePlaying arm_func_start sub_02017C50 sub_02017C50: ; 0x02017C50 diff --git a/asm/main_0202A3E4.s b/asm/main_0202A3E4.s index cde65ebe..18720fef 100644 --- a/asm/main_0202A3E4.s +++ b/asm/main_0202A3E4.s @@ -10426,13 +10426,13 @@ sub_02032BB8: ; 0x02032BB8 tst r6, #0x10 beq _02032C30 mov r0, sb - bl sub_020332AC + bl InventoryMenuPreviousPage b _02032C74 _02032C30: tst r6, #0x20 beq _02032C74 mov r0, sb - bl sub_02033284 + bl InventoryMenuNextPage b _02032C74 _02032C44: tst r1, #0x1000000 @@ -10463,25 +10463,25 @@ _02032C74: tst r6, #0x40 beq _02032CB4 mov r0, sb - bl sub_020332F0 + bl InventoryMenuPrevious10Pages b _02032CEC _02032CB4: tst r6, #0x80 beq _02032CEC mov r0, sb - bl sub_020332CC + bl InventoryMenuNext10Pages b _02032CEC _02032CC8: tst r6, #0x40 beq _02032CDC mov r0, sb - bl sub_020332AC + bl InventoryMenuPreviousPage b _02032CEC _02032CDC: tst r6, #0x80 beq _02032CEC mov r0, sb - bl sub_02033284 + bl InventoryMenuNextPage _02032CEC: ldr r0, [sb, #0x10] tst r0, #1 @@ -10914,8 +10914,8 @@ sub_020331D4: ; 0x020331D4 ldmia sp!, {r4, pc} arm_func_end sub_020331D4 - arm_func_start sub_02033284 -sub_02033284: ; 0x02033284 + arm_func_start InventoryMenuNextPage +InventoryMenuNextPage: ; 0x02033284 ldr r1, [r0, #0xcc] ldr r2, [r0, #0xc8] sub r1, r1, #1 @@ -10927,10 +10927,10 @@ sub_02033284: ; 0x02033284 bx ip .align 2, 0 _020332A8: .word sub_020331D4 - arm_func_end sub_02033284 + arm_func_end InventoryMenuNextPage - arm_func_start sub_020332AC -sub_020332AC: ; 0x020332AC + arm_func_start InventoryMenuPreviousPage +InventoryMenuPreviousPage: ; 0x020332AC ldr r1, [r0, #0xc8] ldr ip, _020332C8 ; =sub_020331D4 cmp r1, #0 @@ -10940,10 +10940,10 @@ sub_020332AC: ; 0x020332AC bx ip .align 2, 0 _020332C8: .word sub_020331D4 - arm_func_end sub_020332AC + arm_func_end InventoryMenuPreviousPage - arm_func_start sub_020332CC -sub_020332CC: ; 0x020332CC + arm_func_start InventoryMenuNext10Pages +InventoryMenuNext10Pages: ; 0x020332CC ldr r2, [r0, #0xc8] ldr r1, [r0, #0xcc] add r2, r2, #0xa @@ -10954,10 +10954,10 @@ sub_020332CC: ; 0x020332CC bx ip .align 2, 0 _020332EC: .word sub_020331D4 - arm_func_end sub_020332CC + arm_func_end InventoryMenuNext10Pages - arm_func_start sub_020332F0 -sub_020332F0: ; 0x020332F0 + arm_func_start InventoryMenuPrevious10Pages +InventoryMenuPrevious10Pages: ; 0x020332F0 ldr r1, [r0, #0xc8] ldr ip, _02033308 ; =sub_020331D4 subs r1, r1, #0xa @@ -10966,7 +10966,7 @@ sub_020332F0: ; 0x020332F0 bx ip .align 2, 0 _02033308: .word sub_020331D4 - arm_func_end sub_020332F0 + arm_func_end InventoryMenuPrevious10Pages arm_func_start sub_0203330C sub_0203330C: ; 0x0203330C @@ -11948,7 +11948,7 @@ _0203401C: cmp r0, #0 beq _02034098 mov r0, r8 - bl sub_020332F0 + bl InventoryMenuPrevious10Pages mov r0, r8 mov r1, #4 bl sub_020333D8 @@ -11971,7 +11971,7 @@ _02034098: cmp r0, #0 beq _020340F0 mov r0, r8 - bl sub_020332CC + bl InventoryMenuNext10Pages mov r0, r8 mov r1, #4 bl sub_020333D8 @@ -11991,7 +11991,7 @@ _020340F0: cmp r0, #0 beq _0203413C mov r0, r8 - bl sub_020332AC + bl InventoryMenuPreviousPage mov r0, r8 mov r1, #4 bl sub_020333D8 @@ -12011,7 +12011,7 @@ _0203413C: cmp r0, #0 beq _02034188 mov r0, r8 - bl sub_02033284 + bl InventoryMenuNextPage mov r0, r8 mov r1, #4 bl sub_020333D8 @@ -12053,7 +12053,7 @@ _020341B8: tst r0, #0x20000 mov r0, r8 beq _02034224 - bl sub_020332AC + bl InventoryMenuPreviousPage mov r0, r8 mov r1, #4 bl sub_020333D8 @@ -12087,7 +12087,7 @@ _02034230: tst r0, #0x20000 mov r0, r8 beq _020342A0 - bl sub_02033284 + bl InventoryMenuNextPage mov r0, r8 mov r1, #4 bl sub_020333D8 diff --git a/asm/main_02051098.s b/asm/main_02051098.s index 83c04e8e..f0a21c46 100644 --- a/asm/main_02051098.s +++ b/asm/main_02051098.s @@ -31,8 +31,8 @@ sub_020510C0: ; 0x020510C0 ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_020510C0 - arm_func_start sub_020510E8 -sub_020510E8: ; 0x020510E8 + arm_func_start MtInit +MtInit: ; 0x020510E8 ldr r3, _02051128 ; =_020AFF88 mov ip, #1 str r0, [r3] @@ -48,19 +48,19 @@ _020510FC: _02051114: cmp ip, #0x270 blt _020510FC - ldr r0, _02051130 ; =_020AFF7C + ldr r0, _02051130 ; =MT_TABLE str ip, [r0] bx lr .align 2, 0 _02051128: .word _020AFF88 _0205112C: .word 0x6C078965 -_02051130: .word _020AFF7C - arm_func_end sub_020510E8 +_02051130: .word MT_TABLE + arm_func_end MtInit - arm_func_start sub_02051134 -sub_02051134: ; 0x02051134 + arm_func_start MtNext +MtNext: ; 0x02051134 stmdb sp!, {r4, lr} - ldr r0, _0205126C ; =_020AFF7C + ldr r0, _0205126C ; =MT_TABLE ldr r1, [r0] cmp r1, #0x270 blt _02051230 @@ -68,7 +68,7 @@ sub_02051134: ; 0x02051134 cmp r1, r0 bne _0205115C add r0, r0, #0x1300 - bl sub_020510E8 + bl MtInit _0205115C: ldr ip, _02051274 ; =_020AFF88 ldr r2, _02051278 ; =_020AFF80 @@ -122,12 +122,12 @@ _020511E8: ldr r0, [r0, r2, lsl #2] eor r2, r3, ip, lsr #1 eor r2, r2, r0 - ldr r0, _0205126C ; =_020AFF7C + ldr r0, _0205126C ; =MT_TABLE str r2, [r1, #0x9bc] mov r1, #0 str r1, [r0] _02051230: - ldr r1, _0205126C ; =_020AFF7C + ldr r1, _0205126C ; =MT_TABLE ldr r2, _02051274 ; =_020AFF88 ldr r3, [r1] ldr r0, _02051280 ; =0x9D2C5680 @@ -143,12 +143,12 @@ _02051230: eor r0, r0, r0, lsr #18 ldmia sp!, {r4, pc} .align 2, 0 -_0205126C: .word _020AFF7C +_0205126C: .word MT_TABLE _02051270: .word 0x00000271 _02051274: .word _020AFF88 _02051278: .word _020AFF80 _0205127C: .word 0x0000026F _02051280: .word 0x9D2C5680 _02051284: .word 0xEFC60000 - arm_func_end sub_02051134 + arm_func_end MtNext diff --git a/asm/main_02052B44.s b/asm/main_02052B44.s index f110de66..e57a9c01 100644 --- a/asm/main_02052B44.s +++ b/asm/main_02052B44.s @@ -480,7 +480,7 @@ sub_020530D4: ; 0x020530D4 strh lr, [sp, #2] strh ip, [sp, #4] ldrb r5, [r4] - bl sub_02053250 + bl InitializeTeamMemberFromMentry ldrh r2, [sp] ldrh r1, [sp, #2] ldrh r0, [sp, #4] @@ -493,7 +493,7 @@ _02053158: mov r0, r4 mov r2, r1 add r1, r7, r6 - bl sub_02053250 + bl InitializeTeamMemberFromMentry _02053168: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -562,14 +562,14 @@ sub_02053224: ; 0x02053224 smlabb r1, ip, r1, r3 mov r3, r2 mov r2, ip - bl sub_02053250 + bl InitializeTeamMemberFromMentry ldmia sp!, {r3, pc} .align 2, 0 _0205324C: .word TEAM_MEMBER_TABLE_PTR arm_func_end sub_02053224 - arm_func_start sub_02053250 -sub_02053250: ; 0x02053250 + arm_func_start InitializeTeamMemberFromMentry +InitializeTeamMemberFromMentry: ; 0x02053250 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 mov r5, r1 @@ -644,7 +644,7 @@ _020532D4: strh r0, [r6, #0x4a] add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} - arm_func_end sub_02053250 + arm_func_end InitializeTeamMemberFromMentry arm_func_start sub_02053374 sub_02053374: ; 0x02053374 diff --git a/asm/main_0205B5A8.s b/asm/main_0205B5A8.s index d0661d32..a2ffdccf 100644 --- a/asm/main_0205B5A8.s +++ b/asm/main_0205B5A8.s @@ -28,21 +28,21 @@ _0205B5CC: bl RandInt orr r0, r0, #2 strb r0, [sp, #0xc2] - bl sub_02063504 + bl ReadMissionMtStateLower mov r5, r0 bl Rand16Bit orr r0, r0, r5, lsl #16 - bl sub_020510E8 + bl MtInit strb r4, [sp, #0x14] - bl sub_02051134 + bl MtNext str r0, [sp, #0x2c] - bl sub_02051134 + bl MtNext str r0, [sp, #0xbc] - bl sub_02051134 + bl MtNext bic r0, r0, #0xff000000 str r0, [sp, #0x1c] ldr r0, [sp, #0xbc] - bl sub_020634F4 + bl WriteMissionMtState ldr r1, _0205B68C ; =0x000038C9 add r0, sp, #0 bl GetStringFromFileVeneer diff --git a/asm/main_0205BA0C.s b/asm/main_0205BA0C.s index 0a1888ed..481b1a37 100644 --- a/asm/main_0205BA0C.s +++ b/asm/main_0205BA0C.s @@ -74,16 +74,16 @@ sub_0205BAB0: ; 0x0205BAB0 str r0, [r3, #8] str r2, [r3, #0xc] str r2, [r3, #0x10] - bl sub_02063504 + bl ReadMissionMtStateLower mov r4, r0 bl Rand16Bit orr r0, r0, r4, lsl #16 - bl sub_020510E8 - bl sub_02051134 + bl MtInit + bl MtNext ldr r1, _0205BB74 ; =_020B0A54 ldr r1, [r1] str r0, [r1, #0x18] - bl sub_020634F4 + bl WriteMissionMtState ldr r1, _0205BB78 ; =_022B57BC ldr r0, _0205BB74 ; =_020B0A54 ldr r1, [r1] diff --git a/asm/main_0205D1F4.s b/asm/main_0205D1F4.s index 473e0cc7..d1e66812 100644 --- a/asm/main_0205D1F4.s +++ b/asm/main_0205D1F4.s @@ -222,7 +222,7 @@ _0205D51C: mov r0, r5 b _0205DF9C _0205D534: - bl sub_02051134 + bl MtNext bic r0, r0, #0xff000000 str r0, [r8, #8] mov r0, #0 diff --git a/asm/main_0205E48C.s b/asm/main_0205E48C.s index 9ad897fe..b1ac0ca6 100644 --- a/asm/main_0205E48C.s +++ b/asm/main_0205E48C.s @@ -144,11 +144,11 @@ _0205E62C: strb r2, [r1, #0x300] ldr r0, [r0, #0x18] strb r2, [r0, #0x320] - bl sub_02063504 + bl ReadMissionMtStateLower mov r4, r0 bl Rand16Bit orr r0, r0, r4, lsl #16 - bl sub_020510E8 + bl MtInit bl GenerateAllPossibleMonstersList bl GenerateAllPossibleDungeonsList bl GenerateAllPossibleDeliverList @@ -349,8 +349,8 @@ _0205E8DC: ldr r1, [r1, #0x18] add r1, r1, #0x200 bl sub_0205E50C - bl sub_02051134 - bl sub_020634F4 + bl MtNext + bl WriteMissionMtState ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0205E948: .word MISSION_DELIVER_LIST_PTR diff --git a/asm/main_0205EB00.s b/asm/main_0205EB00.s index e2fb918b..cebcf1aa 100644 --- a/asm/main_0205EB00.s +++ b/asm/main_0205EB00.s @@ -67,10 +67,10 @@ _0205EB90: ldmleia sp!, {r3, r4, r5, pc} b _0205EB90 _0205EBC4: - bl sub_02065B94 + bl SetRandomRequestNpc03KindVar ldmia sp!, {r3, r4, r5, pc} _0205EBCC: ldrsh r0, [r4, #0xe] - bl sub_02065B94 + bl SetRandomRequestNpc03KindVar ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_0205EB5C diff --git a/asm/main_0205EDA4.s b/asm/main_0205EDA4.s index 0be758fe..3b21a245 100644 --- a/asm/main_0205EDA4.s +++ b/asm/main_0205EDA4.s @@ -270,8 +270,8 @@ GetAcceptedMission: ; 0x0205F0D8 _0205F0EC: .word MISSION_DELIVER_LIST_PTR arm_func_end GetAcceptedMission - arm_func_start sub_0205F0F0 -sub_0205F0F0: ; 0x0205F0F0 + arm_func_start IsAcceptedMissionSlotEmpty +IsAcceptedMissionSlotEmpty: ; 0x0205F0F0 ldr r1, _0205F114 ; =MISSION_DELIVER_LIST_PTR ldr r1, [r1, #0x18] add r0, r1, r0, lsl #5 @@ -283,7 +283,7 @@ sub_0205F0F0: ; 0x0205F0F0 bx lr .align 2, 0 _0205F114: .word MISSION_DELIVER_LIST_PTR - arm_func_end sub_0205F0F0 + arm_func_end IsAcceptedMissionSlotEmpty arm_func_start WasMissionCompletedToday WasMissionCompletedToday: ; 0x0205F118 @@ -1139,7 +1139,7 @@ _0205FBAC: add r0, sp, #0 bl BitstreamDebug bl Rand16Bit - bl sub_020634F4 + bl WriteMissionMtState ldr r0, [sp, #8] add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -1490,7 +1490,7 @@ _020600B8: arm_func_start ReadRescueBinFile ReadRescueBinFile: ; 0x020600CC stmdb sp!, {r3, lr} - ldr r0, _02060144 ; =_020B0AD8 + ldr r0, _02060144 ; =RESCUE_BIN_UNPACK ldr r0, [r0, #0x24] cmp r0, #0 ldmneia sp!, {r3, pc} @@ -1498,7 +1498,7 @@ ReadRescueBinFile: ; 0x020600CC ldr r1, _0206014C ; =_020A462C mov r2, #1 bl LoadFileFromRom - ldr r0, _02060144 ; =_020B0AD8 + ldr r0, _02060144 ; =RESCUE_BIN_UNPACK ldr r2, [r0, #0x24] ldr r1, [r2] add r1, r2, r1 @@ -1520,7 +1520,7 @@ ReadRescueBinFile: ; 0x020600CC str r1, [r0, #0xc] ldmia sp!, {r3, pc} .align 2, 0 -_02060144: .word _020B0AD8 +_02060144: .word RESCUE_BIN_UNPACK _02060148: .word _020B0AFC _0206014C: .word _020A462C arm_func_end ReadRescueBinFile @@ -2157,7 +2157,7 @@ MatchMissionTemplateToMission: ; 0x0206096C ldr r5, [r2, r8, lsl #2] mov r4, #0 mov sb, #0x22 - ldr sl, _020609E4 ; =_020B0AD8 + ldr sl, _020609E4 ; =RESCUE_BIN_UNPACK b _020609BC _02060990: mul r6, r4, sb @@ -2166,7 +2166,7 @@ _02060990: add r0, r0, r6 blx r5 cmp r0, #0 - ldrne r0, _020609E4 ; =_020B0AD8 + ldrne r0, _020609E4 ; =RESCUE_BIN_UNPACK ldrne r0, [r0, #0x18] addne r0, r0, r6 ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -2183,7 +2183,7 @@ _020609BC: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _020609E0: .word MISSION_VALIDATION_FUNCTION_LIST -_020609E4: .word _020B0AD8 +_020609E4: .word RESCUE_BIN_UNPACK arm_func_end MatchMissionTemplateToMission arm_func_start SprintfStatic__020609E8 @@ -2225,7 +2225,7 @@ AppendMissionTitle: ; 0x02060A10 ldr fp, _02060AF0 ; =0x00000FFF ldr sb, _02060AF4 ; =MISSION_STRING_IDS add r7, fp, #0xf000 - ldr r8, _02060AF8 ; =_020B0AD8 + ldr r8, _02060AF8 ; =RESCUE_BIN_UNPACK b _02060AD4 _02060A74: and r0, sl, fp @@ -2264,7 +2264,7 @@ _02060AE4: _02060AEC: .word _020A4644 _02060AF0: .word 0x00000FFF _02060AF4: .word MISSION_STRING_IDS -_02060AF8: .word _020B0AD8 +_02060AF8: .word RESCUE_BIN_UNPACK arm_func_end AppendMissionTitle arm_func_start FormatMissionHeader @@ -2572,7 +2572,7 @@ AppendMissionSummary: ; 0x02060EB4 ldr r2, [r3, #4] ldrb r3, [r3, #1] add r1, r2, r1 - ldr sb, _02060FCC ; =_020B0AD8 + ldr sb, _02060FCC ; =RESCUE_BIN_UNPACK add r1, r3, r1 str r1, [sp, #4] ldr r1, [r8, #0x60] @@ -2630,7 +2630,7 @@ _02060FA8: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02060FCC: .word _020B0AD8 +_02060FCC: .word RESCUE_BIN_UNPACK _02060FD0: .word 0x00000FFF _02060FD4: .word MISSION_STRING_IDS arm_func_end AppendMissionSummary @@ -4061,12 +4061,12 @@ _02062234: cmp r3, ip blo _02062224 mov r1, ip - bl sub_02062248 + bl RandomizeMissionCategory ldmia sp!, {r3, pc} arm_func_end sub_0206220C - arm_func_start sub_02062248 -sub_02062248: ; 0x02062248 + arm_func_start RandomizeMissionCategory +RandomizeMissionCategory: ; 0x02062248 stmdb sp!, {r4, r5, r6, lr} mov r4, #0 mov r6, r1 @@ -4087,7 +4087,7 @@ _02062280: blo _02062264 mvn r0, #0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end sub_02062248 + arm_func_end RandomizeMissionCategory arm_func_start SumValidMissionCategoryWeights SumValidMissionCategoryWeights: ; 0x02062290 @@ -4110,7 +4110,7 @@ _020622C8: bl GetRank mov r8, r0 bl GetScenarioBalance - ldr r4, _02062544 ; =_020B0AD8 + ldr r4, _02062544 ; =RESCUE_BIN_UNPACK mov sb, r0 mov sl, r6 mov fp, #0x16 @@ -4153,7 +4153,7 @@ _02062360: bl GetRank mov r8, r0 bl GetScenarioBalance - ldr r4, _02062544 ; =_020B0AD8 + ldr r4, _02062544 ; =RESCUE_BIN_UNPACK mov sb, r0 mov sl, r6 mov fp, #0x16 @@ -4196,7 +4196,7 @@ _020623F8: bl GetRank mov r8, r0 bl GetScenarioBalance - ldr r4, _02062544 ; =_020B0AD8 + ldr r4, _02062544 ; =RESCUE_BIN_UNPACK mov sb, r0 mov sl, r6 mov fp, #0x16 @@ -4239,7 +4239,7 @@ _02062490: bl GetRank mov r8, r0 bl GetScenarioBalance - ldr r4, _02062544 ; =_020B0AD8 + ldr r4, _02062544 ; =RESCUE_BIN_UNPACK mov sb, r0 mov sl, r6 mov fp, #0x16 @@ -4278,7 +4278,7 @@ _0206250C: add r6, r6, r0 blt _020624B0 _02062524: - ldr r0, _02062544 ; =_020B0AD8 + ldr r0, _02062544 ; =RESCUE_BIN_UNPACK cmp r6, #0 str r6, [r0, #0x20] str r7, [r0, #0x1c] @@ -4287,42 +4287,42 @@ _02062524: and r0, r0, #0xff ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02062544: .word _020B0AD8 +_02062544: .word RESCUE_BIN_UNPACK arm_func_end SumValidMissionCategoryWeights arm_func_start sub_02062548 sub_02062548: ; 0x02062548 stmdb sp!, {r3, lr} - ldr r0, _02062574 ; =_020B0AD8 + ldr r0, _02062574 ; =RESCUE_BIN_UNPACK ldr r0, [r0, #0x1c] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _02062574 ; =_020B0AD8 + ldr r0, _02062574 ; =RESCUE_BIN_UNPACK mov r1, #0 str r1, [r0, #0x1c] str r1, [r0, #0x20] ldmia sp!, {r3, pc} .align 2, 0 -_02062574: .word _020B0AD8 +_02062574: .word RESCUE_BIN_UNPACK arm_func_end sub_02062548 arm_func_start GetRandomMissionTemplate GetRandomMissionTemplate: ; 0x02062578 stmdb sp!, {r4, lr} - ldr r2, _02062768 ; =_020B0AD8 + ldr r2, _02062768 ; =RESCUE_BIN_UNPACK mov r1, #0x258 ldr r0, [r2, #0x20] ldr r2, [r2, #0x1c] - bl sub_02062248 + bl RandomizeMissionCategory movs r4, r0 bmi _02062760 - ldr r0, _02062768 ; =_020B0AD8 + ldr r0, _02062768 ; =RESCUE_BIN_UNPACK ldr r0, [r0, #0xc] add r0, r0, r4, lsl #4 ldrh r0, [r0, #0xc] bl RandInt - ldr r2, _02062768 ; =_020B0AD8 + ldr r2, _02062768 ; =RESCUE_BIN_UNPACK mov r1, #0x22 ldr r3, [r2, #0xc] ldr r2, [r2, #0x18] @@ -4446,13 +4446,13 @@ _02062760: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 -_02062768: .word _020B0AD8 +_02062768: .word RESCUE_BIN_UNPACK arm_func_end GetRandomMissionTemplate arm_func_start sub_0206276C sub_0206276C: ; 0x0206276C stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r5, _020627F0 ; =_020B0AD8 + ldr r5, _020627F0 ; =RESCUE_BIN_UNPACK mov ip, #0 ldr r4, [r5, #0xc] ldr r5, [r5, #0x18] @@ -4488,25 +4488,25 @@ _020627E0: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_020627F0: .word _020B0AD8 +_020627F0: .word RESCUE_BIN_UNPACK arm_func_end sub_0206276C arm_func_start sub_020627F4 sub_020627F4: ; 0x020627F4 - ldr r0, _02062800 ; =_020B0AD8 + ldr r0, _02062800 ; =RESCUE_BIN_UNPACK ldr r0, [r0, #8] bx lr .align 2, 0 -_02062800: .word _020B0AD8 +_02062800: .word RESCUE_BIN_UNPACK arm_func_end sub_020627F4 arm_func_start LoadMissionTemplates LoadMissionTemplates: ; 0x02062804 - ldr r0, _02062810 ; =_020B0AD8 + ldr r0, _02062810 ; =RESCUE_BIN_UNPACK ldr r0, [r0, #0x10] bx lr .align 2, 0 -_02062810: .word _020B0AD8 +_02062810: .word RESCUE_BIN_UNPACK arm_func_end LoadMissionTemplates arm_func_start sub_02062814 @@ -5532,25 +5532,25 @@ _020634BC: _020634F0: .word ITEM_DELIVERY_TABLE arm_func_end GetAvailableItemDeliveryList - arm_func_start sub_020634F4 -sub_020634F4: ; 0x020634F4 - ldr r1, _02063500 ; =_020B0AD8 + arm_func_start WriteMissionMtState +WriteMissionMtState: ; 0x020634F4 + ldr r1, _02063500 ; =RESCUE_BIN_UNPACK str r0, [r1] bx lr .align 2, 0 -_02063500: .word _020B0AD8 - arm_func_end sub_020634F4 +_02063500: .word RESCUE_BIN_UNPACK + arm_func_end WriteMissionMtState - arm_func_start sub_02063504 -sub_02063504: ; 0x02063504 - ldr r0, _02063518 ; =_020B0AD8 + arm_func_start ReadMissionMtStateLower +ReadMissionMtStateLower: ; 0x02063504 + ldr r0, _02063518 ; =RESCUE_BIN_UNPACK ldr r0, [r0] mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bx lr .align 2, 0 -_02063518: .word _020B0AD8 - arm_func_end sub_02063504 +_02063518: .word RESCUE_BIN_UNPACK + arm_func_end ReadMissionMtStateLower arm_func_start ZeroInitMissionRewardDataStruct ZeroInitMissionRewardDataStruct: ; 0x0206351C @@ -8578,8 +8578,8 @@ SetRandomRequestNpcs1And2: ; 0x02065B80 _02065B90: .word _020B0B08 arm_func_end SetRandomRequestNpcs1And2 - arm_func_start sub_02065B94 -sub_02065B94: ; 0x02065B94 + arm_func_start SetRandomRequestNpc03KindVar +SetRandomRequestNpc03KindVar: ; 0x02065B94 ldr ip, _02065BA8 ; =SaveScriptVariableValue mov r2, r0 mov r0, #0 @@ -8587,7 +8587,7 @@ sub_02065B94: ; 0x02065B94 bx ip .align 2, 0 _02065BA8: .word SaveScriptVariableValue - arm_func_end sub_02065B94 + arm_func_end SetRandomRequestNpc03KindVar arm_func_start SetAllEventNpcs SetAllEventNpcs: ; 0x02065BAC @@ -8601,14 +8601,14 @@ SetAllEventNpcs: ; 0x02065BAC _02065BC4: .word _020B0B08 arm_func_end SetAllEventNpcs - arm_func_start sub_02065BC8 -sub_02065BC8: ; 0x02065BC8 + arm_func_start SetNewFriendActor +SetNewFriendActor: ; 0x02065BC8 ldr r1, _02065BD4 ; =_020B0B08 strh r0, [r1, #0xc] bx lr .align 2, 0 _02065BD4: .word _020B0B08 - arm_func_end sub_02065BC8 + arm_func_end SetNewFriendActor arm_func_start sub_02065BD8 sub_02065BD8: ; 0x02065BD8 @@ -11846,7 +11846,7 @@ _02068650: _02068654: mov r0, r6, lsl #0x18 mov r0, r0, asr #0x18 - bl sub_0205F0F0 + bl IsAcceptedMissionSlotEmpty cmp r0, #0 moveq r0, r4, lsl #1 streqh r6, [r5, r0] @@ -12188,7 +12188,7 @@ _02068B08: mov r1, r6, lsl #0x18 mov r5, r0 mov r0, r1, asr #0x18 - bl sub_0205F0F0 + bl IsAcceptedMissionSlotEmpty cmp r0, #0 bne _02068B64 bl GetAdventureLogDungeonFloor @@ -12216,7 +12216,7 @@ _02068B74: _02068B78: mov r0, r5, lsl #0x18 mov r0, r0, asr #0x18 - bl sub_0205F0F0 + bl IsAcceptedMissionSlotEmpty cmp r0, #0 addeq r0, r7, r4, lsl #1 streqh r5, [r0, #0xc] diff --git a/asm/main_rodata_020A2808.s b/asm/main_rodata_020A2808.s index 874a1ecc..2fd33ced 100644 --- a/asm/main_rodata_020A2808.s +++ b/asm/main_rodata_020A2808.s @@ -11363,8 +11363,7 @@ _020AEF08: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global MEMORY_ALLOCATION_ARENA_GETTERS MEMORY_ALLOCATION_ARENA_GETTERS: - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _020AEF08 _020AEF08: #endif @@ -12000,8 +11999,7 @@ _020AFCF0: .global TBL_TALK_GROUP_STRING_ID_START TBL_TALK_GROUP_STRING_ID_START: #if defined(EUROPE) - .byte 0x17, 0x12, 0x6D, 0x16, 0xC6, 0x17, 0x65, 0x0F - .byte 0xBE, 0x10, 0x1F, 0x19 + .byte 0x17, 0x12, 0x6D, 0x16, 0xC6, 0x17, 0x65, 0x0F, 0xBE, 0x10, 0x1F, 0x19 #elif defined(JAPAN) .byte 0x98, 0x24, 0xEE, 0x28, 0x47, 0x2A, 0xA0, 0x2B, 0xF9, 0x2C, 0x52, 0x2E #else @@ -12541,8 +12539,8 @@ GLOBAL_PROGRESS_PTR: .global ADVENTURE_LOG_PTR ADVENTURE_LOG_PTR: .byte 0x00, 0x00, 0x00, 0x00 - .global _020AFF7C -_020AFF7C: + .global MT_TABLE +MT_TABLE: .byte 0x71, 0x02, 0x00, 0x00 .global _020AFF80 _020AFF80: @@ -12912,8 +12910,8 @@ RANK_STRING_PTR_TABLE: .word _020A3C50 .word _020A3C78 .word _020A3C14 - .global _020B0AD8 -_020B0AD8: + .global RESCUE_BIN_UNPACK +RESCUE_BIN_UNPACK: .byte 0xAD, 0x68, 0xC1, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index db713a0c..2c512e18 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -6613,7 +6613,7 @@ _022E1E60: mov r4, r0 mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 - bl sub_0204CDE8 + bl SetWorldMapLevel mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 bl ov11_0230F050 @@ -6624,7 +6624,7 @@ _022E1E88: mov r4, r0 mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 - bl sub_0204CDE8 + bl SetWorldMapLevel mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 bl ov11_0230F08C @@ -7572,7 +7572,7 @@ _022E2BC8: bl ScriptParamToInt mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 moveq r0, #2 movne r5, #0 @@ -13116,7 +13116,7 @@ _022E7680: bl ov11_022E8090 add r0, sp, #0x100 ldrsh r0, [r0, #0x78] - bl sub_02065BC8 + bl SetNewFriendActor add r0, sp, #0x100 add r0, r0, #0xae mov r1, #0xa diff --git a/asm/overlay_11_022EE5E4.s b/asm/overlay_11_022EE5E4.s index 58188a14..2c740ce5 100644 --- a/asm/overlay_11_022EE5E4.s +++ b/asm/overlay_11_022EE5E4.s @@ -24429,7 +24429,7 @@ _023023B8: ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x4c] - bl sub_02065BC8 + bl SetNewFriendActor ldr r0, _023025E4 ; =ov11_02324D48 mov r1, #0xf ldr r0, [r0] @@ -49190,7 +49190,7 @@ ov11_023168E0: ; 0x023168E0 _0231691C: mov r0, r8, lsl #0x18 mov r0, r0, asr #0x18 - bl sub_0205F0F0 + bl IsAcceptedMissionSlotEmpty cmp r0, #0 bne _023169F0 mov r0, r8, lsl #0x18 diff --git a/asm/overlay_17_0238A754.s b/asm/overlay_17_0238A754.s index 125dde0c..b0b313b1 100644 --- a/asm/overlay_17_0238A754.s +++ b/asm/overlay_17_0238A754.s @@ -1099,7 +1099,7 @@ _0238B530: .word OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ov17_0238B534: ; 0x0238B534 stmdb sp!, {r3, lr} mov r0, #5 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238B578 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 @@ -1173,7 +1173,7 @@ ov17_0238B5FC: ; 0x0238B5FC ldrsh r1, [r1, #0x58] orr r1, r1, #0x20000 str r1, [r2, #0xc] - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238B684 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 @@ -1219,7 +1219,7 @@ _0238B6A8: .word OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ov17_0238B6AC: ; 0x0238B6AC stmdb sp!, {r3, lr} mov r0, #7 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238B6D8 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 @@ -1359,7 +1359,7 @@ _0238B850: .word OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ov17_0238B854: ; 0x0238B854 stmdb sp!, {r3, lr} mov r0, #3 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 ldreq r0, _0238B878 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 moveq r1, #0 diff --git a/asm/overlay_20.s b/asm/overlay_20.s index 84d6fca8..6ed59de8 100644 --- a/asm/overlay_20.s +++ b/asm/overlay_20.s @@ -848,7 +848,7 @@ _0238AC84: b _0238B05C _0238AC98: mov r0, #4 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 moveq r0, #0x36 streq r0, [sb, #0xc] @@ -936,7 +936,7 @@ _0238ADC8: b _0238B05C _0238ADDC: mov r0, #4 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 bne _0238B05C mov r0, #0x2e diff --git a/asm/overlay_24.s b/asm/overlay_24.s index c2e865af..52b0c61b 100644 --- a/asm/overlay_24.s +++ b/asm/overlay_24.s @@ -760,7 +760,7 @@ _0238ABF8: cmp r0, #0 bgt _0238B37C mov r0, #3 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 bne _0238AC2C mov r0, #3 @@ -1713,7 +1713,7 @@ _0238B9D4: cmp r0, #0 bgt _0238C158 mov r0, #3 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 bne _0238BA08 mov r0, #3 diff --git a/asm/overlay_29_022DC65C.s b/asm/overlay_29_022DC65C.s index 43555300..eeb1df16 100644 --- a/asm/overlay_29_022DC65C.s +++ b/asm/overlay_29_022DC65C.s @@ -2156,8 +2156,8 @@ ov29_022DE2C8: ; 0x022DE2C8 _022DE2FC: .word DUNGEON_PTR arm_func_end ov29_022DE2C8 - arm_func_start ov29_022DE300 -ov29_022DE300: ; 0x022DE300 + arm_func_start InitDungeonPaletteStruct +InitDungeonPaletteStruct: ; 0x022DE300 stmdb sp!, {r3, lr} mov r0, #0x74 mov r1, #0 @@ -2233,7 +2233,7 @@ _022DE414: .word 0x000003FE #else _022DE414: .word 0x0000040A #endif - arm_func_end ov29_022DE300 + arm_func_end InitDungeonPaletteStruct arm_func_start ov29_022DE418 ov29_022DE418: ; 0x022DE418 diff --git a/asm/overlay_29_022DEBA4.s b/asm/overlay_29_022DEBA4.s index 2e4405f4..ce93ec4d 100644 --- a/asm/overlay_29_022DEBA4.s +++ b/asm/overlay_29_022DEBA4.s @@ -116,7 +116,7 @@ ov29_022DEBBC: ; 0x022DEBBC strb r0, [r1, #0x790] ldr r1, [r2] strb r0, [r1, #0x791] - bl ov29_022EAF34 + bl SetUnkMusicFlag ldr r0, _022DEF2C ; =DUNGEON_PTR mov r1, #0 ldr r2, [r0] @@ -492,15 +492,15 @@ _022DF238: ldreq r0, [sl, #0x18] streq r0, [sb, #0x7a0] beq _022DF2C4 - bl sub_02063504 + bl ReadMissionMtStateLower mov r4, r0 bl Rand16Bit orr r0, r0, r4, lsl #16 - bl sub_020510E8 - bl sub_02051134 + bl MtInit + bl MtNext bic r0, r0, #0xff000000 str r0, [sb, #0x7a0] - bl sub_020634F4 + bl WriteMissionMtState _022DF2C4: ldr r0, [sb, #0x7a0] bl SetDungeonRngPreseed23Bit @@ -1259,14 +1259,14 @@ _022DFC60: add r3, r2, #0x248 mov r2, r4 add r3, r3, #0x400 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter b _022DFDB0 _022DFD9C: ldr r0, _022DFF74 ; =0x00000261 mov r1, r4 mov r2, r4 mov r3, #0 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter _022DFDB0: bl UpdateShouldBoostKecleonShopSpawnChance bl UpdateShouldBoostHiddenStairsSpawnChance @@ -1326,7 +1326,7 @@ _022DFE64: mov r1, #0 ldr r0, _022DFF78 ; =0x00000279 mov r3, r1 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter mov r1, #1 b _022DFF8C _022DFE94: @@ -1337,7 +1337,7 @@ _022DFE94: mov r2, r0 mov r3, r1 mov r0, #0x27c - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter ldr r0, _022DFF40 ; =DUNGEON_PTR ldr r0, [r0] ldrb r0, [r0, #0x790] @@ -1355,7 +1355,7 @@ _022DFED4: mov r1, #0 ldr r0, _022DFF7C ; =0x0000027D mov r3, r1 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter ldr r0, _022DFF40 ; =DUNGEON_PTR ldr r0, [r0] ldrb r0, [r0, #0x790] @@ -1373,7 +1373,7 @@ _022DFF14: mov r1, #0 ldr r0, _022DFF80 ; =0x0000027A mov r3, r1 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter mov r1, #1 b _022DFF8C .align 2, 0 @@ -1426,7 +1426,7 @@ _022DFF8C: mov r1, #0 ldr r0, _022E034C ; =0x0000027B mov r3, r1 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter ldr r0, _022DFF40 ; =DUNGEON_PTR ldr r0, [r0] ldrb r0, [r0, #0x790] @@ -1458,7 +1458,7 @@ _022E0014: mov r1, #0 ldr r0, _022DFF80 ; =0x0000027A mov r3, r1 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter b _022E00EC _022E005C: ldr r1, _022DFF40 ; =DUNGEON_PTR @@ -1487,7 +1487,7 @@ _022E008C: mov r1, #0 ldr r0, _022DFF80 ; =0x0000027A mov r3, r1 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter b _022E00EC _022E00C8: bl GetHiddenFloorField @@ -1514,7 +1514,7 @@ _022E00EC: mov r0, #0 ldr r1, [r1] strb r0, [r1, #0x791] - bl ov29_022EAF34 + bl SetUnkMusicFlag ldr r1, _022DFF40 ; =DUNGEON_PTR mov r3, #0 ldr r0, [r1] diff --git a/asm/overlay_29_022E08A0.s b/asm/overlay_29_022E08A0.s index eebbdb84..2dc6c657 100644 --- a/asm/overlay_29_022E08A0.s +++ b/asm/overlay_29_022E08A0.s @@ -867,7 +867,7 @@ _022E1300: .word ov29_022E11F8 ov29_022E1304: ; 0x022E1304 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x24 - bl ov29_022E150C + bl ResetDungeonColorPalette ldr r1, _022E14EC ; =0x000003FE add r2, sp, #8 mov r0, #4 @@ -1063,8 +1063,8 @@ _022E1508: .word 0x0001212C #endif arm_func_end ov29_022E1304 - arm_func_start ov29_022E150C -ov29_022E150C: ; 0x022E150C + arm_func_start ResetDungeonColorPalette +ResetDungeonColorPalette: ; 0x022E150C ldr r0, _022E154C ; =DUNGEON_PTR mov r3, #0 _022E1514: @@ -1084,7 +1084,7 @@ _022E1514: bx lr .align 2, 0 _022E154C: .word DUNGEON_PTR - arm_func_end ov29_022E150C + arm_func_end ResetDungeonColorPalette arm_func_start ov29_022E1550 ov29_022E1550: ; 0x022E1550 diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s index 2e567886..149002d1 100644 --- a/asm/overlay_29_022E37DC.s +++ b/asm/overlay_29_022E37DC.s @@ -2599,7 +2599,7 @@ ov29_022E56F4: ; 0x022E56F4 cmp r0, #0 bne _022E5710 mov r0, r4 - bl ov29_022EACE4 + bl PlayMeByIdIfNot998 ldmia sp!, {r4, pc} _022E5710: bl ShouldDisplayEntityAdvanced @@ -3137,7 +3137,7 @@ _022E5DFC: ldr r0, _022E5E7C ; =ov29_0235119C mov r1, r4, lsl #1 ldrh r0, [r0, r1] - bl ov29_022EACE4 + bl PlayMeByIdIfNot998 b _022E5E3C _022E5E10: cmp r4, #3 @@ -3151,7 +3151,7 @@ _022E5E2C: ldr r0, _022E5E7C ; =ov29_0235119C mov r1, r4, lsl #1 ldrh r0, [r0, r1] - bl ov29_022EACE4 + bl PlayMeByIdIfNot998 _022E5E3C: mov r0, r5 mov r1, r4 diff --git a/asm/overlay_29_022E7EC4.s b/asm/overlay_29_022E7EC4.s index 5dc89826..b7b8a78e 100644 --- a/asm/overlay_29_022E7EC4.s +++ b/asm/overlay_29_022E7EC4.s @@ -286,7 +286,7 @@ _022E8210: cmp r0, #1 beq _022E8238 mov r0, #1 - bl ov29_022E8CA8 + bl DungeonChangeTopScreenType _022E8238: bl ov29_022E8CE8 ldmia sp!, {r3, pc} @@ -712,25 +712,25 @@ ov29_022E8708: ; 0x022E8708 cmp r0, #3 bne _022E8724 mov r0, #3 - bl ov29_022E8CA8 + bl DungeonChangeTopScreenType ldmia sp!, {r3, pc} _022E8724: cmp r0, #2 bne _022E8738 mov r0, #0 - bl ov29_022E8CA8 + bl DungeonChangeTopScreenType ldmia sp!, {r3, pc} _022E8738: cmp r0, #0 bne _022E874C mov r0, #2 - bl ov29_022E8CA8 + bl DungeonChangeTopScreenType ldmia sp!, {r3, pc} _022E874C: cmp r0, #4 bne _022E8760 mov r0, #4 - bl ov29_022E8CA8 + bl DungeonChangeTopScreenType ldmia sp!, {r3, pc} _022E8760: bl ov29_022E81F8 @@ -739,11 +739,11 @@ _022E8760: arm_func_start ov29_022E8768 ov29_022E8768: ; 0x022E8768 - ldr ip, _022E8774 ; =ov29_022E8CA8 + ldr ip, _022E8774 ; =DungeonChangeTopScreenType mov r0, #5 bx ip .align 2, 0 -_022E8774: .word ov29_022E8CA8 +_022E8774: .word DungeonChangeTopScreenType arm_func_end ov29_022E8768 arm_func_start ov29_022E8778 @@ -1153,8 +1153,8 @@ _022E8C9C: _022E8CA4: .word TOP_SCREEN_STATUS_PTR arm_func_end FreeTopScreen - arm_func_start ov29_022E8CA8 -ov29_022E8CA8: ; 0x022E8CA8 + arm_func_start DungeonChangeTopScreenType +DungeonChangeTopScreenType: ; 0x022E8CA8 ldr r1, _022E8CE4 ; =TOP_SCREEN_STATUS_PTR ldr r3, [r1] ldrsh r2, [r3, #8] @@ -1172,7 +1172,7 @@ ov29_022E8CA8: ; 0x022E8CA8 bx lr .align 2, 0 _022E8CE4: .word TOP_SCREEN_STATUS_PTR - arm_func_end ov29_022E8CA8 + arm_func_end DungeonChangeTopScreenType arm_func_start ov29_022E8CE8 ov29_022E8CE8: ; 0x022E8CE8 diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s index 05801a7a..f733fc0a 100644 --- a/asm/overlay_29_022EAB50.s +++ b/asm/overlay_29_022EAB50.s @@ -147,8 +147,8 @@ PlaySeByIdIfNotSilence: ; 0x022EACCC ldmia sp!, {r3, pc} arm_func_end PlaySeByIdIfNotSilence - arm_func_start ov29_022EACE4 -ov29_022EACE4: ; 0x022EACE4 + arm_func_start PlayMeByIdIfNot998 +PlayMeByIdIfNot998: ; 0x022EACE4 stmdb sp!, {r3, lr} ldr r1, _022EACFC ; =0x000003E6 cmp r0, r1 @@ -157,7 +157,7 @@ ov29_022EACE4: ; 0x022EACE4 ldmia sp!, {r3, pc} .align 2, 0 _022EACFC: .word 0x000003E6 - arm_func_end ov29_022EACE4 + arm_func_end PlayMeByIdIfNot998 arm_func_start MusicTableIdxToMusicId MusicTableIdxToMusicId: ; 0x022EAD00 @@ -365,15 +365,15 @@ ov29_022EAF20: ; 0x022EAF20 _022EAF30: .word DUNGEON_PTR arm_func_end ov29_022EAF20 - arm_func_start ov29_022EAF34 -ov29_022EAF34: ; 0x022EAF34 + arm_func_start SetUnkMusicFlag +SetUnkMusicFlag: ; 0x022EAF34 ldr r1, _022EAF44 ; =DUNGEON_PTR ldr r1, [r1] strb r0, [r1, #0x792] bx lr .align 2, 0 _022EAF44: .word DUNGEON_PTR - arm_func_end ov29_022EAF34 + arm_func_end SetUnkMusicFlag arm_func_start ov29_022EAF48 ov29_022EAF48: ; 0x022EAF48 diff --git a/asm/overlay_29_022EB44C.s b/asm/overlay_29_022EB44C.s index 9e2fc762..02aa805f 100644 --- a/asm/overlay_29_022EB44C.s +++ b/asm/overlay_29_022EB44C.s @@ -189,8 +189,8 @@ _022EB658: ldmia sp!, {r3, r4, r5, pc} arm_func_end RemoveUsedItem - arm_func_start ov29_022EB668 -ov29_022EB668: ; 0x022EB668 + arm_func_start ConvertTmToUsedTm +ConvertTmToUsedTm: ; 0x022EB668 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #8 mov r8, r1 @@ -304,7 +304,7 @@ _022EB7F8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022EB800: .word DUNGEON_PTR - arm_func_end ov29_022EB668 + arm_func_end ConvertTmToUsedTm arm_func_start ov29_022EB804 ov29_022EB804: ; 0x022EB804 diff --git a/asm/overlay_29_022ECDE4.s b/asm/overlay_29_022ECDE4.s index 7e59794c..ec3ac851 100644 --- a/asm/overlay_29_022ECDE4.s +++ b/asm/overlay_29_022ECDE4.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_022ECDE4 -ov29_022ECDE4: ; 0x022ECDE4 + arm_func_start CreateMonsterSummaryFromEntityOuter +CreateMonsterSummaryFromEntityOuter: ; 0x022ECDE4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} ldr r4, _022ECF34 ; =DUNGEON_PTR mov r6, r1 @@ -107,7 +107,7 @@ _022ECF3C: .word 0x00000889 _022ECF3C: .word 0x00000A41 #endif _022ECF40: .word 0x000003E7 - arm_func_end ov29_022ECDE4 + arm_func_end CreateMonsterSummaryFromEntityOuter arm_func_start IsDungeonEndReasonFailure IsDungeonEndReasonFailure: ; 0x022ECF44 diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index 96db5a14..58382599 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -677,7 +677,7 @@ _022EEA68: add r1, sp, #0 ldr r1, [r1, r6, lsl #2] mov r0, r4 - bl ov29_022FA574 + bl DisplayLinkedMovesWarnings mov r8, #1 _022EEADC: cmp r8, #0 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index cfdab58e..23521af4 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -235,8 +235,8 @@ ov29_022F0848: ; 0x022F0848 _022F0858: .word UnkMapRelatedFunc arm_func_end ov29_022F0848 - arm_func_start ov29_022F085C -ov29_022F085C: ; 0x022F085C + arm_func_start GonePebbleGradualPaletteShift +GonePebbleGradualPaletteShift: ; 0x022F085C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 mov r8, r1 @@ -317,7 +317,7 @@ _022F0964: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022F0980: .word DUNGEON_PTR - arm_func_end ov29_022F085C + arm_func_end GonePebbleGradualPaletteShift arm_func_start TalkToSecretBazaarNpc TalkToSecretBazaarNpc: ; 0x022F0984 diff --git a/asm/overlay_29_022F59C4.s b/asm/overlay_29_022F59C4.s index 695308b2..32d2bc7b 100644 --- a/asm/overlay_29_022F59C4.s +++ b/asm/overlay_29_022F59C4.s @@ -566,7 +566,7 @@ _022F6014: ldr r1, [sb, #0xb4] mov r0, sb ldrb r1, [r1, #0x54] - bl ov29_022FA574 + bl DisplayLinkedMovesWarnings _022F6040: mov r0, sb bl TryActivateTruant diff --git a/asm/overlay_29_022F7768.s b/asm/overlay_29_022F7768.s index 8109918d..f079002e 100644 --- a/asm/overlay_29_022F7768.s +++ b/asm/overlay_29_022F7768.s @@ -288,7 +288,7 @@ _022F7AE8: mov r0, r5 mov r1, sl mov r3, r4 - bl sub_02053250 + bl InitializeTeamMemberFromMentry ldr r0, _022F7BE8 ; =TEAM_MEMBER_TABLE_PTR mov r1, r4, lsl #1 ldr r0, [r0] @@ -440,7 +440,7 @@ _022F7CE4: mov r0, r5 mov r1, r6 mov r3, r4 - bl sub_02053250 + bl InitializeTeamMemberFromMentry ldr r0, _022F7E28 ; =TEAM_MEMBER_TABLE_PTR mov r1, r4, lsl #1 ldr r0, [r0] @@ -1001,14 +1001,14 @@ _022F8284: add r3, r2, #0x248 mov r2, sl add r3, r3, #0x400 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter b _022F82C8 _022F82B4: mov r0, sb mov r1, r8 mov r2, sl mov r3, #0 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter _022F82C8: ldr r0, _022F85E8 ; =0x0000025E cmp sb, r0 diff --git a/asm/overlay_29_022FA524.s b/asm/overlay_29_022FA524.s index de0b7751..5dc2fff5 100644 --- a/asm/overlay_29_022FA524.s +++ b/asm/overlay_29_022FA524.s @@ -34,8 +34,8 @@ _022FA560: _022FA570: .word DUNGEON_PTR arm_func_end ov29_022FA524 - arm_func_start ov29_022FA574 -ov29_022FA574: ; 0x022FA574 + arm_func_start DisplayLinkedMovesWarnings +DisplayLinkedMovesWarnings: ; 0x022FA574 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -80,7 +80,7 @@ _022FA5E4: .word 0x00000C1D _022FA5E8: .word 0x00000C1E _022FA5EC: .word 0x00000C1F #endif - arm_func_end ov29_022FA574 + arm_func_end DisplayLinkedMovesWarnings arm_func_start MewSpawnCheck MewSpawnCheck: ; 0x022FA5F0 diff --git a/asm/overlay_29_022FBC4C.s b/asm/overlay_29_022FBC4C.s index 4bd76200..824f6475 100644 --- a/asm/overlay_29_022FBC4C.s +++ b/asm/overlay_29_022FBC4C.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_022FBC4C -ov29_022FBC4C: ; 0x022FBC4C + arm_func_start CountActiveMonsters +CountActiveMonsters: ; 0x022FBC4C stmdb sp!, {r3, r4, r5, lr} mov r5, #0 ldr r4, _022FBC90 ; =DUNGEON_PTR @@ -30,7 +30,7 @@ _022FBC80: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022FBC90: .word DUNGEON_PTR - arm_func_end ov29_022FBC4C + arm_func_end CountActiveMonsters arm_func_start ov29_022FBC94 ov29_022FBC94: ; 0x022FBC94 diff --git a/asm/overlay_29_022FC9C0.s b/asm/overlay_29_022FC9C0.s index 19fa3f88..5d21a9e3 100644 --- a/asm/overlay_29_022FC9C0.s +++ b/asm/overlay_29_022FC9C0.s @@ -708,7 +708,7 @@ ov29_022FD318: ; 0x022FD318 mov r6, r1 mov r5, r2 mov r4, r3 - bl ov29_022FBC4C + bl CountActiveMonsters cmp r0, #0 moveq r0, #0 beq _022FD3AC diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index 01aa95d7..d5ab32ed 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -2620,7 +2620,7 @@ _0230AEEC: mov r2, #0 bl TalkToSecretBazaarNpcStandard mov r0, #4 - bl ov29_022EAF34 + bl SetUnkMusicFlag mov r0, sb bl ov29_022F0518 mov r0, sb @@ -2649,7 +2649,7 @@ _0230AEEC: bl MusicTableIdxToMusicId bl ChangeDungeonMusic mov r0, r4 - bl ov29_022EAF34 + bl SetUnkMusicFlag mov r0, sb bl ov29_0230D628 b _0230B04C @@ -3233,7 +3233,7 @@ _0230A4A0: mov r2, #0 bl TalkToSecretBazaarNpcStandard mov r0, #4 - bl ov29_022EAF34 + bl SetUnkMusicFlag mov r0, r7 bl ov29_022F0518 mov r0, r7 @@ -3262,7 +3262,7 @@ _0230A4A0: bl MusicTableIdxToMusicId bl ChangeDungeonMusic mov r0, r6 - bl ov29_022EAF34 + bl SetUnkMusicFlag mov r0, r7 bl ov29_0230D628 _0230A5E0: diff --git a/asm/overlay_29_0231A8A0.s b/asm/overlay_29_0231A8A0.s index 32be0b00..5818979c 100644 --- a/asm/overlay_29_0231A8A0.s +++ b/asm/overlay_29_0231A8A0.s @@ -89,7 +89,7 @@ _0231A984: bl UpdateMovePp ldrb r1, [r4, #0x4e] mov r0, sb - bl ov29_022FA574 + bl DisplayLinkedMovesWarnings _0231A9BC: mov r0, sb bl TryActivateTruant diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 7149893b..8cda93b0 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -1011,7 +1011,7 @@ ApplyGonePebbleEffect: ; 0x0231D838 bl ov29_022EAF20 mov r4, r0 mov r0, #3 - bl ov29_022EAF34 + bl SetUnkMusicFlag ldr r1, _0231D9B0 ; =0x000003FF mov r0, #4 add r2, sp, #4 @@ -1029,7 +1029,7 @@ ApplyGonePebbleEffect: ; 0x0231D838 bl ov29_022DD828 ldr r0, [sp] mov r1, #6 - bl ov29_022F085C + bl GonePebbleGradualPaletteShift ldr r0, _0231D9B4 ; =0x00000C65 bl ov29_022F0780 bl ov29_022F05E4 @@ -1059,7 +1059,7 @@ ApplyGonePebbleEffect: ; 0x0231D838 bl MusicTableIdxToMusicId bl ChangeDungeonMusic mov r0, r4 - bl ov29_022EAF34 + bl SetUnkMusicFlag #ifndef JAPAN bl UpdateMinimap mov r0, #1 @@ -1069,7 +1069,7 @@ ApplyGonePebbleEffect: ; 0x0231D838 bl GetApparentWeather bl GetWeatherColorTable mov r1, #6 - bl ov29_022F085C + bl GonePebbleGradualPaletteShift mov r0, r5 bl ov29_022F0518 add r0, sp, #4 @@ -1282,7 +1282,7 @@ _0231DB70: ldr r2, _0231DBEC ; =0x00000141 mov r0, sl mov r1, #0 - bl ov29_022EB668 + bl ConvertTmToUsedTm mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 @@ -1402,7 +1402,7 @@ _0231DCEC: mov r0, sl mov r1, #0 str r4, [r3, #0xc8] - bl ov29_022EB668 + bl ConvertTmToUsedTm mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 diff --git a/asm/overlay_29_02348020.s b/asm/overlay_29_02348020.s index 04a15d10..0d4b3a19 100644 --- a/asm/overlay_29_02348020.s +++ b/asm/overlay_29_02348020.s @@ -356,7 +356,7 @@ FillMissionDestinationInfo: ; 0x023484A0 add r0, r0, #0x348 add r7, r0, #0x400 add r0, r7, #0x18 - bl ov29_023496EC + bl ClearMissionDestinationInfo ldr r0, _02348804 ; =DUNGEON_PTR ldr r0, [r0] add r0, r0, #0x700 @@ -659,10 +659,10 @@ _02348884: .word DUNGEON_PTR arm_func_start ov29_02348888 ov29_02348888: ; 0x02348888 - ldr ip, _02348890 ; =ov29_02349AD4 + ldr ip, _02348890 ; =TryCompleteMission bx ip .align 2, 0 -_02348890: .word ov29_02349AD4 +_02348890: .word TryCompleteMission arm_func_end ov29_02348888 arm_func_start ov29_02348894 @@ -787,8 +787,8 @@ _02348A04: _02348A14: .word DUNGEON_PTR arm_func_end ov29_02348994 - arm_func_start ov29_02348A18 -ov29_02348A18: ; 0x02348A18 + arm_func_start MissionExitPrompt +MissionExitPrompt: ; 0x02348A18 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r7, #0 mov r5, #1 @@ -837,7 +837,7 @@ _02348AB8: .word 0x00000B65 #else _02348AB8: .word 0x00000E24 #endif - arm_func_end ov29_02348A18 + arm_func_end MissionExitPrompt arm_func_start ov29_02348ABC ov29_02348ABC: ; 0x02348ABC @@ -854,13 +854,13 @@ ov29_02348ABC: ; 0x02348ABC ldr r1, [r1] mov r2, #0 strb r2, [r1, #0x777] - bl ov29_02348A18 + bl MissionExitPrompt cmp r0, #0 ldmeqia sp!, {r3, pc} bl GetItemToRetrieve mov r1, r0 mov r0, #0 - bl ov29_02349AD4 + bl TryCompleteMission ldr r0, _02348B20 ; =DUNGEON_PTR mov r1, #1 ldr r0, [r0] @@ -898,7 +898,7 @@ ov29_02348B28: ; 0x02348B28 mov r2, r0 bl SubstitutePlaceholderStringTags ldr r0, _02348B9C ; =0x00000E44 - bl ov29_02348A18 + bl MissionExitPrompt mov r1, #1 ldr r0, _02348B94 ; =DUNGEON_PTR ldr r0, [r0] diff --git a/asm/overlay_29_02348D3C.s b/asm/overlay_29_02348D3C.s index 17f1492f..c2683746 100644 --- a/asm/overlay_29_02348D3C.s +++ b/asm/overlay_29_02348D3C.s @@ -147,7 +147,7 @@ _02348EF4: _02348F08: cmp r1, #3 bne _02348F18 - bl ov29_0234AC8C + bl TreasureMemoComplete mov r2, #1 _02348F18: mov r0, r2 @@ -251,7 +251,7 @@ _02349058: bl GetItemToRetrieve mov r1, r0 mov r0, #0 - bl ov29_02349AD4 + bl TryCompleteMission ldr r0, _02349088 ; =DUNGEON_PTR mov r1, #1 ldr r0, [r0] @@ -308,7 +308,7 @@ _02349118: bl GetItemToRetrieve mov r1, r0 mov r0, #0 - bl ov29_02349AD4 + bl TryCompleteMission ldr r0, _02349148 ; =DUNGEON_PTR mov r1, #1 ldr r0, [r0] @@ -343,13 +343,13 @@ _02349184: .word DUNGEON_PTR arm_func_start ov29_02349188 ov29_02349188: ; 0x02349188 ldr r0, _0234919C ; =DUNGEON_PTR - ldr ip, _023491A0 ; =ov29_023496EC + ldr ip, _023491A0 ; =ClearMissionDestinationInfo ldr r0, [r0] add r0, r0, #0x760 bx ip .align 2, 0 _0234919C: .word DUNGEON_PTR -_023491A0: .word ov29_023496EC +_023491A0: .word ClearMissionDestinationInfo arm_func_end ov29_02349188 arm_func_start GetMissionDestination @@ -855,8 +855,8 @@ GetTargetMonsterNotFoundFlag: ; 0x023496D8 _023496E8: .word DUNGEON_PTR arm_func_end GetTargetMonsterNotFoundFlag - arm_func_start ov29_023496EC -ov29_023496EC: ; 0x023496EC + arm_func_start ClearMissionDestinationInfo +ClearMissionDestinationInfo: ; 0x023496EC mov ip, #0 strb ip, [r0] strb ip, [r0, #0x18] @@ -881,7 +881,7 @@ _02349724: blt _02349724 strh r3, [r0, #0x14] bx lr - arm_func_end ov29_023496EC + arm_func_end ClearMissionDestinationInfo arm_func_start FloorHasMissionMonster FloorHasMissionMonster: ; 0x02349748 diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index f83a2b58..84d86b0c 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -174,8 +174,8 @@ _02349AC0: _02349AD0: .word DUNGEON_PTR arm_func_end GetFirstExperienceLockedTeamMember - arm_func_start ov29_02349AD4 -ov29_02349AD4: ; 0x02349AD4 + arm_func_start TryCompleteMission +TryCompleteMission: ; 0x02349AD4 stmdb sp!, {r3, r4, r5, lr} ldr r2, _02349C80 ; =DUNGEON_PTR mov r5, r0 @@ -295,7 +295,7 @@ _02349C78: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02349C80: .word DUNGEON_PTR - arm_func_end ov29_02349AD4 + arm_func_end TryCompleteMission arm_func_start ov29_02349C84 ov29_02349C84: ; 0x02349C84 @@ -487,7 +487,7 @@ _02349F1C: add r0, r0, #4 bl ov29_022FA3D4 mov r0, #1 - bl ov29_022EAF34 + bl SetUnkMusicFlag bl GetMissionTargetEnemy mov r1, r0 mov r0, #1 @@ -657,7 +657,7 @@ _0234A148: mov r2, #1 bl DisplayMessage mov r0, #2 - bl ov29_022EAF34 + bl SetUnkMusicFlag b _0234A1D4 _0234A198: mov r0, #0 @@ -1225,7 +1225,7 @@ _0234A84C: b _0234A898 _0234A890: ldr r0, _0234A8B8 ; =0x00000E44 - bl ov29_02348A18 + bl MissionExitPrompt _0234A898: mov r0, #0 mov r1, r0 @@ -1539,7 +1539,7 @@ ov29_0234ABB0: ; 0x0234ABB0 bl ChangeDungeonMusic _0234AC38: mov r0, #0 - bl ov29_022EAF34 + bl SetUnkMusicFlag _0234AC40: mov r0, r4 mov r1, #0 @@ -1553,7 +1553,7 @@ _0234AC40: b _0234AC70 _0234AC68: ldr r0, _0234AC88 ; =0x00000E43 - bl ov29_02348A18 + bl MissionExitPrompt _0234AC70: mov r0, #0 mov r1, r0 @@ -1571,8 +1571,8 @@ _0234AC88: .word 0x00000E43 #endif arm_func_end ov29_0234ABB0 - arm_func_start ov29_0234AC8C -ov29_0234AC8C: ; 0x0234AC8C + arm_func_start TreasureMemoComplete +TreasureMemoComplete: ; 0x0234AC8C stmdb sp!, {r3, r4, r5, lr} bl GetSpecialTargetItem mov r1, r0 @@ -1586,9 +1586,9 @@ ov29_0234AC8C: ; 0x0234AC8C mov r2, #0 ldr r0, _0234AD08 ; =0x00000E12 mov r3, r2 - bl ov29_0234D70C + bl PrintMissionCompleteString mov r0, #9 - bl ov29_022EACE4 + bl PlayMeByIdIfNot998 mov r5, #0x62 mov r4, #9 b _0234ACE0 @@ -1597,14 +1597,14 @@ _0234ACD8: bl AdvanceFrame _0234ACE0: mov r0, r4 - bl sub_02017C10 + bl IsMePlaying cmp r0, #0 bne _0234ACD8 bl ov29_0234D838 mov r0, #0 bl ov29_0234D8A0 ldr r0, _0234AD0C ; =0x00000E43 - bl ov29_02348A18 + bl MissionExitPrompt ldmia sp!, {r3, r4, r5, pc} .align 2, 0 #ifdef JAPAN @@ -1614,7 +1614,7 @@ _0234AD0C: .word 0x00000B84 _0234AD08: .word 0x00000E12 _0234AD0C: .word 0x00000E43 #endif - arm_func_end ov29_0234AC8C + arm_func_end TreasureMemoComplete arm_func_start ov29_0234AD10 ov29_0234AD10: ; 0x0234AD10 @@ -1699,7 +1699,7 @@ _0234AE0C: bl ov29_022FA3D4 _0234AE1C: mov r0, #1 - bl ov29_022EAF34 + bl SetUnkMusicFlag ldr r1, _0234AE3C ; =0x00000E05 mov r0, #0 mov r2, #1 diff --git a/asm/overlay_29_0234AEE8.s b/asm/overlay_29_0234AEE8.s index b460b075..7251b14e 100644 --- a/asm/overlay_29_0234AEE8.s +++ b/asm/overlay_29_0234AEE8.s @@ -26,7 +26,7 @@ ov29_0234AEE8: ; 0x0234AEE8 bl ChangeDungeonMusic _0234AF24: mov r0, #0 - bl ov29_022EAF34 + bl SetUnkMusicFlag ldmia sp!, {r3, pc} .align 2, 0 _0234AF30: .word DUNGEON_PTR @@ -61,7 +61,7 @@ _0234AF8C: mov r0, #1 bl AnimationDelayOrSomething mov r0, r4 - bl ov29_02348A18 + bl MissionExitPrompt ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0234AFA0: .word 0x0000025B diff --git a/asm/overlay_29_0234BEE0.s b/asm/overlay_29_0234BEE0.s index 5e7acaea..81416eb6 100644 --- a/asm/overlay_29_0234BEE0.s +++ b/asm/overlay_29_0234BEE0.s @@ -75,7 +75,7 @@ RunDungeonMode: ; 0x0234BF28 bl DungeonZInit bl ov29_022DDFF0 bl ov29_022DDFFC - bl ov29_022DE300 + bl InitDungeonPaletteStruct ldr r0, _0234C1C8 ; =ov29_023537D8 mov ip, r5 ldr r0, [r0, #4] diff --git a/asm/overlay_29_0234D484.s b/asm/overlay_29_0234D484.s index 064a5a52..d1a401e6 100644 --- a/asm/overlay_29_0234D484.s +++ b/asm/overlay_29_0234D484.s @@ -216,8 +216,8 @@ ov29_0234D6C8: ; 0x0234D6C8 ldmia sp!, {r3, r4, r5, r6, pc} arm_func_end ov29_0234D6C8 - arm_func_start ov29_0234D70C -ov29_0234D70C: ; 0x0234D70C + arm_func_start PrintMissionCompleteString +PrintMissionCompleteString: ; 0x0234D70C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r2 mov r7, r1 @@ -235,7 +235,7 @@ ov29_0234D70C: ; 0x0234D70C bl ov29_0234DC3C bl ov29_0234D9C0 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_0234D70C + arm_func_end PrintMissionCompleteString arm_func_start ov29_0234D750 ov29_0234D750: ; 0x0234D750 diff --git a/asm/overlay_31_023838E4.s b/asm/overlay_31_023838E4.s index 0c225a80..c1add05d 100644 --- a/asm/overlay_31_023838E4.s +++ b/asm/overlay_31_023838E4.s @@ -6151,7 +6151,7 @@ _02388908: mov r1, #0 ldr r0, _023889D4 ; =0x0000025A mov r3, r1 - bl ov29_022ECDE4 + bl CreateMonsterSummaryFromEntityOuter ldr r0, _023889D8 ; =DUNGEON_PTR mov r1, #1 ldr r0, [r0] diff --git a/include/script_variable_2.h b/include/script_variable_2.h index c3afe7ea..3442df7d 100644 --- a/include/script_variable_2.h +++ b/include/script_variable_2.h @@ -4,7 +4,7 @@ void InitWorldMapScriptVars(); void sub_0204CDB8(void); s8 sub_0204CDCC(void); -void sub_0204CDE8(s32 value); +void SetWorldMapLevel(s32 value); bool8 sub_0204CE00(u32 idx); void sub_0204CE48(u32 idx, s32 value); void InitDungeonListScriptVars(void); diff --git a/src/main_0205BD14.c b/src/main_0205BD14.c index 56b7a286..af048b5b 100644 --- a/src/main_0205BD14.c +++ b/src/main_0205BD14.c @@ -15,7 +15,7 @@ extern void CopyBitsFrom(struct bitstream *stream, void *buf_read, s32 nbits); extern void* memset(void *s, s32 c, u32 n); extern void Copy16BitsFrom(struct bitstream *stream, void *buf_read); extern void BitstreamDebug(struct bitstream *stream); -extern void sub_020634F4(void); +extern void WriteMissionMtState(void); extern void InitBitstreamForRead(struct bitstream *stream, u32 p1, u32 p2); extern void CopyBitsTo(struct bitstream *stream, void* buf_write, s32 nbits); extern void Copy16BitsTo(struct bitstream *stream, void *buf_write); @@ -97,7 +97,7 @@ u32 sub_0205BD9C(u32 arg0, u32 arg1) BitstreamDebug(&stream); Rand16Bit(); - sub_020634F4(); + WriteMissionMtState(); return stream.bit_idx; } diff --git a/src/script_variable_2.c b/src/script_variable_2.c index 076d2fcc..46f65edf 100644 --- a/src/script_variable_2.c +++ b/src/script_variable_2.c @@ -17,7 +17,7 @@ s8 sub_0204CDCC(void) { return LoadScriptVariableValue(0, VAR_WORLD_MAP_LEVEL); } -void sub_0204CDE8(s32 value) { +void SetWorldMapLevel(s32 value) { SaveScriptVariableValue(0, VAR_WORLD_MAP_LEVEL, value); }