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

Sync palette macros

Browse Source
This commit is contained in:
GriffinR
2023-05-23 13:02:51 -04:00
parent f93d5a8ae1
commit dcdb9024d8
117 changed files with 1248 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/learn_move.c
+19 -19
View File
@@ -258,7 +258,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 0,
.width = 6,
.height = 7,
.paletteNum = 0x0d,
.paletteNum = 13,
.baseBlock = 0x014
},
{
@@ -267,7 +267,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 0,
.width = 5,
.height = 5,
.paletteNum = 0x0d,
.paletteNum = 13,
.baseBlock = 0x03e
},
{
@@ -276,7 +276,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 0,
.width = 5,
.height = 2,
.paletteNum = 0x0d,
.paletteNum = 13,
.baseBlock = 0x057
},
{
@@ -285,7 +285,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 0,
.width = 3,
.height = 5,
.paletteNum = 0x0f,
.paletteNum = 15,
.baseBlock = 0x061
},
{
@@ -294,7 +294,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 2,
.width = 3,
.height = 3,
.paletteNum = 0x0f,
.paletteNum = 15,
.baseBlock = 0x070
},
{
@@ -303,7 +303,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 6,
.width = 15,
.height = 8,
.paletteNum = 0x0f,
.paletteNum = 15,
.baseBlock = 0x079
},
{
@@ -312,7 +312,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 1,
.width = 10,
.height = 12,
.paletteNum = 0x0f,
.paletteNum = 15,
.baseBlock = 0x0f1
},
{
@@ -321,7 +321,7 @@ static const struct WindowTemplate sWindowTemplates[9] = {
.tilemapTop = 15,
.width = 26,
.height = 4,
.paletteNum = 0x0f,
.paletteNum = 15,
.baseBlock = 0x169
}, DUMMY_WIN_TEMPLATE
};
@@ -332,7 +332,7 @@ static const struct WindowTemplate sMoveRelearnerYesNoMenuTemplate = {
.tilemapTop = 8,
.width = 6,
.height = 4,
.paletteNum = 0x0f,
.paletteNum = 15,
.baseBlock = 0x1d1
};
@@ -396,11 +396,11 @@ static void MoveRelearnerLoadBgGfx(void)
FillWindowPixelBuffer(i, PIXEL_FILL(0));
}
FillWindowPixelBuffer(7, PIXEL_FILL(1));
FillBgTilemapBufferRect(0, 0x000, 0, 0, 30, 20, 0xF);
FillBgTilemapBufferRect(0, 0x000, 0, 0, 30, 20, 15);
SetBgTilemapBuffer(1, sMoveRelearner->bg1TilemapBuffer);
LoadUserWindowGfx(0, 1, 0xE0);
ListMenuLoadStdPalAt(0xD0, 1);
LoadPalette(gMoveRelearner_Pal, 0x00, 0x20);
LoadUserWindowGfx(0, 1, BG_PLTT_ID(14));
ListMenuLoadStdPalAt(BG_PLTT_ID(13), 1);
LoadPalette(gMoveRelearner_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
DecompressAndLoadBgGfxUsingHeap(1, gMoveRelearner_Gfx, 0, 0, 0);
CopyToBgTilemapBuffer(1, gMoveRelearner_Tilemap, 0, 0);
CopyBgTilemapBufferToVram(1);
@@ -442,7 +442,7 @@ static void CB2_MoveRelearner_Resume(void)
SetVBlankCallback(VBlankCB_MoveRelearner);
MoveRelearnerLoadBgGfx();
SpawnListMenuScrollIndicatorSprites();
FillPalette(RGB_BLACK, 0, 2);
SetBackdropFromColor(RGB_BLACK);
RunTasks();
AnimateSprites();
@@ -506,7 +506,7 @@ static void MoveRelearnerStateMachine(void)
MoveRelearnerMenuHandleInput();
break;
case MENU_STATE_PRINT_TEACH_MOVE_PROMPT:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 14, 0);
sMoveRelearner->state++;
break;
case MENU_STATE_TEACH_MOVE_CONFIRM :
@@ -531,7 +531,7 @@ static void MoveRelearnerStateMachine(void)
}
break;
case MENU_STATE_PRINT_GIVE_UP_PROMPT:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 14, 0);
sMoveRelearner->state++;
break;
case MENU_STATE_GIVE_UP_CONFIRM:
@@ -552,7 +552,7 @@ static void MoveRelearnerStateMachine(void)
sMoveRelearner->state++;
break;
case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 14, 0);
sMoveRelearner->state = 18;
break;
case MENU_STATE_CONFIRM_DELETE_OLD_MOVE:
@@ -573,7 +573,7 @@ static void MoveRelearnerStateMachine(void)
sMoveRelearner->state++;
break;
case MENU_STATE_WAIT_FOR_STOP_TEACHING:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 14, 0);
sMoveRelearner->state = 26;
break;
case MENU_STATE_CONFIRM_STOP_TEACHING:
@@ -680,7 +680,7 @@ static void DrawTextBorderOnWindows6and7(void)
{
int i;
for (i = 6; i < 8; i++)
DrawTextBorderOuter(i, 0x001, 0xE);
DrawTextBorderOuter(i, 0x001, 14);
}
static void PrintTeachWhichMoveToStrVar1(bool8 onInit)