From ebf6214ebfbba816581ccde589dfa176cc567f8f Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 26 Feb 2026 21:04:36 -0500 Subject: [PATCH 1/2] 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 From 58c3ceefcc25cbfb1cbeaf274b6f401738490efd Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 2 Mar 2026 22:38:23 -0500 Subject: [PATCH 2/2] Synced from pmdsky-debug --- asm/overlay_11_022ECD24_data.s | 12 +- asm/overlay_18.s | 628 ++++++++++++++++----------------- 2 files changed, 320 insertions(+), 320 deletions(-) diff --git a/asm/overlay_11_022ECD24_data.s b/asm/overlay_11_022ECD24_data.s index 860f6731..0704a6f3 100644 --- a/asm/overlay_11_022ECD24_data.s +++ b/asm/overlay_11_022ECD24_data.s @@ -247,9 +247,9 @@ .public ov17_0238A140 .public ov17_0238A71C .public ov17_0238A754 -.public ov18_0238A140 -.public ov18_0238AFD4 -.public ov18_0238B01C +.public LinkShopEntryPoint +.public LinkShopDestructor +.public LinkShopMainManager .public ov19_0238D5FC .public ov19_0238D68C .public ov19_0238D698 @@ -1902,9 +1902,9 @@ ov11_0232309C: .global ov11_023230AC ov11_023230AC: .byte 0x16, 0x00, 0x00, 0x00 - .word ov18_0238A140 - .word ov18_0238AFD4 - .word ov18_0238B01C + .word LinkShopEntryPoint + .word LinkShopDestructor + .word LinkShopMainManager .global ov11_023230BC ov11_023230BC: .byte 0x17, 0x00, 0x00, 0x00 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 802ffbad..223ecb9f 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -3,20 +3,20 @@ .text - arm_func_start ov18_0238A140 -ov18_0238A140: ; 0x0238A140 + arm_func_start LinkShopEntryPoint +LinkShopEntryPoint: ; 0x0238A140 stmdb sp!, {r3, lr} mov r0, #0x3c4 mov r1, #8 bl MemAlloc - ldr r1, _0238A298 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238A298 ; =LINK_SHOP_PTR mov r2, #1 str r0, [r1] strb r2, [r0, #0x10] ldr r0, [r1] add r0, r0, #0x14 bl InitPreprocessorArgs - ldr r3, _0238A298 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r3, _0238A298 ; =LINK_SHOP_PTR mov r1, #0 ldr r2, [r3] sub r0, r1, #1 @@ -52,7 +52,7 @@ ov18_0238A140: ; 0x0238A140 bl sub_020573A0 bl sub_02041400 ldr r1, _0238A29C ; =ov11_0238A090 - ldr r0, _0238A298 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A298 ; =LINK_SHOP_PTR ldr r3, [r1] ldr r2, [r0] mvn r1, #1 @@ -92,14 +92,14 @@ ov18_0238A140: ; 0x0238A140 strb r1, [r2, #0xf] ldmia sp!, {r3, pc} .align 2, 0 -_0238A298: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238A298: .word LINK_SHOP_PTR _0238A29C: .word ov11_0238A090 - arm_func_end ov18_0238A140 + arm_func_end LinkShopEntryPoint arm_func_start ov18_0238A2A0 ov18_0238A2A0: ; 0x0238A2A0 stmdb sp!, {r3, lr} - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #1 @@ -110,7 +110,7 @@ ov18_0238A2A0: ; 0x0238A2A0 beq _0238A2CC bl sub_0202F334 _0238A2CC: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #2 @@ -121,7 +121,7 @@ _0238A2CC: beq _0238A2F4 bl HidePortraitBox _0238A2F4: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #4 @@ -132,14 +132,14 @@ _0238A2F4: beq _0238A31C bl sub_0202F954 _0238A31C: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r0, [r0] ldr r0, [r0, #0x88] tst r0, #0x80 bne _0238A334 bl sub_0203A618 _0238A334: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x100 @@ -150,7 +150,7 @@ _0238A334: beq _0238A35C bl SetAdvancedTextBoxState5 _0238A35C: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x200 @@ -161,7 +161,7 @@ _0238A35C: beq _0238A384 bl SetAdvancedTextBoxState5 _0238A384: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x400 @@ -172,7 +172,7 @@ _0238A384: beq _0238A3AC bl SetScrollBoxState7 _0238A3AC: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x1000 @@ -183,7 +183,7 @@ _0238A3AC: beq _0238A3D4 bl sub_0202BC60 _0238A3D4: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x4000 @@ -194,7 +194,7 @@ _0238A3D4: beq _0238A3FC bl SetAdvancedTextBoxState5 _0238A3FC: - ldr r0, _0238A428 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238A428 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -206,13 +206,13 @@ _0238A3FC: bl sub_0202F334 ldmia sp!, {r3, pc} .align 2, 0 -_0238A428: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238A428: .word LINK_SHOP_PTR arm_func_end ov18_0238A2A0 arm_func_start ov18_0238A42C ov18_0238A42C: ; 0x0238A42C stmdb sp!, {r3, lr} - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #1 @@ -226,11 +226,11 @@ ov18_0238A42C: ; 0x0238A42C cmp r0, #0 movne r2, #0 bne _0238A48C - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0] bl CloseDialogueBox - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -240,7 +240,7 @@ _0238A48C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A498: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #2 @@ -254,11 +254,11 @@ _0238A498: cmp r0, #0 movne r2, #0 bne _0238A4F4 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #1] bl ClosePortraitBox - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -268,7 +268,7 @@ _0238A4F4: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A500: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #4 @@ -282,11 +282,11 @@ _0238A500: cmp r0, #0 movne r2, #0 bne _0238A55C - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #2] bl CloseTextBox - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -296,7 +296,7 @@ _0238A55C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A568: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #8 @@ -310,11 +310,11 @@ _0238A568: cmp r0, #0 movne r2, #0 bne _0238A5C4 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #3] bl CloseSimpleMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -324,7 +324,7 @@ _0238A5C4: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A5D0: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x20 @@ -338,11 +338,11 @@ _0238A5D0: cmp r0, #0 movne r2, #0 bne _0238A62C - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #4] bl CloseSimpleMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -352,7 +352,7 @@ _0238A62C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A638: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10 @@ -366,11 +366,11 @@ _0238A638: cmp r0, #0 movne r2, #0 bne _0238A694 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #5] bl CloseSimpleMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -380,7 +380,7 @@ _0238A694: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A6A0: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x40 @@ -394,11 +394,11 @@ _0238A6A0: cmp r0, #0 movne r2, #0 bne _0238A6FC - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #6] bl CloseSimpleMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -408,7 +408,7 @@ _0238A6FC: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A708: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldr r0, [r0, #0x88] tst r0, #0x80 @@ -424,7 +424,7 @@ _0238A734: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A740: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r3, [r0] ldr r2, [r3, #0x88] tst r2, #0x100 @@ -449,12 +449,12 @@ _0238A774: cmp r0, #0 movne r2, #0 bne _0238A7C8 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #8] bl CloseAdvancedTextBox bl sub_020407C0 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -464,7 +464,7 @@ _0238A7C8: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A7D4: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x400 @@ -478,12 +478,12 @@ _0238A7D4: cmp r0, #0 movne r2, #0 bne _0238A834 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #9] bl CloseScrollBox bl sub_02041A00 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -493,7 +493,7 @@ _0238A834: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A840: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x800 @@ -507,11 +507,11 @@ _0238A840: cmp r0, #0 movne r2, #0 bne _0238A89C - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xa] bl CloseSimpleMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -521,7 +521,7 @@ _0238A89C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A8A8: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x1000 @@ -535,11 +535,11 @@ _0238A8A8: cmp r0, #0 movne r2, #0 bne _0238A904 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xb] bl CloseAdvancedMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -549,7 +549,7 @@ _0238A904: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A910: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x2000 @@ -563,11 +563,11 @@ _0238A910: cmp r0, #0 movne r2, #0 bne _0238A96C - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xc] bl CloseSimpleMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -577,7 +577,7 @@ _0238A96C: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A978: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x4000 @@ -591,12 +591,12 @@ _0238A978: cmp r0, #0 movne r2, #0 bne _0238A9D8 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xd] bl CloseAdvancedTextBox bl sub_020407C0 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -606,7 +606,7 @@ _0238A9D8: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238A9E4: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x8000 @@ -620,11 +620,11 @@ _0238A9E4: cmp r0, #0 movne r2, #0 bne _0238AA40 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xe] bl CloseSimpleMenu - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -634,7 +634,7 @@ _0238AA40: moveq r0, #0 ldmeqia sp!, {r3, pc} _0238AA4C: - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -648,11 +648,11 @@ _0238AA4C: cmp r0, #0 movne r2, #0 bne _0238AAA8 - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xf] bl CloseDialogueBox - ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238AABC ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] mov r2, #1 @@ -665,7 +665,7 @@ _0238AAB4: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0238AABC: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238AABC: .word LINK_SHOP_PTR arm_func_end ov18_0238A42C arm_func_start ov18_0238AAC0 @@ -983,7 +983,7 @@ _0238AEEC: .word 0x00000216 arm_func_start ov18_0238AEF0 ov18_0238AEF0: ; 0x0238AEF0 stmdb sp!, {r4, lr} - ldr r2, _0238AF34 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238AF34 ; =LINK_SHOP_PTR mov r1, r1, lsl #0x10 ldr r2, [r2] mov r4, r0 @@ -1000,7 +1000,7 @@ ov18_0238AEF0: ; 0x0238AEF0 mov r0, r4 ldmia sp!, {r4, pc} .align 2, 0 -_0238AF34: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238AF34: .word LINK_SHOP_PTR _0238AF38: .word ov18_0238D5F8 arm_func_end ov18_0238AEF0 @@ -1055,15 +1055,15 @@ _0238AFD0: .word 0x00000225 #endif arm_func_end ov18_0238AF3C - arm_func_start ov18_0238AFD4 -ov18_0238AFD4: ; 0x0238AFD4 + arm_func_start LinkShopDestructor +LinkShopDestructor: ; 0x0238AFD4 stmdb sp!, {r3, lr} - ldr r0, _0238B018 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238B018 ; =LINK_SHOP_PTR ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0238B018 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238B018 ; =LINK_SHOP_PTR mov r1, #0 str r1, [r0] bl sub_02041414 @@ -1076,14 +1076,14 @@ _0238B010: bl sub_020572EC ldmia sp!, {r3, pc} .align 2, 0 -_0238B018: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 - arm_func_end ov18_0238AFD4 +_0238B018: .word LINK_SHOP_PTR + arm_func_end LinkShopDestructor - arm_func_start ov18_0238B01C -ov18_0238B01C: ; 0x0238B01C + arm_func_start LinkShopMainManager +LinkShopMainManager: ; 0x0238B01C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x214 - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r4, [r0] ldr r0, [r4, #0x74] cmp r0, #3 @@ -1113,7 +1113,7 @@ _0238B078: ; jump table b _0238BC88 ; case 2 b _0238B088 ; case 3 _0238B088: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r1, #0 str r1, [r4, #0x7c] ldr r1, [r0] @@ -1121,7 +1121,7 @@ _0238B088: ldr r1, [r1, #0x78] ldr r0, [r0, r1, lsl #2] blx r0 - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r3, [r0] ldr r1, [r3, #0x78] ldr r2, [r3, #0x80] @@ -1138,7 +1138,7 @@ _0238B088: blx r0 _0238B0E4: bl ov18_0238A2A0 - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r1, #1 ldr r0, [r0] str r1, [r0, #0x7c] @@ -1147,7 +1147,7 @@ _0238B0FC: bl ov18_0238A42C cmp r0, #0 beq _0238BCF8 - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #1 @@ -1159,18 +1159,18 @@ _0238B0FC: bne _0238B150 ldr r0, _0238BD4C ; =LINK_SHOP_WINDOW_PARAMS_11 bl CreateDialogueBox - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR mvn r2, #0 ldr r3, [r1] strb r0, [r3] ldr r0, [r1] str r2, [r0, #0x84] _0238B150: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0] bl ShowDialogueBox - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r1, #0x1fc ldr r3, [r0] ldr r2, [r3, #0x84] @@ -1198,7 +1198,7 @@ _0238B1AC: cmpne r1, #0x4b bne _0238B1E4 _0238B1C8: - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r2, [r1] add r1, r2, #0x300 ldrsh r1, [r1, #0x8c] @@ -1209,7 +1209,7 @@ _0238B1E4: mov r1, #0x1fc str r1, [r3, #0x14] _0238B1EC: - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r3, [r1] ldr r2, [r3, #0x78] cmp r2, #0x4b @@ -1408,7 +1408,7 @@ _0238B458: ldr r4, _0238BD58 ; =0x00003018 str r1, [r3, #0x38] _0238B468: - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR mov r0, r0, lsl #0x10 ldr r3, [r1] mov r5, r0, lsr #0x10 @@ -1424,7 +1424,7 @@ _0238B468: mov r2, r2, lsr #0x10 bl ShowStringIdInDialogueBox _0238B4A4: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #2 @@ -1437,30 +1437,30 @@ _0238B4A4: mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r2, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238BD40 ; =LINK_SHOP_PTR mov r1, #0x1fc ldr r3, [r2] strb r0, [r3, #1] ldr r0, [r2] add r0, r0, #0x64 bl InitPortraitParamsWithMonsterId - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r1, #0 ldr r0, [r0] add r0, r0, #0x64 bl SetPortraitLayout - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r1, #0 ldr r0, [r0] add r0, r0, #0x64 bl SetPortraitEmotion - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldrsb r0, [r1, #1] add r1, r1, #0x64 bl ShowPortraitInPortraitBox _0238B530: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #4 @@ -1472,11 +1472,11 @@ _0238B530: ldr r0, _0238BDB0 ; =LINK_SHOP_WINDOW_PARAMS_1 ldr r1, _0238BDB4 ; =ov18_0238AF3C bl CreateTextBox - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #2] _0238B56C: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #8 @@ -1492,11 +1492,11 @@ _0238B56C: mov r2, #0 str r4, [sp] bl CreateSimpleMenuFromStringIds - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #3] _0238B5B8: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x20 @@ -1512,11 +1512,11 @@ _0238B5B8: mov r2, #0 str r4, [sp] bl CreateSimpleMenuFromStringIds - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #4] _0238B604: - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r3, [r1] ldr r0, [r3, #0x88] tst r0, #0x40 @@ -1535,11 +1535,11 @@ _0238B604: ldr r3, _0238BDD4 ; =LINK_SHOP_MENU_ITEMS_CONFIRM add r2, r2, #0x90 bl CreateSimpleMenuFromStringIds - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #6] _0238B65C: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10 @@ -1555,11 +1555,11 @@ _0238B65C: mov r2, #0 str r4, [sp] bl CreateSimpleMenuFromStringIds - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #5] _0238B6A8: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r0, [r0] ldr r0, [r0, #0x88] tst r0, #0x80 @@ -1567,7 +1567,7 @@ _0238B6A8: bl sub_0203A998 cmp r0, #0 bne _0238B6F8 - ldr r2, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238BD40 ; =LINK_SHOP_PTR mov r3, #2 ldr r1, [r2] mov r0, #6 @@ -1580,7 +1580,7 @@ _0238B6A8: add r1, r1, #0x388 bl sub_02039C2C _0238B6F8: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r2, [r0] ldr r0, [r2, #0x88] tst r0, #0x100 @@ -1596,11 +1596,11 @@ _0238B6F8: add r0, sp, #0x19c mov r1, #3 bl sub_0203F150 - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #7] _0238B744: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x200 @@ -1616,21 +1616,21 @@ _0238B744: bge _0238B794 mov r0, #4 bl sub_0204018C - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #8] b _0238B7B0 _0238B794: mov r0, #5 bl sub_0204018C - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #8] b _0238B7B0 _0238B7AC: bl sub_02041178 _0238B7B0: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r2, [r0] ldr r0, [r2, #0x88] tst r0, #0x400 @@ -1646,7 +1646,7 @@ _0238B7B0: add r0, r0, #0x300 mov r1, #1 bl sub_02041860 - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #9] b _0238B820 @@ -1656,11 +1656,11 @@ _0238B800: mov r1, #4 mov r3, #1 bl sub_020417A8 - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #9] _0238B820: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x800 @@ -1670,7 +1670,7 @@ _0238B820: cmp r1, r0 bne _0238B984 bl sub_02041094 - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR mov r6, r0 ldr r0, [r1] add r0, r0, #0x300 @@ -1686,7 +1686,7 @@ _0238B820: _0238B87C: ldr r4, _0238BDE8 ; =LINK_SHOP_SUBMENU_ITEMS_7 _0238B880: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r2, #0 ldr r0, [r0] mov r1, r2 @@ -1738,7 +1738,7 @@ _0238B934: cmp ip, #4 blt _0238B900 _0238B93C: - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR cmp r6, #0 moveq r0, #3 streqb r0, [r5, #4] @@ -1753,11 +1753,11 @@ _0238B93C: mov r3, r4 add r2, r2, #0x128 bl CreateSimpleMenuFromStringIds - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #0xa] _0238B984: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r2, [r0] ldr r0, [r2, #0x88] tst r0, #0x1000 @@ -1776,7 +1776,7 @@ _0238B984: add r1, r1, #0x3a mov r2, #0xa bl StrncpySimpleNoPadSafe - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, _0238BDF8 ; =ov18_0238D5F8 ldr r0, [r0] add r3, sp, #8 @@ -1784,7 +1784,7 @@ _0238B984: add r0, r0, #0x300 mov r2, #0x46 bl ov18_0238AAC0 - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r3, _0238BDFC ; =0x00000A3E ldr r4, [r1] mov r2, #0x10 @@ -1805,7 +1805,7 @@ _0238B984: bl ov18_0238ABB0 str r0, [sp] mov r1, #8 - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR str r1, [sp, #4] ldr r1, [r0] ldr r0, _0238BE00 ; =LINK_SHOP_WINDOW_PARAMS_6 @@ -1813,11 +1813,11 @@ _0238B984: ldr r1, _0238BE04 ; =0x00401833 ldr r3, _0238BE08 ; =ov18_0238AEF0 bl CreateAdvancedMenu - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #0xb] _0238BA70: - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r3, [r1] ldr r0, [r3, #0x88] tst r0, #0x2000 @@ -1836,11 +1836,11 @@ _0238BA70: add r2, r1, #0x258 mov r1, #0x33 bl CreateSimpleMenuFromStringIds - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #0xc] _0238BAC8: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x4000 @@ -1853,14 +1853,14 @@ _0238BAC8: mov r2, r1 mov r0, #6 bl sub_0204018C - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #0xd] b _0238BB10 _0238BB0C: bl sub_02041178 _0238BB10: - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r3, [r1] ldr r0, [r3, #0x88] tst r0, #0x8000 @@ -1877,12 +1877,12 @@ _0238BB10: strb r2, [r0, #0x39e] bl sub_02041094 cmp r0, #4 - ldrge r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldrge r0, _0238BD40 ; =LINK_SHOP_PTR movge r1, #3 ldrge r0, [r0] mov r3, #1 strgeb r1, [r0, #0x39c] - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR mov r4, #3 ldr r2, [r1] add r0, r2, #0x39c @@ -1896,11 +1896,11 @@ _0238BB10: add r1, r4, #0x230 add r2, r2, #0x2f0 bl CreateSimpleMenuFromStringIds - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r1] strb r0, [r1, #0xe] _0238BBAC: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -1911,18 +1911,18 @@ _0238BBAC: bne _0238BBF0 ldr r0, _0238BE1C ; =LINK_SHOP_WINDOW_PARAMS_10 bl CreateDialogueBox - ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BD40 ; =LINK_SHOP_PTR mvn r2, #0 ldr r3, [r1] strb r0, [r3, #0xf] ldr r0, [r1] str r2, [r0, #0x84] _0238BBF0: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xf] bl ShowDialogueBox - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r3, [r0] ldr r0, [r3, #0x78] cmp r0, #0x12 @@ -1954,14 +1954,14 @@ _0238BC50: ldr r0, [r3, #0x84] cmp r0, r2 beq _0238BC74 - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR str r2, [r3, #0x84] ldr r0, [r0] add r3, sp, #0x14c ldrsb r0, [r0, #0xf] bl ShowStringIdInDialogueBox _0238BC74: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r1, #2 ldr r0, [r0] str r1, [r0, #0x7c] @@ -1976,7 +1976,7 @@ _0238BC88: movne r0, #0 bne _0238BCD4 _0238BCA8: - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR ldr r1, [r0] ldr r0, [r1, #0x88] tst r0, #0x10000 @@ -1991,7 +1991,7 @@ _0238BCD0: _0238BCD4: cmp r0, #0 beq _0238BCF8 - ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BD40 ; =LINK_SHOP_PTR mov r2, #0 ldr r1, [r0] str r2, [r1, #0x7c] @@ -2004,7 +2004,7 @@ _0238BCF8: _0238BD00: bl ov18_0238A42C cmp r0, #0 - ldrne r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldrne r0, _0238BD40 ; =LINK_SHOP_PTR movne r1, #2 ldrne r0, [r0] strne r1, [r0, #0x74] @@ -2013,7 +2013,7 @@ _0238BD1C: mov r0, #3 str r0, [r4, #0x74] bl ov11_022E6E68 - bl ov18_0238AFD4 + bl LinkShopDestructor mov r0, #4 b _0238BD38 _0238BD34: @@ -2027,7 +2027,7 @@ _0238BD38: #else #define OV18_0238B01C_OFFSET 0 #endif -_0238BD40: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BD40: .word LINK_SHOP_PTR _0238BD44: .word OVERLAY18_FUNCTION_POINTER_TABLE _0238BD48: .word 0x00003008 _0238BD4C: .word LINK_SHOP_WINDOW_PARAMS_11 @@ -2111,11 +2111,11 @@ _0238BE24: .word 0x00003408 #ifdef JAPAN _0238D390: .word 0x00003D26 #endif - arm_func_end ov18_0238B01C + arm_func_end LinkShopMainManager arm_func_start ov18_0238BE28 ov18_0238BE28: ; 0x0238BE28 - ldr r1, _0238BE44 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238BE44 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r1] str r3, [r2, #0x7c] @@ -2123,12 +2123,12 @@ ov18_0238BE28: ; 0x0238BE28 str r0, [r1, #0x80] bx lr .align 2, 0 -_0238BE44: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BE44: .word LINK_SHOP_PTR arm_func_end ov18_0238BE28 arm_func_start ov18_0238BE48 ov18_0238BE48: ; 0x0238BE48 - ldr r0, _0238BE68 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BE68 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #1 @@ -2137,12 +2137,12 @@ ov18_0238BE48: ; 0x0238BE48 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BE68: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BE68: .word LINK_SHOP_PTR arm_func_end ov18_0238BE48 arm_func_start ov18_0238BE6C ov18_0238BE6C: ; 0x0238BE6C - ldr r0, _0238BE8C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BE8C ; =LINK_SHOP_PTR mov r3, #0xf ldr r2, [r0] mov r1, #2 @@ -2151,19 +2151,19 @@ ov18_0238BE6C: ; 0x0238BE6C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BE8C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BE8C: .word LINK_SHOP_PTR arm_func_end ov18_0238BE6C arm_func_start ov18_0238BE90 ov18_0238BE90: ; 0x0238BE90 stmdb sp!, {r3, lr} - ldr r0, _0238BF08 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BF08 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #3] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238BF08 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BF08 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #3] bl GetSimpleMenuResult__0202B870 @@ -2191,12 +2191,12 @@ _0238BEFC: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238BF08: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BF08: .word LINK_SHOP_PTR arm_func_end ov18_0238BE90 arm_func_start ov18_0238BF0C ov18_0238BF0C: ; 0x0238BF0C - ldr r0, _0238BF2C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BF2C ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #4 @@ -2205,29 +2205,29 @@ ov18_0238BF0C: ; 0x0238BF0C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BF2C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BF2C: .word LINK_SHOP_PTR arm_func_end ov18_0238BF0C arm_func_start ov18_0238BF30 ov18_0238BF30: ; 0x0238BF30 stmdb sp!, {r3, lr} - ldr r0, _0238BF5C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BF5C ; =LINK_SHOP_PTR mov r1, #0 ldr r0, [r0] str r1, [r0, #0x88] bl ov18_0238A2A0 - ldr r0, _0238BF5C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BF5C ; =LINK_SHOP_PTR mov r1, #1 ldr r0, [r0] str r1, [r0, #0x74] ldmia sp!, {r3, pc} .align 2, 0 -_0238BF5C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BF5C: .word LINK_SHOP_PTR arm_func_end ov18_0238BF30 arm_func_start ov18_0238BF60 ov18_0238BF60: ; 0x0238BF60 - ldr r0, _0238BF80 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BF80 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #6 @@ -2236,12 +2236,12 @@ ov18_0238BF60: ; 0x0238BF60 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BF80: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BF80: .word LINK_SHOP_PTR arm_func_end ov18_0238BF60 arm_func_start ov18_0238BF84 ov18_0238BF84: ; 0x0238BF84 - ldr r0, _0238BFA4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238BFA4 ; =LINK_SHOP_PTR mov r3, #0x23 ldr r2, [r0] mov r1, #7 @@ -2250,19 +2250,19 @@ ov18_0238BF84: ; 0x0238BF84 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238BFA4: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238BFA4: .word LINK_SHOP_PTR arm_func_end ov18_0238BF84 arm_func_start ov18_0238BFA8 ov18_0238BFA8: ; 0x0238BFA8 stmdb sp!, {r3, lr} - ldr r0, _0238C038 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C038 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #4] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238C038 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C038 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #4] bl GetSimpleMenuResult__0202B870 @@ -2297,12 +2297,12 @@ _0238C02C: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C038: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C038: .word LINK_SHOP_PTR arm_func_end ov18_0238BFA8 arm_func_start ov18_0238C03C ov18_0238C03C: ; 0x0238C03C - ldr r0, _0238C05C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C05C ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #9 @@ -2311,23 +2311,23 @@ ov18_0238C03C: ; 0x0238C03C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C05C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C05C: .word LINK_SHOP_PTR arm_func_end ov18_0238C03C arm_func_start ov18_0238C060 ov18_0238C060: ; 0x0238C060 - ldr r0, _0238C074 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C074 ; =LINK_SHOP_PTR mov r1, #5 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C074: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C074: .word LINK_SHOP_PTR arm_func_end ov18_0238C060 arm_func_start ov18_0238C078 ov18_0238C078: ; 0x0238C078 - ldr r0, _0238C098 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C098 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0xc @@ -2336,12 +2336,12 @@ ov18_0238C078: ; 0x0238C078 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C098: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C098: .word LINK_SHOP_PTR arm_func_end ov18_0238C078 arm_func_start ov18_0238C09C ov18_0238C09C: ; 0x0238C09C - ldr r0, _0238C0BC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C0BC ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0xd @@ -2350,23 +2350,23 @@ ov18_0238C09C: ; 0x0238C09C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C0BC: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C0BC: .word LINK_SHOP_PTR arm_func_end ov18_0238C09C arm_func_start ov18_0238C0C0 ov18_0238C0C0: ; 0x0238C0C0 - ldr r0, _0238C0D4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C0D4 ; =LINK_SHOP_PTR mov r1, #5 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C0D4: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C0D4: .word LINK_SHOP_PTR arm_func_end ov18_0238C0C0 arm_func_start ov18_0238C0D8 ov18_0238C0D8: ; 0x0238C0D8 - ldr r0, _0238C0F8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C0F8 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0xf @@ -2375,23 +2375,23 @@ ov18_0238C0D8: ; 0x0238C0D8 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C0F8: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C0F8: .word LINK_SHOP_PTR arm_func_end ov18_0238C0D8 arm_func_start ov18_0238C0FC ov18_0238C0FC: ; 0x0238C0FC - ldr r0, _0238C110 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C110 ; =LINK_SHOP_PTR mov r1, #5 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C110: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C110: .word LINK_SHOP_PTR arm_func_end ov18_0238C0FC arm_func_start ov18_0238C114 ov18_0238C114: ; 0x0238C114 - ldr r0, _0238C134 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C134 ; =LINK_SHOP_PTR ldr r3, _0238C138 ; =0x00010002 ldr r2, [r0] mov r1, #0x11 @@ -2400,13 +2400,13 @@ ov18_0238C114: ; 0x0238C114 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C134: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C134: .word LINK_SHOP_PTR _0238C138: .word 0x00010002 arm_func_end ov18_0238C114 arm_func_start ov18_0238C13C ov18_0238C13C: ; 0x0238C13C - ldr r0, _0238C15C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C15C ; =LINK_SHOP_PTR ldr r3, _0238C160 ; =0x00010080 ldr r2, [r0] mov r1, #0x12 @@ -2415,7 +2415,7 @@ ov18_0238C13C: ; 0x0238C13C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C15C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C15C: .word LINK_SHOP_PTR _0238C160: .word 0x00010080 arm_func_end ov18_0238C13C @@ -2437,12 +2437,12 @@ ov18_0238C164: ; 0x0238C164 mov r0, #0 bl PlaySeVolumeWrapper bl sub_0203AAB0 - ldr r1, _0238C218 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238C218 ; =LINK_SHOP_PTR ldr r1, [r1] add r1, r1, #0x300 strh r0, [r1, #0x8c] bl sub_0203A5F0 - ldr r0, _0238C218 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C218 ; =LINK_SHOP_PTR mov r1, #0x17 ldr r0, [r0] str r1, [r0, #0x80] @@ -2457,7 +2457,7 @@ _0238C1CC: bl ov18_0238BE28 ldmia sp!, {r3, pc} _0238C1EC: - ldr r2, _0238C218 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238C218 ; =LINK_SHOP_PTR ldr r1, [r2] add r1, r1, #0x300 strh r0, [r1, #0x8c] @@ -2469,12 +2469,12 @@ _0238C1EC: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C218: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C218: .word LINK_SHOP_PTR arm_func_end ov18_0238C164 arm_func_start ov18_0238C21C ov18_0238C21C: ; 0x0238C21C - ldr r0, _0238C23C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C23C ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x14 @@ -2483,23 +2483,23 @@ ov18_0238C21C: ; 0x0238C21C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C23C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C23C: .word LINK_SHOP_PTR arm_func_end ov18_0238C21C arm_func_start ov18_0238C240 ov18_0238C240: ; 0x0238C240 - ldr r0, _0238C254 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C254 ; =LINK_SHOP_PTR mov r1, #0x11 ldr r0, [r0] str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C254: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C254: .word LINK_SHOP_PTR arm_func_end ov18_0238C240 arm_func_start ov18_0238C258 ov18_0238C258: ; 0x0238C258 - ldr r0, _0238C278 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C278 ; =LINK_SHOP_PTR mov r3, #0x90 ldr r2, [r0] mov r1, #0x16 @@ -2508,19 +2508,19 @@ ov18_0238C258: ; 0x0238C258 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C278: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C278: .word LINK_SHOP_PTR arm_func_end ov18_0238C258 arm_func_start ov18_0238C27C ov18_0238C27C: ; 0x0238C27C stmdb sp!, {r3, lr} - ldr r0, _0238C33C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C33C ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #5] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0238C33C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C33C ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #5] bl GetSimpleMenuResult__0202B870 @@ -2550,7 +2550,7 @@ _0238C2F4: bl ov18_0238BE28 ldmia sp!, {r3, pc} _0238C300: - ldr r0, _0238C33C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C33C ; =LINK_SHOP_PTR mov r3, #0 ldr r2, [r0] mov r1, #0x1b @@ -2568,12 +2568,12 @@ _0238C32C: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C33C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C33C: .word LINK_SHOP_PTR arm_func_end ov18_0238C27C arm_func_start ov18_0238C340 ov18_0238C340: ; 0x0238C340 - ldr r0, _0238C360 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C360 ; =LINK_SHOP_PTR mov r3, #0x100 ldr r2, [r0] mov r1, #0x18 @@ -2582,7 +2582,7 @@ ov18_0238C340: ; 0x0238C340 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C360: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C360: .word LINK_SHOP_PTR arm_func_end ov18_0238C340 arm_func_start ov18_0238C364 @@ -2592,7 +2592,7 @@ ov18_0238C364: ; 0x0238C364 cmp r0, #1 ldmneia sp!, {r3, pc} bl sub_0203F990 - ldr r0, _0238C394 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C394 ; =LINK_SHOP_PTR mvn r2, #1 ldr r1, [r0] mov r0, #0x11 @@ -2600,12 +2600,12 @@ ov18_0238C364: ; 0x0238C364 bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238C394: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C394: .word LINK_SHOP_PTR arm_func_end ov18_0238C364 arm_func_start ov18_0238C398 ov18_0238C398: ; 0x0238C398 - ldr r0, _0238C3B8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C3B8 ; =LINK_SHOP_PTR ldr r3, _0238C3BC ; =0x00000201 ldr r2, [r0] mov r1, #0x1a @@ -2614,7 +2614,7 @@ ov18_0238C398: ; 0x0238C398 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C3B8: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C3B8: .word LINK_SHOP_PTR _0238C3BC: .word 0x00000201 arm_func_end ov18_0238C398 @@ -2624,7 +2624,7 @@ ov18_0238C3C0: ; 0x0238C3C0 bl sub_020407EC movs r4, r0 beq _0238C3E4 - ldr r0, _0238C424 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C424 ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -2650,13 +2650,13 @@ _0238C418: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C424: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C424: .word LINK_SHOP_PTR arm_func_end ov18_0238C3C0 arm_func_start ov18_0238C428 ov18_0238C428: ; 0x0238C428 stmdb sp!, {r3, lr} - ldr r1, _0238C474 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238C474 ; =LINK_SHOP_PTR ldr r0, _0238C478 ; =TEAM_MEMBER_TABLE_PTR ldr r2, [r1] ldr r1, [r0] @@ -2669,13 +2669,13 @@ ov18_0238C428: ; 0x0238C428 ldrsh r2, [r1, #8] add r1, r1, #0x14 bl PrintIqSkillsMenu - ldr r0, _0238C474 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C474 ; =LINK_SHOP_PTR mov r1, #0x1c ldr r0, [r0] str r1, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238C474: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C474: .word LINK_SHOP_PTR _0238C478: .word TEAM_MEMBER_TABLE_PTR arm_func_end ov18_0238C428 @@ -2696,11 +2696,11 @@ ov18_0238C47C: ; 0x0238C47C ov18_0238C4A0: ; 0x0238C4A0 stmdb sp!, {r3, lr} bl sub_0203FD38 - ldr r1, _0238C4E4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238C4E4 ; =LINK_SHOP_PTR ldr r1, [r1] str r0, [r1, #0x3a0] bl sub_02041094 - ldr r2, _0238C4E4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238C4E4 ; =LINK_SHOP_PTR mov ip, #0x400 ldr r1, [r2] mov r3, #0x1e @@ -2712,7 +2712,7 @@ ov18_0238C4A0: ; 0x0238C4A0 str r3, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238C4E4: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C4E4: .word LINK_SHOP_PTR arm_func_end ov18_0238C4A0 arm_func_start ov18_0238C4E8 @@ -2728,7 +2728,7 @@ ov18_0238C4E8: ; 0x0238C4E8 arm_func_start ov18_0238C504 ov18_0238C504: ; 0x0238C504 - ldr r0, _0238C524 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C524 ; =LINK_SHOP_PTR mov r3, #0xa00 ldr r2, [r0] mov r1, #0x20 @@ -2737,13 +2737,13 @@ ov18_0238C504: ; 0x0238C504 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C524: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C524: .word LINK_SHOP_PTR arm_func_end ov18_0238C504 arm_func_start ov18_0238C528 ov18_0238C528: ; 0x0238C528 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _0238C714 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C714 ; =LINK_SHOP_PTR mov r4, #0 ldr r0, [r0] ldrsb r0, [r0, #0xa] @@ -2751,7 +2751,7 @@ ov18_0238C528: ; 0x0238C528 cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} bl sub_02041094 - ldr r1, _0238C714 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238C714 ; =LINK_SHOP_PTR mov r5, r0 ldr r0, [r1] ldrsb r0, [r0, #0xa] @@ -2871,7 +2871,7 @@ _0238C6E0: _0238C6E4: cmp r4, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0238C714 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C714 ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #8] @@ -2883,7 +2883,7 @@ _0238C708: bl ov18_0238BE28 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238C714: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C714: .word LINK_SHOP_PTR _0238C718: .word 0x00003F07 _0238C71C: .word 0x00001308 arm_func_end ov18_0238C528 @@ -2894,7 +2894,7 @@ ov18_0238C720: ; 0x0238C720 bl sub_02041094 mov r4, r0 bl sub_02041154 - ldr r1, _0238C788 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238C788 ; =LINK_SHOP_PTR cmp r4, #0 ldr r1, [r1] str r0, [r1, #0x24] @@ -2919,12 +2919,12 @@ _0238C77C: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C788: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C788: .word LINK_SHOP_PTR arm_func_end ov18_0238C720 arm_func_start ov18_0238C78C ov18_0238C78C: ; 0x0238C78C - ldr r0, _0238C7AC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C7AC ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x23 @@ -2933,7 +2933,7 @@ ov18_0238C78C: ; 0x0238C78C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C7AC: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C7AC: .word LINK_SHOP_PTR arm_func_end ov18_0238C78C arm_func_start ov18_0238C7B0 @@ -2947,7 +2947,7 @@ _0238C7BC: .word ov18_0238BE28 arm_func_start ov18_0238C7C0 ov18_0238C7C0: ; 0x0238C7C0 - ldr r0, _0238C7E0 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C7E0 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x25 @@ -2956,12 +2956,12 @@ ov18_0238C7C0: ; 0x0238C7C0 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C7E0: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C7E0: .word LINK_SHOP_PTR arm_func_end ov18_0238C7C0 arm_func_start ov18_0238C7E4 ov18_0238C7E4: ; 0x0238C7E4 - ldr r0, _0238C804 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C804 ; =LINK_SHOP_PTR mov r3, #0x43 ldr r2, [r0] mov r1, #0x26 @@ -2970,20 +2970,20 @@ ov18_0238C7E4: ; 0x0238C7E4 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C804: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C804: .word LINK_SHOP_PTR arm_func_end ov18_0238C7E4 arm_func_start ov18_0238C808 ov18_0238C808: ; 0x0238C808 stmdb sp!, {r4, lr} - ldr r0, _0238C884 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C884 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #6] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238C884 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238C884 ; =LINK_SHOP_PTR mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -2996,7 +2996,7 @@ ov18_0238C808: ; 0x0238C808 _0238C850: mov r0, r4 bl sub_02041484 - ldr r0, _0238C884 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C884 ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -3009,12 +3009,12 @@ _0238C878: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C884: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C884: .word LINK_SHOP_PTR arm_func_end ov18_0238C808 arm_func_start ov18_0238C888 ov18_0238C888: ; 0x0238C888 - ldr r0, _0238C8A8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C8A8 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x28 @@ -3023,12 +3023,12 @@ ov18_0238C888: ; 0x0238C888 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C8A8: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C8A8: .word LINK_SHOP_PTR arm_func_end ov18_0238C888 arm_func_start ov18_0238C8AC ov18_0238C8AC: ; 0x0238C8AC - ldr r0, _0238C8CC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C8CC ; =LINK_SHOP_PTR mov r3, #0x43 ldr r2, [r0] mov r1, #0x29 @@ -3037,20 +3037,20 @@ ov18_0238C8AC: ; 0x0238C8AC str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C8CC: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C8CC: .word LINK_SHOP_PTR arm_func_end ov18_0238C8AC arm_func_start ov18_0238C8D0 ov18_0238C8D0: ; 0x0238C8D0 stmdb sp!, {r4, lr} - ldr r0, _0238C94C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C94C ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #6] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238C94C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238C94C ; =LINK_SHOP_PTR mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -3063,7 +3063,7 @@ ov18_0238C8D0: ; 0x0238C8D0 _0238C918: mov r0, r4 bl sub_02041484 - ldr r0, _0238C94C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C94C ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -3076,12 +3076,12 @@ _0238C940: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238C94C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C94C: .word LINK_SHOP_PTR arm_func_end ov18_0238C8D0 arm_func_start ov18_0238C950 ov18_0238C950: ; 0x0238C950 - ldr r0, _0238C970 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C970 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x2b @@ -3090,7 +3090,7 @@ ov18_0238C950: ; 0x0238C950 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C970: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C970: .word LINK_SHOP_PTR arm_func_end ov18_0238C950 arm_func_start ov18_0238C974 @@ -3104,7 +3104,7 @@ _0238C980: .word ov18_0238BE28 arm_func_start ov18_0238C984 ov18_0238C984: ; 0x0238C984 - ldr r0, _0238C9A4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238C9A4 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x2d @@ -3113,7 +3113,7 @@ ov18_0238C984: ; 0x0238C984 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238C9A4: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238C9A4: .word LINK_SHOP_PTR arm_func_end ov18_0238C984 arm_func_start ov18_0238C9A8 @@ -3130,33 +3130,33 @@ ov18_0238C9B8: ; 0x0238C9B8 stmdb sp!, {r3, lr} bl sub_0204159C cmp r0, #0 - ldreq r0, _0238CA14 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldreq r0, _0238CA14 ; =LINK_SHOP_PTR moveq r1, #0x2f ldreq r0, [r0] streq r1, [r0, #0x80] ldmeqia sp!, {r3, pc} - ldr r0, _0238CA14 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CA14 ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl ov18_0238ABB0 cmp r0, #0 - ldrle r0, _0238CA14 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldrle r0, _0238CA14 ; =LINK_SHOP_PTR movle r1, #0x31 ldrle r0, [r0] strle r1, [r0, #0x80] - ldrgt r0, _0238CA14 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldrgt r0, _0238CA14 ; =LINK_SHOP_PTR movgt r1, #0x33 ldrgt r0, [r0] strgt r1, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238CA14: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CA14: .word LINK_SHOP_PTR arm_func_end ov18_0238C9B8 arm_func_start ov18_0238CA18 ov18_0238CA18: ; 0x0238CA18 - ldr r0, _0238CA38 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CA38 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x30 @@ -3165,7 +3165,7 @@ ov18_0238CA18: ; 0x0238CA18 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CA38: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CA38: .word LINK_SHOP_PTR arm_func_end ov18_0238CA18 arm_func_start ov18_0238CA3C @@ -3179,7 +3179,7 @@ _0238CA48: .word ov18_0238BE28 arm_func_start ov18_0238CA4C ov18_0238CA4C: ; 0x0238CA4C - ldr r0, _0238CA6C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CA6C ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x32 @@ -3188,7 +3188,7 @@ ov18_0238CA4C: ; 0x0238CA4C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CA6C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CA6C: .word LINK_SHOP_PTR arm_func_end ov18_0238CA4C arm_func_start ov18_0238CA70 @@ -3202,7 +3202,7 @@ _0238CA7C: .word ov18_0238BE28 arm_func_start ov18_0238CA80 ov18_0238CA80: ; 0x0238CA80 - ldr r0, _0238CAAC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CAAC ; =LINK_SHOP_PTR mov r2, #3 ldr r1, [r0] mov r3, #0 @@ -3214,12 +3214,12 @@ ov18_0238CA80: ; 0x0238CA80 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CAAC: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CAAC: .word LINK_SHOP_PTR arm_func_end ov18_0238CA80 arm_func_start ov18_0238CAB0 ov18_0238CAB0: ; 0x0238CAB0 - ldr r0, _0238CAD0 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CAD0 ; =LINK_SHOP_PTR mov r3, #0x1000 ldr r2, [r0] mov r1, #0x35 @@ -3228,7 +3228,7 @@ ov18_0238CAB0: ; 0x0238CAB0 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CAD0: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CAD0: .word LINK_SHOP_PTR arm_func_end ov18_0238CAB0 arm_func_start ov18_0238CAD4 @@ -3238,11 +3238,11 @@ ov18_0238CAD4: ; 0x0238CAD4 add r1, sp, #0 mov r0, #0 bl GetPressedButtons - ldr r0, _0238CBD8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CBD8 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xb] bl GetAdvancedMenuCurrentOption - ldr r1, _0238CBD8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238CBD8 ; =LINK_SHOP_PTR ldr r2, [r1] strh r0, [r2, #0x8c] ldrh r0, [sp] @@ -3252,13 +3252,13 @@ ov18_0238CAD4: ; 0x0238CAD4 ldrsb r0, [r1, #0xb] ldrsh r4, [r1, #0x8c] bl sub_0202C1E4 - ldr r0, _0238CBD8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CBD8 ; =LINK_SHOP_PTR mov r1, r4 ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl ov18_0238ADA8 - ldr r2, _0238CBD8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238CBD8 ; =LINK_SHOP_PTR mov lr, #0 ldr r1, [r2] mov ip, #1 @@ -3285,7 +3285,7 @@ _0238CB8C: bl IsAdvancedMenuActive2 cmp r0, #0 bne _0238CBD0 - ldr r0, _0238CBD8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CBD8 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xb] bl GetAdvancedMenuResult @@ -3302,12 +3302,12 @@ _0238CBD0: add sp, sp, #4 ldmia sp!, {r3, r4, pc} .align 2, 0 -_0238CBD8: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CBD8: .word LINK_SHOP_PTR arm_func_end ov18_0238CAD4 arm_func_start ov18_0238CBDC ov18_0238CBDC: ; 0x0238CBDC - ldr r0, _0238CBFC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CBFC ; =LINK_SHOP_PTR mov r3, #0x3000 ldr r2, [r0] mov r1, #0x37 @@ -3316,24 +3316,24 @@ ov18_0238CBDC: ; 0x0238CBDC str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CBFC: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CBFC: .word LINK_SHOP_PTR arm_func_end ov18_0238CBDC arm_func_start ov18_0238CC00 ov18_0238CC00: ; 0x0238CC00 stmdb sp!, {r4, lr} - ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CD84 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xb] bl GetAdvancedMenuResult - ldr r1, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238CD84 ; =LINK_SHOP_PTR mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #0xc] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CD84 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xc] bl GetSimpleMenuResult__0202B870 @@ -3353,14 +3353,14 @@ _0238CC50: ; jump table b _0238CD5C ; case 8 b _0238CC78 ; case 9 _0238CC78: - ldr r1, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238CD84 ; =LINK_SHOP_PTR mov r0, r4, lsl #0x10 ldr r2, [r1] mov r1, r0, asr #0x10 add r0, r2, #0x300 ldrsh r0, [r0, #0x8c] bl ov18_0238ADA8 - ldr r1, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238CD84 ; =LINK_SHOP_PTR mov r4, r0 ldr r0, [r1] str r4, [r0, #0x24] @@ -3369,14 +3369,14 @@ _0238CC78: mov r0, r4 beq _0238CCCC bl sub_0203FD14 - ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CD84 ; =LINK_SHOP_PTR mov r1, #0x3c ldr r0, [r0] str r1, [r0, #0x80] ldmia sp!, {r4, pc} _0238CCCC: bl sub_02041614 - ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CD84 ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -3385,14 +3385,14 @@ _0238CCCC: bl ov18_0238BE28 ldmia sp!, {r4, pc} _0238CCF0: - ldr r1, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238CD84 ; =LINK_SHOP_PTR mov r0, r4, lsl #0x10 ldr r2, [r1] mov r1, r0, asr #0x10 add r0, r2, #0x300 ldrsh r0, [r0, #0x8c] bl ov18_0238ADA8 - ldr r2, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238CD84 ; =LINK_SHOP_PTR mov r4, #0 ldr r1, [r2] mov r3, #1 @@ -3413,7 +3413,7 @@ _0238CCF0: bl ov18_0238BE28 ldmia sp!, {r4, pc} _0238CD5C: - ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CD84 ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0xb] @@ -3425,12 +3425,12 @@ _0238CD78: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238CD84: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CD84: .word LINK_SHOP_PTR arm_func_end ov18_0238CC00 arm_func_start ov18_0238CD88 ov18_0238CD88: ; 0x0238CD88 - ldr r0, _0238CDA8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CDA8 ; =LINK_SHOP_PTR mov r3, #0x400 ldr r2, [r0] mov r1, #0x39 @@ -3439,7 +3439,7 @@ ov18_0238CD88: ; 0x0238CD88 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CDA8: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CDA8: .word LINK_SHOP_PTR arm_func_end ov18_0238CD88 arm_func_start ov18_0238CDAC @@ -3455,7 +3455,7 @@ ov18_0238CDAC: ; 0x0238CDAC arm_func_start ov18_0238CDC8 ov18_0238CDC8: ; 0x0238CDC8 - ldr r0, _0238CDE8 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CDE8 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x3b @@ -3464,7 +3464,7 @@ ov18_0238CDC8: ; 0x0238CDC8 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CDE8: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CDE8: .word LINK_SHOP_PTR arm_func_end ov18_0238CDC8 arm_func_start ov18_0238CDEC @@ -3478,7 +3478,7 @@ _0238CDF8: .word ov18_0238BE28 arm_func_start ov18_0238CDFC ov18_0238CDFC: ; 0x0238CDFC - ldr r0, _0238CE1C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CE1C ; =LINK_SHOP_PTR mov r3, #0x14000 ldr r2, [r0] mov r1, #0x3d @@ -3487,7 +3487,7 @@ ov18_0238CDFC: ; 0x0238CDFC str r1, [r0, #0x80] bx lr .align 2, 0 -_0238CE1C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CE1C: .word LINK_SHOP_PTR arm_func_end ov18_0238CDFC arm_func_start ov18_0238CE20 @@ -3496,7 +3496,7 @@ ov18_0238CE20: ; 0x0238CE20 bl sub_020407EC movs r4, r0 beq _0238CE44 - ldr r0, _0238CE84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CE84 ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] @@ -3522,24 +3522,24 @@ _0238CE78: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238CE84: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CE84: .word LINK_SHOP_PTR arm_func_end ov18_0238CE20 arm_func_start ov18_0238CE88 ov18_0238CE88: ; 0x0238CE88 stmdb sp!, {r3, lr} - ldr r0, _0238CED4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CED4 ; =LINK_SHOP_PTR mov r1, #0xc000 ldr r0, [r0] str r1, [r0, #0x88] bl sub_02041094 bl sub_02041154 - ldr r1, _0238CED4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238CED4 ; =LINK_SHOP_PTR ldr r1, [r1] str r0, [r1, #0x24] mov r0, #4 bl sub_02041154 - ldr r1, _0238CED4 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238CED4 ; =LINK_SHOP_PTR mov r2, #0x3f ldr r3, [r1] str r0, [r3, #0x28] @@ -3547,21 +3547,21 @@ ov18_0238CE88: ; 0x0238CE88 str r2, [r0, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_0238CED4: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CED4: .word LINK_SHOP_PTR arm_func_end ov18_0238CE88 arm_func_start ov18_0238CED8 ov18_0238CED8: ; 0x0238CED8 stmdb sp!, {r3, lr} bl sub_02041094 - ldr r0, _0238CF94 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CF94 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xe] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} bl sub_0203FD38 - ldr r0, _0238CF94 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CF94 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #0xe] bl GetSimpleMenuResult__0202B870 @@ -3594,7 +3594,7 @@ _0238CF60: bl ov18_0238BE28 ldmia sp!, {r3, pc} _0238CF6C: - ldr r0, _0238CF94 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238CF94 ; =LINK_SHOP_PTR mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0xb] @@ -3606,7 +3606,7 @@ _0238CF88: bl ov18_0238BE28 ldmia sp!, {r3, pc} .align 2, 0 -_0238CF94: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238CF94: .word LINK_SHOP_PTR arm_func_end ov18_0238CED8 arm_func_start ov18_0238CF98 @@ -3618,14 +3618,14 @@ ov18_0238CF98: ; 0x0238CF98 cmp r0, #4 blt _0238CFF0 bl sub_0203FD2C - ldr r2, _0238D030 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r2, _0238D030 ; =LINK_SHOP_PTR mov r1, r0 ldr r0, [r2] mov r2, #8 add r0, r0, #0xa6 add r0, r0, #0x300 bl memcpy - ldr r0, _0238D030 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D030 ; =LINK_SHOP_PTR mov r2, #0 ldr r1, [r0] str r2, [r1, #0x3a0] @@ -3634,16 +3634,16 @@ ov18_0238CF98: ; 0x0238CF98 strh r2, [r0, #0xa4] b _0238D010 _0238CFF0: - ldr r0, _0238D030 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D030 ; =LINK_SHOP_PTR ldr r0, [r0] str r4, [r0, #0x3a0] bl sub_02041094 - ldr r1, _0238D030 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238D030 ; =LINK_SHOP_PTR ldr r1, [r1] add r1, r1, #0x300 strh r0, [r1, #0xa4] _0238D010: - ldr r0, _0238D030 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D030 ; =LINK_SHOP_PTR mov r3, #0x400 ldr r2, [r0] mov r1, #0x41 @@ -3652,7 +3652,7 @@ _0238D010: str r1, [r0, #0x80] ldmia sp!, {r4, pc} .align 2, 0 -_0238D030: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238D030: .word LINK_SHOP_PTR arm_func_end ov18_0238CF98 arm_func_start ov18_0238D034 @@ -3668,7 +3668,7 @@ ov18_0238D034: ; 0x0238D034 arm_func_start ov18_0238D050 ov18_0238D050: ; 0x0238D050 - ldr r0, _0238D070 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D070 ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x43 @@ -3677,12 +3677,12 @@ ov18_0238D050: ; 0x0238D050 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D070: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238D070: .word LINK_SHOP_PTR arm_func_end ov18_0238D050 arm_func_start ov18_0238D074 ov18_0238D074: ; 0x0238D074 - ldr r0, _0238D094 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D094 ; =LINK_SHOP_PTR mov r3, #0x43 ldr r2, [r0] mov r1, #0x44 @@ -3691,20 +3691,20 @@ ov18_0238D074: ; 0x0238D074 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D094: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238D094: .word LINK_SHOP_PTR arm_func_end ov18_0238D074 arm_func_start ov18_0238D098 ov18_0238D098: ; 0x0238D098 stmdb sp!, {r4, lr} - ldr r0, _0238D128 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D128 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #6] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238D128 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238D128 ; =LINK_SHOP_PTR mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -3720,12 +3720,12 @@ _0238D0E0: bl sub_0203FD2C ldrh r0, [r0, #4] bl sub_02041614 - ldr r0, _0238D128 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D128 ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl sub_0203FD80 - ldr r0, _0238D128 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D128 ; =LINK_SHOP_PTR mov r1, #0x48 ldr r0, [r0] str r1, [r0, #0x80] @@ -3735,12 +3735,12 @@ _0238D11C: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238D128: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238D128: .word LINK_SHOP_PTR arm_func_end ov18_0238D098 arm_func_start ov18_0238D12C ov18_0238D12C: ; 0x0238D12C - ldr r0, _0238D14C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D14C ; =LINK_SHOP_PTR mov r3, #3 ldr r2, [r0] mov r1, #0x46 @@ -3749,12 +3749,12 @@ ov18_0238D12C: ; 0x0238D12C str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D14C: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238D14C: .word LINK_SHOP_PTR arm_func_end ov18_0238D12C arm_func_start ov18_0238D150 ov18_0238D150: ; 0x0238D150 - ldr r0, _0238D170 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D170 ; =LINK_SHOP_PTR mov r3, #0x43 ldr r2, [r0] mov r1, #0x47 @@ -3763,20 +3763,20 @@ ov18_0238D150: ; 0x0238D150 str r1, [r0, #0x80] bx lr .align 2, 0 -_0238D170: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238D170: .word LINK_SHOP_PTR arm_func_end ov18_0238D150 arm_func_start ov18_0238D174 ov18_0238D174: ; 0x0238D174 stmdb sp!, {r4, lr} - ldr r0, _0238D204 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D204 ; =LINK_SHOP_PTR ldr r0, [r0] ldrsb r0, [r0, #6] bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 - ldr r1, _0238D204 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r1, _0238D204 ; =LINK_SHOP_PTR mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] @@ -3792,12 +3792,12 @@ _0238D1BC: bl sub_0203FD2C ldrh r0, [r0, #4] bl sub_02041614 - ldr r0, _0238D204 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D204 ; =LINK_SHOP_PTR ldr r0, [r0] add r0, r0, #0x300 ldrsh r0, [r0, #0x8c] bl sub_0203FD80 - ldr r0, _0238D204 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 + ldr r0, _0238D204 ; =LINK_SHOP_PTR mov r1, #0x4a ldr r0, [r0] str r1, [r0, #0x80] @@ -3807,7 +3807,7 @@ _0238D1F8: bl ov18_0238BE28 ldmia sp!, {r4, pc} .align 2, 0 -_0238D204: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 +_0238D204: .word LINK_SHOP_PTR arm_func_end ov18_0238D174 ; 0x0238D208 @@ -3816,7 +3816,7 @@ _0238D204: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 ov18_0238D208: .byte 0x18, 0x00, 0x9F, 0xE5, 0x03, 0x30, 0xA0, 0xE3, 0x00, 0x20, 0x90, 0xE5, 0x49, 0x10, 0xA0, 0xE3 .byte 0x88, 0x30, 0x82, 0xE5, 0x00, 0x00, 0x90, 0xE5, 0x80, 0x10, 0x80, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1 - .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 + .word LINK_SHOP_PTR .global ov18_0238D22C ov18_0238D22C: .byte 0x04, 0xC0, 0x9F, 0xE5, 0x11, 0x00, 0xA0, 0xE3, 0x1C, 0xFF, 0x2F, 0xE1 @@ -3826,7 +3826,7 @@ ov18_0238D23C: .byte 0x18, 0x00, 0x9F, 0xE5, 0x03, 0x30, 0xA0, 0xE3, 0x00, 0x20, 0x90, 0xE5 .byte 0x4B, 0x10, 0xA0, 0xE3, 0x88, 0x30, 0x82, 0xE5, 0x00, 0x00, 0x90, 0xE5, 0x80, 0x10, 0x80, 0xE5 .byte 0x1E, 0xFF, 0x2F, 0xE1 - .word OVERLAY18_UNKNOWN_POINTER__NA_238D620 + .word LINK_SHOP_PTR .global ov18_0238D260 ov18_0238D260: .byte 0x04, 0xC0, 0x9F, 0xE5, 0x11, 0x00, 0xA0, 0xE3 @@ -4080,6 +4080,6 @@ ov18_0238D608: .byte 0x52, 0x5D, 0x00, 0x00 .data - .global OVERLAY18_UNKNOWN_POINTER__NA_238D620 -OVERLAY18_UNKNOWN_POINTER__NA_238D620: + .global LINK_SHOP_PTR +LINK_SHOP_PTR: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00