diff --git a/README.md b/README.md
index 64f360528..490a37308 100644
--- a/README.md
+++ b/README.md
@@ -511,7 +511,7 @@ Individual overlay progress:
| s16a |
63 KB |
Rex Hangar 1st Floor |
- 🚧 Work in progress |
+ ✔️ 100% decompiled! |
| s16b |
diff --git a/asm/overlays/s16a/s16a_evntmous_800C8E88.s b/asm/overlays/s16a/s16a_evntmous_800C8E88.s
deleted file mode 100755
index 526373f9e..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C8E88.s
+++ /dev/null
@@ -1,156 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C8E88
-s16a_evntmous_800C8E88:
- dw 0x3C02800B ; 800C8E88
- dw 0x84424DAE ; 800C8E8C
- dw 0x27BDFFD0 ; 800C8E90
- dw 0xAFB20028 ; 800C8E94
- dw 0x00809021 ; 800C8E98
- dw 0xAFBF002C ; 800C8E9C
- dw 0xAFB10024 ; 800C8EA0
- dw 0x10400089 ; 800C8EA4
- dw 0xAFB00020 ; 800C8EA8
- dw 0x3C02800B ; 800C8EAC
- dw 0x8C42B3D4 ; 800C8EB0
- dw 0x00000000 ; 800C8EB4
- dw 0x14400084 ; 800C8EB8
- dw 0x00000000 ; 800C8EBC
- dw 0x8E42068C ; 800C8EC0
- dw 0x00000000 ; 800C8EC4
- dw 0x14400080 ; 800C8EC8
- dw 0x00000000 ; 800C8ECC
- dw 0xAE46068C ; 800C8ED0
- dw 0x84A20002 ; 800C8ED4
- dw 0x00000000 ; 800C8ED8
- dw 0x2842FFF7 ; 800C8EDC
- dw 0x1440000C ; 800C8EE0
- dw 0x00000000 ; 800C8EE4
- dw 0x84A20004 ; 800C8EE8
- dw 0x00000000 ; 800C8EEC
- dw 0x2842B9A7 ; 800C8EF0
- dw 0x14400007 ; 800C8EF4
- dw 0x2402D10B ; 800C8EF8
- dw 0xA6420694 ; 800C8EFC
- dw 0x240214B8 ; 800C8F00
- dw 0xA6420696 ; 800C8F04
- dw 0x2402E20F ; 800C8F08
- dw 0x080323E1 ; 800C8F0C
- dw 0xA6420698 ; 800C8F10
- dw 0x84A30004 ; 800C8F14
- dw 0x00000000 ; 800C8F18
- dw 0x28621767 ; 800C8F1C
- dw 0x14400007 ; 800C8F20
- dw 0x2402FB83 ; 800C8F24
- dw 0xA6420694 ; 800C8F28
- dw 0x2402FEA4 ; 800C8F2C
- dw 0xA6420696 ; 800C8F30
- dw 0x24022378 ; 800C8F34
- dw 0x080323E1 ; 800C8F38
- dw 0xA6420698 ; 800C8F3C
- dw 0x84A20000 ; 800C8F40
- dw 0x00000000 ; 800C8F44
- dw 0x28422ED7 ; 800C8F48
- dw 0x1440000B ; 800C8F4C
- dw 0x24020001 ; 800C8F50
- dw 0x2862F057 ; 800C8F54
- dw 0x14400008 ; 800C8F58
- dw 0x24020001 ; 800C8F5C
- dw 0x24023541 ; 800C8F60
- dw 0xA6420694 ; 800C8F64
- dw 0x24020338 ; 800C8F68
- dw 0xA6420696 ; 800C8F6C
- dw 0x24021EBF ; 800C8F70
- dw 0x080323E1 ; 800C8F74
- dw 0xA6420698 ; 800C8F78
- dw 0x08032433 ; 800C8F7C
- dw 0xAE42068C ; 800C8F80
- dw 0x2650069C ; 800C8F84
- dw 0x02002021 ; 800C8F88
- dw 0x26510694 ; 800C8F8C
- dw 0x02202821 ; 800C8F90
- dw 0x8A470027 ; 800C8F94
- dw 0x9A470024 ; 800C8F98
- dw 0x8A48002B ; 800C8F9C
- dw 0x9A480028 ; 800C8FA0
- dw 0xAA47069F ; 800C8FA4
- dw 0xBA47069C ; 800C8FA8
- dw 0xAA4806A3 ; 800C8FAC
- dw 0xBA4806A0 ; 800C8FB0
- dw 0x0C005B50 ; 800C8FB4
- dw 0x27A60010 ; 800C8FB8
- dw 0x87A40010 ; 800C8FBC
- dw 0x87A50014 ; 800C8FC0
- dw 0x0C0250C2 ; 800C8FC4
- dw 0x00000000 ; 800C8FC8
- dw 0x27A40010 ; 800C8FCC
- dw 0x30420FFF ; 800C8FD0
- dw 0x0C005B60 ; 800C8FD4
- dw 0xA7A2001A ; 800C8FD8
- dw 0x87A5001A ; 800C8FDC
- dw 0x0C0250C2 ; 800C8FE0
- dw 0x00402021 ; 800C8FE4
- dw 0x02002021 ; 800C8FE8
- dw 0x27A50018 ; 800C8FEC
- dw 0x30420FFF ; 800C8FF0
- dw 0xA7A20018 ; 800C8FF4
- dw 0x2402E890 ; 800C8FF8
- dw 0xA7A0001C ; 800C8FFC
- dw 0xA7A00010 ; 800C9000
- dw 0xA7A00012 ; 800C9004
- dw 0x0C006F23 ; 800C9008
- dw 0xA7A20014 ; 800C900C
- dw 0x27A40010 ; 800C9010
- dw 0x02202821 ; 800C9014
- dw 0x0C006F92 ; 800C9018
- dw 0x24060001 ; 800C901C
- dw 0x3C02800B ; 800C9020
- dw 0x24424D98 ; 800C9024
- dw 0x8443001E ; 800C9028
- dw 0x00000000 ; 800C902C
- dw 0xAE430634 ; 800C9030
- dw 0x8443001C ; 800C9034
- dw 0x00000000 ; 800C9038
- dw 0xAE430630 ; 800C903C
- dw 0x8443001E ; 800C9040
- dw 0x24020001 ; 800C9044
- dw 0x10620007 ; 800C9048
- dw 0x2402000C ; 800C904C
- dw 0x10620005 ; 800C9050
- dw 0x24020005 ; 800C9054
- dw 0x10620003 ; 800C9058
- dw 0x24020006 ; 800C905C
- dw 0x14620005 ; 800C9060
- dw 0x3C02800B ; 800C9064
- dw 0x3C03800B ; 800C9068
- dw 0x2402FFFF ; 800C906C
- dw 0xA4624DB6 ; 800C9070
- dw 0x3C02800B ; 800C9074
- dw 0x24444D98 ; 800C9078
- dw 0x8483001C ; 800C907C
- dw 0x24020009 ; 800C9080
- dw 0x10620003 ; 800C9084
- dw 0x24020004 ; 800C9088
- dw 0x14620003 ; 800C908C
- dw 0x00000000 ; 800C9090
- dw 0x2402FFFF ; 800C9094
- dw 0xA482001C ; 800C9098
- dw 0x3C047735 ; 800C909C
- dw 0x34849400 ; 800C90A0
- dw 0x24050001 ; 800C90A4
- dw 0x3C06800B ; 800C90A8
- dw 0x8CC2B3CC ; 800C90AC
- dw 0x3C03004A ; 800C90B0
- dw 0x00431025 ; 800C90B4
- dw 0x3C031000 ; 800C90B8
- dw 0x00431025 ; 800C90BC
- dw 0x0C0342E8 ; 800C90C0
- dw 0xACC2B3CC ; 800C90C4
- dw 0xAE420690 ; 800C90C8
- dw 0x8FBF002C ; 800C90CC
- dw 0x8FB20028 ; 800C90D0
- dw 0x8FB10024 ; 800C90D4
- dw 0x8FB00020 ; 800C90D8
- dw 0x03E00008 ; 800C90DC
- dw 0x27BD0030 ; 800C90E0
diff --git a/asm/overlays/s16a/s16a_evntmous_800C90E4.s b/asm/overlays/s16a/s16a_evntmous_800C90E4.s
deleted file mode 100755
index b951dcabc..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C90E4.s
+++ /dev/null
@@ -1,28 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C90E4
-s16a_evntmous_800C90E4:
- dw 0x27BDFFD0 ; 800C90E4
- dw 0xAFBF0028 ; 800C90E8
- dw 0x84A20000 ; 800C90EC
- dw 0x00000000 ; 800C90F0
- dw 0xAFA20018 ; 800C90F4
- dw 0x84A20002 ; 800C90F8
- dw 0x00000000 ; 800C90FC
- dw 0xAFA2001C ; 800C9100
- dw 0x84A20004 ; 800C9104
- dw 0x00000000 ; 800C9108
- dw 0xAFA20020 ; 800C910C
- dw 0x84A30006 ; 800C9110
- dw 0x24020004 ; 800C9114
- dw 0xA7A20010 ; 800C9118
- dw 0x27A20018 ; 800C911C
- dw 0x27A50010 ; 800C9120
- dw 0xAFA20014 ; 800C9124
- dw 0x0C007FCB ; 800C9128
- dw 0xAFA30024 ; 800C912C
- dw 0x8FBF0028 ; 800C9130
- dw 0x00000000 ; 800C9134
- dw 0x03E00008 ; 800C9138
- dw 0x27BD0030 ; 800C913C
diff --git a/asm/overlays/s16a/s16a_evntmous_800C9140.s b/asm/overlays/s16a/s16a_evntmous_800C9140.s
deleted file mode 100755
index 7c9abbf9d..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C9140.s
+++ /dev/null
@@ -1,33 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C9140
-s16a_evntmous_800C9140:
- dw 0x27BDFFE8 ; 800C9140
- dw 0xAFBF0010 ; 800C9144
- dw 0x84820000 ; 800C9148
- dw 0x84A30000 ; 800C914C
- dw 0x00000000 ; 800C9150
- dw 0x00431023 ; 800C9154
- dw 0x00021103 ; 800C9158
- dw 0x00420018 ; 800C915C
- dw 0x84820002 ; 800C9160
- dw 0x84A30002 ; 800C9164
- dw 0x00003812 ; 800C9168
- dw 0x00431023 ; 800C916C
- dw 0x00021103 ; 800C9170
- dw 0x00420018 ; 800C9174
- dw 0x84A30004 ; 800C9178
- dw 0x84820004 ; 800C917C
- dw 0x00003012 ; 800C9180
- dw 0x00431023 ; 800C9184
- dw 0x00021103 ; 800C9188
- dw 0x00420018 ; 800C918C
- dw 0x00E62021 ; 800C9190
- dw 0x00001812 ; 800C9194
- dw 0x0C0249C2 ; 800C9198
- dw 0x00832021 ; 800C919C
- dw 0x8FBF0010 ; 800C91A0
- dw 0x00021100 ; 800C91A4
- dw 0x03E00008 ; 800C91A8
- dw 0x27BD0018 ; 800C91AC
diff --git a/asm/overlays/s16a/s16a_evntmous_800C91B0.s b/asm/overlays/s16a/s16a_evntmous_800C91B0.s
deleted file mode 100755
index dd1a1d624..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C91B0.s
+++ /dev/null
@@ -1,59 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C91B0
-s16a_evntmous_800C91B0:
- dw 0x84A20002 ; 800C91B0
- dw 0x00000000 ; 800C91B4
- dw 0x2842FFF7 ; 800C91B8
- dw 0x14400006 ; 800C91BC
- dw 0x00000000 ; 800C91C0
- dw 0x84A20004 ; 800C91C4
- dw 0x00000000 ; 800C91C8
- dw 0x2842B9A7 ; 800C91CC
- dw 0x1040000E ; 800C91D0
- dw 0x00000000 ; 800C91D4
- dw 0x84A30004 ; 800C91D8
- dw 0x00000000 ; 800C91DC
- dw 0x28621767 ; 800C91E0
- dw 0x10400009 ; 800C91E4
- dw 0x00000000 ; 800C91E8
- dw 0x84A20000 ; 800C91EC
- dw 0x00000000 ; 800C91F0
- dw 0x28422ED7 ; 800C91F4
- dw 0x1440001E ; 800C91F8
- dw 0x00000000 ; 800C91FC
- dw 0x2862F057 ; 800C9200
- dw 0x1440001B ; 800C9204
- dw 0x00000000 ; 800C9208
- dw 0x8C820668 ; 800C920C
- dw 0x24030001 ; 800C9210
- dw 0xAC430008 ; 800C9214
- dw 0x8C8200A0 ; 800C9218
- dw 0x00000000 ; 800C921C
- dw 0x8C460000 ; 800C9220
- dw 0x8C470004 ; 800C9224
- dw 0x8C480008 ; 800C9228
- dw 0x8C49000C ; 800C922C
- dw 0xAC86066C ; 800C9230
- dw 0xAC870670 ; 800C9234
- dw 0xAC880674 ; 800C9238
- dw 0xAC890678 ; 800C923C
- dw 0x8C460010 ; 800C9240
- dw 0x8C470014 ; 800C9244
- dw 0x8C480018 ; 800C9248
- dw 0x8C49001C ; 800C924C
- dw 0xAC86067C ; 800C9250
- dw 0xAC870680 ; 800C9254
- dw 0xAC880684 ; 800C9258
- dw 0xAC890688 ; 800C925C
- dw 0x8C820684 ; 800C9260
- dw 0x00000000 ; 800C9264
- dw 0x244200C8 ; 800C9268
- dw 0x080324A0 ; 800C926C
- dw 0xAC820684 ; 800C9270
- dw 0x8C820668 ; 800C9274
- dw 0x00001821 ; 800C9278
- dw 0xAC400008 ; 800C927C
- dw 0x03E00008 ; 800C9280
- dw 0x00601021 ; 800C9284
diff --git a/asm/overlays/s16a/s16a_evntmous_800C9288.s b/asm/overlays/s16a/s16a_evntmous_800C9288.s
deleted file mode 100755
index 72b20b729..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C9288.s
+++ /dev/null
@@ -1,37 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C9288
-s16a_evntmous_800C9288:
- dw 0x27BDFFD8 ; 800C9288
- dw 0x00801021 ; 800C928C
- dw 0x00A02021 ; 800C9290
- dw 0x00402821 ; 800C9294
- dw 0xAFB00018 ; 800C9298
- dw 0x00C08021 ; 800C929C
- dw 0x27A60010 ; 800C92A0
- dw 0xAFBF0020 ; 800C92A4
- dw 0x0C005B50 ; 800C92A8
- dw 0xAFB1001C ; 800C92AC
- dw 0x87A40010 ; 800C92B0
- dw 0x87A50014 ; 800C92B4
- dw 0x0C0250C2 ; 800C92B8
- dw 0x00000000 ; 800C92BC
- dw 0x30420FFF ; 800C92C0
- dw 0xA6020002 ; 800C92C4
- dw 0x87B10012 ; 800C92C8
- dw 0x27A40010 ; 800C92CC
- dw 0x0C005B60 ; 800C92D0
- dw 0xA7A00012 ; 800C92D4
- dw 0x00402021 ; 800C92D8
- dw 0x0C0250C2 ; 800C92DC
- dw 0x02202821 ; 800C92E0
- dw 0x30420FFF ; 800C92E4
- dw 0x2442FC00 ; 800C92E8
- dw 0xA6020000 ; 800C92EC
- dw 0xA6000004 ; 800C92F0
- dw 0x8FBF0020 ; 800C92F4
- dw 0x8FB1001C ; 800C92F8
- dw 0x8FB00018 ; 800C92FC
- dw 0x03E00008 ; 800C9300
- dw 0x27BD0028 ; 800C9304
diff --git a/asm/overlays/s16a/s16a_evntmous_800C9308.s b/asm/overlays/s16a/s16a_evntmous_800C9308.s
deleted file mode 100755
index 068f4a7a6..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C9308.s
+++ /dev/null
@@ -1,102 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C9308
-s16a_evntmous_800C9308:
- dw 0x27BDFFC0 ; 800C9308
- dw 0xAFB30034 ; 800C930C
- dw 0x00809821 ; 800C9310
- dw 0xAFBF0038 ; 800C9314
- dw 0xAFB20030 ; 800C9318
- dw 0xAFB1002C ; 800C931C
- dw 0xAFB00028 ; 800C9320
- dw 0x8A670027 ; 800C9324
- dw 0x9A670024 ; 800C9328
- dw 0x8A68002B ; 800C932C
- dw 0x9A680028 ; 800C9330
- dw 0xABA7001B ; 800C9334
- dw 0xBBA70018 ; 800C9338
- dw 0xABA8001F ; 800C933C
- dw 0xBBA8001C ; 800C9340
- dw 0x87A2001A ; 800C9344
- dw 0x00000000 ; 800C9348
- dw 0x2842FFF7 ; 800C934C
- dw 0x1440000A ; 800C9350
- dw 0x00000000 ; 800C9354
- dw 0x87A2001C ; 800C9358
- dw 0x00000000 ; 800C935C
- dw 0x2842B9A7 ; 800C9360
- dw 0x14400005 ; 800C9364
- dw 0x2402E0C0 ; 800C9368
- dw 0xA7A20010 ; 800C936C
- dw 0x2402C75C ; 800C9370
- dw 0x080324F6 ; 800C9374
- dw 0xA7A00012 ; 800C9378
- dw 0x87A3001C ; 800C937C
- dw 0x00000000 ; 800C9380
- dw 0x28621767 ; 800C9384
- dw 0x14400006 ; 800C9388
- dw 0x24021B58 ; 800C938C
- dw 0xA7A20010 ; 800C9390
- dw 0x2402F830 ; 800C9394
- dw 0xA7A20012 ; 800C9398
- dw 0x080324F6 ; 800C939C
- dw 0x24022328 ; 800C93A0
- dw 0x87A20018 ; 800C93A4
- dw 0x00000000 ; 800C93A8
- dw 0x28422ED7 ; 800C93AC
- dw 0x1440000B ; 800C93B0
- dw 0x27B00018 ; 800C93B4
- dw 0x2862F057 ; 800C93B8
- dw 0x14400009 ; 800C93BC
- dw 0x02002021 ; 800C93C0
- dw 0x240230D4 ; 800C93C4
- dw 0xA7A20010 ; 800C93C8
- dw 0x2402F830 ; 800C93CC
- dw 0xA7A20012 ; 800C93D0
- dw 0x2402FA24 ; 800C93D4
- dw 0xA7A20014 ; 800C93D8
- dw 0x27B00018 ; 800C93DC
- dw 0x02002021 ; 800C93E0
- dw 0x27A50010 ; 800C93E4
- dw 0x27B10020 ; 800C93E8
- dw 0x0C0324A2 ; 800C93EC
- dw 0x02203021 ; 800C93F0
- dw 0x02002021 ; 800C93F4
- dw 0x27A50010 ; 800C93F8
- dw 0x3C10800B ; 800C93FC
- dw 0x260AB39C ; 800C9400
- dw 0x89470003 ; 800C9404
- dw 0x99470000 ; 800C9408
- dw 0x89480007 ; 800C940C
- dw 0x99480004 ; 800C9410
- dw 0xAA670617 ; 800C9414
- dw 0xBA670614 ; 800C9418
- dw 0xAA68061B ; 800C941C
- dw 0xBA680618 ; 800C9420
- dw 0x2610B39C ; 800C9424
- dw 0x0C032450 ; 800C9428
- dw 0x26720614 ; 800C942C
- dw 0x3C038888 ; 800C9430
- dw 0x34638889 ; 800C9434
- dw 0x00430018 ; 800C9438
- dw 0x02002021 ; 800C943C
- dw 0x02202821 ; 800C9440
- dw 0x00003810 ; 800C9444
- dw 0x00E21821 ; 800C9448
- dw 0x00031903 ; 800C944C
- dw 0x000217C3 ; 800C9450
- dw 0x00621823 ; 800C9454
- dw 0x0C006F23 ; 800C9458
- dw 0xA6630618 ; 800C945C
- dw 0x02402021 ; 800C9460
- dw 0x00802821 ; 800C9464
- dw 0x0C006F92 ; 800C9468
- dw 0x24060001 ; 800C946C
- dw 0x8FBF0038 ; 800C9470
- dw 0x8FB30034 ; 800C9474
- dw 0x8FB20030 ; 800C9478
- dw 0x8FB1002C ; 800C947C
- dw 0x8FB00028 ; 800C9480
- dw 0x03E00008 ; 800C9484
- dw 0x27BD0040 ; 800C9488
diff --git a/asm/overlays/s16a/s16a_evntmous_800C948C.s b/asm/overlays/s16a/s16a_evntmous_800C948C.s
deleted file mode 100755
index 023692108..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C948C.s
+++ /dev/null
@@ -1,140 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C948C
-s16a_evntmous_800C948C:
- dw 0x27BDFFD0 ; 800C948C
- dw 0xAFB10024 ; 800C9490
- dw 0x00808821 ; 800C9494
- dw 0x24020001 ; 800C9498
- dw 0xAFBF0028 ; 800C949C
- dw 0xAFB00020 ; 800C94A0
- dw 0xAE220208 ; 800C94A4
- dw 0x88A70003 ; 800C94A8
- dw 0x98A70000 ; 800C94AC
- dw 0x88A80007 ; 800C94B0
- dw 0x98A80004 ; 800C94B4
- dw 0xABA70013 ; 800C94B8
- dw 0xBBA70010 ; 800C94BC
- dw 0xABA80017 ; 800C94C0
- dw 0xBBA80014 ; 800C94C4
- dw 0x0C0324C2 ; 800C94C8
- dw 0x00000000 ; 800C94CC
- dw 0x96220614 ; 800C94D0
- dw 0x00000000 ; 800C94D4
- dw 0x00021400 ; 800C94D8
- dw 0x00021C03 ; 800C94DC
- dw 0x000217C2 ; 800C94E0
- dw 0x00621821 ; 800C94E4
- dw 0x97A20010 ; 800C94E8
- dw 0x00031843 ; 800C94EC
- dw 0x00431021 ; 800C94F0
- dw 0xA7A20010 ; 800C94F4
- dw 0x96220618 ; 800C94F8
- dw 0x00000000 ; 800C94FC
- dw 0x00021400 ; 800C9500
- dw 0x00021C03 ; 800C9504
- dw 0x000217C2 ; 800C9508
- dw 0x00621821 ; 800C950C
- dw 0x97A20014 ; 800C9510
- dw 0x00031843 ; 800C9514
- dw 0x00431021 ; 800C9518
- dw 0xA7A20014 ; 800C951C
- dw 0x8BA70013 ; 800C9520
- dw 0x9BA70010 ; 800C9524
- dw 0x8BA80017 ; 800C9528
- dw 0x9BA80014 ; 800C952C
- dw 0xABA7001B ; 800C9530
- dw 0xBBA70018 ; 800C9534
- dw 0xABA8001F ; 800C9538
- dw 0xBBA8001C ; 800C953C
- dw 0x87A20012 ; 800C9540
- dw 0x00000000 ; 800C9544
- dw 0x2842FFF7 ; 800C9548
- dw 0x1440000D ; 800C954C
- dw 0x27B00010 ; 800C9550
- dw 0x87A20014 ; 800C9554
- dw 0x00000000 ; 800C9558
- dw 0x2842B9A7 ; 800C955C
- dw 0x14400008 ; 800C9560
- dw 0x02202021 ; 800C9564
- dw 0x02002821 ; 800C9568
- dw 0x24060078 ; 800C956C
- dw 0x0C0323A2 ; 800C9570
- dw 0xA7A00012 ; 800C9574
- dw 0x240201F4 ; 800C9578
- dw 0x0803259E ; 800C957C
- dw 0xA7A20016 ; 800C9580
- dw 0x87A30014 ; 800C9584
- dw 0x00000000 ; 800C9588
- dw 0x28621767 ; 800C958C
- dw 0x1440001E ; 800C9590
- dw 0x28621B59 ; 800C9594
- dw 0x14400013 ; 800C9598
- dw 0x2402F830 ; 800C959C
- dw 0x24041000 ; 800C95A0
- dw 0x2402F448 ; 800C95A4
- dw 0xA7A20012 ; 800C95A8
- dw 0x2402F830 ; 800C95AC
- dw 0x0C005C24 ; 800C95B0
- dw 0xA7A2001A ; 800C95B4
- dw 0x00402021 ; 800C95B8
- dw 0x27A50018 ; 800C95BC
- dw 0x0C032C59 ; 800C95C0
- dw 0x00003021 ; 800C95C4
- dw 0x00002021 ; 800C95C8
- dw 0x2405003F ; 800C95CC
- dw 0x240600BB ; 800C95D0
- dw 0x240203E8 ; 800C95D4
- dw 0x0C00CA5A ; 800C95D8
- dw 0xA7A20016 ; 800C95DC
- dw 0x0803257E ; 800C95E0
- dw 0x02202021 ; 800C95E4
- dw 0xA7A20012 ; 800C95E8
- dw 0x240201F4 ; 800C95EC
- dw 0xA7A20016 ; 800C95F0
- dw 0x02202021 ; 800C95F4
- dw 0x27A50010 ; 800C95F8
- dw 0x0C0323A2 ; 800C95FC
- dw 0x24060078 ; 800C9600
- dw 0x0803259F ; 800C9604
- dw 0x00002021 ; 800C9608
- dw 0x87A20010 ; 800C960C
- dw 0x00000000 ; 800C9610
- dw 0x28422ED7 ; 800C9614
- dw 0x14400018 ; 800C9618
- dw 0x00002021 ; 800C961C
- dw 0x2862F057 ; 800C9620
- dw 0x14400015 ; 800C9624
- dw 0x2402F448 ; 800C9628
- dw 0x24041000 ; 800C962C
- dw 0xA7A20012 ; 800C9630
- dw 0x2402F830 ; 800C9634
- dw 0x0C005C24 ; 800C9638
- dw 0xA7A2001A ; 800C963C
- dw 0x00402021 ; 800C9640
- dw 0x27A50018 ; 800C9644
- dw 0x0C032C59 ; 800C9648
- dw 0x00003021 ; 800C964C
- dw 0x02202021 ; 800C9650
- dw 0x27A50010 ; 800C9654
- dw 0x0C0323A2 ; 800C9658
- dw 0x24060078 ; 800C965C
- dw 0x00002021 ; 800C9660
- dw 0x2405003F ; 800C9664
- dw 0x240600B0 ; 800C9668
- dw 0x240203E8 ; 800C966C
- dw 0x0C00CA5A ; 800C9670
- dw 0xA7A20016 ; 800C9674
- dw 0x00002021 ; 800C9678
- dw 0x2405003F ; 800C967C
- dw 0x0C00CA5A ; 800C9680
- dw 0x2406000D ; 800C9684
- dw 0x8E240660 ; 800C9688
- dw 0x0C032439 ; 800C968C
- dw 0x27A50010 ; 800C9690
- dw 0x8FBF0028 ; 800C9694
- dw 0x8FB10024 ; 800C9698
- dw 0x8FB00020 ; 800C969C
- dw 0x03E00008 ; 800C96A0
- dw 0x27BD0030 ; 800C96A4
diff --git a/asm/overlays/s16a/s16a_evntmous_800C96A8.s b/asm/overlays/s16a/s16a_evntmous_800C96A8.s
deleted file mode 100755
index 0abbaca9c..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C96A8.s
+++ /dev/null
@@ -1,101 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C96A8
-s16a_evntmous_800C96A8:
- dw 0x27BDFFA8 ; 800C96A8
- dw 0xAFB1004C ; 800C96AC
- dw 0x00808821 ; 800C96B0
- dw 0x2624002C ; 800C96B4
- dw 0xAFB20050 ; 800C96B8
- dw 0x27B20028 ; 800C96BC
- dw 0x02402821 ; 800C96C0
- dw 0x3C02800A ; 800C96C4
- dw 0xAFB00048 ; 800C96C8
- dw 0xAFBF0054 ; 800C96CC
- dw 0x8A270027 ; 800C96D0
- dw 0x9A270024 ; 800C96D4
- dw 0x8A28002B ; 800C96D8
- dw 0x9A280028 ; 800C96DC
- dw 0xABA70013 ; 800C96E0
- dw 0xBBA70010 ; 800C96E4
- dw 0xABA80017 ; 800C96E8
- dw 0xBBA80014 ; 800C96EC
- dw 0x244AD430 ; 800C96F0
- dw 0x8D470000 ; 800C96F4
- dw 0x8D480004 ; 800C96F8
- dw 0x8D490008 ; 800C96FC
- dw 0xAFA70028 ; 800C9700
- dw 0xAFA8002C ; 800C9704
- dw 0xAFA90030 ; 800C9708
- dw 0x8D47000C ; 800C970C
- dw 0x8D480010 ; 800C9710
- dw 0x8D490014 ; 800C9714
- dw 0xAFA70034 ; 800C9718
- dw 0xAFA80038 ; 800C971C
- dw 0xAFA9003C ; 800C9720
- dw 0x8D470018 ; 800C9724
- dw 0x8D48001C ; 800C9728
- dw 0xAFA70040 ; 800C972C
- dw 0xAFA80044 ; 800C9730
- dw 0x0C025042 ; 800C9734
- dw 0x26300640 ; 800C9738
- dw 0x0C006F11 ; 800C973C
- dw 0x02402021 ; 800C9740
- dw 0x3C04800C ; 800C9744
- dw 0x248433F0 ; 800C9748
- dw 0x27A50018 ; 800C974C
- dw 0x0C006F92 ; 800C9750
- dw 0x24060002 ; 800C9754
- dw 0x97A20010 ; 800C9758
- dw 0x97A30018 ; 800C975C
- dw 0x00000000 ; 800C9760
- dw 0x00431021 ; 800C9764
- dw 0xA6220640 ; 800C9768
- dw 0x97A20010 ; 800C976C
- dw 0x97A30018 ; 800C9770
- dw 0x00000000 ; 800C9774
- dw 0x00431023 ; 800C9778
- dw 0xA6020018 ; 800C977C
- dw 0x97A20014 ; 800C9780
- dw 0x97A3001C ; 800C9784
- dw 0x00000000 ; 800C9788
- dw 0x00431021 ; 800C978C
- dw 0xA6020004 ; 800C9790
- dw 0x97A20014 ; 800C9794
- dw 0x97A3001C ; 800C9798
- dw 0x00000000 ; 800C979C
- dw 0x00431023 ; 800C97A0
- dw 0xA602001C ; 800C97A4
- dw 0x97A20010 ; 800C97A8
- dw 0x97A30020 ; 800C97AC
- dw 0x00000000 ; 800C97B0
- dw 0x00431021 ; 800C97B4
- dw 0xA6020008 ; 800C97B8
- dw 0x97A20010 ; 800C97BC
- dw 0x97A30020 ; 800C97C0
- dw 0x00000000 ; 800C97C4
- dw 0x00431023 ; 800C97C8
- dw 0xA6020010 ; 800C97CC
- dw 0x97A20014 ; 800C97D0
- dw 0x97A30024 ; 800C97D4
- dw 0x00000000 ; 800C97D8
- dw 0x00431021 ; 800C97DC
- dw 0xA602000C ; 800C97E0
- dw 0x97A20014 ; 800C97E4
- dw 0x97A30024 ; 800C97E8
- dw 0x00000000 ; 800C97EC
- dw 0x00431023 ; 800C97F0
- dw 0xA6020014 ; 800C97F4
- dw 0x97A20012 ; 800C97F8
- dw 0x00000000 ; 800C97FC
- dw 0xA622065A ; 800C9800
- dw 0xA6220652 ; 800C9804
- dw 0xA622064A ; 800C9808
- dw 0xA6020002 ; 800C980C
- dw 0x8FBF0054 ; 800C9810
- dw 0x8FB20050 ; 800C9814
- dw 0x8FB1004C ; 800C9818
- dw 0x8FB00048 ; 800C981C
- dw 0x03E00008 ; 800C9820
- dw 0x27BD0058 ; 800C9824
diff --git a/asm/overlays/s16a/s16a_evntmous_800C9828.s b/asm/overlays/s16a/s16a_evntmous_800C9828.s
deleted file mode 100755
index 0420c697e..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C9828.s
+++ /dev/null
@@ -1,31 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C9828
-s16a_evntmous_800C9828:
- dw 0x27BDFFE8 ; 800C9828
- dw 0x3C02800B ; 800C982C
- dw 0xAFBF0010 ; 800C9830
- dw 0x8C8301C8 ; 800C9834
- dw 0x8C42BA0C ; 800C9838
- dw 0x00000000 ; 800C983C
- dw 0x00621824 ; 800C9840
- dw 0x1060000E ; 800C9844
- dw 0x00001021 ; 800C9848
- dw 0x8C820020 ; 800C984C
- dw 0x00000000 ; 800C9850
- dw 0x94420006 ; 800C9854
- dw 0x00000000 ; 800C9858
- dw 0x3042000C ; 800C985C
- dw 0x14400003 ; 800C9860
- dw 0x00002021 ; 800C9864
- dw 0x08032620 ; 800C9868
- dw 0x00001021 ; 800C986C
- dw 0x2405003F ; 800C9870
- dw 0x0C00CA5A ; 800C9874
- dw 0x240600B9 ; 800C9878
- dw 0x24020001 ; 800C987C
- dw 0x8FBF0010 ; 800C9880
- dw 0x00000000 ; 800C9884
- dw 0x03E00008 ; 800C9888
- dw 0x27BD0018 ; 800C988C
diff --git a/asm/overlays/s16a/s16a_evntmous_800C9890.s b/asm/overlays/s16a/s16a_evntmous_800C9890.s
deleted file mode 100755
index 46b24e908..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C9890.s
+++ /dev/null
@@ -1,29 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C9890
-s16a_evntmous_800C9890:
- dw 0x24020009 ; 800C9890
- dw 0xA0820003 ; 800C9894
- dw 0x2402002E ; 800C9898
- dw 0xA0820007 ; 800C989C
- dw 0x90A60008 ; 800C98A0
- dw 0x90A3000A ; 800C98A4
- dw 0x90A20009 ; 800C98A8
- dw 0x90A7000B ; 800C98AC
- dw 0x00C31821 ; 800C98B0
- dw 0xA082000D ; 800C98B4
- dw 0xA0820015 ; 800C98B8
- dw 0x00471021 ; 800C98BC
- dw 0xA086000C ; 800C98C0
- dw 0xA0830014 ; 800C98C4
- dw 0xA086001C ; 800C98C8
- dw 0xA082001D ; 800C98CC
- dw 0xA0830024 ; 800C98D0
- dw 0xA0820025 ; 800C98D4
- dw 0x94A20004 ; 800C98D8
- dw 0x00000000 ; 800C98DC
- dw 0xA4820016 ; 800C98E0
- dw 0x94A20006 ; 800C98E4
- dw 0x03E00008 ; 800C98E8
- dw 0xA482000E ; 800C98EC
diff --git a/asm/overlays/s16a/s16a_evntmous_800C98F0.s b/asm/overlays/s16a/s16a_evntmous_800C98F0.s
deleted file mode 100755
index 440e4d401..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C98F0.s
+++ /dev/null
@@ -1,398 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C98F0
-s16a_evntmous_800C98F0:
- dw 0x27BDFF90 ; 800C98F0
- dw 0xAFB1005C ; 800C98F4
- dw 0x00808821 ; 800C98F8
- dw 0x27A50010 ; 800C98FC
- dw 0xAFBF0068 ; 800C9900
- dw 0xAFB30064 ; 800C9904
- dw 0xAFB20060 ; 800C9908
- dw 0xAFB00058 ; 800C990C
- dw 0x8A270027 ; 800C9910
- dw 0x9A270024 ; 800C9914
- dw 0x8A28002B ; 800C9918
- dw 0x9A280028 ; 800C991C
- dw 0xABA70013 ; 800C9920
- dw 0xBBA70010 ; 800C9924
- dw 0xABA80017 ; 800C9928
- dw 0xBBA80014 ; 800C992C
- dw 0x8E220620 ; 800C9930
- dw 0x00000000 ; 800C9934
- dw 0x000210C0 ; 800C9938
- dw 0x02221021 ; 800C993C
- dw 0x8847020F ; 800C9940
- dw 0x9847020C ; 800C9944
- dw 0x88480213 ; 800C9948
- dw 0x98480210 ; 800C994C
- dw 0xABA7001B ; 800C9950
- dw 0xBBA70018 ; 800C9954
- dw 0xABA8001F ; 800C9958
- dw 0xBBA8001C ; 800C995C
- dw 0x0C03246C ; 800C9960
- dw 0x26320024 ; 800C9964
- dw 0x1440001D ; 800C9968
- dw 0x24040002 ; 800C996C
- dw 0x8E220020 ; 800C9970
- dw 0x00000000 ; 800C9974
- dw 0xA4400006 ; 800C9978
- dw 0x8E230020 ; 800C997C
- dw 0xAE200628 ; 800C9980
- dw 0x94620000 ; 800C9984
- dw 0x00000000 ; 800C9988
- dw 0x3042FFE2 ; 800C998C
- dw 0x34420001 ; 800C9990
- dw 0xA4620000 ; 800C9994
- dw 0x8E2300A0 ; 800C9998
- dw 0x00000000 ; 800C999C
- dw 0x8C620028 ; 800C99A0
- dw 0x00000000 ; 800C99A4
- dw 0x34420080 ; 800C99A8
- dw 0xAC620028 ; 800C99AC
- dw 0x8E2301C4 ; 800C99B0
- dw 0x00000000 ; 800C99B4
- dw 0x8C620024 ; 800C99B8
- dw 0x00000000 ; 800C99BC
- dw 0x34420100 ; 800C99C0
- dw 0x0C005C24 ; 800C99C4
- dw 0xAC620024 ; 800C99C8
- dw 0x1C40014A ; 800C99CC
- dw 0x27A40010 ; 800C99D0
- dw 0x8E330624 ; 800C99D4
- dw 0x08032773 ; 800C99D8
- dw 0x27B00018 ; 800C99DC
- dw 0x8E2201D8 ; 800C99E0
- dw 0x8E230020 ; 800C99E4
- dw 0x24420001 ; 800C99E8
- dw 0xAE2201D8 ; 800C99EC
- dw 0x94620000 ; 800C99F0
- dw 0x00000000 ; 800C99F4
- dw 0x3442001D ; 800C99F8
- dw 0xA4620000 ; 800C99FC
- dw 0x8E240020 ; 800C9A00
- dw 0x0C00B540 ; 800C9A04
- dw 0x02402821 ; 800C9A08
- dw 0x8E240020 ; 800C9A0C
- dw 0x0C00B685 ; 800C9A10
- dw 0x24100001 ; 800C9A14
- dw 0x8E2400A0 ; 800C9A18
- dw 0x00000000 ; 800C9A1C
- dw 0x8C820028 ; 800C9A20
- dw 0x2403FF7F ; 800C9A24
- dw 0x00431024 ; 800C9A28
- dw 0xAC820028 ; 800C9A2C
- dw 0x8E220204 ; 800C9A30
- dw 0x00000000 ; 800C9A34
- dw 0x10500013 ; 800C9A38
- dw 0x00000000 ; 800C9A3C
- dw 0x0C03260A ; 800C9A40
- dw 0x02202021 ; 800C9A44
- dw 0x1040000F ; 800C9A48
- dw 0x02202021 ; 800C9A4C
- dw 0xAC900204 ; 800C9A50
- dw 0xAC8001CC ; 800C9A54
- dw 0x88870027 ; 800C9A58
- dw 0x98870024 ; 800C9A5C
- dw 0x8888002B ; 800C9A60
- dw 0x98880028 ; 800C9A64
- dw 0xA887060F ; 800C9A68
- dw 0xB887060C ; 800C9A6C
- dw 0xA8880613 ; 800C9A70
- dw 0xB8880610 ; 800C9A74
- dw 0x0C0324C2 ; 800C9A78
- dw 0x00000000 ; 800C9A7C
- dw 0x080327BE ; 800C9A80
- dw 0x00000000 ; 800C9A84
- dw 0x8E2201FC ; 800C9A88
- dw 0x00000000 ; 800C9A8C
- dw 0x18400003 ; 800C9A90
- dw 0x2442FFFF ; 800C9A94
- dw 0x080327BE ; 800C9A98
- dw 0xAE2201FC ; 800C9A9C
- dw 0x02402021 ; 800C9AA0
- dw 0x3C05800B ; 800C9AA4
- dw 0x0C032450 ; 800C9AA8
- dw 0x24A5BA10 ; 800C9AAC
- dw 0x02202021 ; 800C9AB0
- dw 0x8E2601C4 ; 800C9AB4
- dw 0x2405FEFF ; 800C9AB8
- dw 0x8CC30024 ; 800C9ABC
- dw 0x00409821 ; 800C9AC0
- dw 0x00651824 ; 800C9AC4
- dw 0x0C0325AA ; 800C9AC8
- dw 0xACC30024 ; 800C9ACC
- dw 0x8E220628 ; 800C9AD0
- dw 0x00000000 ; 800C9AD4
- dw 0x14400076 ; 800C9AD8
- dw 0x3C055555 ; 800C9ADC
- dw 0x2A6207D0 ; 800C9AE0
- dw 0x14400005 ; 800C9AE4
- dw 0x3C02800B ; 800C9AE8
- dw 0x8C42BA24 ; 800C9AEC
- dw 0x00000000 ; 800C9AF0
- dw 0x18400047 ; 800C9AF4
- dw 0x00000000 ; 800C9AF8
- dw 0x8E2400A0 ; 800C9AFC
- dw 0x0C032164 ; 800C9B00
- dw 0x00002821 ; 800C9B04
- dw 0x02402021 ; 800C9B08
- dw 0x0C00CA16 ; 800C9B0C
- dw 0x240500B8 ; 800C9B10
- dw 0x8E300620 ; 800C9B14
- dw 0x24020001 ; 800C9B18
- dw 0xAE220628 ; 800C9B1C
- dw 0x2402000F ; 800C9B20
- dw 0xAE2201FC ; 800C9B24
- dw 0x02202021 ; 800C9B28
- dw 0x001028C0 ; 800C9B2C
- dw 0x24A5020C ; 800C9B30
- dw 0x0C03246C ; 800C9B34
- dw 0x02252821 ; 800C9B38
- dw 0x10400008 ; 800C9B3C
- dw 0x00000000 ; 800C9B40
- dw 0x8E22061C ; 800C9B44
- dw 0x26100001 ; 800C9B48
- dw 0x0202102A ; 800C9B4C
- dw 0x1440FFF6 ; 800C9B50
- dw 0x02202021 ; 800C9B54
- dw 0x080326CB ; 800C9B58
- dw 0x00008021 ; 800C9B5C
- dw 0x2610FFFF ; 800C9B60
- dw 0x06010004 ; 800C9B64
- dw 0x00000000 ; 800C9B68
- dw 0x8E22061C ; 800C9B6C
- dw 0x00000000 ; 800C9B70
- dw 0x2450FFFF ; 800C9B74
- dw 0x8E220208 ; 800C9B78
- dw 0x00000000 ; 800C9B7C
- dw 0x14400024 ; 800C9B80
- dw 0xAE300620 ; 800C9B84
- dw 0x3C02800B ; 800C9B88
- dw 0x8C42BA24 ; 800C9B8C
- dw 0x00000000 ; 800C9B90
- dw 0x1440001F ; 800C9B94
- dw 0x00000000 ; 800C9B98
- dw 0x8E220200 ; 800C9B9C
- dw 0x8E23062C ; 800C9BA0
- dw 0x24420001 ; 800C9BA4
- dw 0x0062182A ; 800C9BA8
- dw 0x10600019 ; 800C9BAC
- dw 0xAE220200 ; 800C9BB0
- dw 0x2A6203E9 ; 800C9BB4
- dw 0x14400016 ; 800C9BB8
- dw 0x00000000 ; 800C9BBC
- dw 0x8A470003 ; 800C9BC0
- dw 0x9A470000 ; 800C9BC4
- dw 0x8A480007 ; 800C9BC8
- dw 0x9A480004 ; 800C9BCC
- dw 0xABA70033 ; 800C9BD0
- dw 0xBBA70030 ; 800C9BD4
- dw 0xABA80037 ; 800C9BD8
- dw 0xBBA80034 ; 800C9BDC
- dw 0x0C0324C2 ; 800C9BE0
- dw 0x02202021 ; 800C9BE4
- dw 0x97A20030 ; 800C9BE8
- dw 0x96230614 ; 800C9BEC
- dw 0x02202021 ; 800C9BF0
- dw 0x00431021 ; 800C9BF4
- dw 0xA7A20030 ; 800C9BF8
- dw 0x97A20034 ; 800C9BFC
- dw 0x96230618 ; 800C9C00
- dw 0x27A50030 ; 800C9C04
- dw 0x00431021 ; 800C9C08
- dw 0x0C032523 ; 800C9C0C
- dw 0xA7A20034 ; 800C9C10
- dw 0x8E2201D0 ; 800C9C14
- dw 0x00000000 ; 800C9C18
- dw 0x2442FFFF ; 800C9C1C
- dw 0x0441000E ; 800C9C20
- dw 0xAE2201D0 ; 800C9C24
- dw 0x8E2301D4 ; 800C9C28
- dw 0x24020001 ; 800C9C2C
- dw 0x00431023 ; 800C9C30
- dw 0x14400005 ; 800C9C34
- dw 0xAE2201D4 ; 800C9C38
- dw 0x0C005C24 ; 800C9C3C
- dw 0x24040040 ; 800C9C40
- dw 0x08032716 ; 800C9C44
- dw 0x24420040 ; 800C9C48
- dw 0x0C005C24 ; 800C9C4C
- dw 0x24040020 ; 800C9C50
- dw 0x24420020 ; 800C9C54
- dw 0xAE2201D0 ; 800C9C58
- dw 0x8E2201D4 ; 800C9C5C
- dw 0x00000000 ; 800C9C60
- dw 0x104000A4 ; 800C9C64
- dw 0x00000000 ; 800C9C68
- dw 0x8E230624 ; 800C9C6C
- dw 0x00000000 ; 800C9C70
- dw 0x04610002 ; 800C9C74
- dw 0x00000000 ; 800C9C78
- dw 0x24630003 ; 800C9C7C
- dw 0x86420000 ; 800C9C80
- dw 0x00000000 ; 800C9C84
- dw 0x28422ED7 ; 800C9C88
- dw 0x1440004D ; 800C9C8C
- dw 0x00039883 ; 800C9C90
- dw 0x86420004 ; 800C9C94
- dw 0x00000000 ; 800C9C98
- dw 0x2842F057 ; 800C9C9C
- dw 0x14400049 ; 800C9CA0
- dw 0x27A40010 ; 800C9CA4
- dw 0x24020001 ; 800C9CA8
- dw 0x08032772 ; 800C9CAC
- dw 0xAE220628 ; 800C9CB0
- dw 0x8E230624 ; 800C9CB4
- dw 0x34A55556 ; 800C9CB8
- dw 0x00650018 ; 800C9CBC
- dw 0x3C02800B ; 800C9CC0
- dw 0x00003010 ; 800C9CC4
- dw 0x8C44B330 ; 800C9CC8
- dw 0x00000000 ; 800C9CCC
- dw 0x00850018 ; 800C9CD0
- dw 0x8A47004F ; 800C9CD4
- dw 0x9A47004C ; 800C9CD8
- dw 0x8A480053 ; 800C9CDC
- dw 0x9A480050 ; 800C9CE0
- dw 0xAA47000B ; 800C9CE4
- dw 0xBA470008 ; 800C9CE8
- dw 0xAA48000F ; 800C9CEC
- dw 0xBA48000C ; 800C9CF0
- dw 0x00031FC3 ; 800C9CF4
- dw 0x00C39823 ; 800C9CF8
- dw 0x00041FC3 ; 800C9CFC
- dw 0x00005810 ; 800C9D00
- dw 0x01631823 ; 800C9D04
- dw 0x00031040 ; 800C9D08
- dw 0x00431021 ; 800C9D0C
- dw 0x1482002D ; 800C9D10
- dw 0x27A40010 ; 800C9D14
- dw 0x86420000 ; 800C9D18
- dw 0x00000000 ; 800C9D1C
- dw 0x28422ED7 ; 800C9D20
- dw 0x14400028 ; 800C9D24
- dw 0x00000000 ; 800C9D28
- dw 0x86420004 ; 800C9D2C
- dw 0x00000000 ; 800C9D30
- dw 0x2842F057 ; 800C9D34
- dw 0x14400024 ; 800C9D38
- dw 0x27B00018 ; 800C9D3C
- dw 0x3C02800A ; 800C9D40
- dw 0x244AD430 ; 800C9D44
- dw 0x8D470000 ; 800C9D48
- dw 0x8D480004 ; 800C9D4C
- dw 0x8D490008 ; 800C9D50
- dw 0xAFA70038 ; 800C9D54
- dw 0xAFA8003C ; 800C9D58
- dw 0xAFA90040 ; 800C9D5C
- dw 0x8D47000C ; 800C9D60
- dw 0x8D480010 ; 800C9D64
- dw 0x8D490014 ; 800C9D68
- dw 0xAFA70044 ; 800C9D6C
- dw 0xAFA80048 ; 800C9D70
- dw 0xAFA9004C ; 800C9D74
- dw 0x8D470018 ; 800C9D78
- dw 0x8D48001C ; 800C9D7C
- dw 0xAFA70050 ; 800C9D80
- dw 0xAFA80054 ; 800C9D84
- dw 0x0C005C2F ; 800C9D88
- dw 0x24040040 ; 800C9D8C
- dw 0x24040040 ; 800C9D90
- dw 0x86430000 ; 800C9D94
- dw 0x2405F830 ; 800C9D98
- dw 0xAFA50050 ; 800C9D9C
- dw 0x00621821 ; 800C9DA0
- dw 0x0C005C24 ; 800C9DA4
- dw 0xAFA3004C ; 800C9DA8
- dw 0x27A40038 ; 800C9DAC
- dw 0x86430004 ; 800C9DB0
- dw 0x240505DC ; 800C9DB4
- dw 0x00621821 ; 800C9DB8
- dw 0x0C0334E1 ; 800C9DBC
- dw 0xAFA30054 ; 800C9DC0
- dw 0x27A40010 ; 800C9DC4
- dw 0x27B00018 ; 800C9DC8
- dw 0x0C032450 ; 800C9DCC
- dw 0x02002821 ; 800C9DD0
- dw 0x0053102A ; 800C9DD4
- dw 0x10400012 ; 800C9DD8
- dw 0x27A40010 ; 800C9DDC
- dw 0x8BA7001B ; 800C9DE0
- dw 0x9BA70018 ; 800C9DE4
- dw 0x8BA8001F ; 800C9DE8
- dw 0x9BA8001C ; 800C9DEC
- dw 0xAA470003 ; 800C9DF0
- dw 0xBA470000 ; 800C9DF4
- dw 0xAA480007 ; 800C9DF8
- dw 0xBA480004 ; 800C9DFC
- dw 0x8E220620 ; 800C9E00
- dw 0x8E23061C ; 800C9E04
- dw 0x24420001 ; 800C9E08
- dw 0xAE220620 ; 800C9E0C
- dw 0x0043102A ; 800C9E10
- dw 0x14400029 ; 800C9E14
- dw 0x00000000 ; 800C9E18
- dw 0x080327AF ; 800C9E1C
- dw 0xAE200620 ; 800C9E20
- dw 0x02002821 ; 800C9E24
- dw 0x27B00020 ; 800C9E28
- dw 0x0C0324A2 ; 800C9E2C
- dw 0x02003021 ; 800C9E30
- dw 0x27A40010 ; 800C9E34
- dw 0x02002821 ; 800C9E38
- dw 0x3C02800B ; 800C9E3C
- dw 0x244AB39C ; 800C9E40
- dw 0x89470003 ; 800C9E44
- dw 0x99470000 ; 800C9E48
- dw 0x89480007 ; 800C9E4C
- dw 0x99480004 ; 800C9E50
- dw 0xABA7002B ; 800C9E54
- dw 0xBBA70028 ; 800C9E58
- dw 0xABA8002F ; 800C9E5C
- dw 0xBBA8002C ; 800C9E60
- dw 0x0C006F23 ; 800C9E64
- dw 0xA7B3002C ; 800C9E68
- dw 0x27A40028 ; 800C9E6C
- dw 0x00802821 ; 800C9E70
- dw 0x0C006F92 ; 800C9E74
- dw 0x24060001 ; 800C9E78
- dw 0x8BA7002B ; 800C9E7C
- dw 0x9BA70028 ; 800C9E80
- dw 0x8BA8002F ; 800C9E84
- dw 0x9BA8002C ; 800C9E88
- dw 0xAA470003 ; 800C9E8C
- dw 0xBA470000 ; 800C9E90
- dw 0xAA480007 ; 800C9E94
- dw 0xBA480004 ; 800C9E98
- dw 0x8BA70023 ; 800C9E9C
- dw 0x9BA70020 ; 800C9EA0
- dw 0x8BA80027 ; 800C9EA4
- dw 0x9BA80024 ; 800C9EA8
- dw 0xAA47004F ; 800C9EAC
- dw 0xBA47004C ; 800C9EB0
- dw 0xAA480053 ; 800C9EB4
- dw 0xBA480050 ; 800C9EB8
- dw 0x8E2301D8 ; 800C9EBC
- dw 0x00000000 ; 800C9EC0
- dw 0x04610002 ; 800C9EC4
- dw 0x00601021 ; 800C9EC8
- dw 0x24620007 ; 800C9ECC
- dw 0x000210C3 ; 800C9ED0
- dw 0x000210C0 ; 800C9ED4
- dw 0x00621023 ; 800C9ED8
- dw 0x00021080 ; 800C9EDC
- dw 0x02221021 ; 800C9EE0
- dw 0x8C4201DC ; 800C9EE4
- dw 0x9643000A ; 800C9EE8
- dw 0x00021180 ; 800C9EEC
- dw 0x00621821 ; 800C9EF0
- dw 0xA643000A ; 800C9EF4
- dw 0x8FBF0068 ; 800C9EF8
- dw 0x8FB30064 ; 800C9EFC
- dw 0x8FB20060 ; 800C9F00
- dw 0x8FB1005C ; 800C9F04
- dw 0x8FB00058 ; 800C9F08
- dw 0x03E00008 ; 800C9F0C
- dw 0x27BD0070 ; 800C9F10
diff --git a/asm/overlays/s16a/s16a_evntmous_800C9F14.s b/asm/overlays/s16a/s16a_evntmous_800C9F14.s
deleted file mode 100644
index e97f3e431..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800C9F14.s
+++ /dev/null
@@ -1,241 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800C9F14
-s16a_evntmous_800C9F14:
- dw 0x27BDFFB0 ; 800C9F14
- dw 0xAFB10044 ; 800C9F18
- dw 0x00808821 ; 800C9F1C
- dw 0xAFBF004C ; 800C9F20
- dw 0xAFB20048 ; 800C9F24
- dw 0xAFB00040 ; 800C9F28
- dw 0x8E22068C ; 800C9F2C
- dw 0x00000000 ; 800C9F30
- dw 0x18400034 ; 800C9F34
- dw 0x26320024 ; 800C9F38
- dw 0x3C04800B ; 800C9F3C
- dw 0x248419EC ; 800C9F40
- dw 0x26250694 ; 800C9F44
- dw 0x2442FFFF ; 800C9F48
- dw 0x2626069C ; 800C9F4C
- dw 0x24070140 ; 800C9F50
- dw 0x0C005CB4 ; 800C9F54
- dw 0xAE22068C ; 800C9F58
- dw 0x8E22068C ; 800C9F5C
- dw 0x00000000 ; 800C9F60
- dw 0x14400028 ; 800C9F64
- dw 0x24020009 ; 800C9F68
- dw 0x8E230630 ; 800C9F6C
- dw 0x00000000 ; 800C9F70
- dw 0x10620003 ; 800C9F74
- dw 0x24020004 ; 800C9F78
- dw 0x14620004 ; 800C9F7C
- dw 0x00000000 ; 800C9F80
- dw 0x96230630 ; 800C9F84
- dw 0x3C02800B ; 800C9F88
- dw 0xA4434DB4 ; 800C9F8C
- dw 0x8E230634 ; 800C9F90
- dw 0x24020001 ; 800C9F94
- dw 0x10620007 ; 800C9F98
- dw 0x2402000C ; 800C9F9C
- dw 0x10620005 ; 800C9FA0
- dw 0x24020005 ; 800C9FA4
- dw 0x10620003 ; 800C9FA8
- dw 0x24020006 ; 800C9FAC
- dw 0x14620004 ; 800C9FB0
- dw 0x00000000 ; 800C9FB4
- dw 0x96230634 ; 800C9FB8
- dw 0x3C02800B ; 800C9FBC
- dw 0xA4434DB6 ; 800C9FC0
- dw 0x8E240690 ; 800C9FC4
- dw 0x00000000 ; 800C9FC8
- dw 0x10800004 ; 800C9FCC
- dw 0x3C06FFB5 ; 800C9FD0
- dw 0x0C03430E ; 800C9FD4
- dw 0x00000000 ; 800C9FD8
- dw 0x3C06FFB5 ; 800C9FDC
- dw 0x34C6FFFF ; 800C9FE0
- dw 0x3C05EFFF ; 800C9FE4
- dw 0x34A5FFFF ; 800C9FE8
- dw 0x3C03800B ; 800C9FEC
- dw 0x8C62B3CC ; 800C9FF0
- dw 0x02202021 ; 800C9FF4
- dw 0x00461024 ; 800C9FF8
- dw 0x00451024 ; 800C9FFC
- dw 0x0C005472 ; 800CA000
- dw 0xAC62B3CC ; 800CA004
- dw 0x8E2201CC ; 800CA008
- dw 0x00000000 ; 800CA00C
- dw 0x04410010 ; 800CA010
- dw 0x02402021 ; 800CA014
- dw 0x8E2300A0 ; 800CA018
- dw 0x00000000 ; 800CA01C
- dw 0x8C620028 ; 800CA020
- dw 0x00000000 ; 800CA024
- dw 0x34420080 ; 800CA028
- dw 0xAC620028 ; 800CA02C
- dw 0x8E2301C4 ; 800CA030
- dw 0x00000000 ; 800CA034
- dw 0x8C620024 ; 800CA038
- dw 0x00002821 ; 800CA03C
- dw 0x34420100 ; 800CA040
- dw 0x0C00988F ; 800CA044
- dw 0xAC620024 ; 800CA048
- dw 0x080328AB ; 800CA04C
- dw 0x00000000 ; 800CA050
- dw 0x8E220208 ; 800CA054
- dw 0x00000000 ; 800CA058
- dw 0x14400008 ; 800CA05C
- dw 0x00002821 ; 800CA060
- dw 0x3C02800B ; 800CA064
- dw 0x84434DB6 ; 800CA068
- dw 0x24020013 ; 800CA06C
- dw 0x14620003 ; 800CA070
- dw 0x00000000 ; 800CA074
- dw 0x02402021 ; 800CA078
- dw 0x24050001 ; 800CA07C
- dw 0x0C00988F ; 800CA080
- dw 0x00000000 ; 800CA084
- dw 0x02202021 ; 800CA088
- dw 0x8E2301C8 ; 800CA08C
- dw 0x3C02800B ; 800CA090
- dw 0x0C03263C ; 800CA094
- dw 0xAC43B9B0 ; 800CA098
- dw 0x8E230204 ; 800CA09C
- dw 0x24020001 ; 800CA0A0
- dw 0x1462005C ; 800CA0A4
- dw 0x00000000 ; 800CA0A8
- dw 0x8E2300A0 ; 800CA0AC
- dw 0x00000000 ; 800CA0B0
- dw 0x8C620028 ; 800CA0B4
- dw 0x00000000 ; 800CA0B8
- dw 0x34420080 ; 800CA0BC
- dw 0xAC620028 ; 800CA0C0
- dw 0x8E2301C4 ; 800CA0C4
- dw 0x00000000 ; 800CA0C8
- dw 0x8C620024 ; 800CA0CC
- dw 0x00000000 ; 800CA0D0
- dw 0x34420100 ; 800CA0D4
- dw 0xAC620024 ; 800CA0D8
- dw 0x8E2201CC ; 800CA0DC
- dw 0x00000000 ; 800CA0E0
- dw 0x2842001F ; 800CA0E4
- dw 0x14400011 ; 800CA0E8
- dw 0x00000000 ; 800CA0EC
- dw 0x92220079 ; 800CA0F0
- dw 0x8E230208 ; 800CA0F4
- dw 0x34420002 ; 800CA0F8
- dw 0x14600006 ; 800CA0FC
- dw 0xA2220079 ; 800CA100
- dw 0x2402D8F0 ; 800CA104
- dw 0xAE2201CC ; 800CA108
- dw 0x02202021 ; 800CA10C
- dw 0x0C032523 ; 800CA110
- dw 0x2625060C ; 800CA114
- dw 0x8E22068C ; 800CA118
- dw 0x00000000 ; 800CA11C
- dw 0x10400062 ; 800CA120
- dw 0x00000000 ; 800CA124
- dw 0x08032886 ; 800CA128
- dw 0x00000000 ; 800CA12C
- dw 0x9642000A ; 800CA130
- dw 0x96430008 ; 800CA134
- dw 0x24420080 ; 800CA138
- dw 0x24630080 ; 800CA13C
- dw 0xA642000A ; 800CA140
- dw 0xA6430008 ; 800CA144
- dw 0x8A48000B ; 800CA148
- dw 0x9A480008 ; 800CA14C
- dw 0x8A49000F ; 800CA150
- dw 0x9A49000C ; 800CA154
- dw 0xAA48004F ; 800CA158
- dw 0xBA48004C ; 800CA15C
- dw 0xAA490053 ; 800CA160
- dw 0xBA490050 ; 800CA164
- dw 0x8E2401CC ; 800CA168
- dw 0x24020015 ; 800CA16C
- dw 0x24840001 ; 800CA170
- dw 0x00441023 ; 800CA174
- dw 0x00420018 ; 800CA178
- dw 0x96230610 ; 800CA17C
- dw 0x00003812 ; 800CA180
- dw 0x24020014 ; 800CA184
- dw 0x00441023 ; 800CA188
- dw 0x00420018 ; 800CA18C
- dw 0x96260618 ; 800CA190
- dw 0x96250614 ; 800CA194
- dw 0x00661821 ; 800CA198
- dw 0xAE2401CC ; 800CA19C
- dw 0x30840001 ; 800CA1A0
- dw 0xA6230610 ; 800CA1A4
- dw 0x9622060C ; 800CA1A8
- dw 0x9623060E ; 800CA1AC
- dw 0x00451021 ; 800CA1B0
- dw 0x26450008 ; 800CA1B4
- dw 0xA622060C ; 800CA1B8
- dw 0x00006012 ; 800CA1BC
- dw 0x00EC1023 ; 800CA1C0
- dw 0x00021080 ; 800CA1C4
- dw 0x00621821 ; 800CA1C8
- dw 0xA623060E ; 800CA1CC
- dw 0x8A28060F ; 800CA1D0
- dw 0x9A28060C ; 800CA1D4
- dw 0x8A290613 ; 800CA1D8
- dw 0x9A290610 ; 800CA1DC
- dw 0xAA480003 ; 800CA1E0
- dw 0xBA480000 ; 800CA1E4
- dw 0xAA490007 ; 800CA1E8
- dw 0xBA490004 ; 800CA1EC
- dw 0x14800009 ; 800CA1F0
- dw 0x2622060C ; 800CA1F4
- dw 0x0C006F23 ; 800CA1F8
- dw 0x00402021 ; 800CA1FC
- dw 0x27B00020 ; 800CA200
- dw 0x0C024B76 ; 800CA204
- dw 0x02002021 ; 800CA208
- dw 0x02002021 ; 800CA20C
- dw 0x0C01C9CA ; 800CA210
- dw 0x24050001 ; 800CA214
- dw 0x0C00969F ; 800CA218
- dw 0x02402021 ; 800CA21C
- dw 0x3C02800B ; 800CA220
- dw 0x240500C8 ; 800CA224
- dw 0x8E2400A0 ; 800CA228
- dw 0x8C43B920 ; 800CA22C
- dw 0x8C820034 ; 800CA230
- dw 0x00031940 ; 800CA234
- dw 0x00621021 ; 800CA238
- dw 0xAC450014 ; 800CA23C
- dw 0x8E2200A0 ; 800CA240
- dw 0x00000000 ; 800CA244
- dw 0x8C420034 ; 800CA248
- dw 0x00000000 ; 800CA24C
- dw 0x00621021 ; 800CA250
- dw 0xAC450018 ; 800CA254
- dw 0x8E2200A0 ; 800CA258
- dw 0x00000000 ; 800CA25C
- dw 0x8C420034 ; 800CA260
- dw 0x262400A0 ; 800CA264
- dw 0x00621821 ; 800CA268
- dw 0x0C00D2E2 ; 800CA26C
- dw 0xAC65001C ; 800CA270
- dw 0x8E220208 ; 800CA274
- dw 0x00000000 ; 800CA278
- dw 0x14400002 ; 800CA27C
- dw 0x24021000 ; 800CA280
- dw 0x24021800 ; 800CA284
- dw 0xAFA20010 ; 800CA288
- dw 0xAFA20014 ; 800CA28C
- dw 0xAFA20018 ; 800CA290
- dw 0x8E2400A0 ; 800CA294
- dw 0x0C024C36 ; 800CA298
- dw 0x27A50010 ; 800CA29C
- dw 0x02402021 ; 800CA2A0
- dw 0x0C006976 ; 800CA2A4
- dw 0x26250184 ; 800CA2A8
- dw 0x8FBF004C ; 800CA2AC
- dw 0x8FB20048 ; 800CA2B0
- dw 0x8FB10044 ; 800CA2B4
- dw 0x8FB00040 ; 800CA2B8
- dw 0x03E00008 ; 800CA2BC
- dw 0x27BD0050 ; 800CA2C0
diff --git a/asm/overlays/s16a/s16a_evntmous_800CA2C4.s b/asm/overlays/s16a/s16a_evntmous_800CA2C4.s
deleted file mode 100644
index d0e5ec02d..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800CA2C4.s
+++ /dev/null
@@ -1,48 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800CA2C4
-s16a_evntmous_800CA2C4:
- dw 0x27BDFFE0 ; 800CA2C4
- dw 0xAFB10014 ; 800CA2C8
- dw 0x00808821 ; 800CA2CC
- dw 0x26240024 ; 800CA2D0
- dw 0xAFBF0018 ; 800CA2D4
- dw 0x0C009833 ; 800CA2D8
- dw 0xAFB00010 ; 800CA2DC
- dw 0x0C00D2FE ; 800CA2E0
- dw 0x262400A0 ; 800CA2E4
- dw 0x8E240020 ; 800CA2E8
- dw 0x0C00B52C ; 800CA2EC
- dw 0x00000000 ; 800CA2F0
- dw 0x8E240668 ; 800CA2F4
- dw 0x0C00CB3F ; 800CA2F8
- dw 0x00000000 ; 800CA2FC
- dw 0x8E3001C4 ; 800CA300
- dw 0x00000000 ; 800CA304
- dw 0x12000005 ; 800CA308
- dw 0x00000000 ; 800CA30C
- dw 0x0C0060B8 ; 800CA310
- dw 0x02002021 ; 800CA314
- dw 0x0C006F01 ; 800CA318
- dw 0x02002021 ; 800CA31C
- dw 0x8E240690 ; 800CA320
- dw 0x00000000 ; 800CA324
- dw 0x10800004 ; 800CA328
- dw 0x3C05FFB5 ; 800CA32C
- dw 0x0C03430E ; 800CA330
- dw 0x00000000 ; 800CA334
- dw 0x3C05FFB5 ; 800CA338
- dw 0x34A5FFFF ; 800CA33C
- dw 0x3C04EFFF ; 800CA340
- dw 0x3C03800B ; 800CA344
- dw 0x3484FFFF ; 800CA348
- dw 0x8C62B3CC ; 800CA34C
- dw 0x8FBF0018 ; 800CA350
- dw 0x8FB10014 ; 800CA354
- dw 0x8FB00010 ; 800CA358
- dw 0x00451024 ; 800CA35C
- dw 0x00441024 ; 800CA360
- dw 0xAC62B3CC ; 800CA364
- dw 0x03E00008 ; 800CA368
- dw 0x27BD0020 ; 800CA36C
diff --git a/asm/overlays/s16a/s16a_evntmous_800CA370.s b/asm/overlays/s16a/s16a_evntmous_800CA370.s
deleted file mode 100755
index 67e2e0266..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800CA370.s
+++ /dev/null
@@ -1,230 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800CA370
-s16a_evntmous_800CA370:
- dw 0x27BDFFC8 ; 800CA370
- dw 0xAFB10024 ; 800CA374
- dw 0x00808821 ; 800CA378
- dw 0xAFB00020 ; 800CA37C
- dw 0x00A08021 ; 800CA380
- dw 0x00063400 ; 800CA384
- dw 0xAFB20028 ; 800CA388
- dw 0x00069403 ; 800CA38C
- dw 0xAFB40030 ; 800CA390
- dw 0x00E0A021 ; 800CA394
- dw 0x2A420002 ; 800CA398
- dw 0xAFBF0034 ; 800CA39C
- dw 0xAFB3002C ; 800CA3A0
- dw 0x1440002B ; 800CA3A4
- dw 0xAE32061C ; 800CA3A8
- dw 0x0C005C24 ; 800CA3AC
- dw 0x24041000 ; 800CA3B0
- dw 0x2643FFFF ; 800CA3B4
- dw 0x0043001A ; 800CA3B8
- dw 0x14600002 ; 800CA3BC
- dw 0x00000000 ; 800CA3C0
- dw 0x0007000D ; 800CA3C4
- dw 0x2401FFFF ; 800CA3C8
- dw 0x14610004 ; 800CA3CC
- dw 0x3C018000 ; 800CA3D0
- dw 0x14410002 ; 800CA3D4
- dw 0x00000000 ; 800CA3D8
- dw 0x0006000D ; 800CA3DC
- dw 0x00009810 ; 800CA3E0
- dw 0x2628020C ; 800CA3E4
- dw 0x00003821 ; 800CA3E8
- dw 0x26620001 ; 800CA3EC
- dw 0x1A400011 ; 800CA3F0
- dw 0xAE220620 ; 800CA3F4
- dw 0x02401821 ; 800CA3F8
- dw 0x26050002 ; 800CA3FC
- dw 0x26240210 ; 800CA400
- dw 0x96020000 ; 800CA404
- dw 0x26100008 ; 800CA408
- dw 0x24E70001 ; 800CA40C
- dw 0xA5020000 ; 800CA410
- dw 0x94A20002 ; 800CA414
- dw 0x25080008 ; 800CA418
- dw 0xA482FFFE ; 800CA41C
- dw 0x94A20000 ; 800CA420
- dw 0x24A50008 ; 800CA424
- dw 0xA4820000 ; 800CA428
- dw 0x00E3102A ; 800CA42C
- dw 0x1440FFF4 ; 800CA430
- dw 0x24840008 ; 800CA434
- dw 0x26320024 ; 800CA438
- dw 0x8FA5004C ; 800CA43C
- dw 0x8FA60050 ; 800CA440
- dw 0x0C009667 ; 800CA444
- dw 0x02402021 ; 800CA448
- dw 0x04410003 ; 800CA44C
- dw 0x02402021 ; 800CA450
- dw 0x080329B5 ; 800CA454
- dw 0x2402FFFF ; 800CA458
- dw 0x0C00988F ; 800CA45C
- dw 0x24050001 ; 800CA460
- dw 0x02402021 ; 800CA464
- dw 0x0C009891 ; 800CA468
- dw 0x24050004 ; 800CA46C
- dw 0x02402021 ; 800CA470
- dw 0x2405FFFF ; 800CA474
- dw 0x2406FFFE ; 800CA478
- dw 0x0C00988B ; 800CA47C
- dw 0x00A03821 ; 800CA480
- dw 0x3C04800D ; 800CA484
- dw 0x248426F0 ; 800CA488
- dw 0x001310C0 ; 800CA48C
- dw 0x02221021 ; 800CA490
- dw 0x8849020F ; 800CA494
- dw 0x9849020C ; 800CA498
- dw 0x884A0213 ; 800CA49C
- dw 0x984A0210 ; 800CA4A0
- dw 0xAA290027 ; 800CA4A4
- dw 0xBA290024 ; 800CA4A8
- dw 0xAA2A002B ; 800CA4AC
- dw 0xBA2A0028 ; 800CA4B0
- dw 0x0C005B33 ; 800CA4B4
- dw 0x263000A0 ; 800CA4B8
- dw 0x02002021 ; 800CA4BC
- dw 0x00402821 ; 800CA4C0
- dw 0x2406036D ; 800CA4C4
- dw 0x0C00D286 ; 800CA4C8
- dw 0x00003821 ; 800CA4CC
- dw 0x0C00D32D ; 800CA4D0
- dw 0x02002021 ; 800CA4D4
- dw 0x02002021 ; 800CA4D8
- dw 0x0C00D311 ; 800CA4DC
- dw 0x26250184 ; 800CA4E0
- dw 0x8E2300A0 ; 800CA4E4
- dw 0x240200C8 ; 800CA4E8
- dw 0xA4620098 ; 800CA4EC
- dw 0xAE200204 ; 800CA4F0
- dw 0xAE340624 ; 800CA4F4
- dw 0xAE2001D8 ; 800CA4F8
- dw 0xAE200628 ; 800CA4FC
- dw 0xAE200200 ; 800CA500
- dw 0xAE200208 ; 800CA504
- dw 0x8FA20048 ; 800CA508
- dw 0x24040020 ; 800CA50C
- dw 0x0C005C24 ; 800CA510
- dw 0xAE22062C ; 800CA514
- dw 0x24420010 ; 800CA518
- dw 0xAE2201D0 ; 800CA51C
- dw 0xAE2001D4 ; 800CA520
- dw 0x8FA20054 ; 800CA524
- dw 0x00000000 ; 800CA528
- dw 0xAE220660 ; 800CA52C
- dw 0x8FA20058 ; 800CA530
- dw 0xAE200664 ; 800CA534
- dw 0xAE200638 ; 800CA538
- dw 0x0C00B500 ; 800CA53C
- dw 0xAE22063C ; 800CA540
- dw 0x1040000D ; 800CA544
- dw 0xAE220020 ; 800CA548
- dw 0x2405001D ; 800CA54C
- dw 0x24060002 ; 800CA550
- dw 0x24020046 ; 800CA554
- dw 0x24030320 ; 800CA558
- dw 0xA7A20018 ; 800CA55C
- dw 0xA7A3001A ; 800CA560
- dw 0xA7A2001C ; 800CA564
- dw 0x8E240020 ; 800CA568
- dw 0x0C00B71D ; 800CA56C
- dw 0x27A70018 ; 800CA570
- dw 0x2402FFFE ; 800CA574
- dw 0xA6420036 ; 800CA578
- dw 0x2624066C ; 800CA57C
- dw 0x0C00CB23 ; 800CA580
- dw 0x02402821 ; 800CA584
- dw 0x24040012 ; 800CA588
- dw 0x24050001 ; 800CA58C
- dw 0x00003021 ; 800CA590
- dw 0x26270640 ; 800CA594
- dw 0x00A09021 ; 800CA598
- dw 0xAE220668 ; 800CA59C
- dw 0xAC520008 ; 800CA5A0
- dw 0x0C006EAF ; 800CA5A4
- dw 0xAFA00010 ; 800CA5A8
- dw 0x00408021 ; 800CA5AC
- dw 0x12000007 ; 800CA5B0
- dw 0x00000000 ; 800CA5B4
- dw 0x0C00609D ; 800CA5B8
- dw 0x02002021 ; 800CA5BC
- dw 0x3C02800B ; 800CA5C0
- dw 0x8C42B9B0 ; 800CA5C4
- dw 0x00000000 ; 800CA5C8
- dw 0xA6020028 ; 800CA5CC
- dw 0x12000003 ; 800CA5D0
- dw 0xAE3001C4 ; 800CA5D4
- dw 0x240201F4 ; 800CA5D8
- dw 0xA602002E ; 800CA5DC
- dw 0x3C04800D ; 800CA5E0
- dw 0x0C005B33 ; 800CA5E4
- dw 0x248426F8 ; 800CA5E8
- dw 0x0C00760C ; 800CA5EC
- dw 0x00402021 ; 800CA5F0
- dw 0x00408021 ; 800CA5F4
- dw 0x12000036 ; 800CA5F8
- dw 0x00001021 ; 800CA5FC
- dw 0x8E2201C4 ; 800CA600
- dw 0x00000000 ; 800CA604
- dw 0x8C440040 ; 800CA608
- dw 0x0C032624 ; 800CA60C
- dw 0x02002821 ; 800CA610
- dw 0x8E2201C4 ; 800CA614
- dw 0x00000000 ; 800CA618
- dw 0x8C440044 ; 800CA61C
- dw 0x0C032624 ; 800CA620
- dw 0x02002821 ; 800CA624
- dw 0x8E2201C4 ; 800CA628
- dw 0x00000000 ; 800CA62C
- dw 0x8C420040 ; 800CA630
- dw 0x24040050 ; 800CA634
- dw 0xA0440004 ; 800CA638
- dw 0x8E2201C4 ; 800CA63C
- dw 0x00000000 ; 800CA640
- dw 0x8C420040 ; 800CA644
- dw 0x00000000 ; 800CA648
- dw 0xA0440005 ; 800CA64C
- dw 0x8E2201C4 ; 800CA650
- dw 0x00000000 ; 800CA654
- dw 0x8C420040 ; 800CA658
- dw 0x00000000 ; 800CA65C
- dw 0xA0440006 ; 800CA660
- dw 0x8E2201C4 ; 800CA664
- dw 0x00000000 ; 800CA668
- dw 0x8C420044 ; 800CA66C
- dw 0x00000000 ; 800CA670
- dw 0xA0440004 ; 800CA674
- dw 0x8E2201C4 ; 800CA678
- dw 0x00000000 ; 800CA67C
- dw 0x8C420044 ; 800CA680
- dw 0x00000000 ; 800CA684
- dw 0xA0440005 ; 800CA688
- dw 0x8E2201C4 ; 800CA68C
- dw 0x00000000 ; 800CA690
- dw 0x8C430044 ; 800CA694
- dw 0x00001021 ; 800CA698
- dw 0xA0640006 ; 800CA69C
- dw 0x24030002 ; 800CA6A0
- dw 0x2404FFFF ; 800CA6A4
- dw 0xAE2301E4 ; 800CA6A8
- dw 0x2403FFFE ; 800CA6AC
- dw 0xAE2001DC ; 800CA6B0
- dw 0xAE3201E0 ; 800CA6B4
- dw 0xAE3201E8 ; 800CA6B8
- dw 0xAE2001EC ; 800CA6BC
- dw 0xAE2401F0 ; 800CA6C0
- dw 0xAE2301F4 ; 800CA6C4
- dw 0xAE2401F8 ; 800CA6C8
- dw 0xAE20068C ; 800CA6CC
- dw 0xAE200690 ; 800CA6D0
- dw 0x8FBF0034 ; 800CA6D4
- dw 0x8FB40030 ; 800CA6D8
- dw 0x8FB3002C ; 800CA6DC
- dw 0x8FB20028 ; 800CA6E0
- dw 0x8FB10024 ; 800CA6E4
- dw 0x8FB00020 ; 800CA6E8
- dw 0x03E00008 ; 800CA6EC
- dw 0x27BD0038 ; 800CA6F0
diff --git a/asm/overlays/s16a/s16a_evntmous_800CA6F4.s b/asm/overlays/s16a/s16a_evntmous_800CA6F4.s
deleted file mode 100755
index 3b61ac862..000000000
--- a/asm/overlays/s16a/s16a_evntmous_800CA6F4.s
+++ /dev/null
@@ -1,63 +0,0 @@
- opt c+, at+, e+, n-
- section overlay.text
-
- xdef s16a_evntmous_800CA6F4
-s16a_evntmous_800CA6F4:
- dw 0x27BDFFC0 ; 800CA6F4
- dw 0xAFB20030 ; 800CA6F8
- dw 0x00809021 ; 800CA6FC
- dw 0xAFB1002C ; 800CA700
- dw 0x00A08821 ; 800CA704
- dw 0xAFB30034 ; 800CA708
- dw 0x00C09821 ; 800CA70C
- dw 0xAFB40038 ; 800CA710
- dw 0x00E0A021 ; 800CA714
- dw 0x24040005 ; 800CA718
- dw 0x240506A4 ; 800CA71C
- dw 0xAFBF003C ; 800CA720
- dw 0x0C005439 ; 800CA724
- dw 0xAFB00028 ; 800CA728
- dw 0x00408021 ; 800CA72C
- dw 0x12000021 ; 800CA730
- dw 0x02002021 ; 800CA734
- dw 0x3C05800D ; 800CA738
- dw 0x24A59F14 ; 800CA73C
- dw 0x3C06800D ; 800CA740
- dw 0x24C6A2C4 ; 800CA744
- dw 0x3C07800D ; 800CA748
- dw 0x0C005453 ; 800CA74C
- dw 0x24E72700 ; 800CA750
- dw 0x02002021 ; 800CA754
- dw 0x02402821 ; 800CA758
- dw 0x00113400 ; 800CA75C
- dw 0x3C11800B ; 800CA760
- dw 0x8E23B9B0 ; 800CA764
- dw 0x24020001 ; 800CA768
- dw 0xAFA20014 ; 800CA76C
- dw 0x8FA20050 ; 800CA770
- dw 0x00063403 ; 800CA774
- dw 0xAFA2001C ; 800CA778
- dw 0x8FA20054 ; 800CA77C
- dw 0x02603821 ; 800CA780
- dw 0xAFB40010 ; 800CA784
- dw 0xAFA30018 ; 800CA788
- dw 0x0C0328DC ; 800CA78C
- dw 0xAFA20020 ; 800CA790
- dw 0x04410005 ; 800CA794
- dw 0x00000000 ; 800CA798
- dw 0x0C005472 ; 800CA79C
- dw 0x02002021 ; 800CA7A0
- dw 0x080329EF ; 800CA7A4
- dw 0x00001021 ; 800CA7A8
- dw 0x8E22B9B0 ; 800CA7AC
- dw 0x00000000 ; 800CA7B0
- dw 0xAE0201C8 ; 800CA7B4
- dw 0x02001021 ; 800CA7B8
- dw 0x8FBF003C ; 800CA7BC
- dw 0x8FB40038 ; 800CA7C0
- dw 0x8FB30034 ; 800CA7C4
- dw 0x8FB20030 ; 800CA7C8
- dw 0x8FB1002C ; 800CA7CC
- dw 0x8FB00028 ; 800CA7D0
- dw 0x03E00008 ; 800CA7D4
- dw 0x27BD0040 ; 800CA7D8
diff --git a/build/linker_command_file.txt b/build/linker_command_file.txt
index c78cff05c..9fa52eda5 100644
--- a/build/linker_command_file.txt
+++ b/build/linker_command_file.txt
@@ -1123,28 +1123,11 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin")
include "{{OBJ_DIR}}\overlays\s16b\Enemy\wall.obj"
include "{{OBJ_DIR}}\overlays\s16b\Enemy\asioto.obj"
include "{{OBJ_DIR}}\overlays\s03e\Okajima\guncame.obj"
+ include "{{OBJ_DIR}}\overlays\s16a\overlay2.obj"
include "{{OBJ_DIR}}\overlays\s01a\Anime\animeconv\socom.obj"
include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\mark.obj"
include "{{OBJ_DIR}}\overlays\s16a\Okajima\key_item.obj"
- include "{{OBJ_DIR}}\overlays\s16a\overlay2.obj"
-
- ; Okajima\evntmous.c
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C8E88.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C90E4.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C9140.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C91B0.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C9288.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C9308.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C948C.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C96A8.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C9828.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C9890.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C98F0.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800C9F14.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800CA2C4.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800CA370.obj"
- include "{{OBJ_DIR}}\overlays\s16a\s16a_evntmous_800CA6F4.obj"
-
+ include "{{OBJ_DIR}}\overlays\s16a\Okajima\evntmous.obj"
include "{{OBJ_DIR}}\overlays\s00a\Okajima\splash2.obj"
include "{{OBJ_DIR}}\overlays\d03a\Okajima\red_alrt.obj"
include "{{OBJ_DIR}}\overlays\d03a\Okajima\blurpure.obj"
diff --git a/src/Game/homing_target.c b/src/Game/homing_target.c
index 1feac6ad7..3edc49da5 100644
--- a/src/Game/homing_target.c
+++ b/src/Game/homing_target.c
@@ -5,11 +5,11 @@
#include "libgv/libgv.h"
#include "psyq.h"
-extern Homing_Target gHomingTargets_800B8230[HOMING_TARGET_ARRAY_LENGTH];
+extern HOMING gHomingTargets_800B8230[HOMING_TARGET_ARRAY_LENGTH];
void HomingTarget_Clear_All_80032C68()
{
- Homing_Target *pIter; // $v0
+ HOMING *pIter; // $v0
int i; // $v1
pIter = gHomingTargets_800B8230;
@@ -20,10 +20,10 @@ void HomingTarget_Clear_All_80032C68()
}
}
-Homing_Target *HomingTarget_Alloc_80032C8C(MATRIX *a1, CONTROL *a2)
+HOMING *HomingTarget_Alloc_80032C8C(MATRIX *a1, CONTROL *a2)
{
int pos; // $v1
- Homing_Target *pIter = gHomingTargets_800B8230;
+ HOMING *pIter = gHomingTargets_800B8230;
for (pos = HOMING_TARGET_ARRAY_LENGTH; pos > 0; --pos)
{
if (!pIter->field_C_bUsed)
@@ -46,7 +46,7 @@ Homing_Target *HomingTarget_Alloc_80032C8C(MATRIX *a1, CONTROL *a2)
return pIter;
}
-void HomingTarget_Free_80032CFC(Homing_Target *pTarget)
+void HomingTarget_Free_80032CFC(HOMING *pTarget)
{
if (pTarget)
{
@@ -57,7 +57,7 @@ void HomingTarget_Free_80032CFC(Homing_Target *pTarget)
void HomingTarget_1_80032D10(MATRIX *pMtx, int vecY, int *pRetY, int *pRetX, int mapBit)
{
int smallest_len; // $s6
- Homing_Target *pTargetIter; // $s3
+ HOMING *pTargetIter; // $s3
int i; // $s5
int len; // $s1
int retY; // $s0
@@ -104,7 +104,7 @@ void HomingTarget_1_80032D10(MATRIX *pMtx, int vecY, int *pRetY, int *pRetX, int
void HomingTarget_2_80032EAC(MATRIX *pMtx, int vecY, int *pRetY, int *pRetX, int mapBit, int max_dist, int min_angle)
{
int smallest_len; // $s6
- Homing_Target *pTargetIter; // $s3
+ HOMING *pTargetIter; // $s3
int i; // $s5
int len; // $s1
int retY; // $s0
diff --git a/src/Game/homing_target.h b/src/Game/homing_target.h
index 8d8d615b5..db47f903c 100644
--- a/src/Game/homing_target.h
+++ b/src/Game/homing_target.h
@@ -16,17 +16,17 @@
#endif
-typedef struct Homing_Target
+typedef struct HOMING
{
MATRIX *field_0; // ptr
CONTROL *field_4; // ptr
int flag; // alive
int field_C_bUsed; // auto_aimable
-} Homing_Target;
+} HOMING;
void HomingTarget_2_80032EAC(MATRIX *pMtx, int vecY, int *pRetY, int *pRetX, int mapBit, int max_dist, int min_angle);
void HomingTarget_Clear_All_80032C68();
-void HomingTarget_Free_80032CFC(Homing_Target *pTarget);
-Homing_Target *HomingTarget_Alloc_80032C8C(MATRIX *a1, CONTROL *a2);
+void HomingTarget_Free_80032CFC(HOMING *pTarget);
+HOMING *HomingTarget_Alloc_80032C8C(MATRIX *a1, CONTROL *a2);
#endif // _HOMING_TARGET_H_
diff --git a/src/data/bss.c b/src/data/bss.c
index 415cf7f04..3ed09d57b 100644
--- a/src/data/bss.c
+++ b/src/data/bss.c
@@ -168,7 +168,7 @@ gap gap_800B788C[0x4]; // 4 bytes
DG_OBJS *BSS StageObjs_800B7890[32]; // 0x80 (128) bytes
MAP BSS gMapRecs_800B7910[16]; // 0x140 (320) bytes
DG_LitVertex BSS DG_LitVertices_800B7A50[84]; // 0x7E0 (2016) bytes
-Homing_Target BSS gHomingTargets_800B8230[HOMING_TARGET_ARRAY_LENGTH];
+HOMING BSS gHomingTargets_800B8230[HOMING_TARGET_ARRAY_LENGTH];
Actor_strctrl BSS strctrl_800B82B0; // 0x40 (64) bytes
Actor_JimCtrl BSS jimCtrlActor_800B82F0; // 0x104C (4172) bytes
array_800B933C_child BSS array_800B933C[array_800B933C_SIZE]; // 0x1C (28) bytes
diff --git a/src/overlays/s00a/Enemy/enemy.h b/src/overlays/s00a/Enemy/enemy.h
index 680d7d049..ab4277f0d 100644
--- a/src/overlays/s00a/Enemy/enemy.h
+++ b/src/overlays/s00a/Enemy/enemy.h
@@ -92,7 +92,7 @@ typedef struct _WatcherWork
TARGET field_904; //0x904
TARGET field_94C; //0x94C
TARGET punch; //0x994
- Homing_Target *hom; //0x9DC
+ HOMING *hom; //0x9DC
short scale; //0x9E0
short field_9E2; //0x9E2
short visible; //0x9E4
diff --git a/src/overlays/s16a/Okajima/evntmous.c b/src/overlays/s16a/Okajima/evntmous.c
new file mode 100644
index 000000000..5af15a530
--- /dev/null
+++ b/src/overlays/s16a/Okajima/evntmous.c
@@ -0,0 +1,807 @@
+#include "libdg/libdg.h"
+#include "libgv/libgv.h"
+#include "Game/game.h"
+#include "Game/homing_target.h"
+#include "Game/linkvarbuf.h"
+#include "Game/object.h"
+#include "Okajima/blood.h"
+
+typedef struct _EventmouseWork
+{
+ GV_ACT actor;
+ TARGET *target;
+ CONTROL control;
+ OBJECT body;
+ MATRIX light[2];
+ DG_PRIM *prim;
+ int map;
+ int f1CC;
+ int f1D0;
+ int f1D4;
+ int f1D8;
+ int f1DC[8];
+ int f1FC;
+ int f200;
+ int f204;
+ int f208;
+ SVECTOR f20C[128];
+ SVECTOR pos;
+ SVECTOR f614;
+ int f61C;
+ int f620;
+ int f624;
+ int f628;
+ int f62C;
+ int weapon;
+ int item;
+ int f638;
+ int f63C;
+ SVECTOR prim_vecs[4];
+ int f660;
+ int f664;
+ HOMING *hom;
+ MATRIX hom_mtx;
+ int f68C;
+ void *f690;
+ SVECTOR eye;
+ SVECTOR center;
+} EventmouseWork;
+
+SVECTOR eventmous_vecs[2] = {{48, 0, 96, 0}, {-48, 0, 96, 0}};
+
+extern MATRIX DG_ZeroMatrix_8009D430;
+extern int GV_Time_800AB330;
+extern SVECTOR DG_ZeroVector_800AB39C;
+extern int GM_GameStatus_800AB3CC;
+extern int GM_GameOverTimer_800AB3D4;
+extern int GV_Clock_800AB920;
+extern int GM_CurrentMap_800AB9B0;
+extern int GM_PlayerMap_800ABA0C;
+extern SVECTOR GM_PlayerPosition_800ABA10;
+extern int GM_NoisePower_800ABA24;
+
+void AN_Unknown_800CA320( MATRIX *, int );
+void * NewRipple_800D7F30( MATRIX *, int );
+void NewSplash2_800DB6F0( int, SVECTOR *, int );
+
+void * NewCinemaScreen_800DE434( int, int );
+int NewCinemaScreenClose_800DE4CC( void * );
+
+#define EXEC_LEVEL 5
+
+void Eventmouse_800C8E88(EventmouseWork *work, SVECTOR *arg1, int arg2)
+{
+ SVECTOR view;
+ SVECTOR rot;
+
+ if ((GM_SnakeCurrentHealth == 0) || (GM_GameOverTimer_800AB3D4 != 0) || (work->f68C != 0))
+ {
+ return;
+ }
+
+ work->f68C = arg2;
+
+ if ((arg1->vy > -10) && (arg1->vz > -18010))
+ {
+ work->eye.vx = -12021;
+ work->eye.vy = 5304;
+ work->eye.vz = -7665;
+ }
+ else if (arg1->vz > 5990)
+ {
+ work->eye.vx = -1149;
+ work->eye.vy = -348;
+ work->eye.vz = 9080;
+ }
+ else if ((arg1->vx > 11990) && (arg1->vz > -4010))
+ {
+ work->eye.vx = 13633;
+ work->eye.vy = 824;
+ work->eye.vz = 7871;
+ }
+ else
+ {
+ work->f68C = 1;
+ return;
+ }
+
+ work->center = work->control.field_0_mov;
+ GV_SubVec3_80016D40(&work->center, &work->eye, &view);
+
+ rot.vy = ratan2(view.vx, view.vz) & 0xFFF;
+ rot.vx = ratan2(GV_VecLen3_80016D80(&view), rot.vy) & 0xFFF;
+ rot.vz = 0;
+
+ view.vx = 0;
+ view.vy = 0;
+ view.vz = -6000;
+
+ DG_SetPos2_8001BC8C(&work->center, &rot);
+ DG_PutVector_8001BE48(&view, &work->eye, 1);
+
+ work->item = GM_CurrentItemId;
+ work->weapon = GM_CurrentWeaponId;
+
+ if ((GM_CurrentItemId == ITEM_SCOPE) || (GM_CurrentItemId == ITEM_CAMERA) ||
+ (GM_CurrentItemId == ITEM_N_V_G) || (GM_CurrentItemId == ITEM_THERM_G))
+ {
+ GM_CurrentItemId = ITEM_NONE;
+ }
+
+ if ((GM_CurrentWeaponId == WEAPON_PSG1) || (GM_CurrentWeaponId == WEAPON_STINGER))
+ {
+ GM_CurrentWeaponId = WEAPON_NONE;
+ }
+
+ GM_GameStatus_800AB3CC |= GAME_FLAG_BIT_23 | GAME_FLAG_BIT_20 | GAME_FLAG_BIT_18;
+ GM_GameStatus_800AB3CC |= GAME_FLAG_BIT_29;
+
+ work->f690 = NewCinemaScreen_800DE434(0x77359400, 1);
+}
+
+void Eventmouse_800C90E4(int proc_id, SVECTOR *vec)
+{
+ GCL_ARGS args;
+ long data[4];
+
+ data[0] = vec->vx;
+ data[1] = vec->vy;
+ data[2] = vec->vz;
+ data[3] = vec->pad;
+
+ args.argc = 4;
+ args.argv = data;
+ GCL_ExecProc_8001FF2C(proc_id, &args);
+}
+
+int Eventmouse_800C9140(SVECTOR *a, SVECTOR *b)
+{
+ int x, y, z;
+
+ x = (a->vx - b->vx) >> 4;
+ y = (a->vy - b->vy) >> 4;
+ z = (a->vz - b->vz) >> 4;
+ return SquareRoot0(x * x + y * y + z * z) * 16;
+}
+
+int Eventmouse_800C91B0(EventmouseWork *work, SVECTOR *arg1)
+{
+ int ret;
+
+ if (((arg1->vy > -10) && (arg1->vz > -18010)) || (arg1->vz >= 0x1767) || ((arg1->vx > 11990) && (arg1->vz > -4010)))
+ {
+ work->hom->flag = ret = 1;
+ work->hom_mtx = work->body.objs->world;
+ work->hom_mtx.t[1] += 200;
+ }
+ else
+ {
+ work->hom->flag = 0;
+ ret = 0;
+ }
+
+ return ret;
+}
+
+void Eventmouse_800C9288(SVECTOR *from, SVECTOR *to, SVECTOR *out)
+{
+ SVECTOR diff;
+ int y;
+
+ GV_SubVec3_80016D40(to, from, &diff);
+ out->vy = ratan2(diff.vx, diff.vz) & 0xFFF;
+
+ y = diff.vy;
+ diff.vy = 0;
+
+ out->vx = (ratan2(GV_VecLen3_80016D80(&diff), y) & 0xFFF) - 1024;
+ out->vz = 0;
+}
+
+void Eventmouse_800C9308(EventmouseWork *work)
+{
+ SVECTOR sp10;
+ SVECTOR pos;
+ SVECTOR rot;
+
+ pos = work->control.field_0_mov;
+
+ if ((pos.vy > -10) && (pos.vz > -18010))
+ {
+ sp10.vx = -8000;
+ sp10.vy = 0;
+ sp10.vz = -14500;
+ }
+ else if (pos.vz > 5990)
+ {
+ sp10.vx = 7000;
+ sp10.vy = -2000;
+ sp10.vz = 9000;
+ }
+ else if ((pos.vx > 11990) && (pos.vz > -4010))
+ {
+ sp10.vx = 12500;
+ sp10.vy = -2000;
+ sp10.vz = -1500;
+ }
+
+ Eventmouse_800C9288(&pos, &sp10, &rot);
+
+ work->f614 = DG_ZeroVector_800AB39C;
+ work->f614.vz = Eventmouse_800C9140(&pos, &sp10) / 30;
+
+ DG_SetPos2_8001BC8C(&DG_ZeroVector_800AB39C, &rot);
+ DG_PutVector_8001BE48(&work->f614, &work->f614, 1);
+}
+
+void Eventmouse_800C948C(EventmouseWork *work, SVECTOR *pos)
+{
+ SVECTOR sp10;
+ SVECTOR sp18;
+
+ work->f208 = 1;
+
+ sp10 = *pos;
+ Eventmouse_800C9308(work);
+
+ sp10.vx += work->f614.vx / 2;
+ sp10.vz += work->f614.vz / 2;
+
+ sp18 = sp10;
+
+ if ((sp10.vy > -10) && (sp10.vz > -18010))
+ {
+ sp10.vy = 0;
+ Eventmouse_800C8E88(work, &sp10, 120);
+ sp10.pad = 500;
+ }
+ else if (sp10.vz > 5990)
+ {
+ if (sp10.vz >= 0x1B59)
+ {
+ sp10.vy = -3000;
+ sp18.vy = -2000;
+ NewSplash2_800DB6F0(GV_RandU_80017090(4096), &sp18, 0);
+ sp10.pad = 1000;
+ GM_SeSet2_80032968(0, 63, 187);
+ }
+ else
+ {
+ sp10.vy = -2000;
+ sp10.pad = 500;
+ }
+
+ Eventmouse_800C8E88(work, &sp10, 120);
+ }
+ else if ((sp10.vx > 11990) && (sp10.vz > -4010))
+ {
+ sp10.vy = -3000;
+ sp18.vy = -2000;
+ NewSplash2_800DB6F0(GV_RandU_80017090(4096), &sp18, 0);
+ Eventmouse_800C8E88(work, &sp10, 120);
+ sp10.pad = 1000;
+ GM_SeSet2_80032968(0, 63, 176);
+ }
+
+ GM_SeSet2_80032968(0, 63, 13);
+ Eventmouse_800C90E4(work->f660, &sp10);
+}
+
+void Eventmouse_800C96A8(EventmouseWork *work)
+{
+ SVECTOR pos;
+ SVECTOR sp18[2];
+ MATRIX rot;
+ SVECTOR *vecs;
+
+ pos = work->control.field_0_mov;
+ rot = DG_ZeroMatrix_8009D430;
+ vecs = work->prim_vecs;
+
+ RotMatrixYXZ_gte(&work->control.field_8_rot, &rot);
+ DG_SetPos_8001BC44(&rot);
+ DG_PutVector_8001BE48(eventmous_vecs, sp18, 2);
+
+ vecs[0].vx = pos.vx + sp18[0].vx;
+ vecs[3].vx = pos.vx - sp18[0].vx;
+ vecs[0].vz = pos.vz + sp18[0].vz;
+ vecs[3].vz = pos.vz - sp18[0].vz;
+
+ vecs[1].vx = pos.vx + sp18[1].vx;
+ vecs[2].vx = pos.vx - sp18[1].vx;
+ vecs[1].vz = pos.vz + sp18[1].vz;
+ vecs[2].vz = pos.vz - sp18[1].vz;
+
+ vecs[0].vy = vecs[1].vy = vecs[2].vy = vecs[3].vy = pos.vy;
+}
+
+int Eventmouse_800C9828(EventmouseWork *work)
+{
+ if (!(work->map & GM_PlayerMap_800ABA0C))
+ {
+ return 0;
+ }
+
+ if (work->target->field_6_flags & (TARGET_PUSH | TARGET_POWER))
+ {
+ GM_SeSet2_80032968(0, 63, 185);
+ return 1;
+ }
+
+ return 0;
+}
+
+void Eventmouse_800C9890(POLY_FT4 *poly, DG_TEX *tex)
+{
+ int x, y, w, h;
+
+ setPolyFT4(poly);
+ setSemiTrans(poly, 1);
+
+ x = tex->field_8_offx;
+ w = tex->field_A_width;
+ y = tex->field_9_offy;
+ h = tex->field_B_height;
+ setUVWH(poly, x, y, w, h);
+
+ poly->tpage = tex->field_4_tPage;
+ poly->clut = tex->field_6_clut;
+}
+
+void Eventmouse_800C98F0(EventmouseWork *work)
+{
+ SVECTOR pos;
+ SVECTOR sp18;
+ SVECTOR rot;
+ SVECTOR mov;
+ SVECTOR mov2;
+ MATRIX sp38;
+ CONTROL *control;
+ int flags;
+ int var_s3;
+ int dist;
+ int index;
+
+ pos = work->control.field_0_mov;
+ sp18 = work->f20C[work->f620];
+
+ control = &work->control;
+
+ if (!Eventmouse_800C91B0(work, &pos))
+ {
+ work->target->field_6_flags = 0;
+ work->f628 = 0;
+
+ flags = work->target->class & ~(TARGET_SEEK | TARGET_PUSH | TARGET_POWER | TARGET_AVAIL);
+ work->target->class = flags | TARGET_AVAIL;
+
+ DG_InvisibleObjs(work->body.objs);
+ DG_InvisiblePrim(work->prim);
+
+ if (GV_RandU_80017090(2) > 0)
+ {
+ return;
+ }
+
+ var_s3 = work->f624;
+ }
+ else
+ {
+ work->f1D8++;
+
+ work->target->class |= TARGET_SEEK | TARGET_PUSH | TARGET_POWER | TARGET_AVAIL;
+ GM_Target_SetVector_8002D500(work->target, &control->field_0_mov);
+ sub_8002DA14(work->target);
+
+ DG_VisibleObjs(work->body.objs);
+
+ if ((work->f204 != 1) && Eventmouse_800C9828(work))
+ {
+ work->f204 = 1;
+ work->f1CC = 0;
+ work->pos = work->control.field_0_mov;
+ Eventmouse_800C9308(work);
+ return;
+ }
+
+ if (work->f1FC > 0)
+ {
+ work->f1FC--;
+ return;
+ }
+
+ dist = Eventmouse_800C9140(&control->field_0_mov, &GM_PlayerPosition_800ABA10);
+
+ DG_VisiblePrim(work->prim);
+ Eventmouse_800C96A8(work);
+
+ if (work->f628 == 0)
+ {
+ if ((dist < 2000) || (GM_NoisePower_800ABA24 > 0))
+ {
+ AN_Unknown_800CA320(&work->body.objs->world, 0);
+ GM_SeSet_80032858(&control->field_0_mov, 184);
+
+ work->f628 = 1;
+ work->f1FC = 15;
+
+ index = work->f620;
+ while (Eventmouse_800C91B0(work, &work->f20C[index]))
+ {
+ if (++index >= work->f61C)
+ {
+ index = 0;
+ }
+ }
+
+ if (--index < 0)
+ {
+ index = work->f61C - 1;
+ }
+
+ work->f620 = index;
+
+ if ((work->f208 == 0) && (GM_NoisePower_800ABA24 == 0) && (work->f62C < ++work->f200) && (dist > 1000))
+ {
+ mov2 = control->field_0_mov;
+ Eventmouse_800C9308(work);
+ mov2.vx += work->f614.vx;
+ mov2.vz += work->f614.vz;
+ Eventmouse_800C948C(work, &mov2);
+ }
+ }
+
+ if (--work->f1D0 < 0)
+ {
+ work->f1D4 = 1 - work->f1D4;
+ if (work->f1D4 == 0)
+ {
+ work->f1D0 = GV_RandU_80017090(64) + 64;
+ }
+ else
+ {
+ work->f1D0 = GV_RandU_80017090(32) + 32;
+ }
+ }
+
+ if (work->f1D4 == 0)
+ {
+ return;
+ }
+
+ var_s3 = work->f624 / 4;
+ if ((control->field_0_mov.vx > 11990) && (control->field_0_mov.vz > -4010))
+ {
+ work->f628 = 1;
+ }
+ }
+ else
+ {
+ var_s3 = work->f624 / 3;
+ control->field_8_rot = control->field_4C_turn;
+ if (((GV_Time_800AB330 % 3) == 0) && (control->field_0_mov.vx > 11990) && (control->field_0_mov.vz > -4010))
+ {
+ sp38 = DG_ZeroMatrix_8009D430;
+ sp38.t[0] = control->field_0_mov.vx + GV_RandS_800170BC(64);
+ sp38.t[1] = -2000;
+ sp38.t[2] = control->field_0_mov.vz + GV_RandU_80017090(64);
+ NewRipple_800D7F30(&sp38, 1500);
+ }
+ }
+ }
+
+ if (Eventmouse_800C9140(&pos, &sp18) < var_s3)
+ {
+ control->field_0_mov = sp18;
+ if (++work->f620 >= work->f61C)
+ {
+ work->f620 = 0;
+ }
+ }
+ else
+ {
+ Eventmouse_800C9288(&pos, &sp18, &rot);
+ mov = DG_ZeroVector_800AB39C;
+ mov.vz = var_s3;
+ DG_SetPos2_8001BC8C(&pos, &rot);
+ DG_PutVector_8001BE48(&mov, &mov, 1);
+ control->field_0_mov = mov;
+ control->field_4C_turn = rot;
+ }
+
+ control->field_8_rot.vy += work->f1DC[work->f1D8 % 8] * 64;
+}
+
+void EventMouseAct_800C9F14(EventmouseWork *work)
+{
+ VECTOR scale;
+ MATRIX world;
+ CONTROL *control;
+ int f1CC;
+ int t1, t2;
+
+ control = &work->control;
+
+ if (work->f68C > 0)
+ {
+ work->f68C--;
+
+ DG_LookAt_800172D0(DG_Chanl(0), &work->eye, &work->center, 320);
+
+ if (work->f68C == 0)
+ {
+ if ((work->weapon == WEAPON_PSG1) || (work->weapon == WEAPON_STINGER))
+ {
+ GM_CurrentWeaponId = work->weapon;
+ }
+
+ if ((work->item == ITEM_SCOPE) || (work->item == ITEM_CAMERA) ||
+ (work->item == ITEM_N_V_G) || (work->item == ITEM_THERM_G))
+ {
+ GM_CurrentItemId = work->item;
+ }
+
+ if (work->f690 != 0)
+ {
+ NewCinemaScreenClose_800DE4CC(work->f690);
+ }
+
+ GM_GameStatus_800AB3CC &= ~(PLAYER_PREVENT_WEAPON_SWITCH | PLAYER_THROWING | PLAYER_KNOCKING);
+ GM_GameStatus_800AB3CC &= ~STATE_PADRELEASE;
+
+ GV_DestroyActor_800151C8(&work->actor);
+ }
+ }
+
+ if (work->f1CC < 0)
+ {
+ DG_InvisibleObjs(work->body.objs);
+ DG_InvisiblePrim(work->prim);
+ GM_ConfigControlAttribute_8002623C(control, RADAR_OFF);
+ return;
+ }
+
+ if ((work->f208 == 0) && (GM_CurrentItemId == ITEM_MINE_D))
+ {
+ GM_ConfigControlAttribute_8002623C(control, RADAR_VISIBLE);
+ }
+ else
+ {
+ GM_ConfigControlAttribute_8002623C(control, RADAR_OFF);
+ }
+
+ GM_CurrentMap_800AB9B0 = work->map;
+
+ Eventmouse_800C98F0(work);
+
+ if (work->f204 == 1)
+ {
+ DG_InvisibleObjs(work->body.objs);
+ DG_InvisiblePrim(work->prim);
+
+ if (work->f1CC > 30)
+ {
+ work->control.field_55_skip_flag |= CTRL_SKIP_TRAP;
+
+ if (work->f208 == 0)
+ {
+ work->f1CC = -10000;
+ Eventmouse_800C948C(work, &work->pos);
+ }
+
+ if (work->f68C == 0)
+ {
+ return;
+ }
+ }
+ else
+ {
+ control->field_8_rot.vy += 128;
+ control->field_8_rot.vx += 128;
+ control->field_4C_turn = control->field_8_rot;
+
+ f1CC = ++work->f1CC;
+ t1 = 21 - f1CC;
+ t2 = 20 - f1CC;
+
+ work->pos.vx += work->f614.vx;
+ work->pos.vz += work->f614.vz;
+ work->pos.vy += (t1 * t1 - t2 * t2) * 4;
+
+ control->field_0_mov = work->pos;
+
+ if ((f1CC & 1) == 0)
+ {
+ DG_SetPos2_8001BC8C(&work->pos, &control->field_8_rot);
+ ReadRotMatrix(&world);
+ NewBlood_80072728(&world, 1);
+ }
+ }
+ }
+
+ GM_ActControl_80025A7C(control);
+
+ work->body.objs->light[GV_Clock_800AB920].t[0] = 200;
+ work->body.objs->light[GV_Clock_800AB920].t[1] = 200;
+ work->body.objs->light[GV_Clock_800AB920].t[2] = 200;
+
+ GM_ActObject2_80034B88(&work->body);
+
+ if (work->f208 == 0)
+ {
+ scale.vx = 6144;
+ scale.vy = 6144;
+ scale.vz = 6144;
+ }
+ else
+ {
+ scale.vx = 4096;
+ scale.vy = 4096;
+ scale.vz = 4096;
+ }
+
+ ScaleMatrix(&work->body.objs->world, &scale);
+ DG_GetLightMatrix2_8001A5D8(&control->field_0_mov, work->light);
+}
+
+void EventMouseDie_800CA2C4(EventmouseWork *work)
+{
+ DG_PRIM *prim;
+
+ GM_FreeControl_800260CC(&work->control);
+ GM_FreeObject_80034BF8(&work->body);
+ GM_FreeTarget_8002D4B0(work->target);
+ HomingTarget_Free_80032CFC(work->hom);
+
+ prim = work->prim;
+ if (prim != NULL)
+ {
+ DG_DequeuePrim_800182E0(prim);
+ DG_FreePrim_8001BC04(prim);
+ }
+
+ if (work->f690 != NULL)
+ {
+ NewCinemaScreenClose_800DE4CC(work->f690);
+ }
+
+ GM_GameStatus_800AB3CC &= ~(PLAYER_PREVENT_WEAPON_SWITCH | PLAYER_THROWING | PLAYER_KNOCKING);
+ GM_GameStatus_800AB3CC &= ~STATE_PADRELEASE;
+}
+
+int EventMouseGetResources_800CA370(EventmouseWork *work, HZD_PTP *points, short n_points, int arg3, int arg4, int name, int map, int arg7, int arg8)
+{
+ SVECTOR size;
+ int start;
+ SVECTOR *vec;
+ int i;
+ CONTROL *control;
+ OBJECT *body;
+ int model;
+ DG_PRIM *prim;
+ DG_TEX *tex;
+
+ work->f61C = n_points;
+
+ if (n_points < 2)
+ {
+ return -1;
+ }
+
+ start = GV_RandU_80017090(4096) % (n_points - 1);
+ work->f620 = start + 1;
+
+ vec = work->f20C;
+ for (i = 0; i < n_points; i++)
+ {
+ vec->vx = points->x;
+ vec->vy = points->y;
+ vec->vz = points->z;
+ vec++;
+ points++;
+ }
+
+ control = &work->control;
+ if (GM_InitLoader_8002599C(control, name, map) < 0)
+ {
+ return -1;
+ }
+
+ GM_ConfigControlAttribute_8002623C(control, RADAR_VISIBLE);
+ GM_ConfigControlInterp_80026244(control, 4);
+ GM_ConfigControlHazard_8002622C(control, -1, -2, -1);
+ work->control.field_0_mov = work->f20C[start];
+
+ body = &work->body;
+ model = GV_StrCode_80016CCC("mouse");
+ GM_InitObject_80034A18(body, model, BODY_FLAG | DG_FLAG_ONEPIECE, 0);
+ GM_ConfigObjectJoint_80034CB4(body);
+ GM_ConfigObjectLight_80034C44(body, work->light);
+ work->body.objs->objs[0].raise = 200;
+
+ work->f204 = 0;
+ work->f624 = arg3;
+ work->f1D8 = 0;
+ work->f628 = 0;
+ work->f200 = 0;
+ work->f208 = 0;
+ work->f62C = arg4;
+ work->f1D0 = GV_RandU_80017090(32) + 16;
+ work->f1D4 = 0;
+ work->f660 = arg7;
+ work->f63C = arg8;
+ work->f664 = 0;
+ work->f638 = 0;
+
+ work->target = GM_AllocTarget_8002D400();
+ if (work->target != NULL)
+ {
+ size.vx = 70;
+ size.vy = 800;
+ size.vz = 70;
+
+ GM_SetTarget_8002DC74(work->target, 0x1D, ENEMY_SIDE, &size);
+ control->field_36 = -2;
+ }
+
+ work->hom = HomingTarget_Alloc_80032C8C(&work->hom_mtx, control);
+ work->hom->flag = 1;
+
+ prim = DG_GetPrim(0x12, 1, 0, work->prim_vecs, NULL);
+ work->prim = prim;
+ if (prim != NULL)
+ {
+ prim->field_2E_k500 = 500;
+ }
+
+ tex = DG_GetTexture_8001D830(GV_StrCode_80016CCC("shadow"));
+ if (tex == NULL)
+ {
+ return 0;
+ }
+
+ Eventmouse_800C9890(&work->prim->field_40_pBuffers[0]->poly_ft4, tex);
+ Eventmouse_800C9890(&work->prim->field_40_pBuffers[1]->poly_ft4, tex);
+
+ work->prim->field_40_pBuffers[0]->poly_ft4.r0 = 80;
+ work->prim->field_40_pBuffers[0]->poly_ft4.g0 = 80;
+ work->prim->field_40_pBuffers[0]->poly_ft4.b0 = 80;
+
+ work->prim->field_40_pBuffers[1]->poly_ft4.r0 = 80;
+ work->prim->field_40_pBuffers[1]->poly_ft4.g0 = 80;
+ work->prim->field_40_pBuffers[1]->poly_ft4.b0 = 80;
+
+ work->f1DC[2] = 2;
+ work->f1DC[0] = 0;
+ work->f1DC[1] = 1;
+ work->f1DC[3] = 1;
+ work->f1DC[4] = 0;
+ work->f1DC[5] = -1;
+ work->f1DC[6] = -2;
+ work->f1DC[7] = -1;
+
+ work->f68C = 0;
+ work->f690 = NULL;
+ return 0;
+}
+
+GV_ACT * NewEventmouse_800CA6F4(HZD_PTP *points, short n_points, int arg2, int arg3, int arg4, int arg5)
+{
+ EventmouseWork *work;
+
+ work = (EventmouseWork *)GV_NewActor_800150E4(EXEC_LEVEL, sizeof(EventmouseWork));
+ if (work != NULL)
+ {
+ GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)EventMouseAct_800C9F14, (TActorFunction)EventMouseDie_800CA2C4, "evntmous.c");
+
+ if (EventMouseGetResources_800CA370(work, points, n_points, arg2, arg3, 1, GM_CurrentMap_800AB9B0, arg4, arg5) < 0)
+ {
+ GV_DestroyActor_800151C8(&work->actor);
+ return NULL;
+ }
+
+ work->map = GM_CurrentMap_800AB9B0;
+ }
+
+ return &work->actor;
+}
diff --git a/src/overlays/s16a/Okajima/key_item.c b/src/overlays/s16a/Okajima/key_item.c
index 3709bf9b3..d1cc9a35c 100644
--- a/src/overlays/s16a/Okajima/key_item.c
+++ b/src/overlays/s16a/Okajima/key_item.c
@@ -1,7 +1,7 @@
#include "libgcl/libgcl.h"
#include "libgv/libgv.h"
-void s16a_evntmous_800CA6F4(HZD_PTP *points, int n_points, int, int, int, int);
+void NewEventmouse_800CA6F4(HZD_PTP *points, int n_points, int, int, int, int);
#define EXEC_LEVEL 5
@@ -176,7 +176,7 @@ void KeyItemRun_800C8948(int where)
}
route = &map->field_8_hzd->f00_header->routes[n_route];
- s16a_evntmous_800CA6F4(route->points, route->n_points, sp11C, var_fp, proc1, 0);
+ NewEventmouse_800CA6F4(route->points, route->n_points, sp11C, var_fp, proc1, 0);
}
else
{
diff --git a/src/overlays/s16a/overlay.c b/src/overlays/s16a/overlay.c
index f4069651e..93bd326ee 100755
--- a/src/overlays/s16a/overlay.c
+++ b/src/overlays/s16a/overlay.c
@@ -1,6 +1,6 @@
#include "libgcl/libgcl.h"
-GCL_ActorTableEntry s16aOverlayCharas[] =
+GCL_ActorTableEntry s16aOverlayCharas[] =
{
{ 0xFED1, (TGCL_ActorCreateFn)0x8005D508 },
{ 0x7A05, (TGCL_ActorCreateFn)0x800D0C44 },
diff --git a/src/overlays/s16a/overlay2.c b/src/overlays/s16a/overlay2.c
index cb9bfd242..b1338af89 100644
--- a/src/overlays/s16a/overlay2.c
+++ b/src/overlays/s16a/overlay2.c
@@ -1,14 +1,3 @@
#include "linker.h"
-int s16a_dword_800C33F0 = 0x00000030;
-int s16a_dword_800C33F4 = 0x00000060;
-int s16a_dword_800C33F8 = 0x0000FFD0;
-int s16a_dword_800C33FC = 0x00000060;
-
-const char s16a_aMouse_800D26F0[] = "mouse";
-const char s16a_aShadow_800D26F8[] = "shadow";
-const char s16a_dword_800D2700[] = {'e', 'v', 'n', 't'};
-const char s16a_dword_800D2704[] = {'m', 'o', 'u', 's'};
-const char s16a_dword_800D2708[] = {'.', 'c', 0x0, 0x81};
-
int SECTION("overlay.bss") s16a_dword_800D29D4;
diff --git a/um/s16a.bin b/um/s16a.bin
index a8a0b49f6..21531b085 100644
Binary files a/um/s16a.bin and b/um/s16a.bin differ