Skip to content

Commit

Permalink
Merge 'Fix display_song_name' (#2293)
Browse files Browse the repository at this point in the history 
# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	data/generated/rom_patch.txt
#	data/generated/symbols.json
  • Loading branch information
@fenhl
fenhl committed Sep 15, 2024
2 parents 4366832 + 428a67b commit f41069d
Show file tree
Hide file tree
Showing 7 changed files with 11,393 additions and 11,383 deletions.
Loading

0 comments on commit f41069d

Please sign in to comment.