summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/bike.h24
-rw-r--r--include/constants/event_object_movement.h24
-rw-r--r--include/constants/layouts.h4
-rw-r--r--include/constants/map_groups.h4
-rw-r--r--include/constants/metatile_behaviors.h2
-rw-r--r--include/constants/vars.h2
-rw-r--r--include/event_scripts.h8
-rw-r--r--include/field_player_avatar.h2
-rw-r--r--include/gba/defines.h5
-rw-r--r--include/graphics.h4
-rw-r--r--include/link.h2
-rw-r--r--include/menu.h4
-rw-r--r--include/metatile_behavior.h4
-rw-r--r--include/pokedex.h2
-rw-r--r--include/pokedex_area_markers.h6
-rw-r--r--include/pokedex_screen.h30
-rw-r--r--include/pokemon.h2
-rw-r--r--include/pokemon_storage_system_internal.h2
-rw-r--r--include/pokemon_summary_screen.h18
-rw-r--r--include/strings.h94
-rw-r--r--include/text.h4
21 files changed, 136 insertions, 111 deletions
diff --git a/include/bike.h b/include/bike.h
index e4f94becb..d6021f5e4 100644
--- a/include/bike.h
+++ b/include/bike.h
@@ -13,6 +13,20 @@ enum
SPEED_FASTEST,
};
+enum {
+ BIKE_TRANS_FACE_DIRECTION,
+ BIKE_TRANS_TURNING,
+ BIKE_TRANS_MOVE,
+ BIKE_TRANS_DOWNHILL,
+ BIKE_TRANS_UPHILL
+};
+
+enum {
+ BIKE_STATE_NORMAL,
+ BIKE_STATE_TURNING,
+ BIKE_STATE_SLOPE
+};
+
// Acro bike states
enum
{
@@ -25,15 +39,15 @@ enum
ACRO_STATE_TURN_JUMP,
};
-void InitPlayerAvatarBikeState(u32 directionHistory, u32 abStartSelectHistory);
-bool8 MetatileAtPlayerPositionForbidsBiking(void);
-void StartTransitionToFlipBikeState(u8 flags);
+void BikeClearState(u32 directionHistory, u32 abStartSelectHistory);
+bool8 IsBikingDisallowedByPlayer(void);
+void GetOnOffBike(u8 flags);
s16 GetPlayerSpeed(void);
-bool8 sub_80BD460(u8);
+bool8 RS_IsRunningDisallowed(u8 r0);
void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
bool32 IsRunningDisallowed(u8 metatileBehavior);
void Bike_HandleBumpySlopeJump(void);
void Bike_UpdateBikeCounterSpeed(u8 counter);
-bool8 player_should_look_direction_be_enforced_upon_movement(void);
+bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void);
#endif //GUARD_BIKE_H
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h
index b029b47c4..008d3a117 100644
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -70,19 +70,19 @@
#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41
#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42
#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43
-#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44
-#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45
-#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46
-#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47
-#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48
-#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49
-#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A
-#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x44
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x45
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x46
+#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x47
+#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x48
+#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x49
+#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x4A
+#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x4B
#define MOVEMENT_TYPE_INVISIBLE 0x4C
-#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x4D
-#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x4E
-#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x4F
-#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x50
+#define MOVEMENT_TYPE_VS_SEEKER_4D 0x4D
+#define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E
+#define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F
+#define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50
#define MOVEMENT_ACTION_FACE_DOWN 0x0
#define MOVEMENT_ACTION_FACE_UP 0x1
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 01a452970..5218ee717 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -7,7 +7,7 @@
#define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F 1
#define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F 2
-#define LAYOUT_PALLET_TOWN_GARYS_HOUSE 3
+#define LAYOUT_PALLET_TOWN_RIVALS_HOUSE 3
#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 4
#define LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB 5
#define LAYOUT_HOUSE1 6
@@ -42,7 +42,7 @@
#define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46
#define LAYOUT_BATTLE_COLOSSEUM_2P 47
#define LAYOUT_TRADE_CENTER 48
-#define LAYOUT_RECORD_CENTER 49
+#define LAYOUT_RECORD_CORNER 49
#define LAYOUT_BATTLE_COLOSSEUM_4P 50
#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51
#define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index b087b2c33..788ea7bda 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -8,7 +8,7 @@
// Map Group 0
#define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8))
#define MAP_TRADE_CENTER (1 | (0 << 8))
-#define MAP_RECORD_CENTER (2 | (0 << 8))
+#define MAP_RECORD_CORNER (2 | (0 << 8))
#define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8))
#define MAP_UNION_ROOM (4 | (0 << 8))
@@ -270,7 +270,7 @@
// Map Group 4
#define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F (0 | (4 << 8))
#define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F (1 | (4 << 8))
-#define MAP_PALLET_TOWN_GARYS_HOUSE (2 | (4 << 8))
+#define MAP_PALLET_TOWN_RIVALS_HOUSE (2 | (4 << 8))
#define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8))
// Map Group 5
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index 77cd6de1b..c953ae20b 100644
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -6,7 +6,7 @@
#define MB_01 0x01
#define MB_TALL_GRASS 0x02
#define MB_CAVE 0x08
-#define MB_0A 0x0A
+#define MB_RUNNING_DISALLOWED 0x0A
#define MB_0B 0x0B
#define MB_0C 0x0C
#define MB_POND_WATER 0x10
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 468b9566e..70efab478 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -135,7 +135,7 @@
#define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB 0x4055
#define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F 0x4056
#define VAR_MAP_SCENE_VIRIDIAN_CITY_MART 0x4057
-#define VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE 0x4058
+#define VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE 0x4058
#define VAR_MAP_SCENE_POKEMON_TOWER_6F 0x4059
#define VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR 0x405A
#define VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR 0x405B
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 437b6dcee..3a25a5fc9 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1270,10 +1270,10 @@ extern const u8 BattleColosseum_4P_EventScript_PlayerSpot0[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[];
-extern const u8 RecordCenter_EventScript_Spot0[];
-extern const u8 RecordCenter_EventScript_Spot1[];
-extern const u8 RecordCenter_EventScript_Spot2[];
-extern const u8 RecordCenter_EventScript_Spot3[];
+extern const u8 RecordCorner_EventScript_Spot0[];
+extern const u8 RecordCorner_EventScript_Spot1[];
+extern const u8 RecordCorner_EventScript_Spot2[];
+extern const u8 RecordCorner_EventScript_Spot3[];
extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[];
extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[];
extern const u8 TradeCenter_EventScript_Chair0[];
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index a254cff83..6e9917154 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -61,7 +61,7 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys);
bool32 PlayerIsMovingOnRockStairs(u8 direction);
void UpdatePlayerAvatarTransitionState(void);
void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender);
-void nullsub_24(u8 direction);
+void PlayerUseAcroBikeOnBumpySlope(u8 direction);
u8 GetRSAvatarGraphicsIdByGender(u8 gender);
#endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 02d687ade..f0fce824e 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -51,8 +51,9 @@
#define BG_SCREEN_ADDR(n) (void *)(BG_VRAM + (BG_SCREEN_SIZE * (n)))
#define BG_TILE_ADDR(n) (void *)(BG_VRAM + (0x80 * (n)))
-#define BG_TILE_H_FLIP(n) (0x400 + (n))
-#define BG_TILE_V_FLIP(n) (0x800 + (n))
+#define BG_TILE_H_FLIP(n) (0x400 + (n))
+#define BG_TILE_V_FLIP(n) (0x800 + (n))
+#define BG_TILE_H_V_FLIP(n) (0xC00 + (n))
// text-mode BG
#define OBJ_VRAM0 (void *)(VRAM + 0x10000)
diff --git a/include/graphics.h b/include/graphics.h
index 3848bea86..6b2c87bad 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4931,7 +4931,7 @@ extern const u16 gUnknown_8E9C3F8[];
extern const u16 gUnknown_8E9C418[];
// pokedex_screen
-extern const u16 gUnknown_8E9C14C[];
-extern const u16 gUnknown_8E9C16C[];
+extern const u16 gDexScreen_TopMenuIconPals_AtoZ[];
+extern const u32 gDexScreen_TopMenuIconTiles_AtoZ[];
#endif //GUARD_GRAPHICS_H
diff --git a/include/link.h b/include/link.h
index b4749164b..5ca2297cd 100644
--- a/include/link.h
+++ b/include/link.h
@@ -266,7 +266,7 @@ void Link_StartSend5FFFwithParam(u16 a0);
void sub_80098D8(void);
void CloseLink(void);
bool8 IsLinkTaskFinished(void);
-bool32 sub_800B270(void);
+bool32 LinkRecvQueueLengthMoreThan2(void);
void ResetSerial(void);
void sub_8054A28(void);
void SetWirelessCommType1(void);
diff --git a/include/menu.h b/include/menu.h
index 83bdcb4f6..5b12047ee 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -28,8 +28,8 @@ u8 Menu2_GetMonSpriteAnchorCoord(u16 species, u32 personality, u8 a2);
s8 Menu2_GetMonSpriteAnchorCoordMinusx20(u16 species, u32 personality, u8 a2);
// list_menu
-void sub_8107CD8(u8 palOffset, u16 speciesId);
-void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
+void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId);
+void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y);
void ListMenuLoadStdPalAt(u8 palOffset, u8 palId);
void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y);
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 9d29c31e9..aedc8b5b0 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -77,7 +77,7 @@ bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior);
bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior);
bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior);
-bool8 MetatileBehavior_ReturnFalse_9(u8 metatileBehavior);
+bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior);
@@ -104,7 +104,7 @@ bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior);
-bool8 MetatileBehavior_IsMB0A(u8 metatileBehavior);
+bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior);
bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior);
bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior);
diff --git a/include/pokedex.h b/include/pokedex.h
index aad4849de..12f03e87d 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -48,6 +48,6 @@ bool16 HasAllHoennMons(void);
bool16 HasAllKantoMons(void);
bool16 HasAllMons(void);
-u8 sub_8106B60(u16 species);
+u8 DexScreen_RegisterMonToPokedex(u16 species);
#endif // GUARD_POKEDEX_H
diff --git a/include/pokedex_area_markers.h b/include/pokedex_area_markers.h
index 47bbdf486..a9669a80a 100644
--- a/include/pokedex_area_markers.h
+++ b/include/pokedex_area_markers.h
@@ -12,8 +12,8 @@ struct PAM_TaskData
};
void SetAreaSubsprite(s32 i, s32 whichArea, struct Subsprite * subsprites);
-void sub_81343F4(u8 taskId);
-u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y);
-u8 sub_81344E0(u8 taskId);
+void Dtor_PokedexAreaMarkers(u8 taskId);
+u8 Ctor_PokedexAreaMarkers(u16 species, u16 tilesTag, u8 palIdx, u8 y);
+u8 PokedexAreaMarkers_Any(u8 taskId);
#endif //GUARD_POKEDEX_AREA_MARKERS_H
diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h
index 128fc1ad3..a93e0ffcd 100644
--- a/include/pokedex_screen.h
+++ b/include/pokedex_screen.h
@@ -1,21 +1,31 @@
#ifndef GUARD_POKEDEX_SCREEN_H
#define GUARD_POKEDEX_SCREEN_H
-#define DEX_CATEGORY_GRASSLAND 0
-#define DEX_CATEGORY_FOREST 1
-#define DEX_CATEGORY_WATERS_EDGE 2
-#define DEX_CATEGORY_SEA 3
-#define DEX_CATEGORY_CAVE 4
-#define DEX_CATEGORY_MOUNTAIN 5
-#define DEX_CATEGORY_ROUGH_TERRAIN 6
-#define DEX_CATEGORY_URBAN 7
-#define DEX_CATEGORY_RARE 8
+#define DEX_CATEGORY_GRASSLAND 0
+#define DEX_CATEGORY_FOREST 1
+#define DEX_CATEGORY_WATERS_EDGE 2
+#define DEX_CATEGORY_SEA 3
+#define DEX_CATEGORY_CAVE 4
+#define DEX_CATEGORY_MOUNTAIN 5
+#define DEX_CATEGORY_ROUGH_TERRAIN 6
+#define DEX_CATEGORY_URBAN 7
+#define DEX_CATEGORY_RARE 8
+#define DEX_CATEGORY_COUNT 9
+
+#define DEX_ORDER_NUMERICAL_KANTO 0
+#define DEX_ORDER_ATOZ 1
+#define DEX_ORDER_TYPE 2
+#define DEX_ORDER_LIGHTEST 3
+#define DEX_ORDER_SMALLEST 4
+#define DEX_ORDER_NUMERICAL_NATIONAL 5
+
+#define DEX_MODE(name) (DEX_CATEGORY_COUNT + DEX_ORDER_##name)
#include "pokedex.h"
extern const struct PokedexEntry gPokedexEntries[];
void CB2_OpenPokedexFromStartMenu(void);
-s8 sub_8104AB0(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);
+s8 DexScreen_GetSetPokedexFlag(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);
#endif //GUARD_POKEDEX_SCREEN_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 6027b9b5a..075a50792 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -417,7 +417,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event);
void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies);
u16 GetMonEVCount(struct Pokemon *mon);
void RandomlyGivePartyPokerus(struct Pokemon *party);
-u8 CheckPartyPokerus(struct Pokemon *party, u8 selection);
+u8 CheckPartyPokerus(struct Pokemon *party, u8 party_bm);
u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection);
void PartySpreadPokerus(struct Pokemon *party);
bool8 TryIncrementMonLevel(struct Pokemon *mon);
diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h
index f08144243..4e1bf0557 100644
--- a/include/pokemon_storage_system_internal.h
+++ b/include/pokemon_storage_system_internal.h
@@ -354,7 +354,7 @@ struct PokemonStorageSystemData
/* 2172 */ u16 field_2176[3];
/* 2178 */ u8 field_2186;
/* 2179 */ u8 field_2187;
- /* 217a */ u8 field_2188;
+ /* 217a */ u8 summaryScreenMode;
/* 217c */ union
{
struct Pokemon *mon;
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index f70337677..aee4c27be 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -12,7 +12,7 @@ void SummaryScreen_SetUnknownTaskId(u8 a0);
void SummaryScreen_DestroyUnknownTask(void);
u8 GetLastViewedMonIndex(void);
void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
-void sub_8138B38(u8);
+void SetPokemonSummaryScreenMode(u8);
// The Pokemon Summary Screen can operate in different modes. Certain features,
// such as move re-ordering, are available in the different modes.
@@ -22,7 +22,7 @@ enum PokemonSummaryScreenMode
PSS_MODE_UNK1,
PSS_MODE_SELECT_MOVE,
PSS_MODE_FORGET_MOVE,
- PSS_MODE_UNK4,
+ PSS_MODE_TRADE,
PSS_MODE_BOX,
};
@@ -38,13 +38,13 @@ enum PokemonSummaryScreenPage
enum PokemonSummaryScreenState3270
{
- PSS_STATE3270_0,
- PSS_STATE3270_1,
- PSS_STATE3270_2,
- PSS_STATE3270_3,
- PSS_STATE3270_4,
- PSS_STATE3270_5,
- PSS_STATE3270_6
+ PSS_STATE3270_FADEIN,
+ PSS_STATE3270_PLAYCRY,
+ PSS_STATE3270_HANDLEINPUT,
+ PSS_STATE3270_FLIPPAGES,
+ PSS_STATE3270_ATEXIT_FADEOUT,
+ PSS_STATE3270_ATEXIT_WAITLINKDELAY,
+ PSS_STATE3270_ATEXIT_WAITFADE
};
enum PokemonSummaryScreenStat
diff --git a/include/strings.h b/include/strings.h
index 5ff490fcf..02f773596 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1190,7 +1190,7 @@ extern const u8 gText_BerryCrush_NoBerries[];
extern const u8 gText_BerryCrush_MemberDroppedOut[];
extern const u8 gText_BerryCrush_TimeUp[];
extern const u8 gText_BerryCrush_CommunicationStandby[];
-extern const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[];
+extern const u8 gText_1_ClrBluShdwLtBlu_Dynamic0[];
extern const u8 gText_1_Dynamic0[];
extern const u8 gText_SpaceTimes[];
extern const u8 gText_XDotY[];
@@ -1501,51 +1501,51 @@ extern const u8 gText_NotEvenANibble[];
extern const u8 gText_ItGotAway[];
// pokemon_summary_screen
-extern const u8 gUnknown_8419C39[];
-extern const u8 gUnknown_8419C92[];
-extern const u8 gUnknown_8419CA2[];
-extern const u8 gUnknown_8419C45[];
-extern const u8 gUnknown_8419C82[];
-extern const u8 gUnknown_8416202[];
-extern const u8 gUnknown_84161EF[];
-extern const u8 gUnknown_841620E[];
-extern const u8 gUnknown_8416210[];
-extern const u8 gUnknown_8416238[];
-extern const u8 gUnknown_8419C13[];
-extern const u8 gUnknown_8419C0B[];
-extern const u8 gUnknown_841996D[];
-extern const u8 gUnknown_841992F[];
-extern const u8 gUnknown_84198D5[];
-extern const u8 gUnknown_84198B4[];
-extern const u8 gUnknown_84197ED[];
-extern const u8 gUnknown_84197B8[];
-extern const u8 gUnknown_8419841[];
-extern const u8 gUnknown_8419822[];
-extern const u8 gUnknown_841979D[];
-extern const u8 gUnknown_8419782[];
-extern const u8 gUnknown_84199F4[];
-extern const u8 gUnknown_84199AB[];
-extern const u8 gUnknown_8419860[];
-extern const u8 gUnknown_841988A[];
-extern const u8 gUnknown_8419C4D[];
-extern const u8 gUnknown_8419C59[];
-extern const u8 gUnknown_8419C1D[];
-extern const u8 gUnknown_8419C62[];
-extern const u8 gUnknown_8419C72[];
-extern const u8 gUnknown_8419C2A[];
-extern const u8 gUnknown_8419C7B[];
-extern const u8 gUnknown_8419CA9[];
-extern const u8 gUnknown_8419CB9[];
-extern const u8 gUnknown_8419B44[];
-extern const u8 gUnknown_8419B7B[];
-extern const u8 gUnknown_8419BAE[];
-extern const u8 gUnknown_8419BDB[];
-extern const u8 gUnknown_8419A3D[];
-extern const u8 gUnknown_8419B18[];
-extern const u8 gUnknown_8419A6E[];
-extern const u8 gUnknown_8419B18[];
-extern const u8 gUnknown_8419AA2[];
-extern const u8 gUnknown_8419ADE[];
-extern const u8 gUnknown_8419B18[];
+extern const u8 gText_PokeSum_PageName_KnownMoves[];
+extern const u8 gText_PokeSum_Controls_PickSwitch[];
+extern const u8 gText_PokeSum_Controls_Pick[];
+extern const u8 gText_PokeSum_NoData[];
+extern const u8 gText_PokeSum_Controls_PageDetail[];
+extern const u8 gText_PokeSum_DexNoUnknown[];
+extern const u8 gText_PokeSum_Item_None[];
+extern const u8 gText_PokeSum_OneHyphen[];
+extern const u8 gText_PokeSum_TwoHyphens[];
+extern const u8 gText_PokeSum_PP[];
+extern const u8 gText_Somewhere[];
+extern const u8 gText_PokeSum_ATrade[];
+extern const u8 gText_PokeSum_FatefulEncounterHatched_BoldGentleGrammar[];
+extern const u8 gText_PokeSum_FatefulEncounterHatched[];
+extern const u8 gText_PokeSum_Hatched_BoldGentleGrammar[];
+extern const u8 gText_PokeSum_Hatched[];
+extern const u8 gText_PokeSum_FatefulEncounterMet_BoldGentleGrammar[];
+extern const u8 gText_PokeSum_FatefulEncounterMet[];
+extern const u8 gText_PokeSum_Met_BoldGentleGrammar[];
+extern const u8 gText_PokeSum_Met[];
+extern const u8 gText_PokeSum_MetInATrade_BoldGentleGrammar[];
+extern const u8 gText_PokeSum_MetInATrade[];
+extern const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched_BoldGentleGrammar[];
+extern const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched[];
+extern const u8 gText_PokeSum_ApparentlyMet[];
+extern const u8 gText_PokeSum_ApparentlyMet_BoldGentleGrammar[];
+extern const u8 gText_PokeSum_ExpPoints[];
+extern const u8 gText_PokeSum_NextLv[];
+extern const u8 gText_PokeSum_PageName_PokemonInfo[];
+extern const u8 gText_PokeSum_Controls_PageCancel[];
+extern const u8 gText_PokeSum_Controls_Cancel[];
+extern const u8 gText_PokeSum_PageName_PokemonSkills[];
+extern const u8 gText_PokeSum_Controls_Page[];
+extern const u8 gText_PokeSum_Controls_PickDelete[];
+extern const u8 gText_PokeSum_HmMovesCantBeForgotten[];
+extern const u8 gText_PokeSum_EggHatch_LongTime[];
+extern const u8 gText_PokeSum_EggHatch_SomeTime[];
+extern const u8 gText_PokeSum_EggHatch_Soon[];
+extern const u8 gText_PokeSum_EggHatch_AlmostReady[];
+extern const u8 gText_PokeSum_EggOrigin_DayCare[];
+extern const u8 gText_PokeSum_EggOrigin_Trade[];
+extern const u8 gText_PokeSum_EggOrigin_TravelingMan[];
+extern const u8 gText_PokeSum_EggOrigin_Trade[];
+extern const u8 gText_PokeSum_EggOrigin_NicePlace[];
+extern const u8 gText_PokeSum_EggOrigin_Spa[];
+extern const u8 gText_PokeSum_EggOrigin_Trade[];
#endif //GUARD_STRINGS_H
diff --git a/include/text.h b/include/text.h
index f181c6d9c..f4236e995 100644
--- a/include/text.h
+++ b/include/text.h
@@ -95,8 +95,8 @@
#define TEXT_COLOR_TRANSPARENT 0x0
#define TEXT_COLOR_WHITE 0x1
-#define TEXT_COLOR_DARK_GREY 0x2
-#define TEXT_COLOR_LIGHT_GREY 0x3
+#define TEXT_COLOR_DARK_GRAY 0x2
+#define TEXT_COLOR_LIGHT_GRAY 0x3
#define TEXT_COLOR_RED 0x4
#define TEXT_COLOR_LIGHT_RED 0x5
#define TEXT_COLOR_GREEN 0x6
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 16:52:29 +0000