Merge pull request #211 from red031000/master

modules 14, 20, and 21 fully shiftable

13 files changed, 117 insertions, 92 deletions

diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index ab0075c6..bd1cabb4 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -574,7 +574,7 @@ Overlay MODULE_13
 
 Overlay MODULE_14
 {
-	### Menu? ###
+	##PC##
 	After arm9
 	Object module_14.o
 }
@@ -587,7 +587,7 @@ Overlay MODULE_15
 
 Overlay MODULE_16
 {
-	##Battle Graphics##
+	##Pokedex/Battle Sprites##
 	After arm9
 	Object module_16.o
 }
@@ -613,12 +613,14 @@ Overlay MODULE_19
 
 Overlay MODULE_20
 {
+	##Pokétch##
 	After MODULE_06
 	Object module_20.o
 }
 
 Overlay MODULE_21
 {
+	##Pokétch##
 	After MODULE_20
 	Object module_21.o
 	Object module_21_sinit.o
diff --git a/arm9/global.inc b/arm9/global.inc
index e33bd907..ace8a6da 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7225,6 +7225,7 @@
 .extern MOD75_021E6BA0
 .extern MOD75_021E6D6C
 .extern MOD75_021E6F00
+.extern MOD75_021EC68C
 .extern MOD76_021D74E0
 .extern MOD76_021D7568
 .extern MOD76_021D761C
@@ -7760,6 +7761,7 @@
 .extern UNK_020F2B7C
 .extern UNK_020F2B8C
 .extern UNK_020FA5FC
+.extern UNK_020FA6E8
 .extern UNK_020FB6F8
 .extern UNK_020FB704
 .extern UNK_020FB710
@@ -8087,3 +8089,4 @@
 .extern MOD18_0224A7C8
 .extern MOD06_0224CAAC
 .extern MOD06_0224CB54
+.extern gSineTable
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 5cf8939b..2c5fb91b 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -5663,7 +5663,7 @@ _021DA2F2:
 	bl MOD14_021D83E4
 	mov r1, #0x4b
 	lsl r1, r1, #2
-	ldr r0, _021DA394 ; =MOD14_020FA6E8
+	ldr r0, _021DA394 ; =UNK_020FA6E8
 	add r1, r5, r1
 	mov r2, #9
 	bl FUN_02006234
@@ -5716,7 +5716,7 @@ _021DA374:
 _021DA390:
 	pop {r3, r4, r5, pc}
 	nop
-_021DA394: .word 0x020FA6E8
+_021DA394: .word UNK_020FA6E8
 _021DA398: .word MOD14_021D76E8
 
 	thumb_func_start MOD14_021DA39C
@@ -5825,7 +5825,7 @@ _021DA41E:
 	bl HandleLoadOverlay
 	mov r1, #0x85
 	lsl r1, r1, #2
-	ldr r0, _021DA5E0 ; =MOD14_021EC68C
+	ldr r0, _021DA5E0 ; =MOD75_021EC68C
 	ldr r1, [r4, r1]
 	mov r2, #9
 	bl FUN_02006234
@@ -5993,7 +5993,7 @@ _021DA5D6:
 	.align 2, 0
 _021DA5D8: .word MOD14_021E6264
 _021DA5DC: .word SDK_OVERLAY_MODULE_75_ID
-_021DA5E0: .word 0x021EC68C
+_021DA5E0: .word MOD75_021EC68C
 _021DA5E4: .word MOD14_021E6A00
 _021DA5E8: .word gUnknown21C48B8
 _021DA5EC: .word 0x000005DD
@@ -10424,13 +10424,13 @@ MOD14_021DC720: ; 0x021DC720
 	ldr r0, [r3, #0x10]
 	sub r0, r2, r0
 	ldr r2, [r3, #0xc]
-	ldr r3, _021DC734 ; =MOD14_020C5668
+	ldr r3, _021DC734 ; =FX_Atan2
 	sub r1, r1, r2
 	lsl r0, r0, #0xc
 	lsl r1, r1, #0xc
 	bx r3
 	nop
-_021DC734: .word 0x020C5668
+_021DC734: .word FX_Atan2
 
 	thumb_func_start MOD14_021DC738
 MOD14_021DC738: ; 0x021DC738
@@ -18844,10 +18844,10 @@ MOD14_021E0930: ; 0x021E0930
 	mov r3, #0x34
 	mul r3, r2
 	add r2, r3, #0
-	ldr r3, _021E093C ; =MOD14_020CE210
+	ldr r3, _021E093C ; =MIi_CpuCopy32
 	bx r3
 	nop
-_021E093C: .word 0x020CE210
+_021E093C: .word MIi_CpuCopy32
 
 	thumb_func_start MOD14_021E0940
 MOD14_021E0940: ; 0x021E0940
@@ -24466,7 +24466,7 @@ MOD14_021E3464: ; 0x021E3464
 	mov r3, #0x10
 	add r1, #0xe4
 	strb r3, [r1]
-	ldr r1, _021E34BC ; =MOD14_020EDF50
+	ldr r1, _021E34BC ; =gSineTable
 	mov r3, #1
 	lsl r4, r4, #8
 	mov r6, #0x10
@@ -24501,7 +24501,7 @@ _021E3480:
 	pop {r4, r5, r6, r7}
 	bx lr
 	nop
-_021E34BC: .word 0x020EDF50
+_021E34BC: .word gSineTable
 
 	thumb_func_start MOD14_021E34C0
 MOD14_021E34C0: ; 0x021E34C0
@@ -30485,36 +30485,36 @@ MOD14_021E63A4: ; 0x021E63A4
 
 	.global MOD14_021E63CC
 MOD14_021E63CC: ; 0x021E63CC
-	.byte 0x2D, 0xCC, 0x1D, 0x02
+	.word MOD14_021DCC2C
 
 	.global MOD14_021E63D0
 MOD14_021E63D0: ; 0x021E63D0
-	.byte 0x00, 0x00, 0x00, 0x00, 0xA1, 0xCC, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0xCD, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x61, 0xCD, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xCD, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x69, 0xCE, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xC5, 0xCE, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x41, 0xCF, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA1, 0xCF, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xBD, 0xCF, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xCF, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x35, 0xD0, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x71, 0xD0, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xA1, 0xD0, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xD0, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x2D, 0xD1, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x75, 0xD1, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xBD, 0xD1, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x35, 0xD2, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD2, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xC5, 0xD2, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xD3, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD3, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xD3, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xF5, 0xD3, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x45, 0xD4, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x61, 0xD4, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x91, 0xD4, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xD4, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xFD, 0xD4, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x35, 0xD5, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x71, 0xD5, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xAD, 0xD5, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x6D, 0xD6, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xBD, 0xD6, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x41, 0xD7, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD7, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xCD, 0xD7, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xFD, 0xD7, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x6D, 0xD8, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xD8, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xC5, 0xD8, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xD8, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x05, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xD9, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x35, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x71, 0xD9, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x8D, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xD9, 0x1D, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xE5, 0xD9, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00
+	.word 0x00000000, MOD14_021DCCA0, 0x00000000, MOD14_021DCD04
+	.word 0x00000000, MOD14_021DCD60, 0x00000000, MOD14_021DCDA8
+	.word 0x00000000, MOD14_021DCE68, 0x00000000, MOD14_021DCEC4
+	.word 0x00000000, MOD14_021DCF40, 0x00000000, MOD14_021DCFA0
+	.word 0x00000000, MOD14_021DCFBC, 0x00000000, MOD14_021DCFF8
+	.word 0x00000000, MOD14_021DD034, 0x00000000, MOD14_021DD070
+	.word 0x00000000, MOD14_021DD0A0, 0x00000000, MOD14_021DD0F0
+	.word 0x00000000, MOD14_021DD12C, 0x00000000, MOD14_021DD174
+	.word 0x00000000, MOD14_021DD1BC, 0x00000000, MOD14_021DD1F8
+	.word 0x00000000, MOD14_021DD234, 0x00000000, MOD14_021DD27C
+	.word 0x00000000, MOD14_021DD2C4, 0x00000000, MOD14_021DD30C
+	.word 0x00000000, MOD14_021DD37C, 0x00000000, MOD14_021DD3CC
+	.word 0x00000000, MOD14_021DD3F4, 0x00000000, MOD14_021DD428
+	.word 0x00000000, MOD14_021DD444, 0x00000000, MOD14_021DD460
+	.word 0x00000000, MOD14_021DD490, 0x00000000, MOD14_021DD4C0
+	.word 0x00000000, MOD14_021DD4FC, 0x00000000, MOD14_021DD534
+	.word 0x00000000, MOD14_021DD570, 0x00000000, MOD14_021DD5AC
+	.word 0x00000000, MOD14_021DD66C, 0x00000000, MOD14_021DD6BC
+	.word 0x00000000, MOD14_021DD740, 0x00000000, MOD14_021DD77C
+	.word 0x00000000, MOD14_021DD7CC, 0x00000000, MOD14_021DD7FC
+	.word 0x00000000, MOD14_021DD86C, 0x00000000, MOD14_021DD8A8
+	.word 0x00000000, MOD14_021DD8C4, 0x00000000, MOD14_021DD8E0
+	.word 0x00000000, MOD14_021DD904, 0x00000000, MOD14_021DD91C
+	.word 0x00000000, MOD14_021DD934, 0x00000000, MOD14_021DD970
+	.word 0x00000000, MOD14_021DD98C, 0x00000000, MOD14_021DD9A8
+	.word 0x00000000, MOD14_021DD9E4, 0x00000000
 
 	.global MOD14_021E656C
 MOD14_021E656C: ; 0x021E656C
@@ -30554,7 +30554,7 @@ MOD14_021E6614: ; 0x021E6614
 
 	.global MOD14_021E6624
 MOD14_021E6624: ; 0x021E6624
-	.byte 0xE9, 0x24, 0x1E, 0x02, 0x15, 0x26, 0x1E, 0x02
+	.word MOD14_021E24E8, MOD14_021E2614
 
 	.global MOD14_021E662C
 MOD14_021E662C: ; 0x021E662C
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s
index ed1c291d..152de123 100644
--- a/arm9/modules/20/asm/module_20.s
+++ b/arm9/modules/20/asm/module_20.s
@@ -4572,7 +4572,7 @@ MOD20_022544C4: ; 0x022544C4
 
 	.global MOD20_022544CC
 MOD20_022544CC: ; 0x022544CC
-	.byte 0x01, 0x26, 0x25, 0x02, 0x89, 0x26, 0x25, 0x02, 0xAD, 0x27, 0x25, 0x02, 0x19, 0x28, 0x25, 0x02
+	.word MOD20_02252600, MOD20_02252688, MOD20_022527AC, MOD20_02252818
 
 	.global MOD20_022544DC
 MOD20_022544DC: ; 0x022544DC
@@ -4619,18 +4619,22 @@ MOD20_022545EC: ; 0x022545EC
 
 	.global MOD20_02254644
 MOD20_02254644: ; 0x02254644
-	.byte 0x00, 0x00, 0x00, 0x00, 0xD1, 0x2E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0xF1, 0x2F, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xF1, 0x2F, 0x25, 0x02
-	.byte 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x29, 0x32, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00, 0x01, 0x31, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
-	.byte 0x8D, 0x32, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xF1, 0x32, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x39, 0x33, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x07, 0x00, 0x00, 0x00, 0x79, 0x33, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00
-	.byte 0xC1, 0x33, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xED, 0x33, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0D, 0x34, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x0C, 0x00, 0x00, 0x00, 0xCD, 0x35, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00
-	.byte 0x69, 0x36, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0xC9, 0x36, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word 0x00000000, MOD20_02252ED0, 0x00000000
+	.word 0x00000001, MOD20_02252FF0, 0x00000004
+	.word 0x00000002, MOD20_02252FF0, 0x00000004
+	.word 0x00000003, MOD20_02253228, 0x00000004
+	.word 0x00000004, MOD20_02253100, 0x00000004
+	.word 0x00000005, MOD20_0225328C, 0x00000004
+	.word 0x00000006, MOD20_022532F0, 0x00000000
+	.word 0x00000008, MOD20_02253338, 0x00000000
+	.word 0x00000007, MOD20_02253378, 0x00000000
+	.word 0x00000009, MOD20_022533C0, 0x00000000
+	.word 0x0000000A, MOD20_022533EC, 0x00000000
+	.word 0x0000000B, MOD20_0225340C, 0x00000000
+	.word 0x0000000C, MOD20_022535CC, 0x00000000
+	.word 0x0000000D, MOD20_02253668, 0x00000000
+	.word 0x0000000E, MOD20_022536C8, 0x00000000
+	.word 0xFFFFFFFF, 0x00000000, 0x00000000
 
 	.global MOD20_02254704
 MOD20_02254704: ; 0x02254704
@@ -4646,8 +4650,8 @@ MOD20_0225470C: ; 0x0225470C
 
 	.global MOD20_02254710
 MOD20_02254710: ; 0x02254710
-	.byte 0x41, 0x43, 0x25, 0x02, 0x5D, 0x43, 0x25, 0x02, 0xBD, 0x43, 0x25, 0x02, 0xF5, 0x43, 0x25, 0x02
-	.byte 0x0D, 0x44, 0x25, 0x02
+	.word MOD20_02254340, MOD20_0225435C, MOD20_022543BC, MOD20_022543F4
+	.word MOD20_0225440C
 
 	.global MOD20_02254724
 MOD20_02254724: ; 0x02254724
diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s
index c54eab3e..d0a6eed9 100644
--- a/arm9/modules/21/asm/module_21.s
+++ b/arm9/modules/21/asm/module_21.s
@@ -94,7 +94,7 @@ _022548E6:
 	strb r0, [r5, #5]
 	mov r0, #8
 	str r0, [sp]
-	ldr r0, _02254914 ; =0x02254D80
+	ldr r0, _02254914 ; =MOD21_02254D80
 	mov r1, #1
 	add r3, r5, #0
 	bl MOD20_02254130
@@ -112,7 +112,7 @@ _0225490A:
 	pop {r3, r4, r5, pc}
 	nop
 _02254910: .word MOD21_02254974
-_02254914: .word 0x02254D80
+_02254914: .word MOD21_02254D80
 	thumb_func_end MOD21_0225489C
 
 	thumb_func_start MOD21_02254918
@@ -142,7 +142,7 @@ MOD21_02254930: ; 0x02254930
 	ldrb r1, [r4]
 	add r0, r4, #0
 	lsl r2, r1, #2
-	ldr r1, _02254968 ; =0x02254D84
+	ldr r1, _02254968 ; =MOD21_02254D84
 	ldr r1, [r1, r2]
 	blx r1
 	cmp r0, #0
@@ -156,7 +156,7 @@ MOD21_02254930: ; 0x02254930
 _02254966:
 	pop {r3, r4, r5, pc}
 	.align 2, 0
-_02254968: .word 0x02254D84
+_02254968: .word MOD21_02254D84
 	thumb_func_end MOD21_02254930
 
 	thumb_func_start MOD21_0225496C
@@ -412,13 +412,13 @@ MOD21_02254B10: ; 0x02254B10
 	str r0, [sp, #4]
 	mov r0, #8
 	str r0, [sp, #8]
-	ldr r0, _02254B30 ; =0x02254DAC
+	ldr r0, _02254B30 ; =MOD21_02254DAC
 	ldr r3, [r2]
 	bl MOD20_022537E0
 	add sp, #0xc
 	pop {pc}
 	nop
-_02254B30: .word 0x02254DAC
+_02254B30: .word MOD21_02254DAC
 	thumb_func_end MOD21_02254B10
 
 	thumb_func_start MOD21_02254B34
@@ -460,7 +460,7 @@ MOD21_02254B60: ; 0x02254B60
 	bl MOD20_022538A0
 	add r5, r0, #0
 	ldr r0, [r5, #4]
-	ldr r2, _02254BE8 ; =0x02254D90
+	ldr r2, _02254BE8 ; =MOD21_02254D90
 	mov r1, #6
 	mov r3, #0
 	bl FUN_02016C18
@@ -514,7 +514,7 @@ MOD21_02254B60: ; 0x02254B60
 	add sp, #0x14
 	pop {r4, r5, pc}
 	.align 2, 0
-_02254BE8: .word 0x02254D90
+_02254BE8: .word MOD21_02254D90
 _02254BEC: .word 0x04001000
 _02254BF0: .word 0xFFFFE0FF
 	thumb_func_end MOD21_02254B60
@@ -722,11 +722,24 @@ _02254D7C: .word 0x040002A8
 	thumb_func_end MOD21_02254C5C
 
 	.section .rodata
-	; 0x02254D80
-	.byte 0x10, 0xAF, 0x10, 0xCF, 0xA5, 0x49, 0x25, 0x02, 0xE5, 0x49, 0x25, 0x02, 0x39, 0x4A, 0x25, 0x02
+
+	.global MOD21_02254D80
+MOD21_02254D80: ; 0x02254D80
+	.byte 0x10, 0xAF, 0x10, 0xCF
+
+	.global MOD21_02254D84
+MOD21_02254D84: ; 0x02254D84
+	.word MOD21_022549A4, MOD21_022549E4, MOD21_02254A38
+
+	.global MOD21_02254D90
+MOD21_02254D90: ; 0x02254D90
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x61, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF5, 0x4B, 0x25, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00
-	.byte 0x03, 0x00, 0x00, 0x00, 0x41, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.global MOD21_02254DAC
+MOD21_02254DAC: ; 0x02254DAC
+	.word 0x00, MOD21_02254B60, 0x00
+	.word 0x01, MOD21_02254BF4, 0x00
+	.word 0x02, MOD21_02254C14, 0x00
+	.word 0x03, MOD21_02254C40, 0x00
+	.word 0x00, 0x00000000, 0x00
diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s
index 5a117b74..b67ca546 100644
--- a/arm9/modules/48/asm/module_48.s
+++ b/arm9/modules/48/asm/module_48.s
@@ -626,7 +626,7 @@ _02254CC6:
 	add r3, r4, r3
 	asr r3, r3, #0xc
 	lsl r4, r3, #2
-	ldr r3, _02254D28 ; =0x020EDF50
+	ldr r3, _02254D28 ; =gSineTable
 	add r0, #0x9c
 	ldr r4, [r3, r4]
 	add r1, #0xa4
@@ -658,7 +658,7 @@ _02254CFE:
 	bl MOD48_02254B1C
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
-_02254D28: .word 0x020EDF50
+_02254D28: .word gSineTable
 	thumb_func_end MOD48_02254C60
 
 	thumb_func_start MOD48_02254D2C
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index 152ad47d..d16a434a 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -3205,7 +3205,7 @@ _0222EFE4:
 	add r0, r6, #0
 	add r0, #0x5a
 	lsl r1, r0, #2
-	ldr r0, _0222F104 ; =0x020EDF50
+	ldr r0, _0222F104 ; =gSineTable
 	mov r3, #0
 	ldr r0, [r0, r1]
 	asr r1, r0, #0x1f
@@ -3221,7 +3221,7 @@ _0222EFE4:
 	orr r1, r0
 	add r4, r2, r1
 	mov r2, #0xa
-	ldr r0, _0222F104 ; =0x020EDF50
+	ldr r0, _0222F104 ; =gSineTable
 	lsl r1, r6, #2
 	ldr r0, [r0, r1]
 	lsl r2, r2, #0xa
@@ -3330,7 +3330,7 @@ _0222F0EC:
 	.align 2, 0
 _0222F0FC: .word MOD69_0222F940
 _0222F100: .word 0x00000808
-_0222F104: .word 0x020EDF50
+_0222F104: .word gSineTable
 _0222F108: .word 0x00000818
 _0222F10C: .word 0x0000081A
 _0222F110: .word 0x0000082C
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 4c994929..09bca872 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -3934,7 +3934,7 @@ _0222F606:
 	add r0, #0xc
 	bl FUN_0207B000
 	add r1, r5, #0
-	ldr r0, _0222F670 ; =0x020FA6E8
+	ldr r0, _0222F670 ; =UNK_020FA6E8
 	add r1, #0xc
 	mov r2, #0x1a
 	bl FUN_02006234
@@ -3946,7 +3946,7 @@ _0222F660: .word 0x00002218
 _0222F664: .word 0x0000221C
 _0222F668: .word 0x00002E14
 _0222F66C: .word MOD71_022313C0
-_0222F670: .word 0x020FA6E8
+_0222F670: .word UNK_020FA6E8
 	thumb_func_end MOD71_0222F59C
 
 	thumb_func_start MOD71_0222F674
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index ba79d09b..6301dc22 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -11240,6 +11240,9 @@ MOD75_021EC674: ; 0x021EC674
 MOD75_021EC67C: ; 0x021EC67C
 	.byte 0x02, 0x0A, 0x05, 0x0F, 0x0A, 0x12, 0x11, 0x12
 	.byte 0x16, 0x0F, 0x19, 0x0A, 0x1A, 0x04, 0x00, 0x00
+
+	.global MOD75_021EC68C
+MOD75_021EC68C: ; 0x021EC68C
 	.word MOD75_021E6BA0, MOD75_021E6D6C, MOD75_021E6F00, 0xFFFFFFFF
 
 	.global MOD75_021EC69C
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index 852b7592..1667166f 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -3162,7 +3162,7 @@ MOD76_021D8D5C: ; 0x021D8D5C
 	bl FUN_0207B000
 	mov r1, #0x53
 	lsl r1, r1, #2
-	ldr r0, _021D8DE8 ; =0x020FA6E8
+	ldr r0, _021D8DE8 ; =UNK_020FA6E8
 	add r1, r4, r1
 	mov r2, #0x43
 	bl FUN_02006234
@@ -3174,7 +3174,7 @@ MOD76_021D8D5C: ; 0x021D8D5C
 	pop {r3, r4, pc}
 	nop
 _021D8DE4: .word MOD76_021D8E48
-_021D8DE8: .word 0x020FA6E8
+_021D8DE8: .word UNK_020FA6E8
 	thumb_func_end MOD76_021D8D5C
 
 	thumb_func_start MOD76_021D8DEC
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index d99385a4..f1234b9a 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -17143,7 +17143,7 @@ MOD80_02235D34: ; 0x02235D34
 	add r0, #0x60
 	bl FUN_0207C2A4
 	add r1, r4, #0
-	ldr r0, _02235DD0 ; =0x020FA6E8
+	ldr r0, _02235DD0 ; =UNK_020FA6E8
 	add r1, #0x60
 	mov r2, #0x3e
 	bl FUN_02006234
@@ -17155,7 +17155,7 @@ MOD80_02235D34: ; 0x02235D34
 	pop {r4, pc}
 	nop
 _02235DCC: .word MOD80_022375E4
-_02235DD0: .word 0x020FA6E8
+_02235DD0: .word UNK_020FA6E8
 	thumb_func_end MOD80_02235D34
 
 	thumb_func_start MOD80_02235DD4
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 6ee359f9..33b046b7 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -4963,7 +4963,7 @@ _0223A4AE:
 	add r0, r4, #0
 	add r0, #0x5a
 	lsl r1, r0, #2
-	ldr r0, _0223A578 ; =0x020EDF50
+	ldr r0, _0223A578 ; =gSineTable
 	ldr r2, [r5, #0x38]
 	ldr r0, [r0, r1]
 	asr r3, r2, #0x1f
@@ -4981,7 +4981,7 @@ _0223A4AE:
 	add r0, r2, r1
 	str r0, [r5, #0x14]
 	ldr r2, [r5, #0x3c]
-	ldr r0, _0223A578 ; =0x020EDF50
+	ldr r0, _0223A578 ; =gSineTable
 	lsl r1, r4, #2
 	ldr r0, [r0, r1]
 	asr r3, r2, #0x1f
@@ -5063,7 +5063,7 @@ _0223A54A:
 	strh r0, [r5, #0x24]
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
-_0223A578: .word 0x020EDF50
+_0223A578: .word gSineTable
 	thumb_func_end MOD81_0223A434
 
 	thumb_func_start MOD81_0223A57C
@@ -6260,7 +6260,7 @@ _0223AEE4:
 	add r0, r4, #0
 	add r0, #0x5a
 	lsl r1, r0, #2
-	ldr r0, _0223AF58 ; =0x020EDF50
+	ldr r0, _0223AF58 ; =gSineTable
 	ldr r2, [r5, #0x44]
 	ldr r0, [r0, r1]
 	asr r3, r2, #0x1f
@@ -6276,7 +6276,7 @@ _0223AEE4:
 	orr r1, r0
 	str r1, [r5, #0x1c]
 	ldr r2, [r5, #0x48]
-	ldr r0, _0223AF58 ; =0x020EDF50
+	ldr r0, _0223AF58 ; =gSineTable
 	lsl r1, r4, #2
 	ldr r0, [r0, r1]
 	asr r3, r2, #0x1f
@@ -6311,7 +6311,7 @@ _0223AEE4:
 	bl VEC_Add
 	pop {r3, r4, r5, pc}
 	nop
-_0223AF58: .word 0x020EDF50
+_0223AF58: .word gSineTable
 	thumb_func_end MOD81_0223AE90
 
 	thumb_func_start MOD81_0223AF5C
@@ -7807,7 +7807,7 @@ _0223BB3C:
 	add r0, r4, #0
 	add r0, #0x5a
 	lsl r1, r0, #2
-	ldr r0, _0223BBC4 ; =0x020EDF50
+	ldr r0, _0223BBC4 ; =gSineTable
 	ldr r2, [r5, #0x44]
 	ldr r0, [r0, r1]
 	asr r3, r2, #0x1f
@@ -7823,7 +7823,7 @@ _0223BB3C:
 	orr r1, r0
 	str r1, [r5, #0x1c]
 	ldr r2, [r5, #0x48]
-	ldr r0, _0223BBC4 ; =0x020EDF50
+	ldr r0, _0223BBC4 ; =gSineTable
 	lsl r1, r4, #2
 	ldr r0, [r0, r1]
 	asr r3, r2, #0x1f
@@ -7868,7 +7868,7 @@ _0223BBAE:
 	pop {r3, r4, r5, pc}
 	nop
 _0223BBC0: .word MOD81_0223D3A0
-_0223BBC4: .word 0x020EDF50
+_0223BBC4: .word gSineTable
 	thumb_func_end MOD81_0223BAD0
 
 	thumb_func_start MOD81_0223BBC8
diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s
index b710e7ca..b2dc368a 100644
--- a/arm9/modules/84/asm/module_84.s
+++ b/arm9/modules/84/asm/module_84.s
@@ -3645,7 +3645,7 @@ _021D9230:
 	ldr r0, [r4, #0x34]
 	asr r2, r2, #0xc
 	lsl r3, r2, #2
-	ldr r2, _021D9274 ; =0x020EDF50
+	ldr r2, _021D9274 ; =gSineTable
 	ldr r1, [r4, #0x30]
 	ldr r2, [r2, r3]
 	mul r2, r0
@@ -3674,7 +3674,7 @@ _021D9230:
 _021D9270:
 	pop {r4, pc}
 	nop
-_021D9274: .word 0x020EDF50
+_021D9274: .word gSineTable
 	thumb_func_end MOD84_021D920C
 
 	thumb_func_start MOD84_021D9278