Used original Pascal_SnakeCase for DSE functions

2026-08-23 19:14:58 -05:00 · 2023-12-30 18:03:55 -06:00
parent 0ba1d76398
commit 14f2b4cd9c
33 changed files with 382 additions and 375 deletions
--- a/asm/include/main_02000C6C.inc
+++ b/asm/include/main_02000C6C.inc
@@ -94,7 +94,6 @@
 .public _020AF698
 .public _020AFF38_EU
 .public _020AFF3C_EU
-.public GXi_DmaId
 .public _020B3380
 .public _020B3384
 .public _020B33A0
@@ -183,21 +182,62 @@
 .public ArrayFill32Fast
 .public CART_REMOVED_IMG_DATA
 .public ClearIrqFlag
+.public Debug_FatalError
+.public Debug_Init
 .public DEBUG_IS_INITIALIZED
 .public Debug_Print
 .public Debug_Print0
 .public DecompressAtFromMemoryPointer
-.public Debug_FatalError
 .public FileInit
+.public G2x_SetBlendAlpha_
+.public G3X_ClearFifo
+.public G3X_Init
+.public G3X_SetClearColor
 .public GetLanguage
 .public GetOverlayInfo
-.public Debug_Init
+.public GX_BeginLoadBGExtPltt
+.public GX_BeginLoadOBJExtPltt
+.public GX_DisableBankForBG
+.public GX_DisableBankForBGExtPltt
+.public GX_DisableBankForLCDC
+.public GX_DisableBankForOBJ
+.public GX_DisableBankForOBJExtPltt
+.public GX_DisableBankForSubBG
+.public GX_DisableBankForSubBGExtPltt
+.public GX_DisableBankForSubOBJ
+.public GX_DisableBankForTex
+.public GX_DisableBankForTexPltt
+.public GX_DispOff
+.public GX_DispOn
+.public GX_EndLoadBGExtPltt
+.public GX_EndLoadOBJExtPltt
+.public GX_Init
+.public GX_SetBankForBG
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForLCDC
+.public GX_SetBankForOBJ
+.public GX_SetBankForOBJExtPltt
+.public GX_SetBankForSubBG
+.public GX_SetBankForSubBGExtPltt
+.public GX_SetBankForSubOBJ
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
+.public GX_SetGraphicsMode
+.public GX_VBlankIntr
+.public GXi_DmaId
+.public GXS_BeginLoadBGExtPltt
+.public GXS_BeginLoadOBJExtPltt
+.public GXS_EndLoadBGExtPltt
+.public GXS_EndLoadOBJExtPltt
+.public GXS_SetGraphicsMode
+.public GXx_SetMasterBrightness_
 .public InitOverlay
 .public LOADED_OVERLAY_GROUP_0
 .public LoadOverlayInternal
 .public MainLoop
 .public MEMORY_ALLOCATION_ARENA_GETTERS
 .public NATURAL_LOG_VALUE_TABLE
+.public OS_GetLockID
 .public OS_IRQTable
 .public PlayBgmById
 .public PRNG_SEQUENCE_NUM
@@ -230,49 +270,9 @@
 .public sub_02019304
 .public sub_0204A5D0
 .public sub_02076070
-.public GX_Init
-.public GX_VBlankIntr
-.public GX_DispOff
-.public GX_DispOn
-.public GX_SetGraphicsMode
-.public GXS_SetGraphicsMode
-.public GXx_SetMasterBrightness_
-.public GX_SetBankForBG
-.public GX_SetBankForOBJ
-.public GX_SetBankForBGExtPltt
-.public GX_SetBankForOBJExtPltt
-.public GX_SetBankForTex
-.public GX_SetBankForTexPltt
-.public GX_SetBankForLCDC
-.public GX_SetBankForSubBG
-.public GX_SetBankForSubOBJ
-.public GX_SetBankForSubBGExtPltt
-.public GX_DisableBankForBG
-.public GX_DisableBankForOBJ
-.public GX_DisableBankForBGExtPltt
-.public GX_DisableBankForOBJExtPltt
-.public GX_DisableBankForTex
-.public GX_DisableBankForTexPltt
-.public GX_DisableBankForLCDC
-.public GX_DisableBankForSubBG
-.public GX_DisableBankForSubOBJ
-.public GX_DisableBankForSubBGExtPltt
-.public G2x_SetBlendAlpha_
-.public G3X_Init
-.public G3X_ClearFifo
-.public G3X_SetClearColor
-.public GX_BeginLoadBGExtPltt
-.public GX_EndLoadBGExtPltt
-.public GX_BeginLoadOBJExtPltt
-.public GX_EndLoadOBJExtPltt
-.public GXS_BeginLoadBGExtPltt
-.public GXS_EndLoadBGExtPltt
-.public GXS_BeginLoadOBJExtPltt
-.public GXS_EndLoadOBJExtPltt
 .public sub_02078900
 .public sub_02078A98
 .public sub_02078C68
-.public OS_GetLockID
 .public sub_02079844
 .public sub_02079888
 .public sub_02079940
--- a/asm/include/main_0200C4CC.inc
+++ b/asm/include/main_0200C4CC.inc
@@ -750,7 +750,6 @@
 .public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
 .public ADVENTURE_LOG_PTR
 .public ALERT_BOX_DEFAULT_WINDOW_PARAMS
-.public DirectoryFileMngr_OpenDirectoryFile
 .public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS
 .public ARM9_UNKNOWN_DATA__NA_209E6BC
 .public ARM9_UNKNOWN_PTR__NA_20A2C84
@@ -772,14 +771,20 @@
 .public CLIENT_LEVEL_TABLE
 .public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS
 .public CONTROLS_CHART_DEFAULT_WINDOW_PARAMS
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
+.public Debug_FatalError
+.public Debug_GetDebugFlag
+.public Debug_GetLogFlag
 .public DEBUG_MENU_DEFAULT_WINDOW_PARAMS
 .public Debug_Print
 .public Debug_Print0
+.public Debug_SetDebugFlag
+.public Debug_SetLogFlag
 .public DEFAULT_HERO_ID
 .public DexNumbersEqual
 .public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS
+.public DirectoryFileMngr_GetDirectoryFileSize
+.public DirectoryFileMngr_LoadDirectoryFile
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DisableIqSkill
 .public DrawTileGrid
 .public DUNGEON_DATA_LIST
@@ -797,26 +802,26 @@
 .public EXCLUSIVE_ITEM_SPECIAL_ATTACK_BOOSTS
 .public EXCLUSIVE_ITEM_SPECIAL_DEFENSE_BOOSTS
 .public EXCLUSIVE_ITEM_STAT_BOOST_DATA_INDEXES
-.public Debug_FatalError
 .public FemaleToMaleForm
 .public FileClose
 .public FileGetSize
-.public FileRom_Veneer_FileInit
 .public FileRom_HandleOpen
 .public FileRom_HandleRead
 .public FileRom_HandleSeek
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
 .public FORBIDDEN_FORGOT_MOVE_LIST
+.public G3i_LookAt_
+.public G3i_OrthoW_
 .public GAME_MODE
 .public GET_ITEM_NAME_FORMATTED_SPRINTF
 .public GetActiveRosterIndex
 .public GetActiveTeamMember
 .public GetActorMatchingStorageId
 .public GetBaseFormCastformDeoxysCherrim
-.public Debug_GetDebugFlag
-.public Debug_GetLogFlag
 .public GetDungeonModeSpecial
 .public GetEvolutionPossibilities
-.public DirectoryFileMngr_GetDirectoryFileSize
 .public GetHeldButtons
 .public GetHero
 .public GetHeroMemberIdx
@@ -842,6 +847,20 @@
 .public GLOBAL_PROGRESS_PTR
 .public GUEST_MONSTER_DATA
 .public GUMMI_STAT_BOOST
+.public GX_BeginLoadBGExtPltt
+.public GX_BeginLoadOBJExtPltt
+.public GX_BeginLoadTex
+.public GX_BeginLoadTexPltt
+.public GX_EndLoadBGExtPltt
+.public GX_EndLoadOBJExtPltt
+.public GX_EndLoadTex
+.public GX_EndLoadTexPltt
+.public GX_LoadTex
+.public GX_LoadTexPltt
+.public GXS_BeginLoadBGExtPltt
+.public GXS_BeginLoadOBJExtPltt
+.public GXS_EndLoadBGExtPltt
+.public GXS_EndLoadOBJExtPltt
 .public HIDDEN_POWER_BASE_POWER_TABLE
 .public IQ_GUMMI_GAIN_TABLE
 .public IqSkillFlagTest
@@ -859,7 +878,6 @@
 .public LANGUAGE_INFO_DATA
 .public LIFE_SEED_HP_BOOST
 .public LoadFileFromRom
-.public DirectoryFileMngr_LoadDirectoryFile
 .public LoadOverlay
 .public MemAlloc
 .public MemArenaAlloc
@@ -882,6 +900,7 @@
 .public MultiplyByFixedPoint
 .public NOTIFY_NOTE
 .public OPTIONS_MENU_DEFAULT_WINDOW_PARAMS
+.public OS_GetLockID
 .public OUTLAW_LEVEL_TABLE
 .public OUTLAW_MINION_LEVEL_TABLE
 .public ov10_022BDADC
@@ -932,8 +951,6 @@
 .public SCROLL_BOX_DEFAULT_WINDOW_PARAMS
 .public SECONDARY_TERRAIN_TYPES
 .public SetActiveTeam
-.public Debug_SetDebugFlag
-.public Debug_SetLogFlag
 .public SetRngSeed
 .public SetTeamSetupHeroAndPartnerOnly
 .public SIMPLE_MENU_DEFAULT_WINDOW_PARAMS
@@ -1110,23 +1127,6 @@
 .public sub_0206F38C
 .public sub_0206F4E0
 .public sub_0206F5C8
-.public G3i_OrthoW_
-.public G3i_LookAt_
-.public GX_BeginLoadBGExtPltt
-.public GX_EndLoadBGExtPltt
-.public GX_BeginLoadOBJExtPltt
-.public GX_EndLoadOBJExtPltt
-.public GXS_BeginLoadBGExtPltt
-.public GXS_EndLoadBGExtPltt
-.public GXS_BeginLoadOBJExtPltt
-.public GXS_EndLoadOBJExtPltt
-.public GX_BeginLoadTex
-.public GX_LoadTex
-.public GX_EndLoadTex
-.public GX_BeginLoadTexPltt
-.public GX_LoadTexPltt
-.public GX_EndLoadTexPltt
-.public OS_GetLockID
 .public sub_02079094
 .public sub_0207A2DC
 .public sub_0207B9EC
--- a/asm/include/main_02054C24.inc
+++ b/asm/include/main_02054C24.inc
@@ -185,11 +185,11 @@
 .public _022B9584
 .public _fdiv
 .public _ffltu
+.public _fls
 .public _fmul
 .public _s32_div_f
 .public _u32_div_f
 .public AddMoneyCarried
-.public DirectoryFileMngr_OpenDirectoryFile
 .public ARM9_UNKNOWN_FUNCTION_TABLE__NA_20A3CF4
 .public ARM9_UNKNOWN_TABLE__NA_20A3CC8
 .public ARM9_UNKNOWN_TABLE__NA_20A3CE4
@@ -209,10 +209,13 @@
 .public CopyNStringFromId
 .public CreateCollectionMenu
 .public CreatePortraitBox
+.public Debug_GetDebugFlag
 .public Debug_Print0
 .public DEF_SCARF_STAT_BOOST
 .public DeleteWanTableEntryVeneer
 .public DEMO_TEAMS
+.public DirectoryFileMngr_ExtractAllDirectoryFiles
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DrawTextInWindow
 .public DRIVER_WORK
 .public DUNGEON_SWAP_ID_TABLE
@@ -234,7 +237,6 @@
 .public GetBaseOffensiveStat
 .public GetBodySize
 .public GetCategoryString
-.public Debug_GetDebugFlag
 .public GetDexNumber
 .public GetDungeonMode
 .public GetEvoParameters
@@ -347,7 +349,6 @@
 .public NO_SEND_ITEM_TABLE
 .public NoteLoadBase
 .public NoteSaveBase
-.public DirectoryFileMngr_ExtractAllDirectoryFiles
 .public ov00_022BE0C8
 .public ov01_02337B3C
 .public ov01_02337B68
@@ -397,19 +398,19 @@
 .public ShowPortraitInPortraitBox
 .public ShuffleHiddenPower
 .public SMD_EVENTS_FUN_TABLE
-.public SoundEnvelopeForceVolume
-.public SoundEnvelopeParametersCheckValidity
-.public SoundEnvelopeParametersReset
-.public SoundEnvelopeRelease
-.public SoundEnvelopeReset
-.public SoundEnvelopeSetParameters
-.public SoundEnvelopeStop
-.public SoundEnvelopeStop2
-.public SoundEnvelopeTick
-.public SoundLfoBankReset
-.public SoundLfoBankSet
-.public SoundLfoBankSetConstEnvelopes
-.public SoundLfoBankTick
+.public SoundEnvelope_ForceVolume
+.public SoundEnvelope_Release
+.public SoundEnvelope_Reset
+.public SoundEnvelope_SetParameters
+.public SoundEnvelope_Stop
+.public SoundEnvelope_Stop2
+.public SoundEnvelope_Tick
+.public SoundEnvelopeParameters_CheckValidity
+.public SoundEnvelopeParameters_Reset
+.public SoundLfoBank_Reset
+.public SoundLfoBank_Set
+.public SoundLfoBank_SetConstEnvelopes
+.public SoundLfoBank_Tick
 .public SPECIAL_BAND_STAT_BOOST
 .public SprintfStatic__02054A60
 .public StartThread
@@ -606,7 +607,6 @@
 .public sub_0207F748
 .public sub_0207F808
 .public sub_0207F828
-.public _fls
 .public TACTIC_NAME_STRING_IDS
 .public TACTICS_UNLOCK_LEVEL_TABLE
 .public TEAM_MEMBER_TABLE_PTR
--- a/asm/include/main_02075600.inc
+++ b/asm/include/main_02075600.inc
@@ -1517,8 +1517,6 @@
 .public _020A9EA4
 .public _020A9EB8
 .public _020A9ECC
-.public sTexPlttStartAddrTable
-.public sTexStartAddrTable
 .public _020AEBF8
 .public _020AEC1C
 .public _020AEC5C
@@ -1533,8 +1531,6 @@
 .public _020AEEF0
 .public _020AF38C
 .public _020AFE44
-.public sIsDispOn
-.public GXi_DmaId
 .public _020B2B9C
 .public _020B2BAC
 .public _020B2BB0
@@ -1610,9 +1606,6 @@
 .public _020B333C
 .public _020B3364
 .public _022B9208
-.public sDispMode
-.public GXi_VRamLockId
-.public gGXState
 .public _022B958E
 .public _022B9590
 .public _022B9592
@@ -1625,8 +1618,6 @@
 .public _022B95A0
 .public _022B95A2
 .public _022B95A4
-.public sSubBGExtPltt
-.public sClrImg
 .public _022B95E4
 .public _022B95E8
 .public _022B95EC
@@ -1709,14 +1700,17 @@
 .public _secure
 .public ACTOR_LIST
 .public ARM9_UNKNOWN_DATA__NA_209EAAC
-.public FX_AtanIdxTable_
 .public ARM9_UNKNOWN_TABLE__NA_20AE924
 .public BaseFormsEqual
 .public DTCM_BSS
+.public FX_AtanIdxTable_
 .public GetKeyM2N
 .public GetKeyM2NBaseForm
 .public GetKeyN2M
 .public GetKeyN2MBaseForm
+.public gGXState
+.public GXi_DmaId
+.public GXi_VRamLockId
 .public IsAOrBPressed
 .public LEVEL_LIST
 .public MIi_UncompressBackward
@@ -1736,20 +1730,26 @@
 .public Render3d64Texture0x7
 .public Render3d64Tiling
 .public Render3d64WindowFrame
+.public sClrImg
+.public sDispMode
 .public SDK_MAIN_ARENA_LO
 .public SDK_SECTION_ARENA_DTCM_START
 .public SDK_SECTION_ARENA_EX_START
 .public SDK_SECTION_ARENA_ITCM_START
-.public SoundLfoWaveFullNoiseFunc
-.public SoundLfoWaveFullSquareFunc
-.public SoundLfoWaveFullTriangleFunc
-.public SoundLfoWaveHalfNoiseFunc
-.public SoundLfoWaveHalfSquareFunc
-.public SoundLfoWaveHalfTriangleFunc
-.public SoundLfoWaveInvalidFunc
-.public SoundLfoWaveReverseSawFunc
-.public SoundLfoWaveSawFunc
-.public SoundUtilGetRandomNumber
+.public sIsDispOn
+.public SoundLfoWave_FullNoiseFunc
+.public SoundLfoWave_FullSquareFunc
+.public SoundLfoWave_FullTriangleFunc
+.public SoundLfoWave_HalfNoiseFunc
+.public SoundLfoWave_HalfSquareFunc
+.public SoundLfoWave_HalfTriangleFunc
+.public SoundLfoWave_InvalidFunc
+.public SoundLfoWave_ReverseSawFunc
+.public SoundLfoWave_SawFunc
+.public SoundUtil_GetRandomNumber
+.public sSubBGExtPltt
+.public sTexPlttStartAddrTable
+.public sTexStartAddrTable
 .public STRING_BALANCE_M_LEVEL_BIN
 .public STRING_DUNGEON_DUNGEON_BIN
 .public STRING_EFFECT_EFFECT_BIN
--- a/asm/include/overlay_00.inc
+++ b/asm/include/overlay_00.inc
@@ -10,6 +10,13 @@
 .public _020AEDB0
 .public _022B966C
 .public _022BCA70
+.public _d2f
+.public _dadd
+.public _ddiv
+.public _dflt
+.public _dmul
+.public _dsub
+.public _ll_udiv
 .public _s32_div_f
 .public _start_AutoloadDoneCallback
 .public _u32_div_f
@@ -20,9 +27,11 @@
 .public ArrayFill16
 .public ArrayFill32
 .public ArrayFill32Fast
+.public CRYPTO_RC4Init
+.public Debug_GetDebugFlag
 .public EnableIrqFlag
 .public FileInit
-.public Debug_GetDebugFlag
+.public G3X_Reset
 .public GetFadeStatus
 .public GetLanguage
 .public GetProcessorMode
@@ -136,9 +145,7 @@
 .public sub_020590DC
 .public sub_0205B77C
 .public sub_0205B80C
-.public CRYPTO_RC4Init
 .public sub_020757B0
-.public G3X_Reset
 .public sub_020790DC
 .public sub_0207911C
 .public sub_02079550
@@ -227,13 +234,6 @@
 .public sub_0208B360
 .public sub_0208DEB0
 .public sub_0208DEBC
-.public _dadd
-.public _d2f
-.public _dflt
-.public _dmul
-.public _dsub
-.public _ll_udiv
-.public _ddiv
 .public SVC_WaitByLoop
 .public ThreadExit
 .public UnloadOverlay
--- a/asm/include/overlay_01.inc
+++ b/asm/include/overlay_01.inc
@@ -1,7 +1,9 @@
 #pragma once
 .public _020B0A5C
+.public _ll_udiv
 .public _s32_div_f
 .public _u32_div_f
+.public _ull_mod
 .public ArrayCopy32
 .public BAG_ITEMS_PTR_MIRROR
 .public CardBackupError
@@ -369,8 +371,6 @@
 .public sub_02062B64
 .public sub_0207A2A4
 .public sub_020851AC
-.public _ll_udiv
-.public _ull_mod
 .public UpdateWindow
 .public vsprintf
 .public WAN_TABLE
--- a/asm/include/overlay_02.inc
+++ b/asm/include/overlay_02.inc
@@ -1,7 +1,10 @@
 #pragma once
 .public _020AE224
+.public _ll_mul
+.public _ll_udiv
 .public _s32_div_f
 .public _u32_div_f
+.public _ull_mod
 .public ArrayCopy16
 .public ArrayCopy32
 .public ArrayCopy32Fast
@@ -11,7 +14,65 @@
 .public ClearIrqFlag
 .public EnableIrqFlag
 .public FileInit
+.public FX_DivS32
+.public FX_ModS32
+.public G2_GetBG0CharPtr
+.public G2_GetBG0ScrPtr
+.public G2S_GetBG0ScrPtr
+.public G2x_ChangeBlendBrightness_
+.public G2x_SetBlendBrightness_
 .public GetLanguage
+.public GX_DisableBankForARM7
+.public GX_DisableBankForBG
+.public GX_DisableBankForBGExtPltt
+.public GX_DisableBankForClearImage
+.public GX_DisableBankForLCDC
+.public GX_DisableBankForOBJ
+.public GX_DisableBankForOBJExtPltt
+.public GX_DisableBankForSubBG
+.public GX_DisableBankForSubBGExtPltt
+.public GX_DisableBankForSubOBJ
+.public GX_DisableBankForSubOBJExtPltt
+.public GX_DisableBankForTex
+.public GX_DisableBankForTexPltt
+.public GX_DispOff
+.public GX_DispOn
+.public GX_LoadBG0Char
+.public GX_LoadBG0Scr
+.public GX_LoadBG1Char
+.public GX_LoadBG1Scr
+.public GX_LoadBG2Char
+.public GX_LoadBG2Scr
+.public GX_LoadBG3Char
+.public GX_LoadBG3Scr
+.public GX_LoadBGPltt
+.public GX_LoadOAM
+.public GX_LoadOBJ
+.public GX_LoadOBJPltt
+.public GX_SetBankForARM7
+.public GX_SetBankForBG
+.public GX_SetBankForBGExtPltt
+.public GX_SetBankForClearImage
+.public GX_SetBankForLCDC
+.public GX_SetBankForOBJ
+.public GX_SetBankForOBJExtPltt
+.public GX_SetBankForSubBG
+.public GX_SetBankForSubBGExtPltt
+.public GX_SetBankForSubOBJ
+.public GX_SetBankForSubOBJExtPltt
+.public GX_SetBankForTex
+.public GX_SetBankForTexPltt
+.public GX_SetGraphicsMode
+.public GX_VBlankIntr
+.public GXS_LoadBG0Char
+.public GXS_LoadBG1Char
+.public GXS_LoadBG1Scr
+.public GXS_LoadBGPltt
+.public GXS_LoadOAM
+.public GXS_LoadOBJ
+.public GXS_LoadOBJPltt
+.public GXS_SetGraphicsMode
+.public GXx_SetMasterBrightness_
 .public MemAlloc
 .public memcmp
 .public memcpy
@@ -19,6 +80,7 @@
 .public MemFree
 .public memset
 .public MemsetFast
+.public OS_GetLockID
 .public OS_IRQTable
 .public ov00_022BDC5C
 .public ov00_022BF2C4
@@ -106,72 +168,13 @@
 .public strcpy
 .public strlen
 .public strncpy
-.public FX_DivS32
-.public FX_ModS32
 .public sub_02076070
-.public GX_VBlankIntr
-.public GX_DispOff
-.public GX_DispOn
-.public GX_SetGraphicsMode
-.public GXS_SetGraphicsMode
-.public GXx_SetMasterBrightness_
-.public GX_SetBankForBG
-.public GX_SetBankForOBJ
-.public GX_SetBankForBGExtPltt
-.public GX_SetBankForOBJExtPltt
-.public GX_SetBankForTex
-.public GX_SetBankForTexPltt
-.public GX_SetBankForClearImage
-.public GX_SetBankForARM7
-.public GX_SetBankForLCDC
-.public GX_SetBankForSubBG
-.public GX_SetBankForSubOBJ
-.public GX_SetBankForSubBGExtPltt
-.public GX_SetBankForSubOBJExtPltt
-.public GX_DisableBankForBG
-.public GX_DisableBankForOBJ
-.public GX_DisableBankForBGExtPltt
-.public GX_DisableBankForOBJExtPltt
-.public GX_DisableBankForTex
-.public GX_DisableBankForTexPltt
-.public GX_DisableBankForClearImage
-.public GX_DisableBankForARM7
-.public GX_DisableBankForLCDC
-.public GX_DisableBankForSubBG
-.public GX_DisableBankForSubOBJ
-.public GX_DisableBankForSubBGExtPltt
-.public GX_DisableBankForSubOBJExtPltt
-.public G2_GetBG0ScrPtr
-.public G2S_GetBG0ScrPtr
-.public G2_GetBG0CharPtr
-.public G2x_SetBlendBrightness_
-.public G2x_ChangeBlendBrightness_
-.public GX_LoadBGPltt
-.public GXS_LoadBGPltt
-.public GX_LoadOBJPltt
-.public GXS_LoadOBJPltt
-.public GX_LoadOAM
-.public GXS_LoadOAM
-.public GX_LoadOBJ
-.public GXS_LoadOBJ
-.public GX_LoadBG0Scr
-.public GX_LoadBG1Scr
-.public GXS_LoadBG1Scr
-.public GX_LoadBG2Scr
-.public GX_LoadBG3Scr
-.public GX_LoadBG0Char
-.public GXS_LoadBG0Char
-.public GX_LoadBG1Char
-.public GXS_LoadBG1Char
-.public GX_LoadBG2Char
-.public GX_LoadBG3Char
 .public sub_02078A98
 .public sub_02078B20
 .public sub_02078C3C
 .public sub_02078C68
 .public sub_02078C98
 .public sub_02078CC8
-.public OS_GetLockID
 .public sub_02079094
 .public sub_020790DC
 .public sub_0207911C
@@ -269,7 +272,4 @@
 .public sub_02085030
 .public sub_02085158
 .public sub_0208B360
-.public _ll_udiv
-.public _ull_mod
-.public _ll_mul
 .public WaitForever2
--- a/asm/include/overlay_03.inc
+++ b/asm/include/overlay_03.inc
@@ -1,4 +1,6 @@
 #pragma once
+.public _ll_udiv
+.public _ull_mod
 .public AddItemToStorage
 .public CanSendItem
 .public CloseAdvancedMenu
@@ -240,6 +242,4 @@
 .public sub_020698B8
 .public sub_02069904
 .public sub_02069940
-.public _ll_udiv
-.public _ull_mod
 .public UnloadFile
--- a/asm/include/overlay_05.inc
+++ b/asm/include/overlay_05.inc
@@ -1,4 +1,6 @@
 #pragma once
+.public _ll_udiv
+.public _ull_mod
 .public CloseAdvancedMenu
 .public CreateAdvancedMenu
 .public DrawTextInWindow
@@ -105,6 +107,4 @@
 .public sub_020590DC
 .public sub_0205BD78
 .public sub_02062B64
-.public _ll_udiv
-.public _ull_mod
 .public UpdateWindow
--- a/asm/include/overlay_07.inc
+++ b/asm/include/overlay_07.inc
@@ -1,5 +1,7 @@
 #pragma once
+.public _ll_udiv
 .public _s32_div_f
+.public _ull_mod
 .public CloseCollectionMenu
 .public CloseOptionsMenu
 .public CloseTextBox
@@ -146,6 +148,4 @@
 .public sub_0204A018
 .public sub_0204A1CC
 .public sub_0205BD78
-.public _ll_udiv
-.public _ull_mod
 .public UpdateWindow
--- a/asm/include/overlay_10.inc
+++ b/asm/include/overlay_10.inc
@@ -3,7 +3,6 @@
 .public _020B0A5C
 .public _s32_div_f
 .public abs
-.public DirectoryFileMngr_OpenDirectoryFile
 .public BAG_ITEMS_PTR_MIRROR
 .public CalcMenuHeightDiv8__020329E4
 .public CleanStickyItemsInBag
@@ -13,11 +12,14 @@
 .public CloseTextBox2
 .public CreatePortraitBox
 .public CreateTextBox
+.public Debug_GetDebugFlag
 .public Debug_Print0
 .public DecompressAtFromMemoryPointerVeneer
 .public DecompressAtNormalVeneer
 .public DeleteWanTableEntryVeneer
 .public DeleteWindow
+.public DirectoryFileMngr_GetDirectoryFileSize
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DoesNotSaveWhenEntering
 .public DoMoveAbsorb
 .public DoMoveAttract
@@ -164,11 +166,9 @@
 .public GetBgRegionArea
 .public GetBodySize
 .public GetCurrentBagCapacity
-.public Debug_GetDebugFlag
 .public GetDungeonGroup
 .public GetDungeonMode
 .public GetDungeonModeSpecial
-.public DirectoryFileMngr_GetDirectoryFileSize
 .public GetGameMode
 .public GetItemAtIdx
 .public GetMoneyCarried
--- a/asm/include/overlay_11.inc
+++ b/asm/include/overlay_11.inc
@@ -54,8 +54,9 @@
 .public CreateSimpleMenu
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
+.public Debug_FatalError
+.public Debug_GetDebugFlag
+.public Debug_GetLogFlag
 .public Debug_Print
 .public Debug_Print0
 .public DecompressAtNormalVeneer
@@ -73,14 +74,17 @@
 .public EuclideanNorm__02005050
 .public EuclideanNorm__020050B0
 .public EVENTS
-.public Debug_FatalError
 .public FemaleToMaleForm
 .public FileClose
-.public FileRom_Veneer_FileInit
 .public FileRom_HandleOpen
 .public FileRom_HandleRead
 .public FileRom_HandleSeek
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
 .public FreeTeamStats
+.public FX_Atan2Idx
+.public G3X_Reset
 .public GenerateDailyMissions
 .public GenerateKecleonItems1
 .public GenerateKecleonItems2
@@ -92,8 +96,6 @@
 .public GetAdvancedMenuResult
 .public GetAtSize
 .public GetCurrentBagCapacity
-.public Debug_GetDebugFlag
-.public Debug_GetLogFlag
 .public GetDexNumber
 .public GetDungeonMode
 .public GetDungeonModeSpecial
@@ -799,9 +801,6 @@
 .public sub_0206C134
 .public sub_0206C144
 .public sub_0206C164
-.public VEC_Distance
-.public FX_Atan2Idx
-.public G3X_Reset
 .public SwitchAnimationControlToNextFrame
 .public TEAM_MEMBER_TABLE_PTR
 .public TRIG_TABLE
@@ -809,6 +808,7 @@
 .public UnloadOverlay
 .public UpdateTeamStats
 .public UpdateWindow
+.public VEC_Distance
 .public vsprintf
 .public WAN_TABLE
 .public ZInit8
--- a/asm/include/overlay_13.inc
+++ b/asm/include/overlay_13.inc
@@ -10,11 +10,11 @@
 .public CreatePortraitBox
 .public CreateSimpleMenuFromStringIds
 .public CreateTextBox
+.public Debug_GetDebugFlag
 .public DrawTextInWindow
 .public FemaleToMaleForm
 .public GetAdvancedMenuCurrentOption
 .public GetAdvancedMenuResult
-.public Debug_GetDebugFlag
 .public GetKeyboardStatus
 .public GetKeyboardStringResult
 .public GetMonsterGenderVeneer
--- a/asm/include/overlay_29_022DC2B8.inc
+++ b/asm/include/overlay_29_022DC2B8.inc
@@ -1,26 +1,29 @@
 #pragma once
-.public DirectoryFileMngr_OpenDirectoryFile
+.public _020AFC4C
+.public _020AFC70
+.public _s32_div_f
 .public AllocTopScreenStatus
 .public ChangeGiratinaFormIfSkyDungeon
 .public ClearHiddenStairs
 .public CloseFixedBin
 .public CountItemsOnFloorForAcuteSniffer
 .public Debug_Print0
-.public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DeleteAllMonsterSpriteFiles
 .public DetermineAllTilesWalkableNeighbors
+.public DIRECTIONS_XY
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DisplayFloorCard
 .public DisplayMessage
 .public DisplayMessage2
 .public DrawTeamStats
+.public DUNGEON_PTR
 .public DungeonGoesUp
 .public DungeonRandInt
 .public DungeonRngUnsetSecondary
 .public EnemyEvolution
 .public EntityIsValid__022E0354
-.public FIXED_ROOM_REVISIT_OVERRIDES
 .public FadeToBlack
+.public FIXED_ROOM_REVISIT_OVERRIDES
 .public FreeLoadedAttackSpriteAndMore
 .public FreeMapAndTeam
 .public FreeTeamStats
@@ -59,36 +62,6 @@
 .public MemFree
 .public MemZero
 .public OpenFixedBin
-.public Rand16Bit
-.public RefillTeam
-.public ResetGravity
-.public RunFractionalTurn
-.public SetBothScreensWindowColorToDefault
-.public SetDungeonRngPreseed
-.public SetDungeonRngPreseed23Bit
-.public SetForcedLossReason
-.public SetMaxReachedFloor
-.public SetMinimapDataE447
-.public SpawnInitialMonsters
-.public SpawnShopkeepers
-.public SpawnTeam
-.public StartFadeDungeonWrapper
-.public TryActivateArtificialWeatherAbilities
-.public TryActivateIqBooster
-.public TryActivateSlowStart
-.public TryActivateWeather
-.public TryForcedLoss
-.public TryInflictBurnStatusWholeTeam
-.public TrySpawnDoughSeedPoke
-.public UnloadFile
-.public UpdateMinimap
-.public UpdateShouldBoostHiddenStairsSpawnChance
-.public UpdateShouldBoostKecleonShopSpawnChance
-.public UpdateTeamStats
-.public UpdateTrapsVisibility
-.public _020AFC4C
-.public _020AFC70
-.public _s32_div_f
 .public ov10_022BDAB0
 .public ov10_022BDB54
 .public ov10_022BDB60
@@ -290,6 +263,20 @@
 .public ov29_02373690
 .public ov29_0237C6D4
 .public ov29_0237C714
+.public Rand16Bit
+.public RefillTeam
+.public ResetGravity
+.public RunFractionalTurn
+.public SetBothScreensWindowColorToDefault
+.public SetDungeonRngPreseed
+.public SetDungeonRngPreseed23Bit
+.public SetForcedLossReason
+.public SetMaxReachedFloor
+.public SetMinimapDataE447
+.public SpawnInitialMonsters
+.public SpawnShopkeepers
+.public SpawnTeam
+.public StartFadeDungeonWrapper
 .public sub_01FF8130
 .public sub_01FF81CC
 .public sub_01FF8C60
@@ -342,3 +329,16 @@
 .public sub_02063734
 .public sub_02063770
 .public sub_02063830
+.public TryActivateArtificialWeatherAbilities
+.public TryActivateIqBooster
+.public TryActivateSlowStart
+.public TryActivateWeather
+.public TryForcedLoss
+.public TryInflictBurnStatusWholeTeam
+.public TrySpawnDoughSeedPoke
+.public UnloadFile
+.public UpdateMinimap
+.public UpdateShouldBoostHiddenStairsSpawnChance
+.public UpdateShouldBoostKecleonShopSpawnChance
+.public UpdateTeamStats
+.public UpdateTrapsVisibility
--- a/asm/include/overlay_29_022E0378.inc
+++ b/asm/include/overlay_29_022E0378.inc
@@ -2,9 +2,9 @@
 .public _020AFC28
 .public _020AFC4C
 .public _020AFC70
-.public DirectoryFileMngr_OpenDirectoryFile
 .public AnimationDelayOrSomething
 .public CalcSpeedStageWrapper
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DisplayMessage2
 .public DUNGEON_PTR
 .public DungeonGoesUp
--- a/asm/include/overlay_29_022F62CC.inc
+++ b/asm/include/overlay_29_022F62CC.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public _ll_sdiv
 .public abs
 .public AddMoneyCarried
 .public AnimationDelayOrSomething
@@ -52,7 +53,6 @@
 .public RemoveGroundItem
 .public SpawnItem
 .public sub_020018A4
-.public _ll_sdiv
 .public TeamLeaderIqSkillIsEnabled
 .public TryWarp
 .public WAN_TABLE
--- a/asm/include/overlay_29_022F7388.inc
+++ b/asm/include/overlay_29_022F7388.inc
@@ -18,6 +18,7 @@
 .public Conversion2IsActive
 .public DeleteWanTableEntryVeneer
 .public DIRECTIONS_XY
+.public DirectoryFileMngr_GetDirectoryFileSize
 .public DiscoverMinimap
 .public DisplayAnimatedNumbers
 .public DisplayMessage
@@ -50,7 +51,6 @@
 .public GetDirectionTowardsPosition
 .public GetExp
 .public GetExplorerMazeMonster
-.public DirectoryFileMngr_GetDirectoryFileSize
 .public GetFloorType
 .public GetForcedLossReason
 .public GetLeader
--- a/asm/include/overlay_29_0231CBEC.inc
+++ b/asm/include/overlay_29_0231CBEC.inc
@@ -1,7 +1,6 @@
 #pragma once
 .public _020A1894
 .public AbilityIsActiveVeneer
-.public DirectoryFileMngr_OpenDirectoryFile
 .public ATK_STAT_IDX
 .public BoostIQ
 .public BoostOffensiveStat
@@ -13,6 +12,7 @@
 .public ClearMonsterActionFields
 .public DetermineTileWalkableNeighbors
 .public DIRECTIONS_XY
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DisplayMessage2
 .public DUNGEON_PTR
 .public DungeonRandInt
--- a/asm/include/overlay_29_02337CCC.inc
+++ b/asm/include/overlay_29_02337CCC.inc
@@ -3,12 +3,12 @@
 .public _020AFC70
 .public _s32_div_f
 .public abs
-.public DirectoryFileMngr_OpenDirectoryFile
 .public CORNER_CARDINAL_NEIGHBOR_IS_OPEN
 .public CountStickyItemsInBag
 .public DetermineAllTilesWalkableNeighbors
 .public DetermineTileWalkableNeighbors
 .public DIRECTIONS_XY
+.public DirectoryFileMngr_OpenDirectoryFile
 .public DUNGEON_PTR
 .public DungeonRand16Bit
 .public DungeonRandInt
--- a/asm/include/overlay_29_023498A0.inc
+++ b/asm/include/overlay_29_023498A0.inc
@@ -24,6 +24,7 @@
 .public EntityIsValid__0234987C
 .public FemaleToMaleForm
 .public FixedRoomIsSubstituteRoom
+.public G3X_Reset
 .public GetAcceptedMission
 .public GetDungeonPtrMaster
 .public GetDungeonTipShown
@@ -275,7 +276,6 @@
 .public sub_02051DD0
 .public sub_02051E60
 .public sub_0205BAB0
-.public G3X_Reset
 .public SubstitutePlaceholderStringTags
 .public UnloadOverlay
 .public WriteQuicksaveData
--- a/asm/include/overlay_34.inc
+++ b/asm/include/overlay_34.inc
@@ -5,6 +5,7 @@
 .public CreateDialogueBox
 .public CreateParentMenuFromStringIds
 .public Debug_GetDebugFlag
+.public G3X_Reset
 .public GetFadeStatus
 .public IsDialogueBoxActive
 .public IsParentMenuActive
@@ -62,4 +63,3 @@
 .public sub_02051B44
 .public sub_02051C24
 .public sub_02052060
-.public G3X_Reset
--- a/asm/main_02054C24.s
+++ b/asm/main_02054C24.s
@@ -28987,8 +28987,8 @@ sub_0206C8C4: ; 0x0206C8C4
 	bx lr
 	arm_func_end sub_0206C8C4

-	arm_func_start SoundUtilGetRandomNumber
-SoundUtilGetRandomNumber: ; 0x0206C8F4
+	arm_func_start SoundUtil_GetRandomNumber
+SoundUtil_GetRandomNumber: ; 0x0206C8F4
 	ldr r1, _0206C914 ; =DRIVER_WORK
 	ldr r0, _0206C918 ; =0x00007FFF
 	ldr r2, [r1, #0x34]
@@ -29000,7 +29000,7 @@ SoundUtilGetRandomNumber: ; 0x0206C8F4
 	.align 2, 0
 _0206C914: .word DRIVER_WORK
 _0206C918: .word 0x00007FFF
-	arm_func_end SoundUtilGetRandomNumber
+	arm_func_end SoundUtil_GetRandomNumber

 	arm_func_start sub_0206C91C
 sub_0206C91C: ; 0x0206C91C
@@ -33176,9 +33176,9 @@ _0206FF5C:
 _0206FFE0:
 	add r0, r7, #0x3c
 	mov r1, fp
-	bl SoundEnvelopeForceVolume
+	bl SoundEnvelope_ForceVolume
 	add r0, r7, #0x5c
-	bl SoundLfoBankReset
+	bl SoundLfoBank_Reset
 	mov r0, #1
 	strh r0, [r7, #6]
 	ldrb r0, [sl, #0x1f]
@@ -33684,9 +33684,9 @@ FlushChannels: ; 0x02070674
 	bl sub_020748A0
 	add r0, r5, #0x3c
 	mvn r1, #0xc0000000
-	bl SoundEnvelopeForceVolume
+	bl SoundEnvelope_ForceVolume
 	add r0, r5, #0x5c
-	bl SoundLfoBankReset
+	bl SoundLfoBank_Reset
 	mov r0, #0
 	strh r0, [r5, #6]
 	mov r0, #0x10
@@ -33809,9 +33809,9 @@ _02070810:
 	movne r0, #0x7f
 	str r0, [sl, #0x144]
 	add r0, sl, #0x3c
-	bl SoundEnvelopeForceVolume
+	bl SoundEnvelope_ForceVolume
 	add r0, sl, #0x5c
-	bl SoundLfoBankReset
+	bl SoundLfoBank_Reset
 	add sb, sb, #1
 	strh r5, [sl, #6]
 	cmp sb, #2
@@ -35374,7 +35374,7 @@ sub_02071CC8: ; 0x02071CC8
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	add r0, r3, #0x64
-	bl SoundEnvelopeParametersReset
+	bl SoundEnvelopeParameters_Reset
 	mov r0, r4
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_02071CC8
@@ -35386,7 +35386,7 @@ sub_02071CE0: ; 0x02071CE0
 	ldrb r1, [r4]
 	add r0, r3, #0x64
 	strb r1, [r3, #0x6c]
-	bl SoundEnvelopeParametersCheckValidity
+	bl SoundEnvelopeParameters_CheckValidity
 	add r0, r4, #1
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_02071CE0
@@ -35398,7 +35398,7 @@ sub_02071D00: ; 0x02071D00
 	ldrb r1, [r4]
 	add r0, r3, #0x64
 	strb r1, [r3, #0x6d]
-	bl SoundEnvelopeParametersCheckValidity
+	bl SoundEnvelopeParameters_CheckValidity
 	add r0, r4, #1
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_02071D00
@@ -35410,7 +35410,7 @@ sub_02071D20: ; 0x02071D20
 	ldrb r1, [r4]
 	add r0, r3, #0x64
 	strb r1, [r3, #0x70]
-	bl SoundEnvelopeParametersCheckValidity
+	bl SoundEnvelopeParameters_CheckValidity
 	add r0, r4, #1
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_02071D20
@@ -35426,7 +35426,7 @@ sub_02071D40: ; 0x02071D40
 	cmp r0, #0xff
 	strneb r0, [r3, #0x6f]
 	add r0, r3, #0x64
-	bl SoundEnvelopeParametersCheckValidity
+	bl SoundEnvelopeParameters_CheckValidity
 	add r0, r4, #2
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_02071D40
@@ -35438,7 +35438,7 @@ sub_02071D70: ; 0x02071D70
 	ldrb r1, [r4]
 	add r0, r3, #0x64
 	strb r1, [r3, #0x71]
-	bl SoundEnvelopeParametersCheckValidity
+	bl SoundEnvelopeParameters_CheckValidity
 	add r0, r4, #1
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_02071D70
@@ -35450,7 +35450,7 @@ sub_02071D90: ; 0x02071D90
 	ldrb r1, [r4]
 	add r0, r3, #0x64
 	strb r1, [r3, #0x72]
-	bl SoundEnvelopeParametersCheckValidity
+	bl SoundEnvelopeParameters_CheckValidity
 	add r0, r4, #1
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_02071D90
@@ -37027,42 +37027,42 @@ sub_02073088: ; 0x02073088

 	arm_func_start sub_02073094
 sub_02073094: ; 0x02073094
-	ldr ip, _020730A4 ; =SoundEnvelopeParametersCheckValidity
+	ldr ip, _020730A4 ; =SoundEnvelopeParameters_CheckValidity
 	strb r1, [r0, #0x72]
 	add r0, r0, #0x64
 	bx ip
 	.align 2, 0
-_020730A4: .word SoundEnvelopeParametersCheckValidity
+_020730A4: .word SoundEnvelopeParameters_CheckValidity
 	arm_func_end sub_02073094

 	arm_func_start sub_020730A8
 sub_020730A8: ; 0x020730A8
-	ldr ip, _020730B8 ; =SoundEnvelopeParametersCheckValidity
+	ldr ip, _020730B8 ; =SoundEnvelopeParameters_CheckValidity
 	strb r1, [r0, #0x6d]
 	add r0, r0, #0x64
 	bx ip
 	.align 2, 0
-_020730B8: .word SoundEnvelopeParametersCheckValidity
+_020730B8: .word SoundEnvelopeParameters_CheckValidity
 	arm_func_end sub_020730A8

 	arm_func_start sub_020730BC
 sub_020730BC: ; 0x020730BC
-	ldr ip, _020730CC ; =SoundEnvelopeParametersCheckValidity
+	ldr ip, _020730CC ; =SoundEnvelopeParameters_CheckValidity
 	strb r1, [r0, #0x6e]
 	add r0, r0, #0x64
 	bx ip
 	.align 2, 0
-_020730CC: .word SoundEnvelopeParametersCheckValidity
+_020730CC: .word SoundEnvelopeParameters_CheckValidity
 	arm_func_end sub_020730BC

 	arm_func_start sub_020730D0
 sub_020730D0: ; 0x020730D0
-	ldr ip, _020730E0 ; =SoundEnvelopeParametersCheckValidity
+	ldr ip, _020730E0 ; =SoundEnvelopeParameters_CheckValidity
 	strb r1, [r0, #0x71]
 	add r0, r0, #0x64
 	bx ip
 	.align 2, 0
-_020730E0: .word SoundEnvelopeParametersCheckValidity
+_020730E0: .word SoundEnvelopeParameters_CheckValidity
 	arm_func_end sub_020730D0

 	arm_func_start sub_020730E4
@@ -37778,7 +37778,7 @@ _020739A8:
 	cmp r0, #4
 	blt _020739A8
 	add r0, r4, #0x64
-	bl SoundEnvelopeParametersReset
+	bl SoundEnvelopeParameters_Reset
 	mov r0, #0
 	ldr r1, _02073A88 ; =0x04000208
 	str r0, [r4, #0xb4]
@@ -37851,7 +37851,7 @@ _02073AB4:
 	strh r5, [r6, #4]
 	str r5, [r6, #0x158]
 	str r5, [r6, #0x154]
-	bl SoundEnvelopeStop
+	bl SoundEnvelope_Stop
 	ldr r0, [r6, #0x14c]
 	cmp r7, #0
 	and r0, r0, #0xff
@@ -37970,7 +37970,7 @@ _02073C48:
 	str lr, [r5, #0xc0]
 _02073C4C:
 	add r0, r5, #0x64
-	bl SoundEnvelopeParametersReset
+	bl SoundEnvelopeParameters_Reset
 	mov r0, r4
 	ldmia sp!, {r4, r5, r6, r7, r8, pc}
 	arm_func_end sub_02073BC8
@@ -37986,7 +37986,7 @@ sub_02073C5C: ; 0x02073C5C
 _02073C74:
 	mov r1, r5
 	add r0, r4, #0x5c
-	bl SoundLfoBankSetConstEnvelopes
+	bl SoundLfoBank_SetConstEnvelopes
 	ldr r4, [r4, #0x154]
 	cmp r4, #0
 	bne _02073C74
@@ -38027,7 +38027,7 @@ sub_02073CD8: ; 0x02073CD8
 	ldrb r0, [r5, #0xc]
 	sub r0, r2, r0
 	add r6, r0, #1
-	bl SoundUtilGetRandomNumber
+	bl SoundUtil_GetRandomNumber
 	mul r1, r6, r0
 	mov r0, r1, asr #0xe
 	ldrb r2, [r5, #0xc]
@@ -38188,7 +38188,7 @@ sub_02073EDC: ; 0x02073EDC
 	moveq r0, #0
 	streq r0, [sp]
 	beq _02073F28
-	bl SoundUtilGetRandomNumber
+	bl SoundUtil_GetRandomNumber
 	mov r1, r4, lsl #1
 	mul r2, r1, r0
 	mov r0, r2, asr #0xe
@@ -38317,7 +38317,7 @@ _020740B0:
 	orr r2, r2, #0xff0
 	strh r2, [r4, #6]
 	ldrsb r2, [sl, #0x51]
-	bl SoundLfoBankSet
+	bl SoundLfoBank_Set
 	add r0, r5, #0x20
 	add r8, r4, #0x3c
 	ldmia r0, {r0, r1, r2, r3}
@@ -38329,7 +38329,7 @@ _020740B0:
 	beq _02074128
 	mov r0, r8
 	add r1, sl, #0x64
-	bl SoundEnvelopeSetParameters
+	bl SoundEnvelope_SetParameters
 _02074128:
 	mov r1, r4
 	mov r0, sl
@@ -38512,9 +38512,9 @@ _02074364:
 	strb r7, [sb, #0x16]
 	add r0, sb, #0x3c
 	strb r5, [sb, #0x17]
-	bl SoundEnvelopeReset
+	bl SoundEnvelope_Reset
 	add r0, sb, #0x5c
-	bl SoundLfoBankReset
+	bl SoundLfoBank_Reset
 	str r4, [sb, #0x154]
 	str r4, [sb, #0x158]
 	ldrh r0, [sl, #0x2e]
@@ -38596,13 +38596,13 @@ UpdateChannels: ; 0x0207448C
 	mov r4, #2
 _020744B0:
 	add r0, r5, #0x3c
-	bl SoundEnvelopeTick
+	bl SoundEnvelope_Tick
 	ldrsb r1, [r5, #0x5a]
 	mov r8, r0
 	cmp r1, #1
 	bne _02074514
 	add r0, r5, #0x5c
-	bl SoundLfoBankTick
+	bl SoundLfoBank_Tick
 	ldrh r1, [r5, #6]
 	orr r0, r1, r0
 	strh r0, [r5, #6]
@@ -38675,7 +38675,7 @@ _020745B4:
 	tst r8, #1
 	bne _020745F0
 	add r0, r6, #0x3c
-	bl SoundEnvelopeStop2
+	bl SoundEnvelope_Stop2
 	add r0, r6, #0x100
 	strh r5, [r0, #0x4c]
 	b _020745F0
@@ -38885,7 +38885,7 @@ sub_0207485C: ; 0x0207485C
 	add r0, r4, #0x3c
 	and r1, r1, #0xff
 	str r1, [r4, #0x14c]
-	bl SoundEnvelopeRelease
+	bl SoundEnvelope_Release
 	ldrh r0, [r4, #6]
 	bic r0, r0, #1
 	strh r0, [r4, #6]
@@ -38921,7 +38921,7 @@ _020748F0:
 	str r0, [r4, #0x158]
 	str r0, [r4, #0x154]
 	add r0, r4, #0x3c
-	bl SoundEnvelopeStop
+	bl SoundEnvelope_Stop
 	ldr r1, [r4, #0x14c]
 	mov r0, #0
 	and r1, r1, #0xff
@@ -38944,7 +38944,7 @@ _02074948:
 	str r0, [r4, #0x158]
 	str r0, [r4, #0x154]
 	add r0, r4, #0x3c
-	bl SoundEnvelopeStop
+	bl SoundEnvelope_Stop
 	ldr r1, [r4, #0x14c]
 	mov r0, #0
 	and r1, r1, #0xff
--- a/asm/main_02075600.s
+++ b/asm/main_02075600.s
@@ -53863,22 +53863,22 @@ MUSIC_DURATION_LOOKUP_TABLE_2:
 	.byte 0x77, 0x62, 0x04, 0x00, 0x00, 0x7B, 0x04, 0x00, 0xFF, 0xFF, 0xFF, 0x7F
 	.global LFO_WAVEFORM_CALLBACKS
 LFO_WAVEFORM_CALLBACKS:
-	.word SoundLfoWaveHalfSquareFunc
-	.word SoundLfoWaveFullSquareFunc
-	.word SoundLfoWaveHalfTriangleFunc
-	.word SoundLfoWaveFullTriangleFunc
-	.word SoundLfoWaveSawFunc
-	.word SoundLfoWaveReverseSawFunc
-	.word SoundLfoWaveHalfNoiseFunc
-	.word SoundLfoWaveFullNoiseFunc
-	.word SoundLfoWaveInvalidFunc
-	.word SoundLfoWaveInvalidFunc
-	.word SoundLfoWaveInvalidFunc
-	.word SoundLfoWaveInvalidFunc
-	.word SoundLfoWaveInvalidFunc
-	.word SoundLfoWaveInvalidFunc
-	.word SoundLfoWaveInvalidFunc
-	.word SoundLfoWaveInvalidFunc
+	.word SoundLfoWave_HalfSquareFunc
+	.word SoundLfoWave_FullSquareFunc
+	.word SoundLfoWave_HalfTriangleFunc
+	.word SoundLfoWave_FullTriangleFunc
+	.word SoundLfoWave_SawFunc
+	.word SoundLfoWave_ReverseSawFunc
+	.word SoundLfoWave_HalfNoiseFunc
+	.word SoundLfoWave_FullNoiseFunc
+	.word SoundLfoWave_InvalidFunc
+	.word SoundLfoWave_InvalidFunc
+	.word SoundLfoWave_InvalidFunc
+	.word SoundLfoWave_InvalidFunc
+	.word SoundLfoWave_InvalidFunc
+	.word SoundLfoWave_InvalidFunc
+	.word SoundLfoWave_InvalidFunc
+	.word SoundLfoWave_InvalidFunc
 	.global _020B1290
 _020B1290:
 	.byte 0x00, 0x01, 0x02, 0x03
--- a/lib/DSE/asm/dc_lfo_1.s
+++ b/lib/DSE/asm/dc_lfo_1.s
@@ -4,8 +4,8 @@
 	.text

 ; https://decomp.me/scratch/Md0hi
-	arm_func_start SoundLfoBankSet
-SoundLfoBankSet: ; 0x020750B4
+	arm_func_start SoundLfoBank_Set
+SoundLfoBank_Set: ; 0x020750B4
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
 	sub sp, sp, #0x20
 	mov sb, r0
@@ -141,4 +141,4 @@ _0207529C: .word LFO_OUTPUT_VOICE_UPDATE_FLAGS
 _020752A0: .word 0x81020409
 _020752A4: .word DRIVER_WORK
 _020752A8: .word LFO_WAVEFORM_CALLBACKS
-	arm_func_end SoundLfoBankSet
+	arm_func_end SoundLfoBank_Set
--- a/lib/DSE/include/dc_envelope.h
+++ b/lib/DSE/include/dc_envelope.h
@@ -47,16 +47,16 @@ struct driver_work {
    s16 usec_per_sound_driver_tick;
 };

-void SoundEnvelopeReset(struct sound_envelope *envelope);
-void SoundEnvelopeParametersReset(struct sound_envelope_parameters *parameters);
-void SoundEnvelopeParametersCheckValidity(struct sound_envelope_parameters *parameters);
-void SoundEnvelopeSetParameters(struct sound_envelope *envelope, struct sound_envelope_parameters *parameters);
-void SoundEnvelopeSetSlide(struct sound_envelope *envelope, s32 target_volume, s32 msec_tab_index);
+void SoundEnvelope_Reset(struct sound_envelope *envelope);
+void SoundEnvelopeParameters_Reset(struct sound_envelope_parameters *parameters);
+void SoundEnvelopeParameters_CheckValidity(struct sound_envelope_parameters *parameters);
+void SoundEnvelope_SetParameters(struct sound_envelope *envelope, struct sound_envelope_parameters *parameters);
+void SoundEnvelope_SetSlide(struct sound_envelope *envelope, s32 target_volume, s32 msec_tab_index);
 void UpdateTrackVolumeEnvelopes(struct sound_envelope *envelope);
-void SoundEnvelopeRelease(struct sound_envelope *envelope);
-void SoundEnvelopeStop(struct sound_envelope *envelope);
-void SoundEnvelopeForceVolume(struct sound_envelope *envelope, s32 volume);
-void SoundEnvelopeStop2(struct sound_envelope *envelope);
-s8 SoundEnvelopeTick(struct sound_envelope *envelope);
+void SoundEnvelope_Release(struct sound_envelope *envelope);
+void SoundEnvelope_Stop(struct sound_envelope *envelope);
+void SoundEnvelope_ForceVolume(struct sound_envelope *envelope, s32 volume);
+void SoundEnvelope_Stop2(struct sound_envelope *envelope);
+s8 SoundEnvelope_Tick(struct sound_envelope *envelope);

 #endif //PMDSKY_DC_ENVELOPE_H
--- a/lib/DSE/include/dc_lfo.h
+++ b/lib/DSE/include/dc_lfo.h
@@ -48,6 +48,6 @@ struct dse_lfo_bank
    //+0xe0
 };

-void SoundLfoBankReset(struct dse_lfo_bank *lfo_bank);
+void SoundLfoBank_Reset(struct dse_lfo_bank *lfo_bank);

 #endif //PMDSKY_DC_LFO_H
--- a/lib/DSE/include/dc_lfo_2.h
+++ b/lib/DSE/include/dc_lfo_2.h
@@ -3,18 +3,18 @@

 #include "dc_lfo.h"

-void SoundLfoBankSetConstEnvelopes(struct dse_lfo_bank *lfo_bank, s8 level);
-u16 SoundLfoBankTick(struct dse_lfo_bank *lfo_bank);
+void SoundLfoBank_SetConstEnvelopes(struct dse_lfo_bank *lfo_bank, s8 level);
+u16 SoundLfoBank_Tick(struct dse_lfo_bank *lfo_bank);

 //Waveform callbacks
-s32 SoundLfoWaveInvalidFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveHalfSquareFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveFullSquareFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveHalfTriangleFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveFullTriangleFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveSawFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveReverseSawFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveHalfNoiseFunc(struct dse_lfo *lfo);
-s32 SoundLfoWaveFullNoiseFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_InvalidFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_HalfSquareFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_FullSquareFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_HalfTriangleFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_FullTriangleFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_SawFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_ReverseSawFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_HalfNoiseFunc(struct dse_lfo *lfo);
+s32 SoundLfoWave_FullNoiseFunc(struct dse_lfo *lfo);

 #endif //PMDSKY_DC_LFO_2_H
--- a/lib/DSE/src/dc_envelope.c
+++ b/lib/DSE/src/dc_envelope.c
@@ -4,14 +4,14 @@ extern u16 MUSIC_DURATION_LOOKUP_TABLE_1[128];
 extern u32 MUSIC_DURATION_LOOKUP_TABLE_2[128];
 extern struct driver_work DRIVER_WORK;

-void SoundEnvelopeReset(struct sound_envelope *envelope)
+void SoundEnvelope_Reset(struct sound_envelope *envelope)
 {
    envelope->parameters.use_envelope = 0;
    envelope->state = ENVELOPE_STATE_OFF;
    envelope->current_volume = 0;
 }

-void SoundEnvelopeParametersReset(struct sound_envelope_parameters *parameters)
+void SoundEnvelopeParameters_Reset(struct sound_envelope_parameters *parameters)
 {
    /*
    parameters->use_envelope = 0;
@@ -33,7 +33,7 @@ void SoundEnvelopeParametersReset(struct sound_envelope_parameters *parameters)
    ((u32 *)parameters)[3] = 0xffffffff;
 }

-void SoundEnvelopeParametersCheckValidity(struct sound_envelope_parameters *parameters)
+void SoundEnvelopeParameters_CheckValidity(struct sound_envelope_parameters *parameters)
 {
    parameters->use_envelope = 1;

@@ -50,7 +50,7 @@ void SoundEnvelopeParametersCheckValidity(struct sound_envelope_parameters *para
    }
 }

-void SoundEnvelopeSetParameters(struct sound_envelope *envelope, struct sound_envelope_parameters *parameters)
+void SoundEnvelope_SetParameters(struct sound_envelope *envelope, struct sound_envelope_parameters *parameters)
 {
    if (parameters->slide_time_multiplier <= 0x7f)
    {
@@ -86,7 +86,7 @@ void SoundEnvelopeSetParameters(struct sound_envelope *envelope, struct sound_en
    }
 }

-void SoundEnvelopeSetSlide(struct sound_envelope *envelope, s32 target_volume, s32 msec_tab_index)
+void SoundEnvelope_SetSlide(struct sound_envelope *envelope, s32 target_volume, s32 msec_tab_index)
 {
    u8 slide_time_multiplier;

@@ -128,7 +128,7 @@ void UpdateTrackVolumeEnvelopes(struct sound_envelope *envelope)
        {
            envelope->current_volume = envelope->parameters.attack_begin << 23;
            envelope->state = ENVELOPE_STATE_ATTACK;
-            SoundEnvelopeSetSlide(envelope, 0x7f, envelope->parameters.attack_time);
+            SoundEnvelope_SetSlide(envelope, 0x7f, envelope->parameters.attack_time);
        }
        else
        {
@@ -136,19 +136,19 @@ void UpdateTrackVolumeEnvelopes(struct sound_envelope *envelope)

            if (envelope->parameters.hold_time != 0)
            {
-                SoundEnvelopeSetSlide(envelope, 0x7f, envelope->parameters.hold_time);
+                SoundEnvelope_SetSlide(envelope, 0x7f, envelope->parameters.hold_time);
                envelope->state = ENVELOPE_STATE_HOLD;
            }
            else if (envelope->parameters.decay_time != 0)
            {
-                SoundEnvelopeSetSlide(envelope, (s8)envelope->parameters.sustain_level, envelope->parameters.decay_time);
+                SoundEnvelope_SetSlide(envelope, (s8)envelope->parameters.sustain_level, envelope->parameters.decay_time);

                envelope->state = ENVELOPE_STATE_DECAY;
            }
            else
            {
                //Do not set volume to sustain level?
-                SoundEnvelopeSetSlide(envelope, 0, envelope->parameters.sustain_time);
+                SoundEnvelope_SetSlide(envelope, 0, envelope->parameters.sustain_time);
                envelope->state = ENVELOPE_STATE_SUSTAIN;
            }
        }
@@ -165,16 +165,16 @@ void UpdateTrackVolumeEnvelopes(struct sound_envelope *envelope)
    }
 }

-void SoundEnvelopeRelease(struct sound_envelope *envelope)
+void SoundEnvelope_Release(struct sound_envelope *envelope)
 {
    if (envelope->state == ENVELOPE_STATE_OFF)
        return;

-    SoundEnvelopeSetSlide(envelope, 0, envelope->parameters.release_time);
+    SoundEnvelope_SetSlide(envelope, 0, envelope->parameters.release_time);
    envelope->state = ENVELOPE_STATE_RELEASE;
 }

-void SoundEnvelopeStop(struct sound_envelope *envelope)
+void SoundEnvelope_Stop(struct sound_envelope *envelope)
 {
    envelope->state = ENVELOPE_STATE_OFF;
    envelope->current_volume = 0;
@@ -182,7 +182,7 @@ void SoundEnvelopeStop(struct sound_envelope *envelope)
    envelope->update_volume = 0;
 }

-void SoundEnvelopeForceVolume(struct sound_envelope *envelope, s32 volume)
+void SoundEnvelope_ForceVolume(struct sound_envelope *envelope, s32 volume)
 {
    envelope->parameters.use_envelope = 0;
    envelope->state = ENVELOPE_STATE_CONST;
@@ -191,7 +191,7 @@ void SoundEnvelopeForceVolume(struct sound_envelope *envelope, s32 volume)
    envelope->update_volume = 1;
 }

-void SoundEnvelopeStop2(struct sound_envelope *envelope)
+void SoundEnvelope_Stop2(struct sound_envelope *envelope)
 {
    envelope->state = ENVELOPE_STATE_OFF;
    envelope->current_volume = 0;
@@ -199,7 +199,7 @@ void SoundEnvelopeStop2(struct sound_envelope *envelope)
    envelope->update_volume = 0;
 }

-s8 SoundEnvelopeTick(struct sound_envelope *envelope)
+s8 SoundEnvelope_Tick(struct sound_envelope *envelope)
 {
    if (envelope->state > ENVELOPE_STATE_DONE) //OFF, CONST, DONE
    {
@@ -221,7 +221,7 @@ s8 SoundEnvelopeTick(struct sound_envelope *envelope)
                    hold_time = envelope->parameters.hold_time;
                    if (hold_time != 0)
                    {
-                        SoundEnvelopeSetSlide(envelope, 0x7f, hold_time);
+                        SoundEnvelope_SetSlide(envelope, 0x7f, hold_time);
                        envelope->state = ENVELOPE_STATE_HOLD;
                        break;
                    }
@@ -229,7 +229,7 @@ s8 SoundEnvelopeTick(struct sound_envelope *envelope)
                    decay_time = envelope->parameters.decay_time;
                    if (decay_time != 0)
                    {
-                        SoundEnvelopeSetSlide(envelope, (s8)envelope->parameters.sustain_level, decay_time);
+                        SoundEnvelope_SetSlide(envelope, (s8)envelope->parameters.sustain_level, decay_time);
                        envelope->state = ENVELOPE_STATE_DECAY;
                        break;
                    }
@@ -238,12 +238,12 @@ s8 SoundEnvelopeTick(struct sound_envelope *envelope)
                    sustain_time = envelope->parameters.sustain_time;
                    if (sustain_time != 0)
                    {
-                        SoundEnvelopeSetSlide(envelope, 0, sustain_time);
+                        SoundEnvelope_SetSlide(envelope, 0, sustain_time);
                        envelope->state = ENVELOPE_STATE_SUSTAIN;
                        break;
                    }
                case ENVELOPE_STATE_SUSTAIN:
-                    SoundEnvelopeSetSlide(envelope, 0, 0);
+                    SoundEnvelope_SetSlide(envelope, 0, 0);
                    envelope->state = ENVELOPE_STATE_DONE;
                    break;
                case ENVELOPE_STATE_RELEASE:
--- a/lib/DSE/src/dc_lfo.c
+++ b/lib/DSE/src/dc_lfo.c
@@ -1,6 +1,6 @@
 #include "dc_lfo.h"

-void SoundLfoBankReset(struct dse_lfo_bank *lfo_bank)
+void SoundLfoBank_Reset(struct dse_lfo_bank *lfo_bank)
 {
    /*
    lfo_bank->outputs[0] = 0;
--- a/lib/DSE/src/dc_lfo_2.c
+++ b/lib/DSE/src/dc_lfo_2.c
@@ -1,8 +1,8 @@
 #include "dc_lfo_2.h"

-extern s32 SoundUtilGetRandomNumber();
+extern s32 SoundUtil_GetRandomNumber();

-void SoundLfoBankSetConstEnvelopes(struct dse_lfo_bank *lfo_bank, s8 level)
+void SoundLfoBank_SetConstEnvelopes(struct dse_lfo_bank *lfo_bank, s8 level)
 {
    struct dse_lfo *lfo;

@@ -18,7 +18,7 @@ void SoundLfoBankSetConstEnvelopes(struct dse_lfo_bank *lfo_bank, s8 level)
    }
 }

-u16 SoundLfoBankTick(struct dse_lfo_bank *lfo_bank)
+u16 SoundLfoBank_Tick(struct dse_lfo_bank *lfo_bank)
 {
    s32 output;
    struct dse_lfo *lfo;
@@ -69,14 +69,14 @@ u16 SoundLfoBankTick(struct dse_lfo_bank *lfo_bank)
    return new_flags;
 }

-s32 SoundLfoWaveInvalidFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_InvalidFunc(struct dse_lfo *lfo)
 {
    lfo->phase_flags = 0;
    lfo->type = SOUND_LFO_TYPE_INVALID;
    return 0;
 }

-s32 SoundLfoWaveHalfSquareFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_HalfSquareFunc(struct dse_lfo *lfo)
 {
    s32 new_output;

@@ -101,7 +101,7 @@ s32 SoundLfoWaveHalfSquareFunc(struct dse_lfo *lfo)
    return lfo->current_output;
 }

-s32 SoundLfoWaveFullSquareFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_FullSquareFunc(struct dse_lfo *lfo)
 {
    s32 new_output;

@@ -116,7 +116,7 @@ s32 SoundLfoWaveFullSquareFunc(struct dse_lfo *lfo)
        }
        else
        {
-                new_output = lfo->amplitude;
+            new_output = lfo->amplitude;
        }
        lfo->current_output = new_output;
        lfo->phase_flags ^= 2;
@@ -125,7 +125,7 @@ s32 SoundLfoWaveFullSquareFunc(struct dse_lfo *lfo)
    return lfo->current_output;
 }

-s32 SoundLfoWaveHalfTriangleFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_HalfTriangleFunc(struct dse_lfo *lfo)
 {
    u8 flags;

@@ -147,7 +147,7 @@ s32 SoundLfoWaveHalfTriangleFunc(struct dse_lfo *lfo)
    return lfo->current_output;
 }

-s32 SoundLfoWaveFullTriangleFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_FullTriangleFunc(struct dse_lfo *lfo)
 {
    s32 new_output;
    u16 ticks_left;
@@ -178,7 +178,7 @@ s32 SoundLfoWaveFullTriangleFunc(struct dse_lfo *lfo)
    return new_output;
 }

-s32 SoundLfoWaveSawFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_SawFunc(struct dse_lfo *lfo)
 {
    u16 ticks_left;

@@ -197,7 +197,7 @@ s32 SoundLfoWaveSawFunc(struct dse_lfo *lfo)
    return lfo->current_output;
 }

-s32 SoundLfoWaveReverseSawFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_ReverseSawFunc(struct dse_lfo *lfo)
 {
    s32 new_output;

@@ -215,21 +215,21 @@ s32 SoundLfoWaveReverseSawFunc(struct dse_lfo *lfo)
    return lfo->current_output;
 }

-s32 SoundLfoWaveHalfNoiseFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_HalfNoiseFunc(struct dse_lfo *lfo)
 {
    s32 random;

    if (lfo->ticks_until_phase_change == 0)
    {
        lfo->ticks_until_phase_change = lfo->ticks_per_phase_change;
-        random = SoundUtilGetRandomNumber();
+        random = SoundUtil_GetRandomNumber();
        lfo->current_output = (s32)((lfo->amplitude >> 0x10) * random);
    }
    lfo->ticks_until_phase_change--;
    return lfo->current_output;
 }

-s32 SoundLfoWaveFullNoiseFunc(struct dse_lfo *lfo)
+s32 SoundLfoWave_FullNoiseFunc(struct dse_lfo *lfo)
 {
    s32 random;
    s32 amplitude;
@@ -238,7 +238,7 @@ s32 SoundLfoWaveFullNoiseFunc(struct dse_lfo *lfo)
    {
        lfo->ticks_until_phase_change = lfo->ticks_per_phase_change;
        amplitude = lfo->amplitude;
-        random = SoundUtilGetRandomNumber();
+        random = SoundUtil_GetRandomNumber();
        lfo->current_output = (s32)((amplitude >> 0xf) * random - (amplitude >> 1));
    }
    lfo->ticks_until_phase_change--;
--- a/lib/asm/include/crt0.inc
+++ b/lib/asm/include/crt0.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public _fp_init
 .public NitroMain
 .public OS_IRQTable
 .public SDK_AUTOLOAD_LIST
@@ -7,5 +8,4 @@
 .public SDK_STATIC_BSS_END
 .public SDK_STATIC_BSS_START
 .public sub_01FF95E8
-.public _fp_init
 .public sub_020908A8
--- a/tools/sync_pmdsky_debug/pmdsky_debug_reader.py
+++ b/tools/sync_pmdsky_debug/pmdsky_debug_reader.py
@@ -100,20 +100,22 @@ def read_pmdsky_debug_symbols() -> Dict[str, Dict[str, Dict[int, SymbolDetails]]
        read_symbols_from_array('functions', False)
        read_symbols_from_array('data', True)

-    itcm_file = os.path.join('arm9', 'itcm.yml')
-
-    read_yaml_symbols('arm9.yml', 'main')
-    read_yaml_symbols(itcm_file, 'main')
-    read_yaml_symbols(itcm_file, 'ITCM', address_suffix='-ITCM')
-    read_yaml_symbols('arm7.yml', 'arm7')
+    read_pairs = [
+        ('arm9', 'main'),
+        ('arm7', 'arm7')
+    ]
    for i in range(0, 36):
-        overlay_name = f'overlay{i:02d}'
-        read_yaml_symbols(f'{overlay_name}.yml', str(i))
-        overlay_folder = os.path.join(pmdsky_debug_path, SYMBOLS_FOLDER, overlay_name)
-        if os.path.exists(overlay_folder):
-            for file in os.listdir(overlay_folder):
+        read_pairs.append((f'overlay{i:02d}', str(i)))
+
+    for read_pair in read_pairs:
+        file_path, symbols_key = read_pair
+        read_yaml_symbols(f'{file_path}.yml', symbols_key)
+        symbol_subfolder = os.path.join(pmdsky_debug_path, SYMBOLS_FOLDER, file_path)
+        if os.path.exists(symbol_subfolder):
+            for file in os.listdir(symbol_subfolder):
                if file.endswith('.yml'):
-                    read_yaml_symbols(os.path.join(overlay_name, file), str(i))
+                    read_yaml_symbols(os.path.join(file_path, file), symbols_key)
+    read_yaml_symbols(os.path.join('arm9', 'itcm.yml'), 'ITCM', address_suffix='-ITCM')
    read_yaml_symbols('ram.yml', 'ram')

    return pmdsky_debug_symbols
--- a/tools/sync_pmdsky_debug/sync_from_pmdsky_debug.py
+++ b/tools/sync_pmdsky_debug/sync_from_pmdsky_debug.py
@@ -29,11 +29,16 @@ def add_files_with_extensions(folder: str, extensions: List[str]) -> List[str]:
                    break
    return found_files

-asm_files = add_files_with_extensions('asm', ['.s', '.inc'])
-asm_arm7_files = add_files_with_extensions(os.path.join('sub', 'asm'), ['.s', '.inc'])
-asm_arm7_files.extend(add_files_with_extensions(os.path.join('sub', 'lib'), ['.s', '.inc']))
+ASM_EXTENSIONS = ['.s', '.inc']
+asm_files = add_files_with_extensions('asm', ASM_EXTENSIONS)
+asm_files.extend(add_files_with_extensions('lib', ASM_EXTENSIONS))
+
+asm_arm7_files = add_files_with_extensions(os.path.join('sub', 'asm'), ASM_EXTENSIONS)
+asm_arm7_files.extend(add_files_with_extensions(os.path.join('sub', 'lib'), ASM_EXTENSIONS))
+
 src_files = add_files_with_extensions(HEADER_FOLDER, ['.h'])
 src_files.extend(add_files_with_extensions('src', ['.c']))
+src_files.extend(add_files_with_extensions('lib', ['.c', '.h']))

 replaced_symbols = set()
 for language, pmdsky_debug_language_symbols in pmdsky_debug_symbols.items():
@@ -99,7 +104,7 @@ for language, pmdsky_debug_language_symbols in pmdsky_debug_symbols.items():
                        asm_contents = asm_file.read()
                    for search_string in asm_search_strings:
                        asm_contents = asm_contents.replace(search_string[0], search_string[1])
-                    if file_path.endswith('.inc') and 'macros' not in file_path:
+                    if file_path.endswith('.inc') and 'macros' not in file_path and 'syscall' not in file_path:
                        asm_contents_split = asm_contents.split('\n')
                        sorted_imports = sorted(asm_contents_split[1:], key=str.casefold)
                        if len(sorted_imports) and sorted_imports[0] == '':