diff --git a/asm/include/main_02003DB8.inc b/asm/include/main_02003DB8.inc index fe912b18..4dc1f12d 100644 --- a/asm/include/main_02003DB8.inc +++ b/asm/include/main_02003DB8.inc @@ -56,12 +56,14 @@ .public Debug_Print0 .public FS_CloseFile .public FS_InitFile +.public FS_LoadOverlayImage +.public FS_LoadOverlayInfo .public FS_OpenFile .public FS_ReadFile .public FS_SeekFile +.public FS_StartOverlay .public FS_UnloadOverlay .public GetDsFirmwareUserSettings -.public FS_LoadOverlayInfo .public GX_BeginLoadBGExtPltt .public GX_BeginLoadOBJExtPltt .public GX_EndLoadBGExtPltt @@ -69,9 +71,7 @@ .public GXS_BeginLoadBGExtPltt .public GXS_EndLoadBGExtPltt .public IC_InvalidateAll -.public FS_StartOverlay .public LOADED_OVERLAY_GROUP_0 -.public FS_LoadOverlayImage .public MATH_CalcCRC32 .public MATHi_CRC32InitTable .public MemAlloc diff --git a/asm/include/main_0202676C.inc b/asm/include/main_0202676C.inc index 0af91444..ff36762b 100644 --- a/asm/include/main_0202676C.inc +++ b/asm/include/main_0202676C.inc @@ -20,6 +20,7 @@ .public _020AFD5C .public _020AFD60 .public _020AFD94 +.public _020AFD98 .public _020AFD9C .public _022A7A5C .public _022A7A6C @@ -64,7 +65,6 @@ .public MemFree .public memset .public MemZero -.public MENU_CONTROL_PTR .public PREV_MENU_ITEMS .public SetAnimationForAnimationControl .public SetSpriteIdForAnimationControl diff --git a/asm/include/main_0202A3E4.inc b/asm/include/main_0202A3E4.inc index 121537b3..5bf8b756 100644 --- a/asm/include/main_0202A3E4.inc +++ b/asm/include/main_0202A3E4.inc @@ -31,7 +31,6 @@ .public _0209B07C .public _0209B084 .public _020AFDAC -.public _020AFDB8 .public _s32_div_f .public ADVANCED_MENU_DEFAULT_WINDOW_PARAMS .public ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS @@ -69,6 +68,7 @@ .public MemcpySimple .public MemFree .public MemZero +.public MENU_CONTROL_PTR .public NewWindowScreenCheck .public NULL_OVERLAY_LOAD_ENTRY .public OPTIONS_MENU_DEFAULT_WINDOW_PARAMS diff --git a/asm/include/main_02034974.inc b/asm/include/main_02034974.inc index 8627b31d..747be92d 100644 --- a/asm/include/main_02034974.inc +++ b/asm/include/main_02034974.inc @@ -64,7 +64,6 @@ .public _0209C764 .public _0209C798 .public _0209C7B8 -.public _020AFDB8 .public _020AFDBC .public _020AFDD0 .public _020AFDD8 @@ -164,6 +163,7 @@ .public MemcpySimple .public MemFree .public MemZero +.public MENU_CONTROL_PTR .public NULL_OVERLAY_LOAD_ENTRY .public ov11_0230D71C .public OverlayIsLoaded diff --git a/asm/include/main_0205EDA4.inc b/asm/include/main_0205EDA4.inc index bfdfc52f..bfb271c2 100644 --- a/asm/include/main_0205EDA4.inc +++ b/asm/include/main_0205EDA4.inc @@ -1,7 +1,26 @@ #pragma once -.public ARM9_UNKNOWN_TABLE__NA_20A68BC +.public _020A3CA0 +.public _020A3CAD +.public _020A3CBC +.public _020A462C +.public _020A4644 +.public _020A4654 +.public _020A4664 +.public _020A4674 +.public _020A4678 +.public _020A4688 +.public _020A4698 +.public _020A46A8 +.public _020A46B0 +.public _020A46D0 +.public _020A5490 +.public _020AFC70 +.public _020B0AFC +.public _020B0B04 +.public _s32_div_f .public AlreadyHasSimilarMission .public AppendStandardStringToMission +.public ARM9_UNKNOWN_TABLE__NA_20A68BC .public BitstreamDebug .public CAFE_MISSION_REWARD_TYPE_WEIGHTS .public CHALLENGE_NORMAL_FIXED_ROOM_IDS @@ -10,17 +29,17 @@ .public CopyBitsFrom .public CopyBitsTo .public CopyColorToPaletteDataRgba -.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS .public Debug_GetDebugFlag .public Debug_Print0 +.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS .public DexNumbersEqual .public DirectoryFileMngr_OpenDirectoryFile .public DrawTextInWindow .public DungeonGoesUp .public DungeonSwapIdToIdx +.public EnqueueRender3dTiling .public ENTITIES .public EVENTS -.public EnqueueRender3dTiling .public FemaleToMaleForm .public FillPaletteDataRgba .public GetAdventureNpcIds @@ -56,7 +75,6 @@ .public GetUnitNpcIds .public HandleSir0TranslationVeneer .public HasMonsterBeenAttackedInDungeons -.public ITEM_DELIVERY_TABLE .public InitBitstreamForRead .public InitBitstreamForWrite .public InitPreprocessorArgs @@ -69,8 +87,15 @@ .public IsMonsterValid .public IsSpecialEpisodeBeaten .public IsStoryBeforePoint +.public ITEM_DELIVERY_TABLE .public LoadFileFromRom .public LoadScriptVariableValue +.public MarkPaletteDataAsNeedingUpdate +.public MaybeGetFormattedItemName +.public MemAlloc +.public MemcpySimple +.public MemFree +.public MemZero .public MISSION_BANNED_MONSTERS .public MISSION_BANNED_STORY_MONSTERS .public MISSION_DELIVER_LIST_PTR @@ -80,58 +105,30 @@ .public MISSION_RANK_POINTS .public MISSION_STRING_IDS .public MISSION_VALIDATION_FUNCTION_LIST -.public MarkPaletteDataAsNeedingUpdate -.public MaybeGetFormattedItemName -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple .public MissionToWonderMailPassword .public MultiplyByFixedPoint .public NO_SEND_ITEM_TABLE .public OUTLAW_HIDEOUT_FIXED_ROOM_IDS .public OUTLAW_MISSION_REWARD_TYPE_WEIGHTS +.public ov11_022E96E4 .public OverlayIsLoaded .public PreprocessString .public PreprocessStringFromId -.public RANK_STRING_PTR_TABLE -.public REMOTE_STRING_PTR_TABLE -.public RESCUE_BIN_UNPACK .public Rand16Bit .public RandInt .public RandIntSafe .public RandRangeSafe +.public RANK_STRING_PTR_TABLE +.public REMOTE_STRING_PTR_TABLE .public RemoveFirstUnequippedItemOfType +.public RESCUE_BIN_UNPACK .public RetrieveFromItemList2 .public SPECIAL_ACTORS -.public StringFromId -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public TREASURE_MEMO_FIXED_ROOM_IDS -.public UnloadFile -.public _020A3CA0 -.public _020A3CAD -.public _020A3CBC -.public _020A462C -.public _020A4644 -.public _020A4654 -.public _020A4664 -.public _020A4674 -.public _020A4678 -.public _020A4688 -.public _020A4698 -.public _020A46A8 -.public _020A46B0 -.public _020A46D0 -.public _020A5490 -.public _020AFC70 -.public _020B0AFC -.public _020B0B04 -.public _s32_div_f -.public ov11_022E96E4 .public strcat .public strcpy +.public StringFromId .public strncat +.public StrncpySimpleNoPadSafe .public sub_02001AB0 .public sub_020022C4 .public sub_020022D0 @@ -163,4 +160,7 @@ .public sub_0205E3F8 .public sub_0205E48C .public sub_0205E50C +.public TEAM_MEMBER_TABLE_PTR +.public TREASURE_MEMO_FIXED_ROOM_IDS +.public UnloadFile .public vsprintf diff --git a/asm/include/main_02065BD8.inc b/asm/include/main_02065BD8.inc index 2f54494a..96dba2d7 100644 --- a/asm/include/main_02065BD8.inc +++ b/asm/include/main_02065BD8.inc @@ -1,4 +1,45 @@ #pragma once +.public _020A68CA +.public _020A9208 +.public _020A9268 +.public _020A9278 +.public _020A9288 +.public _020A9298 +.public _020A92A8 +.public _020A92EC +.public _020A9304 +.public _020A931C +.public _020A9334 +.public _020A9364 +.public _020A937C +.public _020A9394 +.public _020A93B4 +.public _020B0A54 +.public _020B0B24 +.public _020B0B2C +.public _020B0B2D +.public _020B0B2E +.public _020B0B2F +.public _020B0B30 +.public _020B0B31 +.public _020B0B32 +.public _020B0B33 +.public _020B0B34 +.public _020B0B35 +.public _020B0B36 +.public _020B0B37 +.public _020B0B38 +.public _020B0B39 +.public _020B0B3A +.public _020B0B3B +.public _020B0B3C +.public _020B0B3D +.public _020B0B3E +.public _020B0B3F +.public _020B0B44 +.public _020B0B48 +.public _022B7310 +.public _022B7320 .public AddMissionToJobList .public AlreadyHaveMission .public BulkItemToItem @@ -12,8 +53,8 @@ .public CountJobListMissions .public CreateCollectionMenu .public CreatePortraitBox -.public DEMO_TEAMS .public Debug_Print0 +.public DEMO_TEAMS .public DirectoryFileMngr_ExtractAllDirectoryFiles .public DrawTextInWindow .public DungeonRequestsDoneWrapper @@ -75,68 +116,6 @@ .public MemZero .public NoteLoadBase .public NoteSaveBase -.public OverlayIsLoaded -.public PlaySeVolumeWrapper -.public PreprocessStringFromId -.public RandInt -.public ReadSaveHeader -.public SPECIAL_ACTORS -.public SetAdventureLogStructLocation -.public SetBothScreensWindowsColor -.public SetCollectionMenuField0x1B2 -.public SetGameMode -.public SetQuestionMarks -.public SetScenarioProgressScriptVar -.public SetSpecialEpisodeOpen -.public SetSpecialEpisodeType -.public ShowPortraitInPortraitBox -.public StrncpySimple -.public StrncpySimpleNoPadSafe -.public UnloadOverlay -.public UpdateWindow -.public WAN_TABLE -.public ZeroInitScriptVariable -.public _020A68CA -.public _020A9208 -.public _020A9268 -.public _020A9278 -.public _020A9288 -.public _020A9298 -.public _020A92A8 -.public _020A92EC -.public _020A9304 -.public _020A931C -.public _020A9334 -.public _020A9364 -.public _020A937C -.public _020A9394 -.public _020A93B4 -.public _020B0A54 -.public _020B0B24 -.public _020B0B2C -.public _020B0B2D -.public _020B0B2E -.public _020B0B2F -.public _020B0B30 -.public _020B0B31 -.public _020B0B32 -.public _020B0B33 -.public _020B0B34 -.public _020B0B35 -.public _020B0B36 -.public _020B0B37 -.public _020B0B38 -.public _020B0B39 -.public _020B0B3A -.public _020B0B3B -.public _020B0B3C -.public _020B0B3D -.public _020B0B3E -.public _020B0B3F -.public _020B0B44 -.public _020B0B48 -.public _022B7310 -.public _022B7320 .public ov00_022BE0C8 .public ov01_02337B3C .public ov01_02337B68 @@ -151,6 +130,23 @@ .public ov03_0233CDD8 .public ov03_0233CDE4 .public ov11_022E82CC +.public OverlayIsLoaded +.public PlaySeVolumeWrapper +.public PreprocessStringFromId +.public RandInt +.public ReadSaveHeader +.public SetAdventureLogStructLocation +.public SetBothScreensWindowsColor +.public SetCollectionMenuField0x1B2 +.public SetGameMode +.public SetQuestionMarks +.public SetScenarioProgressScriptVar +.public SetSpecialEpisodeOpen +.public SetSpecialEpisodeType +.public ShowPortraitInPortraitBox +.public SPECIAL_ACTORS +.public StrncpySimple +.public StrncpySimpleNoPadSafe .public sub_020024A0 .public sub_02003B94 .public sub_02003BC8 @@ -228,3 +224,7 @@ .public sub_0205F710 .public sub_0205FA38 .public sub_0206276C +.public UnloadOverlay +.public UpdateWindow +.public WAN_TABLE +.public ZeroInitScriptVariable diff --git a/asm/include/main_02075600.inc b/asm/include/main_02075600.inc index 0d6311f6..376e79c2 100644 --- a/asm/include/main_02075600.inc +++ b/asm/include/main_02075600.inc @@ -32,7 +32,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -54,6 +53,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/asm/include/main_0207F894.inc b/asm/include/main_0207F894.inc index d596a379..783c24eb 100644 --- a/asm/include/main_0207F894.inc +++ b/asm/include/main_0207F894.inc @@ -2,12 +2,10 @@ .public _02000BC4 .public _020AEC5C .public _020B2BB4 -.public fsi_digest_key_len .public _020B2BC0 .public _020B2BC4 .public _020B2C84 .public _020B2D88 -.public sDayOfYear .public _020B2ED0 .public _020B2ED4 .public _020B2FBC @@ -16,7 +14,6 @@ .public _022BB5FC .public _022BB604 .public _022BB60C -.public fsi_arc_rom .public _022BB670 .public _022BB68C .public _022BB6AC @@ -97,6 +94,8 @@ .public FS_ReadFile .public FS_RegisterArchiveName .public FS_SetArchiveProc +.public fsi_arc_rom +.public fsi_digest_key_len .public FSi_FindPath .public GetIrqFlag .public IC_InvalidateAll @@ -105,8 +104,8 @@ .public MI_CpuFill8 .public MI_DmaCopy16 .public MI_StopDma -.public MIi_UncompressBackward .public MIi_CardDmaCopy32 +.public MIi_UncompressBackward .public MTi_CpuClear32 .public MTi_CpuClearFast .public MTi_CpuCopy32 @@ -145,6 +144,7 @@ .public Rtci_ReadRawDateTimeAsync .public Rtci_ReadRawTimeAsync .public Rtci_WriteRawStatus2Async +.public sDayOfYear .public SetIrqFlag .public SVC_CpuSet .public SVC_WaitByLoop diff --git a/asm/include/overlay_10_022BCC7C.inc b/asm/include/overlay_10_022BCC7C.inc index 327a085b..db130f5f 100644 --- a/asm/include/overlay_10_022BCC7C.inc +++ b/asm/include/overlay_10_022BCC7C.inc @@ -100,6 +100,7 @@ .public PreprocessString .public Rand16Bit .public SetAndPlayAnimationForAnimationControl +.public SetAnimationControlPausedFlag .public SetAnimationForAnimationControl .public SetPortraitEmotion .public SetPortraitLayout @@ -119,7 +120,6 @@ .public sub_0201D034 .public sub_0201D0F8 .public sub_0201D12C -.public sub_0201D198 .public sub_0201D1B0 .public sub_0201D9C8 .public sub_0201DA20 diff --git a/asm/include/overlay_29_022DEBA4.inc b/asm/include/overlay_29_022DEBA4.inc index 207c2d4c..782cbf87 100644 --- a/asm/include/overlay_29_022DEBA4.inc +++ b/asm/include/overlay_29_022DEBA4.inc @@ -55,7 +55,9 @@ .public IsSecretBazaarVeneer .public IsTrapInvisibleWhenAttacking .public LEADER_PTR +.public LoadActiveMonsterSprites .public LoadMappaFileAttributes +.public LoadMonsterSprites .public LoadScriptVariableValue .public LoadWeather3DFiles .public MemZero @@ -122,8 +124,6 @@ .public ov29_022F6E40 .public ov29_022F6EF4 .public ov29_022F7104 -.public ov29_022F7130 -.public ov29_022F7308 .public ov29_022F7910 .public ov29_022F7BF4 .public ov29_022F7E34 diff --git a/asm/include/overlay_29_022E335C.inc b/asm/include/overlay_29_022E335C.inc index 3586eb63..3b0e0309 100644 --- a/asm/include/overlay_29_022E335C.inc +++ b/asm/include/overlay_29_022E335C.inc @@ -11,11 +11,11 @@ .public LogMessageByIdWithPopupCheckUser .public ov10_022BF274 .public ov10_022BF2B4 -.public ov10_022BF8E8 .public ov10_022BFD20 .public ov29_022E2C6C .public ov29_0235110C .public ov29_0235354C +.public ScreenEffectActive .public ShouldDisplayEntityAdvanced .public sub_0201CF90 .public UpdateCamera diff --git a/asm/include/overlay_29_022E7EC4.inc b/asm/include/overlay_29_022E7EC4.inc index e1204a4e..c9fbf5af 100644 --- a/asm/include/overlay_29_022E7EC4.inc +++ b/asm/include/overlay_29_022E7EC4.inc @@ -2,6 +2,8 @@ .public CloseTextBox2 .public CreateTextBox .public DrawTextInWindow +.public DUNGEON_CONTROLS_MENU_PTR +.public DUNGEON_CONTROLS_MENU_WINDOW_PARAMS .public DUNGEON_FRAMES_PASSED .public DUNGEON_PTR .public DungeonGetSpriteIndex @@ -41,9 +43,7 @@ .public ov29_0234F290 .public ov29_0234F2B8 .public ov29_023515E8 -.public ov29_023515F4 .public ov29_0235352C -.public ov29_02353558 .public SetMinimapDataE447 .public SetMinimapDataE448 .public StartFadeDungeonWrapper diff --git a/asm/include/overlay_29_022EFB20.inc b/asm/include/overlay_29_022EFB20.inc index 6f354b4b..62a23201 100644 --- a/asm/include/overlay_29_022EFB20.inc +++ b/asm/include/overlay_29_022EFB20.inc @@ -8,5 +8,5 @@ .public ov29_0234D8A0 .public ov29_023535A4 .public ov29_0237C9A0 -.public sub_0201D198 +.public SetAnimationControlPausedFlag .public WaitUntilAlertBoxPauseIsOver diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 74c8c7ad..0148fb64 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -29,6 +29,7 @@ .public DungeonRandInt .public EntityIsValid__022F0590 .public ExecuteMoveEffect +.public FreezeAnim .public GetActiveTeamMember .public GetBottomScreenOption .public GetCheckDirectionOption @@ -47,6 +48,7 @@ .public GetMessageLogPreprocessorArgs .public GetMoneyCarried .public GetMonsterGenderVeneer +.public GetMonsterInFront .public GetPressedButtons .public GetTeamMemberIndex .public GetTile @@ -102,12 +104,8 @@ .public ov29_022EB568 .public ov29_022EB594 .public ov29_022EB944 -.public ov29_022F04F0 -.public ov29_022F0518 -.public ov29_022F59C4 .public ov29_022F62CC .public ov29_022F670C -.public ov29_022F87C0 .public ov29_022F89AC .public ov29_022F9C34 .public ov29_022F9EA0 @@ -191,11 +189,13 @@ .public sub_0201CF90 .public sub_02027B1C .public SubstitutePlaceholderStringTags +.public TalkToTeamMemberInFront .public TryAddMonsterToActiveTeam .public TryLeaderItemPickUp .public TryPointCameraToMonster .public TryTriggerMonsterHouse .public TryTriggerTrap +.public UnfreezeAnim .public UnkMapRelatedFunc .public UpdateAiTargetPos .public UpdateMinimap diff --git a/asm/include/overlay_29_022F59C4.inc b/asm/include/overlay_29_022F59C4.inc index 83ff3c13..5d2b2714 100644 --- a/asm/include/overlay_29_022F59C4.inc +++ b/asm/include/overlay_29_022F59C4.inc @@ -17,6 +17,7 @@ .public GetLeader .public GetMessageLogPreprocessorArgs .public GetMissionDestination +.public GetMonsterInFront .public GetNumberOfAttacks .public GetPersonalityIndex .public GetSize0x80Buffer @@ -39,7 +40,6 @@ .public ov29_022E81F8 .public ov29_022F3B8C .public ov29_022F6748 -.public ov29_022F87C0 .public ov29_023009CC .public ov29_0231AE3C .public ov29_02322374 diff --git a/asm/include/overlay_29_022F9744.inc b/asm/include/overlay_29_022F9744.inc index af49545c..a3b96f47 100644 --- a/asm/include/overlay_29_022F9744.inc +++ b/asm/include/overlay_29_022F9744.inc @@ -30,6 +30,7 @@ .public GetMessageLogPreprocessorArgs .public GetMobilityType .public GetMonsterEvoStatus +.public GetMonsterInFront .public GetMoveTypeForMonster .public GetTileAtEntity .public GetTileSafe @@ -42,7 +43,6 @@ .public ov29_022E4160 .public ov29_022E81F8 .public ov29_022EA370 -.public ov29_022F87C0 .public ov29_02307CE0 .public ov29_02307DD0 .public PointCameraToMonster diff --git a/asm/include/overlay_29_022FB678.inc b/asm/include/overlay_29_022FB678.inc index c1d564b1..b6ab5579 100644 --- a/asm/include/overlay_29_022FB678.inc +++ b/asm/include/overlay_29_022FB678.inc @@ -11,9 +11,9 @@ .public IqSkillIsEnabled .public IsMonster__022F9720 .public IsSecretBazaarNpcBehavior -.public ov29_022E576C .public ov29_02307CE0 .public ov29_02348100 +.public PlayMissSfx__022E611C .public TeamMemberHasEnabledIqSkill .public UpdateMapSurveyorFlag .public UpdateMinimap diff --git a/asm/include/overlay_29_022FC9C0.inc b/asm/include/overlay_29_022FC9C0.inc index 07c315dc..f36e69a5 100644 --- a/asm/include/overlay_29_022FC9C0.inc +++ b/asm/include/overlay_29_022FC9C0.inc @@ -41,6 +41,7 @@ .public GetType .public InflictSleepStatusSingle .public InitEnemyStatsAndMoves +.public InitExplorerMazeMonsterStatsMovesAndIq .public InitStandardItem .public IsBagFull .public IsBehaviorLoneOutlaw @@ -85,7 +86,6 @@ .public ov29_022FB83C .public ov29_022FBF08 .public ov29_022FBF30 -.public ov29_022FC468 .public ov29_02307DC0 .public ov29_02351E28 .public ov29_0235276C diff --git a/asm/include/overlay_29_022FE4BC.inc b/asm/include/overlay_29_022FE4BC.inc index 7c282592..56269fef 100644 --- a/asm/include/overlay_29_022FE4BC.inc +++ b/asm/include/overlay_29_022FE4BC.inc @@ -2,6 +2,7 @@ .public AbilityIsActiveVeneer .public ActivateEndOfTurnEffects .public AdvanceFrame +.public AiUseMove .public AnimationDelayOrSomething .public CanMonsterMoveInDirection .public CannotStandOnTile__023006C8 @@ -25,7 +26,6 @@ .public ov10_022C4F3C .public ov10_022C4F3D .public ov29_022E3A58 -.public ov29_022E5D68 .public ov29_022E81F8 .public ov29_022EB944 .public ov29_022EC85C @@ -37,13 +37,9 @@ .public ov29_022F48D8 .public ov29_022F49E0 .public ov29_022F4BDC -.public ov29_022F4BF8 .public ov29_022F4DAC .public ov29_022F505C .public ov29_022F52B0 -.public ov29_022F59C4 -.public ov29_022F5F18 -.public ov29_022F6058 .public ov29_022F9840 .public ov29_022F996C .public ov29_022FBD08 @@ -54,20 +50,24 @@ .public ov29_0230F140 .public ov29_0230F14C .public ov29_0230F158 -.public ov29_0231A8A0 .public ov29_0231A9F8 .public ov29_02337CCC .public ov29_02346888 .public ov29_0237C9C0 .public ov29_0237CA68 .public ov29_0237CA6C +.public PlayerUseMove +.public PlayStairsSfx .public PositionIsOnHiddenStairs .public SetHiddenFloorField .public SetMessageLogGroupStartFlag .public SubstitutePlaceholderStringTags +.public TalkToTeamMemberInFront .public TryActivateFlashFireOnAllMonsters +.public TryPlaceItem .public TrySpawnTrapperTrap .public TryTriggerTrap +.public UseRegularAttackOrStruggle .public UseSingleUseItemWrapper .public UseThrowableItem .public WaitUntilAlertBoxPauseIsOver diff --git a/asm/include/overlay_29_02301A84.inc b/asm/include/overlay_29_02301A84.inc index 347fbeaa..0af3faeb 100644 --- a/asm/include/overlay_29_02301A84.inc +++ b/asm/include/overlay_29_02301A84.inc @@ -5,8 +5,8 @@ .public GetApparentWeather .public GetExclusiveItemWithEffectFromBag .public LogMessageByIdWithPopupCheckUserTarget +.public LogMessageWithTargetAndExclusiveItemName .public MistIsActive -.public ov29_02314DC4 .public ov29_02324BE8 .public PrepareItemForPrinting__02345728 .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc index 88bc8706..93320f64 100644 --- a/asm/include/overlay_29_02302A5C.inc +++ b/asm/include/overlay_29_02302A5C.inc @@ -11,6 +11,7 @@ .public DUNGEON_PTR .public DungeonGetSpriteIndex .public DungeonRandInt +.public DungeonScreenEffectActive .public EndTwoTurnMove .public EntityIsValid__02302A38 .public EntityIsValid__023047B8 @@ -47,7 +48,6 @@ .public ov29_022DDB98 .public ov29_022E273C .public ov29_022E3570 -.public ov29_022E3580 .public ov29_022E6724 .public ov29_022E6E80 .public ov29_022EA370 @@ -56,7 +56,6 @@ .public ov29_022ECB38 .public ov29_023009CC .public ov29_02304830 -.public ov29_02338988 .public ov29_0234B4E0 .public ov29_0234CFA0 .public ov29_0234D234 @@ -76,6 +75,7 @@ .public PlaySeByIdIfShouldDisplayEntity .public Rand16Bit .public SetAndPlayAnimationForAnimationControl +.public SetAnimationControlPausedFlag .public SetMessageLogPreprocessorArgsFlagVal .public SetMessageLogPreprocessorArgsNumberVal .public SetMonsterTypeAndAbility @@ -88,7 +88,6 @@ .public StringFromId .public sub_020149C0 .public sub_0201D034 -.public sub_0201D198 .public sub_0201D1B0 .public sub_0204F610 .public sub_02053904 @@ -97,3 +96,4 @@ .public SwitchAnimationControlToNextFrame .public TryPointCameraToMonster .public UpdateIqSkillsWrapper +.public Weather3DEffectActive diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index 9c5febe4..2b425d06 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -57,8 +57,6 @@ .public ov10_022C593C .public ov29_022E5478 .public ov29_022E550C -.public ov29_022E576C -.public ov29_022E57A0 .public ov29_022E66D8 .public ov29_022E81F8 .public ov29_022EA370 @@ -66,7 +64,6 @@ .public ov29_022ECD84 .public ov29_022EFB20 .public ov29_022EFB84 -.public ov29_022F0518 .public ov29_022F0534 .public ov29_022F05E4 .public ov29_022F0780 @@ -94,6 +91,8 @@ .public ov29_023535D4 .public ov29_0237CA6C .public PlayEffectAnimationEntity +.public PlayMissSfx__022E611C +.public PlayMissSfx__022E6150 .public RecruitCheck .public RemoveHolderForItemInBag .public RestorePpAllMovesSetFlags @@ -113,6 +112,7 @@ .public TryRecruit .public TrySpawnEnemyItemDrop .public TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS +.public UnfreezeAnim .public UpdateAiTargetPos .public UpdateEntityPixelPos .public UpdateShopkeeperModeAfterAttack diff --git a/asm/include/overlay_29_0230F02C.inc b/asm/include/overlay_29_0230F02C.inc index 3ff13b3f..7bccfc72 100644 --- a/asm/include/overlay_29_0230F02C.inc +++ b/asm/include/overlay_29_0230F02C.inc @@ -24,7 +24,6 @@ .public IsItemUnkMissionItem2 .public ItemIsActive__0230F810 .public LogMessageByIdWithPopup -.public ov29_022F52BC .public ov29_022F9EA0 .public ov29_02345004 .public ov29_02347040 @@ -36,4 +35,5 @@ .public RemoveGroundItem .public ShouldMonsterRunAwayAndShowEffect .public SubstitutePlaceholderStringTags +.public UseSingleUseItemSelf .public UseThrowableItem diff --git a/asm/include/overlay_29_0231B33C.inc b/asm/include/overlay_29_0231B33C.inc index 4f85386e..a1fadad6 100644 --- a/asm/include/overlay_29_0231B33C.inc +++ b/asm/include/overlay_29_0231B33C.inc @@ -41,6 +41,7 @@ .public EntityIsValid__0231CBC8 .public ExclusiveItemEffectFlagTest .public FemaleToMaleForm +.public FreezeAnim .public GEO_PEBBLE_DAMAGE .public GetActiveTeamMember .public GetIdleAnimationId @@ -74,8 +75,6 @@ .public ov29_022E81F8 .public ov29_022E9FD0 .public ov29_022EA370 -.public ov29_022F04F0 -.public ov29_022F0518 .public ov29_022F9EA0 .public ov29_022FB920 .public ov29_022FB9BC @@ -111,6 +110,7 @@ .public TryInflictSleepStatus .public TryInflictSlipStatus .public TryWarp +.public UnfreezeAnim .public UpdateShopkeeperModeAfterAttack .public WaitUntilAlertBoxPauseIsOver .public WONDER_GUMMI_STAT_BOOST diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index 62858ed4..0c47b760 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -25,6 +25,7 @@ .public EndFrozenClassStatus .public EntityIsValid__0231CBC8 .public FemaleToMaleForm +.public FreezeAnim .public GetActiveTeamMember .public GetApparentWeather .public GetDoughSeedFlag @@ -67,8 +68,6 @@ .public ov29_022EAF20 .public ov29_022EFB20 .public ov29_022EFB84 -.public ov29_022F04F0 -.public ov29_022F0518 .public ov29_022F05E4 .public ov29_022F0780 .public ov29_022F8830 @@ -108,6 +107,7 @@ .public TryInflictPoisonedStatus .public TryInflictShadowHoldStatus .public TryWarp +.public UnfreezeAnim .public UnkMapRelatedFunc .public UnloadFile .public UpdateIqSkillsWrapper diff --git a/asm/include/overlay_29_02320788.inc b/asm/include/overlay_29_02320788.inc index 5add7633..3ccfb2f6 100644 --- a/asm/include/overlay_29_02320788.inc +++ b/asm/include/overlay_29_02320788.inc @@ -18,6 +18,7 @@ .public FindUnoccupiedTileWithin3 .public GetApparentWeather .public GetLeader +.public GetMonsterInFront .public GetRandomTile .public GetTileSafe .public InitMove @@ -32,7 +33,6 @@ .public ov29_022E5650 .public ov29_022F42F8 .public ov29_022F62CC -.public ov29_022F87C0 .public ov29_022F9C74 .public ov29_022FAA04 .public ov29_02305814 diff --git a/asm/include/overlay_29_0232393C.inc b/asm/include/overlay_29_0232393C.inc index 438affb3..e53baacb 100644 --- a/asm/include/overlay_29_0232393C.inc +++ b/asm/include/overlay_29_0232393C.inc @@ -15,6 +15,7 @@ .public GetApparentWeather .public GetEntityMoveTargetAndRange .public GetMonsterGenderVeneer +.public GetMonsterInFront .public GetMoveAccuracyOrAiChance .public GetMoveAnimationSpeed .public GetMoveNbStrikes @@ -30,7 +31,6 @@ .public ov10_022BEB2C .public ov29_022E2CA0 .public ov29_022EA370 -.public ov29_022F87C0 .public ov29_022F8830 .public ov29_022F88C0 .public ov29_023024E0 diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index 4e8836d3..5eea067b 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -360,6 +360,7 @@ .public LightningRodStormDrainCheck .public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUserTarget +.public LogMessageWithTargetAndExclusiveItemName .public LowerOffensiveStat .public MirrorMoveIsActive .public MonsterCannotAttack @@ -384,7 +385,6 @@ .public ov29_02300DC0 .public ov29_02301C2C .public ov29_02304C3C -.public ov29_02314DC4 .public ov29_0231AD38 .public ov29_023201D0 .public ov29_0232393C diff --git a/asm/include/overlay_29_02332A70.inc b/asm/include/overlay_29_02332A70.inc index 6e0319b9..046d7948 100644 --- a/asm/include/overlay_29_02332A70.inc +++ b/asm/include/overlay_29_02332A70.inc @@ -18,7 +18,7 @@ .public LogMessageByIdQuietCheckUserTarget .public LogMessageByIdWithPopupCheckUserTarget .public MoveHitCheck -.public ov29_022E576C .public ov29_0230D088 +.public PlayMissSfx__022E611C .public SetPreprocessorArgsStringToName .public ShouldDisplayEntityWrapper diff --git a/asm/include/overlay_29_0233861C.inc b/asm/include/overlay_29_0233861C.inc index 1b164b7f..bf846387 100644 --- a/asm/include/overlay_29_0233861C.inc +++ b/asm/include/overlay_29_0233861C.inc @@ -11,6 +11,7 @@ .public DUNGEON_PTR .public DungeonRandInt .public DungeonRandRange +.public DungeonScreenEffectActive .public FLOOR_GENERATION_STATUS .public GenerateSecondaryTerrainFormations .public GetBottomScreenOption @@ -53,7 +54,6 @@ .public ov10_022C6326 .public ov29_022DE288 .public ov29_022E2418 -.public ov29_022E3580 .public ov29_022E7F7C .public ov29_022EA408 .public ov29_0234217C diff --git a/asm/include/overlay_29_02341E6C.inc b/asm/include/overlay_29_02341E6C.inc index f7703e1b..8d40ba9d 100644 --- a/asm/include/overlay_29_02341E6C.inc +++ b/asm/include/overlay_29_02341E6C.inc @@ -47,7 +47,6 @@ .public ov10_022C6C77 .public ov10_022C6C78 .public ov10_022C6C79 -.public ov29_022E6694 .public ov29_022E7BD0 .public ov29_022EA370 .public ov29_023365E8 @@ -60,6 +59,7 @@ .public ov29_02353110 .public ov29_023534F0 .public ov29_0237CFC0 +.public PlayKeyDoorUnlockEffect .public PointsToZero .public SetMonsterLevelAndId .public SetShouldBoostHiddenStairsSpawnChance diff --git a/asm/main_020151E4.s b/asm/main_020151E4.s index e80d0372..6eb4407f 100644 --- a/asm/main_020151E4.s +++ b/asm/main_020151E4.s @@ -10253,15 +10253,15 @@ sub_0201D18C: ; 0x0201D18C bx lr arm_func_end sub_0201D18C - arm_func_start sub_0201D198 -sub_0201D198: ; 0x0201D198 + arm_func_start SetAnimationControlPausedFlag +SetAnimationControlPausedFlag: ; 0x0201D198 cmp r1, #0 ldrh r1, [r0] orrne r1, r1, #0x4000 biceq r1, r1, #0x4000 strh r1, [r0] bx lr - arm_func_end sub_0201D198 + arm_func_end SetAnimationControlPausedFlag arm_func_start sub_0201D1B0 sub_0201D1B0: ; 0x0201D1B0 diff --git a/asm/main_0202676C.s b/asm/main_0202676C.s index cf03e99f..d1e61a3e 100644 --- a/asm/main_0202676C.s +++ b/asm/main_0202676C.s @@ -2189,13 +2189,13 @@ _02027A64: .word _020AFD4C arm_func_start SetScreenWindowsColor SetScreenWindowsColor: ; 0x02027A68 - ldr r2, _02027A7C ; =MENU_CONTROL_PTR + ldr r2, _02027A7C ; =_020AFD98 cmp r1, #2 moveq r1, #1 strb r0, [r2, r1] bx lr .align 2, 0 -_02027A7C: .word MENU_CONTROL_PTR +_02027A7C: .word _020AFD98 arm_func_end SetScreenWindowsColor arm_func_start SetBothScreensWindowsColor @@ -2323,7 +2323,7 @@ _02027B9C: ldrsb r0, [r0, r1] cmp r0, #0 bne _02027DF0 - ldr r0, _02027E20 ; =MENU_CONTROL_PTR + ldr r0, _02027E20 ; =_020AFD98 ldrb r1, [r4, #4] ldrb r3, [r0, #1] ldr r2, _02027E24 ; =_0209ACAC @@ -2485,7 +2485,7 @@ _02027E00: _02027E14: .word _022A7A6C _02027E18: .word WINDOW_LIST _02027E1C: .word _0209AC64 -_02027E20: .word MENU_CONTROL_PTR +_02027E20: .word _020AFD98 _02027E24: .word _0209ACAC _02027E28: .word _022A7AE4 _02027E2C: .word _020AFD4C @@ -3530,7 +3530,7 @@ _02028A94: strb r1, [r7] cmp r0, #0 bne _02028BC4 - ldr r0, _02028DF8 ; =MENU_CONTROL_PTR + ldr r0, _02028DF8 ; =_020AFD98 ldrsb r3, [r6, #9] ldrb r2, [r0] ldr r0, _02028DEC ; =_022A7A6C @@ -3819,7 +3819,7 @@ _02028DE8: .word _020AFD4C _02028DEC: .word _022A7A6C _02028DF0: .word WINDOW_LIST _02028DF4: .word _022A7B1C -_02028DF8: .word MENU_CONTROL_PTR +_02028DF8: .word _020AFD98 _02028DFC: .word _0209ACA8 _02028E00: .word _0209AC64 _02028E04: .word _0209AC78 diff --git a/asm/main_0202A3E4.s b/asm/main_0202A3E4.s index 9e42ef38..7d9e6a72 100644 --- a/asm/main_0202A3E4.s +++ b/asm/main_0202A3E4.s @@ -12399,7 +12399,7 @@ sub_020346C0: ; 0x020346C0 mov r1, #1 bl MemAlloc mov r4, r0 - ldr ip, _02034708 ; =_020AFDB8 + ldr ip, _02034708 ; =MENU_CONTROL_PTR ldr r0, _0203470C ; =NULL_OVERLAY_LOAD_ENTRY str r4, [ip] add lr, r4, #0xc4 @@ -12413,7 +12413,7 @@ sub_020346C0: ; 0x020346C0 bl sub_020469BC ldmia sp!, {r4, pc} .align 2, 0 -_02034708: .word _020AFDB8 +_02034708: .word MENU_CONTROL_PTR _0203470C: .word NULL_OVERLAY_LOAD_ENTRY arm_func_end sub_020346C0 @@ -12421,7 +12421,7 @@ _0203470C: .word NULL_OVERLAY_LOAD_ENTRY sub_02034710: ; 0x02034710 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x10 - ldr r1, _02034798 ; =_020AFDB8 + ldr r1, _02034798 ; =MENU_CONTROL_PTR ldr r0, _0203479C ; =NULL_OVERLAY_LOAD_ENTRY ldr r1, [r1] add r4, r1, #0xc4 @@ -12435,7 +12435,7 @@ _0203473C: add r7, sp, #0 ldmia r0, {r0, r1, r2, r3} stmia r7, {r0, r1, r2, r3} - ldr ip, _02034798 ; =_020AFDB8 + ldr ip, _02034798 ; =MENU_CONTROL_PTR ldmia r7, {r0, r1, r2, r3} ldr r5, [ip] mov r6, #0 @@ -12455,7 +12455,7 @@ _0203473C: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02034798: .word _020AFDB8 +_02034798: .word MENU_CONTROL_PTR _0203479C: .word NULL_OVERLAY_LOAD_ENTRY arm_func_end sub_02034710 @@ -12487,33 +12487,33 @@ _020347EC: .word NULL_OVERLAY_LOAD_ENTRY arm_func_start FreeActiveMenu FreeActiveMenu: ; 0x020347F0 stmdb sp!, {r4, lr} - ldr r0, _0203483C ; =_020AFDB8 + ldr r0, _0203483C ; =MENU_CONTROL_PTR ldr r4, [r0] ldr r0, [r4, #0xcc] cmp r0, #0 beq _0203480C blx r0 _0203480C: - ldr r0, _0203483C ; =_020AFDB8 + ldr r0, _0203483C ; =MENU_CONTROL_PTR ldr r0, [r0] ldrb r0, [r0, #0xd8] cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0xc4] bl UnloadOverlay - ldr r0, _0203483C ; =_020AFDB8 + ldr r0, _0203483C ; =MENU_CONTROL_PTR mov r1, #0 ldr r0, [r0] strb r1, [r0, #0xd8] ldmia sp!, {r4, pc} .align 2, 0 -_0203483C: .word _020AFDB8 +_0203483C: .word MENU_CONTROL_PTR arm_func_end FreeActiveMenu arm_func_start sub_02034840 sub_02034840: ; 0x02034840 stmdb sp!, {r4, lr} - ldr r1, _020348DC ; =_020AFDB8 + ldr r1, _020348DC ; =MENU_CONTROL_PTR mov r4, r0 ldr r2, [r1] ldrb r1, [r2, #0x10] @@ -12537,14 +12537,14 @@ _0203487C: _02034894: cmp r4, #0 beq _020348B4 - ldr r1, _020348DC ; =_020AFDB8 + ldr r1, _020348DC ; =MENU_CONTROL_PTR mov r0, r4 ldr r1, [r1] add r1, r1, #0xc4 bl OverlayLoadEntriesEqual ldmia sp!, {r4, pc} _020348B4: - ldr r1, _020348DC ; =_020AFDB8 + ldr r1, _020348DC ; =MENU_CONTROL_PTR ldr r0, _020348E0 ; =NULL_OVERLAY_LOAD_ENTRY ldr r1, [r1] add r1, r1, #0x14 @@ -12555,6 +12555,6 @@ _020348B4: and r0, r0, #0xff ldmia sp!, {r4, pc} .align 2, 0 -_020348DC: .word _020AFDB8 +_020348DC: .word MENU_CONTROL_PTR _020348E0: .word NULL_OVERLAY_LOAD_ENTRY arm_func_end sub_02034840 diff --git a/asm/main_02034974.s b/asm/main_02034974.s index 595446a8..668c8ce4 100644 --- a/asm/main_02034974.s +++ b/asm/main_02034974.s @@ -6,7 +6,7 @@ arm_func_start InitMenuWithWindowExtraInfo InitMenuWithWindowExtraInfo: ; 0x02034974 stmdb sp!, {r4, r5, r6, lr} - ldr r3, _02034A34 ; =_020AFDB8 + ldr r3, _02034A34 ; =MENU_CONTROL_PTR mov r5, r1 ldr r1, [r3] mov r6, r0 @@ -15,7 +15,7 @@ InitMenuWithWindowExtraInfo: ; 0x02034974 bl OverlayLoadEntriesEqual cmp r0, #0 bne _02034A2C - ldr r0, _02034A34 ; =_020AFDB8 + ldr r0, _02034A34 ; =MENU_CONTROL_PTR ldr r1, [r0] ldrb r0, [r1, #0x10] cmp r0, #0 @@ -27,7 +27,7 @@ InitMenuWithWindowExtraInfo: ; 0x02034974 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} _020349C8: - ldr ip, _02034A34 ; =_020AFDB8 + ldr ip, _02034A34 ; =MENU_CONTROL_PTR mov r2, #1 ldr r0, [ip] mov r1, #0 @@ -58,13 +58,13 @@ _02034A2C: mov r0, #0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02034A34: .word _020AFDB8 +_02034A34: .word MENU_CONTROL_PTR arm_func_end InitMenuWithWindowExtraInfo arm_func_start CopyMenuControlWindowExtraInfo CopyMenuControlWindowExtraInfo: ; 0x02034A38 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _02034A7C ; =_020AFDB8 + ldr r1, _02034A7C ; =MENU_CONTROL_PTR mov r5, r0 ldr r4, [r1] ldr r0, [r4, #0x24] @@ -83,14 +83,14 @@ _02034A74: ldr r0, [r4, #0x24] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02034A7C: .word _020AFDB8 +_02034A7C: .word MENU_CONTROL_PTR arm_func_end CopyMenuControlWindowExtraInfo arm_func_start HandleMenus HandleMenus: ; 0x02034A80 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x10 - ldr r0, _02034C9C ; =_020AFDB8 + ldr r0, _02034C9C ; =MENU_CONTROL_PTR ldr ip, [r0] ldr r0, [ip, #0xd4] add r4, ip, #0xc4 @@ -112,7 +112,7 @@ _02034AAC: stmia r6, {r0, r1, r2, r3} strb r5, [ip, #0x10] _02034AD8: - ldr ip, _02034C9C ; =_020AFDB8 + ldr ip, _02034C9C ; =MENU_CONTROL_PTR ldr r6, [ip] ldrb r0, [r6, #0xc0] cmp r0, #0 @@ -132,7 +132,7 @@ _02034B0C: bne _02034B34 ldr r0, [r4] bl LoadOverlay - ldr r0, _02034C9C ; =_020AFDB8 + ldr r0, _02034C9C ; =MENU_CONTROL_PTR mov r1, #1 ldr r0, [r0] strb r1, [r0, #0xd8] @@ -142,13 +142,13 @@ _02034B34: beq _02034B5C blx r0 cmp r0, #0 - ldreq r0, _02034C9C ; =_020AFDB8 + ldreq r0, _02034C9C ; =MENU_CONTROL_PTR moveq r1, #3 ldreq r0, [r0] streq r1, [r0, #0xd4] beq _02034C94 _02034B5C: - ldr r0, _02034C9C ; =_020AFDB8 + ldr r0, _02034C9C ; =MENU_CONTROL_PTR mov r1, #2 ldr r0, [r0] str r1, [r0, #0xd4] @@ -167,7 +167,7 @@ _02034B6C: bl OverlayLoadEntriesEqual cmp r0, #0 beq _02034BE4 - ldr r0, _02034C9C ; =_020AFDB8 + ldr r0, _02034C9C ; =MENU_CONTROL_PTR mov r1, #3 ldr r0, [r0] cmp r5, #4 @@ -175,7 +175,7 @@ _02034B6C: bne _02034BE4 bl FreeActiveMenu ldr r0, _02034CA0 ; =NULL_OVERLAY_LOAD_ENTRY - ldr ip, _02034C9C ; =_020AFDB8 + ldr ip, _02034C9C ; =MENU_CONTROL_PTR ldmia r0, {r0, r1, r2, r3} stmia r4, {r0, r1, r2, r3} ldr r0, [ip] @@ -184,7 +184,7 @@ _02034B6C: ldr r0, [ip] str r1, [r0, #0xd4] _02034BE4: - ldr r0, _02034C9C ; =_020AFDB8 + ldr r0, _02034C9C ; =MENU_CONTROL_PTR ldr r1, [r0] ldrb r0, [r1, #0x10] cmp r0, #0 @@ -196,7 +196,7 @@ _02034BE4: bne _02034C10 bl FreeActiveMenu _02034C10: - ldr ip, _02034C9C ; =_020AFDB8 + ldr ip, _02034C9C ; =MENU_CONTROL_PTR mov r5, #0 ldr r6, [ip] ldr lr, _02034CA0 ; =NULL_OVERLAY_LOAD_ENTRY @@ -223,7 +223,7 @@ _02034C4C: bl FreeActiveMenu _02034C70: ldr r0, _02034CA0 ; =NULL_OVERLAY_LOAD_ENTRY - ldr ip, _02034C9C ; =_020AFDB8 + ldr ip, _02034C9C ; =MENU_CONTROL_PTR ldmia r0, {r0, r1, r2, r3} stmia r4, {r0, r1, r2, r3} ldr r0, [ip] @@ -235,7 +235,7 @@ _02034C94: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02034C9C: .word _020AFDB8 +_02034C9C: .word MENU_CONTROL_PTR _02034CA0: .word NULL_OVERLAY_LOAD_ENTRY arm_func_end HandleMenus diff --git a/asm/main_rodata_020A2808.s b/asm/main_rodata_020A2808.s index cac45944..19f14198 100644 --- a/asm/main_rodata_020A2808.s +++ b/asm/main_rodata_020A2808.s @@ -12056,8 +12056,8 @@ _020AFD60: .word _0209AD28 .word _0209AD3C #ifdef JAPAN - .global MENU_CONTROL_PTR -MENU_CONTROL_PTR: + .global _020AFD98 +_020AFD98: .byte 0x00, 0x00, 0x00, 0x00 .global _020AFD94 _020AFD94: @@ -12065,8 +12065,8 @@ _020AFD94: .global _020AFD94 _020AFD94: .byte 0x00, 0x00, 0x00, 0x00 - .global MENU_CONTROL_PTR -MENU_CONTROL_PTR: + .global _020AFD98 +_020AFD98: #endif .byte 0x00, 0x00, 0x00, 0x00 .global _020AFD9C @@ -12084,8 +12084,8 @@ _020AFDAC: .word _0209AE54 .word _0209AE68 .word _0209AE7C - .global _020AFDB8 -_020AFDB8: + .global MENU_CONTROL_PTR +MENU_CONTROL_PTR: .byte 0x00, 0x00, 0x00, 0x00 .global _020AFDBC _020AFDBC: diff --git a/asm/overlay_10_022BCC7C.s b/asm/overlay_10_022BCC7C.s index 2eb21b22..2bc6f77d 100644 --- a/asm/overlay_10_022BCC7C.s +++ b/asm/overlay_10_022BCC7C.s @@ -850,8 +850,8 @@ ov10_022BD744: ; 0x022BD744 _022BD758: .word ov10_022DC1C0 arm_func_end ov10_022BD744 - arm_func_start ov10_022BD75C -ov10_022BD75C: ; 0x022BD75C + arm_func_start LoadPaletteBase +LoadPaletteBase: ; 0x022BD75C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x18 cmp r1, #1 @@ -908,7 +908,7 @@ _022BD81C: .align 2, 0 _022BD824: .word WAN_TABLE _022BD828: .word OBJ_GRAPHICS_CONTROLS_PTR - arm_func_end ov10_022BD75C + arm_func_end LoadPaletteBase arm_func_start ov10_022BD82C ov10_022BD82C: ; 0x022BD82C @@ -982,7 +982,7 @@ _022BD888: mov r1, #0 mov r2, r1 mov r4, r0 - bl ov10_022BD75C + bl LoadPaletteBase ldr r0, _022BDA80 ; =WAN_TABLE mov r1, r4 ldr r0, [r0] @@ -1009,7 +1009,7 @@ _022BD888: mov r0, r4 mov r1, #1 ldrsh r2, [sp, #0x18] - bl ov10_022BD75C + bl LoadPaletteBase ldr r1, _022BDA78 ; =ov10_022DC1C0 ldrsh r2, [sp, #0x18] ldr r0, [r1] @@ -1040,7 +1040,7 @@ _022BD9D0: mov r1, #0 mov r0, r4 mov r2, r1 - bl ov10_022BD75C + bl LoadPaletteBase ldr r0, _022BDA80 ; =WAN_TABLE mov r1, r4 ldr r0, [r0] @@ -1127,7 +1127,7 @@ ov10_022BDADC: ; 0x022BDADC add r2, r0, #0x2700 ldrsh r0, [r2, #0x88] ldrsh r2, [r2, #0x90] - bl ov10_022BD75C + bl LoadPaletteBase _022BDB48: add sp, sp, #8 ldmia sp!, {r3, pc} @@ -2977,7 +2977,7 @@ _022BF3CC: ldmeqia sp!, {r4, pc} add r0, r4, #0x68 mov r1, #1 - bl sub_0201D198 + bl SetAnimationControlPausedFlag ldmia sp!, {r4, pc} arm_func_end ov10_022BF394 @@ -3004,7 +3004,7 @@ _022BF424: ldmeqia sp!, {r4, pc} add r0, r4, #0x68 mov r1, #0 - bl sub_0201D198 + bl SetAnimationControlPausedFlag ldmia sp!, {r4, pc} arm_func_end ov10_022BF3EC @@ -3358,8 +3358,8 @@ _022BF8E0: .word ov10_022DC1C0 _022BF8E4: .word ov10_022C7870 arm_func_end ov10_022BF864 - arm_func_start ov10_022BF8E8 -ov10_022BF8E8: ; 0x022BF8E8 + arm_func_start ScreenEffectActive +ScreenEffectActive: ; 0x022BF8E8 ldr r1, _022BF900 ; =ov10_022DC1C0 ldr r1, [r1] add r0, r1, r0 @@ -3368,7 +3368,7 @@ ov10_022BF8E8: ; 0x022BF8E8 bx lr .align 2, 0 _022BF900: .word ov10_022DC1C0 - arm_func_end ov10_022BF8E8 + arm_func_end ScreenEffectActive arm_func_start AnimationHasMoreFrames AnimationHasMoreFrames: ; 0x022BF904 diff --git a/asm/overlay_29_022DEBA4.s b/asm/overlay_29_022DEBA4.s index c5c8131a..f600a6b2 100644 --- a/asm/overlay_29_022DEBA4.s +++ b/asm/overlay_29_022DEBA4.s @@ -711,14 +711,14 @@ _022DF574: bl ov29_022DD5B4 bl ov29_023369F8 bl CopySpawnEntriesOnce - bl ov29_022F7130 + bl LoadMonsterSprites cmp r5, #0 bne _022DF5C4 bl ov29_0231B460 bl ov29_022F7104 b _022DF5CC _022DF5C4: - bl ov29_022F7308 + bl LoadActiveMonsterSprites bl ov29_022FBB1C _022DF5CC: bl ov29_022FE2E4 diff --git a/asm/overlay_29_022E335C.s b/asm/overlay_29_022E335C.s index c3f674f2..495ac49b 100644 --- a/asm/overlay_29_022E335C.s +++ b/asm/overlay_29_022E335C.s @@ -201,14 +201,14 @@ ov29_022E3570: ; 0x022E3570 _022E357C: .word ov29_0235354C arm_func_end ov29_022E3570 - arm_func_start ov29_022E3580 -ov29_022E3580: ; 0x022E3580 - ldr ip, _022E358C ; =ov10_022BF8E8 + arm_func_start DungeonScreenEffectActive +DungeonScreenEffectActive: ; 0x022E3580 + ldr ip, _022E358C ; =ScreenEffectActive mov r0, #0 bx ip .align 2, 0 -_022E358C: .word ov10_022BF8E8 - arm_func_end ov29_022E3580 +_022E358C: .word ScreenEffectActive + arm_func_end DungeonScreenEffectActive arm_func_start ov29_022E3590 ov29_022E3590: ; 0x022E3590 diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s index ef5ddb47..c3336da2 100644 --- a/asm/overlay_29_022E37DC.s +++ b/asm/overlay_29_022E37DC.s @@ -2634,8 +2634,8 @@ _022E5764: .word 0x0000130D _022E5768: .word 0x0000130C arm_func_end ov29_022E5728 - arm_func_start ov29_022E576C -ov29_022E576C: ; 0x022E576C + arm_func_start PlayMissSfx__022E611C +PlayMissSfx__022E611C: ; 0x022E576C stmdb sp!, {r3, lr} ldr r0, [r1, #0xb4] ldrb r0, [r0, #6] @@ -2651,10 +2651,10 @@ _022E578C: .align 2, 0 _022E5798: .word 0x00001306 _022E579C: .word 0x00001307 - arm_func_end ov29_022E576C + arm_func_end PlayMissSfx__022E611C - arm_func_start ov29_022E57A0 -ov29_022E57A0: ; 0x022E57A0 + arm_func_start PlayMissSfx__022E6150 +PlayMissSfx__022E6150: ; 0x022E57A0 stmdb sp!, {r3, lr} ldr r0, [r0, #0xb4] ldrb r0, [r0, #6] @@ -2670,7 +2670,7 @@ _022E57C0: .align 2, 0 _022E57CC: .word 0x00001306 _022E57D0: .word 0x00001307 - arm_func_end ov29_022E57A0 + arm_func_end PlayMissSfx__022E6150 arm_func_start ov29_022E57D4 ov29_022E57D4: ; 0x022E57D4 @@ -3086,8 +3086,8 @@ _022E5D60: .word 0x00000165 _022E5D64: .word DIRECTIONS_XY arm_func_end ov29_022E5BD8 - arm_func_start ov29_022E5D68 -ov29_022E5D68: ; 0x022E5D68 + arm_func_start PlayStairsSfx +PlayStairsSfx: ; 0x022E5D68 stmdb sp!, {r4, lr} mov r4, #0x3f00 bl GetFloorType @@ -3112,7 +3112,7 @@ _022E5DA4: _022E5DB0: .word DUNGEON_PTR _022E5DB4: .word 0x0000130A _022E5DB8: .word 0x00001309 - arm_func_end ov29_022E5D68 + arm_func_end PlayStairsSfx arm_func_start ov29_022E5DBC ov29_022E5DBC: ; 0x022E5DBC @@ -3827,8 +3827,8 @@ ov29_022E6644: ; 0x022E6644 _022E6690: .word 0x0000011D arm_func_end ov29_022E6644 - arm_func_start ov29_022E6694 -ov29_022E6694: ; 0x022E6694 + arm_func_start PlayKeyDoorUnlockEffect +PlayKeyDoorUnlockEffect: ; 0x022E6694 stmdb sp!, {r4, lr} mov r4, r1 ldr r1, _022E66C0 ; =0x0000019E @@ -3842,7 +3842,7 @@ ov29_022E6694: ; 0x022E6694 ldmia sp!, {r4, pc} .align 2, 0 _022E66C0: .word 0x0000019E - arm_func_end ov29_022E6694 + arm_func_end PlayKeyDoorUnlockEffect arm_func_start ov29_022E66C4 ov29_022E66C4: ; 0x022E66C4 diff --git a/asm/overlay_29_022E7EC4.s b/asm/overlay_29_022E7EC4.s index 0b36a5e9..cd94a357 100644 --- a/asm/overlay_29_022E7EC4.s +++ b/asm/overlay_29_022E7EC4.s @@ -518,8 +518,8 @@ _022E84E4: _022E84FC: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E84B0 - arm_func_start ov29_022E8500 -ov29_022E8500: ; 0x022E8500 + arm_func_start InitDungeonControlsMenuWithBg +InitDungeonControlsMenuWithBg: ; 0x022E8500 stmdb sp!, {lr} sub sp, sp, #0x14 add r0, sp, #0 @@ -535,12 +535,12 @@ ov29_022E8500: ; 0x022E8500 ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C21D8 - bl ov29_022E8E94 + bl InitDungeonControlsMenu add sp, sp, #0x14 ldmia sp!, {pc} .align 2, 0 _022E8548: .word TOP_SCREEN_STATUS_PTR - arm_func_end ov29_022E8500 + arm_func_end InitDungeonControlsMenuWithBg arm_func_start ov29_022E854C ov29_022E854C: ; 0x022E854C @@ -562,18 +562,18 @@ ov29_022E854C: ; 0x022E854C _022E8584: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E854C - arm_func_start ov29_022E8588 -ov29_022E8588: ; 0x022E8588 + arm_func_start FreeDungeonControlsMenuWithBg +FreeDungeonControlsMenuWithBg: ; 0x022E8588 stmdb sp!, {r3, lr} ldr r0, _022E85A4 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C2278 - bl ov29_022E8F28 + bl FreeDungeonControlsMenu ldmia sp!, {r3, pc} .align 2, 0 _022E85A4: .word TOP_SCREEN_STATUS_PTR - arm_func_end ov29_022E8588 + arm_func_end FreeDungeonControlsMenuWithBg arm_func_start ov29_022E85A8 ov29_022E85A8: ; 0x022E85A8 @@ -913,8 +913,8 @@ _022E8940: bl AssignTopScreenHandlers b _022E89DC _022E8960: - ldr ip, _022E8BC0 ; =ov29_022E8588 - ldr r1, _022E8BC4 ; =ov29_022E8500 + ldr ip, _022E8BC0 ; =FreeDungeonControlsMenuWithBg + ldr r1, _022E8BC4 ; =InitDungeonControlsMenuWithBg ldr r3, _022E8BC8 ; =ov29_022E854C add r0, r4, #0x14 mov r2, #0 @@ -1076,8 +1076,8 @@ _022E8BB0: .word FreeTeamStatsWrapper _022E8BB4: .word InitializeTeamStats _022E8BB8: .word UpdateTeamStatsWrapper _022E8BBC: .word ov29_022E81C8 -_022E8BC0: .word ov29_022E8588 -_022E8BC4: .word ov29_022E8500 +_022E8BC0: .word FreeDungeonControlsMenuWithBg +_022E8BC4: .word InitDungeonControlsMenuWithBg _022E8BC8: .word ov29_022E854C _022E8BCC: .word ov29_022E80D0 _022E8BD0: .word ov29_022E7F94 @@ -1314,11 +1314,11 @@ _022E8E90: .word 0x00003FCB #endif arm_func_end DrawDungeonControlsText - arm_func_start ov29_022E8E94 -ov29_022E8E94: ; 0x022E8E94 + arm_func_start InitDungeonControlsMenu +InitDungeonControlsMenu: ; 0x022E8E94 stmdb sp!, {r3, lr} sub sp, sp, #0x10 - ldr r0, _022E8F1C ; =ov29_02353558 + ldr r0, _022E8F1C ; =DUNGEON_CONTROLS_MENU_PTR ldr r0, [r0] cmp r0, #0 movne r0, #0 @@ -1326,24 +1326,24 @@ ov29_022E8E94: ; 0x022E8E94 mov r0, #0x54 mov r1, #8 bl MemAlloc - ldr r2, _022E8F1C ; =ov29_02353558 + ldr r2, _022E8F1C ; =DUNGEON_CONTROLS_MENU_PTR mov r1, #0x54 str r0, [r2] bl MemZero - ldr r0, _022E8F20 ; =ov29_023515F4 + ldr r0, _022E8F20 ; =DUNGEON_CONTROLS_MENU_WINDOW_PARAMS add ip, sp, #0 ldmia r0, {r0, r1, r2, r3} stmia ip, {r0, r1, r2, r3} ldr r1, _022E8F24 ; =DrawDungeonControlsText mov r0, ip bl CreateTextBox - ldr r1, _022E8F1C ; =ov29_02353558 + ldr r1, _022E8F1C ; =DUNGEON_CONTROLS_MENU_PTR ldr r2, [r1] strb r0, [r2] ldr r0, [r1] add r0, r0, #4 bl InitPreprocessorArgs - ldr r0, _022E8F1C ; =ov29_02353558 + ldr r0, _022E8F1C ; =DUNGEON_CONTROLS_MENU_PTR mov r2, #0x10000 ldr r1, [r0] mov r0, #1 @@ -1352,35 +1352,35 @@ _022E8F14: add sp, sp, #0x10 ldmia sp!, {r3, pc} .align 2, 0 -_022E8F1C: .word ov29_02353558 -_022E8F20: .word ov29_023515F4 +_022E8F1C: .word DUNGEON_CONTROLS_MENU_PTR +_022E8F20: .word DUNGEON_CONTROLS_MENU_WINDOW_PARAMS _022E8F24: .word DrawDungeonControlsText - arm_func_end ov29_022E8E94 + arm_func_end InitDungeonControlsMenu - arm_func_start ov29_022E8F28 -ov29_022E8F28: ; 0x022E8F28 + arm_func_start FreeDungeonControlsMenu +FreeDungeonControlsMenu: ; 0x022E8F28 stmdb sp!, {r3, lr} - ldr r0, _022E8F74 ; =ov29_02353558 + ldr r0, _022E8F74 ; =DUNGEON_CONTROLS_MENU_PTR ldr r0, [r0] cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] bl CloseTextBox2 - ldr r0, _022E8F74 ; =ov29_02353558 + ldr r0, _022E8F74 ; =DUNGEON_CONTROLS_MENU_PTR mvn r2, #1 ldr r1, [r0] strb r2, [r1] ldr r0, [r0] bl MemFree - ldr r0, _022E8F74 ; =ov29_02353558 + ldr r0, _022E8F74 ; =DUNGEON_CONTROLS_MENU_PTR mov r1, #0 str r1, [r0] mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E8F74: .word ov29_02353558 - arm_func_end ov29_022E8F28 +_022E8F74: .word DUNGEON_CONTROLS_MENU_PTR + arm_func_end FreeDungeonControlsMenu arm_func_start ov29_022E8F78 ov29_022E8F78: ; 0x022E8F78 @@ -1390,7 +1390,7 @@ ov29_022E8F78: ; 0x022E8F78 ldmeqia sp!, {r4, pc} mov r1, #0 strb r1, [r0] - ldr r1, _022E8FC4 ; =ov29_02353558 + ldr r1, _022E8FC4 ; =DUNGEON_CONTROLS_MENU_PTR ldr r0, _022E8FC8 ; =0x00003FCB ldr r1, [r1] ldrsb r4, [r1] @@ -1404,7 +1404,7 @@ ov29_022E8F78: ; 0x022E8F78 bl UpdateWindow ldmia sp!, {r4, pc} .align 2, 0 -_022E8FC4: .word ov29_02353558 +_022E8FC4: .word DUNGEON_CONTROLS_MENU_PTR #if defined(EUROPE) _022E8FC8: .word 0x00003FCD #elif defined(JAPAN) diff --git a/asm/overlay_29_022EFB20.s b/asm/overlay_29_022EFB20.s index d13016df..b700466e 100644 --- a/asm/overlay_29_022EFB20.s +++ b/asm/overlay_29_022EFB20.s @@ -686,8 +686,8 @@ _022F04E8: .word 0x00000112 _022F04EC: .word 0x0000037F arm_func_end ov29_022EFBAC - arm_func_start ov29_022F04F0 -ov29_022F04F0: ; 0x022F04F0 + arm_func_start FreezeAnim +FreezeAnim: ; 0x022F04F0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r4, [r5, #0xb4] @@ -702,13 +702,13 @@ ov29_022F04F0: ; 0x022F04F0 strneb r0, [r4, #0x171] #endif ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_022F04F0 + arm_func_end FreezeAnim - arm_func_start ov29_022F0518 -ov29_022F0518: ; 0x022F0518 + arm_func_start UnfreezeAnim +UnfreezeAnim: ; 0x022F0518 ldr r2, [r0, #0xb4] mov r1, #0 - ldr ip, _022F0530 ; =sub_0201D198 + ldr ip, _022F0530 ; =SetAnimationControlPausedFlag add r0, r0, #0x2c #ifdef JAPAN strb r1, [r2, #0x16d] @@ -717,8 +717,8 @@ ov29_022F0518: ; 0x022F0518 #endif bx ip .align 2, 0 -_022F0530: .word sub_0201D198 - arm_func_end ov29_022F0518 +_022F0530: .word SetAnimationControlPausedFlag + arm_func_end UnfreezeAnim arm_func_start ov29_022F0534 ov29_022F0534: ; 0x022F0534 @@ -742,10 +742,10 @@ _022F0544: cmp r7, #0 mov r0, r6 bne _022F0578 - bl ov29_022F0518 + bl UnfreezeAnim b _022F057C _022F0578: - bl ov29_022F04F0 + bl FreezeAnim _022F057C: add r5, r5, #1 cmp r5, #0x14 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index f2e37b95..2440ccc8 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -9,14 +9,14 @@ ov29_022F05B4: ; 0x022F05B4 mov r4, r1 cmp r2, #0 bne _022F05D4 - bl ov29_022F0518 + bl UnfreezeAnim mov r0, r4 - bl ov29_022F0518 + bl UnfreezeAnim ldmia sp!, {r4, pc} _022F05D4: - bl ov29_022F04F0 + bl FreezeAnim mov r0, r4 - bl ov29_022F04F0 + bl FreezeAnim ldmia sp!, {r4, pc} arm_func_end ov29_022F05B4 @@ -1366,7 +1366,7 @@ _022F17B8: and r1, r0, #7 mov r0, r6 strb r1, [sb, #0x4c] - bl ov29_022F87C0 + bl GetMonsterInFront cmp r0, #0 moveq r1, #0 streqb r8, [sb, #0x4c] @@ -1386,7 +1386,7 @@ _022F17E0: tst r0, #2 beq _022F1868 mov r0, r6 - bl ov29_022F87C0 + bl GetMonsterInFront cmp r0, #0 beq _022F1838 mov r0, r6 @@ -2605,7 +2605,7 @@ _022F2980: cmpne r0, #0x13 bne _022F29B0 mov r0, r6 - bl ov29_022F59C4 + bl TalkToTeamMemberInFront bl IsFloorOver cmp r0, #0 bne _022F2B34 @@ -3614,7 +3614,7 @@ ov29_022F37D0: ; 0x022F37D0 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r4, r1 - bl ov29_022F87C0 + bl GetMonsterInFront movs r5, r0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} @@ -5149,8 +5149,8 @@ ov29_022F4BDC: ; 0x022F4BDC ldmia sp!, {r3, pc} arm_func_end ov29_022F4BDC - arm_func_start ov29_022F4BF8 -ov29_022F4BF8: ; 0x022F4BF8 + arm_func_start TryPlaceItem +TryPlaceItem: ; 0x022F4BF8 stmdb sp!, {r4, r5, r6, lr} mov r5, r0 mov r1, #0 @@ -5277,7 +5277,7 @@ _022F4D9C: .word 0x00000BB8 + OV29_022F4BF8_OFFSET _022F4DA0: .word 0x00001317 _022F4DA4: .word 0x00000BB9 + OV29_022F4BF8_OFFSET _022F4DA8: .word DUNGEON_PTR - arm_func_end ov29_022F4BF8 + arm_func_end TryPlaceItem arm_func_start ov29_022F4DAC ov29_022F4DAC: ; 0x022F4DAC diff --git a/asm/overlay_29_022F52B0.s b/asm/overlay_29_022F52B0.s index a84e04cf..5d027f27 100644 --- a/asm/overlay_29_022F52B0.s +++ b/asm/overlay_29_022F52B0.s @@ -11,14 +11,14 @@ ov29_022F52B0: ; 0x022F52B0 _022F52B8: .word ov29_02343D30 arm_func_end ov29_022F52B0 - arm_func_start ov29_022F52BC -ov29_022F52BC: ; 0x022F52BC + arm_func_start UseSingleUseItemSelf +UseSingleUseItemSelf: ; 0x022F52BC ldr ip, _022F52C8 ; =UseSingleUseItem mov r1, r0 bx ip .align 2, 0 _022F52C8: .word UseSingleUseItem - arm_func_end ov29_022F52BC + arm_func_end UseSingleUseItemSelf arm_func_start UseSingleUseItemWrapper UseSingleUseItemWrapper: ; 0x022F52CC diff --git a/asm/overlay_29_022F59C4.s b/asm/overlay_29_022F59C4.s index 1e723ff1..56570ad4 100644 --- a/asm/overlay_29_022F59C4.s +++ b/asm/overlay_29_022F59C4.s @@ -3,11 +3,11 @@ .text - arm_func_start ov29_022F59C4 -ov29_022F59C4: ; 0x022F59C4 + arm_func_start TalkToTeamMemberInFront +TalkToTeamMemberInFront: ; 0x022F59C4 stmdb sp!, {r4, lr} mov r4, r0 - bl ov29_022F87C0 + bl GetMonsterInFront movs r1, r0 moveq r1, #0 beq _022F59FC @@ -24,7 +24,7 @@ _022F59FC: mvn r2, #0 bl ov29_022F5A40 ldmia sp!, {r4, pc} - arm_func_end ov29_022F59C4 + arm_func_end TalkToTeamMemberInFront arm_func_start ov29_022F5A0C ov29_022F5A0C: ; 0x022F5A0C @@ -476,8 +476,8 @@ _022F5F14: .word 0x00000BCA #endif arm_func_end ov29_022F5DF4 - arm_func_start ov29_022F5F18 -ov29_022F5F18: ; 0x022F5F18 + arm_func_start PlayerUseMove +PlayerUseMove: ; 0x022F5F18 #ifdef JAPAN #define OV29_022F5F18_OFFSET -4 #else @@ -580,10 +580,10 @@ _022F6054: .word 0x00000B3D #else _022F6054: .word 0x00000DFD #endif - arm_func_end ov29_022F5F18 + arm_func_end PlayerUseMove - arm_func_start ov29_022F6058 -ov29_022F6058: ; 0x022F6058 + arm_func_start UseRegularAttackOrStruggle +UseRegularAttackOrStruggle: ; 0x022F6058 #ifdef JAPAN #define OV29_022F6058_OFFSET -4 #else @@ -714,7 +714,7 @@ _022F6204: .word 0x00000BCE #endif _022F6208: .word DIRECTIONS_XY _022F620C: .word DIRECTIONS_XY + 2 - arm_func_end ov29_022F6058 + arm_func_end UseRegularAttackOrStruggle arm_func_start ov29_022F6210 ov29_022F6210: ; 0x022F6210 diff --git a/asm/overlay_29_022F62CC.s b/asm/overlay_29_022F62CC.s index 1de94f8d..1e8bf4da 100644 --- a/asm/overlay_29_022F62CC.s +++ b/asm/overlay_29_022F62CC.s @@ -1133,8 +1133,8 @@ ov29_022F7104: ; 0x022F7104 _022F712C: .word DUNGEON_PTR arm_func_end ov29_022F7104 - arm_func_start ov29_022F7130 -ov29_022F7130: ; 0x022F7130 + arm_func_start LoadMonsterSprites +LoadMonsterSprites: ; 0x022F7130 #ifdef JAPAN #define OV29_022F7130_OFFSET -0xA4 #else @@ -1277,10 +1277,10 @@ _022F72F8: .word DUNGEON_PTR _022F72FC: .word 0x00000483 _022F7300: .word 0x00000229 _022F7304: .word 0x00000217 - arm_func_end ov29_022F7130 + arm_func_end LoadMonsterSprites - arm_func_start ov29_022F7308 -ov29_022F7308: ; 0x022F7308 + arm_func_start LoadActiveMonsterSprites +LoadActiveMonsterSprites: ; 0x022F7308 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, #0 ldr r4, _022F7360 ; =DUNGEON_PTR @@ -1311,4 +1311,4 @@ _022F7350: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022F7360: .word DUNGEON_PTR - arm_func_end ov29_022F7308 + arm_func_end LoadActiveMonsterSprites diff --git a/asm/overlay_29_022F7768.s b/asm/overlay_29_022F7768.s index 5c186ff0..182f6d99 100644 --- a/asm/overlay_29_022F7768.s +++ b/asm/overlay_29_022F7768.s @@ -84,8 +84,8 @@ _022F7810: _022F7830: .word 0x00000483 arm_func_end DeleteAllMonsterSpriteFiles - arm_func_start ov29_022F7834 -ov29_022F7834: ; 0x022F7834 + arm_func_start CanMonsterBeAddedToTeam +CanMonsterBeAddedToTeam: ; 0x022F7834 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r4, #0 mov r5, r0 @@ -144,7 +144,7 @@ _022F78D4: movne r0, #1 moveq r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end ov29_022F7834 + arm_func_end CanMonsterBeAddedToTeam arm_func_start ov29_022F7910 ov29_022F7910: ; 0x022F7910 @@ -168,7 +168,7 @@ ov29_022F7910: ; 0x022F7910 b _022F7AA4 _022F7958: mov r0, sl - bl ov29_022F7834 + bl CanMonsterBeAddedToTeam cmp r0, #0 beq _022F7AA0 ldrsh r1, [sl, #4] @@ -394,7 +394,7 @@ _022F7C5C: b _022F7E10 _022F7C7C: mov r0, r6 - bl ov29_022F7834 + bl CanMonsterBeAddedToTeam cmp r0, #0 beq _022F7CD4 ldrsh r1, [r6, #4] @@ -1415,8 +1415,8 @@ _022F87A8: _022F87BC: .word DUNGEON_PTR arm_func_end MoveMonsterToPos - arm_func_start ov29_022F87C0 -ov29_022F87C0: ; 0x022F87C0 + arm_func_start GetMonsterInFront +GetMonsterInFront: ; 0x022F87C0 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 ldr r5, [r4, #0xb4] @@ -1447,7 +1447,7 @@ _022F8820: .align 2, 0 _022F8828: .word DIRECTIONS_XY _022F882C: .word DIRECTIONS_XY + 2 - arm_func_end ov29_022F87C0 + arm_func_end GetMonsterInFront arm_func_start ov29_022F8830 ov29_022F8830: ; 0x022F8830 diff --git a/asm/overlay_29_022F9744.s b/asm/overlay_29_022F9744.s index aeb041fa..5ef8899f 100644 --- a/asm/overlay_29_022F9744.s +++ b/asm/overlay_29_022F9744.s @@ -317,7 +317,7 @@ ov29_022F9AF4: ; 0x022F9AF4 ldr r1, [sb, #0xb4] mov r5, #0 ldrb r8, [r1, #6] - bl ov29_022F87C0 + bl GetMonsterInFront cmp r0, #0 moveq r0, r5 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} diff --git a/asm/overlay_29_022FB678.s b/asm/overlay_29_022FB678.s index be8960ce..eaf61a67 100644 --- a/asm/overlay_29_022FB678.s +++ b/asm/overlay_29_022FB678.s @@ -293,7 +293,7 @@ ov29_022FB98C: ; 0x022FB98C bl DisplayAnimatedNumbers mov r0, r5 mov r1, r4 - bl ov29_022E576C + bl PlayMissSfx__022E611C ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022FB9B8: .word 0x0000270F diff --git a/asm/overlay_29_022FBE58.s b/asm/overlay_29_022FBE58.s index 052008ea..b4a7689f 100644 --- a/asm/overlay_29_022FBE58.s +++ b/asm/overlay_29_022FBE58.s @@ -462,8 +462,8 @@ _022FC45C: _022FC464: .word DUNGEON_PTR arm_func_end InitEnemyStatsAndMoves - arm_func_start ov29_022FC468 -ov29_022FC468: ; 0x022FC468 + arm_func_start InitExplorerMazeMonsterStatsMovesAndIq +InitExplorerMazeMonsterStatsMovesAndIq: ; 0x022FC468 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} ldr r4, [sp, #0x24] mov sb, r0 @@ -507,7 +507,7 @@ _022FC4C4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022FC508: .word IQ_SKILLS - arm_func_end ov29_022FC468 + arm_func_end InitExplorerMazeMonsterStatsMovesAndIq arm_func_start SpawnTeam SpawnTeam: ; 0x022FC50C diff --git a/asm/overlay_29_022FC9C0.s b/asm/overlay_29_022FC9C0.s index 596a46d3..5bca8aaa 100644 --- a/asm/overlay_29_022FC9C0.s +++ b/asm/overlay_29_022FC9C0.s @@ -585,7 +585,7 @@ _022FD154: add r2, r5, #0x1a add r3, r5, #0x1c str ip, [sp, #4] - bl ov29_022FC468 + bl InitExplorerMazeMonsterStatsMovesAndIq mov r0, r4 bl UpdateIqSkillsWrapper b _022FD1F0 diff --git a/asm/overlay_29_022FE4BC.s b/asm/overlay_29_022FE4BC.s index 1e74f0e1..a6706c40 100644 --- a/asm/overlay_29_022FE4BC.s +++ b/asm/overlay_29_022FE4BC.s @@ -346,10 +346,10 @@ _022FF388: b _022FF5E0 _022FF3C8: mov r0, r6 - bl ov29_0231A8A0 + bl AiUseMove b _022FF5E0 _022FF3D4: - bl ov29_022E5D68 + bl PlayStairsSfx ldr r0, _022FED70 ; =0x02354138 mov r2, #1 ldr r0, [r0] @@ -427,7 +427,7 @@ _022FF4B0: b _022FF5E0 _022FF4D0: mov r0, r6 - bl ov29_022F4BF8 + bl TryPlaceItem b _022FF5E0 _022FF4DC: mov r0, r6 @@ -458,21 +458,21 @@ _022FF518: b _022FF5E0 _022FF538: mov r0, r6 - bl ov29_022F59C4 + bl TalkToTeamMemberInFront b _022FF5E0 _022FF544: mov r0, r6 - bl ov29_022F5F18 + bl PlayerUseMove b _022FF5E0 _022FF550: mov r0, r6 mov r1, #0x160 - bl ov29_022F6058 + bl UseRegularAttackOrStruggle b _022FF5E0 _022FF560: mov r0, r6 rsb r1, r1, #0x164 - bl ov29_022F6058 + bl UseRegularAttackOrStruggle b _022FF5E0 _022FF570: mov r0, r6 @@ -983,10 +983,10 @@ _022FE95C: b _022FEBB4 _022FE99C: mov r0, sb - bl ov29_0231A8A0 + bl AiUseMove b _022FEBB4 _022FE9A8: - bl ov29_022E5D68 + bl PlayStairsSfx ldr r0, _022FED70 ; =DUNGEON_PTR mov r2, #1 ldr r0, [r0] @@ -1084,7 +1084,7 @@ _022FEA84: b _022FEBB4 _022FEAA4: mov r0, sb - bl ov29_022F4BF8 + bl TryPlaceItem b _022FEBB4 _022FEAB0: mov r0, sb @@ -1119,16 +1119,16 @@ _022FEAEC: b _022FEBB4 _022FEB0C: mov r0, sb - bl ov29_022F59C4 + bl TalkToTeamMemberInFront b _022FEBB4 _022FEB18: mov r0, sb - bl ov29_022F5F18 + bl PlayerUseMove b _022FEBB4 _022FEB24: mov r0, sb mov r1, #0x160 - bl ov29_022F6058 + bl UseRegularAttackOrStruggle b _022FEBB4 _022FEB34: #ifdef JAPAN @@ -1138,7 +1138,7 @@ _022FEB34: mov r0, sb rsb r1, r1, #0x164 #endif - bl ov29_022F6058 + bl UseRegularAttackOrStruggle b _022FEBB4 _022FEB44: mov r0, sb diff --git a/asm/overlay_29_02301A84.s b/asm/overlay_29_02301A84.s index 41691ca2..02c75a63 100644 --- a/asm/overlay_29_02301A84.s +++ b/asm/overlay_29_02301A84.s @@ -89,7 +89,7 @@ _02301B8C: mov r0, r7 mov r1, r6 mov r3, #0x26 - bl ov29_02314DC4 + bl LogMessageWithTargetAndExclusiveItemName _02301BA8: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} diff --git a/asm/overlay_29_02302A5C.s b/asm/overlay_29_02302A5C.s index 3758144c..897e8f82 100644 --- a/asm/overlay_29_02302A5C.s +++ b/asm/overlay_29_02302A5C.s @@ -1730,7 +1730,7 @@ _023040EC: beq _023041E4 add r0, r7, #0x2c mov r1, #1 - bl sub_0201D198 + bl SetAnimationControlPausedFlag b _023041E4 _0230414C: cmp r0, #0 @@ -1947,7 +1947,7 @@ _02304458: moveq r0, #1 cmp r0, #0 beq _023044B8 - bl ov29_02338988 + bl Weather3DEffectActive cmp r0, #0 beq _02304498 ldr r0, _023046D8 ; =DUNGEON_FRAMES_PASSED @@ -1956,7 +1956,7 @@ _02304458: beq _023044B8 b _023046C0 _02304498: - bl ov29_022E3580 + bl DungeonScreenEffectActive cmp r0, #0 bne _023044B8 bl ov29_022E3570 diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index c49d8df8..e0998bc1 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -96,7 +96,7 @@ _02309A88: beq _02309B50 mov r0, sl mov r1, sb - bl ov29_022E576C + bl PlayMissSfx__022E611C _02309B50: mov r0, #1 strb r0, [r5, #0x10] @@ -126,7 +126,7 @@ _02309B60: cmp r0, #0 beq _02309BC0 mov r0, sb - bl ov29_022E57A0 + bl PlayMissSfx__022E6150 _02309BC0: mov r0, #1 strb r0, [r5, #0x10] @@ -160,7 +160,7 @@ _02309BD0: bl LogMessageByIdWithPopupCheckUserTarget mov r0, sl mov r1, sb - bl ov29_022E576C + bl PlayMissSfx__022E611C mov r0, #1 strb r0, [r5, #0x10] mov r0, #0 @@ -181,7 +181,7 @@ _02309C50: bl LogMessageByIdWithPopupCheckUserTarget mov r0, sl mov r1, sb - bl ov29_022E576C + bl PlayMissSfx__022E611C _02309C90: mov r0, #1 strb r0, [r5, #0x10] @@ -439,7 +439,7 @@ _02309FCC_EU: _0230A034: mov r0, sl mov r1, sb - bl ov29_022E576C + bl PlayMissSfx__022E611C b _0230A06C _0230A044: ldrb r0, [r7, #0x15c + APPLY_DAMAGE_OFFSET] @@ -1178,7 +1178,7 @@ _0230905C: beq _02309124 mov r0, r8 mov r1, r7 - bl ov29_022E576C + bl PlayMissSfx__022E611C _02309124: mov r0, #1 strb r0, [r6, #0x10] @@ -1208,7 +1208,7 @@ _02309134: cmp r0, #0 beq _02309194 mov r0, r7 - bl ov29_022E57A0 + bl PlayMissSfx__022E6150 _02309194: mov r0, #1 strb r0, [r6, #0x10] @@ -1250,7 +1250,7 @@ _023091A4: bl LogMessageByIdWithPopupCheckUserTarget mov r0, r8 mov r1, r7 - bl ov29_022E576C + bl PlayMissSfx__022E611C mov r0, #1 strb r0, [r6, #0x10] mov r0, #0 @@ -1277,7 +1277,7 @@ _02309224: bl LogMessageByIdWithPopupCheckUserTarget mov r0, r8 mov r1, r7 - bl ov29_022E576C + bl PlayMissSfx__022E611C _02309264: mov r0, #1 strb r0, [r6, #0x10] @@ -1543,7 +1543,7 @@ _023095A0: _02309608: mov r0, r8 mov r1, r7 - bl ov29_022E576C + bl PlayMissSfx__022E611C b _02309640 _02309618: ldrb r0, [r4, #0x15c + APPLY_DAMAGE_OFFSET] @@ -2622,7 +2622,7 @@ _0230AEEC: mov r0, #4 bl SetUnkMusicFlag mov r0, sb - bl ov29_022F0518 + bl UnfreezeAnim mov r0, sb mov r1, #6 bl ov29_02304830 @@ -3235,7 +3235,7 @@ _0230A4A0: mov r0, #4 bl SetUnkMusicFlag mov r0, r7 - bl ov29_022F0518 + bl UnfreezeAnim mov r0, r7 mov r1, #6 bl ov29_02304830 diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s index 77b0de75..7b206e2e 100644 --- a/asm/overlay_29_0230F02C.s +++ b/asm/overlay_29_0230F02C.s @@ -5,10 +5,10 @@ arm_func_start ov29_0230F140 ov29_0230F140: ; 0x0230F140 - ldr ip, _0230F148 ; =ov29_022F52BC + ldr ip, _0230F148 ; =UseSingleUseItemSelf bx ip .align 2, 0 -_0230F148: .word ov29_022F52BC +_0230F148: .word UseSingleUseItemSelf arm_func_end ov29_0230F140 arm_func_start ov29_0230F14C diff --git a/asm/overlay_29_02314810.s b/asm/overlay_29_02314810.s index 6c195b91..4f48dd33 100644 --- a/asm/overlay_29_02314810.s +++ b/asm/overlay_29_02314810.s @@ -250,8 +250,8 @@ _02314DBC: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ExclusiveItemEffectIsActiveWithLogging - arm_func_start ov29_02314DC4 -ov29_02314DC4: ; 0x02314DC4 + arm_func_start LogMessageWithTargetAndExclusiveItemName +LogMessageWithTargetAndExclusiveItemName: ; 0x02314DC4 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 mov r7, r0 @@ -274,7 +274,7 @@ ov29_02314DC4: ; 0x02314DC4 bl LogMessageByIdWithPopupCheckUserTarget add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_02314DC4 + arm_func_end LogMessageWithTargetAndExclusiveItemName arm_func_start TryActivateQuickFeet TryActivateQuickFeet: ; 0x02314E1C diff --git a/asm/overlay_29_0231A8A0.s b/asm/overlay_29_0231A8A0.s index 5818979c..91fc3cab 100644 --- a/asm/overlay_29_0231A8A0.s +++ b/asm/overlay_29_0231A8A0.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_0231A8A0 -ov29_0231A8A0: ; 0x0231A8A0 + arm_func_start AiUseMove +AiUseMove: ; 0x0231A8A0 #ifdef JAPAN #define OV29_0231A8A0_OFFSET -4 #else @@ -103,4 +103,4 @@ _0231A9D0: .word 0x00000B3D #else _0231A9D0: .word 0x00000DFD #endif - arm_func_end ov29_0231A8A0 + arm_func_end AiUseMove diff --git a/asm/overlay_29_0231B33C.s b/asm/overlay_29_0231B33C.s index caf31d45..8596e6a1 100644 --- a/asm/overlay_29_0231B33C.s +++ b/asm/overlay_29_0231B33C.s @@ -268,7 +268,7 @@ _0231B5F4: cmp r6, #0 beq _0231B678 mov r0, r8 - bl ov29_022F04F0 + bl FreezeAnim #ifdef JAPAN mov r0, #2 #else @@ -276,7 +276,7 @@ _0231B5F4: #endif bl AnimationDelayOrSomething mov r0, r8 - bl ov29_022F0518 + bl UnfreezeAnim _0231B678: mov r0, #3 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index b4e70d80..4d44656a 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -1021,7 +1021,7 @@ ApplyGonePebbleEffect: ; 0x0231D838 add r0, sp, #0 bl HandleSir0Translation mov r0, r5 - bl ov29_022F04F0 + bl FreezeAnim ldrb r0, [r5, #0xaa] mov r1, #1 bl ov29_022DE47C @@ -1071,7 +1071,7 @@ ApplyGonePebbleEffect: ; 0x0231D838 mov r1, #6 bl GonePebbleGradualPaletteShift mov r0, r5 - bl ov29_022F0518 + bl UnfreezeAnim add r0, sp, #4 bl UnloadFile ldrb r0, [r5, #0xaa] diff --git a/asm/overlay_29_02320788.s b/asm/overlay_29_02320788.s index a48bc30b..e8cf12b4 100644 --- a/asm/overlay_29_02320788.s +++ b/asm/overlay_29_02320788.s @@ -879,7 +879,7 @@ ov29_02321288: ; 0x02321288 mov r7, r3 ldr r6, [sp, #0x34] ldr r5, [sl, #0xb4] - bl ov29_022F87C0 + bl GetMonsterInFront movs r4, r0 bne _023212E0 mov r0, sl diff --git a/asm/overlay_29_0232393C.s b/asm/overlay_29_0232393C.s index 7e4f29b4..260a121d 100644 --- a/asm/overlay_29_0232393C.s +++ b/asm/overlay_29_0232393C.s @@ -548,7 +548,7 @@ _023240C0: ands r0, r5, #0xf0 bne _023240FC mov r0, sb - bl ov29_022F87C0 + bl GetMonsterInFront cmp r0, #0 beq _0232439C stmia sp, {r0, r8} diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index e8a908fe..23275176 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -641,7 +641,7 @@ _0232F090: bne _0232F14C ldr r2, _0232F814 ; =0x00000EB7 mov r3, #0x25 - bl ov29_02314DC4 + bl LogMessageWithTargetAndExclusiveItemName b _0232F154 _0232F14C: ldr r2, _0232F818 ; =0x00000EB6 diff --git a/asm/overlay_29_02332A70.s b/asm/overlay_29_02332A70.s index 3f07c6e3..3d750e1f 100644 --- a/asm/overlay_29_02332A70.s +++ b/asm/overlay_29_02332A70.s @@ -310,7 +310,7 @@ _02332E3C: bl LogMessageByIdQuietCheckUserTarget mov r0, r8 mov r1, r7 - bl ov29_022E576C + bl PlayMissSfx__022E611C b _02332EB8 _02332EA8: ldr r2, _02332F14 ; =0x00000EC3 diff --git a/asm/overlay_29_0233861C.s b/asm/overlay_29_0233861C.s index 350d4082..4a6cb075 100644 --- a/asm/overlay_29_0233861C.s +++ b/asm/overlay_29_0233861C.s @@ -346,8 +346,8 @@ _02338980: .word ov29_0237CD40 _02338984: .word ov29_02352F7C arm_func_end LoadWeather3DFiles - arm_func_start ov29_02338988 -ov29_02338988: ; 0x02338988 + arm_func_start Weather3DEffectActive +Weather3DEffectActive: ; 0x02338988 stmdb sp!, {r3, lr} ldr r0, _023389BC ; =ov29_0237CACC bl ov29_02338D58 @@ -366,7 +366,7 @@ _023389B4: .align 2, 0 _023389BC: .word ov29_0237CACC _023389C0: .word ov29_0237CD40 - arm_func_end ov29_02338988 + arm_func_end Weather3DEffectActive arm_func_start ov29_023389C4 ov29_023389C4: ; 0x023389C4 @@ -456,7 +456,7 @@ _02338ACC: ldrb r0, [r6, #0x240] cmp r0, #0 beq _02338D18 - bl ov29_022E3580 + bl DungeonScreenEffectActive cmp r0, #0 movne r0, #0 strneb r0, [r6, #0x26d] diff --git a/asm/overlay_29_02341E6C.s b/asm/overlay_29_02341E6C.s index 6f808d09..d023728c 100644 --- a/asm/overlay_29_02341E6C.s +++ b/asm/overlay_29_02341E6C.s @@ -2025,8 +2025,8 @@ _023439BC: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_02343980 - arm_func_start ov29_023439D8 -ov29_023439D8: ; 0x023439D8 + arm_func_start TryOpenKeyDoor +TryOpenKeyDoor: ; 0x023439D8 #ifdef JAPAN #define OV29_023439D8_OFFSET -0xA4 #else @@ -2238,7 +2238,7 @@ _02343C6C: movne r1, #0 add r0, sp, #0xc and r1, r1, #0xff - bl ov29_022E6694 + bl PlayKeyDoorUnlockEffect ldr r1, [sp, #4] mov r0, sl bl LogMessageByIdWithPopupCheckUser @@ -2255,7 +2255,7 @@ _02343CC8: .align 2, 0 _02343CD0: .word DUNGEON_PTR _02343CD4: .word 0xFFFFCFEF - arm_func_end ov29_023439D8 + arm_func_end TryOpenKeyDoor arm_func_start ApplyKeyEffect ApplyKeyEffect: ; 0x02343CD8 @@ -2277,7 +2277,7 @@ _02343D10: ldr r2, _02343D2C ; =0x00000B93 mov r0, r4 add r3, r2, #1 - bl ov29_023439D8 + bl TryOpenKeyDoor bl UpdateMinimap ldmia sp!, {r4, pc} .align 2, 0 @@ -2312,7 +2312,7 @@ _02343D68: mov r0, r5 mov r1, r4 add r3, r2, #2 - bl ov29_023439D8 + bl TryOpenKeyDoor bl UpdateMinimap ldmia sp!, {r3, r4, r5, pc} .align 2, 0 diff --git a/asm/overlay_29_0234AEE8.s b/asm/overlay_29_0234AEE8.s index 9c58da94..110102ba 100644 --- a/asm/overlay_29_0234AEE8.s +++ b/asm/overlay_29_0234AEE8.s @@ -306,7 +306,7 @@ _0234B1C4: strh r3, [r1, #0x92] ldr r1, [r2, #4] str r0, [r1, #0xc98] - bl ov29_0234B768 + bl FullyCloseAlertBox cmp r0, #0 cmpne r4, #0 ldmeqia sp!, {r4, pc} @@ -739,8 +739,8 @@ AlertBoxIsActive: ; 0x0234B73C _0234B764: .word MESSAGE_LOG_INFO arm_func_end AlertBoxIsActive - arm_func_start ov29_0234B768 -ov29_0234B768: ; 0x0234B768 + arm_func_start FullyCloseAlertBox +FullyCloseAlertBox: ; 0x0234B768 stmdb sp!, {r3, lr} ldr r0, _0234B7E8 ; =MESSAGE_LOG_INFO mvn r1, #1 @@ -775,7 +775,7 @@ ov29_0234B768: ; 0x0234B768 ldmia sp!, {r3, pc} .align 2, 0 _0234B7E8: .word MESSAGE_LOG_INFO - arm_func_end ov29_0234B768 + arm_func_end FullyCloseAlertBox arm_func_start AlertBoxIsScrolling AlertBoxIsScrolling: ; 0x0234B7EC @@ -927,7 +927,7 @@ _0234B9C8: ldmneia sp!, {r3, r4, r5, pc} mov r0, #0 str r0, [r4, #0xc98] - bl ov29_0234B768 + bl FullyCloseAlertBox mov r0, #0 mov r1, r0 bl UnkMapRelatedFunc diff --git a/asm/overlay_29_data_023534E0.s b/asm/overlay_29_data_023534E0.s index 55401a11..582e5346 100644 --- a/asm/overlay_29_data_023534E0.s +++ b/asm/overlay_29_data_023534E0.s @@ -56,8 +56,8 @@ ov29_0235354C: .global TOP_SCREEN_STATUS_PTR TOP_SCREEN_STATUS_PTR: .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_02353558 -ov29_02353558: + .global DUNGEON_CONTROLS_MENU_PTR +DUNGEON_CONTROLS_MENU_PTR: .byte 0x00, 0x00, 0x00, 0x00 .global LEADER_PTR LEADER_PTR: diff --git a/asm/overlay_29_rodata_0234FD04.s b/asm/overlay_29_rodata_0234FD04.s index 11d8dd7d..5229839f 100644 --- a/asm/overlay_29_rodata_0234FD04.s +++ b/asm/overlay_29_rodata_0234FD04.s @@ -1691,7 +1691,7 @@ ov29_023515CC: ov29_023515E8: .byte 0x02, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00 - .global ov29_023515F4 -ov29_023515F4: + .global DUNGEON_CONTROLS_MENU_WINDOW_PARAMS +DUNGEON_CONTROLS_MENU_WINDOW_PARAMS: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x14 .byte 0x01, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/lib/MSL_C/asm/include/main_0207F894.inc b/lib/MSL_C/asm/include/main_0207F894.inc index 7f71ae62..1da12ced 100644 --- a/lib/MSL_C/asm/include/main_0207F894.inc +++ b/lib/MSL_C/asm/include/main_0207F894.inc @@ -2,12 +2,10 @@ .public _02000BC4 .public _020AEC5C .public _020B2BB4 -.public fsi_digest_key_len .public _020B2BC0 .public _020B2BC4 .public _020B2C84 .public _020B2D88 -.public sDayOfYear .public _020B2ED0 .public _020B2ED4 .public _020B2FBC @@ -16,7 +14,6 @@ .public _022BB5FC .public _022BB604 .public _022BB60C -.public fsi_arc_rom .public _022BB670 .public _022BB68C .public _022BB6AC @@ -64,6 +61,8 @@ .public FS_ReadFile .public FS_RegisterArchiveName .public FS_SetArchiveProc +.public fsi_arc_rom +.public fsi_digest_key_len .public FSi_FindPath .public GetIrqFlag .public IC_InvalidateAll @@ -72,8 +71,8 @@ .public MI_CpuFill8 .public MI_DmaCopy16 .public MI_StopDma -.public MIi_UncompressBackward .public MIi_CardDmaCopy32 +.public MIi_UncompressBackward .public MTi_CpuClear32 .public MTi_CpuClearFast .public MTi_CpuCopy32 @@ -106,6 +105,7 @@ .public PXI_SendWordByFifo .public PXI_SetFifoRecvCallback .public PXIi_HandlerRecvFifoNotEmpty +.public sDayOfYear .public SetIrqFlag .public SVC_CpuSet .public SVC_WaitByLoop diff --git a/lib/NitroSDK/asm/include/gx.inc b/lib/NitroSDK/asm/include/gx.inc index 3c21404c..1e62ddec 100644 --- a/lib/NitroSDK/asm/include/gx.inc +++ b/lib/NitroSDK/asm/include/gx.inc @@ -32,7 +32,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -56,6 +55,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/gx_bgcnt.inc b/lib/NitroSDK/asm/include/gx_bgcnt.inc index 16b15dba..edf4ae56 100644 --- a/lib/NitroSDK/asm/include/gx_bgcnt.inc +++ b/lib/NitroSDK/asm/include/gx_bgcnt.inc @@ -33,7 +33,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -71,6 +70,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/gx_load2d.inc b/lib/NitroSDK/asm/include/gx_load2d.inc index 4a737da1..9b938c48 100644 --- a/lib/NitroSDK/asm/include/gx_load2d.inc +++ b/lib/NitroSDK/asm/include/gx_load2d.inc @@ -32,7 +32,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -83,6 +82,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/main_0207F894.inc b/lib/NitroSDK/asm/include/main_0207F894.inc index 8f3db743..fba0632d 100644 --- a/lib/NitroSDK/asm/include/main_0207F894.inc +++ b/lib/NitroSDK/asm/include/main_0207F894.inc @@ -2,12 +2,10 @@ .public _02000BC4 .public _020AEC5C .public _020B2BB4 -.public fsi_digest_key_len .public _020B2BC0 .public _020B2BC4 .public _020B2C84 .public _020B2D88 -.public sDayOfYear .public _020B2ED0 .public _020B2ED4 .public _020B2FBC @@ -16,7 +14,6 @@ .public _022BB5FC .public _022BB604 .public _022BB60C -.public fsi_arc_rom .public _022BB670 .public _022BB68C .public _022BB6AC @@ -90,6 +87,8 @@ .public FS_ReadFile .public FS_RegisterArchiveName .public FS_SetArchiveProc +.public fsi_arc_rom +.public fsi_digest_key_len .public FSi_FindPath .public GetIrqFlag .public IC_InvalidateAll @@ -98,8 +97,8 @@ .public MI_CpuFill8 .public MI_DmaCopy16 .public MI_StopDma -.public MIi_UncompressBackward .public MIi_CardDmaCopy32 +.public MIi_UncompressBackward .public MTi_CpuClear32 .public MTi_CpuClearFast .public MTi_CpuCopy32 @@ -133,6 +132,7 @@ .public PXI_SendWordByFifo .public PXI_SetFifoRecvCallback .public PXIi_HandlerRecvFifoNotEmpty +.public sDayOfYear .public SetIrqFlag .public SVC_CpuSet .public SVC_WaitByLoop diff --git a/lib/NitroSDK/asm/include/nitro.inc b/lib/NitroSDK/asm/include/nitro.inc index 46240f9e..9a986bcb 100644 --- a/lib/NitroSDK/asm/include/nitro.inc +++ b/lib/NitroSDK/asm/include/nitro.inc @@ -7,23 +7,23 @@ .public _022B9D00 .public _022BAA20 .public _022BB4E8 -.public sCallbackTable -.public FifoCtrlInit .public _022BB568 .public DC_FlushRange .public DC_InvalidateRange .public DC_StoreRange .public EnableIrqFlag +.public FifoCtrlInit .public FS_InitFile .public FSi_TranslateCommand -.public MIi_DmaSetParams .public MI_CpuCopy8 .public MI_SetWramBank .public MI_StopDma .public MIi_CheckAnotherAutoDma .public MIi_CheckDma0SourceAddress +.public MIi_DmaSetParams .public MIi_DmaSetParams_NoInt .public MIi_DmaSetParams_Wait +.public MIi_DmaSetParams_wait_noInt .public OS_EnableIrqMask .public OS_InitMutex .public OS_IsRunOnEmulator @@ -39,6 +39,7 @@ .public PXI_IsCallbackReady .public PXI_SendWordByFifo .public PXI_SetFifoRecvCallback +.public sCallbackTable .public SetIrqFlag .public Snd_AlarmInit .public Snd_AllocCommand @@ -54,6 +55,5 @@ .public Sndi_UnlockMutex .public sReserveList .public sSndMutex -.public MIi_DmaSetParams_wait_noInt .public VolumeTable .public WaitForever2 diff --git a/lib/NitroSDK/asm/include/os_arena.inc b/lib/NitroSDK/asm/include/os_arena.inc index 2e7b366a..4b4695cb 100644 --- a/lib/NitroSDK/asm/include/os_arena.inc +++ b/lib/NitroSDK/asm/include/os_arena.inc @@ -33,7 +33,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -84,6 +83,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/os_exception.inc b/lib/NitroSDK/asm/include/os_exception.inc index 62219b5f..e2430e15 100644 --- a/lib/NitroSDK/asm/include/os_exception.inc +++ b/lib/NitroSDK/asm/include/os_exception.inc @@ -33,7 +33,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -84,6 +83,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/os_interrupt.inc b/lib/NitroSDK/asm/include/os_interrupt.inc index f0c6fb9a..13d0caaa 100644 --- a/lib/NitroSDK/asm/include/os_interrupt.inc +++ b/lib/NitroSDK/asm/include/os_interrupt.inc @@ -33,7 +33,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -82,6 +81,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/os_spinlock.inc b/lib/NitroSDK/asm/include/os_spinlock.inc index 4d1b4ac9..efd3ffb4 100644 --- a/lib/NitroSDK/asm/include/os_spinlock.inc +++ b/lib/NitroSDK/asm/include/os_spinlock.inc @@ -32,7 +32,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -81,6 +80,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/os_thread.inc b/lib/NitroSDK/asm/include/os_thread.inc index e29d6737..f4256311 100644 --- a/lib/NitroSDK/asm/include/os_thread.inc +++ b/lib/NitroSDK/asm/include/os_thread.inc @@ -33,7 +33,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -84,6 +83,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/lib/NitroSDK/asm/include/os_timer.inc b/lib/NitroSDK/asm/include/os_timer.inc index 367479f1..816704ec 100644 --- a/lib/NitroSDK/asm/include/os_timer.inc +++ b/lib/NitroSDK/asm/include/os_timer.inc @@ -33,7 +33,6 @@ .public _ll_udiv .public _s32_div_f .public _secure -.public MI_SwapWord .public CARD_Init .public ClearIrqFlag .public CP_SaveContext @@ -84,6 +83,7 @@ .public MI_DmaFill32 .public MI_DmaFill32Async .public MI_Init +.public MI_SwapWord .public MI_WaitDma .public MTi_CpuClear32 .public MTi_CpuCopy16 diff --git a/src/main_020348E4.c b/src/main_020348E4.c index f0ddc95a..1120338c 100644 --- a/src/main_020348E4.c +++ b/src/main_020348E4.c @@ -1,18 +1,18 @@ #include "main_020348E4.h" -extern struct struct_02AFDB8* _020AFDB8; +extern struct struct_02AFDB8* MENU_CONTROL_PTR; extern u32 OverlayLoadEntriesEqual(struct struct_1*, struct struct_1*); u32 InitMenu(struct struct_1* src) { - if (OverlayLoadEntriesEqual(src, &(_020AFDB8->b)) == 0) { - if (_020AFDB8->a != 0 && OverlayLoadEntriesEqual(src, &(_020AFDB8->c))) { + if (OverlayLoadEntriesEqual(src, &(MENU_CONTROL_PTR->b)) == 0) { + if (MENU_CONTROL_PTR->a != 0 && OverlayLoadEntriesEqual(src, &(MENU_CONTROL_PTR->c))) { return 0; } - _020AFDB8->a = 1; - _020AFDB8->d = 0; - _020AFDB8->c = *src; - _020AFDB8->e = 0; + MENU_CONTROL_PTR->a = 1; + MENU_CONTROL_PTR->d = 0; + MENU_CONTROL_PTR->c = *src; + MENU_CONTROL_PTR->e = 0; return 1; } return 0;