move / fix bunch of stuff (#133)

* fix some class structures / d_event wip

* d_event wip

* move gamepad stuff

* move m_Do_main

* move d_bomb / partial m_Do_reset

* format

* remove asm

* add Z2SoundID enum

* move some Z2 classes

* fix

* move more Z2 stuff

* fix fopAc_ac_c more

5 files changed, 0 insertions, 95 deletions

diff --git a/asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s b/asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s
deleted file mode 100644
index 1e60b03bbf..0000000000
--- a/asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_802BDEF0:
-/* 802BDEF0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802BDEF4  7C 08 02 A6 */	mflr r0
-/* 802BDEF8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802BDEFC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802BDF00  7C 7F 1B 78 */	mr r31, r3
-/* 802BDF04  4B FE D1 79 */	bl __ct__14Z2SoundHandlesFv
-/* 802BDF08  3C 60 80 3D */	lis r3, __vt__14Z2SoundObjBase@ha /* 0x803CAD50@ha */
-/* 802BDF0C  38 03 AD 50 */	addi r0, r3, __vt__14Z2SoundObjBase@l /* 0x803CAD50@l */
-/* 802BDF10  90 1F 00 10 */	stw r0, 0x10(r31)
-/* 802BDF14  38 60 00 00 */	li r3, 0
-/* 802BDF18  90 7F 00 18 */	stw r3, 0x18(r31)
-/* 802BDF1C  98 7F 00 1F */	stb r3, 0x1f(r31)
-/* 802BDF20  80 0D 85 F4 */	lwz r0, data_80450B74(r13)
-/* 802BDF24  90 1F 00 14 */	stw r0, 0x14(r31)
-/* 802BDF28  B0 7F 00 1C */	sth r3, 0x1c(r31)
-/* 802BDF2C  98 7F 00 1E */	stb r3, 0x1e(r31)
-/* 802BDF30  7F E3 FB 78 */	mr r3, r31
-/* 802BDF34  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802BDF38  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802BDF3C  7C 08 03 A6 */	mtlr r0
-/* 802BDF40  38 21 00 10 */	addi r1, r1, 0x10
-/* 802BDF44  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s b/asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s
deleted file mode 100644
index 2be0030653..0000000000
--- a/asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s
+++ /dev/null
@@ -1,28 +0,0 @@
-lbl_802BDF48:
-/* 802BDF48  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802BDF4C  7C 08 02 A6 */	mflr r0
-/* 802BDF50  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802BDF54  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802BDF58  93 C1 00 08 */	stw r30, 8(r1)
-/* 802BDF5C  7C 7E 1B 79 */	or. r30, r3, r3
-/* 802BDF60  7C 9F 23 78 */	mr r31, r4
-/* 802BDF64  41 82 00 30 */	beq lbl_802BDF94
-/* 802BDF68  3C 80 80 3D */	lis r4, __vt__14Z2SoundObjBase@ha /* 0x803CAD50@ha */
-/* 802BDF6C  38 04 AD 50 */	addi r0, r4, __vt__14Z2SoundObjBase@l /* 0x803CAD50@l */
-/* 802BDF70  90 1E 00 10 */	stw r0, 0x10(r30)
-/* 802BDF74  48 00 00 85 */	bl deleteObject__14Z2SoundObjBaseFv
-/* 802BDF78  7F C3 F3 78 */	mr r3, r30
-/* 802BDF7C  38 80 00 00 */	li r4, 0
-/* 802BDF80  4B FE D1 35 */	bl __dt__14Z2SoundHandlesFv
-/* 802BDF84  7F E0 07 35 */	extsh. r0, r31
-/* 802BDF88  40 81 00 0C */	ble lbl_802BDF94
-/* 802BDF8C  7F C3 F3 78 */	mr r3, r30
-/* 802BDF90  48 01 0D AD */	bl __dl__FPv
-lbl_802BDF94:
-/* 802BDF94  7F C3 F3 78 */	mr r3, r30
-/* 802BDF98  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802BDF9C  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802BDFA0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802BDFA4  7C 08 03 A6 */	mtlr r0
-/* 802BDFA8  38 21 00 10 */	addi r1, r1, 0x10
-/* 802BDFAC  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s b/asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s
deleted file mode 100644
index 4e03518fd5..0000000000
--- a/asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_802BE038:
-/* 802BE038  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802BE03C  7C 08 02 A6 */	mflr r0
-/* 802BE040  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802BE044  88 03 00 1F */	lbz r0, 0x1f(r3)
-/* 802BE048  28 00 00 00 */	cmplwi r0, 0
-/* 802BE04C  41 82 00 14 */	beq lbl_802BE060
-/* 802BE050  B0 83 00 1C */	sth r4, 0x1c(r3)
-/* 802BE054  98 A3 00 1E */	stb r5, 0x1e(r3)
-/* 802BE058  80 83 00 18 */	lwz r4, 0x18(r3)
-/* 802BE05C  4B FE D4 DD */	bl func_802AB538
-lbl_802BE060:
-/* 802BE060  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802BE064  7C 08 03 A6 */	mtlr r0
-/* 802BE068  38 21 00 10 */	addi r1, r1, 0x10
-/* 802BE06C  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s b/asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s
deleted file mode 100644
index 8d5215d6a0..0000000000
--- a/asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s
+++ /dev/null
@@ -1,19 +0,0 @@
-lbl_802BDFB0:
-/* 802BDFB0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802BDFB4  7C 08 02 A6 */	mflr r0
-/* 802BDFB8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802BDFBC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802BDFC0  93 C1 00 08 */	stw r30, 8(r1)
-/* 802BDFC4  7C 7E 1B 78 */	mr r30, r3
-/* 802BDFC8  7C 9F 23 78 */	mr r31, r4
-/* 802BDFCC  7C A4 2B 78 */	mr r4, r5
-/* 802BDFD0  4B FE D1 49 */	bl initHandlesPool__14Z2SoundHandlesFUc
-/* 802BDFD4  93 FE 00 18 */	stw r31, 0x18(r30)
-/* 802BDFD8  38 00 00 01 */	li r0, 1
-/* 802BDFDC  98 1E 00 1F */	stb r0, 0x1f(r30)
-/* 802BDFE0  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802BDFE4  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802BDFE8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802BDFEC  7C 08 03 A6 */	mtlr r0
-/* 802BDFF0  38 21 00 10 */	addi r1, r1, 0x10
-/* 802BDFF4  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s b/asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s
deleted file mode 100644
index d35d2a9a30..0000000000
--- a/asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_802BE880:
-/* 802BE880  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802BE884  7C 08 02 A6 */	mflr r0
-/* 802BE888  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802BE88C  4B FF F7 25 */	bl init__14Z2SoundObjBaseFP3VecUc
-/* 802BE890  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802BE894  7C 08 03 A6 */	mtlr r0
-/* 802BE898  38 21 00 10 */	addi r1, r1, 0x10
-/* 802BE89C  4E 80 00 20 */	blr