Merge pull request #271 from AnonymousRandomPerson/main

Synced from pmdsky-debug
2026-08-23 02:54:53 -05:00 · 2026-06-03 00:08:15 -04:00
parent 1d279df780 753286e26b
commit 3a9f0d83c1
36 changed files with 436 additions and 436 deletions
--- a/asm/include/main_02054E4C.inc
+++ b/asm/include/main_02054E4C.inc
@@ -16,12 +16,14 @@
 .public _022B5788
 .public _022B578C
 .public AddMoneyCarried
+.public AddSimpleObjToOam
 .public CleanStickyItemsInBag
 .public CopyAndInterleaveWrapper
 .public CopyTacticString
 .public Debug_Print0
 .public DirectoryFileMngr_OpenDirectoryFile
 .public EnableAllLearnableIqSkills
+.public FillPaletteInitInfo
 .public GetBaseDefensiveStat
 .public GetBaseFormCastformCherrimDeoxys
 .public GetBaseHp
@@ -40,6 +42,7 @@
 .public IsLevelResetDungeon
 .public IsSkyExclusiveDungeon
 .public ItemZInit
+.public LoadObjPalette
 .public MemZero
 .public OBJ_GRAPHICS_CONTROLS_PTR
 .public RemoveHolderForItemInBag
@@ -54,9 +57,6 @@
 .public StrncpySimpleNoPadSafe
 .public sub_0200D8AC
 .public sub_0200FA0C
-.public sub_0201B43C
-.public sub_0201B9F8
-.public sub_0201F598
 .public sub_0204E584
 .public sub_02052CF4
 .public sub_02052E2C
--- a/asm/include/main_0205EDA4.inc
+++ b/asm/include/main_0205EDA4.inc
@@ -132,6 +132,7 @@
 .public InitBitstreamForRead
 .public InitBitstreamForWrite
 .public InitKaomadoStream
+.public InitObjGraphicsControls
 .public InitOptionsVeneer
 .public InitPreprocessorArgs
 .public InitScriptVariableValues
@@ -258,7 +259,6 @@
 .public sub_0200C020
 .public sub_0200CA8C
 .public sub_0200D310
-.public sub_0201BB3C
 .public sub_0201D7A8
 .public sub_0201DD90
 .public sub_0201E050
--- a/asm/include/overlay_00.inc
+++ b/asm/include/overlay_00.inc
@@ -46,6 +46,7 @@
 .public GetLanguage
 .public GetProcessorMode
 .public GpiCheckForBuddy
+.public GroupOamAttributesBothScreens
 .public Gt2Accept
 .public Gt2AddressToString
 .public Gt2CloseAllConnectionsHard
@@ -1146,7 +1147,6 @@
 .public sub_020184B4
 .public sub_020184C0
 .public sub_0201BE28
-.public sub_0201BE5C
 .public sub_0201BE84
 .public sub_0201BF4C
 .public sub_0201BF64
--- a/asm/include/overlay_10_022BCC7C.inc
+++ b/asm/include/overlay_10_022BCC7C.inc
@@ -15,6 +15,7 @@
 .public DrawTextInWindow
 .public EFFECT_ANIMATION_INFO
 .public FillOamAttributeInfo
+.public FillPaletteInitInfo
 .public GendersEqual
 .public GetBgRegionArea
 .public GetBodySize
@@ -29,6 +30,7 @@
 .public InitPortraitParamsWithMonsterId
 .public InitPreprocessorArgs
 .public ITEM_ANIMATION_INFO
+.public LoadObjPalette
 .public LoadWanTableEntryFromPack
 .public MemAlloc
 .public Memcpy32
@@ -110,7 +112,6 @@
 .public sub_0200B330
 .public sub_0200B3FC
 .public sub_0200D310
-.public sub_0201B43C
 .public sub_0201C108
 .public sub_0201C138
 .public sub_0201CF5C
@@ -124,7 +125,6 @@
 .public sub_0201DA20
 .public sub_0201DBB8
 .public sub_0201E184
-.public sub_0201F598
 .public sub_02025010_EU
 .public sub_020263C8
 .public sub_02027B1C
--- 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 GroupOamAttributesBothScreens
 .public HandleFadesVeneer
 .public HandleMenus
 .public IncrementNbBigTreasureWins
@@ -605,7 +606,6 @@
 .public sub_0201BCCC
 .public sub_0201BCF4
 .public sub_0201BE28
-.public sub_0201BE5C
 .public sub_0201BE84
 .public sub_0201BF4C
 .public sub_0201BF64
--- a/asm/include/overlay_29_022DC65C.inc
+++ b/asm/include/overlay_29_022DC65C.inc
@@ -1,13 +1,17 @@
 #pragma once
 .public _s32_div_f
+.public AddSimpleObjToOam
+.public ChangeSimpleObjTexture
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DrawTeamStats
 .public DUNGEON_PTR
+.public FillPaletteInitInfo
 .public FreeMapAndTeam
 .public FreeTeamStats
 .public GetDefaultTileTextureId
 .public HandleSir0Translation
 .public IsBackgroundTileset
+.public LoadObjPalette
 .public MemAlloc
 .public MemFree
 .public MemZero
@@ -56,13 +60,9 @@
 .public sub_0200A544
 .public sub_0200B330
 .public sub_0200B3D4
-.public sub_0201B43C
-.public sub_0201B9F8
-.public sub_0201BAC8
 .public sub_0201BCCC
 .public sub_0201BCF4
 .public sub_0201BD1C
-.public sub_0201F598
 .public sub_020275C0
 .public sub_020275DC
 .public sub_020519D0
--- a/asm/include/overlay_29_022E08A0.inc
+++ b/asm/include/overlay_29_022E08A0.inc
@@ -7,6 +7,7 @@
 .public DUNGEON_BUTTON_INPUT
 .public DUNGEON_PTR
 .public DungeonGoesUp
+.public FillPaletteInitInfo
 .public GetBgRegionArea
 .public GetFloorType
 .public GetHeldButtons
@@ -16,6 +17,7 @@
 .public HandleSir0Translation
 .public IsCurrentTilesetBackground
 .public IsTouchScreenUseAnywhere
+.public LoadObjPalette
 .public LoadTextureUi
 .public LoadWteFromFileDirectory
 .public Memcpy32
@@ -55,8 +57,6 @@
 .public sub_020091CC
 .public sub_02009454
 .public sub_020094C4
-.public sub_0201B43C
 .public sub_0201E380
-.public sub_0201F598
 .public UnloadFile
 .public UnloadWte
--- a/asm/include/overlay_29_022E9488.inc
+++ b/asm/include/overlay_29_022E9488.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public AddSimpleObjToOam
 .public DUNGEON_PTR
 .public OBJ_GRAPHICS_CONTROLS_PTR
 .public ov29_0237C888
@@ -6,4 +7,3 @@
 .public ov29_0237C88E
 .public ov29_0237C890
 .public ov29_0237C892
-.public sub_0201B9F8
--- a/asm/include/overlay_29_022E9618.inc
+++ b/asm/include/overlay_29_022E9618.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public _s32_div_f
 .public abs
+.public ChangeSimpleObjTexture
 .public CheckVariousStatuses2__02301244
 .public DIRECTIONS_XY
 .public DISPLACEMENTS_WITHIN_2_LARGEST_FIRST
@@ -49,7 +50,6 @@
 .public ov29_02353560
 .public ov29_0237C888
 .public RenderWeather3D
-.public sub_0201BAC8
 .public sub_02051E20
 .public UpdateCamera
 .public UpdateMinimap
--- a/asm/include/overlay_29_022ECDE4.inc
+++ b/asm/include/overlay_29_022ECDE4.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public _020AFC70
+.public AddSimpleObjToOam
 .public AdvanceFrame
 .public AreLateGameTrapsEnabled
 .public CreateMonsterSummaryFromMonster
@@ -26,6 +27,5 @@
 .public SpawnTrap
 .public strcpy
 .public StringFromId
-.public sub_0201B9F8
 .public sub_0201E080
 .public sub_0201F2A0
--- a/asm/include/overlay_29_022F05B4.inc
+++ b/asm/include/overlay_29_022F05B4.inc
@@ -5,6 +5,7 @@
 .public AddItemToBag
 .public AddItemToBagNoHeld
 .public AddMoneyCarried
+.public AddSimpleObjToOam
 .public AdvanceFrame
 .public AnimationDelayOrSomething
 .public BAG_ITEMS_PTR_MIRROR
@@ -187,7 +188,6 @@
 .public StairsMenuAfterStep
 .public sub_02001AB0
 .public sub_02006B70
-.public sub_0201B9F8
 .public sub_0201CF90
 .public sub_02026268
 .public sub_02027B1C
--- a/asm/include/overlay_29_02302A5C.inc
+++ b/asm/include/overlay_29_02302A5C.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public AddSimpleObjToOam
 .public AllocateTemp1024ByteBufferFromPool
 .public ChangeMonsterAnimation
 .public DIRECTIONS_XY
@@ -83,7 +84,6 @@
 .public strcpy
 .public StringFromId
 .public sub_020149C0
-.public sub_0201B9F8
 .public sub_0201CF5C
 .public sub_0201D034
 .public sub_0201D198
--- a/asm/include/overlay_29_0233861C.inc
+++ b/asm/include/overlay_29_0233861C.inc
@@ -2,6 +2,7 @@
 .public _020AFC70
 .public _s32_div_f
 .public abs
+.public AddSimpleObjToOam
 .public ConvertWallsToChasms
 .public CORNER_CARDINAL_NEIGHBOR_IS_OPEN
 .public DelayWteFree
@@ -89,7 +90,6 @@
 .public sub_0200B330
 .public sub_0200B3FC
 .public sub_0200C008
-.public sub_0201B9F8
 .public sub_0201F2A0
 .public TeamMemberHasExclusiveItemEffectActive
 .public TILESET_PROPERTIES
--- a/asm/include/overlay_29_023456BC.inc
+++ b/asm/include/overlay_29_023456BC.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public _s32_div_f
+.public AddSimpleObjToOam
 .public AdvanceFrame
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
 .public DISPLACEMENTS_WITHIN_3
@@ -47,7 +48,6 @@
 .public SinAbs4096
 .public SpawnItem
 .public sub_0200D1FC
-.public sub_0201B9F8
 .public sub_0204F7A8
 .public SubstitutePlaceholderItemTags
 .public UNOWN_STONE_DROP_CHANCE
--- a/asm/include/overlay_29_0234BEE0.inc
+++ b/asm/include/overlay_29_0234BEE0.inc
@@ -7,6 +7,7 @@
 .public DungeonZInit
 .public G3X_Reset
 .public GetAndStoreButtonInput
+.public GroupOamAttributesBothScreens
 .public HandleMenus
 .public InitRender3dElement64
 .public MemAlloc
@@ -65,7 +66,6 @@
 .public sub_02017B70
 .public sub_02017BEC
 .public sub_0201BE28
-.public sub_0201BE5C
 .public sub_0201BE84
 .public sub_0201BF4C
 .public sub_0201BF64
--- a/asm/include/overlay_34.inc
+++ b/asm/include/overlay_34.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public G3X_Reset
 .public GetFadeStatus
+.public GroupOamAttributesBothScreens
 .public HandleFadesVeneer
 .public HandleMenus
 .public ov34_022DCB64
@@ -38,7 +39,6 @@
 .public sub_02017A80
 .public sub_02017B70
 .public sub_0201BE28
-.public sub_0201BE5C
 .public sub_0201BE84
 .public sub_0201BF4C
 .public sub_0201BF64
--- a/asm/main_02014D18.s
+++ b/asm/main_02014D18.s
@@ -7685,8 +7685,8 @@ sub_0201AABC: ; 0x0201AABC
 _0201AAD4: .word _022A4E58
 	arm_func_end sub_0201AABC

-	arm_func_start sub_0201AAD8
-sub_0201AAD8: ; 0x0201AAD8
+	arm_func_start FillCopyToFlatVramCommand
+FillCopyToFlatVramCommand: ; 0x0201AAD8
 	ldrb ip, [sp]
 	cmp ip, #1
 	cmpne ip, #2
@@ -7700,7 +7700,7 @@ sub_0201AAD8: ; 0x0201AAD8
 	strh r1, [r0, #0xc]
 	mov r0, r3
 	bx lr
-	arm_func_end sub_0201AAD8
+	arm_func_end FillCopyToFlatVramCommand

 	arm_func_start ExecuteCopyToFlatVramCommand
 ExecuteCopyToFlatVramCommand: ; 0x0201AB0C
@@ -7770,7 +7770,7 @@ _0201ABCC:
 	ldr r2, [sb], #0xc
 	mov r0, r5
 	mov r1, r8
-	bl sub_0201AAD8
+	bl FillCopyToFlatVramCommand
 	mov r4, r0
 	mov r0, r5
 	bl ExecuteCopyToFlatVramCommand
@@ -7805,7 +7805,7 @@ sub_0201AC20: ; 0x0201AC20
 	add r0, r4, #0xe00
 	ldrsh r0, [r0]
 	add r0, r4, r0, lsl #4
-	bl sub_0201AAD8
+	bl FillCopyToFlatVramCommand
 	add r0, r4, #0xe00
 	ldrsh r1, [r0]
 	add r1, r1, #1
@@ -7844,7 +7844,7 @@ _0201ACB8:
 	ldr r2, [sb]
 	mov r1, r8
 	add r0, sl, r0, lsl #4
-	bl sub_0201AAD8
+	bl FillCopyToFlatVramCommand
 	mov r3, r0
 	b _0201AD1C
 _0201ACD8:
@@ -7853,7 +7853,7 @@ _0201ACD8:
 	ldr r2, [sb]
 	mov r1, r8
 	add r0, sl, r0, lsl #4
-	bl sub_0201AAD8
+	bl FillCopyToFlatVramCommand
 	mov r3, r0
 	b _0201AD1C
 _0201ACF8:
@@ -7864,7 +7864,7 @@ _0201ACF8:
 	ldr r2, [sb]
 	mov r1, r8
 	add r0, sl, r0, lsl #4
-	bl sub_0201AAD8
+	bl FillCopyToFlatVramCommand
 	mov r3, r0
 _0201AD1C:
 	ldrsh r0, [r4]
@@ -8426,8 +8426,8 @@ _0201B430:
 _0201B438: .word _020AFC28
 	arm_func_end sub_0201B388

-	arm_func_start sub_0201B43C
-sub_0201B43C: ; 0x0201B43C
+	arm_func_start LoadObjPalette
+LoadObjPalette: ; 0x0201B43C
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
 	mov r6, r1
 	ldrb r1, [r6, #0xa]
@@ -8498,7 +8498,7 @@ _0201B518:
 _0201B534:
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
-	arm_func_end sub_0201B43C
+	arm_func_end LoadObjPalette

 	arm_func_start sub_0201B53C
 sub_0201B53C: ; 0x0201B53C
@@ -8548,7 +8548,7 @@ _0201B5D0:
 	ldrh r2, [sp, #0x1c]
 	mov r0, r6
 	mov r1, r4
-	bl sub_0201B43C
+	bl LoadObjPalette
 _0201B5EC:
 	mov r0, r7
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -8846,8 +8846,8 @@ _0201B9F0:
 	bx lr
 	arm_func_end sub_0201B9D4

-	arm_func_start sub_0201B9F8
-sub_0201B9F8: ; 0x0201B9F8
+	arm_func_start AddSimpleObjToOam
+AddSimpleObjToOam: ; 0x0201B9F8
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #8
 	mov r4, r0
@@ -8894,19 +8894,19 @@ _0201BA90:
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _0201BA98: .word 0x00000FFF
-	arm_func_end sub_0201B9F8
+	arm_func_end AddSimpleObjToOam

-	arm_func_start sub_0201BA9C
-sub_0201BA9C: ; 0x0201BA9C
+	arm_func_start GroupOamAttributesWrapper
+GroupOamAttributesWrapper: ; 0x0201BA9C
 	ldr ip, _0201BAA8 ; =GroupOamObjs
 	add r0, r0, #0x20
 	bx ip
 	.align 2, 0
 _0201BAA8: .word GroupOamObjs
-	arm_func_end sub_0201BA9C
+	arm_func_end GroupOamAttributesWrapper

-	arm_func_start sub_0201BAAC
-sub_0201BAAC: ; 0x0201BAAC
+	arm_func_start CopyAttributesToOamWrapper
+CopyAttributesToOamWrapper: ; 0x0201BAAC
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	add r0, r4, #0x20
@@ -8914,10 +8914,10 @@ sub_0201BAAC: ; 0x0201BAAC
 	add r0, r4, #0x20
 	bl CopyAttributesToOam
 	ldmia sp!, {r4, pc}
-	arm_func_end sub_0201BAAC
+	arm_func_end CopyAttributesToOamWrapper

-	arm_func_start sub_0201BAC8
-sub_0201BAC8: ; 0x0201BAC8
+	arm_func_start ChangeSimpleObjTexture
+ChangeSimpleObjTexture: ; 0x0201BAC8
 	stmdb sp!, {r3, r4, r5, lr}
 	sub sp, sp, #8
 	ldrb r5, [sp, #0x18]
@@ -8941,7 +8941,7 @@ sub_0201BAC8: ; 0x0201BAC8
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _0201BB1C: .word _020AFC28
-	arm_func_end sub_0201BAC8
+	arm_func_end ChangeSimpleObjTexture

 	arm_func_start sub_0201BB20
 sub_0201BB20: ; 0x0201BB20
@@ -8954,8 +8954,8 @@ sub_0201BB20: ; 0x0201BB20
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_0201BB20

-	arm_func_start sub_0201BB3C
-sub_0201BB3C: ; 0x0201BB3C
+	arm_func_start InitObjGraphicsControls
+InitObjGraphicsControls: ; 0x0201BB3C
 	stmdb sp!, {r3, lr}
 	mov r0, #0x1f00
 	mov r1, #0
@@ -9057,7 +9057,7 @@ _0201BCBC: .word OBJ_GRAPHICS_CONTROLS_PTR
 _0201BCC0: .word 0x05000200
 _0201BCC4: .word 0x06894000
 _0201BCC8: .word 0x05000600
-	arm_func_end sub_0201BB3C
+	arm_func_end InitObjGraphicsControls

 	arm_func_start sub_0201BCCC
 sub_0201BCCC: ; 0x0201BCCC
@@ -9142,24 +9142,24 @@ sub_0201BD80: ; 0x0201BD80
 _0201BDB0: .word OBJ_GRAPHICS_CONTROLS_PTR
 	arm_func_end sub_0201BD80

-	arm_func_start sub_0201BDB4
-sub_0201BDB4: ; 0x0201BDB4
+	arm_func_start CopyAttributesToOamBothScreens
+CopyAttributesToOamBothScreens: ; 0x0201BDB4
 	stmdb sp!, {r3, lr}
 	mov r0, #8
 	bl sub_0200302C
 	ldr r0, _0201BDE8 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
-	bl sub_0201BAAC
+	bl CopyAttributesToOamWrapper
 	ldr r0, _0201BDE8 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x70
-	bl sub_0201BAAC
+	bl CopyAttributesToOamWrapper
 	mov r0, #8
 	bl sub_020030FC
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0201BDE8: .word OBJ_GRAPHICS_CONTROLS_PTR
-	arm_func_end sub_0201BDB4
+	arm_func_end CopyAttributesToOamBothScreens

 	arm_func_start sub_0201BDEC
 sub_0201BDEC: ; 0x0201BDEC
@@ -9169,11 +9169,11 @@ sub_0201BDEC: ; 0x0201BDEC
 	ldr r0, _0201BE24 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
 	add r0, r0, #0xe0
-	bl sub_0201BAAC
+	bl CopyAttributesToOamWrapper
 	ldr r0, _0201BE24 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x150
-	bl sub_0201BAAC
+	bl CopyAttributesToOamWrapper
 	mov r0, #8
 	bl sub_020030FC
 	ldmia sp!, {r3, pc}
@@ -9199,20 +9199,20 @@ sub_0201BE28: ; 0x0201BE28
 _0201BE58: .word OBJ_GRAPHICS_CONTROLS_PTR
 	arm_func_end sub_0201BE28

-	arm_func_start sub_0201BE5C
-sub_0201BE5C: ; 0x0201BE5C
+	arm_func_start GroupOamAttributesBothScreens
+GroupOamAttributesBothScreens: ; 0x0201BE5C
 	stmdb sp!, {r3, lr}
 	ldr r0, _0201BE80 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
-	bl sub_0201BA9C
+	bl GroupOamAttributesWrapper
 	ldr r0, _0201BE80 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x70
-	bl sub_0201BA9C
+	bl GroupOamAttributesWrapper
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0201BE80: .word OBJ_GRAPHICS_CONTROLS_PTR
-	arm_func_end sub_0201BE5C
+	arm_func_end GroupOamAttributesBothScreens

 	arm_func_start sub_0201BE84
 sub_0201BE84: ; 0x0201BE84
@@ -9220,11 +9220,11 @@ sub_0201BE84: ; 0x0201BE84
 	ldr r0, _0201BEAC ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
 	add r0, r0, #0xe0
-	bl sub_0201BA9C
+	bl GroupOamAttributesWrapper
 	ldr r0, _0201BEAC ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x150
-	bl sub_0201BA9C
+	bl GroupOamAttributesWrapper
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0201BEAC: .word OBJ_GRAPHICS_CONTROLS_PTR
@@ -9284,7 +9284,7 @@ sub_0201BF4C: ; 0x0201BF4C
 	stmdb sp!, {r3, lr}
 	bl sub_0201BEB0
 	bl sub_0201BF10
-	bl sub_0201BDB4
+	bl CopyAttributesToOamBothScreens
 	bl sub_0201BDEC
 	ldmia sp!, {r3, pc}
 	arm_func_end sub_0201BF4C
@@ -10130,7 +10130,7 @@ _0201CAB0:
 	ldrb r2, [r8, #0x41]
 	ldr r0, [r0]
 	ldr r1, [r8, #0x5c]
-	bl sub_0201B43C
+	bl LoadObjPalette
 	b _0201CCE0
 _0201CAD0:
 	cmp r1, #0
@@ -10178,7 +10178,7 @@ _0201CB5C:
 	ldr r0, [r0]
 	ldr r1, [r8, #0x5c]
 	add r0, r0, #0x70
-	bl sub_0201B43C
+	bl LoadObjPalette
 	b _0201CCE0
 _0201CB80:
 	cmp r1, #0
@@ -10226,7 +10226,7 @@ _0201CC0C:
 	ldr r0, [r0]
 	ldr r1, [r8, #0x5c]
 	add r0, r0, #0xe0
-	bl sub_0201B43C
+	bl LoadObjPalette
 	b _0201CCE0
 _0201CC30:
 	cmp r1, #0
@@ -10275,7 +10275,7 @@ _0201CCC0:
 	ldr r0, [r0]
 	ldr r1, [r8, #0x5c]
 	add r0, r0, #0x150
-	bl sub_0201B43C
+	bl LoadObjPalette
 _0201CCE0:
 	ldrh r1, [r8, #2]
 	ldr r0, _0201CF58 ; =0x0000FFFF
@@ -11216,7 +11216,7 @@ _0201D8C0:
 	ldr r1, [r5, #4]
 	ldr r0, [r0]
 	mov r2, sb
-	bl sub_0201B43C
+	bl LoadObjPalette
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 _0201D8E4:
 	cmp r3, #0
@@ -11261,7 +11261,7 @@ _0201D960:
 	ldr r0, [r0]
 	mov r2, sb
 	add r0, r0, #0x70
-	bl sub_0201B43C
+	bl LoadObjPalette
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 _0201D988: .word _020AFC30
@@ -13450,8 +13450,8 @@ HandleSir0TranslationVeneer: ; 0x0201F58C
 _0201F594: .word HandleSir0Translation
 	arm_func_end HandleSir0TranslationVeneer

-	arm_func_start sub_0201F598
-sub_0201F598: ; 0x0201F598
+	arm_func_start FillPaletteInitInfo
+FillPaletteInitInfo: ; 0x0201F598
 	str r1, [r0]
 	strh r2, [r0, #4]
 	ldrsh r1, [sp]
@@ -13462,7 +13462,7 @@ sub_0201F598: ; 0x0201F598
 	strb r2, [r0, #0xa]
 	strb r1, [r0, #0xb]
 	bx lr
-	arm_func_end sub_0201F598
+	arm_func_end FillPaletteInitInfo

 	arm_func_start DecompressAtNormalVeneer
 DecompressAtNormalVeneer: ; 0x0201F5C0
--- a/asm/main_02054E4C.s
+++ b/asm/main_02054E4C.s
@@ -4563,12 +4563,12 @@ sub_0205882C: ; 0x0205882C
 	mov r0, r4, lsl #0x10
 	mov r0, r0, asr #0x10
 	mov r1, #0
-	bl sub_02058ABC
+	bl OamTileNumberToVramAddress
 	mov r0, r4, lsl #0x10
 	ldr r5, [sp, #0x1c]
 	mov r0, r0, asr #0x10
 	mov r1, #0
-	bl sub_02058ABC
+	bl OamTileNumberToVramAddress
 	add r1, r5, #4
 	mov r2, #0x40
 	mov r3, #9
@@ -4577,7 +4577,7 @@ sub_0205882C: ; 0x0205882C
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
 	mov r1, #0
-	bl sub_02058ABC
+	bl OamTileNumberToVramAddress
 	add r1, r5, #0x24
 	mov r2, #0x80
 	mov r3, #9
@@ -4586,7 +4586,7 @@ sub_0205882C: ; 0x0205882C
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
 	mov r1, #0
-	bl sub_02058ABC
+	bl OamTileNumberToVramAddress
 	add r1, r5, #0x64
 	mov r2, #0x100
 	mov r3, #9
@@ -4698,12 +4698,12 @@ _02058928:
 	add r0, sp, #0x20
 	mov r2, #1
 	mov r3, #0x20
-	bl sub_0201F598
+	bl FillPaletteInitInfo
 	ldr r0, _02058AB8 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	add r1, sp, #0x20
 	ldr r0, [r0]
 	mov r2, #0
-	bl sub_0201B43C
+	bl LoadObjPalette
 	add r0, sp, #0xc
 	bl UnloadFile
 	add sp, sp, #0x30
@@ -4717,8 +4717,8 @@ _02058AB4: .word 0x000003E5
 _02058AB8: .word OBJ_GRAPHICS_CONTROLS_PTR
 	arm_func_end sub_0205882C

-	arm_func_start sub_02058ABC
-sub_02058ABC: ; 0x02058ABC
+	arm_func_start OamTileNumberToVramAddress
+OamTileNumberToVramAddress: ; 0x02058ABC
 	ldr r3, _02058AF4 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	mov r2, #0x70
 	ldr ip, [r3]
@@ -4736,7 +4736,7 @@ sub_02058ABC: ; 0x02058ABC
 	.align 2, 0
 _02058AF4: .word OBJ_GRAPHICS_CONTROLS_PTR
 _02058AF8: .word _020AFC28
-	arm_func_end sub_02058ABC
+	arm_func_end OamTileNumberToVramAddress

 	arm_func_start sub_02058AFC
 sub_02058AFC: ; 0x02058AFC
@@ -4806,7 +4806,7 @@ _02058B40:
 	mov r2, r4
 	orr r3, r5, r3, lsr #20
 	strh r3, [r1, #4]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
--- a/asm/main_0205EDA4.s
+++ b/asm/main_0205EDA4.s
@@ -8751,7 +8751,7 @@ MainLoop: ; 0x02065D1C
 	bl sub_020205E4
 	bl LoadTblTalk
 	bl sub_0201DD90
-	bl sub_0201BB3C
+	bl InitObjGraphicsControls
 	bl sub_0201D7A8
 	ldr r0, _02066374 ; =WAN_TABLE
 	mov r1, #0x80
--- a/asm/overlay_00.s
+++ b/asm/overlay_00.s
@@ -2516,7 +2516,7 @@ _022BE464:
 	bl ov01_0232ED84
 	mov r0, r4
 	bl sub_02028A64
-	bl sub_0201BE5C
+	bl GroupOamAttributesBothScreens
 	bl sub_0201BE84
 	bl G3X_Reset
 	bl sub_0201DE10
--- a/asm/overlay_10_022BCC7C.s
+++ b/asm/overlay_10_022BCC7C.s
@@ -867,7 +867,7 @@ ov10_022BD75C: ; 0x022BD75C
 	ldr r0, [r3]
 	ldr r1, [r1, #4]
 	mov r2, r2, lsr #0x10
-	bl sub_0201B43C
+	bl LoadObjPalette
 	b _022BD81C
 _022BD7A0:
 	cmp r1, #0
@@ -893,12 +893,12 @@ _022BD7DC:
 	mov r2, r5
 	mov r3, r8
 	add r1, r1, sl, lsl #6
-	bl sub_0201F598
+	bl FillPaletteInitInfo
 	mov r2, sl, lsl #0x10
 	ldr r0, [r4]
 	mov r1, r6
 	mov r2, r2, lsr #0x10
-	bl sub_0201B43C
+	bl LoadObjPalette
 	add sl, sl, #1
 	cmp sl, #0xd
 	blt _022BD7DC
--- a/asm/overlay_11.s
+++ b/asm/overlay_11.s
@@ -15278,7 +15278,7 @@ _022E930C:
 	bl ov10_022BF7D4
 	mov r0, r4
 	bl sub_02028A64
-	bl sub_0201BE5C
+	bl GroupOamAttributesBothScreens
 	bl sub_0201BE84
 	bl sub_02028E88
 	bl sub_0201BF4C
--- a/asm/overlay_11_022ECD24_data.s
+++ b/asm/overlay_11_022ECD24_data.s
@@ -250,12 +250,12 @@
 .public LinkShopEntryPoint
 .public LinkShopDestructor
 .public LinkShopMainManager
-.public ov19_0238D5FC
-.public ov19_0238D68C
-.public ov19_0238D698
-.public ov19_0238D56C
-.public ov19_0238D68C
-.public ov19_0238D698
+.public SpindaBarResume
+.public SpindaBarDestruct
+.public SpindaBarMenuUpdate
+.public SpindaBarEntry
+.public SpindaBarDestruct
+.public SpindaBarMenuUpdate
 .public ov20_0238A150
 .public ov20_0238A160
 .public ov20_0238A1B0
@@ -1908,15 +1908,15 @@ ov11_023230AC:
 	.global ov11_023230BC
 ov11_023230BC:
 	.byte 0x17, 0x00, 0x00, 0x00
-	.word ov19_0238D5FC
-	.word ov19_0238D68C
-	.word ov19_0238D698
+	.word SpindaBarResume
+	.word SpindaBarDestruct
+	.word SpindaBarMenuUpdate
 	.global ov11_023230CC
 ov11_023230CC:
 	.byte 0x17, 0x00, 0x00, 0x00
-	.word ov19_0238D56C
-	.word ov19_0238D68C
-	.word ov19_0238D698
+	.word SpindaBarEntry
+	.word SpindaBarDestruct
+	.word SpindaBarMenuUpdate
 	.global ov11_023230DC
 ov11_023230DC:
 	.byte 0x18, 0x00, 0x00, 0x00
--- a/asm/overlay_19.s
+++ b/asm/overlay_19.s
--- a/asm/overlay_29_022DC65C.s
+++ b/asm/overlay_29_022DC65C.s
@@ -439,7 +439,7 @@ _022DCB24:
 	add r0, r0, #0x70
 	add r1, r4, r1
 	mov r2, r2, asr #0x10
-	bl sub_0201BAC8
+	bl ChangeSimpleObjTexture
 	add r0, r6, sl, lsl #1
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
@@ -455,13 +455,13 @@ _022DCB24:
 	add r1, r2, r1, lsr #10
 	mov r2, #0
 	mov r3, #0x10
-	bl sub_0201F598
+	bl FillPaletteInitInfo
 	ldr r0, _022DD098 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldrh r2, [sp, #0x34]
 	ldr r0, [r0]
 	add r1, sp, #0x2c
 	add r0, r0, #0x70
-	bl sub_0201B43C
+	bl LoadObjPalette
 _022DCC3C:
 	ldr r6, _022DD08C ; =ov29_02353518
 	ldr r2, _022DD090 ; =ov29_02350F8C
@@ -745,7 +745,7 @@ _022DD06C:
 	ldr r0, [r0]
 	mov r2, #1
 	add r0, r0, #0x70
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 _022DD084:
 	add sp, sp, #0x3c
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -1044,7 +1044,7 @@ _022DD468:
 	mov r3, r0, asr #1
 	ldr r0, [r2]
 	add r2, r3, #1
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 _022DD4F8:
 	add sp, sp, #8
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -1093,7 +1093,7 @@ ov29_022DD518: ; 0x022DD518
 	mov r3, r6
 	add r1, r5, r4
 	mov r2, r2, asr #0x10
-	bl sub_0201BAC8
+	bl ChangeSimpleObjTexture
 	add sp, sp, #8
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
@@ -1149,12 +1149,12 @@ _022DD648:
 	mov r2, r5
 	mov r3, fp
 	add r1, r1, sb, lsl #6
-	bl sub_0201F598
+	bl FillPaletteInitInfo
 	mov r2, sb, lsl #0x10
 	ldr r0, [r4]
 	mov r1, r6
 	mov r2, r2, lsr #0x10
-	bl sub_0201B43C
+	bl LoadObjPalette
 	add r0, sb, #1
 	mov r0, r0, lsl #0x10
 	mov sb, r0, asr #0x10
--- a/asm/overlay_29_022E08A0.s
+++ b/asm/overlay_29_022E08A0.s
@@ -581,8 +581,8 @@ ov29_022E0F14: ; 0x022E0F14
 _022E0F28: .word sub_02008F3C
 	arm_func_end ov29_022E0F14

-	arm_func_start ov29_022E0F2C
-ov29_022E0F2C: ; 0x022E0F2C
+	arm_func_start OamTileNumberToVramAddressOv29
+OamTileNumberToVramAddressOv29: ; 0x022E0F2C
 	ldr r3, _022E0F64 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	mov r2, #0x70
 	ldr ip, [r3]
@@ -600,7 +600,7 @@ ov29_022E0F2C: ; 0x022E0F2C
 	.align 2, 0
 _022E0F64: .word OBJ_GRAPHICS_CONTROLS_PTR
 _022E0F68: .word _020AFC28
-	arm_func_end ov29_022E0F2C
+	arm_func_end OamTileNumberToVramAddressOv29

 	arm_func_start ov29_022E0F6C
 ov29_022E0F6C: ; 0x022E0F6C
@@ -630,12 +630,12 @@ _022E0F80:
 	add r0, sp, #0x54
 	mov r2, #1
 	mov r3, #0x20
-	bl sub_0201F598
+	bl FillPaletteInitInfo
 	ldr r0, _022E11D8 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	add r1, sp, #0x54
 	ldr r0, [r0]
 	mov r2, #0
-	bl sub_0201B43C
+	bl LoadObjPalette
 	add r0, sp, #8
 	bl UnloadFile
 	ldr r1, _022E11DC ; =0x000003E3
@@ -651,7 +651,7 @@ _022E0F80:
 	add r1, r1, #4
 	str r1, [sp, #0x10]
 	mov r1, #0
-	bl ov29_022E0F2C
+	bl OamTileNumberToVramAddressOv29
 	mov r7, #0
 	add r6, sp, #0x28
 	mov r5, r7
@@ -662,7 +662,7 @@ _022E1038:
 	ldrsh r0, [r6, r0]
 	ldrsh r8, [r1, #2]
 	mov r1, r5
-	bl ov29_022E0F2C
+	bl OamTileNumberToVramAddressOv29
 	ldr r1, [sp, #0x10]
 	mov r3, r4
 	mov r2, r8, lsl #1
@@ -693,13 +693,13 @@ _022E1038:
 	ldr r1, [sp, #0x18]
 	add r0, sp, #0x64
 	mov r3, #0x10
-	bl sub_0201F598
+	bl FillPaletteInitInfo
 	ldr r0, _022E11D8 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	add r1, sp, #0x64
 	ldr r0, [r0]
 	mov r2, #0xc
 	add r0, r0, #0x70
-	bl sub_0201B43C
+	bl LoadObjPalette
 	add r0, sp, #8
 	bl UnloadFile
 	ldr r1, _022E11E4 ; =0x000003E6
@@ -715,7 +715,7 @@ _022E1038:
 	add r1, r1, #4
 	str r1, [sp, #0x1c]
 	mov r1, #1
-	bl ov29_022E0F2C
+	bl OamTileNumberToVramAddressOv29
 	ldr r1, [sp, #0x1c]
 	mov r2, #0x80
 	bl Memcpy32
@@ -891,19 +891,19 @@ _022E134C:
 	mov r2, fp
 	mov r3, #0x10
 	add r1, r1, r8, lsl #6
-	bl sub_0201F598
+	bl FillPaletteInitInfo
 	mov r1, r8, lsl #0x10
 	mov r2, r1, lsr #0x10
 	ldr r0, [r4]
 	mov r1, r5
-	bl sub_0201B43C
+	bl LoadObjPalette
 	add r8, r8, #1
 	cmp r8, #0x10
 	blt _022E134C
 	ldr r4, [sp, #0x10]
 	mov r0, #0x110
 	mov r1, #0
-	bl ov29_022E0F2C
+	bl OamTileNumberToVramAddressOv29
 	ldmia r4, {r1, r2}
 	mov r2, r2, lsl #8
 	mov r3, #0xd
--- a/asm/overlay_29_022E9488.s
+++ b/asm/overlay_29_022E9488.s
@@ -53,7 +53,7 @@ ov29_022E9488: ; 0x022E9488
 	orr r4, r4, lr, lsr #16
 	mov r2, #0
 	strh r4, [r3, ip]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, pc}
 _022E9554:
--- a/asm/overlay_29_022E9618.s
+++ b/asm/overlay_29_022E9618.s
@@ -871,7 +871,7 @@ _022EA140:
 	mov r0, #1
 	bl FlashLeaderIcon
 _022EA154:
-	bl ov29_022EA64C
+	bl AnimateWaterShadows
 	bl ov29_022EA80C
 	bl DisplayUi
 	ldr r1, _022EA294 ; =ov29_02353560
@@ -1274,8 +1274,8 @@ _022EA644: .word DUNGEON_FRAMES_PASSED
 _022EA648: .word ov29_0234B1A4
 	arm_func_end ov29_022EA62C

-	arm_func_start ov29_022EA64C
-ov29_022EA64C: ; 0x022EA64C
+	arm_func_start AnimateWaterShadows
+AnimateWaterShadows: ; 0x022EA64C
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #8
 	ldr r0, _022EA708 ; =DUNGEON_FRAMES_PASSED
@@ -1307,7 +1307,7 @@ ov29_022EA64C: ; 0x022EA64C
 	mov r2, #0x1e8
 	mov r3, #0x100
 	mov r4, ip, lsl #8
-	bl sub_0201BAC8
+	bl ChangeSimpleObjTexture
 	mov r0, #0
 	str r0, [sp]
 	mov r1, #0xb
@@ -1320,7 +1320,7 @@ ov29_022EA64C: ; 0x022EA64C
 	add r1, ip, r3
 	ldr r2, _022EA714 ; =0x000001EA
 	mov r3, #0x200
-	bl sub_0201BAC8
+	bl ChangeSimpleObjTexture
 	add sp, sp, #8
 	ldmia sp!, {r4, pc}
 	.align 2, 0
@@ -1328,7 +1328,7 @@ _022EA708: .word DUNGEON_FRAMES_PASSED
 _022EA70C: .word ov29_02353540
 _022EA710: .word OBJ_GRAPHICS_CONTROLS_PTR
 _022EA714: .word 0x000001EA
-	arm_func_end ov29_022EA64C
+	arm_func_end AnimateWaterShadows

 	arm_func_start DisplayAnimatedNumbers
 DisplayAnimatedNumbers: ; 0x022EA718
--- a/asm/overlay_29_022ECDE4.s
+++ b/asm/overlay_29_022ECDE4.s
@@ -1032,7 +1032,7 @@ _022EDA74:
 	strh r0, [r6, #4]
 	ldr r0, _022EDBD0 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r0, [r0]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 _022EDB78:
 	add r7, r7, #1
 _022EDB7C:
--- a/asm/overlay_29_022F05B4.s
+++ b/asm/overlay_29_022F05B4.s
@@ -2866,7 +2866,7 @@ _022F2BBC:
 	add r1, sp, #0x10
 	strh sl, [sp, #0x12]
 	strh r3, [sp, #0x16]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 	add r4, r4, #1
 	cmp r4, #4
 	blt _022F2BBC
@@ -3002,7 +3002,7 @@ _022F2E0C:
 	add r1, sp, #0x10
 	ldr r0, [r0]
 	strh r3, [sp, #0x14]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 	ldrsh r1, [sb]
 	ldrsh r0, [sb, #2]
 	add r6, r6, #1
--- a/asm/overlay_29_02302A5C.s
+++ b/asm/overlay_29_02302A5C.s
@@ -1521,8 +1521,8 @@ _02303E54:
 	ldmia sp!, {r3, pc}
 	arm_func_end ov29_02303E0C

-	arm_func_start ov29_02303E5C
-ov29_02303E5C: ; 0x02303E5C
+	arm_func_start DisplayMonsterShadow
+DisplayMonsterShadow: ; 0x02303E5C
 	stmdb sp!, {r3, r4, r5, lr}
 	mvn r4, #0x1f
 	cmp r3, r4
@@ -1565,13 +1565,13 @@ ov29_02303E5C: ; 0x02303E5C
 	orr r3, r4, r3, lsr #16
 	mov r2, #0
 	strh r3, [r1, #6]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _02303F0C: .word ov29_0237C888
 _02303F10: .word 0xFFFF000F
 _02303F14: .word OBJ_GRAPHICS_CONTROLS_PTR
-	arm_func_end ov29_02303E5C
+	arm_func_end DisplayMonsterShadow

 	arm_func_start ov29_02303F18
 ov29_02303F18: ; 0x02303F18
@@ -2075,7 +2075,7 @@ _02304628:
 	mov r1, r6
 	mov r2, r4
 	mov r3, r8
-	bl ov29_02303E5C
+	bl DisplayMonsterShadow
 _0230464C:
 	ldrb r0, [r5, #0xc4]
 	cmp r0, #1
--- a/asm/overlay_29_0233861C.s
+++ b/asm/overlay_29_0233861C.s
@@ -1731,7 +1731,7 @@ FlashLeaderIcon: ; 0x02339A24
 	add r1, sp, #0
 	add r0, r3, #0x70
 	strh r5, [sp, #6]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 _02339BC0:
 	cmp r4, #0
 	bne _02339CB0
@@ -1792,7 +1792,7 @@ _02339BC0:
 	add r1, sp, #0
 	sub r2, r3, #0x9e
 	strh r4, [sp, #6]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 _02339CB0:
 	add sp, sp, #8
 	ldmia sp!, {r4, r5, r6, pc}
--- a/asm/overlay_29_023456BC.s
+++ b/asm/overlay_29_023456BC.s
@@ -241,7 +241,7 @@ _02345958:
 	ldr r0, _02345A38 ; =OBJ_GRAPHICS_CONTROLS_PTR
 	ldr r1, _02345A28 ; =ov29_0237C864
 	ldr r0, [r0]
-	bl sub_0201B9F8
+	bl AddSimpleObjToOam
 	mov r0, #1
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
 _02345A18:
--- a/asm/overlay_29_0234BEE0.s
+++ b/asm/overlay_29_0234BEE0.s
@@ -274,7 +274,7 @@ _0234C274:
 	mov r0, #1
 	bl sub_02028A64
 	bl sub_0201BE28
-	bl sub_0201BE5C
+	bl GroupOamAttributesBothScreens
 	bl sub_0201BE84
 	bl sub_0204F9CC
 	bl sub_02003A40
--- a/asm/overlay_34.s
+++ b/asm/overlay_34.s
@@ -368,7 +368,7 @@ _022DC6C4:
 	bl sub_02008F88
 	mov r0, r4
 	bl sub_02028A64
-	bl sub_0201BE5C
+	bl GroupOamAttributesBothScreens
 	bl sub_0201BE84
 	bl G3X_Reset
 	bl sub_0201DE10
--- a/lib/NitroSDK/asm/include/nitro.inc
+++ b/lib/NitroSDK/asm/include/nitro.inc
@@ -44,9 +44,9 @@
 .public PXI_SendWordByFifo
 .public PXI_SetFifoRecvCallback
 .public SetIrqFlag
-.public SND_CommandInit
 .public Snd_AlarmInit
 .public Snd_AllocCommand
+.public SND_CommandInit
 .public Snd_PushCommand
 .public Sndi_CallAlarmHandler
 .public Sndi_GetFinishedCommandTag