ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

6k left

Browse Source
This commit is contained in:
DizzyEggg 2018-12-16 21:10:01 +01:00
parent f1421d94c3
commit aae36b5653
18 changed files with 2967 additions and 3871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/party_menu.s
View File

@ -6700,7 +6700,7 @@ _081B3774:
_081B3778:
lsls r0, 24
lsrs r4, r0, 24
bl GetMenuCursorPos
bl Menu_GetCursorPos
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
@ -9914,7 +9914,7 @@ sub_81B5470: @ 81B5470
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
bl GetMenuCursorPos
bl Menu_GetCursorPos
ldr r5, =gUnknown_0203CEC4
ldr r1, [r5]
lsls r0, 24
@ -12639,7 +12639,7 @@ ether_effect_related_2: @ 81B6B80
ldr r0, [r0]
adds r0, 0xC
bl sub_81B302C
bl GetMenuCursorPos
bl Menu_GetCursorPos
ldr r1, =gUnknown_0203CEC8
lsls r0, 24
lsrs r0, 24

3043
asm/pokemon_storage_system.s
View File

File diff suppressed because it is too large Load Diff

2
asm/rom_8011DC0.s
View File

@ -14596,7 +14596,7 @@ _0801E1B4:
movs r0, 0x5
bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
bl Menu_MoveCursor
b _0801E23A
.pool
_0801E1D4:

108
data/pokemon_storage_system.s
View File

@ -5,114 +5,6 @@
.align 2
gUnknown_0857B9BC:: @ 857B9BC
.4byte sub_80CF0CC, 0
.4byte sub_80CF5C4, 1
.4byte sub_80CF7E4, 2
.4byte sub_80CF8D8, 3
.4byte NULL, 0
.align 2
gHandCursorSpriteSheets:: @ 857B9E4
obj_tiles gHandCursorTiles, 0x0800, 0x0000
obj_tiles gHandCursorShadowTiles, 0x0080, 0x0001
null_obj_tiles
.align 2
gHandCursorSpritePalettes:: @ 857B9FC
obj_pal gHandCursorPalette, 0xDAC7
null_obj_pal
.align 2
gOamData_857BA0C:: @ 857BA0C
.2byte 0x0000
.2byte 0x8000
.2byte 0x0400
.align 2
gOamData_857BA14:: @ 857BA14
.2byte 0x0000
.2byte 0x4000
.2byte 0x0400
.align 2
gSpriteAnim_857BA1C:: @ 857BA1C
obj_image_anim_frame 0, 30
obj_image_anim_frame 16, 30
obj_image_anim_jump 0
.align 2
gSpriteAnim_857BA28:: @ 857BA28
obj_image_anim_frame 0, 5
obj_image_anim_end
.align 2
gSpriteAnim_857BA30:: @ 857BA30
obj_image_anim_frame 32, 5
obj_image_anim_end
.align 2
gSpriteAnim_857BA38:: @ 857BA38
obj_image_anim_frame 48, 5
obj_image_anim_end
.align 2
gSpriteAnimTable_857BA40:: @ 857BA40
.4byte gSpriteAnim_857BA1C
.4byte gSpriteAnim_857BA28
.4byte gSpriteAnim_857BA30
.4byte gSpriteAnim_857BA38
.align 2
gSpriteTemplate_857BA50:: @ 857BA50
spr_template 0, 0xDACA, gOamData_857BA0C, gSpriteAnimTable_857BA40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteTemplate_857BA68:: @ 857BA68
spr_template 1, 0xDACA, gOamData_857BA14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CFBF4
.align 2
gUnknown_0857BA80:: @ 857BA80
.4byte gPCText_Cancel
.4byte gPCText_Store
.4byte gPCText_Withdraw
.4byte gPCText_Move
.4byte gPCText_Shift
.4byte gPCText_Place
.4byte gPCText_Summary
.4byte gPCText_Release
.4byte gPCText_Mark
.4byte gPCText_Jump
.4byte gPCText_Wallpaper
.4byte gPCText_Name
.4byte gPCText_Take
.4byte gPCText_Give
.4byte gPCText_Give
.4byte gPCText_Switch
.4byte gPCText_Bag
.4byte gPCText_Info
.4byte gPCText_Scenery1
.4byte gPCText_Scenery2
.4byte gPCText_Scenery3
.4byte gPCText_Etcetera
.4byte gPCText_Friends
.4byte gPCText_Forest
.4byte gPCText_City
.4byte gPCText_Desert
.4byte gPCText_Savanna
.4byte gPCText_Crag
.4byte gPCText_Volcano
.4byte gPCText_Snow
.4byte gPCText_Cave
.4byte gPCText_Beach
.4byte gPCText_Seafloor
.4byte gPCText_River
.4byte gPCText_Sky
.4byte gPCText_PolkaDot
.4byte gPCText_Pokecenter
.4byte gPCText_Machine
.4byte gPCText_Simple
.align 2
gUnknown_0857BB1C:: @ 857BB1C

6
include/menu.h
View File

@ -43,7 +43,7 @@ void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palet
void schedule_bg_copy_tilemap_to_vram(u8 bgNum);
void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs);
u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos);
u8 GetMenuCursorPos(void);
u8 Menu_GetCursorPos(void);
s8 Menu_ProcessInput(void);
s8 Menu_ProcessInputNoWrap(void);
void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
@ -71,8 +71,8 @@ u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount
u8 sub_8199134(s8, s8);
u8 GetStartMenuWindowId(void);
void sub_819A2BC(u8, u8);
u8 MoveMenuCursor(s8 cursorDelta);
u8 MoveMenuCursorNoWrapAround(s8 cursorDelta);
u8 Menu_MoveCursor(s8 cursorDelta);
u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta);
void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 CopyToVram);
u8 sub_81979C4(u8 a1);
u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos);

43
include/pokemon_storage_system.h
View File

@ -21,7 +21,7 @@ struct StorageAction
u8 format;
};
struct StorageText
struct StorageMenu
{
const u8 *text;
int textId;
@ -124,7 +124,7 @@ struct PokemonStorageSystemData
u8 field_A66;
u8 field_A67;
u8 *wallpaperTiles;
struct Sprite *field_A6C;
struct Sprite *movingMonSprite;
struct Sprite *partySprites[PARTY_SIZE];
struct Sprite *boxMonsSprites[IN_BOX_COUNT];
struct Sprite **field_B00;
@ -145,7 +145,15 @@ struct PokemonStorageSystemData
s8 field_C69;
u8 field_C6A;
u8 field_C6B;
u8 field_C6C[72];
struct WindowTemplate menuWindow;
struct StorageMenu menuItems[7];
u8 menuItemsCount;
u8 menuWidth;
u8 field_CAE;
u8 field_CAF;
u16 field_CB0;
u8 field_CB2;
u8 field_CB3;
struct Sprite *field_CB4;
struct Sprite *field_CB8;
s32 field_CBC;
@ -161,21 +169,20 @@ struct PokemonStorageSystemData
u8 field_CD5;
u8 field_CD6;
u8 field_CD7;
u8 field_CD8;
u8 field_CD9;
u8 field_CD8[2];
u8 field_CDA;
u8 field_CDB;
u32 *field_CDC;
const u32 *cursorMonPalette;
u32 cursorMonPersonality;
u16 cursorMonSpecies;
u16 selectedItem;
u16 cursorMonItem;
u16 field_CE8;
u8 field_CEA;
u8 field_CEB;
u8 field_CEC;
u8 field_CED;
u8 field_CEE[POKEMON_NAME_LENGTH + 1];
u8 cursorMonNick[36];
u8 cursorMonMarkings;
u8 cursorMonLevel;
bool8 cursorMonIsEgg;
u8 cursorMonNick[POKEMON_NAME_LENGTH + 1];
u8 cursorMonNickText[36];
u8 cursorMonSpeciesName[36];
u8 cursorMonGenderLvlText[36];
u8 cursorMonItemName[36];
@ -187,7 +194,7 @@ struct PokemonStorageSystemData
u16 *field_DA0;
struct PokemonMarkMenu field_DA4;
struct UnkPSSStruct_2002370 field_1E5C;
struct Pokemon field_20A4;
struct Pokemon movingMon;
struct Pokemon field_2108;
s8 field_216C;
u8 field_216D;
@ -207,7 +214,11 @@ struct PokemonStorageSystemData
u8 field_2186;
u8 field_2187;
u8 field_2188;
struct BoxPokemon *field_218C;
union
{
struct Pokemon *mon;
struct BoxPokemon *box;
} field_218C;
u8 field_2190[40];
u8 field_21B8[40];
u8 field_21E0[POKEMON_NAME_LENGTH + 1];
@ -217,7 +228,7 @@ struct PokemonStorageSystemData
u8 field_21FC;
u8 field_21FD;
u8 field_21FE;
u8 field_21FF;
u8 inBoxMovingMode;
u8 field_2200;
u8 field_2201[51];
u16 movingItem;
@ -242,7 +253,7 @@ extern struct PokemonStorageSystemData *gUnknown_02039D08;
u8* GetBoxNamePtr(u8 boxNumber);
struct BoxPokemon *GetBoxedMonPtr(u8, u8);
void SetBoxMonNickFromAnyBox(u8, u8, u8 *);
void CompactPartySlots(void);
s16 CompactPartySlots(void);
u32 GetBoxMonDataAt(u8 boxId, u8 monPosition, u32 request);
bool8 CheckFreePokemonStorageSpace(void);
u8 StorageGetCurrentBox(void);

2
include/pokemon_summary_screen.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
#define GUARD_POKEMON_SUMMARY_SCREEN_H
extern u8 gUnknown_0203CF20;
void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
void sub_81C4F98(u8, void(*)(void));
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);

39
include/strings.h
View File

@ -1434,5 +1434,44 @@ extern const u8 gText_PutItemInBag[];
extern const u8 gText_ItemIsNowHeld[];
extern const u8 gText_ChangedToNewItem[];
extern const u8 gText_MailCantBeStored[];
extern const u8 gPCText_Cancel[];
extern const u8 gPCText_Store[];
extern const u8 gPCText_Withdraw[];
extern const u8 gPCText_Move[];
extern const u8 gPCText_Shift[];
extern const u8 gPCText_Place[];
extern const u8 gPCText_Summary[];
extern const u8 gPCText_Release[];
extern const u8 gPCText_Mark[];
extern const u8 gPCText_Jump[];
extern const u8 gPCText_Wallpaper[];
extern const u8 gPCText_Name[];
extern const u8 gPCText_Take[];
extern const u8 gPCText_Give[];
extern const u8 gPCText_Give[];
extern const u8 gPCText_Switch[];
extern const u8 gPCText_Bag[];
extern const u8 gPCText_Info[];
extern const u8 gPCText_Scenery1[];
extern const u8 gPCText_Scenery2[];
extern const u8 gPCText_Scenery3[];
extern const u8 gPCText_Etcetera[];
extern const u8 gPCText_Friends[];
extern const u8 gPCText_Forest[];
extern const u8 gPCText_City[];
extern const u8 gPCText_Desert[];
extern const u8 gPCText_Savanna[];
extern const u8 gPCText_Crag[];
extern const u8 gPCText_Volcano[];
extern const u8 gPCText_Snow[];
extern const u8 gPCText_Cave[];
extern const u8 gPCText_Beach[];
extern const u8 gPCText_Seafloor[];
extern const u8 gPCText_River[];
extern const u8 gPCText_Sky[];
extern const u8 gPCText_PolkaDot[];
extern const u8 gPCText_Pokecenter[];
extern const u8 gPCText_Machine[];
extern const u8 gPCText_Simple[];
#endif //GUARD_STRINGS_H

2
src/battle_factory_screen.c
View File

@ -131,8 +131,6 @@ struct FactorySwapMonsStruct
bool8 unk30;
};
extern u8 gUnknown_0203CF20;
extern const u16 gBattleFrontierHeldItems[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct FacilityMon gSlateportBattleTentMons[];

2
src/battle_pyramid_bag.c
View File

@ -964,7 +964,7 @@ static void HandleMenuActionInput(u8 taskId)
{
if (sub_81221EC() != TRUE)
{
s8 id = GetMenuCursorPos();
s8 id = Menu_GetCursorPos();
if (gMain.newKeys & DPAD_UP)
{
if (id > 0 && IsValidMenuAction(id - 2))

4
src/decoration.c
View File

@ -519,7 +519,7 @@ void sub_8126B80(u8 taskId)
if (!gPaletteFade.active)
{
menuPos = GetMenuCursorPos();
menuPos = Menu_GetCursorPos();
switch (Menu_ProcessInput())
{
default:
@ -527,7 +527,7 @@ void sub_8126B80(u8 taskId)
sSecretBasePCMenuActions[sSecretBasePCMenuCursorPos].func.void_u8(taskId);
break;
case -2:
sSecretBasePCMenuCursorPos = GetMenuCursorPos();
sSecretBasePCMenuCursorPos = Menu_GetCursorPos();
if ((s8)menuPos != sSecretBasePCMenuCursorPos)
{
sub_8126C08();

2
src/item_menu.c
View File

@ -1564,7 +1564,7 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId)
{
if (sub_81221EC() != TRUE)
{
s8 cursorPos = GetMenuCursorPos();
s8 cursorPos = Menu_GetCursorPos();
if (gMain.newKeys & DPAD_UP)
{
if (cursorPos > 0 && sub_81ACDFC(cursorPos - 2))

2
src/main_menu.c
View File

@ -1394,7 +1394,7 @@ static void Task_NewGameBirchSpeech_ChooseGender(u8 taskId)
gTasks[taskId].func = Task_NewGameBirchSpeech_WhatsYourName;
break;
}
gender2 = GetMenuCursorPos();
gender2 = Menu_GetCursorPos();
if (gender2 != gTasks[taskId].tPlayerGender)
{
gTasks[taskId].tPlayerGender = gender2;

28
src/menu.c
View File

@ -132,7 +132,7 @@ extern void sub_8197BB4(u8, u8, u8, u8, u8, u8);
extern void sub_8197E30(u8, u8, u8, u8, u8, u8);
extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8);
extern void sub_81980A8(u8, u8, u8, u8, u8, u8);
extern u8 MoveMenuCursor(s8);
extern u8 Menu_MoveCursor(s8);
extern u8 sub_8199134(s8, s8);
extern void sub_8198C78(void);
extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
@ -910,7 +910,7 @@ u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numC
else
gUnknown_0203CD90.cursorPos = pos;
MoveMenuCursor(0);
Menu_MoveCursor(0);
return gUnknown_0203CD90.cursorPos;
}
@ -935,7 +935,7 @@ void RedrawMenuCursor(u8 oldPos, u8 newPos)
AddTextPrinterParameterized(gUnknown_0203CD90.windowId, gUnknown_0203CD90.fontId, gText_SelectorArrow3, gUnknown_0203CD90.left, gUnknown_0203CD90.optionHeight * newPos + gUnknown_0203CD90.top, 0, 0);
}
u8 MoveMenuCursor(s8 cursorDelta)
u8 Menu_MoveCursor(s8 cursorDelta)
{
u8 oldPos = gUnknown_0203CD90.cursorPos;
int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
@ -951,7 +951,7 @@ u8 MoveMenuCursor(s8 cursorDelta)
return gUnknown_0203CD90.cursorPos;
}
u8 MoveMenuCursorNoWrapAround(s8 cursorDelta)
u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta)
{
u8 oldPos = gUnknown_0203CD90.cursorPos;
int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
@ -967,7 +967,7 @@ u8 MoveMenuCursorNoWrapAround(s8 cursorDelta)
return gUnknown_0203CD90.cursorPos;
}
u8 GetMenuCursorPos(void)
u8 Menu_GetCursorPos(void)
{
return gUnknown_0203CD90.cursorPos;
}
@ -987,13 +987,13 @@ s8 Menu_ProcessInput(void)
else if (gMain.newKeys & DPAD_UP)
{
PlaySE(SE_SELECT);
MoveMenuCursor(-1);
Menu_MoveCursor(-1);
return MENU_NOTHING_CHOSEN;
}
else if (gMain.newKeys & DPAD_DOWN)
{
PlaySE(SE_SELECT);
MoveMenuCursor(1);
Menu_MoveCursor(1);
return MENU_NOTHING_CHOSEN;
}
@ -1016,13 +1016,13 @@ s8 Menu_ProcessInputNoWrap(void)
}
else if (gMain.newKeys & DPAD_UP)
{
if (oldPos != MoveMenuCursorNoWrapAround(-1))
if (oldPos != Menu_MoveCursorNoWrapAround(-1))
PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN;
}
else if (gMain.newKeys & DPAD_DOWN)
{
if (oldPos != MoveMenuCursorNoWrapAround(1))
if (oldPos != Menu_MoveCursorNoWrapAround(1))
PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN;
}
@ -1045,13 +1045,13 @@ s8 ProcessMenuInput_other(void)
else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
{
PlaySE(SE_SELECT);
MoveMenuCursor(-1);
Menu_MoveCursor(-1);
return MENU_NOTHING_CHOSEN;
}
else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
{
PlaySE(SE_SELECT);
MoveMenuCursor(1);
Menu_MoveCursor(1);
return MENU_NOTHING_CHOSEN;
}
@ -1074,13 +1074,13 @@ s8 Menu_ProcessInputNoWrapAround_other(void)
}
else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
{
if (oldPos != MoveMenuCursorNoWrapAround(-1))
if (oldPos != Menu_MoveCursorNoWrapAround(-1))
PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN;
}
else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
{
if (oldPos != MoveMenuCursorNoWrapAround(1))
if (oldPos != Menu_MoveCursorNoWrapAround(1))
PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN;
}
@ -1588,7 +1588,7 @@ u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, boo
else
gUnknown_0203CD90.cursorPos = pos;
return MoveMenuCursor(0);
return Menu_MoveCursor(0);
}
u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 itemCount, u8 initialCursorPos)

4
src/player_pc.c
View File

@ -462,9 +462,9 @@ static void ItemStorageMenuProcessInput(u8 taskId)
s8 r2;
s8 inputOptionId;
r5 = GetMenuCursorPos();
r5 = Menu_GetCursorPos();
inputOptionId = Menu_ProcessInput();
r2 = GetMenuCursorPos();
r2 = Menu_GetCursorPos();
switch(inputOptionId)
{
case -2:

3529
src/pokemon_storage_system.c
View File

File diff suppressed because it is too large Load Diff

12
src/script_menu.c
View File

@ -1640,27 +1640,27 @@ static void sub_80E2A94(u8 multichoiceId)
{
case 77:
FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[GetMenuCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case 76:
FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[GetMenuCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case 78:
FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[GetMenuCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case 79:
FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[GetMenuCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case 75:
FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[GetMenuCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case 74:
FillWindowPixelBuffer(0, 0x11);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[GetMenuCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
}
}

4
src/start_menu.c
View File

@ -574,13 +574,13 @@ static bool8 HandleStartMenuInput(void)
if (gMain.newKeys & DPAD_UP)
{
PlaySE(SE_SELECT);
sStartMenuCursorPos = MoveMenuCursor(-1);
sStartMenuCursorPos = Menu_MoveCursor(-1);
}
if (gMain.newKeys & DPAD_DOWN)
{
PlaySE(SE_SELECT);
sStartMenuCursorPos = MoveMenuCursor(1);
sStartMenuCursorPos = Menu_MoveCursor(1);
}
if (gMain.newKeys & A_BUTTON)