fix nonmatching songs

This commit is contained in:
DizzyEggg 2024-12-16 20:06:24 +01:00
parent dd75d9a445
commit 9a989c4aa8
8 changed files with 65 additions and 708 deletions

View File

@ -1,601 +1,8 @@
.section .rodata
#include "asm/macros/m4a.inc"
.include "MPlayDef.s"
.global gUnknown_9F87698
gUnknown_9F87698:
.incbin "baserom.gba", 0x1F87698, 0x14
.global seq_050
seq_050:
.incbin "baserom.gba", 0x1F876AC, 0x4
.4byte bank_000
.4byte gUnknown_9F87698
.global gUnknown_9F876B8
gUnknown_9F876B8:
.incbin "baserom.gba", 0x1F876B8, 0x4D
.global gUnknown_9F87705
gUnknown_9F87705:
.incbin "baserom.gba", 0x1F87705, 0x49
.global gUnknown_9F8774E
gUnknown_9F8774E:
.incbin "baserom.gba", 0x1F8774E, 0x53
.global gUnknown_9F877A1
gUnknown_9F877A1:
.incbin "baserom.gba", 0x1F877A1, 0x1D
.global gUnknown_9F877BE
gUnknown_9F877BE:
.incbin "baserom.gba", 0x1F877BE, 0x1E
.global seq_051
seq_051:
.incbin "baserom.gba", 0x1F877DC, 0x4
.4byte bank_000
.4byte gUnknown_9F876B8
.4byte gUnknown_9F87705
.4byte gUnknown_9F8774E
.4byte gUnknown_9F877A1
.4byte gUnknown_9F877BE
.global gUnknown_9F877F8
gUnknown_9F877F8:
.incbin "baserom.gba", 0x1F877F8, 0x47
.global gUnknown_9F8783F
gUnknown_9F8783F:
.incbin "baserom.gba", 0x1F8783F, 0x44
.global gUnknown_9F87883
gUnknown_9F87883:
.incbin "baserom.gba", 0x1F87883, 0x44
.global gUnknown_9F878C7
gUnknown_9F878C7:
.incbin "baserom.gba", 0x1F878C7, 0x1A
.global gUnknown_9F878E1
gUnknown_9F878E1:
.incbin "baserom.gba", 0x1F878E1, 0x1B
.global seq_052
seq_052:
.incbin "baserom.gba", 0x1F878FC, 0x4
.4byte bank_000
.4byte gUnknown_9F877F8
.4byte gUnknown_9F8783F
.4byte gUnknown_9F87883
.4byte gUnknown_9F878C7
.4byte gUnknown_9F878E1
.global gUnknown_9F87918
gUnknown_9F87918:
.incbin "baserom.gba", 0x1F87918, 0x13E
.global gUnknown_9F87A56
gUnknown_9F87A56:
.incbin "baserom.gba", 0x1F87A56, 0x35
.global gUnknown_9F87A8B
gUnknown_9F87A8B:
.incbin "baserom.gba", 0x1F87A8B, 0xDC
.global gUnknown_9F87B67
gUnknown_9F87B67:
.incbin "baserom.gba", 0x1F87B67, 0xDC
.global gUnknown_9F87C43
gUnknown_9F87C43:
.incbin "baserom.gba", 0x1F87C43, 0x219
.global gUnknown_9F87E5C
gUnknown_9F87E5C:
.incbin "baserom.gba", 0x1F87E5C, 0x1D8
.global gUnknown_9F88034
gUnknown_9F88034:
.incbin "baserom.gba", 0x1F88034, 0x41
.global gUnknown_9F88075
gUnknown_9F88075:
.incbin "baserom.gba", 0x1F88075, 0x23C
.global gUnknown_9F882B1
gUnknown_9F882B1:
.incbin "baserom.gba", 0x1F882B1, 0x47B
.global gUnknown_9F8872C
gUnknown_9F8872C:
.incbin "baserom.gba", 0x1F8872C, 0x3B6
.global gUnknown_9F88AE2
gUnknown_9F88AE2:
.incbin "baserom.gba", 0x1F88AE2, 0xAE
.global seq_100
seq_100:
.incbin "baserom.gba", 0x1F88B90, 0x4
.4byte bank_014
.4byte gUnknown_9F87918
.4byte gUnknown_9F87A56
.4byte gUnknown_9F87A8B
.4byte gUnknown_9F87B67
.4byte gUnknown_9F87C43
.4byte gUnknown_9F87E5C
.4byte gUnknown_9F88034
.4byte gUnknown_9F88075
.4byte gUnknown_9F882B1
.4byte gUnknown_9F8872C
.4byte gUnknown_9F88AE2
.global gUnknown_9F88BC4
gUnknown_9F88BC4:
.incbin "baserom.gba", 0x1F88BC4, 0x179
.global gUnknown_9F88D3D
gUnknown_9F88D3D:
.incbin "baserom.gba", 0x1F88D3D, 0x19B
.global gUnknown_9F88ED8
gUnknown_9F88ED8:
.incbin "baserom.gba", 0x1F88ED8, 0xD9
.global gUnknown_9F88FB1
gUnknown_9F88FB1:
.incbin "baserom.gba", 0x1F88FB1, 0x1EC
.global gUnknown_9F8919D
gUnknown_9F8919D:
.incbin "baserom.gba", 0x1F8919D, 0x201
.global gUnknown_9F8939E
gUnknown_9F8939E:
.incbin "baserom.gba", 0x1F8939E, 0x143
.global gUnknown_9F894E1
gUnknown_9F894E1:
.incbin "baserom.gba", 0x1F894E1, 0x220
.global gUnknown_9F89701
gUnknown_9F89701:
.incbin "baserom.gba", 0x1F89701, 0x11B
.global gUnknown_9F8981C
gUnknown_9F8981C:
.incbin "baserom.gba", 0x1F8981C, 0x17F
.global gUnknown_9F8999B
gUnknown_9F8999B:
.incbin "baserom.gba", 0x1F8999B, 0xC6
.global gUnknown_9F89A61
gUnknown_9F89A61:
.incbin "baserom.gba", 0x1F89A61, 0xD7
.global seq_101
seq_101:
.incbin "baserom.gba", 0x1F89B38, 0x4
.4byte bank_014
.4byte gUnknown_9F88BC4
.4byte gUnknown_9F88D3D
.4byte gUnknown_9F88ED8
.4byte gUnknown_9F88FB1
.4byte gUnknown_9F8919D
.4byte gUnknown_9F8939E
.4byte gUnknown_9F894E1
.4byte gUnknown_9F89701
.4byte gUnknown_9F8981C
.4byte gUnknown_9F8999B
.4byte gUnknown_9F89A61
.global gUnknown_9F89B6C
gUnknown_9F89B6C:
.incbin "baserom.gba", 0x1F89B6C, 0x1B2
.global gUnknown_9F89D1E
gUnknown_9F89D1E:
.incbin "baserom.gba", 0x1F89D1E, 0x39
.global gUnknown_9F89D57
gUnknown_9F89D57:
.incbin "baserom.gba", 0x1F89D57, 0x1C3
.global gUnknown_9F89F1A
gUnknown_9F89F1A:
.incbin "baserom.gba", 0x1F89F1A, 0x226
.global gUnknown_9F8A140
gUnknown_9F8A140:
.incbin "baserom.gba", 0x1F8A140, 0x179
.global gUnknown_9F8A2B9
gUnknown_9F8A2B9:
.incbin "baserom.gba", 0x1F8A2B9, 0x150
.global gUnknown_9F8A409
gUnknown_9F8A409:
.incbin "baserom.gba", 0x1F8A409, 0x1F6
.global gUnknown_9F8A5FF
gUnknown_9F8A5FF:
.incbin "baserom.gba", 0x1F8A5FF, 0x78
.global gUnknown_9F8A677
gUnknown_9F8A677:
.incbin "baserom.gba", 0x1F8A677, 0x12E
.global gUnknown_9F8A7A5
gUnknown_9F8A7A5:
.incbin "baserom.gba", 0x1F8A7A5, 0x34A
.global gUnknown_9F8AAEF
gUnknown_9F8AAEF:
.incbin "baserom.gba", 0x1F8AAEF, 0x2F0
.global gUnknown_9F8ADDF
gUnknown_9F8ADDF:
.incbin "baserom.gba", 0x1F8ADDF, 0x8D
.global seq_102
seq_102:
.incbin "baserom.gba", 0x1F8AE6C, 0x4
.4byte bank_014
.4byte gUnknown_9F89B6C
.4byte gUnknown_9F89D1E
.4byte gUnknown_9F89D57
.4byte gUnknown_9F89F1A
.4byte gUnknown_9F8A140
.4byte gUnknown_9F8A2B9
.4byte gUnknown_9F8A409
.4byte gUnknown_9F8A5FF
.4byte gUnknown_9F8A677
.4byte gUnknown_9F8A7A5
.4byte gUnknown_9F8AAEF
.4byte gUnknown_9F8ADDF
.global gUnknown_9F8AEA4
gUnknown_9F8AEA4:
.incbin "baserom.gba", 0x1F8AEA4, 0x29D
.global gUnknown_9F8B141
gUnknown_9F8B141:
.incbin "baserom.gba", 0x1F8B141, 0x171
.global gUnknown_9F8B2B2
gUnknown_9F8B2B2:
.incbin "baserom.gba", 0x1F8B2B2, 0x6E
.global gUnknown_9F8B320
gUnknown_9F8B320:
.incbin "baserom.gba", 0x1F8B320, 0x8B
.global gUnknown_9F8B3AB
gUnknown_9F8B3AB:
.incbin "baserom.gba", 0x1F8B3AB, 0x1A4
.global gUnknown_9F8B54F
gUnknown_9F8B54F:
.incbin "baserom.gba", 0x1F8B54F, 0xCD
.global gUnknown_9F8B61C
gUnknown_9F8B61C:
.incbin "baserom.gba", 0x1F8B61C, 0x113
.global gUnknown_9F8B72F
gUnknown_9F8B72F:
.incbin "baserom.gba", 0x1F8B72F, 0x92
.global gUnknown_9F8B7C1
gUnknown_9F8B7C1:
.incbin "baserom.gba", 0x1F8B7C1, 0x260
.global gUnknown_9F8BA21
gUnknown_9F8BA21:
.incbin "baserom.gba", 0x1F8BA21, 0x3CB
.global gUnknown_9F8BDEC
gUnknown_9F8BDEC:
.incbin "baserom.gba", 0x1F8BDEC, 0x3B4
.global seq_103
seq_103:
.incbin "baserom.gba", 0x1F8C1A0, 0x4
.4byte bank_014
.4byte gUnknown_9F8AEA4
.4byte gUnknown_9F8B141
.4byte gUnknown_9F8B2B2
.4byte gUnknown_9F8B320
.4byte gUnknown_9F8B3AB
.4byte gUnknown_9F8B54F
.4byte gUnknown_9F8B61C
.4byte gUnknown_9F8B72F
.4byte gUnknown_9F8B7C1
.4byte gUnknown_9F8BA21
.4byte gUnknown_9F8BDEC
.global gUnknown_9F8C1D4
gUnknown_9F8C1D4:
.incbin "baserom.gba", 0x1F8C1D4, 0x100
.global gUnknown_9F8C2D4
gUnknown_9F8C2D4:
.incbin "baserom.gba", 0x1F8C2D4, 0x310
.global gUnknown_9F8C5E4
gUnknown_9F8C5E4:
.incbin "baserom.gba", 0x1F8C5E4, 0x190
.global gUnknown_9F8C774
gUnknown_9F8C774:
.incbin "baserom.gba", 0x1F8C774, 0x2F6
.global gUnknown_9F8CA6A
gUnknown_9F8CA6A:
.incbin "baserom.gba", 0x1F8CA6A, 0x2CB
.global gUnknown_9F8CD35
gUnknown_9F8CD35:
.incbin "baserom.gba", 0x1F8CD35, 0x281
.global gUnknown_9F8CFB6
gUnknown_9F8CFB6:
.incbin "baserom.gba", 0x1F8CFB6, 0x2F1
.global gUnknown_9F8D2A7
gUnknown_9F8D2A7:
.incbin "baserom.gba", 0x1F8D2A7, 0x1F5
.global gUnknown_9F8D49C
gUnknown_9F8D49C:
.incbin "baserom.gba", 0x1F8D49C, 0x2B8
.global gUnknown_9F8D754
gUnknown_9F8D754:
.incbin "baserom.gba", 0x1F8D754, 0x215
.global gUnknown_9F8D969
gUnknown_9F8D969:
.incbin "baserom.gba", 0x1F8D969, 0x242
.global gUnknown_9F8DBAB
gUnknown_9F8DBAB:
.incbin "baserom.gba", 0x1F8DBAB, 0x151
.global seq_104
seq_104:
.incbin "baserom.gba", 0x1F8DCFC, 0x4
.4byte bank_014
.4byte gUnknown_9F8C1D4
.4byte gUnknown_9F8C2D4
.4byte gUnknown_9F8C5E4
.4byte gUnknown_9F8C774
.4byte gUnknown_9F8CA6A
.4byte gUnknown_9F8CD35
.4byte gUnknown_9F8CFB6
.4byte gUnknown_9F8D2A7
.4byte gUnknown_9F8D49C
.4byte gUnknown_9F8D754
.4byte gUnknown_9F8D969
.4byte gUnknown_9F8DBAB
.global gUnknown_9F8DD34
gUnknown_9F8DD34:
.incbin "baserom.gba", 0x1F8DD34, 0x13C
.global gUnknown_9F8DE70
gUnknown_9F8DE70:
.incbin "baserom.gba", 0x1F8DE70, 0x16D
.global gUnknown_9F8DFDD
gUnknown_9F8DFDD:
.incbin "baserom.gba", 0x1F8DFDD, 0x195
.global gUnknown_9F8E172
gUnknown_9F8E172:
.incbin "baserom.gba", 0x1F8E172, 0x199
.global gUnknown_9F8E30B
gUnknown_9F8E30B:
.incbin "baserom.gba", 0x1F8E30B, 0x14D
.global gUnknown_9F8E458
gUnknown_9F8E458:
.incbin "baserom.gba", 0x1F8E458, 0x173
.global gUnknown_9F8E5CB
gUnknown_9F8E5CB:
.incbin "baserom.gba", 0x1F8E5CB, 0xAA
.global gUnknown_9F8E675
gUnknown_9F8E675:
.incbin "baserom.gba", 0x1F8E675, 0x99
.global gUnknown_9F8E70E
gUnknown_9F8E70E:
.incbin "baserom.gba", 0x1F8E70E, 0x1CA
.global gUnknown_9F8E8D8
gUnknown_9F8E8D8:
.incbin "baserom.gba", 0x1F8E8D8, 0x4A6
.global gUnknown_9F8ED7E
gUnknown_9F8ED7E:
.incbin "baserom.gba", 0x1F8ED7E, 0x4A6
.global gUnknown_9F8F224
gUnknown_9F8F224:
.incbin "baserom.gba", 0x1F8F224, 0x160
.global seq_105
seq_105:
.incbin "baserom.gba", 0x1F8F384, 0x4
.4byte bank_014
.4byte gUnknown_9F8DD34
.4byte gUnknown_9F8DE70
.4byte gUnknown_9F8DFDD
.4byte gUnknown_9F8E172
.4byte gUnknown_9F8E30B
.4byte gUnknown_9F8E458
.4byte gUnknown_9F8E5CB
.4byte gUnknown_9F8E675
.4byte gUnknown_9F8E70E
.4byte gUnknown_9F8E8D8
.4byte gUnknown_9F8ED7E
.4byte gUnknown_9F8F224
.global gUnknown_9F8F3BC
gUnknown_9F8F3BC:
.incbin "baserom.gba", 0x1F8F3BC, 0x42
.global gUnknown_9F8F3FE
gUnknown_9F8F3FE:
.incbin "baserom.gba", 0x1F8F3FE, 0x26C
.global gUnknown_9F8F66A
gUnknown_9F8F66A:
.incbin "baserom.gba", 0x1F8F66A, 0x90
.global gUnknown_9F8F6FA
gUnknown_9F8F6FA:
.incbin "baserom.gba", 0x1F8F6FA, 0x123
.global gUnknown_9F8F81D
gUnknown_9F8F81D:
.incbin "baserom.gba", 0x1F8F81D, 0x91
.global gUnknown_9F8F8AE
gUnknown_9F8F8AE:
.incbin "baserom.gba", 0x1F8F8AE, 0xFC
.global gUnknown_9F8F9AA
gUnknown_9F8F9AA:
.incbin "baserom.gba", 0x1F8F9AA, 0x9F
.global gUnknown_9F8FA49
gUnknown_9F8FA49:
.incbin "baserom.gba", 0x1F8FA49, 0xC0
.global gUnknown_9F8FB09
gUnknown_9F8FB09:
.incbin "baserom.gba", 0x1F8FB09, 0x120
.global gUnknown_9F8FC29
gUnknown_9F8FC29:
.incbin "baserom.gba", 0x1F8FC29, 0x123
.global seq_106
seq_106:
.incbin "baserom.gba", 0x1F8FD4C, 0x4
.4byte bank_014
.4byte gUnknown_9F8F3BC
.4byte gUnknown_9F8F3FE
.4byte gUnknown_9F8F66A
.4byte gUnknown_9F8F6FA
.4byte gUnknown_9F8F81D
.4byte gUnknown_9F8F8AE
.4byte gUnknown_9F8F9AA
.4byte gUnknown_9F8FA49
.4byte gUnknown_9F8FB09
.4byte gUnknown_9F8FC29
.global gUnknown_9F8FD7C
gUnknown_9F8FD7C:
.incbin "baserom.gba", 0x1F8FD7C, 0x110
.global gUnknown_9F8FE8C
gUnknown_9F8FE8C:
.incbin "baserom.gba", 0x1F8FE8C, 0x16E
.global gUnknown_9F8FFFA
gUnknown_9F8FFFA:
.incbin "baserom.gba", 0x1F8FFFA, 0x112
.global gUnknown_9F9010C
gUnknown_9F9010C:
.incbin "baserom.gba", 0x1F9010C, 0x113
.global gUnknown_9F9021F
gUnknown_9F9021F:
.incbin "baserom.gba", 0x1F9021F, 0xA4
.global gUnknown_9F902C3
gUnknown_9F902C3:
.incbin "baserom.gba", 0x1F902C3, 0x1D1
.global gUnknown_9F90494
gUnknown_9F90494:
.incbin "baserom.gba", 0x1F90494, 0xD8
.global gUnknown_9F9056C
gUnknown_9F9056C:
.incbin "baserom.gba", 0x1F9056C, 0x2AD
.global gUnknown_9F90819
gUnknown_9F90819:
.incbin "baserom.gba", 0x1F90819, 0x335
.global gUnknown_9F90B4E
gUnknown_9F90B4E:
.incbin "baserom.gba", 0x1F90B4E, 0x338
.global gUnknown_9F90E86
gUnknown_9F90E86:
.incbin "baserom.gba", 0x1F90E86, 0xEA
.global seq_107
seq_107:
.incbin "baserom.gba", 0x1F90F70, 0x4
.4byte bank_014
.4byte gUnknown_9F8FD7C
.4byte gUnknown_9F8FE8C
.4byte gUnknown_9F8FFFA
.4byte gUnknown_9F9010C
.4byte gUnknown_9F9021F
.4byte gUnknown_9F902C3
.4byte gUnknown_9F90494
.4byte gUnknown_9F9056C
.4byte gUnknown_9F90819
.4byte gUnknown_9F90B4E
.4byte gUnknown_9F90E86
.global gUnknown_9F90FA4
gUnknown_9F90FA4:
.incbin "baserom.gba", 0x1F90FA4, 0x26A
.global gUnknown_9F9120E
gUnknown_9F9120E:
.incbin "baserom.gba", 0x1F9120E, 0x3C9
.global gUnknown_9F915D7
gUnknown_9F915D7:
.incbin "baserom.gba", 0x1F915D7, 0x3D9
.global gUnknown_9F919B0
gUnknown_9F919B0:
.incbin "baserom.gba", 0x1F919B0, 0x16D
.global gUnknown_9F91B1D
gUnknown_9F91B1D:
.incbin "baserom.gba", 0x1F91B1D, 0x29F
.global gUnknown_9F91DBC
gUnknown_9F91DBC:
.incbin "baserom.gba", 0x1F91DBC, 0x3D8
.global gUnknown_9F92194
gUnknown_9F92194:
.incbin "baserom.gba", 0x1F92194, 0x246
.global gUnknown_9F923DA
gUnknown_9F923DA:
.incbin "baserom.gba", 0x1F923DA, 0x4DD
.global gUnknown_9F928B7
gUnknown_9F928B7:
.incbin "baserom.gba", 0x1F928B7, 0x8F2
.global gUnknown_9F931A9
gUnknown_9F931A9:
.incbin "baserom.gba", 0x1F931A9, 0x8BD
.global gUnknown_9F93A66
gUnknown_9F93A66:
.incbin "baserom.gba", 0x1F93A66, 0x1FA
.global seq_108
seq_108:
.incbin "baserom.gba", 0x1F93C60, 0x4
.4byte bank_014
.4byte gUnknown_9F90FA4
.4byte gUnknown_9F9120E
.4byte gUnknown_9F915D7
.4byte gUnknown_9F919B0
.4byte gUnknown_9F91B1D
.4byte gUnknown_9F91DBC
.4byte gUnknown_9F92194
.4byte gUnknown_9F923DA
.4byte gUnknown_9F928B7
.4byte gUnknown_9F931A9
.4byte gUnknown_9F93A66
.global gUnknown_9F93C94
gUnknown_9F93C94:
.incbin "baserom.gba", 0x1F93C94, 0xBE
.global gUnknown_9F93D52
gUnknown_9F93D52:
.incbin "baserom.gba", 0x1F93D52, 0x140
.global gUnknown_9F93E92
gUnknown_9F93E92:
.incbin "baserom.gba", 0x1F93E92, 0x2C9
.global gUnknown_9F9415B
gUnknown_9F9415B:
.incbin "baserom.gba", 0x1F9415B, 0xE9
.global gUnknown_9F94244
gUnknown_9F94244:
.incbin "baserom.gba", 0x1F94244, 0x1B5
.global gUnknown_9F943F9
gUnknown_9F943F9:
.incbin "baserom.gba", 0x1F943F9, 0xEE
.global gUnknown_9F944E7
gUnknown_9F944E7:
.incbin "baserom.gba", 0x1F944E7, 0x161
.global gUnknown_9F94648
gUnknown_9F94648:
.incbin "baserom.gba", 0x1F94648, 0x1B3
.global gUnknown_9F947FB
gUnknown_9F947FB:
.incbin "baserom.gba", 0x1F947FB, 0x498
.global gUnknown_9F94C93
gUnknown_9F94C93:
.incbin "baserom.gba", 0x1F94C93, 0x253
.global gUnknown_9F94EE6
gUnknown_9F94EE6:
.incbin "baserom.gba", 0x1F94EE6, 0xD6
.global seq_109
seq_109:
.incbin "baserom.gba", 0x1F94FBC, 0x4
.4byte bank_014
.4byte gUnknown_9F93C94
.4byte gUnknown_9F93D52
.4byte gUnknown_9F93E92
.4byte gUnknown_9F9415B
.4byte gUnknown_9F94244
.4byte gUnknown_9F943F9
.4byte gUnknown_9F944E7
.4byte gUnknown_9F94648
.4byte gUnknown_9F947FB
.4byte gUnknown_9F94C93
.4byte gUnknown_9F94EE6
.global gUnknown_9F94FF0
gUnknown_9F94FF0:
.incbin "baserom.gba", 0x1F94FF0, 0x110
.global gUnknown_9F95100
gUnknown_9F95100:
.incbin "baserom.gba", 0x1F95100, 0x170
.global gUnknown_9F95270
gUnknown_9F95270:
.incbin "baserom.gba", 0x1F95270, 0x196
.global gUnknown_9F95406
gUnknown_9F95406:
.incbin "baserom.gba", 0x1F95406, 0x1CA
.global gUnknown_9F955D0
gUnknown_9F955D0:
.incbin "baserom.gba", 0x1F955D0, 0x122
.global gUnknown_9F956F2
gUnknown_9F956F2:
.incbin "baserom.gba", 0x1F956F2, 0x2A1
.global gUnknown_9F95993
gUnknown_9F95993:
.incbin "baserom.gba", 0x1F95993, 0x1DD
.global gUnknown_9F95B70
gUnknown_9F95B70:
.incbin "baserom.gba", 0x1F95B70, 0x171
.global gUnknown_9F95CE1
gUnknown_9F95CE1:
.incbin "baserom.gba", 0x1F95CE1, 0x1D6
.global gUnknown_9F95EB7
gUnknown_9F95EB7:
.incbin "baserom.gba", 0x1F95EB7, 0x1D2
.global gUnknown_9F96089
gUnknown_9F96089:
.incbin "baserom.gba", 0x1F96089, 0x107
.global seq_110
seq_110:
.incbin "baserom.gba", 0x1F96190, 0x4
.4byte bank_014
.4byte gUnknown_9F94FF0
.4byte gUnknown_9F95100
.4byte gUnknown_9F95270
.4byte gUnknown_9F95406
.4byte gUnknown_9F955D0
.4byte gUnknown_9F956F2
.4byte gUnknown_9F95993
.4byte gUnknown_9F95B70
.4byte gUnknown_9F95CE1
.4byte gUnknown_9F95EB7
.4byte gUnknown_9F96089
.global gUnknown_9F961C4
gUnknown_9F961C4:
.incbin "baserom.gba", 0x1F961C4, 0x181

View File

@ -808,7 +808,7 @@ sound/songs/seq_011.o(.rodata);
sound/songs/seq_012.o(.rodata);
sound/songs/seq_013.o(.rodata);
sound/songs/seq_014.o(.rodata);
sound/songs/seq_015_raw.o(.rodata);
sound/songs/seq_015.o(.rodata);
sound/songs/seq_016.o(.rodata);
sound/songs/seq_017.o(.rodata);
sound/songs/seq_018.o(.rodata);
@ -837,9 +837,23 @@ sound/songs/seq_040.o(.rodata);
sound/songs/seq_041.o(.rodata);
sound/songs/seq_042.o(.rodata);
sound/songs/seq_043.o(.rodata);
sound/songs/seq_044_raw.o(.rodata);
sound/songs/seq_044.o(.rodata);
sound/songs/seq_045.o(.rodata);
sound/songs/seq_046.o(.rodata);
sound/songs/seq_050.o(.rodata);
sound/songs/seq_051.o(.rodata);
sound/songs/seq_052.o(.rodata);
sound/songs/seq_100.o(.rodata);
sound/songs/seq_101.o(.rodata);
sound/songs/seq_102.o(.rodata);
sound/songs/seq_103.o(.rodata);
sound/songs/seq_104.o(.rodata);
sound/songs/seq_105.o(.rodata);
sound/songs/seq_106.o(.rodata);
sound/songs/seq_107.o(.rodata);
sound/songs/seq_108.o(.rodata);
sound/songs/seq_109.o(.rodata);
sound/songs/seq_110.o(.rodata);
data/sound_data2.o(.rodata);
data/sound_data3.o(.rodata);

View File

@ -638,6 +638,7 @@ seq_015_0:
.byte W01
.byte GOTO
.word seq_015_0 + 0x13
.byte W72, W72, W72
.byte FINE
@*********************** Track 02 ***********************@
@ -1151,6 +1152,7 @@ seq_015_1:
.byte W12
.byte GOTO
.word seq_015_1 + 0xE
.byte W72, W72, W72
.byte FINE
@*********************** Track 03 ***********************@
@ -1284,6 +1286,7 @@ seq_015_2:
.byte W72
.byte GOTO
.word seq_015_2 + 0xB
.byte W72, W72, W72
.byte FINE
@*********************** Track 04 ***********************@
@ -1538,6 +1541,7 @@ seq_015_3:
.byte W12
.byte GOTO
.word seq_015_3 + 0xC
.byte W72, W72, W72
.byte FINE
@*********************** Track 05 ***********************@
@ -1795,6 +1799,7 @@ seq_015_4:
.byte W12
.byte GOTO
.word seq_015_4 + 0xC
.byte W72, W72, W72
.byte FINE
@*********************** Track 06 ***********************@
@ -2039,6 +2044,7 @@ seq_015_5:
.byte W36
.byte GOTO
.word seq_015_5 + 0xC
.byte W72, W72, W72
.byte FINE
@*********************** Track 07 ***********************@
@ -2285,6 +2291,7 @@ seq_015_6:
.byte W36
.byte GOTO
.word seq_015_6 + 0xC
.byte W72, W72, W72
.byte FINE
@*********************** Track 08 ***********************@
@ -2621,6 +2628,7 @@ seq_015_7:
.byte W01
.byte GOTO
.word seq_015_7 + 0xC
.byte W72, W72, W72
.byte FINE
@*********************** Track 09 ***********************@
@ -2725,6 +2733,7 @@ seq_015_8:
.word seq_015_8 + 0x78
.byte GOTO
.word seq_015_8 + 0xC
.byte W72, W72, W72
.byte FINE
@*********************** Track 10 ***********************@
@ -3509,6 +3518,7 @@ seq_015_9:
.byte W12
.byte GOTO
.word seq_015_9 + 0x13
.byte W72, W72, W72
.byte FINE
@*********************** Track 11 ***********************@
@ -4124,6 +4134,7 @@ seq_015_10:
.byte W12
.byte GOTO
.word seq_015_10 + 0x13
.byte W72, W72, W72
.byte FINE
@*********************** Track 12 ***********************@
@ -4492,6 +4503,7 @@ seq_015_11:
.byte W12
.byte GOTO
.word seq_015_11 + 0xC
.byte W72, W72, W72
.byte FINE
@******************************************************@

View File

@ -1,56 +0,0 @@
.section .rodata
#include "asm/macros/m4a.inc"
.global gUnknown_9F5B5CC
gUnknown_9F5B5CC:
.incbin "baserom.gba", 0x1F5B5CC, 0x39C
.global gUnknown_9F5B968
gUnknown_9F5B968:
.incbin "baserom.gba", 0x1F5B968, 0x2E6
.global gUnknown_9F5BC4E
gUnknown_9F5BC4E:
.incbin "baserom.gba", 0x1F5BC4E, 0xB3
.global gUnknown_9F5BD01
gUnknown_9F5BD01:
.incbin "baserom.gba", 0x1F5BD01, 0x188
.global gUnknown_9F5BE89
gUnknown_9F5BE89:
.incbin "baserom.gba", 0x1F5BE89, 0x191
.global gUnknown_9F5C01A
gUnknown_9F5C01A:
.incbin "baserom.gba", 0x1F5C01A, 0x185
.global gUnknown_9F5C19F
gUnknown_9F5C19F:
.incbin "baserom.gba", 0x1F5C19F, 0x188
.global gUnknown_9F5C327
gUnknown_9F5C327:
.incbin "baserom.gba", 0x1F5C327, 0x1FC
.global gUnknown_9F5C523
gUnknown_9F5C523:
.incbin "baserom.gba", 0x1F5C523, 0xAF
.global gUnknown_9F5C5D2
gUnknown_9F5C5D2:
.incbin "baserom.gba", 0x1F5C5D2, 0x43F
.global gUnknown_9F5CA11
gUnknown_9F5CA11:
.incbin "baserom.gba", 0x1F5CA11, 0x335
.global gUnknown_9F5CD46
gUnknown_9F5CD46:
.incbin "baserom.gba", 0x1F5CD46, 0x246
.global seq_015
seq_015:
.incbin "baserom.gba", 0x1F5CF8C, 0x4
.4byte bank_000
.4byte gUnknown_9F5B5CC
.4byte gUnknown_9F5B968
.4byte gUnknown_9F5BC4E
.4byte gUnknown_9F5BD01
.4byte gUnknown_9F5BE89
.4byte gUnknown_9F5C01A
.4byte gUnknown_9F5C19F
.4byte gUnknown_9F5C327
.4byte gUnknown_9F5C523
.4byte gUnknown_9F5C5D2
.4byte gUnknown_9F5CA11
.4byte gUnknown_9F5CD46

View File

@ -431,6 +431,8 @@ seq_044_0:
.byte W96
.byte GOTO
.word seq_044_0 + 0x125
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte TEMPO, 80 / 2
.byte FINE
@*********************** Track 02 ***********************@
@ -1009,6 +1011,7 @@ seq_044_1:
.byte W24
.byte GOTO
.word seq_044_1 + 0x17F
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 03 ***********************@
@ -2000,6 +2003,7 @@ seq_044_2:
.byte W96
.byte GOTO
.word seq_044_2 + 0x413
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 04 ***********************@
@ -2506,6 +2510,7 @@ seq_044_3:
.byte W96
.byte GOTO
.word seq_044_3 + 0x1F6
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 05 ***********************@
@ -3787,6 +3792,7 @@ seq_044_4:
.word seq_044_4 + 0x399
.byte GOTO
.word seq_044_4 + 0x3E8
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 06 ***********************@
@ -5069,6 +5075,7 @@ seq_044_5:
.word seq_044_5 + 0x39A
.byte GOTO
.word seq_044_5 + 0x3EA
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 07 ***********************@
@ -6246,6 +6253,7 @@ seq_044_6:
.word seq_044_6 + 0x30E
.byte GOTO
.word seq_044_6 + 0x385
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 08 ***********************@
@ -7302,6 +7310,7 @@ seq_044_7:
.word seq_044_7 + 0x265
.byte GOTO
.word seq_044_7 + 0x2C2
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 09 ***********************@
@ -7621,6 +7630,7 @@ seq_044_8:
.byte W96
.byte GOTO
.word seq_044_8 + 0x166
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 10 ***********************@
@ -8570,6 +8580,7 @@ seq_044_9:
.word seq_044_9 + 0x31D
.byte GOTO
.word seq_044_9 + 0x354
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 11 ***********************@
@ -8861,6 +8872,7 @@ seq_044_10:
.word seq_044_10 + 0xC2
.byte GOTO
.word seq_044_10 + 0x14D
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@*********************** Track 12 ***********************@
@ -9081,6 +9093,7 @@ seq_044_11:
.word seq_044_11 + 0x168
.byte GOTO
.word seq_044_11 + 0xD6
.byte W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96, W96
.byte FINE
@******************************************************@

View File

@ -1,56 +0,0 @@
.section .rodata
#include "asm/macros/m4a.inc"
.global gUnknown_9F83AC0
gUnknown_9F83AC0:
.incbin "baserom.gba", 0x1F83AC0, 0x274
.global gUnknown_9F83D34
gUnknown_9F83D34:
.incbin "baserom.gba", 0x1F83D34, 0x306
.global gUnknown_9F8403A
gUnknown_9F8403A:
.incbin "baserom.gba", 0x1F8403A, 0x4E2
.global gUnknown_9F8451C
gUnknown_9F8451C:
.incbin "baserom.gba", 0x1F8451C, 0x239
.global gUnknown_9F84755
gUnknown_9F84755:
.incbin "baserom.gba", 0x1F84755, 0x5CB
.global gUnknown_9F84D20
gUnknown_9F84D20:
.incbin "baserom.gba", 0x1F84D20, 0x5CB
.global gUnknown_9F852EB
gUnknown_9F852EB:
.incbin "baserom.gba", 0x1F852EB, 0x5C4
.global gUnknown_9F858AF
gUnknown_9F858AF:
.incbin "baserom.gba", 0x1F858AF, 0x508
.global gUnknown_9F85DB7
gUnknown_9F85DB7:
.incbin "baserom.gba", 0x1F85DB7, 0x221
.global gUnknown_9F85FD8
gUnknown_9F85FD8:
.incbin "baserom.gba", 0x1F85FD8, 0x442
.global gUnknown_9F8641A
gUnknown_9F8641A:
.incbin "baserom.gba", 0x1F8641A, 0x241
.global gUnknown_9F8665B
gUnknown_9F8665B:
.incbin "baserom.gba", 0x1F8665B, 0x1AD
.global seq_044
seq_044:
.incbin "baserom.gba", 0x1F86808, 0x4
.4byte bank_000
.4byte gUnknown_9F83AC0
.4byte gUnknown_9F83D34
.4byte gUnknown_9F8403A
.4byte gUnknown_9F8451C
.4byte gUnknown_9F84755
.4byte gUnknown_9F84D20
.4byte gUnknown_9F852EB
.4byte gUnknown_9F858AF
.4byte gUnknown_9F85DB7
.4byte gUnknown_9F85FD8
.4byte gUnknown_9F8641A
.4byte gUnknown_9F8665B

View File

@ -66,6 +66,7 @@ seq_106_0:
.byte W96
.byte GOTO
.word seq_106_0 + 0x10
.byte W96, W96
.byte FINE
@*********************** Track 02 ***********************@
@ -463,6 +464,7 @@ seq_106_1:
.byte W02
.byte GOTO
.word seq_106_1 + 0x14
.byte W96, W96
.byte FINE
@*********************** Track 03 ***********************@
@ -537,6 +539,7 @@ seq_106_2:
.word seq_106_2 + 0x2F
.byte GOTO
.word seq_106_2 + 0x17
.byte W96, W96
.byte FINE
@*********************** Track 04 ***********************@
@ -738,6 +741,7 @@ seq_106_3:
.byte W09
.byte GOTO
.word seq_106_3 + 0x15
.byte W96, W96
.byte FINE
@*********************** Track 05 ***********************@
@ -813,6 +817,7 @@ seq_106_4:
.word seq_106_4 + 0x30
.byte GOTO
.word seq_106_4 + 0x18
.byte W96, W96
.byte FINE
@*********************** Track 06 ***********************@
@ -965,6 +970,7 @@ seq_106_5:
.word seq_106_5 + 0x4A
.byte GOTO
.word seq_106_5 + 0x1E
.byte W96, W96
.byte FINE
@*********************** Track 07 ***********************@
@ -1051,6 +1057,7 @@ seq_106_6:
.byte W01
.byte GOTO
.word seq_106_6 + 0xC
.byte W96, W96
.byte FINE
@*********************** Track 08 ***********************@
@ -1162,6 +1169,7 @@ seq_106_7:
.word seq_106_7 + 0x3B
.byte GOTO
.word seq_106_7 + 0x18
.byte W96, W96
.byte FINE
@*********************** Track 09 ***********************@
@ -1311,6 +1319,7 @@ seq_106_8:
.word seq_106_8 + 0x65
.byte GOTO
.word seq_106_8 + 0xC
.byte W96, W96
.byte FINE
@*********************** Track 10 ***********************@
@ -1462,6 +1471,7 @@ seq_106_9:
.word seq_106_9 + 0x66
.byte GOTO
.word seq_106_9 + 0xC
.byte W96, W96
.byte FINE
@******************************************************@

View File

@ -162,10 +162,12 @@ seq_110_0:
.byte W24
.byte GOTO
.word seq_110_0 + 0x14
.byte W96, W96
.byte FINE
@*********************** Track 02 ***********************@
.global seq_110_1
seq_110_1:
.byte KEYSH , seq_110_key+0
.byte VOICE , 12
@ -394,10 +396,12 @@ seq_110_1:
.byte W03
.byte GOTO
.word seq_110_1 + 0x15
.byte W96, W96
.byte FINE
@*********************** Track 03 ***********************@
.global seq_110_2
seq_110_2:
.byte KEYSH , seq_110_key+0
.byte VOICE , 12
@ -666,6 +670,7 @@ seq_110_2:
.byte W02
.byte GOTO
.word seq_110_2 + 0x15
.byte W96, W96
.byte FINE
@*********************** Track 04 ***********************@
@ -951,6 +956,7 @@ seq_110_3:
.word seq_110_3 + 0x15
.byte GOTO
.word seq_110_3 + 0x88
.byte W96, W96
.byte FINE
@*********************** Track 05 ***********************@
@ -1109,6 +1115,7 @@ seq_110_4:
.byte W04
.byte GOTO
.word seq_110_4 + 0x16
.byte W96, W96
.byte FINE
@*********************** Track 06 ***********************@
@ -1511,6 +1518,7 @@ seq_110_5:
.byte W01
.byte GOTO
.word seq_110_5 + 0x16
.byte W96, W96
.byte FINE
@*********************** Track 07 ***********************@
@ -1827,6 +1835,7 @@ seq_110_6:
.word seq_110_6 + 0x18
.byte GOTO
.word seq_110_6 + 0x98
.byte W96, W96
.byte FINE
@*********************** Track 08 ***********************@
@ -2074,6 +2083,7 @@ seq_110_7:
.byte W96
.byte GOTO
.word seq_110_7 + 0x16
.byte W96, W96
.byte FINE
@*********************** Track 09 ***********************@
@ -2349,6 +2359,7 @@ seq_110_8:
.byte W01
.byte GOTO
.word seq_110_8 + 0x53
.byte W96, W96
.byte FINE
@*********************** Track 10 ***********************@
@ -2622,6 +2633,7 @@ seq_110_9:
.byte W01
.byte GOTO
.word seq_110_9 + 0x53
.byte W96, W96
.byte FINE
@*********************** Track 11 ***********************@
@ -2771,6 +2783,7 @@ seq_110_10:
.byte W06
.byte GOTO
.word seq_110_10 + 0xD
.byte W96, W96
.byte FINE
@******************************************************@