dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
DizzyEggg
2018-12-22 23:30:41 +01:00
parent 6dffa6d17c ebbe826133
commit adb4927504
105 changed files with 10712 additions and 22818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/party_menu.c
+9 -9
View File
@@ -2706,7 +2706,7 @@ void sub_81B3730(u8 taskId)
input = Menu_ProcessInputNoWrapAround_other();
else
input = ProcessMenuInput_other();
data[0] = GetMenuCursorPos();
data[0] = Menu_GetCursorPos();
if (input != MENU_NOTHING_CHOSEN)
{
if (input == MENU_B_PRESSED)
@@ -3599,7 +3599,7 @@ void sub_81B5430(u8 taskId)
void sub_81B5470(u8 taskId)
{
u8 fieldMove = gUnknown_0203CEC4->unkF[GetMenuCursorPos()] - 19;
u8 fieldMove = gUnknown_0203CEC4->unkF[Menu_GetCursorPos()] - 19;
const struct MapHeader *mapHeader;
PlaySE(SE_SELECT);
@@ -4063,9 +4063,9 @@ void sub_81B5FBC(u8 spriteId, u8 spriteId2, u8 a)
void LoadPartyMenuPokeballGfx(void)
{
LoadCompressedObjectPic(&gUnknown_08615EF8);
LoadCompressedObjectPic(&gUnknown_08615F70);
LoadCompressedObjectPalette(&gUnknown_08615F00);
LoadCompressedSpriteSheet(&gUnknown_08615EF8);
LoadCompressedSpriteSheet(&gUnknown_08615F70);
LoadCompressedSpritePalette(&gUnknown_08615F00);
}
void party_menu_status_condition_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
@@ -4109,8 +4109,8 @@ void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *
void LoadPartyMenuAilmentGfx(void)
{
LoadCompressedObjectPic(&gUnknown_08615FF8);
LoadCompressedObjectPalette(&gUnknown_08616000);
LoadCompressedSpriteSheet(&gUnknown_08615FF8);
LoadCompressedSpritePalette(&gUnknown_08616000);
}
void sub_81B617C(void)
@@ -4509,7 +4509,7 @@ void dp05_ether(u8 taskId, TaskFunc unused)
void ether_effect_related_2(u8 taskId)
{
sub_81B302C(&gUnknown_0203CEC4->unkC[0]);
gUnknown_0203CEC8.unkE = GetMenuCursorPos();
gUnknown_0203CEC8.unkE = Menu_GetCursorPos();
ether_effect_related(taskId);
}
@@ -6341,7 +6341,7 @@ void sub_81B9918(void)
}
}
}
if (sub_80D23A8(move) != TRUE)
if (AnyStorageMonWithMove(move) != TRUE)
gSpecialVar_Result = TRUE;
}
}