From ee5e65d9edf859290e0e99c5fecbc941f9258041 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Dec 2021 03:57:44 -0500 Subject: Rename generic title screen tilemaps --- graphics/title_screen/clouds.bin | Bin 0 -> 2048 bytes graphics/title_screen/pokemon_logo.bin | Bin 0 -> 1024 bytes graphics/title_screen/title_screen1.bin | Bin 2048 -> 0 bytes graphics/title_screen/title_screen2.bin | Bin 1024 -> 0 bytes graphics/title_screen/unk_853EF78.pal | 115 -------------------------------- graphics/title_screen/unused.pal | 115 ++++++++++++++++++++++++++++++++ src/graphics.c | 4 +- src/title_screen.c | 2 +- 8 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 graphics/title_screen/clouds.bin create mode 100644 graphics/title_screen/pokemon_logo.bin delete mode 100644 graphics/title_screen/title_screen1.bin delete mode 100644 graphics/title_screen/title_screen2.bin delete mode 100644 graphics/title_screen/unk_853EF78.pal create mode 100644 graphics/title_screen/unused.pal diff --git a/graphics/title_screen/clouds.bin b/graphics/title_screen/clouds.bin new file mode 100644 index 000000000..161f23cc1 Binary files /dev/null and b/graphics/title_screen/clouds.bin differ diff --git a/graphics/title_screen/pokemon_logo.bin b/graphics/title_screen/pokemon_logo.bin new file mode 100644 index 000000000..0e6b7e775 Binary files /dev/null and b/graphics/title_screen/pokemon_logo.bin differ diff --git a/graphics/title_screen/title_screen1.bin b/graphics/title_screen/title_screen1.bin deleted file mode 100644 index 161f23cc1..000000000 Binary files a/graphics/title_screen/title_screen1.bin and /dev/null differ diff --git a/graphics/title_screen/title_screen2.bin b/graphics/title_screen/title_screen2.bin deleted file mode 100644 index 0e6b7e775..000000000 Binary files a/graphics/title_screen/title_screen2.bin and /dev/null differ diff --git a/graphics/title_screen/unk_853EF78.pal b/graphics/title_screen/unk_853EF78.pal deleted file mode 100644 index 0cc3bebc1..000000000 --- a/graphics/title_screen/unk_853EF78.pal +++ /dev/null @@ -1,115 +0,0 @@ -JASC-PAL -0100 -112 -0 0 0 -0 0 0 -16 16 16 -32 32 32 -49 49 49 -65 65 65 -90 90 90 -106 106 106 -123 123 123 -139 139 139 -156 156 156 -180 180 180 -197 197 197 -213 213 213 -255 255 255 -255 0 0 -0 0 0 -98 148 16 -98 156 16 -106 164 24 -115 172 32 -123 180 41 -131 197 49 -139 205 57 -148 213 65 -156 222 74 -180 106 172 -0 0 0 -0 0 0 -148 115 115 -123 131 65 -197 197 197 -123 131 65 -255 255 255 -255 255 255 -255 255 255 -0 32 0 -8 41 8 -24 57 16 -41 74 32 -49 90 41 -65 106 49 -82 123 65 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -189 106 8 -0 139 74 -255 255 255 -8 106 49 -8 115 57 -16 123 65 -16 131 74 -24 148 82 -24 156 90 -32 164 98 -41 180 115 -8 65 57 -205 255 197 -255 255 255 -255 0 0 -0 0 0 -123 131 65 -255 255 255 -255 255 255 -255 255 255 -0 0 0 -8 8 8 -24 24 24 -41 41 41 -49 49 49 -65 65 65 -82 82 82 -0 123 230 -255 255 255 -255 255 255 -255 0 0 -255 189 0 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -0 0 0 -41 74 32 -65 106 49 -90 139 74 -115 180 98 -139 213 123 -172 255 148 -0 123 230 -255 255 255 -255 255 255 -255 0 0 -255 189 0 -189 106 8 -0 139 74 -255 255 255 -8 106 49 -8 115 57 -16 123 65 -16 131 74 -24 148 82 -24 156 90 -32 164 98 -41 180 115 -8 65 57 -180 230 172 -255 255 255 -255 0 0 -255 189 0 diff --git a/graphics/title_screen/unused.pal b/graphics/title_screen/unused.pal new file mode 100644 index 000000000..0cc3bebc1 --- /dev/null +++ b/graphics/title_screen/unused.pal @@ -0,0 +1,115 @@ +JASC-PAL +0100 +112 +0 0 0 +0 0 0 +16 16 16 +32 32 32 +49 49 49 +65 65 65 +90 90 90 +106 106 106 +123 123 123 +139 139 139 +156 156 156 +180 180 180 +197 197 197 +213 213 213 +255 255 255 +255 0 0 +0 0 0 +98 148 16 +98 156 16 +106 164 24 +115 172 32 +123 180 41 +131 197 49 +139 205 57 +148 213 65 +156 222 74 +180 106 172 +0 0 0 +0 0 0 +148 115 115 +123 131 65 +197 197 197 +123 131 65 +255 255 255 +255 255 255 +255 255 255 +0 32 0 +8 41 8 +24 57 16 +41 74 32 +49 90 41 +65 106 49 +82 123 65 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +189 106 8 +0 139 74 +255 255 255 +8 106 49 +8 115 57 +16 123 65 +16 131 74 +24 148 82 +24 156 90 +32 164 98 +41 180 115 +8 65 57 +205 255 197 +255 255 255 +255 0 0 +0 0 0 +123 131 65 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +8 8 8 +24 24 24 +41 41 41 +49 49 49 +65 65 65 +82 82 82 +0 123 230 +255 255 255 +255 255 255 +255 0 0 +255 189 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +0 0 0 +41 74 32 +65 106 49 +90 139 74 +115 180 98 +139 213 123 +172 255 148 +0 123 230 +255 255 255 +255 255 255 +255 0 0 +255 189 0 +189 106 8 +0 139 74 +255 255 255 +8 106 49 +8 115 57 +16 123 65 +16 131 74 +24 148 82 +24 156 90 +32 164 98 +41 180 115 +8 65 57 +180 230 172 +255 255 255 +255 0 0 +255 189 0 diff --git a/src/graphics.c b/src/graphics.c index 73825aebf..26eae14e2 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1505,12 +1505,12 @@ const u16 gMonIconPalettes[][16] = const u16 gTitleScreenBgPalettes[] = INCBIN_U16("graphics/title_screen/pokemon_logo.gbapal", "graphics/title_screen/rayquaza_and_clouds.gbapal"); const u16 gTitleScreenEmeraldVersionPal[] = INCBIN_U16("graphics/title_screen/emerald_version.gbapal"); -const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("graphics/title_screen/title_screen1.bin.lz"); +const u32 gTitleScreenCloudsTilemap[] = INCBIN_U32("graphics/title_screen/clouds.bin.lz"); const u32 gTitleScreenPokemonLogoGfx[] = INCBIN_U32("graphics/title_screen/pokemon_logo.8bpp.lz"); const u32 gTitleScreenEmeraldVersionGfx[] = INCBIN_U32("graphics/title_screen/emerald_version.8bpp.lz"); const u16 gTitleScreenPressStartPal[] = INCBIN_U16("graphics/title_screen/press_start.gbapal"); const u32 gTitleScreenPressStartGfx[] = INCBIN_U32("graphics/title_screen/press_start.4bpp.lz"); -const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/title_screen2.bin.lz"); +const u32 gTitleScreenPokemonLogoTilemap[] = INCBIN_U32("graphics/title_screen/pokemon_logo.bin.lz"); // size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well const u16 gFrontierPassBg_Pal[][16] = INCBIN_U16("graphics/frontier_pass/bg.gbapal"); diff --git a/src/title_screen.c b/src/title_screen.c index 93e01327c..d64ee6024 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -52,7 +52,7 @@ static void SpriteCB_PressStartCopyrightBanner(struct Sprite *sprite); static void SpriteCB_PokemonLogoShine(struct Sprite *sprite); // const rom data -static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unk_853EF78.gbapal"); +static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unused.gbapal"); static const u32 sTitleScreenRayquazaGfx[] = INCBIN_U32("graphics/title_screen/rayquaza.4bpp.lz"); static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_screen/rayquaza.bin.lz"); -- cgit v1.2.3 From 3acf002a9c2187ca228e1c7a8b3862e1bc4ab3ea Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Dec 2021 13:16:31 -0500 Subject: Rename generic jp contest tilemaps --- graphics/contest/japanese/audience.bin | Bin 0 -> 8192 bytes graphics/contest/japanese/bg.bin | Bin 0 -> 2048 bytes graphics/contest/japanese/interface.bin | Bin 0 -> 2048 bytes graphics/contest/japanese/tilemap_1.bin | Bin 2048 -> 0 bytes graphics/contest/japanese/tilemap_2.bin | Bin 4096 -> 0 bytes graphics/contest/japanese/windows.bin | Bin 0 -> 4096 bytes graphics/contest/unused_tilemap_1.bin | Bin 2048 -> 0 bytes graphics/contest/unused_tilemap_2.bin | Bin 8192 -> 0 bytes src/graphics.c | 8 ++++---- 9 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 graphics/contest/japanese/audience.bin create mode 100644 graphics/contest/japanese/bg.bin create mode 100644 graphics/contest/japanese/interface.bin delete mode 100644 graphics/contest/japanese/tilemap_1.bin delete mode 100644 graphics/contest/japanese/tilemap_2.bin create mode 100644 graphics/contest/japanese/windows.bin delete mode 100644 graphics/contest/unused_tilemap_1.bin delete mode 100644 graphics/contest/unused_tilemap_2.bin diff --git a/graphics/contest/japanese/audience.bin b/graphics/contest/japanese/audience.bin new file mode 100644 index 000000000..e8a506838 Binary files /dev/null and b/graphics/contest/japanese/audience.bin differ diff --git a/graphics/contest/japanese/bg.bin b/graphics/contest/japanese/bg.bin new file mode 100644 index 000000000..da6f4652e Binary files /dev/null and b/graphics/contest/japanese/bg.bin differ diff --git a/graphics/contest/japanese/interface.bin b/graphics/contest/japanese/interface.bin new file mode 100644 index 000000000..b2567ca7c Binary files /dev/null and b/graphics/contest/japanese/interface.bin differ diff --git a/graphics/contest/japanese/tilemap_1.bin b/graphics/contest/japanese/tilemap_1.bin deleted file mode 100644 index da6f4652e..000000000 Binary files a/graphics/contest/japanese/tilemap_1.bin and /dev/null differ diff --git a/graphics/contest/japanese/tilemap_2.bin b/graphics/contest/japanese/tilemap_2.bin deleted file mode 100644 index 40de9e529..000000000 Binary files a/graphics/contest/japanese/tilemap_2.bin and /dev/null differ diff --git a/graphics/contest/japanese/windows.bin b/graphics/contest/japanese/windows.bin new file mode 100644 index 000000000..40de9e529 Binary files /dev/null and b/graphics/contest/japanese/windows.bin differ diff --git a/graphics/contest/unused_tilemap_1.bin b/graphics/contest/unused_tilemap_1.bin deleted file mode 100644 index b2567ca7c..000000000 Binary files a/graphics/contest/unused_tilemap_1.bin and /dev/null differ diff --git a/graphics/contest/unused_tilemap_2.bin b/graphics/contest/unused_tilemap_2.bin deleted file mode 100644 index e8a506838..000000000 Binary files a/graphics/contest/unused_tilemap_2.bin and /dev/null differ diff --git a/src/graphics.c b/src/graphics.c index 26eae14e2..47b82b6b7 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -435,15 +435,15 @@ const u32 gBattleAnimSpriteGfx_BlueFlames2[] = INCBIN_U32("graphics/battle_anims // Contest const u32 gJPContestGfx1[] = INCBIN_U32("graphics/contest/japanese/composite_1.4bpp.lz"); const u32 gJPContestPal[] = INCBIN_U32("graphics/contest/japanese/palette.gbapal.lz"); -const u32 gJPContestTilemap1[] = INCBIN_U32("graphics/contest/japanese/tilemap_1.bin.lz"); -const u32 gJPContestTilemap2[] = INCBIN_U32("graphics/contest/japanese/tilemap_2.bin.lz"); +const u32 gJPContestBgTilemap[] = INCBIN_U32("graphics/contest/japanese/bg.bin.lz"); +const u32 gJPContestWindowsTilemap[] = INCBIN_U32("graphics/contest/japanese/windows.bin.lz"); const u32 gJPContestGfx2[] = INCBIN_U32("graphics/contest/japanese/composite_2.4bpp.lz"); const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("graphics/contest/interface_audience.gbapal.lz"); const u32 gContestAudienceTilemap[] = INCBIN_U32("graphics/contest/audience.bin.lz"); const u32 gContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/interface.bin.lz"); -const u32 gContestUnusedTilemap1[] = INCBIN_U32("graphics/contest/unused_tilemap_1.bin.lz"); -const u32 gContestUnusedTilemap2[] = INCBIN_U32("graphics/contest/unused_tilemap_2.bin.lz"); +const u32 gJPContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/japanese/interface.bin.lz"); +const u32 gJPContestAudienceTilemap[] = INCBIN_U32("graphics/contest/japanese/audience.bin.lz"); const u32 gContestCurtainTilemap[] = INCBIN_U32("graphics/contest/curtain.bin.lz"); const u32 gContestInterfaceGfx[] = INCBIN_U32("graphics/contest/interface.4bpp.lz"); -- cgit v1.2.3 From 4fc345fff502e3d8c40c6cbe80e73082f2e35588 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Dec 2021 14:54:09 -0500 Subject: Rename unused frontier pass tilemap --- graphics/frontier_pass/card_ball_filled.bin | 1 + graphics/frontier_pass/unused.bin | 1 - src/frontier_pass.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 graphics/frontier_pass/card_ball_filled.bin delete mode 100644 graphics/frontier_pass/unused.bin diff --git a/graphics/frontier_pass/card_ball_filled.bin b/graphics/frontier_pass/card_ball_filled.bin new file mode 100644 index 000000000..a781f0b39 --- /dev/null +++ b/graphics/frontier_pass/card_ball_filled.bin @@ -0,0 +1 @@ +¼½¾¿ÌÍÎÏÜÝÞßìíîïüýþÿ \ No newline at end of file diff --git a/graphics/frontier_pass/unused.bin b/graphics/frontier_pass/unused.bin deleted file mode 100644 index a781f0b39..000000000 --- a/graphics/frontier_pass/unused.bin +++ /dev/null @@ -1 +0,0 @@ -¼½¾¿ÌÍÎÏÜÝÞßìíîïüýþÿ \ No newline at end of file diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 07dd8f228..b14358741 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -173,7 +173,7 @@ static const u32 sHeads_Gfx[] = INCBIN_U32("graphics/frontier static const u32 sMapCursor_Gfx[] = INCBIN_U32("graphics/frontier_pass/map_cursor.4bpp.lz"); static const u32 sMapScreen_Tilemap[] = INCBIN_U32("graphics/frontier_pass/map_screen.bin.lz"); static const u32 sMapAndCard_ZoomedOut_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card.bin.lz"); -static const u32 sUnusedData[] = INCBIN_U32("graphics/frontier_pass/unused.bin"); +static const u32 sCardBall_Filled_Tilemap[] = INCBIN_U32("graphics/frontier_pass/card_ball_filled.bin"); // Unused static const u32 sBattleRecord_Tilemap[] = INCBIN_U32("graphics/frontier_pass/record_frame.bin.lz"); static const u32 sMapAndCard_Zooming_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card_affine.bin.lz"); -- cgit v1.2.3 From aba5264260d023686a08f406651256de324cdf4d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Dec 2021 17:46:05 -0500 Subject: RGB macro use in slot_machine --- graphics/slot_machine/85A8524.bin | Bin 32 -> 0 bytes src/slot_machine.c | 27 +++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 graphics/slot_machine/85A8524.bin diff --git a/graphics/slot_machine/85A8524.bin b/graphics/slot_machine/85A8524.bin deleted file mode 100644 index 032564278..000000000 Binary files a/graphics/slot_machine/85A8524.bin and /dev/null differ diff --git a/src/slot_machine.c b/src/slot_machine.c index 6cbcd76fd..c58de415b 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -7154,18 +7154,18 @@ static const struct SpriteSheet sSlotMachineSpriteSheets[22] = static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap; -static const u16 sUnused[] = +static const u16 sUnusedColors[] = { - 0x6F7B, - 0x6968, - 0x36AB, - 0x7FFF, - 0x5750, - 0x7EC0, - 0x02BA, - 0x02BA, - 0x01FD, - 0x01FD, + RGB(27, 27, 27), + RGB(8, 11, 26), + RGB(11, 21, 13), + RGB(31, 31, 31), + RGB(16, 26, 21), + RGB(0, 22, 31), + RGB(26, 21, 0), + RGB(26, 21, 0), + RGB(29, 15, 0), + RGB(29, 15, 0), }; // The Bet 2 and 3 match line palettes are duplicated unnecessarily @@ -7234,7 +7234,10 @@ static const u16 *const sPokeballShiningPalTable[] = }; static const u16 *const sDigitalDisplay_Pal = gSlotMachineDigitalDisplay_Pal; -static const u16 sUnkPalette[] = INCBIN_U16("graphics/slot_machine/85A8524.bin"); +static const u16 sUnkPalette[16] = { + [1] = RGB_WHITEALPHA, + [3] = RGB(8, 8, 8), +}; static const struct SpritePalette sSlotMachineSpritePalettes[] = { -- cgit v1.2.3 From aadab8b0167f1f74a28d4234509faffd8dca7bc2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Dec 2021 18:07:41 -0500 Subject: Move pokemon and easy chat constants to global, misc clean-up --- include/battle_script_commands.h | 1 - include/constants/global.h | 21 ++++++++++----------- include/constants/pokemon.h | 6 ++++-- include/easy_chat.h | 1 - include/global.h | 5 ++++- include/menu.h | 1 - include/pokeblock.h | 3 --- include/pokemon.h | 1 - include/save.h | 3 +-- src/apprentice.c | 2 -- src/bard_music.c | 1 - src/battle_anim_smokescreen.c | 1 - src/battle_dome.c | 1 - src/battle_pike.c | 1 - src/battle_tower.c | 1 - src/data/easy_chat/easy_chat_words_by_letter.h | 1 - src/data/lilycove_lady.h | 1 - src/dewford_trend.c | 1 - src/easy_chat.c | 1 - src/ereader_helpers.c | 1 - src/mail_data.c | 1 - src/mauville_old_man.c | 1 - src/party_menu.c | 1 - src/save.c | 4 ++-- src/trade.c | 1 - src/trainer_hill.c | 1 - 26 files changed, 21 insertions(+), 42 deletions(-) diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index cb81ad812..ed90d787f 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -1,7 +1,6 @@ #ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H #define GUARD_BATTLE_SCRIPT_COMMANDS_H -#include "constants/pokemon.h" #include "constants/battle_script_commands.h" // Arguments for 'flags' in HandleBattleWindow diff --git a/include/constants/global.h b/include/constants/global.h index ef7861e9e..48b03b5cc 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -29,11 +29,20 @@ #define GAME_VERSION (VERSION_EMERALD) #define GAME_LANGUAGE (LANGUAGE_ENGLISH) +// party sizes +#define PARTY_SIZE 6 +#define MULTI_PARTY_SIZE (PARTY_SIZE / 2) +#define FRONTIER_PARTY_SIZE 3 +#define FRONTIER_DOUBLES_PARTY_SIZE 4 +#define FRONTIER_MULTI_PARTY_SIZE 2 +#define MAX_FRONTIER_PARTY_SIZE FRONTIER_DOUBLES_PARTY_SIZE +#define UNION_ROOM_PARTY_SIZE 2 + // capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 #define OBJECT_EVENTS_COUNT 16 -#define MAIL_COUNT 16 +#define MAIL_COUNT (10 + PARTY_SIZE) #define SECRET_BASES_COUNT 20 #define TV_SHOWS_COUNT 25 #define POKE_NEWS_COUNT 16 @@ -70,7 +79,6 @@ #define TRAINER_ID_LENGTH 4 #define MAX_MON_MOVES 4 -#define NUM_STATS 6 #define CONTESTANT_COUNT 4 #define CONTEST_CATEGORY_COOL 0 @@ -80,15 +88,6 @@ #define CONTEST_CATEGORY_TOUGH 4 #define CONTEST_CATEGORIES_COUNT 5 -// party sizes -#define PARTY_SIZE 6 -#define MULTI_PARTY_SIZE (PARTY_SIZE / 2) -#define FRONTIER_PARTY_SIZE 3 -#define FRONTIER_DOUBLES_PARTY_SIZE 4 -#define FRONTIER_MULTI_PARTY_SIZE 2 -#define MAX_FRONTIER_PARTY_SIZE FRONTIER_DOUBLES_PARTY_SIZE -#define UNION_ROOM_PARTY_SIZE 2 - // string lengths #define ITEM_NAME_LENGTH 14 #define POKEMON_NAME_LENGTH 10 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 9fa023cd5..0a74e751e 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -78,11 +78,13 @@ #define STAT_SPEED 3 #define STAT_SPATK 4 #define STAT_SPDEF 5 +#define NUM_STATS 6 + #define STAT_ACC 6 // Only in battles. #define STAT_EVASION 7 // Only in battles. -#define NUM_NATURE_STATS NUM_STATS - 1 // excludes HP -#define NUM_BATTLE_STATS NUM_STATS + 2 // includes Accuracy and Evasion +#define NUM_NATURE_STATS (NUM_STATS - 1) // excludes HP +#define NUM_BATTLE_STATS (NUM_STATS + 2) // includes Accuracy and Evasion #define MIN_STAT_STAGE 0 #define DEFAULT_STAT_STAGE 6 diff --git a/include/easy_chat.h b/include/easy_chat.h index 4d2bc7c98..c9ef4428f 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -2,7 +2,6 @@ #define GUARD_EASYCHAT_H #include "main.h" -#include "constants/easy_chat.h" struct EasyChatScreenTemplate { diff --git a/include/global.h b/include/global.h index 024280f98..ca5f50916 100644 --- a/include/global.h +++ b/include/global.h @@ -11,6 +11,8 @@ #include "constants/species.h" #include "constants/berry.h" #include "constants/maps.h" +#include "constants/pokemon.h" +#include "constants/easy_chat.h" // Prevent cross-jump optimization. #define BLOCK_CROSS_JUMP asm(""); @@ -127,6 +129,7 @@ #define DEX_FLAGS_NO ROUND_BITS_TO_BYTES(NUM_SPECIES) #define NUM_FLAG_BYTES ROUND_BITS_TO_BYTES(FLAGS_COUNT) +#define NUM_ADDITIONAL_PHRASE_BYTES ROUND_BITS_TO_BYTES(NUM_ADDITIONAL_PHRASES) struct Coords8 { @@ -984,7 +987,7 @@ struct SaveBlock1 /*0x2BC8*/ u16 easyChatBattleWon[EASY_CHAT_BATTLE_WORDS_COUNT]; /*0x2BD4*/ u16 easyChatBattleLost[EASY_CHAT_BATTLE_WORDS_COUNT]; /*0x2BE0*/ struct Mail mail[MAIL_COUNT]; - /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system + /*0x2E20*/ u8 additionalPhrases[NUM_ADDITIONAL_PHRASE_BYTES]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct DewfordTrend dewfordTrends[SAVED_TRENDS_COUNT]; /*0x2e90*/ struct ContestWinner contestWinners[NUM_CONTEST_WINNERS]; // see CONTEST_WINNER_* diff --git a/include/menu.h b/include/menu.h index 69000d408..bf3f56aea 100644 --- a/include/menu.h +++ b/include/menu.h @@ -4,7 +4,6 @@ #include "task.h" #include "text.h" #include "window.h" -#include "constants/pokemon.h" #define MENU_NOTHING_CHOSEN -2 #define MENU_B_PRESSED -1 diff --git a/include/pokeblock.h b/include/pokeblock.h index 9e0161495..24e6ea856 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -1,9 +1,6 @@ #ifndef GUARD_POKEBLOCK_H #define GUARD_POKEBLOCK_H -#include "constants/berry.h" -#include "constants/pokemon.h" - #define TAG_POKEBLOCK 14818 enum diff --git a/include/pokemon.h b/include/pokemon.h index 315416c38..28460bbe6 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,7 +1,6 @@ #ifndef GUARD_POKEMON_H #define GUARD_POKEMON_H -#include "constants/pokemon.h" #include "sprite.h" struct PokemonSubstruct0 diff --git a/include/save.h b/include/save.h index be7961136..89fc9ad33 100644 --- a/include/save.h +++ b/include/save.h @@ -52,8 +52,7 @@ enum { SAVE_NORMAL, SAVE_LINK, // Link / Battle Frontier - //EREADER_SAVE, // deprecated in Emerald - SAVE_LINK2, // unknown 2nd link save + SAVE_EREADER, // deprecated in Emerald SAVE_HALL_OF_FAME, SAVE_OVERWRITE_DIFFERENT_FILE, SAVE_HALL_OF_FAME_ERASE_BEFORE // unused diff --git a/src/apprentice.c b/src/apprentice.c index 2ab2f0e5a..591ab79e4 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -23,9 +23,7 @@ #include "task.h" #include "text.h" #include "constants/battle_frontier.h" -#include "constants/easy_chat.h" #include "constants/items.h" -#include "constants/pokemon.h" #include "constants/songs.h" #include "constants/trainers.h" #include "constants/moves.h" diff --git a/src/bard_music.c b/src/bard_music.c index 114f1cf42..bdc5ac808 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -1,6 +1,5 @@ #include "global.h" #include "bard_music.h" -#include "constants/easy_chat.h" #include "easy_chat.h" #include "data/bard_music/bard_sounds.h" diff --git a/src/battle_anim_smokescreen.c b/src/battle_anim_smokescreen.c index 9844f5007..0819796d2 100644 --- a/src/battle_anim_smokescreen.c +++ b/src/battle_anim_smokescreen.c @@ -5,7 +5,6 @@ #include "graphics.h" #include "sprite.h" #include "util.h" -#include "constants/pokemon.h" #include "constants/battle_palace.h" static void SmokescreenImpact_Callback(struct Sprite *); diff --git a/src/battle_dome.c b/src/battle_dome.c index 293662985..2f77491c9 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -34,7 +34,6 @@ #include "constants/battle_dome.h" #include "constants/frontier_util.h" #include "constants/moves.h" -#include "constants/pokemon.h" #include "constants/trainers.h" #include "constants/abilities.h" #include "constants/songs.h" diff --git a/src/battle_pike.c b/src/battle_pike.c index d889d7cdd..2b0cf6420 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -17,7 +17,6 @@ #include "constants/battle_frontier.h" #include "constants/frontier_util.h" #include "constants/abilities.h" -#include "constants/easy_chat.h" #include "constants/layouts.h" #include "constants/rgb.h" #include "constants/trainers.h" diff --git a/src/battle_tower.c b/src/battle_tower.c index 7ed15d1e6..d1c95285b 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -35,7 +35,6 @@ #include "constants/trainers.h" #include "constants/event_objects.h" #include "constants/moves.h" -#include "constants/easy_chat.h" extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[]; diff --git a/src/data/easy_chat/easy_chat_words_by_letter.h b/src/data/easy_chat/easy_chat_words_by_letter.h index a56e3184f..235afbb78 100755 --- a/src/data/easy_chat/easy_chat_words_by_letter.h +++ b/src/data/easy_chat/easy_chat_words_by_letter.h @@ -1,5 +1,4 @@ #include "easy_chat.h" -#include "constants/easy_chat.h" #define DOUBLE_SPECIES_NAME EC_EMPTY_WORD, 2, diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h index dd0885ff8..4a3a7a719 100644 --- a/src/data/lilycove_lady.h +++ b/src/data/lilycove_lady.h @@ -1,4 +1,3 @@ -#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "constants/items.h" #include "constants/moves.h" diff --git a/src/dewford_trend.c b/src/dewford_trend.c index bba2085e8..08dd9afe0 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -8,7 +8,6 @@ #include "text.h" #include "tv.h" #include "string_util.h" -#include "constants/easy_chat.h" /* ## Overview ## diff --git a/src/easy_chat.c b/src/easy_chat.c index f9ba44ba7..734fd4f18 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -27,7 +27,6 @@ #include "task.h" #include "text_window.h" #include "window.h" -#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "constants/lilycove_lady.h" #include "constants/mauville_old_man.h" diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c index 0de87602e..c3f17f234 100755 --- a/src/ereader_helpers.c +++ b/src/ereader_helpers.c @@ -10,7 +10,6 @@ #include "task.h" #include "util.h" #include "trainer_hill.h" -#include "constants/easy_chat.h" #include "constants/trainers.h" #include "constants/moves.h" #include "constants/items.h" diff --git a/src/mail_data.c b/src/mail_data.c index ca50a687e..99cf1f9ed 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -5,7 +5,6 @@ #include "pokemon_icon.h" #include "text.h" #include "international_string_util.h" -#include "constants/easy_chat.h" #define UNOWN_OFFSET 30000 diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 06c3b8288..681a3dadf 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -1,7 +1,6 @@ #include "global.h" #include "main.h" #include "constants/songs.h" -#include "constants/easy_chat.h" #include "constants/event_objects.h" #include "mauville_old_man.h" #include "event_data.h" diff --git a/src/party_menu.c b/src/party_menu.c index 34aff619f..36e83a168 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -65,7 +65,6 @@ #include "window.h" #include "constants/battle.h" #include "constants/battle_frontier.h" -#include "constants/easy_chat.h" #include "constants/field_effects.h" #include "constants/item_effects.h" #include "constants/items.h" diff --git a/src/save.c b/src/save.c index b53956438..dafc20868 100644 --- a/src/save.c +++ b/src/save.c @@ -428,7 +428,7 @@ static u8 CopySectorSecurityByte(u16 sectorId, const struct SaveSectorLocation * } else { - // Succeded + // Succeeded SetDamagedSectorBits(DISABLE, sector); return SAVE_STATUS_OK; } @@ -734,7 +734,7 @@ u8 HandleSavingData(u8 saveType) WriteSaveSectorOrSlot(FULL_SAVE_SLOT, gRamSaveSectorLocations); break; case SAVE_LINK: - case SAVE_LINK2: + case SAVE_EREADER: // Dummied, now duplicate of SAVE_LINK // Used by link / Battle Frontier // Write only SaveBlocks 1 and 2 (skips the PC) CopyPartyAndObjectsToSave(); diff --git a/src/trade.c b/src/trade.c index 935a89b02..b48d1abf5 100644 --- a/src/trade.c +++ b/src/trade.c @@ -44,7 +44,6 @@ #include "util.h" #include "window.h" #include "constants/contest.h" -#include "constants/easy_chat.h" #include "constants/items.h" #include "constants/moves.h" #include "constants/region_map_sections.h" diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 04312a2dd..3ada262e5 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -29,7 +29,6 @@ #include "constants/layouts.h" #include "constants/moves.h" #include "constants/trainers.h" -#include "constants/easy_chat.h" #include "constants/trainer_hill.h" #include "constants/trainer_types.h" -- cgit v1.2.3