Skip to content

Commit 10387a4

Browse files
committed
B/Album/HG: Update Fantasy
1 parent e58cffd commit 10387a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+76316
-76180
lines changed

MUSIC/EXPORTS/lvlset_Album/musicDefines.h

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,119 @@
11
#define song_okiba_crackdown 0
22
#define song_fingerbang 1
33
#define song_nine_circles 2
4-
#define song_menu_theme 3
4+
#define song_menu_theme_b_sides 3
55
#define song_thermodynamix_full 4
6-
#define song_every_end_pt2 5
7-
#define song_space_pirates_gdw_cut 6
6+
#define song_menu_theme 5
7+
#define song_every_end_pt2 6
88
#define song_freedom_dive 7
9-
#define song_lost 8
10-
#define song_chaoz_impact 9
11-
#define song_infernoplex_full 10
9+
#define song_youve_been_trolled 8
10+
#define song_infernoplex_full 9
11+
#define song_scheming_weasel 10
1212
#define song_dash_full 11
13-
#define song_ultimatedestruction 12
14-
#define song_candyland 13
13+
#define song_repmuj 12
14+
#define song_dance_of_the_violins 13
1515
#define song_subtle_oddities 14
16-
#define song_stereo_madness 15
17-
#define song_atthespeedoflightfull 16
18-
#define song_the_angel 17
19-
#define song_xo 18
20-
#define song_holography 19
16+
#define song_atthespeedoflightfull 15
17+
#define song_ground_to_space 16
18+
#define song_midnight 17
19+
#define song_the_angel 18
20+
#define song_stereo_madness 19
2121
#define song_time_machine_full 20
22-
#define song_blacklight 21
22+
#define song_meltdown 21
2323
#define song_whats_a_future_funk 22
2424
#define song_clutterfunk 23
25-
#define song_blast_processing 24
25+
#define song_sonic_blaster 24
2626
#define song_every_end_pt1 25
27-
#define song_jack_russel 26
28-
#define song_practice 27
29-
#define song_death_moon 28
30-
#define song_endgame 29
27+
#define song_pursuit 26
28+
#define song_theory_of_everything 27
29+
#define song_practice 28
30+
#define song_electroman_adventures 29
3131
#define song_just_right_full 30
32-
#define song_isolation 31
33-
#define song_hsad 32
32+
#define song_beep_beep 31
33+
#define song_isolation 32
3434
#define song_polargeist 33
35-
#define song_idols 34
35+
#define song_hsad 34
3636
#define song_fingerdash 35
37-
#define song_clutterfunk_2 36
38-
#define song_beep_beep 37
37+
#define song_stalemate_full 36
38+
#define song_bit_of_a_vibe 37
3939
#define song_chaoz_airflow 38
4040
#define song_toe_2 39
41-
#define song_stalemate_full 40
41+
#define song_endgame 40
4242
#define song_geometrical_dominator 41
43-
#define song_bit_of_a_vibe 42
43+
#define song_idols 42
4444
#define song_electrodynamix 43
45-
#define song_check_out 44
45+
#define song_free_mind 44
4646
#define song_back_on_track_full 45
47-
#define song_clubstep_full 46
48-
#define song_eighto_full 47
49-
#define song_magic_touch 48
47+
#define song_check_out 46
48+
#define song_clubstep_full 47
49+
#define song_eighto_full 48
5050
#define song_hexagon_force 49
5151
#define song_factory_time 50
52-
#define song_cant_let_go 51
53-
#define song_cryogenic 52
54-
#define song_free_mind 53
55-
#define song_electroman_adventures 54
56-
#define song_rainbow_tylenol 55
57-
#define song_the_seven_seas 56
58-
#define song_theory_of_everything 57
59-
#define song_glitch_gremlin 58
60-
#define song_press_start 59
61-
#define song_deadlocked 60
62-
#define song_fantasy 61
63-
#define song_mayhem 62
64-
#define song_fire_aura 63
65-
#define song_haunted_woods 64
66-
#define song_pursuit 65
67-
#define song_every_madness 66
52+
#define song_cryogenic 51
53+
#define song_magic_touch 52
54+
#define song_clutterfunk_2 53
55+
#define song_death_moon 54
56+
#define song_glint 55
57+
#define song_jack_russel 56
58+
#define song_rainbow_tylenol 57
59+
#define song_the_seven_seas 58
60+
#define song_cycles 59
61+
#define song_fantasy 60
62+
#define song_press_start 61
63+
#define song_deadlocked 62
64+
#define song_haunted_woods 63
65+
#define song_mayhem 64
66+
#define song_every_madness 65
67+
#define song_fire_aura 66
6868
#define song_megalovania 67
69-
#define song_tiny_tunes 68
70-
#define song_2nes 69
71-
#define song_accelerate 70
72-
#define song_sonic_blaster 71
69+
#define song_2nes 68
70+
#define song_blast_processing 69
71+
#define song_tiny_tunes 70
72+
#define song_accelerate 71
7373
#define song_base_after_base 72
74-
#define song_endorphins 73
75-
#define song_infiltration 74
76-
#define song_pyrophoric 75
77-
#define song_airborne_robots 76
78-
#define song_metamorphosis 77
79-
#define song_miami_hotline_vol_3 78
80-
#define song_power_trip 79
81-
#define song_xstep 80
82-
#define song_dry_out_full 81
83-
#define song_pyrophoric_apparently_too_many_creative_liberties_mix 82
84-
#define song_xenogenesis 83
85-
#define song_cycles 84
86-
#define song_chaozfantasy 85
74+
#define song_infiltration 73
75+
#define song_machina_gdw_cut 74
76+
#define song_airborne_robots 75
77+
#define song_driving_by_night 76
78+
#define song_endorphins 77
79+
#define song_power_trip 78
80+
#define song_fairydust 79
81+
#define song_miami_hotline_vol_3 80
82+
#define song_pyrophoric_apparently_too_many_creative_liberties_mix 81
83+
#define song_xenogenesis 82
84+
#define song_candyland 83
85+
#define song_chaozfantasy 84
86+
#define song_dry_out_full 85
8787
#define song_infinite_power 86
88-
#define song_windfall 87
89-
#define song_against_the_odds_redux 88
90-
#define song_extraordinary_excitement 89
88+
#define song_blacklight 87
89+
#define song_glitch_gremlin 88
90+
#define song_holography 89
9191
#define song_kesobomb 90
92-
#define song_meltdown 91
93-
#define song_kratos 92
94-
#define song_midnight 93
95-
#define song_scheming_weasel 94
96-
#define song_stereo_madness_2 95
97-
#define song_ssendam_oerets 96
98-
#define song_menu_theme_b_sides 97
99-
#define song_dance_of_the_violins 98
100-
#define song_fairydust 99
101-
#define song_ground_to_space 100
92+
#define song_against_the_odds_redux 91
93+
#define song_extraordinary_excitement 92
94+
#define song_stereo_madness_2 93
95+
#define song_windfall 94
96+
#define song_xstep 95
97+
#define song_kratos 96
98+
#define song_pyrophoric 97
99+
#define song_xo 98
100+
#define song_ssendam_oerets 99
101+
#define song_chaoz_impact 100
102102
#define song_jumper_full 101
103-
#define song_ninox 102
104-
#define song_flow 103
105-
#define song_golden_haze 104
106-
#define song_ludicrous_speed 105
107-
#define song_meowstuff 106
108-
#define song_problematic 107
109-
#define song_repmuj 108
110-
#define song_the_challenge 109
111-
#define song_driving_by_night 110
112-
#define song_glint 111
113-
#define song_youve_been_trolled 112
114-
#define song_round_1_gdw_cut 113
115-
#define song_beast_mode_gdw_cut 114
116-
#define song_machina_gdw_cut 115
103+
#define song_meowstuff 102
104+
#define song_ninox 103
105+
#define song_ultimatedestruction 104
106+
#define song_space_pirates_gdw_cut 105
107+
#define song_flow 106
108+
#define song_golden_haze 107
109+
#define song_lost 108
110+
#define song_ludicrous_speed 109
111+
#define song_metamorphosis 110
112+
#define song_problematic 111
113+
#define song_cant_let_go 112
114+
#define song_the_challenge 113
115+
#define song_round_1_gdw_cut 114
116+
#define song_beast_mode_gdw_cut 115
117117
#define song_payload_gdw_cut 116
118118
#define song_years_gdw_cut 117
119119
#define song_emeht_unem 118

MUSIC/EXPORTS/lvlset_Album/musicPlayRoutines.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ music_data_locations_hi:
88
.endif
99

1010
music_counts:
11-
.byte 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 6, 6, 9, $FF ;last bank is marked with an FF to always stop bank picking
11+
.byte 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 6, 6, $FF ;last bank is marked with an FF to always stop bank picking

0 commit comments

Comments
 (0)