match GScamera (except func_801DEA3C)

7 files changed, 9 insertions, 74 deletions

diff --git a/asm/GScamera_asm.s b/asm/GScamera_asm.s
index 511b178..4ea72fe 100644
--- a/asm/GScamera_asm.s
+++ b/asm/GScamera_asm.s
@@ -1,14 +1,3 @@
 .include "macros.inc"

 

 .section .text, "ax"  # 0x80006980 - 0x803E1E60

-

-.global func_801DF020

-func_801DF020:

-/* 801DF020 001DAC80  38 A0 00 01 */	li r5, 1

-/* 801DF024 001DAC84  38 6D A0 98 */	addi r3, r13, lbl_8063F358-_SDA_BASE_

-/* 801DF028 001DAC88  38 80 00 04 */	li r4, 4

-/* 801DF02C 001DAC8C  38 00 00 00 */	li r0, 0

-/* 801DF030 001DAC90  98 AD A0 98 */	stb r5, lbl_8063F358-_SDA_BASE_(r13)

-/* 801DF034 001DAC94  B0 83 00 02 */	sth r4, 2(r3)

-/* 801DF038 001DAC98  98 03 00 04 */	stb r0, 4(r3)

-/* 801DF03C 001DAC9C  4E 80 00 20 */	blr

diff --git a/asm/code_801DDF78_asm.s b/asm/code_801DDF78_asm.s
new file mode 100644
index 0000000..4ea72fe
--- /dev/null
+++ b/asm/code_801DDF78_asm.s
@@ -0,0 +1,3 @@
+.include "macros.inc"

+

+.section .text, "ax"  # 0x80006980 - 0x803E1E60

diff --git a/asm/ctors_2.s b/asm/ctors_2.s
index 9c8c611..ce9d11a 100644
--- a/asm/ctors_2.s
+++ b/asm/ctors_2.s
@@ -2,7 +2,7 @@
 

 .section .ctors, "wa"  # 0x803E1E60 - 0x803E22A0

 

-.4byte func_801DF020, func_801E07C8, func_801E07F0, func_801E0A34

+.4byte func_801E07C8, func_801E07F0, func_801E0A34

 .4byte func_801E4308, func_801E472C, func_801E5F5C, func_801E6BD8

 .4byte func_801ED364, func_801EE024, func_801F1A68, func_801F40C0

 .4byte func_801F98CC, func_801FA074, func_801FA36C, func_801FB40C

diff --git a/asm/data_2.s b/asm/data_2.s
index 38d3f37..ebf0af5 100644
--- a/asm/data_2.s
+++ b/asm/data_2.s
@@ -2,12 +2,6 @@
 

 	.section .data, "wa"  # 0x80405D60 - 0x80474F00

 

-.global lbl_80423338

-lbl_80423338:

-	.incbin "baserom.dol", 0x41F438, 0x20

-.global lbl_80423358

-lbl_80423358:

-	.incbin "baserom.dol", 0x41F458, 0xB8

 .global lbl_80423410

 lbl_80423410:

 	.incbin "baserom.dol", 0x41F510, 0x48

diff --git a/asm/sbss_2.s b/asm/sbss_2.s
index a7ac896..0c96a06 100644
--- a/asm/sbss_2.s
+++ b/asm/sbss_2.s
@@ -1,11 +1,8 @@
 .section .sbss, "wa"  # 0x80474F00 - 0x80643050

 

-.global lbl_8063F356

-lbl_8063F350:

+.global lbl_8063F35E

+lbl_8063F35E:

 	.skip 0x2

-.global lbl_8063F358

-lbl_8063F358:

-	.skip 0x8

 .global lbl_8063F360

 lbl_8063F360:

 	.skip 0x8

diff --git a/asm/sdata2_2.s b/asm/sdata2_2.s
index 45ba27b..37e351d 100644
--- a/asm/sdata2_2.s
+++ b/asm/sdata2_2.s
@@ -2,54 +2,6 @@
 

 .section .sdata2, "wa"  # 0x80640600 - 0x80643020

 

-.global lbl_80641BF8

-lbl_80641BF8:

-	.incbin "baserom.dol", 0x473C18, 0x4

-.global lbl_80641BFC

-lbl_80641BFC:

-	.incbin "baserom.dol", 0x473C1C, 0x4

-.global lbl_80641C00

-lbl_80641C00:

-	.incbin "baserom.dol", 0x473C20, 0x4

-.global lbl_80641C04

-lbl_80641C04:

-	.incbin "baserom.dol", 0x473C24, 0x4

-.global lbl_80641C08

-lbl_80641C08:

-	.incbin "baserom.dol", 0x473C28, 0x4

-.global lbl_80641C0C

-lbl_80641C0C:

-	.incbin "baserom.dol", 0x473C2C, 0x4

-.global lbl_80641C10

-lbl_80641C10:

-	.incbin "baserom.dol", 0x473C30, 0x4

-.global lbl_80641C14

-lbl_80641C14:

-	.incbin "baserom.dol", 0x473C34, 0x4

-.global lbl_80641C18

-lbl_80641C18:

-	.incbin "baserom.dol", 0x473C38, 0x4

-.global lbl_80641C1C

-lbl_80641C1C:

-	.incbin "baserom.dol", 0x473C3C, 0x4

-.global lbl_80641C20

-lbl_80641C20:

-	.incbin "baserom.dol", 0x473C40, 0x8

-.global lbl_80641C28

-lbl_80641C28:

-	.incbin "baserom.dol", 0x473C48, 0x8

-.global lbl_80641C30

-lbl_80641C30:

-	.incbin "baserom.dol", 0x473C50, 0x4

-.global lbl_80641C34

-lbl_80641C34:

-	.incbin "baserom.dol", 0x473C54, 0x4

-.global lbl_80641C38

-lbl_80641C38:

-	.incbin "baserom.dol", 0x473C58, 0x4

-.global lbl_80641C3C

-lbl_80641C3C:

-	.incbin "baserom.dol", 0x473C5C, 0x4

 .global lbl_80641C40

 lbl_80641C40:

 	.incbin "baserom.dol", 0x473C60, 0x8

diff --git a/asm/sdata_2.s b/asm/sdata_2.s
index cc4ce9a..fde1af1 100644
--- a/asm/sdata_2.s
+++ b/asm/sdata_2.s
@@ -2,9 +2,9 @@
 

 .section .sdata, "wa"  # 0x8063D2C0 - 0x8063E8E0

 

-.global lbl_8063D6FE

-lbl_8063D6FE:

-	.incbin "baserom.dol", 0x47143E, 0x6A

+.global lbl_8063D730

+lbl_8063D730:

+	.incbin "baserom.dol", 0x471470, 0x38

 .global lbl_8063D768

 lbl_8063D768:

 	.incbin "baserom.dol", 0x4714A8, 0x38