diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 4 | ||||
| -rw-r--r-- | include/libgcnmultiboot.h | 2 | ||||
| -rw-r--r-- | include/starter_choose.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index a9c7abae1..e1a88283a 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -961,10 +961,10 @@ #define FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE 0x394 #define FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA 0x395 #define FLAG_HIDE_BATTLE_TOWER_REPORTER 0x396 -#define FLAG_HIDE_ROUTE_110_RIVAL_1 0x397 +#define FLAG_HIDE_ROUTE_110_RIVAL 0x397 #define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 #define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH 0x399 -#define FLAG_HIDE_ROUTE_110_RIVAL_2 0x39A +#define FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE 0x39A #define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B #define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C #define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D diff --git a/include/libgcnmultiboot.h b/include/libgcnmultiboot.h index 7d347df05..4a6262d8f 100644 --- a/include/libgcnmultiboot.h +++ b/include/libgcnmultiboot.h @@ -1,4 +1,4 @@ -#ifndef GUARD_LIBGCMMULTIBOOT_H +#ifndef GUARD_LIBGCNMULTIBOOT_H #define GUARD_LIBGCNMULTIBOOT_H struct GcmbStruct diff --git a/include/starter_choose.h b/include/starter_choose.h index 535e272b7..7a4f6e967 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -5,6 +5,7 @@ extern const u16 gBirchBagGrassPal[2][16]; extern const u32 gBirchBagTilemap[]; extern const u32 gBirchGrassTilemap[]; extern const u32 gBirchHelpGfx[]; +extern const u32 gPokeballSelection_Gfx[]; u16 GetStarterPokemon(u16 chosenStarterId); void CB2_ChooseStarter(void); diff --git a/include/strings.h b/include/strings.h index 67b238422..702392efa 100644 --- a/include/strings.h +++ b/include/strings.h @@ -374,6 +374,9 @@ extern const u8 gText_DefaultNameTerra[]; extern const u8 gText_DefaultNameLucy[]; extern const u8 gText_DefaultNameHalie[]; +extern const u8 gText_BirchInTrouble[]; +extern const u8 gText_ConfirmStarterChoice[]; + // mystery event menu text extern const u8 gText_EventSafelyLoaded[]; extern const u8 gText_LoadErrorEndingSession[]; |