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

through InitTutorialBag

Browse Source
This commit is contained in:
PikalaxALT
2020-01-18 22:14:54 -05:00
parent c9cb5d931c
commit 4c62d0f35f
8 changed files with 256 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/item_menu.s
+7 -859
View File
@@ -5,858 +5,6 @@
.text
thumb_func_start sub_810A85C
sub_810A85C: @ 810A85C
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
ldr r1, _0810A8B4 @ =gTasks+0x8
adds r5, r0, r1
adds r0, r5, 0
adds r0, 0x10
ldrh r1, [r5, 0x4]
bl AdjustQuantityAccordingToDPadInput
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0810A8BC
movs r1, 0x10
ldrsh r0, [r5, r1]
movs r1, 0x2
bl sub_81097E4
ldr r0, _0810A8B8 @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6]
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
ldrsh r1, [r5, r2]
muls r0, r1
bl sub_810A834
b _0810A93A
.align 2, 0
_0810A8B4: .4byte gTasks+0x8
_0810A8B8: .4byte gUnknown_203ACFC
_0810A8BC:
ldr r0, _0810A8EC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0810A8F0
movs r0, 0x5
bl PlaySE
movs r0, 0
bl sub_810BA3C
movs r0, 0
bl PutWindowTilemap
movs r0, 0
bl ScheduleBgCopyTilemapToVram
bl sub_8108978
adds r0, r4, 0
bl sub_810A690
b _0810A93A
.align 2, 0
_0810A8EC: .4byte gMain
_0810A8F0:
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _0810A93A
movs r0, 0x5
bl PlaySE
movs r0, 0
bl sub_810BA3C
movs r0, 0x2
bl sub_810BA3C
movs r0, 0x5
bl sub_810BA9C
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl ScheduleBgCopyTilemapToVram
bl sub_8108978
ldrb r0, [r5]
movs r1, 0x1
bl bag_menu_print_cursor_
adds r0, r6, 0
bl sub_810910C
_0810A93A:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_810A85C
thumb_func_start sub_810A940
sub_810A940: @ 810A940
push {r4-r6,lr}
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
lsls r4, r5, 2
adds r4, r5
lsls r4, 3
ldr r0, _0810A9B4 @ =gTasks+0x8
adds r4, r0
movs r0, 0
bl PutWindowTilemap
movs r0, 0
bl ScheduleBgCopyTilemapToVram
ldr r0, _0810A9B8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0810A9BC @ =gStringVar1
bl CopyItemName
ldr r6, _0810A9C0 @ =gStringVar3
ldr r0, _0810A9C4 @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6]
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
bl BagGetItemIdByPocketPosition
lsls r0, 16
lsrs r0, 16
bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
ldrsh r1, [r4, r2]
muls r1, r0
adds r0, r6, 0
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, _0810A9C8 @ =gStringVar4
ldr r1, _0810A9CC @ =gText_TurnedOverItemsWorthYen
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, _0810A9D0 @ =sub_810A9D4
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
bl DisplayItemMessageInBag
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0810A9B4: .4byte gTasks+0x8
_0810A9B8: .4byte gSpecialVar_ItemId
_0810A9BC: .4byte gStringVar1
_0810A9C0: .4byte gStringVar3
_0810A9C4: .4byte gUnknown_203ACFC
_0810A9C8: .4byte gStringVar4
_0810A9CC: .4byte gText_TurnedOverItemsWorthYen
_0810A9D0: .4byte sub_810A9D4
thumb_func_end sub_810A940
thumb_func_start sub_810A9D4
sub_810A9D4: @ 810A9D4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
lsls r0, 24
lsrs r0, 24
lsls r6, r0, 2
adds r6, r0
lsls r6, 3
ldr r0, _0810AAD8 @ =gTasks+0x8
mov r10, r0
adds r1, r6, 0
add r1, r10
mov r8, r1
movs r0, 0xF8
bl PlaySE
ldr r5, _0810AADC @ =gSpecialVar_ItemId
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
bl RemoveBagItem
ldr r3, _0810AAE0 @ =gSaveBlock1Ptr
ldr r4, [r3]
movs r7, 0xA4
lsls r7, 2
adds r4, r7
ldrh r0, [r5]
bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
mov r2, r8
movs r3, 0x10
ldrsh r1, [r2, r3]
muls r1, r0
adds r0, r4, 0
bl AddMoney
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
movs r2, 0x2
bl RecordItemPurchase
mov r3, r8
ldrb r0, [r3]
ldr r4, _0810AAE4 @ =gUnknown_203ACFC
ldrh r2, [r4, 0x6]
lsls r2, 1
adds r5, r4, 0
adds r5, 0xE
adds r1, r2, r5
movs r3, 0x8
adds r3, r4
mov r9, r3
add r2, r9
bl DestroyListMenuTask
ldrb r0, [r4, 0x6]
bl sub_8108DC8
ldrb r0, [r4, 0x6]
bl sub_81089F4
ldr r0, _0810AAE8 @ =gUnknown_203AD10
ldr r2, [r0]
ldrb r1, [r2, 0x5]
movs r0, 0x3F
ands r0, r1
movs r1, 0x40
orrs r0, r1
strb r0, [r2, 0x5]
ldrb r0, [r4, 0x6]
bl sub_810842C
ldr r0, _0810AAEC @ =gMultiuseListMenuTemplate
ldrh r2, [r4, 0x6]
lsls r2, 1
adds r5, r2, r5
ldrh r1, [r5]
add r2, r9
ldrh r2, [r2]
bl ListMenuInit
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1]
movs r1, 0x2
bl bag_menu_print_cursor_
movs r0, 0x2
bl sub_810BAD8
lsls r0, 24
lsrs r0, 24
bl sub_810BB74
movs r0, 0x2
bl sub_810BAD8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _0810AAE0 @ =gSaveBlock1Ptr
ldr r0, [r2]
adds r0, r7
bl GetMoney
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
bl PrintMoneyAmountInMoneyBox
movs r3, 0x8
negs r3, r3
add r10, r3
add r6, r10
ldr r0, _0810AAF0 @ =sub_810AAF4
str r0, [r6]
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0810AAD8: .4byte gTasks+0x8
_0810AADC: .4byte gSpecialVar_ItemId
_0810AAE0: .4byte gSaveBlock1Ptr
_0810AAE4: .4byte gUnknown_203ACFC
_0810AAE8: .4byte gUnknown_203AD10
_0810AAEC: .4byte gMultiuseListMenuTemplate
_0810AAF0: .4byte sub_810AAF4
thumb_func_end sub_810A9D4
thumb_func_start sub_810AAF4
sub_810AAF4: @ 810AAF4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0810AB38 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
bne _0810AB0E
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _0810AB32
_0810AB0E:
movs r0, 0x5
bl PlaySE
movs r0, 0x2
bl sub_810BA3C
movs r0, 0x2
bl PutWindowTilemap
ldr r0, _0810AB3C @ =gUnknown_203AD10
ldr r2, [r0]
ldrb r1, [r2, 0x5]
movs r0, 0x3F
ands r0, r1
strb r0, [r2, 0x5]
adds r0, r4, 0
bl sub_810A1F8
_0810AB32:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810AB38: .4byte gMain
_0810AB3C: .4byte gUnknown_203AD10
thumb_func_end sub_810AAF4
thumb_func_start sub_810AB40
sub_810AB40: @ 810AB40
push {r4,r5,lr}
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
adds r0, r2
lsls r4, r0, 3
ldr r5, _0810AB64 @ =gTasks+0x8
adds r1, r4, r5
movs r0, 0x1
strh r0, [r1, 0x10]
movs r3, 0x4
ldrsh r0, [r1, r3]
cmp r0, 0x1
bne _0810AB68
adds r0, r2, 0
bl sub_810AC40
b _0810AB7A
.align 2, 0
_0810AB64: .4byte gTasks+0x8
_0810AB68:
ldrh r0, [r1, 0x2]
ldr r1, _0810AB80 @ =gUnknown_841638F
bl sub_810971C
adds r0, r5, 0
subs r0, 0x8
adds r0, r4, r0
ldr r1, _0810AB84 @ =sub_810AB88
str r1, [r0]
_0810AB7A:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0810AB80: .4byte gUnknown_841638F
_0810AB84: .4byte sub_810AB88
thumb_func_end sub_810AB40
thumb_func_start sub_810AB88
sub_810AB88: @ 810AB88
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
ldr r1, _0810ABB8 @ =gTasks+0x8
adds r4, r0, r1
adds r0, r4, 0
adds r0, 0x10
ldrh r1, [r4, 0x4]
bl AdjustQuantityAccordingToDPadInput
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0810ABBC
movs r1, 0x10
ldrsh r0, [r4, r1]
movs r1, 0x3
bl sub_81097E4
b _0810AC38
.align 2, 0
_0810ABB8: .4byte gTasks+0x8
_0810ABBC:
ldr r0, _0810ABFC @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _0810AC00
movs r0, 0x5
bl PlaySE
movs r0, 0x6
bl sub_810BAD8
lsls r0, 24
lsrs r0, 24
bl ClearWindowTilemap
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
bl sub_810BA3C
movs r0, 0
bl ScheduleBgCopyTilemapToVram
bl sub_8108978
adds r0, r5, 0
bl sub_810AC40
b _0810AC38
.align 2, 0
_0810ABFC: .4byte gMain
_0810AC00:
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _0810AC38
movs r0, 0x5
bl PlaySE
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
bl sub_810BA3C
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl bag_menu_print_cursor_
bl sub_8108978
adds r0, r6, 0
bl sub_810910C
_0810AC38:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_810AB88
thumb_func_start sub_810AC40
sub_810AC40: @ 810AC40
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x14
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
mov r8, r0
ldr r0, _0810ACCC @ =gTasks+0x8
mov r9, r0
mov r7, r8
add r7, r9
ldr r5, _0810ACD0 @ =gSpecialVar_ItemId
ldrh r0, [r5]
ldrh r1, [r7, 0x10]
bl AddPCItem
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x1
bne _0810ACEC
ldrh r2, [r5]
ldr r3, _0810ACD4 @ =0x0000ffff
movs r0, 0x1C
movs r1, 0
bl ItemUse_SetQuestLogEvent
ldrh r0, [r5]
ldr r1, _0810ACD8 @ =gStringVar1
bl CopyItemName
ldr r0, _0810ACDC @ =gStringVar2
movs r2, 0x10
ldrsh r1, [r7, r2]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0810ACE0 @ =gStringVar4
ldr r1, _0810ACE4 @ =gUnknown_84163A7
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x6
movs r1, 0x3
bl sub_810B9DC
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
str r1, [sp]
str r6, [sp, 0x4]
movs r1, 0
str r1, [sp, 0x8]
str r1, [sp, 0xC]
str r6, [sp, 0x10]
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
bl sub_810B8F0
mov r0, r9
subs r0, 0x8
add r0, r8
ldr r1, _0810ACE8 @ =sub_8109F44
str r1, [r0]
b _0810ACF8
.align 2, 0
_0810ACCC: .4byte gTasks+0x8
_0810ACD0: .4byte gSpecialVar_ItemId
_0810ACD4: .4byte 0x0000ffff
_0810ACD8: .4byte gStringVar1
_0810ACDC: .4byte gStringVar2
_0810ACE0: .4byte gStringVar4
_0810ACE4: .4byte gUnknown_84163A7
_0810ACE8: .4byte sub_8109F44
_0810ACEC:
ldr r2, _0810AD08 @ =gUnknown_84163BB
ldr r3, _0810AD0C @ =sub_810A1D0
adds r0, r4, 0
movs r1, 0x2
bl DisplayItemMessageInBag
_0810ACF8:
add sp, 0x14
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0810AD08: .4byte gUnknown_84163BB
_0810AD0C: .4byte sub_810A1D0
thumb_func_end sub_810AC40
thumb_func_start UseRegisteredKeyItemOnField
UseRegisteredKeyItemOnField: @ 810AD10
push {r4-r6,lr}
bl InUnionRoom
cmp r0, 0x1
bne _0810AD1E
movs r0, 0
b _0810ADA0
_0810AD1E:
bl DismissMapNamePopup
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgY
ldr r4, _0810AD80 @ =gSaveBlock1Ptr
ldr r0, [r4]
ldr r5, _0810AD84 @ =0x00000296
adds r1, r0, r5
ldrh r0, [r1]
cmp r0, 0
beq _0810AD98
movs r1, 0x1
bl CheckBagHasItem
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x1
bne _0810AD90
bl ScriptContext2_Enable
bl FreezeObjectEvents
bl sub_805C270
bl sub_805C780
ldr r2, _0810AD88 @ =gSpecialVar_ItemId
ldr r0, [r4]
adds r0, r5
ldrh r1, [r0]
strh r1, [r2]
ldrh r0, [r0]
bl ItemId_GetFieldFunc
movs r1, 0x8
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810AD8C @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
strh r6, [r1, 0xE]
b _0810AD9E
.align 2, 0
_0810AD80: .4byte gSaveBlock1Ptr
_0810AD84: .4byte 0x00000296
_0810AD88: .4byte gSpecialVar_ItemId
_0810AD8C: .4byte gTasks
_0810AD90:
ldr r0, [r4]
adds r0, r5
movs r1, 0
strh r1, [r0]
_0810AD98:
ldr r0, _0810ADA8 @ =gUnknown_81A77A0
bl ScriptContext1_SetupScript
_0810AD9E:
movs r0, 0x1
_0810ADA0:
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0810ADA8: .4byte gUnknown_81A77A0
thumb_func_end UseRegisteredKeyItemOnField
thumb_func_start sub_810ADAC
sub_810ADAC: @ 810ADAC
push {lr}
ldr r0, _0810ADCC @ =gUnknown_203ACFC
ldrb r0, [r0, 0x4]
cmp r0, 0x6
beq _0810ADC6
cmp r0, 0x8
beq _0810ADC6
cmp r0, 0x7
beq _0810ADC6
cmp r0, 0x9
beq _0810ADC6
cmp r0, 0xA
bne _0810ADD0
_0810ADC6:
movs r0, 0x1
b _0810ADD2
.align 2, 0
_0810ADCC: .4byte gUnknown_203ACFC
_0810ADD0:
movs r0, 0
_0810ADD2:
pop {r1}
bx r1
thumb_func_end sub_810ADAC
thumb_func_start sub_810ADD8
sub_810ADD8: @ 810ADD8
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r5, _0810AEBC @ =gUnknown_203AD2C
movs r0, 0xB2
lsls r0, 1
bl AllocZeroed
str r0, [r5]
ldr r4, _0810AEC0 @ =gSaveBlock1Ptr
ldr r1, [r4]
movs r2, 0xC4
lsls r2, 2
adds r1, r2
movs r2, 0xA8
bl memcpy
ldr r0, [r5]
adds r0, 0xA8
ldr r1, [r4]
movs r3, 0xEE
lsls r3, 2
adds r1, r3
movs r2, 0x78
bl memcpy
ldr r0, [r5]
movs r1, 0x90
lsls r1, 1
adds r0, r1
ldr r1, [r4]
movs r2, 0x86
lsls r2, 3
adds r1, r2
movs r2, 0x34
bl memcpy
ldr r2, [r5]
ldr r0, [r4]
ldr r3, _0810AEC4 @ =0x00000296
adds r0, r3
ldrh r1, [r0]
movs r3, 0xB0
lsls r3, 1
adds r0, r2, r3
strh r1, [r0]
ldr r1, _0810AEC8 @ =gUnknown_203ACFC
ldrh r0, [r1, 0x6]
adds r3, 0x2
adds r2, r3
strh r0, [r2]
movs r4, 0
mov r8, r5
movs r7, 0xAA
lsls r7, 1
movs r0, 0xE
adds r0, r1
mov r12, r0
movs r6, 0xAD
lsls r6, 1
adds r5, r1, 0
adds r5, 0x8
_0810AE54:
mov r1, r8
ldr r2, [r1]
lsls r3, r4, 1
adds r0, r2, r7
adds r0, r3
ldrh r1, [r5]
strh r1, [r0]
adds r2, r6
adds r2, r3
mov r3, r12
ldrh r0, [r3]
strh r0, [r2]
movs r0, 0x2
add r12, r0
adds r5, 0x2
adds r4, 0x1
cmp r4, 0x2
bls _0810AE54
ldr r4, _0810AEC0 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xC4
lsls r1, 2
adds r0, r1
movs r1, 0x2A
bl ClearItemSlots
ldr r0, [r4]
movs r2, 0xEE
lsls r2, 2
adds r0, r2
movs r1, 0x1E
bl ClearItemSlots
ldr r0, [r4]
movs r3, 0x86
lsls r3, 3
adds r0, r3
movs r1, 0xD
bl ClearItemSlots
ldr r0, [r4]
ldr r1, _0810AEC4 @ =0x00000296
adds r0, r1
movs r1, 0
strh r1, [r0]
bl sub_81089BC
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0810AEBC: .4byte gUnknown_203AD2C
_0810AEC0: .4byte gSaveBlock1Ptr
_0810AEC4: .4byte 0x00000296
_0810AEC8: .4byte gUnknown_203ACFC
thumb_func_end sub_810ADD8
thumb_func_start sub_810AECC
sub_810AECC: @ 810AECC
push {r4-r7,lr}
ldr r4, _0810AF64 @ =gSaveBlock1Ptr
ldr r0, [r4]
movs r1, 0xC4
lsls r1, 2
adds r0, r1
ldr r5, _0810AF68 @ =gUnknown_203AD2C
ldr r1, [r5]
movs r2, 0xA8
bl memcpy
ldr r0, [r4]
movs r2, 0xEE
lsls r2, 2
adds r0, r2
ldr r1, [r5]
adds r1, 0xA8
movs r2, 0x78
bl memcpy
ldr r0, [r4]
movs r3, 0x86
lsls r3, 3
adds r0, r3
ldr r1, [r5]
movs r2, 0x90
lsls r2, 1
adds r1, r2
movs r2, 0x34
bl memcpy
ldr r1, [r4]
ldr r2, [r5]
movs r3, 0xB0
lsls r3, 1
adds r0, r2, r3
ldrh r0, [r0]
ldr r3, _0810AF6C @ =0x00000296
adds r1, r3
strh r0, [r1]
ldr r1, _0810AF70 @ =gUnknown_203ACFC
movs r3, 0xB1
lsls r3, 1
adds r0, r2, r3
ldrh r0, [r0]
strh r0, [r1, 0x6]
movs r4, 0
mov r12, r5
adds r3, r1, 0
adds r3, 0x8
mov r7, r12
movs r6, 0xAA
lsls r6, 1
movs r5, 0xAD
lsls r5, 1
_0810AF3A:
lsls r2, r4, 1
ldr r1, [r7]
adds r0, r1, r6
adds r0, r2
ldrh r0, [r0]
strh r0, [r3]
adds r1, r5
adds r1, r2
ldrh r0, [r1]
strh r0, [r3, 0x6]
adds r3, 0x2
adds r4, 0x1
cmp r4, 0x2
bls _0810AF3A
mov r1, r12
ldr r0, [r1]
bl Free
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0810AF64: .4byte gSaveBlock1Ptr
_0810AF68: .4byte gUnknown_203AD2C
_0810AF6C: .4byte 0x00000296
_0810AF70: .4byte gUnknown_203ACFC
thumb_func_end sub_810AECC
thumb_func_start sub_810AF74
sub_810AF74: @ 810AF74
push {lr}
bl sub_810ADD8
movs r0, 0xD
movs r1, 0x1
bl AddBagItem
movs r0, 0x4
movs r1, 0x1
bl AddBagItem
ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x6
movs r1, 0
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
_0810AF98: .4byte SetCB2ToReshowScreenAfterMenu2
thumb_func_end sub_810AF74
thumb_func_start sub_810AF9C
sub_810AF9C: @ 810AF9C
push {r4-r7,lr}
@@ -936,7 +84,7 @@ _0810B01C:
movs r1, 0
movs r2, 0
bl DestroyListMenuTask
bl sub_810AECC
bl RestorePlayerBag
bl sub_8108CB4
adds r0, r7, 0
subs r0, 0x8
@@ -1037,7 +185,7 @@ sub_810B108: @ 810B108
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_810ADD8
bl BackUpPlayerBag
movs r0, 0xD
movs r1, 0x1
bl AddBagItem
@@ -1105,7 +253,7 @@ sub_810B180: @ 810B180
.align 2, 0
_0810B198: .4byte gMain
_0810B19C:
bl sub_810AECC
bl RestorePlayerBag
bl SetTeachyTvControllerModeToResume
ldr r0, _0810B1C4 @ =gUnknown_203AD10
ldr r1, [r0]
@@ -1307,7 +455,7 @@ _0810B344:
movs r1, 0
movs r2, 0
bl DestroyListMenuTask
bl sub_810AECC
bl RestorePlayerBag
bl sub_8108CB4
adds r0, r6, 0
subs r0, 0x8
@@ -1462,7 +610,7 @@ _0810B468:
movs r1, 0
movs r2, 0
bl DestroyListMenuTask
bl sub_810AECC
bl RestorePlayerBag
bl sub_8108CB4
adds r0, r7, 0
subs r0, 0x8
@@ -1578,7 +726,7 @@ _0810B564:
movs r1, 0
movs r2, 0
bl DestroyListMenuTask
bl sub_810AECC
bl RestorePlayerBag
ldr r1, _0810B5B0 @ =gItemUseCB
ldr r0, _0810B5B4 @ =ItemUseCB_MedicineStep
str r0, [r1]
@@ -1713,7 +861,7 @@ _0810B68C:
movs r1, 0
movs r2, 0
bl DestroyListMenuTask
bl sub_810AECC
bl RestorePlayerBag
ldr r0, _0810B6D4 @ =gUnknown_203AD10
ldr r1, [r0]
ldr r0, _0810B6D8 @ =PokeDude_InitTMCase
data/strings.s
+3 -3
View File
@@ -596,15 +596,15 @@ gText_TheStrVar1CantBeHeldHere:: @ 8416374
.string "The {STR_VAR_1} can't be held\n"
.string "here.$"
gUnknown_841638F:: @ 841638F
gText_DepositHowManyStrVars1:: @ 841638F
.string "Deposit how many\n"
.string "{STR_VAR_1}(s)?$"
gUnknown_84163A7:: @ 84163A7
gText_DepositedStrVar2StrVar1s:: @ 84163A7
.string "Deposited {STR_VAR_2}\n"
.string "{STR_VAR_1}(s).$"
gUnknown_84163BB:: @ 84163BB
gText_NoRoomToStoreItems:: @ 84163BB
.string "There's no room to\n"
.string "store items.$"
include/event_scripts.h
+2
View File
@@ -1195,4 +1195,6 @@ extern const u8 Text_1A5D31[];
extern const u8 Text_1A5D6E[];
extern const u8 Text_1A5DB1[];
extern const u8 gUnknown_81A77A0[];
#endif //GUARD_EVENT_SCRIPTS_H
include/item_menu.h
+1 -1
View File
@@ -37,7 +37,7 @@ void ItemMenu_SetExitCallback(void (*)(void));
void DisplayItemMessageInBag(u8 taskId, u8 fontId, const u8 * string, TaskFunc followUpFunc);
void sub_810A1F8(u8 taskId);
void sub_8107ECC(void);
void sub_810AF74(void);
void InitTutorialBag(void);
void sub_8108DC8(u8 pocketId);
void sub_81089F4(u8 pocketId);
void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback);
include/map_name_popup.h
+1
View File
@@ -4,5 +4,6 @@
#include "global.h"
void CreateMapNamePopupIfNotAlreadyRunning(bool32 palIntoFadedBuffer);
void DismissMapNamePopup(void);
#endif //GUARD_MAP_NAME_POPUP_H
include/strings.h
+3
View File
@@ -1049,5 +1049,8 @@ extern const u8 gText_PokeBalls2[];
extern const u8 gText_KeyItems2[];
extern const u8 gText_CloseBag[];
extern const u8 gText_CantWriteMailHere[];
extern const u8 gText_DepositHowManyStrVars1[];
extern const u8 gText_DepositedStrVar2StrVar1s[];
extern const u8 gText_NoRoomToStoreItems[];
#endif //GUARD_STRINGS_H
src/battle_controller_oak_old_man.c
+1 -1
View File
@@ -381,7 +381,7 @@ static void OpenBagAndChooseItem(void)
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE)
sub_8107ECC();
else
sub_810AF74();
InitTutorialBag();
}
}
src/item_menu.c
+238
View File
@@ -4,15 +4,19 @@
#include "battle_controllers.h"
#include "berry_pouch.h"
#include "decompress.h"
#include "event_scripts.h"
#include "event_object_80688E4.h"
#include "field_player_avatar.h"
#include "graphics.h"
#include "help_system.h"
#include "item.h"
#include "item_menu.h"
#include "item_menu_icons.h"
#include "item_use.h"
#include "link.h"
#include "list_menu.h"
#include "mail_data.h"
#include "map_name_popup.h"
#include "menu.h"
#include "menu_indicators.h"
#include "money.h"
@@ -21,6 +25,8 @@
#include "party_menu.h"
#include "pokemon_storage_system.h"
#include "scanline_effect.h"
#include "script.h"
#include "shop.h"
#include "strings.h"
#include "tm_case.h"
#include "constants/items.h"
@@ -43,6 +49,17 @@ struct BagMenuAlloc
u8 data[4];
};
struct BagSlots
{
struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT];
struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT];
struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT];
u16 itemsAbove[3];
u16 cursorPos[3];
u16 registeredItem;
u16 pocket;
};
EWRAM_DATA struct BagStruct gUnknown_203ACFC = {};
EWRAM_DATA struct BagMenuAlloc * gUnknown_203AD10 = NULL;
EWRAM_DATA void * gUnknown_203AD14 = NULL;
@@ -51,6 +68,7 @@ EWRAM_DATA u8 (*gUnknown_203AD1C)[19] = NULL;
EWRAM_DATA u8 gUnknown_203AD20[4] = {};
EWRAM_DATA const u8 *gUnknown_203AD24 = NULL;
EWRAM_DATA u8 gUnknown_203AD28 = 0;
EWRAM_DATA struct BagSlots * gUnknown_203AD2C = NULL;
void sub_8107F10(void);
bool8 sub_8107F3C(void);
@@ -124,7 +142,11 @@ void sub_810A770(u8 taskId);
void sub_810A834(s32 price);
void sub_810A85C(u8 taskId);
void sub_810A940(u8 taskId);
void sub_810A9D4(u8 taskId);
void sub_810AAF4(u8 taskId);
void sub_810AB40(u8 taskId);
void sub_810AB88(u8 taskId);
void sub_810AC40(u8 taskId);
bool8 sub_810ADAC(void);
void sub_810AF9C(u8 taskId);
void sub_810B1D4(u8 taskId);
@@ -1855,3 +1877,219 @@ void sub_810A834(s32 amount)
{
PrintMoneyAmount(sub_810BAD8(0), 56, 10, amount, 0);
}
void sub_810A85C(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE)
{
sub_81097E4(data[8], 2);
sub_810A834(itemid_get_market_price(BagGetItemIdByPocketPosition(gUnknown_203ACFC.pocket + 1, data[1])) / 2 * data[8]);
}
else if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
sub_810BA3C(0);
PutWindowTilemap(0);
ScheduleBgCopyTilemapToVram(0);
sub_8108978();
sub_810A690(taskId);
}
else if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
sub_810BA3C(0);
sub_810BA3C(2);
sub_810BA9C(5);
PutWindowTilemap(2);
PutWindowTilemap(0);
PutWindowTilemap(1);
ScheduleBgCopyTilemapToVram(0);
sub_8108978();
bag_menu_print_cursor_(data[0], 1);
sub_810910C(taskId);
}
}
void sub_810A940(u8 taskId)
{
s16 *data = gTasks[taskId].data;
PutWindowTilemap(0);
ScheduleBgCopyTilemapToVram(0);
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(gUnknown_203ACFC.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen);
DisplayItemMessageInBag(taskId, 2, gStringVar4, sub_810A9D4);
}
void sub_810A9D4(u8 taskId)
{
s16 *data = gTasks[taskId].data;
PlaySE(SE_SHOP);
RemoveBagItem(gSpecialVar_ItemId, data[8]);
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
RecordItemPurchase(gSpecialVar_ItemId, data[8], 2);
DestroyListMenuTask(data[0], &gUnknown_203ACFC.cursorPos[gUnknown_203ACFC.pocket], &gUnknown_203ACFC.itemsAbove[gUnknown_203ACFC.pocket]);
sub_8108DC8(gUnknown_203ACFC.pocket);
sub_81089F4(gUnknown_203ACFC.pocket);
gUnknown_203AD10->field_05_6 = 1;
sub_810842C(gUnknown_203ACFC.pocket);
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gUnknown_203ACFC.cursorPos[gUnknown_203ACFC.pocket], gUnknown_203ACFC.itemsAbove[gUnknown_203ACFC.pocket]);
bag_menu_print_cursor_(data[0], 2);
sub_810BB74(sub_810BAD8(2));
PrintMoneyAmountInMoneyBox(sub_810BAD8(2), GetMoney(&gSaveBlock1Ptr->money), 0);
gTasks[taskId].func = sub_810AAF4;
}
void sub_810AAF4(u8 taskId)
{
if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
sub_810BA3C(2);
PutWindowTilemap(2);
gUnknown_203AD10->field_05_6 = 0;
sub_810A1F8(taskId);
}
}
void sub_810AB40(u8 taskId)
{
s16 *data = gTasks[taskId].data;
data[8] = 1;
if (data[2] == 1)
{
sub_810AC40(taskId);
}
else
{
sub_810971C(data[1], gText_DepositHowManyStrVars1);
gTasks[taskId].func = sub_810AB88;
}
}
void sub_810AB88(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE)
{
sub_81097E4(data[8], 3);
}
else if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
ClearWindowTilemap(sub_810BAD8(6));
sub_810BA3C(6);
sub_810BA3C(0);
ScheduleBgCopyTilemapToVram(0);
sub_8108978();
sub_810AC40(taskId);
}
else if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
sub_810BA3C(6);
sub_810BA3C(0);
PutWindowTilemap(1);
ScheduleBgCopyTilemapToVram(0);
bag_menu_print_cursor_(data[0], 1);
sub_8108978();
sub_810910C(taskId);
}
}
void sub_810AC40(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (AddPCItem(gSpecialVar_ItemId, data[8]) == TRUE)
{
ItemUse_SetQuestLogEvent(28, 0, gSpecialVar_ItemId, 0xFFFF);
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_DepositedStrVar2StrVar1s);
sub_810B8F0(sub_810B9DC(6, 3), 2, gStringVar4, 0, 2, 1, 0, 0, 1);
gTasks[taskId].func = sub_8109F44;
}
else
{
DisplayItemMessageInBag(taskId, 2, gText_NoRoomToStoreItems, sub_810A1D0);
}
}
bool8 UseRegisteredKeyItemOnField(void)
{
u8 taskId;
if (InUnionRoom() == TRUE)
return FALSE;
DismissMapNamePopup();
ChangeBgY(0, 0, 0);
if (gSaveBlock1Ptr->registeredItem != ITEM_NONE)
{
if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE)
{
ScriptContext2_Enable();
FreezeObjectEvents();
sub_805C270();
sub_805C780();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8);
gTasks[taskId].data[3] = 1;
return TRUE;
}
gSaveBlock1Ptr->registeredItem = ITEM_NONE;
}
ScriptContext1_SetupScript(gUnknown_81A77A0);
return TRUE;
}
bool8 sub_810ADAC(void)
{
if (gUnknown_203ACFC.location == 6 || gUnknown_203ACFC.location == 8 || gUnknown_203ACFC.location == 7 || gUnknown_203ACFC.location == 9 || gUnknown_203ACFC.location == 10)
return TRUE;
return FALSE;
}
void BackUpPlayerBag(void)
{
u32 i;
gUnknown_203AD2C = AllocZeroed(sizeof(struct BagSlots));
memcpy(gUnknown_203AD2C->bagPocket_Items, gSaveBlock1Ptr->bagPocket_Items, BAG_ITEMS_COUNT * sizeof(struct ItemSlot));
memcpy(gUnknown_203AD2C->bagPocket_KeyItems, gSaveBlock1Ptr->bagPocket_KeyItems, BAG_KEYITEMS_COUNT * sizeof(struct ItemSlot));
memcpy(gUnknown_203AD2C->bagPocket_PokeBalls, gSaveBlock1Ptr->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT * sizeof(struct ItemSlot));
gUnknown_203AD2C->registeredItem = gSaveBlock1Ptr->registeredItem;
gUnknown_203AD2C->pocket = gUnknown_203ACFC.pocket;
for (i = 0; i < 3; i++)
{
gUnknown_203AD2C->itemsAbove[i] = gUnknown_203ACFC.itemsAbove[i];
gUnknown_203AD2C->cursorPos[i] = gUnknown_203ACFC.cursorPos[i];
}
ClearItemSlots(gSaveBlock1Ptr->bagPocket_Items, BAG_ITEMS_COUNT);
ClearItemSlots(gSaveBlock1Ptr->bagPocket_KeyItems, BAG_KEYITEMS_COUNT);
ClearItemSlots(gSaveBlock1Ptr->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT);
gSaveBlock1Ptr->registeredItem = ITEM_NONE;
sub_81089BC();
}
void RestorePlayerBag(void)
{
u32 i;
memcpy(gSaveBlock1Ptr->bagPocket_Items, gUnknown_203AD2C->bagPocket_Items, BAG_ITEMS_COUNT * sizeof(struct ItemSlot));
memcpy(gSaveBlock1Ptr->bagPocket_KeyItems, gUnknown_203AD2C->bagPocket_KeyItems, BAG_KEYITEMS_COUNT * sizeof(struct ItemSlot));
memcpy(gSaveBlock1Ptr->bagPocket_PokeBalls, gUnknown_203AD2C->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT * sizeof(struct ItemSlot));
gSaveBlock1Ptr->registeredItem = gUnknown_203AD2C->registeredItem;
gUnknown_203ACFC.pocket = gUnknown_203AD2C->pocket;
for (i = 0; i < 3; i++)
{
gUnknown_203ACFC.itemsAbove[i] = gUnknown_203AD2C->itemsAbove[i];
gUnknown_203ACFC.cursorPos[i] = gUnknown_203AD2C->cursorPos[i];
}
Free(gUnknown_203AD2C);
}
void InitTutorialBag(void)
{
BackUpPlayerBag();
AddBagItem(ITEM_POTION, 1);
AddBagItem(ITEM_POKE_BALL, 1);
GoToBagMenu(6, 0, SetCB2ToReshowScreenAfterMenu2);
}