dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into doc_pokesum

Browse Source
This commit is contained in:
PikalaxALT
2021-04-12 16:18:38 -04:00
parent c9632154ba b54bd2e387
commit 03b4ea32a9
51 changed files with 415 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
berry_fix/charmap.txt
+2 -2
View File
@@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
TRANSPARENT = 00 TRANSPARENT = 00
WHITE = 01 WHITE = 01
DARK_GREY = 02 DARK_GRAY = 02
LIGHT_GREY = 03 LIGHT_GRAY = 03
RED = 04 RED = 04
LIGHT_RED = 05 LIGHT_RED = 05
GREEN = 06 GREEN = 06
berry_fix/payload/charmap.txt
+2 -2
View File
@@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
TRANSPARENT = 00 TRANSPARENT = 00
WHITE = 01 WHITE = 01
DARK_GREY = 02 DARK_GRAY = 02
LIGHT_GREY = 03 LIGHT_GRAY = 03
RED = 04 RED = 04
LIGHT_RED = 05 LIGHT_RED = 05
GREEN = 06 GREEN = 06
charmap.txt
+17 -15
View File
@@ -450,21 +450,23 @@ BIG = FC 06 04
@ colors @ colors
TRANSPARENT = 00 TRANSPARENT = 00
DARK_GREY = 01 WHITE = 01
RED = 02 DARK_GRAY = 02
GREEN = 03 LIGHT_GRAY = 03
BLUE = 04 RED = 04
YELLOW = 05 LIGHT_RED = 05
CYAN = 06 GREEN = 06
MAGENTA = 07 LIGHT_GREEN = 07
LIGHT_GRAY = 08 BLUE = 08
BLACK = 09 LIGHT_BLUE = 09
BLACK2 = 0A @ duplicate of black? @ these next colors can be set to anything arbitrary at runtime
SILVER = 0B @ usually though they'll have the textbox border colors as described below
WHITE = 0C DYNAMIC_COLOR1 = 0A @ white
SKY_BLUE = 0D DYNAMIC_COLOR2 = 0B @ white with a tinge of green
LIGHT_BLUE = 0E DYNAMIC_COLOR3 = 0C @ white 2
WHITE2 = 0F @ duplicate of white? DYNAMIC_COLOR4 = 0D @ aquamarine
DYNAMIC_COLOR5 = 0E @ blue-green
DYNAMIC_COLOR6 = 0F @ cerulean
@ sound @ sound
data/event_scripts.s
+1 -1
View File
@@ -87,7 +87,7 @@ gStdScriptsEnd::
.include "data/maps/BattleColosseum_2P/scripts.inc" .include "data/maps/BattleColosseum_2P/scripts.inc"
.include "data/maps/TradeCenter/scripts.inc" .include "data/maps/TradeCenter/scripts.inc"
.include "data/maps/RecordCenter/scripts.inc" .include "data/maps/RecordCorner/scripts.inc"
.include "data/maps/BattleColosseum_4P/scripts.inc" .include "data/maps/BattleColosseum_4P/scripts.inc"
.include "data/maps/UnionRoom/scripts.inc" .include "data/maps/UnionRoom/scripts.inc"
.include "data/maps/ViridianForest/scripts.inc" .include "data/maps/ViridianForest/scripts.inc"
data/layouts/RecordCenter/border.bin → data/layouts/RecordCorner/border.bin
View File
data/layouts/RecordCenter/map.bin → data/layouts/RecordCorner/map.bin
View File
data/layouts/layouts.json
+4 -4
View File
@@ -457,16 +457,16 @@
"blockdata_filepath": "data/layouts/TradeCenter/map.bin" "blockdata_filepath": "data/layouts/TradeCenter/map.bin"
}, },
{ {
"id": "LAYOUT_RECORD_CENTER", "id": "LAYOUT_RECORD_CORNER",
"name": "RecordCenter_Layout", "name": "RecordCorner_Layout",
"width": 20, "width": 20,
"height": 10, "height": 10,
"border_width": 2, "border_width": 2,
"border_height": 2, "border_height": 2,
"primary_tileset": "gTileset_Building", "primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub", "secondary_tileset": "gTileset_CableClub",
"border_filepath": "data/layouts/RecordCenter/border.bin", "border_filepath": "data/layouts/RecordCorner/border.bin",
"blockdata_filepath": "data/layouts/RecordCenter/map.bin" "blockdata_filepath": "data/layouts/RecordCorner/map.bin"
}, },
{ {
"id": "LAYOUT_BATTLE_COLOSSEUM_4P", "id": "LAYOUT_BATTLE_COLOSSEUM_4P",
data/maps/RecordCenter/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
RecordCenter_MapScripts:: @ 816047A
.byte 0
data/maps/RecordCenter/map.json → data/maps/RecordCorner/map.json
+8 -8
View File
@@ -1,7 +1,7 @@
{ {
"id": "MAP_RECORD_CENTER", "id": "MAP_RECORD_CORNER",
"name": "RecordCenter", "name": "RecordCorner",
"layout": "LAYOUT_RECORD_CENTER", "layout": "LAYOUT_RECORD_CORNER",
"music": "MUS_POKE_CENTER", "music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SPECIAL_AREA", "region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false, "requires_flash": false,
@@ -25,7 +25,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RecordCenter_EventScript_Attendant", "script": "RecordCorner_EventScript_Attendant",
"flag": "0" "flag": "0"
} }
], ],
@@ -67,7 +67,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot0" "script": "RecordCorner_EventScript_Spot0"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -76,7 +76,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot1" "script": "RecordCorner_EventScript_Spot1"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -85,7 +85,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot2" "script": "RecordCorner_EventScript_Spot2"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -94,7 +94,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot3" "script": "RecordCorner_EventScript_Spot3"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/RecordCorner/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
RecordCorner_MapScripts:: @ 816047A
.byte 0
data/maps/map_groups.json
+1 -1
View File
@@ -47,7 +47,7 @@
"gMapGroup0": [ "gMapGroup0": [
"BattleColosseum_2P", "BattleColosseum_2P",
"TradeCenter", "TradeCenter",
"RecordCenter", "RecordCorner",
"BattleColosseum_4P", "BattleColosseum_4P",
"UnionRoom" "UnionRoom"
], ],
data/scripts/cable_club.inc
+5 -5
View File
@@ -703,10 +703,10 @@ TradeCenter_EventScript_Chair3:: @ 81BB974
@ Nop in FRLG @ Nop in FRLG
@ Separate labels to match GetDirectionForEventScript @ Separate labels to match GetDirectionForEventScript
RecordCenter_EventScript_Spot0:: @ 81BB980 RecordCorner_EventScript_Spot0:: @ 81BB980
RecordCenter_EventScript_Spot1:: @ 81BB980 RecordCorner_EventScript_Spot1:: @ 81BB980
RecordCenter_EventScript_Spot2:: @ 81BB980 RecordCorner_EventScript_Spot2:: @ 81BB980
RecordCenter_EventScript_Spot3:: @ 81BB980 RecordCorner_EventScript_Spot3:: @ 81BB980
end end
CableClub_EventScript_ReadTrainerCard:: @ 81BB981 CableClub_EventScript_ReadTrainerCard:: @ 81BB981
@@ -748,7 +748,7 @@ TradeCenter_EventScript_Attendant:: @ 81BB9C1
end end
@ Nop in FRLG @ Nop in FRLG
RecordCenter_EventScript_Attendant:: @ 81BB9D3 RecordCorner_EventScript_Attendant:: @ 81BB9D3
end end
TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4 TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4
data/text/fame_checker.inc
+240 -240
View File
File diff suppressed because it is too large Load Diff
include/constants/layouts.h
+1 -1
View File
@@ -42,7 +42,7 @@
#define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46 #define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46
#define LAYOUT_BATTLE_COLOSSEUM_2P 47 #define LAYOUT_BATTLE_COLOSSEUM_2P 47
#define LAYOUT_TRADE_CENTER 48 #define LAYOUT_TRADE_CENTER 48
#define LAYOUT_RECORD_CENTER 49 #define LAYOUT_RECORD_CORNER 49
#define LAYOUT_BATTLE_COLOSSEUM_4P 50 #define LAYOUT_BATTLE_COLOSSEUM_4P 50
#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51
#define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52 #define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52
include/constants/map_groups.h
+1 -1
View File
@@ -8,7 +8,7 @@
// Map Group 0 // Map Group 0
#define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8))
#define MAP_TRADE_CENTER (1 | (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_BATTLE_COLOSSEUM_4P (3 | (0 << 8))
#define MAP_UNION_ROOM (4 | (0 << 8)) #define MAP_UNION_ROOM (4 | (0 << 8))
include/event_scripts.h
+4 -4
View File
@@ -1270,10 +1270,10 @@ extern const u8 BattleColosseum_4P_EventScript_PlayerSpot0[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[];
extern const u8 RecordCenter_EventScript_Spot0[]; extern const u8 RecordCorner_EventScript_Spot0[];
extern const u8 RecordCenter_EventScript_Spot1[]; extern const u8 RecordCorner_EventScript_Spot1[];
extern const u8 RecordCenter_EventScript_Spot2[]; extern const u8 RecordCorner_EventScript_Spot2[];
extern const u8 RecordCenter_EventScript_Spot3[]; extern const u8 RecordCorner_EventScript_Spot3[];
extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[];
extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[];
extern const u8 TradeCenter_EventScript_Chair0[]; extern const u8 TradeCenter_EventScript_Chair0[];
include/strings.h
+1 -1
View File
@@ -1190,7 +1190,7 @@ extern const u8 gText_BerryCrush_NoBerries[];
extern const u8 gText_BerryCrush_MemberDroppedOut[]; extern const u8 gText_BerryCrush_MemberDroppedOut[];
extern const u8 gText_BerryCrush_TimeUp[]; extern const u8 gText_BerryCrush_TimeUp[];
extern const u8 gText_BerryCrush_CommunicationStandby[]; 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_1_Dynamic0[];
extern const u8 gText_SpaceTimes[]; extern const u8 gText_SpaceTimes[];
extern const u8 gText_XDotY[]; extern const u8 gText_XDotY[];
include/text.h
+2 -2
View File
@@ -95,8 +95,8 @@
#define TEXT_COLOR_TRANSPARENT 0x0 #define TEXT_COLOR_TRANSPARENT 0x0
#define TEXT_COLOR_WHITE 0x1 #define TEXT_COLOR_WHITE 0x1
#define TEXT_COLOR_DARK_GREY 0x2 #define TEXT_COLOR_DARK_GRAY 0x2
#define TEXT_COLOR_LIGHT_GREY 0x3 #define TEXT_COLOR_LIGHT_GRAY 0x3
#define TEXT_COLOR_RED 0x4 #define TEXT_COLOR_RED 0x4
#define TEXT_COLOR_LIGHT_RED 0x5 #define TEXT_COLOR_LIGHT_RED 0x5
#define TEXT_COLOR_GREEN 0x6 #define TEXT_COLOR_GREEN 0x6
src/battle_script_commands.c
+1 -1
View File
@@ -5637,7 +5637,7 @@ static void PutLevelAndGenderOnLvlUpBox(void)
printerTemplate.unk = 0; printerTemplate.unk = 0;
printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.fgColor = TEXT_COLOR_WHITE;
printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT; printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT;
printerTemplate.shadowColor = TEXT_COLOR_DARK_GREY; printerTemplate.shadowColor = TEXT_COLOR_DARK_GRAY;
AddTextPrinter(&printerTemplate, 0xFF, NULL); AddTextPrinter(&printerTemplate, 0xFF, NULL);
txtPtr = gStringVar4; txtPtr = gStringVar4;
gStringVar4[0] = 0xF9; gStringVar4[0] = 0xF9;
src/berry_crush.c
+7 -7
View File
@@ -400,15 +400,15 @@ static const struct BgTemplate sBgTemplates[] = {
static const u8 sBerryCrushTextColorTable[][3] = { static const u8 sBerryCrushTextColorTable[][3] = {
{ {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY, TEXT_COLOR_DARK_GRAY,
TEXT_COLOR_LIGHT_GREY TEXT_COLOR_LIGHT_GRAY
}, { }, {
TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT,
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY TEXT_COLOR_DARK_GRAY
}, { }, {
TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT,
TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_LIGHT_GRAY,
TEXT_COLOR_RED TEXT_COLOR_RED
}, { }, {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
@@ -1091,11 +1091,11 @@ static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * game, u8 *para
if (params[1] & 2) if (params[1] & 2)
{ {
StringExpandPlaceholders(gStringVar4, sBerryCrushMessages[params[0]]); StringExpandPlaceholders(gStringVar4, sBerryCrushMessages[params[0]]);
AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
else else
{ {
AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
break; break;
@@ -2695,7 +2695,7 @@ static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command
break; break;
} }
if (linkPlayerId == game->localId) if (linkPlayerId == game->localId)
StringCopy(gStringVar3, gText_1_ClrLtGryShdwBlk_Dynamic0); StringCopy(gStringVar3, gText_1_ClrBluShdwLtBlu_Dynamic0);
else else
StringCopy(gStringVar3, gText_1_Dynamic0); StringCopy(gStringVar3, gText_1_Dynamic0);
gStringVar3[0] = linkIdToPrint + CHAR_1; gStringVar3[0] = linkIdToPrint + CHAR_1;
src/bg.c
+9 -9
View File
@@ -910,7 +910,7 @@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u
CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0); CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0);
} }
void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 unused, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, s16 palette1, s16 tileOffset) void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2)
{ {
u16 screenWidth, screenHeight, screenSize; u16 screenWidth, screenHeight, screenSize;
u16 var; u16 var;
@@ -926,28 +926,28 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8
{ {
case 0: case 0:
srcPtr = src + ((srcY * srcWidth) + srcX) * 2; srcPtr = src + ((srcY * srcWidth) + srcX) * 2;
for (i = destX; i < (destX + rectWidth); i++) for (i = destY; i < (destY + rectHeight); i++)
{ {
for (j = srcHeight; j < (srcHeight + destY); j++) for (j = destX; j < (destX + rectWidth); j++)
{ {
u16 index = GetTileMapIndexFromCoords(j, i, screenSize, screenWidth, screenHeight); u16 index = GetTileMapIndexFromCoords(j, i, screenSize, screenWidth, screenHeight);
CopyTileMapEntry(srcPtr, sGpuBgConfigs2[bg].tilemap + (index * 2), rectHeight, palette1, tileOffset); CopyTileMapEntry(srcPtr, sGpuBgConfigs2[bg].tilemap + (index * 2), palette1, tileOffset, palette2);
srcPtr += 2; srcPtr += 2;
} }
srcPtr += (srcWidth - destY) * 2; srcPtr += (srcWidth - rectWidth) * 2;
} }
break; break;
case 1: case 1:
srcPtr = src + ((srcY * srcWidth) + srcX); srcPtr = src + ((srcY * srcWidth) + srcX);
var = GetBgMetricAffineMode(bg, 0x1); var = GetBgMetricAffineMode(bg, 0x1);
for (i = destX; i < (destX + rectWidth); i++) for (i = destY; i < (destY + rectHeight); i++)
{ {
for (j = srcHeight; j < (srcHeight + destY); j++) for (j = destX; j < (destX + rectWidth); j++)
{ {
*(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + palette1; *(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + tileOffset;
srcPtr++; srcPtr++;
} }
srcPtr += (srcWidth - destY); srcPtr += (srcWidth - rectWidth);
} }
break; break;
} }
src/clear_save_data_screen.c
+2 -2
View File
@@ -55,8 +55,8 @@ static const struct WindowTemplate sWindowTemplates[] = {
static const u8 sTextColor[] = { static const u8 sTextColor[] = {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY, TEXT_COLOR_DARK_GRAY,
TEXT_COLOR_LIGHT_GREY TEXT_COLOR_LIGHT_GRAY
}; };
static void CB2_RunClearSaveDataScreen(void) static void CB2_RunClearSaveDataScreen(void)
src/data/party_menu.h
+3 -3
View File
@@ -112,12 +112,12 @@ static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/interface/party_
static const u8 sFontColorTable[][3] = static const u8 sFontColorTable[][3] =
{ {
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY}, // Default {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_DARK_GRAY}, // Default
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_GREEN}, // Unused {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_GREEN}, // Unused
{TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2, TEXT_DYNAMIC_COLOR_3}, // Gender symbol {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2, TEXT_DYNAMIC_COLOR_3}, // Gender symbol
{TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}, // Selection actions {TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}, // Selection actions
{TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE}, // Field moves {TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE}, // Field moves
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, // Unused {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY}, // Unused
}; };
static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] = static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] =
src/diploma.c
+2 -2
View File
@@ -38,8 +38,8 @@ static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま");
static const u8 gUnknown_84159A3[] = _("{HIGHLIGHT TRANSPARENT}ホウエン"); static const u8 gUnknown_84159A3[] = _("{HIGHLIGHT TRANSPARENT}ホウエン");
static const u8 gUnknown_84159AB[] = _("{HIGHLIGHT TRANSPARENT}ぜんこく"); static const u8 gUnknown_84159AB[] = _("{HIGHLIGHT TRANSPARENT}ぜんこく");
static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT}　　　　　ポケモンずかんを\nみごと　かんせい　させた\nいだいなこうせきを　たたえ\nここに　しょうめい　します"); static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT}　　　　　ポケモンずかんを\nみごと　かんせい　させた\nいだいなこうせきを　たたえ\nここに　しょうめい　します");
static const u8 gUnknown_84159ED[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}ゲームフリーク"); static const u8 gUnknown_84159ED[] = _("{COLOR DARK_GRAY}{HIGHLIGHT TRANSPARENT}ゲームフリーク");
static const u8 gUnknown_84159FB[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}"); static const u8 gUnknown_84159FB[] = _("{COLOR DARK_GRAY}{HIGHLIGHT TRANSPARENT}");
static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3}; static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3};
src/dodrio_berry_picking_2.c
+3 -3
View File
@@ -906,8 +906,8 @@ static const u8 sTextColorTable[][3] =
{ {
{ {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_DARK_GREY, TEXT_COLOR_DARK_GRAY,
TEXT_COLOR_LIGHT_GREY TEXT_COLOR_LIGHT_GRAY
}, { }, {
TEXT_COLOR_WHITE, TEXT_COLOR_WHITE,
TEXT_COLOR_RED, TEXT_COLOR_RED,
@@ -1421,7 +1421,7 @@ static void sub_8155A78(void)
{ {
case 0: case 0:
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
gUnknown_203F440->state++; gUnknown_203F440->state++;
break; break;
case 1: case 1:
src/easy_chat_3.c
+2 -2
View File
@@ -1321,7 +1321,7 @@ static void PrintTitleText(void)
xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u; xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u;
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SPEED_FF, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SPEED_FF, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
} }
@@ -1439,7 +1439,7 @@ static void PrintECFields(void)
*str++ = 9; *str++ = 9;
} }
str = WriteColorChangeControlCode(str, 0, TEXT_COLOR_DARK_GREY); str = WriteColorChangeControlCode(str, 0, TEXT_COLOR_DARK_GRAY);
} }
str = StringAppend(str, sText_Clear17); str = StringAppend(str, sText_Clear17);
src/evolution_scene.c
+1 -1
View File
@@ -69,7 +69,7 @@ static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transiti
static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン"); static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン");
static const u8 unref_83F8445[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}"); static const u8 unref_83F8445[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}");
static const u8 unref_83F844F[][10] = { static const u8 unref_83F844F[][10] = {
_("▶\n "), _("▶\n "),
src/field_player_avatar.c
+3 -3
View File
@@ -1839,7 +1839,7 @@ static bool8 Fishing10(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
task->tFrameCounter = 0; task->tFrameCounter = 0;
return FALSE; return FALSE;
@@ -1886,7 +1886,7 @@ static bool8 Fishing12(struct Task *task)
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep = FISHING_SHOW_RESULT; task->tStep = FISHING_SHOW_RESULT;
return TRUE; return TRUE;
} }
@@ -1896,7 +1896,7 @@ static bool8 Fishing13(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
return TRUE; return TRUE;
} }
src/field_screen_effect.c
+1 -1
View File
@@ -29,7 +29,7 @@ static const struct WindowTemplate gUnknown_83C68E4 = {
.baseBlock = 1, .baseBlock = 1,
}; };
static const u8 gUnknown_83C68EC[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY }; static const u8 gUnknown_83C68EC[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY };
static void Task_EnableScriptAfterMusicFade(u8 taskId); static void Task_EnableScriptAfterMusicFade(u8 taskId);
static void Task_BarnDoorWipeChild(u8 taskId); static void Task_BarnDoorWipeChild(u8 taskId);
src/help_message.c
+1 -1
View File
@@ -89,7 +89,7 @@ static void sub_8112FD0(void)
sub_8112F18(sHelpMessageWindowId); sub_8112F18(sHelpMessageWindowId);
} }
static const u8 sHelpMessageTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY}; static const u8 sHelpMessageTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY};
static void PrintHelpMessageText(const u8 *text) static void PrintHelpMessageText(const u8 *text)
{ {
src/item_menu.c
+2 -2
View File
@@ -289,9 +289,9 @@ static const struct YesNoFuncTable sYesNoMenu_Sell = {
Task_SellItem_No Task_SellItem_No
}; };
static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW RED TRANSPARENT GREEN}"); static const u8 sListItemTextColor_RegularItem[] = _("{COLOR_HIGHLIGHT_SHADOW DARK_GRAY TRANSPARENT LIGHT_GRAY}");
static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW LIGHT_GRAY TRANSPARENT BLACK}"); static const u8 sListItemTextColor_TmCase_BerryPouch[] = _("{COLOR_HIGHLIGHT_SHADOW BLUE TRANSPARENT LIGHT_BLUE}");
static const struct ScrollArrowsTemplate sPocketSwitchArrowPairTemplate = { static const struct ScrollArrowsTemplate sPocketSwitchArrowPairTemplate = {
.firstArrowType = SCROLL_ARROW_LEFT, .firstArrowType = SCROLL_ARROW_LEFT,
src/item_pc.c
+4 -4
View File
@@ -121,10 +121,10 @@ static const struct MenuAction sItemPcSubmenuOptions[] = {
}; };
static const u8 sTextColors[][3] = { static const u8 sTextColors[][3] = {
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY},
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}, {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY},
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY}, {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_DARK_GRAY},
{TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY} {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY}
}; };
static const struct WindowTemplate sWindowTemplates[] = { static const struct WindowTemplate sWindowTemplates[] = {
src/librfu_rfu.c
+10 -10
View File
@@ -1425,35 +1425,35 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
sending = ni_or_uni & 0x20; sending = ni_or_uni & 0x20;
if (sending || ni_or_uni == 0x40) if (sending || ni_or_uni == 0x40)
{ {
u8 *dataType_p; // a hack to swap instructions
slotStatus_NI = gRfuSlotStatusNI[bm_slot_id]; slotStatus_NI = gRfuSlotStatusNI[bm_slot_id];
slotStatus_UNI = NULL; slotStatus_UNI = NULL;
slotStatus_NI->send.errorCode = 0; slotStatus_NI->send.errorCode = 0;
*slotStatus_NI->send.now_p = dataType_p = &slotStatus_NI->send.dataType; slotStatus_NI->send.now_p[0] = &slotStatus_NI->send.dataType;
slotStatus_NI->send.remainSize = 7; slotStatus_NI->send.remainSize = 7;
slotStatus_NI->send.bmSlotOrg = bmSendSlot; slotStatus_NI->send.bmSlotOrg = bmSendSlot;
slotStatus_NI->send.bmSlot = bmSendSlot; slotStatus_NI->send.bmSlot = bmSendSlot;
slotStatus_NI->send.payloadSize = subFrameSize - frameSize; slotStatus_NI->send.payloadSize = subFrameSize - frameSize;
if (sending != 0) if (sending != 0)
*dataType_p = 0; slotStatus_NI->send.dataType = 0;
else else
*dataType_p = 1; slotStatus_NI->send.dataType = 1;
slotStatus_NI->send.dataSize = dataSize; slotStatus_NI->send.dataSize = dataSize;
slotStatus_NI->send.src = src; slotStatus_NI->send.src = src;
slotStatus_NI->send.ack = 0; slotStatus_NI->send.ack = 0;
slotStatus_NI->send.phase = 0; slotStatus_NI->send.phase = 0;
#ifndef NONMATCHING // to fix r2, r3, r4, r5 register roulette
asm("":::"r2");
#endif
for (i = 0; i < WINDOW_COUNT; ++i) for (i = 0; i < WINDOW_COUNT; ++i)
{ {
slotStatus_NI->send.recvAckFlag[i] = 0; slotStatus_NI->send.recvAckFlag[i] = 0;
slotStatus_NI->send.n[i] = 1; slotStatus_NI->send.n[i] = 1;
} }
for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id) for (bm_slot_id = 0; bm_slot_id < RFU_CHILD_MAX; ++bm_slot_id)
if ((bmSendSlot >> bm_slot_id) & 1) {
gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0; do
{
if ((bmSendSlot >> bm_slot_id) & 1)
gRfuSlotStatusNI[bm_slot_id]->send.failCounter = 0;
} while (0);
}
gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot; gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot;
*llFrameSize_p -= subFrameSize; *llFrameSize_p -= subFrameSize;
slotStatus_NI->send.state = SLOT_STATE_SEND_START; slotStatus_NI->send.state = SLOT_STATE_SEND_START;
src/map_preview_screen.c
+1 -1
View File
@@ -455,7 +455,7 @@ u16 MapPreview_CreateMapNameWindow(u8 mapsec)
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
color[0] = TEXT_COLOR_WHITE; // Access violation color[0] = TEXT_COLOR_WHITE; // Access violation
color[1] = TEXT_COLOR_RED; // Access violation color[1] = TEXT_COLOR_RED; // Access violation
color[2] = TEXT_COLOR_LIGHT_GREY; // Access violation color[2] = TEXT_COLOR_LIGHT_GRAY; // Access violation
GetMapName(gStringVar4, mapsec, 0); GetMapName(gStringVar4, mapsec, 0);
xctr = 104 - GetStringWidth(2, gStringVar4, 0); xctr = 104 - GetStringWidth(2, gStringVar4, 0);
AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4);
src/naming_screen.c
+5 -5
View File
@@ -706,7 +706,7 @@ static void pokemon_transfer_to_pc_with_message(void)
StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
} }
@@ -1814,9 +1814,9 @@ struct TextColor // Needed because of alignment
static const struct TextColor sTextColorStruct = { static const struct TextColor sTextColorStruct = {
{ {
{TEXT_DYNAMIC_COLOR_4, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, {TEXT_DYNAMIC_COLOR_4, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY},
{TEXT_DYNAMIC_COLOR_5, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}, {TEXT_DYNAMIC_COLOR_5, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY},
{TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY} {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY}
} }
}; };
@@ -1880,7 +1880,7 @@ static void sub_809FA60(void)
static void sub_809FAE4(void) static void sub_809FAE4(void)
{ {
const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY }; const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY };
int strwidth = GetStringWidth(0, gText_MoveOkBack, 0); int strwidth = GetStringWidth(0, gText_MoveOkBack, 0);
FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15)); FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15));
src/option_menu.c
+1 -1
View File
@@ -176,7 +176,7 @@ static const u8 *const sButtonTypeOptions[] =
gText_ButtonTypeLEqualsA gText_ButtonTypeLEqualsA
}; };
static const u8 sOptionMenuPickSwitchCancelTextColor[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; static const u8 sOptionMenuPickSwitchCancelTextColor[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
static const u8 sOptionMenuTextColor[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED}; static const u8 sOptionMenuTextColor[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED};
// Functions // Functions
src/overworld.c
+4 -4
View File
@@ -3117,13 +3117,13 @@ static u16 GetDirectionForEventScript(const u8 *script)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == BattleColosseum_4P_EventScript_PlayerSpot3) else if (script == BattleColosseum_4P_EventScript_PlayerSpot3)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == RecordCenter_EventScript_Spot0) else if (script == RecordCorner_EventScript_Spot0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == RecordCenter_EventScript_Spot1) else if (script == RecordCorner_EventScript_Spot1)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == RecordCenter_EventScript_Spot2) else if (script == RecordCorner_EventScript_Spot2)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == RecordCenter_EventScript_Spot3) else if (script == RecordCorner_EventScript_Spot3)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == BattleColosseum_2P_EventScript_PlayerSpot0) else if (script == BattleColosseum_2P_EventScript_PlayerSpot0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
src/pokemon_jump_4.c
+3 -3
View File
@@ -667,7 +667,7 @@ static void sub_814A7D0(u16 left, u16 top, u8 cursorPos)
static void sub_814A84C(void) static void sub_814A84C(void)
{ {
u8 color[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}; u8 color[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
PutWindowTilemap(0); PutWindowTilemap(0);
PutWindowTilemap(1); PutWindowTilemap(1);
@@ -867,7 +867,7 @@ static void sub_814AC30(bool32 arg0)
if (!arg0) if (!arg0)
{ {
for (i = 0; i < playersCount; i++) for (i = 0; i < playersCount; i++)
sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
} }
else else
{ {
@@ -875,7 +875,7 @@ static void sub_814AC30(bool32 arg0)
for (i = 0; i < playersCount; i++) for (i = 0; i < playersCount; i++)
{ {
if (var != i) if (var != i)
sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
else else
sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED); sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED);
} }
src/pokemon_special_anim_scene.c
+2 -2
View File
@@ -610,13 +610,13 @@ bool8 PSA_LevelUpVerticalSpritesTaskIsRunning(void)
UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter) UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter)
{ {
DrawTextBorderOuter(1, 0x001, 0xE); DrawTextBorderOuter(1, 0x001, 0xE);
DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_BOTH); CopyWindowToVram(1, COPYWIN_BOTH);
} }
UNUSED void PSA_DrawLevelUpWindowPg2(u16 *currStats) UNUSED void PSA_DrawLevelUpWindowPg2(u16 *currStats)
{ {
DrawLevelUpWindowPg2(1, currStats, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY); DrawLevelUpWindowPg2(1, currStats, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
} }
src/pokemon_storage_system_2.c
+7 -7
View File
@@ -245,7 +245,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
LoadStdWindowFrameGfx(); LoadStdWindowFrameGfx();
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(0, COPYWIN_BOTH);
CopyWindowToVram(task->data[15], COPYWIN_BOTH); CopyWindowToVram(task->data[15], COPYWIN_BOTH);
task->data[0]++; task->data[0]++;
@@ -271,7 +271,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
{ {
task->data[1] = task->data[3]; task->data[1] = task->data[3];
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
break; break;
case MENU_B_PRESSED: case MENU_B_PRESSED:
@@ -286,13 +286,13 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE) if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE)
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 3; task->data[0] = 3;
} }
else if (task->data[2] == 1 && CountPartyMons() == 1) else if (task->data[2] == 1 && CountPartyMons() == 1)
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 3; task->data[0] = 3;
} }
else else
@@ -307,7 +307,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON)) if (JOY_NEW(A_BUTTON | B_BUTTON))
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 2; task->data[0] = 2;
} }
else if (JOY_NEW(DPAD_UP)) else if (JOY_NEW(DPAD_UP))
@@ -317,7 +317,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
Menu_MoveCursor(-1); Menu_MoveCursor(-1);
task->data[1] = Menu_GetCursorPos(); task->data[1] = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 2; task->data[0] = 2;
} }
else if (JOY_NEW(DPAD_DOWN)) else if (JOY_NEW(DPAD_DOWN))
@@ -327,7 +327,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
Menu_MoveCursor(1); Menu_MoveCursor(1);
task->data[1] = Menu_GetCursorPos(); task->data[1] = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->data[0] = 2; task->data[0] = 2;
} }
break; break;
src/pokemon_storage_system_5.c
+4 -4
View File
@@ -1114,18 +1114,18 @@ static void SetCursorMonData(void *pokemon, u8 mode)
*(txtPtr)++ = CHAR_FEMALE; *(txtPtr)++ = CHAR_FEMALE;
break; break;
default: default:
*(txtPtr)++ = TEXT_COLOR_DARK_GREY; *(txtPtr)++ = TEXT_COLOR_DARK_GRAY;
*(txtPtr)++ = TEXT_COLOR_WHITE; *(txtPtr)++ = TEXT_COLOR_WHITE;
*(txtPtr)++ = TEXT_COLOR_LIGHT_GREY; *(txtPtr)++ = TEXT_COLOR_LIGHT_GRAY;
*(txtPtr)++ = CHAR_SPACE; *(txtPtr)++ = CHAR_SPACE;
break; break;
} }
*(txtPtr++) = EXT_CTRL_CODE_BEGIN; *(txtPtr++) = EXT_CTRL_CODE_BEGIN;
*(txtPtr++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; *(txtPtr++) = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
*(txtPtr++) = TEXT_COLOR_DARK_GREY; *(txtPtr++) = TEXT_COLOR_DARK_GRAY;
*(txtPtr++) = TEXT_COLOR_WHITE; *(txtPtr++) = TEXT_COLOR_WHITE;
*(txtPtr++) = TEXT_COLOR_LIGHT_GREY; *(txtPtr++) = TEXT_COLOR_LIGHT_GRAY;
*(txtPtr++) = CHAR_SPACE; *(txtPtr++) = CHAR_SPACE;
*(txtPtr++) = CHAR_EXTRA_EMOJI; *(txtPtr++) = CHAR_EXTRA_EMOJI;
*(txtPtr++) = 5; // LV_2 *(txtPtr++) = 5; // LV_2
src/region_map.c
+4 -4
View File
@@ -511,9 +511,9 @@ static const struct WindowTemplate sRegionMapWindowTemplates[] = {
}, DUMMY_WIN_TEMPLATE }, DUMMY_WIN_TEMPLATE
}; };
ALIGNED(4) const u8 sTextColor_White[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; ALIGNED(4) const u8 sTextColor_White[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
ALIGNED(4) const u8 sTextColor_Green[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREEN, TEXT_COLOR_DARK_GREY}; ALIGNED(4) const u8 sTextColor_Green[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREEN, TEXT_COLOR_DARK_GRAY};
ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY}; ALIGNED(4) const u8 sTextColor_Red[] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GRAY};
static const u8 *const sTextColorTable[] = { static const u8 *const sTextColorTable[] = {
[MAPSECTYPE_VISITED - 2] = sTextColor_Green, [MAPSECTYPE_VISITED - 2] = sTextColor_Green,
@@ -812,7 +812,7 @@ static const u8 sWinRegs[][2] = {
{REG_OFFSET_WIN1V, REG_OFFSET_WIN1H} {REG_OFFSET_WIN1V, REG_OFFSET_WIN1H}
}; };
static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; static const u8 sTextColors[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
static const u8 *const sMapNames[] = { static const u8 *const sMapNames[] = {
[MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = gMapSecName_PalletTown, [MAPSEC_PALLET_TOWN - MAPSECS_KANTO] = gMapSecName_PalletTown,
src/save_failed_screen.c
+1 -1
View File
@@ -153,7 +153,7 @@ static void ClearMapBuffer(void)
static void PrintTextOnSaveFailedScreen(const u8 *str) static void PrintTextOnSaveFailedScreen(const u8 *str)
{ {
GenerateFontHalfRowLookupTable(TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY); GenerateFontHalfRowLookupTable(TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CpuFill16(PIXEL_FILL(1) | (PIXEL_FILL(1) << 8), gDecompressionBuffer + 0x20, 0x2300); CpuFill16(PIXEL_FILL(1) | (PIXEL_FILL(1) << 8), gDecompressionBuffer + 0x20, 0x2300);
HelpSystemRenderText(2, gDecompressionBuffer + 0x20, str, 2, 2, 28, 10); HelpSystemRenderText(2, gDecompressionBuffer + 0x20, str, 2, 2, 28, 10);
RequestDmaCopyFromCharBuffer(); RequestDmaCopyFromCharBuffer();
src/slot_machine.c
+1 -1
View File
@@ -1991,7 +1991,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData
x = 236 - GetStringWidth(0, gString_SlotMachineControls, 0); x = 236 - GetStringWidth(0, gString_SlotMachineControls, 0);
textColor[0] = TEXT_DYNAMIC_COLOR_6; textColor[0] = TEXT_DYNAMIC_COLOR_6;
textColor[1] = TEXT_COLOR_WHITE; textColor[1] = TEXT_COLOR_WHITE;
textColor[2] = TEXT_COLOR_DARK_GREY; textColor[2] = TEXT_COLOR_DARK_GRAY;
AddTextPrinterParameterized3(1, 0, x, 0, textColor, 0, gString_SlotMachineControls); AddTextPrinterParameterized3(1, 0, x, 0, textColor, 0, gString_SlotMachineControls);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
src/strings.c
+14 -14
View File
@@ -58,7 +58,7 @@ const u8 gText_Seen[] = _("Seen:");
const u8 gText_Owned[] = _("Owned:"); const u8 gText_Owned[] = _("Owned:");
const u8 gText_Kanto[] = _("KANTO"); const u8 gText_Kanto[] = _("KANTO");
const u8 gText_National[] = _("NATIONAL"); const u8 gText_National[] = _("NATIONAL");
const u8 gText_PokemonHabitats[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON HABITATS"); const u8 gText_PokemonHabitats[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}POKéMON HABITATS");
const u8 gText_DexCategory_GrasslandPkmn[] = _("Grassland POKéMON"); const u8 gText_DexCategory_GrasslandPkmn[] = _("Grassland POKéMON");
const u8 gText_DexCategory_ForestPkmn[] = _("Forest POKéMON"); const u8 gText_DexCategory_ForestPkmn[] = _("Forest POKéMON");
const u8 gText_DexCategory_WatersEdgePkmn[] = _("Water's-edge POKéMON"); const u8 gText_DexCategory_WatersEdgePkmn[] = _("Water's-edge POKéMON");
@@ -68,16 +68,16 @@ const u8 gText_DexCategory_MountainPkmn[] = _("Mountain POKéMON");
const u8 gText_DexCategory_RoughTerrainPkmn[] = _("Rough-terrain POKéMON"); const u8 gText_DexCategory_RoughTerrainPkmn[] = _("Rough-terrain POKéMON");
const u8 gText_DexCategory_UrbanPkmn[] = _("Urban POKéMON"); const u8 gText_DexCategory_UrbanPkmn[] = _("Urban POKéMON");
const u8 gText_DexCategory_RarePkmn[] = _("Rare POKéMON"); const u8 gText_DexCategory_RarePkmn[] = _("Rare POKéMON");
const u8 gText_Search[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}SEARCH"); const u8 gText_Search[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}SEARCH");
const u8 gText_NumericalMode[] = _("NUMERICAL MODE"); const u8 gText_NumericalMode[] = _("NUMERICAL MODE");
const u8 gText_AToZMode[] = _("A TO Z MODE"); const u8 gText_AToZMode[] = _("A TO Z MODE");
const u8 gText_PokedexOther[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}OTHER"); const u8 gText_PokedexOther[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}OTHER");
const u8 gTextJP_HowToUsePokedex[] = _("ずかんの つかいかた"); const u8 gTextJP_HowToUsePokedex[] = _("ずかんの つかいかた");
const u8 gText_ClosePokedex[] = _("CLOSE POKéDEX"); const u8 gText_ClosePokedex[] = _("CLOSE POKéDEX");
const u8 gText_TypeMode[] = _("TYPE MODE"); const u8 gText_TypeMode[] = _("TYPE MODE");
const u8 gText_LightestMode[] = _("LIGHTEST MODE"); const u8 gText_LightestMode[] = _("LIGHTEST MODE");
const u8 gText_SmallestMode[] = _("SMALLEST MODE"); const u8 gText_SmallestMode[] = _("SMALLEST MODE");
const u8 gText_PokemonList[] = _("{COLOR WHITE2}{SHADOW LIGHT_BLUE}POKéMON LIST"); const u8 gText_PokemonList[] = _("{COLOR DYNAMIC_COLOR6}{SHADOW DYNAMIC_COLOR5}POKéMON LIST");
const u8 gText_NumericalModeKanto[] = _("NUMERICAL MODE: KANTO"); const u8 gText_NumericalModeKanto[] = _("NUMERICAL MODE: KANTO");
const u8 gText_NumericalModeNational[] = _("NUMERICAL MODE: NATIONAL"); const u8 gText_NumericalModeNational[] = _("NUMERICAL MODE: NATIONAL");
const u8 gText_PokemonListNoColor[] = _("POKéMON LIST"); const u8 gText_PokemonListNoColor[] = _("POKéMON LIST");
@@ -110,8 +110,8 @@ ALIGNED(4) const u8 gText_Number[] = _("No. ");
ALIGNED(4) const u8 gText_Level[] = _("Lv. "); ALIGNED(4) const u8 gText_Level[] = _("Lv. ");
ALIGNED(4) const u8 gText_Name[] = _("NAME"); ALIGNED(4) const u8 gText_Name[] = _("NAME");
ALIGNED(4) const u8 gText_IDNumber[] = _("IDNo."); ALIGNED(4) const u8 gText_IDNumber[] = _("IDNo.");
const u8 gUnknown_841610A[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!"); const u8 gUnknown_841610A[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}オダマキはかせが ピンチだ!\nポケモンを だして たすけてあげよう!");
const u8 gUnknown_8416133[] = _("{HIGHLIGHT WHITE2}{COLOR DARK_GREY}このポケモンにしますか?"); const u8 gUnknown_8416133[] = _("{HIGHLIGHT DYNAMIC_COLOR6}{COLOR WHITE}このポケモンにしますか?");
const u8 gUnknown_8416146[] = _("ポケモン"); const u8 gUnknown_8416146[] = _("ポケモン");
const u8 gText_SaveError_PleaseExchangeBackupMemory[] = _("Save error.\pPlease exchange the\nbackup memory."); const u8 gText_SaveError_PleaseExchangeBackupMemory[] = _("Save error.\pPlease exchange the\nbackup memory.");
const u8 gSaveStatName_Player[] = _("PLAYER"); const u8 gSaveStatName_Player[] = _("PLAYER");
@@ -760,9 +760,9 @@ const u8 gUnknown_8418C62[] = _("なにも かわらなかった!");
const u8 gUnknown_8418C6F[] = _("もう これいじょう たべない みたい‥"); const u8 gUnknown_8418C6F[] = _("もう これいじょう たべない みたい‥");
const u8 gText_SaveFailedScreen_CheckingBackupMemory[] = _("Save failed.\nChecking the backup memory‥\nPlease wait.\n“Time required:\nabout 1 minute”"); const u8 gText_SaveFailedScreen_CheckingBackupMemory[] = _("Save failed.\nChecking the backup memory‥\nPlease wait.\n“Time required:\nabout 1 minute”");
const u8 gText_SaveFailedScreen_BackupMemoryDamaged[] = _("The backup memory is damaged or\nthe game's battery has run dry.\nThe game can be played, but its\nprogress cannot be saved.\n“Please press the A Button.”"); const u8 gText_SaveFailedScreen_BackupMemoryDamaged[] = _("The backup memory is damaged or\nthe game's battery has run dry.\nThe game can be played, but its\nprogress cannot be saved.\n“Please press the A Button.”");
const u8 gUnknown_8418D70[] = _("{COLOR RED}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); const u8 gUnknown_8418D70[] = _("{COLOR DARK_GRAY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
const u8 gUnknown_8418D99[] = _("けんさが しゅうりょうしました!\nもういちど レポ-トを かきこみます\nしばらくおまちください"); const u8 gUnknown_8418D99[] = _("けんさが しゅうりょうしました!\nもういちど レポ-トを かきこみます\nしばらくおまちください");
const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR RED}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”"); const u8 gUnknown_8418DC9[] = _("レポ-トの かきこみは しゅうりょうしました\n{COLOR DARK_GRAY}“このまま ぼうけんをつづけることは できません\nタイトルに もどります”");
const u8 gText_SaveFailedScreen_SaveCompleted[] = _("Save completed.\n“Please press the A Button.”"); const u8 gText_SaveFailedScreen_SaveCompleted[] = _("Save completed.\n“Please press the A Button.”");
const u8 gUnknown_8418E36[] = _("れんらくせん"); const u8 gUnknown_8418E36[] = _("れんらくせん");
const u8 gUnknown_8418E3D[] = _("ひみつきち"); const u8 gUnknown_8418E3D[] = _("ひみつきち");
@@ -1032,7 +1032,7 @@ ALIGNED(4) const u8 gText_BerryCrush_NoBerries[] = _("You have no BERRIES.\nThe
ALIGNED(4) const u8 gText_BerryCrush_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled."); ALIGNED(4) const u8 gText_BerryCrush_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled.");
ALIGNED(4) const u8 gText_BerryCrush_TimeUp[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p"); ALIGNED(4) const u8 gText_BerryCrush_TimeUp[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p");
ALIGNED(4) const u8 gText_BerryCrush_CommunicationStandby[] = _("Communication standby…"); ALIGNED(4) const u8 gText_BerryCrush_CommunicationStandby[] = _("Communication standby…");
ALIGNED(4) const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[] = _("1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}"); ALIGNED(4) const u8 gText_1_ClrBluShdwLtBlu_Dynamic0[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{DYNAMIC 0x00}");
const u8 gText_1_Dynamic0[] = _("1. {DYNAMIC 0x00}"); const u8 gText_1_Dynamic0[] = _("1. {DYNAMIC 0x00}");
ALIGNED(4) const u8 gText_SpaceTimes[] = _(" times"); ALIGNED(4) const u8 gText_SpaceTimes[] = _(" times");
ALIGNED(4) const u8 gText_XDotY[] = _("{STR_VAR_1}.{STR_VAR_2}"); ALIGNED(4) const u8 gText_XDotY[] = _("{STR_VAR_1}.{STR_VAR_2}");
@@ -1214,10 +1214,10 @@ const u8 gTradeText_CancelTrade[] = _("Cancel trade?");
const u8 gTradeText_PressBButtonToExit[] = _("Press the B Button to exit."); const u8 gTradeText_PressBButtonToExit[] = _("Press the B Button to exit.");
const u8 gUnknown_841E10A[] = _("SUMMARY"); const u8 gUnknown_841E10A[] = _("SUMMARY");
const u8 gUnknown_841E112[] = _("TRADE"); const u8 gUnknown_841E112[] = _("TRADE");
const u8 gUnknown_841E118[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Communication standby…\nPlease wait."); const u8 gUnknown_841E118[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Communication standby…\nPlease wait.");
const u8 gUnknown_841E145[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}The trade has been canceled."); const u8 gUnknown_841E145[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}The trade has been canceled.");
const u8 gUnknown_841E16B[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}That's your only POKéMON\nfor battle."); const u8 gUnknown_841E16B[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}That's your only POKéMON\nfor battle.");
const u8 gUnknown_841E199[] = _("{COLOR RED}{HIGHLIGHT DARK_GREY}{SHADOW GREEN}Waiting for your friend\nto finish…"); const u8 gUnknown_841E199[] = _("{COLOR DARK_GRAY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GRAY}Waiting for your friend\nto finish…");
const u8 gUnknown_841E1C5[] = _("Your friend wants\nto trade POKéMON."); const u8 gUnknown_841E1C5[] = _("Your friend wants\nto trade POKéMON.");
const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}."); const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}.");
const u8 gText_ByeByeVar1[] = _("Bye-bye, {STR_VAR_2}!"); const u8 gText_ByeByeVar1[] = _("Bye-bye, {STR_VAR_2}!");
@@ -1246,7 +1246,7 @@ const u8 gUnknown_841E2C9[] = _("{DYNAMIC 0x02} players");
const u8 gUnknown_841E2D4[] = _("{DYNAMIC 0x03} players"); const u8 gUnknown_841E2D4[] = _("{DYNAMIC 0x03} players");
const u8 gUnknown_841E2DF[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい"); const u8 gUnknown_841E2DF[] = _("{DPAD_ANY}えらぶ:{A_BUTTON}けってい");
const u8 gUnknown_841E2EC[] = _("{B_BUTTON}CANCEL"); const u8 gUnknown_841E2EC[] = _("{B_BUTTON}CANCEL");
const u8 gUnknown_841E2F5[] = _("{COLOR BLUE}{SHADOW YELLOW} たいせんの くみあわせ\n{COLOR RED}{SHADOW GREEN}じぶんの ばしょをきめて ください"); const u8 gUnknown_841E2F5[] = _("{COLOR RED}{SHADOW LIGHT_RED} たいせんの くみあわせ\n{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}じぶんの ばしょをきめて ください");
const u8 gUnknown_841E322[] = _("{ID}"); const u8 gUnknown_841E322[] = _("{ID}");
const u8 gText_CommunicationStandby5[] = _("Communication standby…"); const u8 gText_CommunicationStandby5[] = _("Communication standby…");
const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well."); const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well.");
src/trade.c
+11 -21
View File
@@ -411,7 +411,7 @@ static const u8 gUnknown_8261E92[] = {
}; };
const u8 sText_Dummy[] = _(""); const u8 sText_Dummy[] = _("");
const u8 sText_ClrDkGryHltTranspShdwRed[] = _("{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}{SHADOW RED}"); const u8 sText_ClrWhtHltTranspShdwDrkGry[] = _("{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GRAY}");
const u8 gText_MaleSymbol4[] = _("♂"); const u8 gText_MaleSymbol4[] = _("♂");
const u8 gText_FemaleSymbol4[] = _("♀"); const u8 gText_FemaleSymbol4[] = _("♀");
const u8 gText_GenderlessSymbol[] = _(""); const u8 gText_GenderlessSymbol[] = _("");
@@ -455,7 +455,7 @@ static const u8 *const sTradeErrorOrStatusMessagePtrs[] = {
gText_OtherTrainersPkmnCantBeTraded // The other TRAINER's POKéMON can't be traded now gText_OtherTrainersPkmnCantBeTraded // The other TRAINER's POKéMON can't be traded now
}; };
static const u8 sTextColor_PartyMonNickname[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY }; static const u8 sTextColor_PartyMonNickname[] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY };
static const struct BgTemplate sBgTemplates[] = { static const struct BgTemplate sBgTemplates[] = {
{ {
@@ -674,7 +674,7 @@ static const u8 gUnknown_8262055[][2] = {
static void InitTradeMenuResources(void) static void InitTradeMenuResources(void)
{ {
int i; int i;
static vu16 dummy; static u16 dummy;
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
@@ -723,11 +723,6 @@ static void CB2_ReturnFromLinkTrade2(void)
u8 id; u8 id;
s32 width; s32 width;
u32 xPos; u32 xPos;
#ifndef NONMATCHING
register u32 r0 asm("r0");
#else
u32 r0;
#endif
u8 *name; u8 *name;
switch (gMain.state) switch (gMain.state)
@@ -895,7 +890,8 @@ static void CB2_ReturnFromLinkTrade2(void)
gMain.state++; gMain.state++;
break; break;
case 12: case 12:
width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); name = gSaveBlock2Ptr->playerName;
width = GetStringWidth(1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -904,9 +900,8 @@ static void CB2_ReturnFromLinkTrade2(void)
CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1);
} }
id = GetMultiplayerId(); id = GetMultiplayerId();
r0 = (id ^ 1) * sizeof(*gLinkPlayers); name = gLinkPlayers[id ^ 1].name;
name = gLinkPlayers->name; width = GetStringWidth(1, name, 0);
width = GetStringWidth(1, name + r0, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -999,11 +994,6 @@ void CB2_ReturnToTradeMenuFromSummary(void)
u8 id; u8 id;
s32 width; s32 width;
u32 xPos; u32 xPos;
#ifndef NONMATCHING
register u32 r0 asm("r0");
#else
u32 r0;
#endif
u8 *name; u8 *name;
switch (gMain.state) switch (gMain.state)
@@ -1095,7 +1085,8 @@ void CB2_ReturnToTradeMenuFromSummary(void)
} }
break; break;
case 12: case 12:
width = GetStringWidth(1, gSaveBlock2Ptr->playerName, 0); name = gSaveBlock2Ptr->playerName;
width = GetStringWidth(1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -1104,9 +1095,8 @@ void CB2_ReturnToTradeMenuFromSummary(void)
CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1); CreateSprite(&temp, xPos + sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][0] + (i * 32), sTradeUnknownSpriteCoords[LANGUAGE_ENGLISH - 1][1], 1);
} }
id = GetMultiplayerId(); id = GetMultiplayerId();
r0 = (id ^ 1) * sizeof(*gLinkPlayers); name = gLinkPlayers[id ^ 1].name;
name = gLinkPlayers->name; width = GetStringWidth(1, name, 0);
width = GetStringWidth(1, name + r0, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
src/trainer_card.c
+1 -1
View File
@@ -271,7 +271,7 @@ static const u16 *const sKantoTrainerCardStarPals[] =
sKantoTrainerCard4Stars_Pals sKantoTrainerCard4Stars_Pals
}; };
static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}; static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
static const u8 sTrainerCardStatColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED}; static const u8 sTrainerCardStatColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED};
static const u8 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT}; static const u8 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT};
static const u8 sTrainerCardFontIds[] = {0, 2, 0}; static const u8 sTrainerCardFontIds[] = {0, 2, 0};
src/trainer_tower.c
+3 -12
View File
@@ -316,7 +316,7 @@ static const struct WindowTemplate sTimeBoardWindowTemplate[] = {
static const u32 sUnused_847A228 = 0x70; static const u32 sUnused_847A228 = 0x70;
static const u8 sTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY}; static const u8 sTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
static void (*const sTrainerTowerFunctions[])(void) = { static void (*const sTrainerTowerFunctions[])(void) = {
[TRAINER_TOWER_FUNC_INIT_FLOOR] = InitTrainerTowerFloor, [TRAINER_TOWER_FUNC_INIT_FLOOR] = InitTrainerTowerFloor,
@@ -501,7 +501,7 @@ void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx)
TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose2, dest); TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose2, dest);
} }
static void SetUpTrainerTowerDataStruct(void) // fakematching static void SetUpTrainerTowerDataStruct(void)
{ {
u32 challengeType = gSaveBlock1Ptr->towerChallengeId; u32 challengeType = gSaveBlock1Ptr->towerChallengeId;
s32 r4; s32 r4;
@@ -519,16 +519,7 @@ static void SetUpTrainerTowerDataStruct(void) // fakematching
r7 = gUnknown_84827B4[challengeType]; r7 = gUnknown_84827B4[challengeType];
for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++) for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++)
{ {
#ifndef NONMATCHING *(sTrainerTowerState->unk_0004.floors + r4) = *(r7[r4]); // manual pointer arithmetic needed to match
void * r5;
register void * r0 asm("r0") = sTrainerTowerState;
r5 = (void *)(r4 * sizeof(struct TrainerTowerFloor));
r0 = r5 + (uintptr_t)r0;
r0 += offsetof(struct UnkStruct_203F458, unk_0004.floors);
memcpy(r0, r7[r4], sizeof(struct TrainerTowerFloor));
#else
memcpy(&sTrainerTowerState->unk_0004.floors[r4], r7[r4], sizeof(struct TrainerTowerFloor));
#endif
} }
sTrainerTowerState->unk_0004.checksum = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors)); sTrainerTowerState->unk_0004.checksum = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors));
ValidateOrResetCurTrainerTowerRecord(); ValidateOrResetCurTrainerTowerRecord();
src/union_room.c
+5 -5
View File
@@ -3993,9 +3993,9 @@ static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str
case UR_COLOR_DKE_WHT_LTE: case UR_COLOR_DKE_WHT_LTE:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
printerTemplate.lineSpacing = 0; printerTemplate.lineSpacing = 0;
printerTemplate.fgColor = TEXT_COLOR_DARK_GREY; printerTemplate.fgColor = TEXT_COLOR_DARK_GRAY;
printerTemplate.bgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_WHITE;
printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY;
break; break;
case UR_COLOR_RED_WHT_LTR: case UR_COLOR_RED_WHT_LTR:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
@@ -4016,14 +4016,14 @@ static void UR_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str
printerTemplate.lineSpacing = 0; printerTemplate.lineSpacing = 0;
printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.fgColor = TEXT_COLOR_WHITE;
printerTemplate.bgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_WHITE;
printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY;
break; break;
case UR_COLOR_WHT_DKE_LTE: case UR_COLOR_WHT_DKE_LTE:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
printerTemplate.lineSpacing = 0; printerTemplate.lineSpacing = 0;
printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.fgColor = TEXT_COLOR_WHITE;
printerTemplate.bgColor = TEXT_COLOR_DARK_GREY; printerTemplate.bgColor = TEXT_COLOR_DARK_GRAY;
printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GREY; printerTemplate.shadowColor = TEXT_COLOR_LIGHT_GRAY;
break; break;
case UR_COLOR_GRN_DN6_LTB: case UR_COLOR_GRN_DN6_LTB:
printerTemplate.letterSpacing = 0; printerTemplate.letterSpacing = 0;
src/union_room_chat_display.c
+2 -2
View File
@@ -600,7 +600,7 @@ static bool32 DisplaySubtask_UpdateMessageBuffer(u8 *state)
UnionRoomChat_GetBufferSelectionRegion(&start, &length); UnionRoomChat_GetBufferSelectionRegion(&start, &length);
FillWin1Rect(start, length, PIXEL_FILL(0)); FillWin1Rect(start, length, PIXEL_FILL(0));
str = UnionRoomChat_GetMessageEntryBuffer(); str = UnionRoomChat_GetMessageEntryBuffer();
PrintOnWin1Parameterized(0, str, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY); PrintOnWin1Parameterized(0, str, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
break; break;
case 1: case 1:
@@ -670,7 +670,7 @@ static bool32 DisplaySubtask_CancelRegister(u8 *state)
str = UnionRoomChat_GetEndOfMessageEntryBuffer(); str = UnionRoomChat_GetEndOfMessageEntryBuffer();
length = StringLength_Multibyte(str); length = StringLength_Multibyte(str);
FillWin1Rect(x, length, PIXEL_FILL(0)); FillWin1Rect(x, length, PIXEL_FILL(0));
PrintOnWin1Parameterized(x, str, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY); PrintOnWin1Parameterized(x, str, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
break; break;
case 1: case 1:
src/wireless_communication_status_screen.c
+4 -4
View File
@@ -323,13 +323,13 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *
{ {
case 0: case 0:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
textColor[1] = TEXT_COLOR_DARK_GREY; textColor[1] = TEXT_COLOR_DARK_GRAY;
textColor[2] = TEXT_COLOR_LIGHT_GREY; textColor[2] = TEXT_COLOR_LIGHT_GRAY;
break; break;
case 1: case 1:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
textColor[1] = TEXT_COLOR_WHITE; textColor[1] = TEXT_COLOR_WHITE;
textColor[2] = TEXT_COLOR_LIGHT_GREY; textColor[2] = TEXT_COLOR_LIGHT_GRAY;
break; break;
case 2: case 2:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
@@ -344,7 +344,7 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *
case 4: case 4:
textColor[0] = TEXT_COLOR_TRANSPARENT; textColor[0] = TEXT_COLOR_TRANSPARENT;
textColor[1] = TEXT_COLOR_WHITE; textColor[1] = TEXT_COLOR_WHITE;
textColor[2] = TEXT_COLOR_DARK_GREY; textColor[2] = TEXT_COLOR_DARK_GRAY;
break; break;
// default: UB // default: UB
} }