From ebf6214ebfbba816581ccde589dfa176cc567f8f Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 26 Feb 2026 21:04:36 -0500 Subject: [PATCH] Synced from pmdsky-debug --- asm/include/main_020022C4.inc | 6 ++--- asm/include/main_02003328.inc | 10 ++++---- asm/include/main_020038D8.inc | 6 ++--- asm/include/main_02003DB8.inc | 4 +-- asm/include/main_02008BF4.inc | 4 +-- asm/include/main_02014D18.inc | 2 +- asm/include/main_0203C774.inc | 2 +- asm/include/main_0206C9BC.inc | 6 ++--- asm/include/main_02075600.inc | 16 ++++++------ asm/include/main_0207B87C.inc | 12 ++++----- asm/include/main_0207BC3C.inc | 14 +++++----- asm/include/main_0207E84C.inc | 2 +- asm/include/main_0207F40C.inc | 2 +- asm/include/main_0207F894.inc | 40 ++++++++++++++--------------- asm/include/overlay_00.inc | 20 +++++++-------- asm/include/overlay_01.inc | 2 +- asm/include/overlay_02.inc | 16 ++++++------ asm/include/overlay_29_022F59C4.inc | 2 +- asm/include/overlay_29_022FB678.inc | 10 ++++---- asm/include/overlay_29_022FBB1C.inc | 2 +- asm/include/overlay_29_0231A8A0.inc | 2 +- asm/include/overlay_29_0231AFB4.inc | 4 +-- asm/include/overlay_29_0231CBEC.inc | 2 +- asm/include/overlay_29_02346834.inc | 2 +- asm/include/overlay_29_023498A0.inc | 26 +++++++++---------- asm/include/overlay_29_0234AEE8.inc | 8 +++--- asm/main_02075600.s | 6 ++--- asm/main_0207F894.s | 2 +- 28 files changed, 115 insertions(+), 115 deletions(-) diff --git a/asm/include/main_020022C4.inc b/asm/include/main_020022C4.inc index cecca05c..e829dd96 100644 --- a/asm/include/main_020022C4.inc +++ b/asm/include/main_020022C4.inc @@ -19,20 +19,20 @@ .public InitMemAllocTable .public MemAlloc .public OS_GetLockID +.public OS_InitMutex +.public OS_SleepThread +.public OS_WakeupThreadDirect .public Rand16Bit .public StartThread .public sub_02003AD0 .public sub_020059A8 .public sub_02079844 -.public OS_SleepThread -.public OS_WakeupThreadDirect .public sub_02079A64 .public sub_02079B0C .public sub_02079C14 .public sub_02079DB8 .public sub_02079DE0 .public sub_02079E74 -.public OS_InitMutex .public sub_0207A048 .public sub_0207A0CC .public sub_0207A164 diff --git a/asm/include/main_02003328.inc b/asm/include/main_02003328.inc index 39d7b2fd..d44a094a 100644 --- a/asm/include/main_02003328.inc +++ b/asm/include/main_02003328.inc @@ -22,7 +22,12 @@ .public HaltProcessDisp .public KeyWaitInit .public MainLoop +.public OS_EnableIrqMask +.public OS_InitVAlarm .public OS_IRQTable +.public OS_SetIrqFunction +.public OS_SleepThread +.public OS_WakeupThreadDirect .public Rand16Bit .public sub_02002580 .public sub_020025F8 @@ -48,11 +53,6 @@ .public sub_020082E0 .public sub_02017D20 .public sub_0201849C -.public OS_SetIrqFunction -.public OS_EnableIrqMask -.public OS_SleepThread -.public OS_WakeupThreadDirect -.public OS_InitVAlarm .public sub_0207B4A4 .public sub_0207B4B8 .public sub_020820E8 diff --git a/asm/include/main_020038D8.inc b/asm/include/main_020038D8.inc index 46be943b..92820959 100644 --- a/asm/include/main_020038D8.inc +++ b/asm/include/main_020038D8.inc @@ -10,6 +10,9 @@ .public Debug_Print0 .public DisableAllInterrupts .public EnableAllInterrupts +.public OS_SetIrqFunction +.public OS_SleepThread +.public OS_WakeupThreadDirect .public PlayBgmById .public StopBgmCommand .public sub_02002580 @@ -29,7 +32,4 @@ .public sub_02018118 .public sub_02018278 .public sub_02018428 -.public OS_SetIrqFunction -.public OS_SleepThread -.public OS_WakeupThreadDirect .public sub_0207B584 diff --git a/asm/include/main_02003DB8.inc b/asm/include/main_02003DB8.inc index b1bc2ab9..2ba3aca1 100644 --- a/asm/include/main_02003DB8.inc +++ b/asm/include/main_02003DB8.inc @@ -48,6 +48,7 @@ .public _s32_div_f .public abs .public CardPullOutWithStatus +.public DC_FlushAll .public Debug_FatalError .public Debug_Print .public Debug_Print0 @@ -66,6 +67,7 @@ .public MemAlloc .public MemFree .public MemLocateSet +.public OS_SleepThread .public RandInt .public sprintf .public sqrtf @@ -99,8 +101,6 @@ .public sub_0200B76C .public sub_020184A8 .public sub_02078900 -.public OS_SleepThread -.public DC_FlushAll .public sub_0207A324 .public sub_0207BE6C .public sub_0207BF04 diff --git a/asm/include/main_02008BF4.inc b/asm/include/main_02008BF4.inc index badf45d8..6743000d 100644 --- a/asm/include/main_02008BF4.inc +++ b/asm/include/main_02008BF4.inc @@ -62,6 +62,7 @@ .public _s32_div_f .public ArrayFill32Fast .public CART_REMOVED_IMG_DATA +.public DC_FlushRange .public Debug_Print0 .public DecompressAtFromMemoryPointer .public G2x_SetBlendAlpha_ @@ -110,6 +111,7 @@ .public MemFree .public MemZero16 .public MemZero32 +.public MI_StopDma .public Rgb8ToRgb5 .public sub_02004FF8 .public sub_02005D30 @@ -119,7 +121,5 @@ .public sub_02008980 .public sub_02008A84 .public sub_02019304 -.public DC_FlushRange -.public MI_StopDma .public sub_02082420 .public UnloadFile diff --git a/asm/include/main_02014D18.inc b/asm/include/main_02014D18.inc index 1db0e228..6d4e7d69 100644 --- a/asm/include/main_02014D18.inc +++ b/asm/include/main_02014D18.inc @@ -269,6 +269,7 @@ .public CopyAndInterleave .public CopyAndInterleave0 .public CopyStringFromId +.public DC_FlushRange .public Debug_FatalError .public Debug_GetDebugFlag .public Debug_Print @@ -464,7 +465,6 @@ .public sub_0206C6BC .public sub_0206C754 .public sub_0206F5C8 -.public DC_FlushRange .public sub_0207C9C4 .public sub_0207C9E4 .public sub_0207CC10 diff --git a/asm/include/main_0203C774.inc b/asm/include/main_0203C774.inc index de6c8288..4a416ff5 100644 --- a/asm/include/main_0203C774.inc +++ b/asm/include/main_0203C774.inc @@ -160,6 +160,7 @@ .public Arm9StoreUnkFieldNa0x2029ED8 .public BAG_ITEMS_PTR_MIRROR .public CanMonsterUseMove +.public CARD_Init .public CardBackupError .public CardPullOutWithStatus .public ClearAdventureLogStruct @@ -520,7 +521,6 @@ .public sub_02083B00 .public sub_02083B14 .public sub_02083B3C -.public CARD_Init .public TEAM_MEMBER_TABLE_PTR .public TryPointCameraToMonster .public UpdateWindow diff --git a/asm/include/main_0206C9BC.inc b/asm/include/main_0206C9BC.inc index ba4e79eb..9fcc3a93 100644 --- a/asm/include/main_0206C9BC.inc +++ b/asm/include/main_0206C9BC.inc @@ -27,6 +27,7 @@ .public _s32_div_f .public _u32_div_f .public ArrayFill32Fast +.public DC_FlushRange .public DRIVER_WORK .public Dse_SetError .public Dse_SetError2 @@ -56,6 +57,8 @@ .public DseVoice_UpdateParameters .public FileInit .public GetTimer0Control +.public OS_SleepThread +.public OS_WakeupThreadDirect .public SMD_EVENTS_FUN_TABLE .public SoundEnvelope_ForceVolume .public SoundLfoBank_Reset @@ -63,10 +66,7 @@ .public sub_0206C688 .public sub_02072BB8 .public sub_02079800 -.public OS_SleepThread -.public OS_WakeupThreadDirect .public sub_02079B14 -.public DC_FlushRange .public sub_0207A300 .public sub_0207C8B8 .public sub_0207C8E0 diff --git a/asm/include/main_02075600.inc b/asm/include/main_02075600.inc index 225a8474..e045e564 100644 --- a/asm/include/main_02075600.inc +++ b/asm/include/main_02075600.inc @@ -46,7 +46,9 @@ .public ArrayCopy32 .public ArrayFill32 .public AtomicExchange +.public CARD_Init .public ClearIrqFlag +.public CTRDG_Init .public DseMem_Free .public DTCM_BSS .public EnableIrqFiqFlags @@ -57,7 +59,13 @@ .public gGXState .public GXi_DmaId .public GXi_VRamLockId +.public MI_DmaCopy16 +.public MI_Init +.public OS_InitReset .public OS_IRQTable +.public OSi_InitVramExclusive +.public PM_Init +.public PXI_Init .public sClrImg .public sDispMode .public SDK_MAIN_ARENA_LO @@ -73,22 +81,14 @@ .public sub_0206F808 .public sub_0206FD88 .public sub_0206FDE0 -.public OS_InitReset -.public OSi_InitVramExclusive .public sub_0207BAC8 .public sub_0207BC4C .public sub_0207BCCC -.public MI_DmaCopy16 .public sub_0207BDA8 .public sub_0207BE6C .public sub_0207C0FC -.public MI_Init -.public PXI_Init .public sub_02080EF0 .public sub_02080F30 -.public PM_Init -.public CARD_Init -.public CTRDG_Init .public sub_02085BD4 .public SVC_WaitByLoop .public THREAD_INFO_STRUCT diff --git a/asm/include/main_0207B87C.inc b/asm/include/main_0207B87C.inc index e2df6bee..125689ce 100644 --- a/asm/include/main_0207B87C.inc +++ b/asm/include/main_0207B87C.inc @@ -7,15 +7,15 @@ .public EnableIrqFlag .public GetTimer0Control .public MemcpyFast -.public OS_GetLockID -.public SetIrqFlag -.public sub_01FF97CC -.public OS_SetIrqMask -.public OS_ResetRequestIrqMask .public MI_StopDma +.public OS_GetLockID +.public OS_ResetRequestIrqMask +.public OS_SetIrqMask .public PXI_Init -.public PXI_SetFifoRecvCallback .public PXI_IsCallbackReady .public PXI_SendWordByFifo +.public PXI_SetFifoRecvCallback +.public SetIrqFlag +.public sub_01FF97CC .public sub_02083434 .public WaitForever2 diff --git a/asm/include/main_0207BC3C.inc b/asm/include/main_0207BC3C.inc index 89eeca39..994838f9 100644 --- a/asm/include/main_0207BC3C.inc +++ b/asm/include/main_0207BC3C.inc @@ -14,25 +14,25 @@ .public _022BB564 .public _022BB568 .public ARM9_UNKNOWN_TABLE__NA_20AE924 +.public DC_FlushRange +.public DC_InvalidateRange .public EnableIrqFlag .public FileInit .public InitDmaTransfer_Standard +.public OS_EnableIrqMask +.public OS_InitMutex +.public OS_ResetRequestIrqMask +.public OS_SetIrqFunction +.public OS_SleepThread .public SetIrqFlag .public sub_01FF9AA8 .public sub_01FF9B18 .public sub_01FF9B3C -.public OS_SetIrqFunction .public sub_02078BAC -.public OS_EnableIrqMask -.public OS_ResetRequestIrqMask -.public OS_SleepThread .public sub_020798D8 .public sub_02079D98 -.public OS_InitMutex .public sub_0207A048 .public sub_0207A0CC -.public DC_InvalidateRange .public sub_0207A2C0 -.public DC_FlushRange .public sub_0207B854 .public WaitForever2 diff --git a/asm/include/main_0207E84C.inc b/asm/include/main_0207E84C.inc index 21dabff7..48e1a1c0 100644 --- a/asm/include/main_0207E84C.inc +++ b/asm/include/main_0207E84C.inc @@ -5,8 +5,8 @@ .public FileInit .public MemcpyFast .public MemsetFast -.public SetIrqFlag .public OS_SleepThread +.public SetIrqFlag .public sub_020798D8 .public sub_0207DCC0 .public sub_0207DD1C diff --git a/asm/include/main_0207F40C.inc b/asm/include/main_0207F40C.inc index 52cb5f80..30532c2a 100644 --- a/asm/include/main_0207F40C.inc +++ b/asm/include/main_0207F40C.inc @@ -2,8 +2,8 @@ .public _022BB5EC .public EnableIrqFlag .public FileInit -.public SetIrqFlag .public OS_SleepThread +.public SetIrqFlag .public sub_0207EBA0 .public sub_0207EBE4 .public sub_0207EDB4 diff --git a/asm/include/main_0207F894.inc b/asm/include/main_0207F894.inc index 20fed2ab..e513b7f9 100644 --- a/asm/include/main_0207F894.inc +++ b/asm/include/main_0207F894.inc @@ -51,35 +51,42 @@ .public ArrayFill32 .public ArrayFill32Fast .public CopyAndInterleave +.public DC_FlushAll +.public DC_FlushRange +.public DC_InvalidateRange .public EnableIrqFlag .public FileInit .public GetIrqFlag .public MemcpyFast .public MemsetFast +.public MI_DmaCopy16 +.public MI_StopDma .public MIi_UncompressBackward +.public OS_DisableIrqMask +.public OS_EnableIrqMask .public OS_GetLockID -.public OSi_ReferSymbol -.public SetIrqFlag -.public StartThread +.public OS_InitMutex +.public OS_ResetRequestIrqMask .public OS_SetIrqFunction .public OS_SetIrqMask -.public OS_EnableIrqMask -.public OS_DisableIrqMask -.public OS_ResetRequestIrqMask -.public OS_UnLockCartridge +.public OS_SleepThread +.public OS_UnlockCartridgeVeneer +.public OS_WakeupThreadDirect +.public OSi_ReferSymbol +.public PXI_Init +.public PXI_IsCallbackReady +.public PXI_SendWordByFifo +.public PXI_SetFifoRecvCallback +.public PXIi_HandlerRecvFifoNotEmpty +.public SetIrqFlag +.public StartThread .public sub_02078F6C .public sub_02078FBC .public sub_02078FD8 .public sub_02079024 -.public OS_SleepThread .public sub_020798D8 -.public OS_WakeupThreadDirect .public sub_02079A64 -.public OS_InitMutex -.public DC_FlushAll -.public DC_InvalidateRange .public sub_0207A2C0 -.public DC_FlushRange .public sub_0207A300 .public sub_0207A324 .public sub_0207A330 @@ -87,14 +94,7 @@ .public sub_0207AB00 .public sub_0207ADCC .public sub_0207B854 -.public MI_DmaCopy16 -.public MI_StopDma .public sub_0207C750 -.public PXI_Init -.public PXI_SetFifoRecvCallback -.public PXI_IsCallbackReady -.public PXI_SendWordByFifo -.public PXIi_HandlerRecvFifoNotEmpty .public sub_0207ED88 .public sub_0207EDF4 .public sub_0207EF2C diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index f3db1599..b0a95b77 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -28,6 +28,8 @@ .public ArrayFill32Fast .public Crypto_RC4Encrypt .public CRYPTO_RC4Init +.public DC_FlushRange +.public DC_InvalidateRange .public Debug_GetDebugFlag .public EnableIrqFlag .public FileInit @@ -53,6 +55,10 @@ .public memset .public MemsetFast .public MemZero +.public MI_DmaCopy16 +.public OS_InitMutex +.public OS_SleepThread +.public OS_WakeupThreadDirect .public OSi_ReferSymbol .public ov00_0230E074 .public ov00_0230E098 @@ -1022,6 +1028,10 @@ .public ov01_0233AE64 .public ov02_02329520 .public PlayBgmByIdVeneer +.public PXI_Init +.public PXI_IsCallbackReady +.public PXI_SendWordByFifo +.public PXI_SetFifoRecvCallback .public RandInt .public SetIrqFlag .public snprintf @@ -1097,9 +1107,7 @@ .public sub_0207976C .public sub_02079800 .public sub_02079830 -.public OS_SleepThread .public sub_020798D8 -.public OS_WakeupThreadDirect .public sub_02079990 .public sub_020799AC .public sub_02079A64 @@ -1112,13 +1120,10 @@ .public sub_02079E74 .public sub_02079F18 .public sub_02079FB4 -.public OS_InitMutex .public sub_0207A048 .public sub_0207A0CC .public sub_0207A164 -.public DC_InvalidateRange .public sub_0207A2C0 -.public DC_FlushRange .public sub_0207A300 .public sub_0207AD54 .public sub_0207ADCC @@ -1132,11 +1137,6 @@ .public sub_0207B9EC .public sub_0207BB50 .public sub_0207BC4C -.public MI_DmaCopy16 -.public PXI_Init -.public PXI_SetFifoRecvCallback -.public PXI_IsCallbackReady -.public PXI_SendWordByFifo .public sub_0207EDB4 .public sub_0207F60C .public sub_0207F6C4 diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 6b10cf2c..15a74841 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -30,6 +30,7 @@ .public CreateParentMenuFromStringIds .public CreateSimpleMenuFromStringIds .public CreateTextBox +.public DC_InvalidateRange .public Debug_Print0 .public DeleteWanTableEntryVeneer .public DrawChar @@ -371,7 +372,6 @@ .public sub_0205B77C .public sub_0205B80C .public sub_0205BBA4 -.public DC_InvalidateRange .public sub_020851AC .public UpdateWindow .public vsprintf diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index e2c2f033..8aedfcf2 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -14,6 +14,8 @@ .public bind .public ClearIrqFlag .public CloseVeneer +.public DC_FlushRange +.public DC_InvalidateRange .public EnableIrqFlag .public FileInit .public FX_DivS32 @@ -84,8 +86,14 @@ .public MemFree .public memset .public MemsetFast +.public OS_DisableIrqMask +.public OS_EnableIrqMask .public OS_GetLockID .public OS_IRQTable +.public OS_ResetRequestIrqMask +.public OS_SetIrqFunction +.public OS_SetIrqMask +.public OS_WakeupThreadDirect .public ov00_022BDC5C .public ov00_022BF2C4 .public ov00_022BF3E0 @@ -171,28 +179,20 @@ .public strlen .public strncpy .public sub_02076070 -.public OS_SetIrqFunction .public sub_02078B20 -.public OS_SetIrqMask -.public OS_EnableIrqMask -.public OS_DisableIrqMask -.public OS_ResetRequestIrqMask .public sub_02079094 .public sub_020790DC .public sub_0207911C .public sub_02079550 .public sub_02079800 .public sub_02079830 -.public OS_WakeupThreadDirect .public sub_02079B14 .public sub_02079DB8 .public sub_02079DE0 .public sub_02079E74 .public sub_0207A048 .public sub_0207A0CC -.public DC_InvalidateRange .public sub_0207A2C0 -.public DC_FlushRange .public sub_0207ADCC .public sub_0207AE44 .public sub_0207B030 diff --git a/asm/include/overlay_29_022F59C4.inc b/asm/include/overlay_29_022F59C4.inc index 8a644447..5e9c7573 100644 --- a/asm/include/overlay_29_022F59C4.inc +++ b/asm/include/overlay_29_022F59C4.inc @@ -41,7 +41,6 @@ .public ov29_023009CC .public ov29_02304AFC .public ov29_0231AE3C -.public UseMove .public ov29_02322374 .public ov29_0233A248 .public ov29_02344544 @@ -65,4 +64,5 @@ .public TryEndPetrifiedOrSleepStatus .public UpdateMapSurveyorFlag .public UpdateMovePp +.public UseMove .public YesNoMenu diff --git a/asm/include/overlay_29_022FB678.inc b/asm/include/overlay_29_022FB678.inc index 4079ad09..c1d564b1 100644 --- a/asm/include/overlay_29_022FB678.inc +++ b/asm/include/overlay_29_022FB678.inc @@ -1,8 +1,9 @@ #pragma once +.public _020A1870 .public Conversion2IsActive .public DIRECTIONS_XY -.public DUNGEON_PTR .public DisplayAnimatedNumbers +.public DUNGEON_PTR .public EntityIsValid__022F7364 .public GetMaxPp .public GetMoveBasePp @@ -10,10 +11,9 @@ .public IqSkillIsEnabled .public IsMonster__022F9720 .public IsSecretBazaarNpcBehavior -.public TeamMemberHasEnabledIqSkill -.public UpdateMapSurveyorFlag -.public UpdateMinimap -.public _020A1870 .public ov29_022E576C .public ov29_02307CE0 .public ov29_02348100 +.public TeamMemberHasEnabledIqSkill +.public UpdateMapSurveyorFlag +.public UpdateMinimap diff --git a/asm/include/overlay_29_022FBB1C.inc b/asm/include/overlay_29_022FBB1C.inc index def7fd20..a3faa692 100644 --- a/asm/include/overlay_29_022FBB1C.inc +++ b/asm/include/overlay_29_022FBB1C.inc @@ -4,6 +4,6 @@ .public GetIdleAnimationId .public GetTileSafe .public InitAnimationControlWithSet__0201C0CC -.public SetSpriteIdForAnimationControl .public ov29_022DDA54 .public ov29_02304830 +.public SetSpriteIdForAnimationControl diff --git a/asm/include/overlay_29_0231A8A0.inc b/asm/include/overlay_29_0231A8A0.inc index 7b8abb1f..acfe888d 100644 --- a/asm/include/overlay_29_0231A8A0.inc +++ b/asm/include/overlay_29_0231A8A0.inc @@ -7,7 +7,7 @@ .public IsMonster__0231A9D4 .public LogMessageByIdWithPopupCheckUser .public ov29_022FA574 -.public UseMove .public ShouldUsePp .public TryActivateTruant .public UpdateMovePp +.public UseMove diff --git a/asm/include/overlay_29_0231AFB4.inc b/asm/include/overlay_29_0231AFB4.inc index f692c18c..e8899997 100644 --- a/asm/include/overlay_29_0231AFB4.inc +++ b/asm/include/overlay_29_0231AFB4.inc @@ -5,7 +5,7 @@ .public GetTreasureBoxChances .public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUserTarget -.public PrepareItemForPrinting__02345728 -.public SubstitutePlaceholderStringTags .public ov29_022E4110 .public ov29_0232E80C +.public PrepareItemForPrinting__02345728 +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index 6770d518..54eb995b 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -13,6 +13,7 @@ .public ClearMonsterActionFields .public DirectoryFileMngr_OpenDirectoryFile .public DisplayMessage2 +.public DoesMonsterHaveMove .public DUNGEON_PTR .public DungeonRandInt .public DungeonRandOutcome__022EAB20 @@ -77,7 +78,6 @@ .public ov29_022F8830 .public ov29_022F9C34 .public ov29_022FA02C -.public DoesMonsterHaveMove .public ov29_023009A0 .public ov29_023021F0 .public ov29_02339FF4 diff --git a/asm/include/overlay_29_02346834.inc b/asm/include/overlay_29_02346834.inc index 36be5d33..06e49847 100644 --- a/asm/include/overlay_29_02346834.inc +++ b/asm/include/overlay_29_02346834.inc @@ -8,6 +8,7 @@ .public CleanStickyItemsInBag .public ClearItem .public DIRECTIONS_XY +.public DoesMonsterHaveMove .public DoesProjectileHitTarget .public DUNGEON_PTR .public DungeonRand16Bit @@ -48,7 +49,6 @@ .public ov29_022EBB98 .public ov29_022FAFD4 .public ov29_022FB920 -.public DoesMonsterHaveMove .public ov29_023009A0 .public ov29_023457C8 .public ov29_0234B4CC diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index ca165cc6..278af32c 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -3,13 +3,14 @@ .public BAG_ITEMS_PTR_MIRROR .public CanSeeTarget .public ChangeDungeonMusic -.public DUNGEON_PTR .public DisplayMessage .public DisplayMessage2 +.public DUNGEON_PTR .public DungeonRandInt .public EndNegativeStatusConditionWrapper .public EntityIsValid__0234987C .public FemaleToMaleForm +.public FindMonsterWithBehavior .public GetAcceptedMission .public GetEvoParameters .public GetForcedLossReason @@ -39,16 +40,6 @@ .public ItemZInit .public LogMessageById .public MusicTableIdxToMusicId -.public PositionIsOnStairs -.public PrepareItemForPrinting__02345728 -.public RemoveEmptyItemsInBagWrapper -.public RemoveGroundItem -.public SetDungeonEscapeFields -.public SetMessageLogPreprocessorArgsStringToName -.public SetPortraitLayout -.public SetPreprocessorArgsIdVal -.public SubstitutePlaceholderStringTags -.public YesNoMenu .public ov29_022E550C .public ov29_022E8244 .public ov29_022EA428 @@ -57,7 +48,6 @@ .public ov29_022EAEFC .public ov29_022EAF34 .public ov29_022FA3D4 -.public FindMonsterWithBehavior .public ov29_023009CC .public ov29_02300B04 .public ov29_02344B9C @@ -65,7 +55,6 @@ .public ov29_02348A18 .public ov29_023491B8 .public ov29_023496B0 -.public TeleportFleeingOutlaw .public ov29_0234AEE8 .public ov29_0234AF34 .public ov29_0234D630 @@ -73,4 +62,15 @@ .public ov29_0234D838 .public ov29_0234D8A0 .public ov29_023537C8 +.public PositionIsOnStairs +.public PrepareItemForPrinting__02345728 +.public RemoveEmptyItemsInBagWrapper +.public RemoveGroundItem +.public SetDungeonEscapeFields +.public SetMessageLogPreprocessorArgsStringToName +.public SetPortraitLayout +.public SetPreprocessorArgsIdVal .public sub_02017C10 +.public SubstitutePlaceholderStringTags +.public TeleportFleeingOutlaw +.public YesNoMenu diff --git a/asm/include/overlay_29_0234AEE8.inc b/asm/include/overlay_29_0234AEE8.inc index 60f11632..2c738be1 100644 --- a/asm/include/overlay_29_0234AEE8.inc +++ b/asm/include/overlay_29_0234AEE8.inc @@ -13,14 +13,11 @@ .public InitPortraitParams .public InitPreprocessorArgs .public IsAlertBoxActive -.public MESSAGE_LOG_INFO .public MemAlloc .public MemFree .public MemZero +.public MESSAGE_LOG_INFO .public MusicTableIdxToMusicId -.public PreprocessString -.public ShouldDisplayEntityWrapper -.public StringFromId .public ov10_022BFD20 .public ov29_022E0B60 .public ov29_022E2CA0 @@ -34,6 +31,9 @@ .public ov29_02348A18 .public ov29_02353214 .public ov29_0237C694 +.public PreprocessString +.public ShouldDisplayEntityWrapper +.public StringFromId .public strlen .public strncmp .public strncpy diff --git a/asm/main_02075600.s b/asm/main_02075600.s index fdc9adc8..61258ce9 100644 --- a/asm/main_02075600.s +++ b/asm/main_02075600.s @@ -4675,13 +4675,13 @@ _02078F58: .word 0x027FFFE8 _02078F5C: .word OSi_FreeCartridgeBus arm_func_end OS_UnlockCartridge - arm_func_start OS_UnLockCartridge -OS_UnLockCartridge: ; 0x02078F60 + arm_func_start OS_UnlockCartridgeVeneer +OS_UnlockCartridgeVeneer: ; 0x02078F60 ldr r1, _02078F68 ; =OS_UnlockCartridge bx r1 .align 2, 0 _02078F68: .word OS_UnlockCartridge - arm_func_end OS_UnLockCartridge + arm_func_end OS_UnlockCartridgeVeneer arm_func_start sub_02078F6C sub_02078F6C: ; 0x02078F6C diff --git a/asm/main_0207F894.s b/asm/main_0207F894.s index 1c15c910..088897cb 100644 --- a/asm/main_0207F894.s +++ b/asm/main_0207F894.s @@ -6232,7 +6232,7 @@ CTRDGi_UnlockByProcessor: ; 0x02084990 ldr r1, [r4] cmp r1, #0 bne _020849A8 - bl OS_UnLockCartridge + bl OS_UnlockCartridgeVeneer _020849A8: ldr r0, [r4, #4] bl SetIrqFlag