mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-29 21:37:06 -05:00
Berry Blender graphics + Moved Easy Chat
This commit is contained in:
Eduardo Quezada
BIN
graphics/berry_blender/fr/outer.png
Normal file
BIN
graphics/berry_blender/fr/outer.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
graphics/berry_blender/fr/start.png
Normal file
BIN
graphics/berry_blender/fr/start.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 268 B |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 314 B |
@@ -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};
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
@@ -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] = {
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user