From 44ec57c1d56b9cd095d1fea6d1ca94be9ad55e6e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 9 Aug 2022 18:20:17 -0400 Subject: [PATCH] Berry Blender graphics + Moved Easy Chat --- graphics/berry_blender/fr/outer.png | Bin 0 -> 1879 bytes graphics/berry_blender/fr/start.png | Bin 0 -> 268 bytes .../the_end_copyright.bin} | Bin .../the_end_copyright.png} | Bin src/berry_blender.c | 5 +- src/data/easy_chat/easy_chat_groups.h | 44 +++++++++--------- .../easy_chat_group_actions.h} | 0 .../easy_chat_group_adjectives.h} | 0 .../easy_chat_group_battle.h} | 0 .../easy_chat_group_conditions.h} | 0 .../easy_chat_group_endings.h} | 0 .../easy_chat_group_events.h} | 0 .../easy_chat_group_feelings.h} | 0 .../easy_chat_group_greetings.h} | 0 .../easy_chat_group_hobbies.h} | 0 .../easy_chat_group_lifestyle.h} | 0 .../easy_chat_group_misc.h} | 0 .../easy_chat_group_move_1.h} | 0 .../easy_chat_group_move_2.h} | 0 .../easy_chat_group_people.h} | 0 .../easy_chat_group_pokemon.h} | 0 .../easy_chat_group_pokemon2.h} | 0 .../easy_chat_group_speech.h} | 0 .../easy_chat_group_status.h} | 0 .../easy_chat_group_time.h} | 0 .../easy_chat_group_trainer.h} | 0 .../easy_chat_group_trendy_saying.h} | 0 .../easy_chat_group_voices.h} | 0 .../easy_chat_words_by_letter.h} | 0 src/easy_chat.c | 2 +- src/graphics.c | 8 +++- 31 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 graphics/berry_blender/fr/outer.png create mode 100644 graphics/berry_blender/fr/start.png rename graphics/credits/{the_end_copyright_fr.bin => fr/the_end_copyright.bin} (100%) rename graphics/credits/{the_end_copyright_fr.png => fr/the_end_copyright.png} (100%) rename src/data/easy_chat/{easy_chat_group_actions_fr.h => fr/easy_chat_group_actions.h} (100%) rename src/data/easy_chat/{easy_chat_group_adjectives_fr.h => fr/easy_chat_group_adjectives.h} (100%) rename src/data/easy_chat/{easy_chat_group_battle_fr.h => fr/easy_chat_group_battle.h} (100%) rename src/data/easy_chat/{easy_chat_group_conditions_fr.h => fr/easy_chat_group_conditions.h} (100%) rename src/data/easy_chat/{easy_chat_group_endings_fr.h => fr/easy_chat_group_endings.h} (100%) rename src/data/easy_chat/{easy_chat_group_events_fr.h => fr/easy_chat_group_events.h} (100%) rename src/data/easy_chat/{easy_chat_group_feelings_fr.h => fr/easy_chat_group_feelings.h} (100%) rename src/data/easy_chat/{easy_chat_group_greetings_fr.h => fr/easy_chat_group_greetings.h} (100%) rename src/data/easy_chat/{easy_chat_group_hobbies_fr.h => fr/easy_chat_group_hobbies.h} (100%) rename src/data/easy_chat/{easy_chat_group_lifestyle_fr.h => fr/easy_chat_group_lifestyle.h} (100%) rename src/data/easy_chat/{easy_chat_group_misc_fr.h => fr/easy_chat_group_misc.h} (100%) rename src/data/easy_chat/{easy_chat_group_move_1_fr.h => fr/easy_chat_group_move_1.h} (100%) rename src/data/easy_chat/{easy_chat_group_move_2_fr.h => fr/easy_chat_group_move_2.h} (100%) rename src/data/easy_chat/{easy_chat_group_people_fr.h => fr/easy_chat_group_people.h} (100%) rename src/data/easy_chat/{easy_chat_group_pokemon_fr.h => fr/easy_chat_group_pokemon.h} (100%) rename src/data/easy_chat/{easy_chat_group_pokemon2_fr.h => fr/easy_chat_group_pokemon2.h} (100%) rename src/data/easy_chat/{easy_chat_group_speech_fr.h => fr/easy_chat_group_speech.h} (100%) rename src/data/easy_chat/{easy_chat_group_status_fr.h => fr/easy_chat_group_status.h} (100%) rename src/data/easy_chat/{easy_chat_group_time_fr.h => fr/easy_chat_group_time.h} (100%) rename src/data/easy_chat/{easy_chat_group_trainer_fr.h => fr/easy_chat_group_trainer.h} (100%) rename src/data/easy_chat/{easy_chat_group_trendy_saying_fr.h => fr/easy_chat_group_trendy_saying.h} (100%) rename src/data/easy_chat/{easy_chat_group_voices_fr.h => fr/easy_chat_group_voices.h} (100%) rename src/data/easy_chat/{easy_chat_words_by_letter_fr.h => fr/easy_chat_words_by_letter.h} (100%) diff --git a/graphics/berry_blender/fr/outer.png b/graphics/berry_blender/fr/outer.png new file mode 100644 index 0000000000000000000000000000000000000000..451f5d3c0722b1cc6109ffa370b05cd287838a56 GIT binary patch literal 1879 zcmV-d2dMaoP)xH11}0iN}I{?|yiH{8Ks=eZUh>65pry-rc=Bo=5s zbzUpW7``k(@cV>l5(w!7zy^LFOu#Tr6@V(~1sG1qdYUBZhXcZo7Q2Zcd-%-dpS*KRUm&TKoE~9{c>yrJ{9((bgD+$ zIwE)?6<`?8!+6AE&;i%nUN`3mLC^r}(xyNvGsi`8RY}5ZM5-P9Nz2Anax7*CqfHaH}lK{9O7yw4F0GNP% z0F>`xf`o|$ATtwy1Y!cF5>S?`R7NIX-2y-+CnkU;k^_Vjkq#g>0DPD<0=N@l)CvGX z3xGS(4xl0NW)a=OX-KCW@S7r_6U+sF#3taq1wa=VfLHdzZ2;^%)*>K&@T3cnU%~rO{GI?*5fB=i0M?HRz+ynaguh(_ zfDu6>KnjatcjVzXC9pQs00I|4qvy?l=SBoJphQ3tMO&LfSPXxTJnVydfbRleT5eXg zp%$PbK)@3R0JY(%^Z;Wp0MT_Pz^Dx@2_p|jK?TqvfT48d(Vs%0Kl&S=pkSduAWy0vl_q?3t$#l22eix*WCcI8)hOW zWGf)B0mdTZ0`weW#f^0r5CB7YlnNod8#(}rAc~@zOb(#P9e~fa@4^8F(55p7Mg0Q@A0R{`jqAeSv*a7f}VZLBVK0VE`;SsQx;w7&m;0KA^k4A{tF zpK{@Oc@E9|0^hT1uCA!ffD5ojJACor=8K&1n8GW54$O;o0N(A1U-#HAGi5;5?gL;3 z>=*eJjPP@Ig-|*HmCJDRh7Evk>Husqu_WpV6K*q=p23yalSxkJ6}qt*5Ua5R8;~_# zMPVnQ3Mvz`pvaQu0M6bYrww&uo|!uV9Ei!o{Jiw0oFUr`9YLi17r=*0JAQ8b`&Pp z08K*voRHePHCOO3PObqufK6rXFs@PXI8f`p3b0M-P(KcA2J}3TYytE;5^VwWJCtn$ z^g0%9l#YYxWv!7eSR7l9#;-a7e(T|U@w5{_la{{+ie%6Y0K&CGaN*|5BH8R7%5Zzq z@E6Gv&vE(yTK}Z^j{wpJ=?zF4q&EQPew{V~ke>Ar=?VS_)nTxBjXPZfnTu^sQ53(^ z$Ax;}fGYeWrui-CIVv>H&r#oko}<16J^z(gY6{K(Aj>qsUO&Jg4AZ(0B7g4(1iS$~ zLxslK8R{F*Gt@VrXTKaqKAy@rfSV-y9s#dGPf?+9dW!lQ^c3|q=;_Z{vX1~K2j$KD z1p+oey<9%)vWG`NyH<;{z45%3E12o)MfN2sqrk5FHM9=*K3U)JVe z|K^+T5O4x|j0%n8W7HGSW7HGS(00X!=;1i@%@V>en`~&v`crBvK RDE$Bc002ovPDHLkV1iCsF#`Yq literal 0 HcmV?d00001 diff --git a/graphics/berry_blender/fr/start.png b/graphics/berry_blender/fr/start.png new file mode 100644 index 0000000000000000000000000000000000000000..ad9d015d70aef341ba6f6ed183a70656f5fe0892 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQU(D&A+A6g0{&lR_#YIM^#4D@ z-v3Gelg=_Q{0E{rbAYlyvH$<4?A^Qf|NsB41#BKbq3ND3jv*GkS10-MF$nUs-gS7R z`mUbmw_Ka>j71t&$)+=X%;R1u|E=`;s}|IGVCu2O_p^f!6^ef3;O!7AN@&t#kpIQ5 z%6*Sl)WYHXhlc^i4v`<6a~lk&HLMCduscP|A&a%>=8f>2wK)x|l~;LnJ4jwsc5vOt z7V!3atju!-pGj+@@35Np?D759{G|P)fxG)$+scx!#|s(b(o#DU{X1$we)4qnb6Mw< G&;$SilxSoC literal 0 HcmV?d00001 diff --git a/graphics/credits/the_end_copyright_fr.bin b/graphics/credits/fr/the_end_copyright.bin similarity index 100% rename from graphics/credits/the_end_copyright_fr.bin rename to graphics/credits/fr/the_end_copyright.bin diff --git a/graphics/credits/the_end_copyright_fr.png b/graphics/credits/fr/the_end_copyright.png similarity index 100% rename from graphics/credits/the_end_copyright_fr.png rename to graphics/credits/fr/the_end_copyright.png diff --git a/src/berry_blender.c b/src/berry_blender.c index e617015097..23b79df5db 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -243,9 +243,12 @@ u8 gInGameOpponentsNo; #if ENGLISH static const u16 sBlenderCenter_Pal[] = INCBIN_U16("graphics/berry_blender/center.gbapal"); -#endif static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"); static const u16 sBlenderOuter_Pal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal"); +#elif FRENCH +static const u8 sBlenderCenter_Tilemap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"); +static const u16 sBlenderOuter_Pal[] = INCBIN_U16("graphics/berry_blender/fr/outer.gbapal"); +#endif static const u16 sUnused_Pal[] = INCBIN_U16("graphics/berry_blender/unused.gbapal"); static const u16 sEmpty_Pal[16 * 14] = {0}; diff --git a/src/data/easy_chat/easy_chat_groups.h b/src/data/easy_chat/easy_chat_groups.h index c79a40bf80..2e544f67a2 100755 --- a/src/data/easy_chat/easy_chat_groups.h +++ b/src/data/easy_chat/easy_chat_groups.h @@ -24,28 +24,28 @@ #include "easy_chat_group_trendy_saying.h" #include "easy_chat_group_pokemon2.h" #elif FRENCH -#include "easy_chat_group_pokemon_fr.h" -#include "easy_chat_group_trainer_fr.h" -#include "easy_chat_group_status_fr.h" -#include "easy_chat_group_battle_fr.h" -#include "easy_chat_group_greetings_fr.h" -#include "easy_chat_group_people_fr.h" -#include "easy_chat_group_voices_fr.h" -#include "easy_chat_group_speech_fr.h" -#include "easy_chat_group_endings_fr.h" -#include "easy_chat_group_feelings_fr.h" -#include "easy_chat_group_conditions_fr.h" -#include "easy_chat_group_actions_fr.h" -#include "easy_chat_group_lifestyle_fr.h" -#include "easy_chat_group_hobbies_fr.h" -#include "easy_chat_group_time_fr.h" -#include "easy_chat_group_misc_fr.h" -#include "easy_chat_group_adjectives_fr.h" -#include "easy_chat_group_events_fr.h" -#include "easy_chat_group_move_1_fr.h" -#include "easy_chat_group_move_2_fr.h" -#include "easy_chat_group_trendy_saying_fr.h" -#include "easy_chat_group_pokemon2_fr.h" +#include "fr/easy_chat_group_pokemon.h" +#include "fr/easy_chat_group_trainer.h" +#include "fr/easy_chat_group_status.h" +#include "fr/easy_chat_group_battle.h" +#include "fr/easy_chat_group_greetings.h" +#include "fr/easy_chat_group_people.h" +#include "fr/easy_chat_group_voices.h" +#include "fr/easy_chat_group_speech.h" +#include "fr/easy_chat_group_endings.h" +#include "fr/easy_chat_group_feelings.h" +#include "fr/easy_chat_group_conditions.h" +#include "fr/easy_chat_group_actions.h" +#include "fr/easy_chat_group_lifestyle.h" +#include "fr/easy_chat_group_hobbies.h" +#include "fr/easy_chat_group_time.h" +#include "fr/easy_chat_group_misc.h" +#include "fr/easy_chat_group_adjectives.h" +#include "fr/easy_chat_group_events.h" +#include "fr/easy_chat_group_move_1.h" +#include "fr/easy_chat_group_move_2.h" +#include "fr/easy_chat_group_trendy_saying.h" +#include "fr/easy_chat_group_pokemon2.h" #endif const struct EasyChatGroup gEasyChatGroups[] = { diff --git a/src/data/easy_chat/easy_chat_group_actions_fr.h b/src/data/easy_chat/fr/easy_chat_group_actions.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_actions_fr.h rename to src/data/easy_chat/fr/easy_chat_group_actions.h diff --git a/src/data/easy_chat/easy_chat_group_adjectives_fr.h b/src/data/easy_chat/fr/easy_chat_group_adjectives.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_adjectives_fr.h rename to src/data/easy_chat/fr/easy_chat_group_adjectives.h diff --git a/src/data/easy_chat/easy_chat_group_battle_fr.h b/src/data/easy_chat/fr/easy_chat_group_battle.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_battle_fr.h rename to src/data/easy_chat/fr/easy_chat_group_battle.h diff --git a/src/data/easy_chat/easy_chat_group_conditions_fr.h b/src/data/easy_chat/fr/easy_chat_group_conditions.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_conditions_fr.h rename to src/data/easy_chat/fr/easy_chat_group_conditions.h diff --git a/src/data/easy_chat/easy_chat_group_endings_fr.h b/src/data/easy_chat/fr/easy_chat_group_endings.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_endings_fr.h rename to src/data/easy_chat/fr/easy_chat_group_endings.h diff --git a/src/data/easy_chat/easy_chat_group_events_fr.h b/src/data/easy_chat/fr/easy_chat_group_events.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_events_fr.h rename to src/data/easy_chat/fr/easy_chat_group_events.h diff --git a/src/data/easy_chat/easy_chat_group_feelings_fr.h b/src/data/easy_chat/fr/easy_chat_group_feelings.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_feelings_fr.h rename to src/data/easy_chat/fr/easy_chat_group_feelings.h diff --git a/src/data/easy_chat/easy_chat_group_greetings_fr.h b/src/data/easy_chat/fr/easy_chat_group_greetings.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_greetings_fr.h rename to src/data/easy_chat/fr/easy_chat_group_greetings.h diff --git a/src/data/easy_chat/easy_chat_group_hobbies_fr.h b/src/data/easy_chat/fr/easy_chat_group_hobbies.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_hobbies_fr.h rename to src/data/easy_chat/fr/easy_chat_group_hobbies.h diff --git a/src/data/easy_chat/easy_chat_group_lifestyle_fr.h b/src/data/easy_chat/fr/easy_chat_group_lifestyle.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_lifestyle_fr.h rename to src/data/easy_chat/fr/easy_chat_group_lifestyle.h diff --git a/src/data/easy_chat/easy_chat_group_misc_fr.h b/src/data/easy_chat/fr/easy_chat_group_misc.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_misc_fr.h rename to src/data/easy_chat/fr/easy_chat_group_misc.h diff --git a/src/data/easy_chat/easy_chat_group_move_1_fr.h b/src/data/easy_chat/fr/easy_chat_group_move_1.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_move_1_fr.h rename to src/data/easy_chat/fr/easy_chat_group_move_1.h diff --git a/src/data/easy_chat/easy_chat_group_move_2_fr.h b/src/data/easy_chat/fr/easy_chat_group_move_2.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_move_2_fr.h rename to src/data/easy_chat/fr/easy_chat_group_move_2.h diff --git a/src/data/easy_chat/easy_chat_group_people_fr.h b/src/data/easy_chat/fr/easy_chat_group_people.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_people_fr.h rename to src/data/easy_chat/fr/easy_chat_group_people.h diff --git a/src/data/easy_chat/easy_chat_group_pokemon_fr.h b/src/data/easy_chat/fr/easy_chat_group_pokemon.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_pokemon_fr.h rename to src/data/easy_chat/fr/easy_chat_group_pokemon.h diff --git a/src/data/easy_chat/easy_chat_group_pokemon2_fr.h b/src/data/easy_chat/fr/easy_chat_group_pokemon2.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_pokemon2_fr.h rename to src/data/easy_chat/fr/easy_chat_group_pokemon2.h diff --git a/src/data/easy_chat/easy_chat_group_speech_fr.h b/src/data/easy_chat/fr/easy_chat_group_speech.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_speech_fr.h rename to src/data/easy_chat/fr/easy_chat_group_speech.h diff --git a/src/data/easy_chat/easy_chat_group_status_fr.h b/src/data/easy_chat/fr/easy_chat_group_status.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_status_fr.h rename to src/data/easy_chat/fr/easy_chat_group_status.h diff --git a/src/data/easy_chat/easy_chat_group_time_fr.h b/src/data/easy_chat/fr/easy_chat_group_time.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_time_fr.h rename to src/data/easy_chat/fr/easy_chat_group_time.h diff --git a/src/data/easy_chat/easy_chat_group_trainer_fr.h b/src/data/easy_chat/fr/easy_chat_group_trainer.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_trainer_fr.h rename to src/data/easy_chat/fr/easy_chat_group_trainer.h diff --git a/src/data/easy_chat/easy_chat_group_trendy_saying_fr.h b/src/data/easy_chat/fr/easy_chat_group_trendy_saying.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_trendy_saying_fr.h rename to src/data/easy_chat/fr/easy_chat_group_trendy_saying.h diff --git a/src/data/easy_chat/easy_chat_group_voices_fr.h b/src/data/easy_chat/fr/easy_chat_group_voices.h similarity index 100% rename from src/data/easy_chat/easy_chat_group_voices_fr.h rename to src/data/easy_chat/fr/easy_chat_group_voices.h diff --git a/src/data/easy_chat/easy_chat_words_by_letter_fr.h b/src/data/easy_chat/fr/easy_chat_words_by_letter.h similarity index 100% rename from src/data/easy_chat/easy_chat_words_by_letter_fr.h rename to src/data/easy_chat/fr/easy_chat_words_by_letter.h diff --git a/src/easy_chat.c b/src/easy_chat.c index 7be1dc42f0..82462a8080 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1218,7 +1218,7 @@ static const u8 *const sFooterTextOptions[NUM_FOOTER_TYPES][4] = { #if ENGLISH #include "data/easy_chat/easy_chat_words_by_letter.h" #elif FRENCH -#include "data/easy_chat/easy_chat_words_by_letter_fr.h" +#include "data/easy_chat/fr/easy_chat_words_by_letter.h" #endif static const u8 *const sEasyChatGroupNamePointers[EC_NUM_GROUPS] = { diff --git a/src/graphics.c b/src/graphics.c index 877805c1e8..048aafd591 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1343,7 +1343,11 @@ const u8 gBerryBlenderScoreSymbols_Gfx[] = INCBIN_U8("graphics/berry_blender/sco const u8 gBerryBlenderParticles_Gfx[] = INCBIN_U8("graphics/berry_blender/particles.4bpp"); static const u8 sEmpty0[0x120] = {0}; const u8 gBerryBlenderCountdownNumbers_Gfx[] = INCBIN_U8("graphics/berry_blender/countdown_numbers.4bpp"); +#if ENGLISH const u8 gBerryBlenderStart_Gfx[] = INCBIN_U8("graphics/berry_blender/start.4bpp"); +#elif FRENCH +const u8 gBerryBlenderStart_Gfx[] = INCBIN_U8("graphics/berry_blender/fr/start.4bpp"); +#endif static const u8 sEmpty1[0x200] = {0}; const u8 gBerryBlenderPlayerArrow_Gfx[] = INCBIN_U8("graphics/berry_blender/arrow.4bpp"); static const u8 sEmpty2[0x2C0] = {0}; @@ -1531,8 +1535,8 @@ const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/t // Moved from other files in the french version. // credits -const u32 gCreditsCopyrightEnd_Gfx[] = INCBIN_U32("graphics/credits/the_end_copyright_fr.4bpp.lz"); -const u32 gCreditsCopyrightEnd_Tilemap[] = INCBIN_U32("graphics/credits/the_end_copyright_fr.bin.lz"); +const u32 gCreditsCopyrightEnd_Gfx[] = INCBIN_U32("graphics/credits/fr/the_end_copyright.4bpp.lz"); +const u32 gCreditsCopyrightEnd_Tilemap[] = INCBIN_U32("graphics/credits/fr/the_end_copyright.bin.lz"); const u16 g321Start_Pal[] = INCBIN_U16("graphics/link/321start.gbapal"); const u32 g321Start_Gfx[] = INCBIN_U32("graphics/link/321start.4bpp.lz");