Skip to content

Commit

Permalink
Music fix (add music_12.s to crt0 - why was it gone??)
Browse files Browse the repository at this point in the history
  • Loading branch information
kandowontu committed Jan 9, 2025
1 parent 2939b52 commit 3ca0744
Show file tree
Hide file tree
Showing 9 changed files with 2,970 additions and 2,962 deletions.
2 changes: 2 additions & 0 deletions LIB/asm/crt0.s
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@ GeometryDashPCMB:
.include "MUSIC/EXPORTS/music_10.s"
.segment "MUS_BANK_0B"
.include "MUSIC/EXPORTS/music_11.s"
.segment "MUS_BANK_0C"
.include "MUSIC/EXPORTS/music_12.s"

.segment "SFX_BANK"
.include "MUSIC/EXPORTS/sfx.s"
Expand Down
28 changes: 14 additions & 14 deletions MUSIC/EXPORTS/musicDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
#define song_atthespeedoflight 2
#define song_death_moon 3
#define song_practice 4
#define song_endgame 5
#define song_eon 6
#define song_eon 5
#define song_atthespeedoflight2 6
#define song_polargeist 7
#define song_infernoplex 8
#define song_time_machine 9
#define song_electrodynamix 10
#define song_hexagon_force 11
#define song_atthespeedoflight2 12
#define song_endgame 11
#define song_hexagon_force 12
#define song_electroman_adventures 13
#define song_toe_2 14
#define song_the_challenge 15
#define song_back_on_track 16
#define song_clubstep 17
#define song_haunted_woods 18
#define song_base_after_base 19
#define song_blast_processing 20
#define song_menu_theme 20
#define song_stalemate 21
#define song_cycles 22
#define song_scheming_weasel 23
#define song_chaozfantasy 24
#define song_just_right 25
#define song_just_right 22
#define song_cycles 23
#define song_blast_processing 24
#define song_chaozfantasy 25
#define song_against_the_odds_redux 26
#define song_stereo_madness_2 27
#define song_stereo_madness 28
#define song_xstep 29
#define song_menu_theme 30
#define song_cant_let_go 29
#define song_xstep 30
#define song_midnight 31
#define song_retray 32
#define song_dry_out 33
#define song_cant_let_go 34
#define song_jumper 35
#define song_theory_of_everything 36
#define song_jumper 34
#define song_theory_of_everything 35
#define song_scheming_weasel 36
#define song_problematic 37
#define song_max 38
2 changes: 1 addition & 1 deletion MUSIC/EXPORTS/musicPlayRoutines.s
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ music_data_locations_hi:
.endif

music_counts:
.byte 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 5, 5, $FF ;last bank is marked with an FF to always stop bank picking
.byte 1, 2, 2, 2, 2, 2, 2, 3, 3, 4, 4, 5, $FF ;last bank is marked with an FF to always stop bank picking
Loading

0 comments on commit 3ca0744

Please sign in to comment.