diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 10 | ||||
| -rw-r--r-- | include/event_scripts.h | 3 | ||||
| -rw-r--r-- | include/graphics.h | 16 | ||||
| -rw-r--r-- | include/strings.h | 5 |
4 files changed, 24 insertions, 10 deletions
diff --git a/include/config.h b/include/config.h index 67dc38a2b..70d76ca53 100644 --- a/include/config.h +++ b/include/config.h @@ -13,6 +13,16 @@ // Fire Red likely forgot to define NDEBUG/NOAGBPRN before release, leading // to the inclusion of asserts in the retail ROM. +// Define the game version for use elsewhere +#if defined(FIRERED) +#define GAME_VERSION VERSION_FIRE_RED +#elif defined(LEAFGREEN) +#define GAME_VERSION VERSION_LEAF_GREEN +#else +#error unknown version +#endif + +// rev1 renamed the source folder for reasons #if REVISION == 0 #define CODE_ROOT "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/" #else diff --git a/include/event_scripts.h b/include/event_scripts.h index 2ad1485c2..b899a217b 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -708,9 +708,8 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[]; extern const u8 gOtherText_NewName[]; extern const u8 gNameChoice_Green[]; extern const u8 gNameChoice_Red[]; -extern const u8 gNameChoice_Red[]; -extern const u8 gNameChoice_Fire[]; extern const u8 gNameChoice_Fire[]; +extern const u8 gNameChoice_Leaf[]; extern const u8 gNameChoice_Gary[]; extern const u8 gNameChoice_Kaz[]; extern const u8 gNameChoice_Toru[]; diff --git a/include/graphics.h b/include/graphics.h index 89541e748..dc0389420 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4297,17 +4297,17 @@ extern const u32 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet[]; extern const u32 gBattleAnimSpritePal_FlyingDirt[]; // title_screen -extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[]; -extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[]; -extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoMap[]; -extern const u16 gGraphics_TitleScreen_CharizardPals[]; -extern const u8 gGraphics_TitleScreen_CharizardTiles[]; -extern const u8 gGraphics_TitleScreen_CharizardMap[]; +extern const u16 gGraphics_TitleScreen_GameTitleLogoPals[]; +extern const u8 gGraphics_TitleScreen_GameTitleLogoTiles[]; +extern const u8 gGraphics_TitleScreen_GameTitleLogoMap[]; +extern const u16 gGraphics_TitleScreen_BoxArtMonPals[]; +extern const u8 gGraphics_TitleScreen_BoxArtMonTiles[]; +extern const u8 gGraphics_TitleScreen_BoxArtMonMap[]; extern u16 gGraphics_TitleScreen_BackgroundPals[]; // If this is const, title_screen.c does not match extern const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[]; extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[]; -extern const u16 gGraphics_TitleScreen_FirePals[]; -extern const u8 gGraphics_TitleScreen_BlankObjTiles[]; +extern const u16 gGraphics_TitleScreen_FireOrLeafPals[]; +extern const u32 gGraphics_TitleScreen_BlankObjTiles[]; // battle_gfx_sfx_util extern const u32 gHealthboxSinglesPlayerGfx[]; diff --git a/include/strings.h b/include/strings.h index bc1aee889..90fd49b52 100644 --- a/include/strings.h +++ b/include/strings.h @@ -777,6 +777,11 @@ extern const u8 gText_Clefairy_500Coins[]; extern const u8 gText_Dratini_2800Coins[]; extern const u8 gText_Scyther_5500Coins[]; extern const u8 gText_Porygon_9999Coins[]; +extern const u8 gText_Abra_120Coins[]; +extern const u8 gText_Clefairy_750Coins[]; +extern const u8 gText_Pinsir_2500Coins[]; +extern const u8 gText_Dratini_4600Coins[]; +extern const u8 gText_Porygon_6500Coins[]; extern const u8 gText_NoThanks_2[]; extern const u8 gText_HelixFossil[]; extern const u8 gText_DomeFossil[]; |