diff options
44 files changed, 818 insertions, 818 deletions
diff --git a/asm/battle_ai.s b/asm/battle_ai.s index a15f0f006..029458352 100644 --- a/asm/battle_ai.s +++ b/asm/battle_ai.s @@ -4844,7 +4844,7 @@ _08109488: muls r0, r4 adds r0, r1 ldrh r0, [r0, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect ldr r1, _081094B0 @ =0x02016800 lsls r0, 24 lsrs r0, 24 diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 6b9b758c1..42292e775 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -26,7 +26,7 @@ task01_battle_start: @ 8081960 .align 2, 0 _08081980: .4byte gTasks + 0x8 _08081984: - bl c3_80A0DD8_is_running + bl FieldPoisonEffectIsRunning cmp r0, 0 bne _080819BA ldrb r0, [r4, 0x2] @@ -1056,7 +1056,7 @@ sub_8082188: @ 8082188 movs r1, 0x5 movs r2, 0 movs r3, 0 - bl sub_80C5374 + bl ScriptGiveMon bl ResetTasks bl sub_80408BC ldr r0, _080821D4 @ =sub_80821D8 diff --git a/asm/berry.s b/asm/berry.s index 5e72d6e9f..21e4b52e1 100644 --- a/asm/berry.s +++ b/asm/berry.s @@ -958,7 +958,7 @@ FieldObjectInteractionPickBerryTree: @ 80B4F2C lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r0, 24 strh r0, [r6] diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 1f42e332f..70af7824d 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -7650,7 +7650,7 @@ _08051F86: ldr r0, _08051FF4 @ =word_203855E ldrh r0, [r0] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem adds r0, r5, 0 bl sub_810CA34 ldr r1, [r4] @@ -8383,7 +8383,7 @@ _0805259E: lsrs r0, 16 mov r1, sp adds r1, 0x1 - bl itemid_copy_name + bl CopyItemName b _080525F8 .align 2, 0 _080525C8: .4byte gOtherText_BPMAndDash @@ -8401,7 +8401,7 @@ _080525D8: lsls r0, 16 lsrs r0, 16 mov r1, sp - bl itemid_copy_name + bl CopyItemName movs r0, 0 strb r0, [r7, 0x6] movs r0, 0xFF diff --git a/asm/big_shroomish_barboach.s b/asm/big_shroomish_barboach.s index c5fe1bf07..94ad0dc98 100644 --- a/asm/big_shroomish_barboach.s +++ b/asm/big_shroomish_barboach.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_80C58C0 -sub_80C58C0: @ 80C58C0 + thumb_func_start GetBigMonSizeParams +GetBigMonSizeParams: @ 80C58C0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -83,10 +83,10 @@ sub_80C58C0: @ 80C58C0 pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80C58C0 + thumb_func_end GetBigMonSizeParams - thumb_func_start sub_80C5964 -sub_80C5964: @ 80C5964 + thumb_func_start TranslateBigMonSizeTableIndex +TranslateBigMonSizeTableIndex: @ 80C5964 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -114,10 +114,10 @@ _080C5984: _080C5990: pop {r1} bx r1 - thumb_func_end sub_80C5964 + thumb_func_end TranslateBigMonSizeTableIndex - thumb_func_start sub_80C5994 -sub_80C5994: @ 80C5994 + thumb_func_start GetBigMonSize +GetBigMonSize: @ 80C5994 push {r4-r7,lr} sub sp, 0x8 adds r6, r1, 0 @@ -133,7 +133,7 @@ sub_80C5994: @ 80C5994 lsls r0, 16 lsrs r7, r0, 16 adds r0, r6, 0 - bl sub_80C5964 + bl TranslateBigMonSizeTableIndex lsls r0, 24 ldr r1, _080C5A04 @ =gUnknown_083D180C lsrs r0, 21 @@ -169,10 +169,10 @@ sub_80C5994: @ 80C5994 bx r1 .align 2, 0 _080C5A04: .4byte gUnknown_083D180C - thumb_func_end sub_80C5994 + thumb_func_end GetBigMonSize - thumb_func_start sub_80C5A08 -sub_80C5A08: @ 80C5A08 + thumb_func_start FormatBigMonSize +FormatBigMonSize: @ 80C5A08 push {r4-r6,lr} sub sp, 0x4 adds r6, r0, 0 @@ -226,10 +226,10 @@ _080C5A7C: .4byte 0x41f00000 _080C5A80: .4byte 0x00000000 _080C5A84: .4byte 0x40396666 _080C5A88: .4byte 0x66666666 - thumb_func_end sub_80C5A08 + thumb_func_end FormatBigMonSize - thumb_func_start sub_80C5A8C -sub_80C5A8C: @ 80C5A8C + thumb_func_start CompareMonSize +CompareMonSize: @ 80C5A8C push {r4-r7,lr} sub sp, 0x4 adds r7, r1, 0 @@ -267,20 +267,20 @@ _080C5AD0: .4byte gPlayerParty _080C5AD4: mov r4, sp adds r0, r5, 0 - bl sub_80C58C0 + bl GetBigMonSizeParams strh r0, [r4] mov r0, sp ldrh r1, [r0] adds r0, r6, 0 - bl sub_80C5994 + bl GetBigMonSize adds r5, r0, 0 ldrh r1, [r7] adds r0, r6, 0 - bl sub_80C5994 + bl GetBigMonSize adds r4, r0, 0 ldr r0, _080C5B0C @ =gStringVar2 adds r1, r5, 0 - bl sub_80C5A08 + bl FormatBigMonSize cmp r5, r4 bls _080C5B10 mov r0, sp @@ -297,10 +297,10 @@ _080C5B12: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80C5A8C + thumb_func_end CompareMonSize - thumb_func_start sub_80C5B1C -sub_80C5B1C: @ 80C5B1C + thumb_func_start GetBigMonInfo +GetBigMonInfo: @ 80C5B1C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -308,10 +308,10 @@ sub_80C5B1C: @ 80C5B1C lsrs r4, 16 ldrh r1, [r5] adds r0, r4, 0 - bl sub_80C5994 + bl GetBigMonSize adds r1, r0, 0 ldr r0, _080C5B58 @ =gStringVar3 - bl sub_80C5A08 + bl FormatBigMonSize ldr r0, _080C5B5C @ =gStringVar1 movs r1, 0xB muls r1, r4 @@ -344,10 +344,10 @@ _080C5B74: .align 2, 0 _080C5B7C: .4byte gStringVar2 _080C5B80: .4byte gSaveBlock2 - thumb_func_end sub_80C5B1C + thumb_func_end GetBigMonInfo - thumb_func_start sub_80C5B84 -sub_80C5B84: @ 80C5B84 + thumb_func_start InitShroomishSizeRecord +InitShroomishSizeRecord: @ 80C5B84 push {lr} ldr r0, _080C5B94 @ =0x00004047 movs r1, 0x81 @@ -357,25 +357,25 @@ sub_80C5B84: @ 80C5B84 bx r0 .align 2, 0 _080C5B94: .4byte 0x00004047 - thumb_func_end sub_80C5B84 + thumb_func_end InitShroomishSizeRecord - thumb_func_start sub_80C5B98 -sub_80C5B98: @ 80C5B98 + thumb_func_start GetBigShroomishInfo +GetBigShroomishInfo: @ 80C5B98 push {lr} ldr r0, _080C5BB0 @ =0x00004047 bl GetVarPointer adds r1, r0, 0 movs r0, 0x99 lsls r0, 1 - bl sub_80C5B1C + bl GetBigMonInfo pop {r0} bx r0 .align 2, 0 _080C5BB0: .4byte 0x00004047 - thumb_func_end sub_80C5B98 + thumb_func_end GetBigShroomishInfo - thumb_func_start sub_80C5BB4 -sub_80C5BB4: @ 80C5BB4 + thumb_func_start CompareShroomishSize +CompareShroomishSize: @ 80C5BB4 push {r4,lr} ldr r0, _080C5BD4 @ =0x00004047 bl GetVarPointer @@ -383,7 +383,7 @@ sub_80C5BB4: @ 80C5BB4 ldr r4, _080C5BD8 @ =gScriptResult movs r0, 0x99 lsls r0, 1 - bl sub_80C5A8C + bl CompareMonSize lsls r0, 24 lsrs r0, 24 strh r0, [r4] @@ -393,10 +393,10 @@ sub_80C5BB4: @ 80C5BB4 .align 2, 0 _080C5BD4: .4byte 0x00004047 _080C5BD8: .4byte gScriptResult - thumb_func_end sub_80C5BB4 + thumb_func_end CompareShroomishSize - thumb_func_start sub_80C5BDC -sub_80C5BDC: @ 80C5BDC + thumb_func_start InitBarboachSizeRecord +InitBarboachSizeRecord: @ 80C5BDC push {lr} ldr r0, _080C5BEC @ =0x0000404f movs r1, 0x81 @@ -406,32 +406,32 @@ sub_80C5BDC: @ 80C5BDC bx r0 .align 2, 0 _080C5BEC: .4byte 0x0000404f - thumb_func_end sub_80C5BDC + thumb_func_end InitBarboachSizeRecord - thumb_func_start sub_80C5BF0 -sub_80C5BF0: @ 80C5BF0 + thumb_func_start GetBigBarboachInfo +GetBigBarboachInfo: @ 80C5BF0 push {lr} ldr r0, _080C5C04 @ =0x0000404f bl GetVarPointer adds r1, r0, 0 ldr r0, _080C5C08 @ =0x00000143 - bl sub_80C5B1C + bl GetBigMonInfo pop {r0} bx r0 .align 2, 0 _080C5C04: .4byte 0x0000404f _080C5C08: .4byte 0x00000143 - thumb_func_end sub_80C5BF0 + thumb_func_end GetBigBarboachInfo - thumb_func_start sub_80C5C0C -sub_80C5C0C: @ 80C5C0C + thumb_func_start CompareBarboachSize +CompareBarboachSize: @ 80C5C0C push {r4,lr} ldr r0, _080C5C2C @ =0x0000404f bl GetVarPointer adds r1, r0, 0 ldr r4, _080C5C30 @ =gScriptResult ldr r0, _080C5C34 @ =0x00000143 - bl sub_80C5A8C + bl CompareMonSize lsls r0, 24 lsrs r0, 24 strh r0, [r4] @@ -442,10 +442,10 @@ sub_80C5C0C: @ 80C5C0C _080C5C2C: .4byte 0x0000404f _080C5C30: .4byte gScriptResult _080C5C34: .4byte 0x00000143 - thumb_func_end sub_80C5C0C + thumb_func_end CompareBarboachSize - thumb_func_start sub_80C5C38 -sub_80C5C38: @ 80C5C38 + thumb_func_start GiveSpecialRibbonToParty +GiveSpecialRibbonToParty: @ 80C5C38 push {r4-r7,lr} mov r7, r8 push {r7} @@ -517,6 +517,6 @@ _080C5CC4: .4byte gSaveBlock1 _080C5CC8: .4byte 0x00003110 _080C5CCC: .4byte gPlayerParty _080C5CD0: .4byte 0x0000083b - thumb_func_end sub_80C5C38 + thumb_func_end GiveSpecialRibbonToParty .align 2, 0 @ Don't pad with nop. diff --git a/asm/cable_club.s b/asm/cable_club.s index 1c3f4a966..ebf64fe82 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1574,7 +1574,7 @@ _08083918: .align 2, 0 _08083920: .4byte gUnknown_020239F8 _08083924: - bl sub_80C5604 + bl ReducePlayerPartyToThree ldr r1, _08083948 @ =gUnknown_020239F8 movs r0, 0x4B _0808392C: diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index c633e4cdc..99b6efaab 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -100,12 +100,12 @@ _0803BAAE: _0803BADC: .4byte gEnigmaBerries _0803BAE0: ldrh r0, [r7, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrh r0, [r7, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _0803BAF6: @@ -136,13 +136,13 @@ _0803BB14: _0803BB26: ldr r2, [sp, 0x4] ldrh r0, [r2, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x1C] ldr r3, [sp, 0x4] ldrh r0, [r3, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam _0803BB3C: adds r0, r7, 0 adds r0, 0x20 diff --git a/asm/contest_painting.s b/asm/contest_painting.s index fe9b38a49..11f1ce69d 100644 --- a/asm/contest_painting.s +++ b/asm/contest_painting.s @@ -36,16 +36,16 @@ _08106660: .4byte gSaveBlock1 _08106664: .4byte 0x00002dfc thumb_func_end sub_8106630 - thumb_func_start sub_8106668 -sub_8106668: @ 8106668 + thumb_func_start CB2_ContestPainting +CB2_ContestPainting: @ 8106668 push {lr} - bl sub_8106674 + bl ShowContestPainting pop {r0} bx r0 - thumb_func_end sub_8106668 + thumb_func_end CB2_ContestPainting - thumb_func_start sub_8106674 -sub_8106674: @ 8106674 + thumb_func_start ShowContestPainting +ShowContestPainting: @ 8106674 push {r4-r7,lr} sub sp, 0x4 ldr r1, _08106694 @ =gMain @@ -81,8 +81,8 @@ _081066B4: ldr r0, _081066D4 @ =0x02015de0 str r0, [r1] movs r0, 0x1 - bl sub_8106A10 - bl sub_81069CC + bl ContestPaintingInitVars + bl ContestPaintingInitBG b _0810676E .align 2, 0 _081066D0: .4byte gUnknown_03005E8C @@ -137,7 +137,7 @@ _08106734: ldr r1, _08106754 @ =0x00015ddf adds r0, r1 ldrb r0, [r0] - bl sub_81068FC + bl ContestPaintingInitWindow ldr r2, _08106758 @ =0x0000043c adds r1, r4, r2 b _08106774 @@ -176,7 +176,7 @@ _0810678C: adds r2, 0x1 adds r1, r2 ldrb r1, [r1] - bl sub_8106918 + bl ContestPaintingPrintCaption ldr r0, _081067F0 @ =gUnknown_083F6140 movs r1, 0 movs r2, 0x2 @@ -217,22 +217,22 @@ _081067EC: .4byte 0x00015dde _081067F0: .4byte gUnknown_083F6140 _081067F4: .4byte 0x040000d4 _081067F8: .4byte 0x85000100 -_081067FC: .4byte sub_8106AAC +_081067FC: .4byte VBlankCB_ContestPainting _08106800: .4byte gUnknown_03000750 -_08106804: .4byte sub_8106808 - thumb_func_end sub_8106674 +_08106804: .4byte CB2_HoldContestPainting + thumb_func_end ShowContestPainting - thumb_func_start sub_8106808 -sub_8106808: @ 8106808 + thumb_func_start CB2_HoldContestPainting +CB2_HoldContestPainting: @ 8106808 push {lr} - bl sub_810682C + bl HoldContestPainting bl UpdatePaletteFade pop {r0} bx r0 - thumb_func_end sub_8106808 + thumb_func_end CB2_HoldContestPainting - thumb_func_start sub_8106818 -sub_8106818: @ 8106818 + thumb_func_start CB2_QuitContestPainting +CB2_QuitContestPainting: @ 8106818 push {lr} ldr r0, _08106828 @ =gMain ldr r0, [r0, 0x8] @@ -241,10 +241,10 @@ sub_8106818: @ 8106818 bx r0 .align 2, 0 _08106828: .4byte gMain - thumb_func_end sub_8106818 + thumb_func_end CB2_QuitContestPainting - thumb_func_start sub_810682C -sub_810682C: @ 810682C + thumb_func_start HoldContestPainting +HoldContestPainting: @ 810682C push {lr} sub sp, 0x4 ldr r3, _08106844 @ =gUnknown_03000750 @@ -344,13 +344,13 @@ _081068E6: bx r0 .align 2, 0 _081068EC: .4byte gPaletteFade -_081068F0: .4byte sub_8106818 +_081068F0: .4byte CB2_QuitContestPainting _081068F4: .4byte gUnknown_03000756 _081068F8: .4byte gUnknown_03000754 - thumb_func_end sub_810682C + thumb_func_end HoldContestPainting - thumb_func_start sub_81068FC -sub_81068FC: @ 81068FC + thumb_func_start ContestPaintingInitWindow +ContestPaintingInitWindow: @ 81068FC push {r4,lr} ldr r4, _08106914 @ =gWindowConfig_81E7160 adds r0, r4, 0 @@ -362,10 +362,10 @@ sub_81068FC: @ 81068FC bx r0 .align 2, 0 _08106914: .4byte gWindowConfig_81E7160 - thumb_func_end sub_81068FC + thumb_func_end ContestPaintingInitWindow - thumb_func_start sub_8106918 -sub_8106918: @ 8106918 + thumb_func_start ContestPaintingPrintCaption +ContestPaintingPrintCaption: @ 8106918 push {r4-r6,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -445,10 +445,10 @@ _081069BE: .align 2, 0 _081069C4: .4byte gUnknown_083F60C0 _081069C8: .4byte gUnknown_03005E40 - thumb_func_end sub_8106918 + thumb_func_end ContestPaintingPrintCaption - thumb_func_start sub_81069CC -sub_81069CC: @ 81069CC + thumb_func_start ContestPaintingInitBG +ContestPaintingInitBG: @ 81069CC movs r0, 0x80 lsls r0, 19 movs r3, 0 @@ -479,10 +479,10 @@ _08106A00: .4byte REG_BG0CNT _08106A04: .4byte 0x00000c42 _08106A08: .4byte 0x00000a45 _08106A0C: .4byte REG_BLDCNT - thumb_func_end sub_81069CC + thumb_func_end ContestPaintingInitBG - thumb_func_start sub_8106A10 -sub_8106A10: @ 8106A10 + thumb_func_start ContestPaintingInitVars +ContestPaintingInitVars: @ 8106A10 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -516,10 +516,10 @@ _08106A46: _08106A4C: .4byte gUnknown_03000756 _08106A50: .4byte gUnknown_03000752 _08106A54: .4byte gUnknown_03000754 - thumb_func_end sub_8106A10 + thumb_func_end ContestPaintingInitVars - thumb_func_start sub_8106A58 -sub_8106A58: @ 8106A58 + thumb_func_start ContestPaintingMosaic +ContestPaintingMosaic: @ 8106A58 push {lr} ldr r0, _08106A68 @ =gUnknown_03000756 ldrb r1, [r0] @@ -558,18 +558,18 @@ _08106A9C: .4byte 0x00000a45 _08106AA0: .4byte gUnknown_03000752 _08106AA4: .4byte gUnknown_03000754 _08106AA8: .4byte REG_MOSAIC - thumb_func_end sub_8106A58 + thumb_func_end ContestPaintingMosaic - thumb_func_start sub_8106AAC -sub_8106AAC: @ 8106AAC + thumb_func_start VBlankCB_ContestPainting +VBlankCB_ContestPainting: @ 8106AAC push {lr} - bl sub_8106A58 + bl ContestPaintingMosaic bl LoadOam bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 - thumb_func_end sub_8106AAC + thumb_func_end VBlankCB_ContestPainting thumb_func_start sub_8106AC4 sub_8106AC4: @ 8106AC4 diff --git a/asm/decoration.s b/asm/decoration.s index 6259f16e6..b241ba0a9 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -609,7 +609,7 @@ _080FE656: ldr r0, _080FE6D0 @ =gUnknown_020388F7 movs r1, 0x8 bl sub_80F9480 - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette ldr r1, _080FE6D4 @ =gTasks lsls r0, r5, 2 adds r0, r5 @@ -1126,7 +1126,7 @@ _080FEADE: movs r0, 0 movs r1, 0x3C movs r2, 0x8 - bl sub_80F953C + bl CreateVerticalScrollIndicators _080FEAE8: ldr r5, _080FEB58 @ =gUnknown_020388F4 ldrb r0, [r5] @@ -1146,7 +1146,7 @@ _080FEAFC: movs r0, 0x1 movs r1, 0x3C movs r2, 0x98 - bl sub_80F953C + bl CreateVerticalScrollIndicators _080FEB10: ldrb r4, [r5] adds r0, r4, 0 @@ -1431,7 +1431,7 @@ sub_80FED3C: @ 80FED3C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette ldr r1, _080FED5C @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -1809,7 +1809,7 @@ sub_80FEFF4: @ 80FEFF4 cmp r0, 0 beq _080FF020 _080FF00E: - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette ldr r0, _080FF02C @ =gTasks lsls r1, r4, 2 adds r1, r4 @@ -4277,7 +4277,7 @@ _08100360: .4byte sub_80FE948 sub_8100364: @ 8100364 push {lr} bl ScriptContext2_Enable - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette bl pal_fill_black ldr r0, _08100388 @ =sub_8100334 movs r1, 0x8 diff --git a/asm/field_poison.s b/asm/field_poison.s index 36b10b747..f51c18cfe 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_80C5684 -sub_80C5684: @ 80C5684 + thumb_func_start CheckMonIsValid +CheckMonIsValid: @ 80C5684 push {lr} movs r1, 0x41 bl GetMonData @@ -27,16 +27,16 @@ _080C56A0: _080C56A2: pop {r1} bx r1 - thumb_func_end sub_80C5684 + thumb_func_end CheckMonIsValid - thumb_func_start sub_80C56A8 -sub_80C56A8: @ 80C56A8 + thumb_func_start CheckMonFainted +CheckMonFainted: @ 80C56A8 push {r4,r5,lr} ldr r4, _080C56C8 @ =gPlayerParty movs r5, 0 _080C56AE: adds r0, r4, 0 - bl sub_80C5684 + bl CheckMonIsValid cmp r0, 0 beq _080C56CC adds r0, r4, 0 @@ -58,10 +58,10 @@ _080C56D6: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80C56A8 + thumb_func_end CheckMonFainted - thumb_func_start sub_80C56DC -sub_80C56DC: @ 80C56DC + thumb_func_start MonFaintFromPoisonOnField +MonFaintFromPoisonOnField: @ 80C56DC push {r4,r5,lr} sub sp, 0x4 lsls r0, 24 @@ -94,10 +94,10 @@ sub_80C56DC: @ 80C56DC .align 2, 0 _080C5720: .4byte gPlayerParty _080C5724: .4byte gStringVar1 - thumb_func_end sub_80C56DC + thumb_func_end MonFaintFromPoisonOnField - thumb_func_start sub_80C5728 -sub_80C5728: @ 80C5728 + thumb_func_start CheckMonFaintedFromPoison +CheckMonFaintedFromPoison: @ 80C5728 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -106,7 +106,7 @@ sub_80C5728: @ 80C5728 ldr r0, _080C5764 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 - bl sub_80C5684 + bl CheckMonIsValid cmp r0, 0 beq _080C5768 adds r0, r4, 0 @@ -132,10 +132,10 @@ _080C576A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80C5728 + thumb_func_end CheckMonFaintedFromPoison - thumb_func_start sub_80C5770 -sub_80C5770: @ 80C5770 + thumb_func_start Task_WhiteOut +Task_WhiteOut: @ 80C5770 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -168,7 +168,7 @@ _080C579E: _080C57A8: lsls r0, r1, 24 lsrs r0, 24 - bl sub_80C5728 + bl CheckMonFaintedFromPoison cmp r0, 0 bne _080C57F4 ldrh r0, [r4, 0x2] @@ -193,7 +193,7 @@ _080C57CA: strh r0, [r4] b _080C581A _080C57DC: - bl sub_80C56A8 + bl CheckMonFainted adds r1, r0, 0 cmp r1, 0 beq _080C580C @@ -205,7 +205,7 @@ _080C57DC: _080C57F0: .4byte gScriptResult _080C57F4: ldrb r0, [r4, 0x2] - bl sub_80C56DC + bl MonFaintFromPoisonOnField ldr r0, _080C5808 @ =UnknownString_81A1132 bl ShowFieldMessage ldrh r0, [r4] @@ -227,10 +227,10 @@ _080C581A: bx r0 .align 2, 0 _080C5820: .4byte gScriptResult - thumb_func_end sub_80C5770 + thumb_func_end Task_WhiteOut - thumb_func_start sub_80C5824 -sub_80C5824: @ 80C5824 + thumb_func_start DoWhiteOut +DoWhiteOut: @ 80C5824 push {lr} ldr r0, _080C5838 @ =sub_80C5770 movs r1, 0x50 @@ -239,8 +239,8 @@ sub_80C5824: @ 80C5824 pop {r0} bx r0 .align 2, 0 -_080C5838: .4byte sub_80C5770 - thumb_func_end sub_80C5824 +_080C5838: .4byte Task_WhiteOut + thumb_func_end DoWhiteOut thumb_func_start overworld_poison overworld_poison: @ 80C583C @@ -292,7 +292,7 @@ _080C588C: cmp r7, 0 beq _080C58A0 _080C589C: - bl overworld_posion_effect + bl DoFieldPoisonEffect _080C58A0: cmp r6, 0 beq _080C58AC diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s index fb5ec4283..1e62f5516 100644 --- a/asm/fldeff_80C5CD4.s +++ b/asm/fldeff_80C5CD4.s @@ -1605,7 +1605,7 @@ _080C6912: bne _080C692C movs r2, 0 ldrsh r0, [r4, r2] - bl sub_80C696C + bl DoBalloonSoundEffect _080C692C: movs r3, 0x2 ldrsh r0, [r4, r3] @@ -1639,8 +1639,8 @@ _080C6964: bx r0 thumb_func_end sub_80C68EC - thumb_func_start sub_80C696C -sub_80C696C: @ 80C696C + thumb_func_start DoBalloonSoundEffect +DoBalloonSoundEffect: @ 80C696C push {lr} lsls r0, 16 asrs r1, r0, 16 @@ -1682,7 +1682,7 @@ _080C69B0: _080C69B6: pop {r0} bx r0 - thumb_func_end sub_80C696C + thumb_func_end DoBalloonSoundEffect thumb_func_start FldEff_Nop47 FldEff_Nop47: @ 80C69BC @@ -1814,8 +1814,8 @@ _080C6AA4: .4byte sub_80C6A14 _080C6AA8: .4byte gTasks thumb_func_end sub_80C6A54 - thumb_func_start sub_80C6AAC -sub_80C6AAC: @ 80C6AAC + thumb_func_start Task_DecorationSoundEffect +Task_DecorationSoundEffect: @ 80C6AAC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1954,10 +1954,10 @@ _080C6C2A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80C6AAC + thumb_func_end Task_DecorationSoundEffect - thumb_func_start sub_80C6C30 -sub_80C6C30: @ 80C6C30 + thumb_func_start DoDecorationSoundEffect +DoDecorationSoundEffect: @ 80C6C30 push {r4,lr} adds r4, r0, 0 lsls r4, 16 @@ -1979,12 +1979,12 @@ sub_80C6C30: @ 80C6C30 pop {r0} bx r0 .align 2, 0 -_080C6C5C: .4byte sub_80C6AAC +_080C6C5C: .4byte Task_DecorationSoundEffect _080C6C60: .4byte gTasks - thumb_func_end sub_80C6C30 + thumb_func_end DoDecorationSoundEffect - thumb_func_start sub_80C6C64 -sub_80C6C64: @ 80C6C64 + thumb_func_start SpriteCB_YellowCave4Sparkle +SpriteCB_YellowCave4Sparkle: @ 80C6C64 push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x2E] @@ -2007,10 +2007,10 @@ _080C6C8A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80C6C64 + thumb_func_end SpriteCB_YellowCave4Sparkle - thumb_func_start sub_80C6C90 -sub_80C6C90: @ 80C6C90 + thumb_func_start DoYellowCave4Sparkle +DoYellowCave4Sparkle: @ 80C6C90 push {r4,lr} sub sp, 0x4 ldr r3, _080C6D28 @ =gMapObjects @@ -2090,8 +2090,8 @@ _080C6D28: .4byte gMapObjects _080C6D2C: .4byte gPlayerAvatar _080C6D30: .4byte gFieldEffectObjectTemplatePointers _080C6D34: .4byte gSprites -_080C6D38: .4byte sub_80C6C64 - thumb_func_end sub_80C6C90 +_080C6D38: .4byte SpriteCB_YellowCave4Sparkle + thumb_func_end DoYellowCave4Sparkle thumb_func_start FldEff_SandPillar FldEff_SandPillar: @ 80C6D3C @@ -2234,8 +2234,8 @@ _080C6E5C: .4byte gSprites _080C6E60: .4byte gPlayerAvatar thumb_func_end FldEff_SandPillar - thumb_func_start door_restore_tilemap -door_restore_tilemap: @ 80C6E64 + thumb_func_start SpriteCB_SandPillar_0 +SpriteCB_SandPillar_0: @ 80C6E64 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x83 @@ -2288,11 +2288,11 @@ _080C6EAA: .align 2, 0 _080C6ED8: .4byte gUnknown_0202FF84 _080C6EDC: .4byte 0x0000020a -_080C6EE0: .4byte sub_80C6EE4 - thumb_func_end door_restore_tilemap +_080C6EE0: .4byte SpriteCB_SandPillar_1 + thumb_func_end SpriteCB_SandPillar_0 - thumb_func_start sub_80C6EE4 -sub_80C6EE4: @ 80C6EE4 + thumb_func_start SpriteCB_SandPillar_1 +SpriteCB_SandPillar_1: @ 80C6EE4 push {r4,r5,lr} adds r5, r0, 0 ldrh r1, [r5, 0x2E] @@ -2323,21 +2323,21 @@ _080C6F14: .align 2, 0 _080C6F1C: .4byte gUnknown_0202FF84 _080C6F20: .4byte 0x00000e8c -_080C6F24: .4byte sub_80C6F28 - thumb_func_end sub_80C6EE4 +_080C6F24: .4byte SpriteCB_SandPillar_2 + thumb_func_end SpriteCB_SandPillar_1 - thumb_func_start sub_80C6F28 -sub_80C6F28: @ 80C6F28 + thumb_func_start SpriteCB_SandPillar_2 +SpriteCB_SandPillar_2: @ 80C6F28 push {lr} movs r1, 0x34 bl FieldEffectStop bl EnableBothScriptContexts pop {r0} bx r0 - thumb_func_end sub_80C6F28 + thumb_func_end SpriteCB_SandPillar_2 - thumb_func_start sub_80C6F38 -sub_80C6F38: @ 80C6F38 + thumb_func_start GetShieldToyTVDecorationInfo +GetShieldToyTVDecorationInfo: @ 80C6F38 push {r4,lr} sub sp, 0x4 mov r4, sp @@ -2431,10 +2431,10 @@ _080C6FFA: bx r0 .align 2, 0 _080C7004: .4byte gScriptResult - thumb_func_end sub_80C6F38 + thumb_func_end GetShieldToyTVDecorationInfo - thumb_func_start task50_overworld_posion_effect -task50_overworld_posion_effect: @ 80C7008 + thumb_func_start Task_FieldPoisonEffect +Task_FieldPoisonEffect: @ 80C7008 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -2494,10 +2494,10 @@ _080C706C: bx r0 .align 2, 0 _080C7070: .4byte REG_MOSAIC - thumb_func_end task50_overworld_posion_effect + thumb_func_end Task_FieldPoisonEffect - thumb_func_start overworld_posion_effect -overworld_posion_effect: @ 80C7074 + thumb_func_start DoFieldPoisonEffect +DoFieldPoisonEffect: @ 80C7074 push {lr} movs r0, 0x4F bl PlaySE @@ -2507,11 +2507,11 @@ overworld_posion_effect: @ 80C7074 pop {r0} bx r0 .align 2, 0 -_080C7088: .4byte task50_overworld_posion_effect - thumb_func_end overworld_posion_effect +_080C7088: .4byte Task_FieldPoisonEffect + thumb_func_end DoFieldPoisonEffect - thumb_func_start c3_80A0DD8_is_running -c3_80A0DD8_is_running: @ 80C708C + thumb_func_start FieldPoisonEffectIsRunning +FieldPoisonEffectIsRunning: @ 80C708C push {lr} ldr r0, _080C709C @ =task50_overworld_posion_effect bl FuncIsActiveTask @@ -2520,11 +2520,11 @@ c3_80A0DD8_is_running: @ 80C708C pop {r1} bx r1 .align 2, 0 -_080C709C: .4byte task50_overworld_posion_effect - thumb_func_end c3_80A0DD8_is_running +_080C709C: .4byte Task_FieldPoisonEffect + thumb_func_end FieldPoisonEffectIsRunning - thumb_func_start sub_80C70A0 -sub_80C70A0: @ 80C70A0 + thumb_func_start Task_WateringBerryTreeAnim_0 +Task_WateringBerryTreeAnim_0: @ 80C70A0 lsls r0, 24 lsrs r0, 24 ldr r2, _080C70B4 @ =gTasks @@ -2537,11 +2537,11 @@ sub_80C70A0: @ 80C70A0 bx lr .align 2, 0 _080C70B4: .4byte gTasks -_080C70B8: .4byte sub_80C70BC - thumb_func_end sub_80C70A0 +_080C70B8: .4byte Task_WateringBerryTreeAnim_1 + thumb_func_end Task_WateringBerryTreeAnim_0 - thumb_func_start sub_80C70BC -sub_80C70BC: @ 80C70BC + thumb_func_start Task_WateringBerryTreeAnim_1 +Task_WateringBerryTreeAnim_1: @ 80C70BC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -2591,11 +2591,11 @@ _080C711A: _080C7120: .4byte gPlayerAvatar _080C7124: .4byte gMapObjects _080C7128: .4byte gTasks -_080C712C: .4byte sub_80C7130 - thumb_func_end sub_80C70BC +_080C712C: .4byte Task_WateringBerryTreeAnim_2 + thumb_func_end Task_WateringBerryTreeAnim_1 - thumb_func_start sub_80C7130 -sub_80C7130: @ 80C7130 + thumb_func_start Task_WateringBerryTreeAnim_2 +Task_WateringBerryTreeAnim_2: @ 80C7130 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2645,11 +2645,11 @@ _080C7194: pop {r0} bx r0 .align 2, 0 -_080C719C: .4byte sub_80C71A0 - thumb_func_end sub_80C7130 +_080C719C: .4byte Task_WateringBerryTreeAnim_3 + thumb_func_end Task_WateringBerryTreeAnim_2 - thumb_func_start sub_80C71A0 -sub_80C71A0: @ 80C71A0 + thumb_func_start Task_WateringBerryTreeAnim_3 +Task_WateringBerryTreeAnim_3: @ 80C71A0 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -2664,10 +2664,10 @@ sub_80C71A0: @ 80C71A0 pop {r4} pop {r0} bx r0 - thumb_func_end sub_80C71A0 + thumb_func_end Task_WateringBerryTreeAnim_3 - thumb_func_start sub_80C71C4 -sub_80C71C4: @ 80C71C4 + thumb_func_start DoWateringBerryTreeAnim +DoWateringBerryTreeAnim: @ 80C71C4 push {lr} ldr r0, _080C71D4 @ =sub_80C70A0 movs r1, 0x50 @@ -2675,11 +2675,11 @@ sub_80C71C4: @ 80C71C4 pop {r0} bx r0 .align 2, 0 -_080C71D4: .4byte sub_80C70A0 - thumb_func_end sub_80C71C4 +_080C71D4: .4byte Task_WateringBerryTreeAnim_0 + thumb_func_end DoWateringBerryTreeAnim - thumb_func_start sub_80C71D8 -sub_80C71D8: @ 80C71D8 + thumb_func_start CreateRecordMixingSprite +CreateRecordMixingSprite: @ 80C71D8 push {r4,r5,lr} ldr r0, _080C722C @ =gUnknown_083D2878 bl LoadSpritePalette @@ -2728,10 +2728,10 @@ _080C723A: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80C71D8 + thumb_func_end CreateRecordMixingSprite - thumb_func_start sub_80C7240 -sub_80C7240: @ 80C7240 + thumb_func_start DestroyRecordMixingSprite +DestroyRecordMixingSprite: @ 80C7240 push {r4-r7,lr} ldr r4, _080C7274 @ =gSprites adds r7, r4, 0 @@ -2761,6 +2761,6 @@ _080C7264: .align 2, 0 _080C7274: .4byte gSprites _080C7278: .4byte gSpriteTemplate_83D2894 - thumb_func_end sub_80C7240 + thumb_func_end DestroyRecordMixingSprite .align 2, 0 @ Don't pad with nop. diff --git a/asm/heal_location.s b/asm/heal_location.s index 41c98c25d..72d741024 100644 --- a/asm/heal_location.s +++ b/asm/heal_location.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_80FA86C -sub_80FA86C: @ 80FA86C + thumb_func_start GetHealLocationIndexByMap +GetHealLocationIndexByMap: @ 80FA86C push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -38,16 +38,16 @@ _080FA89E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80FA86C + thumb_func_end GetHealLocationIndexByMap - thumb_func_start unref_sub_80FA8A4 -unref_sub_80FA8A4: @ 80FA8A4 + thumb_func_start GetHealLocationByMap +GetHealLocationByMap: @ 80FA8A4 push {lr} lsls r0, 16 lsrs r0, 16 lsls r1, 16 lsrs r1, 16 - bl sub_80FA86C + bl GetHealLocationIndexByMap cmp r0, 0 beq _080FA8C4 lsls r0, 3 @@ -61,10 +61,10 @@ _080FA8C4: _080FA8C6: pop {r1} bx r1 - thumb_func_end unref_sub_80FA8A4 + thumb_func_end GetHealLocationByMap - thumb_func_start sub_80FA8CC -sub_80FA8CC: @ 80FA8CC + thumb_func_start GetHealLocation +GetHealLocation: @ 80FA8CC push {lr} cmp r0, 0 beq _080FA8E4 @@ -81,6 +81,6 @@ _080FA8E4: _080FA8E6: pop {r1} bx r1 - thumb_func_end sub_80FA8CC + thumb_func_end GetHealLocation .align 2, 0 @ Don't pad with nop. diff --git a/asm/item_use.s b/asm/item_use.s index ec093aa2e..713323866 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -30,7 +30,7 @@ _080C8FD0: .4byte word_203855E _080C8FD4: .4byte gTasks _080C8FD8: ldrh r0, [r1] - bl itemid_get_type + bl ItemId_GetType subs r0, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -204,7 +204,7 @@ CheckIfItemIsTMHMOrEvolutionStone: @ 80C911C lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc ldr r1, _080C9134 @ =ItemUseOutOfBattle_TMHM cmp r0, r1 bne _080C9138 @@ -214,7 +214,7 @@ CheckIfItemIsTMHMOrEvolutionStone: @ 80C911C _080C9134: .4byte ItemUseOutOfBattle_TMHM _080C9138: adds r0, r4, 0 - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc ldr r1, _080C9148 @ =ItemUseOutOfBattle_EvolutionStone cmp r0, r1 beq _080C914C @@ -397,7 +397,7 @@ ItemUseOnFieldCB_Bike: @ 80C929C lsrs r5, r0, 24 ldr r4, _080C92E0 @ =word_203855E ldrh r0, [r4] - bl itemid_get_x28 + bl ItemId_GetSecondaryId lsls r0, 24 cmp r0, 0 bne _080C92B6 @@ -405,7 +405,7 @@ ItemUseOnFieldCB_Bike: @ 80C929C bl GetOnOffBike _080C92B6: ldrh r0, [r4] - bl itemid_get_x28 + bl ItemId_GetSecondaryId lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -539,7 +539,7 @@ ItemUseOnFieldCB_Rod: @ 80C93B8 lsrs r4, 24 ldr r0, _080C93DC @ =word_203855E ldrh r0, [r0] - bl itemid_get_x28 + bl ItemId_GetSecondaryId lsls r0, 24 lsrs r0, 24 bl StartFishing @@ -1668,7 +1668,7 @@ unref_sub_80C9BF8: @ 80C9BF8 ldr r4, _080C9C40 @ =gUnknown_083D61DC ldr r0, _080C9C44 @ =word_203855E ldrh r0, [r0] - bl itemid_get_x28 + bl ItemId_GetSecondaryId lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -1687,7 +1687,7 @@ _080C9C4C: ldr r4, _080C9C70 @ =gUnknown_083D61DC ldr r0, _080C9C74 @ =word_203855E ldrh r0, [r0] - bl itemid_get_x28 + bl ItemId_GetSecondaryId lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -1754,7 +1754,7 @@ _080C9CE0: .4byte sub_80A5B00 _080C9CE4: ldr r0, _080C9CFC @ =word_203855E ldrh r0, [r0] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc adds r1, r0, 0 adds r0, r4, 0 bl _call_via_r1 @@ -1776,7 +1776,7 @@ sub_80C9D00: @ 80C9D00 ldr r0, _080C9D28 @ =word_203855E ldrh r0, [r0] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem bl ScriptContext2_Enable ldr r0, _080C9D2C @ =gUnknown_081A1654 bl ScriptContext1_SetupScript @@ -2148,11 +2148,11 @@ sub_80C9FDC: @ 80C9FDC ldr r4, _080CA004 @ =word_203855E ldrh r0, [r4] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem bl sub_80A3E0C ldrh r0, [r4] ldr r1, _080CA008 @ =gStringVar2 - bl itemid_copy_name + bl CopyItemName ldr r0, _080CA00C @ =gStringVar4 ldr r1, _080CA010 @ =gOtherText_UsedItem bl StringExpandPlaceholders @@ -2179,7 +2179,7 @@ ItemUseOutOfBattle_Repel: @ 80CA014 bne _080CA060 ldr r0, _080CA054 @ =word_203855E ldrh r0, [r0] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2219,7 +2219,7 @@ sub_80CA07C: @ 80CA07C ldr r0, _080CA090 @ =word_203855E ldrh r0, [r0] ldr r1, _080CA094 @ =gStringVar2 - bl itemid_copy_name + bl CopyItemName pop {r0} bx r0 .align 2, 0 @@ -2450,7 +2450,7 @@ ItemUseInBattle_PokeBall: @ 80CA244 ldr r0, _080CA268 @ =word_203855E ldrh r0, [r0] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem adds r0, r4, 0 bl sub_80A7094 b _080CA284 @@ -2523,7 +2523,7 @@ sub_80CA2BC: @ 80CA2BC ldr r4, _080CA308 @ =word_203855E ldrh r0, [r4] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem ldrh r0, [r4] bl sub_803F378 adds r1, r0, 0 @@ -2722,7 +2722,7 @@ unref_sub_80CA448: @ 80CA448 bne _080CA4AC ldrh r0, [r4] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem ldr r0, _080CA498 @ =gPlayerParty ldr r1, _080CA49C @ =gStringVar1 bl GetMonNickname diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 4faccce74..d8d77ab07 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -714,8 +714,8 @@ _080F9526: bx r0 thumb_func_end sub_80F9520 - thumb_func_start sub_80F953C -sub_80F953C: @ 80F953C + thumb_func_start CreateVerticalScrollIndicators +CreateVerticalScrollIndicators: @ 80F953C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1019,7 +1019,7 @@ _080F9790: bx r0 .align 2, 0 _080F9798: .4byte gSprites - thumb_func_end sub_80F953C + thumb_func_end CreateVerticalScrollIndicators thumb_func_start sub_80F979C sub_80F979C: @ 80F979C @@ -1089,8 +1089,8 @@ _080F9810: .4byte gUnknown_020388C0 _080F9814: .4byte gSprites thumb_func_end SetBgTilemapBuffer - thumb_func_start InitMenuInUpperLeftCornerPlaySoundWhenAPressed -InitMenuInUpperLeftCornerPlaySoundWhenAPressed: @ 80F9818 + thumb_func_start LoadScrollIndicatorPalette +LoadScrollIndicatorPalette: @ 80F9818 push {lr} ldr r0, _080F9824 @ =gUnknown_083E5968 bl LoadSpritePalette @@ -1098,7 +1098,7 @@ InitMenuInUpperLeftCornerPlaySoundWhenAPressed: @ 80F9818 bx r0 .align 2, 0 _080F9824: .4byte gUnknown_083E5968 - thumb_func_end InitMenuInUpperLeftCornerPlaySoundWhenAPressed + thumb_func_end LoadScrollIndicatorPalette thumb_func_start BuyMenuFreeMemory BuyMenuFreeMemory: @ 80F9828 diff --git a/asm/money.s b/asm/money.s index 0d630ba52..c194bf238 100644 --- a/asm/money.s +++ b/asm/money.s @@ -215,7 +215,7 @@ sub_80B7AEC: @ 80B7AEC mov r0, sp adds r1, r4, 0 adds r2, r5, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned movs r0, 0xFC strb r0, [r6] movs r0, 0x14 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index e5384cb75..057517bb2 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -631,7 +631,7 @@ sub_81264F0: @ 81264F0 ldrb r1, [r2] adds r2, 0x1 str r2, [r4, 0x8] - bl sub_80C5C38 + bl GiveSpecialRibbonToParty ldr r0, _0812651C @ =gStringVar4 ldr r1, _08126520 @ =gOtherText_SpecialRibbonReceived bl StringExpandPlaceholders diff --git a/asm/pokedex.s b/asm/pokedex.s index e3ad1d0d2..5b716383c 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -8139,7 +8139,7 @@ sub_80925CC: @ 80925CC str r0, [sp] movs r0, 0x10 movs r2, 0xC - bl sub_814AC58 + bl CreateBlendedOutlineCursor ldrh r0, [r5] movs r1, 0x1 bl sub_80925B4 diff --git a/asm/pokenav.s b/asm/pokenav.s index 7790b9d6e..3422efef5 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -9539,7 +9539,7 @@ _080F0854: ldr r0, _080F08CC @ =gOtherText_NumberRegistered movs r1, 0xA movs r2, 0x9 - bl sub_8072B4C + bl MenuPrint_RightAligned cmp r5, 0 bne _080F08C6 _080F0862: @@ -9559,14 +9559,14 @@ _080F0862: adds r0, r4, 0 movs r1, 0xA movs r2, 0xB - bl sub_8072B4C + bl MenuPrint_RightAligned cmp r5, 0 bne _080F08C6 _080F088C: ldr r0, _080F08DC @ =gOtherText_NumberBattles movs r1, 0xA movs r2, 0xD - bl sub_8072B4C + bl MenuPrint_RightAligned cmp r5, 0 bne _080F08C6 _080F089A: @@ -9589,7 +9589,7 @@ _080F08AA: adds r0, r4, 0 movs r1, 0xA movs r2, 0xF - bl sub_8072B4C + bl MenuPrint_RightAligned _080F08C6: pop {r4,r5} pop {r0} diff --git a/asm/record_mixing.s b/asm/record_mixing.s index c00d6219b..2df37cb74 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -260,7 +260,7 @@ _080B94C8: movs r0, 0 strb r0, [r1] bl sub_80B92AC - bl sub_80C71D8 + bl CreateRecordMixingSprite movs r0, 0x1 strh r0, [r4] ldr r0, _080B9514 @ =sub_80B95F0 @@ -296,7 +296,7 @@ _080B951C: strh r0, [r4] ldr r0, _080B954C @ =0x00000834 bl FlagSet - bl sub_80C7240 + bl DestroyRecordMixingSprite ldrb r0, [r4, 0x1E] bl DestroyTask b _080B95E6 @@ -1622,26 +1622,26 @@ sub_80B9F3C: @ 80B9F3C ldrh r0, [r4] cmp r0, 0 beq _080BA000 - bl sub_80A9670 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 bne _080B9FC8 ldrh r0, [r4] movs r1, 0x1 - bl sub_80A92D4 + bl CheckBagHasItem lsls r0, 24 cmp r0, 0 bne _080B9FB8 ldrh r0, [r4] movs r1, 0x1 - bl sub_80A9718 + bl CheckPCHasItem lsls r0, 24 cmp r0, 0 bne _080B9FB8 ldrh r0, [r4] movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 cmp r0, 0 beq _080B9FB8 @@ -1674,7 +1674,7 @@ _080B9FC4: .4byte 0x00004001 _080B9FC8: ldrh r0, [r4] movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/region_map.s b/asm/region_map.s index ce64bfa98..c02ded1cc 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -3333,7 +3333,7 @@ _080FC268: ldr r0, [r0] movs r1, 0x1D movs r2, 0x11 - bl sub_8072B4C + bl MenuPrint_RightAligned b _080FC310 .align 2, 0 _080FC2AC: .4byte 0x02000000 diff --git a/asm/rom3.s b/asm/rom3.s index 86a18c075..f21110baf 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -13095,7 +13095,7 @@ _08012050: .4byte gUnknown_02024A60 _08012054: .4byte gEnigmaBerries _08012058: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r2, r0, 24 _08012062: @@ -15101,11 +15101,11 @@ _08013104: .4byte gStatStageRatios _08013108: .4byte gEnigmaBerries _0801310C: ldrh r0, [r4, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r6, r0, 24 ldrh r0, [r4, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r5, r0, 24 _08013120: @@ -15211,11 +15211,11 @@ _080131EC: .4byte gStatStageRatios _080131F0: .4byte gEnigmaBerries _080131F4: ldrh r0, [r4, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r6, r0, 24 ldrh r0, [r4, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r5, r0, 24 _08013208: @@ -18202,7 +18202,7 @@ _08014ADC: .4byte gBattleMons _08014AE0: .4byte gEnigmaBerries _08014AE4: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r1, r0, 24 _08014AEE: @@ -20093,7 +20093,7 @@ _080159DC: .4byte gUnknown_081D9464 _080159E0: .4byte gEnigmaBerries _080159E4: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r3, r0, 24 _080159EE: @@ -20217,7 +20217,7 @@ _08015AE0: .4byte gEnigmaBerries _08015AE4: ldrh r0, [r1, 0x2E] str r3, [sp, 0x14] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 str r0, [sp] @@ -28581,11 +28581,11 @@ _0801A07C: .4byte gBattleMons _0801A080: .4byte gEnigmaBerries _0801A084: ldrh r0, [r4] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _0801A098: @@ -28615,12 +28615,12 @@ _0801A0C4: .4byte gUnknown_02024C07 _0801A0C8: .4byte gEnigmaBerries _0801A0CC: ldr r0, [sp, 0x14] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 mov r8, r0 ldr r0, [sp, 0x14] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _0801A0E2: @@ -28635,9 +28635,9 @@ _0801A0E2: cmp r4, 0xAF beq _0801A102 adds r0, r4, 0 - bl itemid_get_x12 + bl ItemId_GetHoldEffect adds r0, r4, 0 - bl itemid_get_quality + bl ItemId_GetHoldEffectParam _0801A102: ldr r4, [sp, 0x8] cmp r4, 0x4 @@ -30258,11 +30258,11 @@ _0801AE44: .4byte gBattleMons _0801AE48: .4byte gEnigmaBerries _0801AE4C: ldrh r0, [r4] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam _0801AE5C: subs r0, r5, 0x2 cmp r0, 0x1A @@ -33012,7 +33012,7 @@ _0801C580: .4byte gUnknown_02024C08 _0801C584: .4byte gEnigmaBerries _0801C588: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r5, r0, 24 mov r1, r8 @@ -33020,7 +33020,7 @@ _0801C588: muls r0, r7 add r0, r9 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r2, r0, 24 _0801C5A4: @@ -33402,7 +33402,7 @@ _0801C89C: .4byte gBattleMons _0801C8A0: .4byte gUnknown_02024C07 _0801C8A4: .4byte gEnigmaBerries _0801C8A8: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r6, r0, 24 _0801C8B0: @@ -35127,14 +35127,14 @@ _0801D610: .4byte gUnknown_02024C08 _0801D614: .4byte gEnigmaBerries _0801D618: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _0801D632: @@ -35331,14 +35331,14 @@ _0801D7C0: .4byte gUnknown_02024C08 _0801D7C4: .4byte gEnigmaBerries _0801D7C8: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _0801D7E2: @@ -40418,7 +40418,7 @@ _08020150: .4byte gSaveBlock1 + 0x3688 _08020154: .4byte gPlayerParty _08020158: .4byte gBitTable _0802015C: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 _08020164: @@ -40545,7 +40545,7 @@ _08020260: .4byte gPlayerParty _08020264: .4byte gSaveBlock1 _08020268: .4byte 0x00003688 _0802026C: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 _08020274: @@ -43388,7 +43388,7 @@ _0802183C: .4byte gUnknown_02024C07 _08021840: .4byte gEnigmaBerries _08021844: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0802184E: @@ -49084,14 +49084,14 @@ _08024704: .4byte gUnknown_02024C08 _08024708: .4byte gEnigmaBerries _0802470C: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _08024726: @@ -53687,14 +53687,14 @@ _08026BAC: .4byte gUnknown_02024C08 _08026BB0: .4byte gEnigmaBerries _08026BB4: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _08026BCE: @@ -64606,7 +64606,7 @@ _0802C218: bhi _0802C2AC adds r0, r5, 0 movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem _0802C278: movs r0, 0x5 bl PlaySE diff --git a/asm/rom6.s b/asm/rom6.s index f9b879c69..aa8fcd710 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -675,15 +675,15 @@ _0810B844: .4byte gMain _0810B848: .4byte 0x0000043c _0810B84C: bl sub_80F944C - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette movs r0, 0 movs r1, 0xB0 movs r2, 0x8 - bl sub_80F953C + bl CreateVerticalScrollIndicators movs r0, 0x1 movs r1, 0xB0 movs r2, 0x98 - bl sub_80F953C + bl CreateVerticalScrollIndicators b _0810B91C _0810B86A: movs r0, 0x38 @@ -1018,7 +1018,7 @@ sub_810BB0C: @ 810BB0C ldr r0, _0810BB28 @ =gWindowConfig_81E6E34 bl BasicInitMenuWindow ldr r0, _0810BB2C @ =0x00000111 - bl itemid_get_item + bl ItemId_GetItem movs r1, 0x2 movs r2, 0x1 movs r3, 0x48 @@ -3885,7 +3885,7 @@ _0810D17C: .4byte gMain sub_810D180: @ 810D180 push {r4-r7,lr} sub sp, 0x4 - bl sp000_heal_pokemon + bl HealPlayerParty ldr r4, _0810D1A0 @ =0x00000804 adds r0, r4, 0 bl FlagGet @@ -6906,7 +6906,7 @@ sub_810E874: @ 810E874 ldr r0, _0810E8BC @ =gUnknown_0203925C strb r4, [r0] bl sub_80F944C - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette bl sub_810ECD4 b _0810E8E8 .align 2, 0 @@ -7416,7 +7416,7 @@ sub_810ECB0: @ 810ECB0 movs r0, 0 movs r1, 0x24 movs r2, 0x8 - bl sub_80F953C + bl CreateVerticalScrollIndicators _0810ECCC: pop {r0} bx r0 @@ -7439,7 +7439,7 @@ sub_810ECD4: @ 810ECD4 movs r0, 0x1 movs r1, 0x24 movs r2, 0x48 - bl sub_80F953C + bl CreateVerticalScrollIndicators _0810ECF2: pop {r0} bx r0 @@ -7923,7 +7923,7 @@ sub_810F090: @ 810F090 ldr r0, _0810F104 @ =gUnknown_0203925C strb r4, [r0] bl sub_80F944C - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette bl sub_810F2B4 ldr r5, _0810F108 @ =gUnknown_083F83C0 _0810F0CA: @@ -8159,7 +8159,7 @@ sub_810F290: @ 810F290 movs r0, 0 movs r1, 0x2C movs r2, 0x8 - bl sub_80F953C + bl CreateVerticalScrollIndicators _0810F2AC: pop {r0} bx r0 @@ -8182,7 +8182,7 @@ sub_810F2B4: @ 810F2B4 movs r0, 0x1 movs r1, 0x2C movs r2, 0x58 - bl sub_80F953C + bl CreateVerticalScrollIndicators _0810F2D2: pop {r0} bx r0 @@ -24499,8 +24499,8 @@ _081176A0: .4byte gTasks _081176A4: .4byte sub_81174F8 thumb_func_end sub_8117630 - thumb_func_start sub_81176A8 -sub_81176A8: @ 81176A8 + thumb_func_start Task_Roulette_0 +Task_Roulette_0: @ 81176A8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -24533,7 +24533,7 @@ sub_81176A8: @ 81176A8 adds r0, r5, 0 movs r1, 0x9 movs r2, 0x1 - bl sub_8072B4C + bl MenuPrint_RightAligned ldr r2, _08117768 @ =gUnknown_083F8DF0 ldr r1, _0811776C @ =gUnknown_0202E8CC mov r8, r1 @@ -24646,10 +24646,10 @@ _081177E4: .align 2, 0 _081177F4: .4byte gUnknown_081C411C _081177F8: .4byte sub_81175DC - thumb_func_end sub_81176A8 + thumb_func_end Task_Roulette_0 - thumb_func_start sub_81177FC -sub_81177FC: @ 81177FC + thumb_func_start PlayRoulette +PlayRoulette: @ 81177FC push {lr} bl ScriptContext2_Enable ldr r0, _08117828 @ =sub_81176A8 @@ -24670,11 +24670,11 @@ sub_81177FC: @ 81177FC pop {r0} bx r0 .align 2, 0 -_08117828: .4byte sub_81176A8 +_08117828: .4byte Task_Roulette_0 _0811782C: .4byte gTasks _08117830: .4byte gSaveBlock1 _08117834: .4byte 0x00000494 - thumb_func_end sub_81177FC + thumb_func_end PlayRoulette thumb_func_start sub_8117838 sub_8117838: @ 8117838 @@ -44739,7 +44739,7 @@ _081216D8: ldrh r0, [r0] _081216DC: mov r1, sp - bl itemid_copy_name + bl CopyItemName mov r4, sp b _081219E6 .align 2, 0 @@ -45508,12 +45508,12 @@ _08121CEC: .4byte gUnknown_08400A78 _08121CF0: adds r0, r2, 0 adds r1, r6, 0 - bl itemid_copy_name + bl CopyItemName b _08121D02 _08121CFA: adds r0, r2, 0 adds r1, r6, 0 - bl itemid_copy_name + bl CopyItemName _08121D02: adds r5, 0x3 _08121D04: diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s index 2aee8b264..237a79dd9 100644 --- a/asm/rom_803D1FC.s +++ b/asm/rom_803D1FC.s @@ -96,7 +96,7 @@ _0803E22C: _0803E238: .4byte gSaveBlock1 _0803E23C: .4byte 0x00003688 _0803E240: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0803E248: @@ -2436,7 +2436,7 @@ GetEvolutionTargetSpecies: @ 803F48C _0803F4F8: .4byte gSaveBlock1 _0803F4FC: .4byte 0x00003688 _0803F500: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0803F508: @@ -3634,7 +3634,7 @@ _0803FD20: _0803FD2C: .4byte gSaveBlock1 _0803FD30: .4byte 0x00003688 _0803FD34: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 _0803FD3C: @@ -3955,7 +3955,7 @@ _0803FF94: _0803FFA0: .4byte gSaveBlock1 _0803FFA4: .4byte 0x00003688 _0803FFA8: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0803FFB0: diff --git a/asm/rom_806936C.s b/asm/rom_806936C.s index b40e84987..35f73211b 100644 --- a/asm/rom_806936C.s +++ b/asm/rom_806936C.s @@ -1711,7 +1711,7 @@ _0806A006: movs r0, 0x87 lsls r0, 1 movs r1, 0x1 - bl sub_80A92D4 + bl CheckBagHasItem lsls r0, 24 cmp r0, 0 beq _0806A02A diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s index e5012500d..2cea0374e 100644 --- a/asm/rom_806D7F8.s +++ b/asm/rom_806D7F8.s @@ -2378,7 +2378,7 @@ _0806E9F0: bl GetMonNickname ldr r1, _0806EA34 @ =gStringVar2 adds r0, r7, 0 - bl itemid_copy_name + bl CopyItemName ldr r4, _0806EA38 @ =gStringVar4 ldr r1, _0806EA3C @ =gOtherText_AlreadyHolding adds r0, r4, 0 @@ -2410,7 +2410,7 @@ _0806EA44: bl sub_806E904 adds r0, r5, 0 movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem adds r0, r5, 0 bl itemid_is_mail lsls r0, 24 @@ -2495,10 +2495,10 @@ sub_806EACC: @ 806EACC lsrs r5, r0, 16 ldrh r0, [r4, 0x6] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem adds r0, r5, 0 movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2521,7 +2521,7 @@ _0806EB30: .4byte 0x0201c000 _0806EB34: ldrh r0, [r4, 0x6] ldr r1, _0806EB50 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r4, _0806EB54 @ =gStringVar4 ldr r1, _0806EB58 @ =gOtherText_TakenAndReplaced adds r0, r4, 0 @@ -2540,7 +2540,7 @@ _0806EB5C: bl sub_806E834 ldrh r0, [r4, 0x6] movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem b _0806EB9A .align 2, 0 _0806EB70: .4byte gOtherText_BagFullCannotRemoveItem @@ -2630,7 +2630,7 @@ sub_806EBF0: @ 806EBF0 bl GetMonNickname ldr r1, _0806EC38 @ =gStringVar2 adds r0, r4, 0 - bl itemid_copy_name + bl CopyItemName ldr r4, _0806EC3C @ =gStringVar4 ldr r1, _0806EC40 @ =gOtherText_WasGivenToHold adds r0, r4, 0 @@ -2772,7 +2772,7 @@ _0806ED50: strb r1, [r0, 0x1] adds r0, r4, 0 movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2832,7 +2832,7 @@ sub_806EDB4: @ 806EDB4 bl GetMonNickname ldr r1, _0806EDFC @ =gStringVar2 adds r0, r4, 0 - bl itemid_copy_name + bl CopyItemName ldr r4, _0806EE00 @ =gStringVar4 ldr r1, _0806EE04 @ =gOtherText_ReceivedTheThingFrom adds r0, r4, 0 @@ -2901,7 +2901,7 @@ sub_806EE5C: @ 806EE5C ldr r5, _0806EE90 @ =0x0201c000 ldrh r0, [r5, 0x6] movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3352,7 +3352,7 @@ sub_806F1D0: @ 806F1D0 bhi _0806F220 adds r0, r1, 0 movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem _0806F220: ldr r0, _0806F24C @ =gTasks lsls r1, r6, 2 @@ -4274,7 +4274,7 @@ _0806F964: bl SetMonData ldrh r0, [r4, 0x6] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem bl sub_8032638 ldr r1, _0806F9E8 @ =gTasks adds r0, r7, r6 @@ -5001,7 +5001,7 @@ _0806FFC8: bne _0806FFE6 adds r0, r6, 0 movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem _0806FFE6: adds r0, r6, 0 bl GetMedicineItemEffectMessage @@ -5258,7 +5258,7 @@ sub_80701DC: @ 80701DC adds r4, r6, r0 ldrh r0, [r4, 0x6] movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem ldrb r1, [r4, 0x5] movs r0, 0x64 muls r0, r1 @@ -5337,7 +5337,7 @@ _080702AC: .4byte sub_806FB0C _080702B0: ldrh r0, [r4, 0x6] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem ldr r1, _080702D0 @ =gTasks lsls r0, r5, 2 adds r0, r5 @@ -5717,7 +5717,7 @@ _080705B8: bl PlaySE ldrh r0, [r6, 0x6] movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem ldr r0, [r6] movs r2, 0x1E ldrsh r1, [r7, r2] @@ -5882,7 +5882,7 @@ _08070724: bl sub_8070A20 adds r0, r6, 0 movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem ldr r0, [r4] ldr r1, _0807078C @ =gStringVar1 bl GetMonNickname @@ -6696,7 +6696,7 @@ _08070E34: .4byte sub_806FB0C _08070E38: adds r0, r6, 0 movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem _08070E40: pop {r4-r6} pop {r0} diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s index 5a92065fd..5514f281c 100644 --- a/asm/rom_80859BC.s +++ b/asm/rom_80859BC.s @@ -9697,7 +9697,7 @@ sub_808A520: @ 808A520 cmp r0, 0 beq _0808A542 movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem _0808A542: ldr r6, _0808A590 @ =gUnknown_03005CE0 ldrb r0, [r6] @@ -9710,7 +9710,7 @@ _0808A542: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem ldrb r0, [r6] muls r0, r5 adds r0, r4 @@ -11550,7 +11550,7 @@ sub_808B3EC: @ 808B3EC cmp r0, 0 beq _0808B416 movs r1, 0x1 - bl sub_80A9538 + bl RemoveBagItem _0808B416: ldr r6, _0808B470 @ =gUnknown_03005CE0 ldrb r0, [r6] @@ -11563,7 +11563,7 @@ _0808B416: lsls r0, 16 lsrs r0, 16 movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem ldrb r0, [r6] muls r0, r5 adds r0, r4 diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s index f49f9d6be..c912fd14e 100644 --- a/asm/rom_8094928.s +++ b/asm/rom_8094928.s @@ -15494,7 +15494,7 @@ _0809C3EA: ldr r1, _0809C460 @ =0x00001282 adds r7, r2, r1 ldrh r0, [r3] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r7, 0 bl StringCopy @@ -20083,7 +20083,7 @@ sub_809E7F0: @ 809E7F0 ldr r1, _0809E838 @ =sub_809E3FC str r1, [r0] adds r0, r4, 0 - bl BgFrame_FillTileMap + bl sub_80A2078 _0809E828: pop {r4} pop {r0} @@ -20169,7 +20169,7 @@ _0809E8CA: ldr r0, _0809E8EC @ =sub_809E3FC str r0, [r1] adds r0, r5, 0 - bl BgFrame_FillTileMap + bl sub_80A2078 _0809E8DE: pop {r4,r5} pop {r0} @@ -20344,7 +20344,7 @@ _0809EA26: bl sub_80A0428 _0809EA34: mov r0, r8 - bl BgFrame_FillTileMap + bl sub_80A2078 add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -20401,7 +20401,7 @@ _0809EA8C: ldr r1, _0809EAC4 @ =sub_809E3FC str r1, [r0] adds r0, r5, 0 - bl BgFrame_FillTileMap + bl sub_80A2078 pop {r4,r5} pop {r0} bx r0 @@ -23067,7 +23067,7 @@ _0809FF6A: adds r0, r4, 0 movs r1, 0x1D movs r2, 0xE - bl sub_8072B4C + bl MenuPrint_RightAligned adds r0, r5, 0 movs r1, 0x17 movs r2, 0x10 @@ -24590,7 +24590,7 @@ sub_80A0BF4: @ 80A0BF4 _080A0C2E: ldr r4, _080A0C44 @ =gStringVar1 adds r0, r5, 0 - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy @@ -24611,7 +24611,7 @@ _080A0C5C: .4byte gOtherText_None _080A0C60: ldr r1, _080A0C78 @ =gStringVar1 adds r0, r5, 0 - bl itemid_copy_name + bl CopyItemName _080A0C68: ldr r0, _080A0C7C @ =gUnknown_083C15B4 adds r1, r7, 0 @@ -24708,7 +24708,7 @@ _080A0D14: lsrs r1, 24 adds r0, r4, 0 ldr r2, [sp] - bl sub_8072B4C + bl MenuPrint_RightAligned ldr r0, _080A0D58 @ =0x06004caa mov r9, r0 movs r2, 0 @@ -27228,8 +27228,8 @@ _080A2052: _080A2074: .4byte gOtherText_Comma thumb_func_end sub_80A203C - thumb_func_start BgFrame_FillTileMap -BgFrame_FillTileMap: @ 80A2078 + thumb_func_start sub_80A2078 +sub_80A2078: @ 80A2078 push {lr} ldr r3, _080A209C @ =gUnknown_03005CF0 ldr r2, _080A20A0 @ =gTasks @@ -27250,7 +27250,7 @@ BgFrame_FillTileMap: @ 80A2078 _080A209C: .4byte gUnknown_03005CF0 _080A20A0: .4byte gTasks _080A20A4: .4byte sub_80A20A8 - thumb_func_end BgFrame_FillTileMap + thumb_func_end sub_80A2078 thumb_func_start sub_80A20A8 sub_80A20A8: @ 80A20A8 @@ -29625,23 +29625,23 @@ _080A32A2: b _080A3464 _080A32A4: bl sub_80F944C - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette movs r0, 0 movs r1, 0xAC movs r2, 0xC - bl sub_80F953C + bl CreateVerticalScrollIndicators movs r0, 0x1 movs r1, 0xAC movs r2, 0x94 - bl sub_80F953C + bl CreateVerticalScrollIndicators movs r0, 0x2 movs r1, 0x1C movs r2, 0x58 - bl sub_80F953C + bl CreateVerticalScrollIndicators movs r0, 0x3 movs r1, 0x64 movs r2, 0x58 - bl sub_80F953C + bl CreateVerticalScrollIndicators movs r0, 0 movs r1, 0x2 bl sub_80F9988 @@ -29735,8 +29735,8 @@ _080A338C: adds r1, r0 movs r2, 0 ldrsh r0, [r1, r2] - bl sub_80A490C - bl sub_80A736C + bl ItemListMenu_InitDescription + bl ItemListMenu_InitMenu ldr r1, _080A33E4 @ =gUnknown_0203855B ldrb r0, [r4] adds r0, 0x1 @@ -29758,9 +29758,9 @@ _080A33E8: .4byte gUnknown_0203855C _080A33EC: .4byte gMain _080A33F0: .4byte 0x0000043c _080A33F4: - bl sub_80A7B10 + bl CreateBagSprite movs r0, 0 - bl sub_80A7C20 + bl CreateBagPokeballSprite bl sub_80A3740 b _080A3464 _080A3404: @@ -30169,7 +30169,7 @@ _080A371A: adds r1, r5 ldr r0, [r1] ldrb r1, [r1, 0x4] - bl sub_80A9684 + bl ClearItemSlots adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -30350,7 +30350,7 @@ _080A3868: ldrsh r0, [r1, r2] ldr r4, _080A38B0 @ =gUnknown_02038562 ldrb r1, [r4] - bl sub_80A49AC + bl ItemListMenu_ChangeDescription ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -30385,7 +30385,7 @@ _080A38C0: movs r2, 0 ldrsh r0, [r1, r2] ldrb r1, [r4] - bl sub_80A49AC + bl ItemListMenu_ChangeDescription ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -30413,7 +30413,7 @@ _080A38F2: bl sub_80A37C0 adds r0, r7, 0 bl DestroyTask - bl sub_80A736C + bl ItemListMenu_InitMenu movs r0, 0x2 movs r1, 0 bl sub_80F979C @@ -31187,7 +31187,7 @@ sub_80A3E90: @ 80A3E90 bl sub_80A763C movs r0, 0 bl sub_80A7528 - bl sub_80A736C + bl ItemListMenu_InitMenu pop {r4,r5} pop {r0} bx r0 @@ -31861,7 +31861,7 @@ _080A43A4: lsls r4, 2 adds r0, r4, r0 ldrh r0, [r0] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r6, 0 movs r2, 0x66 @@ -31963,7 +31963,7 @@ _080A4470: lsls r4, 2 adds r0, r4, r0 ldrh r0, [r0] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r7, 0 movs r2, 0x60 @@ -32312,7 +32312,7 @@ _080A4730: adds r0, r4, r0 ldrh r0, [r0] mov r1, r9 - bl itemid_copy_name + bl CopyItemName mov r1, r8 ldr r0, [r1] adds r4, r0 @@ -32509,8 +32509,8 @@ sub_80A48F8: @ 80A48F8 bx r0 thumb_func_end sub_80A48F8 - thumb_func_start sub_80A490C -sub_80A490C: @ 80A490C + thumb_func_start ItemListMenu_InitDescription +ItemListMenu_InitDescription: @ 80A490C push {r4,r5,lr} sub sp, 0x4 lsls r0, 16 @@ -32558,7 +32558,7 @@ _080A496C: .4byte gUnknown_0840E740 _080A4970: .4byte gUnknown_03000701 _080A4974: adds r0, r3, 0 - bl itemid_get_description + bl ItemId_GetDescription movs r1, 0x1 str r1, [sp] movs r1, 0x4 @@ -32584,10 +32584,10 @@ _080A49A4: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80A490C + thumb_func_end ItemListMenu_InitDescription - thumb_func_start sub_80A49AC -sub_80A49AC: @ 80A49AC + thumb_func_start ItemListMenu_ChangeDescription +ItemListMenu_ChangeDescription: @ 80A49AC push {r4,r5,lr} sub sp, 0x64 adds r4, r1, 0 @@ -32652,7 +32652,7 @@ _080A4A28: asrs r1, 16 mov r0, sp adds r2, r4, 0 - bl sub_80A99A8 + bl ItemId_CopyDescription cmp r0, 0 beq _080A4A4C lsls r2, r4, 20 @@ -32669,7 +32669,7 @@ _080A4A4C: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80A49AC + thumb_func_end ItemListMenu_ChangeDescription thumb_func_start sub_80A4A54 sub_80A4A54: @ 80A4A54 @@ -33254,7 +33254,7 @@ sub_80A4E8C: @ 80A4E8C bl sub_80A3770 bl sub_80A7C64 adds r0, r6, 0 - bl sub_80A7C20 + bl CreateBagPokeballSprite pop {r4-r6} pop {r0} bx r0 @@ -33909,7 +33909,7 @@ sub_80A5414: @ 80A5414 lsls r0, 24 lsrs r4, r0, 24 movs r5, 0 - bl rfu_lacks_rfufunc + bl sub_80A78A0 cmp r0, 0 bne _080A5426 b _080A5552 @@ -34444,7 +34444,7 @@ sub_80A5888: @ 80A5888 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - bl rfu_lacks_rfufunc + bl sub_80A78A0 cmp r0, 0 beq _080A5988 ldr r2, _080A58B8 @ =gMain @@ -34807,7 +34807,7 @@ sub_80A5B78: @ 80A5B78 lsrs r4, r0, 24 ldr r5, _080A5BB0 @ =word_203855E ldrh r0, [r5] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc cmp r0, 0 beq _080A5BF2 movs r0, 0x5 @@ -34817,7 +34817,7 @@ sub_80A5B78: @ 80A5B78 cmp r0, 0 bne _080A5BB4 ldrh r0, [r5] - bl itemid_get_type + bl ItemId_GetType lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -34843,7 +34843,7 @@ _080A5BB4: beq _080A5BEC ldr r0, _080A5BE8 @ =word_203855E ldrh r0, [r0] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc adds r1, r0, 0 adds r0, r4, 0 bl _call_via_r1 @@ -34892,7 +34892,7 @@ sub_80A5C24: @ 80A5C24 bl sub_80A7528 adds r0, r4, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r4, 0 bl sub_80A37C0 pop {r4} @@ -35044,7 +35044,7 @@ sub_80A5D38: @ 80A5D38 bl sub_80A7528 adds r0, r4, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r4, 0 bl sub_80A37C0 pop {r4} @@ -35085,7 +35085,7 @@ sub_80A5DA0: @ 80A5DA0 lsls r1, 16 lsrs r4, r1, 16 ldr r1, _080A5DC4 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName cmp r4, 0x63 bls _080A5DCC ldr r0, _080A5DC8 @ =gStringVar2 @@ -35323,7 +35323,7 @@ sub_80A5F80: @ 80A5F80 bl sub_80A7528 adds r0, r4, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r4, 0 bl sub_80A37C0 pop {r4} @@ -35362,7 +35362,7 @@ _080A5FE2: bl sub_80A7528 adds r0, r6, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r6, 0 bl sub_80A37C0 pop {r4-r6} @@ -35380,7 +35380,7 @@ sub_80A6000: @ 80A6000 bl sub_80A7528 adds r0, r4, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r4, 0 bl sub_80A37C0 pop {r4} @@ -35431,8 +35431,8 @@ _080A6074: .4byte gTasks _080A6078: .4byte sub_80A6000 thumb_func_end sub_80A6024 - thumb_func_start DisplayCannotDismountBikeMessage -DisplayCannotDismountBikeMessage: @ 80A607C + thumb_func_start DisplayCannotBeHeldMessage +DisplayCannotBeHeldMessage: @ 80A607C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 24 @@ -35441,7 +35441,7 @@ DisplayCannotDismountBikeMessage: @ 80A607C ldr r0, _080A60B4 @ =word_203855E ldrh r0, [r0] ldr r1, _080A60B8 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r5, _080A60BC @ =gStringVar4 ldr r1, _080A60C0 @ =gOtherText_CantBeHeld adds r0, r5, 0 @@ -35461,7 +35461,7 @@ _080A60B8: .4byte gStringVar1 _080A60BC: .4byte gStringVar4 _080A60C0: .4byte gOtherText_CantBeHeld _080A60C4: .4byte sub_80A6024 - thumb_func_end DisplayCannotDismountBikeMessage + thumb_func_end DisplayCannotBeHeldMessage thumb_func_start ItemMenu_Give ItemMenu_Give: @ 80A60C8 @@ -35492,7 +35492,7 @@ _080A6100: .4byte gOtherText_CantWriteMail _080A6104: .4byte sub_80A6024 _080A6108: ldrh r0, [r5] - bl itemid_is_unique + bl ItemId_GetImportance lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -35534,7 +35534,7 @@ _080A6160: .4byte sub_80A5B00 _080A6164: .4byte gUnknown_02038561 _080A6168: adds r0, r6, 0 - bl DisplayCannotDismountBikeMessage + bl DisplayCannotBeHeldMessage _080A616E: add sp, 0x4 pop {r4-r6} @@ -35661,7 +35661,7 @@ _080A6254: bl sub_80A73FC ldrh r0, [r4] ldr r1, _080A6288 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r4, _080A628C @ =gStringVar4 ldr r1, _080A6290 @ =gOtherText_CantBeHeldHere adds r0, r4, 0 @@ -35683,7 +35683,7 @@ _080A6298: cmp r6, 0x5 beq _080A62CC ldrh r0, [r4] - bl itemid_is_unique + bl ItemId_GetImportance lsls r0, 24 cmp r0, 0 bne _080A62CC @@ -35704,7 +35704,7 @@ _080A62C4: .4byte gTasks _080A62C8: .4byte sub_808A3F8 _080A62CC: adds r0, r5, 0 - bl DisplayCannotDismountBikeMessage + bl DisplayCannotBeHeldMessage _080A62D2: pop {r4-r6} pop {r0} @@ -35808,9 +35808,9 @@ sub_80A6354: @ 80A6354 ldr r4, _080A63D0 @ =word_203855E ldrh r0, [r4] ldr r1, _080A63D4 @ =gStringVar2 - bl itemid_copy_name + bl CopyItemName ldrh r0, [r4] - bl itemid_get_market_price + bl ItemId_GetPrice lsls r0, 16 cmp r0, 0 bne _080A63E4 @@ -35870,7 +35870,7 @@ sub_80A640C: @ 80A640C bl sub_80A7528 adds r0, r4, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r4, 0 bl sub_80A37C0 pop {r4} @@ -36082,7 +36082,7 @@ sub_80A65AC: @ 80A65AC ldr r0, _080A6604 @ =word_203855E ldrh r0, [r0] ldr r1, _080A6608 @ =gStringVar2 - bl itemid_copy_name + bl CopyItemName ldr r4, _080A660C @ =gStringVar4 ldr r1, _080A6610 @ =gOtherText_SoldItem adds r0, r4, 0 @@ -36208,7 +36208,7 @@ _080A66B4: ldr r4, _080A672C @ =gStringVar1 ldr r0, _080A6730 @ =word_203855E ldrh r0, [r0] - bl itemid_get_market_price + bl ItemId_GetPrice lsls r0, 16 lsrs r0, 17 ldr r2, _080A6734 @ =gTasks @@ -36275,7 +36275,7 @@ sub_80A6760: @ 80A6760 bl sub_80A7528 adds r0, r4, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r4, 0 bl sub_80A37C0 pop {r4} @@ -36339,7 +36339,7 @@ BuyMenuDisplayMessage: @ 80A67F4 lsls r5, 16 lsrs r5, 16 adds r0, r4, 0 - bl itemid_get_market_price + bl ItemId_GetPrice lsls r0, 16 lsrs r0, 17 muls r0, r5 @@ -36349,7 +36349,7 @@ BuyMenuDisplayMessage: @ 80A67F4 bl sub_80B7A94 ldr r6, _080A6838 @ =gStringVar1 adds r0, r4, 0 - bl itemid_get_market_price + bl ItemId_GetPrice lsls r0, 16 lsrs r0, 17 adds r1, r0, 0 @@ -36401,7 +36401,7 @@ sub_80A6870: @ 80A6870 lsls r4, 24 lsrs r4, 24 ldr r5, _080A68A0 @ =gSaveBlock1 + 0x490 - bl itemid_get_market_price + bl ItemId_GetPrice lsls r0, 16 lsrs r0, 17 adds r1, r0, 0 @@ -36693,7 +36693,7 @@ sub_80A6A84: @ 80A6A84 ldr r0, _080A6AF0 @ =word_203855E ldrh r0, [r0] ldr r1, _080A6AF4 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r0, _080A6AF8 @ =gStringVar2 mov r2, r8 movs r3, 0x2 @@ -36792,7 +36792,7 @@ sub_80A6B64: @ 80A6B64 ldr r0, _080A6BA0 @ =word_203855E mov r8, r0 ldrh r0, [r0] - bl itemid_is_unique + bl ItemId_GetImportance lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -36813,7 +36813,7 @@ _080A6BA8: mov r1, r8 ldrh r0, [r1] ldrh r1, [r7, 0x2] - bl sub_80A9760 + bl AddPCItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -36997,7 +36997,7 @@ sub_80A6D1C: @ 80A6D1C cmp r0, 0 beq _080A6D84 movs r1, 0x1 - bl sub_80A92D4 + bl CheckBagHasItem lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 @@ -37010,7 +37010,7 @@ sub_80A6D1C: @ 80A6D1C ldrh r0, [r4] strh r0, [r1] ldrh r0, [r4] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc movs r1, 0x8 bl CreateTask lsls r0, 24 @@ -37320,7 +37320,7 @@ sub_80A6FDC: @ 80A6FDC push {lr} ldr r0, _080A6FF8 @ =word_203855E ldrh r0, [r0] - bl itemid_get_usage + bl ItemId_GetBattleUsage lsls r0, 24 cmp r0, 0 beq _080A7008 @@ -37458,13 +37458,13 @@ ItemMenu_UseInBattle: @ 80A70F4 lsrs r5, r0, 24 ldr r4, _080A7120 @ =word_203855E ldrh r0, [r4] - bl itemid_get_battle_function + bl ItemId_GetBattleFunc cmp r0, 0 beq _080A711A movs r0, 0x5 bl PlaySE ldrh r0, [r4] - bl itemid_get_battle_function + bl ItemId_GetBattleFunc adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 @@ -37488,7 +37488,7 @@ sub_80A7124: @ 80A7124 bl sub_80A7528 adds r0, r4, 0 bl sub_80A41D4 - bl sub_80A736C + bl ItemListMenu_InitMenu adds r0, r4, 0 bl sub_80A37C0 pop {r4} @@ -37573,16 +37573,16 @@ _080A71B2: bl memcpy adds r0, r5, 0 movs r1, 0x14 - bl sub_80A9684 + bl ClearItemSlots adds r0, r4, 0 movs r1, 0x10 - bl sub_80A9684 + bl ClearItemSlots movs r0, 0xD movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem movs r0, 0x4 movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem ldr r1, _080A7228 @ =gUnknown_03000701 movs r0, 0x7 strb r0, [r1] @@ -37743,8 +37743,8 @@ _080A735E: bx r0 thumb_func_end sub_80A7230 - thumb_func_start sub_80A736C -sub_80A736C: @ 80A736C + thumb_func_start ItemListMenu_InitMenu +ItemListMenu_InitMenu: @ 80A736C push {lr} sub sp, 0x8 ldr r1, _080A73B0 @ =gUnknown_03005D10 @@ -37771,7 +37771,7 @@ sub_80A736C: @ 80A736C str r0, [sp] movs r0, 0x10 movs r2, 0xC - bl sub_814AC58 + bl CreateBlendedOutlineCursor bl sub_80A73C0 add sp, 0x8 pop {r0} @@ -37781,7 +37781,7 @@ _080A73B0: .4byte gUnknown_03005D10 _080A73B4: .4byte gUnknown_02038559 _080A73B8: .4byte 0x0000ffff _080A73BC: .4byte 0x00002d9f - thumb_func_end sub_80A736C + thumb_func_end ItemListMenu_InitMenu thumb_func_start sub_80A73C0 sub_80A73C0: @ 80A73C0 @@ -37892,7 +37892,7 @@ _080A7478: movs r2, 0 ldrsh r0, [r1, r2] ldrb r1, [r4, 0x1] - bl sub_80A49AC + bl ItemListMenu_ChangeDescription b _080A74FC .align 2, 0 _080A74A0: .4byte gUnknown_03005D10 @@ -38499,8 +38499,8 @@ _080A789C: bx r0 thumb_func_end sub_80A7880 - thumb_func_start rfu_lacks_rfufunc -rfu_lacks_rfufunc: @ 80A78A0 + thumb_func_start sub_80A78A0 +sub_80A78A0: @ 80A78A0 push {lr} ldr r0, _080A78B4 @ =gUnknown_02038550 movs r1, 0 @@ -38514,7 +38514,7 @@ _080A78AE: bx r1 .align 2, 0 _080A78B4: .4byte gUnknown_02038550 - thumb_func_end rfu_lacks_rfufunc + thumb_func_end sub_80A78A0 thumb_func_start sub_80A78B8 sub_80A78B8: @ 80A78B8 @@ -38866,8 +38866,8 @@ sub_80A7AE4: @ 80A7AE4 _080A7B0C: .4byte gUnknown_0203855C thumb_func_end sub_80A7AE4 - thumb_func_start sub_80A7B10 -sub_80A7B10: @ 80A7B10 + thumb_func_start CreateBagSprite +CreateBagSprite: @ 80A7B10 push {lr} ldr r0, _080A7B24 @ =gSpriteTemplate_83C1CE0 movs r1, 0x3A @@ -38878,7 +38878,7 @@ sub_80A7B10: @ 80A7B10 bx r0 .align 2, 0 _080A7B24: .4byte gSpriteTemplate_83C1CE0 - thumb_func_end sub_80A7B10 + thumb_func_end CreateBagSprite thumb_func_start sub_80A7B28 sub_80A7B28: @ 80A7B28 @@ -39013,8 +39013,8 @@ _080A7C16: _080A7C1C: .4byte SpriteCallbackDummy thumb_func_end sub_80A7B6C - thumb_func_start sub_80A7C20 -sub_80A7C20: @ 80A7C20 + thumb_func_start CreateBagPokeballSprite +CreateBagPokeballSprite: @ 80A7C20 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -39043,7 +39043,7 @@ _080A7C54: .4byte gUnknown_083C1D30 _080A7C58: .4byte gSpriteTemplate_83C1D38 _080A7C5C: .4byte gUnknown_02038568 _080A7C60: .4byte gSprites - thumb_func_end sub_80A7C20 + thumb_func_end CreateBagPokeballSprite thumb_func_start sub_80A7C64 sub_80A7C64: @ 80A7C64 @@ -41896,8 +41896,8 @@ _080A921A: _080A9220: .4byte gSprites thumb_func_end sub_80A913C - thumb_func_start itemid_copy_name -itemid_copy_name: @ 80A9224 + thumb_func_start CopyItemName +CopyItemName: @ 80A9224 push {r4,lr} adds r4, r1, 0 lsls r0, 16 @@ -41916,7 +41916,7 @@ itemid_copy_name: @ 80A9224 .align 2, 0 _080A9248: .4byte gOtherText_Berry2 _080A924C: - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy @@ -41924,10 +41924,10 @@ _080A9258: pop {r4} pop {r0} bx r0 - thumb_func_end itemid_copy_name + thumb_func_end CopyItemName - thumb_func_start unref_sub_80A9260 -unref_sub_80A9260: @ 80A9260 + thumb_func_start CountUsedBagPocketSlots +CountUsedBagPocketSlots: @ 80A9260 push {lr} lsls r0, 24 movs r2, 0 @@ -41961,7 +41961,7 @@ _080A9292: _080A9296: pop {r1} bx r1 - thumb_func_end unref_sub_80A9260 + thumb_func_end CountUsedBagPocketSlots thumb_func_start IsBagPocketNonEmpty IsBagPocketNonEmpty: @ 80A929C @@ -41999,15 +41999,15 @@ _080A92D0: bx r1 thumb_func_end IsBagPocketNonEmpty - thumb_func_start sub_80A92D4 -sub_80A92D4: @ 80A92D4 + thumb_func_start CheckBagHasItem +CheckBagHasItem: @ 80A92D4 push {r4-r7,lr} lsls r0, 16 lsrs r5, r0, 16 lsls r1, 16 lsrs r4, r1, 16 adds r0, r5, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 bne _080A92F0 @@ -42017,7 +42017,7 @@ _080A92EC: b _080A9338 _080A92F0: adds r0, r5, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 movs r3, 0 @@ -42060,10 +42060,10 @@ _080A9338: bx r1 .align 2, 0 _080A9340: .4byte gBagPockets - thumb_func_end sub_80A92D4 + thumb_func_end CheckBagHasItem - thumb_func_start sub_80A9344 -sub_80A9344: @ 80A9344 + thumb_func_start CheckBagHasSpace +CheckBagHasSpace: @ 80A9344 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -42074,12 +42074,12 @@ sub_80A9344: @ 80A9344 lsls r1, 16 lsrs r4, r1, 16 adds r0, r6, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 beq _080A9408 adds r0, r6, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 lsrs r1, r0, 24 @@ -42183,10 +42183,10 @@ _080A9416: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A9344 + thumb_func_end CheckBagHasSpace - thumb_func_start sub_80A9424 -sub_80A9424: @ 80A9424 + thumb_func_start AddBagItem +AddBagItem: @ 80A9424 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -42197,12 +42197,12 @@ sub_80A9424: @ 80A9424 mov r8, r0 lsls r1, 16 lsrs r4, r1, 16 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 beq _080A9510 mov r0, r8 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -42331,10 +42331,10 @@ _080A9528: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A9424 + thumb_func_end AddBagItem - thumb_func_start sub_80A9538 -sub_80A9538: @ 80A9538 + thumb_func_start RemoveBagItem +RemoveBagItem: @ 80A9538 push {r4-r7,lr} mov r7, r8 push {r7} @@ -42344,14 +42344,14 @@ sub_80A9538: @ 80A9538 lsrs r4, r1, 16 movs r7, 0 adds r0, r6, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 beq _080A959E cmp r6, 0 beq _080A959E adds r0, r6, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 lsrs r0, 24 @@ -42501,22 +42501,22 @@ _080A9664: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A9538 + thumb_func_end RemoveBagItem - thumb_func_start sub_80A9670 -sub_80A9670: @ 80A9670 + thumb_func_start GetPocketByItemId +GetPocketByItemId: @ 80A9670 push {lr} lsls r0, 16 lsrs r0, 16 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_80A9670 + thumb_func_end GetPocketByItemId - thumb_func_start sub_80A9684 -sub_80A9684: @ 80A9684 + thumb_func_start ClearItemSlots +ClearItemSlots: @ 80A9684 push {r4,lr} adds r4, r0, 0 lsls r1, 24 @@ -42539,10 +42539,10 @@ _080A96A6: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80A9684 + thumb_func_end ClearItemSlots - thumb_func_start sub_80A96AC -sub_80A96AC: @ 80A96AC + thumb_func_start FindFreePCItemSlot +FindFreePCItemSlot: @ 80A96AC push {lr} movs r1, 0 ldr r3, _080A96CC @ =gSaveBlock1 @@ -42573,10 +42573,10 @@ _080A96D0: _080A96E0: pop {r1} bx r1 - thumb_func_end sub_80A96AC + thumb_func_end FindFreePCItemSlot - thumb_func_start sub_80A96E4 -sub_80A96E4: @ 80A96E4 + thumb_func_start CountUsedPCItemSlots +CountUsedPCItemSlots: @ 80A96E4 push {r4,lr} movs r2, 0 movs r1, 0 @@ -42605,10 +42605,10 @@ _080A9702: bx r1 .align 2, 0 _080A9714: .4byte gSaveBlock1 - thumb_func_end sub_80A96E4 + thumb_func_end CountUsedPCItemSlots - thumb_func_start sub_80A9718 -sub_80A9718: @ 80A9718 + thumb_func_start CheckPCHasItem +CheckPCHasItem: @ 80A9718 push {r4-r7,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -42646,10 +42646,10 @@ _080A9758: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A9718 + thumb_func_end CheckPCHasItem - thumb_func_start sub_80A9760 -sub_80A9760: @ 80A9760 + thumb_func_start AddPCItem +AddPCItem: @ 80A9760 push {r4-r7,lr} sub sp, 0xC8 lsls r0, 16 @@ -42690,7 +42690,7 @@ _080A97A0: bls _080A977C cmp r4, 0 beq _080A97DC - bl sub_80A96AC + bl FindFreePCItemSlot lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 @@ -42724,10 +42724,10 @@ _080A97E8: bx r1 .align 2, 0 _080A97F0: .4byte gSaveBlock1 + 0x498 - thumb_func_end sub_80A9760 + thumb_func_end AddPCItem - thumb_func_start sub_80A97F4 -sub_80A97F4: @ 80A97F4 + thumb_func_start RemovePCItem +RemovePCItem: @ 80A97F4 push {lr} lsls r0, 24 lsls r1, 16 @@ -42748,17 +42748,17 @@ sub_80A97F4: @ 80A97F4 lsls r2, 3 adds r0, r3, r2 strh r1, [r0] - bl sub_80A982C + bl CompactPCItems _080A9820: pop {r0} bx r0 .align 2, 0 _080A9824: .4byte gSaveBlock1 _080A9828: .4byte 0x0000049a - thumb_func_end sub_80A97F4 + thumb_func_end RemovePCItem - thumb_func_start sub_80A982C -sub_80A982C: @ 80A982C + thumb_func_start CompactPCItems +CompactPCItems: @ 80A982C push {r4-r7,lr} movs r2, 0 ldr r0, _080A987C @ =gSaveBlock1 @@ -42805,10 +42805,10 @@ _080A986C: .align 2, 0 _080A987C: .4byte gSaveBlock1 _080A9880: .4byte gSaveBlock1 + 0x498 - thumb_func_end sub_80A982C + thumb_func_end CompactPCItems - thumb_func_start sub_80A9884 -sub_80A9884: @ 80A9884 + thumb_func_start SwapRegisteredBike +SwapRegisteredBike: @ 80A9884 push {lr} ldr r0, _080A98A0 @ =gSaveBlock1 ldr r1, _080A98A4 @ =0x00000496 @@ -42836,10 +42836,10 @@ _080A98B4: _080A98B6: pop {r0} bx r0 - thumb_func_end sub_80A9884 + thumb_func_end SwapRegisteredBike - thumb_func_start itemid_sanitize -itemid_sanitize: @ 80A98BC + thumb_func_start SanitizeItemId +SanitizeItemId: @ 80A98BC push {lr} lsls r0, 16 lsrs r1, r0, 16 @@ -42854,14 +42854,14 @@ _080A98CE: _080A98D0: pop {r1} bx r1 - thumb_func_end itemid_sanitize + thumb_func_end SanitizeItemId - thumb_func_start itemid_get_item -itemid_get_item: @ 80A98D4 + thumb_func_start ItemId_GetItem +ItemId_GetItem: @ 80A98D4 push {lr} lsls r0, 16 lsrs r0, 16 - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -42872,15 +42872,15 @@ itemid_get_item: @ 80A98D4 bx r1 .align 2, 0 _080A98F0: .4byte gItems - thumb_func_end itemid_get_item + thumb_func_end ItemId_GetItem - thumb_func_start itemid_get_number -itemid_get_number: @ 80A98F4 + thumb_func_start ItemId_GetId +ItemId_GetId: @ 80A98F4 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9914 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -42892,15 +42892,15 @@ itemid_get_number: @ 80A98F4 bx r1 .align 2, 0 _080A9914: .4byte gItems - thumb_func_end itemid_get_number + thumb_func_end ItemId_GetId - thumb_func_start itemid_get_market_price -itemid_get_market_price: @ 80A9918 + thumb_func_start ItemId_GetPrice +ItemId_GetPrice: @ 80A9918 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9938 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -42912,15 +42912,15 @@ itemid_get_market_price: @ 80A9918 bx r1 .align 2, 0 _080A9938: .4byte gItems - thumb_func_end itemid_get_market_price + thumb_func_end ItemId_GetPrice - thumb_func_start itemid_get_x12 -itemid_get_x12: @ 80A993C + thumb_func_start ItemId_GetHoldEffect +ItemId_GetHoldEffect: @ 80A993C push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A995C @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -42932,15 +42932,15 @@ itemid_get_x12: @ 80A993C bx r1 .align 2, 0 _080A995C: .4byte gItems - thumb_func_end itemid_get_x12 + thumb_func_end ItemId_GetHoldEffect - thumb_func_start itemid_get_quality -itemid_get_quality: @ 80A9960 + thumb_func_start ItemId_GetHoldEffectParam +ItemId_GetHoldEffectParam: @ 80A9960 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9980 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -42952,15 +42952,15 @@ itemid_get_quality: @ 80A9960 bx r1 .align 2, 0 _080A9980: .4byte gItems - thumb_func_end itemid_get_quality + thumb_func_end ItemId_GetHoldEffectParam - thumb_func_start itemid_get_description -itemid_get_description: @ 80A9984 + thumb_func_start ItemId_GetDescription +ItemId_GetDescription: @ 80A9984 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A99A4 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -42973,10 +42973,10 @@ itemid_get_description: @ 80A9984 bx r1 .align 2, 0 _080A99A4: .4byte gItems - thumb_func_end itemid_get_description + thumb_func_end ItemId_GetDescription - thumb_func_start sub_80A99A8 -sub_80A99A8: @ 80A99A8 + thumb_func_start ItemId_CopyDescription +ItemId_CopyDescription: @ 80A99A8 push {r4-r6,lr} adds r6, r0, 0 adds r0, r1, 0 @@ -42984,7 +42984,7 @@ sub_80A99A8: @ 80A99A8 ldr r4, _080A99E4 @ =gItems lsls r0, 16 lsrs r0, 16 - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43029,15 +43029,15 @@ _080A9A02: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80A99A8 + thumb_func_end ItemId_CopyDescription - thumb_func_start itemid_is_unique -itemid_is_unique: @ 80A9A08 + thumb_func_start ItemId_GetImportance +ItemId_GetImportance: @ 80A9A08 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9A28 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43049,15 +43049,15 @@ itemid_is_unique: @ 80A9A08 bx r1 .align 2, 0 _080A9A28: .4byte gItems - thumb_func_end itemid_is_unique + thumb_func_end ItemId_GetImportance - thumb_func_start itemid_get_x19 -itemid_get_x19: @ 80A9A2C + thumb_func_start ItemId_GetUnknownValue +ItemId_GetUnknownValue: @ 80A9A2C push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9A4C @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43069,15 +43069,15 @@ itemid_get_x19: @ 80A9A2C bx r1 .align 2, 0 _080A9A4C: .4byte gItems - thumb_func_end itemid_get_x19 + thumb_func_end ItemId_GetUnknownValue - thumb_func_start itemid_get_pocket_number -itemid_get_pocket_number: @ 80A9A50 + thumb_func_start ItemId_GetPocket +ItemId_GetPocket: @ 80A9A50 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9A70 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43089,15 +43089,15 @@ itemid_get_pocket_number: @ 80A9A50 bx r1 .align 2, 0 _080A9A70: .4byte gItems - thumb_func_end itemid_get_pocket_number + thumb_func_end ItemId_GetPocket - thumb_func_start itemid_get_type -itemid_get_type: @ 80A9A74 + thumb_func_start ItemId_GetType +ItemId_GetType: @ 80A9A74 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9A94 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43109,15 +43109,15 @@ itemid_get_type: @ 80A9A74 bx r1 .align 2, 0 _080A9A94: .4byte gItems - thumb_func_end itemid_get_type + thumb_func_end ItemId_GetType - thumb_func_start itemid_get_overworld_function -itemid_get_overworld_function: @ 80A9A98 + thumb_func_start ItemId_GetFieldFunc +ItemId_GetFieldFunc: @ 80A9A98 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9AB8 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43130,15 +43130,15 @@ itemid_get_overworld_function: @ 80A9A98 bx r1 .align 2, 0 _080A9AB8: .4byte gItems - thumb_func_end itemid_get_overworld_function + thumb_func_end ItemId_GetFieldFunc - thumb_func_start itemid_get_usage -itemid_get_usage: @ 80A9ABC + thumb_func_start ItemId_GetBattleUsage +ItemId_GetBattleUsage: @ 80A9ABC push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9ADC @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43151,15 +43151,15 @@ itemid_get_usage: @ 80A9ABC bx r1 .align 2, 0 _080A9ADC: .4byte gItems - thumb_func_end itemid_get_usage + thumb_func_end ItemId_GetBattleUsage - thumb_func_start itemid_get_battle_function -itemid_get_battle_function: @ 80A9AE0 + thumb_func_start ItemId_GetBattleFunc +ItemId_GetBattleFunc: @ 80A9AE0 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9B00 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43172,15 +43172,15 @@ itemid_get_battle_function: @ 80A9AE0 bx r1 .align 2, 0 _080A9B00: .4byte gItems - thumb_func_end itemid_get_battle_function + thumb_func_end ItemId_GetBattleFunc - thumb_func_start itemid_get_x28 -itemid_get_x28: @ 80A9B04 + thumb_func_start ItemId_GetSecondaryId +ItemId_GetSecondaryId: @ 80A9B04 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, _080A9B24 @ =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -43193,7 +43193,7 @@ itemid_get_x28: @ 80A9B04 bx r1 .align 2, 0 _080A9B24: .4byte gItems - thumb_func_end itemid_get_x28 + thumb_func_end ItemId_GetSecondaryId thumb_func_start unref_sub_80A9B28 unref_sub_80A9B28: @ 80A9B28 @@ -52373,8 +52373,8 @@ _080AE590: .4byte gUnknown_02038696 _080AE594: .4byte gUnknown_03004210 thumb_func_end sub_80AE514 - thumb_func_start PutWindowTilemap -PutWindowTilemap: @ 80AE598 + thumb_func_start sub_80AE598 +sub_80AE598: @ 80AE598 push {r4,r5,lr} adds r5, r1, 0 lsls r4, r2, 24 @@ -52390,7 +52390,7 @@ PutWindowTilemap: @ 80AE598 bx r1 .align 2, 0 _080AE5B8: .4byte gUnknown_083CC59C - thumb_func_end PutWindowTilemap + thumb_func_end sub_80AE598 thumb_func_start sub_80AE5BC sub_80AE5BC: @ 80AE5BC @@ -52419,7 +52419,7 @@ sub_80AE5D4: @ 80AE5D4 ldr r3, _080AE660 @ =gUnknown_020238CC ldr r1, _080AE664 @ =gEmptyString_81E72B0 adds r0, r3, 0 - bl PutWindowTilemap + bl sub_80AE598 adds r3, r0, 0 movs r0, 0xFC strb r0, [r3] @@ -52559,7 +52559,7 @@ sub_80AE6E4: @ 80AE6E4 ldr r0, _080AE760 @ =gUnknown_02038572 adds r1, r0 adds r0, r3, 0 - bl PutWindowTilemap + bl sub_80AE598 adds r3, r0, 0 movs r0, 0xFF strb r0, [r3] @@ -54001,7 +54001,7 @@ _080AF1FE: ldr r0, _080AF220 @ =gUnknown_020238CC ldr r1, _080AF224 @ =gUnknownText_MissedTurn adds r2, r3, 0 - bl PutWindowTilemap + bl sub_80AE598 b _080AF23A .align 2, 0 _080AF21C: .4byte 0x02019260 @@ -54015,7 +54015,7 @@ _080AF228: ldr r2, _080AF274 @ =gMoveNames adds r1, r2 adds r2, r3, 0 - bl PutWindowTilemap + bl sub_80AE598 _080AF23A: adds r0, r5, 0 bl sub_80AF2A0 @@ -56112,7 +56112,7 @@ _080B01BA: .align 2, 0 _080B01D4: .4byte 0x0201920d _080B01D8: .4byte gSprites + 0x1C -_080B01DC: .4byte ObjectCB_SwitchPocketRotatingBallInit +_080B01DC: .4byte sub_80B0238 thumb_func_end unref_sub_80B01B0 thumb_func_start unref_sub_80B01E0 @@ -56164,8 +56164,8 @@ _080B0232: bx r1 thumb_func_end unref_sub_80B01E0 - thumb_func_start ObjectCB_SwitchPocketRotatingBallInit -ObjectCB_SwitchPocketRotatingBallInit: @ 80B0238 + thumb_func_start sub_80B0238 +sub_80B0238: @ 80B0238 push {r4,lr} adds r4, r0, 0 ldrb r1, [r4, 0x1] @@ -56200,7 +56200,7 @@ _080B0272: bx r0 .align 2, 0 _080B027C: .4byte sub_80B0280 - thumb_func_end ObjectCB_SwitchPocketRotatingBallInit + thumb_func_end sub_80B0238 thumb_func_start sub_80B0280 sub_80B0280: @ 80B0280 @@ -62421,11 +62421,11 @@ sub_80B3270: @ 80B3270 movs r0, 0 movs r1, 0xAC movs r2, 0xC - bl sub_80F953C + bl CreateVerticalScrollIndicators movs r0, 0x1 movs r1, 0xAC movs r2, 0x94 - bl sub_80F953C + bl CreateVerticalScrollIndicators movs r0, 0 movs r1, 0x1 bl sub_80F979C @@ -63159,7 +63159,7 @@ sub_80B37F8: @ 80B37F8 lsls r0, 1 adds r0, r1 ldrh r0, [r0] - bl itemid_get_market_price + bl ItemId_GetPrice adds r4, r0, 0 movs r0, 0x1 bl GetPriceReduction @@ -63246,7 +63246,7 @@ sub_80B389C: @ 80B389C _080B38C8: adds r0, r2, 0 adds r1, r5, 0 - bl itemid_copy_name + bl CopyItemName ldr r6, _080B392C @ =gStringVar1 lsls r7, r4, 3 movs r0, 0x1 @@ -63263,7 +63263,7 @@ _080B38C8: adds r5, r6, 0x3 _080B38EE: mov r0, r9 - bl itemid_get_market_price + bl ItemId_GetPrice adds r4, r0, 0 movs r0, 0x1 bl GetPriceReduction @@ -63475,7 +63475,7 @@ sub_80B3A70: @ 80B3A70 lsls r0, 1 adds r0, r1 ldrh r0, [r0] - bl itemid_get_description + bl ItemId_GetDescription movs r1, 0x30 str r1, [sp] str r4, [sp, 0x4] @@ -63566,7 +63566,7 @@ _080B3B06: ble _080B3B74 movs r0, 0xC movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -63699,7 +63699,7 @@ sub_80B3BF4: @ 80B3BF4 lsls r1, 3 adds r1, r2 ldrh r1, [r1, 0xA] - bl sub_80A9424 + bl AddBagItem lsls r0, 24 cmp r0, 0 beq _080B3C9C @@ -63897,7 +63897,7 @@ _080B3DEE: lsls r0, 1 adds r0, r1 ldrh r0, [r0] - bl itemid_get_market_price + bl ItemId_GetPrice adds r4, r0, 0 movs r0, 0x1 bl GetPriceReduction @@ -63940,7 +63940,7 @@ _080B3DEE: adds r0, r1 ldrh r0, [r0] ldr r1, _080B3EBC @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r0, _080B3EC0 @ =gStringVar2 movs r2, 0xA ldrsh r1, [r5, r2] @@ -64023,7 +64023,7 @@ sub_80B3EFC: @ 80B3EFC lsls r0, 1 adds r0, r1 ldrh r0, [r0] - bl itemid_get_market_price + bl ItemId_GetPrice adds r4, r0, 0 movs r0, 0x1 bl GetPriceReduction @@ -64386,7 +64386,7 @@ _080B41CE: lsls r0, 1 adds r0, r1 ldrh r0, [r0] - bl itemid_get_market_price + bl ItemId_GetPrice adds r4, r0, 0 movs r0, 0x1 bl GetPriceReduction @@ -64414,7 +64414,7 @@ _080B41CE: adds r0, r1 ldrh r0, [r0] ldr r1, _080B4278 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r4, _080B427C @ =gStringVar4 ldr r1, _080B4280 @ =gOtherText_HowManyYouWant adds r0, r4, 0 @@ -64764,7 +64764,7 @@ ClearItemPurchases: @ 80B4534 strb r1, [r0] ldr r0, _080B454C @ =gUnknown_02038724 movs r1, 0x3 - bl sub_80A9684 + bl ClearItemSlots pop {r0} bx r0 .align 2, 0 diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s index afcee9c10..994f6a5c5 100644 --- a/asm/rom_81258BC.s +++ b/asm/rom_81258BC.s @@ -17288,7 +17288,7 @@ _08133500: str r0, [sp] movs r0, 0x10 movs r2, 0xC - bl sub_814AC58 + bl CreateBlendedOutlineCursor add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -22052,7 +22052,7 @@ _08135A1C: adds r2, 0x1 cmp r2, 0x2 ble _08135A1C - bl sub_80C5604 + bl ReducePlayerPartyToThree pop {r4} pop {r0} bx r0 @@ -22556,14 +22556,14 @@ sub_8135DEC: @ 8135DEC adds r6, r5, r0 ldrh r0, [r6] movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 bne _08135E30 ldrh r0, [r6] ldr r1, _08135E28 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r0, _08135E2C @ =gScriptResult strh r4, [r0] b _08135E40 @@ -30207,7 +30207,7 @@ NewGameInitPCItems: @ 8139C18 movs r4, 0 ldr r0, _08139C6C @ =gSaveBlock1 + 0x498 movs r1, 0x32 - bl sub_80A9684 + bl ClearItemSlots ldr r1, _08139C70 @ =gNewGamePCItems ldrh r0, [r1] cmp r0, 0 @@ -30223,7 +30223,7 @@ _08139C36: ldrh r0, [r0] adds r1, r6 ldrh r1, [r1] - bl sub_80A9760 + bl AddPCItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -30846,7 +30846,7 @@ sub_813A118: @ 813A118 movs r2, 0xB movs r3, 0x9 bl MenuZeroFillWindowRect - bl sub_80A96E4 + bl CountUsedPCItemSlots lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x4] @@ -30906,7 +30906,7 @@ sub_813A198: @ 813A198 movs r2, 0xB movs r3, 0x9 bl MenuZeroFillWindowRect - bl sub_80A96E4 + bl CountUsedPCItemSlots lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x4] @@ -31587,14 +31587,14 @@ sub_813A6FC: @ 813A6FC adds r5, r0, r2 ldrh r0, [r5] ldrh r1, [r4, 0x6] - bl sub_80A9424 + bl AddBagItem lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0813A770 ldrh r0, [r5] ldr r1, _0813A760 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r0, _0813A764 @ =gStringVar2 movs r2, 0x6 ldrsh r1, [r4, r2] @@ -31658,13 +31658,13 @@ sub_813A794: @ 813A794 lsls r2, 3 adds r5, r0, r2 ldrh r0, [r5] - bl itemid_is_unique + bl ItemId_GetImportance lsls r0, 24 cmp r0, 0 bne _0813A814 ldrh r0, [r5] ldr r1, _0813A804 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName ldr r0, _0813A808 @ =gStringVar2 movs r2, 0x6 ldrsh r1, [r4, r2] @@ -31820,9 +31820,9 @@ _0813A912: lsls r0, 24 lsrs r0, 24 ldrh r1, [r5, 0x6] - bl sub_80A97F4 + bl RemovePCItem ldrh r4, [r5, 0x4] - bl sub_80A96E4 + bl CountUsedPCItemSlots lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x4] @@ -32092,7 +32092,7 @@ sub_813AB28: @ 813AB28 lsrs r5, r1, 24 ldrh r0, [r0] ldr r1, _0813AB48 @ =gStringVar1 - bl itemid_copy_name + bl CopyItemName cmp r4, 0 beq _0813AB50 ldr r0, _0813AB4C @ =gUnknown_0840631E @@ -32234,7 +32234,7 @@ _0813AC34: lsls r2, 3 adds r0, r2 ldrh r0, [r0] - bl sub_80A9670 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 subs r0, 0x1 @@ -32322,7 +32322,7 @@ _0813ACEA: movs r0, 0 movs r1, 0xB8 movs r2, 0x8 - bl sub_80F953C + bl CreateVerticalScrollIndicators b _0813AD26 .align 2, 0 _0813AD00: .4byte gSaveBlock1 + 0x498 @@ -32356,7 +32356,7 @@ _0813AD26: movs r0, 0x1 movs r1, 0xB8 movs r2, 0x98 - bl sub_80F953C + bl CreateVerticalScrollIndicators b _0813AD4A _0813AD44: movs r0, 0x1 @@ -32446,7 +32446,7 @@ _0813ADE0: _0813ADE4: .4byte gOtherText_SwitchWhichItem _0813ADE8: adds r0, r1, 0 - bl itemid_get_description + bl ItemId_GetDescription adds r1, r0, 0 _0813ADF0: movs r0, 0x30 @@ -32528,7 +32528,7 @@ sub_813AE6C: @ 813AE6C ldr r0, _0813AEF8 @ =gTasks + 0x8 adds r5, r0 bl sub_80F944C - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette bl sub_813AF04 movs r0, 0xF movs r1, 0 @@ -32802,7 +32802,7 @@ _0813B0A4: movs r0, 0 movs r1, 0xC8 movs r2, 0x8 - bl sub_80F953C + bl CreateVerticalScrollIndicators b _0813B0DA .align 2, 0 _0813B0B8: .4byte 0x0201fe00 @@ -32830,7 +32830,7 @@ _0813B0DA: movs r0, 0x1 movs r1, 0xC8 movs r2, 0x98 - bl sub_80F953C + bl CreateVerticalScrollIndicators b _0813B0FE .align 2, 0 _0813B0F4: .4byte 0x0201fe00 @@ -32853,7 +32853,7 @@ sub_813B108: @ 813B108 lsls r4, 24 lsrs r4, 24 bl sub_80F944C - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette movs r0, 0 movs r1, 0 movs r2, 0x1D @@ -33418,7 +33418,7 @@ sub_813B578: @ 813B578 bl MenuZeroFillWindowRect ldrh r0, [r6, 0x20] movs r1, 0x1 - bl sub_80A9424 + bl AddBagItem lsls r0, 24 cmp r0, 0 bne _0813B5CC diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s index 132b592a1..3ef0309e3 100644 --- a/asm/rom_813BA94.s +++ b/asm/rom_813BA94.s @@ -15324,7 +15324,7 @@ sub_8143300: @ 8143300 mov r8, r2 mov r1, r8 adds r2, r4, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned ldr r0, _081433D4 @ =gOtherText_IDNumber2 adds r4, r6, 0x3 lsls r4, 24 @@ -15346,7 +15346,7 @@ sub_8143300: @ 8143300 mov r0, r9 mov r1, r8 adds r2, r4, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned ldr r0, _081433DC @ =gMainMenuString_Time adds r6, 0x5 lsls r6, 24 @@ -15377,7 +15377,7 @@ sub_8143300: @ 8143300 mov r0, r9 mov r1, r8 adds r2, r6, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned pop {r3-r5} mov r8, r3 mov r9, r4 diff --git a/asm/rom_8148B8C.s b/asm/rom_8148B8C.s index 45959da5b..f1b748f17 100644 --- a/asm/rom_8148B8C.s +++ b/asm/rom_8148B8C.s @@ -4233,8 +4233,8 @@ _0814AC50: .4byte gUnknown_0842F758 _0814AC54: .4byte gUnknown_0203A3D1 thumb_func_end unref_sub_814ABE4 - thumb_func_start sub_814AC58 -sub_814AC58: @ 814AC58 + thumb_func_start CreateBlendedOutlineCursor +CreateBlendedOutlineCursor: @ 814AC58 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -4344,7 +4344,7 @@ _0814AD2A: bx r1 .align 2, 0 _0814AD40: .4byte gUnknown_0203A3D2 - thumb_func_end sub_814AC58 + thumb_func_end CreateBlendedOutlineCursor thumb_func_start sub_814AD44 sub_814AD44: @ 814AD44 diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s index 9eeaaec94..5f092c135 100644 --- a/asm/save_menu_util.s +++ b/asm/save_menu_util.s @@ -218,7 +218,7 @@ sub_8094740: @ 8094740 lsrs r4, 24 adds r1, r4, 0 adds r2, r5, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned pop {r4,r5} pop {r0} bx r0 @@ -284,7 +284,7 @@ sub_80947B0: @ 80947B0 mov r0, sp adds r1, r4, 0 adds r2, r5, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned add sp, 0x10 pop {r4,r5} pop {r0} @@ -322,7 +322,7 @@ sub_80947F8: @ 80947F8 mov r0, sp adds r1, r4, 0 adds r2, r5, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned add sp, 0x10 pop {r4,r5} pop {r0} @@ -358,7 +358,7 @@ sub_8094844: @ 8094844 mov r0, sp adds r1, r4, 0 adds r2, r5, 0 - bl sub_8072B4C + bl MenuPrint_RightAligned add sp, 0x10 pop {r4,r5} pop {r0} diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s index 8d6ea4d45..883adfe5d 100644 --- a/asm/script_pokemon_util_80C4BF0.s +++ b/asm/script_pokemon_util_80C4BF0.s @@ -429,8 +429,8 @@ _080C4EEA: _080C4EFC: .4byte gUnknown_0202E8D0 thumb_func_end sub_80C4D80 - thumb_func_start sub_80C4F00 -sub_80C4F00: @ 80C4F00 + thumb_func_start ShowContestWinnerCleanup +ShowContestWinnerCleanup: @ 80C4F00 push {lr} ldr r0, _080C4F0C @ =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 @@ -438,10 +438,10 @@ sub_80C4F00: @ 80C4F00 bx r0 .align 2, 0 _080C4F0C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music - thumb_func_end sub_80C4F00 + thumb_func_end ShowContestWinnerCleanup - thumb_func_start sub_80C4F10 -sub_80C4F10: @ 80C4F10 + thumb_func_start ShowContestWinner +ShowContestWinner: @ 80C4F10 push {r4-r6,lr} ldr r6, _080C4F54 @ =gUnknown_0203856C ldrb r0, [r6] @@ -477,10 +477,10 @@ _080C4F54: .4byte gUnknown_0203856C _080C4F58: .4byte 0x02000000 _080C4F5C: .4byte 0x00015ddf _080C4F60: .4byte 0x00015dde -_080C4F64: .4byte sub_8106668 +_080C4F64: .4byte CB2_ContestPainting _080C4F68: .4byte gMain -_080C4F6C: .4byte sub_80C4F00 - thumb_func_end sub_80C4F10 +_080C4F6C: .4byte ShowContestWinnerCleanup + thumb_func_end ShowContestWinner thumb_func_start sub_80C4F70 sub_80C4F70: @ 80C4F70 @@ -515,8 +515,8 @@ _080C4FB4: .4byte 0x00004012 _080C4FB8: .4byte 0x00004013 thumb_func_end sub_80C4F70 - thumb_func_start sub_80C4FBC -sub_80C4FBC: @ 80C4FBC + thumb_func_start GiveMonArtistRibbon +GiveMonArtistRibbon: @ 80C4FBC push {r4-r6,lr} sub sp, 0x4 ldr r6, _080C501C @ =gUnknown_02038694 @@ -578,7 +578,7 @@ _080C503A: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80C4FBC + thumb_func_end GiveMonArtistRibbon thumb_func_start sub_80C5044 sub_80C5044: @ 80C5044 @@ -589,8 +589,8 @@ sub_80C5044: @ 80C5044 _080C504C: .4byte gUnknown_0203856C thumb_func_end sub_80C5044 - thumb_func_start sub_80C5050 -sub_80C5050: @ 80C5050 + thumb_func_start ShowContestEntryMonPic +ShowContestEntryMonPic: @ 80C5050 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -712,7 +712,7 @@ _080C5154: .4byte gUnknown_081FAF4C _080C5158: .4byte gUnknown_02024E8C _080C515C: .4byte gSprites _080C5160: .4byte SpriteCallbackDummy - thumb_func_end sub_80C5050 + thumb_func_end ShowContestEntryMonPic thumb_func_start sub_80C5164 sub_80C5164: @ 80C5164 @@ -818,8 +818,8 @@ _080C5222: bx r0 thumb_func_end sub_80C5190 - thumb_func_start sub_80C5228 -sub_80C5228: @ 80C5228 + thumb_func_start ScriptGetMultiplayerId +ScriptGetMultiplayerId: @ 80C5228 push {r4,lr} ldr r0, _080C5244 @ =gUnknown_0203869A ldrb r1, [r0] @@ -846,10 +846,10 @@ _080C5252: bx r0 .align 2, 0 _080C5258: .4byte gScriptResult - thumb_func_end sub_80C5228 + thumb_func_end ScriptGetMultiplayerId - thumb_func_start sub_80C525C -sub_80C525C: @ 80C525C + thumb_func_start ScriptRandom +ScriptRandom: @ 80C525C push {r4,lr} ldr r0, _080C5280 @ =gUnknown_0203869A ldrb r1, [r0] @@ -887,10 +887,10 @@ _080C529E: bx r0 .align 2, 0 _080C52AC: .4byte gScriptResult - thumb_func_end sub_80C525C + thumb_func_end ScriptRandom - thumb_func_start sp000_heal_pokemon -sp000_heal_pokemon: @ 80C52B0 + thumb_func_start HealPlayerParty +HealPlayerParty: @ 80C52B0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -984,10 +984,10 @@ _080C535C: .align 2, 0 _080C536C: .4byte gPlayerPartyCount _080C5370: .4byte gPlayerParty - thumb_func_end sp000_heal_pokemon + thumb_func_end HealPlayerParty - thumb_func_start sub_80C5374 -sub_80C5374: @ 80C5374 + thumb_func_start ScriptGiveMon +ScriptGiveMon: @ 80C5374 push {r4-r6,lr} mov r6, r8 push {r6} @@ -1048,10 +1048,10 @@ _080C53E8: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80C5374 + thumb_func_end ScriptGiveMon - thumb_func_start sub_80C53F8 -sub_80C53F8: @ 80C53F8 + thumb_func_start ScriptGiveEgg +ScriptGiveEgg: @ 80C53F8 push {lr} sub sp, 0x68 adds r1, r0, 0 @@ -1073,10 +1073,10 @@ sub_80C53F8: @ 80C53F8 add sp, 0x68 pop {r1} bx r1 - thumb_func_end sub_80C53F8 + thumb_func_end ScriptGiveEgg - thumb_func_start sub_80C5428 -sub_80C5428: @ 80C5428 + thumb_func_start CheckForAlivePartyMons +CheckForAlivePartyMons: @ 80C5428 push {lr} bl sub_803DAA0 lsls r0, 24 @@ -1099,10 +1099,10 @@ _080C5448: bx r0 .align 2, 0 _080C544C: .4byte gScriptResult - thumb_func_end sub_80C5428 + thumb_func_end CheckForAlivePartyMons - thumb_func_start sub_80C5450 -sub_80C5450: @ 80C5450 + thumb_func_start CheckPartyMonHasHeldItem +CheckPartyMonHasHeldItem: @ 80C5450 push {r4-r7,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -1142,13 +1142,13 @@ _080C5498: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80C5450 + thumb_func_end CheckPartyMonHasHeldItem - thumb_func_start sub_80C54A0 -sub_80C54A0: @ 80C54A0 + thumb_func_start GetNameOfEnigmaBerryInPlayerParty +GetNameOfEnigmaBerryInPlayerParty: @ 80C54A0 push {r4,lr} movs r0, 0xAF - bl sub_80C5450 + bl CheckPartyMonHasHeldItem lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 @@ -1167,10 +1167,10 @@ _080C54C2: bx r1 .align 2, 0 _080C54CC: .4byte gStringVar1 - thumb_func_end sub_80C54A0 + thumb_func_end GetNameOfEnigmaBerryInPlayerParty - thumb_func_start sub_80C54D0 -sub_80C54D0: @ 80C54D0 + thumb_func_start ScriptWildBattle +ScriptWildBattle: @ 80C54D0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -1216,10 +1216,10 @@ _080C551E: bx r0 .align 2, 0 _080C552C: .4byte gEnemyParty - thumb_func_end sub_80C54D0 + thumb_func_end ScriptWildBattle - thumb_func_start sub_80C5530 -sub_80C5530: @ 80C5530 + thumb_func_start ScriptSetMonMoveSlot +ScriptSetMonMoveSlot: @ 80C5530 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -1247,7 +1247,7 @@ _080C554C: .align 2, 0 _080C5560: .4byte gPlayerPartyCount _080C5564: .4byte gPlayerParty - thumb_func_end sub_80C5530 + thumb_func_end ScriptSetMonMoveSlot thumb_func_start sub_80C5568 sub_80C5568: @ 80C5568 @@ -1290,8 +1290,8 @@ _080C55A8: .4byte gScriptResult _080C55AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_end sub_80C5580 - thumb_func_start sub_80C55B0 -sub_80C55B0: @ 80C55B0 + thumb_func_start ChooseBattleTowerPlayerParty +ChooseBattleTowerPlayerParty: @ 80C55B0 push {lr} ldr r1, _080C55C0 @ =gMain ldr r0, _080C55C4 @ =sub_80C55C8 @@ -1301,11 +1301,11 @@ sub_80C55B0: @ 80C55B0 bx r0 .align 2, 0 _080C55C0: .4byte gMain -_080C55C4: .4byte sub_80C55C8 - thumb_func_end sub_80C55B0 +_080C55C4: .4byte SetBattleTowerPlayerParty + thumb_func_end ChooseBattleTowerPlayerParty - thumb_func_start sub_80C55C8 -sub_80C55C8: @ 80C55C8 + thumb_func_start SetBattleTowerPlayerParty +SetBattleTowerPlayerParty: @ 80C55C8 push {r4,lr} ldr r0, _080C55DC @ =gUnknown_02039270 ldrb r4, [r0] @@ -1319,7 +1319,7 @@ sub_80C55C8: @ 80C55C8 _080C55DC: .4byte gUnknown_02039270 _080C55E0: .4byte gScriptResult _080C55E4: - bl sub_80C5604 + bl ReducePlayerPartyToThree ldr r1, _080C55FC @ =gScriptResult movs r0, 0x1 strh r0, [r1] @@ -1332,10 +1332,10 @@ _080C55EE: .align 2, 0 _080C55FC: .4byte gScriptResult _080C5600: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music - thumb_func_end sub_80C55C8 + thumb_func_end SetBattleTowerPlayerParty - thumb_func_start sub_80C5604 -sub_80C5604: @ 80C5604 + thumb_func_start ReducePlayerPartyToThree +ReducePlayerPartyToThree: @ 80C5604 push {r4-r7,lr} sub sp, 0x134 add r0, sp, 0x12C @@ -1394,6 +1394,6 @@ _080C5674: .4byte 0x0500004b _080C5678: .4byte gPlayerParty _080C567C: .4byte gUnknown_02039270 _080C5680: .4byte 0x05000096 - thumb_func_end sub_80C5604 + thumb_func_end ReducePlayerPartyToThree .align 2, 0 @ Don't pad with nop. diff --git a/asm/secret_base.s b/asm/secret_base.s index 936fd1ece..15c629364 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -2304,7 +2304,7 @@ sub_80BC62C: @ 80BC62C lsrs r5, r0, 24 bl ScriptContext2_Enable bl sub_80F944C - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed + bl LoadScrollIndicatorPalette lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2485,7 +2485,7 @@ _080BC7A8: movs r0, 0x1 movs r1, 0xBC movs r2, 0x98 - bl sub_80F953C + bl CreateVerticalScrollIndicators _080BC7B2: mov r1, r8 movs r2, 0x4 @@ -2499,7 +2499,7 @@ _080BC7C4: movs r0, 0 movs r1, 0xBC movs r2, 0x8 - bl sub_80F953C + bl CreateVerticalScrollIndicators _080BC7CE: pop {r3} mov r8, r3 @@ -3492,7 +3492,7 @@ _080BCF7C: lsrs r0, 24 cmp r0, 0x1 bne _080BCFA8 - bl sub_80C6C90 + bl DoYellowCave4Sparkle b _080BD02C _080BCFA8: adds r0, r4, 0 @@ -3545,7 +3545,7 @@ _080BCFF6: bl MapGridGetMetatileIdAt lsls r0, 16 asrs r0, 16 - bl sub_80C6C30 + bl DoDecorationSoundEffect b _080BD02C _080BD01C: ldrb r0, [r4, 0x8] diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 48aca5d96..e4c4e7220 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_81018A0 -sub_81018A0: @ 81018A0 + thumb_func_start PlaySlotMachine +PlaySlotMachine: @ 81018A0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -18,7 +18,7 @@ sub_81018A0: @ 81018A0 bx r0 .align 2, 0 _081018B4: .4byte sub_81018B8 - thumb_func_end sub_81018A0 + thumb_func_end PlaySlotMachine thumb_func_start sub_81018B8 sub_81018B8: @ 81018B8 diff --git a/asm/sound_check_menu.s b/asm/sound_check_menu.s index 22a8c3410..3c5335382 100644 --- a/asm/sound_check_menu.s +++ b/asm/sound_check_menu.s @@ -373,7 +373,7 @@ _080BA3EC: .4byte gTasks _080BA3F0: .4byte 0x0000015d _080BA3F4: .4byte gBGMNames _080BA3F8: .4byte gSENames -_080BA3FC: .4byte Task_HandleMainMenuInput +_080BA3FC: .4byte sub_80BA65C thumb_func_end sub_80BA384 thumb_func_start sub_80BA400 @@ -690,8 +690,8 @@ _080BA64E: _080BA658: .4byte gUnknown_020387B0 thumb_func_end sub_80BA400 - thumb_func_start Task_HandleMainMenuInput -Task_HandleMainMenuInput: @ 80BA65C + thumb_func_start sub_80BA65C +sub_80BA65C: @ 80BA65C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -714,7 +714,7 @@ _080BA67C: .align 2, 0 _080BA684: .4byte gTasks _080BA688: .4byte sub_80BA384 - thumb_func_end Task_HandleMainMenuInput + thumb_func_end sub_80BA65C thumb_func_start sub_80BA68C sub_80BA68C: @ 80BA68C diff --git a/asm/trainer_card.s b/asm/trainer_card.s index e793fc376..4e1035d1a 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -1019,8 +1019,8 @@ _080938C4: .4byte gPaletteFade _080938C8: .4byte 0x02000000 thumb_func_end sub_80938A8 - thumb_func_start rfu_NI_stopReceivingData -rfu_NI_stopReceivingData: @ 80938CC + thumb_func_start sub_80938CC +sub_80938CC: @ 80938CC push {lr} ldr r0, _080938E4 @ =gMain ldrh r1, [r0, 0x2E] @@ -1063,7 +1063,7 @@ _08093912: _08093914: pop {r1} bx r1 - thumb_func_end rfu_NI_stopReceivingData + thumb_func_end sub_80938CC thumb_func_start sub_8093918 sub_8093918: @ 8093918 @@ -2283,7 +2283,7 @@ _08094230: mov r0, sp movs r1, 0x10 movs r2, 0xA - bl sub_8072B4C + bl MenuPrint_RightAligned _0809424A: add sp, 0x10 pop {r0} @@ -2390,7 +2390,7 @@ sub_80942F8: @ 80942F8 adds r0, r4, 0 movs r1, 0x1C movs r2, 0x2 - bl sub_8072B4C + bl MenuPrint_RightAligned pop {r4,r5} pop {r0} bx r0 @@ -2460,7 +2460,7 @@ sub_8094354: @ 8094354 ldr r0, _080943BC @ =gStringVar1 movs r1, 0x1C movs r2, 0x5 - bl sub_8072B4C + bl MenuPrint_RightAligned _080943B0: pop {r4,r5} pop {r0} @@ -2506,7 +2506,7 @@ sub_80943E4: @ 80943E4 mov r0, sp movs r1, 0x16 movs r2, 0x7 - bl sub_8072B4C + bl MenuPrint_RightAligned adds r0, r4, 0 adds r0, 0x7A ldrh r1, [r0] @@ -2515,7 +2515,7 @@ sub_80943E4: @ 80943E4 mov r0, sp movs r1, 0x1C movs r2, 0x7 - bl sub_8072B4C + bl MenuPrint_RightAligned _0809441C: add sp, 0x10 pop {r4} @@ -2622,7 +2622,7 @@ sub_80944B8: @ 80944B8 mov r0, sp movs r1, 0x1C movs r2, 0xD - bl sub_8072B4C + bl MenuPrint_RightAligned _080944DE: add sp, 0x8 pop {r0} @@ -2668,7 +2668,7 @@ sub_8094508: @ 8094508 mov r0, sp movs r1, 0x1C movs r2, 0xB - bl sub_8072B4C + bl MenuPrint_RightAligned _0809452E: add sp, 0x8 pop {r0} @@ -2714,7 +2714,7 @@ sub_8094558: @ 8094558 mov r0, sp movs r1, 0x1C movs r2, 0x9 - bl sub_8072B4C + bl MenuPrint_RightAligned _0809457E: add sp, 0x8 pop {r0} @@ -3327,7 +3327,7 @@ _080BF166: ldrh r0, [r1] cmp r0, 0 beq _080BF186 - bl itemid_get_market_price + bl ItemId_GetPrice lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -6286,8 +6286,8 @@ _080C07BC: .4byte gSaveBlock1 _080C07C0: .4byte 0x00002abd thumb_func_end sub_80C0788 - thumb_func_start sub_80C07C4 -sub_80C07C4: @ 80C07C4 + thumb_func_start DoTVShow +DoTVShow: @ 80C07C4 push {lr} ldr r2, _080C07F8 @ =gSaveBlock1 ldr r0, _080C07FC @ =gUnknown_0202E8CC @@ -6383,7 +6383,7 @@ _080C08CA: bl DoTVShowBravoTrainerPokemonProfile b _080C08F8 _080C08D0: - bl sub_80C0B9C + bl DoTVShowBravoTrainerBattleTowerProfile b _080C08F8 _080C08D6: bl DoTVShowPokemonTodaySuccessfulCapture @@ -6405,10 +6405,10 @@ _080C08F4: _080C08F8: pop {r0} bx r0 - thumb_func_end sub_80C07C4 + thumb_func_end DoTVShow - thumb_func_start sub_80C08FC -sub_80C08FC: @ 80C08FC + thumb_func_start TVShowConvertInternationalString +TVShowConvertInternationalString: @ 80C08FC push {r4,r5,lr} adds r5, r0, 0 lsls r4, r2, 24 @@ -6423,7 +6423,7 @@ _080C0914: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80C08FC + thumb_func_end TVShowConvertInternationalString thumb_func_start DoTVShowBravoTrainerPokemonProfile DoTVShowBravoTrainerPokemonProfile: @ 80C091C @@ -6471,7 +6471,7 @@ _080C0980: adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r1, [r4, 0x13] lsls r1, 29 lsrs r1, 29 @@ -6517,7 +6517,7 @@ _080C09D8: adds r1, r4, 0 adds r1, 0x8 ldrb r2, [r4, 0x1F] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r1, [r4, 0x13] lsls r1, 29 lsrs r1, 29 @@ -6533,7 +6533,7 @@ _080C0A10: adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r1, [r4, 0x13] movs r0, 0x60 ands r0, r1 @@ -6556,7 +6556,7 @@ _080C0A40: adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0A6C @ =gStringVar2 ldrh r1, [r4, 0x4] bl sub_80EB3FC @@ -6578,7 +6578,7 @@ _080C0A74: adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0AA0 @ =gStringVar2 ldrh r1, [r4, 0x4] bl sub_80EB3FC @@ -6600,7 +6600,7 @@ _080C0AA8: adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r1, [r4, 0x13] lsls r1, 29 lsrs r1, 29 @@ -6658,7 +6658,7 @@ _080C0B34: adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0B5C @ =gStringVar2 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -6701,8 +6701,8 @@ _080C0B94: .4byte gUnknown_020387E8 _080C0B98: .4byte gUnknown_083D1524 thumb_func_end DoTVShowBravoTrainerPokemonProfile - thumb_func_start sub_80C0B9C -sub_80C0B9C: @ 80C0B9C + thumb_func_start DoTVShowBravoTrainerBattleTowerProfile +DoTVShowBravoTrainerBattleTowerProfile: @ 80C0B9C push {r4,r5,lr} ldr r0, _080C0BC8 @ =gUnknown_0202E8CC ldrh r1, [r0] @@ -6753,7 +6753,7 @@ _080C0C18: ldr r0, _080C0C40 @ =gStringVar1 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0C44 @ =gStringVar2 ldrh r2, [r4, 0xA] movs r1, 0xB @@ -6808,7 +6808,7 @@ _080C0C8C: adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrh r1, [r4, 0x16] adds r1, 0x1 movs r0, 0x1 @@ -6825,7 +6825,7 @@ _080C0CB0: adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0CD4 @ =gStringVar2 ldrh r2, [r4, 0x14] movs r1, 0xB @@ -6843,7 +6843,7 @@ _080C0CDC: adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0D0C @ =gStringVar2 ldrh r2, [r4, 0x14] movs r1, 0xB @@ -6894,7 +6894,7 @@ _080C0D42: adds r1, r4, 0x2 _080C0D46: ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r1, _080C0D58 @ =gUnknown_020387E8 movs r0, 0xB strb r0, [r1] @@ -6930,12 +6930,12 @@ _080C0D88: ldr r0, _080C0DB4 @ =gStringVar2 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0DB8 @ =gStringVar3 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r1, _080C0DBC @ =gUnknown_020387E8 movs r0, 0xE strb r0, [r1] @@ -6949,7 +6949,7 @@ _080C0DC0: ldr r0, _080C0DF0 @ =gStringVar1 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0DF4 @ =gStringVar2 ldrh r2, [r4, 0xA] movs r1, 0xB @@ -6972,7 +6972,7 @@ _080C0DF0: .4byte gStringVar1 _080C0DF4: .4byte gStringVar2 _080C0DF8: .4byte gSpeciesNames _080C0DFC: .4byte gUnknown_083D1548 - thumb_func_end sub_80C0B9C + thumb_func_end DoTVShowBravoTrainerBattleTowerProfile thumb_func_start DoTVShowTodaysSmartShopper DoTVShowTodaysSmartShopper: @ 80C0E00 @@ -7025,7 +7025,7 @@ _080C0E74: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C0E9C @ =gStringVar2 ldrb r1, [r5, 0x12] movs r2, 0 @@ -7053,10 +7053,10 @@ _080C0EB0: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r4, _080C0EF0 @ =gStringVar2 ldrh r0, [r5, 0x6] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy @@ -7113,7 +7113,7 @@ _080C0F30: .4byte gUnknown_020387E8 _080C0F34: ldr r4, _080C0F5C @ =gStringVar2 ldrh r0, [r5, 0x8] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy @@ -7133,7 +7133,7 @@ _080C0F60: .4byte gUnknown_020387E8 _080C0F64: ldr r4, _080C0F8C @ =gStringVar2 ldrh r0, [r5, 0xA] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy @@ -7180,10 +7180,10 @@ _080C0FC0: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r4, _080C0FF0 @ =gStringVar2 ldrh r0, [r5, 0x6] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy @@ -7211,7 +7211,7 @@ _080C1004: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString bl TVShowDone _080C1014: ldr r0, _080C102C @ =gUnknown_083D14F0 @@ -7285,7 +7285,7 @@ _080C10C0: adds r1, r6, 0 adds r1, 0xF ldrb r2, [r6, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C10F8 @ =gStringVar2 ldrh r2, [r6, 0x2] movs r1, 0xB @@ -7296,7 +7296,7 @@ _080C10C0: ldr r0, _080C1100 @ =gStringVar3 adds r1, r6, 0x4 ldrb r2, [r6, 0x1F] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r4, _080C1104 @ =gUnknown_020387E8 adds r0, r6, 0 bl sub_80BF7E8 @@ -7335,7 +7335,7 @@ _080C112A: adds r1, r6, 0 adds r1, 0xF ldrb r2, [r6, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r0, [r6, 0x1A] cmp r0, 0 bne _080C114C @@ -7379,7 +7379,7 @@ _080C1170: ldr r4, _080C11C0 @ =gStringVar1 ldrb r2, [r6, 0x1F] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString str r5, [sp] str r6, [sp, 0x4] movs r0, 0 @@ -7390,11 +7390,11 @@ _080C1170: ldr r0, _080C11C4 @ =gStringVar2 ldrb r2, [r6, 0x1F] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString adds r1, r6, 0x4 ldrb r2, [r6, 0x1F] adds r0, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r1, _080C11C8 @ =gUnknown_020387E8 movs r0, 0xC strb r0, [r1] @@ -7417,7 +7417,7 @@ _080C11CC: ldr r4, _080C121C @ =gStringVar1 ldrb r2, [r6, 0x1F] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString str r5, [sp] str r6, [sp, 0x4] movs r0, 0 @@ -7428,12 +7428,12 @@ _080C11CC: ldr r0, _080C1220 @ =gStringVar2 ldrb r2, [r6, 0x1E] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString adds r1, r6, 0 adds r1, 0xF ldrb r2, [r6, 0x1E] adds r0, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r1, _080C1224 @ =gUnknown_020387E8 movs r0, 0xE strb r0, [r1] @@ -7456,7 +7456,7 @@ _080C1228: ldr r4, _080C1274 @ =gStringVar1 ldrb r2, [r6, 0x1E] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString str r5, [sp] str r6, [sp, 0x4] movs r0, 0 @@ -7467,12 +7467,12 @@ _080C1228: ldr r0, _080C1278 @ =gStringVar2 ldrb r2, [r6, 0x1F] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString adds r1, r6, 0 adds r1, 0xF ldrb r2, [r6, 0x1E] adds r0, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString b _080C1354 .align 2, 0 _080C1270: .4byte gStringVar3 @@ -7491,7 +7491,7 @@ _080C127C: ldr r4, _080C12C8 @ =gStringVar2 ldrb r2, [r6, 0x1F] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString ldrh r1, [r6, 0x2] movs r0, 0xB muls r1, r0 @@ -7527,7 +7527,7 @@ _080C12D4: ldr r0, _080C1308 @ =gStringVar3 ldr r1, _080C130C @ =gStringVar1 ldrb r2, [r6, 0x1F] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrh r0, [r6, 0x2] str r0, [sp] str r6, [sp, 0x4] @@ -7557,7 +7557,7 @@ _080C1314: ldr r4, _080C1360 @ =gStringVar2 ldrb r2, [r6, 0x1F] adds r1, r4, 0 - bl sub_80C08FC + bl TVShowConvertInternationalString ldrh r0, [r6, 0x1C] str r0, [sp] str r6, [sp, 0x4] @@ -7590,12 +7590,12 @@ _080C1370: ldr r0, _080C13A0 @ =gStringVar1 adds r1, r6, 0x4 ldrb r2, [r6, 0x1F] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C13A4 @ =gStringVar2 adds r1, r6, 0 adds r1, 0xF ldrb r2, [r6, 0x1E] - bl sub_80C08FC + bl TVShowConvertInternationalString bl TVShowDone _080C138A: ldr r0, _080C13A8 @ =gUnknown_083D1584 @@ -7663,7 +7663,7 @@ _080C141C: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1454 @ =gStringVar2 ldrh r2, [r5, 0x10] movs r1, 0xB @@ -7674,7 +7674,7 @@ _080C141C: ldr r0, _080C145C @ =gStringVar3 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r0, [r5, 0xF] cmp r0, 0x1 bne _080C1464 @@ -7702,7 +7702,7 @@ _080C1470: _080C1476: ldr r4, _080C149C @ =gStringVar2 ldrb r0, [r5, 0xF] - bl itemid_get_item + bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy @@ -7731,7 +7731,7 @@ _080C14B0: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C14DC @ =gStringVar2 ldrh r2, [r5, 0x10] movs r1, 0xB @@ -7742,7 +7742,7 @@ _080C14B0: ldr r0, _080C14E4 @ =gStringVar3 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString b _080C150A .align 2, 0 _080C14D8: .4byte gStringVar1 @@ -7758,7 +7758,7 @@ _080C14EE: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1518 @ =gStringVar2 ldrh r2, [r5, 0x10] movs r1, 0xB @@ -7781,7 +7781,7 @@ _080C1524: adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1568 @ =gStringVar2 ldrh r2, [r5, 0x10] movs r1, 0xB @@ -7792,7 +7792,7 @@ _080C1524: ldr r0, _080C1570 @ =gStringVar3 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r4, _080C1574 @ =gUnknown_020387E8 bl Random ldrb r2, [r4] @@ -7821,7 +7821,7 @@ _080C1578: ldr r0, _080C15A4 @ =gStringVar2 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrh r1, [r5, 0x10] movs r0, 0x2 bl sub_80BF638 @@ -7841,7 +7841,7 @@ _080C15A8: ldr r0, _080C15D0 @ =gStringVar2 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] - bl sub_80C08FC + bl TVShowConvertInternationalString _080C15C2: ldr r0, _080C15D4 @ =gUnknown_020387E8 strb r4, [r0] @@ -7910,7 +7910,7 @@ _080C1650: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1678 @ =gStringVar2 ldrh r2, [r4, 0xC] movs r1, 0xB @@ -7932,7 +7932,7 @@ _080C1684: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C16BC @ =gStringVar2 ldrb r1, [r4, 0x12] movs r2, 0 @@ -7969,7 +7969,7 @@ _080C16D8: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r1, [r4, 0x10] movs r0, 0x1 bl sub_80BF088 @@ -8000,7 +8000,7 @@ _080C171C: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r1, _080C1734 @ =gUnknown_020387E8 movs r0, 0x6 strb r0, [r1] @@ -8113,7 +8113,7 @@ _080C1864: adds r1, r5, 0 adds r1, 0x10 ldrb r2, [r5, 0x18] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C188C @ =gStringVar2 ldrh r2, [r5, 0x2] movs r1, 0xB @@ -8325,7 +8325,7 @@ _080C1A84: adds r1, r5, 0 adds r1, 0x10 ldrb r2, [r5, 0x18] - bl sub_80C08FC + bl TVShowConvertInternationalString adds r0, r5, 0 bl sub_80BF79C ldr r1, _080C1AA4 @ =gUnknown_020387E8 @@ -8418,7 +8418,7 @@ _080C1B46: ldr r0, _080C1B78 @ =gStringVar1 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1B7C @ =gStringVar2 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -8430,7 +8430,7 @@ _080C1B46: adds r1, r4, 0 adds r1, 0x10 ldrb r2, [r4, 0xE] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrb r0, [r4, 0x4] lsrs r0, 4 adds r0, 0x1 @@ -8445,7 +8445,7 @@ _080C1B88: ldr r0, _080C1BB0 @ =gStringVar1 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1BB4 @ =gStringVar2 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -8468,7 +8468,7 @@ _080C1BC0: ldr r0, _080C1BE8 @ =gStringVar1 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1BEC @ =gStringVar3 ldrh r1, [r4, 0x1E] bl sub_80EB3FC @@ -8789,7 +8789,7 @@ _080C1E84: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x6] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1EB4 @ =gStringVar2 ldrh r2, [r4, 0x4] movs r1, 0xB @@ -8811,7 +8811,7 @@ _080C1EBC: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x6] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1EFC @ =gStringVar2 ldrh r2, [r4, 0x4] movs r1, 0xB @@ -8875,7 +8875,7 @@ _080C1F46: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xB] - bl sub_80C08FC + bl TVShowConvertInternationalString ldrh r1, [r4, 0x6] movs r0, 0x1 bl sub_80BF088 @@ -8906,7 +8906,7 @@ _080C1F8C: adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xB] - bl sub_80C08FC + bl TVShowConvertInternationalString ldr r0, _080C1FCC @ =gStringVar2 ldrb r1, [r4, 0xA] movs r2, 0 diff --git a/data/data2.s b/data/data2.s index 0370630c0..4da2572a4 100644 --- a/data/data2.s +++ b/data/data2.s @@ -12171,7 +12171,7 @@ gBadgesTiles:: @ 83B5AB8 gUnknown_083B5EBC:: @ 83B5EBC .4byte sub_8093864 .4byte sub_80938A8 - .4byte rfu_NI_stopReceivingData + .4byte sub_80938CC .4byte sub_8093918 .4byte sub_8093938 .4byte sub_8093954 @@ -15479,7 +15479,7 @@ gSpriteImageTable_83D2688:: @ 83D2688 .align 2 gSpriteTemplate_83D26A0:: @ 83D26A0 - spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, door_restore_tilemap + spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0 @ This uses one of the secret base palettes, so there is no "09.pal" file. .align 2 diff --git a/data/specials.s b/data/specials.s index 0d79f0368..33ac3f6e8 100644 --- a/data/specials.s +++ b/data/specials.s @@ -1,6 +1,6 @@ .align 2 gSpecials:: - .4byte sp000_heal_pokemon + .4byte HealPlayerParty .4byte sub_8068FEC .4byte sub_808102C .4byte sub_80810DC @@ -61,9 +61,9 @@ gSpecials:: .4byte sub_8082C9C .4byte sub_80826B0 .4byte sub_8096100 - .4byte sub_80C5428 + .4byte CheckForAlivePartyMons .4byte TurnOffTVScreen - .4byte sub_80C07C4 + .4byte DoTVShow .4byte sub_80BECE8 .4byte special_0x44 .4byte sub_80BDA0C @@ -91,10 +91,10 @@ gSpecials:: .4byte sub_80C4440 .4byte sub_80C44C0 .4byte sub_80C5044 - .4byte sub_80C4FBC + .4byte GiveMonArtistRibbon .4byte sub_808363C .4byte InitSaveDialog - .4byte sub_80C71C4 + .4byte DoWateringBerryTreeAnim .4byte sub_80E60D8 .4byte sub_80EB7C4 .4byte sub_80F7B14 @@ -119,10 +119,10 @@ gSpecials:: .4byte sub_8109C90 .4byte sub_8109CF0 .4byte sub_8109DE0 - .4byte sub_80C5B98 - .4byte sub_80C5BB4 - .4byte sub_80C5BF0 - .4byte sub_80C5C0C + .4byte GetBigShroomishInfo + .4byte CompareShroomishSize + .4byte GetBigBarboachInfo + .4byte CompareBarboachSize .4byte sub_80BF9B4 .4byte sub_80BFAE0 .4byte sub_80BFB10 @@ -130,7 +130,7 @@ gSpecials:: .4byte sub_80FA5E4 .4byte sub_80EB83C .4byte sub_80FA648 - .4byte sub_80A9884 + .4byte SwapRegisteredBike .4byte CalculatePlayerPartyCount .4byte sub_8095B6C .4byte sub_8095C10 @@ -138,7 +138,7 @@ gSpecials:: .4byte sub_80C4CEC .4byte sub_80C4C78 .4byte sub_80C4D50 - .4byte sub_80C4F10 + .4byte ShowContestWinner .4byte sub_810DCCC .4byte sub_810DC7C .4byte sub_810E24C @@ -162,7 +162,7 @@ gSpecials:: .4byte sub_80F9A0C .4byte sub_810CA00 .4byte sub_804E538 - .4byte sub_81177FC + .4byte PlayRoulette .4byte sub_810FD60 .4byte sub_810FCB0 .4byte sub_810FDAC @@ -199,7 +199,7 @@ gSpecials:: .4byte sub_811043C .4byte sub_80B7CE8 .4byte sub_80B7D0C - .4byte sub_80C5824 + .4byte DoWhiteOut .4byte sp0C8_whiteout_maybe .4byte sub_80C8040 .4byte sub_80C8080 @@ -245,10 +245,10 @@ gSpecials:: .4byte sub_8135D84 .4byte sub_8135DEC .4byte sub_8135E50 - .4byte sub_80C55B0 + .4byte ChooseBattleTowerPlayerParty .4byte sub_813601C .4byte sub_810F404 - .4byte sub_80C5604 + .4byte ReducePlayerPartyToThree .4byte sub_8139C74 .4byte sub_8139CB4 .4byte sub_810E414 @@ -307,7 +307,7 @@ gSpecials:: .4byte sub_810F6EC .4byte sub_81477B4 .4byte sub_810E944 - .4byte sub_80C6F38 + .4byte GetShieldToyTVDecorationInfo .4byte sub_810F738 .4byte sub_8069D78 .4byte sub_810F758 @@ -320,13 +320,13 @@ gSpecials:: .4byte sub_807E25C .4byte sp13E_warp_to_last_warp .4byte sp13F_fall_to_last_warp - .4byte sub_80C5050 + .4byte ShowContestEntryMonPic .4byte sub_80C5164 .4byte sub_8134AB4 .4byte sub_8081B78 .4byte sub_810F83C .4byte sub_810F85C - .4byte sub_80C5228 + .4byte ScriptGetMultiplayerId .4byte sub_810F8D4 .4byte sub_80FA148 .4byte sub_810F8FC @@ -339,6 +339,6 @@ gSpecials:: .4byte sub_810F96C .4byte sub_810F9AC .4byte sub_813610C - .4byte sub_80C54A0 - .4byte sub_80C525C + .4byte GetNameOfEnigmaBerryInPlayerParty + .4byte ScriptRandom .4byte sub_80835D8 diff --git a/include/menu.h b/include/menu.h index 4b54fc9a9..6df47cf93 100644 --- a/include/menu.h +++ b/include/menu.h @@ -45,7 +45,7 @@ u8 MenuPrint_PixelCoords(u8 *, u8, u16, u8); u8 sub_8072A18(u8 *, u8, u16, u8, u32); u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32); int sub_8072AB0(u8 *, u8, u16, u8, u8, u32); -void sub_8072B4C(u8 *, u8, u8); +void MenuPrint_RightAligned(u8 *, u8, u8); void sub_8072B80(u8 *, u8, u8, u8 *); void sub_8072BD8(u8 *, u8, u8, u16); u8 *sub_8072C14(u8 *, s32, u8, u8); diff --git a/src/menu.c b/src/menu.c index 4bdaa8caf..5744df4c1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -607,7 +607,7 @@ int sub_8072AB0(u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6) MenuFillWindowRectWithBlankTile(left, top + 2 * newlineCount, left + width - 1, height + top - 1); } -void sub_8072B4C(u8 *str, u8 left, u8 top) +void MenuPrint_RightAligned(u8 *str, u8 left, u8 top) { sub_8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); } diff --git a/src/new_game.c b/src/new_game.c index 92810615e..11449a7c7 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -110,8 +110,8 @@ void NewGameInitData(void) sub_80530AC(); sub_8052DA8(); GameFreakRTC_Reset(); - sub_80C5B84(); - sub_80C5BDC(); + InitShroomishSizeRecord(); + InitBarboachSizeRecord(); gPlayerPartyCount = 0; ZeroPlayerPartyMons(); sub_80961D8(); diff --git a/src/rom4.c b/src/rom4.c index a898ab988..3223c7680 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -123,7 +123,7 @@ extern const struct WarpData gDummyWarpData; extern s32 gUnknown_0839ACE8; extern u32 gUnknown_08216694[]; -extern struct UnkWarpStruct *sub_80FA8CC(u8); +extern struct UnkWarpStruct *GetHealLocation(u8); extern u16 VarGet(u16); extern u8 FlagGet(u16); extern u8 GetSav1Weather(void); @@ -232,7 +232,7 @@ void sub_8052F5C(void) { ScriptContext2_RunNewScript(gUnknown_0819FC74); gSaveBlock1.money /= 2; - sp000_heal_pokemon(); + HealPlayerParty(); sub_8053050(); sub_8053570(); warp_in(); @@ -496,7 +496,7 @@ void copy_saved_warp2_bank_and_enter_x_to_warp1(void) void sub_8053538(u8 a1) { - struct UnkWarpStruct *warp = sub_80FA8CC(a1); + struct UnkWarpStruct *warp = GetHealLocation(a1); if (warp) warp1_set(warp->mapGroup, warp->mapNum, -1, warp->x, warp->y); } @@ -508,7 +508,7 @@ void sub_8053570(void) void sub_8053588(u8 a1) { - struct UnkWarpStruct *warp = sub_80FA8CC(a1); + struct UnkWarpStruct *warp = GetHealLocation(a1); if (warp) warp_set(&gSaveBlock1.warp3, warp->mapGroup, warp->mapNum, -1, warp->x, warp->y); } @@ -570,7 +570,7 @@ void unref_sub_8053790(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y) void sub_80537CC(u8 a1) { - struct UnkWarpStruct *warp = sub_80FA8CC(a1); + struct UnkWarpStruct *warp = GetHealLocation(a1); if (warp) warp_set(&gSaveBlock1.warp1, warp->mapGroup, warp->mapNum, -1, warp->x, warp->y); } diff --git a/src/scrcmd.c b/src/scrcmd.c index 9ed9eb7b2..871e5cce2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -16,13 +16,13 @@ extern void ClearRamScript(void); extern u16 *GetVarPointer(u16); extern u16 VarGet(u16); extern void sub_8126160(u8); -extern u8 sub_80A9424(u16, u16); -extern u8 sub_80A9538(u16, u16); -extern u8 sub_80A9344(u16, u16); -extern u8 sub_80A92D4(u16, u16); -extern u8 sub_80A9670(u16); -extern u8 sub_80A9760(u16, u16); -extern u8 sub_80A9718(u16, u16); +extern u8 AddBagItem(u16, u16); +extern u8 RemoveBagItem(u16, u16); +extern u8 CheckBagHasSpace(u16, u16); +extern u8 CheckBagHasItem(u16, u16); +extern u8 GetPocketByItemId(u16); +extern u8 AddPCItem(u16, u16); +extern u8 CheckPCHasItem(u16, u16); extern u8 IsThereStorageSpaceForDecoration(u8); extern s8 sub_81340A8(u8); extern u8 sub_8134074(u8); @@ -89,9 +89,9 @@ extern bool8 Multichoice(u8, u8, u8, u8); extern bool8 sub_80B58C4(u16, u8, u8); extern void *picbox_close(void); extern void sub_8106630(u32); -extern void sub_80C4F10(void); +extern void ShowContestWinner(void); extern u8 sub_810F87C(void); -extern void itemid_copy_name(u16, u8 *); +extern void CopyItemName(u16, u8 *); extern u8 sub_80BF0B8(u32); extern void sub_80B79B8(u32 *, u32); extern void sub_80B79E0(u32 *, u32); @@ -109,12 +109,12 @@ extern u8 *sub_8082700(void); extern u8 trainer_flag_check(u16); extern void trainer_flag_set(u16); extern void trainer_flag_clear(u16); -extern void sub_80C54D0(u16, u8, u16); +extern void ScriptWildBattle(u16, u8, u16); extern void sub_8081B3C(void); extern void CreatePokemartMenu(void *); extern void CreateDecorationShop1Menu(void *); extern void CreateDecorationShop2Menu(void *); -extern void sub_81018A0(u8, void *); +extern void PlaySlotMachine(u8, void *); extern void PlantBerryTree(u8, u8, u8, u8); extern bool8 GetPriceReduction(u8); extern void sub_80F99CC(void); @@ -136,9 +136,9 @@ extern void sub_810E824(void); extern u16 GetCoins(void); extern bool8 GiveCoins(u16); extern bool8 TakeCoins(u16); -extern u8 sub_80C5374(u16, u8, u16, u32, u32, u8); -extern u8 sub_80C53F8(u16); -extern void sub_80C5530(u8, u16, u8); +extern u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8); +extern u8 ScriptGiveEgg(u16); +extern void ScriptSetMonMoveSlot(u8, u16, u8); extern bool8 pokemon_has_move(struct Pokemon *, u16); extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void); @@ -542,7 +542,7 @@ bool8 ScrCmd_additem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80A9424(itemId, (u8)quantity); + gScriptResult = AddBagItem(itemId, (u8)quantity); return FALSE; } @@ -550,7 +550,7 @@ bool8 ScrCmd_removeitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80A9538(itemId, (u8)quantity); + gScriptResult = RemoveBagItem(itemId, (u8)quantity); return FALSE; } @@ -558,7 +558,7 @@ bool8 ScrCmd_checkitemspace(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80A9344(itemId, (u8)quantity); + gScriptResult = CheckBagHasSpace(itemId, (u8)quantity); return FALSE; } @@ -566,14 +566,14 @@ bool8 ScrCmd_checkitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u32 quantity = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80A92D4(itemId, (u8)quantity); + gScriptResult = CheckBagHasItem(itemId, (u8)quantity); return FALSE; } bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80A9670(itemId); + gScriptResult = GetPocketByItemId(itemId); return FALSE; } @@ -581,7 +581,7 @@ bool8 ScrCmd_addpcitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u16 quantity = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80A9760(itemId, quantity); + gScriptResult = AddPCItem(itemId, quantity); return FALSE; } @@ -589,7 +589,7 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx) { u16 itemId = VarGet(ScriptReadHalfword(ctx)); u16 quantity = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80A9718(itemId, quantity); + gScriptResult = CheckPCHasItem(itemId, quantity); return FALSE; } @@ -1412,7 +1412,7 @@ bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx) u8 v1 = ScriptReadByte(ctx); if (v1) sub_8106630(v1); - sub_80C4F10(); + ShowContestWinner(); ScriptContext1_Stop(); return TRUE; } @@ -1470,7 +1470,7 @@ bool8 ScrCmd_bufferitem(struct ScriptContext *ctx) { u8 stringVarIndex = ScriptReadByte(ctx); u16 itemId = VarGet(ScriptReadHalfword(ctx)); - itemid_copy_name(itemId, gUnknown_083762F0[stringVarIndex]); + CopyItemName(itemId, gUnknown_083762F0[stringVarIndex]); return FALSE; } @@ -1540,14 +1540,14 @@ bool8 ScrCmd_givepokemon(struct ScriptContext *ctx) u32 v8 = ScriptReadWord(ctx); u32 v9 = ScriptReadWord(ctx); u8 v10 = ScriptReadByte(ctx); - gScriptResult = sub_80C5374(v3, v5, v7, v8, v9, v10); + gScriptResult = ScriptGiveMon(v3, v5, v7, v8, v9, v10); return FALSE; } bool8 ScrCmd_giveegg(struct ScriptContext *ctx) { u16 value = VarGet(ScriptReadHalfword(ctx)); - gScriptResult = sub_80C53F8(value); + gScriptResult = ScriptGiveEgg(value); return FALSE; } @@ -1556,7 +1556,7 @@ bool8 ScrCmd_setpokemove(struct ScriptContext *ctx) u8 v2 = ScriptReadByte(ctx); u8 v3 = ScriptReadByte(ctx); u16 v4 = ScriptReadHalfword(ctx); - sub_80C5530(v2, v4, v3); + ScriptSetMonMoveSlot(v2, v4, v3); return FALSE; } @@ -1710,7 +1710,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx) u16 v2 = ScriptReadHalfword(ctx); u8 v4 = ScriptReadByte(ctx); u16 v5 = ScriptReadHalfword(ctx); - sub_80C54D0(v2, v4, v5); + ScriptWildBattle(v2, v4, v5); return FALSE; } @@ -1748,7 +1748,7 @@ bool8 ScrCmd_pokemartbp(struct ScriptContext *ctx) bool8 ScrCmd_pokecasino(struct ScriptContext *ctx) { u8 v2 = VarGet(ScriptReadHalfword(ctx)); - sub_81018A0(v2, c2_exit_to_overworld_1_continue_scripts_restart_music); + PlaySlotMachine(v2, c2_exit_to_overworld_1_continue_scripts_restart_music); ScriptContext1_Stop(); return TRUE; } |