Merge pull request #1867 from KieronJ/sndtest

Finish change overlay (minus safechk)
This commit is contained in:
Kieron 2024-02-10 00:57:53 +00:00 committed by GitHub
commit c7cfa22366
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 385 additions and 644 deletions

View File

@ -1,410 +0,0 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C3CD0
change_800C3CD0:
dw 0x27BDFFC0 ; 800C3CD0
dw 0xAFB10034 ; 800C3CD4
dw 0x00808821 ; 800C3CD8
dw 0xAFBF003C ; 800C3CDC
dw 0xAFB20038 ; 800C3CE0
dw 0xAFB00030 ; 800C3CE4
dw 0x8E2406B0 ; 800C3CE8
dw 0x8E220020 ; 800C3CEC
dw 0x2C83000B ; 800C3CF0
dw 0x94450002 ; 800C3CF4
dw 0x10600184 ; 800C3CF8
dw 0x3C02800C ; 800C3CFC
dw 0x24425E9C ; 800C3D00
dw 0x00041880 ; 800C3D04
dw 0x00621821 ; 800C3D08
dw 0x8C620000 ; 800C3D0C
dw 0x00000000 ; 800C3D10
dw 0x00400008 ; 800C3D14
dw 0x00000000 ; 800C3D18
dw 0x24040001 ; 800C3D1C
dw 0x27B00028 ; 800C3D20
dw 0x02002821 ; 800C3D24
dw 0x27A60010 ; 800C3D28
dw 0x0C0232DD ; 800C3D2C
dw 0xA3A00028 ; 800C3D30
dw 0x93A20010 ; 800C3D34
dw 0x00000000 ; 800C3D38
dw 0x30420010 ; 800C3D3C
dw 0x14400030 ; 800C3D40
dw 0x24020003 ; 800C3D44
dw 0xA3A00028 ; 800C3D48
dw 0x2404000E ; 800C3D4C
dw 0x02002821 ; 800C3D50
dw 0x0C0232DD ; 800C3D54
dw 0x27A60010 ; 800C3D58
dw 0x00408021 ; 800C3D5C
dw 0x16000009 ; 800C3D60
dw 0x24020001 ; 800C3D64
dw 0x3C04800C ; 800C3D68
dw 0x0C022EE8 ; 800C3D6C
dw 0x24845CA8 ; 800C3D70
dw 0x8E2206A8 ; 800C3D74
dw 0x00000000 ; 800C3D78
dw 0x24420001 ; 800C3D7C
dw 0x08030F6F ; 800C3D80
dw 0xAE2206A8 ; 800C3D84
dw 0x16020009 ; 800C3D88
dw 0x00000000 ; 800C3D8C
dw 0x3C04800C ; 800C3D90
dw 0x24845CC8 ; 800C3D94
dw 0x0C022EE8 ; 800C3D98
dw 0xAE3006B0 ; 800C3D9C
dw 0x0C02257D ; 800C3DA0
dw 0x24040003 ; 800C3DA4
dw 0x08030F6F ; 800C3DA8
dw 0xAE2006A8 ; 800C3DAC
dw 0x3C04800C ; 800C3DB0
dw 0x0C022EE8 ; 800C3DB4
dw 0x24845CE8 ; 800C3DB8
dw 0x8E2206A8 ; 800C3DBC
dw 0x00000000 ; 800C3DC0
dw 0x2842012C ; 800C3DC4
dw 0x14400150 ; 800C3DC8
dw 0x3C04800C ; 800C3DCC
dw 0x0803103D ; 800C3DD0
dw 0x24845CF4 ; 800C3DD4
dw 0x24040001 ; 800C3DD8
dw 0x27B00028 ; 800C3DDC
dw 0x02002821 ; 800C3DE0
dw 0x27A60010 ; 800C3DE4
dw 0x0C0232DD ; 800C3DE8
dw 0xA3A00028 ; 800C3DEC
dw 0x93A20010 ; 800C3DF0
dw 0x00000000 ; 800C3DF4
dw 0x30420010 ; 800C3DF8
dw 0x10400009 ; 800C3DFC
dw 0x24020003 ; 800C3E00
dw 0xAE2206B0 ; 800C3E04
dw 0x3C04800C ; 800C3E08
dw 0x0C022EE8 ; 800C3E0C
dw 0x24845C98 ; 800C3E10
dw 0x0C02257D ; 800C3E14
dw 0x24040003 ; 800C3E18
dw 0x080310C3 ; 800C3E1C
dw 0x00000000 ; 800C3E20
dw 0xA3A00028 ; 800C3E24
dw 0x24040008 ; 800C3E28
dw 0x02002821 ; 800C3E2C
dw 0x0C0232DD ; 800C3E30
dw 0x27A60010 ; 800C3E34
dw 0x00408021 ; 800C3E38
dw 0x16000009 ; 800C3E3C
dw 0x24020001 ; 800C3E40
dw 0x3C04800C ; 800C3E44
dw 0x0C022EE8 ; 800C3E48
dw 0x24845D0C ; 800C3E4C
dw 0x8E2206A8 ; 800C3E50
dw 0x00000000 ; 800C3E54
dw 0x24420001 ; 800C3E58
dw 0x08030FA4 ; 800C3E5C
dw 0xAE2206A8 ; 800C3E60
dw 0x16020008 ; 800C3E64
dw 0x3C04800C ; 800C3E68
dw 0x3C04800C ; 800C3E6C
dw 0x24845D20 ; 800C3E70
dw 0x24020002 ; 800C3E74
dw 0x0C022EE8 ; 800C3E78
dw 0xAE2206B0 ; 800C3E7C
dw 0x08030FA4 ; 800C3E80
dw 0xAE2006A8 ; 800C3E84
dw 0x0C022EE8 ; 800C3E88
dw 0x24845CE8 ; 800C3E8C
dw 0x8E2206A8 ; 800C3E90
dw 0x00000000 ; 800C3E94
dw 0x2842012C ; 800C3E98
dw 0x1440011B ; 800C3E9C
dw 0x3C04800C ; 800C3EA0
dw 0x0803103D ; 800C3EA4
dw 0x24845CF4 ; 800C3EA8
dw 0x24040001 ; 800C3EAC
dw 0x27A50028 ; 800C3EB0
dw 0x27A60010 ; 800C3EB4
dw 0x0C0232DD ; 800C3EB8
dw 0xA3A00028 ; 800C3EBC
dw 0x93A20010 ; 800C3EC0
dw 0x00000000 ; 800C3EC4
dw 0x30420010 ; 800C3EC8
dw 0x1040000F ; 800C3ECC
dw 0x24020003 ; 800C3ED0
dw 0x08030FC8 ; 800C3ED4
dw 0xAE2206B0 ; 800C3ED8
dw 0x24040001 ; 800C3EDC
dw 0x27A50028 ; 800C3EE0
dw 0x27A60010 ; 800C3EE4
dw 0x0C0232DD ; 800C3EE8
dw 0xA3A00028 ; 800C3EEC
dw 0x93A20010 ; 800C3EF0
dw 0x00000000 ; 800C3EF4
dw 0x30420010 ; 800C3EF8
dw 0x14400009 ; 800C3EFC
dw 0x3C04800C ; 800C3F00
dw 0x24020004 ; 800C3F04
dw 0xAE2206B0 ; 800C3F08
dw 0x3C04800C ; 800C3F0C
dw 0x0C022EE8 ; 800C3F10
dw 0x24845D34 ; 800C3F14
dw 0x080310C3 ; 800C3F18
dw 0x00000000 ; 800C3F1C
dw 0x3C04800C ; 800C3F20
dw 0x0C022EE8 ; 800C3F24
dw 0x24845C98 ; 800C3F28
dw 0x080310C3 ; 800C3F2C
dw 0x00000000 ; 800C3F30
dw 0x8E2206BC ; 800C3F34
dw 0x00000000 ; 800C3F38
dw 0x104000F3 ; 800C3F3C
dw 0x30A20800 ; 800C3F40
dw 0x104000F1 ; 800C3F44
dw 0x3C04800C ; 800C3F48
dw 0x24845D48 ; 800C3F4C
dw 0x24020005 ; 800C3F50
dw 0x0C022EE8 ; 800C3F54
dw 0xAE2206B0 ; 800C3F58
dw 0x00002021 ; 800C3F5C
dw 0x2405003F ; 800C3F60
dw 0x0C00CA5A ; 800C3F64
dw 0x24060020 ; 800C3F68
dw 0x080310C3 ; 800C3F6C
dw 0xAE2006A8 ; 800C3F70
dw 0x24040001 ; 800C3F74
dw 0x27A50028 ; 800C3F78
dw 0x27A60010 ; 800C3F7C
dw 0x0C0232DD ; 800C3F80
dw 0xA3A00028 ; 800C3F84
dw 0x8E2206A8 ; 800C3F88
dw 0x00000000 ; 800C3F8C
dw 0x24420001 ; 800C3F90
dw 0xAE2206A8 ; 800C3F94
dw 0x93A20010 ; 800C3F98
dw 0x00000000 ; 800C3F9C
dw 0x30420002 ; 800C3FA0
dw 0x10400007 ; 800C3FA4
dw 0x24020006 ; 800C3FA8
dw 0x3C04800C ; 800C3FAC
dw 0x24845D60 ; 800C3FB0
dw 0x0C022EE8 ; 800C3FB4
dw 0xAE2206B0 ; 800C3FB8
dw 0x08030FF4 ; 800C3FBC
dw 0xAE2006A8 ; 800C3FC0
dw 0x3C04800C ; 800C3FC4
dw 0x0C022EE8 ; 800C3FC8
dw 0x24845D74 ; 800C3FCC
dw 0x8E2206A8 ; 800C3FD0
dw 0x00000000 ; 800C3FD4
dw 0x2842012C ; 800C3FD8
dw 0x144000CB ; 800C3FDC
dw 0x3C04800C ; 800C3FE0
dw 0x0803103D ; 800C3FE4
dw 0x24845CF4 ; 800C3FE8
dw 0xA3A00028 ; 800C3FEC
dw 0x24040013 ; 800C3FF0
dw 0x27A50028 ; 800C3FF4
dw 0x0C0232DD ; 800C3FF8
dw 0x27A60010 ; 800C3FFC
dw 0x00408021 ; 800C4000
dw 0x16000009 ; 800C4004
dw 0x24020001 ; 800C4008
dw 0x3C04800C ; 800C400C
dw 0x0C022EE8 ; 800C4010
dw 0x24845D84 ; 800C4014
dw 0x8E2206A8 ; 800C4018
dw 0x00000000 ; 800C401C
dw 0x24420001 ; 800C4020
dw 0x08031016 ; 800C4024
dw 0xAE2206A8 ; 800C4028
dw 0x16020008 ; 800C402C
dw 0x3C04800C ; 800C4030
dw 0x3C04800C ; 800C4034
dw 0x24845DA0 ; 800C4038
dw 0x24020007 ; 800C403C
dw 0x0C022EE8 ; 800C4040
dw 0xAE2206B0 ; 800C4044
dw 0x08031016 ; 800C4048
dw 0xAE2006A8 ; 800C404C
dw 0x0C022EE8 ; 800C4050
dw 0x24845CE8 ; 800C4054
dw 0x8E2206A8 ; 800C4058
dw 0x00000000 ; 800C405C
dw 0x28420258 ; 800C4060
dw 0x144000A9 ; 800C4064
dw 0x3C04800C ; 800C4068
dw 0x0803103D ; 800C406C
dw 0x24845CF4 ; 800C4070
dw 0x3C04800C ; 800C4074
dw 0x24845DB8 ; 800C4078
dw 0x24020008 ; 800C407C
dw 0xAE2206B0 ; 800C4080
dw 0x0C022EE8 ; 800C4084
dw 0xAE2006A8 ; 800C4088
dw 0x080310C3 ; 800C408C
dw 0x00000000 ; 800C4090
dw 0x24040010 ; 800C4094
dw 0x27B00020 ; 800C4098
dw 0x0C023359 ; 800C409C
dw 0x02002821 ; 800C40A0
dw 0x24040006 ; 800C40A4
dw 0x02002821 ; 800C40A8
dw 0x0C0232DD ; 800C40AC
dw 0x27A60010 ; 800C40B0
dw 0x00408021 ; 800C40B4
dw 0x16000030 ; 800C40B8
dw 0x24020001 ; 800C40BC
dw 0x3C04800C ; 800C40C0
dw 0x93A50010 ; 800C40C4
dw 0x93A60011 ; 800C40C8
dw 0x0C022EE8 ; 800C40CC
dw 0x24845DD4 ; 800C40D0
dw 0x8E2206A8 ; 800C40D4
dw 0x00000000 ; 800C40D8
dw 0x24420001 ; 800C40DC
dw 0xAE2206A8 ; 800C40E0
dw 0x2842012C ; 800C40E4
dw 0x14400008 ; 800C40E8
dw 0x3C04800C ; 800C40EC
dw 0x24845CF4 ; 800C40F0
dw 0x2402000A ; 800C40F4
dw 0xAE2206B0 ; 800C40F8
dw 0x0C022EE8 ; 800C40FC
dw 0xAE2006B8 ; 800C4100
dw 0x080310C3 ; 800C4104
dw 0x00000000 ; 800C4108
dw 0x93A30010 ; 800C410C
dw 0x00000000 ; 800C4110
dw 0x30620060 ; 800C4114
dw 0x1440007C ; 800C4118
dw 0x30620001 ; 800C411C
dw 0x1040000B ; 800C4120
dw 0x00000000 ; 800C4124
dw 0x93A20011 ; 800C4128
dw 0x00000000 ; 800C412C
dw 0x30420040 ; 800C4130
dw 0x10400006 ; 800C4134
dw 0x3C04800C ; 800C4138
dw 0x24845CF4 ; 800C413C
dw 0x2402000A ; 800C4140
dw 0xAE2206B0 ; 800C4144
dw 0x0C022EE8 ; 800C4148
dw 0xAE2006B8 ; 800C414C
dw 0x93A20010 ; 800C4150
dw 0x00000000 ; 800C4154
dw 0x30420002 ; 800C4158
dw 0x1040006B ; 800C415C
dw 0x3C04800C ; 800C4160
dw 0x0C022EE8 ; 800C4164
dw 0x24845DF0 ; 800C4168
dw 0x2402000A ; 800C416C
dw 0xAE2206B0 ; 800C4170
dw 0x080310C3 ; 800C4174
dw 0xAE2006B8 ; 800C4178
dw 0x16020046 ; 800C417C
dw 0x3C04800C ; 800C4180
dw 0x00002021 ; 800C4184
dw 0x0C02322F ; 800C4188
dw 0x27A50018 ; 800C418C
dw 0x00401821 ; 800C4190
dw 0x14700016 ; 800C4194
dw 0x00009021 ; 800C4198
dw 0x3C04800C ; 800C419C
dw 0x0C022EE8 ; 800C41A0
dw 0x24845E00 ; 800C41A4
dw 0x93A20018 ; 800C41A8
dw 0x00000000 ; 800C41AC
dw 0x30420001 ; 800C41B0
dw 0x10400015 ; 800C41B4
dw 0x00000000 ; 800C41B8
dw 0x93A20019 ; 800C41BC
dw 0x00000000 ; 800C41C0
dw 0x30420040 ; 800C41C4
dw 0x10400010 ; 800C41C8
dw 0x00000000 ; 800C41CC
dw 0x24120001 ; 800C41D0
dw 0x3C04800C ; 800C41D4
dw 0x0C022EE8 ; 800C41D8
dw 0x24845E10 ; 800C41DC
dw 0x2402000A ; 800C41E0
dw 0xAE2206B0 ; 800C41E4
dw 0x08031083 ; 800C41E8
dw 0xAE2006B8 ; 800C41EC
dw 0x24020005 ; 800C41F0
dw 0x14620005 ; 800C41F4
dw 0x00000000 ; 800C41F8
dw 0x24120001 ; 800C41FC
dw 0x3C04800C ; 800C4200
dw 0x0C022EE8 ; 800C4204
dw 0x24845E28 ; 800C4208
dw 0x1640003F ; 800C420C
dw 0x3C04800C ; 800C4210
dw 0x0C022EE8 ; 800C4214
dw 0x24845E3C ; 800C4218
dw 0x24040010 ; 800C421C
dw 0x0C03117E ; 800C4220
dw 0x24050258 ; 800C4224
dw 0x0C0311C5 ; 800C4228
dw 0x00000000 ; 800C422C
dw 0x0C005883 ; 800C4230
dw 0x24042000 ; 800C4234
dw 0x00409021 ; 800C4238
dw 0x0C00878B ; 800C423C
dw 0x02402021 ; 800C4240
dw 0x00408021 ; 800C4244
dw 0x24020001 ; 800C4248
dw 0x16020009 ; 800C424C
dw 0x3C04800C ; 800C4250
dw 0x3C04800C ; 800C4254
dw 0x0C022EE8 ; 800C4258
dw 0x24845E50 ; 800C425C
dw 0x24020009 ; 800C4260
dw 0xAE2206B0 ; 800C4264
dw 0x3C02800B ; 800C4268
dw 0x080310A2 ; 800C426C
dw 0xAC50CBF0 ; 800C4270
dw 0x0C022EE8 ; 800C4274
dw 0x24845E64 ; 800C4278
dw 0x2402000A ; 800C427C
dw 0xAE2206B0 ; 800C4280
dw 0xAE2006B8 ; 800C4284
dw 0x0C00588C ; 800C4288
dw 0x02402021 ; 800C428C
dw 0x080310C3 ; 800C4290
dw 0x00000000 ; 800C4294
dw 0x0C022EE8 ; 800C4298
dw 0x24845CE8 ; 800C429C
dw 0x080310C3 ; 800C42A0
dw 0x00000000 ; 800C42A4
dw 0x24040009 ; 800C42A8
dw 0x27A50028 ; 800C42AC
dw 0x27A60010 ; 800C42B0
dw 0x0C0232DD ; 800C42B4
dw 0xA3A00028 ; 800C42B8
dw 0x3C04800C ; 800C42BC
dw 0x24845E7C ; 800C42C0
dw 0x24020001 ; 800C42C4
dw 0xAE2206AC ; 800C42C8
dw 0x0C022EE8 ; 800C42CC
dw 0xAE2206B4 ; 800C42D0
dw 0x080310C3 ; 800C42D4
dw 0x00000000 ; 800C42D8
dw 0x3C04800C ; 800C42DC
dw 0x8E2206B8 ; 800C42E0
dw 0x24845E88 ; 800C42E4
dw 0x24420001 ; 800C42E8
dw 0x0C022EE8 ; 800C42EC
dw 0xAE2206B8 ; 800C42F0
dw 0x8E2206B8 ; 800C42F4
dw 0x00000000 ; 800C42F8
dw 0x2842001E ; 800C42FC
dw 0x14400002 ; 800C4300
dw 0x00000000 ; 800C4304
dw 0xAE2006B0 ; 800C4308
dw 0x8FBF003C ; 800C3D1C
dw 0x8FB20038 ; 800C3D20
dw 0x8FB10034 ; 800C3D24
dw 0x8FB00030 ; 800C3D28
dw 0x03E00008 ; 800C3D2C
dw 0x27BD0040 ; 800C3D30

View File

@ -1,39 +0,0 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C5B4C
change_800C5B4C:
dw 0x240A00B0 ; 800C5B4C
dw 0x01400008 ; 800C5B50
dw 0x24090038 ; 800C5B54
dw 0x00000000 ; 800C5B58
dw 0x27BDFFD8 ; 800C5B5C
dw 0xAFB20018 ; 800C5B60
dw 0x8FB20038 ; 800C5B64
dw 0xAFB10014 ; 800C5B68
dw 0x00808821 ; 800C5B6C
dw 0xAFB3001C ; 800C5B70
dw 0x00A09821 ; 800C5B74
dw 0xAFB40020 ; 800C5B78
dw 0x00C0A021 ; 800C5B7C
dw 0xAFB00010 ; 800C5B80
dw 0xAFBF0024 ; 800C5B84
dw 0x0C02638B ; 800C5B88
dw 0x00E08021 ; 800C5B8C
dw 0x24030001 ; 800C5B90
dw 0xA6330000 ; 800C5B94
dw 0xA6340002 ; 800C5B98
dw 0xA6300004 ; 800C5B9C
dw 0xA620000C ; 800C5BA0
dw 0xA620000E ; 800C5BA4
dw 0xA6200010 ; 800C5BA8
dw 0xA6200012 ; 800C5BAC
dw 0xA2200019 ; 800C5BB0
dw 0xA220001A ; 800C5BB4
dw 0xA220001B ; 800C5BB8
dw 0xA2230016 ; 800C5BBC
dw 0x10400003 ; 800C5BC0
dw 0xA6320006 ; 800C5BC4
dw 0x080316F5 ; 800C5BC8
dw 0x2A420121 ; 800C5BCC
dw 0x2A420101 ; 800C5BD0

View File

@ -1,23 +0,0 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C5BD4
change_800C5BD4:
dw 0xA2220017 ; 800C5BD4
dw 0x02201021 ; 800C5BD8
dw 0x2403000A ; 800C5BDC
dw 0xA4530008 ; 800C5BE0
dw 0xA454000A ; 800C5BE4
dw 0xA4430014 ; 800C5BE8
dw 0xA0400018 ; 800C5BEC
dw 0x8FBF0024 ; 800C5BF0
dw 0x8FB40020 ; 800C5BF4
dw 0x8FB3001C ; 800C5BF8
dw 0x8FB20018 ; 800C5BFC
dw 0x8FB10014 ; 800C5C00
dw 0x8FB00010 ; 800C5C04
dw 0x03E00008 ; 800C5C08
dw 0x27BD0028 ; 800C5C0C
dw 0x00000000 ; 800C5C10
dw 0x00000000 ; 800C5C14
dw 0x00000000 ; 800C5C18

View File

@ -1,25 +0,0 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C5C1C
change_800C5C1C:
dw 0x8FA30010 ; 800C5C1C
dw 0x00801021 ; 800C5C20
dw 0xA4450000 ; 800C5C24
dw 0xA4460002 ; 800C5C28
dw 0xA4470004 ; 800C5C2C
dw 0xA4400008 ; 800C5C30
dw 0xA440000A ; 800C5C34
dw 0xA440000C ; 800C5C38
dw 0xA440000E ; 800C5C3C
dw 0xA0400011 ; 800C5C40
dw 0xA0400010 ; 800C5C44
dw 0xA0400013 ; 800C5C48
dw 0xA0400012 ; 800C5C4C
dw 0x03E00008 ; 800C5C50
dw 0xA4430006 ; 800C5C54
dw 0x00000000 ; 800C5C58
dw 0x240A00B0 ; 800C5C5C
dw 0x01400008 ; 800C5C60
dw 0x24090051 ; 800C5C64
dw 0x00000000 ; 800C5C68

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C499C
change_800C499C:
xdef safecheck_800C499C
safecheck_800C499C:
dw 0x00804021 ; 800C499C
dw 0x00002021 ; 800C49A0
dw 0x00002821 ; 800C49A4

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C4BC8
change_800C4BC8:
xdef safecheck_800C4BC8
safecheck_800C4BC8:
dw 0x27BDFF08 ; 800C4BC8
dw 0x24040001 ; 800C4BCC
dw 0xAFBF00F0 ; 800C4BD0

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C4CE0
change_800C4CE0:
xdef safecheck_800C4CE0
safecheck_800C4CE0:
dw 0x27BDFFD0 ; 800C4CE0
dw 0xAFB00010 ; 800C4CE4
dw 0x00808021 ; 800C4CE8

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C4DB8
change_800C4DB8:
xdef safecheck_800C4DB8
safecheck_800C4DB8:
dw 0x27BDFFA0 ; 800C4DB8
dw 0xAFB10044 ; 800C4DBC
dw 0x00808821 ; 800C4DC0

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef change_800C4ED4
change_800C4ED4:
xdef safecheck_800C4ED4
safecheck_800C4ED4:
dw 0x27BDFFB0 ; 800C4ED4
dw 0x3C032800 ; 800C4ED8
dw 0x346300FF ; 800C4EDC

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef title_fonttext_800C3B28
title_fonttext_800C3B28:
xdef safecheck_800C3B28
safecheck_800C3B28:
dw 0x00804021 ; 800C3B28
dw 0x00002021 ; 800C3B2C
dw 0x00002821 ; 800C3B30

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef title_fonttext_800C3D54
title_fonttext_800C3D54:
xdef safecheck_800C3D54
safecheck_800C3D54:
dw 0x27BDFF08 ; 800C3D54
dw 0x24040001 ; 800C3D58
dw 0xAFBF00F0 ; 800C3D5C

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef title_fonttext_800C3E6C
title_fonttext_800C3E6C:
xdef safecheck_800C3E6C
safecheck_800C3E6C:
dw 0x27BDFFD0 ; 800C3E6C
dw 0xAFB00010 ; 800C3E70
dw 0x00808021 ; 800C3E74

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef title_fonttext_800C3F44
title_fonttext_800C3F44:
xdef safecheck_800C3F44
safecheck_800C3F44:
dw 0x27BDFFA0 ; 800C3F44
dw 0xAFB10044 ; 800C3F48
dw 0x00808821 ; 800C3F4C

View File

@ -1,8 +1,8 @@
opt c+, at+, e+, n-
section overlay.text
xdef title_fonttext_800C4060
title_fonttext_800C4060:
xdef safecheck_800C4060
safecheck_800C4060:
dw 0x27BDFFB0 ; 800C4060
dw 0x3C032800 ; 800C4064
dw 0x346300FF ; 800C4068

View File

@ -335,19 +335,25 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin")
{% elif OVERLAY == "change" %}
include "{{OBJ_DIR}}\overlays\change\overlay.obj"
include "{{OBJ_DIR}}\overlays\change\Onoda\change\change.obj"
include "{{OBJ_DIR}}\overlays\change\overlay2.obj"
include "{{OBJ_DIR}}\overlays\change\Onoda\change\safety.obj"
include "{{OBJ_DIR}}\overlays\change\SafetyCheck.obj"
include "{{OBJ_DIR}}\overlays\change\change_800C499C.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\change_800C4BC8.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\change_800C4CE0.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\change_800C4DB8.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\change_800C4ED4.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\safecheck_800C499C.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\safecheck_800C4BC8.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\safecheck_800C4CE0.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\safecheck_800C4DB8.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\safecheck_800C4ED4.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\change\overlay3.obj"
include "{{OBJ_DIR}}\overlays\change\overlay2.obj"
include "{{OBJ_DIR}}\overlays\change\Onoda\change\met_logo.obj"
include "{{OBJ_DIR}}\overlays\change\Onoda\change\change2.obj"
; PSYQ - TODO: how to use inclib effectively here?
; For some reason extra functions end up in main exe
; when using inclib...
include "{{PSYQ_SDK}}\psyq_4.4\LIB\libc2\EXIT.OBJ", overlay
include "{{PSYQ_SDK}}\psyq_4.4\LIB\libgpu\E03.OBJ", overlay
include "{{PSYQ_SDK}}\psyq_4.4\LIB\libgpu\E04.OBJ", overlay
include "{{PSYQ_SDK}}\psyq_4.4\LIB\libapi\A81.OBJ", overlay
{% elif OVERLAY == "s16b" %}
include "{{OBJ_DIR}}\overlays\s16b\overlay.obj"
include "{{OBJ_DIR}}\overlays\s16b\Enemy\wall.obj"
@ -490,11 +496,11 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin")
include "{{OBJ_DIR}}\overlays\title\overlay2.obj"
include "{{OBJ_DIR}}\overlays\title\SafetyCheck.obj"
include "{{OBJ_DIR}}\overlays\title\title_fonttext_800C3B28.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\title_fonttext_800C3D54.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\title_fonttext_800C3E6C.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\title_fonttext_800C3F44.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\title_fonttext_800C4060.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\safecheck_800C3B28.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\safecheck_800C3D54.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\safecheck_800C3E6C.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\safecheck_800C3F44.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\safecheck_800C4060.obj" ; safecheck internal
include "{{OBJ_DIR}}\overlays\title\chara\others\fonttext.obj"
include "{{OBJ_DIR}}\overlays\title\Onoda\open\open.obj"

View File

@ -1,10 +1,11 @@
#include "linker.h"
#include "psyq.h"
#include "Font/font.h"
#include "libdg/libdg.h"
#include "libfs/libfs.h"
#include "libgcl/libgcl.h"
#include "libgv/libgv.h"
#include "libfs/libfs.h"
#include "Font/font.h"
#include "Game/game.h"
typedef struct _Unknown
{
@ -47,6 +48,7 @@ typedef struct _Work
extern int GM_GameStatus_800AB3CC;
extern int GV_Clock_800AB920;
extern int GM_CurrentMap_800AB9B0;
extern int gDiskNum_800ACBF0;
extern GV_PAD GV_PadData_800B05C0[4];
typedef struct _Unknown2
@ -60,14 +62,8 @@ typedef struct _Unknown2
extern Unknown2 dword_800C3218[6];
extern signed char byte_800C3260[];
extern const char aChangec_800C5EC8[]; // = "change.c"
extern const char aSafecheckstartn_800C5ED4[]; // = "SafeCheckStart\n"
extern const char aTry_800C5EE4[]; // = "TRY\n"
extern const char aTimeoutn_800C5EEC[]; // = "TIMEOUT\n"
extern const char aTryEndn_800C5EF8[]; // = "TRY END\n"
extern const char aOpenn_800C5F04[]; // = "OPEN\n"
extern const char aSafecheckendn_800C5F0C[]; // = "SafeCheckEND\n"
int Safety_800C45F8( int lba, int timeout );
void Safety_800C4714( void );
GV_ACT * NewMetLogo_800C5A90( int * );
@ -264,8 +260,317 @@ void change_800C3B90( Work *work )
}
}
#pragma INCLUDE_ASM("asm/overlays/change/change_800C3CD0.s") // 1596 bytes
void change_800C3CD0( Work *work );
void change_800C3CD0( Work *work )
{
char result[8];
char result2[8];
CdlLOC loc;
char param[8];
int press;
int status;
int intr;
int error;
void *alloc;
press = work->pad_data->press;
switch ( work->f6B0 )
{
case 0:
param[ 0 ] = 0;
CdControlB( CdlNop, param, result );
if ( result[ 0 ] & CdlStatShellOpen )
{
work->f6B0 = 3;
printf( "CD CASE OPEN!!\n" );
mts_wait_vbl_800895F4( 3 );
break;
}
param[ 0 ] = 0;
status = CdControlB( CdlSetmode, param, result );
if ( status == 0 )
{
printf( "CD NORMAL SPEED SET FAILED!!\n" );
work->f6A8++;
}
else if ( status == 1 )
{
work->f6B0 = 1;
printf( "CD NORMAL SPEED SET SUCCESS!!\n" );
mts_wait_vbl_800895F4( 3 );
work->f6A8 = 0;
}
else
{
printf( "???????\n" );
}
if ( work->f6A8 >= 300 )
{
work->f6B0 = 10;
work->f6B8 = 0;
printf( "THIS IS NOT PS DISC!!\n" );
}
break;
case 1:
param[ 0 ] = 0;
CdControlB( CdlNop, param, result );
if ( result[ 0 ] & CdlStatShellOpen )
{
work->f6B0 = 3;
printf( "CD CASE OPEN!!\n" );
mts_wait_vbl_800895F4( 3 );
break;
}
param[ 0 ] = 0;
status = CdControlB( CdlStop, param, result );
if ( status == 0 )
{
printf( "CD STOP FAILED!!\n" );
work->f6A8++;
}
else if ( status == 1 )
{
work->f6B0 = 2;
printf( "CD STOP SUCCESS!!\n" );
work->f6A8 = 0;
}
else
{
printf( "???????\n" );
}
if ( work->f6A8 >= 300 )
{
work->f6B0 = 10;
work->f6B8 = 0;
printf( "THIS IS NOT PS DISC!!\n" );
}
break;
case 2:
param[ 0 ] = 0;
CdControlB( CdlNop, param, result );
if ( !( result[ 0 ] & CdlStatShellOpen ) )
{
printf( "CD CASE CLOSE!!\n" );
}
else
{
work->f6B0 = 3;
printf( "CD CASE OPEN!!\n" );
}
break;
case 3:
param[ 0 ] = 0;
CdControlB( CdlNop, param, result );
if ( !( result[ 0 ] & CdlStatShellOpen ) )
{
work->f6B0 = 4;
printf( "CD CASE CLOSE!!\n" );
}
else
{
printf( "CD CASE OPEN!!\n" );
}
break;
case 4:
if ( work->f6BC != 0 && ( press & PAD_START ) )
{
work->f6B0 = 5;
printf( "START BUTTON PUSH!!\n" );
GM_SeSet2_80032968( 0, 63, 32 ); // Select sound
work->f6A8 = 0;
}
break;
case 5:
param[ 0 ] = 0;
CdControlB( CdlNop, param, result );
work->f6A8++;
if ( result[ 0 ] & CdlStatStandby )
{
work->f6B0 = 6;
printf( "CD SPIN START!!\n" );
work->f6A8 = 0;
}
else
{
printf( "CD NOT SPIN!!\n" );
}
if ( work->f6A8 >= 300 )
{
work->f6B0 = 10;
work->f6B8 = 0;
printf( "THIS IS NOT PS DISC!!\n" );
}
break;
case 6:
param[ 0 ] = 0;
status = CdControlB( CdlGetTN, param, result );
if ( status == 0 )
{
printf( "CD TOC READ NOT FINISH!!\n" );
work->f6A8++;
}
else if ( status == 1 )
{
work->f6B0 = 7;
printf( "CD TOC READ SUCCESS!!\n" );
work->f6A8 = 0;
}
else
{
printf( "???????\n" );
}
if ( work->f6A8 >= 600 )
{
work->f6B0 = 10;
work->f6B8 = 0;
printf( "THIS IS NOT PS DISC!!\n" );
}
break;
case 7:
work->f6B0 = 8;
work->f6A8 = 0;
printf( "CD SPEED INIT SUCCESS!!\n" );
break;
case 8:
CdIntToPos( 16, &loc );
status = CdControlB( CdlReadN, (char *)&loc, result );
if ( status == 0 )
{
printf( "CD CHECK FAILED[%X:%X]!!\n", result[ 0 ], result[ 1 ] );
work->f6A8++;
if ( work->f6A8 >= 300 )
{
work->f6B0 = 10;
work->f6B8 = 0;
printf( "THIS IS NOT PS DISC!!\n" );
break;
}
if ( result[ 0 ] & ( CdlStatSeek | CdlStatRead ) )
{
break;
}
if ( result[ 0 ] & CdlStatError && result[ 1 ] & CdlStatSeek )
{
work->f6B0 = 10;
work->f6B8 = 0;
printf( "THIS IS NOT PS DISC!!\n" );
}
if ( result[ 0 ] & CdlStatStandby )
{
printf( "This is CDDA\n" );
work->f6B0 = 10;
work->f6B8 = 0;
}
break;
}
else if ( status == 1 )
{
intr = CdReady( 0, result2 );
error = 0;
if ( intr == CdlDataReady )
{
printf( "CD CHECK OK!!\n" );
if ( result2[ 0 ] & CdlStatError && result2[ 1 ] & CdlStatSeek )
{
error = 1;
printf( "THIS IS NOT PS DISC!!!\n" );
work->f6B0 = 10;
work->f6B8 = 0;
}
}
else if ( intr == CdlDiskError )
{
error = 1;
printf( "CD CHECK ERROR!!\n" );
}
if ( error )
{
break;
}
printf( "THIS IS PS DISC!!\n" );
Safety_800C45F8( 16, 600 );
Safety_800C4714();
alloc = GV_Malloc_8001620C( 8192 );
status = FS_ResetCdFilePosition_80021E2C( alloc );
if ( status == 1 )
{
printf( "THIS IS DISC 2!!\n" );
work->f6B0 = 9;
gDiskNum_800ACBF0 = status;
}
else
{
printf( "THIS IS NOT DISC 2!!!\n" );
work->f6B0 = 10;
work->f6B8 = 0;
}
GV_Free_80016230( alloc );
}
else
{
printf( "???????\n" );
}
break;
case 9:
param[ 0 ] = 0;
status = CdControlB( CdlPause, param, result );
work->f6AC = 1;
work->f6B4 = 1;
printf( "OK! OK!\n" );
break;
case 10:
work->f6B8++;
printf( "NOT OK! NOT OK!\n" );
if ( work->f6B8 >= 30 )
{
work->f6B0 = 0;
}
break;
}
}
void ChangeAct_800C4324( Work *work )
{
@ -357,7 +662,7 @@ GV_ACT * NewChange_800C455C( int name, int where, int argc, char **argv )
work = (Work *)GV_NewActor_800150E4( EXEC_LEVEL, sizeof( Work ) );
if (work != NULL)
{
GV_SetNamedActor_8001514C( &( work->actor ), (TActorFunction)ChangeAct_800C4324, (TActorFunction)ChangeDie_800C43EC, aChangec_800C5EC8 );
GV_SetNamedActor_8001514C( &( work->actor ), (TActorFunction)ChangeAct_800C4324, (TActorFunction)ChangeDie_800C43EC, "change.c" );
if ( ChangeGetResources_800C4448( work, where ) < 0 )
{

View File

@ -1,5 +0,0 @@
#include "linker.h"
#pragma INCLUDE_ASM("asm/overlays/change/change_800C5B4C.s") // 136 bytes
#pragma INCLUDE_ASM("asm/overlays/change/change_800C5BD4.s") // 60 bytes
#pragma INCLUDE_ASM("asm/overlays/change/change_800C5C1C.s") // 60 bytes

View File

@ -6,7 +6,7 @@ extern FS_FILE_INFO_8009D49C gDirFiles_8009D49C[];
int SafetyCheck( int, int, int );
int change_800C45F8( int lba, int timeout )
int Safety_800C45F8( int lba, int timeout )
{
CdlLOC loc;
char result[8];
@ -52,7 +52,7 @@ int change_800C45F8( int lba, int timeout )
return 1;
}
void change_800C4714( void )
void Safety_800C4714( void )
{
char param;
@ -62,13 +62,13 @@ void change_800C4714( void )
while ( !CdControl( CdlDemute, NULL, NULL ) );
}
void change_800C476C( int timeout )
void Safety_800C476C( int timeout )
{
change_800C45F8( gDirFiles_8009D49C[0].field_4_sector, timeout );
change_800C4714();
Safety_800C45F8( gDirFiles_8009D49C[0].field_4_sector, timeout );
Safety_800C4714();
}
int change_800C47A0( void )
int Safety_800C47A0( void )
{
int timeout;
@ -78,6 +78,6 @@ int change_800C47A0( void )
timeout = GCL_GetNextParamValue_80020AD4() * 60;
}
change_800C476C( timeout );
Safety_800C476C( timeout );
return 1;
}

View File

@ -1,68 +1,21 @@
const char aCdCaseOpenn_800C5C98[] = "CD CASE OPEN!!\n";
const char aCdNormalSpeedSetFailedn_800C5CA8[] = "CD NORMAL SPEED SET FAILED!!\n";
const short word_800C5CC6 = 0;
const char aCdNormalSpeedSetSuccessn_800C5CC8[] = "CD NORMAL SPEED SET SUCCESS!!\n";
const char byte_800C5CE7 = 0;
const char an_800C5CE8[] = "???????\n";
const char byte_800C5CF1 = 0;
const short word_800C5CF2 = 0;
const char aThisIsNotPsDiscn_800C5CF4[] = "THIS IS NOT PS DISC!!\n";
const char byte_800C5D0B = 0;
const char aCdStopFailedn_800C5D0C[] = "CD STOP FAILED!!\n";
const short word_800C5D1E = 0;
const char aCdStopSuccessn_800C5D20[] = "CD STOP SUCCESS!!\n";
const char byte_800C5D33 = 0;
const char aCdCaseClosen_800C5D34[] = "CD CASE CLOSE!!\n";
const char byte_800C5D45 = 0;
const short word_800C5D46 = 0;
const char aStartButtonPushn_800C5D48[] = "START BUTTON PUSH!!\n";
const char byte_800C5D5D = 0;
const short word_800C5D5E = 0;
const char aCdSpinStartn_800C5D60[] = "CD SPIN START!!\n";
const char byte_800C5D71 = 0;
const short word_800C5D72 = 0;
const char aCdNotSpinn_800C5D74[] = "CD NOT SPIN!!\n";
const char byte_800C5D83 = 0;
const char aCdTocReadNotFinishn_800C5D84[] = "CD TOC READ NOT FINISH!!\n";
const short word_800C5D9E = 0;
const char aCdTocReadSuccessn_800C5DA0[] = "CD TOC READ SUCCESS!!\n";
const char byte_800C5DB7 = 0;
const char aCdSpeedInitSuccessn_800C5DB8[] = "CD SPEED INIT SUCCESS!!\n";
const char byte_800C5DD1 = 0;
const short word_800C5DD2 = 0;
const char aCdCheckFailedxxn_800C5DD4[] = "CD CHECK FAILED[%X:%X]!!\n";
const short word_800C5DEE = 0;
const char aThisIsCddan_800C5DF0[] = "This is CDDA\n";
const short word_800C5DFE = 0;
const char aCdCheckOkn_800C5E00[] = "CD CHECK OK!!\n";
const char byte_800C5E0F = 0;
const char aThisIsNotPsDiscn_800C5E10[] = "THIS IS NOT PS DISC!!!\n";
const char aCdCheckErrorn_800C5E28[] = "CD CHECK ERROR!!\n";
const short word_800C5E3A = 0;
const char aThisIsPsDiscn_800C5E3C[] = "THIS IS PS DISC!!\n";
const char byte_800C5E4F = 0;
const char aThisIsDisc2n_800C5E50[] = "THIS IS DISC 2!!\n";
const short word_800C5E62 = 0;
const char aThisIsNotDisc2n_800C5E64[] = "THIS IS NOT DISC 2!!!\n";
const char byte_800C5E7B = 0;
const char aOkOkn_800C5E7C[] = "OK! OK!\n";
const char byte_800C5E85 = 0;
const short word_800C5E86 = 0;
const char aNotOkNotOkn_800C5E88[] = "NOT OK! NOT OK!\n";
const char byte_800C5E99 = 0;
const short word_800C5E9A = 0;
// jump_table_800C5E9C
const int dword_800C5E9C = 0x800C3D1C;
const int dword_800C5EA0 = 0x800C3DD8;
const int dword_800C5EA4 = 0x800C3EAC;
const int dword_800C5EA8 = 0x800C3EDC;
const int dword_800C5EAC = 0x800C3F34;
const int dword_800C5EB0 = 0x800C3F74;
const int dword_800C5EB4 = 0x800C3FEC;
const int dword_800C5EB8 = 0x800C4074;
const int dword_800C5EBC = 0x800C4094;
const int dword_800C5EC0 = 0x800C42A8;
const int dword_800C5EC4 = 0x800C42DC;
const char aChangec_800C5EC8[] = "change.c";
const short __attribute__ ((aligned (1))) dword_800C5F1A = -21109;
const int __attribute__ ((aligned (1))) dword_800C5F1E = 0x498FA790;
const int __attribute__ ((aligned (1))) dword_800C5F22 = -1249724009;
const int __attribute__ ((aligned (1))) dword_800C5F26 = -1249715070;
const int __attribute__ ((aligned (1))) dword_800C5F2A = 1115798914;
const int __attribute__ ((aligned (1))) dword_800C5F2E = -1854171638;
const int __attribute__ ((aligned (1))) dword_800C5F32 = -1985314100;
const int __attribute__ ((aligned (1))) dword_800C5F36 = -2103275012;
const int __attribute__ ((aligned (1))) dword_800C5F3A = -2098560333;
const int __attribute__ ((aligned (1))) dword_800C5F3E = -2103278908;
const int __attribute__ ((aligned (1))) dword_800C5F42 = -1467872535;
const int __attribute__ ((aligned (1))) dword_800C5F46 = -360531070;
const int __attribute__ ((aligned (1))) dword_800C5F4A = -1602049406;
const int __attribute__ ((aligned (1))) dword_800C5F4E = -595400574;
const int __attribute__ ((aligned (1))) dword_800C5F52 = 1115797378;
const short __attribute__ ((aligned (1))) word_800C5F56 = 0;
const int dword_800C5F58 = 33489153;
const int dword_800C5F5C = -255;
const int dword_800C5F60 = 0;
const int dword_800C5F64 = 0;
const int dword_800C5F68 = 0;

View File

@ -1,21 +0,0 @@
const short __attribute__ ((aligned (1))) dword_800C5F1A = -21109;
const int __attribute__ ((aligned (1))) dword_800C5F1E = 0x498FA790;
const int __attribute__ ((aligned (1))) dword_800C5F22 = -1249724009;
const int __attribute__ ((aligned (1))) dword_800C5F26 = -1249715070;
const int __attribute__ ((aligned (1))) dword_800C5F2A = 1115798914;
const int __attribute__ ((aligned (1))) dword_800C5F2E = -1854171638;
const int __attribute__ ((aligned (1))) dword_800C5F32 = -1985314100;
const int __attribute__ ((aligned (1))) dword_800C5F36 = -2103275012;
const int __attribute__ ((aligned (1))) dword_800C5F3A = -2098560333;
const int __attribute__ ((aligned (1))) dword_800C5F3E = -2103278908;
const int __attribute__ ((aligned (1))) dword_800C5F42 = -1467872535;
const int __attribute__ ((aligned (1))) dword_800C5F46 = -360531070;
const int __attribute__ ((aligned (1))) dword_800C5F4A = -1602049406;
const int __attribute__ ((aligned (1))) dword_800C5F4E = -595400574;
const int __attribute__ ((aligned (1))) dword_800C5F52 = 1115797378;
const short __attribute__ ((aligned (1))) word_800C5F56 = 0;
const int dword_800C5F58 = 33489153;
const int dword_800C5F5C = -255;
const int dword_800C5F60 = 0;
const int dword_800C5F64 = 0;
const int dword_800C5F68 = 0;