ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label remaining symbols in field_specials

Browse Source
This commit is contained in:
GriffinR 2021-10-18 02:14:29 -04:00
parent 46dd10c87b
commit 7590bacec1
2 changed files with 26 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/specials.inc
View File

@ -455,7 +455,7 @@ gSpecials::
def_special ClearLinkContestFlags def_special ClearLinkContestFlags
def_special TryContestEModeLinkup def_special TryContestEModeLinkup
def_special ShowScrollableMultichoice def_special ShowScrollableMultichoice
def_special sub_813A630 def_special ScrollableMultichoice_TryReturnToList
def_special BufferBattleTowerElevatorFloors def_special BufferBattleTowerElevatorFloors
def_special TryStoreHeldItemsInPyramidBag def_special TryStoreHeldItemsInPyramidBag
def_special ChooseItemsToTossFromPyramidBag def_special ChooseItemsToTossFromPyramidBag
@ -484,10 +484,10 @@ gSpecials::
def_special CountPlayerTrainerStars def_special CountPlayerTrainerStars
def_special BufferBattleFrontierTutorMoveName def_special BufferBattleFrontierTutorMoveName
def_special CloseBattleFrontierTutorWindow def_special CloseBattleFrontierTutorWindow
def_special sub_813ADD4 def_special ScrollableMultichoice_RedrawPersistentMenu
def_special ChooseMonForMoveTutor def_special ChooseMonForMoveTutor
def_special GetBattleFrontierTutorMoveIndex def_special GetBattleFrontierTutorMoveIndex
def_special sub_813AF48 def_special ScrollableMultichoice_ClosePersistentMenu
def_special DoDeoxysRockInteraction def_special DoDeoxysRockInteraction
def_special SetDeoxysRockPalette def_special SetDeoxysRockPalette
def_special CreateEventLegalEnemyMon def_special CreateEventLegalEnemyMon

67
src/field_specials.c
View File

@ -116,8 +116,8 @@ static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused);
static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection); static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection);
static void CloseScrollableMultichoice(u8 taskId); static void CloseScrollableMultichoice(u8 taskId);
static void ScrollableMultichoice_RemoveScrollArrows(u8 taskId); static void ScrollableMultichoice_RemoveScrollArrows(u8 taskId);
static void sub_813A600(u8 taskId); static void Task_ScrollableMultichoice_WaitReturnToList(u8 taskId);
static void sub_813A664(u8 taskId); static void Task_ScrollableMultichoice_ReturnToList(u8 taskId);
static void ShowFrontierExchangeCornerItemIcon(u16 item); static void ShowFrontierExchangeCornerItemIcon(u16 item);
static void Task_DeoxysRockInteraction(u8 taskId); static void Task_DeoxysRockInteraction(u8 taskId);
static void ChangeDeoxysRockLevel(u8 a0); static void ChangeDeoxysRockLevel(u8 a0);
@ -2702,10 +2702,10 @@ static void ScrollableMultichoice_ProcessInput(u8 taskId)
{ {
CloseScrollableMultichoice(taskId); CloseScrollableMultichoice(taskId);
} }
else else // Handle selection while keeping the menu open
{ {
ScrollableMultichoice_RemoveScrollArrows(taskId); ScrollableMultichoice_RemoveScrollArrows(taskId);
task->func = sub_813A600; task->func = Task_ScrollableMultichoice_WaitReturnToList;
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
break; break;
@ -2729,36 +2729,32 @@ static void CloseScrollableMultichoice(u8 taskId)
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
// Functionally unused; tKeepOpenAfterSelect is only != 0 in unused functions // Never run, tKeepOpenAfterSelect is FALSE for all scrollable multichoices.
static void sub_813A600(u8 taskId) static void Task_ScrollableMultichoice_WaitReturnToList(u8 taskId)
{ {
switch (gTasks[taskId].tKeepOpenAfterSelect) switch (gTasks[taskId].tKeepOpenAfterSelect)
{ {
case 1: case 1:
default: default:
break; break;
case 2: case 2:
gTasks[taskId].tKeepOpenAfterSelect = 1; gTasks[taskId].tKeepOpenAfterSelect = 1;
gTasks[taskId].func = sub_813A664; gTasks[taskId].func = Task_ScrollableMultichoice_ReturnToList;
break; break;
} }
} }
// Never called // Never called
void sub_813A630(void) void ScrollableMultichoice_TryReturnToList(void)
{ {
u8 taskId = FindTaskIdByFunc(sub_813A600); u8 taskId = FindTaskIdByFunc(Task_ScrollableMultichoice_WaitReturnToList);
if (taskId == TASK_NONE) if (taskId == TASK_NONE)
{
EnableBothScriptContexts(); EnableBothScriptContexts();
}
else else
{ gTasks[taskId].tKeepOpenAfterSelect++; // Return to list
gTasks[taskId].tKeepOpenAfterSelect++;
}
} }
static void sub_813A664(u8 taskId) static void Task_ScrollableMultichoice_ReturnToList(u8 taskId)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
ScrollableMultichoice_UpdateScrollArrows(taskId); ScrollableMultichoice_UpdateScrollArrows(taskId);
@ -2807,23 +2803,7 @@ static void ScrollableMultichoice_RemoveScrollArrows(u8 taskId)
// Removed for Emerald (replaced by ShowScrollableMultichoice) // Removed for Emerald (replaced by ShowScrollableMultichoice)
void ShowGlassWorkshopMenu(void) void ShowGlassWorkshopMenu(void)
{ {
/*
u8 i;
ScriptContext2_Enable();
Menu_DrawStdWindowFrame(0, 0, 10, 11);
InitMenu(0, 1, 1, 5, 0, 9);
gUnknown_0203925C = 0;
ClearVerticalScrollIndicatorPalettes();
LoadScrollIndicatorPalette();
sub_810F2B4();
for (i = 0; i < 5; i++)
{
Menu_PrintText(gUnknown_083F83C0[i], 1, 2 * i + 1);
}
gUnknown_0203925B = 0;
gUnknown_0203925A = ARRAY_COUNT(gUnknown_083F83C0);
CreateTask(sub_810F118, 8);
*/
} }
void SetBattleTowerLinkPlayerGfx(void) void SetBattleTowerLinkPlayerGfx(void)
@ -3252,11 +3232,11 @@ void CloseBattleFrontierTutorWindow(void)
} }
// Never called // Never called
void sub_813ADD4(void) void ScrollableMultichoice_RedrawPersistentMenu(void)
{ {
u16 scrollOffset, selectedRow; u16 scrollOffset, selectedRow;
u8 i; u8 i;
u8 taskId = FindTaskIdByFunc(sub_813A600); u8 taskId = FindTaskIdByFunc(Task_ScrollableMultichoice_WaitReturnToList);
if (taskId != TASK_NONE) if (taskId != TASK_NONE)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@ -3264,9 +3244,7 @@ void sub_813ADD4(void)
SetStandardWindowBorderStyle(task->tWindowId, 0); SetStandardWindowBorderStyle(task->tWindowId, 0);
for (i = 0; i < MAX_SCROLL_MULTI_ON_SCREEN; i++) for (i = 0; i < MAX_SCROLL_MULTI_ON_SCREEN; i++)
{
AddTextPrinterParameterized5(task->tWindowId, 1, sScrollableMultichoiceOptions[gSpecialVar_0x8004][scrollOffset + i], 10, i * 16, TEXT_SPEED_FF, NULL, 0, 0); AddTextPrinterParameterized5(task->tWindowId, 1, sScrollableMultichoiceOptions[gSpecialVar_0x8004][scrollOffset + i], 10, i * 16, TEXT_SPEED_FF, NULL, 0, 0);
}
AddTextPrinterParameterized(task->tWindowId, 1, gText_SelectorArrow, 0, selectedRow * 16, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(task->tWindowId, 1, gText_SelectorArrow, 0, selectedRow * 16, TEXT_SPEED_FF, NULL);
PutWindowTilemap(task->tWindowId); PutWindowTilemap(task->tWindowId);
@ -3313,9 +3291,10 @@ void GetBattleFrontierTutorMoveIndex(void)
} }
// Never called // Never called
void sub_813AF48(void) // Close a scrollable multichoice that stays open after selection
void ScrollableMultichoice_ClosePersistentMenu(void)
{ {
u8 taskId = FindTaskIdByFunc(sub_813A600); u8 taskId = FindTaskIdByFunc(Task_ScrollableMultichoice_WaitReturnToList);
if (taskId != TASK_NONE) if (taskId != TASK_NONE)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];