Merge pull request #28 from AnonymousRandomPerson/main

Defined more pointers
2026-09-10 20:37:05 -05:00 · 2023-09-27 00:15:27 -04:00
parent e097a0ca11 a5ca344779
commit f53850f644
20 changed files with 370 additions and 345 deletions
--- a/asm/dtcm.s
+++ b/asm/dtcm.s
@@ -2,8 +2,8 @@
 	.include "dtcm.inc"

 	.bss
-	.global dtcm_bss
-dtcm_bss:
+	.global DTCM_BSS
+DTCM_BSS:
 	.space 0x2020

 	.section .dtcm,4,1,4
--- a/asm/include/itcm.inc
+++ b/asm/include/itcm.inc
@@ -97,7 +97,8 @@
 .public CanTargetEntity
 .public CanTargetPosition
 .public CeilFixedPoint
-.public dtcm_bss
+.public DIRECTIONS_XY
+.public DTCM_BSS
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public EnableIrqFlag
@@ -126,6 +127,9 @@
 .public IsMonsterCornered
 .public MemcpyFast
 .public MemsetFast
+.public OS_IRQTable
+.public ov10_022C4580
+.public ov10_022C4900
 .public ov29_022E935C
 .public ov29_022EBC74
 .public ov29_022FBDF0
@@ -145,6 +149,10 @@
 .public ov29_0231B008
 .public ov29_02338350
 .public ov29_02348D00
+.public ov29_0235171E
+.public ov29_0235177C
+.public ov29_02353530
+.public ov29_02353538
 .public RENDER_3D
 .public Rgb8ToRgb5
 .public SetActionPassTurnOrWalk
@@ -170,4 +178,3 @@
 .public TRIG_TABLE
 .public TryAddTargetToAiTargetList
 .public UpdateAiTargetPos
-.public DIRECTIONS_XY
--- a/asm/include/main_02000C6C.inc
+++ b/asm/include/main_02000C6C.inc
@@ -181,19 +181,15 @@
 .public ArrayFill32Fast
 .public CART_REMOVED_IMG_DATA
 .public ClearIrqFlag
-.public ClearIrqFlag
 .public DEBUG_IS_INITIALIZED
 .public DebugPrint
 .public DebugPrint0
 .public DecompressAtFromMemoryPointer
-.public DecompressAtFromMemoryPointer
 .public FatalError
 .public FileInit
-.public FileInit
 .public InitDebug
 .public LOADED_OVERLAY_GROUP_0
 .public MainLoop
-.public MainLoop
 .public MEMORY_ALLOCATION_ARENA_GETTERS
 .public NATURAL_LOG_VALUE_TABLE
 .public PRNG_SEQUENCE_NUM
@@ -339,4 +335,4 @@
 .public sub_02085180
 .public vsprintf
 .public WaitForInterrupt
-.public WaitForInterrupt
+.public OS_IRQTable
--- a/asm/include/main_0200C4CC.inc
+++ b/asm/include/main_0200C4CC.inc
@@ -3,6 +3,7 @@
 .public _02000BC4
 .public _secure
 .public AllocAndLoadFileInPack
+.public CALCIUM_STAT_BOOST
 .public CanMonsterUseMove
 .public CardBackupError
 .public CardPullOutWithStatus
@@ -10,6 +11,7 @@
 .public DataTransferStop
 .public DebugPrint
 .public DebugPrint0
+.public DTCM_BSS
 .public ExplorersOfSkyMain
 .public FatalError
 .public FileClose
@@ -29,7 +31,10 @@
 .public GetReleasedStylus
 .public GetRngSeed
 .public GetTime
+.public GINSENG_CHANCE_3
+.public IRON_STAT_BOOST
 .public KeyWaitInit
+.public LIFE_SEED_HP_BOOST
 .public LoadFileFromRom
 .public LoadFileInPackWithPackId
 .public LoadOverlay
@@ -49,8 +54,6 @@
 .public OpenAllPackFiles
 .public OS_IRQTable
 .public OSi_ReferSymbol
-.public SetDebugFlag
-.public SetDebugLogFlag
 .public ov00_022BDADC
 .public ov00_022BE0C8
 .public ov00_022C2340
@@ -76,22 +79,31 @@
 .public ov01_02337BA0
 .public ov01_02337C54
 .public ov01_02337E0C
-.public ov02_0233CAA8
-.public ov02_0233CAD8
-.public ov02_0233CB10
-.public ov02_0233CB3C
-.public ov02_0233CDC8
-.public ov02_0233CDD8
-.public ov02_0233CDE4
-.public ov02_02347100
 .public ov11_022E82CC
 .public ov11_023061CC
 .public ov11_023061E4
 .public ov11_02306C64
 .public ov11_02306C9C
 .public ov11_02310BDC
+.public ov29_022EA62C
+.public ov29_023002F0
+.public ov29_02337B3C
+.public ov29_02337BA0
+.public ov29_02337C54
+.public ov29_02337E0C
+.public ov29_0233CAA8
+.public ov29_0233CAD8
+.public ov29_0233CB10
+.public ov29_0233CB3C
+.public ov29_0233CDC8
+.public ov29_0233CDD8
+.public ov29_0233CDE4
+.public ov29_02347100
+.public ov29_02353538
 .public OverlayIsLoaded
 .public PointsToZero
+.public PositionHasMonster
+.public PROTEIN_STAT_BOOST
 .public Rand16Bit
 .public Rand32Bit
 .public RandInt
@@ -100,9 +112,16 @@
 .public RandRangeSafe
 .public Render3dStack
 .public Rgb8ToRgb5
+.public SDK_MAIN_ARENA_LO
+.public SDK_SECTION_ARENA_DTCM_START
+.public SDK_SECTION_ARENA_EX_START
+.public SDK_SECTION_ARENA_ITCM_START
+.public SetDebugFlag
 .public SetDebugFlag
 .public SetDebugLogFlag
+.public SetDebugLogFlag
 .public SetRngSeed
+.public SITRUS_BERRY_FULL_HP_BOOST
 .public sub_01FF8000
 .public sub_01FF80B0
 .public sub_01FF8CAC
@@ -216,4 +235,5 @@
 .public SVC_WaitByLoop
 .public UnloadFile
 .public UnloadOverlay
+.public ZINC_STAT_BOOST
 .public ZInit8
--- a/asm/include/overlay_00.inc
+++ b/asm/include/overlay_00.inc
@@ -14,6 +14,12 @@
 .public _022BCA70
 .public _start_AutoloadDoneCallback
 .public abs
+.public ArrayCopy16
+.public ArrayCopy32
+.public ArrayCopy32Fast
+.public ArrayFill16
+.public ArrayFill32
+.public ArrayFill32Fast
 .public EnableIrqFlag
 .public FileInit
 .public GetDebugFlag
@@ -21,26 +27,14 @@
 .public MemAlloc
 .public memcmp
 .public memcpy
+.public MemcpyFast
 .public MemcpySimple
 .public MemFree
 .public memmove
 .public memset
+.public MemsetFast
 .public MemZero
 .public OSi_ReferSymbol
-.public ov00_02329520
-.public ov00_0232BE98
-.public ov00_0232C244
-.public ov00_0232C4D8
-.public ov00_0232E768
-.public ov00_0232E7C0
-.public ov00_0232E7E8
-.public ov00_0232EA30
-.public ov00_0232EC30
-.public ov00_0232ED5C
-.public ov00_0232ED84
-.public ov00_0233103C
-.public ov00_02337914
-.public ov00_0233AE64
 .public ov01_02329520
 .public ov01_0232BE98
 .public ov01_0232C244
@@ -59,6 +53,7 @@
 .public ov01_023310B8
 .public ov01_02337914
 .public ov01_0233AE64
+.public ov02_02329520
 .public ov08_0233E230
 .public ov09_0233CA80
 .public RandInt
@@ -182,14 +177,6 @@
 .public sub_0207BB50
 .public sub_0207BC4C
 .public sub_0207BD3C
-.public ArrayFill16
-.public ArrayCopy16
-.public ArrayFill32
-.public ArrayCopy32
-.public ArrayFill32Fast
-.public ArrayCopy32Fast
-.public MemsetFast
-.public MemcpyFast
 .public sub_0207D9A4
 .public sub_0207DAB0
 .public sub_0207DAFC
--- a/asm/include/overlay_02.inc
+++ b/asm/include/overlay_02.inc
@@ -3,14 +3,23 @@
 .public __udivsi3
 .public _020AE224
 .public _021AC7F4
+.public ArrayCopy16
+.public ArrayCopy32
+.public ArrayCopy32Fast
+.public ArrayFill16
+.public ArrayFill32
+.public ArrayFill32Fast
 .public ClearIrqFlag
 .public EnableIrqFlag
 .public FileInit
 .public MemAlloc
 .public memcmp
 .public memcpy
+.public MemcpyFast
 .public MemFree
 .public memset
+.public MemsetFast
+.public OS_IRQTable
 .public ov00_022BDC5C
 .public ov00_022BF2C4
 .public ov00_022BF3E0
@@ -92,7 +101,6 @@
 .public ov00_02318158
 .public ov00_02318160
 .public ov00_023250C8
-.public ov02_0233C114
 .public SetIrqFlag
 .public strcpy
 .public strlen
@@ -190,14 +198,6 @@
 .public sub_0207B860
 .public sub_0207B9EC
 .public sub_0207BA08
-.public ArrayFill16
-.public ArrayCopy16
-.public ArrayFill32
-.public ArrayCopy32
-.public ArrayFill32Fast
-.public ArrayCopy32Fast
-.public MemsetFast
-.public MemcpyFast
 .public sub_0207C650
 .public sub_0207C7DC
 .public sub_0207C7FC
--- a/asm/itcm.s
+++ b/asm/itcm.s
@@ -1042,7 +1042,7 @@ _01FF8E98:
 	blt _01FF8E54
 	mov r6, #0
 	add r5, sp, #0
-	ldr r4, _01FF8F00 ; =0x01FF8120
+	ldr r4, _01FF8F00 ; =_01FF8120
 	ldr r7, _01FF8EFC ; =RENDER_3D
 	b _01FF8EDC
 _01FF8EB4:
@@ -1068,7 +1068,7 @@ _01FF8EF4:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _01FF8EFC: .word RENDER_3D
-_01FF8F00: .word 0x01FF8120
+_01FF8F00: .word _01FF8120
 	arm_func_end Render3dStack

 	arm_func_start sub_01FF8F04
@@ -1622,18 +1622,18 @@ _01FF9620:
 	mov r1, r3, lsr r0
 	str r1, [ip, #4]
 	rsbs r0, r0, #0x1f
-	ldr r1, _01FF9648 ; =0x027E0000
+	ldr r1, _01FF9648 ; =OS_IRQTable
 	ldr r0, [r1, r0, lsl #2]
 	ldr lr, _01FF964C ; =sub_01FF9650
 	bx r0
 	.align 2, 0
-_01FF9648: .word 0x027E0000
+_01FF9648: .word OS_IRQTable
 _01FF964C: .word sub_01FF9650
 	arm_func_end sub_01FF95E8

 	arm_func_start sub_01FF9650
 sub_01FF9650: ; 0x01FF9650
-	ldr ip, _01FF97BC ; =0x027E0060
+	ldr ip, _01FF97BC ; =DTCM_BSS
 	mov r3, #0
 	ldr ip, [ip]
 	mov r2, #1
@@ -1648,7 +1648,7 @@ _01FF9668:
 	mov ip, r0
 	cmp ip, #0
 	bne _01FF9668
-	ldr ip, _01FF97BC ; =0x027E0060
+	ldr ip, _01FF97BC ; =DTCM_BSS
 	str r3, [ip]
 	str r3, [ip, #4]
 	ldr ip, _01FF97C0 ; =_022B966C
@@ -1740,7 +1740,7 @@ _01FF9738:
 	stmda sp!, {r0, r1, r2, r3, ip, lr}
 	ldmia sp!, {pc}
 	.align 2, 0
-_01FF97BC: .word dtcm_bss
+_01FF97BC: .word DTCM_BSS
 _01FF97C0: .word _022B966C
 _01FF97C4: .word sub_02080EF0
 _01FF97C8: .word sub_02080F30
@@ -1769,7 +1769,7 @@ _01FF97FC: .word 0x04000208
 sub_01FF9800: ; 0x01FF9800
 	mov ip, #0x4000000
 	str ip, [ip, #0x208]
-	ldr r1, _01FF98AC ; =0x027E0000
+	ldr r1, _01FF98AC ; =OS_IRQTable
 	add r1, r1, #0x3fc0
 	add r1, r1, #0x3c
 	mov r0, #0
@@ -1813,7 +1813,7 @@ _01FF9878:
 	mov fp, #0
 	bx ip
 	.align 2, 0
-_01FF98AC: .word 0x027E0000
+_01FF98AC: .word OS_IRQTable
 _01FF98B0: .word 0x04000180
 _01FF98B4: .word 0x027FFD9C
 _01FF98B8: .word 0x027FFD80
@@ -2136,7 +2136,7 @@ _01FF9CD8:
 	ldr r4, [r0, #4]
 	cmp ip, r4
 	blt _01FF9C70
-	ldr r1, _01FF9E10 ; =0x02353530
+	ldr r1, _01FF9E10 ; =ov29_02353530
 	mov r0, r3
 	ldr r1, [r1]
 	add r1, r1, #0x4c
@@ -2211,20 +2211,20 @@ _01FF9D9C:
 _01FF9DF0:
 	cmp r0, #0xf0
 	blt _01FF9D9C
-	ldr r1, _01FF9E10 ; =0x02353530
+	ldr r1, _01FF9E10 ; =ov29_02353530
 	mov r0, r3
 	ldr r1, [r1]
 	add r1, r1, #0x4c
 	bl Rgb8ToRgb5
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_01FF9E10: .word 0x02353530
+_01FF9E10: .word ov29_02353530
 	arm_func_end sub_01FF9BA0

 	arm_func_start sub_01FF9E14
 sub_01FF9E14: ; 0x01FF9E14
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
-	ldr r1, _01FF9F7C ; =0x02353530
+	ldr r1, _01FF9F7C ; =ov29_02353530
 	ldr r4, [r0, #0x10]
 	ldr r1, [r1]
 	cmp r4, #0
@@ -2321,13 +2321,13 @@ _01FF9F70:
 	blt _01FF9EF4
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
-_01FF9F7C: .word 0x02353530
+_01FF9F7C: .word ov29_02353530
 	arm_func_end sub_01FF9E14

 	arm_func_start sub_01FF9F80
 sub_01FF9F80: ; 0x01FF9F80
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
-	ldr r1, _01FFA38C ; =0x02353530
+	ldr r1, _01FFA38C ; =ov29_02353530
 	ldr r4, [r0, #0x10]
 	ldr r1, [r1]
 	cmp r4, #0
@@ -2599,7 +2599,7 @@ _01FFA37C:
 	blt _01FFA294
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
-_01FFA38C: .word 0x02353530
+_01FFA38C: .word ov29_02353530
 	arm_func_end sub_01FF9F80

 	arm_func_start ShouldMonsterRunAwayVariationOutlawCheck
@@ -2710,7 +2710,7 @@ _01FFA4D4:
 	bl ShouldMonsterHeadToStairs
 	cmp r0, #0
 	beq _01FFA550
-	ldr r3, _01FFB2B4 ; =0x02353538
+	ldr r3, _01FFB2B4 ; =ov29_02353538
 	add r2, sb, #0x100
 	ldr r1, [r3]
 	mov r0, #1
@@ -2727,7 +2727,7 @@ _01FFA4D4:
 	strh r1, [r2, #0x80]
 	b _01FFAF28
 _01FFA550:
-	ldr r0, _01FFB2B4 ; =0x02353538
+	ldr r0, _01FFB2B4 ; =ov29_02353538
 	ldr r1, [r0]
 	add r0, r1, #0x3000
 	ldrb r0, [r0, #0xe38]
@@ -2778,7 +2778,7 @@ _01FFA5E0:
 	bl CanSeeTarget
 	cmp r0, #0
 	beq _01FFA688
-	ldr r0, _01FFB2B4 ; =0x02353538
+	ldr r0, _01FFB2B4 ; =ov29_02353538
 	ldr r0, [r0]
 	add r0, r0, #0x3000
 	ldrb r0, [r0, #0xe38]
@@ -2877,7 +2877,7 @@ _01FFA754:
 	ldr r0, _01FFB2B8 ; =DIRECTIONS_XY
 	ldrsh r5, [r4, #4]
 	ldrsh r2, [r0, r3]
-	ldr r1, _01FFB2BC ; =0x0235171E
+	ldr r1, _01FFB2BC ; =ov29_0235171E
 	mov r0, #1
 	add r2, r5, r2
 	strh r2, [sb, #0x8c]
@@ -2896,7 +2896,7 @@ _01FFA7A0:
 	strh r1, [sb, #0x8e]
 	b _01FFAF28
 _01FFA7C0:
-	ldr r0, _01FFB2B4 ; =0x02353538
+	ldr r0, _01FFB2B4 ; =ov29_02353538
 	ldrsh sl, [r4, #6]
 	ldr r1, [r0]
 	ldrsh r2, [r7, #6]
@@ -3107,7 +3107,7 @@ _01FFAAB8:
 	bl ov29_023082A0
 	cmp r0, #0
 	bne _01FFAD14
-	ldr r0, _01FFB2B4 ; =0x02353538
+	ldr r0, _01FFB2B4 ; =ov29_02353538
 	ldr r1, [r0]
 	add r0, r1, #0x3000
 	ldrb r0, [r0, #0xe38]
@@ -3148,7 +3148,7 @@ _01FFAB50:
 	ldrb r1, [r0, #0xbc]
 	cmp r1, #6
 	bhi _01FFAC60
-	ldr r1, _01FFB2B4 ; =0x02353538
+	ldr r1, _01FFB2B4 ; =ov29_02353538
 	ldr r1, [r1]
 	add r1, r1, #0x3000
 	ldrb r1, [r1, #0xe38]
@@ -3307,7 +3307,7 @@ _01FFAD7C:
 	add r5, r0, #2
 	b _01FFAE60
 _01FFADC0:
-	ldr r0, _01FFB2B4 ; =0x02353538
+	ldr r0, _01FFB2B4 ; =ov29_02353538
 	mov r1, #0x1c
 	ldr r0, [r0]
 	add r0, r0, #0x2e8
@@ -3509,7 +3509,7 @@ _01FFB080:
 	add r0, r1, r0
 	cmp r3, r0
 	bne _01FFB0D4
-	ldr r0, _01FFB2BC ; =0x0235171E
+	ldr r0, _01FFB2BC ; =ov29_0235171E
 	ldrsh r1, [r4, #6]
 	ldrsh r0, [r0, r2]
 	ldrsh r2, [sb, #0x8e]
@@ -3580,7 +3580,7 @@ _01FFB16C:
 	mov fp, r8
 	cmpeq r0, #0
 	movne sl, #5
-	ldr r6, _01FFB2C4 ; =0x0235177C
+	ldr r6, _01FFB2C4 ; =ov29_0235177C
 	add r5, sp, #0x58
 	b _01FFB1FC
 _01FFB1B8:
@@ -3653,17 +3653,17 @@ _01FFB2A4:
 	.align 2, 0
 _01FFB2AC: .word 0x000003E7
 _01FFB2B0: .word 0x000F423F
-_01FFB2B4: .word 0x02353538
+_01FFB2B4: .word ov29_02353538
 _01FFB2B8: .word DIRECTIONS_XY
-_01FFB2BC: .word 0x0235171E
+_01FFB2BC: .word ov29_0235171E
 _01FFB2C0: .word 0xFFF0BDC1
-_01FFB2C4: .word 0x0235177C
+_01FFB2C4: .word ov29_0235177C
 	arm_func_end AiMovement

 	arm_func_start CalculateAiTargetPos
 CalculateAiTargetPos: ; 0x01FFB2C8
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
-	ldr r1, _01FFB61C ; =0x02353538
+	ldr r1, _01FFB61C ; =ov29_02353538
 	mov sl, r0
 	ldr r0, [r1]
 	ldr sb, [sl, #0xb4]
@@ -3704,7 +3704,7 @@ _01FFB32C:
 	mov r7, #1
 _01FFB35C:
 	mov r5, #0
-	ldr r4, _01FFB620 ; =0x0235177C
+	ldr r4, _01FFB620 ; =ov29_0235177C
 	add fp, sp, #1
 	b _01FFB3E4
 _01FFB36C:
@@ -3729,7 +3729,7 @@ _01FFB38C:
 	mov r3, r8, lsl #2
 	ldrsh r2, [r0, r3]
 	ldrsh r4, [sl, #4]
-	ldr r1, _01FFB628 ; =0x0235171E
+	ldr r1, _01FFB628 ; =ov29_0235171E
 	mov r0, #1
 	add r2, r4, r2
 	strh r2, [sb, #0x8c]
@@ -3745,7 +3745,7 @@ _01FFB3E4:
 	blt _01FFB36C
 	b _01FFB5D8
 _01FFB3F0:
-	ldr r0, _01FFB61C ; =0x02353538
+	ldr r0, _01FFB61C ; =ov29_02353538
 	ldr r1, [sb, #0x120]
 	ldr r2, [r0]
 	cmp r1, #0
@@ -3764,7 +3764,7 @@ _01FFB3F0:
 	ldr r0, _01FFB624 ; =DIRECTIONS_XY
 	ldrsh r4, [sl, #4]
 	ldrsh r2, [r0, r3]
-	ldr r1, _01FFB628 ; =0x0235171E
+	ldr r1, _01FFB628 ; =ov29_0235171E
 	mov r0, #1
 	add r2, r4, r2
 	strh r2, [sb, #0x8c]
@@ -3787,7 +3787,7 @@ _01FFB460:
 	ldr r0, _01FFB624 ; =DIRECTIONS_XY
 	ldrsh r4, [sl, #4]
 	ldrsh r2, [r0, r3]
-	ldr r1, _01FFB628 ; =0x0235171E
+	ldr r1, _01FFB628 ; =ov29_0235171E
 	mov r0, #1
 	add r2, r4, r2
 	strh r2, [sb, #0x8c]
@@ -3886,7 +3886,7 @@ _01FFB5D8:
 	ldr r0, _01FFB624 ; =DIRECTIONS_XY
 	ldrsh r4, [sl, #4]
 	ldrsh r2, [r0, r3]
-	ldr r1, _01FFB628 ; =0x0235171E
+	ldr r1, _01FFB628 ; =ov29_0235171E
 	mov r0, #1
 	add r2, r4, r2
 	strh r2, [sb, #0x8c]
@@ -3896,10 +3896,10 @@ _01FFB5D8:
 	strh r1, [sb, #0x8e]
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
-_01FFB61C: .word 0x02353538
-_01FFB620: .word 0x0235177C
+_01FFB61C: .word ov29_02353538
+_01FFB620: .word ov29_0235177C
 _01FFB624: .word DIRECTIONS_XY
-_01FFB628: .word 0x0235171E
+_01FFB628: .word ov29_0235171E
 	arm_func_end CalculateAiTargetPos

 	arm_func_start sub_01FFB62C
@@ -3922,7 +3922,7 @@ _01FFB654:
 ChooseAiMove: ; 0x01FFB658
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	sub sp, sp, #0x44
-	ldr r1, _01FFBD14 ; =0x02353538
+	ldr r1, _01FFBD14 ; =ov29_02353538
 	mov sl, r0
 	ldr r0, [r1]
 	ldr r7, [sl, #0xb4]
@@ -3958,7 +3958,7 @@ _01FFB6CC:
 	ldrb r0, [r7, #0xd0]
 	cmp r0, #2
 	bne _01FFB700
-	ldr r0, _01FFBD18 ; =0x022C4580
+	ldr r0, _01FFBD18 ; =ov10_022C4580
 	ldrsh r0, [r0]
 	bl DungeonRandOutcome__022EAB20
 	cmp r0, #0
@@ -4237,7 +4237,7 @@ _01FFBA7C:
 	movne r0, #2
 	strne r0, [sp, #0x40]
 	ldreq r0, [sp]
-	ldreq r1, _01FFBD1C ; =0x022C4900
+	ldreq r1, _01FFBD1C ; =ov10_022C4900
 	moveq r0, r0, lsl #1
 	ldreqsh r0, [r1, r0]
 	streq r0, [sp, #0x40]
@@ -4400,9 +4400,9 @@ _01FFBD0C:
 	add sp, sp, #0x44
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
-_01FFBD14: .word 0x02353538
-_01FFBD18: .word 0x022C4580
-_01FFBD1C: .word 0x022C4900
+_01FFBD14: .word ov29_02353538
+_01FFBD18: .word ov10_022C4580
+_01FFBD1C: .word ov10_022C4900
 	arm_func_end ChooseAiMove

 	arm_func_start sub_01FFBD20
@@ -4425,7 +4425,7 @@ sub_01FFBD20: ; 0x01FFBD20
 _01FFBD5C:
 	mov r3, #0
 _01FFBD60:
-	ldr r1, _01FFBDF0 ; =0x02353538
+	ldr r1, _01FFBDF0 ; =ov29_02353538
 	mov r0, r6
 	ldr r2, [r1]
 	mov r1, #0x32
@@ -4463,7 +4463,7 @@ _01FFBDB0:
 	strne r0, [r4, #0xc]
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_01FFBDF0: .word 0x02353538
+_01FFBDF0: .word ov29_02353538
 	arm_func_end sub_01FFBD20

 	arm_func_start sub_01FFBDF4
@@ -4475,7 +4475,7 @@ sub_01FFBDF4: ; 0x01FFBDF4
 	bl EntityIsValid__02319F8C
 	cmp r0, #0
 	ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
-	ldr r4, _01FFBE58 ; =0x02353538
+	ldr r4, _01FFBE58 ; =ov29_02353538
 	mov r5, #0
 _01FFBE18:
 	ldr r0, [r4]
@@ -4496,7 +4496,7 @@ _01FFBE48:
 	blt _01FFBE18
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_01FFBE58: .word 0x02353538
+_01FFBE58: .word ov29_02353538
 	arm_func_end sub_01FFBDF4

 	arm_func_start LightningRodStormDrainCheck
@@ -4507,8 +4507,8 @@ LightningRodStormDrainCheck: ; 0x01FFBE5C
 	mov r8, r2
 	mov r7, r3
 	mov r5, #0
-	ldr r4, _01FFBF70 ; =0x01FFB654
-	ldr fp, _01FFBF74 ; =0x02353538
+	ldr r4, _01FFBF70 ; =_01FFB654
+	ldr fp, _01FFBF74 ; =ov29_02353538
 	b _01FFBF60
 _01FFBE80:
 	ldr r1, [fp]
@@ -4577,8 +4577,8 @@ _01FFBF60:
 	mov r0, #0
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
-_01FFBF70: .word 0x01FFB654
-_01FFBF74: .word 0x02353538
+_01FFBF70: .word _01FFB654
+_01FFBF74: .word ov29_02353538
 	arm_func_end LightningRodStormDrainCheck

 	arm_func_start sub_01FFBF78
--- a/asm/main_02000C6C.s
+++ b/asm/main_02000C6C.s
@@ -3505,7 +3505,7 @@ _02003700: .word _020AEF7C
 	arm_func_start sub_02003704
 sub_02003704: ; 0x02003704
 	stmdb sp!, {r3, lr}
-	ldr r0, _0200374C ; =0x027E0000
+	ldr r0, _0200374C ; =OS_IRQTable
 	ldr r1, _02003750 ; =_020AEF7C
 	add r0, r0, #0x3000
 	ldr r2, [r0, #0xff8]
@@ -3524,7 +3524,7 @@ _02003744:
 	bl sub_020082E0
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_0200374C: .word 0x027E0000
+_0200374C: .word OS_IRQTable
 _02003750: .word _020AEF7C
 	arm_func_end sub_02003704

--- a/asm/main_0200C4CC.s
+++ b/asm/main_0200C4CC.s
@@ -6454,7 +6454,7 @@ sub_02011554: ; 0x02011554
 	arm_func_start sub_02011580
 sub_02011580: ; 0x02011580
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
-	ldr r2, _020115B8 ; =0x022C45F4
+	ldr r2, _020115B8 ; =SITRUS_BERRY_FULL_HP_BOOST
 	mov r7, r0
 	ldrsh r5, [r2]
 	ldrsh r4, [r7, #0xa]
@@ -6468,13 +6468,13 @@ sub_02011580: ; 0x02011580
 	sub r0, r0, r4
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_020115B8: .word 0x022C45F4
+_020115B8: .word SITRUS_BERRY_FULL_HP_BOOST
 	arm_func_end sub_02011580

 	arm_func_start sub_020115BC
 sub_020115BC: ; 0x020115BC
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
-	ldr r2, _020115F4 ; =0x022C44F8
+	ldr r2, _020115F4 ; =LIFE_SEED_HP_BOOST
 	mov r7, r0
 	ldrsh r5, [r2]
 	ldrsh r4, [r7, #0xa]
@@ -6488,7 +6488,7 @@ sub_020115BC: ; 0x020115BC
 	sub r0, r0, r4
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_020115F4: .word 0x022C44F8
+_020115F4: .word LIFE_SEED_HP_BOOST
 	arm_func_end sub_020115BC

 	arm_func_start ProcessGinsengOverworld
@@ -6501,7 +6501,7 @@ ProcessGinsengOverworld: ; 0x020115F8
 	mvn r4, #0
 	mov r6, #0
 	bl RandInt
-	ldr r1, _02011708 ; =0x022C46C0
+	ldr r1, _02011708 ; =GINSENG_CHANCE_3
 	mov ip, #0
 	ldrsh r1, [r1]
 	mov r2, #1
@@ -6567,13 +6567,13 @@ _020116E4:
 	mov r0, r7
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
-_02011708: .word 0x022C46C0
+_02011708: .word GINSENG_CHANCE_3
 	arm_func_end ProcessGinsengOverworld

 	arm_func_start sub_0201170C
 sub_0201170C: ; 0x0201170C
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
-	ldr r2, _02011744 ; =0x022C4420
+	ldr r2, _02011744 ; =PROTEIN_STAT_BOOST
 	mov r7, r0
 	ldrsh r5, [r2]
 	ldrb r4, [r7, #0xc]
@@ -6587,13 +6587,13 @@ sub_0201170C: ; 0x0201170C
 	sub r0, r0, r4
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02011744: .word 0x022C4420
+_02011744: .word PROTEIN_STAT_BOOST
 	arm_func_end sub_0201170C

 	arm_func_start sub_02011748
 sub_02011748: ; 0x02011748
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
-	ldr r2, _02011780 ; =0x022C46CC
+	ldr r2, _02011780 ; =CALCIUM_STAT_BOOST
 	mov r7, r0
 	ldrsh r5, [r2]
 	ldrb r4, [r7, #0xd]
@@ -6607,13 +6607,13 @@ sub_02011748: ; 0x02011748
 	sub r0, r0, r4
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02011780: .word 0x022C46CC
+_02011780: .word CALCIUM_STAT_BOOST
 	arm_func_end sub_02011748

 	arm_func_start sub_02011784
 sub_02011784: ; 0x02011784
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
-	ldr r2, _020117BC ; =0x022C46C8
+	ldr r2, _020117BC ; =IRON_STAT_BOOST
 	mov r7, r0
 	ldrsh r5, [r2]
 	ldrb r4, [r7, #0xe]
@@ -6627,13 +6627,13 @@ sub_02011784: ; 0x02011784
 	sub r0, r0, r4
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_020117BC: .word 0x022C46C8
+_020117BC: .word IRON_STAT_BOOST
 	arm_func_end sub_02011784

 	arm_func_start sub_020117C0
 sub_020117C0: ; 0x020117C0
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
-	ldr r2, _020117F8 ; =0x022C46C4
+	ldr r2, _020117F8 ; =ZINC_STAT_BOOST
 	mov r7, r0
 	ldrsh r5, [r2]
 	ldrb r4, [r7, #0xf]
@@ -6647,7 +6647,7 @@ sub_020117C0: ; 0x020117C0
 	sub r0, r0, r4
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_020117F8: .word 0x022C46C4
+_020117F8: .word ZINC_STAT_BOOST
 	arm_func_end sub_020117C0

 	arm_func_start sub_020117FC
@@ -68632,7 +68632,7 @@ sub_020449AC: ; 0x020449AC
 	bl sub_020584FC
 	b _02044A30
 _020449E8:
-	ldr r1, _02044ADC ; =0x02353538
+	ldr r1, _02044ADC ; =ov29_02353538
 	add r0, r6, #0x2e
 	ldr r1, [r1]
 	add r0, r0, #0x700
@@ -68670,7 +68670,7 @@ _02044A4C:
 	add r1, r0, #0x3e
 	b _02044A8C
 _02044A70:
-	ldr r0, _02044ADC ; =0x02353538
+	ldr r0, _02044ADC ; =ov29_02353538
 	ldr r0, [r0]
 	add r0, r0, r5, lsl #2
 	add r0, r0, #0x12000
@@ -68701,7 +68701,7 @@ _02044ACC:
 	bl sub_0203083C
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02044ADC: .word 0x02353538
+_02044ADC: .word ov29_02353538
 _02044AE0: .word 0x00000A3D
 _02044AE4: .word 0x00000A37
 _02044AE8: .word _0209CB6C
@@ -68738,7 +68738,7 @@ sub_02044AEC: ; 0x02044AEC
 	bl sub_020449AC
 	b _02044BEC
 _02044B5C:
-	ldr r0, _02044BF4 ; =0x02353538
+	ldr r0, _02044BF4 ; =ov29_02353538
 	ldr r0, [r0]
 	add r0, r0, r4, lsl #2
 	add r0, r0, #0x12000
@@ -68780,7 +68780,7 @@ _02044BEC:
 	str r4, [r7, #0x930]
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_02044BF4: .word 0x02353538
+_02044BF4: .word ov29_02353538
 	arm_func_end sub_02044AEC

 	arm_func_start sub_02044BF8
@@ -68848,7 +68848,7 @@ _02044CCC:
 _02044CD8:
 	mov r5, r4
 _02044CDC:
-	ldr r0, _020451A0 ; =0x02353538
+	ldr r0, _020451A0 ; =ov29_02353538
 	ldr r0, [r0]
 	add r0, r0, r5, lsl #2
 	add r0, r0, #0x12000
@@ -68861,7 +68861,7 @@ _02044CDC:
 	beq _02044D18
 	mov r0, r6
 	ldr r8, [r6, #0xb4]
-	bl ov02_02347100
+	bl ov29_02347100
 	strb r0, [r8, #0x161]
 _02044D18:
 	add r0, r7, r4, lsl #2
@@ -68964,7 +68964,7 @@ _02044E28:
 	bl sub_020584FC
 	b _02044EC4
 _02044E8C:
-	ldr r3, _020451A0 ; =0x02353538
+	ldr r3, _020451A0 ; =ov29_02353538
 	add r0, r5, r6
 	ldr r3, [r3]
 	ldrb r0, [r0, #0x18]
@@ -68977,7 +68977,7 @@ _02044E8C:
 	and r2, r0, #0xff
 	ldr r0, [sp, #0x14]
 	ldr r1, [r1, #0xb4]
-	bl ov00_023002F0
+	bl ov29_023002F0
 _02044EC4:
 	ldr r0, [sp, #0x14]
 	str r0, [sl, #0x574]
@@ -68989,7 +68989,7 @@ _02044EC4:
 	bl strcpy
 	b _020450A8
 _02044EE8:
-	ldr r0, _020451A0 ; =0x02353538
+	ldr r0, _020451A0 ; =ov29_02353538
 	ldr r0, [r0]
 	add r0, r0, fp, lsl #2
 	add r0, r0, #0x12000
@@ -68997,7 +68997,7 @@ _02044EE8:
 	bl sub_0204533C
 	cmp r0, #0
 	beq _020450F4
-	ldr r0, _020451A0 ; =0x02353538
+	ldr r0, _020451A0 ; =ov29_02353538
 	ldr r2, [r0]
 	ldr r0, _020451AC ; =TEAM_MEMBER_TABLE_PTR
 	ldr r1, [r0]
@@ -69170,13 +69170,13 @@ _020450F8:
 	strb r0, [sl, #8]
 	cmp r1, #1
 	bne _02045194
-	bl ov00_022EA62C
+	bl ov29_022EA62C
 _02045194:
 	add sp, sp, #0xbc
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 _0204519C: .word 0x00000728
-_020451A0: .word 0x02353538
+_020451A0: .word ov29_02353538
 _020451A4: .word 0x000003E7
 _020451A8: .word _0209CBA8
 _020451AC: .word TEAM_MEMBER_TABLE_PTR
@@ -69353,7 +69353,7 @@ _020453C0:
 	mvn r0, #0
 	ldmia sp!, {r4, pc}
 _020453C8:
-	ldr r0, _020453F4 ; =0x02353538
+	ldr r0, _020453F4 ; =ov29_02353538
 	ldr r0, [r0]
 	add r0, r0, r4, lsl #2
 	add r0, r0, #0x12000
@@ -69366,7 +69366,7 @@ _020453EC:
 	mov r0, r4
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_020453F4: .word 0x02353538
+_020453F4: .word ov29_02353538
 	arm_func_end sub_02045360

 	arm_func_start sub_020453F8
@@ -114621,7 +114621,7 @@ _02069E78:
 _02069E84:
 	add r4, r5, #0x58
 	add r5, r5, #0x90
-	bl ov02_0233CAA8
+	bl ov29_0233CAA8
 	cmp r0, #1
 	bne _02069F90
 	ldr r0, _0206A5E0 ; =_020B0B48
@@ -114680,7 +114680,7 @@ _02069E84:
 _02069F6C:
 	add r0, r5, #4
 	mov r1, #0x14
-	bl ov01_02337B3C
+	bl ov29_02337B3C
 	ldr r1, _0206A5E0 ; =_020B0B48
 	strb r0, [r5, #3]
 	ldr r0, [r1]
@@ -114688,7 +114688,7 @@ _02069F6C:
 	str r1, [r0]
 	b _0206A5D4
 _02069F90:
-	bl ov02_0233CAA8
+	bl ov29_0233CAA8
 	cmp r0, #0
 	bne _0206A5D4
 	ldr r0, _0206A5E0 ; =_020B0B48
@@ -114722,7 +114722,7 @@ _02069F90:
 	mov r7, #0x18
 	str r4, [r0, #0xac]
 	ldr r0, [ip]
-	ldr r6, _0206A5F4 ; =0x02337B68
+	ldr r6, _0206A5F4 ; =_02337B68
 	str r7, [r0, #0xb0]
 	ldr r0, [ip]
 	mov lr, #0
@@ -114752,7 +114752,7 @@ _02069F90:
 	bl GetTeamNameCheck
 	add r0, r4, #4
 	mov r1, #0x34
-	bl ov01_02337B3C
+	bl ov29_02337B3C
 	strb r0, [r4, #3]
 	ldr r0, _0206A5E0 ; =_020B0B48
 	mov r1, #0x1000
@@ -114776,17 +114776,17 @@ _0206A0AC:
 	strh r2, [sp, #0xc4]
 	strb r1, [sp, #0xc6]
 	str r4, [sp, #0xc8]
-	bl ov01_02337BA0
+	bl ov29_02337BA0
 	ldr r0, _0206A5E0 ; =_020B0B48
 	ldr r1, _0206A5E4 ; =0x00001001
 	ldr r0, [r0]
 	str r1, [r0]
 	b _0206A5D4
 _0206A104:
-	bl ov01_02337E0C
+	bl ov29_02337E0C
 	movs r4, r0
 	beq _0206A5D4
-	bl ov01_02337C54
+	bl ov29_02337C54
 	cmp r4, #0xe
 	addls pc, pc, r4, lsl #2
 	b _0206A5D4
@@ -114807,7 +114807,7 @@ _0206A120: ; jump table
 	b _0206A380 ; case 13
 	b _0206A380 ; case 14
 _0206A15C:
-	bl ov02_0233CAA8
+	bl ov29_0233CAA8
 	cmp r0, #1
 	bne _0206A300
 	ldr r0, _0206A5E0 ; =_020B0B48
@@ -114822,7 +114822,7 @@ _0206A15C:
 	beq _0206A1B0
 	ldr r1, _0206A5F8 ; =0x000037A8
 	mov r0, #0x1c
-	bl ov02_0233CDC8
+	bl ov29_0233CDC8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	ldr r1, _0206A5FC ; =0x00002001
 	ldr r0, [r0]
@@ -114857,7 +114857,7 @@ _0206A204:
 	add r2, sp, #0x1bc
 	mov r0, #0x1c
 	str r3, [sp, #0x1f4]
-	bl ov02_0233CDD8
+	bl ov29_0233CDD8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	mov r1, #0
 	ldr r0, [r0]
@@ -114902,7 +114902,7 @@ _0206A2AC:
 	add r2, sp, #0x16c
 	mov r0, #0x1c
 	str r3, [sp, #0x1a4]
-	bl ov02_0233CDD8
+	bl ov29_0233CDD8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	mov r1, #0
 	ldr r0, [r0]
@@ -114920,7 +114920,7 @@ _0206A2EC:
 	str r1, [r0]
 	b _0206A5D4
 _0206A300:
-	bl ov02_0233CAA8
+	bl ov29_0233CAA8
 	cmp r0, #0
 	bne _0206A5D4
 	add r0, sp, #0x11c
@@ -114948,7 +114948,7 @@ _0206A354:
 	add r2, sp, #0x11c
 	mov r0, #0x1c
 	str r3, [sp, #0x154]
-	bl ov02_0233CDD8
+	bl ov29_0233CDD8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	mov r1, #0x8000
 	ldr r0, [r0]
@@ -114958,17 +114958,17 @@ _0206A380:
 	mov r0, #1
 	b _0206A5D8
 _0206A388:
-	bl ov02_0233CAD8
+	bl ov29_0233CAD8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	ldr r1, _0206A5E8 ; =0x00003001
 	ldr r0, [r0]
 	str r1, [r0]
 	b _0206A5D4
 _0206A3A0:
-	bl ov02_0233CB3C
+	bl ov29_0233CB3C
 	cmp r0, #2
 	bne _0206A450
-	bl ov02_0233CB10
+	bl ov29_0233CB10
 	add r0, sp, #0xcc
 	bl InitPreprocessorArgs
 	ldr r0, _0206A5E0 ; =_020B0B48
@@ -115000,7 +115000,7 @@ _0206A410:
 	add r2, sp, #0xcc
 	mov r0, #0x1c
 	str r3, [sp, #0x104]
-	bl ov02_0233CDD8
+	bl ov29_0233CDD8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	mov r1, #0
 	ldr r0, [r0]
@@ -115014,11 +115014,11 @@ _0206A410:
 _0206A450:
 	cmp r0, #1
 	bne _0206A5D4
-	bl ov02_0233CB10
+	bl ov29_0233CB10
 	mov r0, #1
 	b _0206A5D8
 _0206A464:
-	bl ov02_0233CDE4
+	bl ov29_0233CDE4
 	mov r4, r0
 	bl sub_020698B8
 	cmp r4, #0x12
@@ -115030,7 +115030,7 @@ _0206A464:
 	str r1, [r0]
 	b _0206A5D4
 _0206A490:
-	bl ov02_0233CDE4
+	bl ov29_0233CDE4
 	cmp r0, #0x12
 	bne _0206A5D4
 	mov r0, #1
@@ -115038,14 +115038,14 @@ _0206A490:
 _0206A4A4:
 	ldr r1, _0206A60C ; =0x0000023B
 	mov r0, #0
-	bl ov02_0233CDC8
+	bl ov29_0233CDC8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	ldr r1, _0206A610 ; =0x00004002
 	ldr r0, [r0]
 	str r1, [r0]
 	b _0206A5D4
 _0206A4C4:
-	bl ov02_0233CDE4
+	bl ov29_0233CDE4
 	cmp r0, #0x12
 	bne _0206A5D4
 	mov r0, #0xe0
@@ -115074,11 +115074,11 @@ _0206A4F8:
 	mov r0, #0x1c
 	beq _0206A53C
 	ldr r1, _0206A618 ; =0x0000379E
-	bl ov02_0233CDC8
+	bl ov29_0233CDC8
 	b _0206A544
 _0206A53C:
 	mov r1, #0x23c
-	bl ov02_0233CDC8
+	bl ov29_0233CDC8
 _0206A544:
 	ldr r0, _0206A5E0 ; =_020B0B48
 	ldr r1, _0206A61C ; =0x00004003
@@ -115091,32 +115091,32 @@ _0206A558:
 	beq _0206A5D8
 	ldr r1, _0206A620 ; =0x00000239
 	mov r0, #0x1c
-	bl ov02_0233CDC8
+	bl ov29_0233CDC8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	ldr r1, _0206A5EC ; =0x00004004
 	ldr r0, [r0]
 	str r1, [r0]
 	b _0206A5D4
 _0206A584:
-	bl ov02_0233CDE4
+	bl ov29_0233CDE4
 	cmp r0, #0x12
 	bne _0206A5D4
 	ldr r1, _0206A624 ; =0x000037A0
 	mov r0, #0x1c
-	bl ov02_0233CDC8
+	bl ov29_0233CDC8
 	ldr r0, _0206A5E0 ; =_020B0B48
 	mov r1, #0x8000
 	ldr r0, [r0]
 	str r1, [r0]
 	b _0206A5D4
 _0206A5B0:
-	bl ov02_0233CDE4
+	bl ov29_0233CDE4
 	cmp r0, #0x12
 	bne _0206A5D4
 	mov r0, #1
 	b _0206A5D8
 _0206A5C4:
-	bl ov02_0233CDE4
+	bl ov29_0233CDE4
 	cmp r0, #0x12
 	moveq r0, #2
 	beq _0206A5D8
@@ -115131,7 +115131,7 @@ _0206A5E4: .word 0x00001001
 _0206A5E8: .word 0x00003001
 _0206A5EC: .word 0x00004004
 _0206A5F0: .word sub_0206A628
-_0206A5F4: .word 0x02337B68
+_0206A5F4: .word PositionHasMonster
 _0206A5F8: .word 0x000037A8
 _0206A5FC: .word 0x00002001
 _0206A600: .word 0x000038C9
@@ -115150,12 +115150,12 @@ _0206A624: .word 0x000037A0
 sub_0206A628: ; 0x0206A628
 	stmdb sp!, {r4, lr}
 	mov r4, r0
-	bl ov02_0233CAA8
+	bl ov29_0233CAA8
 	cmp r0, #1
 	bne _0206A70C
 	add r0, r4, #4
 	mov r1, #0x34
-	bl ov01_02337B3C
+	bl ov29_02337B3C
 	ldrb r1, [r4, #3]
 	cmp r0, r1
 	movne r0, #3
@@ -132780,7 +132780,7 @@ sub_02078900: ; 0x02078900
 	bl EnableIrqFlag
 	cmp r5, #0
 	beq _02078930
-	ldr r1, _0207896C ; =0x027E0000
+	ldr r1, _0207896C ; =OS_IRQTable
 	mvn r2, r4
 	add r1, r1, #0x3000
 	ldr r3, [r1, #0xff8]
@@ -132788,13 +132788,13 @@ sub_02078900: ; 0x02078900
 	str r2, [r1, #0xff8]
 _02078930:
 	bl SetIrqFlag
-	ldr r1, _0207896C ; =0x027E0000
+	ldr r1, _0207896C ; =OS_IRQTable
 	add r0, r1, #0x3000
 	ldr r0, [r0, #0xff8]
 	tst r4, r0
 	ldmneia sp!, {r4, r5, r6, pc}
 	add r0, r1, #0x3f8
-	ldr r5, _02078970 ; =0x027E0060
+	ldr r5, _02078970 ; =DTCM_BSS
 	add r6, r0, #0x3c00
 _02078954:
 	mov r0, r5
@@ -132804,8 +132804,8 @@ _02078954:
 	beq _02078954
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_0207896C: .word 0x027E0000
-_02078970: .word 0x027E0060
+_0207896C: .word OS_IRQTable
+_02078970: .word DTCM_BSS
 	arm_func_end sub_02078900

 	arm_func_start sub_02078974
@@ -132833,7 +132833,7 @@ sub_02078978: ; 0x02078978
 	ldr r0, [r0, r5]
 	blx r1
 _020789BC:
-	ldr r0, _020789F8 ; =0x027E0000
+	ldr r0, _020789F8 ; =OS_IRQTable
 	ldr r1, _020789FC ; =_022B95E8
 	add r0, r0, #0x3000
 	ldr r2, [r0, #0xff8]
@@ -132849,7 +132849,7 @@ _020789BC:
 _020789EC: .word _022B95E4
 _020789F0: .word _020B2B9C
 _020789F4: .word _022B95EC
-_020789F8: .word 0x027E0000
+_020789F8: .word OS_IRQTable
 _020789FC: .word _022B95E8
 	arm_func_end sub_02078978

@@ -132927,13 +132927,13 @@ _02078A7C: .word sub_02078978

 	arm_func_start sub_02078A80
 sub_02078A80: ; 0x02078A80
-	ldr r0, _02078A94 ; =0x027E0060
+	ldr r0, _02078A94 ; =DTCM_BSS
 	mov r1, #0
 	str r1, [r0, #4]
 	str r1, [r0]
 	bx lr
 	.align 2, 0
-_02078A94: .word 0x027E0060
+_02078A94: .word DTCM_BSS
 	arm_func_end sub_02078A80

 	arm_func_start sub_02078A98
@@ -132941,7 +132941,7 @@ sub_02078A98: ; 0x02078A98
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
 	mov r8, #0
 	mov r2, #0xc
-	ldr r4, _02078B18 ; =0x027E0000
+	ldr r4, _02078B18 ; =OS_IRQTable
 	ldr r6, _02078B1C ; =_022B95E4
 	mov r7, r8
 	mov lr, r8
@@ -132982,7 +132982,7 @@ _02078B1C: .word _022B95E4

 	arm_func_start sub_02078B20
 sub_02078B20: ; 0x02078B20
-	ldr r2, _02078BA4 ; =0x027E0000
+	ldr r2, _02078BA4 ; =OS_IRQTable
 	mov r1, #0
 _02078B28:
 	tst r0, #1
@@ -133020,7 +133020,7 @@ _02078B88:
 	mov r0, #0
 	bx lr
 	.align 2, 0
-_02078BA4: .word 0x027E0000
+_02078BA4: .word OS_IRQTable
 _02078BA8: .word _022B95E4
 	arm_func_end sub_02078B20

@@ -133138,7 +133138,7 @@ _02078CF0: .word 0x04000208

 	arm_func_start sub_02078CF4
 sub_02078CF4: ; 0x02078CF4
-	ldr ip, _02078D18 ; =0x027E0000
+	ldr ip, _02078D18 ; =OS_IRQTable
 	ldr r3, _02078D1C ; =0xFDDB597D
 	add r0, ip, #0x3000
 	ldr r2, _02078D20 ; =0x7BF9DD5B
@@ -133148,7 +133148,7 @@ sub_02078CF4: ; 0x02078CF4
 	str r2, [r0, -r1]
 	bx lr
 	.align 2, 0
-_02078D18: .word 0x027E0000
+_02078D18: .word OS_IRQTable
 _02078D1C: .word 0xFDDB597D
 _02078D20: .word 0x7BF9DD5B
 _02078D24: .word 0x00000800
@@ -133803,14 +133803,14 @@ sub_02079408: ; 0x02079408
 	str r1, [r0, #0x2c]
 	str r1, [r0, #0x28]
 	cmp r2, #0
-	ldrle r0, _02079528 ; =0x027E2080
+	ldrle r0, _02079528 ; =SDK_SECTION_ARENA_DTCM_START
 	ble _0207947C
-	ldr r1, _0207952C ; =0x027E0000
+	ldr r1, _0207952C ; =OS_IRQTable
 	ldr r0, _02079530 ; =0x00000800
 	add r1, r1, #0x3f80
 	sub r0, r1, r0
 _0207947C:
-	ldr r1, _0207952C ; =0x027E0000
+	ldr r1, _0207952C ; =OS_IRQTable
 	sub ip, r0, r2
 	add r2, r1, #0x3f80
 	ldr r0, _02079530 ; =0x00000800
@@ -133854,8 +133854,8 @@ _02079518: .word _022B9648
 _0207951C: .word _022B9670
 _02079520: .word 0x00000000
 _02079524: .word _022B973C
-_02079528: .word 0x027E2080
-_0207952C: .word 0x027E0000
+_02079528: .word SDK_SECTION_ARENA_DTCM_START
+_0207952C: .word OS_IRQTable
 _02079530: .word 0x00000800
 _02079534: .word 0xFDDB597D
 _02079538: .word 0x7BF9DD5B
@@ -135232,7 +135232,7 @@ _0207A55C: ; jump table
 	b _0207A5F8 ; case 5
 	b _0207A600 ; case 6
 _0207A578:
-	ldr r0, _0207A610 ; =0x023E0000
+	ldr r0, _0207A610 ; =SDK_SECTION_ARENA_EX_START
 	ldmia sp!, {r3, pc}
 _0207A580:
 	ldr r0, _0207A614 ; =_022B98C4
@@ -135253,20 +135253,20 @@ _0207A5B0:
 	mov r0, #0x2000000
 	ldmia sp!, {r3, pc}
 _0207A5B8:
-	ldr r0, _0207A618 ; =0x027E0000
+	ldr r0, _0207A618 ; =OS_IRQTable
 	ldr r1, _0207A61C ; =0x00000000
 	ldr r2, _0207A620 ; =0x00000800
 	add r3, r0, #0x3f80
 	cmp r1, #0
 	sub r2, r3, r2
 	bne _0207A5E4
-	ldr r1, _0207A624 ; =0x027E2080
+	ldr r1, _0207A624 ; =SDK_SECTION_ARENA_DTCM_START
 	cmp r0, r1
 	movlo r0, r1
 	ldmia sp!, {r3, pc}
 _0207A5E4:
 	cmp r1, #0
-	ldrlt r0, _0207A624 ; =0x027E2080
+	ldrlt r0, _0207A624 ; =SDK_SECTION_ARENA_DTCM_START
 	sublt r0, r0, r1
 	subge r0, r2, r1
 	ldmia sp!, {r3, pc}
@@ -135280,12 +135280,12 @@ _0207A608:
 	mov r0, #0
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_0207A610: .word 0x023E0000
+_0207A610: .word SDK_SECTION_ARENA_EX_START
 _0207A614: .word _022B98C4
-_0207A618: .word 0x027E0000
+_0207A618: .word OS_IRQTable
 _0207A61C: .word 0x00000000
 _0207A620: .word 0x00000800
-_0207A624: .word 0x027E2080
+_0207A624: .word SDK_SECTION_ARENA_DTCM_START
 _0207A628: .word 0x027FF680
 _0207A62C: .word 0x037F8000
 	arm_func_end sub_0207A54C
@@ -135305,7 +135305,7 @@ _0207A640: ; jump table
 	b _0207A6A4 ; case 5
 	b _0207A6AC ; case 6
 _0207A65C:
-	ldr r0, _0207A6BC ; =0x0238EC80
+	ldr r0, _0207A6BC ; =SDK_MAIN_ARENA_LO
 	ldmia sp!, {r3, pc}
 _0207A664:
 	ldr r0, _0207A6C0 ; =_022B98C4
@@ -135320,13 +135320,13 @@ _0207A684:
 	mov r0, #0
 	ldmia sp!, {r3, pc}
 _0207A68C:
-	ldr r0, _0207A6C4 ; =0x023E0000
+	ldr r0, _0207A6C4 ; =SDK_SECTION_ARENA_EX_START
 	ldmia sp!, {r3, pc}
 _0207A694:
-	ldr r0, _0207A6C8 ; =0x01FFC000
+	ldr r0, _0207A6C8 ; =SDK_SECTION_ARENA_ITCM_START
 	ldmia sp!, {r3, pc}
 _0207A69C:
-	ldr r0, _0207A6CC ; =0x027E2080
+	ldr r0, _0207A6CC ; =SDK_SECTION_ARENA_DTCM_START
 	ldmia sp!, {r3, pc}
 _0207A6A4:
 	ldr r0, _0207A6D0 ; =0x027FF000
@@ -135338,11 +135338,11 @@ _0207A6B4:
 	mov r0, #0
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_0207A6BC: .word 0x0238EC80
+_0207A6BC: .word SDK_MAIN_ARENA_LO
 _0207A6C0: .word _022B98C4
-_0207A6C4: .word 0x023E0000
-_0207A6C8: .word 0x01FFC000
-_0207A6CC: .word 0x027E2080
+_0207A6C4: .word SDK_SECTION_ARENA_EX_START
+_0207A6C8: .word SDK_SECTION_ARENA_ITCM_START
+_0207A6CC: .word SDK_SECTION_ARENA_DTCM_START
 _0207A6D0: .word 0x027FF000
 _0207A6D4: .word 0x037F8000
 	arm_func_end sub_0207A630
@@ -136307,7 +136307,7 @@ sub_0207B280: ; 0x0207B280
 	mov r0, #0x10
 	strh r2, [r1]
 	bl sub_02078C98
-	ldr r0, _0207B368 ; =0x027E0000
+	ldr r0, _0207B368 ; =OS_IRQTable
 	add r0, r0, #0x3000
 	ldr r1, [r0, #0xff8]
 	orr r1, r1, #0x10
@@ -136363,7 +136363,7 @@ _0207B34C:
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _0207B364: .word 0x04000106
-_0207B368: .word 0x027E0000
+_0207B368: .word OS_IRQTable
 _0207B36C: .word _022B99B0
 	arm_func_end sub_0207B280

@@ -136569,7 +136569,7 @@ sub_0207B5CC: ; 0x0207B5CC
 	mov r0, #4
 	bl sub_02078C98
 	ldr r2, _0207B734 ; =0x04000004
-	ldr r0, _0207B738 ; =0x027E0000
+	ldr r0, _0207B738 ; =OS_IRQTable
 	ldrh r1, [r2]
 	add r0, r0, #0x3000
 	bic r1, r1, #0x20
@@ -136663,7 +136663,7 @@ _0207B724:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 _0207B734: .word 0x04000004
-_0207B738: .word 0x027E0000
+_0207B738: .word OS_IRQTable
 _0207B73C: .word _022B99BC
 _0207B740: .word 0x04000006
 	arm_func_end sub_0207B5CC
--- a/asm/overlay_00.s
+++ b/asm/overlay_00.s
@@ -2194,7 +2194,7 @@ _022BE320:
 	bl LoadOverlay
 	bl sub_020184B4
 	bl sub_020024B0
-	bl ov01_02329520
+	bl ov02_02329520
 	ldr r2, _022BE3C8 ; =0x04000208
 	mov r0, #1
 	ldrh r1, [r2]
--- a/asm/overlay_02.s
+++ b/asm/overlay_02.s
@@ -52235,14 +52235,14 @@ ov02_0234F098: ; 0x0234F098
 	stmdb sp!, {r3, lr}
 	mov r0, #1
 	bl ov02_0234F9E8
-	ldr r0, _0234F0BC ; =0x027E0000
+	ldr r0, _0234F0BC ; =OS_IRQTable
 	add r0, r0, #0x3000
 	ldr r1, [r0, #0xff8]
 	orr r1, r1, #1
 	str r1, [r0, #0xff8]
 	ldmia sp!, {r3, pc}
 	.align 2, 0
-_0234F0BC: .word 0x027E0000
+_0234F0BC: .word OS_IRQTable
 	arm_func_end ov02_0234F098

 	arm_func_start ov02_0234F0C0
--- a/asm/overlay_10.s
+++ b/asm/overlay_10.s
@@ -9391,7 +9391,10 @@ RAIN_ABILITY_BONUS_REGEN:
 	.byte 0x6A, 0xFF, 0x00, 0x00
 	.global ov10_022C457C
 ov10_022C457C:
-	.byte 0x03, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00
+	.byte 0x03, 0x00, 0x00, 0x00
+	.global ov10_022C4580
+ov10_022C4580:
+	.byte 0x46, 0x00, 0x00, 0x00
 	.global ov10_022C4584
 ov10_022C4584:
 	.byte 0x1E, 0x00, 0x00, 0x00
@@ -10036,7 +10039,10 @@ ov10_022C48EC:
 	.byte 0x00, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00
 	.global ov10_022C48F4
 ov10_022C48F4:
-	.byte 0x7C, 0x05, 0x79, 0x05, 0x7A, 0x05, 0x7B, 0x05, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x14, 0x00
+	.byte 0x7C, 0x05, 0x79, 0x05, 0x7A, 0x05, 0x7B, 0x05, 0x00, 0x00, 0x00, 0x00
+	.global ov10_022C4900
+ov10_022C4900:
+	.byte 0x64, 0x00, 0x14, 0x00
 	.byte 0x1E, 0x00, 0x28, 0x00, 0x32, 0x00, 0x00, 0x00
 	.global ov10_022C490C
 ov10_022C490C:
--- a/asm/overlay_29_02337CCC.s
+++ b/asm/overlay_29_02337CCC.s
@@ -92,11 +92,13 @@ _02337DE4:
 	mov r0, r6
 	bl EntityIsValid__02337CA8
 	cmp r0, #0
-	beq _02337E0C
+	beq ov29_02337E0C
 	mov r0, r6
 	bl ov29_02304BAC
 	arm_func_end ov29_02337D68
-_02337E0C:
+
+	arm_func_start ov29_02337E0C
+ov29_02337E0C: ; 0x02337E0C
 	add r5, r5, #1
 	cmp r5, #0x14
 	blt _02337DE4
@@ -106,6 +108,7 @@ _02337E0C:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _02337E28: .word ov29_02353538
+	arm_func_end ov29_02337E0C

 	arm_func_start ov29_02337E2C
 ov29_02337E2C: ; 0x02337E2C
--- a/asm/overlay_29_0234EC38.s
+++ b/asm/overlay_29_0234EC38.s
@@ -3031,6 +3031,8 @@ ov29_0235173E:
 ov29_0235175C:
 	.byte 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
 	.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00
+	.global ov29_0235177C
+ov29_0235177C:
 	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00
 	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00
 	.global ov29_0235179C
--- a/lib/asm/crt0.s
+++ b/lib/asm/crt0.s
@@ -14,12 +14,12 @@ _02000808:
 	bl sub_02000AB0
 	mov r0, #0x13
 	msr cpsr_c, r0
-	ldr r0, _02000930 ; =0x027E0000
+	ldr r0, _02000930 ; =OS_IRQTable
 	add r0, r0, #0x3fc0
 	mov sp, r0
 	mov r0, #0x12
 	msr cpsr_c, r0
-	ldr r0, _02000930 ; =0x027E0000
+	ldr r0, _02000930 ; =OS_IRQTable
 	add r0, r0, #0x3fc0
 	sub r0, r0, #0x40
 	sub sp, r0, #4
@@ -35,7 +35,7 @@ _02000854:
 	msr cpsr_fsxc, r0
 	sub sp, r1, #4
 	mov r0, #0
-	ldr r1, _02000930 ; =0x027E0000
+	ldr r1, _02000930 ; =OS_IRQTable
 	mov r2, #0x4000
 	bl sub_02000954
 	mov r0, #0
@@ -73,7 +73,7 @@ _020008D4:
 	blt _020008D4
 	ldr r1, _02000944 ; =0x027FFF9C
 	str r0, [r1]
-	ldr r1, _02000930 ; =0x027E0000
+	ldr r1, _02000930 ; =OS_IRQTable
 	add r1, r1, #0x3fc0
 	add r1, r1, #0x3c
 	ldr r0, _02000948 ; =0x01FF95E8
@@ -91,7 +91,7 @@ _02000928:
 _0200092C:
 	bx r1
 	.align 2, 0
-_02000930: .word 0x027E0000
+_02000930: .word OS_IRQTable
 _02000934: .word 0x00000800
 _02000938: .word 0x05000000
 _0200093C: .word 0x07000000
@@ -246,7 +246,7 @@ sub_02000AB0: ; 0x02000AB0
 	mcr p15, 0, r0, c6, c2, 0
 	ldr r0, _02000B78 ; =0x08000035
 	mcr p15, 0, r0, c6, c3, 0
-	ldr r0, _02000B7C ; =0x027E0000
+	ldr r0, _02000B7C ; =OS_IRQTable
 	orr r0, r0, #0x1a
 	orr r0, r0, #1
 	mcr p15, 0, r0, c6, c4, 0
@@ -258,7 +258,7 @@ sub_02000AB0: ; 0x02000AB0
 	mcr p15, 0, r0, c6, c7, 0
 	mov r0, #0x20
 	mcr p15, 0, r0, c9, c1, 1
-	ldr r0, _02000B7C ; =0x027E0000
+	ldr r0, _02000B7C ; =OS_IRQTable
 	orr r0, r0, #0xa
 	mcr p15, 0, r0, c9, c1, 0
 	mov r0, #0x42
@@ -282,7 +282,7 @@ _02000B6C: .word 0x04000033
 _02000B70: .word 0x0200002D
 _02000B74: .word 0x027E0021
 _02000B78: .word 0x08000035
-_02000B7C: .word 0x027E0000
+_02000B7C: .word OS_IRQTable
 _02000B80: .word 0x0100002F
 _02000B84: .word 0xFFFF001D
 _02000B88: .word 0x027FF017
--- a/lib/asm/include/crt0.inc
+++ b/lib/asm/include/crt0.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public OS_IRQTable
 .public SDK_AUTOLOAD_LIST
 .public SDK_AUTOLOAD_LIST_END
 .public SDK_AUTOLOAD_START
--- a/sub/asm/include/main.inc
+++ b/sub/asm/include/main.inc
@@ -1,77 +1,85 @@
 #pragma once
-.public sub_037FE708
-.public sub_03803830
-.public sub_037FC054
-.public sub_037F886C
-.public sub_037F9198
-.public sub_038039E8
-.public sub_03803B0C
-.public sub_037FD5C0
-.public sub_037FB32C
-.public sub_037FB928
-.public sub_037FE5A8
-.public sub_037FE070
-.public sub_037F8DE0
-.public sub_037FC90C
-.public sub_03807380
-.public sub_037FC468
+.public _0380B2C0
+.public _0380B364
+.public _0380B408
+.public _0380B434
+.public _0380B460
+.public SDK_SUBPRIV_ARENA_LO
+.public sub_037F84E0
 .public sub_037F8598
-.public sub_037FBBFC
-.public sub_037FDD00
-.public sub_037FDFEC
-.public sub_037FD4DC
-.public sub_037FB420
+.public sub_037F8650
+.public sub_037F87AC
+.public sub_037F886C
+.public sub_037F8908
 .public sub_037F8988
-.public sub_037FCD84
-.public sub_037FE12C
-.public sub_03803B28
-.public sub_037FD898
-.public sub_03803B40
-.public sub_037FC760
-.public sub_037FD3A0
-.public sub_037F9238
-.public sub_037FB7BC
-.public sub_03806BC8
-.public sub_037FB454
-.public sub_037FDE70
-.public sub_037FC6D4
-.public sub_037FB3B4
-.public sub_0380521C
-.public sub_037FE39C
-.public sub_037FDFD0
-.public sub_037FDD14
-.public sub_037FCC74
-.public sub_037FC558
-.public sub_037FDF9C
-.public sub_037F8D58
-.public sub_037FD884
 .public sub_037F8A80
+.public sub_037F8D58
+.public sub_037F8DE0
+.public sub_037F9198
+.public sub_037F9238
+.public sub_037F92DC
+.public sub_037FACB4
+.public sub_037FB32C
+.public sub_037FB3B4
+.public sub_037FB420
+.public sub_037FB454
+.public sub_037FB7BC
+.public sub_037FB8F0
+.public sub_037FB928
+.public sub_037FBBFC
+.public sub_037FC054
+.public sub_037FC15C
+.public sub_037FC36C
+.public sub_037FC3C0
+.public sub_037FC468
+.public sub_037FC558
+.public sub_037FC590
+.public sub_037FC6AC
+.public sub_037FC6D4
+.public sub_037FC760
 .public sub_037FC870
 .public sub_037FC888
-.public sub_037FC15C
-.public sub_037FC3C0
-.public sub_037FDF74
-.public sub_037FDA38
-.public sub_037FC36C
-.public sub_037F87AC
-.public sub_037FDE88
-.public sub_03803A48
-.public sub_037FE410
-.public sub_0380398C
-.public sub_037FC590
-.public sub_037F8908
-.public sub_037F8650
-.public sub_037FE588
-.public sub_038073D4
-.public sub_037FC6AC
-.public sub_037FB8F0
-.public sub_037FACB4
-.public sub_037FE2B4
-.public sub_03806B80
+.public sub_037FC90C
+.public sub_037FCC74
+.public sub_037FCD84
 .public sub_037FD21C
 .public sub_037FD390
+.public sub_037FD3A0
+.public sub_037FD4DC
 .public sub_037FD54C
-.public sub_03806DD4
+.public sub_037FD5C0
+.public sub_037FD884
+.public sub_037FD898
+.public sub_037FDA38
+.public sub_037FDD00
+.public sub_037FDD14
+.public sub_037FDE70
+.public sub_037FDE88
+.public sub_037FDF74
+.public sub_037FDF9C
+.public sub_037FDFD0
+.public sub_037FDFEC
 .public sub_037FE014
-.public sub_03807334
+.public sub_037FE070
+.public sub_037FE12C
+.public sub_037FE2B4
+.public sub_037FE39C
+.public sub_037FE410
+.public sub_037FE588
+.public sub_037FE5A8
+.public sub_037FE708
+.public sub_03803830
+.public sub_0380398C
+.public sub_038039E8
+.public sub_03803A48
+.public sub_03803B0C
+.public sub_03803B28
+.public sub_03803B40
 .public sub_03803B7C
+.public sub_0380521C
+.public sub_03806B80
+.public sub_03806BC8
+.public sub_03806DD4
+.public sub_03807334
+.public sub_03807380
+.public sub_038073D4
--- a/sub/asm/include/wram.inc
+++ b/sub/asm/include/wram.inc
@@ -8,7 +8,8 @@
 .public _027F77B0
 .public _027F8878
 .public _027F8DA0
-.public _027F91E0
+.public SDK_SUBPRIV_ARENA_LO
+.public SDK_WRAM_ARENA_LO
 .public sub_027E0000
 .public sub_027E8D44
 .public sub_027E9CB4
--- a/sub/asm/main.s
+++ b/sub/asm/main.s
@@ -393,7 +393,7 @@ sub_027E0640: ; 0x027E0640
 	ldr r1, [r1, #0x588]
 	bl sub_037FC3C0
 	ldr r1, _027E0694 ; =_027F8878
-	ldr r0, _027E069C ; =0x0380B364
+	ldr r0, _027E069C ; =_0380B364
 	ldr r1, [r1, #0x584]
 	bl sub_037FC3C0
 	bl sub_037FC590
@@ -403,8 +403,8 @@ sub_027E0640: ; 0x027E0640
 	bx lr
 	.align 2, 0
 _027E0694: .word _027F8878
-_027E0698: .word 0x0380B2C0
-_027E069C: .word 0x0380B364
+_027E0698: .word _0380B2C0
+_027E069C: .word _0380B364
 	arm_func_end sub_027E0640

 	arm_func_start sub_027E06A0
@@ -414,7 +414,7 @@ sub_027E06A0: ; 0x027E06A0
 	mov r4, r0
 	bl sub_037FC558
 	ldr r1, _027E06F4 ; =_027F8878
-	ldr r0, _027E06F8 ; =0x0380B364
+	ldr r0, _027E06F8 ; =_0380B364
 	ldr r1, [r1, #0x578]
 	bl sub_037FC3C0
 	bl sub_027E8BB0
@@ -422,7 +422,7 @@ sub_027E06A0: ; 0x027E06A0
 	ldr r1, [r1, #0x57c]
 	bl sub_037FC3C0
 	ldr r1, _027E06F4 ; =_027F8878
-	ldr r0, _027E06FC ; =0x0380B2C0
+	ldr r0, _027E06FC ; =_0380B2C0
 	ldr r1, [r1, #0x580]
 	bl sub_037FC3C0
 	bl sub_037FC590
@@ -432,7 +432,7 @@ sub_027E06A0: ; 0x027E06A0
 	bx lr
 	.align 2, 0
 _027E06F4: .word _027F8878
-_027E06F8: .word 0x0380B364
+_027E06F8: .word _0380B364
 _027E06FC: .word 0x0380B2C0
 	arm_func_end sub_027E06A0

@@ -1116,7 +1116,7 @@ _027E101C:
 	cmp r1, #1
 	mov r5, #0
 	bne _027E10AC
-	ldr r0, _027E170C ; =0x0380B408
+	ldr r0, _027E170C ; =_0380B408
 	mov r5, #1
 	bl sub_037FD5C0
 _027E10AC:
@@ -1146,7 +1146,7 @@ _027E10AC:
 	orr r0, r0, r2, lsl #26
 	mov r3, r2, lsr #6
 	mov r1, r0, lsr #0xa
-	ldr r0, _027E170C ; =0x0380B408
+	ldr r0, _027E170C ; =_0380B408
 	mov r2, r3, lsr #0xa
 	orr r1, r1, r3, lsl #22
 	ldr r3, _027E1714 ; =sub_027E1B68
@@ -1494,12 +1494,12 @@ _027E1588:
 	ldrne r4, _027E171C ; =0x0000FFFF
 	cmp r0, #0
 	beq _027E1664
-	ldr r0, _027E1720 ; =0x0380B434
+	ldr r0, _027E1720 ; =_0380B434
 	bl sub_037FD5C0
 	str r4, [sp]
 	ldr r1, [r8, #0x48]
 	ldr r2, [r8, #0x4c]
-	ldr r0, _027E1720 ; =0x0380B434
+	ldr r0, _027E1720 ; =_0380B434
 	ldr r3, _027E1724 ; =sub_027E1AD4
 	bl sub_037FD4DC
 	b _027E19CC
@@ -1550,16 +1550,16 @@ _027E16FC: .word _027F7900
 _027E1700: .word 0x027FFF98
 _027E1704: .word 0x00008002
 _027E1708: .word 0x000005E4
-_027E170C: .word 0x0380B408
+_027E170C: .word _0380B408
 _027E1710: .word 0x000082EA
 _027E1714: .word sub_027E1B68
 _027E1718: .word 0x00008001
 _027E171C: .word 0x0000FFFF
-_027E1720: .word 0x0380B434
+_027E1720: .word _0380B434
 _027E1724: .word sub_027E1AD4
 _027E1728: .word 0x048080F8
 _027E172C:
-	ldr r0, _027E170C ; =0x0380B408
+	ldr r0, _027E170C ; =_0380B408
 	mov r1, #0
 	strh r1, [r8, #0x84]
 	ldrh r6, [r8, #0x90]
@@ -1652,13 +1652,13 @@ _027E1860:
 	ldrh r0, [r8, #0x46]
 	cmp r0, #0
 	beq _027E18B4
-	ldr r0, _027E1720 ; =0x0380B434
+	ldr r0, _027E1720 ; =_0380B434
 	bl sub_037FD5C0
 	mov r0, #0
 	str r0, [sp]
 	ldr r1, [r8, #0x50]
 	ldr r2, [r8, #0x54]
-	ldr r0, _027E1720 ; =0x0380B434
+	ldr r0, _027E1720 ; =_0380B434
 	ldr r3, _027E19FC ; =sub_027E1C00
 	bl sub_037FD4DC
 	b _027E19CC
@@ -1681,7 +1681,7 @@ _027E18D4:
 	bne _027E1948
 	bl sub_037FDD00
 	mov r4, r0
-	ldr r0, _027E170C ; =0x0380B408
+	ldr r0, _027E170C ; =_0380B408
 	bl sub_037FD5C0
 	mov r1, #0
 	mov r0, r4
@@ -1973,15 +1973,15 @@ _027E1C98: .word _027F7878
 	arm_func_start sub_027E1C9C
 sub_027E1C9C: ; 0x027E1C9C
 	stmdb sp!, {r3, lr}
-	ldr r0, _027E1CB8 ; =0x0380B434
+	ldr r0, _027E1CB8 ; =_0380B434
 	bl sub_037FD3A0
-	ldr r0, _027E1CBC ; =0x0380B408
+	ldr r0, _027E1CBC ; =_0380B408
 	bl sub_037FD3A0
 	ldmia sp!, {r3, lr}
 	bx lr
 	.align 2, 0
-_027E1CB8: .word 0x0380B434
-_027E1CBC: .word 0x0380B408
+_027E1CB8: .word _0380B434
+_027E1CBC: .word _0380B408
 	arm_func_end sub_027E1C9C

 	arm_func_start sub_027E1CC0
@@ -6597,21 +6597,21 @@ _027E5B6C:
 	arm_func_start sub_027E5B78
 sub_027E5B78: ; 0x027E5B78
 	ldr ip, _027E5B84 ; =sub_037FD884
-	ldr r0, _027E5B88 ; =0x0380B460
+	ldr r0, _027E5B88 ; =_0380B460
 	bx ip
 	.align 2, 0
 _027E5B84: .word sub_037FD884
-_027E5B88: .word 0x0380B460
+_027E5B88: .word _0380B460
 	arm_func_end sub_027E5B78

 	arm_func_start sub_027E5B8C
 sub_027E5B8C: ; 0x027E5B8C
 	ldr ip, _027E5B98 ; =sub_037FDA38
-	ldr r0, _027E5B9C ; =0x0380B460
+	ldr r0, _027E5B9C ; =_0380B460
 	bx ip
 	.align 2, 0
 _027E5B98: .word sub_037FDA38
-_027E5B9C: .word 0x0380B460
+_027E5B9C: .word _0380B460
 	arm_func_end sub_027E5B8C

 	arm_func_start sub_027E5BA0
@@ -6619,7 +6619,7 @@ sub_027E5BA0: ; 0x027E5BA0
 	stmdb sp!, {r3, r4, lr}
 	sub sp, sp, #4
 	ldr r1, _027E5C40 ; =_027F8878
-	ldr r0, _027E5C44 ; =0x0380B460
+	ldr r0, _027E5C44 ; =_0380B460
 	ldr r4, [r1, #0x550]
 	ldrh r1, [r4, #0xe6]
 	cmp r1, #1
@@ -6629,7 +6629,7 @@ sub_027E5BA0: ; 0x027E5BA0
 	beq _027E5BD0
 	bl sub_037FDA38
 _027E5BD0:
-	ldr r0, _027E5C44 ; =0x0380B460
+	ldr r0, _027E5C44 ; =_0380B460
 	mov r1, #0xcb
 	mov ip, #3
 	ldr r3, _027E5C48 ; =sub_027E5F8C
@@ -6647,7 +6647,7 @@ _027E5BF0:
 	beq _027E5C10
 	bl sub_037FDA38
 _027E5C10:
-	ldr r0, _027E5C44 ; =0x0380B460
+	ldr r0, _027E5C44 ; =_0380B460
 	mov r2, #1
 	mov r1, #0xc8
 	ldr r3, _027E5C4C ; =sub_027E5C50
@@ -6662,7 +6662,7 @@ _027E5C34:
 	bx lr
 	.align 2, 0
 _027E5C40: .word _027F8878
-_027E5C44: .word 0x0380B460
+_027E5C44: .word _0380B460
 _027E5C48: .word sub_027E5F8C
 _027E5C4C: .word sub_027E5C50
 	arm_func_end sub_027E5BA0
@@ -6732,7 +6732,7 @@ _027E5D30:
 	ldr r1, [r0, #0xd8]
 	cmp r1, #0x7f
 	bls _027E5D5C
-	ldr r0, _027E5DA8 ; =0x0380B460
+	ldr r0, _027E5DA8 ; =_0380B460
 	mov r1, #0xd0
 	mov ip, #2
 	ldr r3, _027E5DAC ; =sub_027E5DB4
@@ -6746,7 +6746,7 @@ _027E5D5C:
 	mov r1, #4
 	str r1, [sp]
 	ldrsh r1, [r0, #0x42]
-	ldr r0, _027E5DA8 ; =0x0380B460
+	ldr r0, _027E5DA8 ; =_0380B460
 	ldr r3, _027E5DB0 ; =sub_027E5E74
 	rsb r2, r2, #0x108
 	bl sub_037FD898
@@ -6762,7 +6762,7 @@ _027E5D98: .word 0x04000006
 _027E5D9C: .word 0x00000107
 _027E5DA0: .word 0x003FFFC0
 _027E5DA4: .word 0x0000400E
-_027E5DA8: .word 0x0380B460
+_027E5DA8: .word _0380B460
 _027E5DAC: .word sub_027E5DB4
 _027E5DB0: .word sub_027E5E74
 	arm_func_end sub_027E5C50
@@ -6811,7 +6811,7 @@ _027E5E2C:
 	mov r1, #4
 	str r1, [sp]
 	ldrsh r1, [r0, #0x42]
-	ldr r0, _027E5E6C ; =0x0380B460
+	ldr r0, _027E5E6C ; =_0380B460
 	ldr r3, _027E5E70 ; =sub_027E5E74
 	bl sub_037FD898
 	ldmia sp!, {r3, lr}
@@ -6820,7 +6820,7 @@ _027E5E2C:
 _027E5E60: .word 0x04000006
 _027E5E64: .word _027F8878
 _027E5E68: .word 0x00000107
-_027E5E6C: .word 0x0380B460
+_027E5E6C: .word _0380B460
 _027E5E70: .word sub_027E5E74
 	arm_func_end sub_027E5DB4

@@ -6833,7 +6833,7 @@ sub_027E5E74: ; 0x027E5E74
 	ldr r0, [r4, #0xc]
 	cmp r0, #1
 	bne _027E5F6C
-	ldr r0, _027E5F7C ; =0x0380B460
+	ldr r0, _027E5F7C ; =_0380B460
 	mov r2, #1
 	mov r1, #0xc8
 	ldr r3, _027E5F80 ; =sub_027E5C50
@@ -6896,7 +6896,7 @@ _027E5F6C:
 	bx lr
 	.align 2, 0
 _027E5F78: .word _027F8878
-_027E5F7C: .word 0x0380B460
+_027E5F7C: .word _0380B460
 _027E5F80: .word sub_027E5C50
 _027E5F84: .word 0x00008001
 _027E5F88: .word _027F7900
@@ -6940,7 +6940,7 @@ _027E5FD0:
 	mov r2, #5
 	str r2, [sp]
 	ldrsh r1, [r0, #0x40]
-	ldr r0, _027E603C ; =0x0380B460
+	ldr r0, _027E603C ; =_0380B460
 	ldr r3, _027E6040 ; =sub_027E6044
 	rsb r2, r2, #0x10c
 	bl sub_037FD898
@@ -6951,7 +6951,7 @@ _027E602C: .word _027F8878
 _027E6030: .word 0x04000006
 _027E6034: .word 0x048080F8
 _027E6038: .word 0x0380FFF0
-_027E603C: .word 0x0380B460
+_027E603C: .word _0380B460
 _027E6040: .word sub_027E6044
 	arm_func_end sub_027E5F8C

@@ -6963,7 +6963,7 @@ sub_027E6044: ; 0x027E6044
 	ldr r0, [r0, #0xc]
 	cmp r0, #1
 	bne _027E607C
-	ldr r0, _027E6088 ; =0x0380B460
+	ldr r0, _027E6088 ; =_0380B460
 	mov r1, #0xcb
 	mov ip, #3
 	ldr r3, _027E608C ; =sub_027E5F8C
@@ -6976,7 +6976,7 @@ _027E607C:
 	bx lr
 	.align 2, 0
 _027E6084: .word _027F8878
-_027E6088: .word 0x0380B460
+_027E6088: .word _0380B460
 _027E608C: .word sub_027E5F8C
 	arm_func_end sub_027E6044

@@ -10001,7 +10001,7 @@ _027E8B44:
 	ldr r0, _027E8BA0 ; =0x0380FFF4
 	str r1, [sp]
 	ldr r2, [r4, #0xc]
-	ldr r1, _027E8BAC ; =0x037F84E0
+	ldr r1, _027E8BAC ; =sub_037F84E0
 	str r2, [sp, #4]
 	ldr r0, [r0]
 	ldr r3, [r4, #4]
@@ -10024,7 +10024,7 @@ _027E8B44:
 _027E8BA0: .word 0x0380FFF4
 _027E8BA4: .word 0x00000694
 _027E8BA8: .word 0x04000304
-_027E8BAC: .word 0x037F84E0
+_027E8BAC: .word sub_037F84E0
 	arm_func_end sub_027E89E0

 	arm_func_start sub_027E8BB0
@@ -13565,7 +13565,7 @@ _027EB8B8: .word 0x00003FFF
 	arm_func_start sub_027EB8BC
 sub_027EB8BC: ; 0x027EB8BC
 	stmdb sp!, {r3, lr}
-	ldr r1, _027EB8DC ; =0x037F92DC
+	ldr r1, _027EB8DC ; =sub_037F92DC
 	mov r0, #0x1000000
 	bl sub_037FB7BC
 	mov r0, #0x1000000
@@ -13573,7 +13573,7 @@ sub_027EB8BC: ; 0x027EB8BC
 	ldmia sp!, {r3, lr}
 	bx lr
 	.align 2, 0
-_027EB8DC: .word 0x037F92DC
+_027EB8DC: .word sub_037F92DC
 	arm_func_end sub_027EB8BC

 	arm_func_start sub_027EB8E0
@@ -27709,6 +27709,3 @@ _027F8F28:
 	.global _027F9000
 _027F9000:
 	.space 0x1E0
-	.global _027F91E0
-_027F91E0:
-	.space 0x0
--- a/sub/asm/wram.s
+++ b/sub/asm/wram.s
@@ -5775,7 +5775,7 @@ _037FCAE0:
 _037FCAE8:
 	ldr r2, _037FCB28 ; =0x00000400
 	ldr r0, _037FCB2C ; =0x0380FF80
-	ldr r1, _037FCB30 ; =_0380B488
+	ldr r1, _037FCB30 ; =SDK_WRAM_ARENA_LO
 	sub r2, r0, r2
 	mov r0, #0x3800000
 	cmp r1, #0x3800000
@@ -5793,7 +5793,7 @@ _037FCB1C:
 _037FCB24: .word 0x027FF000
 _037FCB28: .word 0x00000400
 _037FCB2C: .word 0x0380FF80
-_037FCB30: .word _0380B488
+_037FCB30: .word SDK_WRAM_ARENA_LO
 _037FCB34: .word 0x00000400
 	arm_func_end sub_037FCABC

@@ -5807,15 +5807,15 @@ sub_037FCB38: ; 0x037FCB38
 	beq _037FCB6C
 	b _037FCB80
 _037FCB54:
-	ldr r0, _037FCB88 ; =_027F91E0
+	ldr r0, _037FCB88 ; =SDK_SUBPRIV_ARENA_LO
 	bx lr
 _037FCB5C:
-	ldr r0, _037FCB8C ; =_0380B488
+	ldr r0, _037FCB8C ; =SDK_WRAM_ARENA_LO
 	cmp r0, #0x3800000
 	movhi r0, #0x3800000
 	bx lr
 _037FCB6C:
-	ldr r1, _037FCB8C ; =_0380B488
+	ldr r1, _037FCB8C ; =SDK_WRAM_ARENA_LO
 	mov r0, #0x3800000
 	cmp r1, #0x3800000
 	movhi r0, r1
@@ -5824,8 +5824,8 @@ _037FCB80:
 	mov r0, #0
 	bx lr
 	.align 2, 0
-_037FCB88: .word _027F91E0
-_037FCB8C: .word _0380B488
+_037FCB88: .word SDK_SUBPRIV_ARENA_LO
+_037FCB8C: .word SDK_WRAM_ARENA_LO
 	arm_func_end sub_037FCB38

 	arm_func_start sub_037FCB90
@@ -19331,7 +19331,7 @@ _0380B264:
 	.space 0x30
 	.global _0380B294
 _0380B294:
-	.space 0x14
+	.space 0x2C
 	.global _0380B2C0
 _0380B2C0:
 	.space 0xA4
@@ -19346,7 +19346,4 @@ _0380B434:
 	.space 0x2C
 	.global _0380B460
 _0380B460:
-	.space 0x40
-	.global _0380B488
-_0380B488:
-	.space 0x0
+	.space 0x28