Pret merge (5th of November) (#5644)

rh-hideout · Nov 5, 2024 · 123fa09 · 123fa09
2 parents 45d063d + 6d38e26
commit 123fa09
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -342,6 +342,8 @@ include audio_rules.mk
 # NOTE: Tools must have been built prior (FIXME)
 # so you can't really call this rule directly
 generated: $(AUTO_GEN_TARGETS)
+	@: # Silence the "Nothing to be done for `generated'" message, which some people were confusing for an error.
+
 
 %.s:   ;
 %.png: ;

diff --git a/graphics/title_screen/emerald_version.png b/graphics/title_screen/emerald_version.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
@@ -21,6 +21,7 @@ POKEDEXGFXDIR := graphics/pokedex
 STARTERGFXDIR := graphics/starter_choose
 NAMINGGFXDIR := graphics/naming_screen
 SPINDAGFXDIR := graphics/pokemon/spinda/spots
+TITLESCREENGFXDIR := graphics/title_screen
 
 types := none normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy stellar
 contest_types := cool beauty cute smart tough
@@ -270,9 +271,13 @@ $(FONTGFXDIR)/frlg_female.fwjpnfont: $(FONTGFXDIR)/japanese_frlg_female.png
 
 
 ### Miscellaneous ###
-graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
+
+$(TITLESCREENGFXDIR)/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
+$(TITLESCREENGFXDIR)/emerald_version.8bpp: %.8bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 4
+
 graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 

diff --git a/include/bard_music.h b/include/bard_music.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_BARD_MUSIC_H
 #define GUARD_BARD_MUSIC_H
 
+#define BARD_SOUND_MAX_LENGTH 6
+
 struct BardSound
 {
     /*0x00*/ u8 songLengthId;
@@ -26,8 +28,8 @@ struct BardSong
     /*0x06*/ u16 volume;
     /*0x08*/ s16 pitch;
     /*0x0A*/ s16 voiceInflection;
-    /*0x0C*/ u16 lyrics[6];
-    /*0x18*/ struct BardPhoneme phonemes[6];
+    /*0x0C*/ u16 lyrics[BARD_SOUND_MAX_LENGTH];
+    /*0x18*/ struct BardPhoneme phonemes[BARD_SOUND_MAX_LENGTH];
     /*0x30*/ const struct BardSound *sound;
 };
 

diff --git a/src/bard_music.c b/src/bard_music.c
@@ -48,7 +48,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word)
     const struct BardSound *sound;
 
     song->length = 0;
-    for (i = 0; i < 6; i ++)
+    for (i = 0; i < BARD_SOUND_MAX_LENGTH; i ++)
     {
         sound = &song->sound[i];
         if (sound->songLengthId != 0xFF)

diff --git a/src/data/bard_music/moves.h b/src/data/bard_music/moves.h
@@ -5,7 +5,7 @@
 
 const u16 gNumBardWords_Moves = MOVES_COUNT;
 
-const struct BardSound gBardSounds_Moves[MOVES_COUNT][6] = {
+const struct BardSound gBardSounds_Moves[MOVES_COUNT][BARD_SOUND_MAX_LENGTH] = {
     [MOVE_NONE] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,

diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h
@@ -3,7 +3,7 @@
 
 const u16 gNumBardWords_Species = NUM_SPECIES;
 
-const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = {
+const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][BARD_SOUND_MAX_LENGTH] = {
     [SPECIES_NONE] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,