Merge pull request #263 from AnonymousRandomPerson/main

Synced from pmdsky-debug
2026-08-27 21:25:43 -05:00 · 2026-05-12 20:09:47 -04:00
parent 9e365e5e90 4551f5801f
commit 3bd5c15782
75 changed files with 714 additions and 701 deletions
--- a/asm/include/itcm.inc
+++ b/asm/include/itcm.inc
@@ -10,6 +10,9 @@
 .public _022A88FC
 .public _022B966C
 .public _022B99D0
+.public DC_InvalidateAll
+.public DC_StoreAll
+.public DC_WaitWriteBufferEmpty
 .public DTCM_BSS
 .public EnableIrqFlag
 .public G3_MultMtx43
@@ -17,6 +20,7 @@
 .public GeomSetVertexCoord16
 .public GetAllBaseForms
 .public GetWindow
+.public IC_InvalidateAll
 .public MI_CpuCopy8
 .public MI_CpuFill8
 .public MONSTER_DATA_TABLE_PTR
@@ -30,10 +34,6 @@
 .public sub_0201BD80
 .public sub_0202760C
 .public sub_0202796C_JP
-.public DC_InvalidateAll
-.public DC_StoreAll
-.public DC_WaitWriteBufferEmpty
-.public IC_InvalidateAll
 .public sub_02080EF0
 .public sub_02080F30
 .public TRIG_TABLE
--- a/asm/include/main_020022C4.inc
+++ b/asm/include/main_020022C4.inc
@@ -20,6 +20,7 @@
 .public MemAlloc
 .public OS_GetLockID
 .public OS_InitMutex
+.public OS_ResetSystem
 .public OS_SleepThread
 .public OS_WakeupThreadDirect
 .public Rand16Bit
@@ -36,7 +37,6 @@
 .public sub_0207A048
 .public sub_0207A0CC
 .public sub_0207A164
-.public OS_ResetSystem
 .public sub_02083434
 .public sub_02083450
 .public sub_0208346C
--- a/asm/include/main_02003DB8.inc
+++ b/asm/include/main_02003DB8.inc
@@ -61,6 +61,7 @@
 .public GX_EndLoadOBJExtPltt
 .public GXS_BeginLoadBGExtPltt
 .public GXS_EndLoadBGExtPltt
+.public IC_InvalidateAll
 .public InitOverlay
 .public LOADED_OVERLAY_GROUP_0
 .public LoadOverlayInternal
@@ -101,7 +102,6 @@
 .public sub_0200B76C
 .public sub_020184A8
 .public sub_02078900
-.public IC_InvalidateAll
 .public sub_0207BE6C
 .public sub_0207BF04
 .public sub_0207BFA4
--- a/asm/include/main_02008BF4.inc
+++ b/asm/include/main_02008BF4.inc
@@ -1,17 +1,4 @@
 #pragma once
-.public MTi_CpuClearFast
-.public Debug_Print0
-.public G3X_ClearFifo
-.public G3X_Init
-.public GX_DisableBankForLCDC
-.public GX_DispOff
-.public GX_DispOn
-.public GX_Init
-.public GX_SetBankForLCDC
-.public GXi_DmaId
-.public GXx_SetMasterBrightness_
-.public MemZero16
-.public MemZero32
 .public _02092A18
 .public _02092A38
 .public _02092A58
@@ -59,6 +46,19 @@
 .public _022A3804
 .public _022A3805
 .public _022A3806
+.public Debug_Print0
+.public G3X_ClearFifo
+.public G3X_Init
+.public GX_DisableBankForLCDC
+.public GX_DispOff
+.public GX_DispOn
+.public GX_Init
+.public GX_SetBankForLCDC
+.public GXi_DmaId
+.public GXx_SetMasterBrightness_
+.public MemZero16
+.public MemZero32
+.public MTi_CpuClearFast
 .public sub_0200844C
 .public sub_0200846C
 .public sub_02008980
--- a/asm/include/main_02009648.inc
+++ b/asm/include/main_02009648.inc
@@ -1,7 +1,6 @@
 #pragma once
 .public G2x_SetBlendAlpha_
 .public G3X_SetClearColor
-.public GXS_SetGraphicsMode
 .public GX_SetBankForBG
 .public GX_SetBankForBGExtPltt
 .public GX_SetBankForOBJ
@@ -12,6 +11,7 @@
 .public GX_SetBankForTex
 .public GX_SetBankForTexPltt
 .public GX_SetGraphicsMode
+.public GXS_SetGraphicsMode
 .public sub_02009120
 .public sub_020091CC
 .public sub_020091F8
--- a/asm/include/main_0200A124.inc
+++ b/asm/include/main_0200A124.inc
@@ -1,20 +1,20 @@
 #pragma once
-.public DC_FlushRange
-.public GXS_BeginLoadBGExtPltt
-.public GXS_BeginLoadOBJExtPltt
-.public GXS_EndLoadBGExtPltt
-.public GXS_EndLoadOBJExtPltt
-.public GX_BeginLoadBGExtPltt
-.public GX_BeginLoadOBJExtPltt
-.public GX_EndLoadBGExtPltt
-.public GX_EndLoadOBJExtPltt
-.public MemAlloc
-.public MemFree
-.public Memcpy32
-.public Rgb8ToRgb5
 .public _0200A314
 .public _0200A344
 .public _02092AD8
 .public _s32_div_f
+.public DC_FlushRange
+.public GX_BeginLoadBGExtPltt
+.public GX_BeginLoadOBJExtPltt
+.public GX_EndLoadBGExtPltt
+.public GX_EndLoadOBJExtPltt
+.public GXS_BeginLoadBGExtPltt
+.public GXS_BeginLoadOBJExtPltt
+.public GXS_EndLoadBGExtPltt
+.public GXS_EndLoadOBJExtPltt
+.public MemAlloc
+.public Memcpy32
+.public MemFree
+.public Rgb8ToRgb5
 .public sub_02004FF8
 .public sub_0200B3D4
--- a/asm/include/main_0200B33C.inc
+++ b/asm/include/main_0200B33C.inc
@@ -1,9 +1,15 @@
 #pragma once
-.public MTi_CpuClearFast
+.public _0200A314
+.public _0200A344
+.public _02094AE8
+.public _02094AF0
+.public _020AFF38_EU
+.public _020AFF3C_EU
+.public _s32_div_f
 .public CART_REMOVED_IMG_DATA
 .public DC_FlushRange
 .public DecompressAtFromMemoryPointer
-.public GXS_SetGraphicsMode
+.public GetLanguage
 .public GX_DisableBankForBG
 .public GX_DisableBankForBGExtPltt
 .public GX_DisableBankForOBJ
@@ -17,23 +23,17 @@
 .public GX_DispOn
 .public GX_SetBankForLCDC
 .public GX_SetGraphicsMode
+.public GXS_SetGraphicsMode
 .public GXx_SetMasterBrightness_
-.public GetLanguage
 .public LoadFileFromRom
-.public MI_StopDma
 .public MemAlloc
 .public Memcpy32
 .public MemcpySimple
-.public UnloadFile
-.public _0200A314
-.public _0200A344
-.public _02094AE8
-.public _02094AF0
-.public _020AFF38_EU
-.public _020AFF3C_EU
-.public _s32_div_f
+.public MI_StopDma
+.public MTi_CpuClearFast
 .public sub_02005D30
 .public sub_02005E10
 .public sub_0200A2CC
 .public sub_0200A2F4
 .public sub_02019304
+.public UnloadFile
--- a/asm/include/main_0200BC60.inc
+++ b/asm/include/main_0200BC60.inc
@@ -1,3 +1,3 @@
 #pragma once
-.public UpdateFadeStatus
 .public sub_0200B928
+.public UpdateFadeStatus
--- a/asm/include/main_02013C30.inc
+++ b/asm/include/main_02013C30.inc
@@ -1,6 +1,6 @@
 #pragma once
+.public _s32_div_f
 .public DUNGEON_MOVE_TABLES
 .public GetInfoMoveGround
-.public RECOIL_MOVE_LIST
 .public Rand16Bit
-.public _s32_div_f
+.public RECOIL_MOVE_LIST
--- a/asm/include/main_02014D18.inc
+++ b/asm/include/main_02014D18.inc
@@ -262,8 +262,6 @@
 .public _022A5970
 .public _s32_div_f
 .public _u32_div_f
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AUDIO_COMMANDS_BUFFER
 .public BagHasExclusiveItemTypeForMonster
 .public CopyAndInterleave
@@ -370,6 +368,8 @@
 .public MemZero32
 .public MOVE_ACCURACY_STARS_TABLE
 .public MOVE_POWER_STARS_TABLE
+.public MTi_CpuClear32
+.public MTi_CpuCopy32
 .public MultiplyByFixedPoint
 .public NewRender3dQuadrilateral
 .public NewRender3dRectangle
@@ -385,6 +385,7 @@
 .public RENDER_3D_FUNCTIONS_64
 .public ResumeBgm
 .public Rgb8ToRgb5
+.public SND_Init
 .public sprintf
 .public strcat
 .public strcmp
@@ -467,7 +468,6 @@
 .public sub_0206F5C8
 .public sub_0207C9C4
 .public sub_0207C9E4
-.public SND_Init
 .public TEAM_MEMBER_TABLE_PTR
 .public UnloadFile
 .public vsprintf
--- a/asm/include/main_0202676C.inc
+++ b/asm/include/main_0202676C.inc
@@ -1,26 +1,4 @@
 #pragma once
-.public CURSOR_16_ANIMATION_CONTROL
-.public CURSOR_16_SPRITE_ID
-.public CURSOR_ANIMATION_CONTROL
-.public DecompressAtHalf
-.public DelayWteFree
-.public GetPageItemYOffset
-.public InitAnimationControlWithSet__0201C0B0
-.public InitRender3dElement64
-.public LoadAlert
-.public LoadFileFromRom
-.public LoadWanTableEntry
-.public LoadWteFromRom
-.public MENU_CONTROL_PTR
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public Memcpy32
-.public SetAnimationForAnimationControl
-.public SetSpriteIdForAnimationControl
-.public UnloadFile
-.public WAN_TABLE
-.public WINDOW_LIST
 .public _0209AC4C
 .public _0209AC50
 .public _0209AC54
@@ -70,7 +48,26 @@
 .public _022A9A5C
 .public _022AA35C
 .public _022AAC68
+.public CURSOR_16_ANIMATION_CONTROL
+.public CURSOR_16_SPRITE_ID
+.public CURSOR_ANIMATION_CONTROL
+.public DecompressAtHalf
+.public DelayWteFree
+.public GetPageItemYOffset
+.public InitAnimationControlWithSet__0201C0B0
+.public InitRender3dElement64
+.public LoadAlert
+.public LoadFileFromRom
+.public LoadWanTableEntry
+.public LoadWteFromRom
+.public MemAlloc
+.public Memcpy32
+.public MemFree
 .public memset
+.public MemZero
+.public MENU_CONTROL_PTR
+.public SetAnimationForAnimationControl
+.public SetSpriteIdForAnimationControl
 .public sub_0200302C
 .public sub_020030FC
 .public sub_0200A124
@@ -100,3 +97,6 @@
 .public sub_02033350
 .public sub_02033390
 .public sub_020333B4
+.public UnloadFile
+.public WAN_TABLE
+.public WINDOW_LIST
--- a/asm/include/main_02029A68.inc
+++ b/asm/include/main_02029A68.inc
@@ -1,4 +1,8 @@
 #pragma once
+.public _0209AE20
+.public _020AFDA0
+.public _020AFDA8
+.public _022AAC68
 .public ALERT_ANIMATION_CONTROL
 .public ALERT_SPRITE_ID
 .public CURSOR_16_ANIMATION_CONTROL
@@ -10,11 +14,6 @@
 .public MemAlloc
 .public SetAnimationForAnimationControl
 .public SetSpriteIdForAnimationControl
-.public WAN_TABLE
-.public _0209AE20
-.public _020AFDA0
-.public _020AFDA8
-.public _022AAC68
 .public sub_0201C028
 .public sub_0201CF5C
 .public sub_02025D90
@@ -23,3 +22,4 @@
 .public sub_020335A8
 .public sub_02033BC0
 .public sub_02034360
+.public WAN_TABLE
--- a/asm/include/main_0202A3E4.inc
+++ b/asm/include/main_0202A3E4.inc
@@ -1,53 +1,4 @@
 #pragma once
-.public ADVANCED_MENU_DEFAULT_WINDOW_PARAMS
-.public ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS
-.public ALERT_BOX_DEFAULT_WINDOW_PARAMS
-.public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS
-.public AnalyzeText
-.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
-.public CONTROLS_CHART_DEFAULT_WINDOW_PARAMS
-.public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
-.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
-.public DeleteWindow
-.public DrawTextInWindow
-.public FileClose
-.public FileRom_HandleOpen
-.public FileRom_HandleRead
-.public FileRom_HandleSeek
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
-.public FileRom_Veneer_FileInit
-.public GetHeldButtons
-.public GetPressedButtons
-.public GetReleasedStylus
-.public GetStringFromFileVeneer
-.public GetWindow
-.public GetWindowContents
-.public GetWindowRectangle
-.public InitPortraitParams
-.public InitPreprocessorArgs
-.public IsTouchScreenNotOff
-.public IsValidPortrait
-.public KeyWaitInit
-.public LoadPortrait
-.public MemAlloc
-.public MemFree
-.public MemZero
-.public MemcpySimple
-.public NULL_OVERLAY_LOAD_ENTRY
-.public NewWindowScreenCheck
-.public OPTIONS_MENU_DEFAULT_WINDOW_PARAMS
-.public PARENT_MENU_DEFAULT_WINDOW_PARAMS
-.public PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS
-.public PlaySeVolumeWrapper
-.public PreprocessString
-.public PreprocessStringFromId
-.public SCROLL_BOX_DEFAULT_WINDOW_PARAMS
-.public SIMPLE_MENU_DEFAULT_WINDOW_PARAMS
-.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS
-.public TEXT_BOX_DEFAULT_WINDOW_PARAMS
-.public UnloadOverlay
-.public UpdateWindow
 .public _0209AE34
 .public _0209AE44
 .public _0209AEE0
@@ -82,6 +33,51 @@
 .public _020AFDAC
 .public _020AFDB8
 .public _s32_div_f
+.public ADVANCED_MENU_DEFAULT_WINDOW_PARAMS
+.public ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS
+.public ALERT_BOX_DEFAULT_WINDOW_PARAMS
+.public AnalyzeText
+.public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS
+.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
+.public CONTROLS_CHART_DEFAULT_WINDOW_PARAMS
+.public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
+.public DeleteWindow
+.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
+.public DrawTextInWindow
+.public FileClose
+.public FileRom_HandleOpen
+.public FileRom_HandleRead
+.public FileRom_HandleSeek
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
+.public GetHeldButtons
+.public GetPressedButtons
+.public GetReleasedStylus
+.public GetStringFromFileVeneer
+.public GetWindow
+.public GetWindowContents
+.public GetWindowRectangle
+.public InitPortraitParams
+.public InitPreprocessorArgs
+.public IsTouchScreenNotOff
+.public IsValidPortrait
+.public KeyWaitInit
+.public LoadPortrait
+.public MemAlloc
+.public MemcpySimple
+.public MemFree
+.public MemZero
+.public NewWindowScreenCheck
+.public NULL_OVERLAY_LOAD_ENTRY
+.public OPTIONS_MENU_DEFAULT_WINDOW_PARAMS
+.public PARENT_MENU_DEFAULT_WINDOW_PARAMS
+.public PlaySeVolumeWrapper
+.public PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS
+.public PreprocessString
+.public PreprocessStringFromId
+.public SCROLL_BOX_DEFAULT_WINDOW_PARAMS
+.public SIMPLE_MENU_DEFAULT_WINDOW_PARAMS
 .public strcpy
 .public sub_01FF9128
 .public sub_01FF929C
@@ -136,3 +132,7 @@
 .public sub_0203C984
 .public sub_020469BC
 .public sub_02048240
+.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS
+.public TEXT_BOX_DEFAULT_WINDOW_PARAMS
+.public UnloadOverlay
+.public UpdateWindow
--- a/asm/include/main_0203C774.inc
+++ b/asm/include/main_0203C774.inc
@@ -317,6 +317,7 @@
 .public NOTIFY_NOTE
 .public OPTIONS
 .public OS_GetLockID
+.public OS_GetMacAddress
 .public ov11_023061CC
 .public ov11_023061E4
 .public ov11_02306C64
@@ -514,7 +515,6 @@
 .public sub_0205FC20
 .public sub_0206637C
 .public sub_02079094
-.public OS_GetMacAddress
 .public sub_0208346C
 .public sub_0208347C
 .public sub_02083A18
--- a/asm/include/main_0204FE58.inc
+++ b/asm/include/main_0204FE58.inc
@@ -1,10 +1,10 @@
 #pragma once
 .public _0209E6BD
-.public _020A192C
 .public _022AB924
 .public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
 .public ADVENTURE_LOG_PTR
 .public ARM9_UNKNOWN_DATA__NA_209E6BC
+.public CONVERSION2_TYPE_TABLE
 .public Copy16BitsFrom
 .public Copy16BitsTo
 .public CopyNStringFromId
--- a/asm/include/main_020517F4.inc
+++ b/asm/include/main_020517F4.inc
@@ -1,10 +1,10 @@
 #pragma once
 .public _020B09B0
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public MemAlloc
 .public MemFree
 .public MemZero
+.public MTi_CpuClear32
+.public MTi_CpuCopy32
 .public RANK_UP_TABLE
 .public sub_0200302C
 .public sub_020030FC
--- a/asm/include/main_0206A878.inc
+++ b/asm/include/main_0206A878.inc
@@ -52,6 +52,9 @@
 .public MemFree
 .public MemZero
 .public MultiplyByFixedPoint
+.public OS_InitAlarm
+.public OS_InitTick
+.public OS_SetTick
 .public ov10_022C2340
 .public ov10_022C23B0
 .public ov10_022C23EC
@@ -91,7 +94,4 @@
 .public sub_020756E8
 .public sub_0207A7EC
 .public sub_0207A8F4
-.public OS_InitTick
-.public OS_SetTick
-.public OS_InitAlarm
 .public WAN_TABLE
--- a/asm/include/main_0206C9BC.inc
+++ b/asm/include/main_0206C9BC.inc
@@ -26,8 +26,8 @@
 .public _fmul
 .public _s32_div_f
 .public _u32_div_f
-.public MTi_CpuClearFast
 .public DC_FlushRange
+.public DC_WaitWriteBufferEmpty
 .public DRIVER_WORK
 .public Dse_SetError
 .public Dse_SetError2
@@ -56,6 +56,7 @@
 .public DseVoice_UpdateHardware
 .public DseVoice_UpdateParameters
 .public FileInit
+.public MTi_CpuClearFast
 .public OS_GetTickLo
 .public OS_SleepThread
 .public OS_WakeupThreadDirect
@@ -67,7 +68,6 @@
 .public sub_02072BB8
 .public sub_02079800
 .public sub_02079B14
-.public DC_WaitWriteBufferEmpty
 .public sub_0207C8B8
 .public sub_0207C8E0
 .public sub_0207C944
--- a/asm/include/main_02075600.inc
+++ b/asm/include/main_02075600.inc
@@ -34,17 +34,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -61,9 +55,15 @@
 .public GXi_VRamLockId
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public OS_InitReset
 .public OS_IRQTable
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
--- a/asm/include/main_0207F894.inc
+++ b/asm/include/main_0207F894.inc
@@ -47,26 +47,34 @@
 .public _022BCA74
 .public _f2d
 .public _ll_udiv
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
-.public MTi_CpuClearFast
 .public CopyAndInterleave
 .public DC_FlushAll
 .public DC_FlushRange
 .public DC_InvalidateRange
+.public DC_StoreRange
+.public DC_WaitWriteBufferEmpty
 .public EnableIrqFlag
 .public FileInit
 .public GetIrqFlag
+.public IC_InvalidateAll
+.public IC_InvalidateRange
 .public MI_CpuCopy8
 .public MI_CpuFill8
 .public MI_DmaCopy16
 .public MI_StopDma
 .public MIi_UncompressBackward
+.public MTi_CardDmaCopy32
+.public MTi_CpuClear32
+.public MTi_CpuClearFast
+.public MTi_CpuCopy32
 .public OS_DisableIrqMask
 .public OS_EnableIrqMask
+.public OS_GetDTCMAddress
 .public OS_GetLockID
 .public OS_InitMutex
+.public OS_IsTickAvailable
 .public OS_ResetRequestIrqMask
+.public OS_SetDPermissionsForProtectionRegion
 .public OS_SetIrqFunction
 .public OS_SetIrqMask
 .public OS_SleepThread
@@ -86,15 +94,7 @@
 .public sub_02079024
 .public sub_020798D8
 .public sub_02079A64
-.public DC_StoreRange
-.public DC_WaitWriteBufferEmpty
-.public IC_InvalidateAll
-.public IC_InvalidateRange
-.public OS_GetDTCMAddress
-.public OS_SetDPermissionsForProtectionRegion
-.public OS_IsTickAvailable
 .public sub_0207B854
-.public MTi_CardDmaCopy32
 .public sub_0207ED88
 .public sub_0207EDF4
 .public sub_0207EF2C
--- a/asm/include/overlay_00.inc
+++ b/asm/include/overlay_00.inc
@@ -20,16 +20,12 @@
 .public _start_AutoloadDoneCallback
 .public _u32_div_f
 .public abs
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuCopy32Fast
-.public MTi_CpuClear16
-.public MTi_CpuClear32
-.public MTi_CpuClearFast
 .public Crypto_RC4Encrypt
 .public CRYPTO_RC4Init
 .public DC_FlushRange
 .public DC_InvalidateRange
+.public DC_StoreRange
+.public DC_WaitWriteBufferEmpty
 .public Debug_GetDebugFlag
 .public EnableIrqFlag
 .public FileInit
@@ -38,6 +34,7 @@
 .public GetFadeStatus
 .public GetLanguage
 .public GetProcessorMode
+.public HandleFadesVeneer
 .public HandleMenus
 .public HardwareInterrupt
 .public InitMenu
@@ -48,15 +45,29 @@
 .public MemAlloc
 .public memcmp
 .public memcpy
-.public MI_CpuCopy8
 .public MemcpySimple
 .public MemFree
 .public memmove
 .public memset
-.public MI_CpuFill8
 .public MemZero
+.public MI_CpuCopy8
+.public MI_CpuFill8
 .public MI_DmaCopy16
+.public MTi_CpuClear16
+.public MTi_CpuClear32
+.public MTi_CpuClearFast
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
+.public MTi_CpuCopy32Fast
+.public OS_CreateAlarm
+.public OS_GetMacAddress
+.public OS_GetTick
+.public OS_InitAlarm
 .public OS_InitMutex
+.public OS_InitTick
+.public OS_IsAlarmAvailable
+.public OS_IsTickAvailable
+.public OS_SetAlarm
 .public OS_SleepThread
 .public OS_WakeupThreadDirect
 .public OSi_ReferSymbol
@@ -1067,7 +1078,6 @@
 .public sub_0200B8D4
 .public sub_0200BB60
 .public sub_0200BB74
-.public HandleFadesVeneer
 .public sub_0200BD14
 .public sub_02017A68
 .public sub_02017A80
@@ -1123,18 +1133,8 @@
 .public sub_0207A048
 .public sub_0207A0CC
 .public sub_0207A164
-.public DC_StoreRange
-.public DC_WaitWriteBufferEmpty
-.public OS_InitTick
-.public OS_IsTickAvailable
-.public OS_GetTick
-.public OS_InitAlarm
-.public OS_IsAlarmAvailable
-.public OS_CreateAlarm
-.public OS_SetAlarm
 .public sub_0207B1E8
 .public sub_0207B854
-.public OS_GetMacAddress
 .public sub_0207BB50
 .public sub_0207BC4C
 .public sub_0207EDB4
--- a/asm/include/overlay_01.inc
+++ b/asm/include/overlay_01.inc
@@ -5,7 +5,6 @@
 .public _u32_div_f
 .public _ull_mod
 .public AllocateTemp1024ByteBufferFromPool
-.public MTi_CpuCopy32
 .public BAG_ITEMS_PTR_MIRROR
 .public BitstreamDebug
 .public CardBackupError
@@ -112,6 +111,7 @@
 .public MemFree
 .public MemsetSimple
 .public MemZero
+.public MTi_CpuCopy32
 .public NoteSaveBase
 .public ov00_022BCA80
 .public ov00_022BCBAC
@@ -248,6 +248,7 @@
 .public PreprocessString
 .public PreprocessStringFromId
 .public PrintClearMark
+.public PrintSpecialEpisodeClearMark
 .public RandInt
 .public ResumeAdvancedMenu
 .public ResumeParentMenu
@@ -304,7 +305,6 @@
 .public sub_02029F88
 .public sub_02029FBC
 .public sub_0202A2A4
-.public sub_0202A40C
 .public sub_0202B0A4
 .public sub_0202BC28
 .public sub_0202BC60
--- a/asm/include/overlay_02.inc
+++ b/asm/include/overlay_02.inc
@@ -5,17 +5,12 @@
 .public _s32_div_f
 .public _u32_div_f
 .public _ull_mod
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuCopy32Fast
-.public MTi_CpuClear16
-.public MTi_CpuClear32
-.public MTi_CpuClearFast
 .public bind
 .public ClearIrqFlag
 .public CloseVeneer
 .public DC_FlushRange
 .public DC_InvalidateRange
+.public DC_StoreRange
 .public EnableIrqFlag
 .public FileInit
 .public FX_DivS32
@@ -82,15 +77,27 @@
 .public MemAlloc
 .public memcmp
 .public memcpy
-.public MI_CpuCopy8
 .public MemFree
 .public memset
+.public MI_CpuCopy8
 .public MI_CpuFill8
+.public MTi_CpuClear16
+.public MTi_CpuClear32
+.public MTi_CpuClearFast
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
+.public MTi_CpuCopy32Fast
+.public OS_CreateAlarm
 .public OS_DisableIrqMask
 .public OS_EnableIrqMask
 .public OS_GetLockID
+.public OS_GetMacAddress
+.public OS_GetTick
 .public OS_IRQTable
+.public OS_IsAlarmAvailable
+.public OS_IsTickAvailable
 .public OS_ResetRequestIrqMask
+.public OS_SetAlarm
 .public OS_SetIrqFunction
 .public OS_SetIrqMask
 .public OS_WakeupThreadDirect
@@ -133,7 +140,6 @@
 .public ov00_022C759C
 .public ov00_022C75D8
 .public ov00_022CEF10
-.public SOC_Startup
 .public ov00_022CF7E8
 .public ov00_022CF8F8
 .public ov00_022CF918
@@ -173,6 +179,8 @@
 .public recvfrom
 .public sendto
 .public SetIrqFlag
+.public SND_Init
+.public SOC_Startup
 .public socket
 .public StartThread
 .public strcpy
@@ -192,16 +200,9 @@
 .public sub_02079E74
 .public sub_0207A048
 .public sub_0207A0CC
-.public DC_StoreRange
-.public OS_IsTickAvailable
-.public OS_GetTick
-.public OS_IsAlarmAvailable
-.public OS_CreateAlarm
-.public OS_SetAlarm
 .public sub_0207B1E8
 .public sub_0207B854
 .public sub_0207B860
-.public OS_GetMacAddress
 .public sub_0207C650
 .public sub_0207C7DC
 .public sub_0207C7FC
@@ -217,7 +218,6 @@
 .public sub_0207CB14
 .public sub_0207CB34
 .public sub_0207CB54
-.public SND_Init
 .public sub_0207CD44
 .public sub_0207CF14
 .public sub_0207D0D0
--- a/asm/include/overlay_08.inc
+++ b/asm/include/overlay_08.inc
@@ -13,10 +13,11 @@
 .public GetPressedButtons
 .public InitPreprocessorArgs
 .public MemAlloc
-.public MI_CpuCopy8
 .public MemFree
-.public MI_CpuFill8
 .public MemZero
+.public MI_CpuCopy8
+.public MI_CpuFill8
+.public OS_GetMacAddress
 .public ov00_022BF2C4
 .public ov00_022BF640
 .public ov00_022BFB14
@@ -63,7 +64,6 @@
 .public sub_02046BE8
 .public sub_02046C78
 .public sub_02046D20
-.public OS_GetMacAddress
 .public sub_0207F6C4
 .public sub_0207F70C
 .public WaitForever2
--- a/asm/include/overlay_11.inc
+++ b/asm/include/overlay_11.inc
@@ -83,6 +83,7 @@
 .public GetTeamMember
 .public GetType
 .public GROUND_MEMORY_ARENA_1
+.public HandleFadesVeneer
 .public HandleMenus
 .public IncrementNbBigTreasureWins
 .public IncrementNbDungeonsCleared
@@ -569,7 +570,6 @@
 .public sub_0200BB74
 .public sub_0200BB88
 .public sub_0200BBF8
-.public HandleFadesVeneer
 .public sub_0200BC60
 .public sub_0200BCB0
 .public sub_0200BD14
--- a/asm/include/overlay_29_022E37DC.inc
+++ b/asm/include/overlay_29_022E37DC.inc
@@ -7,8 +7,8 @@
 .public CheckActiveChallengeRequest
 .public CheckSpawnThreshold
 .public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DisplayAnimatedNumbers
+.public DUNGEON_PTR
 .public DungeonFloorToGroupFloor
 .public DungeonGetTotalSpriteFileSize
 .public DungeonGoesUp
@@ -47,28 +47,6 @@
 .public MemFree
 .public MonsterIsType
 .public NeedsItemToSpawn
-.public PlayEffectAnimationEntity
-.public PlaySeByIdIfNotSilence
-.public RandIntSafe
-.public STATUS_ICON_ARRAY_BIDE
-.public STATUS_ICON_ARRAY_BLINDED
-.public STATUS_ICON_ARRAY_BURN
-.public STATUS_ICON_ARRAY_CRINGE
-.public STATUS_ICON_ARRAY_CURSE
-.public STATUS_ICON_ARRAY_FREEZE
-.public STATUS_ICON_ARRAY_INVISIBLE
-.public STATUS_ICON_ARRAY_LEECH_SEED
-.public STATUS_ICON_ARRAY_LONG_TOSS
-.public STATUS_ICON_ARRAY_MAGNET_RISE
-.public STATUS_ICON_ARRAY_MIRACLE_EYE
-.public STATUS_ICON_ARRAY_MUZZLED
-.public STATUS_ICON_ARRAY_REFLECT
-.public STATUS_ICON_ARRAY_SLEEP
-.public STATUS_ICON_ARRAY_SURE_SHOT
-.public SetMonsterId
-.public ShouldDisplayEntityWrapper
-.public SubstitutePlaceholderStringTags
-.public UnloadFile
 .public ov10_022BDC68
 .public ov10_022BDE50
 .public ov10_022BEC08
@@ -103,6 +81,28 @@
 .public ov29_023515B0
 .public ov29_023515CC
 .public ov29_0235354C
+.public PlayEffectAnimationEntity
+.public PlaySeByIdIfNotSilence
+.public RandIntSafe
+.public SetMonsterId
+.public ShouldDisplayEntityWrapper
+.public STATUS_ICON_ARRAY_BIDE
+.public STATUS_ICON_ARRAY_BLINDED
+.public STATUS_ICON_ARRAY_BURN
+.public STATUS_ICON_ARRAY_CRINGE
+.public STATUS_ICON_ARRAY_CURSE
+.public STATUS_ICON_ARRAY_FREEZE
+.public STATUS_ICON_ARRAY_INVISIBLE
+.public STATUS_ICON_ARRAY_LEECH_SEED
+.public STATUS_ICON_ARRAY_LONG_TOSS
+.public STATUS_ICON_ARRAY_MAGNET_RISE
+.public STATUS_ICON_ARRAY_MIRACLE_EYE
+.public STATUS_ICON_ARRAY_MUZZLED
+.public STATUS_ICON_ARRAY_REFLECT
+.public STATUS_ICON_ARRAY_SLEEP
+.public STATUS_ICON_ARRAY_SURE_SHOT
 .public sub_0201C000
 .public sub_0201CF90
 .public sub_0201D034
+.public SubstitutePlaceholderStringTags
+.public UnloadFile
--- a/asm/include/overlay_29_022E7EC4.inc
+++ b/asm/include/overlay_29_022E7EC4.inc
@@ -1,9 +1,9 @@
 #pragma once
 .public CloseTextBox2
 .public CreateTextBox
+.public DrawTextInWindow
 .public DUNGEON_FRAMES_PASSED
 .public DUNGEON_PTR
-.public DrawTextInWindow
 .public DungeonGetSpriteIndex
 .public GetIdleAnimationId
 .public GetPlayerGender
@@ -13,13 +13,6 @@
 .public MemAlloc
 .public MemFree
 .public MemZero
-.public SetMinimapDataE447
-.public SetMinimapDataE448
-.public StartFadeDungeonWrapper
-.public StringFromId
-.public TOP_SCREEN_STATUS_PTR
-.public UpdateMinimap
-.public UpdateWindow
 .public ov10_022C1DE0
 .public ov10_022C1E50
 .public ov10_022C1E80
@@ -51,9 +44,16 @@
 .public ov29_023515F4
 .public ov29_0235352C
 .public ov29_02353558
+.public SetMinimapDataE447
+.public SetMinimapDataE448
+.public StartFadeDungeonWrapper
+.public StringFromId
 .public sub_0200B330
 .public sub_0200B3D4
 .public sub_02048384
 .public sub_020483B8
 .public sub_020483D8
 .public sub_02048400
+.public TOP_SCREEN_STATUS_PTR
+.public UpdateMinimap
+.public UpdateWindow
--- a/asm/include/overlay_29_022EBCE8.inc
+++ b/asm/include/overlay_29_022EBCE8.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public abs
+.public ActivateEndOfTurnEffects
 .public AdvanceFrame
 .public CalcSpeedStageWrapper
 .public ChangeLeader
@@ -14,7 +15,6 @@
 .public IsFloorOver
 .public ov29_022E81F8
 .public ov29_022EF9C8
-.public ov29_0230FC24
 .public ov29_02348FD8
 .public ov29_023522B6
 .public RunMonsterAi
--- a/asm/include/overlay_29_022FE4BC.inc
+++ b/asm/include/overlay_29_022FE4BC.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public AbilityIsActiveVeneer
+.public ActivateEndOfTurnEffects
 .public AdvanceFrame
 .public AnimationDelayOrSomething
 .public CanMonsterMoveInDirection
@@ -52,7 +53,6 @@
 .public ov29_0230F140
 .public ov29_0230F14C
 .public ov29_0230F158
-.public ov29_0230FC24
 .public ov29_02318D58
 .public ov29_0231A8A0
 .public ov29_0231A9F8
--- a/asm/include/overlay_29_023047DC.inc
+++ b/asm/include/overlay_29_023047DC.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public _s32_div_f
+.public ActivateEndOfTurnEffects
 .public AdvanceFrame
 .public CheckLeaderTile
 .public CheckNonLeaderTile
@@ -27,7 +28,6 @@
 .public ov29_022F9C74
 .public ov29_02305814
 .public ov29_02307DD0
-.public ov29_0230FC24
 .public ov29_02346888
 .public ov29_0234AD10
 .public ov29_0235173C
--- a/asm/include/overlay_29_023085DC.inc
+++ b/asm/include/overlay_29_023085DC.inc
@@ -2,6 +2,7 @@
 .public abs
 .public ApplyDamage
 .public ApplyDamageAndEffectsWrapper
+.public ARENA_TRAP_ACTIVATION_CHANCE
 .public ATK_STAT_IDX
 .public BoostOffensiveStat
 .public CategoryIsNotPhysical
@@ -18,20 +19,18 @@
 .public IqSkillIsEnabled
 .public LevitateIsActive
 .public LogMessageByIdWithPopupCheckUserTarget
+.public MAGNET_PULL_ACTIVATION_CHANCE
 .public MonsterIsType
 .public ov10_022C442C
-.public ov10_022C4460
 .public ov10_022C4464
 .public ov10_022C44C0
 .public ov10_022C4550
-.public ov10_022C4564
 .public ov10_022C45AC
 .public ov10_022C45B0
 .public ov10_022C45B4
 .public ov10_022C45C0
 .public ov10_022C4638
 .public ov10_022C467C
-.public ov10_022C468C
 .public ov29_022E3F24
 .public ov29_022E40C0
 .public ov29_022E45D0
@@ -44,5 +43,6 @@
 .public ov29_023535DC
 .public RAPID_SPIN_BINDING_REMOVAL
 .public ResetDamageData
+.public SHADOW_TAG_ACTIVATION_CHANCE
 .public TryHurl
 .public UpdateAiTargetPos
--- a/asm/include/overlay_29_0230F9A4.inc
+++ b/asm/include/overlay_29_0230F9A4.inc
@@ -51,7 +51,6 @@
 .public ov10_022C464C
 .public ov10_022C4650
 .public ov10_022C4664
-.public ov10_022C46A0
 .public ov10_022C4A5C
 .public ov10_022C4BBC
 .public ov10_022C4BE4
@@ -75,6 +74,7 @@
 .public POISON_DAMAGE
 .public POISON_DAMAGE_COOLDOWN
 .public SetPreprocessorArgsIdVal
+.public SHED_SKIN_ACTIVATION_CHANCE
 .public SpawnDroppedItemWrapper
 .public SPEED_BOOST_TURNS
 .public sub_02050FF8
--- a/asm/include/overlay_29_02317844.inc
+++ b/asm/include/overlay_29_02317844.inc
@@ -13,12 +13,12 @@
 .public GetMobilityType
 .public GravityIsActive
 .public HasTypeAffectedByGravity
+.public HEAL_BLOCK_TURN_RANGE
 .public IsProtectedFromNegativeStatus
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserTarget
 .public ov10_022C4764
 .public ov10_022C4768
-.public ov10_022C4774
 .public ov10_022C4778
 .public ov10_022C477C
 .public ov10_022C4780
--- a/asm/include/overlay_29_02348020.inc
+++ b/asm/include/overlay_29_02348020.inc
@@ -13,6 +13,7 @@
 .public GetAcceptedMission
 .public GetBgRegionArea
 .public GetCurrentHiddenStairsType
+.public GetFirstExperienceLockedTeamMember
 .public GetForcedLossReason
 .public GetItemToRetrieve
 .public GetLeader
@@ -39,7 +40,6 @@
 .public ov29_023496EC
 .public ov29_023497C8
 .public ov29_02349818
-.public ov29_02349A70
 .public ov29_02349AD4
 .public ov29_0234C738
 .public ov29_023537C4
--- a/asm/include/overlay_29_02348D3C.inc
+++ b/asm/include/overlay_29_02348D3C.inc
@@ -3,6 +3,7 @@
 .public DUNGEON_PTR
 .public EntityIsValid__0234987C
 .public GetAcceptedMission
+.public GetFirstExperienceLockedTeamMember
 .public GetSpriteFileSize
 .public IsItemInBag
 .public IsItemWithFlagsInBag
@@ -11,7 +12,6 @@
 .public ov29_02348ABC
 .public ov29_02348B28
 .public ov29_02348BA0
-.public ov29_02349A70
 .public ov29_02349AD4
 .public ov29_0234A244
 .public ov29_0234A790
--- a/asm/include/overlay_29_0234D484.inc
+++ b/asm/include/overlay_29_0234D484.inc
@@ -25,8 +25,8 @@
 .public ov29_0234B73C
 .public ov29_0234D304
 .public ov29_02353398
-.public ov29_02382800
 .public OverlayIsLoaded
+.public SECRET_BAZAAR_DIALOGUE_INFO_PTR
 .public ShowPortraitInPortraitBox
 .public ShowStringInDialogueBox
 .public StringFromId
--- a/asm/include/overlay_34.inc
+++ b/asm/include/overlay_34.inc
@@ -1,8 +1,8 @@
 #pragma once
 .public G3X_Reset
 .public GetFadeStatus
+.public HandleFadesVeneer
 .public HandleMenus
-.public OVERLAY34_UNKNOWN_POINTER__NA_22DD080
 .public ov34_022DCB64
 .public ov34_022DCB98
 .public ov34_022DCBCC
@@ -13,6 +13,7 @@
 .public ov34_022DD0B0
 .public ov34_022DD0C0
 .public ov34_022DD104
+.public OVERLAY34_UNKNOWN_POINTER__NA_22DD080
 .public sub_02002878
 .public sub_0200383C
 .public sub_020038D8
@@ -32,7 +33,6 @@
 .public sub_0200B8D4
 .public sub_0200BB60
 .public sub_0200BB74
-.public HandleFadesVeneer
 .public sub_0200BD14
 .public sub_02017A68
 .public sub_02017A80
--- a/asm/include/overlay_34_022DCBCC.inc
+++ b/asm/include/overlay_34_022DCBCC.inc
@@ -11,11 +11,11 @@
 .public IsParentMenuActive
 .public MemAlloc
 .public MemFree
+.public ov34_022DC718
 .public OVERLAY34_UNKNOWN_POINTER__NA_22DD084
 .public OVERLAY34_UNKNOWN_POINTER__NA_22DD08C
 .public OVERLAY34_UNKNOWN_STRUCT__NA_22DD014
 .public OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C
-.public START_MENU_ITEMS_CONFIRM
 .public ShowStringIdInDialogueBox
-.public ov34_022DC718
+.public START_MENU_ITEMS_CONFIRM
 .public sub_0202F334
--- a/asm/main_0202A3E4.s
+++ b/asm/main_0202A3E4.s
@@ -17,8 +17,8 @@ PrintClearMark: ; 0x0202A3E4
 	ldmia sp!, {r3, pc}
 	arm_func_end PrintClearMark

-	arm_func_start sub_0202A40C
-sub_0202A40C: ; 0x0202A40C
+	arm_func_start PrintSpecialEpisodeClearMark
+PrintSpecialEpisodeClearMark: ; 0x0202A40C
 	stmdb sp!, {r3, lr}
 	mov lr, r1
 	mov ip, r2
@@ -29,7 +29,7 @@ sub_0202A40C: ; 0x0202A40C
 	mov r0, #1
 	bl PrintMark
 	ldmia sp!, {r3, pc}
-	arm_func_end sub_0202A40C
+	arm_func_end PrintSpecialEpisodeClearMark

 	arm_func_start PrintBadgeMark
 PrintBadgeMark: ; 0x0202A434
--- a/asm/main_0204FE58.s
+++ b/asm/main_0204FE58.s
@@ -881,11 +881,11 @@ GetTypeStringId: ; 0x02050950

 	arm_func_start GetConversion2ConvertToType
 GetConversion2ConvertToType: ; 0x02050964
-	ldr r1, _02050970 ; =_020A192C
+	ldr r1, _02050970 ; =CONVERSION2_TYPE_TABLE
 	ldrb r0, [r1, r0]
 	bx lr
 	.align 2, 0
-_02050970: .word _020A192C
+_02050970: .word CONVERSION2_TYPE_TABLE
 	arm_func_end GetConversion2ConvertToType

 	arm_func_start InitBitstreamForWrite
--- a/asm/main_rodata_020A190C.s
+++ b/asm/main_rodata_020A190C.s
@@ -6,8 +6,8 @@
 FORBIDDEN_FORGOT_MOVE_LIST:
 	.byte 0x18, 0x03, 0xD6, 0x00, 0xFB, 0x00, 0x19, 0x01, 0xD6, 0x00, 0x08, 0x00
 	.byte 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00
-	.global _020A192C
-_020A192C:
+	.global CONVERSION2_TYPE_TABLE
+CONVERSION2_TYPE_TABLE:
 	.byte 0x00, 0x0E, 0x03, 0x04, 0x0C, 0x09, 0x02, 0x0E
 	.byte 0x11, 0x0A, 0x0D, 0x10, 0x08, 0x07, 0x01, 0x11, 0x10, 0x05, 0x00, 0x00
 	.global TACTICS_UNLOCK_LEVEL_TABLE
--- a/asm/overlay_01.s
+++ b/asm/overlay_01.s
@@ -12370,7 +12370,7 @@ _02333534:
 	cmp r0, #1
 	cmpne r0, #4
 	beq _023335C4
-	ldr r6, _02333674 ; =ov01_0233B764
+	ldr r6, _02333674 ; =CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS
 	mov r5, #0xe
 	mvn r4, #1
 _02333580:
@@ -12405,7 +12405,7 @@ _023335D0:
 	mov r1, r8
 	mov r2, r6
 	mov r3, r5
-	bl sub_0202A40C
+	bl PrintSpecialEpisodeClearMark
 	ldr r1, [r4]
 	add r8, r8, #2
 	add r1, r1, r7
@@ -12462,7 +12462,7 @@ _02333664: .word 0x00000215 + PROCESS_CONTINUE_SCREEN_CONTENTS_OFFSET
 _02333668: .word 0x00002710
 _0233366C: .word 0x05F5E100
 _02333670: .word 0x00000217 + PROCESS_CONTINUE_SCREEN_CONTENTS_OFFSET
-_02333674: .word ov01_0233B764
+_02333674: .word CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS
 	arm_func_end ProcessContinueScreenContents

 	arm_func_start ov01_02333678
@@ -22852,8 +22852,8 @@ MAIN_MENU_ITEMS_CONFIRM:
 	.byte 0xF7, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x00
 #endif
 	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.global ov01_0233B764
-ov01_0233B764:
+	.global CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS
+CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS:
 	.byte 0x0C, 0x00, 0x00, 0x00
 	.byte 0x0D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
 	.byte 0x11, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00
--- a/asm/overlay_10_022C4394.s
+++ b/asm/overlay_10_022C4394.s
@@ -101,8 +101,8 @@ HURL_DAMAGE:
 	.global TRAP_BUSTER_ACTIVATION_CHANCE
 TRAP_BUSTER_ACTIVATION_CHANCE:
 	.byte 0x1E, 0x00, 0x00, 0x00
-	.global ov10_022C4460
-ov10_022C4460:
+	.global MAGNET_PULL_ACTIVATION_CHANCE
+MAGNET_PULL_ACTIVATION_CHANCE:
 	.byte 0x0C, 0x00, 0x00, 0x00
 	.global ov10_022C4464
 ov10_022C4464:
@@ -296,8 +296,8 @@ TECHNICIAN_MOVE_POWER_THRESHOLD:
 	.global ov10_022C4560
 ov10_022C4560:
 	.byte 0x08, 0x00, 0x00, 0x00
-	.global ov10_022C4564
-ov10_022C4564:
+	.global ARENA_TRAP_ACTIVATION_CHANCE
+ARENA_TRAP_ACTIVATION_CHANCE:
 	.byte 0x0C, 0x00, 0x00, 0x00
 	.global SONICBOOM_FIXED_DAMAGE
 SONICBOOM_FIXED_DAMAGE:
--- a/asm/overlay_10_rodata_022C464C.s
+++ b/asm/overlay_10_rodata_022C464C.s
@@ -50,8 +50,8 @@ FLARE_BLITZ_BURN_CHANCE:
 	.global FLAME_WHEEL_BURN_CHANCE
 FLAME_WHEEL_BURN_CHANCE:
 	.byte 0x0A, 0x00, 0x00, 0x00
-	.global ov10_022C468C
-ov10_022C468C:
+	.global SHADOW_TAG_ACTIVATION_CHANCE
+SHADOW_TAG_ACTIVATION_CHANCE:
 	.byte 0x0C, 0x00, 0x00, 0x00
 	.global PSYBEAM_CONFUSE_CHANCE
 PSYBEAM_CONFUSE_CHANCE:
@@ -65,8 +65,8 @@ MIRACLE_CHEST_EXP_BOOST:
 	.global WONDER_CHEST_EXP_BOOST
 WONDER_CHEST_EXP_BOOST:
 	.byte 0x0F, 0x00, 0x00, 0x00
-	.global ov10_022C46A0
-ov10_022C46A0:
+	.global SHED_SKIN_ACTIVATION_CHANCE
+SHED_SKIN_ACTIVATION_CHANCE:
 	.byte 0x32, 0x00, 0x00, 0x00
 	.global SPAWN_CAP_WITH_MONSTER_HOUSE
 SPAWN_CAP_WITH_MONSTER_HOUSE:
@@ -224,8 +224,8 @@ GASTRO_ACID_TURN_RANGE:
 	.global ov10_022C4770
 ov10_022C4770:
 	.byte 0x20, 0x00, 0x00, 0x00
-	.global ov10_022C4774
-ov10_022C4774:
+	.global HEAL_BLOCK_TURN_RANGE
+HEAL_BLOCK_TURN_RANGE:
 	.byte 0x04, 0x00, 0x0A, 0x00
 	.global ov10_022C4778
 ov10_022C4778:
--- a/asm/overlay_29_022EBCE8.s
+++ b/asm/overlay_29_022EBCE8.s
@@ -255,7 +255,7 @@ _022EC038:
 	cmpne r0, #0
 	beq _022EC088
 	mov r0, r7
-	bl ov29_0230FC24
+	bl ActivateEndOfTurnEffects
 	mov r0, r7
 	bl EntityIsValid__022EC608
 	cmp r0, #0
@@ -368,7 +368,7 @@ _022EC1E0:
 	cmpne r0, #0
 	beq _022EC230
 	mov r0, r7
-	bl ov29_0230FC24
+	bl ActivateEndOfTurnEffects
 	mov r0, r7
 	bl EntityIsValid__022EC608
 	cmp r0, #0
--- a/asm/overlay_29_022FE4BC.s
+++ b/asm/overlay_29_022FE4BC.s
@@ -625,7 +625,7 @@ _022FF77C:
 	bl EnsureCanStandCurrentTile
 _022FF784:
 	mov r0, r6
-	bl ov29_0230FC24
+	bl ActivateEndOfTurnEffects
 	mov r0, r6
 	bl EnemyEvolution
 _022FF794:
@@ -1291,7 +1291,7 @@ _022FED50:
 	bl EnsureCanStandCurrentTile
 _022FED58:
 	mov r0, sb
-	bl ov29_0230FC24
+	bl ActivateEndOfTurnEffects
 	mov r0, sb
 	bl EnemyEvolution
 _022FED68:
--- a/asm/overlay_29_023047DC.s
+++ b/asm/overlay_29_023047DC.s
@@ -969,7 +969,7 @@ _0230547C:
 	mov r0, #0
 	bl TryForcedLoss
 	mov r0, sb
-	bl ov29_0230FC24
+	bl ActivateEndOfTurnEffects
 	mov r0, sb
 	bl EntityIsValid__0230558C
 	cmp r0, #0
--- a/asm/overlay_29_023085DC.s
+++ b/asm/overlay_29_023085DC.s
@@ -449,7 +449,7 @@ _02308C0C:
 	bne _02308C38
 	mov r0, #0x64
 	bl DungeonRandInt
-	ldr r1, _02308F90 ; =ov10_022C4564
+	ldr r1, _02308F90 ; =ARENA_TRAP_ACTIVATION_CHANCE
 	ldrsh r1, [r1]
 	cmp r0, r1
 	addlt r0, r6, #0x100
@@ -468,7 +468,7 @@ _02308C38:
 	beq _02308C88
 	mov r0, #0x64
 	bl DungeonRandInt
-	ldr r1, _02308F94 ; =ov10_022C468C
+	ldr r1, _02308F94 ; =SHADOW_TAG_ACTIVATION_CHANCE
 	ldrsh r1, [r1]
 	cmp r0, r1
 	bge _02308C88
@@ -496,7 +496,7 @@ _02308C88:
 	beq _02308CDC
 	mov r0, #0x64
 	bl DungeonRandInt
-	ldr r1, _02308F9C ; =ov10_022C4460
+	ldr r1, _02308F9C ; =MAGNET_PULL_ACTIVATION_CHANCE
 	ldrsh r1, [r1]
 	cmp r0, r1
 	addlt r0, r6, #0x100
@@ -712,10 +712,10 @@ _02308F80: .word 0x00000C3F
 _02308F84: .word ov10_022C45B4
 _02308F88: .word ov29_023535DC
 _02308F8C: .word ov10_022C45B0
-_02308F90: .word ov10_022C4564
-_02308F94: .word ov10_022C468C
+_02308F90: .word ARENA_TRAP_ACTIVATION_CHANCE
+_02308F94: .word SHADOW_TAG_ACTIVATION_CHANCE
 _02308F98: .word RAPID_SPIN_BINDING_REMOVAL
-_02308F9C: .word ov10_022C4460
+_02308F9C: .word MAGNET_PULL_ACTIVATION_CHANCE
 _02308FA0: .word ov10_022C4550
 _02308FA4: .word ov10_022C45C0
 _02308FA8: .word ov10_022C45AC
--- a/asm/overlay_29_0230F9A4.s
+++ b/asm/overlay_29_0230F9A4.s
@@ -196,8 +196,8 @@ _0230FBB8:
 _0230FC20: .word ov10_022C4BE4
 	arm_func_end TickNoSlipCap

-	arm_func_start ov29_0230FC24
-ov29_0230FC24: ; 0x0230FC24
+	arm_func_start ActivateEndOfTurnEffects
+ActivateEndOfTurnEffects: ; 0x0230FC24
 #ifdef JAPAN
 #define OV29_0230FC24_OFFSET -4
 #define OV29_0230FC24_OFFSET_2 -0xA4
@@ -707,7 +707,7 @@ _0231037C:
 	bl AbilityIsActiveVeneer
 	cmp r0, #0
 	beq _023103F8
-	ldr r0, _02310AA4 ; =ov10_022C46A0
+	ldr r0, _02310AA4 ; =SHED_SKIN_ACTIVATION_CHANCE
 	ldrsh r0, [r0]
 	cmp r6, r0
 	bge _023103F8
@@ -1186,7 +1186,7 @@ _02310A94: .word 0x00001303
 _02310A98: .word 0x00000DBD + OV29_0230FC24_DATA_OFFSET
 _02310A9C: .word BAD_WEATHER_DAMAGE
 _02310AA0: .word 0x0000025F
-_02310AA4: .word ov10_022C46A0
+_02310AA4: .word SHED_SKIN_ACTIVATION_CHANCE
 _02310AA8: .word SPEED_BOOST_TURNS
 _02310AAC: .word BURN_DAMAGE_COOLDOWN
 _02310AB0: .word BURN_DAMAGE
@@ -1550,4 +1550,4 @@ _02311000: .word 0x00000DEC + OV29_0230FC24_DATA_OFFSET
 _02311004: .word 0x0000270F
 _02311008: .word 0x00000165
 _0231100C: .word 0x00000CBA + OV29_0230FC24_DATA_OFFSET
-	arm_func_end ov29_0230FC24
+	arm_func_end ActivateEndOfTurnEffects
--- a/asm/overlay_29_02317844.s
+++ b/asm/overlay_29_02317844.s
@@ -1134,7 +1134,7 @@ TryInflictHealBlockStatus: ; 0x023185A8
 	mov r1, r5
 	bl TryRemoveSnatchedMonsterFromDungeonStruct
 	mov r3, #5
-	ldr r1, _023186C0 ; =ov10_022C4774
+	ldr r1, _023186C0 ; =HEAL_BLOCK_TURN_RANGE
 	mov r0, r5
 	mov r2, #1
 	strb r3, [r7, #0xd8]
@@ -1165,7 +1165,7 @@ _023186B0:
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_023186C0: .word ov10_022C4774
+_023186C0: .word HEAL_BLOCK_TURN_RANGE
 #ifdef JAPAN
 _023186C4: .word 0x00000AC1
 _023186C8: .word 0x00000AC2
--- a/asm/overlay_29_02348020.s
+++ b/asm/overlay_29_02348020.s
@@ -919,7 +919,7 @@ _02348B9C: .word 0x00000E44
 ov29_02348BA0: ; 0x02348BA0
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
-	bl ov29_02349A70
+	bl GetFirstExperienceLockedTeamMember
 	movs r4, r0
 	moveq r0, #0
 	ldmeqia sp!, {r3, r4, r5, pc}
@@ -943,7 +943,7 @@ _02348BE0:
 ov29_02348BE8: ; 0x02348BE8
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #0x10
-	bl ov29_02349A70
+	bl GetFirstExperienceLockedTeamMember
 	movs r4, r0
 	beq _02348C50
 	ldr r1, [r4, #0xb4]
--- a/asm/overlay_29_02348D3C.s
+++ b/asm/overlay_29_02348D3C.s
@@ -364,10 +364,10 @@ _023491B4: .word DUNGEON_PTR

 	arm_func_start ov29_023491B8
 ov29_023491B8: ; 0x023491B8
-	ldr ip, _023491C0 ; =ov29_02349A70
+	ldr ip, _023491C0 ; =GetFirstExperienceLockedTeamMember
 	bx ip
 	.align 2, 0
-_023491C0: .word ov29_02349A70
+_023491C0: .word GetFirstExperienceLockedTeamMember
 	arm_func_end ov29_023491B8

 	arm_func_start IsOutlawOrChallengeRequestFloor
--- a/asm/overlay_29_023498A0.s
+++ b/asm/overlay_29_023498A0.s
@@ -137,8 +137,8 @@ _02349A68: .word 0x000001C1
 _02349A6C: .word 0x00000418
 	arm_func_end GenerateMissionEggMonster

-	arm_func_start ov29_02349A70
-ov29_02349A70: ; 0x02349A70
+	arm_func_start GetFirstExperienceLockedTeamMember
+GetFirstExperienceLockedTeamMember: ; 0x02349A70
 	stmdb sp!, {r4, r5, r6, lr}
 	mov r5, #0
 	ldr r4, _02349AD0 ; =DUNGEON_PTR
@@ -172,7 +172,7 @@ _02349AC0:
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
 _02349AD0: .word DUNGEON_PTR
-	arm_func_end ov29_02349A70
+	arm_func_end GetFirstExperienceLockedTeamMember

 	arm_func_start ov29_02349AD4
 ov29_02349AD4: ; 0x02349AD4
--- a/asm/overlay_29_0234D484.s
+++ b/asm/overlay_29_0234D484.s
@@ -118,7 +118,7 @@ ov29_0234D5D0: ; 0x0234D5D0
 	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ov29_0234B4CC
-	bl ov29_0234DB58
+	bl InitSecretBazaarDialogueInfo
 	mov r0, r5
 	bl ov29_0234DBE0
 	mov r0, r7
@@ -142,7 +142,7 @@ ov29_0234D630: ; 0x0234D630
 	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ov29_0234B4CC
-	bl ov29_0234DB58
+	bl InitSecretBazaarDialogueInfo
 	ldmia sp!, {r3, pc}
 	arm_func_end ov29_0234D630

@@ -165,7 +165,7 @@ _0234D664: .word ov29_0234DBE0
 	arm_func_start ov29_0234D668
 ov29_0234D668: ; 0x0234D668
 	stmdb sp!, {r3, lr}
-	ldr r0, _0234D68C ; =ov29_02382800
+	ldr r0, _0234D68C ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn r1, #1
 	ldr r0, [r0]
 	ldrsb r0, [r0, #0x12]
@@ -174,7 +174,7 @@ ov29_0234D668: ; 0x0234D668
 	bl HidePortraitBox
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_0234D68C: .word ov29_02382800
+_0234D68C: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234D668

 	arm_func_start ov29_0234D690
@@ -261,13 +261,13 @@ ov29_0234D750: ; 0x0234D750
 	mov r3, #0
 	bl ov29_0234DC3C
 	bl ov29_0234D9C0
-	ldr r0, _0234D7BC ; =ov29_02382800
+	ldr r0, _0234D7BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	ldr r0, [r0, #0x46c]
 	add sp, sp, #0xc
 	ldmia sp!, {r3, r4, r5, r6, pc}
 	.align 2, 0
-_0234D7BC: .word ov29_02382800
+_0234D7BC: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234D750

 	arm_func_start ov29_0234D7C0
@@ -296,19 +296,19 @@ ov29_0234D7C0: ; 0x0234D7C0
 	mov r3, #0
 	bl ov29_0234DC3C
 	bl ov29_0234D9C0
-	ldr r0, _0234D834 ; =ov29_02382800
+	ldr r0, _0234D834 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	ldr r0, [r0, #0x46c]
 	add sp, sp, #0xc
 	ldmia sp!, {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0234D834: .word ov29_02382800
+_0234D834: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234D7C0

 	arm_func_start ov29_0234D838
 ov29_0234D838: ; 0x0234D838
 	stmdb sp!, {r3, lr}
-	ldr r0, _0234D85C ; =ov29_02382800
+	ldr r0, _0234D85C ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn r1, #1
 	ldr r0, [r0]
 	ldrsb r0, [r0, #0x10]
@@ -317,7 +317,7 @@ ov29_0234D838: ; 0x0234D838
 	bl sub_0202F334
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_0234D85C: .word ov29_02382800
+_0234D85C: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234D838

 	arm_func_start ov29_0234D860
@@ -332,22 +332,22 @@ ov29_0234D860: ; 0x0234D860

 	arm_func_start ov29_0234D878
 ov29_0234D878: ; 0x0234D878
-	ldr r1, _0234D888 ; =ov29_02382800
+	ldr r1, _0234D888 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r1, [r1]
 	str r0, [r1, #0x474]
 	bx lr
 	.align 2, 0
-_0234D888: .word ov29_02382800
+_0234D888: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234D878

 	arm_func_start ov29_0234D88C
 ov29_0234D88C: ; 0x0234D88C
-	ldr r0, _0234D89C ; =ov29_02382800
+	ldr r0, _0234D89C ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	ldr r0, [r0, #0x46c]
 	bx lr
 	.align 2, 0
-_0234D89C: .word ov29_02382800
+_0234D89C: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234D88C

 	arm_func_start ov29_0234D8A0
@@ -363,7 +363,7 @@ _0234D8B0: .word ov29_0234D8B4
 	arm_func_start ov29_0234D8B4
 ov29_0234D8B4: ; 0x0234D8B4
 	stmdb sp!, {r3, r4, r5, lr}
-	ldr r2, _0234D9BC ; =ov29_02382800
+	ldr r2, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r5, r0
 	ldr r0, [r2]
 	mov r4, r1
@@ -375,14 +375,14 @@ ov29_0234D8B4: ; 0x0234D8B4
 	beq _0234D8E4
 	bl HidePortraitBox
 _0234D8E4:
-	ldr r0, _0234D9BC ; =ov29_02382800
+	ldr r0, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	ldrsb r0, [r0, #0x10]
 	bl sub_0202F334
 	mov r0, #8
 	mov r1, #0x62
 	bl ov29_022EA370
-	ldr r0, _0234D9BC ; =ov29_02382800
+	ldr r0, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn r1, #1
 	ldr r0, [r0]
 	ldrsb r0, [r0, #0x11]
@@ -390,26 +390,26 @@ _0234D8E4:
 	beq _0234D91C
 	bl CloseParentMenu
 _0234D91C:
-	ldr r0, _0234D9BC ; =ov29_02382800
+	ldr r0, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn r1, #1
 	ldr r0, [r0]
 	ldrsb r0, [r0, #0x12]
 	cmp r0, r1
 	beq _0234D948
 	bl ClosePortraitBox
-	ldr r0, _0234D9BC ; =ov29_02382800
+	ldr r0, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn r1, #1
 	ldr r0, [r0]
 	strb r1, [r0, #0x12]
 _0234D948:
-	ldr r0, _0234D9BC ; =ov29_02382800
+	ldr r0, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	ldrsb r0, [r0, #0x10]
 	bl CloseDialogueBox
-	ldr r0, _0234D9BC ; =ov29_02382800
+	ldr r0, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	bl MemFree
-	ldr r0, _0234D9BC ; =ov29_02382800
+	ldr r0, _0234D9BC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r1, #0
 	str r1, [r0]
 _0234D970:
@@ -435,7 +435,7 @@ _0234D9A8:
 	bl ov29_0234B4CC
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
-_0234D9BC: .word ov29_02382800
+_0234D9BC: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234D8B4

 	arm_func_start ov29_0234D9C0
@@ -443,7 +443,7 @@ ov29_0234D9C0: ; 0x0234D9C0
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	mvn r8, #1
 	mov r7, #0
-	ldr r6, _0234DB50 ; =ov29_02382800
+	ldr r6, _0234DB50 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	sub r5, r8, #3
 	sub r4, r8, #2
 	mov sb, #1
@@ -547,28 +547,28 @@ _0234DB44:
 	beq _0234D9E0
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
-_0234DB50: .word ov29_02382800
+_0234DB50: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 _0234DB54: .word ov29_02353398
 	arm_func_end ov29_0234D9C0

-	arm_func_start ov29_0234DB58
-ov29_0234DB58: ; 0x0234DB58
+	arm_func_start InitSecretBazaarDialogueInfo
+InitSecretBazaarDialogueInfo: ; 0x0234DB58
 	stmdb sp!, {r3, lr}
 	ldr r0, _0234DBD8 ; =0x00000478
 	mov r1, #8
 	bl MemAlloc
-	ldr r2, _0234DBDC ; =ov29_02382800
+	ldr r2, _0234DBDC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r1, _0234DBD8 ; =0x00000478
 	str r0, [r2]
 	bl MemZero
-	ldr r0, _0234DBDC ; =ov29_02382800
+	ldr r0, _0234DBDC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn r2, #0
 	ldr r1, [r0]
 	str r2, [r1, #0x46c]
 	ldr r0, [r0]
 	add r0, r0, #0x14
 	bl InitPreprocessorArgs
-	ldr r1, _0234DBDC ; =ov29_02382800
+	ldr r1, _0234DBDC ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r3, #0
 	ldr r0, [r1]
 	sub r2, r3, #2
@@ -587,15 +587,15 @@ ov29_0234DB58: ; 0x0234DB58
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0234DBD8: .word 0x00000478
-_0234DBDC: .word ov29_02382800
-	arm_func_end ov29_0234DB58
+_0234DBDC: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
+	arm_func_end InitSecretBazaarDialogueInfo

 	arm_func_start ov29_0234DBE0
 ov29_0234DBE0: ; 0x0234DBE0
 	stmdb sp!, {r4, lr}
 	movs r4, r0
 	ldmeqia sp!, {r4, pc}
-	ldr r1, _0234DC38 ; =ov29_02382800
+	ldr r1, _0234DC38 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn r0, #1
 	ldr r1, [r1]
 	ldrsb r1, [r1, #0x12]
@@ -605,24 +605,24 @@ ov29_0234DBE0: ; 0x0234DBE0
 	mov r1, #3
 	mov r2, #1
 	bl CreatePortraitBox
-	ldr r1, _0234DC38 ; =ov29_02382800
+	ldr r1, _0234DC38 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r1, [r1]
 	strb r0, [r1, #0x12]
 _0234DC20:
-	ldr r0, _0234DC38 ; =ov29_02382800
+	ldr r0, _0234DC38 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r1, r4
 	ldr r0, [r0]
 	ldrsb r0, [r0, #0x12]
 	bl ShowPortraitInPortraitBox
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_0234DC38: .word ov29_02382800
+_0234DC38: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	arm_func_end ov29_0234DBE0

 	arm_func_start ov29_0234DC3C
 ov29_0234DC3C: ; 0x0234DC3C
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
-	ldr r4, _0234DD88 ; =ov29_02382800
+	ldr r4, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mvn ip, #1
 	ldr r4, [r4]
 	mov r7, r0
@@ -634,7 +634,7 @@ ov29_0234DC3C: ; 0x0234DC3C
 	bne _0234DC8C
 	mov r0, #0
 	bl CreateDialogueBox
-	ldr r2, _0234DD88 ; =ov29_02382800
+	ldr r2, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r1, #0
 	ldr r3, [r2]
 	strb r0, [r3, #0x10]
@@ -642,7 +642,7 @@ ov29_0234DC3C: ; 0x0234DC3C
 	ldrsb r0, [r0, #0x10]
 	bl sub_0202F474
 _0234DC8C:
-	ldr r0, _0234DD88 ; =ov29_02382800
+	ldr r0, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r8, r6
 	ldr sb, [r0]
 	mov ip, #5
@@ -657,7 +657,7 @@ _0234DCA0:
 	strh r1, [r0, #0x64]
 	cmp r4, #0
 	beq _0234DCDC
-	ldr r0, _0234DD88 ; =ov29_02382800
+	ldr r0, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x400
 	ldrh r1, [r0, #0x64]
@@ -669,7 +669,7 @@ _0234DCDC:
 	beq _0234DD24
 	cmp r5, #0
 	beq _0234DD0C
-	ldr r0, _0234DD88 ; =ov29_02382800
+	ldr r0, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x400
 	ldrh r1, [r0, #0x64]
@@ -677,7 +677,7 @@ _0234DCDC:
 	strh r1, [r0, #0x64]
 	b _0234DD24
 _0234DD0C:
-	ldr r0, _0234DD88 ; =ov29_02382800
+	ldr r0, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x400
 	ldrh r1, [r0, #0x64]
@@ -686,7 +686,7 @@ _0234DD0C:
 _0234DD24:
 	cmp r5, #0
 	beq _0234DD64
-	ldr r1, _0234DD88 ; =ov29_02382800
+	ldr r1, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r2, #1
 	ldr r0, [r1]
 	strb r2, [r0, #0x466]
@@ -701,7 +701,7 @@ _0234DD24:
 	ldr r0, [r1]
 	str r2, [r0, #0x470]
 _0234DD64:
-	ldr r0, _0234DD88 ; =ov29_02382800
+	ldr r0, _0234DD88 ; =SECRET_BAZAAR_DIALOGUE_INFO_PTR
 	mov r2, r7
 	ldr r0, [r0]
 	mov r3, r6
@@ -711,7 +711,7 @@ _0234DD64:
 	bl ShowStringInDialogueBox
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
-_0234DD88: .word ov29_02382800
+_0234DD88: .word SECRET_BAZAAR_DIALOGUE_INFO_PTR
 _0234DD8C: .word 0x00001004
 	arm_func_end ov29_0234DC3C

--- a/asm/overlay_29_bss_0237CA18.s
+++ b/asm/overlay_29_bss_0237CA18.s
@@ -94,8 +94,8 @@ ov29_0237CFFC:
 	.global ov29_0237D000
 ov29_0237D000:
 	.space 0x5800
-	.global ov29_02382800
-ov29_02382800:
+	.global SECRET_BAZAAR_DIALOGUE_INFO_PTR
+SECRET_BAZAAR_DIALOGUE_INFO_PTR:
 	.space 0x4
 	.global ov29_02382804
 ov29_02382804:
--- a/lib/NitroSDK/asm/include/fx_cp.inc
+++ b/lib/NitroSDK/asm/include/fx_cp.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/lib/NitroSDK/asm/include/fx_vec.inc
+++ b/lib/NitroSDK/asm/include/fx_vec.inc
@@ -1,4 +1,5 @@
 #pragma once
+
 .public _0200002B
 .public _0207AD0C
 .public _020B2B9C
@@ -34,17 +35,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -62,11 +57,17 @@
 .public GXi_VRamLockId
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
 .public OS_InitReset
 .public OS_IRQTable
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -96,4 +97,3 @@
 .public THREAD_INFO_STRUCT
 .public WaitForever2
 .public WaitForInterrupt
-
--- a/lib/NitroSDK/asm/include/g2.inc
+++ b/lib/NitroSDK/asm/include/g2.inc
@@ -34,17 +34,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,44 +49,50 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
 .public OS_InitReset
 .public OS_IRQTable
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
--- a/lib/NitroSDK/asm/include/g3imm.inc
+++ b/lib/NitroSDK/asm/include/g3imm.inc
@@ -1,3 +1,3 @@
 #pragma once
-.public GX_SendFifo64B
 .public GX_SendFifo48B
+.public GX_SendFifo64B
--- a/lib/NitroSDK/asm/include/g3x.inc
+++ b/lib/NitroSDK/asm/include/g3x.inc
@@ -1,10 +1,10 @@
 #pragma once
-.public MTi_CpuClear32
-.public GXi_DmaId
-.public GXi_VRamLockId
 .public G3_LoadMtx43
 .public G3_LoadMtx44
+.public GXi_DmaId
+.public GXi_VRamLockId
+.public MTi_CpuClear32
 .public MTX_LookAt
 .public MTX_OrthoW
-.public sub_0207BDA8
 .public sub_0207BC4C
+.public sub_0207BDA8
--- a/lib/NitroSDK/asm/include/gx.inc
+++ b/lib/NitroSDK/asm/include/gx.inc
@@ -34,17 +34,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -62,12 +56,19 @@
 .public GXi_VRamLockId
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
 .public OS_GetLockID
 .public OS_InitReset
 .public OS_IRQTable
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UnlockVram
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -85,7 +86,6 @@
 .public sub_0206F808
 .public sub_0206FD88
 .public sub_0206FDE0
-.public OSi_UnlockVram
 .public sub_0207BC4C
 .public sub_0207BCCC
 .public sub_0207BDA8
--- a/lib/NitroSDK/asm/include/gx_bgcnt.inc
+++ b/lib/NitroSDK/asm/include/gx_bgcnt.inc
@@ -1,4 +1,5 @@
 #pragma once
+
 .public _0200002B
 .public _0207AD0C
 .public _020B2B9C
@@ -34,17 +35,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -58,30 +53,36 @@
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
 .public OS_InitReset
 .public OS_IRQTable
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -111,4 +112,3 @@
 .public THREAD_INFO_STRUCT
 .public WaitForever2
 .public WaitForInterrupt
-
--- a/lib/NitroSDK/asm/include/gx_load2d.inc
+++ b/lib/NitroSDK/asm/include/gx_load2d.inc
@@ -34,17 +34,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,46 +49,52 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
+.public G3_LoadMtx43
+.public G3_LoadMtx44
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
-.public G3_LoadMtx43
-.public G3_LoadMtx44
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
 .public OS_InitReset
 .public OS_IRQTable
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
--- a/lib/NitroSDK/asm/include/gx_load3d.inc
+++ b/lib/NitroSDK/asm/include/gx_load3d.inc
@@ -1,11 +1,12 @@
 #pragma once
+
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
+.public GXi_DmaId
 .public MTi_CpuCopy16
 .public MTi_CpuCopy32
-.public GXi_DmaId
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -24,4 +25,3 @@
 .public sub_02080EF0
 .public sub_02080F30
 .public sub_02085BD4
-
--- a/lib/NitroSDK/asm/include/mi_memory.inc
+++ b/lib/NitroSDK/asm/include/mi_memory.inc
@@ -16,9 +16,14 @@
 .public ARM9_UNKNOWN_TABLE__NA_20AE924
 .public DC_FlushRange
 .public DC_InvalidateRange
+.public DC_StoreRange
 .public EnableIrqFlag
 .public FileInit
 .public InitDmaTransfer_Standard
+.public MI_CpuCopy8
+.public MI_SetWramBank
+.public MI_StopDma
+.public MIi_CheckDma0SourceAddress
 .public OS_EnableIrqMask
 .public OS_InitMutex
 .public OS_ResetRequestIrqMask
@@ -33,11 +38,6 @@
 .public sub_02079D98
 .public sub_0207A048
 .public sub_0207A0CC
-.public DC_StoreRange
 .public sub_0207B854
 .public sub_0207C1E0
 .public WaitForever2
-.public MI_SetWramBank
-.public MIi_CheckDma0SourceAddress
-.public MI_StopDma
-.public MI_CpuCopy8
--- a/lib/NitroSDK/asm/include/mtx.inc
+++ b/lib/NitroSDK/asm/include/mtx.inc
@@ -34,17 +34,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -63,9 +57,15 @@
 .public GXi_VRamLockId
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public OS_InitReset
 .public OS_IRQTable
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
--- a/lib/NitroSDK/asm/include/os_arena.inc
+++ b/lib/NitroSDK/asm/include/os_arena.inc
@@ -1,4 +1,5 @@
 #pragma once
+
 .public _0200002B
 .public _0207AD0C
 .public _020B2B9C
@@ -34,17 +35,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,55 +50,61 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
+.public G3_LoadMtx43
+.public G3_LoadMtx44
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
-.public G3_LoadMtx43
-.public G3_LoadMtx44
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
+.public OS_DisableIrqMask
+.public OS_EnableIrqMask
+.public OS_InitIrqTable
+.public OS_InitLock
 .public OS_InitReset
 .public OS_IRQTable
-.public OS_InitLock
-.public OS_InitIrqTable
 .public OS_ResetRequestIrqMask
-.public OS_SetIrqStackChecker
 .public OS_SetIrqFunction
+.public OS_SetIrqStackChecker
 .public OS_SetProtectionRegion1
 .public OS_SetProtectionRegion2
-.public OS_EnableIrqMask
-.public OS_DisableIrqMask
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -122,6 +123,7 @@
 .public sub_0206FD88
 .public sub_0206FDE0
 .public sub_02078BF4
+.public sub_02079DA0
 .public sub_0207BC4C
 .public sub_0207BCCC
 .public sub_0207BDA8
@@ -134,5 +136,3 @@
 .public THREAD_INFO_STRUCT
 .public WaitForever2
 .public WaitForInterrupt
-
-.public sub_02079DA0
--- a/lib/NitroSDK/asm/include/os_exception.inc
+++ b/lib/NitroSDK/asm/include/os_exception.inc
@@ -1,4 +1,5 @@
 #pragma once
+
 .public _0200002B
 .public _0207AD0C
 .public _020B2B9C
@@ -34,17 +35,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,55 +50,61 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
+.public G3_LoadMtx43
+.public G3_LoadMtx44
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
-.public G3_LoadMtx43
-.public G3_LoadMtx44
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
+.public OS_DisableIrqMask
+.public OS_DisableProtectionUnit
+.public OS_EnableIrqMask
+.public OS_EnableProtectionUnit
+.public OS_InitIrqTable
+.public OS_InitLock
 .public OS_InitReset
 .public OS_IRQTable
-.public OS_InitLock
-.public OS_InitIrqTable
 .public OS_ResetRequestIrqMask
-.public OS_SetIrqStackChecker
 .public OS_SetIrqFunction
-.public OS_DisableProtectionUnit
-.public OS_EnableProtectionUnit
-.public OS_EnableIrqMask
-.public OS_DisableIrqMask
+.public OS_SetIrqStackChecker
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -122,6 +123,7 @@
 .public sub_0206FD88
 .public sub_0206FDE0
 .public sub_02078BF4
+.public sub_02079DA0
 .public sub_0207BC4C
 .public sub_0207BCCC
 .public sub_0207BDA8
@@ -134,5 +136,3 @@
 .public THREAD_INFO_STRUCT
 .public WaitForever2
 .public WaitForInterrupt
-
-.public sub_02079DA0
--- a/lib/NitroSDK/asm/include/os_interrupt.inc
+++ b/lib/NitroSDK/asm/include/os_interrupt.inc
@@ -1,4 +1,5 @@
 #pragma once
+
 .public _0200002B
 .public _0207AD0C
 .public _020B2B9C
@@ -34,17 +35,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,45 +50,51 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
 .public OS_InitReset
 .public OS_IRQTable
 .public OS_SleepThread
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -123,4 +124,3 @@
 .public THREAD_INFO_STRUCT
 .public WaitForever2
 .public WaitForInterrupt
-
--- a/lib/NitroSDK/asm/include/os_reset.inc
+++ b/lib/NitroSDK/asm/include/os_reset.inc
@@ -1,12 +1,12 @@
 #pragma once
 .public _022B99A8
 .public _022B99D0
-.public MTi_CpuCopy16
 .public EnableIrqFlag
-.public OS_GetTickLo
 .public MI_CpuCopy8
 .public MI_StopDma
+.public MTi_CpuCopy16
 .public OS_GetLockID
+.public OS_GetTickLo
 .public OS_ResetRequestIrqMask
 .public OS_SetIrqMask
 .public PXI_Init
--- a/lib/NitroSDK/asm/include/os_spinlock.inc
+++ b/lib/NitroSDK/asm/include/os_spinlock.inc
@@ -34,17 +34,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,45 +49,51 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
 .public OS_InitReset
 .public OS_IRQTable
 .public OS_SleepThread
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
--- a/lib/NitroSDK/asm/include/os_thread.inc
+++ b/lib/NitroSDK/asm/include/os_thread.inc
@@ -1,4 +1,5 @@
 #pragma once
+
 .public _0200002B
 .public _0207AD0C
 .public _020B2B9C
@@ -34,17 +35,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,53 +50,61 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
+.public G3_LoadMtx43
+.public G3_LoadMtx44
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
-.public G3_LoadMtx43
-.public G3_LoadMtx44
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
+.public OS_CreateAlarm
+.public OS_DisableIrqMask
+.public OS_EnableIrqMask
+.public OS_InitIrqTable
+.public OS_InitLock
 .public OS_InitReset
 .public OS_IRQTable
-.public OS_InitLock
-.public OS_InitIrqTable
 .public OS_ResetRequestIrqMask
-.public OS_SetIrqStackChecker
+.public OS_SetAlarm
 .public OS_SetIrqFunction
-.public OS_EnableIrqMask
-.public OS_DisableIrqMask
+.public OS_SetIrqStackChecker
 .public OSi_InitVramExclusive
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -120,6 +123,7 @@
 .public sub_0206FD88
 .public sub_0206FDE0
 .public sub_02078BF4
+.public sub_0207B1E8
 .public sub_0207BC4C
 .public sub_0207BCCC
 .public sub_0207BDA8
@@ -132,7 +136,3 @@
 .public THREAD_INFO_STRUCT
 .public WaitForever2
 .public WaitForInterrupt
-
-.public sub_0207B1E8
-.public OS_CreateAlarm
-.public OS_SetAlarm
--- a/lib/NitroSDK/asm/include/os_timer.inc
+++ b/lib/NitroSDK/asm/include/os_timer.inc
@@ -1,4 +1,5 @@
 #pragma once
+
 .public _0200002B
 .public _0207AD0C
 .public _020B2B9C
@@ -34,17 +35,11 @@
 .public _022B98F4
 .public _022B98F8
 .public _022B991C
-.public OSi_TimerReserved
-.public OSi_UseTick
-.public OSi_UseAlarm
 .public _022B99BC
 .public _ll_sdiv
 .public _ll_udiv
 .public _s32_div_f
 .public _secure
-.public MTi_CpuCopy16
-.public MTi_CpuCopy32
-.public MTi_CpuClear32
 .public AtomicExchange
 .public CARD_Init
 .public ClearIrqFlag
@@ -55,56 +50,63 @@
 .public EnableIrqFlag
 .public FX_AtanIdxTable_
 .public FX_Div
+.public G2_GetBG0CharPtr
+.public G2_GetBG1CharPtr
+.public G2_GetBG1ScrPtr
+.public G2_GetBG2CharPtr
+.public G2_GetBG2ScrPtr
+.public G2_GetBG3CharPtr
+.public G2_GetBG3ScrPtr
+.public G2S_GetBG0CharPtr
+.public G2S_GetBG0ScrPtr
+.public G2S_GetBG1CharPtr
+.public G2S_GetBG1ScrPtr
+.public G3_LoadMtx43
+.public G3_LoadMtx44
 .public GetGameMode
 .public GetProcessorMode
 .public gGXState
+.public GX_HBlankIntr
+.public GX_ResetBankForBGExtPltt
+.public GX_ResetBankForOBJExtPltt 
+.public GX_ResetBankForSubBGExtPltt 
+.public GX_ResetBankForSubBGOBJExtPltt 
+.public GX_ResetBankForSubOBJExtPltt 
+.public GX_ResetBankForTex
+.public GX_ResetBankForTexPltt
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForOBJExtPltt 
+.public GX_SetBankForSubBGExtPltt 
+.public GX_SetBankForSubBGOBJExtPltt 
+.public GX_SetBankForSubOBJExtPltt 
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
 .public GXi_DmaId
 .public GXi_VRamLockId
-.public GX_ResetBankForBGExtPltt
-.public GX_SetBankForBGExtPltt
-.public GX_ResetBankForSubBGExtPltt 
-.public GX_SetBankForSubBGExtPltt 
-.public GX_ResetBankForSubBGOBJExtPltt 
-.public GX_SetBankForSubBGOBJExtPltt 
-.public GX_ResetBankForOBJExtPltt 
-.public GX_SetBankForOBJExtPltt 
-.public GX_ResetBankForSubOBJExtPltt 
-.public GX_SetBankForSubOBJExtPltt 
-.public GX_ResetBankForTex
-.public GX_SetBankForTex
-.public GX_ResetBankForTexPltt
-.public GX_SetBankForTexPltt
-.public GX_HBlankIntr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG1ScrPtr
-.public G2_GetBG2ScrPtr
-.public G2_GetBG3ScrPtr
-.public G2S_GetBG0CharPtr
-.public G2S_GetBG1ScrPtr
-.public G2S_GetBG1CharPtr
-.public G2_GetBG0CharPtr
-.public G2_GetBG1CharPtr
-.public G2_GetBG2CharPtr
-.public G2_GetBG3CharPtr
-.public G3_LoadMtx43
-.public G3_LoadMtx44
 .public MI_DmaCopy16
 .public MI_Init
+.public MTi_CpuClear32
+.public MTi_CpuCopy16
+.public MTi_CpuCopy32
 .public MTX_LookAt
 .public MTX_OrthoW
+.public OS_DisableIrqMask
+.public OS_DisableProtectionUnit
+.public OS_EnableIrqMask
+.public OS_EnableProtectionUnit
+.public OS_GetTick
+.public OS_InitIrqTable
+.public OS_InitLock
 .public OS_InitReset
 .public OS_IRQTable
-.public OS_InitLock
-.public OS_InitIrqTable
 .public OS_ResetRequestIrqMask
-.public OS_SetIrqStackChecker
 .public OS_SetIrqFunction
-.public OS_DisableProtectionUnit
-.public OS_EnableProtectionUnit
-.public OS_EnableIrqMask
-.public OS_DisableIrqMask
+.public OS_SetIrqStackChecker
 .public OSi_InitVramExclusive
 .public OSi_SetTimerReserved
+.public OSi_TimerReserved
+.public OSi_UseAlarm
+.public OSi_UseTick
 .public PM_Init
 .public PXI_Init
 .public sClrImg
@@ -123,6 +125,7 @@
 .public sub_0206FD88
 .public sub_0206FDE0
 .public sub_02078BF4
+.public sub_02079DA0
 .public sub_0207BC4C
 .public sub_0207BCCC
 .public sub_0207BDA8
@@ -135,6 +138,3 @@
 .public THREAD_INFO_STRUCT
 .public WaitForever2
 .public WaitForInterrupt
-
-.public sub_02079DA0
-.public OS_GetTick
--- a/lib/asm/include/nitro.inc
+++ b/lib/asm/include/nitro.inc
@@ -16,9 +16,14 @@
 .public ARM9_UNKNOWN_TABLE__NA_20AE924
 .public DC_FlushRange
 .public DC_InvalidateRange
+.public DC_StoreRange
 .public EnableIrqFlag
 .public FileInit
 .public InitDmaTransfer_Standard
+.public MI_CpuCopy8
+.public MI_SetWramBank
+.public MI_StopDma
+.public MIi_CheckDma0SourceAddress
 .public OS_EnableIrqMask
 .public OS_InitMutex
 .public OS_ResetRequestIrqMask
@@ -33,11 +38,6 @@
 .public sub_02079D98
 .public sub_0207A048
 .public sub_0207A0CC
-.public DC_StoreRange
 .public sub_0207B854
 .public sub_0207C1E0
 .public WaitForever2
-.public MI_SetWramBank
-.public MIi_CheckDma0SourceAddress
-.public MI_StopDma
-.public MI_CpuCopy8
--- a/tools/sync_pmdsky_debug/symbol_details.py
+++ b/tools/sync_pmdsky_debug/symbol_details.py
@@ -3,6 +3,7 @@ from typing import List

 # Some symbol names in the decomp do not match pmdsky-debug because of naming convention differences.
 # Map these symbol names between the two projects to avoid changes when syncing the projects.
+# Format is decomp name : pmdsky-debug name
 NONMATCHING_SYMBOLS_ARM9 = {
    '_secure': 'SECURE',
    '_start_AutoloadDoneCallback': 'StartAutoloadDoneCallback',
@@ -99,6 +100,13 @@ NONMATCHING_SYMBOLS_ARM9 = {
    'INITi_CpuClear32': 'InitI_CpuClear32',
    'MTX_LookAt': 'Mtx_LookAt',
    'MTX_OrthoW': 'Mtx_OrthoW',
+    'OS_GetDTCMAddress': 'OS_GetDtcmAddress',
+    'OSi_TimerReserved': 'OSI_TIMER_RESERVED',
+    'OSi_UseAlarm': 'OSI_USE_ALARM',
+    'OSi_UseTick': 'OSI_USE_TICK',
+    'OSi_vramExclusive': 'OSI_VRAM_EXCLUSIVE',
+    'OSi_vramLockId': 'OSI_VRAM_LOCK_ID',
+    'PushCommand_impl': 'PushCommand_Impl',
    'PXI_Init': 'Pxi_Init',
    'PXI_InitFifo': 'Pxi_InitFifo',
    'PXI_IsCallbackReady': 'Pxi_IsCallbackReady',
@@ -109,6 +117,10 @@ NONMATCHING_SYMBOLS_ARM9 = {
    'sClrImg': 'CLR_IMG',
    'sDispMode': 'DISP_MODE',
    'sIsDispOn': 'IS_DISP_ON',
+    'SND_CommandInit': 'Snd_CommandInit',
+    'SND_Init': 'Snd_Init',
+    'SOC_Startup': 'Soc_Startup',
+    'SOCL_Startup': 'Socl_Startup',
    'sSubBGExtPltt': 'SUB_BG_EXT_PLTT',
    'sTexPlttStartAddrTable': 'TEX_PLTT_START_ADDR_TABLE',
    'sTexStartAddrTable': 'TEX_START_ADDR_TABLE',