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

Merge pull request #226 from DizzyEggg/decompile_list_menu

Browse Source 
Decompile list menu
This commit is contained in:
Diegoisawesome
2018-03-09 15:49:36 -06:00
committed by GitHub
parent f1b180d89d db2839bd5b
commit ae214eca8b
18 changed files with 792 additions and 1774 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_specials.s
+6 -6
View File
@@ -4894,7 +4894,7 @@ sub_813A46C: @ 813A46C
lsrs r0, 24 lsrs r0, 24
mov r1, sp mov r1, sp
movs r2, 0 movs r2, 0
bl sub_81AE860 bl ListMenuGetScrollAndRow
ldr r1, =gUnknown_0203AB68 ldr r1, =gUnknown_0203AB68
mov r0, sp mov r0, sp
ldrh r0, [r0] ldrh r0, [r0]
@@ -4903,7 +4903,7 @@ sub_813A46C: @ 813A46C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r1, sp mov r1, sp
bl sub_81AE838 bl ListMenuGetCurrentItemArrayId
ldrh r0, [r4, 0x1E] ldrh r0, [r4, 0x1E]
ldr r5, =gUnknown_0203AB6A ldr r5, =gUnknown_0203AB6A
ldrh r1, [r5] ldrh r1, [r5]
@@ -5007,7 +5007,7 @@ sub_813A570: @ 813A570
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r1, sp mov r1, sp
bl sub_81AE838 bl ListMenuGetCurrentItemArrayId
ldrh r0, [r4, 0x1E] ldrh r0, [r4, 0x1E]
mov r1, sp mov r1, sp
ldrh r1, [r1] ldrh r1, [r1]
@@ -5019,7 +5019,7 @@ sub_813A570: @ 813A570
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldr r0, =gUnknown_0203AB64 ldr r0, =gUnknown_0203AB64
ldr r0, [r0] ldr r0, [r0]
bl Free bl Free
@@ -6012,7 +6012,7 @@ sub_813ADD4: @ 813ADD4
adds r4, 0x16 adds r4, 0x16
add r1, sp, 0x14 add r1, sp, 0x14
adds r2, r4, 0 adds r2, r4, 0
bl sub_81AE860 bl ListMenuGetScrollAndRow
ldrh r0, [r6, 0x22] ldrh r0, [r6, 0x22]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -6173,7 +6173,7 @@ sub_813AF48: @ 813AF48
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldr r0, =gUnknown_0203AB64 ldr r0, =gUnknown_0203AB64
ldr r0, [r0] ldr r0, [r0]
bl Free bl Free
asm/learn_move.s
+2 -2
View File
@@ -903,7 +903,7 @@ sub_8160EA0: @ 8160EA0
ldrb r0, [r0] ldrb r0, [r0]
ldr r1, =gUnknown_0203BC38 ldr r1, =gUnknown_0203BC38
adds r2, r1, 0x2 adds r2, r1, 0x2
bl sub_81AE6C8 bl DestroyListMenuTask
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
@@ -988,7 +988,7 @@ sub_8160F50: @ 8160F50
ldr r4, =gUnknown_0203BC38 ldr r4, =gUnknown_0203BC38
adds r2, r4, 0x2 adds r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_81AE860 bl ListMenuGetScrollAndRow
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r5, r0 cmp r5, r0
asm/list_menu.s
-1643
View File
File diff suppressed because it is too large Load Diff
asm/player_pc.s
+10 -10
View File
@@ -1021,7 +1021,7 @@ sub_816B674: @ 816B674
mov r8, r1 mov r8, r1
adds r1, r7, 0 adds r1, r7, 0
mov r2, r8 mov r2, r8
bl sub_81AE860 bl ListMenuGetScrollAndRow
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r6, r0 cmp r6, r0
@@ -1050,7 +1050,7 @@ _0816B6EA:
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
adds r1, r7, 0 adds r1, r7, 0
mov r2, r8 mov r2, r8
bl sub_81AE6C8 bl DestroyListMenuTask
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
mov r1, r8 mov r1, r8
@@ -1129,7 +1129,7 @@ sub_816B798: @ 816B798
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
movs r0, 0 movs r0, 0
bl schedule_bg_copy_tilemap_to_vram bl schedule_bg_copy_tilemap_to_vram
bl sub_81D1EC0 bl sub_81D1EC0
@@ -2476,7 +2476,7 @@ sub_816C30C: @ 816C30C
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r4, r1, 0x2 subs r4, r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl sub_81AE860 bl ListMenuGetScrollAndRow
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
ldrh r0, [r4] ldrh r0, [r4]
adds r1, r0 adds r1, r0
@@ -2497,7 +2497,7 @@ _0816C35C:
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r2, r1, 0x2 subs r2, r1, 0x2
bl sub_81AE860 bl ListMenuGetScrollAndRow
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r6, r0 cmp r6, r0
@@ -2584,7 +2584,7 @@ sub_816C400: @ 816C400
ldrb r0, [r5, 0xA] ldrb r0, [r5, 0xA]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldr r0, =gUnknown_0203BCC4 ldr r0, =gUnknown_0203BCC4
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xCD movs r1, 0xCD
@@ -2691,7 +2691,7 @@ sub_816C4FC: @ 816C4FC
ldrb r0, [r4, 0xA] ldrb r0, [r4, 0xA]
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r2, r1, 0x2 subs r2, r1, 0x2
bl sub_81AE860 bl ListMenuGetScrollAndRow
b _0816C57E b _0816C57E
.pool .pool
_0816C530: _0816C530:
@@ -2702,7 +2702,7 @@ _0816C530:
ldr r1, =gUnknown_0203BCBA ldr r1, =gUnknown_0203BCBA
subs r4, r1, 0x2 subs r4, r1, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl sub_81AE860 bl ListMenuGetScrollAndRow
ldr r0, =gUnknown_0203BCC4 ldr r0, =gUnknown_0203BCC4
ldr r0, [r0] ldr r0, [r0]
movs r1, 0xCD movs r1, 0xCD
@@ -2776,7 +2776,7 @@ sub_816C5A0: @ 816C5A0
ldrb r0, [r2, 0xA] ldrb r0, [r2, 0xA]
adds r1, r4, 0x2 adds r1, r4, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl sub_81AE6C8 bl DestroyListMenuTask
cmp r5, 0 cmp r5, 0
bne _0816C60A bne _0816C60A
ldr r1, =gUnknown_0203BCC4 ldr r1, =gUnknown_0203BCC4
@@ -3359,7 +3359,7 @@ sub_816CB04: @ 816CB04
ldrb r0, [r5, 0xA] ldrb r0, [r5, 0xA]
adds r1, r4, 0x2 adds r1, r4, 0x2
adds r2, r4, 0 adds r2, r4, 0
bl sub_81AE6C8 bl DestroyListMenuTask
bl sub_816C110 bl sub_816C110
bl sub_816C140 bl sub_816C140
bl sub_816BD04 bl sub_816BD04
asm/pokemon_summary_screen.s
+8 -8
View File
@@ -3469,7 +3469,7 @@ sub_81C5B4C: @ 81C5B4C
ldr r4, =gUnknown_0203CF38 ldr r4, =gUnknown_0203CF38
subs r2, r4, 0x2 subs r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldr r0, =gUnknown_0203CF2C ldr r0, =gUnknown_0203CF2C
ldr r0, [r0] ldr r0, [r0]
ldr r0, [r0] ldr r0, [r0]
@@ -3545,7 +3545,7 @@ _081C5C12:
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x8 adds r1, 0x8
adds r2, r4, 0x6 adds r2, r4, 0x6
bl sub_81AE860 bl ListMenuGetScrollAndRow
ldrh r1, [r4, 0x8] ldrh r1, [r4, 0x8]
ldrh r0, [r4, 0x6] ldrh r0, [r4, 0x6]
adds r1, r0 adds r1, r0
@@ -3572,7 +3572,7 @@ _081C5C5C:
mov r8, r1 mov r8, r1
mov r2, r8 mov r2, r8
subs r2, 0x2 subs r2, 0x2
bl sub_81AE860 bl ListMenuGetScrollAndRow
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r6, r0 cmp r6, r0
@@ -4642,7 +4642,7 @@ sub_81C65CC: @ 81C65CC
ldrb r0, [r4] ldrb r0, [r4]
adds r1, r6, 0 adds r1, r6, 0
adds r2, r7, 0 adds r2, r7, 0
bl sub_81AE6C8 bl DestroyListMenuTask
bl sub_81C5924 bl sub_81C5924
bl sub_81C59BC bl sub_81C59BC
bl sub_81C5314 bl sub_81C5314
@@ -4953,7 +4953,7 @@ sub_81C68B0: @ 81C68B0
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, =gUnknown_0203CF38 ldr r1, =gUnknown_0203CF38
subs r2, r1, 0x2 subs r2, r1, 0x2
bl sub_81AE860 bl ListMenuGetScrollAndRow
b _081C6940 b _081C6940
.pool .pool
_081C68F8: _081C68F8:
@@ -4964,7 +4964,7 @@ _081C68F8:
ldr r4, =gUnknown_0203CF38 ldr r4, =gUnknown_0203CF38
subs r2, r4, 0x2 subs r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl sub_81AE860 bl ListMenuGetScrollAndRow
movs r0, 0 movs r0, 0
bl sub_81C7028 bl sub_81C7028
subs r4, 0x8 subs r4, 0x8
@@ -5054,7 +5054,7 @@ _081C69A8:
ldrb r0, [r5] ldrb r0, [r5]
adds r1, r7, 0 adds r1, r7, 0
mov r2, r8 mov r2, r8
bl sub_81AE6C8 bl DestroyListMenuTask
movs r3, 0x2 movs r3, 0x2
ldrsh r0, [r5, r3] ldrsh r0, [r5, r3]
cmp r0, r4 cmp r0, r4
@@ -5109,7 +5109,7 @@ sub_81C6A14: @ 81C6A14
ldrb r0, [r4] ldrb r0, [r4]
adds r1, r5, 0 adds r1, r5, 0
adds r2, r7, 0 adds r2, r7, 0
bl sub_81AE6C8 bl DestroyListMenuTask
movs r0, 0x2 movs r0, 0x2
ldrsh r2, [r4, r0] ldrsh r2, [r4, r0]
ldrh r0, [r5] ldrh r0, [r5]
asm/rom_8011DC0.s
+10 -10
View File
@@ -1192,7 +1192,7 @@ sub_8012F64: @ 8012F64
ldrb r0, [r4, 0x12] ldrb r0, [r4, 0x12]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldrb r0, [r4, 0x10] ldrb r0, [r4, 0x10]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r4, 0xF] ldrb r0, [r4, 0xF]
@@ -2394,7 +2394,7 @@ _08013A8C:
ldrb r0, [r6, 0xE] ldrb r0, [r6, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldrb r0, [r6, 0xC] ldrb r0, [r6, 0xC]
bl ClearWindowTilemap bl ClearWindowTilemap
ldrb r0, [r6, 0xB] ldrb r0, [r6, 0xB]
@@ -4511,7 +4511,7 @@ _08014E16:
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
@@ -4567,7 +4567,7 @@ _08014EA8:
ldrb r0, [r5, 0x12] ldrb r0, [r5, 0x12]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF] ldrb r0, [r5, 0xF]
@@ -4923,7 +4923,7 @@ _08015204:
ldrb r0, [r7, 0xE] ldrb r0, [r7, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r7, 0xD] ldrb r0, [r7, 0xD]
@@ -5292,7 +5292,7 @@ _08015564:
ldrb r0, [r5, 0xE] ldrb r0, [r5, 0xE]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
movs r0, 0 movs r0, 0
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xB] ldrb r0, [r5, 0xB]
@@ -8545,7 +8545,7 @@ _08017228:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_819746C bl sub_819746C
@@ -8565,7 +8565,7 @@ _08017264:
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_819746C bl sub_819746C
@@ -8669,7 +8669,7 @@ _0801733E:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldrb r0, [r6] ldrb r0, [r6]
bl RemoveWindow bl RemoveWindow
mov r7, r9 mov r7, r9
@@ -8691,7 +8691,7 @@ _08017368:
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl sub_81AE6C8 bl DestroyListMenuTask
ldrb r0, [r6] ldrb r0, [r6]
bl RemoveWindow bl RemoveWindow
mov r3, r9 mov r3, r9
asm/shop.s
+1 -1
View File
@@ -1985,7 +1985,7 @@ _080E0AEA:
adds r1, r2, r3 adds r1, r2, r3
subs r3, 0x2 subs r3, 0x2
adds r2, r3 adds r2, r3
bl sub_81AE860 bl ListMenuGetScrollAndRow
movs r0, 0x2 movs r0, 0x2
negs r0, r0 negs r0, r0
cmp r5, r0 cmp r5, r0
common_syms/list_menu.txt
+2
View File
@@ -0,0 +1,2 @@
gUnknown_03006300
gMultiuseListMenuTemplate
include/list_menu.h
+40 -24
View File
@@ -4,9 +4,11 @@
#define LIST_NOTHING_CHOSEN -1 #define LIST_NOTHING_CHOSEN -1
#define LIST_B_PRESSED -2 #define LIST_B_PRESSED -2
// Exported type declarations #define LIST_NO_MULTIPLE_SCROLL 0
#define LIST_MULTIPLE_SCROLL_DPAD 1
#define LIST_MULTIPLE_SCROLL_L_R 2
// Exported RAM declarations struct ListMenu;
struct ListMenuItem struct ListMenuItem
{ {
@@ -14,33 +16,31 @@ struct ListMenuItem
s32 id; s32 id;
}; };
struct ListMenu;
struct ListMenuTemplate struct ListMenuTemplate
{ {
const struct ListMenuItem *items; const struct ListMenuItem *items;
void (* moveCursorFunc)(u32, bool8, struct ListMenu *); void (* moveCursorFunc)(s32, bool8, struct ListMenu *);
void (* unk_08)(u8, s32, u8); void (* unk_08)(u8 windowId, s32 itemId, u8 y);
u16 totalItems; u16 totalItems;
u16 maxShowed; u16 maxShowed;
u8 unk_10; u8 windowId;
u8 unk_11; u8 unk_11;
u8 unk_12; u8 unk_12;
u8 cursor_Y; u8 cursor_X;
u32 upText_Y:4; // x1, x2, x4, x8 = xF u8 upText_Y:4; // x1, x2, x4, x8 = xF
u32 cursorColor:4; // x10, x20, x40, x80 = xF0 u8 cursorPal:4; // x10, x20, x40, x80 = xF0
u32 fillColor:4; // x100, x200, x400, x800 = xF00 u8 fillValue:4; // x1, x2, x4, x8 = xF
u32 cursorShadowColor:4; // x1000, x2000, x4000, x8000 = xF000 u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
u32 unk_16_0:1; // x10000 u8 lettersSpacing:3;
u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000 u8 unk_16_3:3;
u32 unk_16_7:1; // x800000 u8 scrollMultiple:2; // x40, x80 = xC0
u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000 u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
u32 cursorKind:2; // x40000000, x80000000 u8 cursorKind:2; // x40, x80
}; };
struct ListMenu struct ListMenu
{ {
struct ListMenuTemplate _template; struct ListMenuTemplate template;
u16 scrollOffset; u16 scrollOffset;
u16 selectedRow; u16 selectedRow;
u8 unk_1C; u8 unk_1C;
@@ -49,14 +49,30 @@ struct ListMenu
u8 unk_1F; u8 unk_1F;
}; };
struct UnknownListMenuWindowStruct
{
u8 x;
u8 y;
u8 width;
u8 height;
u8 palNum;
};
extern struct ListMenuTemplate gMultiuseListMenuTemplate; extern struct ListMenuTemplate gMultiuseListMenuTemplate;
// Exported ROM declarations s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
u8 ListMenuInit(struct ListMenuTemplate *template, u16 cursorPage, u16 cursorPosition); u8 ListMenuInitWithWindows(struct ListMenuTemplate *listMenuTemplate, struct UnknownListMenuWindowStruct *arg1, u16 scrollOffset, u16 selectedRow);
s32 ListMenuHandleInputGetItemId(u8 listTaskId); s32 ListMenuHandleInputGetItemId(u8 listTaskId);
void sub_81AE860(u8 listTaskId, u16 *a1, u16 *a2); void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
void sub_81AE6C8(u8 listTaskId, u16 *a1, u16 *a2); void sub_81AE70C(u8 listTaskId);
u8 ListMenuGetYCoordForPrintingArrowCursor(u8); void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
void ChangeListMenuCoords(u8 listTaskId, u8 x, u8 y);
s32 ListMenuTestInput(struct ListMenuTemplate *template, u32 scrollOffset, u32 selectedRow, u16 keys, u16 *newScrollOffset, u16 *newSelectedRow);
void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId);
void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
void sub_81AF028(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
void sub_81AF078(s32 arg0, u8 arg1, struct ListMenu *list);
#endif //GUARD_LIST_MENU_H #endif //GUARD_LIST_MENU_H
include/menu_indicators.h
+16 -1
View File
@@ -7,16 +7,31 @@
// Exported ROM declarations // Exported ROM declarations
struct ArrowStruct { struct ArrowStruct
{
u8 unk0[6]; u8 unk0[6];
u16 unk6[4]; u16 unk6[4];
u8 unkE; u8 unkE;
}; };
struct CursorStruct
{
u8 unk0;
u8 unk1;
u16 unk2;
u16 unk4;
u16 unk6;
u16 unk8;
u8 unkA;
};
void Task_ScrollIndicatorArrowPairOnMainMenu(u8); void Task_ScrollIndicatorArrowPairOnMainMenu(u8);
u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *); u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
void RemoveScrollIndicatorArrowPair(u8); void RemoveScrollIndicatorArrowPair(u8);
u8 AddScrollIndicatorArrowPair(const struct ArrowStruct*, void*); u8 AddScrollIndicatorArrowPair(const struct ArrowStruct*, void*);
void sub_81AF15C(u8, u8, u8); void sub_81AF15C(u8, u8, u8);
void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind);
void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind);
u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind);
#endif //GUARD_MENU_INDICATORS_H #endif //GUARD_MENU_INDICATORS_H
ld_script.txt
+1 -1
View File
@@ -247,7 +247,7 @@ SECTIONS {
src/menu.o(.text); src/menu.o(.text);
asm/battle_frontier_2.o(.text); asm/battle_frontier_2.o(.text);
src/item_menu.o(.text); src/item_menu.o(.text);
asm/list_menu.o(.text); src/list_menu.o(.text);
asm/menu_indicators.o(.text); asm/menu_indicators.o(.text);
src/unk_text_util.o(.text); src/unk_text_util.o(.text);
src/save_location.o(.text); src/save_location.o(.text);
src/daycare.c
+13 -14
View File
@@ -41,11 +41,10 @@ extern const u8 gDaycareText_PlayOther[];
extern u8 GetCursorSelectionMonId(void); extern u8 GetCursorSelectionMonId(void);
extern u16 ItemIdToBattleMoveId(u16); extern u16 ItemIdToBattleMoveId(u16);
extern s32 ListMenuHandleInputGetItemId(u8); extern s32 ListMenuHandleInputGetItemId(u8);
extern void sub_81AE6C8(u8, u16*, u16*); extern void DestroyListMenuTask(u8, u16*, u16*);
extern void sub_819746C(u8, bool8); extern void sub_819746C(u8, bool8);
extern void NewMenuHelpers_DrawStdWindowFrame(u8, bool8); extern void NewMenuHelpers_DrawStdWindowFrame(u8, bool8);
extern void sub_81B9328(void); extern void sub_81B9328(void);
extern void sub_81AF078(u32, bool8, struct ListMenu *);
extern void CB2_ReturnToField(void); extern void CB2_ReturnToField(void);
// this file's functions // this file's functions
@@ -79,18 +78,18 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
.unk_08 = DaycarePrintMonInfo, .unk_08 = DaycarePrintMonInfo,
.totalItems = 3, .totalItems = 3,
.maxShowed = 3, .maxShowed = 3,
.unk_10 = 0, .windowId = 0,
.unk_11 = 0, .unk_11 = 0,
.unk_12 = 8, .unk_12 = 8,
.cursor_Y = 0, .cursor_X = 0,
.upText_Y = 1, .upText_Y = 1,
.cursorColor = 2, .cursorPal = 2,
.fillColor = 1, .fillValue = 1,
.cursorShadowColor = 3, .cursorShadowPal = 3,
.unk_16_0 = TRUE, .lettersSpacing = 1,
.spaceBetweenItems = 0, .unk_16_3 = 0,
.unk_16_7 = FALSE, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.unk_17_0 = 1, .fontId = 1,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -1271,7 +1270,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
gSpecialVar_Result = 2; gSpecialVar_Result = 2;
break; break;
} }
sub_81AE6C8(gTasks[taskId].tMenuListTaskId, NULL, NULL); DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
sub_819746C(gTasks[taskId].tWindowId, TRUE); sub_819746C(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId); RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId); DestroyTask(taskId);
@@ -1280,7 +1279,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
else if (gMain.newKeys & B_BUTTON) else if (gMain.newKeys & B_BUTTON)
{ {
gSpecialVar_Result = 2; gSpecialVar_Result = 2;
sub_81AE6C8(gTasks[taskId].tMenuListTaskId, NULL, NULL); DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
sub_819746C(gTasks[taskId].tWindowId, TRUE); sub_819746C(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId); RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId); DestroyTask(taskId);
@@ -1299,7 +1298,7 @@ void ShowDaycareLevelMenu(void)
NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE); NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE);
menuTemplate = sDaycareListMenuLevelTemplate; menuTemplate = sDaycareListMenuLevelTemplate;
menuTemplate.unk_10 = windowId; menuTemplate.windowId = windowId;
listMenuTaskId = ListMenuInit(&menuTemplate, 0, 0); listMenuTaskId = ListMenuInit(&menuTemplate, 0, 0);
CopyWindowToVram(windowId, 3); CopyWindowToVram(windowId, 3);
src/decoration.c
+6 -6
View File
@@ -113,7 +113,7 @@ void sub_812719C(u8 taskId);
void sub_81271CC(u8 taskId); void sub_81271CC(u8 taskId);
void sub_8127268(u8 taskId); void sub_8127268(u8 taskId);
void sub_8127454(u8 *dest, u16 decorId); void sub_8127454(u8 *dest, u16 decorId);
void sub_8127480(u32 a0, bool8 flag, struct ListMenu *menu); void sub_8127480(s32 a0, bool8 flag, struct ListMenu *menu);
void sub_81274A0(u8 a0, s32 a1, u8 a2); void sub_81274A0(u8 a0, s32 a1, u8 a2);
void sub_8127620(u8 taskId); void sub_8127620(u8 taskId);
void sub_812764C(u8 taskId); void sub_812764C(u8 taskId);
@@ -801,7 +801,7 @@ void sub_8127330(u8 taskId)
sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i]; sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
sDecorPCBuffer->items[i].id = -2; sDecorPCBuffer->items[i].id = -2;
gMultiuseListMenuTemplate = gUnknown_085A6BD0; gMultiuseListMenuTemplate = gUnknown_085A6BD0;
gMultiuseListMenuTemplate.unk_10 = sDecorMenuWindowIndices[1]; gMultiuseListMenuTemplate.windowId = sDecorMenuWindowIndices[1];
gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520; gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520;
gMultiuseListMenuTemplate.items = sDecorPCBuffer->items; gMultiuseListMenuTemplate.items = sDecorPCBuffer->items;
gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521; gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521;
@@ -813,7 +813,7 @@ void sub_8127454(u8 *dest, u16 decorId)
StringAppend(dest, gDecorations[decorId].name); StringAppend(dest, gDecorations[decorId].name);
} }
void sub_8127480(u32 a0, bool8 flag, struct ListMenu *menu) void sub_8127480(s32 a0, bool8 flag, struct ListMenu *menu)
{ {
if (flag != TRUE) if (flag != TRUE)
{ {
@@ -892,7 +892,7 @@ void sub_812764C(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
input = ListMenuHandleInputGetItemId(data[13]); input = ListMenuHandleInputGetItemId(data[13]);
sub_81AE860(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo); ListMenuGetScrollAndRow(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
switch (input) switch (input)
{ {
case -1: case -1:
@@ -905,7 +905,7 @@ void sub_812764C(u8 taskId)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gCurDecorationIndex = input; gCurDecorationIndex = input;
sub_8127554(); sub_8127554();
sub_81AE6C8(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo); DestroyListMenuTask(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
sub_8126A58(1); sub_8126A58(1);
sub_81277A8(); sub_81277A8();
free(sDecorPCBuffer); free(sDecorPCBuffer);
@@ -1074,7 +1074,7 @@ void sub_8127A8C(u8 taskId)
data = gTasks[taskId].data; data = gTasks[taskId].data;
sub_8127554(); sub_8127554();
sub_81277A8(); sub_81277A8();
sub_81AE6C8(data[13], NULL, NULL); DestroyListMenuTask(data[13], NULL, NULL);
free(sDecorPCBuffer); free(sDecorPCBuffer);
sub_8126E44(taskId); sub_8126E44(taskId);
} }
src/item_menu.c
+16 -16
View File
@@ -128,7 +128,7 @@ void sub_81ABAC4(void);
void sub_81ABAE0(void); void sub_81ABAE0(void);
u8 sub_81AB1F0(u8); u8 sub_81AB1F0(u8);
void sub_81AC23C(u8); void sub_81AC23C(u8);
void bag_menu_change_item_callback(u32 a, bool8 b, struct ListMenu*); void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu*);
void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a); void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a);
void ItemMenu_UseOutOfBattle(u8 taskId); void ItemMenu_UseOutOfBattle(u8 taskId);
void ItemMenu_Toss(u8 taskId); void ItemMenu_Toss(u8 taskId);
@@ -688,7 +688,7 @@ void get_name(s8 *dest, u16 itemId)
} }
} }
void bag_menu_change_item_callback(u32 a, bool8 b, struct ListMenu *unused) void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused)
{ {
if (b != 1) if (b != 1)
{ {
@@ -830,7 +830,7 @@ void task_close_bag_menu_2(u8 taskId)
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
sub_81AE6C8(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
if (gUnknown_0203CE54->unk0 != 0) if (gUnknown_0203CE54->unk0 != 0)
SetMainCallback2(gUnknown_0203CE54->unk0); SetMainCallback2(gUnknown_0203CE54->unk0);
else else
@@ -915,7 +915,7 @@ void bag_menu_inits_lists_menu(u8 taskId)
u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]; u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket];
u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket];
bag_menu_RemoveBagItem_message_window(4); bag_menu_RemoveBagItem_message_window(4);
sub_81AE6C8(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
sub_81AB9A8(gUnknown_0203CE58.pocket); sub_81AB9A8(gUnknown_0203CE58.pocket);
sub_81ABA88(gUnknown_0203CE58.pocket); sub_81ABA88(gUnknown_0203CE58.pocket);
load_bag_item_list_buffers(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -967,7 +967,7 @@ void Task_BagMenu(u8 taskId)
{ {
if (sub_81AC2C0() == 1) if (sub_81AC2C0() == 1)
{ {
sub_81AE860(data[0], scrollPos, cursorPos); ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos);
if ((*scrollPos + *cursorPos) != gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - 1) if ((*scrollPos + *cursorPos) != gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - 1)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
@@ -979,7 +979,7 @@ void Task_BagMenu(u8 taskId)
else else
{ {
int r4 = ListMenuHandleInputGetItemId(data[0]); int r4 = ListMenuHandleInputGetItemId(data[0]);
sub_81AE860(data[0], scrollPos, cursorPos); ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos);
switch (r4) switch (r4)
{ {
case -1: case -1:
@@ -1063,7 +1063,7 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3)
{ {
ClearWindowTilemap(0); ClearWindowTilemap(0);
ClearWindowTilemap(1); ClearWindowTilemap(1);
sub_81AE6C8(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
gSprites[gUnknown_0203CE54->unk806[gUnknown_0203CE54->unk81B_1 ^ 1]].invisible = 1; gSprites[gUnknown_0203CE54->unk806[gUnknown_0203CE54->unk81B_1 ^ 1]].invisible = 1;
sub_81AB824(); sub_81AB824();
@@ -1125,7 +1125,7 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3)
adds r1, r2, r1\n\ adds r1, r2, r1\n\
adds r3, 0x8\n\ adds r3, 0x8\n\
adds r2, r3\n\ adds r2, r3\n\
bl sub_81AE6C8\n\ bl DestroyListMenuTask\n\
movs r0, 0\n\ movs r0, 0\n\
bl schedule_bg_copy_tilemap_to_vram\n\ bl schedule_bg_copy_tilemap_to_vram\n\
ldr r3, =gSprites\n\ ldr r3, =gSprites\n\
@@ -1340,13 +1340,13 @@ void sub_81AC3C0(u8 taskId)
if (gMain.newKeys & SELECT_BUTTON) if (gMain.newKeys & SELECT_BUTTON)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_81AE860(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
sub_81AC498(taskId); sub_81AC498(taskId);
} }
else else
{ {
r7 = ListMenuHandleInputGetItemId(data[0]); r7 = ListMenuHandleInputGetItemId(data[0]);
sub_81AE860(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
sub_80D4FC8(0); sub_80D4FC8(0);
sub_80D4FEC(gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); sub_80D4FEC(gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
switch (r7) switch (r7)
@@ -1381,7 +1381,7 @@ void sub_81AC498(u8 taskId)
{ {
sub_80D702C(gBagPockets[gUnknown_0203CE58.pocket].itemSlots, data[1], realPos); sub_80D702C(gBagPockets[gUnknown_0203CE58.pocket].itemSlots, data[1], realPos);
gUnknown_0203CE54->unk81A = -1; gUnknown_0203CE54->unk81A = -1;
sub_81AE6C8(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
if (data[1] < realPos) if (data[1] < realPos)
gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--; gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--;
load_bag_item_list_buffers(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -1399,7 +1399,7 @@ void sub_81AC590(u8 taskId)
u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]; u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket];
gUnknown_0203CE54->unk81A = -1; gUnknown_0203CE54->unk81A = -1;
sub_81AE6C8(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
if (data[1] < (*scrollPos + *cursorPos)) if (data[1] < (*scrollPos + *cursorPos))
gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--; gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--;
load_bag_item_list_buffers(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -1771,7 +1771,7 @@ void Task_ActuallyToss(u8 taskId)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
RemoveBagItem(gSpecialVar_ItemId, data[8]); RemoveBagItem(gSpecialVar_ItemId, data[8]);
sub_81AE6C8(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
sub_81AB9A8(gUnknown_0203CE58.pocket); sub_81AB9A8(gUnknown_0203CE58.pocket);
sub_81ABA88(gUnknown_0203CE58.pocket); sub_81ABA88(gUnknown_0203CE58.pocket);
load_bag_item_list_buffers(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -1791,7 +1791,7 @@ void ItemMenu_Register(u8 taskId)
gSaveBlock1Ptr->registeredItem = 0; gSaveBlock1Ptr->registeredItem = 0;
else else
gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId; gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId;
sub_81AE6C8(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
load_bag_item_list_buffers(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
@@ -2039,7 +2039,7 @@ void sub_81AD8C8(u8 taskId)
PlaySE(SE_REGI); PlaySE(SE_REGI);
RemoveBagItem(gSpecialVar_ItemId, data[8]); RemoveBagItem(gSpecialVar_ItemId, data[8]);
AddMoney(&gSaveBlock1Ptr->money, (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8]); AddMoney(&gSaveBlock1Ptr->money, (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8]);
sub_81AE6C8(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
sub_81AB9A8(gUnknown_0203CE58.pocket); sub_81AB9A8(gUnknown_0203CE58.pocket);
sub_81ABA88(gUnknown_0203CE58.pocket); sub_81ABA88(gUnknown_0203CE58.pocket);
load_bag_item_list_buffers(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -2212,7 +2212,7 @@ void Task_WallyTutorialBagMenu(u8 taskId)
case 0x132: case 0x132:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
bag_menu_remove_some_window(); bag_menu_remove_some_window();
sub_81AE6C8(data[0], 0, 0); DestroyListMenuTask(data[0], 0, 0);
RestoreBagAfterWallyTutorial(); RestoreBagAfterWallyTutorial();
unknown_ItemMenu_Confirm(taskId); unknown_ItemMenu_Confirm(taskId);
break; break;
src/list_menu.c
+633
View File
@@ -0,0 +1,633 @@
#include "global.h"
#include "menu.h"
#include "list_menu.h"
#include "window.h"
#include "text_window.h"
#include "main.h"
#include "task.h"
#include "menu_indicators.h"
#include "strings.h"
#include "sound.h"
#include "constants/songs.h"
struct UnknownMysteryGiftLinkMenuStruct
{
s32 field_0;
u8 field_4;
u8 field_5;
u8 field_6;
};
struct UnknownListMenuPals
{
u8 cursorPal:4;
u8 fillValue:4;
u8 cursorShadowPal:4;
u8 lettersSpacing:6;
u8 field_2_2:6; // unused
u8 fontId:7;
u8 field_3_7:1;
};
extern struct UnknownMysteryGiftLinkMenuStruct gUnknown_0203CE84;
// this file's functions
static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown);
static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count);
static void ListMenuDrawCursor(struct ListMenu *list);
static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 a2);
static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind);
// IWRAM common
struct UnknownListMenuPals gUnknown_03006300;
struct ListMenuTemplate gMultiuseListMenuTemplate;
// code
static void ListMenuDummyTask(u8 taskId)
{
}
s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum)
{
switch (gUnknown_0203CE84.field_4)
{
case 0:
default:
gUnknown_0203CE84.field_5 = AddWindow(windowTemplate);
switch (arg2)
{
case 2:
sub_809882C(gUnknown_0203CE84.field_5, tileNum, palNum);
case 1:
sub_8098858(gUnknown_0203CE84.field_5, tileNum, palNum / 16);
break;
}
gMultiuseListMenuTemplate = *listMenuTemplate;
gMultiuseListMenuTemplate.windowId = gUnknown_0203CE84.field_5;
gUnknown_0203CE84.field_6 = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
CopyWindowToVram(gUnknown_0203CE84.field_5, 1);
gUnknown_0203CE84.field_4 = 1;
break;
case 1:
gUnknown_0203CE84.field_0 = ListMenuHandleInputGetItemId(gUnknown_0203CE84.field_6);
if (gMain.newKeys & A_BUTTON)
{
gUnknown_0203CE84.field_4 = 2;
}
if (gMain.newKeys & B_BUTTON)
{
gUnknown_0203CE84.field_0 = LIST_B_PRESSED;
gUnknown_0203CE84.field_4 = 2;
}
if (gUnknown_0203CE84.field_4 == 2)
{
if (arg2 == 0)
{
ClearWindowTilemap(gUnknown_0203CE84.field_5);
}
else
{
switch (arg2)
{
case 0: // can never be reached, because of the if statement above
sub_819746C(gUnknown_0203CE84.field_5, FALSE);
break;
case 2:
case 1:
sub_819746C(gUnknown_0203CE84.field_5, FALSE);
break;
}
}
CopyWindowToVram(gUnknown_0203CE84.field_5, 1);
}
break;
case 2:
DestroyListMenuTask(gUnknown_0203CE84.field_6, NULL, NULL);
RemoveWindow(gUnknown_0203CE84.field_5);
gUnknown_0203CE84.field_4 = 0;
return gUnknown_0203CE84.field_0;
}
return -1;
}
u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
{
u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow);
PutWindowTilemap(listMenuTemplate->windowId);
CopyWindowToVram(listMenuTemplate->windowId, 2);
return taskId;
}
// unused
u8 ListMenuInitWithWindows(struct ListMenuTemplate *listMenuTemplate, struct UnknownListMenuWindowStruct *arg1, u16 scrollOffset, u16 selectedRow)
{
s32 i;
u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow);
for (i = 0; arg1[i].palNum != 0xFF; i++)
{
PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId,
arg1[i].x,
arg1[i].y,
arg1[i].width,
arg1[i].height,
arg1[i].palNum);
}
CopyWindowToVram(listMenuTemplate->windowId, 2);
return taskId;
}
s32 ListMenuHandleInputGetItemId(u8 listTaskId)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
if (gMain.newKeys & A_BUTTON)
{
return list->template.items[list->scrollOffset + list->selectedRow].id;
}
else if (gMain.newKeys & B_BUTTON)
{
return LIST_B_PRESSED;
}
else if (gMain.newAndRepeatedKeys & DPAD_UP)
{
ListMenuChangeSelection(list, TRUE, 1, FALSE);
return LIST_NOTHING_CHOSEN;
}
else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
{
ListMenuChangeSelection(list, TRUE, 1, TRUE);
return LIST_NOTHING_CHOSEN;
}
else // try to move by one window scroll
{
bool16 rightButton, leftButton;
switch (list->template.scrollMultiple)
{
case LIST_NO_MULTIPLE_SCROLL:
default:
leftButton = FALSE;
rightButton = FALSE;
break;
case LIST_MULTIPLE_SCROLL_DPAD:
leftButton = gMain.newAndRepeatedKeys & DPAD_LEFT;
rightButton = gMain.newAndRepeatedKeys & DPAD_RIGHT;
break;
case LIST_MULTIPLE_SCROLL_L_R:
leftButton = gMain.newAndRepeatedKeys & L_BUTTON;
rightButton = gMain.newAndRepeatedKeys & R_BUTTON;
break;
}
if (leftButton)
{
ListMenuChangeSelection(list, TRUE, list->template.maxShowed, FALSE);
return LIST_NOTHING_CHOSEN;
}
else if (rightButton)
{
ListMenuChangeSelection(list, TRUE, list->template.maxShowed, TRUE);
return LIST_NOTHING_CHOSEN;
}
else
{
return LIST_NOTHING_CHOSEN;
}
}
}
void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
if (scrollOffset != NULL)
*scrollOffset = list->scrollOffset;
if (selectedRow != NULL)
*selectedRow = list->selectedRow;
if (list->unk_1E != 0xFF)
ListMenuRemoveCursorObject(list->unk_1E, list->template.cursorKind - 2);
DestroyTask(listTaskId);
}
void sub_81AE70C(u8 listTaskId)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue));
ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed);
ListMenuDrawCursor(list);
CopyWindowToVram(list->template.windowId, 2);
}
// unused
void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
list->template.cursorPal = cursorPal;
list->template.fillValue = fillValue;
list->template.cursorShadowPal = cursorShadowPal;
}
// unused
void ChangeListMenuCoords(u8 listTaskId, u8 x, u8 y)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
SetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT, x);
SetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP, y);
}
// unused
s32 ListMenuTestInput(struct ListMenuTemplate *template, u32 scrollOffset, u32 selectedRow, u16 keys, u16 *newScrollOffset, u16 *newSelectedRow)
{
struct ListMenu list;
list.template = *template;
list.scrollOffset = scrollOffset;
list.selectedRow = selectedRow;
list.unk_1C = 0;
list.unk_1D = 0;
if (keys == DPAD_UP)
ListMenuChangeSelection(&list, FALSE, 1, FALSE);
if (keys == DPAD_DOWN)
ListMenuChangeSelection(&list, FALSE, 1, TRUE);
if (newScrollOffset != NULL)
*newScrollOffset = list.scrollOffset;
if (newSelectedRow != NULL)
*newSelectedRow = list.selectedRow;
return LIST_NOTHING_CHOSEN;
}
void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
if (arrayId != NULL)
*arrayId = list->scrollOffset + list->selectedRow;
}
void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
if (scrollOffset != NULL)
*scrollOffset = list->scrollOffset;
if (selectedRow != NULL)
*selectedRow = list->selectedRow;
}
u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId)
{
struct ListMenu *list = (void*) gTasks[listTaskId].data;
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
return list->selectedRow * yMultiplier + list->template.upText_Y;
}
static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
{
u8 listTaskId = CreateTask(ListMenuDummyTask, 0);
struct ListMenu *list = (void*) gTasks[listTaskId].data;
list->template = *listMenuTemplate;
list->scrollOffset = scrollOffset;
list->selectedRow = selectedRow;
list->unk_1C = 0;
list->unk_1D = 0;
list->unk_1E = 0xFF;
list->unk_1F = 0;
gUnknown_03006300.cursorPal = list->template.cursorPal;
gUnknown_03006300.fillValue = list->template.fillValue;
gUnknown_03006300.cursorShadowPal = list->template.cursorShadowPal;
gUnknown_03006300.lettersSpacing = list->template.lettersSpacing;
gUnknown_03006300.fontId = list->template.fontId;
gUnknown_03006300.field_3_7 = 0;
if (list->template.totalItems < list->template.maxShowed)
list->template.maxShowed = list->template.totalItems;
FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue));
ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed);
ListMenuDrawCursor(list);
ListMenuCallSelectionChangedCallback(list, 1);
return listTaskId;
}
static void ListMenuPrint(struct ListMenu *list, const u8 *str, u8 x, u8 y)
{
u8 colors[3];
if (gUnknown_03006300.field_3_7)
{
colors[0] = gUnknown_03006300.fillValue;
colors[1] = gUnknown_03006300.cursorPal;
colors[2] = gUnknown_03006300.cursorShadowPal;
AddTextPrinterParameterized2(list->template.windowId,
gUnknown_03006300.fontId,
x, y,
gUnknown_03006300.lettersSpacing,
0, colors, TEXT_SPEED_FF, str);
gUnknown_03006300.field_3_7 = 0;
}
else
{
colors[0] = list->template.fillValue;
colors[1] = list->template.cursorPal;
colors[2] = list->template.cursorShadowPal;
AddTextPrinterParameterized2(list->template.windowId,
list->template.fontId,
x, y,
list->template.lettersSpacing,
0, colors, TEXT_SPEED_FF, str);
}
}
static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count)
{
s32 i;
u8 x, y;
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
for (i = 0; i < count; i++)
{
if (list->template.items[startIndex].id != -3)
x = list->template.unk_12;
else
x = list->template.unk_11;
y = (yOffset + i) * yMultiplier + list->template.upText_Y;
if (list->template.unk_08 != NULL)
list->template.unk_08(list->template.windowId, list->template.items[startIndex].id, y);
ListMenuPrint(list, list->template.items[startIndex].name, x, y);
startIndex++;
}
}
static void ListMenuDrawCursor(struct ListMenu *list)
{
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
u8 x = list->template.cursor_X;
u8 y = list->selectedRow * yMultiplier + list->template.upText_Y;
switch (list->template.cursorKind)
{
case 0:
ListMenuPrint(list, gText_SelectorArrow2, x, y);
break;
case 1:
break;
case 2:
if (list->unk_1E == 0xFF)
list->unk_1E = ListMenuAddCursorObject(list, 0);
ListMenuUpdateCursorObject(list->unk_1E,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 - 1,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1, 0);
break;
case 3:
if (list->unk_1E == 0xFF)
list->unk_1E = ListMenuAddCursorObject(list, 1);
ListMenuUpdateCursorObject(list->unk_1E,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 + x,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y, 1);
break;
}
}
static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
{
struct CursorStruct cursor;
cursor.unk0 = 0;
cursor.unk1 = 0xA0;
cursor.unk2 = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8 + 2;
cursor.unk4 = GetFontAttribute(list->template.fontId, 1) + 2;
cursor.unk6 = 0x4000;
cursor.unk8 = 0xFFFF;
cursor.unkA = 0xF;
return ListMenuAddCursorObjectInternal(&cursor, cursorKind);
}
static void ListMenuErasePrintedCursor(struct ListMenu *list, u16 selectedRow)
{
u8 cursorKind = list->template.cursorKind;
if (cursorKind == 0)
{
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
u8 width = GetMenuCursorDimensionByFont(list->template.fontId, 0);
u8 height = GetMenuCursorDimensionByFont(list->template.fontId, 1);
FillWindowPixelRect(list->template.windowId,
(list->template.fillValue << 4) | (list->template.fillValue),
list->template.cursor_X,
selectedRow * yMultiplier + list->template.upText_Y,
width,
height);
}
}
static u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, bool8 movingDown)
{
u16 selectedRow = list->selectedRow;
u16 scrollOffset = list->scrollOffset;
u16 newRow;
u32 newScroll;
if (!movingDown)
{
if (list->template.maxShowed == 1)
newRow = 0;
else
newRow = list->template.maxShowed - ((list->template.maxShowed / 2) + (list->template.maxShowed % 2)) - 1;
if (scrollOffset == 0)
{
while (selectedRow != 0)
{
selectedRow--;
if (list->template.items[scrollOffset + selectedRow].id != -3)
{
list->selectedRow = selectedRow;
return 1;
}
}
return 0;
}
else
{
while (selectedRow > newRow)
{
selectedRow--;
if (list->template.items[scrollOffset + selectedRow].id != -3)
{
list->selectedRow = selectedRow;
return 1;
}
}
newScroll = scrollOffset - 1;
}
}
else
{
if (list->template.maxShowed == 1)
newRow = 0;
else
newRow = ((list->template.maxShowed / 2) + (list->template.maxShowed % 2));
if (scrollOffset == list->template.totalItems - list->template.maxShowed)
{
while (selectedRow < list->template.maxShowed - 1)
{
selectedRow++;
if (list->template.items[scrollOffset + selectedRow].id != -3)
{
list->selectedRow = selectedRow;
return 1;
}
}
return 0;
}
else
{
while (selectedRow < newRow)
{
selectedRow++;
if (list->template.items[scrollOffset + selectedRow].id != -3)
{
list->selectedRow = selectedRow;
return 1;
}
}
newScroll = scrollOffset + 1;
}
}
list->selectedRow = newRow;
list->scrollOffset = newScroll;
return 2;
}
static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown)
{
if (count >= list->template.maxShowed)
{
FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue));
ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed);
}
else
{
u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
if (!movingDown)
{
u16 y, width, height;
ScrollWindow(list->template.windowId, 1, count * yMultiplier, (list->template.fillValue << 4) | (list->template.fillValue));
ListMenuPrintEntries(list, list->scrollOffset, 0, count);
y = (list->template.maxShowed * yMultiplier) + list->template.upText_Y;
width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8;
height = (GetWindowAttribute(list->template.windowId, WINDOW_HEIGHT) * 8) - y;
FillWindowPixelRect(list->template.windowId,
(list->template.fillValue << 4) | (list->template.fillValue),
0, y, width, height);
}
else
{
u16 width;
ScrollWindow(list->template.windowId, 0, count * yMultiplier, (list->template.fillValue << 4) | (list->template.fillValue));
ListMenuPrintEntries(list, list->scrollOffset + (list->template.maxShowed - count), list->template.maxShowed - count, count);
width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8;
FillWindowPixelRect(list->template.windowId,
(list->template.fillValue << 4) | (list->template.fillValue),
0, 0, width, list->template.upText_Y);
}
}
}
static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown)
{
u16 oldSelectedRow;
u8 selectionChange, i, cursorCount;
oldSelectedRow = list->selectedRow;
cursorCount = 0;
selectionChange = 0;
for (i = 0; i < count; i++)
{
do
{
u8 ret = ListMenuUpdateSelectedRowIndexAndScrollOffset(list, movingDown);
selectionChange |= ret;
if (ret != 2)
break;
cursorCount++;
} while (list->template.items[list->scrollOffset + list->selectedRow].id == -3);
}
if (updateCursorAndCallCallback)
{
switch (selectionChange)
{
case 0:
default:
return TRUE;
case 1:
ListMenuErasePrintedCursor(list, oldSelectedRow);
ListMenuDrawCursor(list);
ListMenuCallSelectionChangedCallback(list, 0);
CopyWindowToVram(list->template.windowId, 2);
break;
case 2:
case 3:
ListMenuErasePrintedCursor(list, oldSelectedRow);
ListMenuScroll(list, cursorCount, movingDown);
ListMenuDrawCursor(list);
ListMenuCallSelectionChangedCallback(list, 0);
CopyWindowToVram(list->template.windowId, 2);
break;
}
}
return FALSE;
}
static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 a2)
{
if (list->template.moveCursorFunc != NULL)
list->template.moveCursorFunc(list->template.items[list->scrollOffset + list->selectedRow].id, a2, list);
}
// unused
void sub_81AF028(u8 cursorPal, u8 fillValue, u8 cursorShadowPal)
{
gUnknown_03006300.cursorPal = cursorPal;
gUnknown_03006300.fillValue = fillValue;
gUnknown_03006300.cursorShadowPal = cursorShadowPal;
gUnknown_03006300.field_3_7 = 1;
}
void sub_81AF078(s32 arg0, u8 arg1, struct ListMenu *list)
{
if (!arg1)
PlaySE(SE_SELECT);
}
src/pokeblock.c
+19 -19
View File
@@ -91,7 +91,7 @@ static void sub_81362E0(void);
static void sub_8136344(void); static void sub_8136344(void);
static void HandlePokeblockListMenuItems(void); static void HandlePokeblockListMenuItems(void);
static void sub_81363BC(void); static void sub_81363BC(void);
static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2); static void MovePokeblockMenuCursor(s32 pkblId, bool8 arg1, struct ListMenu *arg2);
static void PutPokeblockInfoText(void); static void PutPokeblockInfoText(void);
static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1); static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1);
static void PutPokeblockListMenuString(u8 *dst, u16 pkblId); static void PutPokeblockListMenuString(u8 *dst, u16 pkblId);
@@ -319,18 +319,18 @@ static const struct ListMenuTemplate sPokeblockListMenuTemplate =
.unk_08 = NULL, .unk_08 = NULL,
.totalItems = 0, .totalItems = 0,
.maxShowed = 0, .maxShowed = 0,
.unk_10 = 1, .windowId = 1,
.unk_11 = 0, .unk_11 = 0,
.unk_12 = 1, .unk_12 = 1,
.cursor_Y = 0, .cursor_X = 0,
.upText_Y = 1, .upText_Y = 1,
.cursorColor = 2, .cursorPal = 2,
.fillColor = 0, .fillValue = 0,
.cursorShadowColor = 3, .cursorShadowPal = 3,
.unk_16_0 = FALSE, .lettersSpacing = 0,
.spaceBetweenItems = 32, .unk_16_3 = 0,
.unk_16_7 = FALSE, .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.unk_17_0 = 1, .fontId = 1,
.cursorKind = 1 .cursorKind = 1
}; };
@@ -620,7 +620,7 @@ static void HandlePokeblockListMenuItems(void)
sPokeblockMenu->items[i].id = LIST_B_PRESSED; sPokeblockMenu->items[i].id = LIST_B_PRESSED;
gMultiuseListMenuTemplate = sPokeblockListMenuTemplate; gMultiuseListMenuTemplate = sPokeblockListMenuTemplate;
gMultiuseListMenuTemplate.unk_17_0 = 7; gMultiuseListMenuTemplate.fontId = 7;
gMultiuseListMenuTemplate.totalItems = sPokeblockMenu->itemsNo; gMultiuseListMenuTemplate.totalItems = sPokeblockMenu->itemsNo;
gMultiuseListMenuTemplate.items = sPokeblockMenu->items; gMultiuseListMenuTemplate.items = sPokeblockMenu->items;
gMultiuseListMenuTemplate.maxShowed = sPokeblockMenu->maxShowed; gMultiuseListMenuTemplate.maxShowed = sPokeblockMenu->maxShowed;
@@ -639,7 +639,7 @@ static void PutPokeblockListMenuString(u8 *dst, u16 pkblId)
StringExpandPlaceholders(txtPtr, gText_LvVar1); StringExpandPlaceholders(txtPtr, gText_LvVar1);
} }
static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2) static void MovePokeblockMenuCursor(s32 pkblId, bool8 arg1, struct ListMenu *arg2)
{ {
if (arg1 != TRUE) if (arg1 != TRUE)
{ {
@@ -869,7 +869,7 @@ static void Task_FreeDataAndExitPokeblockCase(u8 taskId)
if (sPokeblockMenu->caseId == PBLOCK_CASE_FEEDER || sPokeblockMenu->caseId == PBLOCK_CASE_GIVE) if (sPokeblockMenu->caseId == PBLOCK_CASE_FEEDER || sPokeblockMenu->caseId == PBLOCK_CASE_GIVE)
gFieldCallback = sub_80AF168; gFieldCallback = sub_80AF168;
sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); DestroyListMenuTask(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
sub_8136418(); sub_8136418();
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
@@ -893,7 +893,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
{ {
if (gMain.newKeys & SELECT_BUTTON) if (gMain.newKeys & SELECT_BUTTON)
{ {
sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos != sPokeblockMenu->itemsNo - 1) if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos != sPokeblockMenu->itemsNo - 1)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
@@ -908,7 +908,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
u16 oldPosition = sSavedPokeblockData.lastItemPos; u16 oldPosition = sSavedPokeblockData.lastItemPos;
s32 itemId = ListMenuHandleInputGetItemId(data[0]); s32 itemId = ListMenuHandleInputGetItemId(data[0]);
sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
if (oldPosition != sSavedPokeblockData.lastItemPos) if (oldPosition != sSavedPokeblockData.lastItemPos)
{ {
HandlePokeblockMenuCursor(oldPosition, 5); HandlePokeblockMenuCursor(oldPosition, 5);
@@ -945,7 +945,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
if (gMain.newKeys & SELECT_BUTTON) if (gMain.newKeys & SELECT_BUTTON)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
HandlePokeblocksSwap(taskId, FALSE); HandlePokeblocksSwap(taskId, FALSE);
} }
else else
@@ -954,7 +954,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
u16 var = sSavedPokeblockData.lastItemPos; u16 var = sSavedPokeblockData.lastItemPos;
s32 itemId = ListMenuHandleInputGetItemId(data[0]); s32 itemId = ListMenuHandleInputGetItemId(data[0]);
sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos) if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos)
{ {
for (i = 0; i < 9; i++) for (i = 0; i < 9; i++)
@@ -996,7 +996,7 @@ static void HandlePokeblocksSwap(u8 taskId, bool8 noSwap)
u16 swappedFromId = sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos; u16 swappedFromId = sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos;
sPokeblockMenu->isSwapping = FALSE; sPokeblockMenu->isSwapping = FALSE;
sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); DestroyListMenuTask(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
if (!noSwap && data[2] != swappedFromId && data[2] != swappedFromId - 1) if (!noSwap && data[2] != swappedFromId && data[2] != swappedFromId - 1)
{ {
@@ -1112,7 +1112,7 @@ static void HandleErasePokeblock(u8 taskId)
lastPos = &sSavedPokeblockData.lastItemPos; lastPos = &sSavedPokeblockData.lastItemPos;
data = gTasks[taskId].data; data = gTasks[taskId].data;
sub_81AE6C8(data[0], lastPage, lastPos); DestroyListMenuTask(data[0], lastPage, lastPos);
HandlePokeblockMenuCursor(*lastPos, 5); HandlePokeblockMenuCursor(*lastPos, 5);
SetMenuItemsCountAndMaxShowed(); SetMenuItemsCountAndMaxShowed();
sub_81362E0(); sub_81362E0();
src/secret_base.c
+8 -8
View File
@@ -6,8 +6,8 @@
#include "main.h" #include "main.h"
#include "task.h" #include "task.h"
#include "palette.h" #include "palette.h"
#include "list_menu.h"
#include "window.h" #include "window.h"
#include "list_menu.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "menu_indicators.h" #include "menu_indicators.h"
@@ -66,7 +66,7 @@ EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL;
void sub_80E9C9C(u8 taskId); void sub_80E9C9C(u8 taskId);
void game_continue(u8 taskId); void game_continue(u8 taskId);
void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu); void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu);
void sub_80E9E00(u8 taskId); void sub_80E9E00(u8 taskId);
void sub_80E9E44(u8 taskId); void sub_80E9E44(u8 taskId);
void sub_80E9E90(u8 taskId); void sub_80E9E90(u8 taskId);
@@ -913,13 +913,13 @@ void game_continue(u8 taskId)
data[3] = 8; data[3] = 8;
} }
gMultiuseListMenuTemplate = gUnknown_0858D07C; gMultiuseListMenuTemplate = gUnknown_0858D07C;
gMultiuseListMenuTemplate.unk_10 = data[6]; gMultiuseListMenuTemplate.windowId = data[6];
gMultiuseListMenuTemplate.totalItems = data[0]; gMultiuseListMenuTemplate.totalItems = data[0];
gMultiuseListMenuTemplate.items = gUnknown_0203A020->items; gMultiuseListMenuTemplate.items = gUnknown_0203A020->items;
gMultiuseListMenuTemplate.maxShowed = data[3]; gMultiuseListMenuTemplate.maxShowed = data[3];
} }
void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu) void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu)
{ {
if (flag != TRUE) if (flag != TRUE)
{ {
@@ -953,14 +953,14 @@ void sub_80E9E90(u8 taskId)
data = gTasks[taskId].data; data = gTasks[taskId].data;
input = ListMenuHandleInputGetItemId(data[5]); input = ListMenuHandleInputGetItemId(data[5]);
sub_81AE860(data[5], &data[2], &data[1]); ListMenuGetScrollAndRow(data[5], &data[2], &data[1]);
switch (input) switch (input)
{ {
case -1: case -1:
break; break;
case -2: case -2:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_81AE6C8(data[5], NULL, NULL); DestroyListMenuTask(data[5], NULL, NULL);
RemoveScrollIndicatorArrowPair(data[8]); RemoveScrollIndicatorArrowPair(data[8]);
sub_819746C(data[6], 0); sub_819746C(data[6], 0);
ClearWindowTilemap(data[6]); ClearWindowTilemap(data[6]);
@@ -1042,7 +1042,7 @@ void sub_80EA08C(u8 taskId)
data = gTasks[taskId].data; data = gTasks[taskId].data;
sub_8197434(0, 0); sub_8197434(0, 0);
sub_81AE6C8(data[5], &data[2], &data[1]); DestroyListMenuTask(data[5], &data[2], &data[1]);
gSaveBlock1Ptr->secretBases[data[4]].sbr_field_1_6 = 0; gSaveBlock1Ptr->secretBases[data[4]].sbr_field_1_6 = 0;
game_continue(taskId); game_continue(taskId);
sub_812225C(&data[2], &data[1], data[3], data[0]); sub_812225C(&data[2], &data[1], data[3], data[0]);
@@ -1061,7 +1061,7 @@ void sub_80EA13C(u8 taskId)
data = gTasks[taskId].data; data = gTasks[taskId].data;
sub_8197434(0, 0); sub_8197434(0, 0);
sub_81AE6C8(data[5], &data[2], &data[1]); DestroyListMenuTask(data[5], &data[2], &data[1]);
sub_80E9E00(taskId); sub_80E9E00(taskId);
gTasks[taskId].func = sub_80E9E90; gTasks[taskId].func = sub_80E9E90;
} }
sym_common.txt
+1 -5
View File
@@ -178,11 +178,7 @@ gUnknown_030062F0: @ 30062F0
gUnknown_030062F4: @ 30062F4 gUnknown_030062F4: @ 30062F4
.space 0xC .space 0xC
gUnknown_03006300: @ 3006300 .include "list_menu.o"
.space 0x10
gMultiuseListMenuTemplate: @ 3006310
.space 0x18
gUnknown_03006328: @ 3006328 gUnknown_03006328: @ 3006328
.space 0x48 .space 0x48