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

Rename Item PC symbols

Browse Source
This commit is contained in:
PikalaxALT
2019-06-17 10:21:32 -04:00
parent 632a7e8c08
commit 2b750cf444
64 changed files with 709 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+3 -3
View File
@@ -223,11 +223,11 @@ sub_800F380: @ 800F380
movs r0, 0x2
movs r1, 0x12
movs r2, 0x10
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0x2
movs r1, 0x22
movs r2, 0x10
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
ldr r4, _0800F3F0 @ =gPlttBufferUnfaded
adds r0, r4, 0
adds r0, 0xB8
@@ -257,7 +257,7 @@ sub_800F380: @ 800F380
movs r0, 0
movs r1, 0x30
movs r2, 0x70
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
adds r0, r4, 0
adds r0, 0xEC
movs r1, 0
asm/berry_crush_3.s
+4 -4
View File
@@ -2097,7 +2097,7 @@ _0814E6E0:
ldr r4, _0814E700 @ =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r5]
movs r1, 0
adds r2, r4, 0
@@ -2246,7 +2246,7 @@ sub_814E80C: @ 814E80C
adds r5, r4, r0
ldrb r0, [r5]
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r5]
bl RemoveWindow
adds r0, r4, 0
@@ -2309,7 +2309,7 @@ _0814E876:
ldr r4, _0814E8AC @ =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r7, 0x2]
movs r1, 0
adds r2, r4, 0
@@ -2499,7 +2499,7 @@ _0814EA3C: .4byte gMain
_0814EA40:
ldrb r0, [r7, 0x2]
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r7, 0x2]
bl ClearWindowTilemap
ldrb r0, [r7, 0x2]
asm/berry_pouch.s
+13 -13
View File
@@ -130,7 +130,7 @@ _0813CE32:
lsrs r0, 24
cmp r0, 0x1
beq _0813CE56
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -199,10 +199,10 @@ _0813CEEC:
bl ResetSpriteData
b _0813CFD2
_0813CEF2:
bl sub_80984D8
bl ResetItemMenuIconState
b _0813CFD2
_0813CEF8:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
bne _0813CFD2
@@ -798,7 +798,7 @@ _0813D3D6:
ldrb r1, [r0, 0x9]
movs r0, 0x1
eors r0, r1
bl sub_8098940
bl DestroyItemMenuIcon
ldr r1, [r4]
ldrb r0, [r1, 0x7]
cmp r0, r5
@@ -1028,7 +1028,7 @@ sub_813D594: @ 813D594
movs r1, 0
movs r2, 0x10
movs r3, 0x1E
bl sub_80F6B08
bl SetBgRectPal
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
@@ -1869,7 +1869,7 @@ _0813DC18: .4byte gUnknown_203F384
_0813DC1C: .4byte gUnknown_84643B0
_0813DC20: .4byte gUnknown_203F388
_0813DC24:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1985,7 +1985,7 @@ _0813DC86:
ldr r1, _0813DD68 @ =gStringVar1
bl sub_813D39C
ldr r5, _0813DD6C @ =gStringVar4
ldr r1, _0813DD70 @ =gUnknown_84162FF
ldr r1, _0813DD70 @ =gOtherText_StrVar1
adds r0, r5, 0
bl StringExpandPlaceholders
movs r0, 0x2
@@ -2014,7 +2014,7 @@ _0813DD60: .4byte gUnknown_203F388
_0813DD64: .4byte gUnknown_846437C
_0813DD68: .4byte gStringVar1
_0813DD6C: .4byte gStringVar4
_0813DD70: .4byte gUnknown_84162FF
_0813DD70: .4byte gOtherText_StrVar1
thumb_func_end sub_813DBE4
thumb_func_start sub_813DD74
@@ -3367,15 +3367,15 @@ sub_813E910: @ 813E910
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0
movs r1, 0x13
movs r2, 0xD0
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
movs r0, 0
movs r1, 0xA
movs r2, 0xC0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0813E998 @ =gTMCaseMainWindowPalette
movs r1, 0xF0
movs r2, 0x20
@@ -3562,7 +3562,7 @@ sub_813EA98: @ 813EA98
adds r4, r0
ldrb r0, [r4]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
@@ -3589,7 +3589,7 @@ sub_813EACC: @ 813EACC
cmp r0, 0xFF
beq _0813EB04
movs r1, 0
bl sub_810F260
bl ClearMenuWindow_BorderThickness2
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
asm/buy_menu_helpers.s
+3 -3
View File
@@ -24,15 +24,15 @@ _0813F686:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0
movs r1, 0x13
movs r2, 0xE0
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
movs r0, 0
movs r1, 0xA
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0
bl PutWindowTilemap
movs r0, 0x4
asm/clear_save_data_screen.s
+2 -2
View File
@@ -109,11 +109,11 @@ _080F564A:
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x1
movs r1, 0x1
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
b _080F56E2
_080F5660:
movs r0, 0x1
asm/dodrio_berry_picking.s
+2 -2
View File
@@ -6474,7 +6474,7 @@ sub_81538D0: @ 81538D0
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
@@ -8351,7 +8351,7 @@ sub_8154720: @ 8154720
movs r0, 0
movs r1, 0xA
movs r2, 0xB0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
pop {r0}
bx r0
thumb_func_end sub_8154720
asm/field_specials.s
+3 -3
View File
@@ -2071,7 +2071,7 @@ sub_80CB580: @ 80CB580
ldr r5, _080CB62C @ =0x0000021d
adds r1, r5, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r4]
movs r1, 0
adds r2, r5, 0
@@ -2141,7 +2141,7 @@ sub_80CB63C: @ 80CB63C
ldr r4, _080CB654 @ =gUnknown_2039A0C
ldrb r0, [r4]
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
@@ -2862,7 +2862,7 @@ sub_80CBBAC: @ 80CBBAC
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
asm/hall_of_fame.s
+1 -1
View File
@@ -1194,7 +1194,7 @@ sub_80F26D4: @ 80F26D4
ldr r1, _080F2758 @ =0x0000021d
movs r0, 0x1
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x78
strh r0, [r4, 0xE]
ldr r0, _080F275C @ =Task_Hof_WaitAndPrintPlayerInfo
asm/item.s
+6 -6
View File
@@ -957,8 +957,8 @@ _0809A458:
bx r1
thumb_func_end AddPCItem
thumb_func_start sub_809A460
sub_809A460: @ 809A460
thumb_func_start RemoveItemFromPC
RemoveItemFromPC: @ 809A460
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1027,10 +1027,10 @@ _0809A4D8:
bx r0
.align 2, 0
_0809A4E4: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A460
thumb_func_end RemoveItemFromPC
thumb_func_start sub_809A4E8
sub_809A4E8: @ 809A4E8
thumb_func_start ItemPcCompaction
ItemPcCompaction: @ 809A4E8
push {r4-r7,lr}
movs r2, 0
_0809A4EC:
@@ -1079,7 +1079,7 @@ _0809A52E:
bx r0
.align 2, 0
_0809A53C: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A4E8
thumb_func_end ItemPcCompaction
thumb_func_start sub_809A540
sub_809A540: @ 809A540
asm/item_menu.s
+23 -23
View File
@@ -200,7 +200,7 @@ _08107F12:
lsrs r0, 24
cmp r0, 0x1
beq _08107F36
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -275,10 +275,10 @@ _08107FD8:
bl ResetSpriteData
b _08108104
_08107FDE:
bl sub_80984D8
bl ResetItemMenuIconState
b _08108104
_08107FE4:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
beq _08107FF0
@@ -687,7 +687,7 @@ _08108340:
.align 2, 0
_08108348: .4byte gUnknown_83D41F4
_0810834C:
ldr r0, _08108360 @ =gUnknown_83D4240
ldr r0, _08108360 @ =gBagSwapSpriteSheet
_0810834E:
bl LoadCompressedObjectPic
_08108352:
@@ -698,10 +698,10 @@ _08108352:
strb r0, [r1, 0x10]
b _0810837C
.align 2, 0
_08108360: .4byte gUnknown_83D4240
_08108360: .4byte gBagSwapSpriteSheet
_08108364: .4byte gUnknown_203AD10
_08108368:
ldr r0, _08108378 @ =gUnknown_83D4248
ldr r0, _08108378 @ =gBagSwapSpritePalette
bl LoadCompressedObjectPalette
ldr r1, [r4]
movs r0, 0
@@ -709,7 +709,7 @@ _08108368:
movs r0, 0x1
b _0810837E
.align 2, 0
_08108378: .4byte gUnknown_83D4248
_08108378: .4byte gBagSwapSpritePalette
_0810837C:
movs r0, 0
_0810837E:
@@ -1014,7 +1014,7 @@ _081085BA:
lsrs r1, 30
movs r0, 0x1
eors r0, r1
bl sub_8098940
bl DestroyItemMenuIcon
ldr r2, [r4]
ldr r0, _08108608 @ =gUnknown_203ACFC
ldrh r1, [r0, 0x6]
@@ -1036,7 +1036,7 @@ _081085BA:
ldrb r1, [r1, 0x5]
lsls r1, 26
lsrs r1, 30
bl sub_80988E8
bl CreateItemMenuIcon
b _08108618
.align 2, 0
_08108604: .4byte gUnknown_203AD10
@@ -1046,7 +1046,7 @@ _0810860C:
ldrb r1, [r2, 0x5]
lsls r1, 26
lsrs r1, 30
bl sub_80988E8
bl CreateItemMenuIcon
_08108618:
ldr r4, _08108650 @ =gUnknown_203AD10
ldr r3, [r4]
@@ -1999,8 +1999,8 @@ _08108D5A:
bx r0
thumb_func_end sub_8108CFC
thumb_func_start sub_8108D60
sub_8108D60: @ 8108D60
thumb_func_start ItemMenu_MoveItemSlotToNewPositionInArray
ItemMenu_MoveItemSlotToNewPositionInArray: @ 8108D60
push {r4-r6,lr}
adds r4, r0, 0
adds r3, r2, 0
@@ -2057,7 +2057,7 @@ _08108DC0:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8108D60
thumb_func_end ItemMenu_MoveItemSlotToNewPositionInArray
thumb_func_start sub_8108DC8
sub_8108DC8: @ 8108DC8
@@ -2514,7 +2514,7 @@ sub_8109140: @ 8109140
movs r1, 0
movs r2, 0xE
movs r3, 0x1E
bl sub_80F6B08
bl SetBgRectPal
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
@@ -2627,7 +2627,7 @@ sub_81091D0: @ 81091D0
lsrs r1, 30
movs r0, 0x1
eors r0, r1
bl sub_8098940
bl DestroyItemMenuIcon
bl sub_8108978
_08109242:
movs r0, 0x12
@@ -2677,7 +2677,7 @@ sub_8109298: @ 8109298
lsls r0, 3
ldr r1, _081092DC @ =gTasks+0x8
adds r5, r0, r1
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
bne _08109314
@@ -2858,7 +2858,7 @@ sub_81093B8: @ 81093B8
adds r0, r4, 0
bl StringCopy
ldr r4, _081094A4 @ =gStringVar4
ldr r1, _081094A8 @ =gUnknown_841633F
ldr r1, _081094A8 @ =gOtherText_WhereShouldTheStrVar1BePlaced
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@@ -2910,7 +2910,7 @@ _08109498: .4byte gUnknown_203AD10
_0810949C: .4byte gStringVar1
_081094A0: .4byte gUnknown_203ACFC
_081094A4: .4byte gStringVar4
_081094A8: .4byte gUnknown_841633F
_081094A8: .4byte gOtherText_WhereShouldTheStrVar1BePlaced
_081094AC: .4byte sub_81094B0
thumb_func_end sub_81093B8
@@ -3071,7 +3071,7 @@ _081095E8:
ldr r0, [r0]
adds r1, r2, 0
adds r2, r5, 0
bl sub_8108D60
bl ItemMenu_MoveItemSlotToNewPositionInArray
ldrb r0, [r6]
ldrh r2, [r4, 0x6]
lsls r2, 1
@@ -3464,7 +3464,7 @@ _08109930: .4byte gUnknown_203AD24
_08109934: .4byte gUnknown_8452F30
_08109938: .4byte gUnknown_203AD28
_0810993C:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3727,7 +3727,7 @@ _08109AD4:
ldr r1, _08109BAC @ =gStringVar1
bl CopyItemName
ldr r6, _08109BB0 @ =gStringVar4
ldr r1, _08109BB4 @ =gUnknown_84162FF
ldr r1, _08109BB4 @ =gOtherText_StrVar1
adds r0, r6, 0
bl StringExpandPlaceholders
movs r0, 0x2
@@ -3754,7 +3754,7 @@ _08109BA4: .4byte gUnknown_8452EB8
_08109BA8: .4byte gSpecialVar_ItemId
_08109BAC: .4byte gStringVar1
_08109BB0: .4byte gStringVar4
_08109BB4: .4byte gUnknown_84162FF
_08109BB4: .4byte gOtherText_StrVar1
thumb_func_end sub_8109890
thumb_func_start sub_8109BB8
@@ -5753,7 +5753,7 @@ sub_810AC40: @ 810AC40
ldr r3, _0810ACD4 @ =0x0000ffff
movs r0, 0x1C
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldrh r0, [r5]
ldr r1, _0810ACD8 @ =gStringVar1
bl CopyItemName
asm/item_menu_icons.s
+9 -9
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80984D8
sub_80984D8: @ 80984D8
thumb_func_start ResetItemMenuIconState
ResetItemMenuIconState: @ 80984D8
push {r4,lr}
movs r2, 0
ldr r4, _080984F8 @ =gUnknown_2039878
@@ -26,7 +26,7 @@ _080984E0:
bx r0
.align 2, 0
_080984F8: .4byte gUnknown_2039878
thumb_func_end sub_80984D8
thumb_func_end ResetItemMenuIconState
thumb_func_start sub_80984FC
sub_80984FC: @ 80984FC
@@ -534,8 +534,8 @@ _080988DA:
bx r1
thumb_func_end AddItemIconObjectWithCustomObjectTemplate
thumb_func_start sub_80988E8
sub_80988E8: @ 80988E8
thumb_func_start CreateItemMenuIcon
CreateItemMenuIcon: @ 80988E8
push {r4-r6,lr}
lsls r0, 16
lsrs r6, r0, 16
@@ -577,10 +577,10 @@ _08098932:
.align 2, 0
_08098938: .4byte gUnknown_2039882
_0809893C: .4byte gSprites
thumb_func_end sub_80988E8
thumb_func_end CreateItemMenuIcon
thumb_func_start sub_8098940
sub_8098940: @ 8098940
thumb_func_start DestroyItemMenuIcon
DestroyItemMenuIcon: @ 8098940
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -605,7 +605,7 @@ _08098964:
.align 2, 0
_0809896C: .4byte gUnknown_2039882
_08098970: .4byte gSprites
thumb_func_end sub_8098940
thumb_func_end DestroyItemMenuIcon
thumb_func_start sub_8098974
sub_8098974: @ 8098974
asm/item_use.s
+12 -12
View File
@@ -630,7 +630,7 @@ sub_80A1460: @ 80A1460
ldr r3, _080A14C4 @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _080A14C8 @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -689,7 +689,7 @@ sub_80A14E8: @ 80A14E8
ldr r3, _080A1548 @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _080A154C @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -765,7 +765,7 @@ _080A1598:
ldr r3, _080A15D8 @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _080A15DC @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -1201,7 +1201,7 @@ sub_80A18EC: @ 80A18EC
ldr r3, _080A1924 @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _080A1928 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -1328,7 +1328,7 @@ sub_80A19E8: @ 80A19E8
ldr r3, _080A1A34 @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r5, _080A1A38 @ =0x00004020
ldrh r0, [r4]
bl ItemId_GetHoldEffectParam
@@ -1399,7 +1399,7 @@ sub_80A1A94: @ 80A1A94
ldr r3, _080A1AD8 @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldrh r0, [r5]
cmp r0, 0x2B
bne _080A1AF4
@@ -1533,7 +1533,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80A1BAC
ldrb r3, [r0, 0x14]
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _080A1BE4 @ =gUnknown_2039998
ldr r0, _080A1BE8 @ =sub_80A1C08
str r0, [r1]
@@ -1692,7 +1692,7 @@ sub_80A1CF8: @ 80A1CF8
ldr r3, _080A1D30 @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _080A1D34 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -2102,7 +2102,7 @@ sub_80A2010: @ 80A2010
ldr r3, _080A204C @ =0x0000ffff
movs r0, 0x4
movs r1, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r2, _080A2050 @ =gStringVar4
ldr r3, _080A2054 @ =sub_8108B50
adds r0, r4, 0
@@ -2363,8 +2363,8 @@ _080A228A:
_080A2290: .4byte gTasks
thumb_func_end sub_80A2238
thumb_func_start sub_80A2294
sub_80A2294: @ 80A2294
thumb_func_start ItemUse_SetQuestLogEvent
ItemUse_SetQuestLogEvent: @ 80A2294
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2405,6 +2405,6 @@ _080A22CA:
bx r0
.align 2, 0
_080A22E4: .4byte 0x0000ffff
thumb_func_end sub_80A2294
thumb_func_end ItemUse_SetQuestLogEvent
.align 2, 0 @ Don't pad with nop.
asm/learn_move.s
+1 -1
View File
@@ -119,7 +119,7 @@ _080E46C6:
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0xD0
movs r1, 0x1
bl sub_8107D38
asm/link_rfu.s
+1 -1
View File
@@ -7851,7 +7851,7 @@ sub_8100E34: @ 8100E34
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
asm/link_rfu_3.s
+1 -1
View File
@@ -12966,7 +12966,7 @@ _0811C300:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
bl sub_80F77B8
ldr r0, _0811C35C @ =sub_811C1B4
bl SetVBlankCallback
asm/list_menu.s
+1 -1
View File
@@ -52,7 +52,7 @@ _08106F06:
lsls r2, r1, 24
lsrs r2, 24
adds r1, r7, 0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
_08106F24:
ldrb r0, [r5, 0x5]
mov r3, r8
asm/mail.s
+1 -1
View File
@@ -623,7 +623,7 @@ _080BF112:
.align 2, 0
_080BF128: .4byte sub_80BF368
_080BF12C:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/mailbox_pc.s
+1 -1
View File
@@ -81,7 +81,7 @@ sub_810EBE0: @ 810EBE0
adds r4, r0
ldrb r0, [r4]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
asm/main_menu.s
+1 -1
View File
@@ -1656,7 +1656,7 @@ sub_800D094: @ 800D094
ldr r1, _0800D0AC @ =0x000001b1
movs r0, 0
movs r2, 0x20
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0800D0B0 @ =gUnknown_8234638
bl sub_800D1E8
pop {r0}
asm/menu.s
+7 -7
View File
@@ -556,8 +556,8 @@ _0810F258: .4byte 0x00000803
_0810F25C: .4byte 0x00000804
thumb_func_end sub_810EE5C
thumb_func_start sub_810F260
sub_810F260: @ 810F260
thumb_func_start ClearMenuWindow_BorderThickness2
ClearMenuWindow_BorderThickness2: @ 810F260
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 24
@@ -583,7 +583,7 @@ _0810F28E:
bx r0
.align 2, 0
_0810F294: .4byte sub_810F298
thumb_func_end sub_810F260
thumb_func_end ClearMenuWindow_BorderThickness2
thumb_func_start sub_810F298
sub_810F298: @ 810F298
@@ -866,8 +866,8 @@ _0810F4D0: .4byte gUnknown_203ADF0
_0810F4D4: .4byte gUnknown_203ADF2
thumb_func_end DrawWindowBorder
thumb_func_start sub_810F4D8
sub_810F4D8: @ 810F4D8
thumb_func_start ClearMenuWindow
ClearMenuWindow: @ 810F4D8
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 24
@@ -893,7 +893,7 @@ _0810F506:
bx r0
.align 2, 0
_0810F50C: .4byte sub_810F510
thumb_func_end sub_810F4D8
thumb_func_end ClearMenuWindow
thumb_func_start sub_810F510
sub_810F510: @ 810F510
@@ -2469,7 +2469,7 @@ sub_81100E8: @ 81100E8
ldr r4, _08110100 @ =gUnknown_203ADF3
ldrb r0, [r4]
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
asm/menu_helpers.s
+4 -4
View File
@@ -357,8 +357,8 @@ _080BF702:
bx r1
thumb_func_end itemid_80BF6D8_mail_related
thumb_func_start sub_80BF708
sub_80BF708: @ 80BF708
thumb_func_start MenuHelpers_LinkSomething
MenuHelpers_LinkSomething: @ 80BF708
push {lr}
bl is_c1_link_related_active
cmp r0, 0x1
@@ -377,12 +377,12 @@ _080BF724:
_080BF726:
pop {r1}
bx r1
thumb_func_end sub_80BF708
thumb_func_end MenuHelpers_LinkSomething
thumb_func_start sub_80BF72C
sub_80BF72C: @ 80BF72C
push {lr}
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
beq _080BF742
asm/new_menu_helpers.s
+7 -7
View File
@@ -486,8 +486,8 @@ _080F6AFC:
bx r1
thumb_func_end sub_80F6AD0
thumb_func_start sub_80F6B08
sub_80F6B08: @ 80F6B08
thumb_func_start SetBgRectPal
SetBgRectPal: @ 80F6B08
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -561,7 +561,7 @@ _080F6B80:
bx r0
.align 2, 0
_080F6B90: .4byte 0x00000fff
thumb_func_end sub_80F6B08
thumb_func_end SetBgRectPal
thumb_func_start sub_80F6B94
sub_80F6B94: @ 80F6B94
@@ -984,13 +984,13 @@ _080F6EC4:
lsls r1, 2
movs r0, 0
movs r2, 0xF0
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
_080F6ED4:
movs r1, 0x85
lsls r1, 2
movs r0, 0
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
pop {r0}
bx r0
thumb_func_end sub_80F6E9C
@@ -2033,7 +2033,7 @@ _080F7798:
lsls r1, 2
adds r0, r4, 0
movs r2, 0xF0
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
_080F77A4:
movs r2, 0x80
lsls r2, 2
@@ -2347,7 +2347,7 @@ sub_80F79A4: @ 80F79A4
lsls r1, 2
movs r0, 0
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
pop {r0}
bx r0
thumb_func_end sub_80F79A4
asm/party_menu.s
+63 -63
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_811EA44
sub_811EA44: @ 811EA44
thumb_func_start PartyMenuInit
PartyMenuInit: @ 811EA44
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -181,7 +181,7 @@ _0811EB90: .4byte gUnknown_203B09C
_0811EB94: .4byte gPlayerParty
_0811EB98: .4byte gTextFlags
_0811EB9C: .4byte sub_811EBD0
thumb_func_end sub_811EA44
thumb_func_end PartyMenuInit
thumb_func_start sub_811EBA0
sub_811EBA0: @ 811EBA0
@@ -219,7 +219,7 @@ _0811EBD2:
lsrs r0, 24
cmp r0, 0x1
beq _0811EBF6
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -299,7 +299,7 @@ _0811ECAE:
bl FreeAllSpritePalettes
b _0811EDFC
_0811ECB4:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
beq _0811ECC0
@@ -1799,7 +1799,7 @@ _0811F884:
movs r1, 0x17
movs r2, 0x10
movs r3, 0x7
bl sub_80F6B08
bl SetBgRectPal
b _0811F8B0
_0811F89E:
movs r0, 0x2
@@ -1809,7 +1809,7 @@ _0811F89E:
movs r1, 0x17
movs r2, 0x10
movs r3, 0x7
bl sub_80F6B08
bl SetBgRectPal
_0811F8B0:
ldr r0, _0811F8BC @ =gUnknown_203B09C
ldr r0, [r0]
@@ -1857,7 +1857,7 @@ _0811F8F2:
movs r2, 0x12
_0811F904:
movs r3, 0x7
bl sub_80F6B08
bl SetBgRectPal
b _0811F91E
_0811F90C:
movs r0, 0x2
@@ -1867,7 +1867,7 @@ _0811F90C:
movs r1, 0x17
movs r2, 0x12
movs r3, 0x7
bl sub_80F6B08
bl SetBgRectPal
_0811F91E:
ldr r0, _0811F940 @ =gUnknown_203B09C
ldr r0, [r0]
@@ -2494,7 +2494,7 @@ _0811FDD6:
.align 2, 0
_0811FDF0: .4byte gUnknown_203B0A0
_0811FDF4:
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
bne _0811FE04
@@ -3234,7 +3234,7 @@ sub_8120328: @ 8120328
bne _0812035E
movs r0, 0x6
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0x6
bl ClearWindowTilemap
_0812035E:
@@ -3302,10 +3302,10 @@ sub_81203B8: @ 81203B8
beq _08120410
movs r0, 0x6
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0x6
bl ClearWindowTilemap
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3366,7 +3366,7 @@ _0812043C:
_08120448:
adds r1, r5, 0
adds r2, r4, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
b _08120468
.align 2, 0
_08120454: .4byte gUnknown_203B0A0
@@ -3376,7 +3376,7 @@ _0812045C:
movs r0, 0x6
adds r1, r5, 0
adds r2, r4, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
_08120468:
ldr r1, _0812049C @ =gStringVar1
adds r0, r5, 0
@@ -3418,7 +3418,7 @@ sub_81204AC: @ 81204AC
movs r0, 0x8
adds r1, r6, 0
adds r2, r4, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _081204FC @ =gStringVar1
adds r0, r6, 0
bl GetMonNickname
@@ -4709,11 +4709,11 @@ sub_8120E58: @ 8120E58
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0
movs r1, 0x58
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldr r0, _08120E94 @ =gUnknown_203B0A0
ldrb r0, [r0, 0xB]
cmp r0, 0x3
@@ -5016,11 +5016,11 @@ _081210AC:
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0
movs r1, 0x58
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x2
bl stdpal_get
movs r1, 0xC0
@@ -6507,7 +6507,7 @@ sub_8121CE4: @ 8121CE4
cmp r0, 0xFF
beq _08121D04
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl RemoveWindow
movs r0, 0xFF
@@ -7026,7 +7026,7 @@ sub_81220D4: @ 81220D4
adds r0, r4, 0
movs r1, 0x4F
movs r2, 0xE0
bl sub_814FEAC
bl TextWindow_SetBubbleFrame_841F1C8
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x4F
@@ -7054,7 +7054,7 @@ sub_8122110: @ 8122110
bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0
bl sub_810F260
bl ClearMenuWindow_BorderThickness2
adds r0, r4, 0
bl RemoveWindow
movs r0, 0x2
@@ -8717,7 +8717,7 @@ sub_8122DBC: @ 8122DBC
str r1, [sp, 0x8]
movs r1, 0xFF
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -9928,7 +9928,7 @@ _081237AE:
str r1, [sp, 0x8]
movs r1, 0xFF
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
b _08123814
.align 2, 0
_081237BC: .4byte gUnknown_203B0D8
@@ -9967,7 +9967,7 @@ _081237F8:
str r1, [sp, 0x8]
movs r1, 0xFF
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
_08123814:
add sp, 0xC
pop {r3}
@@ -10345,7 +10345,7 @@ sub_8123ACC: @ 8123ACC
str r1, [sp, 0x8]
movs r1, 0xFF
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
b _08123B68
.align 2, 0
_08123B38: .4byte gUnknown_203B0A0
@@ -10366,7 +10366,7 @@ _08123B4C:
str r1, [sp, 0x8]
movs r1, 0xFF
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
_08123B68:
add sp, 0xC
pop {r3}
@@ -10675,7 +10675,7 @@ sub_8123DCC: @ 8123DCC
str r1, [sp, 0x8]
movs r1, 0xFF
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -11627,7 +11627,7 @@ _081245D6:
ldr r0, [r5]
adds r0, 0xD
bl sub_8121CE4
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12237,7 +12237,7 @@ sub_8124AB0: @ 8124AB0
movs r1, 0
movs r2, 0
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -12577,7 +12577,7 @@ _08124D6A:
adds r1, r7, 0
movs r2, 0x3
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r3}
mov r8, r3
@@ -12759,7 +12759,7 @@ _08124EC8:
str r1, [sp, 0x8]
movs r1, 0xFF
movs r2, 0
bl sub_811EA44
bl PartyMenuInit
_08124EE6:
add sp, 0xC
pop {r3}
@@ -12820,7 +12820,7 @@ sub_8124EFC: @ 8124EFC
movs r0, 0x4
adds r1, r5, 0
adds r3, r6, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldrh r1, [r7]
movs r0, 0xA9
lsls r0, 1
@@ -12852,7 +12852,7 @@ _08124F94:
ldr r1, [r4]
str r1, [sp, 0x8]
movs r1, 0xFF
bl sub_811EA44
bl PartyMenuInit
_08124FB2:
add sp, 0xC
pop {r3}
@@ -13312,7 +13312,7 @@ _08125380:
movs r0, 0x4
adds r1, r5, 0
adds r2, r6, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
adds r0, r7, 0
bl sub_8124DC0
ldr r1, _081253A8 @ =gUnknown_3005E98
@@ -13958,7 +13958,7 @@ sub_8125898: @ 8125898
ldr r3, _08125940 @ =0x0000ffff
movs r0, 0x4
adds r1, r4, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
movs r0, 0x1
bl PlaySE
ldrh r0, [r6]
@@ -14060,7 +14060,7 @@ _081259A0:
movs r0, 0x4
adds r1, r4, 0
adds r2, r5, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
movs r0, 0x1
bl PlaySE
adds r0, r5, 0
@@ -14315,7 +14315,7 @@ sub_8125B40: @ 8125B40
movs r0, 0x4
adds r1, r4, 0
adds r2, r5, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
adds r0, r6, 0
bl sub_8124DC0
ldr r1, _08125BEC @ =gUnknown_3005E98
@@ -14712,7 +14712,7 @@ _08125EE8:
movs r1, 0
movs r2, 0
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
_08125F02:
add sp, 0xC
pop {r4,r5}
@@ -14799,7 +14799,7 @@ sub_8125F5C: @ 8125F5C
movs r0, 0x4
adds r1, r6, 0
adds r3, r4, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldr r1, _08125FF0 @ =gStringVar1
adds r0, r6, 0
bl GetMonNickname
@@ -15268,7 +15268,7 @@ sub_8126350: @ 8126350
ldr r3, _08126424 @ =0x0000ffff
movs r0, 0x4
adds r1, r4, 0
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
movs r0, 0
bl PlayFanfareByFanfareNum
ldrb r0, [r6, 0x9]
@@ -16112,7 +16112,7 @@ _08126A94:
ldrh r2, [r0]
ldr r3, _08126AE0 @ =0x0000ffff
movs r0, 0x4
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
_08126AB4:
ldr r0, _08126ADC @ =gSpecialVar_ItemId
ldrh r0, [r0]
@@ -16266,7 +16266,7 @@ sub_8126BD4: @ 8126BD4
ldrh r2, [r5]
ldr r3, _08126C20 @ =0x0000ffff
movs r0, 0x4
bl sub_80A2294
bl ItemUse_SetQuestLogEvent
ldrh r0, [r5]
movs r1, 0x1
bl RemoveBagItem
@@ -16640,7 +16640,7 @@ CB2_PartyMenuFromStartMenu: @ 8126EB0
movs r1, 0
movs r2, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -16684,7 +16684,7 @@ _08126F0A:
movs r1, 0
movs r2, 0x5
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
ldr r1, _08126F38 @ =gUnknown_203B0A0
ldr r0, _08126F3C @ =gSpecialVar_ItemId
ldrh r0, [r0]
@@ -16995,7 +16995,7 @@ _0812719C:
str r1, [sp, 0x8]
movs r1, 0xFF
movs r3, 0x1
bl sub_811EA44
bl PartyMenuInit
_081271B8:
add sp, 0xC
pop {r4-r7}
@@ -17233,7 +17233,7 @@ sub_8127384: @ 8127384
bne _081273A0
adds r0, r1, 0
movs r1, 0x1
bl sub_809A460
bl RemoveItemFromPC
b _081273A8
.align 2, 0
_0812739C: .4byte gUnknown_203B0A0
@@ -17286,7 +17286,7 @@ sub_81273D8: @ 81273D8
movs r1, 0
movs r2, 0x7
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -17387,7 +17387,7 @@ sub_81274A8: @ 81274A8
movs r1, 0
movs r2, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
ldr r1, _081274F4 @ =gUnknown_203B0A0
lsls r4, 6
ldrb r2, [r1, 0x8]
@@ -17824,7 +17824,7 @@ sub_81277F4: @ 81277F4
movs r1, 0
movs r2, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -17850,7 +17850,7 @@ sub_812781C: @ 812781C
movs r1, 0
movs r2, 0xC
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
b _08127870
.align 2, 0
_08127844: .4byte gSpecialVar_0x8005
@@ -17867,7 +17867,7 @@ _08127850:
movs r1, 0
movs r2, 0xC
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
ldr r1, _08127880 @ =gUnknown_203B0A0
ldr r0, _08127884 @ =gSpecialVar_0x8007
ldrh r0, [r0]
@@ -17897,7 +17897,7 @@ sub_8127888: @ 8127888
movs r1, 0
movs r2, 0xD
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -17960,7 +17960,7 @@ sub_81278DC: @ 81278DC
movs r0, 0x1
adds r2, r4, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
movs r0, 0x8
bl sub_80EB2F4
b _08127950
@@ -17982,7 +17982,7 @@ _08127930:
movs r0, 0x1
adds r2, r4, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
_08127950:
bl nullsub_44
bl pokemon_change_order
@@ -18012,7 +18012,7 @@ sub_8127968: @ 8127968
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
bl nullsub_44
bl pokemon_change_order
add sp, 0xC
@@ -18040,7 +18040,7 @@ sub_81279A4: @ 81279A4
movs r0, 0x1
movs r2, 0xE
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
bl nullsub_44
bl pokemon_change_order
add sp, 0xC
@@ -18079,7 +18079,7 @@ sub_81279E0: @ 81279E0
movs r0, 0x1
movs r2, 0x3
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
movs r0, 0x8
bl sub_80EB2F4
b _08127A62
@@ -18110,7 +18110,7 @@ _08127A44:
movs r0, 0x1
movs r2, 0x3
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
_08127A62:
bl nullsub_44
bl pokemon_change_order
@@ -19069,7 +19069,7 @@ sub_8128198: @ 8128198
movs r1, 0x3
movs r2, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -19314,7 +19314,7 @@ sub_8128370: @ 8128370
movs r1, 0
movs r2, 0
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
@@ -19343,7 +19343,7 @@ sub_81283A8: @ 81283A8
movs r1, 0
movs r2, 0xB
movs r3, 0
bl sub_811EA44
bl PartyMenuInit
add sp, 0xC
pop {r0}
bx r0
asm/player_pc.s
+6 -6
View File
@@ -237,7 +237,7 @@ sub_80EB81C: @ 80EB81C
bl PlaySE
ldrb r0, [r4, 0x14]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4, 0x14]
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
@@ -256,7 +256,7 @@ _080EB874: .4byte sub_80EB9B8
_080EB878:
ldrb r0, [r4, 0x14]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4, 0x14]
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
@@ -752,7 +752,7 @@ _080EBC78: .4byte sub_80EBCAC
_080EBC7C:
ldrb r0, [r4, 0x14]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4, 0x14]
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
@@ -811,7 +811,7 @@ sub_80EBCD8: @ 80EBCD8
bl CleanupOverworldWindowsAndTilemaps
ldrb r0, [r5, 0xC]
ldr r1, _080EBD14 @ =CB2_ReturnToField
bl sub_810D3F4
bl ItemPc_Init
adds r0, r4, 0
bl DestroyTask
_080EBD06:
@@ -837,7 +837,7 @@ sub_80EBD18: @ 80EBD18
ldr r0, _080EBD44 @ =sub_80EBCD8
str r0, [r1]
movs r0, 0
bl sub_810DE94
bl ItemPc_SetInitializedFlag
movs r0, 0x1
movs r1, 0
bl fade_screen
@@ -861,7 +861,7 @@ sub_80EBD48: @ 80EBD48
adds r4, r0
ldrb r0, [r4, 0x14]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4, 0x14]
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
asm/pokemon_jump_2.s
+1 -1
View File
@@ -7930,7 +7930,7 @@ sub_814B5C4: @ 814B5C4
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD
asm/pokemon_special_anim.s
+2 -2
View File
@@ -1617,7 +1617,7 @@ sub_811D184: @ 811D184
movs r0, 0
movs r1, 0
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
@@ -1703,7 +1703,7 @@ sub_811D2D0: @ 811D2D0
bl ClearWindowTilemap
movs r0, 0
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0
movs r1, 0x1
bl CopyWindowToVram
asm/pokemon_storage_system.s
+4 -4
View File
@@ -3035,7 +3035,7 @@ _0808D0D6:
movs r0, 0x1
movs r1, 0xB
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
b _0808D20C
.align 2, 0
_0808D100: .4byte 0x05000080
@@ -8165,7 +8165,7 @@ sub_808FB68: @ 808FB68
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
@@ -8363,7 +8363,7 @@ sub_808FD20: @ 808FD20
push {lr}
movs r0, 0x1
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r0}
@@ -19077,7 +19077,7 @@ sub_8095024: @ 8095024
adds r0, r4
ldrb r0, [r0]
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
asm/script_menu.s
+1 -1
View File
@@ -1721,7 +1721,7 @@ sub_809D6B0: @ 809D6B0
bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x1
bl sub_810F4D8
bl ClearMenuWindow
adds r0, r4, 0
bl RemoveWindow
pop {r4}
asm/shop.s
+12 -12
View File
@@ -332,7 +332,7 @@ sub_809AD24: @ 809AD24
ldr r4, _0809AD3C @ =gUnknown_2039950
ldrb r0, [r4]
movs r1, 0x2
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
bl RemoveWindow
pop {r4}
@@ -529,7 +529,7 @@ _0809AEAC:
bl ResetSpriteData
bl ResetTasks
bl clear_scheduled_bg_copies_to_vram
bl sub_80984D8
bl ResetItemMenuIconState
bl sub_809AF6C
lsls r0, 24
cmp r0, 0
@@ -793,7 +793,7 @@ _0809B118:
movs r1, 0
movs r2, 0xE
movs r3, 0x1E
bl sub_80F6B08
bl SetBgRectPal
b _0809B14E
.align 2, 0
_0809B138: .4byte gUnknown_2039934
@@ -805,7 +805,7 @@ _0809B13C:
movs r1, 0
movs r2, 0xC
movs r3, 0x1E
bl sub_80F6B08
bl SetBgRectPal
_0809B14E:
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
@@ -1069,7 +1069,7 @@ _0809B34A:
lsrs r1, 30
movs r0, 0x1
eors r0, r1
bl sub_8098940
bl DestroyItemMenuIcon
movs r0, 0x2
negs r0, r0
cmp r5, r0
@@ -1079,7 +1079,7 @@ _0809B34A:
ldrb r1, [r6, 0x17]
lsls r1, 29
lsrs r1, 30
bl sub_80988E8
bl CreateItemMenuIcon
b _0809B398
.align 2, 0
_0809B384: .4byte gUnknown_8416757
@@ -1089,7 +1089,7 @@ _0809B38C:
ldrb r1, [r6, 0x17]
lsls r1, 29
lsrs r1, 30
bl sub_80988E8
bl CreateItemMenuIcon
_0809B398:
ldr r3, _0809B3D4 @ =gUnknown_2039934
ldrb r2, [r3, 0x17]
@@ -2396,10 +2396,10 @@ _0809BDD4:
bl sub_809B73C
movs r0, 0x3
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0x1
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0x3
bl ClearWindowTilemap
movs r0, 0x1
@@ -2442,10 +2442,10 @@ _0809BE54:
bl sub_809B73C
movs r0, 0x3
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0x1
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0x3
bl ClearWindowTilemap
movs r0, 0x1
@@ -2601,7 +2601,7 @@ sub_809BF98: @ 809BF98
adds r4, r5, r6
movs r0, 0x2
movs r1, 0
bl sub_810F260
bl ClearMenuWindow_BorderThickness2
ldrb r0, [r4, 0xE]
movs r1, 0x1
bl sub_809B57C
asm/start_menu.s
+8 -8
View File
@@ -220,7 +220,7 @@ sub_806EF18: @ 806EF18
ldr r4, _0806EF40 @ =gUnknown_2037101
ldrb r0, [r4]
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldrb r0, [r4]
movs r1, 0x2
bl CopyWindowToVram
@@ -440,7 +440,7 @@ _0806F0C4:
movs r3, 0
bl ProgramAndPlaceMenuCursorOnWindow
strb r0, [r4]
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
bne _0806F118
@@ -666,7 +666,7 @@ sub_806F280: @ 806F280
bl MoveMenuCursor
ldr r4, _0806F360 @ =gUnknown_20370F4
strb r0, [r4]
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
bne _0806F2D2
@@ -701,7 +701,7 @@ _0806F2D2:
bl MoveMenuCursor
ldr r4, _0806F360 @ =gUnknown_20370F4
strb r0, [r4]
bl sub_80BF708
bl MenuHelpers_LinkSomething
lsls r0, 24
cmp r0, 0
bne _0806F320
@@ -1080,7 +1080,7 @@ sub_806F5C8: @ 806F5C8
_0806F5E4:
movs r0, 0
movs r1, 0
bl sub_810F260
bl ClearMenuWindow_BorderThickness2
bl sub_806F14C
bl sub_812B248
ldr r1, _0806F5FC @ =gUnknown_20370F0
@@ -1093,7 +1093,7 @@ _0806F600: .4byte sub_806F280
_0806F604:
movs r0, 0
movs r1, 0x1
bl sub_810F260
bl ClearMenuWindow_BorderThickness2
bl sub_80696C0
bl ScriptContext2_Disable
bl sub_812B248
@@ -1781,7 +1781,7 @@ _0806FB12:
movs r0, 0
movs r1, 0x8
movs r2, 0xF0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
b _0806FB64
.align 2, 0
_0806FB34: .4byte gUnknown_83A73B8
@@ -2014,7 +2014,7 @@ sub_806FCF4: @ 806FCF4
ldr r4, _0806FE5C @ =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldrb r0, [r5]
movs r1, 0
adds r2, r4, 0
asm/trade.s
+2 -2
View File
@@ -78,11 +78,11 @@ _0804C674:
movs r0, 0
movs r1, 0x14
movs r2, 0xC0
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
movs r0, 0x2
movs r1, 0x1
movs r2, 0xE0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
bl sub_809707C
ldr r2, _0804C708 @ =gUnknown_2031DA8
ldr r0, [r2]
asm/union_room_chat.s
+5 -5
View File
@@ -4329,7 +4329,7 @@ sub_812A51C: @ 812A51C
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldr r0, [r4]
ldrb r0, [r0, 0x18]
bl ClearWindowTilemap
@@ -4568,7 +4568,7 @@ sub_812A6F4: @ 812A6F4
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
ldr r0, [r4]
ldrb r0, [r0, 0x1E]
bl ClearWindowTilemap
@@ -5015,7 +5015,7 @@ sub_812AA64: @ 812AA64
push {lr}
movs r0, 0x3
movs r1, 0
bl sub_810F4D8
bl ClearMenuWindow
movs r0, 0x3
bl ClearWindowTilemap
pop {r0}
@@ -5350,11 +5350,11 @@ sub_812AD20: @ 812AD20
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD0
bl sub_815001C
bl TextWindow_SetUserSelectedFrame
movs r0, 0x3
movs r1, 0xA
movs r2, 0x20
bl sub_814FF2C
bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0812AD4C @ =gTMCaseMainWindowPalette
movs r1, 0xE0
movs r2, 0x20