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

polish and bug fix

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-10 03:21:34 +08:00
parent bcf27c2de1
commit 9d53999465
9 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/script_menu.s
+4 -4
View File
@@ -271,7 +271,7 @@ _0809CB32:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
movs r3, 0x2 movs r3, 0x2
bl PrintMultichoiceListItems bl MultichoiceList_PrintItems
b _0809CB7A b _0809CB7A
.align 2, 0 .align 2, 0
_0809CB54: .4byte sub_809D6D4 _0809CB54: .4byte sub_809D6D4
@@ -290,7 +290,7 @@ _0809CB5C:
movs r1, 0x2 movs r1, 0x2
movs r2, 0x8 movs r2, 0x8
movs r3, 0x2 movs r3, 0x2
bl PrintMultichoiceListItems bl MultichoiceList_PrintItems
_0809CB7A: _0809CB7A:
movs r0, 0xE movs r0, 0xE
str r0, [sp] str r0, [sp]
@@ -833,7 +833,7 @@ _0809CF08:
movs r1, 0x1 movs r1, 0x1
adds r2, r5, 0 adds r2, r5, 0
movs r3, 0x10 movs r3, 0x10
bl MultichoiceGridPrintItems bl MultichoiceGrid_PrintItems
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
str r5, [sp] str r5, [sp]
str r7, [sp, 0x4] str r7, [sp, 0x4]
@@ -843,7 +843,7 @@ _0809CF08:
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl MultichoiceGridInitCursor bl MultichoiceGrid_InitCursor
movs r0, 0 movs r0, 0
bl ScheduleBgCopyTilemapToVram bl ScheduleBgCopyTilemapToVram
_0809CFB8: _0809CFB8:
include/menu.h
+3 -3
View File
@@ -35,14 +35,14 @@ void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y);
// menu // menu
s8 Menu_ProcessInputGridLayout(void); s8 Menu_ProcessInputGridLayout(void);
u8 MultichoiceGridInitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos); u8 MultichoiceGrid_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos);
void MultichoiceGridPrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs); void MultichoiceGrid_PrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs);
void DestroyYesNoMenu(void); void DestroyYesNoMenu(void);
s8 Menu_ProcessInputNoWrapClearOnChoose(void); s8 Menu_ProcessInputNoWrapClearOnChoose(void);
void CreateYesNoMenu(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos); void CreateYesNoMenu(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos);
void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *orderArray); void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *orderArray);
void UnionRoomAndTradeMenuPrintOptions(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs); void UnionRoomAndTradeMenuPrintOptions(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs);
void PrintMultichoiceListItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing); void MultichoiceList_PrintItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing);
void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs); void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs);
s8 Menu_ProcessInputNoWrapAround_other(void); s8 Menu_ProcessInputNoWrapAround_other(void);
s8 Menu_ProcessInput_other(void); s8 Menu_ProcessInput_other(void);
include/palette.h
+1 -1
View File
@@ -43,7 +43,7 @@ struct PaletteFadeControl
extern struct PaletteFadeControl gPaletteFade; extern struct PaletteFadeControl gPaletteFade;
extern u32 gPlttBufferTransferPending; extern u32 gPlttBufferTransferPending;
extern u8 *gPaletteDecompressionBuffer; extern u8 *gUnknown_203AAB0;
extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE]; extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE];
extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE]; extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE];
include/sound.h
-1
View File
@@ -12,7 +12,6 @@ void StopMapMusic(void);
void FadeOutMapMusic(u8 speed); void FadeOutMapMusic(u8 speed);
void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed); void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed);
void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed); void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed);
void FadeInNewMapMusic(u16 songNum, u8 speed);
bool8 IsNotWaitingForBGMStop(void); bool8 IsNotWaitingForBGMStop(void);
void PlayFanfareByFanfareNum(u8 fanfareNum); void PlayFanfareByFanfareNum(u8 fanfareNum);
bool8 WaitFanfare(bool8 stop); bool8 WaitFanfare(bool8 stop);
src/fldeff_sweetscent.c
+5 -5
View File
@@ -52,8 +52,8 @@ static void StartSweetScentFieldEffect(void)
u8 taskId; u8 taskId;
PlaySE(SE_W260); PlaySE(SE_W260);
gPaletteDecompressionBuffer = (u8 *)Alloc(0x400); gUnknown_203AAB0 = (u8 *)Alloc(0x400);
CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100); CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100);
CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100); CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0)); BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0));
taskId = CreateTask(TrySweetScentEncounter, 0); taskId = CreateTask(TrySweetScentEncounter, 0);
@@ -72,7 +72,7 @@ static void TrySweetScentEncounter(u8 taskId)
data[0] = 0; data[0] = 0;
if (SweetScentWildEncounter() == TRUE) if (SweetScentWildEncounter() == TRUE)
{ {
Free(gPaletteDecompressionBuffer); Free(gUnknown_203AAB0);
DestroyTask(taskId); DestroyTask(taskId);
} }
else else
@@ -92,9 +92,9 @@ static void FailSweetScentEncounter(u8 taskId)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100); CpuFastSet(gUnknown_203AAB0, gPlttBufferUnfaded, 0x100);
sub_807B070(); sub_807B070();
Free(gPaletteDecompressionBuffer); Free(gUnknown_203AAB0);
ScriptContext1_SetupScript(EventScript_FailSweetScent); ScriptContext1_SetupScript(EventScript_FailSweetScent);
DestroyTask(taskId); DestroyTask(taskId);
} }
src/menu.c
+48 -48
View File
@@ -35,6 +35,12 @@ static EWRAM_DATA u8 sPaletteNum = 0;
static EWRAM_DATA u8 sYesNoWindowId = 0; static EWRAM_DATA u8 sYesNoWindowId = 0;
static EWRAM_DATA u8 sTopBarWindowId = 0; static EWRAM_DATA u8 sTopBarWindowId = 0;
static void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY);
static const struct TextColor gUnknown_8456618 = static const struct TextColor gUnknown_8456618 =
{ {
.fgColor = 15, .fgColor = 15,
@@ -42,12 +48,6 @@ static const struct TextColor gUnknown_8456618 =
.shadowColor = 2, .shadowColor = 2,
}; };
static void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY);
void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum) void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum)
{ {
sTileNum = tileNum; sTileNum = tileNum;
@@ -245,7 +245,7 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo
} }
// not used // not used
static void Unused_CopyTopBarWindowToVram(void) static void CopyTopBarWindowToVram(void)
{ {
if (sTopBarWindowId != 0xFF) if (sTopBarWindowId != 0xFF)
CopyWindowToVram(sTopBarWindowId, 3); CopyWindowToVram(sTopBarWindowId, 3);
@@ -305,7 +305,7 @@ static u8 sub_810F818(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8
return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos); return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos);
} }
static void RedrawMenuCursor(u8 oldPos, u8 newPos) static void Menu_RedrawCursor(u8 oldPos, u8 newPos)
{ {
u8 width, height; u8 width, height;
@@ -326,7 +326,7 @@ u8 Menu_MoveCursor(s8 cursorDelta)
sMenu.cursorPos = sMenu.minCursorPos; sMenu.cursorPos = sMenu.minCursorPos;
else else
sMenu.cursorPos += cursorDelta; sMenu.cursorPos += cursorDelta;
RedrawMenuCursor(oldPos, sMenu.cursorPos); Menu_RedrawCursor(oldPos, sMenu.cursorPos);
return sMenu.cursorPos; return sMenu.cursorPos;
} }
@@ -342,7 +342,7 @@ u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta)
else else
sMenu.cursorPos += cursorDelta; sMenu.cursorPos += cursorDelta;
RedrawMenuCursor(oldPos, sMenu.cursorPos); Menu_RedrawCursor(oldPos, sMenu.cursorPos);
return sMenu.cursorPos; return sMenu.cursorPos;
} }
@@ -472,7 +472,7 @@ void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 i
CopyWindowToVram(windowId, 2); CopyWindowToVram(windowId, 2);
} }
void PrintMultichoiceListItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing) void MultichoiceList_PrintItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing)
{ {
u8 i; u8 i;
@@ -521,16 +521,16 @@ static void sub_810FDE4(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, con
struct WindowTemplate SetWindowTemplateFields(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock) struct WindowTemplate SetWindowTemplateFields(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
{ {
struct WindowTemplate temp; struct WindowTemplate template;
temp.bg = bg; template.bg = bg;
temp.tilemapLeft = left; template.tilemapLeft = left;
temp.tilemapTop = top; template.tilemapTop = top;
temp.width = width; template.width = width;
temp.height = height; template.height = height;
temp.paletteNum = paletteNum; template.paletteNum = paletteNum;
temp.baseBlock = baseBlock; template.baseBlock = baseBlock;
return temp; return template;
} }
// not used // not used
@@ -564,7 +564,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u8 fontId, u8 left, u8
} }
// not used // not used
static void Unused_CreateYesNoMenu2(const struct WindowTemplate *window, u8 paletteNum, u16 baseTileNum, u8 initialCursorPos) static void CreateYesNoMenu2(const struct WindowTemplate *window, u8 paletteNum, u16 baseTileNum, u8 initialCursorPos)
{ {
CreateYesNoMenu(window, paletteNum, 0, 0, baseTileNum, initialCursorPos, 0); CreateYesNoMenu(window, paletteNum, 0, 0, baseTileNum, initialCursorPos, 0);
} }
@@ -583,7 +583,7 @@ void DestroyYesNoMenu(void)
RemoveWindow(sYesNoWindowId); RemoveWindow(sYesNoWindowId);
} }
void MultichoiceGridPrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs) void MultichoiceGrid_PrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs)
{ {
u8 width, i, j, yOffset; u8 width, i, j, yOffset;
@@ -599,7 +599,7 @@ void MultichoiceGridPrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeig
} }
//not used //not used
static void Unused_MultichoiceGridPrintItemsCustomOrder(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs, const u8 *orderArray) static void MultichoiceGrid_PrintItemsCustomOrder(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs, const u8 *orderArray)
{ {
u8 width, i, j; u8 width, i, j;
@@ -613,7 +613,7 @@ static void Unused_MultichoiceGridPrintItemsCustomOrder(u8 windowId, u8 fontId,
CopyWindowToVram(windowId, 2); CopyWindowToVram(windowId, 2);
} }
static u8 MultichoiceGridInitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cursorHeight, u8 cols, u8 rows, u8 numChoices, u8 cursorPos) static u8 MultichoiceGrid_InitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cursorHeight, u8 cols, u8 rows, u8 numChoices, u8 cursorPos)
{ {
s32 pos; s32 pos;
@@ -632,19 +632,19 @@ static u8 MultichoiceGridInitCursorInternal(u8 windowId, u8 fontId, u8 left, u8
sMenu.cursorPos = 0; sMenu.cursorPos = 0;
else else
sMenu.cursorPos = pos; sMenu.cursorPos = pos;
MultichoiceGridComputeNewCursorPos(0, 0); MultichoiceGrid_MoveCursor(0, 0);
return sMenu.cursorPos; return sMenu.cursorPos;
} }
u8 MultichoiceGridInitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos) u8 MultichoiceGrid_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos)
{ {
s32 cursorHeight = 16; s32 cursorHeight = 16;
u8 numChoices = cols * rows; u8 numChoices = cols * rows;
return MultichoiceGridInitCursorInternal(windowId, fontId, left, top, optionWidth, cursorHeight, cols, rows, numChoices, cursorPos); return MultichoiceGrid_InitCursorInternal(windowId, fontId, left, top, optionWidth, cursorHeight, cols, rows, numChoices, cursorPos);
} }
static void MultichoiceGridUpdateCursorPos(u8 oldCursorPos, u8 newCursorPos) static void MultichoiceGrid_RedrawCursor(u8 oldCursorPos, u8 newCursorPos)
{ {
u8 cursorWidth = GetMenuCursorDimensionByFont(sMenu.fontId, 0); u8 cursorWidth = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
u8 cursorHeight = GetMenuCursorDimensionByFont(sMenu.fontId, 1); u8 cursorHeight = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
@@ -657,7 +657,7 @@ static void MultichoiceGridUpdateCursorPos(u8 oldCursorPos, u8 newCursorPos)
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gFameCheckerText_ListMenuCursor, xPos, yPos, 0, 0); AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gFameCheckerText_ListMenuCursor, xPos, yPos, 0, 0);
} }
static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY) static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY)
{ {
u8 oldPos = sMenu.cursorPos; u8 oldPos = sMenu.cursorPos;
@@ -686,12 +686,12 @@ static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY)
} }
else else
{ {
MultichoiceGridUpdateCursorPos(oldPos, sMenu.cursorPos); MultichoiceGrid_RedrawCursor(oldPos, sMenu.cursorPos);
return sMenu.cursorPos; return sMenu.cursorPos;
} }
} }
static u8 MultichoiceGridComputeNewCursorPosIfValid(s8 deltaX, s8 deltaY) static u8 MultichoiceGrid_MoveCursorIfValid(s8 deltaX, s8 deltaY)
{ {
u8 oldPos = sMenu.cursorPos; u8 oldPos = sMenu.cursorPos;
@@ -712,7 +712,7 @@ static u8 MultichoiceGridComputeNewCursorPosIfValid(s8 deltaX, s8 deltaY)
} }
else else
{ {
MultichoiceGridUpdateCursorPos(oldPos, sMenu.cursorPos); MultichoiceGrid_RedrawCursor(oldPos, sMenu.cursorPos);
return sMenu.cursorPos; return sMenu.cursorPos;
} }
} }
@@ -732,25 +732,25 @@ static s8 sub_81105A0(void)
else if (JOY_NEW(DPAD_UP)) else if (JOY_NEW(DPAD_UP))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(0, -1); MultichoiceGrid_MoveCursor(0, -1);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_NEW(DPAD_DOWN)) else if (JOY_NEW(DPAD_DOWN))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(0, 1); MultichoiceGrid_MoveCursor(0, 1);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_NEW(DPAD_LEFT) || GetLRKeysState() == 1) else if (JOY_NEW(DPAD_LEFT) || GetLRKeysState() == 1)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(-1, 0); MultichoiceGrid_MoveCursor(-1, 0);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysState() == 2) else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysState() == 2)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(1, 0); MultichoiceGrid_MoveCursor(1, 0);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
@@ -771,25 +771,25 @@ s8 Menu_ProcessInputGridLayout(void)
} }
else if (JOY_NEW(DPAD_UP)) else if (JOY_NEW(DPAD_UP))
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, -1)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, -1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_NEW(DPAD_DOWN)) else if (JOY_NEW(DPAD_DOWN))
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, 1)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, 1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_NEW(DPAD_LEFT) || GetLRKeysState() == 1) else if (JOY_NEW(DPAD_LEFT) || GetLRKeysState() == 1)
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(-1, 0)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(-1, 0))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysState() == 2) else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysState() == 2)
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(1, 0)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(1, 0))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
@@ -811,25 +811,25 @@ static s8 sub_81106F4(void)
else if (JOY_REPT(DPAD_ANY) == DPAD_UP) else if (JOY_REPT(DPAD_ANY) == DPAD_UP)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(0, -1); MultichoiceGrid_MoveCursor(0, -1);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN) else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(0, 1); MultichoiceGrid_MoveCursor(0, 1);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT || sub_80BF66C() == 1) else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT || sub_80BF66C() == 1)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(-1, 0); MultichoiceGrid_MoveCursor(-1, 0);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT || sub_80BF66C() == 2) else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT || sub_80BF66C() == 2)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
MultichoiceGridComputeNewCursorPos(1, 0); MultichoiceGrid_MoveCursor(1, 0);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
@@ -852,25 +852,25 @@ static s8 sub_81107A0(void)
} }
else if (JOY_REPT(DPAD_ANY) == DPAD_UP) else if (JOY_REPT(DPAD_ANY) == DPAD_UP)
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, -1)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, -1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN) else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, 1)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, 1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT || sub_80BF66C() == 1) else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT || sub_80BF66C() == 1)
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(-1, 0)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(-1, 0))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT || sub_80BF66C() == 2) else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT || sub_80BF66C() == 2)
{ {
if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(1, 0)) if (oldPos != MultichoiceGrid_MoveCursorIfValid(1, 0))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
src/new_menu_helpers.c
+1 -2
View File
@@ -671,8 +671,7 @@ u8 sub_80F78E0(u8 height)
{ {
if (sStartMenuWindowId == 0xFF) if (sStartMenuWindowId == 0xFF)
{ {
struct WindowTemplate template; struct WindowTemplate template = SetWindowTemplateFields(0, 0x16, 1, 7, height * 2 - 1, DLG_WINDOW_PALETTE_NUM, 0x13D);
template = SetWindowTemplateFields(0, 0x16, 1, 7, height * 2 - 1, DLG_WINDOW_PALETTE_NUM, 0x13D);
sStartMenuWindowId = AddWindow(&template); sStartMenuWindowId = AddWindow(&template);
PutWindowTilemap(sStartMenuWindowId); PutWindowTilemap(sStartMenuWindowId);
} }
src/sound.c
+1 -1
View File
@@ -169,7 +169,7 @@ void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed)
sMapMusicFadeInSpeed = fadeInSpeed; sMapMusicFadeInSpeed = fadeInSpeed;
} }
void FadeInNewMapMusic(u16 songNum, u8 speed) static void FadeInNewMapMusic(u16 songNum, u8 speed)
{ {
FadeInNewBGM(songNum, speed); FadeInNewBGM(songNum, speed);
sCurrentMapMusic = songNum; sCurrentMapMusic = songNum;
sym_ewram.txt
+1 -1
View File
@@ -1085,7 +1085,7 @@ gUnknown_2039A34: @ 2039A34
.include "src/save.o" .include "src/save.o"
.include "src/mystery_event_script.o" .include "src/mystery_event_script.o"
gPaletteDecompressionBuffer: @ 203AAB0 gUnknown_203AAB0: @ 203AAB0
.space 0x4 .space 0x4
gUnknown_203AAB4: @ 203AAB4 gUnknown_203AAB4: @ 203AAB4