diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-12 16:18:38 -0400 |
| commit | 03b4ea32a9af67e6afb954cc44ff0c2768b86091 (patch) | |
| tree | 0371bfddb0f099e447cd6cdb3a23192993162535 /include | |
| parent | c9632154babc05708d0f2c7ee1f20b2939762ea1 (diff) | |
| parent | b54bd2e387feb7ece4f34f50f17519e329419716 (diff) | |
Merge remote-tracking branch 'origin' into doc_pokesum
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/layouts.h | 2 | ||||
| -rw-r--r-- | include/constants/map_groups.h | 2 | ||||
| -rw-r--r-- | include/event_scripts.h | 8 | ||||
| -rw-r--r-- | include/strings.h | 2 | ||||
| -rw-r--r-- | include/text.h | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 01a452970..b64f29809 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -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..a219613aa 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)) 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/strings.h b/include/strings.h index 8ec67ced5..57e30eb37 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[]; 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 |