diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-20 11:23:34 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-23 08:09:22 +0800 |
commit | a4e7a359606b276bc595f0273ccc549c766d715b (patch) | |
tree | 5067dc0476f8418fe173a06910b1cf8c46fdbbc7 | |
parent | 548490c675f68dfacf4d1939486c47d8405dddd8 (diff) |
document some symbols
56 files changed, 3089 insertions, 3092 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index dd84f75c1..c0efe9975 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -2572,7 +2572,7 @@ _0806DC78: bl sub_805550C ldrb r0, [r4, 0x7] ldrb r1, [r4, 0x6] - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldr r1, [r0, 0x4] ldrb r0, [r4, 0x5] ldr r1, [r1, 0x8] diff --git a/asm/field_effect.s b/asm/field_effect.s index a8542fcc3..41c33c6fc 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310 ldrsh r6, [r4, r0] cmp r6, 0 bne _08084350 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08084376 @@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites sub_8084564: @ 8084564 push {r4,lr} adds r4, r0, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08084578 @@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274 adds r4, r0, 0 adds r5, r1, 0 adds r6, r2, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _080852B4 @@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks sub_8085A54: @ 8085A54 push {r4,lr} adds r4, r0, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08085A78 @@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks sub_8085E0C: @ 8085E0C push {r4-r6,lr} adds r6, r0, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08085E82 diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 8787ff647..8c782d3dd 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -376,7 +376,7 @@ sub_805E080: @ 805E080 str r0, [sp, 0x8] adds r0, r6, 0 adds r1, r7, 0 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldr r1, [r0, 0x4] lsls r0, r4, 1 adds r0, r4 @@ -4294,7 +4294,7 @@ _0805FD90: .4byte gMapHeader _0805FD94: adds r0, r2, 0 adds r1, r3, 0 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldr r0, [r0, 0x4] ldr r1, [r0, 0x4] _0805FDA0: diff --git a/asm/field_weather.s b/asm/field_weather.s index b65548171..ece13573f 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -1889,8 +1889,8 @@ _0807AA68: .4byte 0x000006ca _0807AA6C: .4byte 0x000006cb thumb_func_end FieldWeather_StartFadingOutCreditsMap - thumb_func_start field_weather_is_fade_finished -field_weather_is_fade_finished: @ 807AA70 + thumb_func_start IsWeatherNotFadingIn +IsWeatherNotFadingIn: @ 807AA70 ldr r0, _0807AA84 @ =gUnknown_2037F34 ldr r1, _0807AA88 @ =0x000006c6 adds r0, r1 @@ -1904,7 +1904,7 @@ field_weather_is_fade_finished: @ 807AA70 .align 2, 0 _0807AA84: .4byte gUnknown_2037F34 _0807AA88: .4byte 0x000006c6 - thumb_func_end field_weather_is_fade_finished + thumb_func_end IsWeatherNotFadingIn thumb_func_start sub_807AA8C sub_807AA8C: @ 807AA8C diff --git a/asm/item_menu.s b/asm/item_menu.s index a8487864a..9774cbe90 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8107DB4 -sub_8107DB4: @ 8107DB4 + thumb_func_start GoToBagMenu +GoToBagMenu: @ 8107DB4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -136,7 +136,7 @@ _08107EA8: .4byte gSpecialVar_ItemId _08107EAC: .4byte sub_8107F10 _08107EB0: .4byte gUnknown_203AD10 _08107EB4: .4byte gUnknown_203ACFC - thumb_func_end sub_8107DB4 + thumb_func_end GoToBagMenu thumb_func_start CB2_BagMenuFromStartMenu CB2_BagMenuFromStartMenu: @ 8107EB8 @@ -144,7 +144,7 @@ CB2_BagMenuFromStartMenu: @ 8107EB8 ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu movs r0, 0 movs r1, 0x3 - bl sub_8107DB4 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 @@ -157,7 +157,7 @@ sub_8107ECC: @ 8107ECC ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2 movs r0, 0x5 movs r1, 0x3 - bl sub_8107DB4 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 @@ -1934,15 +1934,15 @@ _08108CE8: .4byte 0x0000fff0 _08108CEC: .4byte gUnknown_203ACFC thumb_func_end sub_8108CB4 - thumb_func_start sub_8108CF0 -sub_8108CF0: @ 8108CF0 + thumb_func_start CB2_SetUpReshowBattleScreenAfterMenu +CB2_SetUpReshowBattleScreenAfterMenu: @ 8108CF0 ldr r1, _08108CF8 @ =gUnknown_203ACFC movs r0, 0 strb r0, [r1, 0x5] bx lr .align 2, 0 _08108CF8: .4byte gUnknown_203ACFC - thumb_func_end sub_8108CF0 + thumb_func_end CB2_SetUpReshowBattleScreenAfterMenu thumb_func_start sub_8108CFC sub_8108CFC: @ 8108CFC @@ -4399,7 +4399,7 @@ _0810A120: _0810A13E: ldr r0, _0810A154 @ =gUnknown_203AD10 ldr r1, [r0] - ldr r0, _0810A158 @ =sub_8126EDC + ldr r0, _0810A158 @ =CB2_ChooseMonToGiveItem str r0, [r1] mov r0, r8 subs r0, 0x8 @@ -4409,7 +4409,7 @@ _0810A13E: b _0810A166 .align 2, 0 _0810A154: .4byte gUnknown_203AD10 -_0810A158: .4byte sub_8126EDC +_0810A158: .4byte CB2_ChooseMonToGiveItem _0810A15C: .4byte ItemMenu_StartFadeToExitCallback _0810A160: adds r0, r7, 0 @@ -4786,7 +4786,7 @@ _0810A458: .4byte sub_810A45C thumb_func_start sub_810A45C sub_810A45C: @ 810A45C push {lr} - bl sub_8123730 + bl CB2_SelectBagItemToGive pop {r0} bx r0 thumb_func_end sub_810A45C @@ -4918,7 +4918,7 @@ sub_810A554: @ 810A554 ldr r2, _0810A564 @ =sub_808CE60 movs r0, 0x4 movs r1, 0x3 - bl sub_8107DB4 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 @@ -5063,7 +5063,7 @@ sub_810A67C: @ 810A67C ldr r2, _0810A68C @ =CB2_ReturnToField movs r0, 0x2 movs r1, 0x3 - bl sub_8107DB4 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 @@ -6127,7 +6127,7 @@ sub_810AF74: @ 810AF74 ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2 movs r0, 0x6 movs r1, 0 - bl sub_8107DB4 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 @@ -6358,7 +6358,7 @@ _0810B16C: movs r0, 0x8 _0810B170: movs r1, 0 - bl sub_8107DB4 + bl GoToBagMenu pop {r4} pop {r0} bx r0 @@ -6856,10 +6856,10 @@ _0810B564: movs r2, 0 bl DestroyListMenuTask bl sub_810AECC - ldr r1, _0810B5B0 @ =gUnknown_3005E98 + ldr r1, _0810B5B0 @ =gItemUseCB ldr r0, _0810B5B4 @ =ItemUseCB_Medicine str r0, [r1] - ldr r0, _0810B5B8 @ =sub_81279A4 + ldr r0, _0810B5B8 @ =ChooseMonForInBattleItem bl ItemMenu_SetExitCallback mov r0, r9 subs r0, 0x8 @@ -6868,9 +6868,9 @@ _0810B564: str r1, [r0] b _0810B5C6 .align 2, 0 -_0810B5B0: .4byte gUnknown_3005E98 +_0810B5B0: .4byte gItemUseCB _0810B5B4: .4byte ItemUseCB_Medicine -_0810B5B8: .4byte sub_81279A4 +_0810B5B8: .4byte ChooseMonForInBattleItem _0810B5BC: .4byte sub_810B070 _0810B5C0: ldrh r0, [r5, 0x10] diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 0ccbda9eb..df112d1ad 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3172,8 +3172,8 @@ _080FEBA6: bx r0 thumb_func_end sub_80FEB3C - thumb_func_start sub_80FEBAC -sub_80FEBAC: @ 80FEBAC + thumb_func_start DoEasyChatScreen +DoEasyChatScreen: @ 80FEBAC push {r4-r6,lr} mov r6, r8 push {r6} @@ -3214,7 +3214,7 @@ sub_80FEBAC: @ 80FEBAC _080FEC00: .4byte sub_80FEC54 _080FEC04: .4byte gTasks _080FEC08: .4byte sub_80FEC0C - thumb_func_end sub_80FEBAC + thumb_func_end DoEasyChatScreen thumb_func_start sub_80FEC0C sub_80FEC0C: @ 80FEC0C @@ -3588,7 +3588,7 @@ _080FEF08: ldr r0, _080FEF24 @ =gSpecialVar_0x8004 ldrb r0, [r0] ldr r2, _080FEF28 @ =sub_80568C4 - bl sub_80FEBAC + bl DoEasyChatScreen _080FEF12: pop {r0} bx r0 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 24125485e..d996721ad 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3650,7 +3650,7 @@ _08117784: ldr r0, _0811779C @ =sub_811C1C8 str r0, [r1, 0x8] movs r0, 0x2 - bl sub_81274A8 + bl InitChooseHalfPartyForBattle b _081178E0 .align 2, 0 _08117798: .4byte gMain @@ -5602,12 +5602,12 @@ _0811887C: _081188C4: .4byte gUnknown_203B06C _081188C8: .4byte gSpecialVar_Result _081188CC: - bl sub_811FB18 + bl GetPartyMenuType lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 beq _081188E4 - bl sub_811FB18 + bl GetPartyMenuType lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 @@ -7006,7 +7006,7 @@ _08119512: str r0, [r1] ldr r1, _08119538 @ =CB2_ReturnToField movs r0, 0x8 - bl sub_81277F4 + bl ChooseMonForMoveTutor b _081198DC .align 2, 0 _08119528: .4byte gPaletteFade @@ -7335,7 +7335,7 @@ _081197CA: adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r2, _0811982C @ =gUnknown_203B06A + ldr r2, _0811982C @ =gUnionRoomRequestedMonType ldr r1, [r6] movs r3, 0x2 ldrsh r0, [r7, r3] @@ -7344,7 +7344,7 @@ _081197CA: ldrb r0, [r1, 0x9] lsrs r0, 2 strb r0, [r2] - ldr r2, _08119830 @ =gUnknown_203B068 + ldr r2, _08119830 @ =gUnionRoomOfferedSpecies ldr r1, [r6] movs r3, 0x2 ldrsh r0, [r7, r3] @@ -7359,7 +7359,7 @@ _081197CA: str r0, [r1] ldr r1, _0811983C @ =CB2_ReturnToField movs r0, 0x9 - bl sub_81277F4 + bl ChooseMonForMoveTutor adds r0, r6, 0 bl sub_81186B0 ldrh r0, [r7, 0x2] @@ -7369,8 +7369,8 @@ _081197CA: _08119820: .4byte gUnknown_8458D1C _08119824: .4byte gUnknown_203B06C _08119828: .4byte gUnknown_203B064 -_0811982C: .4byte gUnknown_203B06A -_08119830: .4byte gUnknown_203B068 +_0811982C: .4byte gUnionRoomRequestedMonType +_08119830: .4byte gUnionRoomOfferedSpecies _08119834: .4byte gFieldCallback _08119838: .4byte sub_807DCE4 _0811983C: .4byte CB2_ReturnToField diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 817d215a0..a42d6e4ab 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -3623,7 +3623,7 @@ sub_809F5C4: @ 809F5C4 push {r4,r5,lr} sub sp, 0x10 movs r4, 0 - ldr r1, _0809F61C @ =gUnknown_841621F + ldr r1, _0809F61C @ =gText_MaleSymbol add r0, sp, 0xC bl StringCopy ldr r5, _0809F620 @ =gUnknown_203998C @@ -3635,7 +3635,7 @@ sub_809F5C4: @ 809F5C4 beq _0809F614 cmp r0, 0xFE bne _0809F5EE - ldr r1, _0809F628 @ =gUnknown_8416221 + ldr r1, _0809F628 @ =gText_FemaleSymbol add r0, sp, 0xC bl StringCopy movs r4, 0x1 @@ -3664,10 +3664,10 @@ _0809F614: pop {r0} bx r0 .align 2, 0 -_0809F61C: .4byte gUnknown_841621F +_0809F61C: .4byte gText_MaleSymbol _0809F620: .4byte gUnknown_203998C _0809F624: .4byte 0x00001e36 -_0809F628: .4byte gUnknown_8416221 +_0809F628: .4byte gText_FemaleSymbol _0809F62C: .4byte 0x00001e13 _0809F630: .4byte gUnknown_83E2428 thumb_func_end sub_809F5C4 diff --git a/asm/overworld.s b/asm/overworld.s index 28bcd8ecb..29c676060 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -473,7 +473,7 @@ _08054F8A: str r2, [sp, 0x4] adds r0, r2, 0 adds r1, r5, 0 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId mov r6, r10 ldr r1, [r6] mov r2, r8 @@ -821,8 +821,8 @@ _08055232: bx r1 thumb_func_end warp_data_is_not_neg_1 - thumb_func_start get_mapheader_by_bank_and_number -get_mapheader_by_bank_and_number: @ 8055238 + thumb_func_start Overworld_GetMapHeaderByGroupAndId +Overworld_GetMapHeaderByGroupAndId: @ 8055238 lsls r0, 16 lsls r1, 16 ldr r2, _0805524C @ =gMapGroups @@ -835,7 +835,7 @@ get_mapheader_by_bank_and_number: @ 8055238 bx lr .align 2, 0 _0805524C: .4byte gMapGroups - thumb_func_end get_mapheader_by_bank_and_number + thumb_func_end Overworld_GetMapHeaderByGroupAndId thumb_func_start warp1_get_mapheader warp1_get_mapheader: @ 8055250 @@ -850,7 +850,7 @@ warp1_get_mapheader: @ 8055250 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId pop {r1} bx r1 .align 2, 0 @@ -872,7 +872,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8055274 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r1, r4, 0 ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} @@ -908,7 +908,7 @@ set_current_map_header_from_sav1: @ 80552BC asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r1, r4, 0 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} @@ -2336,7 +2336,7 @@ sub_8055D6C: @ 8055D6C asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrh r0, [r0, 0x10] pop {r1} bx r1 @@ -2863,7 +2863,7 @@ get_map_light_level_by_bank_and_number: @ 8056158 lsls r1, 24 asrs r1, 8 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, 0x17] pop {r1} bx r1 @@ -2925,7 +2925,7 @@ sub_80561B4: @ 80561B4 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, 0x14] pop {r1} bx r1 @@ -3014,7 +3014,7 @@ sav1_saved_warp2_map_get_name: @ 8056238 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, 0x14] pop {r1} bx r1 @@ -3036,7 +3036,7 @@ GetCurrentRegionMapSectionId: @ 8056260 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, 0x14] pop {r1} bx r1 @@ -3058,7 +3058,7 @@ sav1_map_get_battletype: @ 8056288 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, 0x1B] pop {r1} bx r1 diff --git a/asm/party_menu.s b/asm/party_menu.s index 3cb62c712..081515121 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -5,8 +5,8 @@ .text - thumb_func_start PartyMenuInit -PartyMenuInit: @ 811EA44 + thumb_func_start InitPartyMenu +InitPartyMenu: @ 811EA44 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -28,8 +28,8 @@ PartyMenuInit: @ 811EA44 str r3, [sp] lsls r4, 24 lsrs r7, r4, 24 - bl reset_brm - ldr r6, _0811EA8C @ =gUnknown_203B09C + bl ResetPartyMenu + ldr r6, _0811EA8C @ =sPartyMenuInternal movs r0, 0x8E lsls r0, 2 bl Alloc @@ -41,9 +41,9 @@ PartyMenuInit: @ 811EA44 bl SetMainCallback2 b _0811EB80 .align 2, 0 -_0811EA8C: .4byte gUnknown_203B09C +_0811EA8C: .4byte sPartyMenuInternal _0811EA90: - ldr r3, _0811EAE0 @ =gUnknown_203B0A0 + ldr r3, _0811EAE0 @ =gPartyMenu movs r1, 0xF mov r0, r9 ands r1, r0 @@ -83,7 +83,7 @@ _0811EA90: strb r1, [r0, 0x8] b _0811EAF0 .align 2, 0 -_0811EAE0: .4byte gUnknown_203B0A0 +_0811EAE0: .4byte gPartyMenu _0811EAE4: ldr r2, [r6] ldrb r1, [r2, 0x8] @@ -106,7 +106,7 @@ _0811EAF0: strb r1, [r7, 0x8] _0811EB08: movs r2, 0 - ldr r5, _0811EB90 @ =gUnknown_203B09C + ldr r5, _0811EB90 @ =sPartyMenuInternal movs r4, 0x86 lsls r4, 2 movs r3, 0 @@ -122,7 +122,7 @@ _0811EB12: cmp r2, 0xF bls _0811EB12 movs r2, 0 - ldr r4, _0811EB90 @ =gUnknown_203B09C + ldr r4, _0811EB90 @ =sPartyMenuInternal movs r3, 0xFF _0811EB2C: ldr r0, [r4] @@ -165,7 +165,7 @@ _0811EB6A: ands r0, r1 strb r0, [r2] bl CalculatePlayerPartyCount - ldr r0, _0811EB9C @ =sub_811EBD0 + ldr r0, _0811EB9C @ =CB2_InitPartyMenu bl SetMainCallback2 _0811EB80: add sp, 0x4 @@ -177,14 +177,14 @@ _0811EB80: pop {r0} bx r0 .align 2, 0 -_0811EB90: .4byte gUnknown_203B09C +_0811EB90: .4byte sPartyMenuInternal _0811EB94: .4byte gPlayerParty _0811EB98: .4byte gTextFlags -_0811EB9C: .4byte sub_811EBD0 - thumb_func_end PartyMenuInit +_0811EB9C: .4byte CB2_InitPartyMenu + thumb_func_end InitPartyMenu - thumb_func_start sub_811EBA0 -sub_811EBA0: @ 811EBA0 + thumb_func_start CB2_UpdatePartyMenu +CB2_UpdatePartyMenu: @ 811EBA0 push {lr} bl RunTasks bl AnimateSprites @@ -193,20 +193,20 @@ sub_811EBA0: @ 811EBA0 bl UpdatePaletteFade pop {r0} bx r0 - thumb_func_end sub_811EBA0 + thumb_func_end CB2_UpdatePartyMenu - thumb_func_start sub_811EBBC -sub_811EBBC: @ 811EBBC + thumb_func_start VBlankCB_PartyMenu +VBlankCB_PartyMenu: @ 811EBBC push {lr} bl LoadOam bl ProcessSpriteCopyRequests bl TransferPlttBuffer pop {r0} bx r0 - thumb_func_end sub_811EBBC + thumb_func_end VBlankCB_PartyMenu - thumb_func_start sub_811EBD0 -sub_811EBD0: @ 811EBD0 + thumb_func_start CB2_InitPartyMenu +CB2_InitPartyMenu: @ 811EBD0 push {lr} _0811EBD2: bl sub_80BF748 @@ -214,7 +214,7 @@ _0811EBD2: lsrs r0, 24 cmp r0, 0x1 beq _0811EBF6 - bl sub_811EBFC + bl ShowPartyMenu lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -227,10 +227,10 @@ _0811EBD2: _0811EBF6: pop {r0} bx r0 - thumb_func_end sub_811EBD0 + thumb_func_end CB2_InitPartyMenu - thumb_func_start sub_811EBFC -sub_811EBFC: @ 811EBFC + thumb_func_start ShowPartyMenu +ShowPartyMenu: @ 811EBFC push {r4,lr} sub sp, 0x4 ldr r0, _0811EC1C @ =gMain @@ -308,18 +308,18 @@ _0811ECC0: bl ResetTasks b _0811EDFC _0811ECC6: - bl sub_81208E4 + bl SetPartyMonsAllowedInMinigame b _0811EDFC _0811ECCC: - bl sub_811EECC + bl AllocPartyMenuBg lsls r0, 24 cmp r0, 0 bne _0811ECDE - bl sub_811EE38 + bl ExitPartyMenu movs r0, 0x1 b _0811EE2E _0811ECDE: - ldr r0, _0811ECF0 @ =gUnknown_203B09C + ldr r0, _0811ECF0 @ =sPartyMenuInternal ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -328,9 +328,9 @@ _0811ECDE: strh r1, [r0] b _0811EDFC .align 2, 0 -_0811ECF0: .4byte gUnknown_203B09C +_0811ECF0: .4byte sPartyMenuInternal _0811ECF4: - bl sub_811EF44 + bl AllocPartyMenuBgGfx lsls r0, 24 cmp r0, 0 bne _0811ED00 @@ -338,21 +338,21 @@ _0811ECF4: _0811ED00: b _0811EDFC _0811ED02: - ldr r0, _0811ED10 @ =gUnknown_203B0A0 + ldr r0, _0811ED10 @ =gPartyMenu ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 - bl sub_8121060 + bl InitPartyMenuWindows b _0811EDFC .align 2, 0 -_0811ED10: .4byte gUnknown_203B0A0 +_0811ED10: .4byte gPartyMenu _0811ED14: - ldr r0, _0811ED30 @ =gUnknown_203B0A0 + ldr r0, _0811ED30 @ =gPartyMenu ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 - bl sub_811F0BC - ldr r0, _0811ED34 @ =gUnknown_203B09C + bl InitPartyMenuBoxes + ldr r0, _0811ED34 @ =sPartyMenuInternal ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -361,26 +361,26 @@ _0811ED14: strh r1, [r0] b _0811EDFC .align 2, 0 -_0811ED30: .4byte gUnknown_203B0A0 -_0811ED34: .4byte gUnknown_203B09C +_0811ED30: .4byte gPartyMenu +_0811ED34: .4byte sPartyMenuInternal _0811ED38: bl LoadHeldItemIcons b _0811EDFC _0811ED3E: - bl sub_8122860 + bl LoadPartyMenuPokeballGfx b _0811EDFC _0811ED44: - bl sub_8122980 + bl LoadPartyMenuAilmentGfx b _0811EDFC _0811ED4A: bl LoadMonIconPalettes b _0811EDFC _0811ED50: - bl party_menu_add_per_mon_objects + bl CreatePartyMonSpritesLoop lsls r0, 24 cmp r0, 0 beq _0811EE2C - ldr r0, _0811ED6C @ =gUnknown_203B09C + ldr r0, _0811ED6C @ =sPartyMenuInternal ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -389,13 +389,13 @@ _0811ED50: strh r1, [r0] b _0811EDFC .align 2, 0 -_0811ED6C: .4byte gUnknown_203B09C +_0811ED6C: .4byte sPartyMenuInternal _0811ED70: - bl sub_811F5EC + bl RenderPartyMenuBoxes lsls r0, 24 cmp r0, 0 beq _0811EE2C - ldr r0, _0811ED8C @ =gUnknown_203B09C + ldr r0, _0811ED8C @ =sPartyMenuInternal ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -404,26 +404,26 @@ _0811ED70: strh r1, [r0] b _0811EDFC .align 2, 0 -_0811ED8C: .4byte gUnknown_203B09C +_0811ED8C: .4byte sPartyMenuInternal _0811ED90: - bl sub_811F774 + bl CreateCancelConfirmPokeballSprites b _0811EDFC _0811ED96: - ldr r0, _0811EDA8 @ =gUnknown_203B09C + ldr r0, _0811EDA8 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 lsrs r0, 31 - bl sub_81210F8 + bl CreateCancelConfirmWindows b _0811EDFC .align 2, 0 -_0811EDA8: .4byte gUnknown_203B09C +_0811EDA8: .4byte sPartyMenuInternal _0811EDAC: movs r0, 0x5 bl HelpSystem_SetSomeVariable2 b _0811EDFC _0811EDB4: - ldr r4, _0811EDCC @ =gUnknown_203B09C + ldr r4, _0811EDCC @ =sPartyMenuInternal ldr r0, [r4] ldr r0, [r0] movs r1, 0 @@ -431,10 +431,10 @@ _0811EDB4: ldr r0, [r4] ldrh r0, [r0, 0xA] lsrs r0, 2 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _0811EDFC .align 2, 0 -_0811EDCC: .4byte gUnknown_203B09C +_0811EDCC: .4byte sPartyMenuInternal _0811EDD0: movs r0, 0x1 negs r0, r0 @@ -471,15 +471,15 @@ _0811EDFC: _0811EE0C: .4byte gPaletteFade _0811EE10: .4byte gMain _0811EE14: - ldr r0, _0811EE24 @ =sub_811EBBC + ldr r0, _0811EE24 @ =VBlankCB_PartyMenu bl SetVBlankCallback - ldr r0, _0811EE28 @ =sub_811EBA0 + ldr r0, _0811EE28 @ =CB2_UpdatePartyMenu bl SetMainCallback2 movs r0, 0x1 b _0811EE2E .align 2, 0 -_0811EE24: .4byte sub_811EBBC -_0811EE28: .4byte sub_811EBA0 +_0811EE24: .4byte VBlankCB_PartyMenu +_0811EE28: .4byte CB2_UpdatePartyMenu _0811EE2C: movs r0, 0 _0811EE2E: @@ -487,10 +487,10 @@ _0811EE2E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_811EBFC + thumb_func_end ShowPartyMenu - thumb_func_start sub_811EE38 -sub_811EE38: @ 811EE38 + thumb_func_start ExitPartyMenu +ExitPartyMenu: @ 811EE38 push {lr} sub sp, 0x4 movs r0, 0x1 @@ -501,24 +501,24 @@ sub_811EE38: @ 811EE38 str r2, [sp] movs r3, 0x10 bl BeginNormalPaletteFade - ldr r0, _0811EE68 @ =sub_811EE74 + ldr r0, _0811EE68 @ =Task_ExitPartyMenu movs r1, 0 bl CreateTask - ldr r0, _0811EE6C @ =sub_811EBBC + ldr r0, _0811EE6C @ =VBlankCB_PartyMenu bl SetVBlankCallback - ldr r0, _0811EE70 @ =sub_811EBA0 + ldr r0, _0811EE70 @ =CB2_UpdatePartyMenu bl SetMainCallback2 add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0811EE68: .4byte sub_811EE74 -_0811EE6C: .4byte sub_811EBBC -_0811EE70: .4byte sub_811EBA0 - thumb_func_end sub_811EE38 +_0811EE68: .4byte Task_ExitPartyMenu +_0811EE6C: .4byte VBlankCB_PartyMenu +_0811EE70: .4byte CB2_UpdatePartyMenu + thumb_func_end ExitPartyMenu - thumb_func_start sub_811EE74 -sub_811EE74: @ 811EE74 + thumb_func_start Task_ExitPartyMenu +Task_ExitPartyMenu: @ 811EE74 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -528,10 +528,10 @@ sub_811EE74: @ 811EE74 ands r0, r1 cmp r0, 0 bne _0811EE98 - ldr r0, _0811EEA4 @ =gUnknown_203B0A0 + ldr r0, _0811EEA4 @ =gPartyMenu ldr r0, [r0] bl SetMainCallback2 - bl sub_811F070 + bl FreePartyPointers adds r0, r4, 0 bl DestroyTask _0811EE98: @@ -540,33 +540,33 @@ _0811EE98: bx r0 .align 2, 0 _0811EEA0: .4byte gPaletteFade -_0811EEA4: .4byte gUnknown_203B0A0 - thumb_func_end sub_811EE74 +_0811EEA4: .4byte gPartyMenu + thumb_func_end Task_ExitPartyMenu - thumb_func_start reset_brm -reset_brm: @ 811EEA8 - ldr r0, _0811EEBC @ =gUnknown_203B09C + thumb_func_start ResetPartyMenu +ResetPartyMenu: @ 811EEA8 + ldr r0, _0811EEBC @ =sPartyMenuInternal movs r1, 0 str r1, [r0] - ldr r0, _0811EEC0 @ =gUnknown_203B0BC + ldr r0, _0811EEC0 @ =sPartyBgTilemapBuffer str r1, [r0] - ldr r0, _0811EEC4 @ =gUnknown_203B0B4 + ldr r0, _0811EEC4 @ =sPartyMenuBoxes str r1, [r0] - ldr r0, _0811EEC8 @ =gUnknown_203B0B8 + ldr r0, _0811EEC8 @ =sPartyBgGfxTilemap str r1, [r0] bx lr .align 2, 0 -_0811EEBC: .4byte gUnknown_203B09C -_0811EEC0: .4byte gUnknown_203B0BC -_0811EEC4: .4byte gUnknown_203B0B4 -_0811EEC8: .4byte gUnknown_203B0B8 - thumb_func_end reset_brm +_0811EEBC: .4byte sPartyMenuInternal +_0811EEC0: .4byte sPartyBgTilemapBuffer +_0811EEC4: .4byte sPartyMenuBoxes +_0811EEC8: .4byte sPartyBgGfxTilemap + thumb_func_end ResetPartyMenu - thumb_func_start sub_811EECC -sub_811EECC: @ 811EECC + thumb_func_start AllocPartyMenuBg +AllocPartyMenuBg: @ 811EECC push {r4,r5,lr} bl ResetAllBgsCoordinatesAndBgCntRegs - ldr r5, _0811EF34 @ =gUnknown_203B0BC + ldr r5, _0811EF34 @ =sPartyBgTilemapBuffer movs r4, 0x80 lsls r4, 4 adds r0, r4, 0 @@ -579,7 +579,7 @@ sub_811EECC: @ 811EECC bl memset movs r0, 0 bl ResetBgsAndClearDma3BusyFlags - ldr r1, _0811EF38 @ =gUnknown_8459EB8 + ldr r1, _0811EF38 @ =sPartyMenuBgTemplates movs r0, 0 movs r2, 0x3 bl InitBgsFromTemplates @@ -604,21 +604,21 @@ sub_811EECC: @ 811EECC movs r0, 0x1 b _0811EF3E .align 2, 0 -_0811EF34: .4byte gUnknown_203B0BC -_0811EF38: .4byte gUnknown_8459EB8 +_0811EF34: .4byte sPartyBgTilemapBuffer +_0811EF38: .4byte sPartyMenuBgTemplates _0811EF3C: movs r0, 0 _0811EF3E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_811EECC + thumb_func_end AllocPartyMenuBg - thumb_func_start sub_811EF44 -sub_811EF44: @ 811EF44 + thumb_func_start AllocPartyMenuBgGfx +AllocPartyMenuBgGfx: @ 811EF44 push {r4,lr} sub sp, 0x4 - ldr r0, _0811EF64 @ =gUnknown_203B09C + ldr r0, _0811EF64 @ =sPartyMenuInternal ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -633,7 +633,7 @@ sub_811EF44: @ 811EF44 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811EF64: .4byte gUnknown_203B09C +_0811EF64: .4byte sPartyMenuInternal _0811EF68: .4byte _0811EF6C .align 2, 0 _0811EF6C: @@ -646,8 +646,8 @@ _0811EF6C: .4byte _0811F00C .4byte _0811F010 _0811EF8C: - ldr r4, _0811EFAC @ =gUnknown_203B0B8 - ldr r0, _0811EFB0 @ =gFile_graphics_interface_party_menu_misc_sheet + ldr r4, _0811EFAC @ =sPartyBgGfxTilemap + ldr r0, _0811EFB0 @ =gPartyMenuBg_Gfx mov r1, sp bl MallocAndDecompress adds r1, r0, 0 @@ -660,29 +660,29 @@ _0811EF8C: bl LoadBgTiles b _0811F016 .align 2, 0 -_0811EFAC: .4byte gUnknown_203B0B8 -_0811EFB0: .4byte gFile_graphics_interface_party_menu_misc_sheet +_0811EFAC: .4byte sPartyBgGfxTilemap +_0811EFB0: .4byte gPartyMenuBg_Gfx _0811EFB4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 bne _0811F030 - ldr r0, _0811EFCC @ =gFile_graphics_interface_party_menu_misc_tilemap - ldr r1, _0811EFD0 @ =gUnknown_203B0BC + ldr r0, _0811EFCC @ =gPartyMenuBg_Tilemap + ldr r1, _0811EFD0 @ =sPartyBgTilemapBuffer ldr r1, [r1] bl LZDecompressWram b _0811F016 .align 2, 0 -_0811EFCC: .4byte gFile_graphics_interface_party_menu_misc_tilemap -_0811EFD0: .4byte gUnknown_203B0BC +_0811EFCC: .4byte gPartyMenuBg_Tilemap +_0811EFD0: .4byte sPartyBgTilemapBuffer _0811EFD4: - ldr r0, _0811EFF4 @ =gUnknown_8E829C8 + ldr r0, _0811EFF4 @ =gPartyMenuBg_Pal movs r2, 0xB0 lsls r2, 1 movs r1, 0 bl LoadCompressedPalette ldr r0, _0811EFF8 @ =gPlttBufferUnfaded - ldr r4, _0811EFFC @ =gUnknown_203B09C + ldr r4, _0811EFFC @ =sPartyMenuInternal ldr r1, [r4] adds r1, 0x18 movs r2, 0xB0 @@ -690,9 +690,9 @@ _0811EFD4: ldr r1, [r4] b _0811F01A .align 2, 0 -_0811EFF4: .4byte gUnknown_8E829C8 +_0811EFF4: .4byte gPartyMenuBg_Pal _0811EFF8: .4byte gPlttBufferUnfaded -_0811EFFC: .4byte gUnknown_203B09C +_0811EFFC: .4byte sPartyMenuInternal _0811F000: movs r0, 0x4 b _0811F012 @@ -708,9 +708,9 @@ _0811F00C: _0811F010: movs r0, 0x8 _0811F012: - bl sub_811F03C + bl PartyPaletteBufferCopy _0811F016: - ldr r0, _0811F028 @ =gUnknown_203B09C + ldr r0, _0811F028 @ =sPartyMenuInternal ldr r1, [r0] _0811F01A: movs r0, 0x86 @@ -721,7 +721,7 @@ _0811F01A: strh r0, [r1] b _0811F030 .align 2, 0 -_0811F028: .4byte gUnknown_203B09C +_0811F028: .4byte sPartyMenuInternal _0811F02C: movs r0, 0x1 b _0811F032 @@ -732,10 +732,10 @@ _0811F032: pop {r4} pop {r1} bx r1 - thumb_func_end sub_811EF44 + thumb_func_end AllocPartyMenuBgGfx - thumb_func_start sub_811F03C -sub_811F03C: @ 811F03C + thumb_func_start PartyPaletteBufferCopy +PartyPaletteBufferCopy: @ 811F03C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 28 @@ -759,30 +759,30 @@ sub_811F03C: @ 811F03C .align 2, 0 _0811F068: .4byte gPlttBufferUnfaded + 0x60 _0811F06C: .4byte gPlttBufferFaded - thumb_func_end sub_811F03C + thumb_func_end PartyPaletteBufferCopy - thumb_func_start sub_811F070 -sub_811F070: @ 811F070 + thumb_func_start FreePartyPointers +FreePartyPointers: @ 811F070 push {lr} - ldr r0, _0811F0AC @ =gUnknown_203B09C + ldr r0, _0811F0AC @ =sPartyMenuInternal ldr r0, [r0] cmp r0, 0 beq _0811F07E bl Free _0811F07E: - ldr r0, _0811F0B0 @ =gUnknown_203B0BC + ldr r0, _0811F0B0 @ =sPartyBgTilemapBuffer ldr r0, [r0] cmp r0, 0 beq _0811F08A bl Free _0811F08A: - ldr r0, _0811F0B4 @ =gUnknown_203B0B8 + ldr r0, _0811F0B4 @ =sPartyBgGfxTilemap ldr r0, [r0] cmp r0, 0 beq _0811F096 bl Free _0811F096: - ldr r0, _0811F0B8 @ =gUnknown_203B0B4 + ldr r0, _0811F0B8 @ =sPartyMenuBoxes ldr r0, [r0] cmp r0, 0 beq _0811F0A2 @@ -792,28 +792,28 @@ _0811F0A2: pop {r0} bx r0 .align 2, 0 -_0811F0AC: .4byte gUnknown_203B09C -_0811F0B0: .4byte gUnknown_203B0BC -_0811F0B4: .4byte gUnknown_203B0B8 -_0811F0B8: .4byte gUnknown_203B0B4 - thumb_func_end sub_811F070 +_0811F0AC: .4byte sPartyMenuInternal +_0811F0B0: .4byte sPartyBgTilemapBuffer +_0811F0B4: .4byte sPartyBgGfxTilemap +_0811F0B8: .4byte sPartyMenuBoxes + thumb_func_end FreePartyPointers - thumb_func_start sub_811F0BC -sub_811F0BC: @ 811F0BC + thumb_func_start InitPartyMenuBoxes +InitPartyMenuBoxes: @ 811F0BC push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _0811F108 @ =gUnknown_203B0B4 + ldr r4, _0811F108 @ =sPartyMenuBoxes movs r0, 0x60 bl Alloc str r0, [r4] movs r2, 0 - ldr r7, _0811F10C @ =gUnknown_8459EE4 + ldr r7, _0811F10C @ =sPartyBoxInfoRects + 0x20 lsls r0, r5, 1 adds r0, r5 lsls r3, r0, 4 mov r12, r4 - ldr r6, _0811F110 @ =gUnknown_8459F04 + ldr r6, _0811F110 @ =sPartyMenuSpriteCoords _0811F0DA: ldr r0, [r4] lsls r1, r2, 4 @@ -831,17 +831,17 @@ _0811F0DA: bls _0811F0DA mov r1, r12 ldr r0, [r1] - ldr r1, _0811F114 @ =gUnknown_8459EC4 + ldr r1, _0811F114 @ =sPartyBoxInfoRects str r1, [r0] cmp r5, 0x3 bne _0811F118 str r1, [r0, 0x30] b _0811F11E .align 2, 0 -_0811F108: .4byte gUnknown_203B0B4 -_0811F10C: .4byte gUnknown_8459EE4 -_0811F110: .4byte gUnknown_8459F04 -_0811F114: .4byte gUnknown_8459EC4 +_0811F108: .4byte sPartyMenuBoxes +_0811F10C: .4byte sPartyBoxInfoRects + 0x20 +_0811F110: .4byte sPartyMenuSpriteCoords +_0811F114: .4byte sPartyBoxInfoRects _0811F118: cmp r5, 0 beq _0811F11E @@ -850,14 +850,14 @@ _0811F11E: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_811F0BC + thumb_func_end InitPartyMenuBoxes - thumb_func_start sub_811F124 -sub_811F124: @ 811F124 + thumb_func_start RenderPartyMenuBox +RenderPartyMenuBox: @ 811F124 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0811F16C @ =gUnknown_203B0A0 + ldr r0, _0811F16C @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -866,13 +866,13 @@ sub_811F124: @ 811F124 cmp r4, 0x2 bls _0811F174 adds r0, r4, 0 - bl sub_811F528 - ldr r5, _0811F170 @ =gUnknown_203B0B4 + bl DisplayPartyPokemonDataForMultiBattle + ldr r5, _0811F170 @ =sPartyMenuBoxes lsls r4, 4 ldr r0, [r5] adds r0, r4 movs r1, 0x8 - bl sub_812142C + bl LoadPartyBoxPalette ldr r0, [r5] adds r0, r4, r0 ldrb r0, [r0, 0x8] @@ -886,8 +886,8 @@ sub_811F124: @ 811F124 bl ScheduleBgCopyTilemapToVram b _0811F22A .align 2, 0 -_0811F16C: .4byte gUnknown_203B0A0 -_0811F170: .4byte gUnknown_203B0B4 +_0811F16C: .4byte gPartyMenu +_0811F170: .4byte sPartyMenuBoxes _0811F174: movs r0, 0x64 muls r0, r4 @@ -897,12 +897,12 @@ _0811F174: bl GetMonData cmp r0, 0 bne _0811F1AC - ldr r5, _0811F1A8 @ =gUnknown_203B0B4 + ldr r5, _0811F1A8 @ =sPartyMenuBoxes ldr r0, [r5] lsls r4, 4 adds r0, r4, r0 ldrb r0, [r0, 0x8] - bl sub_8121404 + bl DrawEmptySlot ldr r0, [r5] adds r0, r4, r0 ldrb r0, [r0, 0x8] @@ -911,35 +911,35 @@ _0811F174: b _0811F218 .align 2, 0 _0811F1A4: .4byte gPlayerParty -_0811F1A8: .4byte gUnknown_203B0B4 +_0811F1A8: .4byte sPartyMenuBoxes _0811F1AC: - ldr r0, _0811F1C0 @ =gUnknown_203B0A0 + ldr r0, _0811F1C0 @ =gPartyMenu ldrb r0, [r0, 0x8] movs r1, 0xF ands r1, r0 cmp r1, 0x4 bne _0811F1C4 adds r0, r4, 0 - bl sub_811F388 + bl DisplayPartyPokemonDataForChooseHalf b _0811F1E2 .align 2, 0 -_0811F1C0: .4byte gUnknown_203B0A0 +_0811F1C0: .4byte gPartyMenu _0811F1C4: cmp r1, 0xB bne _0811F1D0 adds r0, r4, 0 - bl sub_811F404 + bl DisplayPartyPokemonDataForWirelessMinigame b _0811F1E2 _0811F1D0: adds r0, r4, 0 - bl sub_811F430 + bl DisplayPartyPokemonDataForMoveTutorOrEvolutionItem lsls r0, 24 cmp r0, 0 bne _0811F1E2 adds r0, r4, 0 - bl sub_811F234 + bl DisplayPartyPokemonData _0811F1E2: - ldr r2, _0811F1F8 @ =gUnknown_203B0A0 + ldr r2, _0811F1F8 @ =gPartyMenu ldrb r1, [r2, 0x8] movs r0, 0xF ands r0, r1 @@ -947,10 +947,10 @@ _0811F1E2: bne _0811F1FC adds r0, r4, 0 movs r1, 0 - bl sub_811F818 + bl AnimatePartySlot b _0811F216 .align 2, 0 -_0811F1F8: .4byte gUnknown_203B0A0 +_0811F1F8: .4byte gPartyMenu _0811F1FC: movs r0, 0x9 ldrsb r0, [r2, r0] @@ -958,16 +958,16 @@ _0811F1FC: bne _0811F20E adds r0, r4, 0 movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot b _0811F216 _0811F20E: adds r0, r4, 0 movs r1, 0 - bl sub_811F818 + bl AnimatePartySlot _0811F216: lsls r4, 4 _0811F218: - ldr r0, _0811F230 @ =gUnknown_203B0B4 + ldr r0, _0811F230 @ =sPartyMenuBoxes ldr r0, [r0] adds r0, r4, r0 ldrb r0, [r0, 0x8] @@ -979,11 +979,11 @@ _0811F22A: pop {r0} bx r0 .align 2, 0 -_0811F230: .4byte gUnknown_203B0B4 - thumb_func_end sub_811F124 +_0811F230: .4byte sPartyMenuBoxes + thumb_func_end RenderPartyMenuBox - thumb_func_start sub_811F234 -sub_811F234: @ 811F234 + thumb_func_start DisplayPartyPokemonData +DisplayPartyPokemonData: @ 811F234 push {r4-r7,lr} sub sp, 0x8 lsls r0, 24 @@ -999,7 +999,7 @@ sub_811F234: @ 811F234 adds r2, r0, 0 cmp r2, 0 beq _0811F28C - ldr r6, _0811F288 @ =gUnknown_203B0B4 + ldr r6, _0811F288 @ =sPartyMenuBoxes ldr r0, [r6] lsls r5, r4, 4 adds r0, r5, r0 @@ -1018,13 +1018,13 @@ sub_811F234: @ 811F234 adds r1, r5 adds r0, r7, 0 movs r2, 0 - bl sub_8121738 + bl DisplayPartyPokemonNickname b _0811F2EE .align 2, 0 _0811F284: .4byte gPlayerParty -_0811F288: .4byte gUnknown_203B0B4 +_0811F288: .4byte sPartyMenuBoxes _0811F28C: - ldr r5, _0811F2F8 @ =gUnknown_203B0B4 + ldr r5, _0811F2F8 @ =sPartyMenuBoxes ldr r0, [r5] lsls r4, 4 adds r0, r4, r0 @@ -1041,42 +1041,42 @@ _0811F28C: adds r1, r4 adds r0, r7, 0 movs r2, 0 - bl sub_8121738 + bl DisplayPartyPokemonNickname ldr r1, [r5] adds r1, r4 adds r0, r7, 0 movs r2, 0 - bl sub_8121790 + bl DisplayPartyPokemonLevelCheck ldr r1, [r5] adds r1, r4 adds r0, r7, 0 movs r2, 0 - bl sub_8121854 + bl DisplayPartyPokemonGenderNidoranCheck ldr r1, [r5] adds r1, r4 adds r0, r7, 0 movs r2, 0 - bl sub_812199C + bl DisplayPartyPokemonHPCheck ldr r1, [r5] adds r1, r4 adds r0, r7, 0 movs r2, 0 - bl sub_8121A3C + bl DisplayPartyPokemonMaxHPCheck ldr r1, [r5] adds r1, r4 adds r0, r7, 0 - bl sub_8121AF0 + bl DisplayPartyPokemonHPBarCheck _0811F2EE: add sp, 0x8 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0811F2F8: .4byte gUnknown_203B0B4 - thumb_func_end sub_811F234 +_0811F2F8: .4byte sPartyMenuBoxes + thumb_func_end DisplayPartyPokemonData - thumb_func_start sub_811F2FC -sub_811F2FC: @ 811F2FC + thumb_func_start DisplayPartyPokemonDescriptionData +DisplayPartyPokemonDescriptionData: @ 811F2FC push {r4-r7,lr} mov r7, r8 push {r7} @@ -1091,7 +1091,7 @@ sub_811F2FC: @ 811F2FC muls r2, r1 ldr r1, _0811F380 @ =gPlayerParty adds r6, r2, r1 - ldr r7, _0811F384 @ =gUnknown_203B0B4 + ldr r7, _0811F384 @ =sPartyMenuBoxes ldr r1, [r7] lsls r5, r0, 4 adds r1, r5, r1 @@ -1110,7 +1110,7 @@ sub_811F2FC: @ 811F2FC adds r1, r5 adds r0, r6, 0 movs r2, 0 - bl sub_8121738 + bl DisplayPartyPokemonNickname adds r0, r6, 0 movs r1, 0x2D bl GetMonData @@ -1120,18 +1120,18 @@ sub_811F2FC: @ 811F2FC adds r1, r5 adds r0, r6, 0 movs r2, 0 - bl sub_8121790 + bl DisplayPartyPokemonLevelCheck ldr r1, [r7] adds r1, r5 adds r0, r6, 0 movs r2, 0 - bl sub_8121854 + bl DisplayPartyPokemonGenderNidoranCheck _0811F368: ldr r1, [r7] adds r1, r5 mov r0, r8 movs r2, 0 - bl sub_8121C70 + bl DisplayPartyPokemonDescriptionText add sp, 0x8 pop {r3} mov r8, r3 @@ -1140,11 +1140,11 @@ _0811F368: bx r0 .align 2, 0 _0811F380: .4byte gPlayerParty -_0811F384: .4byte gUnknown_203B0B4 - thumb_func_end sub_811F2FC +_0811F384: .4byte sPartyMenuBoxes + thumb_func_end DisplayPartyPokemonDescriptionData - thumb_func_start sub_811F388 -sub_811F388: @ 811F388 + thumb_func_start DisplayPartyPokemonDataForChooseHalf +DisplayPartyPokemonDataForChooseHalf: @ 811F388 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1153,13 +1153,13 @@ sub_811F388: @ 811F388 ldr r1, _0811F3AC @ =gPlayerParty adds r0, r1 ldr r5, _0811F3B0 @ =gSelectedOrderFromParty - bl sub_8127550 + bl GetBattleEntryEligibility lsls r0, 24 cmp r0, 0 bne _0811F3C2 adds r0, r4, 0 movs r1, 0x6 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData b _0811F3F8 .align 2, 0 _0811F3AC: .4byte gPlayerParty @@ -1169,10 +1169,10 @@ _0811F3B4: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData b _0811F3F8 _0811F3C2: - ldr r0, _0811F400 @ =gUnknown_203B0A0 + ldr r0, _0811F400 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xC0 ands r0, r1 @@ -1201,42 +1201,42 @@ _0811F3E6: _0811F3F0: adds r0, r4, 0 movs r1, 0x1 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData _0811F3F8: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0811F400: .4byte gUnknown_203B0A0 - thumb_func_end sub_811F388 +_0811F400: .4byte gPartyMenu + thumb_func_end DisplayPartyPokemonDataForChooseHalf - thumb_func_start sub_811F404 -sub_811F404: @ 811F404 + thumb_func_start DisplayPartyPokemonDataForWirelessMinigame +DisplayPartyPokemonDataForWirelessMinigame: @ 811F404 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_81209D4 + bl IsMonAllowedInMinigame lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0811F422 adds r0, r4, 0 movs r1, 0x5 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData b _0811F42A _0811F422: adds r0, r4, 0 movs r1, 0x6 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData _0811F42A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_811F404 + thumb_func_end DisplayPartyPokemonDataForWirelessMinigame - thumb_func_start sub_811F430 -sub_811F430: @ 811F430 + thumb_func_start DisplayPartyPokemonDataForMoveTutorOrEvolutionItem +DisplayPartyPokemonDataForMoveTutorOrEvolutionItem: @ 811F430 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -1247,7 +1247,7 @@ sub_811F430: @ 811F430 adds r6, r1, r0 ldr r0, _0811F46C @ =gSpecialVar_ItemId ldrh r4, [r0] - ldr r0, _0811F470 @ =gUnknown_203B0A0 + ldr r0, _0811F470 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0xC bne _0811F47C @@ -1262,12 +1262,12 @@ sub_811F430: @ 811F430 lsrs r2, 24 adds r0, r5, 0 movs r1, 0 - bl sub_811F4D0 + bl DisplayPartyPokemonDataToTeachMove b _0811F4C6 .align 2, 0 _0811F468: .4byte gPlayerParty _0811F46C: .4byte gSpecialVar_ItemId -_0811F470: .4byte gUnknown_203B0A0 +_0811F470: .4byte gPartyMenu _0811F474: .4byte gSpecialVar_Result _0811F478: .4byte gSpecialVar_0x8005 _0811F47C: @@ -1288,7 +1288,7 @@ _0811F496: adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 - bl sub_811F4D0 + bl DisplayPartyPokemonDataToTeachMove b _0811F4C6 _0811F4A2: adds r0, r6, 0 @@ -1306,17 +1306,17 @@ _0811F4A2: _0811F4BE: adds r0, r5, 0 movs r1, 0 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData _0811F4C6: movs r0, 0x1 _0811F4C8: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_811F430 + thumb_func_end DisplayPartyPokemonDataForMoveTutorOrEvolutionItem - thumb_func_start sub_811F4D0 -sub_811F4D0: @ 811F4D0 + thumb_func_start DisplayPartyPokemonDataToTeachMove +DisplayPartyPokemonDataToTeachMove: @ 811F4D0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1328,7 +1328,7 @@ sub_811F4D0: @ 811F4D0 muls r0, r4 ldr r3, _0811F4FC @ =gPlayerParty adds r0, r3 - bl sub_8120B20 + bl CanMonLearnTMTutor lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -1346,38 +1346,38 @@ _0811F500: _0811F504: adds r0, r4, 0 movs r1, 0x8 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData b _0811F520 _0811F50E: adds r0, r4, 0 movs r1, 0x9 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData b _0811F520 _0811F518: adds r0, r4, 0 movs r1, 0x7 - bl sub_811F2FC + bl DisplayPartyPokemonDescriptionData _0811F520: pop {r4} pop {r0} bx r0 - thumb_func_end sub_811F4D0 + thumb_func_end DisplayPartyPokemonDataToTeachMove - thumb_func_start sub_811F528 -sub_811F528: @ 811F528 + thumb_func_start DisplayPartyPokemonDataForMultiBattle +DisplayPartyPokemonDataForMultiBattle: @ 811F528 push {r4-r7,lr} mov r7, r8 push {r7} sub sp, 0x8 lsls r0, 24 lsrs r0, 24 - ldr r1, _0811F558 @ =gUnknown_203B0B4 + ldr r1, _0811F558 @ =sPartyMenuBoxes lsls r2, r0, 4 ldr r1, [r1] adds r5, r1, r2 subs r0, 0x3 lsls r0, 24 - ldr r1, _0811F55C @ =gUnknown_2022B58 + ldr r1, _0811F55C @ =gMultiPartnerParty mov r8, r1 lsrs r7, r0, 19 adds r6, r7, r1 @@ -1385,11 +1385,11 @@ sub_811F528: @ 811F528 cmp r0, 0 bne _0811F560 ldrb r0, [r5, 0x8] - bl sub_8121404 + bl DrawEmptySlot b _0811F5DC .align 2, 0 -_0811F558: .4byte gUnknown_203B0B4 -_0811F55C: .4byte gUnknown_2022B58 +_0811F558: .4byte sPartyMenuBoxes +_0811F55C: .4byte gMultiPartnerParty _0811F560: ldr r2, [r5] ldrb r0, [r5, 0x8] @@ -1424,25 +1424,25 @@ _0811F5A0: adds r3, 0x4 adds r1, r4, 0 movs r2, 0 - bl sub_8121704 + bl DisplayPartyPokemonBarDetail ldrb r0, [r6, 0xF] adds r1, r5, 0 - bl sub_8121808 + bl DisplayPartyPokemonLevel ldrb r0, [r6, 0x1C] ldrh r1, [r6] adds r2, r7, 0 adds r3, r5, 0 - bl sub_81218BC + bl DisplayPartyPokemonGender ldrh r0, [r6, 0x10] adds r1, r5, 0 - bl sub_8121A04 + bl DisplayPartyPokemonHP ldrh r0, [r6, 0x12] adds r1, r5, 0 - bl sub_8121AA4 + bl DisplayPartyPokemonMaxHP ldrh r0, [r6, 0x10] ldrh r1, [r6, 0x12] adds r2, r5, 0 - bl sub_8121B2C + bl DisplayPartyPokemonHPBar _0811F5DC: add sp, 0x8 pop {r3} @@ -1452,18 +1452,18 @@ _0811F5DC: bx r0 .align 2, 0 _0811F5E8: .4byte gStringVar1 - thumb_func_end sub_811F528 + thumb_func_end DisplayPartyPokemonDataForMultiBattle - thumb_func_start sub_811F5EC -sub_811F5EC: @ 811F5EC + thumb_func_start RenderPartyMenuBoxes +RenderPartyMenuBoxes: @ 811F5EC push {r4,r5,lr} - ldr r5, _0811F614 @ =gUnknown_203B09C + ldr r5, _0811F614 @ =sPartyMenuInternal ldr r0, [r5] movs r4, 0x86 lsls r4, 2 adds r0, r4 ldrb r0, [r0] - bl sub_811F124 + bl RenderPartyMenuBox ldr r1, [r5] adds r1, r4 ldrh r0, [r1] @@ -1476,30 +1476,30 @@ sub_811F5EC: @ 811F5EC movs r0, 0 b _0811F61A .align 2, 0 -_0811F614: .4byte gUnknown_203B09C +_0811F614: .4byte sPartyMenuInternal _0811F618: movs r0, 0x1 _0811F61A: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_811F5EC + thumb_func_end RenderPartyMenuBoxes - thumb_func_start sub_811F620 -sub_811F620: @ 811F620 + thumb_func_start GetPartyMenuBgTile +GetPartyMenuBgTile: @ 811F620 lsls r0, 16 - ldr r1, _0811F630 @ =gUnknown_203B0B8 + ldr r1, _0811F630 @ =sPartyBgGfxTilemap lsrs r0, 11 ldr r1, [r1] adds r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_0811F630: .4byte gUnknown_203B0B8 - thumb_func_end sub_811F620 +_0811F630: .4byte sPartyBgGfxTilemap + thumb_func_end GetPartyMenuBgTile - thumb_func_start party_menu_add_per_mon_objects_internal -party_menu_add_per_mon_objects_internal: @ 811F634 + thumb_func_start CreatePartyMonSprites +CreatePartyMonSprites: @ 811F634 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1508,7 +1508,7 @@ party_menu_add_per_mon_objects_internal: @ 811F634 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0811F6A8 @ =gUnknown_203B0A0 + ldr r0, _0811F6A8 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -1520,7 +1520,7 @@ party_menu_add_per_mon_objects_internal: @ 811F634 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _0811F6AC @ =gUnknown_2022B58 + ldr r0, _0811F6AC @ =gMultiPartnerParty mov r9, r0 mov r2, r10 lsls r2, 5 @@ -1534,54 +1534,54 @@ party_menu_add_per_mon_objects_internal: @ 811F634 adds r1, 0x18 add r1, r8 ldr r1, [r1] - ldr r4, _0811F6B0 @ =gUnknown_203B0B4 + ldr r4, _0811F6B0 @ =sPartyMenuBoxes lsls r5, r7, 4 ldr r2, [r4] adds r2, r5 movs r3, 0 str r3, [sp] - bl party_menu_link_mon_icon_anim + bl CreatePartyMonIconSpriteParameterized ldrh r0, [r6] ldrh r1, [r6, 0x2] ldr r2, [r4] adds r2, r5 - bl party_menu_link_mon_held_item_object + bl CreatePartyMonHeldItemSpriteParameterized ldrh r0, [r6] ldr r1, [r4] adds r1, r5 - bl party_menu_link_mon_pokeball_object + bl CreatePartyMonPokeballSpriteParameterized ldrh r0, [r6, 0x10] cmp r0, 0 bne _0811F6B4 movs r3, 0x7 b _0811F6C4 .align 2, 0 -_0811F6A8: .4byte gUnknown_203B0A0 -_0811F6AC: .4byte gUnknown_2022B58 -_0811F6B0: .4byte gUnknown_203B0B4 +_0811F6A8: .4byte gPartyMenu +_0811F6AC: .4byte gMultiPartnerParty +_0811F6B0: .4byte sPartyMenuBoxes _0811F6B4: mov r0, r9 adds r0, 0x14 add r0, r8 ldr r0, [r0] - bl pokemon_ailments_get_primary + bl GetAilmentFromStatus lsls r0, 24 lsrs r3, r0, 24 _0811F6C4: - ldr r1, _0811F6DC @ =gUnknown_2022B58 + ldr r1, _0811F6DC @ =gMultiPartnerParty mov r2, r10 lsls r0, r2, 5 adds r0, r1 ldrh r0, [r0] - ldr r1, _0811F6E0 @ =gUnknown_203B0B4 + ldr r1, _0811F6E0 @ =sPartyMenuBoxes ldr r2, [r1] adds r2, r5 adds r1, r3, 0 - bl party_menu_link_mon_status_condition_object + bl CreatePartyMonStatusSpriteParameterized b _0811F728 .align 2, 0 -_0811F6DC: .4byte gUnknown_2022B58 -_0811F6E0: .4byte gUnknown_203B0B4 +_0811F6DC: .4byte gMultiPartnerParty +_0811F6E0: .4byte sPartyMenuBoxes _0811F6E4: movs r0, 0x64 adds r1, r7, 0 @@ -1593,25 +1593,25 @@ _0811F6E4: bl GetMonData cmp r0, 0 beq _0811F728 - ldr r4, _0811F73C @ =gUnknown_203B0B4 + ldr r4, _0811F73C @ =sPartyMenuBoxes lsls r5, r7, 4 ldr r1, [r4] adds r1, r5 adds r0, r6, 0 adds r2, r7, 0 - bl party_menu_icon_anim + bl CreatePartyMonIconSprite ldr r1, [r4] adds r1, r5 adds r0, r6, 0 - bl party_menu_held_item_object + bl CreatePartyMonHeldItemSprite ldr r1, [r4] adds r1, r5 adds r0, r6, 0 - bl party_menu_pokeball_object + bl CreatePartyMonPokeballSprite ldr r1, [r4] adds r1, r5 adds r0, r6, 0 - bl party_menu_status_condition_object + bl CreatePartyMonStatusSprite _0811F728: add sp, 0x4 pop {r3-r5} @@ -1623,19 +1623,19 @@ _0811F728: bx r0 .align 2, 0 _0811F738: .4byte gPlayerParty -_0811F73C: .4byte gUnknown_203B0B4 - thumb_func_end party_menu_add_per_mon_objects_internal +_0811F73C: .4byte sPartyMenuBoxes + thumb_func_end CreatePartyMonSprites - thumb_func_start party_menu_add_per_mon_objects -party_menu_add_per_mon_objects: @ 811F740 + thumb_func_start CreatePartyMonSpritesLoop +CreatePartyMonSpritesLoop: @ 811F740 push {r4,r5,lr} - ldr r5, _0811F768 @ =gUnknown_203B09C + ldr r5, _0811F768 @ =sPartyMenuInternal ldr r0, [r5] movs r4, 0x86 lsls r4, 2 adds r0, r4 ldrb r0, [r0] - bl party_menu_add_per_mon_objects_internal + bl CreatePartyMonSprites ldr r1, [r5] adds r1, r4 ldrh r0, [r1] @@ -1648,20 +1648,20 @@ party_menu_add_per_mon_objects: @ 811F740 movs r0, 0 b _0811F76E .align 2, 0 -_0811F768: .4byte gUnknown_203B09C +_0811F768: .4byte sPartyMenuInternal _0811F76C: movs r0, 0x1 _0811F76E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end party_menu_add_per_mon_objects + thumb_func_end CreatePartyMonSpritesLoop - thumb_func_start sub_811F774 -sub_811F774: @ 811F774 + thumb_func_start CreateCancelConfirmPokeballSprites +CreateCancelConfirmPokeballSprites: @ 811F774 push {r4,lr} sub sp, 0xC - ldr r0, _0811F79C @ =gUnknown_203B0A0 + ldr r0, _0811F79C @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -1679,9 +1679,9 @@ sub_811F774: @ 811F774 bl FillBgTilemapBufferRect b _0811F808 .align 2, 0 -_0811F79C: .4byte gUnknown_203B0A0 +_0811F79C: .4byte gPartyMenu _0811F7A0: - ldr r4, _0811F7D8 @ =gUnknown_203B09C + ldr r4, _0811F7D8 @ =sPartyMenuInternal ldr r0, [r4] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -1689,7 +1689,7 @@ _0811F7A0: beq _0811F7E0 movs r0, 0xBF movs r1, 0x88 - bl sub_8122794 + bl CreateSmallPokeballButtonSprite ldr r3, [r4] lsls r0, 24 lsrs r0, 24 @@ -1701,18 +1701,18 @@ _0811F7A0: ands r1, r2 orrs r1, r0 strh r1, [r3, 0x8] - bl sub_811F9DC + bl DrawCancelConfirmButtons movs r0, 0xBF movs r1, 0x98 - bl sub_8122794 + bl CreateSmallPokeballButtonSprite b _0811F7E8 .align 2, 0 -_0811F7D8: .4byte gUnknown_203B09C +_0811F7D8: .4byte sPartyMenuInternal _0811F7DC: .4byte 0xfffff80f _0811F7E0: movs r0, 0xC6 movs r1, 0x94 - bl sub_8122754 + bl CreatePokeballButtonSprite _0811F7E8: ldr r3, [r4] lsls r0, 24 @@ -1725,10 +1725,10 @@ _0811F7E8: ands r1, r2 orrs r1, r0 str r1, [r3, 0x8] - ldr r0, _0811F814 @ =gUnknown_203B0A0 + ldr r0, _0811F814 @ =gPartyMenu ldrb r0, [r0, 0x9] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot _0811F808: add sp, 0xC pop {r4} @@ -1736,11 +1736,11 @@ _0811F808: bx r0 .align 2, 0 _0811F810: .4byte 0xfffc07ff -_0811F814: .4byte gUnknown_203B0A0 - thumb_func_end sub_811F774 +_0811F814: .4byte gPartyMenu + thumb_func_end CreateCancelConfirmPokeballSprites - thumb_func_start sub_811F818 -sub_811F818: @ 811F818 + thumb_func_start AnimatePartySlot +AnimatePartySlot: @ 811F818 push {r4-r7,lr} mov r7, r8 push {r7} @@ -1762,32 +1762,32 @@ sub_811F818: @ 811F818 bl GetMonData cmp r0, 0 beq _0811F934 - ldr r6, _0811F880 @ =gUnknown_203B0B4 + ldr r6, _0811F880 @ =sPartyMenuBoxes lsls r5, r7, 4 ldr r4, [r6] adds r4, r5 adds r0, r7, 0 mov r1, r8 - bl sub_811F944 + bl GetPartyBoxPaletteFlags adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_812142C + bl LoadPartyBoxPalette ldr r0, [r6] adds r0, r5, r0 ldrb r0, [r0, 0x9] mov r1, r8 - bl sub_812238C + bl AnimateSelectedPartyIcon ldr r0, [r6] adds r5, r0 ldrb r0, [r5, 0xB] mov r1, r8 - bl sub_81227B8 + bl PartyMenuStartSpriteAnim b _0811F934 .align 2, 0 _0811F87C: .4byte gPlayerParty -_0811F880: .4byte gUnknown_203B0B4 +_0811F880: .4byte sPartyMenuBoxes _0811F884: mov r0, r8 cmp r0, 0 @@ -1811,15 +1811,15 @@ _0811F89E: movs r3, 0x7 bl SetBgRectPal _0811F8B0: - ldr r0, _0811F8BC @ =gUnknown_203B09C + ldr r0, _0811F8BC @ =sPartyMenuInternal ldr r0, [r0] ldrh r0, [r0, 0x8] lsls r0, 21 b _0811F926 .align 2, 0 -_0811F8BC: .4byte gUnknown_203B09C +_0811F8BC: .4byte sPartyMenuInternal _0811F8C0: - ldr r0, _0811F8E0 @ =gUnknown_203B09C + ldr r0, _0811F8E0 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -1836,7 +1836,7 @@ _0811F8C0: movs r2, 0x11 b _0811F904 .align 2, 0 -_0811F8E0: .4byte gUnknown_203B09C +_0811F8E0: .4byte sPartyMenuInternal _0811F8E4: movs r0, 0x2 str r0, [sp] @@ -1869,14 +1869,14 @@ _0811F90C: movs r3, 0x7 bl SetBgRectPal _0811F91E: - ldr r0, _0811F940 @ =gUnknown_203B09C + ldr r0, _0811F940 @ =sPartyMenuInternal ldr r0, [r0] ldr r0, [r0, 0x8] lsls r0, 14 _0811F926: lsrs r0, 25 mov r1, r8 - bl sub_81227B8 + bl PartyMenuStartSpriteAnim movs r0, 0x1 bl ScheduleBgCopyTilemapToVram _0811F934: @@ -1887,11 +1887,11 @@ _0811F934: pop {r0} bx r0 .align 2, 0 -_0811F940: .4byte gUnknown_203B09C - thumb_func_end sub_811F818 +_0811F940: .4byte sPartyMenuInternal + thumb_func_end AnimatePartySlot - thumb_func_start sub_811F944 -sub_811F944: @ 811F944 + thumb_func_start GetPartyBoxPaletteFlags +GetPartyBoxPaletteFlags: @ 811F944 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -1913,7 +1913,7 @@ _0811F956: movs r0, 0x2 orrs r4, r0 _0811F96C: - ldr r2, _0811F9D8 @ =gUnknown_203B0A0 + ldr r2, _0811F9D8 @ =gPartyMenu ldrb r1, [r2, 0x8] movs r0, 0x30 ands r0, r1 @@ -1973,11 +1973,11 @@ _0811F9CC: bx r1 .align 2, 0 _0811F9D4: .4byte gPlayerParty -_0811F9D8: .4byte gUnknown_203B0A0 - thumb_func_end sub_811F944 +_0811F9D8: .4byte gPartyMenu + thumb_func_end GetPartyBoxPaletteFlags - thumb_func_start sub_811F9DC -sub_811F9DC: @ 811F9DC + thumb_func_start DrawCancelConfirmButtons +DrawCancelConfirmButtons: @ 811F9DC push {r4-r6,lr} sub sp, 0xC ldr r1, _0811FA18 @ =gUnknown_8459FC4 @@ -2008,7 +2008,7 @@ sub_811F9DC: @ 811F9DC .align 2, 0 _0811FA18: .4byte gUnknown_8459FC4 _0811FA1C: .4byte gUnknown_8459FE0 - thumb_func_end sub_811F9DC + thumb_func_end DrawCancelConfirmButtons thumb_func_start IsMultiBattle IsMultiBattle: @ 811FA20 @@ -2030,8 +2030,8 @@ _0811FA3A: bx r1 thumb_func_end IsMultiBattle - thumb_func_start sub_811FA40 -sub_811FA40: @ 811FA40 + thumb_func_start SwapPartyPokemon +SwapPartyPokemon: @ 811FA40 push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 @@ -2054,10 +2054,10 @@ sub_811FA40: @ 811FA40 pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_811FA40 + thumb_func_end SwapPartyPokemon - thumb_func_start sub_811FA78 -sub_811FA78: @ 811FA78 + thumb_func_start Task_ClosePartyMenu +Task_ClosePartyMenu: @ 811FA78 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -2076,7 +2076,7 @@ sub_811FA78: @ 811FA78 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0811FAB0 @ =sub_811FAB4 + ldr r1, _0811FAB0 @ =Task_ClosePartyMenuAndSetCB2 str r1, [r0] add sp, 0x4 pop {r4} @@ -2084,11 +2084,11 @@ sub_811FA78: @ 811FA78 bx r0 .align 2, 0 _0811FAAC: .4byte gTasks -_0811FAB0: .4byte sub_811FAB4 - thumb_func_end sub_811FA78 +_0811FAB0: .4byte Task_ClosePartyMenuAndSetCB2 + thumb_func_end Task_ClosePartyMenu - thumb_func_start sub_811FAB4 -sub_811FAB4: @ 811FAB4 + thumb_func_start Task_ClosePartyMenuAndSetCB2 +Task_ClosePartyMenuAndSetCB2: @ 811FAB4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -2098,15 +2098,15 @@ sub_811FAB4: @ 811FAB4 ands r0, r1 cmp r0, 0 bne _0811FB04 - ldr r4, _0811FAEC @ =gUnknown_203B0A0 + ldr r4, _0811FAEC @ =gPartyMenu ldrb r1, [r4, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 bne _0811FAD6 - bl sub_81280C4 + bl UpdatePartyToFieldOrder _0811FAD6: - ldr r0, _0811FAF0 @ =gUnknown_203B09C + ldr r0, _0811FAF0 @ =sPartyMenuInternal ldr r0, [r0] ldr r0, [r0, 0x4] cmp r0, 0 @@ -2115,43 +2115,43 @@ _0811FAD6: b _0811FAFA .align 2, 0 _0811FAE8: .4byte gPaletteFade -_0811FAEC: .4byte gUnknown_203B0A0 -_0811FAF0: .4byte gUnknown_203B09C +_0811FAEC: .4byte gPartyMenu +_0811FAF0: .4byte sPartyMenuInternal _0811FAF4: ldr r0, [r4] bl SetMainCallback2 _0811FAFA: - bl sub_811F070 + bl FreePartyPointers adds r0, r5, 0 bl DestroyTask _0811FB04: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_811FAB4 + thumb_func_end Task_ClosePartyMenuAndSetCB2 thumb_func_start GetCursorSelectionMonId GetCursorSelectionMonId: @ 811FB0C - ldr r0, _0811FB14 @ =gUnknown_203B0A0 + ldr r0, _0811FB14 @ =gPartyMenu ldrb r0, [r0, 0x9] bx lr .align 2, 0 -_0811FB14: .4byte gUnknown_203B0A0 +_0811FB14: .4byte gPartyMenu thumb_func_end GetCursorSelectionMonId - thumb_func_start sub_811FB18 -sub_811FB18: @ 811FB18 - ldr r0, _0811FB24 @ =gUnknown_203B0A0 + thumb_func_start GetPartyMenuType +GetPartyMenuType: @ 811FB18 + ldr r0, _0811FB24 @ =gPartyMenu ldrb r0, [r0, 0x8] lsls r0, 28 lsrs r0, 28 bx lr .align 2, 0 -_0811FB24: .4byte gUnknown_203B0A0 - thumb_func_end sub_811FB18 +_0811FB24: .4byte gPartyMenu + thumb_func_end GetPartyMenuType - thumb_func_start sub_811FB28 -sub_811FB28: @ 811FB28 + thumb_func_start Task_HandleChooseMonInput +Task_HandleChooseMonInput: @ 811FB28 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -2167,9 +2167,9 @@ sub_811FB28: @ 811FB28 lsrs r0, 24 cmp r0, 0x1 beq _0811FB98 - bl sub_811FBA4 + bl GetCurrentPartySlotPtr adds r4, r0, 0 - bl sub_811FEFC + bl PartyMenuButtonHandler lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 @@ -2188,15 +2188,15 @@ _0811FB68: _0811FB6E: adds r0, r5, 0 adds r1, r4, 0 - bl sub_811FBC4 + bl HandleChooseMonSelection b _0811FB98 _0811FB78: adds r0, r6, 0 adds r1, r4, 0 - bl sub_811FD88 + bl HandleChooseMonCancel b _0811FB98 _0811FB82: - ldr r0, _0811FBA0 @ =gUnknown_203B09C + ldr r0, _0811FBA0 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -2204,19 +2204,19 @@ _0811FB82: beq _0811FB98 movs r0, 0x5 bl PlaySE - bl sub_8124258 + bl MoveCursorToConfirm _0811FB98: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0811FBA0: .4byte gUnknown_203B09C - thumb_func_end sub_811FB28 +_0811FBA0: .4byte sPartyMenuInternal + thumb_func_end Task_HandleChooseMonInput - thumb_func_start sub_811FBA4 -sub_811FBA4: @ 811FBA4 + thumb_func_start GetCurrentPartySlotPtr +GetCurrentPartySlotPtr: @ 811FBA4 push {lr} - ldr r0, _0811FBB8 @ =gUnknown_203B0A0 + ldr r0, _0811FBB8 @ =gPartyMenu ldrb r1, [r0, 0xB] cmp r1, 0x8 beq _0811FBB2 @@ -2226,16 +2226,16 @@ _0811FBB2: adds r0, 0xA b _0811FBBE .align 2, 0 -_0811FBB8: .4byte gUnknown_203B0A0 +_0811FBB8: .4byte gPartyMenu _0811FBBC: adds r0, 0x9 _0811FBBE: pop {r1} bx r1 - thumb_func_end sub_811FBA4 + thumb_func_end GetCurrentPartySlotPtr - thumb_func_start sub_811FBC4 -sub_811FBC4: @ 811FBC4 + thumb_func_start HandleChooseMonSelection +HandleChooseMonSelection: @ 811FBC4 push {r4-r6,lr} adds r5, r1, 0 lsls r0, 24 @@ -2244,15 +2244,15 @@ sub_811FBC4: @ 811FBC4 ldrsb r0, [r5, r0] cmp r0, 0x6 bne _0811FBE4 - ldr r0, _0811FBE0 @ =gUnknown_203B0A0 + ldr r0, _0811FBE0 @ =gPartyMenu ldr r1, [r0, 0x4] adds r0, r6, 0 bl _call_via_r1 b _0811FD56 .align 2, 0 -_0811FBE0: .4byte gUnknown_203B0A0 +_0811FBE0: .4byte gPartyMenu _0811FBE4: - ldr r0, _0811FBFC @ =gUnknown_203B0A0 + ldr r0, _0811FBFC @ =gPartyMenu ldrb r0, [r0, 0xB] subs r0, 0x3 cmp r0, 0xA @@ -2265,7 +2265,7 @@ _0811FBF0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811FBFC: .4byte gUnknown_203B0A0 +_0811FBFC: .4byte gPartyMenu _0811FC00: .4byte _0811FC04 .align 2, 0 _0811FC04: @@ -2282,7 +2282,7 @@ _0811FC04: .4byte _0811FD34 _0811FC30: adds r0, r5, 0 - bl sub_811FD5C + bl IsSelectedMonNotEgg lsls r0, 24 cmp r0, 0 bne _0811FC3E @@ -2293,73 +2293,73 @@ _0811FC3E: b _0811FD56 _0811FC46: adds r0, r5, 0 - bl sub_811FD5C + bl IsSelectedMonNotEgg lsls r0, 24 cmp r0, 0 bne _0811FC54 b _0811FD56 _0811FC54: - ldr r0, _0811FC78 @ =gUnknown_203B0A0 + ldr r0, _0811FC78 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 bne _0811FC68 - ldr r0, _0811FC7C @ =gUnknown_203B09C + ldr r0, _0811FC7C @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _0811FC80 @ =sub_8128184 + ldr r0, _0811FC80 @ =CB2_SetUpExitToBattleScreen str r0, [r1, 0x4] _0811FC68: - ldr r0, _0811FC84 @ =gUnknown_3005E98 - ldr r1, _0811FC88 @ =sub_81255BC + ldr r0, _0811FC84 @ =gItemUseCB + ldr r1, _0811FC88 @ =Task_ClosePartyMenuAfterText ldr r2, [r0] adds r0, r6, 0 bl _call_via_r2 b _0811FD56 .align 2, 0 -_0811FC78: .4byte gUnknown_203B0A0 -_0811FC7C: .4byte gUnknown_203B09C -_0811FC80: .4byte sub_8128184 -_0811FC84: .4byte gUnknown_3005E98 -_0811FC88: .4byte sub_81255BC +_0811FC78: .4byte gPartyMenu +_0811FC7C: .4byte sPartyMenuInternal +_0811FC80: .4byte CB2_SetUpExitToBattleScreen +_0811FC84: .4byte gItemUseCB +_0811FC88: .4byte Task_ClosePartyMenuAfterText _0811FC8C: adds r0, r5, 0 - bl sub_811FD5C + bl IsSelectedMonNotEgg lsls r0, 24 cmp r0, 0 beq _0811FD56 movs r0, 0x5 bl PlaySE adds r0, r6, 0 - bl sub_8126DC8 + bl TryTutorSelectedMon b _0811FD56 _0811FCA6: adds r0, r5, 0 - bl sub_811FD5C + bl IsSelectedMonNotEgg lsls r0, 24 cmp r0, 0 beq _0811FD56 movs r0, 0x5 bl PlaySE adds r0, r6, 0 - bl sub_8127404 + bl TryGiveMailToSelectedMon b _0811FD56 _0811FCC0: adds r0, r5, 0 - bl sub_811FD5C + bl IsSelectedMonNotEgg lsls r0, 24 cmp r0, 0 beq _0811FD56 movs r0, 0x5 bl PlaySE adds r0, r6, 0 - bl sub_8126F40 + bl TryGiveItemOrMailToSelectedMon b _0811FD56 _0811FCDA: movs r0, 0x5 bl PlaySE adds r0, r6, 0 - bl sub_8122E5C + bl SwitchSelectedMons b _0811FD56 _0811FCE8: movs r0, 0x5 @@ -2368,7 +2368,7 @@ _0811FCE8: movs r0, 0 ldrsb r0, [r5, r0] strh r0, [r1] - ldr r0, _0811FD28 @ =gUnknown_203B0A0 + ldr r0, _0811FD28 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -2387,36 +2387,36 @@ _0811FCE8: strh r0, [r4] _0811FD1A: adds r0, r6, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _0811FD56 .align 2, 0 _0811FD24: .4byte gSpecialVar_0x8004 -_0811FD28: .4byte gUnknown_203B0A0 +_0811FD28: .4byte gPartyMenu _0811FD2C: .4byte gSpecialVar_0x8005 _0811FD30: .4byte gPlayerParty _0811FD34: adds r0, r5, 0 - bl sub_811FD5C + bl IsSelectedMonNotEgg lsls r0, 24 cmp r0, 0 beq _0811FD56 ldrb r1, [r5] adds r0, r6, 0 - bl sub_81209F4 + bl TryEnterMonForMinigame b _0811FD56 _0811FD4A: movs r0, 0x5 bl PlaySE adds r0, r6, 0 - bl sub_8122C30 + bl Task_TryCreateSelectionWindow _0811FD56: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_811FBC4 + thumb_func_end HandleChooseMonSelection - thumb_func_start sub_811FD5C -sub_811FD5C: @ 811FD5C + thumb_func_start IsSelectedMonNotEgg +IsSelectedMonNotEgg: @ 811FD5C push {lr} ldrb r1, [r0] movs r0, 0x64 @@ -2438,15 +2438,15 @@ _0811FD7C: _0811FD84: pop {r1} bx r1 - thumb_func_end sub_811FD5C + thumb_func_end IsSelectedMonNotEgg - thumb_func_start sub_811FD88 -sub_811FD88: @ 811FD88 + thumb_func_start HandleChooseMonCancel +HandleChooseMonCancel: @ 811FD88 push {r4,r5,lr} adds r5, r1, 0 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0811FDA4 @ =gUnknown_203B0A0 + ldr r0, _0811FDA4 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x8 beq _0811FDBA @@ -2456,7 +2456,7 @@ sub_811FD88: @ 811FD88 beq _0811FDB2 b _0811FDD6 .align 2, 0 -_0811FDA4: .4byte gUnknown_203B0A0 +_0811FDA4: .4byte gPartyMenu _0811FDA8: cmp r0, 0xA beq _0811FDBA @@ -2471,28 +2471,28 @@ _0811FDBA: movs r0, 0x5 bl PlaySE adds r0, r4, 0 - bl sub_81235E8 + bl FinishTwoMonAction b _0811FE14 _0811FDC8: movs r0, 0x5 bl PlaySE adds r0, r4, 0 - bl sub_8120A58 + bl CancelParticipationPrompt b _0811FE14 _0811FDD6: movs r0, 0x5 bl PlaySE - ldr r0, _0811FDF0 @ =gUnknown_203B0A0 + ldr r0, _0811FDF0 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x4 bne _0811FDF4 adds r0, r4, 0 - bl sub_811FE24 + bl DisplayCancelChooseMonYesNo b _0811FE14 .align 2, 0 -_0811FDF0: .4byte gUnknown_203B0A0 +_0811FDF0: .4byte gPartyMenu _0811FDF4: bl MenuHelpers_LinkSomething lsls r0, 24 @@ -2502,74 +2502,74 @@ _0811FDF4: movs r0, 0x7 strh r0, [r1] _0811FE04: - ldr r0, _0811FE20 @ =gUnknown_203B0C0 + ldr r0, _0811FE20 @ =gPartyMenuUseExitCallback movs r1, 0 strb r1, [r0] movs r0, 0x7 strb r0, [r5] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _0811FE14: pop {r4,r5} pop {r0} bx r0 .align 2, 0 _0811FE1C: .4byte gSpecialVar_0x8004 -_0811FE20: .4byte gUnknown_203B0C0 - thumb_func_end sub_811FD88 +_0811FE20: .4byte gPartyMenuUseExitCallback + thumb_func_end HandleChooseMonCancel - thumb_func_start sub_811FE24 -sub_811FE24: @ 811FE24 + thumb_func_start DisplayCancelChooseMonYesNo +DisplayCancelChooseMonYesNo: @ 811FE24 push {r4,r5,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0811FE5C @ =gUnknown_203B09C + ldr r0, _0811FE5C @ =sPartyMenuInternal ldr r0, [r0] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r5, _0811FE60 @ =gStringVar4 ldr r1, _0811FE64 @ =gUnknown_84176CF adds r0, r5, 0 bl StringExpandPlaceholders adds r0, r5, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _0811FE68 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0811FE6C @ =sub_811FE70 + ldr r1, _0811FE6C @ =Task_CancelChooseMonYesNo str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0811FE5C: .4byte gUnknown_203B09C +_0811FE5C: .4byte sPartyMenuInternal _0811FE60: .4byte gStringVar4 _0811FE64: .4byte gUnknown_84176CF _0811FE68: .4byte gTasks -_0811FE6C: .4byte sub_811FE70 - thumb_func_end sub_811FE24 +_0811FE6C: .4byte Task_CancelChooseMonYesNo + thumb_func_end DisplayCancelChooseMonYesNo - thumb_func_start sub_811FE70 -sub_811FE70: @ 811FE70 + thumb_func_start Task_CancelChooseMonYesNo +Task_CancelChooseMonYesNo: @ 811FE70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _0811FE94 - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _0811FE9C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0811FEA0 @ =sub_811FEA4 + ldr r0, _0811FEA0 @ =Task_HandleCancelChooseMonYesNoInput str r0, [r1] _0811FE94: pop {r4} @@ -2577,11 +2577,11 @@ _0811FE94: bx r0 .align 2, 0 _0811FE9C: .4byte gTasks -_0811FEA0: .4byte sub_811FEA4 - thumb_func_end sub_811FE70 +_0811FEA0: .4byte Task_HandleCancelChooseMonYesNoInput + thumb_func_end Task_CancelChooseMonYesNo - thumb_func_start sub_811FEA4 -sub_811FEA4: @ 811FEA4 + thumb_func_start Task_HandleCancelChooseMonYesNoInput +Task_HandleCancelChooseMonYesNoInput: @ 811FEA4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2602,32 +2602,32 @@ _0811FEC4: beq _0811FEEE b _0811FEF4 _0811FECA: - ldr r0, _0811FEE0 @ =gUnknown_203B0C0 + ldr r0, _0811FEE0 @ =gPartyMenuUseExitCallback strb r1, [r0] - ldr r1, _0811FEE4 @ =gUnknown_203B0A0 + ldr r1, _0811FEE4 @ =gPartyMenu movs r0, 0x7 strb r0, [r1, 0x9] - bl sub_81274FC + bl ClearSelectedPartyOrder adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _0811FEF4 .align 2, 0 -_0811FEE0: .4byte gUnknown_203B0C0 -_0811FEE4: .4byte gUnknown_203B0A0 +_0811FEE0: .4byte gPartyMenuUseExitCallback +_0811FEE4: .4byte gPartyMenu _0811FEE8: movs r0, 0x5 bl PlaySE _0811FEEE: adds r0, r4, 0 - bl sub_81203B8 + bl Task_ReturnToChooseMonAfterText _0811FEF4: pop {r4} pop {r0} bx r0 - thumb_func_end sub_811FEA4 + thumb_func_end Task_HandleCancelChooseMonYesNoInput - thumb_func_start sub_811FEFC -sub_811FEFC: @ 811FEFC + thumb_func_start PartyMenuButtonHandler +PartyMenuButtonHandler: @ 811FEFC push {r4,lr} adds r4, r0, 0 ldr r0, _0811FF14 @ =gMain @@ -2693,7 +2693,7 @@ _0811FF60: cmp r1, 0 beq _0811FF72 adds r0, r4, 0 - bl sub_811FF94 + bl UpdateCurrentPartySelection movs r0, 0 b _0811FF8C _0811FF72: @@ -2715,16 +2715,16 @@ _0811FF8C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_811FEFC + thumb_func_end PartyMenuButtonHandler - thumb_func_start sub_811FF94 -sub_811FF94: @ 811FF94 + thumb_func_start UpdateCurrentPartySelection +UpdateCurrentPartySelection: @ 811FF94 push {r4,r5,lr} adds r5, r0, 0 lsls r1, 24 lsrs r1, 24 ldrb r4, [r5] - ldr r0, _0811FFB8 @ =gUnknown_203B0A0 + ldr r0, _0811FFB8 @ =gPartyMenu ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 @@ -2733,15 +2733,15 @@ sub_811FF94: @ 811FF94 lsls r1, 24 asrs r1, 24 adds r0, r5, 0 - bl sub_811FFF0 + bl UpdatePartySelectionSingleLayout b _0811FFC6 .align 2, 0 -_0811FFB8: .4byte gUnknown_203B0A0 +_0811FFB8: .4byte gPartyMenu _0811FFBC: lsls r1, 24 asrs r1, 24 adds r0, r5, 0 - bl sub_81200F8 + bl UpdatePartySelectionDoubleLayout _0811FFC6: movs r1, 0 ldrsb r1, [r5, r1] @@ -2753,18 +2753,18 @@ _0811FFC6: bl PlaySE lsrs r0, r4, 24 movs r1, 0 - bl sub_811F818 + bl AnimatePartySlot ldrb r0, [r5] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot _0811FFE8: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_811FF94 + thumb_func_end UpdateCurrentPartySelection - thumb_func_start sub_811FFF0 -sub_811FFF0: @ 811FFF0 + thumb_func_start UpdatePartySelectionSingleLayout +UpdatePartySelectionSingleLayout: @ 811FFF0 push {r4,lr} adds r4, r0, 0 lsls r1, 24 @@ -2805,7 +2805,7 @@ _08120030: .4byte gPlayerPartyCount _08120034: cmp r1, 0x7 bne _08120058 - ldr r0, _08120048 @ =gUnknown_203B09C + ldr r0, _08120048 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -2814,7 +2814,7 @@ _08120034: movs r0, 0x6 b _081200EC .align 2, 0 -_08120048: .4byte gUnknown_203B09C +_08120048: .4byte sPartyMenuInternal _0812004C: ldr r0, _08120054 @ =gPlayerPartyCount ldrb r0, [r0] @@ -2838,7 +2838,7 @@ _0812005C: subs r0, 0x1 cmp r1, r0 bne _08120090 - ldr r0, _08120088 @ =gUnknown_203B09C + ldr r0, _08120088 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -2848,7 +2848,7 @@ _0812005C: b _081200EC .align 2, 0 _08120084: .4byte gPlayerPartyCount -_08120088: .4byte gUnknown_203B09C +_08120088: .4byte sPartyMenuInternal _0812008C: movs r0, 0x7 b _081200EC @@ -2864,7 +2864,7 @@ _08120094: ldrsb r0, [r4, r0] cmp r0, 0 bne _081200EE - ldr r0, _081200BC @ =gUnknown_203B09C + ldr r0, _081200BC @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 @@ -2875,7 +2875,7 @@ _08120094: b _081200EC .align 2, 0 _081200B8: .4byte gPlayerPartyCount -_081200BC: .4byte gUnknown_203B09C +_081200BC: .4byte sPartyMenuInternal _081200C0: movs r0, 0 ldrsb r0, [r4, r0] @@ -2885,7 +2885,7 @@ _081200C0: beq _081200EE cmp r0, 0x7 beq _081200EE - ldr r0, _081200F4 @ =gUnknown_203B09C + ldr r0, _081200F4 @ =sPartyMenuInternal ldr r3, [r0] movs r1, 0 ldrsb r1, [r4, r1] @@ -2907,11 +2907,11 @@ _081200EE: pop {r0} bx r0 .align 2, 0 -_081200F4: .4byte gUnknown_203B09C - thumb_func_end sub_811FFF0 +_081200F4: .4byte sPartyMenuInternal + thumb_func_end UpdatePartySelectionSingleLayout - thumb_func_start sub_81200F8 -sub_81200F8: @ 81200F8 + thumb_func_start UpdatePartySelectionDoubleLayout +UpdatePartySelectionDoubleLayout: @ 81200F8 push {r4-r6,lr} adds r4, r0, 0 lsls r1, 24 @@ -2956,7 +2956,7 @@ _08120140: .4byte gPlayerPartyCount _08120144: cmp r0, 0x7 bne _08120160 - ldr r0, _08120158 @ =gUnknown_203B09C + ldr r0, _08120158 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -2965,7 +2965,7 @@ _08120144: movs r0, 0x6 b _0812028E .align 2, 0 -_08120158: .4byte gUnknown_203B09C +_08120158: .4byte sPartyMenuInternal _0812015C: subs r0, r1, 0x1 strb r0, [r4] @@ -2974,7 +2974,7 @@ _08120160: ldrsb r0, [r4, r0] lsls r1, r2, 24 asrs r1, 24 - bl sub_812029C + bl GetNewSlotDoubleLayout lsls r0, 24 lsrs r2, r0, 24 asrs r0, 24 @@ -3002,13 +3002,13 @@ _08120194: movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x1 - bl sub_812029C + bl GetNewSlotDoubleLayout lsls r0, 24 lsrs r2, r0, 24 asrs r0, 24 cmp r0, r6 bne _0812017C - ldr r0, _081201B8 @ =gUnknown_203B09C + ldr r0, _081201B8 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -3017,7 +3017,7 @@ _08120194: movs r0, 0x6 b _0812028E .align 2, 0 -_081201B8: .4byte gUnknown_203B09C +_081201B8: .4byte sPartyMenuInternal _081201BC: movs r0, 0x7 b _0812028E @@ -3026,7 +3026,7 @@ _081201C0: ldrsb r0, [r4, r0] cmp r0, 0 bne _081201F8 - ldr r0, _081201E8 @ =gUnknown_203B09C + ldr r0, _081201E8 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 @@ -3041,7 +3041,7 @@ _081201C0: strb r6, [r4] b _08120290 .align 2, 0 -_081201E8: .4byte gUnknown_203B09C +_081201E8: .4byte sPartyMenuInternal _081201EC: .4byte gPlayerParty + 300 @ &gPlayerParty[3] _081201F0: ldr r0, _081201F4 @ =gPlayerParty + 200 @ &gPlayerParty[2] @@ -3051,7 +3051,7 @@ _081201F4: .4byte gPlayerParty + 200 @ &gPlayerParty[2] _081201F8: cmp r0, 0x1 bne _08120290 - ldr r0, _0812021C @ =gUnknown_203B09C + ldr r0, _0812021C @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 @@ -3067,7 +3067,7 @@ _0812020C: strb r5, [r4] b _08120290 .align 2, 0 -_0812021C: .4byte gUnknown_203B09C +_0812021C: .4byte sPartyMenuInternal _08120220: .4byte gPlayerParty + 500 @ &gPlayerParty[5] _08120224: ldr r0, _08120234 @ =gPlayerParty + 400 @ &gPlayerParty[4] @@ -3086,7 +3086,7 @@ _08120238: lsrs r0, 24 cmp r0, 0x1 bhi _08120268 - ldr r0, _08120264 @ =gUnknown_203B09C + ldr r0, _08120264 @ =sPartyMenuInternal ldr r3, [r0] movs r1, 0 ldrsb r1, [r4, r1] @@ -3102,14 +3102,14 @@ _08120238: movs r0, 0 b _0812028E .align 2, 0 -_08120264: .4byte gUnknown_203B09C +_08120264: .4byte sPartyMenuInternal _08120268: subs r0, r1, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bhi _08120290 - ldr r0, _08120298 @ =gUnknown_203B09C + ldr r0, _08120298 @ =sPartyMenuInternal ldr r3, [r0] movs r1, 0 ldrsb r1, [r4, r1] @@ -3130,11 +3130,11 @@ _08120290: pop {r0} bx r0 .align 2, 0 -_08120298: .4byte gUnknown_203B09C - thumb_func_end sub_81200F8 +_08120298: .4byte sPartyMenuInternal + thumb_func_end UpdatePartySelectionDoubleLayout - thumb_func_start sub_812029C -sub_812029C: @ 812029C + thumb_func_start GetNewSlotDoubleLayout +GetNewSlotDoubleLayout: @ 812029C push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -3170,7 +3170,7 @@ _081202D8: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_812029C + thumb_func_end GetNewSlotDoubleLayout thumb_func_start GetMonNickname GetMonNickname: @ 81202E0 @@ -3186,13 +3186,13 @@ GetMonNickname: @ 81202E0 bx r1 thumb_func_end GetMonNickname - thumb_func_start sub_81202F8 -sub_81202F8: @ 81202F8 + thumb_func_start DisplayPartyMenuMessage +DisplayPartyMenuMessage: @ 81202F8 push {r4,lr} lsls r4, r1, 24 lsrs r4, 24 - bl sub_8121FC0 - ldr r0, _08120320 @ =sub_8120328 + bl PartyMenuPrintText + ldr r0, _08120320 @ =Task_PrintAndWaitForText movs r1, 0x1 bl CreateTask lsls r0, 24 @@ -3207,12 +3207,12 @@ sub_81202F8: @ 81202F8 pop {r1} bx r1 .align 2, 0 -_08120320: .4byte sub_8120328 +_08120320: .4byte Task_PrintAndWaitForText _08120324: .4byte gTasks - thumb_func_end sub_81202F8 + thumb_func_end DisplayPartyMenuMessage - thumb_func_start sub_8120328 -sub_8120328: @ 8120328 + thumb_func_start Task_PrintAndWaitForText +Task_PrintAndWaitForText: @ 8120328 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -3246,23 +3246,23 @@ _08120364: bx r0 .align 2, 0 _0812036C: .4byte gTasks - thumb_func_end sub_8120328 + thumb_func_end Task_PrintAndWaitForText - thumb_func_start sub_8120370 -sub_8120370: @ 8120370 + thumb_func_start IsPartyMenuTextPrinterActive +IsPartyMenuTextPrinterActive: @ 8120370 push {lr} - ldr r0, _08120380 @ =sub_8120328 + ldr r0, _08120380 @ =Task_PrintAndWaitForText bl FuncIsActiveTask lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_08120380: .4byte sub_8120328 - thumb_func_end sub_8120370 +_08120380: .4byte Task_PrintAndWaitForText + thumb_func_end IsPartyMenuTextPrinterActive - thumb_func_start sub_8120384 -sub_8120384: @ 8120384 + thumb_func_start Task_WaitForLinkAndReturnToChooseMon +Task_WaitForLinkAndReturnToChooseMon: @ 8120384 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -3272,13 +3272,13 @@ sub_8120384: @ 8120384 cmp r0, 0x1 beq _081203AA movs r0, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r0, _081203B0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081203B4 @ =sub_811FB28 + ldr r0, _081203B4 @ =Task_HandleChooseMonInput str r0, [r1] _081203AA: pop {r4} @@ -3286,16 +3286,16 @@ _081203AA: bx r0 .align 2, 0 _081203B0: .4byte gTasks -_081203B4: .4byte sub_811FB28 - thumb_func_end sub_8120384 +_081203B4: .4byte Task_HandleChooseMonInput + thumb_func_end Task_WaitForLinkAndReturnToChooseMon - thumb_func_start sub_81203B8 -sub_81203B8: @ 81203B8 + thumb_func_start Task_ReturnToChooseMonAfterText +Task_ReturnToChooseMonAfterText: @ 81203B8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3315,20 +3315,20 @@ sub_81203B8: @ 81203B8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081203F8 @ =sub_8120384 + ldr r0, _081203F8 @ =Task_WaitForLinkAndReturnToChooseMon b _0812040E .align 2, 0 _081203F4: .4byte gTasks -_081203F8: .4byte sub_8120384 +_081203F8: .4byte Task_WaitForLinkAndReturnToChooseMon _081203FC: movs r0, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r0, _08120418 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _0812041C @ =sub_811FB28 + ldr r0, _0812041C @ =Task_HandleChooseMonInput _0812040E: str r0, [r1] _08120410: @@ -3337,11 +3337,11 @@ _08120410: bx r0 .align 2, 0 _08120418: .4byte gTasks -_0812041C: .4byte sub_811FB28 - thumb_func_end sub_81203B8 +_0812041C: .4byte Task_HandleChooseMonInput + thumb_func_end Task_ReturnToChooseMonAfterText - thumb_func_start sub_8120420 -sub_8120420: @ 8120420 + thumb_func_start DisplayGaveHeldItemMessage +DisplayGaveHeldItemMessage: @ 8120420 push {r4-r6,lr} adds r5, r0, 0 lsls r1, 16 @@ -3357,7 +3357,7 @@ sub_8120420: @ 8120420 .align 2, 0 _08120438: .4byte 0x0000ffff _0812043C: - ldr r0, _08120454 @ =gUnknown_203B0A0 + ldr r0, _08120454 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x6 bne _0812045C @@ -3369,7 +3369,7 @@ _08120448: bl ItemUse_SetQuestLogEvent b _08120468 .align 2, 0 -_08120454: .4byte gUnknown_203B0A0 +_08120454: .4byte gPartyMenu _08120458: .4byte 0x0000ffff _0812045C: ldr r3, _08120498 @ =0x0000ffff @@ -3385,12 +3385,12 @@ _08120468: adds r0, r4, 0 bl CopyItemName ldr r4, _081204A4 @ =gStringVar4 - ldr r1, _081204A8 @ =gUnknown_8416C2A + ldr r1, _081204A8 @ =gText_PkmnWasGivenItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r6, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram pop {r4-r6} @@ -3401,11 +3401,11 @@ _08120498: .4byte 0x0000ffff _0812049C: .4byte gStringVar1 _081204A0: .4byte gStringVar2 _081204A4: .4byte gStringVar4 -_081204A8: .4byte gUnknown_8416C2A - thumb_func_end sub_8120420 +_081204A8: .4byte gText_PkmnWasGivenItem + thumb_func_end DisplayGaveHeldItemMessage - thumb_func_start sub_81204AC -sub_81204AC: @ 81204AC + thumb_func_start DisplayTookHeldItemMessage +DisplayTookHeldItemMessage: @ 81204AC push {r4-r6,lr} adds r6, r0, 0 adds r4, r1, 0 @@ -3426,12 +3426,12 @@ sub_81204AC: @ 81204AC adds r0, r4, 0 bl CopyItemName ldr r4, _08120504 @ =gStringVar4 - ldr r1, _08120508 @ =gUnknown_8416CAC + ldr r1, _08120508 @ =gText_ReceivedItemFromPkmn adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r5, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram pop {r4-r6} @@ -3442,11 +3442,11 @@ _081204F8: .4byte 0x0000ffff _081204FC: .4byte gStringVar1 _08120500: .4byte gStringVar2 _08120504: .4byte gStringVar4 -_08120508: .4byte gUnknown_8416CAC - thumb_func_end sub_81204AC +_08120508: .4byte gText_ReceivedItemFromPkmn + thumb_func_end DisplayTookHeldItemMessage - thumb_func_start sub_812050C -sub_812050C: @ 812050C + thumb_func_start DisplayAlreadyHoldingItemSwitchMessage +DisplayAlreadyHoldingItemSwitchMessage: @ 812050C push {r4,r5,lr} adds r4, r1, 0 adds r5, r2, 0 @@ -3460,12 +3460,12 @@ sub_812050C: @ 812050C adds r0, r4, 0 bl CopyItemName ldr r4, _08120550 @ =gStringVar4 - ldr r1, _08120554 @ =gUnknown_8416C49 + ldr r1, _08120554 @ =gText_PkmnAlreadyHoldingItemSwitch adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r5, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram pop {r4,r5} @@ -3475,11 +3475,11 @@ sub_812050C: @ 812050C _08120548: .4byte gStringVar1 _0812054C: .4byte gStringVar2 _08120550: .4byte gStringVar4 -_08120554: .4byte gUnknown_8416C49 - thumb_func_end sub_812050C +_08120554: .4byte gText_PkmnAlreadyHoldingItemSwitch + thumb_func_end DisplayAlreadyHoldingItemSwitchMessage - thumb_func_start sub_8120558 -sub_8120558: @ 8120558 + thumb_func_start DisplaySwitchedHeldItemMessage +DisplaySwitchedHeldItemMessage: @ 8120558 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -3490,7 +3490,7 @@ sub_8120558: @ 8120558 lsrs r5, 16 lsls r6, 24 lsrs r6, 24 - ldr r0, _081205B0 @ =gUnknown_203B0A0 + ldr r0, _081205B0 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -3507,28 +3507,28 @@ sub_8120558: @ 8120558 adds r0, r5, 0 bl CopyItemName ldr r4, _081205C0 @ =gStringVar4 - ldr r1, _081205C4 @ =gUnknown_8416CEA + ldr r1, _081205C4 @ =gText_SwitchedPkmnItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r6, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081205B0: .4byte gUnknown_203B0A0 +_081205B0: .4byte gPartyMenu _081205B4: .4byte gPlayerParty _081205B8: .4byte gStringVar1 _081205BC: .4byte gStringVar2 _081205C0: .4byte gStringVar4 -_081205C4: .4byte gUnknown_8416CEA - thumb_func_end sub_8120558 +_081205C4: .4byte gText_SwitchedPkmnItem + thumb_func_end DisplaySwitchedHeldItemMessage - thumb_func_start sub_81205C8 -sub_81205C8: @ 81205C8 + thumb_func_start GiveItemToMon +GiveItemToMon: @ 81205C8 push {r4-r7,lr} sub sp, 0x4 adds r6, r0, 0 @@ -3563,10 +3563,10 @@ _08120606: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_81205C8 + thumb_func_end GiveItemToMon - thumb_func_start sub_8120610 -sub_8120610: @ 8120610 + thumb_func_start TryTakeMonItem +TryTakeMonItem: @ 8120610 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -3602,10 +3602,10 @@ _0812064E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8120610 + thumb_func_end TryTakeMonItem - thumb_func_start sub_8120658 -sub_8120658: @ 8120658 + thumb_func_start BufferBagFullCantTakeItemMessage +BufferBagFullCantTakeItemMessage: @ 8120658 push {lr} lsls r0, 16 lsrs r0, 16 @@ -3633,7 +3633,7 @@ _08120686: ldr r0, _0812069C @ =gStringVar1 bl StringCopy ldr r0, _081206A0 @ =gStringVar4 - ldr r1, _081206A4 @ =gUnknown_8416D78 + ldr r1, _081206A4 @ =gText_BagFullCouldNotRemoveItem bl StringExpandPlaceholders pop {r0} bx r0 @@ -3641,11 +3641,11 @@ _08120686: _08120698: .4byte 0x0000016d _0812069C: .4byte gStringVar1 _081206A0: .4byte gStringVar4 -_081206A4: .4byte gUnknown_8416D78 - thumb_func_end sub_8120658 +_081206A4: .4byte gText_BagFullCouldNotRemoveItem + thumb_func_end BufferBagFullCantTakeItemMessage - thumb_func_start sub_81206A8 -sub_81206A8: @ 81206A8 + thumb_func_start Task_PartyMenuModifyHP +Task_PartyMenuModifyHP: @ 81206A8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -3678,12 +3678,12 @@ sub_81206A8: @ 81206A8 adds r0, r2, 0 muls r0, r5 adds r0, r4 - ldr r6, _08120758 @ =gUnknown_203B0B4 + ldr r6, _08120758 @ =sPartyMenuBoxes lsls r2, 4 ldr r1, [r6] adds r1, r2 movs r2, 0x1 - bl sub_812199C + bl DisplayPartyPokemonHPCheck movs r0, 0x8 ldrsh r2, [r7, r0] adds r0, r2, 0 @@ -3692,7 +3692,7 @@ sub_81206A8: @ 81206A8 lsls r2, 4 ldr r1, [r6] adds r1, r2 - bl sub_8121AF0 + bl DisplayPartyPokemonHPBarCheck movs r1, 0x6 ldrsh r0, [r7, r1] cmp r0, 0 @@ -3731,12 +3731,12 @@ _08120746: .align 2, 0 _08120750: .4byte gTasks+0x8 _08120754: .4byte gPlayerParty -_08120758: .4byte gUnknown_203B0B4 +_08120758: .4byte sPartyMenuBoxes _0812075C: .4byte gStringVar2 - thumb_func_end sub_81206A8 + thumb_func_end Task_PartyMenuModifyHP - thumb_func_start sub_8120760 -sub_8120760: @ 8120760 + thumb_func_start PartyMenuModifyHP +PartyMenuModifyHP: @ 8120760 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3788,7 +3788,7 @@ sub_8120760: @ 8120760 strh r0, [r4, 0x8] ldrh r0, [r4] strh r0, [r4, 0xA] - ldr r1, _081207EC @ =sub_81206A8 + ldr r1, _081207EC @ =Task_PartyMenuModifyHP mov r0, r8 adds r2, r7, 0 bl SetTaskFuncWithFollowupFunc @@ -3802,11 +3802,11 @@ sub_8120760: @ 8120760 .align 2, 0 _081207E4: .4byte gPlayerParty _081207E8: .4byte gTasks+0x8 -_081207EC: .4byte sub_81206A8 - thumb_func_end sub_8120760 +_081207EC: .4byte Task_PartyMenuModifyHP + thumb_func_end PartyMenuModifyHP - thumb_func_start sub_81207F0 -sub_81207F0: @ 81207F0 + thumb_func_start ResetHPTaskData +ResetHPTaskData: @ 81207F0 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -3852,7 +3852,7 @@ _08120846: strh r2, [r3, 0x8] b _08120852 _0812084A: - ldr r1, _08120858 @ =sub_81206A8 + ldr r1, _08120858 @ =Task_PartyMenuModifyHP adds r0, r4, 0 bl SetTaskFuncWithFollowupFunc _08120852: @@ -3860,11 +3860,11 @@ _08120852: pop {r0} bx r0 .align 2, 0 -_08120858: .4byte sub_81206A8 - thumb_func_end sub_81207F0 +_08120858: .4byte Task_PartyMenuModifyHP + thumb_func_end ResetHPTaskData - thumb_func_start pokemon_ailments_get_primary -pokemon_ailments_get_primary: @ 812085C + thumb_func_start GetAilmentFromStatus +GetAilmentFromStatus: @ 812085C push {lr} adds r1, r0, 0 movs r0, 0x88 @@ -3906,10 +3906,10 @@ _0812089C: _0812089E: pop {r1} bx r1 - thumb_func_end pokemon_ailments_get_primary + thumb_func_end GetAilmentFromStatus - thumb_func_start sub_81208A4 -sub_81208A4: @ 81208A4 + thumb_func_start GetMonAilment +GetMonAilment: @ 81208A4 push {r4,lr} adds r4, r0, 0 movs r1, 0x39 @@ -3922,7 +3922,7 @@ _081208B6: adds r0, r4, 0 movs r1, 0x37 bl GetMonData - bl pokemon_ailments_get_primary + bl GetAilmentFromStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -3941,12 +3941,12 @@ _081208DE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_81208A4 + thumb_func_end GetMonAilment - thumb_func_start sub_81208E4 -sub_81208E4: @ 81208E4 + thumb_func_start SetPartyMonsAllowedInMinigame +SetPartyMonsAllowedInMinigame: @ 81208E4 push {r4,r5,lr} - ldr r2, _08120934 @ =gUnknown_203B0A0 + ldr r2, _08120934 @ =gPartyMenu ldrb r1, [r2, 0x8] movs r0, 0xF ands r0, r1 @@ -3970,7 +3970,7 @@ _0812090C: muls r0, r4 ldr r1, _08120940 @ =gPlayerParty adds r0, r1 - bl sub_812097C + bl IsMonAllowedInPokemonJump lsls r0, 16 lsrs r0, 16 lsls r0, r4 @@ -3986,7 +3986,7 @@ _0812090C: bcc _0812090C b _0812096E .align 2, 0 -_08120934: .4byte gUnknown_203B0A0 +_08120934: .4byte gPartyMenu _08120938: .4byte gSpecialVar_0x8005 _0812093C: .4byte gPlayerPartyCount _08120940: .4byte gPlayerParty @@ -3998,7 +3998,7 @@ _08120948: muls r0, r4 ldr r1, _08120974 @ =gPlayerParty adds r0, r1 - bl sub_81209AC + bl IsMonAllowedInDodrioBerryPicking lsls r0, 16 lsrs r0, 16 lsls r0, r4 @@ -4020,10 +4020,10 @@ _0812096E: .align 2, 0 _08120974: .4byte gPlayerParty _08120978: .4byte gPlayerPartyCount - thumb_func_end sub_81208E4 + thumb_func_end SetPartyMonsAllowedInMinigame - thumb_func_start sub_812097C -sub_812097C: @ 812097C + thumb_func_start IsMonAllowedInPokemonJump +IsMonAllowedInPokemonJump: @ 812097C push {r4,lr} adds r4, r0, 0 movs r1, 0x2D @@ -4046,10 +4046,10 @@ _081209A4: pop {r4} pop {r1} bx r1 - thumb_func_end sub_812097C + thumb_func_end IsMonAllowedInPokemonJump - thumb_func_start sub_81209AC -sub_81209AC: @ 81209AC + thumb_func_start IsMonAllowedInDodrioBerryPicking +IsMonAllowedInDodrioBerryPicking: @ 81209AC push {r4,lr} adds r4, r0, 0 movs r1, 0x2D @@ -4069,14 +4069,14 @@ _081209CC: pop {r4} pop {r1} bx r1 - thumb_func_end sub_81209AC + thumb_func_end IsMonAllowedInDodrioBerryPicking - thumb_func_start sub_81209D4 -sub_81209D4: @ 81209D4 + thumb_func_start IsMonAllowedInMinigame +IsMonAllowedInMinigame: @ 81209D4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081209F0 @ =gUnknown_203B0A0 + ldr r1, _081209F0 @ =gPartyMenu movs r2, 0xE ldrsh r1, [r1, r2] asrs r1, r0 @@ -4089,18 +4089,18 @@ _081209EC: pop {r1} bx r1 .align 2, 0 -_081209F0: .4byte gUnknown_203B0A0 - thumb_func_end sub_81209D4 +_081209F0: .4byte gPartyMenu + thumb_func_end IsMonAllowedInMinigame - thumb_func_start sub_81209F4 -sub_81209F4: @ 81209F4 + thumb_func_start TryEnterMonForMinigame +TryEnterMonForMinigame: @ 81209F4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 lsls r1, 24 lsrs r5, r1, 24 adds r0, r5, 0 - bl sub_81209D4 + bl IsMonAllowedInMinigame lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4110,7 +4110,7 @@ sub_81209F4: @ 81209F4 ldr r0, _08120A20 @ =gSpecialVar_0x8004 strh r5, [r0] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _08120A46 .align 2, 0 _08120A20: .4byte gSpecialVar_0x8004 @@ -4119,7 +4119,7 @@ _08120A24: bl PlaySE ldr r0, _08120A4C @ =gUnknown_8417696 movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08120A50 @ =gTasks @@ -4127,7 +4127,7 @@ _08120A24: adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08120A54 @ =sub_81203B8 + ldr r1, _08120A54 @ =Task_ReturnToChooseMonAfterText str r1, [r0] _08120A46: pop {r4,r5} @@ -4136,18 +4136,18 @@ _08120A46: .align 2, 0 _08120A4C: .4byte gUnknown_8417696 _08120A50: .4byte gTasks -_08120A54: .4byte sub_81203B8 - thumb_func_end sub_81209F4 +_08120A54: .4byte Task_ReturnToChooseMonAfterText + thumb_func_end TryEnterMonForMinigame - thumb_func_start sub_8120A58 -sub_8120A58: @ 8120A58 + thumb_func_start CancelParticipationPrompt +CancelParticipationPrompt: @ 8120A58 push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldr r0, _08120A84 @ =gUnknown_84176B8 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08120A88 @ =gTasks @@ -4155,7 +4155,7 @@ sub_8120A58: @ 8120A58 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08120A8C @ =sub_8120A90 + ldr r1, _08120A8C @ =Task_CancelParticipationYesNo str r1, [r0] pop {r4} pop {r0} @@ -4163,26 +4163,26 @@ sub_8120A58: @ 8120A58 .align 2, 0 _08120A84: .4byte gUnknown_84176B8 _08120A88: .4byte gTasks -_08120A8C: .4byte sub_8120A90 - thumb_func_end sub_8120A58 +_08120A8C: .4byte Task_CancelParticipationYesNo + thumb_func_end CancelParticipationPrompt - thumb_func_start sub_8120A90 -sub_8120A90: @ 8120A90 + thumb_func_start Task_CancelParticipationYesNo +Task_CancelParticipationYesNo: @ 8120A90 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08120AB4 - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08120ABC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08120AC0 @ =sub_8120AC4 + ldr r0, _08120AC0 @ =Task_HandleCancelParticipationYesNoInput str r0, [r1] _08120AB4: pop {r4} @@ -4190,11 +4190,11 @@ _08120AB4: bx r0 .align 2, 0 _08120ABC: .4byte gTasks -_08120AC0: .4byte sub_8120AC4 - thumb_func_end sub_8120A90 +_08120AC0: .4byte Task_HandleCancelParticipationYesNoInput + thumb_func_end Task_CancelParticipationYesNo - thumb_func_start sub_8120AC4 -sub_8120AC4: @ 8120AC4 + thumb_func_start Task_HandleCancelParticipationYesNoInput +Task_HandleCancelParticipationYesNoInput: @ 8120AC4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -4219,7 +4219,7 @@ _08120AEA: movs r0, 0x7 strh r0, [r1] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _08120B10 .align 2, 0 _08120AF8: .4byte gSpecialVar_0x8004 @@ -4232,7 +4232,7 @@ _08120B02: adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08120B1C @ =sub_81203B8 + ldr r0, _08120B1C @ =Task_ReturnToChooseMonAfterText str r0, [r1] _08120B10: pop {r4} @@ -4240,11 +4240,11 @@ _08120B10: bx r0 .align 2, 0 _08120B18: .4byte gTasks -_08120B1C: .4byte sub_81203B8 - thumb_func_end sub_8120AC4 +_08120B1C: .4byte Task_ReturnToChooseMonAfterText + thumb_func_end Task_HandleCancelParticipationYesNoInput - thumb_func_start sub_8120B20 -sub_8120B20: @ 8120B20 + thumb_func_start CanMonLearnTMTutor +CanMonLearnTMTutor: @ 8120B20 push {r4-r7,lr} mov r7, r8 push {r7} @@ -4284,7 +4284,7 @@ _08120B64: lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 - bl IsMonCompatibleWithMoveTutorMove + bl CanLearnTutorMove lsls r0, 24 cmp r0, 0 bne _08120B80 @@ -4313,7 +4313,7 @@ _08120B9E: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8120B20 + thumb_func_end CanMonLearnTMTutor thumb_func_start GetMoveTutorMove GetMoveTutorMove: @ 8120BA8 @@ -4356,8 +4356,8 @@ _08120BDE: _08120BE4: .4byte gMoveTutorMoves thumb_func_end GetMoveTutorMove - thumb_func_start IsMonCompatibleWithMoveTutorMove -IsMonCompatibleWithMoveTutorMove: @ 8120BE8 + thumb_func_start CanLearnTutorMove +CanLearnTutorMove: @ 8120BE8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -4387,7 +4387,7 @@ _08120C12: beq _08120C34 b _08120C2A _08120C18: - ldr r1, _08120C30 @ =gMoveTutorMoveCompatibilityTable + ldr r1, _08120C30 @ =sTutorLearnsets lsls r0, 1 adds r0, r1 ldrh r0, [r0] @@ -4400,13 +4400,13 @@ _08120C2A: movs r0, 0 b _08120C36 .align 2, 0 -_08120C30: .4byte gMoveTutorMoveCompatibilityTable +_08120C30: .4byte sTutorLearnsets _08120C34: movs r0, 0x1 _08120C36: pop {r1} bx r1 - thumb_func_end IsMonCompatibleWithMoveTutorMove + thumb_func_end CanLearnTutorMove thumb_func_start sub_8120C3C sub_8120C3C: @ 8120C3C @@ -4714,26 +4714,26 @@ sub_8120E58: @ 8120E58 movs r1, 0x58 movs r2, 0xF0 bl TextWindow_SetStdFrame0_WithPal - ldr r0, _08120E94 @ =gUnknown_203B0A0 + ldr r0, _08120E94 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x3 bne _08120E98 movs r0, 0x5 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _08120E9E .align 2, 0 _08120E90: .4byte gPaletteFade -_08120E94: .4byte gUnknown_203B0A0 +_08120E94: .4byte gPartyMenu _08120E98: movs r0, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage _08120E9E: ldr r0, _08120EB4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08120EB8 @ =sub_811FB28 + ldr r0, _08120EB8 @ =Task_HandleChooseMonInput str r0, [r1] _08120EAC: pop {r4} @@ -4741,7 +4741,7 @@ _08120EAC: bx r0 .align 2, 0 _08120EB4: .4byte gTasks -_08120EB8: .4byte sub_811FB28 +_08120EB8: .4byte Task_HandleChooseMonInput thumb_func_end sub_8120E58 thumb_func_start sub_8120EBC @@ -4806,21 +4806,21 @@ _08120F24: _08120F2A: ldr r0, _08120F34 @ =gUnknown_203B0A9 movs r1, 0x2 - bl sub_811FF94 + bl UpdateCurrentPartySelection b _08120F62 .align 2, 0 _08120F34: .4byte gUnknown_203B0A9 _08120F38: movs r0, 0x5 bl PlaySE - bl sub_8122BD4 + bl CreateSelectionWindow b _08120F62 _08120F44: - ldr r4, _08120F70 @ =gUnknown_203B09C + ldr r4, _08120F70 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xE - bl sub_8121CE4 - ldr r1, _08120F74 @ =gUnknown_845A618 + bl PartyMenuRemoveWindow + ldr r1, _08120F74 @ =sCursorOptions ldr r0, [r4] ldrb r0, [r0, 0xF] lsls r0, 3 @@ -4838,8 +4838,8 @@ _08120F68: pop {r0} bx r0 .align 2, 0 -_08120F70: .4byte gUnknown_203B09C -_08120F74: .4byte gUnknown_845A618 +_08120F70: .4byte sPartyMenuInternal +_08120F74: .4byte sCursorOptions thumb_func_end sub_8120EE0 thumb_func_start sub_8120F78 @@ -4858,18 +4858,18 @@ sub_8120F78: @ 8120F78 .align 2, 0 _08120F90: .4byte gMain _08120F94: - ldr r0, _08120FA8 @ =gUnknown_203B09C + ldr r0, _08120FA8 @ =sPartyMenuInternal ldr r1, [r0] ldr r0, _08120FAC @ =sub_8120FB0 str r0, [r1, 0x4] adds r0, r2, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu movs r0, 0x1 _08120FA4: pop {r1} bx r1 .align 2, 0 -_08120FA8: .4byte gUnknown_203B09C +_08120FA8: .4byte sPartyMenuInternal _08120FAC: .4byte sub_8120FB0 thumb_func_end sub_8120F78 @@ -4943,12 +4943,12 @@ sub_8120FF0: @ 8120FF0 _0812102C: .4byte gTasks+0x8 _08121030: .4byte gPaletteFade _08121034: - ldr r0, _08121050 @ =gUnknown_203B09C + ldr r0, _08121050 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _08121054 @ =sub_8128184 + ldr r0, _08121054 @ =CB2_SetUpExitToBattleScreen str r0, [r1, 0x4] - ldr r0, _08121058 @ =gUnknown_3005E98 - ldr r1, _0812105C @ =sub_81255BC + ldr r0, _08121058 @ =gItemUseCB + ldr r1, _0812105C @ =Task_ClosePartyMenuAfterText ldr r2, [r0] adds r0, r5, 0 bl _call_via_r2 @@ -4957,14 +4957,14 @@ _08121048: pop {r0} bx r0 .align 2, 0 -_08121050: .4byte gUnknown_203B09C -_08121054: .4byte sub_8128184 -_08121058: .4byte gUnknown_3005E98 -_0812105C: .4byte sub_81255BC +_08121050: .4byte sPartyMenuInternal +_08121054: .4byte CB2_SetUpExitToBattleScreen +_08121058: .4byte gItemUseCB +_0812105C: .4byte Task_ClosePartyMenuAfterText thumb_func_end sub_8120FF0 - thumb_func_start sub_8121060 -sub_8121060: @ 8121060 + thumb_func_start InitPartyMenuWindows +InitPartyMenuWindows: @ 8121060 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -4981,25 +4981,25 @@ _08121076: beq _08121094 b _081210A0 _0812107C: - ldr r0, _08121084 @ =gUnknown_845A010 + ldr r0, _08121084 @ =sSinglePartyMenuWindowTemplate bl InitWindows b _081210A6 .align 2, 0 -_08121084: .4byte gUnknown_845A010 +_08121084: .4byte sSinglePartyMenuWindowTemplate _08121088: - ldr r0, _08121090 @ =gUnknown_845A050 + ldr r0, _08121090 @ =sDoublePartyMenuWindowTemplate bl InitWindows b _081210A6 .align 2, 0 -_08121090: .4byte gUnknown_845A050 +_08121090: .4byte sDoublePartyMenuWindowTemplate _08121094: - ldr r0, _0812109C @ =gUnknown_845A090 + ldr r0, _0812109C @ =sMultiPartyMenuWindowTemplate bl InitWindows b _081210A6 .align 2, 0 -_0812109C: .4byte gUnknown_845A090 +_0812109C: .4byte sMultiPartyMenuWindowTemplate _081210A0: - ldr r0, _081210F4 @ =gUnknown_845A0D0 + ldr r0, _081210F4 @ =sShowcaseMultiPartyMenuWindowTemplate bl InitWindows _081210A6: bl DeactivateAllTextPrinters @@ -5035,16 +5035,16 @@ _081210AC: pop {r0} bx r0 .align 2, 0 -_081210F4: .4byte gUnknown_845A0D0 - thumb_func_end sub_8121060 +_081210F4: .4byte sShowcaseMultiPartyMenuWindowTemplate + thumb_func_end InitPartyMenuWindows - thumb_func_start sub_81210F8 -sub_81210F8: @ 81210F8 + thumb_func_start CreateCancelConfirmWindows +CreateCancelConfirmWindows: @ 81210F8 push {r4-r6,lr} sub sp, 0x14 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08121174 @ =gUnknown_203B0A0 + ldr r0, _08121174 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -5054,7 +5054,7 @@ sub_81210F8: @ 81210F8 _0812110E: cmp r2, 0x1 bne _08121188 - ldr r0, _08121178 @ =gUnknown_845A118 + ldr r0, _08121178 @ =sConfirmButtonWindowTemplate bl AddWindow adds r4, r0, 0 lsls r4, 24 @@ -5062,7 +5062,7 @@ _0812110E: adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r5, _0812117C @ =gUnknown_84169D5 + ldr r5, _0812117C @ =gMenuText_Confirm movs r0, 0 adds r1, r5, 0 movs r2, 0 @@ -5075,7 +5075,7 @@ _0812110E: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] - ldr r0, _08121180 @ =gUnknown_8459FFC + ldr r0, _08121180 @ =sFontColorTable str r0, [sp, 0x8] movs r0, 0x1 negs r0, r0 @@ -5090,20 +5090,20 @@ _0812110E: adds r0, r4, 0 movs r1, 0x2 bl CopyWindowToVram - ldr r0, _08121184 @ =gUnknown_845A110 + ldr r0, _08121184 @ =sMultiCancelButtonWindowTemplate bl AddWindow lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 b _08121194 .align 2, 0 -_08121174: .4byte gUnknown_203B0A0 -_08121178: .4byte gUnknown_845A118 -_0812117C: .4byte gUnknown_84169D5 -_08121180: .4byte gUnknown_8459FFC -_08121184: .4byte gUnknown_845A110 +_08121174: .4byte gPartyMenu +_08121178: .4byte sConfirmButtonWindowTemplate +_0812117C: .4byte gMenuText_Confirm +_08121180: .4byte sFontColorTable +_08121184: .4byte sMultiCancelButtonWindowTemplate _08121188: - ldr r0, _081211E0 @ =gUnknown_845A108 + ldr r0, _081211E0 @ =sCancelButtonWindowTemplate bl AddWindow lsls r0, 24 lsrs r6, r0, 24 @@ -5112,7 +5112,7 @@ _08121194: adds r0, r6, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r0, _081211E4 @ =gUnknown_203B0A0 + ldr r0, _081211E4 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -5131,7 +5131,7 @@ _08121194: adds r1, r5, r1 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _081211EC @ =gUnknown_8459FFC + ldr r0, _081211EC @ =sFontColorTable str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -5144,10 +5144,10 @@ _08121194: bl AddTextPrinterParameterized3 b _08121224 .align 2, 0 -_081211E0: .4byte gUnknown_845A108 -_081211E4: .4byte gUnknown_203B0A0 +_081211E0: .4byte sCancelButtonWindowTemplate +_081211E4: .4byte gPartyMenu _081211E8: .4byte gFameCheckerText_Cancel -_081211EC: .4byte gUnknown_8459FFC +_081211EC: .4byte sFontColorTable _081211F0: ldr r4, _08121240 @ =gOtherText_Exit movs r0, 0 @@ -5162,7 +5162,7 @@ _081211F0: adds r1, r5, r1 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _08121244 @ =gUnknown_8459FFC + ldr r0, _08121244 @ =sFontColorTable str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -5188,13 +5188,13 @@ _08121238: bx r0 .align 2, 0 _08121240: .4byte gOtherText_Exit -_08121244: .4byte gUnknown_8459FFC - thumb_func_end sub_81210F8 +_08121244: .4byte sFontColorTable + thumb_func_end CreateCancelConfirmWindows - thumb_func_start sub_8121248 -sub_8121248: @ 8121248 + thumb_func_start GetPartyMenuPalBufferPtr +GetPartyMenuPalBufferPtr: @ 8121248 lsls r0, 24 - ldr r1, _08121258 @ =gUnknown_203B09C + ldr r1, _08121258 @ =sPartyMenuInternal lsrs r0, 23 adds r0, 0x18 ldr r1, [r1] @@ -5202,11 +5202,11 @@ sub_8121248: @ 8121248 adds r0, r1, 0 bx lr .align 2, 0 -_08121258: .4byte gUnknown_203B09C - thumb_func_end sub_8121248 +_08121258: .4byte sPartyMenuInternal + thumb_func_end GetPartyMenuPalBufferPtr - thumb_func_start sub_812125C -sub_812125C: @ 812125C + thumb_func_start BlitBitmapToPartyWindow +BlitBitmapToPartyWindow: @ 812125C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -5274,7 +5274,7 @@ _081212D4: ldr r2, [sp, 0xC] adds r0, r2, r0 ldrb r0, [r0] - bl sub_811F620 + bl GetPartyMenuBgTile adds r1, r5, 0 muls r1, r6 adds r1, r4 @@ -5318,10 +5318,10 @@ _0812132A: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_812125C + thumb_func_end BlitBitmapToPartyWindow - thumb_func_start sub_812133C -sub_812133C: @ 812133C + thumb_func_start BlitBitmapToPartyWindow_LeftColumn +BlitBitmapToPartyWindow_LeftColumn: @ 812133C push {r4-r6,lr} sub sp, 0xC ldr r4, [sp, 0x1C] @@ -5347,35 +5347,35 @@ sub_812133C: @ 812133C _08121368: cmp r5, 0 bne _08121384 - ldr r1, _08121380 @ =gUnknown_845A180 + ldr r1, _08121380 @ =sMainSlotTileNums str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] movs r2, 0xA adds r3, r6, 0 - bl sub_812125C + bl BlitBitmapToPartyWindow b _08121394 .align 2, 0 -_08121380: .4byte gUnknown_845A180 +_08121380: .4byte sMainSlotTileNums _08121384: - ldr r1, _0812139C @ =gUnknown_845A1C6 + ldr r1, _0812139C @ =sMainSlotTileNums_Egg str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] movs r2, 0xA adds r3, r6, 0 - bl sub_812125C + bl BlitBitmapToPartyWindow _08121394: add sp, 0xC pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0812139C: .4byte gUnknown_845A1C6 - thumb_func_end sub_812133C +_0812139C: .4byte sMainSlotTileNums_Egg + thumb_func_end BlitBitmapToPartyWindow_LeftColumn - thumb_func_start sub_81213A0 -sub_81213A0: @ 81213A0 + thumb_func_start BlitBitmapToPartyWindow_RightColumn +BlitBitmapToPartyWindow_RightColumn: @ 81213A0 push {r4-r6,lr} sub sp, 0xC ldr r4, [sp, 0x1C] @@ -5401,35 +5401,35 @@ sub_81213A0: @ 81213A0 _081213CC: cmp r5, 0 bne _081213E8 - ldr r1, _081213E4 @ =gUnknown_845A20C + ldr r1, _081213E4 @ =sOtherSlotTileNums str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] movs r2, 0x12 adds r3, r6, 0 - bl sub_812125C + bl BlitBitmapToPartyWindow b _081213F8 .align 2, 0 -_081213E4: .4byte gUnknown_845A20C +_081213E4: .4byte sOtherSlotTileNums _081213E8: - ldr r1, _08121400 @ =gUnknown_845A242 + ldr r1, _08121400 @ =sOtherSlotTileNums_Egg str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] movs r2, 0x12 adds r3, r6, 0 - bl sub_812125C + bl BlitBitmapToPartyWindow _081213F8: add sp, 0xC pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08121400: .4byte gUnknown_845A242 - thumb_func_end sub_81213A0 +_08121400: .4byte sOtherSlotTileNums_Egg + thumb_func_end BlitBitmapToPartyWindow_RightColumn - thumb_func_start sub_8121404 -sub_8121404: @ 8121404 + thumb_func_start DrawEmptySlot +DrawEmptySlot: @ 8121404 push {lr} sub sp, 0xC lsls r0, 24 @@ -5443,16 +5443,16 @@ sub_8121404: @ 8121404 str r2, [sp, 0x8] movs r2, 0x12 movs r3, 0 - bl sub_812125C + bl BlitBitmapToPartyWindow add sp, 0xC pop {r0} bx r0 .align 2, 0 _08121428: .4byte gUnknown_845A278 - thumb_func_end sub_8121404 + thumb_func_end DrawEmptySlot - thumb_func_start sub_812142C -sub_812142C: @ 812142C + thumb_func_start LoadPartyBoxPalette +LoadPartyBoxPalette: @ 812142C push {r4-r7,lr} lsls r1, 24 lsrs r4, r1, 24 @@ -5478,20 +5478,20 @@ _08121458: .4byte gUnknown_845A2D4 _0812145C: ldr r5, _08121494 @ =gUnknown_845A2D4 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _08121498 @ =gUnknown_845A2B2 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r6 movs r2, 0x2 @@ -5509,20 +5509,20 @@ _081214A0: beq _081214EC ldr r5, _081214E0 @ =gUnknown_845A2D4 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _081214E4 @ =gUnknown_845A2B2 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r6 movs r2, 0x2 @@ -5549,20 +5549,20 @@ _08121500: .4byte gUnknown_845A2D4 _08121504: ldr r5, _0812153C @ =gUnknown_845A2D4 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _08121540 @ =gUnknown_845A2B2 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r6 movs r2, 0x2 @@ -5589,20 +5589,20 @@ _0812155C: .4byte gUnknown_845A2D1 _08121560: ldr r5, _08121598 @ =gUnknown_845A2C8 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _0812159C @ =gUnknown_845A2B2 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r6 movs r2, 0x2 @@ -5629,20 +5629,20 @@ _081215B8: .4byte gUnknown_845A2CE _081215BC: ldr r5, _081215F4 @ =gUnknown_845A2C5 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _081215F8 @ =gUnknown_845A2B2 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r6 movs r2, 0x2 @@ -5661,20 +5661,20 @@ _08121600: ldr r5, _08121674 @ =gUnknown_845A2CB _0812160A: ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _08121678 @ =gUnknown_845A2B2 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r6 movs r2, 0x2 @@ -5682,20 +5682,20 @@ _0812160A: ldr r5, _0812167C @ =gUnknown_845A2E0 _0812163E: ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _08121680 @ =gUnknown_845A2B5 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r6 movs r2, 0x2 @@ -5709,40 +5709,40 @@ _08121680: .4byte gUnknown_845A2B5 _08121684: ldr r5, _081216F4 @ =gUnknown_845A2C2 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _081216F8 @ =gUnknown_845A2B2 ldrb r1, [r4] adds r1, r7 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r7 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r7 movs r2, 0x2 bl LoadPalette ldr r5, _081216FC @ =gUnknown_845A2D7 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _08121700 @ =gUnknown_845A2B5 ldrb r1, [r4] adds r1, r7 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r7 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x2] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x2] adds r1, r7 movs r2, 0x2 @@ -5756,10 +5756,10 @@ _081216F4: .4byte gUnknown_845A2C2 _081216F8: .4byte gUnknown_845A2B2 _081216FC: .4byte gUnknown_845A2D7 _08121700: .4byte gUnknown_845A2B5 - thumb_func_end sub_812142C + thumb_func_end LoadPartyBoxPalette - thumb_func_start sub_8121704 -sub_8121704: @ 8121704 + thumb_func_start DisplayPartyPokemonBarDetail +DisplayPartyPokemonBarDetail: @ 8121704 push {r4,r5,lr} sub sp, 0xC lsls r0, 24 @@ -5770,7 +5770,7 @@ sub_8121704: @ 8121704 ldrb r3, [r3, 0x1] lsls r4, r2, 1 adds r4, r2 - ldr r2, _08121734 @ =gUnknown_8459FFC + ldr r2, _08121734 @ =sFontColorTable adds r4, r2 str r4, [sp] movs r2, 0 @@ -5784,11 +5784,11 @@ sub_8121704: @ 8121704 pop {r0} bx r0 .align 2, 0 -_08121734: .4byte gUnknown_8459FFC - thumb_func_end sub_8121704 +_08121734: .4byte sFontColorTable + thumb_func_end DisplayPartyPokemonBarDetail - thumb_func_start sub_8121738 -sub_8121738: @ 8121738 + thumb_func_start DisplayPartyPokemonNickname +DisplayPartyPokemonNickname: @ 8121738 push {r4-r7,lr} sub sp, 0x14 adds r7, r0, 0 @@ -5825,16 +5825,16 @@ _08121772: adds r3, 0x4 add r1, sp, 0x8 movs r2, 0 - bl sub_8121704 + bl DisplayPartyPokemonBarDetail _08121788: add sp, 0x14 pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8121738 + thumb_func_end DisplayPartyPokemonNickname - thumb_func_start sub_8121790 -sub_8121790: @ 8121790 + thumb_func_start DisplayPartyPokemonLevelCheck +DisplayPartyPokemonLevelCheck: @ 8121790 push {r4-r7,lr} mov r7, r8 push {r7} @@ -5849,7 +5849,7 @@ sub_8121790: @ 8121790 cmp r0, 0 beq _081217FC adds r0, r6, 0 - bl sub_81208A4 + bl GetMonAilment lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5885,7 +5885,7 @@ _081217E4: lsls r0, 24 lsrs r0, 24 adds r1, r7, 0 - bl sub_8121808 + bl DisplayPartyPokemonLevel _081217FC: add sp, 0x8 pop {r3} @@ -5893,10 +5893,10 @@ _081217FC: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8121790 + thumb_func_end DisplayPartyPokemonLevelCheck - thumb_func_start sub_8121808 -sub_8121808: @ 8121808 + thumb_func_start DisplayPartyPokemonLevel +DisplayPartyPokemonLevel: @ 8121808 push {r4-r6,lr} adds r2, r0, 0 adds r6, r1, 0 @@ -5920,7 +5920,7 @@ sub_8121808: @ 8121808 adds r3, 0x8 adds r1, r4, 0 movs r2, 0 - bl sub_8121704 + bl DisplayPartyPokemonBarDetail pop {r4-r6} pop {r0} bx r0 @@ -5928,10 +5928,10 @@ sub_8121808: @ 8121808 _08121848: .4byte gStringVar2 _0812184C: .4byte gStringVar1 _08121850: .4byte gText_Lv - thumb_func_end sub_8121808 + thumb_func_end DisplayPartyPokemonLevel - thumb_func_start sub_8121854 -sub_8121854: @ 8121854 + thumb_func_start DisplayPartyPokemonGenderNidoranCheck +DisplayPartyPokemonGenderNidoranCheck: @ 8121854 push {r4-r7,lr} sub sp, 0x14 adds r6, r0, 0 @@ -5974,15 +5974,15 @@ _08121886: adds r0, r4, 0 add r2, sp, 0x8 adds r3, r7, 0 - bl sub_81218BC + bl DisplayPartyPokemonGender add sp, 0x14 pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8121854 + thumb_func_end DisplayPartyPokemonGenderNidoranCheck - thumb_func_start sub_81218BC -sub_81218BC: @ 81218BC + thumb_func_start DisplayPartyPokemonGender +DisplayPartyPokemonGender: @ 81218BC push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -6026,52 +6026,52 @@ _08121900: .align 2, 0 _0812190C: .4byte gSpeciesNames _08121910: - ldr r5, _08121944 @ =gUnknown_845A2B8 + ldr r5, _08121944 @ =sGenderMalePalIds ldrb r0, [r5] - bl sub_8121248 - ldr r4, _08121948 @ =gUnknown_845A2AE + bl GetPartyMenuPalBufferPtr + ldr r4, _08121948 @ =sGenderPalOffsets ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r7, 0x8] - ldr r1, _0812194C @ =gUnknown_841621F + ldr r1, _0812194C @ =gText_MaleSymbol ldr r3, [r7] adds r3, 0xC movs r2, 0x2 - bl sub_8121704 + bl DisplayPartyPokemonBarDetail b _08121982 .align 2, 0 -_08121944: .4byte gUnknown_845A2B8 -_08121948: .4byte gUnknown_845A2AE -_0812194C: .4byte gUnknown_841621F +_08121944: .4byte sGenderMalePalIds +_08121948: .4byte sGenderPalOffsets +_0812194C: .4byte gText_MaleSymbol _08121950: - ldr r5, _08121990 @ =gUnknown_845A2BA + ldr r5, _08121990 @ =sGenderFemalePalIds ldrb r0, [r5] - bl sub_8121248 - ldr r4, _08121994 @ =gUnknown_845A2AE + bl GetPartyMenuPalBufferPtr + ldr r4, _08121994 @ =sGenderPalOffsets ldrb r1, [r4] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r6 movs r2, 0x2 bl LoadPalette ldrb r0, [r7, 0x8] - ldr r1, _08121998 @ =gUnknown_8416221 + ldr r1, _08121998 @ =gText_FemaleSymbol ldr r3, [r7] adds r3, 0xC movs r2, 0x2 - bl sub_8121704 + bl DisplayPartyPokemonBarDetail _08121982: pop {r3,r4} mov r8, r3 @@ -6080,13 +6080,13 @@ _08121982: pop {r0} bx r0 .align 2, 0 -_08121990: .4byte gUnknown_845A2BA -_08121994: .4byte gUnknown_845A2AE -_08121998: .4byte gUnknown_8416221 - thumb_func_end sub_81218BC +_08121990: .4byte sGenderFemalePalIds +_08121994: .4byte sGenderPalOffsets +_08121998: .4byte gText_FemaleSymbol + thumb_func_end DisplayPartyPokemonGender - thumb_func_start sub_812199C -sub_812199C: @ 812199C + thumb_func_start DisplayPartyPokemonHPCheck +DisplayPartyPokemonHPCheck: @ 812199C push {r4-r7,lr} mov r7, r8 push {r7} @@ -6128,7 +6128,7 @@ _081219DE: lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 - bl sub_8121A04 + bl DisplayPartyPokemonHP _081219F6: add sp, 0x8 pop {r3} @@ -6136,10 +6136,10 @@ _081219F6: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_812199C + thumb_func_end DisplayPartyPokemonHPCheck - thumb_func_start sub_8121A04 -sub_8121A04: @ 8121A04 + thumb_func_start DisplayPartyPokemonHP +DisplayPartyPokemonHP: @ 8121A04 push {r4,r5,lr} adds r2, r0, 0 adds r4, r1, 0 @@ -6160,16 +6160,16 @@ sub_8121A04: @ 8121A04 adds r3, 0x10 adds r1, r5, 0 movs r2, 0 - bl sub_8121704 + bl DisplayPartyPokemonBarDetail pop {r4,r5} pop {r0} bx r0 .align 2, 0 _08121A38: .4byte gStringVar1 - thumb_func_end sub_8121A04 + thumb_func_end DisplayPartyPokemonHP - thumb_func_start sub_8121A3C -sub_8121A3C: @ 8121A3C + thumb_func_start DisplayPartyPokemonMaxHPCheck +DisplayPartyPokemonMaxHPCheck: @ 8121A3C push {r4-r7,lr} mov r7, r8 push {r7} @@ -6212,7 +6212,7 @@ _08121A80: lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 - bl sub_8121AA4 + bl DisplayPartyPokemonMaxHP _08121A98: add sp, 0x8 pop {r3} @@ -6220,10 +6220,10 @@ _08121A98: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8121A3C + thumb_func_end DisplayPartyPokemonMaxHPCheck - thumb_func_start sub_8121AA4 -sub_8121AA4: @ 8121AA4 + thumb_func_start DisplayPartyPokemonMaxHP +DisplayPartyPokemonMaxHP: @ 8121AA4 push {r4-r6,lr} adds r2, r0, 0 adds r6, r1, 0 @@ -6236,7 +6236,7 @@ sub_8121AA4: @ 8121AA4 movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r4, _08121AE8 @ =gStringVar1 - ldr r1, _08121AEC @ =gUnknown_841620C + ldr r1, _08121AEC @ =gText_Slash adds r0, r4, 0 bl StringCopy adds r0, r4, 0 @@ -6247,18 +6247,18 @@ sub_8121AA4: @ 8121AA4 adds r3, 0x14 adds r1, r4, 0 movs r2, 0 - bl sub_8121704 + bl DisplayPartyPokemonBarDetail pop {r4-r6} pop {r0} bx r0 .align 2, 0 _08121AE4: .4byte gStringVar2 _08121AE8: .4byte gStringVar1 -_08121AEC: .4byte gUnknown_841620C - thumb_func_end sub_8121AA4 +_08121AEC: .4byte gText_Slash + thumb_func_end DisplayPartyPokemonMaxHP - thumb_func_start sub_8121AF0 -sub_8121AF0: @ 8121AF0 + thumb_func_start DisplayPartyPokemonHPBarCheck +DisplayPartyPokemonHPBarCheck: @ 8121AF0 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 @@ -6280,15 +6280,15 @@ sub_8121AF0: @ 8121AF0 lsrs r1, 16 adds r0, r4, 0 adds r2, r6, 0 - bl sub_8121B2C + bl DisplayPartyPokemonHPBar _08121B24: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8121AF0 + thumb_func_end DisplayPartyPokemonHPBarCheck - thumb_func_start sub_8121B2C -sub_8121B2C: @ 8121B2C + thumb_func_start DisplayPartyPokemonHPBar +DisplayPartyPokemonHPBar: @ 8121B2C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -6329,14 +6329,14 @@ _08121B78: ldr r5, _08121BA0 @ =gUnknown_845A2BE _08121B7A: ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _08121BA4 @ =gUnknown_845A2B0 ldrb r1, [r4] adds r1, r7 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r7 movs r2, 0x2 @@ -6348,14 +6348,14 @@ _08121BA4: .4byte gUnknown_845A2B0 _08121BA8: ldr r5, _08121C68 @ =gUnknown_845A2C0 ldrb r0, [r5] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldr r4, _08121C6C @ =gUnknown_845A2B0 ldrb r1, [r4] adds r1, r7 movs r2, 0x2 bl LoadPalette ldrb r0, [r5, 0x1] - bl sub_8121248 + bl GetPartyMenuPalBufferPtr ldrb r1, [r4, 0x1] adds r1, r7 movs r2, 0x2 @@ -6436,10 +6436,10 @@ _08121C50: .align 2, 0 _08121C68: .4byte gUnknown_845A2C0 _08121C6C: .4byte gUnknown_845A2B0 - thumb_func_end sub_8121B2C + thumb_func_end DisplayPartyPokemonHPBar - thumb_func_start sub_8121C70 -sub_8121C70: @ 8121C70 + thumb_func_start DisplayPartyPokemonDescriptionText +DisplayPartyPokemonDescriptionText: @ 8121C70 push {r4-r7,lr} mov r7, r8 push {r7} @@ -6475,11 +6475,11 @@ _08121CAA: ldr r1, [r6] ldrb r2, [r1, 0x1C] ldrb r3, [r1, 0x1D] - ldr r1, _08121CDC @ =gUnknown_8459FFC + ldr r1, _08121CDC @ =sFontColorTable str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r4, _08121CE0 @ =gUnknown_845A354 + ldr r4, _08121CE0 @ =sDescriptionStringTable mov r5, r8 lsls r1, r5, 2 adds r1, r4 @@ -6495,12 +6495,12 @@ _08121CD0: pop {r0} bx r0 .align 2, 0 -_08121CDC: .4byte gUnknown_8459FFC -_08121CE0: .4byte gUnknown_845A354 - thumb_func_end sub_8121C70 +_08121CDC: .4byte sFontColorTable +_08121CE0: .4byte sDescriptionStringTable + thumb_func_end DisplayPartyPokemonDescriptionText - thumb_func_start sub_8121CE4 -sub_8121CE4: @ 8121CE4 + thumb_func_start PartyMenuRemoveWindow +PartyMenuRemoveWindow: @ 8121CE4 push {r4,lr} adds r4, r0, 0 ldrb r0, [r4] @@ -6518,14 +6518,14 @@ _08121D04: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8121CE4 + thumb_func_end PartyMenuRemoveWindow - thumb_func_start sub_8121D0C -sub_8121D0C: @ 8121D0C + thumb_func_start DisplayPartyMenuStdMessage +DisplayPartyMenuStdMessage: @ 8121D0C push {r4-r6,lr} sub sp, 0xC adds r6, r0, 0 - ldr r0, _08121D3C @ =gUnknown_203B09C + ldr r0, _08121D3C @ =sPartyMenuInternal ldr r4, [r0] adds r5, r4, 0 adds r5, 0xD @@ -6533,7 +6533,7 @@ sub_8121D0C: @ 8121D0C cmp r0, 0xFF beq _08121D26 adds r0, r5, 0 - bl sub_8121CE4 + bl PartyMenuRemoveWindow _08121D26: cmp r6, 0x7F beq _08121DE8 @@ -6547,7 +6547,7 @@ _08121D26: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08121D3C: .4byte gUnknown_203B09C +_08121D3C: .4byte sPartyMenuInternal _08121D40: .4byte _08121D44 .align 2, 0 _08121D44: @@ -6586,7 +6586,7 @@ _08121D80: _08121D88: cmp r6, 0 bne _08121DB0 - ldr r0, _08121DA0 @ =gUnknown_203B09C + ldr r0, _08121DA0 @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -6596,9 +6596,9 @@ _08121D88: b _08121DB0 .align 2, 0 _08121D9C: .4byte gUnknown_845A120 -_08121DA0: .4byte gUnknown_203B09C +_08121DA0: .4byte sPartyMenuInternal _08121DA4: - bl sub_8121DF8 + bl ShouldUseChooseMonText lsls r0, 24 cmp r0, 0 bne _08121DB0 @@ -6610,7 +6610,7 @@ _08121DB0: movs r3, 0xF bl DrawStdFrameWithCustomTileAndPalette ldr r4, _08121DF0 @ =gStringVar4 - ldr r1, _08121DF4 @ =gUnknown_845A2E8 + ldr r1, _08121DF4 @ =sActionStringTable lsls r0, r6, 2 adds r0, r1 ldr r1, [r0] @@ -6635,15 +6635,15 @@ _08121DE8: bx r0 .align 2, 0 _08121DF0: .4byte gStringVar4 -_08121DF4: .4byte gUnknown_845A2E8 - thumb_func_end sub_8121D0C +_08121DF4: .4byte sActionStringTable + thumb_func_end DisplayPartyMenuStdMessage - thumb_func_start sub_8121DF8 -sub_8121DF8: @ 8121DF8 + thumb_func_start ShouldUseChooseMonText +ShouldUseChooseMonText: @ 8121DF8 push {r4-r7,lr} ldr r7, _08121E0C @ =gPlayerParty movs r6, 0 - ldr r0, _08121E10 @ =gUnknown_203B0A0 + ldr r0, _08121E10 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x1 bne _08121E14 @@ -6652,7 +6652,7 @@ _08121E06: b _08121E56 .align 2, 0 _08121E0C: .4byte gPlayerParty -_08121E10: .4byte gUnknown_203B0A0 +_08121E10: .4byte gPartyMenu _08121E14: movs r5, 0 _08121E16: @@ -6691,10 +6691,10 @@ _08121E56: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8121DF8 + thumb_func_end ShouldUseChooseMonText - thumb_func_start sub_8121E5C -sub_8121E5C: @ 8121E5C + thumb_func_start DisplaySelectionWindow +DisplaySelectionWindow: @ 8121E5C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -6714,7 +6714,7 @@ _08121E78: beq _08121EC4 b _08121ECC _08121E7E: - ldr r0, _08121EB4 @ =gUnknown_203B09C + ldr r0, _08121EB4 @ =sPartyMenuInternal ldr r1, [r0] ldrb r0, [r1, 0x17] lsls r0, 1 @@ -6740,20 +6740,20 @@ _08121E7E: ldr r1, [sp, 0x18] b _08121ED2 .align 2, 0 -_08121EB4: .4byte gUnknown_203B09C +_08121EB4: .4byte sPartyMenuInternal _08121EB8: .4byte 0x000002bf _08121EBC: - ldr r0, _08121EC0 @ =gUnknown_845A148 + ldr r0, _08121EC0 @ =sItemGiveTakeWindowTemplate b _08121ECE .align 2, 0 -_08121EC0: .4byte gUnknown_845A148 +_08121EC0: .4byte sItemGiveTakeWindowTemplate _08121EC4: - ldr r0, _08121EC8 @ =gUnknown_845A150 + ldr r0, _08121EC8 @ =sMailReadTakeWindowTemplate b _08121ECE .align 2, 0 -_08121EC8: .4byte gUnknown_845A150 +_08121EC8: .4byte sMailReadTakeWindowTemplate _08121ECC: - ldr r0, _08121EF8 @ =gUnknown_845A158 + ldr r0, _08121EF8 @ =sMoveSelectWindowTemplate _08121ECE: ldr r1, [r0, 0x4] ldr r0, [r0] @@ -6762,7 +6762,7 @@ _08121ED2: str r1, [sp, 0x20] add r0, sp, 0x1C bl AddWindow - ldr r6, _08121EFC @ =gUnknown_203B09C + ldr r6, _08121EFC @ =sPartyMenuInternal ldr r1, [r6] strb r0, [r1, 0xC] ldr r0, [r6] @@ -6776,8 +6776,8 @@ _08121ED2: ldr r0, [r6] b _08121FA2 .align 2, 0 -_08121EF8: .4byte gUnknown_845A158 -_08121EFC: .4byte gUnknown_203B09C +_08121EF8: .4byte sMoveSelectWindowTemplate +_08121EFC: .4byte sPartyMenuInternal _08121F00: movs r0, 0x2 movs r1, 0 @@ -6819,11 +6819,11 @@ _08121F3C: str r6, [sp, 0x4] lsls r1, r2, 1 adds r1, r2 - ldr r2, _08121FB4 @ =gUnknown_8459FFC + ldr r2, _08121FB4 @ =sFontColorTable adds r1, r2 str r1, [sp, 0x8] str r6, [sp, 0xC] - ldr r2, _08121FB8 @ =gUnknown_845A618 + ldr r2, _08121FB8 @ =sCursorOptions ldrb r1, [r4] lsls r1, 3 adds r1, r2 @@ -6840,7 +6840,7 @@ _08121F3C: cmp r5, r0 bcc _08121F2A _08121F7A: - ldr r4, _08121FBC @ =gUnknown_203B09C + ldr r4, _08121FBC @ =sPartyMenuInternal ldr r2, [r4] ldrb r0, [r2, 0xC] movs r1, 0x10 @@ -6868,13 +6868,13 @@ _08121FA2: pop {r1} bx r1 .align 2, 0 -_08121FB4: .4byte gUnknown_8459FFC -_08121FB8: .4byte gUnknown_845A618 -_08121FBC: .4byte gUnknown_203B09C - thumb_func_end sub_8121E5C +_08121FB4: .4byte sFontColorTable +_08121FB8: .4byte sCursorOptions +_08121FBC: .4byte sPartyMenuInternal + thumb_func_end DisplaySelectionWindow - thumb_func_start sub_8121FC0 -sub_8121FC0: @ 8121FC0 + thumb_func_start PartyMenuPrintText +PartyMenuPrintText: @ 8121FC0 push {r4,lr} sub sp, 0x10 adds r4, r0, 0 @@ -6910,13 +6910,13 @@ sub_8121FC0: @ 8121FC0 bx r0 .align 2, 0 _08122008: .4byte gTextFlags - thumb_func_end sub_8121FC0 + thumb_func_end PartyMenuPrintText - thumb_func_start sub_812200C -sub_812200C: @ 812200C + thumb_func_start PartyMenuDisplayYesNoMenu +PartyMenuDisplayYesNoMenu: @ 812200C push {lr} sub sp, 0xC - ldr r0, _08122030 @ =gUnknown_845A160 + ldr r0, _08122030 @ =sPartyMenuYesNoWindowTemplate movs r1, 0x4F str r1, [sp] movs r1, 0xD @@ -6931,15 +6931,15 @@ sub_812200C: @ 812200C pop {r0} bx r0 .align 2, 0 -_08122030: .4byte gUnknown_845A160 - thumb_func_end sub_812200C +_08122030: .4byte sPartyMenuYesNoWindowTemplate + thumb_func_end PartyMenuDisplayYesNoMenu - thumb_func_start sub_8122034 -sub_8122034: @ 8122034 + thumb_func_start CreateLevelUpStatsWindow +CreateLevelUpStatsWindow: @ 8122034 push {r4,lr} - ldr r0, _0812205C @ =gUnknown_845A168 + ldr r0, _0812205C @ =sLevelUpStatsWindowTemplate bl AddWindow - ldr r4, _08122060 @ =gUnknown_203B09C + ldr r4, _08122060 @ =sPartyMenuInternal ldr r1, [r4] strb r0, [r1, 0xC] ldr r0, [r4] @@ -6954,26 +6954,26 @@ sub_8122034: @ 8122034 pop {r1} bx r1 .align 2, 0 -_0812205C: .4byte gUnknown_845A168 -_08122060: .4byte gUnknown_203B09C - thumb_func_end sub_8122034 +_0812205C: .4byte sLevelUpStatsWindowTemplate +_08122060: .4byte sPartyMenuInternal + thumb_func_end CreateLevelUpStatsWindow - thumb_func_start sub_8122064 -sub_8122064: @ 8122064 + thumb_func_start RemoveLevelUpStatsWindow +RemoveLevelUpStatsWindow: @ 8122064 push {r4,lr} - ldr r4, _08122080 @ =gUnknown_203B09C + ldr r4, _08122080 @ =sPartyMenuInternal ldr r0, [r4] ldrb r0, [r0, 0xC] bl ClearWindowTilemap ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow pop {r4} pop {r0} bx r0 .align 2, 0 -_08122080: .4byte gUnknown_203B09C - thumb_func_end sub_8122064 +_08122080: .4byte sPartyMenuInternal + thumb_func_end RemoveLevelUpStatsWindow thumb_func_start sub_8122084 sub_8122084: @ 8122084 @@ -7071,7 +7071,7 @@ sub_8122138: @ 8122138 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, _08122168 @ =gUnknown_203B09C + ldr r0, _08122168 @ =sPartyMenuInternal ldr r4, [r0] cmp r5, 0x11 bhi _0812216C @@ -7087,7 +7087,7 @@ sub_8122138: @ 8122138 bl ScheduleBgCopyTilemapToVram b _081221C0 .align 2, 0 -_08122168: .4byte gUnknown_203B09C +_08122168: .4byte sPartyMenuInternal _0812216C: ldrb r0, [r4, 0xE] cmp r0, 0xFF @@ -7137,8 +7137,8 @@ _081221CC: .4byte gUnknown_845A00B _081221D0: .4byte gUnknown_845A37C thumb_func_end sub_8122138 - thumb_func_start party_menu_icon_anim -party_menu_icon_anim: @ 81221D4 + thumb_func_start CreatePartyMonIconSprite +CreatePartyMonIconSprite: @ 81221D4 push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 @@ -7158,7 +7158,7 @@ party_menu_icon_anim: @ 81221D4 ands r0, r1 cmp r0, 0 beq _0812220A - ldr r0, _08122248 @ =gUnknown_845A59C + ldr r0, _08122248 @ =sMultiBattlePartnersPartyMask adds r0, r4, r0 ldrb r1, [r0] eors r1, r6 @@ -7180,10 +7180,10 @@ _0812220A: adds r0, r4, 0 adds r2, r7, 0 movs r3, 0x1 - bl party_menu_link_mon_icon_anim + bl CreatePartyMonIconSpriteParameterized ldrb r0, [r7, 0x9] adds r1, r5, 0 - bl sub_8122358 + bl UpdatePartyMonHPBar add sp, 0x4 pop {r4-r7} pop {r0} @@ -7191,11 +7191,11 @@ _0812220A: .align 2, 0 _08122240: .4byte gMain _08122244: .4byte 0x00000439 -_08122248: .4byte gUnknown_845A59C - thumb_func_end party_menu_icon_anim +_08122248: .4byte sMultiBattlePartnersPartyMask + thumb_func_end CreatePartyMonIconSprite - thumb_func_start party_menu_link_mon_icon_anim -party_menu_link_mon_icon_anim: @ 812224C + thumb_func_start CreatePartyMonIconSpriteParameterized +CreatePartyMonIconSpriteParameterized: @ 812224C push {r4-r7,lr} sub sp, 0xC adds r6, r1, 0 @@ -7242,10 +7242,10 @@ _0812229A: .align 2, 0 _081222A4: .4byte SpriteCB_MonIcon _081222A8: .4byte gSprites - thumb_func_end party_menu_link_mon_icon_anim + thumb_func_end CreatePartyMonIconSpriteParameterized - thumb_func_start sub_81222AC -sub_81222AC: @ 81222AC + thumb_func_start UpdateHPBar +UpdateHPBar: @ 81222AC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -7327,10 +7327,10 @@ _0812234C: bx r0 .align 2, 0 _08122354: .4byte gSprites - thumb_func_end sub_81222AC + thumb_func_end UpdateHPBar - thumb_func_start sub_8122358 -sub_8122358: @ 8122358 + thumb_func_start UpdatePartyMonHPBar +UpdatePartyMonHPBar: @ 8122358 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 @@ -7350,14 +7350,14 @@ sub_8122358: @ 8122358 lsrs r2, 16 adds r0, r5, 0 adds r1, r4, 0 - bl sub_81222AC + bl UpdateHPBar pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8122358 + thumb_func_end UpdatePartyMonHPBar - thumb_func_start sub_812238C -sub_812238C: @ 812238C + thumb_func_start AnimateSelectedPartyIcon +AnimateSelectedPartyIcon: @ 812238C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -7395,29 +7395,29 @@ _081223CA: mov r1, r12 adds r1, 0x1C adds r0, r1 - ldr r1, _081223E0 @ =sub_8122428 + ldr r1, _081223E0 @ =SpriteCB_UpdatePartyMonIcon b _081223F0 .align 2, 0 _081223DC: .4byte 0x0000fffc -_081223E0: .4byte sub_8122428 +_081223E0: .4byte SpriteCB_UpdatePartyMonIcon _081223E4: strh r3, [r2, 0x24] strh r3, [r2, 0x26] adds r0, r5, 0 adds r0, 0x1C adds r0, r6, r0 - ldr r1, _081223F8 @ =sub_81223FC + ldr r1, _081223F8 @ =SpriteCB_BouncePartyMonIcon _081223F0: str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081223F8: .4byte sub_81223FC - thumb_func_end sub_812238C +_081223F8: .4byte SpriteCB_BouncePartyMonIcon + thumb_func_end AnimateSelectedPartyIcon - thumb_func_start sub_81223FC -sub_81223FC: @ 81223FC + thumb_func_start SpriteCB_BouncePartyMonIcon +SpriteCB_BouncePartyMonIcon: @ 81223FC push {r4,lr} adds r4, r0, 0 bl UpdateMonIconFrame @@ -7440,18 +7440,18 @@ _08122422: pop {r4} pop {r0} bx r0 - thumb_func_end sub_81223FC + thumb_func_end SpriteCB_BouncePartyMonIcon - thumb_func_start sub_8122428 -sub_8122428: @ 8122428 + thumb_func_start SpriteCB_UpdatePartyMonIcon +SpriteCB_UpdatePartyMonIcon: @ 8122428 push {lr} bl UpdateMonIconFrame pop {r0} bx r0 - thumb_func_end sub_8122428 + thumb_func_end SpriteCB_UpdatePartyMonIcon - thumb_func_start party_menu_held_item_object -party_menu_held_item_object: @ 8122434 + thumb_func_start CreatePartyMonHeldItemSprite +CreatePartyMonHeldItemSprite: @ 8122434 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -7459,7 +7459,7 @@ party_menu_held_item_object: @ 8122434 bl GetMonData cmp r0, 0 beq _0812245C - ldr r0, _08122464 @ =gUnknown_845A43C + ldr r0, _08122464 @ =sSpriteTemplate_HeldItem ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] @@ -7468,17 +7468,17 @@ party_menu_held_item_object: @ 8122434 strb r0, [r4, 0xA] adds r0, r5, 0 adds r1, r4, 0 - bl sub_81224B4 + bl UpdatePartyMonHeldItemSprite _0812245C: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08122464: .4byte gUnknown_845A43C - thumb_func_end party_menu_held_item_object +_08122464: .4byte sSpriteTemplate_HeldItem + thumb_func_end CreatePartyMonHeldItemSprite - thumb_func_start party_menu_link_mon_held_item_object -party_menu_link_mon_held_item_object: @ 8122468 + thumb_func_start CreatePartyMonHeldItemSpriteParameterized +CreatePartyMonHeldItemSpriteParameterized: @ 8122468 push {r4,r5,lr} adds r4, r2, 0 lsls r0, 16 @@ -7486,7 +7486,7 @@ party_menu_link_mon_held_item_object: @ 8122468 lsrs r5, r1, 16 cmp r0, 0 beq _081224A4 - ldr r0, _081224AC @ =gUnknown_845A43C + ldr r0, _081224AC @ =sSpriteTemplate_HeldItem ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] @@ -7506,18 +7506,18 @@ party_menu_link_mon_held_item_object: @ 8122468 strb r0, [r1, 0x5] adds r0, r5, 0 adds r1, r4, 0 - bl sub_81224D0 + bl ShowOrHideHeldItemSprite _081224A4: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081224AC: .4byte gUnknown_845A43C +_081224AC: .4byte sSpriteTemplate_HeldItem _081224B0: .4byte gSprites - thumb_func_end party_menu_link_mon_held_item_object + thumb_func_end CreatePartyMonHeldItemSpriteParameterized - thumb_func_start sub_81224B4 -sub_81224B4: @ 81224B4 + thumb_func_start UpdatePartyMonHeldItemSprite +UpdatePartyMonHeldItemSprite: @ 81224B4 push {r4,lr} adds r4, r1, 0 movs r1, 0xC @@ -7525,14 +7525,14 @@ sub_81224B4: @ 81224B4 lsls r0, 16 lsrs r0, 16 adds r1, r4, 0 - bl sub_81224D0 + bl ShowOrHideHeldItemSprite pop {r4} pop {r0} bx r0 - thumb_func_end sub_81224B4 + thumb_func_end UpdatePartyMonHeldItemSprite - thumb_func_start sub_81224D0 -sub_81224D0: @ 81224D0 + thumb_func_start ShowOrHideHeldItemSprite +ShowOrHideHeldItemSprite: @ 81224D0 push {r4,lr} adds r4, r1, 0 lsls r0, 16 @@ -7596,24 +7596,24 @@ _08122544: bx r0 .align 2, 0 _0812254C: .4byte gSprites - thumb_func_end sub_81224D0 + thumb_func_end ShowOrHideHeldItemSprite thumb_func_start LoadHeldItemIcons LoadHeldItemIcons: @ 8122550 push {lr} - ldr r0, _08122564 @ =gUnknown_845A42C + ldr r0, _08122564 @ =sSpriteSheet_HeldItem bl LoadSpriteSheet - ldr r0, _08122568 @ =gUnknown_845A434 + ldr r0, _08122568 @ =sSpritePalette_HeldItem bl LoadSpritePalette pop {r0} bx r0 .align 2, 0 -_08122564: .4byte gUnknown_845A42C -_08122568: .4byte gUnknown_845A434 +_08122564: .4byte sSpriteSheet_HeldItem +_08122568: .4byte sSpritePalette_HeldItem thumb_func_end LoadHeldItemIcons - thumb_func_start sub_812256C -sub_812256C: @ 812256C + thumb_func_start DrawHeldItemIconsForTrade +DrawHeldItemIconsForTrade: @ 812256C push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 @@ -7648,7 +7648,7 @@ _08122588: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_8122610 + bl CreateHeldItemSpriteForTrade _081225B4: adds r0, r5, 0x1 lsls r0, 16 @@ -7681,7 +7681,7 @@ _081225CC: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_8122610 + bl CreateHeldItemSpriteForTrade _081225F8: adds r0, r5, 0x1 lsls r0, 16 @@ -7696,10 +7696,10 @@ _08122604: bx r0 .align 2, 0 _0812260C: .4byte gEnemyParty - thumb_func_end sub_812256C + thumb_func_end DrawHeldItemIconsForTrade - thumb_func_start sub_8122610 -sub_8122610: @ 8122610 + thumb_func_start CreateHeldItemSpriteForTrade +CreateHeldItemSpriteForTrade: @ 8122610 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -7720,7 +7720,7 @@ sub_8122610: @ 8122610 add r0, r8 adds r0, 0x43 ldrb r3, [r0] - ldr r0, _0812268C @ =gUnknown_845A43C + ldr r0, _0812268C @ =sSpriteTemplate_HeldItem subs r3, 0x1 lsls r3, 24 lsrs r3, 24 @@ -7741,7 +7741,7 @@ sub_8122610: @ 8122610 movs r0, 0x1C add r8, r0 add r4, r8 - ldr r0, _08122690 @ =sub_8122694 + ldr r0, _08122690 @ =SpriteCB_HeldItem str r0, [r4] strh r6, [r5, 0x3C] adds r0, r5, 0 @@ -7758,12 +7758,12 @@ sub_8122610: @ 8122610 bx r0 .align 2, 0 _08122688: .4byte gSprites -_0812268C: .4byte gUnknown_845A43C -_08122690: .4byte sub_8122694 - thumb_func_end sub_8122610 +_0812268C: .4byte sSpriteTemplate_HeldItem +_08122690: .4byte SpriteCB_HeldItem + thumb_func_end CreateHeldItemSpriteForTrade - thumb_func_start sub_8122694 -sub_8122694: @ 8122694 + thumb_func_start SpriteCB_HeldItem +SpriteCB_HeldItem: @ 8122694 push {r4,lr} adds r4, r0, 0 ldrh r1, [r4, 0x3C] @@ -7809,17 +7809,17 @@ _081226E6: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8122694 + thumb_func_end SpriteCB_HeldItem - thumb_func_start party_menu_pokeball_object -party_menu_pokeball_object: @ 81226EC + thumb_func_start CreatePartyMonPokeballSprite +CreatePartyMonPokeballSprite: @ 81226EC push {r4,lr} adds r4, r1, 0 movs r1, 0xB bl GetMonData cmp r0, 0 beq _0812270A - ldr r0, _08122710 @ =gUnknown_845A484 + ldr r0, _08122710 @ =sSpriteTemplate_MenuPokeball ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] @@ -7831,17 +7831,17 @@ _0812270A: pop {r0} bx r0 .align 2, 0 -_08122710: .4byte gUnknown_845A484 - thumb_func_end party_menu_pokeball_object +_08122710: .4byte sSpriteTemplate_MenuPokeball + thumb_func_end CreatePartyMonPokeballSprite - thumb_func_start party_menu_link_mon_pokeball_object -party_menu_link_mon_pokeball_object: @ 8122714 + thumb_func_start CreatePartyMonPokeballSpriteParameterized +CreatePartyMonPokeballSpriteParameterized: @ 8122714 push {r4,lr} adds r4, r1, 0 lsls r0, 16 cmp r0, 0 beq _08122744 - ldr r0, _0812274C @ =gUnknown_845A484 + ldr r0, _0812274C @ =sSpriteTemplate_MenuPokeball ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] @@ -7864,12 +7864,12 @@ _08122744: pop {r0} bx r0 .align 2, 0 -_0812274C: .4byte gUnknown_845A484 +_0812274C: .4byte sSpriteTemplate_MenuPokeball _08122750: .4byte gSprites - thumb_func_end party_menu_link_mon_pokeball_object + thumb_func_end CreatePartyMonPokeballSpriteParameterized - thumb_func_start sub_8122754 -sub_8122754: @ 8122754 + thumb_func_start CreatePokeballButtonSprite +CreatePokeballButtonSprite: @ 8122754 push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -7877,7 +7877,7 @@ sub_8122754: @ 8122754 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _0812278C @ =gUnknown_845A484 + ldr r0, _0812278C @ =sSpriteTemplate_MenuPokeball adds r1, r3, 0 movs r3, 0x8 bl CreateSprite @@ -7898,12 +7898,12 @@ sub_8122754: @ 8122754 pop {r1} bx r1 .align 2, 0 -_0812278C: .4byte gUnknown_845A484 +_0812278C: .4byte sSpriteTemplate_MenuPokeball _08122790: .4byte gSprites - thumb_func_end sub_8122754 + thumb_func_end CreatePokeballButtonSprite - thumb_func_start sub_8122794 -sub_8122794: @ 8122794 + thumb_func_start CreateSmallPokeballButtonSprite +CreateSmallPokeballButtonSprite: @ 8122794 push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -7911,7 +7911,7 @@ sub_8122794: @ 8122794 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _081227B4 @ =gUnknown_845A4F4 + ldr r0, _081227B4 @ =sSpriteTemplate_MenuPokeballSmall adds r1, r3, 0 movs r3, 0x8 bl CreateSprite @@ -7920,11 +7920,11 @@ sub_8122794: @ 8122794 pop {r1} bx r1 .align 2, 0 -_081227B4: .4byte gUnknown_845A4F4 - thumb_func_end sub_8122794 +_081227B4: .4byte sSpriteTemplate_MenuPokeballSmall + thumb_func_end CreateSmallPokeballButtonSprite - thumb_func_start sub_81227B8 -sub_81227B8: @ 81227B8 + thumb_func_start PartyMenuStartSpriteAnim +PartyMenuStartSpriteAnim: @ 81227B8 push {lr} adds r2, r0, 0 lsls r2, 24 @@ -7941,10 +7941,10 @@ sub_81227B8: @ 81227B8 bx r0 .align 2, 0 _081227D8: .4byte gSprites - thumb_func_end sub_81227B8 + thumb_func_end PartyMenuStartSpriteAnim - thumb_func_start sub_81227DC -sub_81227DC: @ 81227DC + thumb_func_start SpriteCB_BounceConfirmCancelButton +SpriteCB_BounceConfirmCancelButton: @ 81227DC push {r4-r7,lr} mov r7, r8 push {r7} @@ -8007,27 +8007,27 @@ _0812284C: .align 2, 0 _08122858: .4byte gSprites _0812285C: .4byte 0x0000fffc - thumb_func_end sub_81227DC + thumb_func_end SpriteCB_BounceConfirmCancelButton - thumb_func_start sub_8122860 -sub_8122860: @ 8122860 + thumb_func_start LoadPartyMenuPokeballGfx +LoadPartyMenuPokeballGfx: @ 8122860 push {lr} - ldr r0, _08122878 @ =gUnknown_845A474 + ldr r0, _08122878 @ =sSpriteSheet_MenuPokeball bl LoadCompressedSpriteSheet - ldr r0, _0812287C @ =gUnknown_845A4EC + ldr r0, _0812287C @ =sSpriteSheet_MenuPokeballSmall bl LoadCompressedSpriteSheet - ldr r0, _08122880 @ =gUnknown_845A47C + ldr r0, _08122880 @ =sSpritePalette_MenuPokeball bl LoadCompressedSpritePalette pop {r0} bx r0 .align 2, 0 -_08122878: .4byte gUnknown_845A474 -_0812287C: .4byte gUnknown_845A4EC -_08122880: .4byte gUnknown_845A47C - thumb_func_end sub_8122860 +_08122878: .4byte sSpriteSheet_MenuPokeball +_0812287C: .4byte sSpriteSheet_MenuPokeballSmall +_08122880: .4byte sSpritePalette_MenuPokeball + thumb_func_end LoadPartyMenuPokeballGfx - thumb_func_start party_menu_status_condition_object -party_menu_status_condition_object: @ 8122884 + thumb_func_start CreatePartyMonStatusSprite +CreatePartyMonStatusSprite: @ 8122884 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -8035,7 +8035,7 @@ party_menu_status_condition_object: @ 8122884 bl GetMonData cmp r0, 0 beq _081228AC - ldr r0, _081228B4 @ =gUnknown_845A584 + ldr r0, _081228B4 @ =sSpriteTemplate_StatusIcons ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] @@ -8044,17 +8044,17 @@ party_menu_status_condition_object: @ 8122884 strb r0, [r4, 0xC] adds r0, r5, 0 adds r1, r4, 0 - bl party_menu_get_status_condition_and_update_object + bl SetPartyMonAilmentGfx _081228AC: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081228B4: .4byte gUnknown_845A584 - thumb_func_end party_menu_status_condition_object +_081228B4: .4byte sSpriteTemplate_StatusIcons + thumb_func_end CreatePartyMonStatusSprite - thumb_func_start party_menu_link_mon_status_condition_object -party_menu_link_mon_status_condition_object: @ 81228B8 + thumb_func_start CreatePartyMonStatusSpriteParameterized +CreatePartyMonStatusSpriteParameterized: @ 81228B8 push {r4,r5,lr} adds r4, r2, 0 lsls r0, 16 @@ -8062,7 +8062,7 @@ party_menu_link_mon_status_condition_object: @ 81228B8 lsrs r5, r1, 24 cmp r0, 0 beq _081228F4 - ldr r0, _081228FC @ =gUnknown_845A584 + ldr r0, _081228FC @ =sSpriteTemplate_StatusIcons ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] @@ -8071,7 +8071,7 @@ party_menu_link_mon_status_condition_object: @ 81228B8 strb r0, [r4, 0xC] adds r0, r5, 0 adds r1, r4, 0 - bl party_menu_update_status_condition_object + bl UpdatePartyMonAilmentGfx ldr r2, _08122900 @ =gSprites ldrb r0, [r4, 0xC] lsls r1, r0, 4 @@ -8088,26 +8088,26 @@ _081228F4: pop {r0} bx r0 .align 2, 0 -_081228FC: .4byte gUnknown_845A584 +_081228FC: .4byte sSpriteTemplate_StatusIcons _08122900: .4byte gSprites - thumb_func_end party_menu_link_mon_status_condition_object + thumb_func_end CreatePartyMonStatusSpriteParameterized - thumb_func_start party_menu_get_status_condition_and_update_object -party_menu_get_status_condition_and_update_object: @ 8122904 + thumb_func_start SetPartyMonAilmentGfx +SetPartyMonAilmentGfx: @ 8122904 push {r4,lr} adds r4, r1, 0 - bl sub_81208A4 + bl GetMonAilment lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 - bl party_menu_update_status_condition_object + bl UpdatePartyMonAilmentGfx pop {r4} pop {r0} bx r0 - thumb_func_end party_menu_get_status_condition_and_update_object + thumb_func_end SetPartyMonAilmentGfx - thumb_func_start party_menu_update_status_condition_object -party_menu_update_status_condition_object: @ 812291C + thumb_func_start UpdatePartyMonAilmentGfx +UpdatePartyMonAilmentGfx: @ 812291C push {r4,r5,lr} adds r5, r1, 0 lsls r0, 24 @@ -8158,24 +8158,24 @@ _08122972: bx r0 .align 2, 0 _0812297C: .4byte gSprites - thumb_func_end party_menu_update_status_condition_object + thumb_func_end UpdatePartyMonAilmentGfx - thumb_func_start sub_8122980 -sub_8122980: @ 8122980 + thumb_func_start LoadPartyMenuAilmentGfx +LoadPartyMenuAilmentGfx: @ 8122980 push {lr} - ldr r0, _08122994 @ =gUnknown_845A574 + ldr r0, _08122994 @ =sSpriteSheet_StatusIcons bl LoadCompressedSpriteSheet - ldr r0, _08122998 @ =gUnknown_845A57C + ldr r0, _08122998 @ =sSpritePalette_StatusIcons bl LoadCompressedSpritePalette pop {r0} bx r0 .align 2, 0 -_08122994: .4byte gUnknown_845A574 -_08122998: .4byte gUnknown_845A57C - thumb_func_end sub_8122980 +_08122994: .4byte sSpriteSheet_StatusIcons +_08122998: .4byte sSpritePalette_StatusIcons + thumb_func_end LoadPartyMenuAilmentGfx - thumb_func_start sub_812299C -sub_812299C: @ 812299C + thumb_func_start SetPartyMonSelectionActions +SetPartyMonSelectionActions: @ 812299C push {r4,lr} lsls r1, 24 lsrs r1, 24 @@ -8183,12 +8183,12 @@ sub_812299C: @ 812299C lsrs r2, 24 cmp r2, 0 bne _081229B0 - bl sub_81229FC + bl SetPartyMonFieldSelectionActions b _081229E8 _081229B0: - ldr r4, _081229F0 @ =gUnknown_203B09C + ldr r4, _081229F0 @ =sPartyMenuInternal ldr r1, [r4] - ldr r0, _081229F4 @ =gUnknown_845A760 + ldr r0, _081229F4 @ =sPartyMenuActionCounts adds r0, r2, r0 ldrb r0, [r0] strb r0, [r1, 0x17] @@ -8197,7 +8197,7 @@ _081229B0: ldrb r0, [r0, 0x17] cmp r3, r0 bcs _081229E8 - ldr r1, _081229F8 @ =gUnknown_845A72C + ldr r1, _081229F8 @ =sPartyMenuActions lsls r0, r2, 2 adds r2, r0, r1 _081229CC: @@ -8220,13 +8220,13 @@ _081229E8: pop {r0} bx r0 .align 2, 0 -_081229F0: .4byte gUnknown_203B09C -_081229F4: .4byte gUnknown_845A760 -_081229F8: .4byte gUnknown_845A72C - thumb_func_end sub_812299C +_081229F0: .4byte sPartyMenuInternal +_081229F4: .4byte sPartyMenuActionCounts +_081229F8: .4byte sPartyMenuActions + thumb_func_end SetPartyMonSelectionActions - thumb_func_start sub_81229FC -sub_81229FC: @ 81229FC + thumb_func_start SetPartyMonFieldSelectionActions +SetPartyMonFieldSelectionActions: @ 81229FC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -8237,7 +8237,7 @@ sub_81229FC: @ 81229FC lsls r1, 24 lsrs r1, 24 mov r10, r1 - ldr r2, _08122A78 @ =gUnknown_203B09C + ldr r2, _08122A78 @ =sPartyMenuInternal ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x17] @@ -8248,7 +8248,7 @@ sub_81229FC: @ 81229FC movs r2, 0 bl AppendToList movs r7, 0 - ldr r0, _08122A7C @ =gUnknown_845A76E + ldr r0, _08122A7C @ =sFieldMoves ldrh r0, [r0] str r0, [sp] mov r0, r9 @@ -8264,7 +8264,7 @@ _08122A34: movs r0, 0x64 mov r6, r10 muls r6, r0 - ldr r5, _08122A7C @ =gUnknown_845A76E + ldr r5, _08122A7C @ =sFieldMoves _08122A48: mov r1, r9 adds r0, r1, r6 @@ -8276,7 +8276,7 @@ _08122A48: ldrh r1, [r1] cmp r0, r1 bne _08122A80 - ldr r0, _08122A78 @ =gUnknown_203B09C + ldr r0, _08122A78 @ =sPartyMenuInternal ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -8288,8 +8288,8 @@ _08122A48: bl AppendToList b _08122A90 .align 2, 0 -_08122A78: .4byte gUnknown_203B09C -_08122A7C: .4byte gUnknown_845A76E +_08122A78: .4byte sPartyMenuInternal +_08122A7C: .4byte sFieldMoves _08122A80: adds r0, r4, 0x1 lsls r0, 24 @@ -8310,7 +8310,7 @@ _08122A90: bl GetMonData cmp r0, 0 beq _08122AB6 - ldr r0, _08122AE8 @ =gUnknown_203B09C + ldr r0, _08122AE8 @ =sPartyMenuInternal ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -8331,7 +8331,7 @@ _08122AB6: lsls r0, 24 cmp r0, 0 beq _08122AEC - ldr r0, _08122AE8 @ =gUnknown_203B09C + ldr r0, _08122AE8 @ =sPartyMenuInternal ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -8340,9 +8340,9 @@ _08122AB6: bl AppendToList b _08122AFC .align 2, 0 -_08122AE8: .4byte gUnknown_203B09C +_08122AE8: .4byte sPartyMenuInternal _08122AEC: - ldr r0, _08122B1C @ =gUnknown_203B09C + ldr r0, _08122B1C @ =sPartyMenuInternal ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -8350,7 +8350,7 @@ _08122AEC: movs r2, 0x3 bl AppendToList _08122AFC: - ldr r0, _08122B1C @ =gUnknown_203B09C + ldr r0, _08122B1C @ =sPartyMenuInternal ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -8366,14 +8366,14 @@ _08122AFC: pop {r0} bx r0 .align 2, 0 -_08122B1C: .4byte gUnknown_203B09C - thumb_func_end sub_81229FC +_08122B1C: .4byte sPartyMenuInternal + thumb_func_end SetPartyMonFieldSelectionActions - thumb_func_start sub_8122B20 -sub_8122B20: @ 8122B20 + thumb_func_start GetPartyMenuActionsType +GetPartyMenuActionsType: @ 8122B20 push {lr} adds r2, r0, 0 - ldr r1, _08122B3C @ =gUnknown_203B0A0 + ldr r1, _08122B3C @ =gPartyMenu ldrb r0, [r1, 0x8] lsls r0, 28 lsrs r0, 28 @@ -8386,7 +8386,7 @@ sub_8122B20: @ 8122B20 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08122B3C: .4byte gUnknown_203B0A0 +_08122B3C: .4byte gPartyMenu _08122B40: .4byte _08122B44 .align 2, 0 _08122B44: @@ -8411,14 +8411,14 @@ _08122B70: b _08122BCC _08122B80: adds r0, r2, 0 - bl sub_8127A84 + bl GetPartyMenuActionsTypeInBattle lsls r0, 24 lsrs r1, r0, 24 b _08122BCC _08122B8C: movs r0, 0x9 ldrsb r0, [r3, r0] - bl sub_8127510 + bl GetPartySlotEntryStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -8457,12 +8457,12 @@ _08122BCC: adds r0, r1, 0 pop {r1} bx r1 - thumb_func_end sub_8122B20 + thumb_func_end GetPartyMenuActionsType - thumb_func_start sub_8122BD4 -sub_8122BD4: @ 8122BD4 + thumb_func_start CreateSelectionWindow +CreateSelectionWindow: @ 8122BD4 push {r4-r6,lr} - ldr r5, _08122C20 @ =gUnknown_203B0A0 + ldr r5, _08122C20 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r5, r1] movs r0, 0x64 @@ -8473,40 +8473,40 @@ sub_8122BD4: @ 8122BD4 ldr r1, _08122C28 @ =gStringVar1 adds r0, r4, 0 bl GetMonNickname - ldr r0, _08122C2C @ =gUnknown_203B09C + ldr r0, _08122C2C @ =sPartyMenuInternal ldr r0, [r0] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldrb r5, [r5, 0x9] adds r0, r4, 0 - bl sub_8122B20 + bl GetPartyMenuActionsType adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 adds r0, r6, 0 adds r1, r5, 0 - bl sub_812299C + bl SetPartyMonSelectionActions movs r0, 0 - bl sub_8121E5C + bl DisplaySelectionWindow movs r0, 0x16 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08122C20: .4byte gUnknown_203B0A0 +_08122C20: .4byte gPartyMenu _08122C24: .4byte gPlayerParty _08122C28: .4byte gStringVar1 -_08122C2C: .4byte gUnknown_203B09C - thumb_func_end sub_8122BD4 +_08122C2C: .4byte sPartyMenuInternal + thumb_func_end CreateSelectionWindow - thumb_func_start sub_8122C30 -sub_8122C30: @ 8122C30 + thumb_func_start Task_TryCreateSelectionWindow +Task_TryCreateSelectionWindow: @ 8122C30 push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl sub_8122BD4 + bl CreateSelectionWindow ldr r1, _08122C54 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -8514,18 +8514,18 @@ sub_8122C30: @ 8122C30 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _08122C58 @ =sub_8122C5C + ldr r1, _08122C58 @ =Task_HandleSelectionMenuInput str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 _08122C54: .4byte gTasks -_08122C58: .4byte sub_8122C5C - thumb_func_end sub_8122C30 +_08122C58: .4byte Task_HandleSelectionMenuInput + thumb_func_end Task_TryCreateSelectionWindow - thumb_func_start sub_8122C5C -sub_8122C5C: @ 8122C5C + thumb_func_start Task_HandleSelectionMenuInput +Task_HandleSelectionMenuInput: @ 8122C5C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -8545,7 +8545,7 @@ sub_8122C5C: @ 8122C5C lsls r0, 3 ldr r1, _08122C98 @ =gTasks+0x8 adds r7, r0, r1 - ldr r0, _08122C9C @ =gUnknown_203B09C + ldr r0, _08122C9C @ =sPartyMenuInternal ldr r0, [r0] ldrb r0, [r0, 0x17] cmp r0, 0x3 @@ -8555,7 +8555,7 @@ sub_8122C5C: @ 8122C5C .align 2, 0 _08122C94: .4byte gPaletteFade _08122C98: .4byte gTasks+0x8 -_08122C9C: .4byte gUnknown_203B09C +_08122C9C: .4byte sPartyMenuInternal _08122CA0: bl Menu_ProcessInput_other _08122CA4: @@ -8568,7 +8568,7 @@ _08122CA4: lsrs r0, 24 cmp r4, r0 beq _08122CCE - ldr r0, _08122D14 @ =gUnknown_203B09C + ldr r0, _08122D14 @ =sPartyMenuInternal ldr r4, [r0] bl Menu_GetCursorPos lsls r0, 24 @@ -8593,11 +8593,11 @@ _08122CCE: bne _08122D1C movs r0, 0x5 bl PlaySE - ldr r4, _08122D14 @ =gUnknown_203B09C + ldr r4, _08122D14 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xE - bl sub_8121CE4 - ldr r2, _08122D18 @ =gUnknown_845A618 + bl PartyMenuRemoveWindow + ldr r2, _08122D18 @ =sCursorOptions ldr r0, [r4] ldrb r1, [r0, 0x17] adds r0, r1 @@ -8610,14 +8610,14 @@ _08122CCE: bl _call_via_r1 b _08122D3E .align 2, 0 -_08122D14: .4byte gUnknown_203B09C -_08122D18: .4byte gUnknown_845A618 +_08122D14: .4byte sPartyMenuInternal +_08122D18: .4byte sCursorOptions _08122D1C: - ldr r4, _08122D44 @ =gUnknown_203B09C + ldr r4, _08122D44 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xE - bl sub_8121CE4 - ldr r1, _08122D48 @ =gUnknown_845A618 + bl PartyMenuRemoveWindow + ldr r1, _08122D48 @ =sCursorOptions ldr r0, [r4] adds r0, 0xF adds r0, r5 @@ -8633,43 +8633,43 @@ _08122D3E: pop {r0} bx r0 .align 2, 0 -_08122D44: .4byte gUnknown_203B09C -_08122D48: .4byte gUnknown_845A618 - thumb_func_end sub_8122C5C +_08122D44: .4byte sPartyMenuInternal +_08122D48: .4byte sCursorOptions + thumb_func_end Task_HandleSelectionMenuInput - thumb_func_start sub_8122D4C -sub_8122D4C: @ 8122D4C + thumb_func_start CursorCB_Summary +CursorCB_Summary: @ 8122D4C push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r0, _08122D70 @ =gUnknown_203B09C + ldr r0, _08122D70 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _08122D74 @ =sub_8122D78 + ldr r0, _08122D74 @ =CB2_ShowPokemonSummaryScreen str r0, [r1, 0x4] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu pop {r4} pop {r0} bx r0 .align 2, 0 -_08122D70: .4byte gUnknown_203B09C -_08122D74: .4byte sub_8122D78 - thumb_func_end sub_8122D4C +_08122D70: .4byte sPartyMenuInternal +_08122D74: .4byte CB2_ShowPokemonSummaryScreen + thumb_func_end CursorCB_Summary - thumb_func_start sub_8122D78 -sub_8122D78: @ 8122D78 + thumb_func_start CB2_ShowPokemonSummaryScreen +CB2_ShowPokemonSummaryScreen: @ 8122D78 push {r4,lr} sub sp, 0x4 - ldr r4, _08122DAC @ =gUnknown_203B0A0 + ldr r4, _08122DAC @ =gPartyMenu ldrb r1, [r4, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 bne _08122D8C - bl pokemon_change_order + bl UpdatePartyToBattleOrder _08122D8C: ldr r0, _08122DB0 @ =gPlayerParty ldrb r1, [r4, 0x9] @@ -8678,7 +8678,7 @@ _08122D8C: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _08122DB8 @ =sub_8122DBC + ldr r3, _08122DB8 @ =CB2_ReturnToPartyMenuFromSummaryScreen movs r4, 0 str r4, [sp] bl ShowPokemonSummaryScreen @@ -8687,14 +8687,14 @@ _08122D8C: pop {r0} bx r0 .align 2, 0 -_08122DAC: .4byte gUnknown_203B0A0 +_08122DAC: .4byte gPartyMenu _08122DB0: .4byte gPlayerParty _08122DB4: .4byte gPlayerPartyCount -_08122DB8: .4byte sub_8122DBC - thumb_func_end sub_8122D78 +_08122DB8: .4byte CB2_ReturnToPartyMenuFromSummaryScreen + thumb_func_end CB2_ShowPokemonSummaryScreen - thumb_func_start sub_8122DBC -sub_8122DBC: @ 8122DBC + thumb_func_start CB2_ReturnToPartyMenuFromSummaryScreen +CB2_ReturnToPartyMenuFromSummaryScreen: @ 8122DBC push {lr} sub sp, 0xC ldr r2, _08122DF4 @ =gPaletteFade @@ -8703,7 +8703,7 @@ sub_8122DBC: @ 8122DBC orrs r0, r1 strb r0, [r2, 0x8] bl sub_8138B20 - ldr r3, _08122DF8 @ =gUnknown_203B0A0 + ldr r3, _08122DF8 @ =gPartyMenu strb r0, [r3, 0x9] ldrb r0, [r3, 0x8] lsls r0, 28 @@ -8711,45 +8711,45 @@ sub_8122DBC: @ 8122DBC ldrb r2, [r3, 0xB] movs r1, 0x16 str r1, [sp] - ldr r1, _08122DFC @ =sub_8122C30 + ldr r1, _08122DFC @ =Task_TryCreateSelectionWindow str r1, [sp, 0x4] ldr r1, [r3] str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 _08122DF4: .4byte gPaletteFade -_08122DF8: .4byte gUnknown_203B0A0 -_08122DFC: .4byte sub_8122C30 - thumb_func_end sub_8122DBC +_08122DF8: .4byte gPartyMenu +_08122DFC: .4byte Task_TryCreateSelectionWindow + thumb_func_end CB2_ReturnToPartyMenuFromSummaryScreen - thumb_func_start brm_switch -brm_switch: @ 8122E00 + thumb_func_start CursorCB_Switch +CursorCB_Switch: @ 8122E00 push {r4-r6,lr} adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 movs r0, 0x5 bl PlaySE - ldr r5, _08122E4C @ =gUnknown_203B0A0 + ldr r5, _08122E4C @ =gPartyMenu movs r0, 0x8 strb r0, [r5, 0xB] - ldr r4, _08122E50 @ =gUnknown_203B09C + ldr r4, _08122E50 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow movs r0, 0x3 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldrb r0, [r5, 0x9] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot ldrb r0, [r5, 0x9] strb r0, [r5, 0xA] ldr r1, _08122E54 @ =gTasks @@ -8757,20 +8757,20 @@ brm_switch: @ 8122E00 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08122E58 @ =sub_811FB28 + ldr r1, _08122E58 @ =Task_HandleChooseMonInput str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08122E4C: .4byte gUnknown_203B0A0 -_08122E50: .4byte gUnknown_203B09C +_08122E4C: .4byte gPartyMenu +_08122E50: .4byte sPartyMenuInternal _08122E54: .4byte gTasks -_08122E58: .4byte sub_811FB28 - thumb_func_end brm_switch +_08122E58: .4byte Task_HandleChooseMonInput + thumb_func_end CursorCB_Switch - thumb_func_start sub_8122E5C -sub_8122E5C: @ 8122E5C + thumb_func_start SwitchSelectedMons +SwitchSelectedMons: @ 8122E5C push {r4-r7,lr} sub sp, 0xC lsls r0, 24 @@ -8780,7 +8780,7 @@ sub_8122E5C: @ 8122E5C lsls r0, 3 ldr r1, _08122E84 @ =gTasks+0x8 adds r6, r0, r1 - ldr r4, _08122E88 @ =gUnknown_203B0A0 + ldr r4, _08122E88 @ =gPartyMenu movs r1, 0xA ldrsb r1, [r4, r1] movs r0, 0x9 @@ -8788,17 +8788,17 @@ sub_8122E5C: @ 8122E5C cmp r1, r0 bne _08122E8C adds r0, r7, 0 - bl sub_81235E8 + bl FinishTwoMonAction b _08122FE2 .align 2, 0 _08122E84: .4byte gTasks+0x8 -_08122E88: .4byte gUnknown_203B0A0 +_08122E88: .4byte gPartyMenu _08122E8C: bl sub_812358C add r2, sp, 0x8 movs r0, 0x9 ldrsb r0, [r4, r0] - ldr r1, _08122EE8 @ =gUnknown_203B0B4 + ldr r1, _08122EE8 @ =sPartyMenuBoxes ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -8835,17 +8835,17 @@ _08122E8C: adds r0, r2, 0 b _08122EEE .align 2, 0 -_08122EE8: .4byte gUnknown_203B0B4 +_08122EE8: .4byte sPartyMenuBoxes _08122EEC: movs r0, 0x1 _08122EEE: strh r0, [r6, 0x14] add r2, sp, 0x8 - ldr r0, _08122F4C @ =gUnknown_203B0A0 + ldr r0, _08122F4C @ =gPartyMenu ldrb r0, [r0, 0xA] lsls r0, 24 asrs r0, 24 - ldr r1, _08122F50 @ =gUnknown_203B0B4 + ldr r1, _08122F50 @ =sPartyMenuBoxes ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -8882,13 +8882,13 @@ _08122EEE: adds r0, r2, 0 b _08122F56 .align 2, 0 -_08122F4C: .4byte gUnknown_203B0A0 -_08122F50: .4byte gUnknown_203B0B4 +_08122F4C: .4byte gPartyMenu +_08122F50: .4byte sPartyMenuBoxes _08122F54: movs r0, 0x1 _08122F56: strh r0, [r6, 0x16] - ldr r4, _08122FEC @ =gUnknown_203B0C8 + ldr r4, _08122FEC @ =sSlot1TilemapBuffer movs r0, 0x4 ldrsh r1, [r6, r0] movs r2, 0x6 @@ -8897,7 +8897,7 @@ _08122F56: muls r0, r1 bl Alloc str r0, [r4] - ldr r5, _08122FF0 @ =gUnknown_203B0CC + ldr r5, _08122FF0 @ =sSlot2TilemapBuffer movs r0, 0xC ldrsh r1, [r6, r0] movs r2, 0xE @@ -8930,23 +8930,23 @@ _08122F56: add r0, sp, 0x8 ldrb r0, [r0, 0x1] bl ClearWindowTilemap - ldr r4, _08122FF4 @ =gUnknown_203B0A0 + ldr r4, _08122FF4 @ =gPartyMenu movs r0, 0x9 strb r0, [r4, 0xB] ldrb r0, [r4, 0x9] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot ldrb r0, [r4, 0xA] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot adds r0, r7, 0 - bl sub_81231E8 + bl SlidePartyMenuBoxOneStep ldr r1, _08122FF8 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _08122FFC @ =sub_8123270 + ldr r1, _08122FFC @ =Task_SlideSelectedSlotsOffscreen str r1, [r0] _08122FE2: add sp, 0xC @@ -8954,15 +8954,15 @@ _08122FE2: pop {r0} bx r0 .align 2, 0 -_08122FEC: .4byte gUnknown_203B0C8 -_08122FF0: .4byte gUnknown_203B0CC -_08122FF4: .4byte gUnknown_203B0A0 +_08122FEC: .4byte sSlot1TilemapBuffer +_08122FF0: .4byte sSlot2TilemapBuffer +_08122FF4: .4byte gPartyMenu _08122FF8: .4byte gTasks -_08122FFC: .4byte sub_8123270 - thumb_func_end sub_8122E5C +_08122FFC: .4byte Task_SlideSelectedSlotsOffscreen + thumb_func_end SwitchSelectedMons - thumb_func_start sub_8123000 -sub_8123000: @ 8123000 + thumb_func_start TryMovePartySlot +TryMovePartySlot: @ 8123000 push {r4-r7,lr} mov r7, r8 push {r7} @@ -9020,10 +9020,10 @@ _0812305C: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8123000 + thumb_func_end TryMovePartySlot - thumb_func_start sub_8123068 -sub_8123068: @ 8123068 + thumb_func_start MoveAndBufferPartySlot +MoveAndBufferPartySlot: @ 8123068 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -9058,7 +9058,7 @@ sub_8123068: @ 8123068 mov r1, r8 add r2, sp, 0x24 adds r3, r5, 0 - bl sub_8123000 + bl TryMovePartySlot lsls r0, 24 cmp r0, 0 beq _08123122 @@ -9087,7 +9087,7 @@ sub_8123068: @ 8123068 mov r1, r8 add r2, sp, 0x24 adds r3, r5, 0 - bl sub_8123000 + bl TryMovePartySlot lsls r0, 24 cmp r0, 0 beq _08123122 @@ -9122,10 +9122,10 @@ _08123122: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8123068 + thumb_func_end MoveAndBufferPartySlot - thumb_func_start sub_8123134 -sub_8123134: @ 8123134 + thumb_func_start MovePartyMenuBoxSprites +MovePartyMenuBoxSprites: @ 8123134 push {r4,lr} ldr r4, _08123184 @ =gSprites ldrb r2, [r0, 0xB] @@ -9167,10 +9167,10 @@ sub_8123134: @ 8123134 bx r0 .align 2, 0 _08123184: .4byte gSprites - thumb_func_end sub_8123134 + thumb_func_end MovePartyMenuBoxSprites - thumb_func_start sub_8123188 -sub_8123188: @ 8123188 + thumb_func_start SlidePartyMenuBoxSpritesOneStep +SlidePartyMenuBoxSpritesOneStep: @ 8123188 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -9183,8 +9183,8 @@ sub_8123188: @ 8123188 ldrsh r0, [r4, r1] cmp r0, 0 beq _081231B6 - ldr r2, _081231E0 @ =gUnknown_203B0B4 - ldr r0, _081231E4 @ =gUnknown_203B0A0 + ldr r2, _081231E0 @ =sPartyMenuBoxes + ldr r0, _081231E4 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] lsls r1, 4 @@ -9192,14 +9192,14 @@ sub_8123188: @ 8123188 adds r0, r1 movs r2, 0x14 ldrsh r1, [r4, r2] - bl sub_8123134 + bl MovePartyMenuBoxSprites _081231B6: movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0 beq _081231D4 - ldr r2, _081231E0 @ =gUnknown_203B0B4 - ldr r0, _081231E4 @ =gUnknown_203B0A0 + ldr r2, _081231E0 @ =sPartyMenuBoxes + ldr r0, _081231E4 @ =gPartyMenu movs r1, 0xA ldrsb r1, [r0, r1] lsls r1, 4 @@ -9207,19 +9207,19 @@ _081231B6: adds r0, r1 movs r2, 0x16 ldrsh r1, [r4, r2] - bl sub_8123134 + bl MovePartyMenuBoxSprites _081231D4: pop {r4} pop {r0} bx r0 .align 2, 0 _081231DC: .4byte gTasks+0x8 -_081231E0: .4byte gUnknown_203B0B4 -_081231E4: .4byte gUnknown_203B0A0 - thumb_func_end sub_8123188 +_081231E0: .4byte sPartyMenuBoxes +_081231E4: .4byte gPartyMenu + thumb_func_end SlidePartyMenuBoxSpritesOneStep - thumb_func_start sub_81231E8 -sub_81231E8: @ 81231E8 + thumb_func_start SlidePartyMenuBoxOneStep +SlidePartyMenuBoxOneStep: @ 81231E8 push {r4-r6,lr} sub sp, 0x8 lsls r0, 24 @@ -9233,7 +9233,7 @@ sub_81231E8: @ 81231E8 ldrsh r0, [r5, r1] cmp r0, 0 beq _08123228 - ldr r0, _08123268 @ =gUnknown_203B0C8 + ldr r0, _08123268 @ =sSlot1TilemapBuffer ldr r0, [r0] ldrh r1, [r5, 0x10] ldrh r2, [r5] @@ -9250,13 +9250,13 @@ sub_81231E8: @ 81231E8 movs r6, 0x14 ldrsh r4, [r5, r6] str r4, [sp, 0x4] - bl sub_8123068 + bl MoveAndBufferPartySlot _08123228: movs r1, 0x16 ldrsh r0, [r5, r1] cmp r0, 0 beq _08123256 - ldr r0, _0812326C @ =gUnknown_203B0CC + ldr r0, _0812326C @ =sSlot2TilemapBuffer ldr r0, [r0] ldrh r1, [r5, 0x12] ldrh r2, [r5, 0x8] @@ -9273,7 +9273,7 @@ _08123228: movs r6, 0x16 ldrsh r4, [r5, r6] str r4, [sp, 0x4] - bl sub_8123068 + bl MoveAndBufferPartySlot _08123256: movs r0, 0 bl ScheduleBgCopyTilemapToVram @@ -9283,12 +9283,12 @@ _08123256: bx r0 .align 2, 0 _08123264: .4byte gTasks+0x8 -_08123268: .4byte gUnknown_203B0C8 -_0812326C: .4byte gUnknown_203B0CC - thumb_func_end sub_81231E8 +_08123268: .4byte sSlot1TilemapBuffer +_0812326C: .4byte sSlot2TilemapBuffer + thumb_func_end SlidePartyMenuBoxOneStep - thumb_func_start sub_8123270 -sub_8123270: @ 8123270 + thumb_func_start Task_SlideSelectedSlotsOffscreen +Task_SlideSelectedSlotsOffscreen: @ 8123270 push {r4-r7,lr} mov r7, r8 push {r7} @@ -9303,9 +9303,9 @@ sub_8123270: @ 8123270 mov r8, r0 adds r6, r7, r0 adds r0, r4, 0 - bl sub_81231E8 + bl SlidePartyMenuBoxOneStep adds r0, r4, 0 - bl sub_8123188 + bl SlidePartyMenuBoxSpritesOneStep ldrh r1, [r6, 0x14] ldrh r2, [r6, 0x10] adds r1, r2 @@ -9339,15 +9339,15 @@ sub_8123270: @ 8123270 ldrsh r0, [r6, r2] negs r0, r0 strh r0, [r6, 0x16] - bl swap_pokemon_and_oams - ldr r4, _08123374 @ =gUnknown_203B0A0 + bl SwitchPartyMon + ldr r4, _08123374 @ =gPartyMenu ldrb r0, [r4, 0x9] - bl sub_811F234 + bl DisplayPartyPokemonData ldrb r0, [r4, 0xA] - bl sub_811F234 + bl DisplayPartyPokemonData movs r0, 0x9 ldrsb r0, [r4, r0] - ldr r5, _08123378 @ =gUnknown_203B0B4 + ldr r5, _08123378 @ =sPartyMenuBoxes ldr r1, [r5] lsls r0, 4 adds r0, r1 @@ -9360,7 +9360,7 @@ sub_8123270: @ 8123270 adds r0, r1 ldrb r0, [r0, 0x8] bl PutWindowTilemap - ldr r0, _0812337C @ =gUnknown_203B0C8 + ldr r0, _0812337C @ =sSlot1TilemapBuffer ldr r1, [r0] ldrb r2, [r6] ldrb r3, [r6, 0x2] @@ -9370,7 +9370,7 @@ sub_8123270: @ 8123270 str r0, [sp, 0x4] movs r0, 0 bl CopyRectIntoAltRect - ldr r0, _08123380 @ =gUnknown_203B0CC + ldr r0, _08123380 @ =sSlot2TilemapBuffer ldr r1, [r0] ldrb r2, [r6, 0x8] ldrb r3, [r6, 0xA] @@ -9397,7 +9397,7 @@ sub_8123270: @ 8123270 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _08123384 @ =sub_8123388 + ldr r1, _08123384 @ =Task_SlideSelectedSlotsOnscreen str r1, [r0] _08123362: add sp, 0xC @@ -9408,15 +9408,15 @@ _08123362: bx r0 .align 2, 0 _08123370: .4byte gTasks+0x8 -_08123374: .4byte gUnknown_203B0A0 -_08123378: .4byte gUnknown_203B0B4 -_0812337C: .4byte gUnknown_203B0C8 -_08123380: .4byte gUnknown_203B0CC -_08123384: .4byte sub_8123388 - thumb_func_end sub_8123270 - - thumb_func_start sub_8123388 -sub_8123388: @ 8123388 +_08123374: .4byte gPartyMenu +_08123378: .4byte sPartyMenuBoxes +_0812337C: .4byte sSlot1TilemapBuffer +_08123380: .4byte sSlot2TilemapBuffer +_08123384: .4byte Task_SlideSelectedSlotsOnscreen + thumb_func_end Task_SlideSelectedSlotsOffscreen + + thumb_func_start Task_SlideSelectedSlotsOnscreen +Task_SlideSelectedSlotsOnscreen: @ 8123388 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -9426,9 +9426,9 @@ sub_8123388: @ 8123388 ldr r1, _081233E8 @ =gTasks+0x8 adds r4, r0, r1 adds r0, r6, 0 - bl sub_81231E8 + bl SlidePartyMenuBoxOneStep adds r0, r6, 0 - bl sub_8123188 + bl SlidePartyMenuBoxSpritesOneStep movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 @@ -9437,10 +9437,10 @@ sub_8123388: @ 8123388 ldrsh r0, [r4, r2] cmp r0, 0 bne _081233F4 - ldr r5, _081233EC @ =gUnknown_203B0A0 + ldr r5, _081233EC @ =gPartyMenu movs r0, 0x9 ldrsb r0, [r5, r0] - ldr r4, _081233F0 @ =gUnknown_203B0B4 + ldr r4, _081233F0 @ =sPartyMenuBoxes ldr r1, [r4] lsls r0, 4 adds r0, r1 @@ -9456,12 +9456,12 @@ sub_8123388: @ 8123388 movs r0, 0 bl ScheduleBgCopyTilemapToVram adds r0, r6, 0 - bl sub_81235E8 + bl FinishTwoMonAction b _08123418 .align 2, 0 _081233E8: .4byte gTasks+0x8 -_081233EC: .4byte gUnknown_203B0A0 -_081233F0: .4byte gUnknown_203B0B4 +_081233EC: .4byte gPartyMenu +_081233F0: .4byte sPartyMenuBoxes _081233F4: ldrh r1, [r4, 0x14] ldrh r0, [r4, 0x10] @@ -9486,10 +9486,10 @@ _08123418: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8123388 + thumb_func_end Task_SlideSelectedSlotsOnscreen - thumb_func_start oamt_swap_pos -oamt_swap_pos: @ 8123420 + thumb_func_start SwitchMenuBoxSprites +SwitchMenuBoxSprites: @ 8123420 push {r4-r6,lr} mov r6, r10 mov r5, r9 @@ -9591,14 +9591,14 @@ oamt_swap_pos: @ 8123420 bx r0 .align 2, 0 _081234E8: .4byte gSprites - thumb_func_end oamt_swap_pos + thumb_func_end SwitchMenuBoxSprites - thumb_func_start swap_pokemon_and_oams -swap_pokemon_and_oams: @ 81234EC + thumb_func_start SwitchPartyMon +SwitchPartyMon: @ 81234EC push {r4-r6,lr} sub sp, 0x8 - ldr r1, _08123580 @ =gUnknown_203B0B4 - ldr r2, _08123584 @ =gUnknown_203B0A0 + ldr r1, _08123580 @ =sPartyMenuBoxes + ldr r2, _08123584 @ =gPartyMenu movs r3, 0x9 ldrsb r3, [r2, r3] lsls r0, r3, 4 @@ -9639,31 +9639,31 @@ swap_pokemon_and_oams: @ 81234EC adds r0, 0xB ldr r1, [sp, 0x4] adds r1, 0xB - bl oamt_swap_pos + bl SwitchMenuBoxSprites ldr r0, [sp] adds r0, 0xA ldr r1, [sp, 0x4] adds r1, 0xA - bl oamt_swap_pos + bl SwitchMenuBoxSprites ldr r0, [sp] adds r0, 0x9 ldr r1, [sp, 0x4] adds r1, 0x9 - bl oamt_swap_pos + bl SwitchMenuBoxSprites ldr r0, [sp] adds r0, 0xC ldr r1, [sp, 0x4] adds r1, 0xC - bl oamt_swap_pos + bl SwitchMenuBoxSprites add sp, 0x8 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08123580: .4byte gUnknown_203B0B4 -_08123584: .4byte gUnknown_203B0A0 +_08123580: .4byte sPartyMenuBoxes +_08123584: .4byte gPartyMenu _08123588: .4byte gPlayerParty - thumb_func_end swap_pokemon_and_oams + thumb_func_end SwitchPartyMon thumb_func_start sub_812358C sub_812358C: @ 812358C @@ -9673,7 +9673,7 @@ sub_812358C: @ 812358C movs r0, 0x4 bl Alloc adds r4, r0, 0 - ldr r0, _081235E0 @ =gUnknown_203B0A0 + ldr r0, _081235E0 @ =gPartyMenu mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -9704,119 +9704,119 @@ sub_812358C: @ 812358C pop {r0} bx r0 .align 2, 0 -_081235E0: .4byte gUnknown_203B0A0 +_081235E0: .4byte gPartyMenu _081235E4: .4byte gPlayerParty thumb_func_end sub_812358C - thumb_func_start sub_81235E8 -sub_81235E8: @ 81235E8 + thumb_func_start FinishTwoMonAction +FinishTwoMonAction: @ 81235E8 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08123630 @ =gUnknown_203B09C + ldr r0, _08123630 @ =sPartyMenuInternal ldr r0, [r0] adds r0, 0xD - bl sub_8121CE4 - ldr r4, _08123634 @ =gUnknown_203B0A0 + bl PartyMenuRemoveWindow + ldr r4, _08123634 @ =gPartyMenu movs r0, 0 strb r0, [r4, 0xB] ldrb r0, [r4, 0x9] movs r1, 0 - bl sub_811F818 + bl AnimatePartySlot ldrb r0, [r4, 0xA] strb r0, [r4, 0x9] ldrb r0, [r4, 0xA] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot movs r0, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r1, _08123638 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0812363C @ =sub_811FB28 + ldr r1, _0812363C @ =Task_HandleChooseMonInput str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08123630: .4byte gUnknown_203B09C -_08123634: .4byte gUnknown_203B0A0 +_08123630: .4byte sPartyMenuInternal +_08123634: .4byte gPartyMenu _08123638: .4byte gTasks -_0812363C: .4byte sub_811FB28 - thumb_func_end sub_81235E8 +_0812363C: .4byte Task_HandleChooseMonInput + thumb_func_end FinishTwoMonAction - thumb_func_start brm_cancel_1 -brm_cancel_1: @ 8123640 + thumb_func_start CursorCB_Cancel1 +CursorCB_Cancel1: @ 8123640 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 movs r0, 0x5 bl PlaySE - ldr r4, _08123674 @ =gUnknown_203B09C + ldr r4, _08123674 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 - ldr r0, _08123678 @ =gUnknown_203B0A0 + bl PartyMenuRemoveWindow + ldr r0, _08123678 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x6 bne _0812367C movs r0, 0xF - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _08123682 .align 2, 0 -_08123674: .4byte gUnknown_203B09C -_08123678: .4byte gUnknown_203B0A0 +_08123674: .4byte sPartyMenuInternal +_08123678: .4byte gPartyMenu _0812367C: movs r0, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage _08123682: ldr r0, _08123698 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _0812369C @ =sub_811FB28 + ldr r0, _0812369C @ =Task_HandleChooseMonInput str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 _08123698: .4byte gTasks -_0812369C: .4byte sub_811FB28 - thumb_func_end brm_cancel_1 +_0812369C: .4byte Task_HandleChooseMonInput + thumb_func_end CursorCB_Cancel1 - thumb_func_start sub_81236A0 -sub_81236A0: @ 81236A0 + thumb_func_start CursorCB_Item +CursorCB_Item: @ 81236A0 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 movs r0, 0x5 bl PlaySE - ldr r4, _081236F0 @ =gUnknown_203B09C + ldr r4, _081236F0 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, _081236F4 @ =gPlayerParty - ldr r1, _081236F8 @ =gUnknown_203B0A0 + ldr r1, _081236F8 @ =gPartyMenu ldrb r1, [r1, 0x9] movs r2, 0x8 - bl sub_812299C + bl SetPartyMonSelectionActions movs r0, 0x1 - bl sub_8121E5C + bl DisplaySelectionWindow movs r0, 0x19 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r1, _081236FC @ =gTasks lsls r0, r5, 2 adds r0, r5 @@ -9824,56 +9824,56 @@ sub_81236A0: @ 81236A0 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _08123700 @ =sub_8122C5C + ldr r1, _08123700 @ =Task_HandleSelectionMenuInput str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081236F0: .4byte gUnknown_203B09C +_081236F0: .4byte sPartyMenuInternal _081236F4: .4byte gPlayerParty -_081236F8: .4byte gUnknown_203B0A0 +_081236F8: .4byte gPartyMenu _081236FC: .4byte gTasks -_08123700: .4byte sub_8122C5C - thumb_func_end sub_81236A0 +_08123700: .4byte Task_HandleSelectionMenuInput + thumb_func_end CursorCB_Item - thumb_func_start sub_8123704 -sub_8123704: @ 8123704 + thumb_func_start CursorCB_Give +CursorCB_Give: @ 8123704 push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r0, _08123728 @ =gUnknown_203B09C + ldr r0, _08123728 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _0812372C @ =sub_8123730 + ldr r0, _0812372C @ =CB2_SelectBagItemToGive str r0, [r1, 0x4] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu pop {r4} pop {r0} bx r0 .align 2, 0 -_08123728: .4byte gUnknown_203B09C -_0812372C: .4byte sub_8123730 - thumb_func_end sub_8123704 +_08123728: .4byte sPartyMenuInternal +_0812372C: .4byte CB2_SelectBagItemToGive + thumb_func_end CursorCB_Give - thumb_func_start sub_8123730 -sub_8123730: @ 8123730 + thumb_func_start CB2_SelectBagItemToGive +CB2_SelectBagItemToGive: @ 8123730 push {lr} - ldr r2, _08123740 @ =c2_8123744 + ldr r2, _08123740 @ =CB2_GiveHoldItem movs r0, 0x1 movs r1, 0x3 - bl sub_8107DB4 + bl GoToBagMenu pop {r0} bx r0 .align 2, 0 -_08123740: .4byte c2_8123744 - thumb_func_end sub_8123730 +_08123740: .4byte CB2_GiveHoldItem + thumb_func_end CB2_SelectBagItemToGive - thumb_func_start c2_8123744 -c2_8123744: @ 8123744 + thumb_func_start CB2_GiveHoldItem +CB2_GiveHoldItem: @ 8123744 push {r4-r7,lr} mov r7, r8 push {r7} @@ -9882,24 +9882,24 @@ c2_8123744: @ 8123744 ldrh r0, [r6] cmp r0, 0 bne _08123778 - ldr r3, _08123770 @ =gUnknown_203B0A0 + ldr r3, _08123770 @ =gPartyMenu ldrb r0, [r3, 0x8] lsls r0, 28 lsrs r0, 28 ldrb r2, [r3, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _08123774 @ =sub_8122C30 + ldr r1, _08123774 @ =Task_TryCreateSelectionWindow str r1, [sp, 0x4] ldr r1, [r3] b _081237AE .align 2, 0 _0812376C: .4byte gSpecialVar_ItemId -_08123770: .4byte gUnknown_203B0A0 -_08123774: .4byte sub_8122C30 +_08123770: .4byte gPartyMenu +_08123774: .4byte Task_TryCreateSelectionWindow _08123778: - ldr r4, _081237BC @ =gUnknown_203B0D8 - ldr r5, _081237C0 @ =gUnknown_203B0A0 + ldr r4, _081237BC @ =sPartyMenuItemId + ldr r5, _081237C0 @ =gPartyMenu movs r0, 0x9 ldrsb r0, [r5, r0] movs r1, 0x64 @@ -9921,20 +9921,20 @@ _08123778: ldrb r2, [r5, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _081237C8 @ =sub_81238A4 + ldr r1, _081237C8 @ =Task_SwitchHoldItemsPrompt str r1, [sp, 0x4] ldr r1, [r5] _081237AE: str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu b _08123814 .align 2, 0 -_081237BC: .4byte gUnknown_203B0D8 -_081237C0: .4byte gUnknown_203B0A0 +_081237BC: .4byte sPartyMenuItemId +_081237C0: .4byte gPartyMenu _081237C4: .4byte gPlayerParty -_081237C8: .4byte sub_81238A4 +_081237C8: .4byte Task_SwitchHoldItemsPrompt _081237CC: ldrh r0, [r6] bl ItemIsMail @@ -9951,8 +9951,8 @@ _081237CC: adds r0, r1, 0 adds r0, r7 ldrh r1, [r6] - bl sub_81205C8 - bl sub_8123A80 + bl GiveItemToMon + bl CB2_WriteMailToGiveMon b _08123814 _081237F8: ldrb r0, [r5, 0x8] @@ -9961,13 +9961,13 @@ _081237F8: ldrb r2, [r5, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _08123820 @ =sub_8123824 + ldr r1, _08123820 @ =Task_GiveHoldItem str r1, [sp, 0x4] ldr r1, [r5] str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu _08123814: add sp, 0xC pop {r3} @@ -9976,11 +9976,11 @@ _08123814: pop {r0} bx r0 .align 2, 0 -_08123820: .4byte sub_8123824 - thumb_func_end c2_8123744 +_08123820: .4byte Task_GiveHoldItem + thumb_func_end CB2_GiveHoldItem - thumb_func_start sub_8123824 -sub_8123824: @ 8123824 + thumb_func_start Task_GiveHoldItem +Task_GiveHoldItem: @ 8123824 push {r4-r7,lr} mov r7, r8 push {r7} @@ -9994,7 +9994,7 @@ sub_8123824: @ 8123824 bne _08123880 ldr r0, _08123890 @ =gSpecialVar_ItemId ldrh r4, [r0] - ldr r0, _08123894 @ =gUnknown_203B0A0 + ldr r0, _08123894 @ =gPartyMenu mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -10006,14 +10006,14 @@ sub_8123824: @ 8123824 adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl sub_8120420 + bl DisplayGaveHeldItemMessage mov r1, r8 movs r0, 0x9 ldrsb r0, [r1, r0] muls r0, r6 adds r0, r5 adds r1, r4, 0 - bl sub_81205C8 + bl GiveItemToMon adds r0, r4, 0 movs r1, 0x1 bl RemoveBagItem @@ -10022,7 +10022,7 @@ sub_8123824: @ 8123824 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081238A0 @ =sub_8123BF0 + ldr r1, _081238A0 @ =Task_UpdateHeldItemSprite str r1, [r0] _08123880: pop {r3} @@ -10033,14 +10033,14 @@ _08123880: .align 2, 0 _0812388C: .4byte gPaletteFade _08123890: .4byte gSpecialVar_ItemId -_08123894: .4byte gUnknown_203B0A0 +_08123894: .4byte gPartyMenu _08123898: .4byte gPlayerParty _0812389C: .4byte gTasks -_081238A0: .4byte sub_8123BF0 - thumb_func_end sub_8123824 +_081238A0: .4byte Task_UpdateHeldItemSprite + thumb_func_end Task_GiveHoldItem - thumb_func_start sub_81238A4 -sub_81238A4: @ 81238A4 + thumb_func_start Task_SwitchHoldItemsPrompt +Task_SwitchHoldItemsPrompt: @ 81238A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -10050,23 +10050,23 @@ sub_81238A4: @ 81238A4 ands r0, r1 cmp r0, 0 bne _081238DC - ldr r0, _081238E8 @ =gUnknown_203B0A0 + ldr r0, _081238E8 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 ldr r1, _081238EC @ =gPlayerParty adds r0, r1 - ldr r1, _081238F0 @ =gUnknown_203B0D8 + ldr r1, _081238F0 @ =sPartyMenuItemId ldrh r1, [r1] movs r2, 0x1 - bl sub_812050C + bl DisplayAlreadyHoldingItemSwitchMessage ldr r1, _081238F4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081238F8 @ =sub_81238FC + ldr r1, _081238F8 @ =Task_SwitchItemsYesNo str r1, [r0] _081238DC: pop {r4} @@ -10074,30 +10074,30 @@ _081238DC: bx r0 .align 2, 0 _081238E4: .4byte gPaletteFade -_081238E8: .4byte gUnknown_203B0A0 +_081238E8: .4byte gPartyMenu _081238EC: .4byte gPlayerParty -_081238F0: .4byte gUnknown_203B0D8 +_081238F0: .4byte sPartyMenuItemId _081238F4: .4byte gTasks -_081238F8: .4byte sub_81238FC - thumb_func_end sub_81238A4 +_081238F8: .4byte Task_SwitchItemsYesNo + thumb_func_end Task_SwitchHoldItemsPrompt - thumb_func_start sub_81238FC -sub_81238FC: @ 81238FC + thumb_func_start Task_SwitchItemsYesNo +Task_SwitchItemsYesNo: @ 81238FC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08123920 - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08123928 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0812392C @ =sub_8123930 + ldr r0, _0812392C @ =Task_HandleSwitchItemsYesNoInput str r0, [r1] _08123920: pop {r4} @@ -10105,11 +10105,11 @@ _08123920: bx r0 .align 2, 0 _08123928: .4byte gTasks -_0812392C: .4byte sub_8123930 - thumb_func_end sub_81238FC +_0812392C: .4byte Task_HandleSwitchItemsYesNoInput + thumb_func_end Task_SwitchItemsYesNo - thumb_func_start sub_8123930 -sub_8123930: @ 8123930 + thumb_func_start Task_HandleSwitchItemsYesNoInput +Task_HandleSwitchItemsYesNoInput: @ 8123930 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -10134,7 +10134,7 @@ _08123956: ldrh r0, [r5] movs r1, 0x1 bl RemoveBagItem - ldr r6, _0812399C @ =gUnknown_203B0D8 + ldr r6, _0812399C @ =sPartyMenuItemId ldrh r0, [r6] movs r1, 0x1 bl AddBagItem @@ -10145,31 +10145,31 @@ _08123956: movs r1, 0x1 bl AddBagItem ldrh r0, [r6] - bl sub_8120658 + bl BufferBagFullCantTakeItemMessage ldr r0, _081239A0 @ =gStringVar4 movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _081239A4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081239A8 @ =sub_81203B8 + ldr r1, _081239A8 @ =Task_ReturnToChooseMonAfterText str r1, [r0] b _08123A40 .align 2, 0 _08123998: .4byte gSpecialVar_ItemId -_0812399C: .4byte gUnknown_203B0D8 +_0812399C: .4byte sPartyMenuItemId _081239A0: .4byte gStringVar4 _081239A4: .4byte gTasks -_081239A8: .4byte sub_81203B8 +_081239A8: .4byte Task_ReturnToChooseMonAfterText _081239AC: ldrh r0, [r5] bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081239EC - ldr r0, _081239DC @ =gUnknown_203B0A0 + ldr r0, _081239DC @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -10177,22 +10177,22 @@ _081239AC: ldr r1, _081239E0 @ =gPlayerParty adds r0, r1 ldrh r1, [r5] - bl sub_81205C8 + bl GiveItemToMon ldr r1, _081239E4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081239E8 @ =sub_8123A50 + ldr r1, _081239E8 @ =Task_WriteMailToGiveMonAfterText str r1, [r0] b _08123A40 .align 2, 0 -_081239DC: .4byte gUnknown_203B0A0 +_081239DC: .4byte gPartyMenu _081239E0: .4byte gPlayerParty _081239E4: .4byte gTasks -_081239E8: .4byte sub_8123A50 +_081239E8: .4byte Task_WriteMailToGiveMonAfterText _081239EC: - ldr r0, _08123A1C @ =gUnknown_203B0A0 + ldr r0, _08123A1C @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -10200,24 +10200,24 @@ _081239EC: ldr r1, _08123A20 @ =gPlayerParty adds r0, r1 ldrh r1, [r5] - bl sub_81205C8 + bl GiveItemToMon ldrh r0, [r5] ldrh r1, [r6] movs r2, 0x1 - bl sub_8120558 + bl DisplaySwitchedHeldItemMessage ldr r1, _08123A24 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08123A28 @ =sub_8123BF0 + ldr r1, _08123A28 @ =Task_UpdateHeldItemSprite str r1, [r0] b _08123A40 .align 2, 0 -_08123A1C: .4byte gUnknown_203B0A0 +_08123A1C: .4byte gPartyMenu _08123A20: .4byte gPlayerParty _08123A24: .4byte gTasks -_08123A28: .4byte sub_8123BF0 +_08123A28: .4byte Task_UpdateHeldItemSprite _08123A2C: movs r0, 0x5 bl PlaySE @@ -10227,7 +10227,7 @@ _08123A32: adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08123A4C @ =sub_81203B8 + ldr r0, _08123A4C @ =Task_ReturnToChooseMonAfterText str r0, [r1] _08123A40: pop {r4-r6} @@ -10235,38 +10235,38 @@ _08123A40: bx r0 .align 2, 0 _08123A48: .4byte gTasks -_08123A4C: .4byte sub_81203B8 - thumb_func_end sub_8123930 +_08123A4C: .4byte Task_ReturnToChooseMonAfterText + thumb_func_end Task_HandleSwitchItemsYesNoInput - thumb_func_start sub_8123A50 -sub_8123A50: @ 8123A50 + thumb_func_start Task_WriteMailToGiveMonAfterText +Task_WriteMailToGiveMonAfterText: @ 8123A50 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08123A70 - ldr r0, _08123A78 @ =gUnknown_203B09C + ldr r0, _08123A78 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _08123A7C @ =sub_8123A80 + ldr r0, _08123A7C @ =CB2_WriteMailToGiveMon str r0, [r1, 0x4] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _08123A70: pop {r4} pop {r0} bx r0 .align 2, 0 -_08123A78: .4byte gUnknown_203B09C -_08123A7C: .4byte sub_8123A80 - thumb_func_end sub_8123A50 +_08123A78: .4byte sPartyMenuInternal +_08123A7C: .4byte CB2_WriteMailToGiveMon + thumb_func_end Task_WriteMailToGiveMonAfterText - thumb_func_start sub_8123A80 -sub_8123A80: @ 8123A80 + thumb_func_start CB2_WriteMailToGiveMon +CB2_WriteMailToGiveMon: @ 8123A80 push {lr} - ldr r0, _08123AB8 @ =gUnknown_203B0A0 + ldr r0, _08123AB8 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -10285,26 +10285,26 @@ sub_8123A80: @ 8123A80 adds r2, r0 ldr r1, [r1] adds r1, r2 - ldr r2, _08123AC8 @ =sub_8123ACC + ldr r2, _08123AC8 @ =CB2_ReturnToPartyMenuFromWritingMail movs r0, 0x4 - bl sub_80FEBAC + bl DoEasyChatScreen pop {r0} bx r0 .align 2, 0 -_08123AB8: .4byte gUnknown_203B0A0 +_08123AB8: .4byte gPartyMenu _08123ABC: .4byte gPlayerParty _08123AC0: .4byte gSaveBlock1Ptr _08123AC4: .4byte 0x00002cd0 -_08123AC8: .4byte sub_8123ACC - thumb_func_end sub_8123A80 +_08123AC8: .4byte CB2_ReturnToPartyMenuFromWritingMail + thumb_func_end CB2_WriteMailToGiveMon - thumb_func_start sub_8123ACC -sub_8123ACC: @ 8123ACC + thumb_func_start CB2_ReturnToPartyMenuFromWritingMail +CB2_ReturnToPartyMenuFromWritingMail: @ 8123ACC push {r4-r7,lr} mov r7, r8 push {r7} sub sp, 0xC - ldr r6, _08123B38 @ =gUnknown_203B0A0 + ldr r6, _08123B38 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 @@ -10323,7 +10323,7 @@ sub_8123ACC: @ 8123ACC bne _08123B4C adds r0, r5, 0 bl TakeMailFromMon - ldr r4, _08123B44 @ =gUnknown_203B0D8 + ldr r4, _08123B44 @ =sPartyMenuItemId adds r0, r5, 0 movs r1, 0xC adds r2, r4, 0 @@ -10339,20 +10339,20 @@ sub_8123ACC: @ 8123ACC lsrs r0, 28 ldrb r2, [r6, 0xB] str r7, [sp] - ldr r1, _08123B48 @ =sub_8122C30 + ldr r1, _08123B48 @ =Task_TryCreateSelectionWindow str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu b _08123B68 .align 2, 0 -_08123B38: .4byte gUnknown_203B0A0 +_08123B38: .4byte gPartyMenu _08123B3C: .4byte gPlayerParty _08123B40: .4byte gSpecialVar_Result -_08123B44: .4byte gUnknown_203B0D8 -_08123B48: .4byte sub_8122C30 +_08123B44: .4byte sPartyMenuItemId +_08123B48: .4byte Task_TryCreateSelectionWindow _08123B4C: ldrb r0, [r6, 0x8] lsls r0, 28 @@ -10360,13 +10360,13 @@ _08123B4C: ldrb r2, [r6, 0xB] movs r1, 0 str r1, [sp] - ldr r1, _08123B74 @ =sub_8123B78 + ldr r1, _08123B74 @ =Task_DisplayGaveMailFromPartyMessage str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu _08123B68: add sp, 0xC pop {r3} @@ -10375,11 +10375,11 @@ _08123B68: pop {r0} bx r0 .align 2, 0 -_08123B74: .4byte sub_8123B78 - thumb_func_end sub_8123ACC +_08123B74: .4byte Task_DisplayGaveMailFromPartyMessage + thumb_func_end CB2_ReturnToPartyMenuFromWritingMail - thumb_func_start sub_8123B78 -sub_8123B78: @ 8123B78 + thumb_func_start Task_DisplayGaveMailFromPartyMessage +Task_DisplayGaveMailFromPartyMessage: @ 8123B78 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -10389,11 +10389,11 @@ sub_8123B78: @ 8123B78 ands r0, r1 cmp r0, 0 bne _08123BDE - ldr r1, _08123BB4 @ =gUnknown_203B0D8 + ldr r1, _08123BB4 @ =sPartyMenuItemId ldrh r0, [r1] cmp r0, 0 bne _08123BC4 - ldr r0, _08123BB8 @ =gUnknown_203B0A0 + ldr r0, _08123BB8 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -10404,12 +10404,12 @@ sub_8123B78: @ 8123B78 ldrh r1, [r1] movs r2, 0 movs r3, 0 - bl sub_8120420 + bl DisplayGaveHeldItemMessage b _08123BD0 .align 2, 0 _08123BB0: .4byte gPaletteFade -_08123BB4: .4byte gUnknown_203B0D8 -_08123BB8: .4byte gUnknown_203B0A0 +_08123BB4: .4byte sPartyMenuItemId +_08123BB8: .4byte gPartyMenu _08123BBC: .4byte gPlayerParty _08123BC0: .4byte gSpecialVar_ItemId _08123BC4: @@ -10417,14 +10417,14 @@ _08123BC4: ldrh r0, [r0] ldrh r1, [r1] movs r2, 0 - bl sub_8120558 + bl DisplaySwitchedHeldItemMessage _08123BD0: ldr r0, _08123BE8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08123BEC @ =sub_8123BF0 + ldr r0, _08123BEC @ =Task_UpdateHeldItemSprite str r0, [r1] _08123BDE: pop {r4} @@ -10433,17 +10433,17 @@ _08123BDE: .align 2, 0 _08123BE4: .4byte gSpecialVar_ItemId _08123BE8: .4byte gTasks -_08123BEC: .4byte sub_8123BF0 - thumb_func_end sub_8123B78 +_08123BEC: .4byte Task_UpdateHeldItemSprite + thumb_func_end Task_DisplayGaveMailFromPartyMessage - thumb_func_start sub_8123BF0 -sub_8123BF0: @ 8123BF0 + thumb_func_start Task_UpdateHeldItemSprite +Task_UpdateHeldItemSprite: @ 8123BF0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08123C2C @ =gUnknown_203B0A0 + ldr r0, _08123C2C @ =gPartyMenu ldrb r4, [r0, 0x9] - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -10454,29 +10454,29 @@ sub_8123BF0: @ 8123BF0 muls r0, r2 ldr r1, _08123C30 @ =gPlayerParty adds r0, r1 - ldr r1, _08123C34 @ =gUnknown_203B0B4 + ldr r1, _08123C34 @ =sPartyMenuBoxes lsls r2, 4 ldr r1, [r1] adds r1, r2 - bl sub_81224B4 + bl UpdatePartyMonHeldItemSprite adds r0, r5, 0 - bl sub_81203B8 + bl Task_ReturnToChooseMonAfterText _08123C24: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08123C2C: .4byte gUnknown_203B0A0 +_08123C2C: .4byte gPartyMenu _08123C30: .4byte gPlayerParty -_08123C34: .4byte gUnknown_203B0B4 - thumb_func_end sub_8123BF0 +_08123C34: .4byte sPartyMenuBoxes + thumb_func_end Task_UpdateHeldItemSprite - thumb_func_start sub_8123C38 -sub_8123C38: @ 8123C38 + thumb_func_start CursorCB_TakeItem +CursorCB_TakeItem: @ 8123C38 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08123C90 @ =gUnknown_203B0A0 + ldr r0, _08123C90 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -10490,15 +10490,15 @@ sub_8123C38: @ 8123C38 lsrs r6, r0, 16 movs r0, 0x5 bl PlaySE - ldr r4, _08123C98 @ =gUnknown_203B09C + ldr r4, _08123C98 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow adds r0, r5, 0 - bl sub_8120610 + bl TryTakeMonItem lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -10508,12 +10508,12 @@ sub_8123C38: @ 8123C38 adds r0, r5, 0 adds r1, r6, 0 movs r2, 0x1 - bl sub_81204AC + bl DisplayTookHeldItemMessage b _08123CCE .align 2, 0 -_08123C90: .4byte gUnknown_203B0A0 +_08123C90: .4byte gPartyMenu _08123C94: .4byte gPlayerParty -_08123C98: .4byte gUnknown_203B09C +_08123C98: .4byte sPartyMenuInternal _08123C9C: ldr r1, _08123CB4 @ =gStringVar1 adds r0, r5, 0 @@ -10530,11 +10530,11 @@ _08123CB8: .4byte gStringVar4 _08123CBC: .4byte gUnknown_8416C8F _08123CC0: adds r0, r6, 0 - bl sub_8120658 + bl BufferBagFullCantTakeItemMessage ldr r0, _08123CE8 @ =gStringVar4 _08123CC8: movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage _08123CCE: movs r0, 0x2 bl ScheduleBgCopyTilemapToVram @@ -10543,7 +10543,7 @@ _08123CCE: adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, _08123CF0 @ =sub_8123BF0 + ldr r0, _08123CF0 @ =Task_UpdateHeldItemSprite str r0, [r1] pop {r4-r7} pop {r0} @@ -10551,33 +10551,33 @@ _08123CCE: .align 2, 0 _08123CE8: .4byte gStringVar4 _08123CEC: .4byte gTasks -_08123CF0: .4byte sub_8123BF0 - thumb_func_end sub_8123C38 +_08123CF0: .4byte Task_UpdateHeldItemSprite + thumb_func_end CursorCB_TakeItem - thumb_func_start sub_8123CF4 -sub_8123CF4: @ 8123CF4 + thumb_func_start CursorCB_Mail +CursorCB_Mail: @ 8123CF4 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 movs r0, 0x5 bl PlaySE - ldr r4, _08123D44 @ =gUnknown_203B09C + ldr r4, _08123D44 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, _08123D48 @ =gPlayerParty - ldr r1, _08123D4C @ =gUnknown_203B0A0 + ldr r1, _08123D4C @ =gPartyMenu ldrb r1, [r1, 0x9] movs r2, 0x9 - bl sub_812299C + bl SetPartyMonSelectionActions movs r0, 0x2 - bl sub_8121E5C + bl DisplaySelectionWindow movs r0, 0x1A - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r1, _08123D50 @ =gTasks lsls r0, r5, 2 adds r0, r5 @@ -10585,45 +10585,45 @@ sub_8123CF4: @ 8123CF4 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _08123D54 @ =sub_8122C5C + ldr r1, _08123D54 @ =Task_HandleSelectionMenuInput str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08123D44: .4byte gUnknown_203B09C +_08123D44: .4byte sPartyMenuInternal _08123D48: .4byte gPlayerParty -_08123D4C: .4byte gUnknown_203B0A0 +_08123D4C: .4byte gPartyMenu _08123D50: .4byte gTasks -_08123D54: .4byte sub_8122C5C - thumb_func_end sub_8123CF4 +_08123D54: .4byte Task_HandleSelectionMenuInput + thumb_func_end CursorCB_Mail - thumb_func_start sub_8123D58 -sub_8123D58: @ 8123D58 + thumb_func_start CursorCB_Read +CursorCB_Read: @ 8123D58 push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r0, _08123D7C @ =gUnknown_203B09C + ldr r0, _08123D7C @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _08123D80 @ =sub_8123D84 + ldr r0, _08123D80 @ =CB2_ReadHeldMail str r0, [r1, 0x4] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu pop {r4} pop {r0} bx r0 .align 2, 0 -_08123D7C: .4byte gUnknown_203B09C -_08123D80: .4byte sub_8123D84 - thumb_func_end sub_8123D58 +_08123D7C: .4byte sPartyMenuInternal +_08123D80: .4byte CB2_ReadHeldMail + thumb_func_end CursorCB_Read - thumb_func_start sub_8123D84 -sub_8123D84: @ 8123D84 + thumb_func_start CB2_ReadHeldMail +CB2_ReadHeldMail: @ 8123D84 push {lr} - ldr r0, _08123DB8 @ =gUnknown_203B0A0 + ldr r0, _08123DB8 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -10640,21 +10640,21 @@ sub_8123D84: @ 8123D84 adds r1, r0 ldr r0, [r2] adds r0, r1 - ldr r1, _08123DC8 @ =sub_8123DCC + ldr r1, _08123DC8 @ =CB2_ReturnToPartyMenuFromReadingMail movs r2, 0x1 bl ReadMail pop {r0} bx r0 .align 2, 0 -_08123DB8: .4byte gUnknown_203B0A0 +_08123DB8: .4byte gPartyMenu _08123DBC: .4byte gPlayerParty _08123DC0: .4byte gSaveBlock1Ptr _08123DC4: .4byte 0x00002cd0 -_08123DC8: .4byte sub_8123DCC - thumb_func_end sub_8123D84 +_08123DC8: .4byte CB2_ReturnToPartyMenuFromReadingMail + thumb_func_end CB2_ReadHeldMail - thumb_func_start sub_8123DCC -sub_8123DCC: @ 8123DCC + thumb_func_start CB2_ReturnToPartyMenuFromReadingMail +CB2_ReturnToPartyMenuFromReadingMail: @ 8123DCC push {lr} sub sp, 0xC ldr r2, _08123E00 @ =gPaletteFade @@ -10662,81 +10662,81 @@ sub_8123DCC: @ 8123DCC movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r3, _08123E04 @ =gUnknown_203B0A0 + ldr r3, _08123E04 @ =gPartyMenu ldrb r0, [r3, 0x8] lsls r0, 28 lsrs r0, 28 ldrb r2, [r3, 0xB] movs r1, 0x16 str r1, [sp] - ldr r1, _08123E08 @ =sub_8122C30 + ldr r1, _08123E08 @ =Task_TryCreateSelectionWindow str r1, [sp, 0x4] ldr r1, [r3] str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 _08123E00: .4byte gPaletteFade -_08123E04: .4byte gUnknown_203B0A0 -_08123E08: .4byte sub_8122C30 - thumb_func_end sub_8123DCC +_08123E04: .4byte gPartyMenu +_08123E08: .4byte Task_TryCreateSelectionWindow + thumb_func_end CB2_ReturnToPartyMenuFromReadingMail - thumb_func_start brm_take_2 -brm_take_2: @ 8123E0C + thumb_func_start CursorCB_TakeMail +CursorCB_TakeMail: @ 8123E0C push {r4,r5,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r5, _08123E48 @ =gUnknown_203B09C + ldr r5, _08123E48 @ =sPartyMenuInternal ldr r0, [r5] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r5] adds r0, 0xC - bl sub_8121CE4 - ldr r0, _08123E4C @ =gUnknown_8416B64 + bl PartyMenuRemoveWindow + ldr r0, _08123E4C @ =gText_SendMailToPC movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08123E50 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08123E54 @ =sub_8123E58 + ldr r1, _08123E54 @ =Task_SendMailToPCYesNo str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08123E48: .4byte gUnknown_203B09C -_08123E4C: .4byte gUnknown_8416B64 +_08123E48: .4byte sPartyMenuInternal +_08123E4C: .4byte gText_SendMailToPC _08123E50: .4byte gTasks -_08123E54: .4byte sub_8123E58 - thumb_func_end brm_take_2 +_08123E54: .4byte Task_SendMailToPCYesNo + thumb_func_end CursorCB_TakeMail - thumb_func_start sub_8123E58 -sub_8123E58: @ 8123E58 + thumb_func_start Task_SendMailToPCYesNo +Task_SendMailToPCYesNo: @ 8123E58 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08123E7C - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08123E84 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08123E88 @ =sub_8123E8C + ldr r0, _08123E88 @ =Task_HandleSendMailToPCYesNoInput str r0, [r1] _08123E7C: pop {r4} @@ -10744,11 +10744,11 @@ _08123E7C: bx r0 .align 2, 0 _08123E84: .4byte gTasks -_08123E88: .4byte sub_8123E8C - thumb_func_end sub_8123E58 +_08123E88: .4byte Task_HandleSendMailToPCYesNoInput + thumb_func_end Task_SendMailToPCYesNo - thumb_func_start sub_8123E8C -sub_8123E8C: @ 8123E8C + thumb_func_start Task_HandleSendMailToPCYesNoInput +Task_HandleSendMailToPCYesNoInput: @ 8123E8C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -10769,7 +10769,7 @@ _08123EAC: beq _08123F22 b _08123F38 _08123EB2: - ldr r0, _08123EE4 @ =gUnknown_203B0A0 + ldr r0, _08123EE4 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -10781,50 +10781,50 @@ _08123EB2: lsrs r0, 24 cmp r0, 0xFF beq _08123EF8 - ldr r0, _08123EEC @ =gUnknown_8416B86 + ldr r0, _08123EEC @ =gText_MailSentToPC movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08123EF0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08123EF4 @ =sub_8123BF0 + ldr r1, _08123EF4 @ =Task_UpdateHeldItemSprite b _08123F36 .align 2, 0 -_08123EE4: .4byte gUnknown_203B0A0 +_08123EE4: .4byte gPartyMenu _08123EE8: .4byte gPlayerParty -_08123EEC: .4byte gUnknown_8416B86 +_08123EEC: .4byte gText_MailSentToPC _08123EF0: .4byte gTasks -_08123EF4: .4byte sub_8123BF0 +_08123EF4: .4byte Task_UpdateHeldItemSprite _08123EF8: - ldr r0, _08123F10 @ =gUnknown_8416BA6 + ldr r0, _08123F10 @ =gText_PCMailboxFull movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08123F14 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08123F18 @ =sub_81203B8 + ldr r1, _08123F18 @ =Task_ReturnToChooseMonAfterText b _08123F36 .align 2, 0 -_08123F10: .4byte gUnknown_8416BA6 +_08123F10: .4byte gText_PCMailboxFull _08123F14: .4byte gTasks -_08123F18: .4byte sub_81203B8 +_08123F18: .4byte Task_ReturnToChooseMonAfterText _08123F1C: movs r0, 0x5 bl PlaySE _08123F22: - ldr r0, _08123F40 @ =gUnknown_8416BC3 + ldr r0, _08123F40 @ =gText_MailMessageWillBeLost movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08123F44 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08123F48 @ =sub_8123F4C + ldr r1, _08123F48 @ =Task_LoseMailMessageYesNo _08123F36: str r1, [r0] _08123F38: @@ -10832,28 +10832,28 @@ _08123F38: pop {r0} bx r0 .align 2, 0 -_08123F40: .4byte gUnknown_8416BC3 +_08123F40: .4byte gText_MailMessageWillBeLost _08123F44: .4byte gTasks -_08123F48: .4byte sub_8123F4C - thumb_func_end sub_8123E8C +_08123F48: .4byte Task_LoseMailMessageYesNo + thumb_func_end Task_HandleSendMailToPCYesNoInput - thumb_func_start sub_8123F4C -sub_8123F4C: @ 8123F4C + thumb_func_start Task_LoseMailMessageYesNo +Task_LoseMailMessageYesNo: @ 8123F4C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08123F70 - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08123F78 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08123F7C @ =sub_8123F80 + ldr r0, _08123F7C @ =Task_HandleLoseMailMessageYesNoInput str r0, [r1] _08123F70: pop {r4} @@ -10861,11 +10861,11 @@ _08123F70: bx r0 .align 2, 0 _08123F78: .4byte gTasks -_08123F7C: .4byte sub_8123F80 - thumb_func_end sub_8123F4C +_08123F7C: .4byte Task_HandleLoseMailMessageYesNoInput + thumb_func_end Task_LoseMailMessageYesNo - thumb_func_start sub_8123F80 -sub_8123F80: @ 8123F80 + thumb_func_start Task_HandleLoseMailMessageYesNoInput +Task_HandleLoseMailMessageYesNoInput: @ 8123F80 push {r4-r7,lr} mov r7, r8 push {r7} @@ -10888,7 +10888,7 @@ _08123FA4: beq _08124042 b _08124050 _08123FAA: - ldr r0, _08123FFC @ =gUnknown_203B0A0 + ldr r0, _08123FFC @ =gPartyMenu mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -10914,41 +10914,41 @@ _08123FAA: muls r0, r7 adds r0, r6 bl TakeMailFromMon - ldr r0, _08124004 @ =gUnknown_8416CC7 + ldr r0, _08124004 @ =gText_MailTakenFromPkmn movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08124008 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0812400C @ =sub_8123BF0 + ldr r1, _0812400C @ =Task_UpdateHeldItemSprite str r1, [r0] b _08124050 .align 2, 0 -_08123FFC: .4byte gUnknown_203B0A0 +_08123FFC: .4byte gPartyMenu _08124000: .4byte gPlayerParty -_08124004: .4byte gUnknown_8416CC7 +_08124004: .4byte gText_MailTakenFromPkmn _08124008: .4byte gTasks -_0812400C: .4byte sub_8123BF0 +_0812400C: .4byte Task_UpdateHeldItemSprite _08124010: adds r0, r4, 0 - bl sub_8120658 + bl BufferBagFullCantTakeItemMessage ldr r0, _08124030 @ =gStringVar4 movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08124034 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08124038 @ =sub_81203B8 + ldr r1, _08124038 @ =Task_ReturnToChooseMonAfterText str r1, [r0] b _08124050 .align 2, 0 _08124030: .4byte gStringVar4 _08124034: .4byte gTasks -_08124038: .4byte sub_81203B8 +_08124038: .4byte Task_ReturnToChooseMonAfterText _0812403C: movs r0, 0x5 bl PlaySE @@ -10958,7 +10958,7 @@ _08124042: adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08124060 @ =sub_81203B8 + ldr r0, _08124060 @ =Task_ReturnToChooseMonAfterText str r0, [r1] _08124050: pop {r3} @@ -10968,11 +10968,11 @@ _08124050: bx r0 .align 2, 0 _0812405C: .4byte gTasks -_08124060: .4byte sub_81203B8 - thumb_func_end sub_8123F80 +_08124060: .4byte Task_ReturnToChooseMonAfterText + thumb_func_end Task_HandleLoseMailMessageYesNoInput - thumb_func_start sub_8124064 -sub_8124064: @ 8124064 + thumb_func_start CursorCB_Cancel2 +CursorCB_Cancel2: @ 8124064 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -10980,7 +10980,7 @@ sub_8124064: @ 8124064 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _081240E0 @ =gUnknown_203B0A0 + ldr r0, _081240E0 @ =gPartyMenu mov r8, r0 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -10992,27 +10992,27 @@ sub_8124064: @ 8124064 add r5, r9 movs r0, 0x5 bl PlaySE - ldr r4, _081240E8 @ =gUnknown_203B09C + ldr r4, _081240E8 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow mov r0, r8 ldrb r4, [r0, 0x9] adds r0, r5, 0 - bl sub_8122B20 + bl GetPartyMenuActionsType adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 mov r0, r9 adds r1, r4, 0 - bl sub_812299C + bl SetPartyMonSelectionActions movs r0, 0 - bl sub_8121E5C + bl DisplaySelectionWindow movs r0, 0x16 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r1, _081240EC @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -11020,7 +11020,7 @@ sub_8124064: @ 8124064 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _081240F0 @ =sub_8122C5C + ldr r1, _081240F0 @ =Task_HandleSelectionMenuInput str r1, [r0] pop {r3,r4} mov r8, r3 @@ -11029,47 +11029,47 @@ sub_8124064: @ 8124064 pop {r0} bx r0 .align 2, 0 -_081240E0: .4byte gUnknown_203B0A0 +_081240E0: .4byte gPartyMenu _081240E4: .4byte gPlayerParty -_081240E8: .4byte gUnknown_203B09C +_081240E8: .4byte sPartyMenuInternal _081240EC: .4byte gTasks -_081240F0: .4byte sub_8122C5C - thumb_func_end sub_8124064 +_081240F0: .4byte Task_HandleSelectionMenuInput + thumb_func_end CursorCB_Cancel2 - thumb_func_start sub_81240F4 -sub_81240F4: @ 81240F4 + thumb_func_start CursorCB_SendMon +CursorCB_SendMon: @ 81240F4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 bl PlaySE - ldr r5, _08124120 @ =gUnknown_203B09C + ldr r5, _08124120 @ =sPartyMenuInternal ldr r0, [r5] adds r0, 0xC - bl sub_8121CE4 - bl sub_8127AC0 + bl PartyMenuRemoveWindow + bl TrySwitchInPokemon lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08124124 adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _08124142 .align 2, 0 -_08124120: .4byte gUnknown_203B09C +_08124120: .4byte sPartyMenuInternal _08124124: ldr r0, [r5] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, _08124148 @ =gStringVar4 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _0812414C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08124150 @ =sub_81203B8 + ldr r1, _08124150 @ =Task_ReturnToChooseMonAfterText str r1, [r0] _08124142: pop {r4,r5} @@ -11078,11 +11078,11 @@ _08124142: .align 2, 0 _08124148: .4byte gStringVar4 _0812414C: .4byte gTasks -_08124150: .4byte sub_81203B8 - thumb_func_end sub_81240F4 +_08124150: .4byte Task_ReturnToChooseMonAfterText + thumb_func_end CursorCB_SendMon - thumb_func_start sub_8124154 -sub_8124154: @ 8124154 + thumb_func_start CursorCB_Enter +CursorCB_Enter: @ 8124154 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -11091,7 +11091,7 @@ sub_8124154: @ 8124154 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0812417C @ =gUnknown_203B0A0 + ldr r0, _0812417C @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xC0 ands r0, r1 @@ -11103,7 +11103,7 @@ sub_8124154: @ 8124154 str r1, [sp] b _0812418C .align 2, 0 -_0812417C: .4byte gUnknown_203B0A0 +_0812417C: .4byte gPartyMenu _08124180: .4byte gUnknown_8416B3E _08124184: movs r2, 0x3 @@ -11111,19 +11111,19 @@ _08124184: ldr r0, _081241FC @ =gUnknown_8416B16 str r0, [sp] _0812418C: - ldr r4, _08124200 @ =gUnknown_203B09C + ldr r4, _08124200 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow movs r5, 0 lsls r1, r7, 2 mov r9, r1 cmp r5, r8 bcs _08124222 - ldr r6, _08124204 @ =gUnknown_203B0A0 + ldr r6, _08124204 @ =gPartyMenu ldr r1, _08124208 @ =gTasks mov r2, r9 adds r0, r2, r7 @@ -11144,33 +11144,33 @@ _081241B6: adds r0, r5, 0x2 lsls r0, 24 lsrs r0, 24 - ldr r1, _08124210 @ =gUnknown_203B0B4 + ldr r1, _08124210 @ =sPartyMenuBoxes movs r2, 0x9 ldrsb r2, [r6, r2] lsls r2, 4 ldr r1, [r1] adds r1, r2 movs r2, 0x1 - bl sub_8121C70 + bl DisplayPartyPokemonDescriptionText mov r0, r8 subs r0, 0x1 cmp r5, r0 bne _081241F0 - bl sub_8124258 + bl MoveCursorToConfirm _081241F0: movs r0, 0 - bl sub_8121D0C - ldr r0, _08124214 @ =sub_811FB28 + bl DisplayPartyMenuStdMessage + ldr r0, _08124214 @ =Task_HandleChooseMonInput mov r1, r10 b _0812423C .align 2, 0 _081241FC: .4byte gUnknown_8416B16 -_08124200: .4byte gUnknown_203B09C -_08124204: .4byte gUnknown_203B0A0 +_08124200: .4byte sPartyMenuInternal +_08124204: .4byte gPartyMenu _08124208: .4byte gTasks _0812420C: .4byte gSelectedOrderFromParty -_08124210: .4byte gUnknown_203B0B4 -_08124214: .4byte sub_811FB28 +_08124210: .4byte sPartyMenuBoxes +_08124214: .4byte Task_HandleChooseMonInput _08124218: adds r0, r5, 0x1 lsls r0, 24 @@ -11182,13 +11182,13 @@ _08124222: bl PlaySE ldr r0, [sp] movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r0, _08124250 @ =gTasks mov r2, r9 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - ldr r0, _08124254 @ =sub_81203B8 + ldr r0, _08124254 @ =Task_ReturnToChooseMonAfterText _0812423C: str r0, [r1] add sp, 0x4 @@ -11201,44 +11201,44 @@ _0812423C: bx r0 .align 2, 0 _08124250: .4byte gTasks -_08124254: .4byte sub_81203B8 - thumb_func_end sub_8124154 +_08124254: .4byte Task_ReturnToChooseMonAfterText + thumb_func_end CursorCB_Enter - thumb_func_start sub_8124258 -sub_8124258: @ 8124258 + thumb_func_start MoveCursorToConfirm +MoveCursorToConfirm: @ 8124258 push {r4,lr} - ldr r4, _08124274 @ =gUnknown_203B0A0 + ldr r4, _08124274 @ =gPartyMenu ldrb r0, [r4, 0x9] movs r1, 0 - bl sub_811F818 + bl AnimatePartySlot movs r0, 0x6 strb r0, [r4, 0x9] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot pop {r4} pop {r0} bx r0 .align 2, 0 -_08124274: .4byte gUnknown_203B0A0 - thumb_func_end sub_8124258 +_08124274: .4byte gPartyMenu + thumb_func_end MoveCursorToConfirm - thumb_func_start sub_8124278 -sub_8124278: @ 8124278 + thumb_func_start CursorCB_NoEntry +CursorCB_NoEntry: @ 8124278 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x5 bl PlaySE - ldr r4, _081242BC @ =gUnknown_203B09C + ldr r4, _081242BC @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow movs r4, 0 ldr r3, _081242C0 @ =gSelectedOrderFromParty - ldr r6, _081242C4 @ =gUnknown_203B0A0 + ldr r6, _081242C4 @ =gPartyMenu adds r5, r6, 0 _0812429E: adds r2, r4, r3 @@ -11256,9 +11256,9 @@ _0812429E: beq _081242D4 b _081242E6 .align 2, 0 -_081242BC: .4byte gUnknown_203B09C +_081242BC: .4byte sPartyMenuInternal _081242C0: .4byte gSelectedOrderFromParty -_081242C4: .4byte gUnknown_203B0A0 +_081242C4: .4byte gPartyMenu _081242C8: ldrb r0, [r3, 0x1] strb r0, [r3] @@ -11278,7 +11278,7 @@ _081242DC: cmp r4, 0x2 bls _0812429E _081242E6: - ldr r5, _08124344 @ =gUnknown_203B0B4 + ldr r5, _08124344 @ =sPartyMenuBoxes movs r0, 0x9 ldrsb r0, [r6, r0] lsls r0, 4 @@ -11286,7 +11286,7 @@ _081242E6: adds r1, r0 movs r0, 0x1 movs r2, 0x1 - bl sub_8121C70 + bl DisplayPartyPokemonDescriptionText ldr r4, _08124348 @ =gSelectedOrderFromParty ldrb r0, [r4] cmp r0, 0 @@ -11297,7 +11297,7 @@ _081242E6: adds r1, r0 movs r0, 0x2 movs r2, 0x1 - bl sub_8121C70 + bl DisplayPartyPokemonDescriptionText _08124312: ldrb r0, [r4, 0x1] cmp r0, 0 @@ -11308,29 +11308,29 @@ _08124312: adds r1, r0 movs r0, 0x3 movs r2, 0x1 - bl sub_8121C70 + bl DisplayPartyPokemonDescriptionText _08124328: movs r0, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r0, _0812434C @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, _08124350 @ =sub_811FB28 + ldr r0, _08124350 @ =Task_HandleChooseMonInput str r0, [r1] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08124344: .4byte gUnknown_203B0B4 +_08124344: .4byte sPartyMenuBoxes _08124348: .4byte gSelectedOrderFromParty _0812434C: .4byte gTasks -_08124350: .4byte sub_811FB28 - thumb_func_end sub_8124278 +_08124350: .4byte Task_HandleChooseMonInput + thumb_func_end CursorCB_NoEntry - thumb_func_start sub_8124354 -sub_8124354: @ 8124354 + thumb_func_start CursorCB_Store +CursorCB_Store: @ 8124354 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -11338,30 +11338,30 @@ sub_8124354: @ 8124354 movs r0, 0x5 bl PlaySE ldr r1, _0812437C @ =gSpecialVar_0x8004 - ldr r0, _08124380 @ =gUnknown_203B0A0 + ldr r0, _08124380 @ =gPartyMenu ldrb r0, [r0, 0x9] lsls r0, 24 asrs r0, 24 strh r0, [r1] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu pop {r4} pop {r0} bx r0 .align 2, 0 _0812437C: .4byte gSpecialVar_0x8004 -_08124380: .4byte gUnknown_203B0A0 - thumb_func_end sub_8124354 +_08124380: .4byte gPartyMenu + thumb_func_end CursorCB_Store - thumb_func_start sub_8124384 -sub_8124384: @ 8124384 + thumb_func_start CursorCB_Register +CursorCB_Register: @ 8124384 push {r4-r7,lr} mov r7, r9 mov r6, r8 push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08124410 @ =gUnknown_203B0A0 + ldr r0, _08124410 @ =gPartyMenu mov r9, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -11415,10 +11415,10 @@ sub_8124384: @ 8124384 movs r0, 0x5 bl PlaySE adds r0, r7, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _0812446C .align 2, 0 -_08124410: .4byte gUnknown_203B0A0 +_08124410: .4byte gPartyMenu _08124414: .4byte gPlayerParty _08124418: ldr r0, _08124424 @ =gStringVar4 @@ -11435,26 +11435,26 @@ _0812442C: _08124434: movs r0, 0x1A bl PlaySE - ldr r4, _08124480 @ =gUnknown_203B09C + ldr r4, _08124480 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r4, _08124478 @ =gStringVar4 - ldr r1, _08124484 @ =gUnknown_84169D9 + ldr r1, _08124484 @ =gText_PauseUntilPress adds r0, r4, 0 bl StringAppend adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08124488 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _0812448C @ =sub_81203B8 + ldr r1, _0812448C @ =Task_ReturnToChooseMonAfterText str r1, [r0] _0812446C: pop {r3,r4} @@ -11466,14 +11466,14 @@ _0812446C: .align 2, 0 _08124478: .4byte gStringVar4 _0812447C: .4byte gUnknown_84170E0 -_08124480: .4byte gUnknown_203B09C -_08124484: .4byte gUnknown_84169D9 +_08124480: .4byte sPartyMenuInternal +_08124484: .4byte gText_PauseUntilPress _08124488: .4byte gTasks -_0812448C: .4byte sub_81203B8 - thumb_func_end sub_8124384 +_0812448C: .4byte Task_ReturnToChooseMonAfterText + thumb_func_end CursorCB_Register - thumb_func_start brm_trade_1 -brm_trade_1: @ 8124490 + thumb_func_start CursorCB_Trade1 +CursorCB_Trade1: @ 8124490 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -11481,7 +11481,7 @@ brm_trade_1: @ 8124490 sub sp, 0xC lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08124558 @ =gUnknown_203B0A0 + ldr r0, _08124558 @ =gPartyMenu mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -11521,19 +11521,19 @@ brm_trade_1: @ 8124490 ldr r0, [r0] ldr r1, _08124560 @ =gUnknown_203B064 ldr r1, [r1] - ldr r2, _08124564 @ =gUnknown_203B068 + ldr r2, _08124564 @ =gUnionRoomOfferedSpecies ldrh r3, [r2] - ldr r2, _08124568 @ =gUnknown_203B06A + ldr r2, _08124568 @ =gUnionRoomRequestedMonType ldrb r2, [r2] str r2, [sp] str r5, [sp, 0x4] str r4, [sp, 0x8] mov r2, r9 - bl sub_804FBEC + bl GetUnionRoomTradeMessageId cmp r0, 0 beq _08124584 ldr r5, _0812456C @ =gStringVar4 - ldr r1, _08124570 @ =gUnknown_845A7E8 + ldr r1, _08124570 @ =sUnionRoomTradeMessages subs r0, 0x1 lsls r0, 2 adds r0, r1 @@ -11542,44 +11542,44 @@ brm_trade_1: @ 8124490 bl StringExpandPlaceholders movs r0, 0x1A bl PlaySE - ldr r4, _08124574 @ =gUnknown_203B09C + ldr r4, _08124574 @ =sPartyMenuInternal ldr r0, [r4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r4] adds r0, 0xD - bl sub_8121CE4 - ldr r1, _08124578 @ =gUnknown_84169D9 + bl PartyMenuRemoveWindow + ldr r1, _08124578 @ =gText_PauseUntilPress adds r0, r5, 0 bl StringAppend adds r0, r5, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _0812457C @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _08124580 @ =sub_81203B8 + ldr r1, _08124580 @ =Task_ReturnToChooseMonAfterText str r1, [r0] b _08124590 .align 2, 0 -_08124558: .4byte gUnknown_203B0A0 +_08124558: .4byte gPartyMenu _0812455C: .4byte gPlayerParty _08124560: .4byte gUnknown_203B064 -_08124564: .4byte gUnknown_203B068 -_08124568: .4byte gUnknown_203B06A +_08124564: .4byte gUnionRoomOfferedSpecies +_08124568: .4byte gUnionRoomRequestedMonType _0812456C: .4byte gStringVar4 -_08124570: .4byte gUnknown_845A7E8 -_08124574: .4byte gUnknown_203B09C -_08124578: .4byte gUnknown_84169D9 +_08124570: .4byte sUnionRoomTradeMessages +_08124574: .4byte sPartyMenuInternal +_08124578: .4byte gText_PauseUntilPress _0812457C: .4byte gTasks -_08124580: .4byte sub_81203B8 +_08124580: .4byte Task_ReturnToChooseMonAfterText _08124584: movs r0, 0x5 bl PlaySE adds r0, r7, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _08124590: add sp, 0xC pop {r3,r4} @@ -11588,20 +11588,20 @@ _08124590: pop {r4-r7} pop {r0} bx r0 - thumb_func_end brm_trade_1 + thumb_func_end CursorCB_Trade1 thumb_func_start nullsub_93 nullsub_93: @ 81245A0 bx lr thumb_func_end nullsub_93 - thumb_func_start sub_81245A4 -sub_81245A4: @ 81245A4 + thumb_func_start CursorCB_FieldMove +CursorCB_FieldMove: @ 81245A4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 bl Menu_GetCursorPos - ldr r5, _08124610 @ =gUnknown_203B09C + ldr r5, _08124610 @ =sPartyMenuInternal ldr r1, [r5] lsls r0, 24 lsrs r0, 24 @@ -11613,7 +11613,7 @@ sub_81245A4: @ 81245A4 lsrs r4, r0, 24 movs r0, 0x5 bl PlaySE - ldr r1, _08124614 @ =gUnknown_845A788 + ldr r1, _08124614 @ =sFieldMoveCursorCallbacks lsls r0, r4, 3 adds r7, r0, r1 ldr r0, [r7] @@ -11623,10 +11623,10 @@ sub_81245A4: @ 81245A4 _081245D6: ldr r0, [r5] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow ldr r0, [r5] adds r0, 0xD - bl sub_8121CE4 + bl PartyMenuRemoveWindow bl MenuHelpers_LinkSomething lsls r0, 24 lsrs r0, 24 @@ -11643,11 +11643,11 @@ _081245FA: cmp r0, 0x1 bhi _08124618 movs r0, 0xD - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _081247A6 .align 2, 0 -_08124610: .4byte gUnknown_203B09C -_08124614: .4byte gUnknown_845A788 +_08124610: .4byte sPartyMenuInternal +_08124614: .4byte sFieldMoveCursorCallbacks _08124618: ldrb r0, [r7, 0x4] b _081247A2 @@ -11662,23 +11662,23 @@ _0812461C: lsrs r0, 24 cmp r0, 0x1 beq _08124658 - ldr r0, _0812464C @ =gUnknown_8416AE2 + ldr r0, _0812464C @ =gText_CantUseUntilNewBadge movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08124650 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08124654 @ =sub_81203B8 + ldr r1, _08124654 @ =Task_ReturnToChooseMonAfterText str r1, [r0] b _081247B4 .align 2, 0 -_0812464C: .4byte gUnknown_8416AE2 +_0812464C: .4byte gText_CantUseUntilNewBadge _08124650: .4byte gTasks -_08124654: .4byte sub_81203B8 +_08124654: .4byte Task_ReturnToChooseMonAfterText _08124658: - ldr r1, _08124680 @ =gUnknown_845A788 + ldr r1, _08124680 @ =sFieldMoveCursorCallbacks lsls r0, r4, 3 adds r5, r0, r1 ldr r0, [r5] @@ -11698,7 +11698,7 @@ _0812466E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08124680: .4byte gUnknown_845A788 +_08124680: .4byte sFieldMoveCursorCallbacks _08124684: .4byte _08124688 .align 2, 0 _08124688: @@ -11713,7 +11713,7 @@ _08124688: .4byte _081246AC _081246AC: adds r0, r6, 0 - bl sub_80E56DC + bl ChooseMonForSoftboiled b _081247B4 _081246B4: ldr r0, _081246E0 @ =gSaveBlock1Ptr @@ -11727,11 +11727,11 @@ _081246B4: asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r1, r0, 0 ldr r0, _081246E4 @ =gStringVar1 ldrb r1, [r1, 0x14] - bl sub_80C4DF8 + bl GetMapNameGeneric ldr r0, _081246E8 @ =gStringVar4 ldr r1, _081246EC @ =gUnknown_8417640 b _08124720 @@ -11756,18 +11756,18 @@ _081246F0: asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r1, r0, 0 ldr r0, _0812473C @ =gStringVar1 ldrb r1, [r1, 0x14] - bl sub_80C4DF8 + bl GetMapNameGeneric ldr r0, _08124740 @ =gStringVar4 ldr r1, _08124744 @ =gUnknown_8417615 _08124720: bl StringExpandPlaceholders adds r0, r6, 0 - bl sub_81247C4 - ldr r0, _08124748 @ =gUnknown_203B09C + bl DisplayFieldMoveExitAreaMessage + ldr r0, _08124748 @ =sPartyMenuInternal ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -11779,17 +11779,17 @@ _08124738: .4byte gSaveBlock1Ptr _0812473C: .4byte gStringVar1 _08124740: .4byte gStringVar4 _08124744: .4byte gUnknown_8417615 -_08124748: .4byte gUnknown_203B09C +_08124748: .4byte sPartyMenuInternal _0812474C: - ldr r1, _08124754 @ =gUnknown_203B0A0 + ldr r1, _08124754 @ =gPartyMenu ldr r0, _08124758 @ =sub_80C4EF8 str r0, [r1] b _08124778 .align 2, 0 -_08124754: .4byte gUnknown_203B0A0 +_08124754: .4byte gPartyMenu _08124758: .4byte sub_80C4EF8 _0812475C: - ldr r1, _08124780 @ =gUnknown_203B0A0 + ldr r1, _08124780 @ =gPartyMenu ldr r0, _08124784 @ =CB2_ReturnToField str r0, [r1] bl GetCursorSelectionMonId @@ -11803,10 +11803,10 @@ _0812475C: bl sub_8124BB0 _08124778: adds r0, r6, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _081247B4 .align 2, 0 -_08124780: .4byte gUnknown_203B0A0 +_08124780: .4byte gPartyMenu _08124784: .4byte CB2_ReturnToField _08124788: .4byte gPlayerParty _0812478C: @@ -11814,22 +11814,22 @@ _0812478C: beq _0812479A cmp r4, 0x4 bne _081247A0 - bl sub_8124A0C + bl DisplayCantUseSurfMessage b _081247A6 _0812479A: - bl sub_8124954 + bl DisplayCantUseFlashMessage b _081247A6 _081247A0: ldrb r0, [r5, 0x4] _081247A2: - bl sub_8121D0C + bl DisplayPartyMenuStdMessage _081247A6: ldr r0, _081247BC @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081247C0 @ =task_brm_cancel_1_on_keypad_a_or_b + ldr r0, _081247C0 @ =Task_CancelAfterAorBPress str r0, [r1] _081247B4: pop {r4-r7} @@ -11837,24 +11837,24 @@ _081247B4: bx r0 .align 2, 0 _081247BC: .4byte gTasks -_081247C0: .4byte task_brm_cancel_1_on_keypad_a_or_b - thumb_func_end sub_81245A4 +_081247C0: .4byte Task_CancelAfterAorBPress + thumb_func_end CursorCB_FieldMove - thumb_func_start sub_81247C4 -sub_81247C4: @ 81247C4 + thumb_func_start DisplayFieldMoveExitAreaMessage +DisplayFieldMoveExitAreaMessage: @ 81247C4 push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldr r0, _081247E8 @ =gStringVar4 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _081247EC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081247F0 @ =sub_81247F4 + ldr r1, _081247F0 @ =Task_FieldMoveExitAreaYesNo str r1, [r0] pop {r4} pop {r0} @@ -11862,26 +11862,26 @@ sub_81247C4: @ 81247C4 .align 2, 0 _081247E8: .4byte gStringVar4 _081247EC: .4byte gTasks -_081247F0: .4byte sub_81247F4 - thumb_func_end sub_81247C4 +_081247F0: .4byte Task_FieldMoveExitAreaYesNo + thumb_func_end DisplayFieldMoveExitAreaMessage - thumb_func_start sub_81247F4 -sub_81247F4: @ 81247F4 + thumb_func_start Task_FieldMoveExitAreaYesNo +Task_FieldMoveExitAreaYesNo: @ 81247F4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08124818 - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08124820 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08124824 @ =sub_8124828 + ldr r0, _08124824 @ =Task_HandleFieldMoveExitAreaYesNoInput str r0, [r1] _08124818: pop {r4} @@ -11889,11 +11889,11 @@ _08124818: bx r0 .align 2, 0 _08124820: .4byte gTasks -_08124824: .4byte sub_8124828 - thumb_func_end sub_81247F4 +_08124824: .4byte Task_HandleFieldMoveExitAreaYesNoInput + thumb_func_end Task_FieldMoveExitAreaYesNo - thumb_func_start sub_8124828 -sub_8124828: @ 8124828 + thumb_func_start Task_HandleFieldMoveExitAreaYesNoInput +Task_HandleFieldMoveExitAreaYesNoInput: @ 8124828 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -11914,7 +11914,7 @@ _08124848: beq _08124892 b _081248A2 _0812484E: - ldr r1, _0812487C @ =gUnknown_203B0A0 + ldr r1, _0812487C @ =gPartyMenu ldr r0, _08124880 @ =CB2_ReturnToField str r0, [r1] bl GetCursorSelectionMonId @@ -11924,7 +11924,7 @@ _0812484E: muls r0, r1 ldr r1, _08124884 @ =gPlayerParty adds r0, r1 - ldr r1, _08124888 @ =gUnknown_203B09C + ldr r1, _08124888 @ =sPartyMenuInternal ldr r1, [r1] movs r2, 0x86 lsls r2, 2 @@ -11932,13 +11932,13 @@ _0812484E: ldrb r1, [r1] bl sub_8124BB0 adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _081248A2 .align 2, 0 -_0812487C: .4byte gUnknown_203B0A0 +_0812487C: .4byte gPartyMenu _08124880: .4byte CB2_ReturnToField _08124884: .4byte gPlayerParty -_08124888: .4byte gUnknown_203B09C +_08124888: .4byte sPartyMenuInternal _0812488C: movs r0, 0x5 bl PlaySE @@ -11949,7 +11949,7 @@ _08124892: ldr r0, _081248AC @ =gPostMenuFieldCallback str r1, [r0] adds r0, r4, 0 - bl sub_81203B8 + bl Task_ReturnToChooseMonAfterText _081248A2: pop {r4} pop {r0} @@ -11957,33 +11957,33 @@ _081248A2: .align 2, 0 _081248A8: .4byte gFieldCallback2 _081248AC: .4byte gPostMenuFieldCallback - thumb_func_end sub_8124828 + thumb_func_end Task_HandleFieldMoveExitAreaYesNoInput thumb_func_start FieldCallback_PrepareFadeInFromMenu FieldCallback_PrepareFadeInFromMenu: @ 81248B0 push {lr} bl sub_807DC00 - ldr r0, _081248C4 @ =task_launch_hm_phase_2 + ldr r0, _081248C4 @ =Task_FieldMoveWaitForFade movs r1, 0x8 bl CreateTask movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_081248C4: .4byte task_launch_hm_phase_2 +_081248C4: .4byte Task_FieldMoveWaitForFade thumb_func_end FieldCallback_PrepareFadeInFromMenu - thumb_func_start task_launch_hm_phase_2 -task_launch_hm_phase_2: @ 81248C8 + thumb_func_start Task_FieldMoveWaitForFade +Task_FieldMoveWaitForFade: @ 81248C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _081248F4 - bl brm_get_selected_species + bl GetFieldMoveMonSpecies ldr r1, _081248FC @ =gFieldEffectArguments lsls r0, 16 lsrs r0, 16 @@ -12000,12 +12000,12 @@ _081248F4: .align 2, 0 _081248FC: .4byte gFieldEffectArguments _08124900: .4byte gPostMenuFieldCallback - thumb_func_end task_launch_hm_phase_2 + thumb_func_end Task_FieldMoveWaitForFade - thumb_func_start brm_get_selected_species -brm_get_selected_species: @ 8124904 + thumb_func_start GetFieldMoveMonSpecies +GetFieldMoveMonSpecies: @ 8124904 push {lr} - ldr r0, _08124924 @ =gUnknown_203B0A0 + ldr r0, _08124924 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -12019,12 +12019,12 @@ brm_get_selected_species: @ 8124904 pop {r1} bx r1 .align 2, 0 -_08124924: .4byte gUnknown_203B0A0 +_08124924: .4byte gPartyMenu _08124928: .4byte gPlayerParty - thumb_func_end brm_get_selected_species + thumb_func_end GetFieldMoveMonSpecies - thumb_func_start task_brm_cancel_1_on_keypad_a_or_b -task_brm_cancel_1_on_keypad_a_or_b: @ 812492C + thumb_func_start Task_CancelAfterAorBPress +Task_CancelAfterAorBPress: @ 812492C push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -12040,16 +12040,16 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 812492C beq _0812494C _08124946: adds r0, r2, 0 - bl brm_cancel_1 + bl CursorCB_Cancel1 _0812494C: pop {r0} bx r0 .align 2, 0 _08124950: .4byte gMain - thumb_func_end task_brm_cancel_1_on_keypad_a_or_b + thumb_func_end Task_CancelAfterAorBPress - thumb_func_start sub_8124954 -sub_8124954: @ 8124954 + thumb_func_start DisplayCantUseFlashMessage +DisplayCantUseFlashMessage: @ 8124954 push {lr} ldr r0, _0812496C @ =0x00000806 bl FlagGet @@ -12058,20 +12058,20 @@ sub_8124954: @ 8124954 cmp r0, 0x1 bne _08124970 movs r0, 0xC - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _08124976 .align 2, 0 _0812496C: .4byte 0x00000806 _08124970: movs r0, 0xD - bl sub_8121D0C + bl DisplayPartyMenuStdMessage _08124976: pop {r0} bx r0 - thumb_func_end sub_8124954 + thumb_func_end DisplayCantUseFlashMessage - thumb_func_start hm_surf_run_dp02scr -hm_surf_run_dp02scr: @ 812497C + thumb_func_start FieldCallback_Surf +FieldCallback_Surf: @ 812497C push {lr} bl GetCursorSelectionMonId ldr r1, _08124994 @ =gFieldEffectArguments @@ -12084,10 +12084,10 @@ hm_surf_run_dp02scr: @ 812497C bx r0 .align 2, 0 _08124994: .4byte gFieldEffectArguments - thumb_func_end hm_surf_run_dp02scr + thumb_func_end FieldCallback_Surf - thumb_func_start sub_8124998 -sub_8124998: @ 8124998 + thumb_func_start SetUpFieldMove_Surf +SetUpFieldMove_Surf: @ 8124998 push {r4,lr} sub sp, 0x4 mov r4, sp @@ -12122,7 +12122,7 @@ sub_8124998: @ 8124998 ldr r0, _081249F4 @ =FieldCallback_PrepareFadeInFromMenu str r0, [r1] ldr r1, _081249F8 @ =gPostMenuFieldCallback - ldr r0, _081249FC @ =hm_surf_run_dp02scr + ldr r0, _081249FC @ =FieldCallback_Surf str r0, [r1] movs r0, 0x1 b _08124A02 @@ -12130,7 +12130,7 @@ sub_8124998: @ 8124998 _081249F0: .4byte gFieldCallback2 _081249F4: .4byte FieldCallback_PrepareFadeInFromMenu _081249F8: .4byte gPostMenuFieldCallback -_081249FC: .4byte hm_surf_run_dp02scr +_081249FC: .4byte FieldCallback_Surf _08124A00: movs r0, 0 _08124A02: @@ -12138,10 +12138,10 @@ _08124A02: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8124998 + thumb_func_end SetUpFieldMove_Surf - thumb_func_start sub_8124A0C -sub_8124A0C: @ 8124A0C + thumb_func_start DisplayCantUseSurfMessage +DisplayCantUseSurfMessage: @ 8124A0C push {r4,lr} sub sp, 0x4 movs r0, 0x8 @@ -12150,7 +12150,7 @@ sub_8124A0C: @ 8124A0C cmp r0, 0 beq _08124A24 movs r0, 0x9 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _08124A82 _08124A24: mov r4, sp @@ -12172,7 +12172,7 @@ _08124A24: cmp r0, 0x1 bne _08124A56 movs r0, 0xA - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _08124A82 _08124A56: ldr r0, _08124A78 @ =gSaveBlock1Ptr @@ -12188,22 +12188,22 @@ _08124A56: cmp r0, 0x1 bhi _08124A7C movs r0, 0xB - bl sub_8121D0C + bl DisplayPartyMenuStdMessage b _08124A82 .align 2, 0 _08124A78: .4byte gSaveBlock1Ptr _08124A7C: movs r0, 0x8 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage _08124A82: add sp, 0x4 pop {r4} pop {r0} bx r0 - thumb_func_end sub_8124A0C + thumb_func_end DisplayCantUseSurfMessage - thumb_func_start sub_8124A8C -sub_8124A8C: @ 8124A8C + thumb_func_start SetUpFieldMove_Fly +SetUpFieldMove_Fly: @ 8124A8C push {lr} ldr r0, _08124AA4 @ =gMapHeader ldrb r0, [r0, 0x17] @@ -12221,15 +12221,15 @@ _08124AA8: _08124AAA: pop {r1} bx r1 - thumb_func_end sub_8124A8C + thumb_func_end SetUpFieldMove_Fly - thumb_func_start sub_8124AB0 -sub_8124AB0: @ 8124AB0 + thumb_func_start CB2_ReturnToPartyMenuFromFlyMap +CB2_ReturnToPartyMenuFromFlyMap: @ 8124AB0 push {lr} sub sp, 0xC movs r0, 0 str r0, [sp] - ldr r0, _08124AD4 @ =sub_811FB28 + ldr r0, _08124AD4 @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _08124AD8 @ =CB2_ReturnToStartMenu str r0, [sp, 0x8] @@ -12237,17 +12237,17 @@ sub_8124AB0: @ 8124AB0 movs r1, 0 movs r2, 0 movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 -_08124AD4: .4byte sub_811FB28 +_08124AD4: .4byte Task_HandleChooseMonInput _08124AD8: .4byte CB2_ReturnToStartMenu - thumb_func_end sub_8124AB0 + thumb_func_end CB2_ReturnToPartyMenuFromFlyMap - thumb_func_start hm2_waterfall -hm2_waterfall: @ 8124ADC + thumb_func_start FieldCallback_Waterfall +FieldCallback_Waterfall: @ 8124ADC push {lr} bl GetCursorSelectionMonId ldr r1, _08124AF4 @ =gFieldEffectArguments @@ -12260,10 +12260,10 @@ hm2_waterfall: @ 8124ADC bx r0 .align 2, 0 _08124AF4: .4byte gFieldEffectArguments - thumb_func_end hm2_waterfall + thumb_func_end FieldCallback_Waterfall - thumb_func_start hm_prepare_waterfall -hm_prepare_waterfall: @ 8124AF8 + thumb_func_start SetUpFieldMove_Waterfall +SetUpFieldMove_Waterfall: @ 8124AF8 push {r4,lr} sub sp, 0x4 mov r4, sp @@ -12293,7 +12293,7 @@ hm_prepare_waterfall: @ 8124AF8 ldr r0, _08124B48 @ =FieldCallback_PrepareFadeInFromMenu str r0, [r1] ldr r1, _08124B4C @ =gPostMenuFieldCallback - ldr r0, _08124B50 @ =hm2_waterfall + ldr r0, _08124B50 @ =FieldCallback_Waterfall str r0, [r1] movs r0, 0x1 b _08124B56 @@ -12301,7 +12301,7 @@ hm_prepare_waterfall: @ 8124AF8 _08124B44: .4byte gFieldCallback2 _08124B48: .4byte FieldCallback_PrepareFadeInFromMenu _08124B4C: .4byte gPostMenuFieldCallback -_08124B50: .4byte hm2_waterfall +_08124B50: .4byte FieldCallback_Waterfall _08124B54: movs r0, 0 _08124B56: @@ -12309,7 +12309,7 @@ _08124B56: pop {r4} pop {r1} bx r1 - thumb_func_end hm_prepare_waterfall + thumb_func_end SetUpFieldMove_Waterfall thumb_func_start sub_8124B60 sub_8124B60: @ 8124B60 @@ -12330,7 +12330,7 @@ sub_8124B60: @ 8124B60 strh r0, [r7, 0x4] strh r4, [r7] strh r5, [r7, 0x2] - ldr r0, _08124B98 @ =gUnknown_203B0A0 + ldr r0, _08124B98 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x6 bne _08124B9C @@ -12339,7 +12339,7 @@ sub_8124B60: @ 8124B60 bl sub_8113550 b _08124BA4 .align 2, 0 -_08124B98: .4byte gUnknown_203B0A0 +_08124B98: .4byte gPartyMenu _08124B9C: movs r0, 0x9 adds r1, r7, 0 @@ -12385,7 +12385,7 @@ _08124BDA: asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId b _08124BFE .align 2, 0 _08124BF8: .4byte gSaveBlock1Ptr @@ -12426,7 +12426,7 @@ sub_8124C1C: @ 8124C1C ldrsb r1, [r4, r1] lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r5, r0, 0 adds r0, r4, 0 bl Free @@ -12459,13 +12459,13 @@ sub_8124C1C: @ 8124C1C _08124C88: .4byte gPlayerParty thumb_func_end sub_8124C1C - thumb_func_start sub_8124C8C -sub_8124C8C: @ 8124C8C + thumb_func_start CB2_ShowPartyMenuForItemUse +CB2_ShowPartyMenuForItemUse: @ 8124C8C push {r4-r7,lr} mov r7, r8 push {r7} sub sp, 0xC - ldr r6, _08124CB4 @ =sub_8124D90 + ldr r6, _08124CB4 @ =CB2_ReturnToBagMenu ldr r0, _08124CB8 @ =gMain ldr r1, _08124CBC @ =0x00000439 adds r0, r1 @@ -12476,20 +12476,20 @@ sub_8124C8C: @ 8124C8C beq _08124CCC movs r0, 0x1 mov r8, r0 - bl sub_81278B4 + bl GetPartyLayoutFromBattleType lsls r0, 24 lsrs r7, r0, 24 b _08124CD2 .align 2, 0 -_08124CB4: .4byte sub_8124D90 +_08124CB4: .4byte CB2_ReturnToBagMenu _08124CB8: .4byte gMain _08124CBC: .4byte 0x00000439 _08124CC0: - ldr r0, _08124CC8 @ =gUnknown_203B0A0 + ldr r0, _08124CC8 @ =gPartyMenu strb r5, [r0, 0x9] b _08124D16 .align 2, 0 -_08124CC8: .4byte gUnknown_203B0A0 +_08124CC8: .4byte gPartyMenu _08124CCC: movs r1, 0 mov r8, r1 @@ -12502,7 +12502,7 @@ _08124CD2: lsrs r0, 24 cmp r0, 0xA bne _08124D44 - ldr r1, _08124D34 @ =gUnknown_203B0A0 + ldr r1, _08124D34 @ =gPartyMenu movs r0, 0 strb r0, [r1, 0x9] movs r5, 0 @@ -12538,15 +12538,15 @@ _08124D16: bne _08124D28 ldr r6, _08124D3C @ =sub_8124DB0 _08124D28: - ldr r1, _08124D40 @ =sub_8124FC8 + ldr r1, _08124D40 @ =Task_SetSacredAshCB movs r0, 0x7F b _08124D6A .align 2, 0 _08124D30: .4byte gSpecialVar_ItemId -_08124D34: .4byte gUnknown_203B0A0 +_08124D34: .4byte gPartyMenu _08124D38: .4byte gPlayerParty _08124D3C: .4byte sub_8124DB0 -_08124D40: .4byte sub_8124FC8 +_08124D40: .4byte Task_SetSacredAshCB _08124D44: ldrh r0, [r4] bl GetPocketByItemId @@ -12568,7 +12568,7 @@ _08124D64: movs r0, 0x5 ldr r6, _08124D88 @ =sub_8124DB0 _08124D68: - ldr r1, _08124D8C @ =sub_811FB28 + ldr r1, _08124D8C @ =Task_HandleChooseMonInput _08124D6A: str r0, [sp] str r1, [sp, 0x4] @@ -12577,7 +12577,7 @@ _08124D6A: adds r1, r7, 0 movs r2, 0x3 movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r3} mov r8, r3 @@ -12586,19 +12586,19 @@ _08124D6A: bx r0 .align 2, 0 _08124D88: .4byte sub_8124DB0 -_08124D8C: .4byte sub_811FB28 - thumb_func_end sub_8124C8C +_08124D8C: .4byte Task_HandleChooseMonInput + thumb_func_end CB2_ShowPartyMenuForItemUse - thumb_func_start sub_8124D90 -sub_8124D90: @ 8124D90 + thumb_func_start CB2_ReturnToBagMenu +CB2_ReturnToBagMenu: @ 8124D90 push {lr} movs r0, 0xB movs r1, 0x3 movs r2, 0 - bl sub_8107DB4 + bl GoToBagMenu pop {r0} bx r0 - thumb_func_end sub_8124D90 + thumb_func_end CB2_ReturnToBagMenu thumb_func_start sub_8124DA0 sub_8124DA0: @ 8124DA0 @@ -12627,15 +12627,15 @@ sub_8124DC0: @ 8124DC0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08124DD8 @ =gUnknown_203B09C + ldr r1, _08124DD8 @ =sPartyMenuInternal ldr r2, [r1] ldr r1, _08124DDC @ =sub_8124DE0 str r1, [r2, 0x4] - bl sub_811FA78 + bl Task_ClosePartyMenu pop {r0} bx r0 .align 2, 0 -_08124DD8: .4byte gUnknown_203B09C +_08124DD8: .4byte sPartyMenuInternal _08124DDC: .4byte sub_8124DE0 thumb_func_end sub_8124DC0 @@ -12654,27 +12654,27 @@ sub_8124DE0: @ 8124DE0 lsrs r0, 24 cmp r0, 0x1 bne _08124E18 - ldr r0, _08124E10 @ =gUnknown_203B0A0 + ldr r0, _08124E10 @ =gPartyMenu ldrb r0, [r0, 0x9] ldrh r1, [r4] - ldr r2, _08124E14 @ =sub_8126BD4 + ldr r2, _08124E14 @ =ItemUseCB_EvolutionStone bl sub_811C540 b _08124E38 .align 2, 0 _08124E0C: .4byte gSpecialVar_ItemId -_08124E10: .4byte gUnknown_203B0A0 -_08124E14: .4byte sub_8126BD4 +_08124E10: .4byte gPartyMenu +_08124E14: .4byte ItemUseCB_EvolutionStone _08124E18: - ldr r2, _08124E28 @ =gUnknown_203B0A0 + ldr r2, _08124E28 @ =gPartyMenu ldrb r0, [r2, 0x9] ldrh r1, [r4] ldr r2, [r2] bl sub_811C5AC b _08124E38 .align 2, 0 -_08124E28: .4byte gUnknown_203B0A0 +_08124E28: .4byte gPartyMenu _08124E2C: - ldr r0, _08124E40 @ =gUnknown_203B0A0 + ldr r0, _08124E40 @ =gPartyMenu ldrb r0, [r0, 0x9] ldrh r1, [r4] ldr r2, _08124E44 @ =sub_8124E48 @@ -12684,7 +12684,7 @@ _08124E38: pop {r0} bx r0 .align 2, 0 -_08124E40: .4byte gUnknown_203B0A0 +_08124E40: .4byte gPartyMenu _08124E44: .4byte sub_8124E48 thumb_func_end sub_8124DE0 @@ -12704,7 +12704,7 @@ sub_8124E48: @ 8124E48 bl sub_811D178 cmp r0, 0x1 bne _08124EC8 - ldr r0, _08124EC0 @ =gUnknown_203B0A0 + ldr r0, _08124EC0 @ =gPartyMenu mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -12743,23 +12743,23 @@ _08124EB0: b _08124EE6 .align 2, 0 _08124EBC: .4byte gSpecialVar_ItemId -_08124EC0: .4byte gUnknown_203B0A0 +_08124EC0: .4byte gPartyMenu _08124EC4: .4byte gPlayerParty _08124EC8: - ldr r2, _08124EF4 @ =gUnknown_203B0A0 + ldr r2, _08124EF4 @ =gPartyMenu ldrb r0, [r2, 0x8] lsls r0, 28 lsrs r0, 28 ldrb r3, [r2, 0x9] movs r1, 0x7F str r1, [sp] - ldr r1, _08124EF8 @ =sub_8124FC8 + ldr r1, _08124EF8 @ =Task_SetSacredAshCB str r1, [sp, 0x4] ldr r1, [r2] str r1, [sp, 0x8] movs r1, 0xFF movs r2, 0 - bl PartyMenuInit + bl InitPartyMenu _08124EE6: add sp, 0xC pop {r3} @@ -12768,8 +12768,8 @@ _08124EE6: pop {r0} bx r0 .align 2, 0 -_08124EF4: .4byte gUnknown_203B0A0 -_08124EF8: .4byte sub_8124FC8 +_08124EF4: .4byte gPartyMenu +_08124EF8: .4byte Task_SetSacredAshCB thumb_func_end sub_8124E48 thumb_func_start sub_8124EFC @@ -12781,7 +12781,7 @@ sub_8124EFC: @ 8124EFC bl sub_811D178 cmp r0, 0x1 bne _08124F94 - ldr r0, _08124F88 @ =gUnknown_203B0A0 + ldr r0, _08124F88 @ =gPartyMenu mov r8, r0 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -12835,11 +12835,11 @@ _08124F7C: bl SetMainCallback2 b _08124FB2 .align 2, 0 -_08124F88: .4byte gUnknown_203B0A0 +_08124F88: .4byte gPartyMenu _08124F8C: .4byte gPlayerParty _08124F90: .4byte gSpecialVar_ItemId _08124F94: - ldr r4, _08124FC0 @ =gUnknown_203B0A0 + ldr r4, _08124FC0 @ =gPartyMenu ldrb r0, [r4, 0x8] lsls r0, 28 lsrs r0, 28 @@ -12847,12 +12847,12 @@ _08124F94: ldrb r3, [r4, 0x9] movs r1, 0x7F str r1, [sp] - ldr r1, _08124FC4 @ =sub_8124FC8 + ldr r1, _08124FC4 @ =Task_SetSacredAshCB str r1, [sp, 0x4] ldr r1, [r4] str r1, [sp, 0x8] movs r1, 0xFF - bl PartyMenuInit + bl InitPartyMenu _08124FB2: add sp, 0xC pop {r3} @@ -12861,12 +12861,12 @@ _08124FB2: pop {r0} bx r0 .align 2, 0 -_08124FC0: .4byte gUnknown_203B0A0 -_08124FC4: .4byte sub_8124FC8 +_08124FC0: .4byte gPartyMenu +_08124FC4: .4byte Task_SetSacredAshCB thumb_func_end sub_8124EFC - thumb_func_start sub_8124FC8 -sub_8124FC8: @ 8124FC8 + thumb_func_start Task_SetSacredAshCB +Task_SetSacredAshCB: @ 8124FC8 push {lr} lsls r0, 24 lsrs r3, r0, 24 @@ -12876,19 +12876,19 @@ sub_8124FC8: @ 8124FC8 ands r0, r1 cmp r0, 0 bne _08124FFA - ldr r0, _08125004 @ =gUnknown_203B0A0 + ldr r0, _08125004 @ =gPartyMenu ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 bne _08124FEE - ldr r0, _08125008 @ =gUnknown_203B09C + ldr r0, _08125008 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _0812500C @ =sub_8128184 + ldr r0, _0812500C @ =CB2_SetUpExitToBattleScreen str r0, [r1, 0x4] _08124FEE: - ldr r0, _08125010 @ =gUnknown_3005E98 - ldr r1, _08125014 @ =sub_81255BC + ldr r0, _08125010 @ =gItemUseCB + ldr r1, _08125014 @ =Task_ClosePartyMenuAfterText ldr r2, [r0] adds r0, r3, 0 bl _call_via_r2 @@ -12897,12 +12897,12 @@ _08124FFA: bx r0 .align 2, 0 _08125000: .4byte gPaletteFade -_08125004: .4byte gUnknown_203B0A0 -_08125008: .4byte gUnknown_203B09C -_0812500C: .4byte sub_8128184 -_08125010: .4byte gUnknown_3005E98 -_08125014: .4byte sub_81255BC - thumb_func_end sub_8124FC8 +_08125004: .4byte gPartyMenu +_08125008: .4byte sPartyMenuInternal +_0812500C: .4byte CB2_SetUpExitToBattleScreen +_08125010: .4byte gItemUseCB +_08125014: .4byte Task_ClosePartyMenuAfterText + thumb_func_end Task_SetSacredAshCB thumb_func_start IsHPRecoveryItem IsHPRecoveryItem: @ 8125018 @@ -12985,147 +12985,147 @@ _0812507C: .4byte _081251F0 _081250C8: ldr r0, _081250D4 @ =gStringVar4 - ldr r1, _081250D8 @ =gUnknown_8416F4E + ldr r1, _081250D8 @ =gText_PkmnCuredOfPoison bl StringExpandPlaceholders b _0812520C .align 2, 0 _081250D4: .4byte gStringVar4 -_081250D8: .4byte gUnknown_8416F4E +_081250D8: .4byte gText_PkmnCuredOfPoison _081250DC: ldr r0, _081250E8 @ =gStringVar4 - ldr r1, _081250EC @ =gUnknown_8416F8C + ldr r1, _081250EC @ =gText_PkmnWokeUp2 bl StringExpandPlaceholders b _0812520C .align 2, 0 _081250E8: .4byte gStringVar4 -_081250EC: .4byte gUnknown_8416F8C +_081250EC: .4byte gText_PkmnWokeUp2 _081250F0: ldr r0, _081250FC @ =gStringVar4 - ldr r1, _08125100 @ =gUnknown_8416F9A + ldr r1, _08125100 @ =gText_PkmnBurnHealed bl StringExpandPlaceholders b _0812520C .align 2, 0 _081250FC: .4byte gStringVar4 -_08125100: .4byte gUnknown_8416F9A +_08125100: .4byte gText_PkmnBurnHealed _08125104: ldr r0, _08125110 @ =gStringVar4 - ldr r1, _08125114 @ =gUnknown_8416FB2 + ldr r1, _08125114 @ =gText_PkmnThawedOut bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125110: .4byte gStringVar4 -_08125114: .4byte gUnknown_8416FB2 +_08125114: .4byte gText_PkmnThawedOut _08125118: ldr r0, _08125124 @ =gStringVar4 - ldr r1, _08125128 @ =gUnknown_8416F6F + ldr r1, _08125128 @ =gText_PkmnCuredOfParalysis bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125124: .4byte gStringVar4 -_08125128: .4byte gUnknown_8416F6F +_08125128: .4byte gText_PkmnCuredOfParalysis _0812512C: ldr r0, _08125138 @ =gStringVar4 - ldr r1, _0812513C @ =gUnknown_8417052 + ldr r1, _0812513C @ =gText_PkmnSnappedOutOfConfusion bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125138: .4byte gStringVar4 -_0812513C: .4byte gUnknown_8417052 +_0812513C: .4byte gText_PkmnSnappedOutOfConfusion _08125140: ldr r0, _0812514C @ =gStringVar4 - ldr r1, _08125150 @ =gUnknown_8417075 + ldr r1, _08125150 @ =gText_PkmnGotOverInfatuation bl StringExpandPlaceholders b _0812520C .align 2, 0 _0812514C: .4byte gStringVar4 -_08125150: .4byte gUnknown_8417075 +_08125150: .4byte gText_PkmnGotOverInfatuation _08125154: ldr r0, _08125160 @ =gStringVar4 - ldr r1, _08125164 @ =gUnknown_8416FED + ldr r1, _08125164 @ =gText_PkmnBecameHealthy bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125160: .4byte gStringVar4 -_08125164: .4byte gUnknown_8416FED +_08125164: .4byte gText_PkmnBecameHealthy _08125168: ldr r0, _08125170 @ =gStringVar2 - ldr r1, _08125174 @ =gUnknown_84169C2 + ldr r1, _08125174 @ =gText_HP3 b _081251BC .align 2, 0 _08125170: .4byte gStringVar2 -_08125174: .4byte gUnknown_84169C2 +_08125174: .4byte gText_HP3 _08125178: ldr r0, _08125180 @ =gStringVar2 - ldr r1, _08125184 @ =gUnknown_8417674 + ldr r1, _08125184 @ =gText_Attack3 b _081251BC .align 2, 0 _08125180: .4byte gStringVar2 -_08125184: .4byte gUnknown_8417674 +_08125184: .4byte gText_Attack3 _08125188: ldr r0, _08125190 @ =gStringVar2 - ldr r1, _08125194 @ =gUnknown_841767B + ldr r1, _08125194 @ =gText_Defense3 b _081251BC .align 2, 0 _08125190: .4byte gStringVar2 -_08125194: .4byte gUnknown_841767B +_08125194: .4byte gText_Defense3 _08125198: ldr r0, _081251A0 @ =gStringVar2 - ldr r1, _081251A4 @ =gUnknown_841768D + ldr r1, _081251A4 @ =gText_Speed2 b _081251BC .align 2, 0 _081251A0: .4byte gStringVar2 -_081251A4: .4byte gUnknown_841768D +_081251A4: .4byte gText_Speed2 _081251A8: ldr r0, _081251B0 @ =gStringVar2 - ldr r1, _081251B4 @ =gUnknown_84169C5 + ldr r1, _081251B4 @ =gText_SpAtk3 b _081251BC .align 2, 0 _081251B0: .4byte gStringVar2 -_081251B4: .4byte gUnknown_84169C5 +_081251B4: .4byte gText_SpAtk3 _081251B8: ldr r0, _081251CC @ =gStringVar2 - ldr r1, _081251D0 @ =gUnknown_84169CD + ldr r1, _081251D0 @ =gText_SpDef3 _081251BC: bl StringCopy ldr r0, _081251D4 @ =gStringVar4 - ldr r1, _081251D8 @ =gUnknown_8417032 + ldr r1, _081251D8 @ =gText_PkmnBaseVar2StatIncreased bl StringExpandPlaceholders b _0812520C .align 2, 0 _081251CC: .4byte gStringVar2 -_081251D0: .4byte gUnknown_84169CD +_081251D0: .4byte gText_SpDef3 _081251D4: .4byte gStringVar4 -_081251D8: .4byte gUnknown_8417032 +_081251D8: .4byte gText_PkmnBaseVar2StatIncreased _081251DC: ldr r0, _081251E8 @ =gStringVar4 - ldr r1, _081251EC @ =gUnknown_8417002 + ldr r1, _081251EC @ =gText_MovesPPIncreased bl StringExpandPlaceholders b _0812520C .align 2, 0 _081251E8: .4byte gStringVar4 -_081251EC: .4byte gUnknown_8417002 +_081251EC: .4byte gText_MovesPPIncreased _081251F0: ldr r0, _081251FC @ =gStringVar4 - ldr r1, _08125200 @ =gUnknown_8416FC7 + ldr r1, _08125200 @ =gText_PPWasRestored bl StringExpandPlaceholders b _0812520C .align 2, 0 _081251FC: .4byte gStringVar4 -_08125200: .4byte gUnknown_8416FC7 +_08125200: .4byte gText_PPWasRestored _08125204: ldr r0, _08125210 @ =gStringVar4 - ldr r1, _08125214 @ =gUnknown_84169DC + ldr r1, _08125214 @ =gText_WontHaveEffect bl StringExpandPlaceholders _0812520C: pop {r0} bx r0 .align 2, 0 _08125210: .4byte gStringVar4 -_08125214: .4byte gUnknown_84169DC +_08125214: .4byte gText_WontHaveEffect thumb_func_end GetMedicineItemEffectMessage - thumb_func_start UsingHPEVItemOnShedinja -UsingHPEVItemOnShedinja: @ 8125218 + thumb_func_start NotUsingHPEVItemOnShedinja +NotUsingHPEVItemOnShedinja: @ 8125218 push {r4,lr} adds r4, r0, 0 lsls r0, r1, 16 @@ -13151,10 +13151,10 @@ _08125246: pop {r4} pop {r1} bx r1 - thumb_func_end UsingHPEVItemOnShedinja + thumb_func_end NotUsingHPEVItemOnShedinja - thumb_func_start IsBlueYellowRedFlute -IsBlueYellowRedFlute: @ 812524C + thumb_func_start IsItemFlute +IsItemFlute: @ 812524C push {lr} lsls r0, 16 lsrs r0, 16 @@ -13172,10 +13172,10 @@ _08125262: _08125264: pop {r1} bx r1 - thumb_func_end IsBlueYellowRedFlute + thumb_func_end IsItemFlute - thumb_func_start ExecuteTableBasedItemEffect__ -ExecuteTableBasedItemEffect__: @ 8125268 + thumb_func_start ExecuteTableBasedItemEffect_ +ExecuteTableBasedItemEffect_: @ 8125268 push {r4-r6,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -13209,7 +13209,7 @@ _081252A0: ldr r0, _081252CC @ =gPlayerParty adds r4, r0 adds r0, r3, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -13225,7 +13225,7 @@ _081252BA: bx r1 .align 2, 0 _081252CC: .4byte gPlayerParty - thumb_func_end ExecuteTableBasedItemEffect__ + thumb_func_end ExecuteTableBasedItemEffect_ thumb_func_start sub_81252D0 sub_81252D0: @ 81252D0 @@ -13235,7 +13235,7 @@ sub_81252D0: @ 81252D0 mov r8, r1 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08125300 @ =gUnknown_203B0A0 + ldr r0, _08125300 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -13246,14 +13246,14 @@ sub_81252D0: @ 81252D0 ldrh r6, [r0] adds r0, r5, 0 adds r1, r6, 0 - bl UsingHPEVItemOnShedinja + bl NotUsingHPEVItemOnShedinja lsls r0, 24 cmp r0, 0 bne _0812530C movs r4, 0x1 b _08125342 .align 2, 0 -_08125300: .4byte gUnknown_203B0A0 +_08125300: .4byte gPartyMenu _08125304: .4byte gPlayerParty _08125308: .4byte gSpecialVar_ItemId _0812530C: @@ -13273,7 +13273,7 @@ _0812530C: movs r1, 0x3A bl GetMonData _08125330: - ldr r0, _08125370 @ =gUnknown_203B0A0 + ldr r0, _08125370 @ =gPartyMenu ldrb r2, [r0, 0x9] adds r0, r5, 0 adds r1, r6, 0 @@ -13286,12 +13286,12 @@ _08125342: bl PlaySE cmp r4, 0 beq _08125380 - ldr r1, _08125374 @ =gUnknown_203B0C0 + ldr r1, _08125374 @ =gPartyMenuUseExitCallback movs r0, 0 strb r0, [r1] - ldr r0, _08125378 @ =gUnknown_84169DC + ldr r0, _08125378 @ =gText_WontHaveEffect movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _0812537C @ =gTasks @@ -13303,9 +13303,9 @@ _08125342: str r1, [r0] b _08125398 .align 2, 0 -_08125370: .4byte gUnknown_203B0A0 -_08125374: .4byte gUnknown_203B0C0 -_08125378: .4byte gUnknown_84169DC +_08125370: .4byte gPartyMenu +_08125374: .4byte gPartyMenuUseExitCallback +_08125378: .4byte gText_WontHaveEffect _0812537C: .4byte gTasks _08125380: ldr r3, _081253A4 @ =0x0000ffff @@ -13315,7 +13315,7 @@ _08125380: bl ItemUse_SetQuestLogEvent adds r0, r7, 0 bl sub_8124DC0 - ldr r1, _081253A8 @ =gUnknown_3005E98 + ldr r1, _081253A8 @ =gItemUseCB ldr r0, _081253AC @ =ItemUseCB_Medicine str r0, [r1] _08125398: @@ -13326,7 +13326,7 @@ _08125398: bx r0 .align 2, 0 _081253A4: .4byte 0x0000ffff -_081253A8: .4byte gUnknown_3005E98 +_081253A8: .4byte gItemUseCB _081253AC: .4byte ItemUseCB_Medicine thumb_func_end sub_81252D0 @@ -13344,7 +13344,7 @@ ItemUseCB_Medicine: @ 81253B0 mov r9, r0 movs r0, 0 mov r10, r0 - ldr r0, _08125438 @ =gUnknown_203B0A0 + ldr r0, _08125438 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -13355,7 +13355,7 @@ ItemUseCB_Medicine: @ 81253B0 ldrh r6, [r0] adds r0, r5, 0 adds r1, r6, 0 - bl UsingHPEVItemOnShedinja + bl NotUsingHPEVItemOnShedinja lsls r0, 24 cmp r0, 0 beq _08125428 @@ -13380,34 +13380,34 @@ ItemUseCB_Medicine: @ 81253B0 movs r1, 0 mov r8, r1 _08125416: - ldr r4, _08125438 @ =gUnknown_203B0A0 + ldr r4, _08125438 @ =gPartyMenu ldrb r0, [r4, 0x9] adds r1, r6, 0 movs r2, 0 - bl ExecuteTableBasedItemEffect__ + bl ExecuteTableBasedItemEffect_ lsls r0, 24 cmp r0, 0 beq _0812544C _08125428: - ldr r1, _08125444 @ =gUnknown_203B0C0 + ldr r1, _08125444 @ =gPartyMenuUseExitCallback movs r0, 0 strb r0, [r1] movs r0, 0x5 bl PlaySE - ldr r0, _08125448 @ =gUnknown_84169DC + ldr r0, _08125448 @ =gText_WontHaveEffect b _0812551C .align 2, 0 -_08125438: .4byte gUnknown_203B0A0 +_08125438: .4byte gPartyMenu _0812543C: .4byte gPlayerParty _08125440: .4byte gSpecialVar_ItemId -_08125444: .4byte gUnknown_203B0C0 -_08125448: .4byte gUnknown_84169DC +_08125444: .4byte gPartyMenuUseExitCallback +_08125448: .4byte gText_WontHaveEffect _0812544C: - ldr r1, _08125474 @ =gUnknown_203B0C0 + ldr r1, _08125474 @ =gPartyMenuUseExitCallback movs r0, 0x1 strb r0, [r1] adds r0, r6, 0 - bl IsBlueYellowRedFlute + bl IsItemFlute lsls r0, 24 cmp r0, 0 bne _08125478 @@ -13421,20 +13421,20 @@ _0812544C: bl RemoveBagItem b _0812547E .align 2, 0 -_08125474: .4byte gUnknown_203B0C0 +_08125474: .4byte gPartyMenuUseExitCallback _08125478: movs r0, 0x6E bl PlaySE _0812547E: - ldr r4, _081254FC @ =gUnknown_203B0B4 - ldr r7, _08125500 @ =gUnknown_203B0A0 + ldr r4, _081254FC @ =sPartyMenuBoxes + ldr r7, _08125500 @ =gPartyMenu movs r0, 0x9 ldrsb r0, [r7, r0] lsls r0, 4 ldr r1, [r4] adds r1, r0 adds r0, r5, 0 - bl party_menu_get_status_condition_and_update_object + bl SetPartyMonAilmentGfx ldr r2, _08125504 @ =gSprites movs r0, 0x9 ldrsb r0, [r7, r0] @@ -13454,7 +13454,7 @@ _0812547E: adds r0, r5, 0 adds r1, r3, 0 movs r2, 0x1 - bl sub_8121790 + bl DisplayPartyPokemonLevelCheck _081254BC: mov r2, r8 cmp r2, 0x1 @@ -13464,7 +13464,7 @@ _081254BC: bne _081254D0 ldrb r0, [r7, 0x9] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot _081254D0: adds r0, r5, 0 movs r1, 0x39 @@ -13475,21 +13475,21 @@ _081254D0: lsls r3, 16 asrs r3, 16 ldrb r1, [r7, 0x9] - ldr r0, _08125508 @ =sub_8125554 + ldr r0, _08125508 @ =Task_DisplayHPRestoredMessage str r0, [sp] mov r0, r9 movs r2, 0x1 - bl sub_8120760 + bl PartyMenuModifyHP mov r0, r9 movs r1, 0 mov r2, r10 - bl sub_81207F0 + bl ResetHPTaskData b _08125538 .align 2, 0 -_081254FC: .4byte gUnknown_203B0B4 -_08125500: .4byte gUnknown_203B0A0 +_081254FC: .4byte sPartyMenuBoxes +_08125500: .4byte gPartyMenu _08125504: .4byte gSprites -_08125508: .4byte sub_8125554 +_08125508: .4byte Task_DisplayHPRestoredMessage _0812550C: ldr r1, _08125548 @ =gStringVar1 adds r0, r5, 0 @@ -13499,7 +13499,7 @@ _0812550C: ldr r0, _0812554C @ =gStringVar4 _0812551C: movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08125550 @ =gTasks @@ -13525,13 +13525,13 @@ _0812554C: .4byte gStringVar4 _08125550: .4byte gTasks thumb_func_end ItemUseCB_Medicine - thumb_func_start sub_8125554 -sub_8125554: @ 8125554 + thumb_func_start Task_DisplayHPRestoredMessage +Task_DisplayHPRestoredMessage: @ 8125554 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081255A0 @ =gUnknown_203B0A0 + ldr r0, _081255A0 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -13541,12 +13541,12 @@ sub_8125554: @ 8125554 ldr r1, _081255A8 @ =gStringVar1 bl GetMonNickname ldr r4, _081255AC @ =gStringVar4 - ldr r1, _081255B0 @ =gUnknown_8416F27 + ldr r1, _081255B0 @ =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram bl HandleBattleLowHpMusicChange @@ -13555,52 +13555,52 @@ sub_8125554: @ 8125554 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081255B8 @ =sub_81255BC + ldr r1, _081255B8 @ =Task_ClosePartyMenuAfterText str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081255A0: .4byte gUnknown_203B0A0 +_081255A0: .4byte gPartyMenu _081255A4: .4byte gPlayerParty _081255A8: .4byte gStringVar1 _081255AC: .4byte gStringVar4 -_081255B0: .4byte gUnknown_8416F27 +_081255B0: .4byte gText_PkmnHPRestoredByVar2 _081255B4: .4byte gTasks -_081255B8: .4byte sub_81255BC - thumb_func_end sub_8125554 +_081255B8: .4byte Task_ClosePartyMenuAfterText + thumb_func_end Task_DisplayHPRestoredMessage - thumb_func_start sub_81255BC -sub_81255BC: @ 81255BC + thumb_func_start Task_ClosePartyMenuAfterText +Task_ClosePartyMenuAfterText: @ 81255BC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081255E2 - ldr r0, _081255E8 @ =gUnknown_203B0C0 + ldr r0, _081255E8 @ =gPartyMenuUseExitCallback ldrb r1, [r0] cmp r1, 0 bne _081255DC - ldr r0, _081255EC @ =gUnknown_203B09C + ldr r0, _081255EC @ =sPartyMenuInternal ldr r0, [r0] str r1, [r0, 0x4] _081255DC: adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _081255E2: pop {r4} pop {r0} bx r0 .align 2, 0 -_081255E8: .4byte gUnknown_203B0C0 -_081255EC: .4byte gUnknown_203B09C - thumb_func_end sub_81255BC +_081255E8: .4byte gPartyMenuUseExitCallback +_081255EC: .4byte sPartyMenuInternal + thumb_func_end Task_ClosePartyMenuAfterText - thumb_func_start sub_81255F0 -sub_81255F0: @ 81255F0 + thumb_func_start ShowMoveSelectWindow +ShowMoveSelectWindow: @ 81255F0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -13615,7 +13615,7 @@ sub_81255F0: @ 81255F0 movs r1, 0x2 mov r8, r1 movs r0, 0x3 - bl sub_8121E5C + bl DisplaySelectionWindow lsls r0, 24 lsrs r0, 24 mov r9, r0 @@ -13698,10 +13698,10 @@ _08125680: .align 2, 0 _081256B8: .4byte gPlayerParty _081256BC: .4byte gMoveNames - thumb_func_end sub_81255F0 + thumb_func_end ShowMoveSelectWindow - thumb_func_start sub_81256C0 -sub_81256C0: @ 81256C0 + thumb_func_start Task_HandleWhichMoveInput +Task_HandleWhichMoveInput: @ 81256C0 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -13719,19 +13719,19 @@ sub_81256C0: @ 81256C0 movs r0, 0x5 bl PlaySE adds r0, r4, 0 - bl sub_81257D4 + bl ReturnToUseOnWhichMon b _081256F2 _081256EC: adds r0, r5, 0 - bl sub_8125790 + bl SetSelectedMoveForPPItem _081256F2: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_81256C0 + thumb_func_end Task_HandleWhichMoveInput - thumb_func_start ItemUseCB_PpRestore -ItemUseCB_PpRestore: @ 81256F8 + thumb_func_start ItemUseCB_PPRecovery +ItemUseCB_PPRecovery: @ 81256F8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -13762,7 +13762,7 @@ _08125726: lsrs r1, r0, 24 cmp r1, 0 bne _0812575C - ldr r0, _08125750 @ =gUnknown_203B0A0 + ldr r0, _08125750 @ =gPartyMenu strh r1, [r0, 0xE] ldrb r1, [r0, 0x8] movs r0, 0xF @@ -13770,11 +13770,11 @@ _08125726: cmp r0, 0x1 bne _08125754 adds r0, r4, 0 - bl sub_8125958 + bl TryUsePPItem b _0812577E .align 2, 0 _0812574C: .4byte gItemEffectTable -_08125750: .4byte gUnknown_203B0A0 +_08125750: .4byte gPartyMenu _08125754: adds r0, r4, 0 bl sub_812580C @@ -13783,38 +13783,38 @@ _0812575C: movs r0, 0x5 bl PlaySE movs r0, 0x17 - bl sub_8121D0C - ldr r0, _08125784 @ =gUnknown_203B0A0 + bl DisplayPartyMenuStdMessage + ldr r0, _08125784 @ =gPartyMenu ldrb r0, [r0, 0x9] - bl sub_81255F0 + bl ShowMoveSelectWindow ldr r1, _08125788 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0812578C @ =sub_81256C0 + ldr r1, _0812578C @ =Task_HandleWhichMoveInput str r1, [r0] _0812577E: pop {r4} pop {r0} bx r0 .align 2, 0 -_08125784: .4byte gUnknown_203B0A0 +_08125784: .4byte gPartyMenu _08125788: .4byte gTasks -_0812578C: .4byte sub_81256C0 - thumb_func_end ItemUseCB_PpRestore +_0812578C: .4byte Task_HandleWhichMoveInput + thumb_func_end ItemUseCB_PPRecovery - thumb_func_start sub_8125790 -sub_8125790: @ 8125790 + thumb_func_start SetSelectedMoveForPPItem +SetSelectedMoveForPPItem: @ 8125790 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081257C0 @ =gUnknown_203B09C + ldr r0, _081257C0 @ =sPartyMenuInternal ldr r0, [r0] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow bl Menu_GetCursorPos - ldr r1, _081257C4 @ =gUnknown_203B0A0 + ldr r1, _081257C4 @ =gPartyMenu lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0xE] @@ -13824,11 +13824,11 @@ sub_8125790: @ 8125790 cmp r0, 0x1 bne _081257C8 adds r0, r4, 0 - bl sub_8125958 + bl TryUsePPItem b _081257CE .align 2, 0 -_081257C0: .4byte gUnknown_203B09C -_081257C4: .4byte gUnknown_203B0A0 +_081257C0: .4byte sPartyMenuInternal +_081257C4: .4byte gPartyMenu _081257C8: adds r0, r4, 0 bl sub_812580C @@ -13836,10 +13836,10 @@ _081257CE: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8125790 + thumb_func_end SetSelectedMoveForPPItem - thumb_func_start sub_81257D4 -sub_81257D4: @ 81257D4 + thumb_func_start ReturnToUseOnWhichMon +ReturnToUseOnWhichMon: @ 81257D4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -13848,30 +13848,30 @@ sub_81257D4: @ 81257D4 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08125804 @ =sub_811FB28 + ldr r0, _08125804 @ =Task_HandleChooseMonInput str r0, [r1] - ldr r0, _08125808 @ =gUnknown_203B09C + ldr r0, _08125808 @ =sPartyMenuInternal ldr r0, [r0] movs r1, 0 str r1, [r0, 0x4] adds r0, 0xC - bl sub_8121CE4 + bl PartyMenuRemoveWindow movs r0, 0x5 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage pop {r0} bx r0 .align 2, 0 _08125800: .4byte gTasks -_08125804: .4byte sub_811FB28 -_08125808: .4byte gUnknown_203B09C - thumb_func_end sub_81257D4 +_08125804: .4byte Task_HandleChooseMonInput +_08125808: .4byte sPartyMenuInternal + thumb_func_end ReturnToUseOnWhichMon thumb_func_start sub_812580C sub_812580C: @ 812580C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _08125860 @ =gUnknown_203B0A0 + ldr r3, _08125860 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r3, r1] movs r0, 0x64 @@ -13890,12 +13890,12 @@ sub_812580C: @ 812580C bl PlaySE cmp r4, 0 beq _0812587C - ldr r1, _0812586C @ =gUnknown_203B0C0 + ldr r1, _0812586C @ =gPartyMenuUseExitCallback movs r0, 0 strb r0, [r1] - ldr r0, _08125870 @ =gUnknown_84169DC + ldr r0, _08125870 @ =gText_WontHaveEffect movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08125874 @ =gTasks @@ -13903,21 +13903,21 @@ sub_812580C: @ 812580C adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08125878 @ =sub_81255BC + ldr r1, _08125878 @ =Task_ClosePartyMenuAfterText str r1, [r0] b _08125888 .align 2, 0 -_08125860: .4byte gUnknown_203B0A0 +_08125860: .4byte gPartyMenu _08125864: .4byte gPlayerParty _08125868: .4byte gSpecialVar_ItemId -_0812586C: .4byte gUnknown_203B0C0 -_08125870: .4byte gUnknown_84169DC +_0812586C: .4byte gPartyMenuUseExitCallback +_08125870: .4byte gText_WontHaveEffect _08125874: .4byte gTasks -_08125878: .4byte sub_81255BC +_08125878: .4byte Task_ClosePartyMenuAfterText _0812587C: adds r0, r5, 0 bl sub_8124DC0 - ldr r1, _08125890 @ =gUnknown_3005E98 + ldr r1, _08125890 @ =gItemUseCB ldr r0, _08125894 @ =sub_8125898 str r0, [r1] _08125888: @@ -13925,7 +13925,7 @@ _08125888: pop {r0} bx r0 .align 2, 0 -_08125890: .4byte gUnknown_3005E98 +_08125890: .4byte gItemUseCB _08125894: .4byte sub_8125898 thumb_func_end sub_812580C @@ -13938,7 +13938,7 @@ sub_8125898: @ 8125898 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r5, _08125930 @ =gUnknown_203B0A0 + ldr r5, _08125930 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r5, r1] movs r0, 0x64 @@ -13950,8 +13950,8 @@ sub_8125898: @ 8125898 ldr r6, _08125938 @ =gSpecialVar_ItemId ldrh r1, [r6] ldrb r2, [r5, 0xE] - bl ExecuteTableBasedItemEffect__ - ldr r1, _0812593C @ =gUnknown_203B0C0 + bl ExecuteTableBasedItemEffect_ + ldr r1, _0812593C @ =gPartyMenuUseExitCallback movs r0, 0x1 strb r0, [r1] ldrh r2, [r6] @@ -13982,7 +13982,7 @@ sub_8125898: @ 8125898 bl GetMedicineItemEffectMessage ldr r0, _0812594C @ =gStringVar4 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08125950 @ =gTasks @@ -13991,7 +13991,7 @@ sub_8125898: @ 8125898 add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, _08125954 @ =sub_81255BC + ldr r1, _08125954 @ =Task_ClosePartyMenuAfterText str r1, [r0] pop {r3} mov r8, r3 @@ -13999,20 +13999,20 @@ sub_8125898: @ 8125898 pop {r0} bx r0 .align 2, 0 -_08125930: .4byte gUnknown_203B0A0 +_08125930: .4byte gPartyMenu _08125934: .4byte gPlayerParty _08125938: .4byte gSpecialVar_ItemId -_0812593C: .4byte gUnknown_203B0C0 +_0812593C: .4byte gPartyMenuUseExitCallback _08125940: .4byte 0x0000ffff _08125944: .4byte gStringVar1 _08125948: .4byte gMoveNames _0812594C: .4byte gStringVar4 _08125950: .4byte gTasks -_08125954: .4byte sub_81255BC +_08125954: .4byte Task_ClosePartyMenuAfterText thumb_func_end sub_8125898 - thumb_func_start sub_8125958 -sub_8125958: @ 8125958 + thumb_func_start TryUsePPItem +TryUsePPItem: @ 8125958 push {r4-r7,lr} mov r7, r8 push {r7} @@ -14029,23 +14029,23 @@ sub_8125958: @ 8125958 ldrb r0, [r0, 0x9] ldrb r2, [r7] adds r1, r5, 0 - bl ExecuteTableBasedItemEffect__ + bl ExecuteTableBasedItemEffect_ lsls r0, 24 cmp r0, 0 beq _081259A0 - ldr r0, _08125998 @ =gUnknown_203B0C0 + ldr r0, _08125998 @ =gPartyMenuUseExitCallback strb r4, [r0] movs r0, 0x5 bl PlaySE - ldr r0, _0812599C @ =gUnknown_84169DC + ldr r0, _0812599C @ =gText_WontHaveEffect b _081259F6 .align 2, 0 _08125990: .4byte gUnknown_203B0AE _08125994: .4byte gSpecialVar_ItemId -_08125998: .4byte gUnknown_203B0C0 -_0812599C: .4byte gUnknown_84169DC +_08125998: .4byte gPartyMenuUseExitCallback +_0812599C: .4byte gText_WontHaveEffect _081259A0: - ldr r1, _08125A1C @ =gUnknown_203B0C0 + ldr r1, _08125A1C @ =gPartyMenuUseExitCallback movs r0, 0x1 strb r0, [r1] mov r0, r8 @@ -14084,7 +14084,7 @@ _081259A0: ldr r0, _08125A30 @ =gStringVar4 _081259F6: movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08125A34 @ =gTasks @@ -14092,7 +14092,7 @@ _081259F6: adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08125A38 @ =sub_81255BC + ldr r1, _08125A38 @ =Task_ClosePartyMenuAfterText str r1, [r0] pop {r3} mov r8, r3 @@ -14100,18 +14100,18 @@ _081259F6: pop {r0} bx r0 .align 2, 0 -_08125A1C: .4byte gUnknown_203B0C0 +_08125A1C: .4byte gPartyMenuUseExitCallback _08125A20: .4byte gPlayerParty _08125A24: .4byte 0x0000ffff _08125A28: .4byte gStringVar1 _08125A2C: .4byte gMoveNames _08125A30: .4byte gStringVar4 _08125A34: .4byte gTasks -_08125A38: .4byte sub_81255BC - thumb_func_end sub_8125958 +_08125A38: .4byte Task_ClosePartyMenuAfterText + thumb_func_end TryUsePPItem - thumb_func_start dp05_pp_up -dp05_pp_up: @ 8125A3C + thumb_func_start ItemUseCB_PPUp +ItemUseCB_PPUp: @ 8125A3C push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -14119,48 +14119,48 @@ dp05_pp_up: @ 8125A3C movs r0, 0x5 bl PlaySE movs r0, 0x18 - bl sub_8121D0C - ldr r0, _08125A6C @ =gUnknown_203B0A0 + bl DisplayPartyMenuStdMessage + ldr r0, _08125A6C @ =gPartyMenu ldrb r0, [r0, 0x9] - bl sub_81255F0 + bl ShowMoveSelectWindow ldr r1, _08125A70 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08125A74 @ =sub_81256C0 + ldr r1, _08125A74 @ =Task_HandleWhichMoveInput str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08125A6C: .4byte gUnknown_203B0A0 +_08125A6C: .4byte gPartyMenu _08125A70: .4byte gTasks -_08125A74: .4byte sub_81256C0 - thumb_func_end dp05_pp_up +_08125A74: .4byte Task_HandleWhichMoveInput + thumb_func_end ItemUseCB_PPUp thumb_func_start ItemIdToBattleMoveId ItemIdToBattleMoveId: @ 8125A78 lsls r0, 16 ldr r1, _08125A88 @ =0xfedf0000 adds r0, r1 - ldr r1, _08125A8C @ =gUnknown_845A80C + ldr r1, _08125A8C @ =sTMHMMoves lsrs r0, 15 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 _08125A88: .4byte 0xfedf0000 -_08125A8C: .4byte gUnknown_845A80C +_08125A8C: .4byte sTMHMMoves thumb_func_end ItemIdToBattleMoveId - thumb_func_start sub_8125A90 -sub_8125A90: @ 8125A90 + thumb_func_start IsMoveHm +IsMoveHm: @ 8125A90 push {lr} lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 - ldr r3, _08125AAC @ =gUnknown_845A80C + ldr r3, _08125AAC @ =sTMHMMoves _08125A9A: adds r0, r1, 0 adds r0, 0x32 @@ -14172,7 +14172,7 @@ _08125A9A: movs r0, 0x1 b _08125ABC .align 2, 0 -_08125AAC: .4byte gUnknown_845A80C +_08125AAC: .4byte sTMHMMoves _08125AB0: adds r0, r1, 0x1 lsls r0, 24 @@ -14183,7 +14183,7 @@ _08125AB0: _08125ABC: pop {r1} bx r1 - thumb_func_end sub_8125A90 + thumb_func_end IsMoveHm thumb_func_start MonKnowsMove MonKnowsMove: @ 8125AC0 @@ -14214,8 +14214,8 @@ _08125AE8: bx r1 thumb_func_end MonKnowsMove - thumb_func_start sub_8125AF0 -sub_8125AF0: @ 8125AF0 + thumb_func_start DisplayLearnMoveMessage +DisplayLearnMoveMessage: @ 8125AF0 push {r4,lr} adds r1, r0, 0 ldr r4, _08125B10 @ =gStringVar4 @@ -14223,7 +14223,7 @@ sub_8125AF0: @ 8125AF0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram pop {r4} @@ -14231,33 +14231,33 @@ sub_8125AF0: @ 8125AF0 bx r0 .align 2, 0 _08125B10: .4byte gStringVar4 - thumb_func_end sub_8125AF0 + thumb_func_end DisplayLearnMoveMessage - thumb_func_start sub_8125B14 -sub_8125B14: @ 8125B14 + thumb_func_start DisplayLearnMoveMessageAndClose +DisplayLearnMoveMessageAndClose: @ 8125B14 push {r4,lr} adds r4, r0, 0 adds r0, r1, 0 lsls r4, 24 lsrs r4, 24 - bl sub_8125AF0 + bl DisplayLearnMoveMessage ldr r1, _08125B38 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08125B3C @ =sub_81255BC + ldr r1, _08125B3C @ =Task_ClosePartyMenuAfterText str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 _08125B38: .4byte gTasks -_08125B3C: .4byte sub_81255BC - thumb_func_end sub_8125B14 +_08125B3C: .4byte Task_ClosePartyMenuAfterText + thumb_func_end DisplayLearnMoveMessageAndClose - thumb_func_start sub_8125B40 -sub_8125B40: @ 8125B40 + thumb_func_start ItemUseCB_TMHM +ItemUseCB_TMHM: @ 8125B40 push {r4-r7,lr} mov r7, r8 push {r7} @@ -14265,7 +14265,7 @@ sub_8125B40: @ 8125B40 lsrs r6, r0, 24 movs r0, 0x5 bl PlaySE - ldr r7, _08125BD0 @ =gUnknown_203B0A0 + ldr r7, _08125BD0 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 @@ -14297,7 +14297,7 @@ sub_8125B40: @ 8125B40 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8120B20 + bl CanMonLearnTMTutor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -14318,42 +14318,42 @@ sub_8125B40: @ 8125B40 bl ItemUse_SetQuestLogEvent adds r0, r6, 0 bl sub_8124DC0 - ldr r1, _08125BEC @ =gUnknown_3005E98 - ldr r0, _08125BF0 @ =sub_8125C38 + ldr r1, _08125BEC @ =gItemUseCB + ldr r0, _08125BF0 @ =Task_LearnedMove_ str r0, [r1] b _08125C20 .align 2, 0 -_08125BD0: .4byte gUnknown_203B0A0 +_08125BD0: .4byte gPartyMenu _08125BD4: .4byte gPlayerParty _08125BD8: .4byte gSpecialVar_ItemId _08125BDC: .4byte gStringVar1 _08125BE0: .4byte gStringVar2 _08125BE4: .4byte gMoveNames _08125BE8: .4byte 0x0000ffff -_08125BEC: .4byte gUnknown_3005E98 -_08125BF0: .4byte sub_8125C38 +_08125BEC: .4byte gItemUseCB +_08125BF0: .4byte Task_LearnedMove_ _08125BF4: - ldr r1, _08125BF8 @ =gUnknown_8416DC2 + ldr r1, _08125BF8 @ =gText_PkmnCantLearnMove b _08125BFE .align 2, 0 -_08125BF8: .4byte gUnknown_8416DC2 +_08125BF8: .4byte gText_PkmnCantLearnMove _08125BFC: - ldr r1, _08125C08 @ =gUnknown_8416F10 + ldr r1, _08125C08 @ =gText_PkmnAlreadyKnows _08125BFE: adds r0, r6, 0 - bl sub_8125B14 + bl DisplayLearnMoveMessageAndClose b _08125C20 .align 2, 0 -_08125C08: .4byte gUnknown_8416F10 +_08125C08: .4byte gText_PkmnAlreadyKnows _08125C0C: - ldr r0, _08125C2C @ =gUnknown_8416DF7 - bl sub_8125AF0 + ldr r0, _08125C2C @ =gText_PkmnNeedsToReplaceMove + bl DisplayLearnMoveMessage ldr r1, _08125C30 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08125C34 @ =sub_8125D88 + ldr r1, _08125C34 @ =Task_ReplaceMoveYesNo str r1, [r0] _08125C20: pop {r3} @@ -14362,27 +14362,27 @@ _08125C20: pop {r0} bx r0 .align 2, 0 -_08125C2C: .4byte gUnknown_8416DF7 +_08125C2C: .4byte gText_PkmnNeedsToReplaceMove _08125C30: .4byte gTasks -_08125C34: .4byte sub_8125D88 - thumb_func_end sub_8125B40 +_08125C34: .4byte Task_ReplaceMoveYesNo + thumb_func_end ItemUseCB_TMHM - thumb_func_start sub_8125C38 -sub_8125C38: @ 8125C38 + thumb_func_start Task_LearnedMove_ +Task_LearnedMove_: @ 8125C38 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_8125C48 + bl Task_LearnedMove pop {r0} bx r0 - thumb_func_end sub_8125C38 + thumb_func_end Task_LearnedMove_ - thumb_func_start sub_8125C48 -sub_8125C48: @ 8125C48 + thumb_func_start Task_LearnedMove +Task_LearnedMove: @ 8125C48 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _08125CCC @ =gUnknown_203B0A0 + ldr r2, _08125CCC @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r2, r1] movs r0, 0x64 @@ -14420,12 +14420,12 @@ _08125C84: adds r1, r2 bl StringCopy ldr r4, _08125CE4 @ =gStringVar4 - ldr r1, _08125CE8 @ =gUnknown_8416DB3 + ldr r1, _08125CE8 @ =gText_PkmnLearnedMove3 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08125CEC @ =gTasks @@ -14433,30 +14433,30 @@ _08125C84: adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _08125CF0 @ =sub_8125CF4 + ldr r1, _08125CF0 @ =Task_DoLearnedMoveFanfareAfterText str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08125CCC: .4byte gUnknown_203B0A0 +_08125CCC: .4byte gPartyMenu _08125CD0: .4byte gPlayerParty _08125CD4: .4byte gSpecialVar_ItemId _08125CD8: .4byte gStringVar1 _08125CDC: .4byte gStringVar2 _08125CE0: .4byte gMoveNames _08125CE4: .4byte gStringVar4 -_08125CE8: .4byte gUnknown_8416DB3 +_08125CE8: .4byte gText_PkmnLearnedMove3 _08125CEC: .4byte gTasks -_08125CF0: .4byte sub_8125CF4 - thumb_func_end sub_8125C48 +_08125CF0: .4byte Task_DoLearnedMoveFanfareAfterText + thumb_func_end Task_LearnedMove - thumb_func_start sub_8125CF4 -sub_8125CF4: @ 8125CF4 + thumb_func_start Task_DoLearnedMoveFanfareAfterText +Task_DoLearnedMoveFanfareAfterText: @ 8125CF4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -14468,7 +14468,7 @@ sub_8125CF4: @ 8125CF4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08125D28 @ =sub_8125D2C + ldr r1, _08125D28 @ =Task_LearnNextMoveOrClosePartyMenu str r1, [r0] _08125D1A: pop {r4} @@ -14477,11 +14477,11 @@ _08125D1A: .align 2, 0 _08125D20: .4byte 0x00000101 _08125D24: .4byte gTasks -_08125D28: .4byte sub_8125D2C - thumb_func_end sub_8125CF4 +_08125D28: .4byte Task_LearnNextMoveOrClosePartyMenu + thumb_func_end Task_DoLearnedMoveFanfareAfterText - thumb_func_start sub_8125D2C -sub_8125D2C: @ 8125D2C + thumb_func_start Task_LearnNextMoveOrClosePartyMenu +Task_LearnNextMoveOrClosePartyMenu: @ 8125D2C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -14502,17 +14502,17 @@ sub_8125D2C: @ 8125D2C cmp r0, 0 beq _08125D7E _08125D54: - ldr r0, _08125D6C @ =gUnknown_203B0A0 + ldr r0, _08125D6C @ =gPartyMenu movs r1, 0x10 ldrsh r0, [r0, r1] cmp r0, 0x1 bne _08125D70 adds r0, r4, 0 - bl sub_81266A0 + bl Task_TryLearningNextMove b _08125D7E .align 2, 0 _08125D68: .4byte gMain -_08125D6C: .4byte gUnknown_203B0A0 +_08125D6C: .4byte gPartyMenu _08125D70: cmp r0, 0x2 bne _08125D78 @@ -14520,32 +14520,32 @@ _08125D70: strh r2, [r0] _08125D78: adds r0, r5, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _08125D7E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 _08125D84: .4byte gSpecialVar_Result - thumb_func_end sub_8125D2C + thumb_func_end Task_LearnNextMoveOrClosePartyMenu - thumb_func_start sub_8125D88 -sub_8125D88: @ 8125D88 + thumb_func_start Task_ReplaceMoveYesNo +Task_ReplaceMoveYesNo: @ 8125D88 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08125DAC - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08125DB4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08125DB8 @ =sub_8125DBC + ldr r0, _08125DB8 @ =Task_HandleReplaceMoveYesNoInput str r0, [r1] _08125DAC: pop {r4} @@ -14553,11 +14553,11 @@ _08125DAC: bx r0 .align 2, 0 _08125DB4: .4byte gTasks -_08125DB8: .4byte sub_8125DBC - thumb_func_end sub_8125D88 +_08125DB8: .4byte Task_HandleReplaceMoveYesNoInput + thumb_func_end Task_ReplaceMoveYesNo - thumb_func_start sub_8125DBC -sub_8125DBC: @ 8125DBC + thumb_func_start Task_HandleReplaceMoveYesNoInput +Task_HandleReplaceMoveYesNoInput: @ 8125DBC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -14578,71 +14578,71 @@ _08125DDC: beq _08125E0E b _08125E14 _08125DE2: - ldr r0, _08125DFC @ =gUnknown_8416EA4 + ldr r0, _08125DFC @ =gText_WhichMoveToForget movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage ldr r1, _08125E00 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08125E04 @ =sub_8125E1C + ldr r1, _08125E04 @ =Task_ShowSummaryScreenToForgetMove str r1, [r0] b _08125E14 .align 2, 0 -_08125DFC: .4byte gUnknown_8416EA4 +_08125DFC: .4byte gText_WhichMoveToForget _08125E00: .4byte gTasks -_08125E04: .4byte sub_8125E1C +_08125E04: .4byte Task_ShowSummaryScreenToForgetMove _08125E08: movs r0, 0x5 bl PlaySE _08125E0E: adds r0, r4, 0 - bl sub_81260D8 + bl StopLearningMovePrompt _08125E14: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8125DBC + thumb_func_end Task_HandleReplaceMoveYesNoInput - thumb_func_start sub_8125E1C -sub_8125E1C: @ 8125E1C + thumb_func_start Task_ShowSummaryScreenToForgetMove +Task_ShowSummaryScreenToForgetMove: @ 8125E1C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08125E3C - ldr r0, _08125E44 @ =gUnknown_203B09C + ldr r0, _08125E44 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _08125E48 @ =sub_8125E4C + ldr r0, _08125E48 @ =CB2_ShowSummaryScreenToForgetMove str r0, [r1, 0x4] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _08125E3C: pop {r4} pop {r0} bx r0 .align 2, 0 -_08125E44: .4byte gUnknown_203B09C -_08125E48: .4byte sub_8125E4C - thumb_func_end sub_8125E1C +_08125E44: .4byte sPartyMenuInternal +_08125E48: .4byte CB2_ShowSummaryScreenToForgetMove + thumb_func_end Task_ShowSummaryScreenToForgetMove - thumb_func_start sub_8125E4C -sub_8125E4C: @ 8125E4C + thumb_func_start CB2_ShowSummaryScreenToForgetMove +CB2_ShowSummaryScreenToForgetMove: @ 8125E4C push {r4,lr} sub sp, 0x4 ldr r0, _08125E74 @ =gPlayerParty - ldr r4, _08125E78 @ =gUnknown_203B0A0 + ldr r4, _08125E78 @ =gPartyMenu ldrb r1, [r4, 0x9] ldr r2, _08125E7C @ =gPlayerPartyCount ldrb r2, [r2] subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _08125E80 @ =sub_8125E84 + ldr r3, _08125E80 @ =CB2_ReturnToPartyMenuWhileLearningMove ldrh r4, [r4, 0xE] str r4, [sp] bl ShowSelectMovePokemonSummaryScreen @@ -14652,19 +14652,19 @@ sub_8125E4C: @ 8125E4C bx r0 .align 2, 0 _08125E74: .4byte gPlayerParty -_08125E78: .4byte gUnknown_203B0A0 +_08125E78: .4byte gPartyMenu _08125E7C: .4byte gPlayerPartyCount -_08125E80: .4byte sub_8125E84 - thumb_func_end sub_8125E4C +_08125E80: .4byte CB2_ReturnToPartyMenuWhileLearningMove + thumb_func_end CB2_ShowSummaryScreenToForgetMove - thumb_func_start sub_8125E84 -sub_8125E84: @ 8125E84 + thumb_func_start CB2_ReturnToPartyMenuWhileLearningMove +CB2_ReturnToPartyMenuWhileLearningMove: @ 8125E84 push {r4,r5,lr} sub sp, 0xC bl GetMoveSlotToReplace lsls r0, 24 lsrs r2, r0, 24 - ldr r4, _08125ED0 @ =gUnknown_203B0A0 + ldr r4, _08125ED0 @ =gPartyMenu movs r0, 0x10 ldrsh r5, [r4, r0] cmp r5, 0 @@ -14688,43 +14688,43 @@ sub_8125E84: @ 8125E84 ldrh r1, [r1] ldr r3, _08125EDC @ =sub_8124EFC bl sub_811C568 - ldr r1, _08125EE0 @ =gUnknown_3005E98 + ldr r1, _08125EE0 @ =gItemUseCB ldr r0, _08125EE4 @ =sub_8125F4C str r0, [r1] strb r5, [r4, 0xB] b _08125F02 .align 2, 0 -_08125ED0: .4byte gUnknown_203B0A0 +_08125ED0: .4byte gPartyMenu _08125ED4: .4byte gPlayerParty _08125ED8: .4byte gSpecialVar_ItemId _08125EDC: .4byte sub_8124EFC -_08125EE0: .4byte gUnknown_3005E98 +_08125EE0: .4byte gItemUseCB _08125EE4: .4byte sub_8125F4C _08125EE8: movs r0, 0x7F str r0, [sp] - ldr r0, _08125F0C @ =sub_8125F14 + ldr r0, _08125F0C @ =Task_ReturnToPartyMenuWhileLearningMove str r0, [sp, 0x4] - ldr r0, _08125F10 @ =gUnknown_203B0A0 + ldr r0, _08125F10 @ =gPartyMenu ldr r0, [r0] str r0, [sp, 0x8] movs r0, 0 movs r1, 0 movs r2, 0 movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu _08125F02: add sp, 0xC pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08125F0C: .4byte sub_8125F14 -_08125F10: .4byte gUnknown_203B0A0 - thumb_func_end sub_8125E84 +_08125F0C: .4byte Task_ReturnToPartyMenuWhileLearningMove +_08125F10: .4byte gPartyMenu + thumb_func_end CB2_ReturnToPartyMenuWhileLearningMove - thumb_func_start sub_8125F14 -sub_8125F14: @ 8125F14 + thumb_func_start Task_ReturnToPartyMenuWhileLearningMove +Task_ReturnToPartyMenuWhileLearningMove: @ 8125F14 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -14741,18 +14741,18 @@ sub_8125F14: @ 8125F14 cmp r0, 0x4 beq _08125F40 adds r0, r4, 0 - bl sub_8125FFC + bl DisplayPartyMenuForgotMoveMessage b _08125F46 .align 2, 0 _08125F3C: .4byte gPaletteFade _08125F40: adds r0, r5, 0 - bl sub_81260D8 + bl StopLearningMovePrompt _08125F46: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_8125F14 + thumb_func_end Task_ReturnToPartyMenuWhileLearningMove thumb_func_start sub_8125F4C sub_8125F4C: @ 8125F4C @@ -14774,7 +14774,7 @@ sub_8125F5C: @ 8125F5C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _08125FE4 @ =gUnknown_203B0A0 + ldr r0, _08125FE4 @ =gPartyMenu mov r9, r0 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -14818,7 +14818,7 @@ sub_8125F5C: @ 8125F5C adds r2, r5, 0 bl SetMonMoveSlot mov r0, r8 - bl sub_8125C48 + bl Task_LearnedMove pop {r3,r4} mov r8, r3 mov r9, r4 @@ -14826,7 +14826,7 @@ sub_8125F5C: @ 8125F5C pop {r0} bx r0 .align 2, 0 -_08125FE4: .4byte gUnknown_203B0A0 +_08125FE4: .4byte gPartyMenu _08125FE8: .4byte gPlayerParty _08125FEC: .4byte gSpecialVar_ItemId _08125FF0: .4byte gStringVar1 @@ -14834,13 +14834,13 @@ _08125FF4: .4byte gStringVar2 _08125FF8: .4byte gMoveNames thumb_func_end sub_8125F5C - thumb_func_start sub_8125FFC -sub_8125FFC: @ 8125FFC + thumb_func_start DisplayPartyMenuForgotMoveMessage +DisplayPartyMenuForgotMoveMessage: @ 8125FFC push {r4-r6,lr} adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _0812605C @ =gUnknown_203B0A0 + ldr r0, _0812605C @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -14868,39 +14868,39 @@ sub_8125FFC: @ 8125FFC adds r1, r2 bl StringCopy ldr r0, _08126070 @ =gUnknown_8416EC6 - bl sub_8125AF0 + bl DisplayLearnMoveMessage ldr r1, _08126074 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08126078 @ =sub_812607C + ldr r1, _08126078 @ =Task_PartyMenuReplaceMove str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0812605C: .4byte gUnknown_203B0A0 +_0812605C: .4byte gPartyMenu _08126060: .4byte gPlayerParty _08126064: .4byte gStringVar1 _08126068: .4byte gStringVar2 _0812606C: .4byte gMoveNames _08126070: .4byte gUnknown_8416EC6 _08126074: .4byte gTasks -_08126078: .4byte sub_812607C - thumb_func_end sub_8125FFC +_08126078: .4byte Task_PartyMenuReplaceMove + thumb_func_end DisplayPartyMenuForgotMoveMessage - thumb_func_start sub_812607C -sub_812607C: @ 812607C + thumb_func_start Task_PartyMenuReplaceMove +Task_PartyMenuReplaceMove: @ 812607C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081260C8 - ldr r5, _081260D0 @ =gUnknown_203B0A0 + ldr r5, _081260D0 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r5, r1] movs r0, 0x64 @@ -14923,24 +14923,24 @@ sub_812607C: @ 812607C adds r1, r5, 0 bl SetMonMoveSlot adds r0, r6, 0 - bl sub_8125C48 + bl Task_LearnedMove _081260C8: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081260D0: .4byte gUnknown_203B0A0 +_081260D0: .4byte gPartyMenu _081260D4: .4byte gPlayerParty - thumb_func_end sub_812607C + thumb_func_end Task_PartyMenuReplaceMove - thumb_func_start sub_81260D8 -sub_81260D8: @ 81260D8 + thumb_func_start StopLearningMovePrompt +StopLearningMovePrompt: @ 81260D8 push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 ldr r0, _08126120 @ =gStringVar2 - ldr r1, _08126124 @ =gUnknown_203B0A0 + ldr r1, _08126124 @ =gPartyMenu movs r3, 0xE ldrsh r2, [r1, r3] movs r1, 0xD @@ -14949,12 +14949,12 @@ sub_81260D8: @ 81260D8 adds r1, r2 bl StringCopy ldr r4, _0812612C @ =gStringVar4 - ldr r1, _08126130 @ =gUnknown_8416E6B + ldr r1, _08126130 @ =gText_StopLearningMove2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08126134 @ =gTasks @@ -14962,38 +14962,38 @@ sub_81260D8: @ 81260D8 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08126138 @ =sub_812613C + ldr r1, _08126138 @ =Task_StopLearningMoveYesNo str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 _08126120: .4byte gStringVar2 -_08126124: .4byte gUnknown_203B0A0 +_08126124: .4byte gPartyMenu _08126128: .4byte gMoveNames _0812612C: .4byte gStringVar4 -_08126130: .4byte gUnknown_8416E6B +_08126130: .4byte gText_StopLearningMove2 _08126134: .4byte gTasks -_08126138: .4byte sub_812613C - thumb_func_end sub_81260D8 +_08126138: .4byte Task_StopLearningMoveYesNo + thumb_func_end StopLearningMovePrompt - thumb_func_start sub_812613C -sub_812613C: @ 812613C + thumb_func_start Task_StopLearningMoveYesNo +Task_StopLearningMoveYesNo: @ 812613C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08126160 - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08126168 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0812616C @ =sub_8126170 + ldr r0, _0812616C @ =Task_HandleStopLearningMoveYesNoInput str r0, [r1] _08126160: pop {r4} @@ -15001,15 +15001,15 @@ _08126160: bx r0 .align 2, 0 _08126168: .4byte gTasks -_0812616C: .4byte sub_8126170 - thumb_func_end sub_812613C +_0812616C: .4byte Task_HandleStopLearningMoveYesNoInput + thumb_func_end Task_StopLearningMoveYesNo - thumb_func_start sub_8126170 -sub_8126170: @ 8126170 + thumb_func_start Task_HandleStopLearningMoveYesNoInput +Task_HandleStopLearningMoveYesNoInput: @ 8126170 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _081261A0 @ =gUnknown_203B0A0 + ldr r7, _081261A0 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 @@ -15029,7 +15029,7 @@ sub_8126170: @ 8126170 beq _08126234 b _0812626A .align 2, 0 -_081261A0: .4byte gUnknown_203B0A0 +_081261A0: .4byte gPartyMenu _081261A4: .4byte gPlayerParty _081261A8: cmp r5, 0x1 @@ -15048,12 +15048,12 @@ _081261AE: adds r1, r2 bl StringCopy ldr r4, _08126200 @ =gStringVar4 - ldr r1, _08126204 @ =gUnknown_8416E84 + ldr r1, _08126204 @ =gText_MoveNotLearned adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r3, 0x10 ldrsh r0, [r7, r3] cmp r0, 0x1 @@ -15063,7 +15063,7 @@ _081261AE: adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _0812620C @ =sub_812628C + ldr r0, _0812620C @ =Task_TryLearningNextMoveAfterText str r0, [r1] b _0812626A .align 2, 0 @@ -15071,9 +15071,9 @@ _081261F4: .4byte gStringVar1 _081261F8: .4byte gStringVar2 _081261FC: .4byte gMoveNames _08126200: .4byte gStringVar4 -_08126204: .4byte gUnknown_8416E84 +_08126204: .4byte gText_MoveNotLearned _08126208: .4byte gTasks -_0812620C: .4byte sub_812628C +_0812620C: .4byte Task_TryLearningNextMoveAfterText _08126210: cmp r0, 0x2 bne _08126218 @@ -15085,13 +15085,13 @@ _08126218: adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _08126230 @ =sub_81255BC + ldr r0, _08126230 @ =Task_ClosePartyMenuAfterText str r0, [r1] b _0812626A .align 2, 0 _08126228: .4byte gSpecialVar_Result _0812622C: .4byte gTasks -_08126230: .4byte sub_81255BC +_08126230: .4byte Task_ClosePartyMenuAfterText _08126234: movs r0, 0x5 bl PlaySE @@ -15100,7 +15100,7 @@ _0812623A: adds r0, r4, 0 bl GetMonNickname ldr r0, _08126274 @ =gStringVar2 - ldr r1, _08126278 @ =gUnknown_203B0A0 + ldr r1, _08126278 @ =gPartyMenu movs r3, 0xE ldrsh r2, [r1, r3] movs r1, 0xD @@ -15108,14 +15108,14 @@ _0812623A: ldr r2, _0812627C @ =gMoveNames adds r1, r2 bl StringCopy - ldr r0, _08126280 @ =gUnknown_8416DF7 - bl sub_8125AF0 + ldr r0, _08126280 @ =gText_PkmnNeedsToReplaceMove + bl DisplayLearnMoveMessage ldr r1, _08126284 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08126288 @ =sub_8125D88 + ldr r1, _08126288 @ =Task_ReplaceMoveYesNo str r1, [r0] _0812626A: pop {r4-r7} @@ -15124,30 +15124,30 @@ _0812626A: .align 2, 0 _08126270: .4byte gStringVar1 _08126274: .4byte gStringVar2 -_08126278: .4byte gUnknown_203B0A0 +_08126278: .4byte gPartyMenu _0812627C: .4byte gMoveNames -_08126280: .4byte gUnknown_8416DF7 +_08126280: .4byte gText_PkmnNeedsToReplaceMove _08126284: .4byte gTasks -_08126288: .4byte sub_8125D88 - thumb_func_end sub_8126170 +_08126288: .4byte Task_ReplaceMoveYesNo + thumb_func_end Task_HandleStopLearningMoveYesNoInput - thumb_func_start sub_812628C -sub_812628C: @ 812628C + thumb_func_start Task_TryLearningNextMoveAfterText +Task_TryLearningNextMoveAfterText: @ 812628C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081262A4 adds r0, r4, 0 - bl sub_81266A0 + bl Task_TryLearningNextMove _081262A4: pop {r4} pop {r0} bx r0 - thumb_func_end sub_812628C + thumb_func_end Task_TryLearningNextMoveAfterText thumb_func_start dp05_rare_candy dp05_rare_candy: @ 81262AC @@ -15157,7 +15157,7 @@ dp05_rare_candy: @ 81262AC mov r8, r1 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _081262E8 @ =gUnknown_203B0A0 + ldr r7, _081262E8 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 @@ -15180,7 +15180,7 @@ dp05_rare_candy: @ 81262AC lsrs r4, r0, 24 b _081262F6 .align 2, 0 -_081262E8: .4byte gUnknown_203B0A0 +_081262E8: .4byte gPartyMenu _081262EC: .4byte gPlayerParty _081262F0: .4byte gSpecialVar_ItemId _081262F4: @@ -15190,12 +15190,12 @@ _081262F6: bl PlaySE cmp r4, 0 beq _08126330 - ldr r1, _08126324 @ =gUnknown_203B0C0 + ldr r1, _08126324 @ =gPartyMenuUseExitCallback movs r0, 0 strb r0, [r1] - ldr r0, _08126328 @ =gUnknown_84169DC + ldr r0, _08126328 @ =gText_WontHaveEffect movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _0812632C @ =gTasks @@ -15207,14 +15207,14 @@ _081262F6: str r1, [r0] b _0812633C .align 2, 0 -_08126324: .4byte gUnknown_203B0C0 -_08126328: .4byte gUnknown_84169DC +_08126324: .4byte gPartyMenuUseExitCallback +_08126328: .4byte gText_WontHaveEffect _0812632C: .4byte gTasks _08126330: adds r0, r6, 0 bl sub_8124DC0 - ldr r1, _08126348 @ =gUnknown_3005E98 - ldr r0, _0812634C @ =sub_8126350 + ldr r1, _08126348 @ =gItemUseCB + ldr r0, _0812634C @ =ItemUseCB_RareCandy str r0, [r1] _0812633C: pop {r3} @@ -15223,12 +15223,12 @@ _0812633C: pop {r0} bx r0 .align 2, 0 -_08126348: .4byte gUnknown_3005E98 -_0812634C: .4byte sub_8126350 +_08126348: .4byte gItemUseCB +_0812634C: .4byte ItemUseCB_RareCandy thumb_func_end dp05_rare_candy - thumb_func_start sub_8126350 -sub_8126350: @ 8126350 + thumb_func_start ItemUseCB_RareCandy +ItemUseCB_RareCandy: @ 8126350 push {r4-r7,lr} mov r7, r8 push {r7} @@ -15236,7 +15236,7 @@ sub_8126350: @ 8126350 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, _08126410 @ =gUnknown_203B0A0 + ldr r6, _08126410 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 @@ -15244,7 +15244,7 @@ sub_8126350: @ 8126350 muls r4, r0 ldr r0, _08126414 @ =gPlayerParty adds r4, r0 - ldr r0, _08126418 @ =gUnknown_203B09C + ldr r0, _08126418 @ =sPartyMenuInternal ldr r7, [r0] movs r2, 0x86 lsls r2, 2 @@ -15255,13 +15255,13 @@ sub_8126350: @ 8126350 ldr r5, _0812641C @ =gSpecialVar_ItemId ldrh r1, [r5] movs r2, 0 - bl ExecuteTableBasedItemEffect__ + bl ExecuteTableBasedItemEffect_ movs r0, 0x89 lsls r0, 2 adds r1, r7, r0 adds r0, r4, 0 bl GetMonLevelUpWindowStats - ldr r1, _08126420 @ =gUnknown_203B0C0 + ldr r1, _08126420 @ =gPartyMenuUseExitCallback movs r0, 0x1 strb r0, [r1] ldrh r2, [r5] @@ -15273,7 +15273,7 @@ sub_8126350: @ 8126350 bl PlayFanfareByFanfareNum ldrb r0, [r6, 0x9] adds r1, r4, 0 - bl sub_8126440 + bl UpdateMonDisplayInfoAfterRareCandy ldrh r0, [r5] movs r1, 0x1 bl RemoveBagItem @@ -15291,12 +15291,12 @@ sub_8126350: @ 8126350 movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r4, _08126430 @ =gStringVar4 - ldr r1, _08126434 @ =gUnknown_8417017 + ldr r1, _08126434 @ =gText_PkmnElevatedToLvVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08126438 @ =gTasks @@ -15305,7 +15305,7 @@ sub_8126350: @ 8126350 add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, _0812643C @ =sub_81264C8 + ldr r1, _0812643C @ =Task_DisplayLevelUpStatsPg1 str r1, [r0] pop {r3} mov r8, r3 @@ -15313,33 +15313,33 @@ sub_8126350: @ 8126350 pop {r0} bx r0 .align 2, 0 -_08126410: .4byte gUnknown_203B0A0 +_08126410: .4byte gPartyMenu _08126414: .4byte gPlayerParty -_08126418: .4byte gUnknown_203B09C +_08126418: .4byte sPartyMenuInternal _0812641C: .4byte gSpecialVar_ItemId -_08126420: .4byte gUnknown_203B0C0 +_08126420: .4byte gPartyMenuUseExitCallback _08126424: .4byte 0x0000ffff _08126428: .4byte gStringVar1 _0812642C: .4byte gStringVar2 _08126430: .4byte gStringVar4 -_08126434: .4byte gUnknown_8417017 +_08126434: .4byte gText_PkmnElevatedToLvVar2 _08126438: .4byte gTasks -_0812643C: .4byte sub_81264C8 - thumb_func_end sub_8126350 +_0812643C: .4byte Task_DisplayLevelUpStatsPg1 + thumb_func_end ItemUseCB_RareCandy - thumb_func_start sub_8126440 -sub_8126440: @ 8126440 + thumb_func_start UpdateMonDisplayInfoAfterRareCandy +UpdateMonDisplayInfoAfterRareCandy: @ 8126440 push {r4-r7,lr} adds r5, r1, 0 lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r6, _081264C0 @ =gUnknown_203B0B4 + ldr r6, _081264C0 @ =sPartyMenuBoxes lsls r4, r7, 4 ldr r1, [r6] adds r1, r4 adds r0, r5, 0 - bl party_menu_get_status_condition_and_update_object + bl SetPartyMonAilmentGfx ldr r2, _081264C4 @ =gSprites ldr r0, [r6] adds r3, r4, r0 @@ -15356,42 +15356,42 @@ sub_8126440: @ 8126440 adds r0, r5, 0 adds r1, r3, 0 movs r2, 0x1 - bl sub_8121790 + bl DisplayPartyPokemonLevelCheck _0812647C: ldr r1, [r6] adds r1, r4 adds r0, r5, 0 movs r2, 0x1 - bl sub_812199C + bl DisplayPartyPokemonHPCheck ldr r1, [r6] adds r1, r4 adds r0, r5, 0 movs r2, 0x1 - bl sub_8121A3C + bl DisplayPartyPokemonMaxHPCheck ldr r1, [r6] adds r1, r4 adds r0, r5, 0 - bl sub_8121AF0 + bl DisplayPartyPokemonHPBarCheck ldr r0, [r6] adds r0, r4, r0 ldrb r0, [r0, 0x9] adds r1, r5, 0 - bl sub_8122358 + bl UpdatePartyMonHPBar adds r0, r7, 0 movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot movs r0, 0 bl ScheduleBgCopyTilemapToVram pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081264C0: .4byte gUnknown_203B0B4 +_081264C0: .4byte sPartyMenuBoxes _081264C4: .4byte gSprites - thumb_func_end sub_8126440 + thumb_func_end UpdateMonDisplayInfoAfterRareCandy - thumb_func_start sub_81264C8 -sub_81264C8: @ 81264C8 + thumb_func_start Task_DisplayLevelUpStatsPg1 +Task_DisplayLevelUpStatsPg1: @ 81264C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -15400,7 +15400,7 @@ sub_81264C8: @ 81264C8 lsls r0, 24 cmp r0, 0 beq _08126514 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -15419,13 +15419,13 @@ _081264FA: movs r0, 0x5 bl PlaySE adds r0, r4, 0 - bl sub_8126570 + bl DisplayLevelUpStatsPg1 ldr r0, _08126520 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08126524 @ =sub_8126528 + ldr r0, _08126524 @ =Task_DisplayLevelUpStatsPg2 str r0, [r1] _08126514: pop {r4} @@ -15434,11 +15434,11 @@ _08126514: .align 2, 0 _0812651C: .4byte gMain _08126520: .4byte gTasks -_08126524: .4byte sub_8126528 - thumb_func_end sub_81264C8 +_08126524: .4byte Task_DisplayLevelUpStatsPg2 + thumb_func_end Task_DisplayLevelUpStatsPg1 - thumb_func_start sub_8126528 -sub_8126528: @ 8126528 + thumb_func_start Task_DisplayLevelUpStatsPg2 +Task_DisplayLevelUpStatsPg2: @ 8126528 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -15456,13 +15456,13 @@ _08126542: movs r0, 0x5 bl PlaySE adds r0, r4, 0 - bl sub_81265BC + bl DisplayLevelUpStatsPg2 ldr r0, _08126568 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0812656C @ =sub_81265F8 + ldr r0, _0812656C @ =Task_TryLearnNewMoves str r0, [r1] _0812655C: pop {r4} @@ -15471,19 +15471,19 @@ _0812655C: .align 2, 0 _08126564: .4byte gMain _08126568: .4byte gTasks -_0812656C: .4byte sub_81265F8 - thumb_func_end sub_8126528 +_0812656C: .4byte Task_TryLearnNewMoves + thumb_func_end Task_DisplayLevelUpStatsPg2 - thumb_func_start sub_8126570 -sub_8126570: @ 8126570 + thumb_func_start DisplayLevelUpStatsPg1 +DisplayLevelUpStatsPg1: @ 8126570 push {r4,r5,lr} sub sp, 0x8 - ldr r0, _081265B8 @ =gUnknown_203B09C + ldr r0, _081265B8 @ =sPartyMenuInternal ldr r5, [r0] movs r0, 0x86 lsls r0, 2 adds r4, r5, r0 - bl sub_8122034 + bl CreateLevelUpStatsWindow lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x18] @@ -15508,14 +15508,14 @@ sub_8126570: @ 8126570 pop {r0} bx r0 .align 2, 0 -_081265B8: .4byte gUnknown_203B09C - thumb_func_end sub_8126570 +_081265B8: .4byte sPartyMenuInternal + thumb_func_end DisplayLevelUpStatsPg1 - thumb_func_start sub_81265BC -sub_81265BC: @ 81265BC + thumb_func_start DisplayLevelUpStatsPg2 +DisplayLevelUpStatsPg2: @ 81265BC push {r4,lr} sub sp, 0x4 - ldr r0, _081265F4 @ =gUnknown_203B09C + ldr r0, _081265F4 @ =sPartyMenuInternal ldr r1, [r0] movs r0, 0x86 lsls r0, 2 @@ -15539,11 +15539,11 @@ sub_81265BC: @ 81265BC pop {r0} bx r0 .align 2, 0 -_081265F4: .4byte gUnknown_203B09C - thumb_func_end sub_81265BC +_081265F4: .4byte sPartyMenuInternal + thumb_func_end DisplayLevelUpStatsPg2 - thumb_func_start sub_81265F8 -sub_81265F8: @ 81265F8 + thumb_func_start Task_TryLearnNewMoves +Task_TryLearnNewMoves: @ 81265F8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -15564,8 +15564,8 @@ sub_81265F8: @ 81265F8 cmp r0, 0 beq _0812669A _08126620: - bl sub_8122064 - ldr r4, _08126654 @ =gUnknown_203B0A0 + bl RemoveLevelUpStatsWindow + ldr r4, _08126654 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r4, r1] movs r0, 0x64 @@ -15587,7 +15587,7 @@ _08126620: b _08126694 .align 2, 0 _08126650: .4byte gMain -_08126654: .4byte gUnknown_203B0A0 +_08126654: .4byte gPartyMenu _08126658: .4byte gPlayerParty _0812665C: .4byte 0x0000fffe _08126660: @@ -15599,11 +15599,11 @@ _08126660: _08126668: .4byte 0x0000ffff _0812666C: adds r0, r5, 0 - bl sub_8126704 + bl PartyMenuTryEvolution b _0812669A _08126674: adds r0, r5, 0 - bl sub_8126770 + bl DisplayMonNeedsToReplaceMove b _0812669A _0812667C: ldr r0, _0812668C @ =gTasks @@ -15611,27 +15611,27 @@ _0812667C: adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08126690 @ =sub_81266A0 + ldr r0, _08126690 @ =Task_TryLearningNextMove str r0, [r1] b _0812669A .align 2, 0 _0812668C: .4byte gTasks -_08126690: .4byte sub_81266A0 +_08126690: .4byte Task_TryLearningNextMove _08126694: adds r0, r5, 0 - bl sub_8126804 + bl DisplayMonLearnedMove _0812669A: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_81265F8 + thumb_func_end Task_TryLearnNewMoves - thumb_func_start sub_81266A0 -sub_81266A0: @ 81266A0 + thumb_func_start Task_TryLearningNextMove +Task_TryLearningNextMove: @ 81266A0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081266D0 @ =gUnknown_203B0A0 + ldr r0, _081266D0 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -15651,7 +15651,7 @@ sub_81266A0: @ 81266A0 beq _081266E8 b _081266F8 .align 2, 0 -_081266D0: .4byte gUnknown_203B0A0 +_081266D0: .4byte gPartyMenu _081266D4: .4byte gPlayerParty _081266D8: .4byte 0x0000fffe _081266DC: @@ -15663,27 +15663,27 @@ _081266DC: _081266E4: .4byte 0x0000ffff _081266E8: adds r0, r4, 0 - bl sub_8126704 + bl PartyMenuTryEvolution b _081266FE _081266F0: adds r0, r4, 0 - bl sub_8126770 + bl DisplayMonNeedsToReplaceMove b _081266FE _081266F8: adds r0, r4, 0 - bl sub_8126804 + bl DisplayMonLearnedMove _081266FE: pop {r4} pop {r0} bx r0 - thumb_func_end sub_81266A0 + thumb_func_end Task_TryLearningNextMove - thumb_func_start sub_8126704 -sub_8126704: @ 8126704 + thumb_func_start PartyMenuTryEvolution +PartyMenuTryEvolution: @ 8126704 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _08126748 @ =gUnknown_203B0A0 + ldr r6, _08126748 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 @@ -15698,7 +15698,7 @@ sub_8126704: @ 8126704 lsrs r4, r0, 16 cmp r4, 0 beq _08126754 - bl sub_811F070 + bl FreePartyPointers ldr r0, _08126750 @ =gCB2_AfterEvolution ldr r1, [r6] str r1, [r0] @@ -15711,7 +15711,7 @@ sub_8126704: @ 8126704 bl DestroyTask b _08126762 .align 2, 0 -_08126748: .4byte gUnknown_203B0A0 +_08126748: .4byte gPartyMenu _0812674C: .4byte gPlayerParty _08126750: .4byte gCB2_AfterEvolution _08126754: @@ -15720,7 +15720,7 @@ _08126754: adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _0812676C @ =sub_81255BC + ldr r0, _0812676C @ =Task_ClosePartyMenuAfterText str r0, [r1] _08126762: pop {r4-r7} @@ -15728,18 +15728,18 @@ _08126762: bx r0 .align 2, 0 _08126768: .4byte gTasks -_0812676C: .4byte sub_81255BC - thumb_func_end sub_8126704 +_0812676C: .4byte Task_ClosePartyMenuAfterText + thumb_func_end PartyMenuTryEvolution - thumb_func_start sub_8126770 -sub_8126770: @ 8126770 + thumb_func_start DisplayMonNeedsToReplaceMove +DisplayMonNeedsToReplaceMove: @ 8126770 push {r4-r6,lr} mov r6, r8 push {r6} adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081267DC @ =gUnknown_203B0A0 + ldr r0, _081267DC @ =gPartyMenu mov r8, r0 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -15758,12 +15758,12 @@ sub_8126770: @ 8126770 adds r1, r2 bl StringCopy ldr r4, _081267F4 @ =gStringVar4 - ldr r1, _081267F8 @ =gUnknown_8416DF7 + ldr r1, _081267F8 @ =gText_PkmnNeedsToReplaceMove adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldrh r0, [r6] @@ -15774,7 +15774,7 @@ sub_8126770: @ 8126770 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08126800 @ =sub_8125D88 + ldr r1, _08126800 @ =Task_ReplaceMoveYesNo str r1, [r0] pop {r3} mov r8, r3 @@ -15782,20 +15782,20 @@ sub_8126770: @ 8126770 pop {r0} bx r0 .align 2, 0 -_081267DC: .4byte gUnknown_203B0A0 +_081267DC: .4byte gPartyMenu _081267E0: .4byte gPlayerParty _081267E4: .4byte gStringVar1 _081267E8: .4byte gStringVar2 _081267EC: .4byte gMoveToLearn _081267F0: .4byte gMoveNames _081267F4: .4byte gStringVar4 -_081267F8: .4byte gUnknown_8416DF7 +_081267F8: .4byte gText_PkmnNeedsToReplaceMove _081267FC: .4byte gTasks -_08126800: .4byte sub_8125D88 - thumb_func_end sub_8126770 +_08126800: .4byte Task_ReplaceMoveYesNo + thumb_func_end DisplayMonNeedsToReplaceMove - thumb_func_start sub_8126804 -sub_8126804: @ 8126804 + thumb_func_start DisplayMonLearnedMove +DisplayMonLearnedMove: @ 8126804 push {r4-r6,lr} mov r6, r8 push {r6} @@ -15805,7 +15805,7 @@ sub_8126804: @ 8126804 lsrs r6, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _08126870 @ =gUnknown_203B0A0 + ldr r0, _08126870 @ =gPartyMenu mov r8, r0 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -15822,12 +15822,12 @@ sub_8126804: @ 8126804 adds r1, r2 bl StringCopy ldr r4, _08126884 @ =gStringVar4 - ldr r1, _08126888 @ =gUnknown_8416DB3 + ldr r1, _08126888 @ =gText_PkmnLearnedMove3 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram mov r0, r8 @@ -15837,7 +15837,7 @@ sub_8126804: @ 8126804 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08126890 @ =sub_8125CF4 + ldr r1, _08126890 @ =Task_DoLearnedMoveFanfareAfterText str r1, [r0] pop {r3} mov r8, r3 @@ -15845,23 +15845,23 @@ sub_8126804: @ 8126804 pop {r0} bx r0 .align 2, 0 -_08126870: .4byte gUnknown_203B0A0 +_08126870: .4byte gPartyMenu _08126874: .4byte gPlayerParty _08126878: .4byte gStringVar1 _0812687C: .4byte gStringVar2 _08126880: .4byte gMoveNames _08126884: .4byte gStringVar4 -_08126888: .4byte gUnknown_8416DB3 +_08126888: .4byte gText_PkmnLearnedMove3 _0812688C: .4byte gTasks -_08126890: .4byte sub_8125CF4 - thumb_func_end sub_8126804 +_08126890: .4byte Task_DoLearnedMoveFanfareAfterText + thumb_func_end DisplayMonLearnedMove - thumb_func_start sub_8126894 -sub_8126894: @ 8126894 + thumb_func_start ItemUseCB_SacredAsh +ItemUseCB_SacredAsh: @ 8126894 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081268C8 @ =gUnknown_203B09C + ldr r1, _081268C8 @ =sPartyMenuInternal ldr r2, [r1] movs r3, 0x86 lsls r3, 2 @@ -15871,7 +15871,7 @@ sub_8126894: @ 8126894 ldr r4, _081268CC @ =0x0000021a adds r1, r2, r4 strh r3, [r1] - ldr r1, _081268D0 @ =gUnknown_203B0A0 + ldr r1, _081268D0 @ =gPartyMenu ldrb r1, [r1, 0x9] lsls r1, 24 asrs r1, 24 @@ -15879,18 +15879,18 @@ sub_8126894: @ 8126894 lsls r3, 2 adds r2, r3 strh r1, [r2] - bl sub_81268D4 + bl UseSacredAsh pop {r4} pop {r0} bx r0 .align 2, 0 -_081268C8: .4byte gUnknown_203B09C +_081268C8: .4byte sPartyMenuInternal _081268CC: .4byte 0x0000021a -_081268D0: .4byte gUnknown_203B0A0 - thumb_func_end sub_8126894 +_081268D0: .4byte gPartyMenu + thumb_func_end ItemUseCB_SacredAsh - thumb_func_start sub_81268D4 -sub_81268D4: @ 81268D4 + thumb_func_start UseSacredAsh +UseSacredAsh: @ 81268D4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -15900,7 +15900,7 @@ sub_81268D4: @ 81268D4 lsls r0, 24 lsrs r4, r0, 24 mov r9, r4 - ldr r6, _08126930 @ =gUnknown_203B0A0 + ldr r6, _08126930 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 @@ -15922,7 +15922,7 @@ sub_81268D4: @ 81268D4 ldr r1, _08126938 @ =gSpecialVar_ItemId ldrh r1, [r1] movs r2, 0 - bl ExecuteTableBasedItemEffect__ + bl ExecuteTableBasedItemEffect_ lsls r0, 24 cmp r0, 0 beq _08126944 @@ -15932,19 +15932,19 @@ _08126920: adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08126940 @ =sub_8126A18 + ldr r0, _08126940 @ =Task_SacredAshLoop str r0, [r1] b _081269EE .align 2, 0 -_08126930: .4byte gUnknown_203B0A0 +_08126930: .4byte gPartyMenu _08126934: .4byte gPlayerParty _08126938: .4byte gSpecialVar_ItemId _0812693C: .4byte gTasks -_08126940: .4byte sub_8126A18 +_08126940: .4byte Task_SacredAshLoop _08126944: movs r0, 0x1 bl PlaySE - ldr r7, _08126A00 @ =gUnknown_203B09C + ldr r7, _08126A00 @ =sPartyMenuInternal ldr r0, [r7] ldr r1, _08126A04 @ =0x0000021a mov r10, r1 @@ -15956,14 +15956,14 @@ _08126944: ldr r0, _08126A08 @ =gUnknown_203B0D0 str r5, [r0] _08126960: - ldr r4, _08126A0C @ =gUnknown_203B0B4 + ldr r4, _08126A0C @ =sPartyMenuBoxes movs r0, 0x9 ldrsb r0, [r6, r0] lsls r0, 4 ldr r1, [r4] adds r1, r0 adds r0, r5, 0 - bl party_menu_get_status_condition_and_update_object + bl SetPartyMonAilmentGfx ldr r2, _08126A10 @ =gSprites movs r0, 0x9 ldrsb r0, [r6, r0] @@ -15983,7 +15983,7 @@ _08126960: adds r0, r5, 0 adds r1, r3, 0 movs r2, 0x1 - bl sub_8121790 + bl DisplayPartyPokemonLevelCheck _0812699C: ldr r0, [r7] movs r1, 0x87 @@ -15991,10 +15991,10 @@ _0812699C: adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_811F818 + bl AnimatePartySlot ldrb r0, [r6, 0x9] movs r1, 0x1 - bl sub_811F818 + bl AnimatePartySlot adds r0, r5, 0 movs r1, 0x39 bl GetMonData @@ -16004,15 +16004,15 @@ _0812699C: lsls r3, 16 asrs r3, 16 ldrb r1, [r6, 0x9] - ldr r0, _08126A14 @ =sub_8126AFC + ldr r0, _08126A14 @ =Task_SacredAshDisplayHPRestored str r0, [sp] mov r0, r9 movs r2, 0x1 - bl sub_8120760 + bl PartyMenuModifyHP mov r0, r9 movs r1, 0 mov r2, r8 - bl sub_81207F0 + bl ResetHPTaskData ldr r0, [r7] movs r2, 0x86 lsls r2, 2 @@ -16031,32 +16031,32 @@ _081269EE: pop {r0} bx r0 .align 2, 0 -_08126A00: .4byte gUnknown_203B09C +_08126A00: .4byte sPartyMenuInternal _08126A04: .4byte 0x0000021a _08126A08: .4byte gUnknown_203B0D0 -_08126A0C: .4byte gUnknown_203B0B4 +_08126A0C: .4byte sPartyMenuBoxes _08126A10: .4byte gSprites -_08126A14: .4byte sub_8126AFC - thumb_func_end sub_81268D4 +_08126A14: .4byte Task_SacredAshDisplayHPRestored + thumb_func_end UseSacredAsh - thumb_func_start sub_8126A18 -sub_8126A18: @ 8126A18 + thumb_func_start Task_SacredAshLoop +Task_SacredAshLoop: @ 8126A18 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08126AF6 - ldr r5, _08126A80 @ =gUnknown_203B09C + ldr r5, _08126A80 @ =sPartyMenuInternal ldr r2, [r5] movs r0, 0x86 lsls r0, 2 adds r1, r2, r0 movs r3, 0 ldrsh r0, [r1, r3] - ldr r3, _08126A84 @ =gUnknown_203B0A0 + ldr r3, _08126A84 @ =gPartyMenu cmp r0, 0x1 bne _08126A4E movs r0, 0 @@ -16083,22 +16083,22 @@ _08126A4E: ldrsh r1, [r0, r2] cmp r1, 0 bne _08126A94 - ldr r0, _08126A8C @ =gUnknown_203B0C0 + ldr r0, _08126A8C @ =gPartyMenuUseExitCallback strb r1, [r0] - ldr r0, _08126A90 @ =gUnknown_84169DC + ldr r0, _08126A90 @ =gText_WontHaveEffect movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram b _08126ABE .align 2, 0 -_08126A80: .4byte gUnknown_203B09C -_08126A84: .4byte gUnknown_203B0A0 +_08126A80: .4byte sPartyMenuInternal +_08126A84: .4byte gPartyMenu _08126A88: .4byte 0x0000021a -_08126A8C: .4byte gUnknown_203B0C0 -_08126A90: .4byte gUnknown_84169DC +_08126A8C: .4byte gPartyMenuUseExitCallback +_08126A90: .4byte gText_WontHaveEffect _08126A94: - ldr r1, _08126AD4 @ =gUnknown_203B0C0 + ldr r1, _08126AD4 @ =gPartyMenuUseExitCallback movs r0, 0x1 strb r0, [r1] ldrb r1, [r3, 0x8] @@ -16124,36 +16124,36 @@ _08126ABE: adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08126AE8 @ =sub_81255BC + ldr r1, _08126AE8 @ =Task_ClosePartyMenuAfterText str r1, [r0] - ldr r1, _08126AEC @ =gUnknown_203B0A0 + ldr r1, _08126AEC @ =gPartyMenu movs r0, 0 strb r0, [r1, 0x9] b _08126AF6 .align 2, 0 -_08126AD4: .4byte gUnknown_203B0C0 +_08126AD4: .4byte gPartyMenuUseExitCallback _08126AD8: .4byte gUnknown_203B0D0 _08126ADC: .4byte gSpecialVar_ItemId _08126AE0: .4byte 0x0000ffff _08126AE4: .4byte gTasks -_08126AE8: .4byte sub_81255BC -_08126AEC: .4byte gUnknown_203B0A0 +_08126AE8: .4byte Task_ClosePartyMenuAfterText +_08126AEC: .4byte gPartyMenu _08126AF0: adds r0, r4, 0 - bl sub_81268D4 + bl UseSacredAsh _08126AF6: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8126A18 + thumb_func_end Task_SacredAshLoop - thumb_func_start sub_8126AFC -sub_8126AFC: @ 8126AFC + thumb_func_start Task_SacredAshDisplayHPRestored +Task_SacredAshDisplayHPRestored: @ 8126AFC push {r4,r5,lr} adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08126B44 @ =gUnknown_203B0A0 + ldr r0, _08126B44 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -16163,12 +16163,12 @@ sub_8126AFC: @ 8126AFC ldr r1, _08126B4C @ =gStringVar1 bl GetMonNickname ldr r4, _08126B50 @ =gStringVar4 - ldr r1, _08126B54 @ =gUnknown_8416F27 + ldr r1, _08126B54 @ =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08126B58 @ =gTasks @@ -16176,20 +16176,20 @@ sub_8126AFC: @ 8126AFC adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08126B5C @ =sub_8126A18 + ldr r1, _08126B5C @ =Task_SacredAshLoop str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08126B44: .4byte gUnknown_203B0A0 +_08126B44: .4byte gPartyMenu _08126B48: .4byte gPlayerParty _08126B4C: .4byte gStringVar1 _08126B50: .4byte gStringVar4 -_08126B54: .4byte gUnknown_8416F27 +_08126B54: .4byte gText_PkmnHPRestoredByVar2 _08126B58: .4byte gTasks -_08126B5C: .4byte sub_8126A18 - thumb_func_end sub_8126AFC +_08126B5C: .4byte Task_SacredAshLoop + thumb_func_end Task_SacredAshDisplayHPRestored thumb_func_start sub_8126B60 sub_8126B60: @ 8126B60 @@ -16199,7 +16199,7 @@ sub_8126B60: @ 8126B60 lsrs r4, r0, 24 movs r0, 0x5 bl PlaySE - ldr r2, _08126BB0 @ =gUnknown_203B0A0 + ldr r2, _08126BB0 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r2, r1] movs r0, 0x64 @@ -16214,12 +16214,12 @@ sub_8126B60: @ 8126B60 lsls r0, 24 cmp r0, 0 beq _08126BC8 - ldr r1, _08126BBC @ =gUnknown_203B0C0 + ldr r1, _08126BBC @ =gPartyMenuUseExitCallback movs r0, 0 strb r0, [r1] - ldr r0, _08126BC0 @ =gUnknown_84169DC + ldr r0, _08126BC0 @ =gText_WontHaveEffect movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _08126BC4 @ =gTasks @@ -16230,11 +16230,11 @@ sub_8126B60: @ 8126B60 str r5, [r0] b _08126BCE .align 2, 0 -_08126BB0: .4byte gUnknown_203B0A0 +_08126BB0: .4byte gPartyMenu _08126BB4: .4byte gPlayerParty _08126BB8: .4byte gSpecialVar_ItemId -_08126BBC: .4byte gUnknown_203B0C0 -_08126BC0: .4byte gUnknown_84169DC +_08126BBC: .4byte gPartyMenuUseExitCallback +_08126BC0: .4byte gText_WontHaveEffect _08126BC4: .4byte gTasks _08126BC8: adds r0, r4, 0 @@ -16245,18 +16245,18 @@ _08126BCE: bx r0 thumb_func_end sub_8126B60 - thumb_func_start sub_8126BD4 -sub_8126BD4: @ 8126BD4 + thumb_func_start ItemUseCB_EvolutionStone +ItemUseCB_EvolutionStone: @ 8126BD4 push {r4,r5,lr} ldr r1, _08126C10 @ =gCB2_AfterEvolution - ldr r4, _08126C14 @ =gUnknown_203B0A0 + ldr r4, _08126C14 @ =gPartyMenu ldr r0, [r4] str r0, [r1] ldrb r0, [r4, 0x9] ldr r5, _08126C18 @ =gSpecialVar_ItemId ldrh r1, [r5] movs r2, 0 - bl ExecuteTableBasedItemEffect__ + bl ExecuteTableBasedItemEffect_ movs r1, 0x9 ldrsb r1, [r4, r1] movs r0, 0x64 @@ -16275,11 +16275,11 @@ sub_8126BD4: @ 8126BD4 bx r0 .align 2, 0 _08126C10: .4byte gCB2_AfterEvolution -_08126C14: .4byte gUnknown_203B0A0 +_08126C14: .4byte gPartyMenu _08126C18: .4byte gSpecialVar_ItemId _08126C1C: .4byte gPlayerParty _08126C20: .4byte 0x0000ffff - thumb_func_end sub_8126BD4 + thumb_func_end ItemUseCB_EvolutionStone thumb_func_start sub_8126C24 sub_8126C24: @ 8126C24 @@ -16287,7 +16287,7 @@ sub_8126C24: @ 8126C24 bl IsNationalPokedexEnabled cmp r0, 0 bne _08126C60 - ldr r0, _08126C54 @ =gUnknown_203B0A0 + ldr r0, _08126C54 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 @@ -16305,7 +16305,7 @@ sub_8126C24: @ 8126C24 movs r0, 0 b _08126C62 .align 2, 0 -_08126C54: .4byte gUnknown_203B0A0 +_08126C54: .4byte gPartyMenu _08126C58: .4byte gPlayerParty _08126C5C: .4byte gSpecialVar_ItemId _08126C60: @@ -16521,8 +16521,8 @@ _08126DC2: bx r1 thumb_func_end GetItemEffectType - thumb_func_start sub_8126DC8 -sub_8126DC8: @ 8126DC8 + thumb_func_start TryTutorSelectedMon +TryTutorSelectedMon: @ 8126DC8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -16534,7 +16534,7 @@ sub_8126DC8: @ 8126DC8 ands r0, r1 cmp r0, 0 bne _08126E98 - ldr r7, _08126E50 @ =gUnknown_203B0A0 + ldr r7, _08126E50 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 @@ -16565,7 +16565,7 @@ sub_8126DC8: @ 8126DC8 ldrb r2, [r4] adds r0, r5, 0 movs r1, 0 - bl sub_8120B20 + bl CanMonLearnTMTutor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -16580,11 +16580,11 @@ sub_8126DC8: @ 8126DC8 cmp r0, r1 beq _08126E84 adds r0, r6, 0 - bl sub_8125C48 + bl Task_LearnedMove b _08126E98 .align 2, 0 _08126E4C: .4byte gPaletteFade -_08126E50: .4byte gUnknown_203B0A0 +_08126E50: .4byte gPartyMenu _08126E54: .4byte gPlayerParty _08126E58: .4byte gStringVar1 _08126E5C: .4byte gSpecialVar_0x8005 @@ -16592,27 +16592,27 @@ _08126E60: .4byte gStringVar2 _08126E64: .4byte gMoveNames _08126E68: .4byte 0xffff0000 _08126E6C: - ldr r1, _08126E70 @ =gUnknown_8416DC2 + ldr r1, _08126E70 @ =gText_PkmnCantLearnMove b _08126E76 .align 2, 0 -_08126E70: .4byte gUnknown_8416DC2 +_08126E70: .4byte gText_PkmnCantLearnMove _08126E74: - ldr r1, _08126E80 @ =gUnknown_8416F10 + ldr r1, _08126E80 @ =gText_PkmnAlreadyKnows _08126E76: adds r0, r6, 0 - bl sub_8125B14 + bl DisplayLearnMoveMessageAndClose b _08126E98 .align 2, 0 -_08126E80: .4byte gUnknown_8416F10 +_08126E80: .4byte gText_PkmnAlreadyKnows _08126E84: - ldr r0, _08126EA4 @ =gUnknown_8416DF7 - bl sub_8125AF0 + ldr r0, _08126EA4 @ =gText_PkmnNeedsToReplaceMove + bl DisplayLearnMoveMessage ldr r1, _08126EA8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08126EAC @ =sub_8125D88 + ldr r1, _08126EAC @ =Task_ReplaceMoveYesNo str r1, [r0] _08126E98: pop {r3} @@ -16621,10 +16621,10 @@ _08126E98: pop {r0} bx r0 .align 2, 0 -_08126EA4: .4byte gUnknown_8416DF7 +_08126EA4: .4byte gText_PkmnNeedsToReplaceMove _08126EA8: .4byte gTasks -_08126EAC: .4byte sub_8125D88 - thumb_func_end sub_8126DC8 +_08126EAC: .4byte Task_ReplaceMoveYesNo + thumb_func_end TryTutorSelectedMon thumb_func_start CB2_PartyMenuFromStartMenu CB2_PartyMenuFromStartMenu: @ 8126EB0 @@ -16632,7 +16632,7 @@ CB2_PartyMenuFromStartMenu: @ 8126EB0 sub sp, 0xC movs r0, 0 str r0, [sp] - ldr r0, _08126ED4 @ =sub_811FB28 + ldr r0, _08126ED4 @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _08126ED8 @ =CB2_ReturnToStartMenu str r0, [sp, 0x8] @@ -16640,17 +16640,17 @@ CB2_PartyMenuFromStartMenu: @ 8126EB0 movs r1, 0 movs r2, 0 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 -_08126ED4: .4byte sub_811FB28 +_08126ED4: .4byte Task_HandleChooseMonInput _08126ED8: .4byte CB2_ReturnToStartMenu thumb_func_end CB2_PartyMenuFromStartMenu - thumb_func_start sub_8126EDC -sub_8126EDC: @ 8126EDC + thumb_func_start CB2_ChooseMonToGiveItem +CB2_ChooseMonToGiveItem: @ 8126EDC push {lr} sub sp, 0xC ldr r0, _08126EF8 @ =gSpecialVar_ItemId @@ -16662,11 +16662,11 @@ sub_8126EDC: @ 8126EDC beq _08126F00 cmp r0, 0x5 beq _08126F08 - ldr r1, _08126EFC @ =sub_8124D90 + ldr r1, _08126EFC @ =CB2_ReturnToBagMenu b _08126F0A .align 2, 0 _08126EF8: .4byte gSpecialVar_ItemId -_08126EFC: .4byte sub_8124D90 +_08126EFC: .4byte CB2_ReturnToBagMenu _08126F00: ldr r1, _08126F04 @ =sub_8124DA0 b _08126F0A @@ -16677,15 +16677,15 @@ _08126F08: _08126F0A: movs r0, 0x6 str r0, [sp] - ldr r0, _08126F34 @ =sub_811FB28 + ldr r0, _08126F34 @ =Task_HandleChooseMonInput str r0, [sp, 0x4] str r1, [sp, 0x8] movs r0, 0 movs r1, 0 movs r2, 0x5 movs r3, 0 - bl PartyMenuInit - ldr r1, _08126F38 @ =gUnknown_203B0A0 + bl InitPartyMenu + ldr r1, _08126F38 @ =gPartyMenu ldr r0, _08126F3C @ =gSpecialVar_ItemId ldrh r0, [r0] strh r0, [r1, 0xC] @@ -16694,13 +16694,13 @@ _08126F0A: bx r0 .align 2, 0 _08126F30: .4byte sub_8124DB0 -_08126F34: .4byte sub_811FB28 -_08126F38: .4byte gUnknown_203B0A0 +_08126F34: .4byte Task_HandleChooseMonInput +_08126F38: .4byte gPartyMenu _08126F3C: .4byte gSpecialVar_ItemId - thumb_func_end sub_8126EDC + thumb_func_end CB2_ChooseMonToGiveItem - thumb_func_start sub_8126F40 -sub_8126F40: @ 8126F40 + thumb_func_start TryGiveItemOrMailToSelectedMon +TryGiveItemOrMailToSelectedMon: @ 8126F40 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -16708,8 +16708,8 @@ sub_8126F40: @ 8126F40 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r5, _08126F80 @ =gUnknown_203B0D8 - ldr r0, _08126F84 @ =gUnknown_203B0A0 + ldr r5, _08126F80 @ =sPartyMenuItemId + ldr r0, _08126F84 @ =gPartyMenu mov r9, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -16728,11 +16728,11 @@ sub_8126F40: @ 8126F40 cmp r0, 0 bne _08126F8C adds r0, r4, 0 - bl sub_8126FD8 + bl GiveItemOrMailToSelectedMon b _08126FC4 .align 2, 0 -_08126F80: .4byte gUnknown_203B0D8 -_08126F84: .4byte gUnknown_203B0A0 +_08126F80: .4byte sPartyMenuItemId +_08126F84: .4byte gPartyMenu _08126F88: .4byte gPlayerParty _08126F8C: ldrh r0, [r5] @@ -16741,7 +16741,7 @@ _08126F8C: cmp r0, 0 beq _08126FA0 adds r0, r4, 0 - bl sub_812734C + bl DisplayItemMustBeRemovedFirstMessage b _08126FC4 _08126FA0: mov r1, r9 @@ -16753,13 +16753,13 @@ _08126FA0: adds r0, r7 ldrh r1, [r5] movs r2, 0x1 - bl sub_812050C + bl DisplayAlreadyHoldingItemSwitchMessage ldr r1, _08126FD0 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08126FD4 @ =sub_8127234 + ldr r1, _08126FD4 @ =Task_SwitchItemsFromBagYesNo str r1, [r0] _08126FC4: pop {r3,r4} @@ -16770,44 +16770,44 @@ _08126FC4: bx r0 .align 2, 0 _08126FD0: .4byte gTasks -_08126FD4: .4byte sub_8127234 - thumb_func_end sub_8126F40 +_08126FD4: .4byte Task_SwitchItemsFromBagYesNo + thumb_func_end TryGiveItemOrMailToSelectedMon - thumb_func_start sub_8126FD8 -sub_8126FD8: @ 8126FD8 + thumb_func_start GiveItemOrMailToSelectedMon +GiveItemOrMailToSelectedMon: @ 8126FD8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _08127004 @ =gUnknown_203B0A0 + ldr r5, _08127004 @ =gPartyMenu ldrh r0, [r5, 0xC] bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _08127010 ldrh r0, [r5, 0xC] - bl sub_8127384 - ldr r0, _08127008 @ =gUnknown_203B09C + bl RemoveItemToGiveFromBag + ldr r0, _08127008 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _0812700C @ =sub_81270E0 + ldr r0, _0812700C @ =CB2_WriteMailToGiveMonFromBag str r0, [r1, 0x4] adds r0, r4, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _08127016 .align 2, 0 -_08127004: .4byte gUnknown_203B0A0 -_08127008: .4byte gUnknown_203B09C -_0812700C: .4byte sub_81270E0 +_08127004: .4byte gPartyMenu +_08127008: .4byte sPartyMenuInternal +_0812700C: .4byte CB2_WriteMailToGiveMonFromBag _08127010: adds r0, r4, 0 - bl sub_812701C + bl GiveItemToSelectedMon _08127016: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_8126FD8 + thumb_func_end GiveItemOrMailToSelectedMon - thumb_func_start sub_812701C -sub_812701C: @ 812701C + thumb_func_start GiveItemToSelectedMon +GiveItemToSelectedMon: @ 812701C push {r4-r7,lr} mov r7, r8 push {r7} @@ -16819,7 +16819,7 @@ sub_812701C: @ 812701C ands r0, r1 cmp r0, 0 bne _08127078 - ldr r4, _08127088 @ =gUnknown_203B0A0 + ldr r4, _08127088 @ =gPartyMenu ldrh r5, [r4, 0xC] movs r0, 0x9 ldrsb r0, [r4, r0] @@ -16833,7 +16833,7 @@ sub_812701C: @ 812701C adds r1, r5, 0 movs r2, 0 movs r3, 0x1 - bl sub_8120420 + bl DisplayGaveHeldItemMessage movs r0, 0x9 ldrsb r0, [r4, r0] mov r1, r8 @@ -16841,15 +16841,15 @@ sub_812701C: @ 812701C adds r0, r1, 0 adds r0, r6 adds r1, r5, 0 - bl sub_81205C8 + bl GiveItemToMon adds r0, r5, 0 - bl sub_8127384 + bl RemoveItemToGiveFromBag ldr r1, _08127090 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _08127094 @ =sub_8127098 + ldr r1, _08127094 @ =Task_UpdateHeldItemSpriteAndClosePartyMenu str r1, [r0] _08127078: pop {r3} @@ -16859,20 +16859,20 @@ _08127078: bx r0 .align 2, 0 _08127084: .4byte gPaletteFade -_08127088: .4byte gUnknown_203B0A0 +_08127088: .4byte gPartyMenu _0812708C: .4byte gPlayerParty _08127090: .4byte gTasks -_08127094: .4byte sub_8127098 - thumb_func_end sub_812701C +_08127094: .4byte Task_UpdateHeldItemSpriteAndClosePartyMenu + thumb_func_end GiveItemToSelectedMon - thumb_func_start sub_8127098 -sub_8127098: @ 8127098 + thumb_func_start Task_UpdateHeldItemSpriteAndClosePartyMenu +Task_UpdateHeldItemSpriteAndClosePartyMenu: @ 8127098 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081270D4 @ =gUnknown_203B0A0 + ldr r0, _081270D4 @ =gPartyMenu ldrb r4, [r0, 0x9] - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -16883,27 +16883,27 @@ sub_8127098: @ 8127098 muls r0, r2 ldr r1, _081270D8 @ =gPlayerParty adds r0, r1 - ldr r1, _081270DC @ =gUnknown_203B0B4 + ldr r1, _081270DC @ =sPartyMenuBoxes lsls r2, 4 ldr r1, [r1] adds r1, r2 - bl sub_81224B4 + bl UpdatePartyMonHeldItemSprite adds r0, r5, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _081270CC: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081270D4: .4byte gUnknown_203B0A0 +_081270D4: .4byte gPartyMenu _081270D8: .4byte gPlayerParty -_081270DC: .4byte gUnknown_203B0B4 - thumb_func_end sub_8127098 +_081270DC: .4byte sPartyMenuBoxes + thumb_func_end Task_UpdateHeldItemSpriteAndClosePartyMenu - thumb_func_start sub_81270E0 -sub_81270E0: @ 81270E0 + thumb_func_start CB2_WriteMailToGiveMonFromBag +CB2_WriteMailToGiveMonFromBag: @ 81270E0 push {r4-r6,lr} - ldr r4, _08127128 @ =gUnknown_203B0A0 + ldr r4, _08127128 @ =gPartyMenu movs r0, 0x9 ldrsb r0, [r4, r0] movs r6, 0x64 @@ -16911,7 +16911,7 @@ sub_81270E0: @ 81270E0 ldr r5, _0812712C @ =gPlayerParty adds r0, r5 ldrh r1, [r4, 0xC] - bl sub_81205C8 + bl GiveItemToMon movs r0, 0x9 ldrsb r0, [r4, r0] muls r0, r6 @@ -16928,25 +16928,25 @@ sub_81270E0: @ 81270E0 adds r2, r0 ldr r1, [r1] adds r1, r2 - ldr r2, _08127138 @ =sub_812713C + ldr r2, _08127138 @ =CB2_ReturnToPartyOrBagMenuFromWritingMail movs r0, 0x4 - bl sub_80FEBAC + bl DoEasyChatScreen pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08127128: .4byte gUnknown_203B0A0 +_08127128: .4byte gPartyMenu _0812712C: .4byte gPlayerParty _08127130: .4byte gSaveBlock1Ptr _08127134: .4byte 0x00002cd0 -_08127138: .4byte sub_812713C - thumb_func_end sub_81270E0 +_08127138: .4byte CB2_ReturnToPartyOrBagMenuFromWritingMail + thumb_func_end CB2_WriteMailToGiveMonFromBag - thumb_func_start sub_812713C -sub_812713C: @ 812713C + thumb_func_start CB2_ReturnToPartyOrBagMenuFromWritingMail +CB2_ReturnToPartyOrBagMenuFromWritingMail: @ 812713C push {r4-r7,lr} sub sp, 0xC - ldr r6, _0812718C @ =gUnknown_203B0A0 + ldr r6, _0812718C @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 @@ -16964,7 +16964,7 @@ sub_812713C: @ 812713C bne _0812719C adds r0, r5, 0 bl TakeMailFromMon - ldr r4, _08127198 @ =gUnknown_203B0D8 + ldr r4, _08127198 @ =sPartyMenuItemId adds r0, r5, 0 movs r1, 0xC adds r2, r4, 0 @@ -16973,15 +16973,15 @@ sub_812713C: @ 812713C movs r1, 0x1 bl RemoveBagItem adds r0, r7, 0 - bl sub_81273AC + bl ReturnGiveItemToBagOrPC ldr r0, [r6] bl SetMainCallback2 b _081271B8 .align 2, 0 -_0812718C: .4byte gUnknown_203B0A0 +_0812718C: .4byte gPartyMenu _08127190: .4byte gPlayerParty _08127194: .4byte gSpecialVar_Result -_08127198: .4byte gUnknown_203B0D8 +_08127198: .4byte sPartyMenuItemId _0812719C: ldrb r0, [r6, 0x8] lsls r0, 28 @@ -16989,24 +16989,24 @@ _0812719C: ldrb r2, [r6, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _081271C0 @ =sub_81271C4 + ldr r1, _081271C0 @ =Task_DisplayGaveMailFromBagMessage str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] movs r1, 0xFF movs r3, 0x1 - bl PartyMenuInit + bl InitPartyMenu _081271B8: add sp, 0xC pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081271C0: .4byte sub_81271C4 - thumb_func_end sub_812713C +_081271C0: .4byte Task_DisplayGaveMailFromBagMessage + thumb_func_end CB2_ReturnToPartyOrBagMenuFromWritingMail - thumb_func_start sub_81271C4 -sub_81271C4: @ 81271C4 + thumb_func_start Task_DisplayGaveMailFromBagMessage +Task_DisplayGaveMailFromBagMessage: @ 81271C4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -17016,22 +17016,22 @@ sub_81271C4: @ 81271C4 ands r0, r1 cmp r0, 0 bne _0812721E - ldr r1, _081271F0 @ =gUnknown_203B0D8 + ldr r1, _081271F0 @ =sPartyMenuItemId ldrh r0, [r1] cmp r0, 0 beq _081271F8 - ldr r0, _081271F4 @ =gUnknown_203B0A0 + ldr r0, _081271F4 @ =gPartyMenu ldrh r0, [r0, 0xC] ldrh r1, [r1] movs r2, 0 - bl sub_8120558 + bl DisplaySwitchedHeldItemMessage b _08127210 .align 2, 0 _081271EC: .4byte gPaletteFade -_081271F0: .4byte gUnknown_203B0D8 -_081271F4: .4byte gUnknown_203B0A0 +_081271F0: .4byte sPartyMenuItemId +_081271F4: .4byte gPartyMenu _081271F8: - ldr r2, _08127224 @ =gUnknown_203B0A0 + ldr r2, _08127224 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r2, r1] movs r0, 0x64 @@ -17041,43 +17041,43 @@ _081271F8: ldrh r1, [r2, 0xC] movs r2, 0 movs r3, 0x1 - bl sub_8120420 + bl DisplayGaveHeldItemMessage _08127210: ldr r0, _0812722C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08127230 @ =sub_8127098 + ldr r0, _08127230 @ =Task_UpdateHeldItemSpriteAndClosePartyMenu str r0, [r1] _0812721E: pop {r4} pop {r0} bx r0 .align 2, 0 -_08127224: .4byte gUnknown_203B0A0 +_08127224: .4byte gPartyMenu _08127228: .4byte gPlayerParty _0812722C: .4byte gTasks -_08127230: .4byte sub_8127098 - thumb_func_end sub_81271C4 +_08127230: .4byte Task_UpdateHeldItemSpriteAndClosePartyMenu + thumb_func_end Task_DisplayGaveMailFromBagMessage - thumb_func_start sub_8127234 -sub_8127234: @ 8127234 + thumb_func_start Task_SwitchItemsFromBagYesNo +Task_SwitchItemsFromBagYesNo: @ 8127234 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8120370 + bl IsPartyMenuTextPrinterActive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08127258 - bl sub_812200C + bl PartyMenuDisplayYesNoMenu ldr r0, _08127260 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08127264 @ =sub_8127268 + ldr r0, _08127264 @ =Task_HandleSwitchItemsFromBagYesNoInput str r0, [r1] _08127258: pop {r4} @@ -17085,11 +17085,11 @@ _08127258: bx r0 .align 2, 0 _08127260: .4byte gTasks -_08127264: .4byte sub_8127268 - thumb_func_end sub_8127234 +_08127264: .4byte Task_HandleSwitchItemsFromBagYesNoInput + thumb_func_end Task_SwitchItemsFromBagYesNo - thumb_func_start sub_8127268 -sub_8127268: @ 8127268 + thumb_func_start Task_HandleSwitchItemsFromBagYesNoInput +Task_HandleSwitchItemsFromBagYesNoInput: @ 8127268 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -17110,11 +17110,11 @@ _08127288: beq _0812732E b _0812733C _0812728E: - ldr r7, _081272C0 @ =gUnknown_203B0A0 + ldr r7, _081272C0 @ =gPartyMenu ldrh r4, [r7, 0xC] adds r0, r4, 0 - bl sub_8127384 - ldr r6, _081272C4 @ =gUnknown_203B0D8 + bl RemoveItemToGiveFromBag + ldr r6, _081272C4 @ =sPartyMenuItemId ldrh r0, [r6] movs r1, 0x1 bl AddBagItem @@ -17122,16 +17122,16 @@ _0812728E: cmp r0, 0 bne _081272CC adds r0, r4, 0 - bl sub_81273AC + bl ReturnGiveItemToBagOrPC ldrh r0, [r6] - bl sub_8120658 + bl BufferBagFullCantTakeItemMessage ldr r0, _081272C8 @ =gStringVar4 movs r1, 0 - bl sub_81202F8 + bl DisplayPartyMenuMessage b _0812730C .align 2, 0 -_081272C0: .4byte gUnknown_203B0A0 -_081272C4: .4byte gUnknown_203B0D8 +_081272C0: .4byte gPartyMenu +_081272C4: .4byte sPartyMenuItemId _081272C8: .4byte gStringVar4 _081272CC: adds r0, r4, 0 @@ -17139,16 +17139,16 @@ _081272CC: lsls r0, 24 cmp r0, 0 beq _081272F0 - ldr r0, _081272E8 @ =gUnknown_203B09C + ldr r0, _081272E8 @ =sPartyMenuInternal ldr r1, [r0] - ldr r0, _081272EC @ =sub_81270E0 + ldr r0, _081272EC @ =CB2_WriteMailToGiveMonFromBag str r0, [r1, 0x4] adds r0, r5, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _0812733C .align 2, 0 -_081272E8: .4byte gUnknown_203B09C -_081272EC: .4byte sub_81270E0 +_081272E8: .4byte sPartyMenuInternal +_081272EC: .4byte CB2_WriteMailToGiveMonFromBag _081272F0: movs r1, 0x9 ldrsb r1, [r7, r1] @@ -17157,24 +17157,24 @@ _081272F0: ldr r1, _0812731C @ =gPlayerParty adds r0, r1 adds r1, r4, 0 - bl sub_81205C8 + bl GiveItemToMon ldrh r1, [r6] adds r0, r4, 0 movs r2, 0x1 - bl sub_8120558 + bl DisplaySwitchedHeldItemMessage _0812730C: ldr r1, _08127320 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08127324 @ =sub_8127098 + ldr r1, _08127324 @ =Task_UpdateHeldItemSpriteAndClosePartyMenu str r1, [r0] b _0812733C .align 2, 0 _0812731C: .4byte gPlayerParty _08127320: .4byte gTasks -_08127324: .4byte sub_8127098 +_08127324: .4byte Task_UpdateHeldItemSpriteAndClosePartyMenu _08127328: movs r0, 0x5 bl PlaySE @@ -17184,7 +17184,7 @@ _0812732E: adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08127348 @ =sub_8127098 + ldr r0, _08127348 @ =Task_UpdateHeldItemSpriteAndClosePartyMenu str r0, [r1] _0812733C: pop {r4-r7} @@ -17192,18 +17192,18 @@ _0812733C: bx r0 .align 2, 0 _08127344: .4byte gTasks -_08127348: .4byte sub_8127098 - thumb_func_end sub_8127268 +_08127348: .4byte Task_UpdateHeldItemSpriteAndClosePartyMenu + thumb_func_end Task_HandleSwitchItemsFromBagYesNoInput - thumb_func_start sub_812734C -sub_812734C: @ 812734C + thumb_func_start DisplayItemMustBeRemovedFirstMessage +DisplayItemMustBeRemovedFirstMessage: @ 812734C push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldr r0, _08127378 @ =gUnknown_8416BFB movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r1, _0812737C @ =gTasks @@ -17211,7 +17211,7 @@ sub_812734C: @ 812734C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08127380 @ =sub_8127098 + ldr r1, _08127380 @ =Task_UpdateHeldItemSpriteAndClosePartyMenu str r1, [r0] pop {r4} pop {r0} @@ -17219,15 +17219,15 @@ sub_812734C: @ 812734C .align 2, 0 _08127378: .4byte gUnknown_8416BFB _0812737C: .4byte gTasks -_08127380: .4byte sub_8127098 - thumb_func_end sub_812734C +_08127380: .4byte Task_UpdateHeldItemSpriteAndClosePartyMenu + thumb_func_end DisplayItemMustBeRemovedFirstMessage - thumb_func_start sub_8127384 -sub_8127384: @ 8127384 + thumb_func_start RemoveItemToGiveFromBag +RemoveItemToGiveFromBag: @ 8127384 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _0812739C @ =gUnknown_203B0A0 + ldr r0, _0812739C @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x6 bne _081273A0 @@ -17236,7 +17236,7 @@ sub_8127384: @ 8127384 bl RemoveItemFromPC b _081273A8 .align 2, 0 -_0812739C: .4byte gUnknown_203B0A0 +_0812739C: .4byte gPartyMenu _081273A0: adds r0, r1, 0 movs r1, 0x1 @@ -17244,14 +17244,14 @@ _081273A0: _081273A8: pop {r0} bx r0 - thumb_func_end sub_8127384 + thumb_func_end RemoveItemToGiveFromBag - thumb_func_start sub_81273AC -sub_81273AC: @ 81273AC + thumb_func_start ReturnGiveItemToBagOrPC +ReturnGiveItemToBagOrPC: @ 81273AC push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _081273C4 @ =gUnknown_203B0A0 + ldr r0, _081273C4 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x5 beq _081273C8 @@ -17260,7 +17260,7 @@ sub_81273AC: @ 81273AC bl AddPCItem b _081273D0 .align 2, 0 -_081273C4: .4byte gUnknown_203B0A0 +_081273C4: .4byte gPartyMenu _081273C8: adds r0, r1, 0 movs r1, 0x1 @@ -17270,15 +17270,15 @@ _081273D0: lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_81273AC + thumb_func_end ReturnGiveItemToBagOrPC - thumb_func_start PartyMenuInit_FromPlayerPc -PartyMenuInit_FromPlayerPc: @ 81273D8 + thumb_func_start ChooseMonToGiveMailFromMailbox +ChooseMonToGiveMailFromMailbox: @ 81273D8 push {lr} sub sp, 0xC movs r0, 0x6 str r0, [sp] - ldr r0, _081273FC @ =sub_811FB28 + ldr r0, _081273FC @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _08127400 @ =CB2_PlayerPC_ReturnFromPartyMenu str r0, [sp, 0x8] @@ -17286,28 +17286,28 @@ PartyMenuInit_FromPlayerPc: @ 81273D8 movs r1, 0 movs r2, 0x7 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 -_081273FC: .4byte sub_811FB28 +_081273FC: .4byte Task_HandleChooseMonInput _08127400: .4byte CB2_PlayerPC_ReturnFromPartyMenu - thumb_func_end PartyMenuInit_FromPlayerPc + thumb_func_end ChooseMonToGiveMailFromMailbox - thumb_func_start sub_8127404 -sub_8127404: @ 8127404 + thumb_func_start TryGiveMailToSelectedMon +TryGiveMailToSelectedMon: @ 8127404 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08127450 @ =gUnknown_203B0A0 + ldr r0, _08127450 @ =gPartyMenu movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 ldr r0, _08127454 @ =gPlayerParty adds r5, r1, r0 - ldr r1, _08127458 @ =gUnknown_203B0C0 + ldr r1, _08127458 @ =gPartyMenuUseExitCallback movs r0, 0 strb r0, [r1] ldr r2, _0812745C @ =gSaveBlock1Ptr @@ -17328,27 +17328,27 @@ sub_8127404: @ 8127404 bl GetMonData cmp r0, 0 beq _0812746C - ldr r0, _08127468 @ =gUnknown_8416D17 + ldr r0, _08127468 @ =gText_PkmnHoldingItemCantHoldMail movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage b _08127482 .align 2, 0 -_08127450: .4byte gUnknown_203B0A0 +_08127450: .4byte gPartyMenu _08127454: .4byte gPlayerParty -_08127458: .4byte gUnknown_203B0C0 +_08127458: .4byte gPartyMenuUseExitCallback _0812745C: .4byte gSaveBlock1Ptr _08127460: .4byte gPlayerPcMenuManager _08127464: .4byte 0x00002cd0 -_08127468: .4byte gUnknown_8416D17 +_08127468: .4byte gText_PkmnHoldingItemCantHoldMail _0812746C: adds r0, r5, 0 adds r1, r4, 0 bl GiveMailToMon2 adds r0, r4, 0 bl ClearMailStruct - ldr r0, _0812749C @ =gUnknown_8416D4F + ldr r0, _0812749C @ =gText_MailTransferredFromMailbox movs r1, 0x1 - bl sub_81202F8 + bl DisplayPartyMenuMessage _08127482: movs r0, 0x2 bl ScheduleBgCopyTilemapToVram @@ -17357,28 +17357,28 @@ _08127482: adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081274A4 @ =sub_8127098 + ldr r0, _081274A4 @ =Task_UpdateHeldItemSpriteAndClosePartyMenu str r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0812749C: .4byte gUnknown_8416D4F +_0812749C: .4byte gText_MailTransferredFromMailbox _081274A0: .4byte gTasks -_081274A4: .4byte sub_8127098 - thumb_func_end sub_8127404 +_081274A4: .4byte Task_UpdateHeldItemSpriteAndClosePartyMenu + thumb_func_end TryGiveMailToSelectedMon - thumb_func_start sub_81274A8 -sub_81274A8: @ 81274A8 + thumb_func_start InitChooseHalfPartyForBattle +InitChooseHalfPartyForBattle: @ 81274A8 push {r4,lr} sub sp, 0xC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl sub_81274FC + bl ClearSelectedPartyOrder movs r0, 0 str r0, [sp] - ldr r0, _081274EC @ =sub_811FB28 + ldr r0, _081274EC @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _081274F0 @ =gMain ldr r0, [r0, 0x8] @@ -17387,29 +17387,29 @@ sub_81274A8: @ 81274A8 movs r1, 0 movs r2, 0 movs r3, 0 - bl PartyMenuInit - ldr r1, _081274F4 @ =gUnknown_203B0A0 + bl InitPartyMenu + ldr r1, _081274F4 @ =gPartyMenu lsls r4, 6 ldrb r2, [r1, 0x8] movs r0, 0x3F ands r0, r2 orrs r0, r4 strb r0, [r1, 0x8] - ldr r0, _081274F8 @ =sub_812773C + ldr r0, _081274F8 @ =Task_ValidateChosenHalfParty str r0, [r1, 0x4] add sp, 0xC pop {r4} pop {r0} bx r0 .align 2, 0 -_081274EC: .4byte sub_811FB28 +_081274EC: .4byte Task_HandleChooseMonInput _081274F0: .4byte gMain -_081274F4: .4byte gUnknown_203B0A0 -_081274F8: .4byte sub_812773C - thumb_func_end sub_81274A8 +_081274F4: .4byte gPartyMenu +_081274F8: .4byte Task_ValidateChosenHalfParty + thumb_func_end InitChooseHalfPartyForBattle - thumb_func_start sub_81274FC -sub_81274FC: @ 81274FC + thumb_func_start ClearSelectedPartyOrder +ClearSelectedPartyOrder: @ 81274FC push {lr} ldr r0, _0812750C @ =gSelectedOrderFromParty movs r1, 0 @@ -17419,10 +17419,10 @@ sub_81274FC: @ 81274FC bx r0 .align 2, 0 _0812750C: .4byte gSelectedOrderFromParty - thumb_func_end sub_81274FC + thumb_func_end ClearSelectedPartyOrder - thumb_func_start sub_8127510 -sub_8127510: @ 8127510 + thumb_func_start GetPartySlotEntryStatus +GetPartySlotEntryStatus: @ 8127510 push {r4,lr} lsls r0, 24 asrs r4, r0, 24 @@ -17430,7 +17430,7 @@ sub_8127510: @ 8127510 muls r0, r4 ldr r1, _0812752C @ =gPlayerParty adds r0, r1 - bl sub_8127550 + bl GetBattleEntryEligibility lsls r0, 24 cmp r0, 0 bne _08127530 @@ -17442,7 +17442,7 @@ _08127530: adds r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 - bl sub_8127710 + bl HasPartySlotAlreadyBeenSelected lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -17455,10 +17455,10 @@ _08127548: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8127510 + thumb_func_end GetPartySlotEntryStatus - thumb_func_start sub_8127550 -sub_8127550: @ 8127550 + thumb_func_start GetBattleEntryEligibility +GetBattleEntryEligibility: @ 8127550 push {r4,r5,lr} adds r4, r0, 0 movs r5, 0 @@ -17466,7 +17466,7 @@ sub_8127550: @ 8127550 bl GetMonData cmp r0, 0 bne _0812757A - ldr r0, _08127580 @ =gUnknown_203B0A0 + ldr r0, _08127580 @ =gPartyMenu ldrb r0, [r0, 0x8] lsrs r1, r0, 6 cmp r1, 0 @@ -17482,7 +17482,7 @@ _0812757A: movs r0, 0 b _081275E2 .align 2, 0 -_08127580: .4byte gUnknown_203B0A0 +_08127580: .4byte gPartyMenu _08127584: adds r0, r4, 0 movs r1, 0x39 @@ -17541,10 +17541,10 @@ _081275E8: .4byte gSaveBlock2Ptr _081275EC: .4byte 0x0000055c _081275F0: .4byte gBattleTowerBannedSpecies _081275F4: .4byte 0x0000ffff - thumb_func_end sub_8127550 + thumb_func_end GetBattleEntryEligibility - thumb_func_start sub_81275F8 -sub_81275F8: @ 81275F8 + thumb_func_start CheckBattleEntriesAndGetMessage +CheckBattleEntriesAndGetMessage: @ 81275F8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -17552,7 +17552,7 @@ sub_81275F8: @ 81275F8 push {r5-r7} ldr r0, _08127618 @ =gPlayerParty mov r10, r0 - ldr r0, _0812761C @ =gUnknown_203B0A0 + ldr r0, _0812761C @ =gPartyMenu ldrb r0, [r0, 0x8] lsrs r0, 6 cmp r0, 0x1 @@ -17562,7 +17562,7 @@ sub_81275F8: @ 81275F8 b _08127700 .align 2, 0 _08127618: .4byte gPlayerParty -_0812761C: .4byte gUnknown_203B0A0 +_0812761C: .4byte gPartyMenu _08127620: ldr r1, _0812762C @ =gSelectedOrderFromParty ldrb r0, [r1, 0x2] @@ -17584,7 +17584,7 @@ _08127632: add r0, r10 movs r1, 0xB bl GetMonData - ldr r2, _081276E0 @ =gUnknown_203B09C + ldr r2, _081276E0 @ =sPartyMenuInternal ldr r1, [r2] ldr r2, _081276E4 @ =0x00000236 adds r1, r2 @@ -17596,7 +17596,7 @@ _08127632: add r0, r10 movs r1, 0xC bl GetMonData - ldr r2, _081276E0 @ =gUnknown_203B09C + ldr r2, _081276E0 @ =sPartyMenuInternal ldr r1, [r2] movs r2, 0x8D lsls r2, 2 @@ -17608,7 +17608,7 @@ _08127632: mov r9, r1 cmp r5, 0x2 bhi _081276D0 - ldr r0, _081276E0 @ =gUnknown_203B09C + ldr r0, _081276E0 @ =sPartyMenuInternal mov r8, r0 movs r7, 0x64 _0812767E: @@ -17661,7 +17661,7 @@ _081276D0: b _08127700 .align 2, 0 _081276DC: .4byte gSelectedOrderFromParty -_081276E0: .4byte gUnknown_203B09C +_081276E0: .4byte sPartyMenuInternal _081276E4: .4byte 0x00000236 _081276E8: ldr r2, _081276F4 @ =gSelectedOrderFromParty @@ -17688,10 +17688,10 @@ _08127702: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_81275F8 + thumb_func_end CheckBattleEntriesAndGetMessage - thumb_func_start sub_8127710 -sub_8127710: @ 8127710 + thumb_func_start HasPartySlotAlreadyBeenSelected +HasPartySlotAlreadyBeenSelected: @ 8127710 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -17716,15 +17716,15 @@ _0812772C: _08127738: pop {r1} bx r1 - thumb_func_end sub_8127710 + thumb_func_end HasPartySlotAlreadyBeenSelected - thumb_func_start sub_812773C -sub_812773C: @ 812773C + thumb_func_start Task_ValidateChosenHalfParty +Task_ValidateChosenHalfParty: @ 812773C push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - bl sub_81275F8 + bl CheckBattleEntriesAndGetMessage lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF @@ -17732,7 +17732,7 @@ sub_812773C: @ 812773C movs r0, 0x1A bl PlaySE adds r0, r4, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r0, _08127764 @ =gTasks lsls r1, r5, 2 adds r1, r5 @@ -17747,7 +17747,7 @@ _08127768: movs r0, 0x5 bl PlaySE adds r0, r5, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu b _0812779E .align 2, 0 _08127780: .4byte gSelectedOrderFromParty @@ -17755,14 +17755,14 @@ _08127784: movs r0, 0x1A bl PlaySE movs r0, 0xE - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r0, _081277A4 @ =gTasks lsls r1, r6, 2 adds r1, r6 _08127796: lsls r1, 3 adds r1, r0 - ldr r0, _081277A8 @ =sub_81277AC + ldr r0, _081277A8 @ =Task_ContinueChoosingHalfParty str r0, [r1] _0812779E: pop {r4-r6} @@ -17770,11 +17770,11 @@ _0812779E: bx r0 .align 2, 0 _081277A4: .4byte gTasks -_081277A8: .4byte sub_81277AC - thumb_func_end sub_812773C +_081277A8: .4byte Task_ContinueChoosingHalfParty + thumb_func_end Task_ValidateChosenHalfParty - thumb_func_start sub_81277AC -sub_81277AC: @ 81277AC + thumb_func_start Task_ContinueChoosingHalfParty +Task_ContinueChoosingHalfParty: @ 81277AC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -17792,13 +17792,13 @@ _081277C6: movs r0, 0x5 bl PlaySE movs r0, 0 - bl sub_8121D0C + bl DisplayPartyMenuStdMessage ldr r0, _081277EC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081277F0 @ =sub_811FB28 + ldr r0, _081277F0 @ =Task_HandleChooseMonInput str r0, [r1] _081277E0: pop {r4} @@ -17807,30 +17807,30 @@ _081277E0: .align 2, 0 _081277E8: .4byte gMain _081277EC: .4byte gTasks -_081277F0: .4byte sub_811FB28 - thumb_func_end sub_81277AC +_081277F0: .4byte Task_HandleChooseMonInput + thumb_func_end Task_ContinueChoosingHalfParty - thumb_func_start sub_81277F4 -sub_81277F4: @ 81277F4 + thumb_func_start ChooseMonForMoveTutor +ChooseMonForMoveTutor: @ 81277F4 push {lr} sub sp, 0xC lsls r0, 24 lsrs r0, 24 movs r2, 0 str r2, [sp] - ldr r2, _08127818 @ =sub_811FB28 + ldr r2, _08127818 @ =Task_HandleChooseMonInput str r2, [sp, 0x4] str r1, [sp, 0x8] movs r1, 0 movs r2, 0 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 -_08127818: .4byte sub_811FB28 - thumb_func_end sub_81277F4 +_08127818: .4byte Task_HandleChooseMonInput + thumb_func_end ChooseMonForMoveTutor thumb_func_start sub_812781C sub_812781C: @ 812781C @@ -17842,7 +17842,7 @@ sub_812781C: @ 812781C bhi _08127850 movs r0, 0x4 str r0, [sp] - ldr r0, _08127848 @ =sub_811FB28 + ldr r0, _08127848 @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _0812784C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic str r0, [sp, 0x8] @@ -17850,16 +17850,16 @@ sub_812781C: @ 812781C movs r1, 0 movs r2, 0xC movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu b _08127870 .align 2, 0 _08127844: .4byte gSpecialVar_0x8005 -_08127848: .4byte sub_811FB28 +_08127848: .4byte Task_HandleChooseMonInput _0812784C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic _08127850: movs r0, 0x7F str r0, [sp] - ldr r0, _08127878 @ =sub_8126DC8 + ldr r0, _08127878 @ =TryTutorSelectedMon str r0, [sp, 0x4] ldr r0, _0812787C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic str r0, [sp, 0x8] @@ -17867,8 +17867,8 @@ _08127850: movs r1, 0 movs r2, 0xC movs r3, 0 - bl PartyMenuInit - ldr r1, _08127880 @ =gUnknown_203B0A0 + bl InitPartyMenu + ldr r1, _08127880 @ =gPartyMenu ldr r0, _08127884 @ =gSpecialVar_0x8007 ldrh r0, [r0] strb r0, [r1, 0x9] @@ -17877,19 +17877,19 @@ _08127870: pop {r0} bx r0 .align 2, 0 -_08127878: .4byte sub_8126DC8 +_08127878: .4byte TryTutorSelectedMon _0812787C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic -_08127880: .4byte gUnknown_203B0A0 +_08127880: .4byte gPartyMenu _08127884: .4byte gSpecialVar_0x8007 thumb_func_end sub_812781C - thumb_func_start sub_8127888 -sub_8127888: @ 8127888 + thumb_func_start ChooseMonForWirelessMinigame +ChooseMonForWirelessMinigame: @ 8127888 push {lr} sub sp, 0xC movs r0, 0x1 str r0, [sp] - ldr r0, _081278AC @ =sub_811FB28 + ldr r0, _081278AC @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _081278B0 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic str r0, [sp, 0x8] @@ -17897,17 +17897,17 @@ sub_8127888: @ 8127888 movs r1, 0 movs r2, 0xD movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 -_081278AC: .4byte sub_811FB28 +_081278AC: .4byte Task_HandleChooseMonInput _081278B0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic - thumb_func_end sub_8127888 + thumb_func_end ChooseMonForWirelessMinigame - thumb_func_start sub_81278B4 -sub_81278B4: @ 81278B4 + thumb_func_start GetPartyLayoutFromBattleType +GetPartyLayoutFromBattleType: @ 81278B4 push {lr} bl IsDoubleBattle lsls r0, 24 @@ -17928,10 +17928,10 @@ _081278D4: _081278D6: pop {r1} bx r1 - thumb_func_end sub_81278B4 + thumb_func_end GetPartyLayoutFromBattleType - thumb_func_start OpenPartyMenuInBattle -OpenPartyMenuInBattle: @ 81278DC + thumb_func_start OpenPartyMenuInTutorialBattle +OpenPartyMenuInTutorialBattle: @ 81278DC push {r4,lr} sub sp, 0xC lsls r0, 24 @@ -17947,7 +17947,7 @@ OpenPartyMenuInBattle: @ 81278DC ands r0, r1 cmp r0, 0 beq _08127930 - bl sub_81278B4 + bl GetPartyLayoutFromBattleType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -17960,7 +17960,7 @@ OpenPartyMenuInBattle: @ 81278DC movs r0, 0x1 adds r2, r4, 0 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu movs r0, 0x8 bl sub_80EB2F4 b _08127950 @@ -17969,37 +17969,37 @@ _08127924: .4byte gBattleTypeFlags _08127928: .4byte sub_8120C3C _0812792C: .4byte SetCB2ToReshowScreenAfterMenu _08127930: - bl sub_81278B4 + bl GetPartyLayoutFromBattleType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 movs r0, 0 str r0, [sp] - ldr r0, _08127960 @ =sub_811FB28 + ldr r0, _08127960 @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _08127964 @ =SetCB2ToReshowScreenAfterMenu str r0, [sp, 0x8] movs r0, 0x1 adds r2, r4, 0 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu _08127950: bl nullsub_44 - bl pokemon_change_order + bl UpdatePartyToBattleOrder add sp, 0xC pop {r4} pop {r0} bx r0 .align 2, 0 -_08127960: .4byte sub_811FB28 +_08127960: .4byte Task_HandleChooseMonInput _08127964: .4byte SetCB2ToReshowScreenAfterMenu - thumb_func_end OpenPartyMenuInBattle + thumb_func_end OpenPartyMenuInTutorialBattle - thumb_func_start sub_8127968 -sub_8127968: @ 8127968 + thumb_func_start OpenPartyMenuInBattle +OpenPartyMenuInBattle: @ 8127968 push {lr} sub sp, 0xC - bl sub_81278B4 + bl GetPartyLayoutFromBattleType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -18012,22 +18012,22 @@ sub_8127968: @ 8127968 movs r0, 0x1 movs r2, 0 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu bl nullsub_44 - bl pokemon_change_order + bl UpdatePartyToBattleOrder add sp, 0xC pop {r0} bx r0 .align 2, 0 _0812799C: .4byte sub_8120EBC _081279A0: .4byte SetCB2ToReshowScreenAfterMenu - thumb_func_end sub_8127968 + thumb_func_end OpenPartyMenuInBattle - thumb_func_start sub_81279A4 -sub_81279A4: @ 81279A4 + thumb_func_start ChooseMonForInBattleItem +ChooseMonForInBattleItem: @ 81279A4 push {lr} sub sp, 0xC - bl sub_81278B4 + bl GetPartyLayoutFromBattleType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -18040,16 +18040,16 @@ sub_81279A4: @ 81279A4 movs r0, 0x1 movs r2, 0xE movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu bl nullsub_44 - bl pokemon_change_order + bl UpdatePartyToBattleOrder add sp, 0xC pop {r0} bx r0 .align 2, 0 _081279D8: .4byte sub_8120FCC _081279DC: .4byte sub_8107ECC - thumb_func_end sub_81279A4 + thumb_func_end ChooseMonForInBattleItem thumb_func_start sub_81279E0 sub_81279E0: @ 81279E0 @@ -18066,7 +18066,7 @@ sub_81279E0: @ 81279E0 ands r0, r1 cmp r0, 0 beq _08127A30 - bl sub_81278B4 + bl GetPartyLayoutFromBattleType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -18079,7 +18079,7 @@ sub_81279E0: @ 81279E0 movs r0, 0x1 movs r2, 0x3 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu movs r0, 0x8 bl sub_80EB2F4 b _08127A62 @@ -18098,22 +18098,22 @@ _08127A30: bne _08127A44 ldr r4, _08127A7C @ =sub_8124DB0 _08127A44: - bl sub_81278B4 + bl GetPartyLayoutFromBattleType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 movs r0, 0x5 str r0, [sp] - ldr r0, _08127A80 @ =sub_811FB28 + ldr r0, _08127A80 @ =Task_HandleChooseMonInput str r0, [sp, 0x4] str r4, [sp, 0x8] movs r0, 0x1 movs r2, 0x3 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu _08127A62: bl nullsub_44 - bl pokemon_change_order + bl UpdatePartyToBattleOrder add sp, 0xC pop {r4} pop {r0} @@ -18122,11 +18122,11 @@ _08127A62: _08127A74: .4byte gSpecialVar_ItemId _08127A78: .4byte sub_8107ECC _08127A7C: .4byte sub_8124DB0 -_08127A80: .4byte sub_811FB28 +_08127A80: .4byte Task_HandleChooseMonInput thumb_func_end sub_81279E0 - thumb_func_start sub_8127A84 -sub_8127A84: @ 8127A84 + thumb_func_start GetPartyMenuActionsTypeInBattle +GetPartyMenuActionsTypeInBattle: @ 8127A84 push {r4,lr} adds r4, r0, 0 ldr r0, _08127AA4 @ =gPlayerParty + 100 @ &gPlayerParty[1] @@ -18145,24 +18145,24 @@ _08127AA0: .align 2, 0 _08127AA4: .4byte gPlayerParty + 100 @ &gPlayerParty[1] _08127AA8: - ldr r0, _08127AB4 @ =gUnknown_203B0A0 + ldr r0, _08127AB4 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x1 beq _08127AB8 movs r0, 0x2 b _08127ABA .align 2, 0 -_08127AB4: .4byte gUnknown_203B0A0 +_08127AB4: .4byte gPartyMenu _08127AB8: movs r0, 0x3 _08127ABA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8127A84 + thumb_func_end GetPartyMenuActionsTypeInBattle - thumb_func_start sub_8127AC0 -sub_8127AC0: @ 8127AC0 + thumb_func_start TrySwitchInPokemon +TrySwitchInPokemon: @ 8127AC0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -18225,7 +18225,7 @@ _08127B40: cmp r0, 0 bne _08127B62 adds r0, r5, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot lsls r0, 24 ldr r2, _08127B90 @ =gBattlerPartyIndexes lsls r1, r4, 1 @@ -18265,7 +18265,7 @@ _08127B9C: .4byte gStringVar4 _08127BA0: .4byte gUnknown_8416ACB _08127BA4: adds r0, r5, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot ldr r1, _08127BC8 @ =gBattleStruct ldr r1, [r1] adds r1, 0x8B @@ -18286,22 +18286,22 @@ _08127BCC: .4byte gStringVar1 _08127BD0: .4byte gStringVar4 _08127BD4: .4byte gUnknown_8416A55 _08127BD8: - ldr r0, _08127BE8 @ =gUnknown_203B0A0 + ldr r0, _08127BE8 @ =gPartyMenu ldrb r0, [r0, 0xB] cmp r0, 0x4 bne _08127BEC bl SetMonPreventsSwitchingString b _08127C8A .align 2, 0 -_08127BE8: .4byte gUnknown_203B0A0 +_08127BE8: .4byte gPartyMenu _08127BEC: cmp r0, 0x2 beq _08127C64 adds r0, r5, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot ldr r1, _08127C30 @ =gUnknown_203B0C1 strb r0, [r1] - ldr r1, _08127C34 @ =gUnknown_203B0C0 + ldr r1, _08127C34 @ =gPartyMenuUseExitCallback movs r0, 0x1 strb r0, [r1] ldr r1, _08127C38 @ =gBattlerPartyIndexes @@ -18316,17 +18316,17 @@ _08127BEC: lsrs r4, 24 adds r0, r4, 0 adds r1, r5, 0 - bl sub_8127FF4 + bl SwitchPartyMonSlots adds r0, r4, 0 muls r0, r7 add r0, r8 adds r1, r6, 0 - bl sub_811FA40 + bl SwapPartyPokemon movs r0, 0x1 b _08127C8C .align 2, 0 _08127C30: .4byte gUnknown_203B0C1 -_08127C34: .4byte gUnknown_203B0C0 +_08127C34: .4byte gPartyMenuUseExitCallback _08127C38: .4byte gBattlerPartyIndexes _08127C3C: .4byte gBattlerInMenuId _08127C40: @@ -18376,27 +18376,27 @@ _08127C9C: .4byte gBattlerPartyIndexes _08127CA0: .4byte gStringVar1 _08127CA4: .4byte gStringVar4 _08127CA8: .4byte gUnknown_8416A1E - thumb_func_end sub_8127AC0 + thumb_func_end TrySwitchInPokemon - thumb_func_start sub_8127CAC -sub_8127CAC: @ 8127CAC + thumb_func_start BufferBattlePartyCurrentOrder +BufferBattlePartyCurrentOrder: @ 8127CAC push {r4,lr} - ldr r4, _08127CC8 @ =gUnknown_203B0DC + ldr r4, _08127CC8 @ =gBattlePartyCurrentOrder bl sub_80435E0 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl sub_8127CCC + bl BufferBattlePartyOrder pop {r4} pop {r0} bx r0 .align 2, 0 -_08127CC8: .4byte gUnknown_203B0DC - thumb_func_end sub_8127CAC +_08127CC8: .4byte gBattlePartyCurrentOrder + thumb_func_end BufferBattlePartyCurrentOrder - thumb_func_start sub_8127CCC -sub_8127CCC: @ 8127CCC + thumb_func_start BufferBattlePartyOrder +BufferBattlePartyOrder: @ 8127CCC push {r4-r6,lr} sub sp, 0x8 adds r6, r0, 0 @@ -18512,10 +18512,10 @@ _08127D9C: bx r0 .align 2, 0 _08127DA4: .4byte gBattlerPartyIndexes - thumb_func_end sub_8127CCC + thumb_func_end BufferBattlePartyOrder - thumb_func_start sub_8127DA8 -sub_8127DA8: @ 8127DA8 + thumb_func_start BufferBattlePartyCurrentOrderBySide +BufferBattlePartyCurrentOrderBySide: @ 8127DA8 push {lr} adds r2, r0, 0 lsls r2, 24 @@ -18528,15 +18528,15 @@ sub_8127DA8: @ 8127DA8 adds r3, 0x60 ldr r0, [r0] adds r0, r3 - bl sub_8127DCC + bl BufferBattlePartyOrderBySide pop {r0} bx r0 .align 2, 0 _08127DC8: .4byte gBattleStruct - thumb_func_end sub_8127DA8 + thumb_func_end BufferBattlePartyCurrentOrderBySide - thumb_func_start sub_8127DCC -sub_8127DCC: @ 8127DCC + thumb_func_start BufferBattlePartyOrderBySide +BufferBattlePartyOrderBySide: @ 8127DCC push {r4-r7,lr} sub sp, 0x8 adds r5, r0, 0 @@ -18665,10 +18665,10 @@ _08127EB6: bx r0 .align 2, 0 _08127EC0: .4byte gBattlerPartyIndexes - thumb_func_end sub_8127DCC + thumb_func_end BufferBattlePartyOrderBySide - thumb_func_start sub_8127EC4 -sub_8127EC4: @ 8127EC4 + thumb_func_start SwitchPartyOrderLinkMulti +SwitchPartyOrderLinkMulti: @ 8127EC4 push {r4-r7,lr} sub sp, 0x8 lsls r0, 24 @@ -18762,10 +18762,10 @@ _08127F72: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8127EC4 + thumb_func_end SwitchPartyOrderLinkMulti - thumb_func_start sub_8127F7C -sub_8127F7C: @ 8127F7C + thumb_func_start GetPartyIdFromBattleSlot +GetPartyIdFromBattleSlot: @ 8127F7C push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -18774,16 +18774,16 @@ sub_8127F7C: @ 8127F7C lsrs r2, r0, 25 cmp r1, 0 beq _08127F9C - ldr r0, _08127F98 @ =gUnknown_203B0DC + ldr r0, _08127F98 @ =gBattlePartyCurrentOrder adds r0, r2, r0 ldrb r0, [r0] movs r1, 0xF ands r1, r0 b _08127FA4 .align 2, 0 -_08127F98: .4byte gUnknown_203B0DC +_08127F98: .4byte gBattlePartyCurrentOrder _08127F9C: - ldr r0, _08127FAC @ =gUnknown_203B0DC + ldr r0, _08127FAC @ =gBattlePartyCurrentOrder adds r0, r2, r0 ldrb r0, [r0] lsrs r1, r0, 4 @@ -18792,11 +18792,11 @@ _08127FA4: pop {r1} bx r1 .align 2, 0 -_08127FAC: .4byte gUnknown_203B0DC - thumb_func_end sub_8127F7C +_08127FAC: .4byte gBattlePartyCurrentOrder + thumb_func_end GetPartyIdFromBattleSlot - thumb_func_start sub_8127FB0 -sub_8127FB0: @ 8127FB0 + thumb_func_start SetPartyIdAtBattleSlot +SetPartyIdAtBattleSlot: @ 8127FB0 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -18807,7 +18807,7 @@ sub_8127FB0: @ 8127FB0 lsrs r3, r0, 25 cmp r1, 0 beq _08127FD8 - ldr r0, _08127FD4 @ =gUnknown_203B0DC + ldr r0, _08127FD4 @ =gBattlePartyCurrentOrder adds r0, r3, r0 ldrb r2, [r0] movs r1, 0xF0 @@ -18816,9 +18816,9 @@ sub_8127FB0: @ 8127FB0 strb r1, [r0] b _08127FE8 .align 2, 0 -_08127FD4: .4byte gUnknown_203B0DC +_08127FD4: .4byte gBattlePartyCurrentOrder _08127FD8: - ldr r2, _08127FF0 @ =gUnknown_203B0DC + ldr r2, _08127FF0 @ =gBattlePartyCurrentOrder adds r2, r3, r2 ldrb r1, [r2] movs r0, 0xF @@ -18831,11 +18831,11 @@ _08127FE8: pop {r0} bx r0 .align 2, 0 -_08127FF0: .4byte gUnknown_203B0DC - thumb_func_end sub_8127FB0 +_08127FF0: .4byte gBattlePartyCurrentOrder + thumb_func_end SetPartyIdAtBattleSlot - thumb_func_start sub_8127FF4 -sub_8127FF4: @ 8127FF4 + thumb_func_start SwitchPartyMonSlots +SwitchPartyMonSlots: @ 8127FF4 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 @@ -18844,24 +18844,24 @@ sub_8127FF4: @ 8127FF4 lsls r6, 24 lsrs r6, 24 adds r0, r5, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 adds r0, r6, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl sub_8127FB0 + bl SetPartyIdAtBattleSlot adds r0, r6, 0 adds r1, r4, 0 - bl sub_8127FB0 + bl SetPartyIdAtBattleSlot pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8127FF4 + thumb_func_end SwitchPartyMonSlots thumb_func_start pokemon_order_func pokemon_order_func: @ 8128030 @@ -18870,7 +18870,7 @@ pokemon_order_func: @ 8128030 lsrs r4, r0, 24 movs r3, 0 movs r2, 0 - ldr r5, _08128058 @ =gUnknown_203B0DC + ldr r5, _08128058 @ =gBattlePartyCurrentOrder _0812803C: adds r0, r3, r5 ldrb r1, [r0] @@ -18888,7 +18888,7 @@ _08128054: adds r0, r2, 0 b _0812806E .align 2, 0 -_08128058: .4byte gUnknown_203B0DC +_08128058: .4byte gBattlePartyCurrentOrder _0812805C: adds r0, r2, 0x1 lsls r0, 24 @@ -18905,8 +18905,8 @@ _0812806E: bx r1 thumb_func_end pokemon_order_func - thumb_func_start pokemon_change_order -pokemon_change_order: @ 8128074 + thumb_func_start UpdatePartyToBattleOrder +UpdatePartyToBattleOrder: @ 8128074 push {r4-r6,lr} movs r4, 0x96 lsls r4, 2 @@ -18943,10 +18943,10 @@ _0812808E: bx r0 .align 2, 0 _081280C0: .4byte gPlayerParty - thumb_func_end pokemon_change_order + thumb_func_end UpdatePartyToBattleOrder - thumb_func_start sub_81280C4 -sub_81280C4: @ 81280C4 + thumb_func_start UpdatePartyToFieldOrder +UpdatePartyToFieldOrder: @ 81280C4 push {r4-r6,lr} movs r4, 0x96 lsls r4, 2 @@ -18960,7 +18960,7 @@ sub_81280C4: @ 81280C4 movs r6, 0x64 _081280DE: adds r0, r4, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot lsls r0, 24 lsrs r0, 24 muls r0, r6 @@ -18983,10 +18983,10 @@ _081280DE: bx r0 .align 2, 0 _08128110: .4byte gPlayerParty - thumb_func_end sub_81280C4 + thumb_func_end UpdatePartyToFieldOrder - thumb_func_start sub_8128114 -sub_8128114: @ 8128114 + thumb_func_start SwitchAliveMonIntoLeadSlot +SwitchAliveMonIntoLeadSlot: @ 8128114 push {r4-r7,lr} mov r7, r8 push {r7} @@ -18996,7 +18996,7 @@ sub_8128114: @ 8128114 mov r8, r0 _08128122: adds r0, r6, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot lsls r0, 24 lsrs r0, 24 muls r0, r7 @@ -19013,18 +19013,18 @@ _08128122: cmp r0, 0 beq _08128170 movs r0, 0 - bl sub_8127F7C + bl GetPartyIdFromBattleSlot adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0 adds r1, r6, 0 - bl sub_8127FF4 + bl SwitchPartyMonSlots adds r0, r4, 0 muls r0, r7 add r0, r8 adds r1, r5, 0 - bl sub_811FA40 + bl SwapPartyPokemon b _0812817A .align 2, 0 _0812816C: .4byte gPlayerParty @@ -19040,27 +19040,27 @@ _0812817A: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8128114 + thumb_func_end SwitchAliveMonIntoLeadSlot - thumb_func_start sub_8128184 -sub_8128184: @ 8128184 + thumb_func_start CB2_SetUpExitToBattleScreen +CB2_SetUpExitToBattleScreen: @ 8128184 push {lr} - bl sub_8108CF0 + bl CB2_SetUpReshowBattleScreenAfterMenu ldr r0, _08128194 @ =SetCB2ToReshowScreenAfterMenu bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 _08128194: .4byte SetCB2ToReshowScreenAfterMenu - thumb_func_end sub_8128184 + thumb_func_end CB2_SetUpExitToBattleScreen - thumb_func_start sub_8128198 -sub_8128198: @ 8128198 + thumb_func_start ShowPartyMenuToShowcaseMultiBattleParty +ShowPartyMenuToShowcaseMultiBattleParty: @ 8128198 push {lr} sub sp, 0xC movs r0, 0x7F str r0, [sp] - ldr r0, _081281BC @ =sub_81281C4 + ldr r0, _081281BC @ =Task_InitMultiPartnerPartySlideIn str r0, [sp, 0x4] ldr r0, _081281C0 @ =gMain ldr r0, [r0, 0x8] @@ -19069,17 +19069,17 @@ sub_8128198: @ 8128198 movs r1, 0x3 movs r2, 0 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 -_081281BC: .4byte sub_81281C4 +_081281BC: .4byte Task_InitMultiPartnerPartySlideIn _081281C0: .4byte gMain - thumb_func_end sub_8128198 + thumb_func_end ShowPartyMenuToShowcaseMultiBattleParty - thumb_func_start sub_81281C4 -sub_81281C4: @ 81281C4 + thumb_func_start Task_InitMultiPartnerPartySlideIn +Task_InitMultiPartnerPartySlideIn: @ 81281C4 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -19091,24 +19091,24 @@ sub_81281C4: @ 81281C4 movs r1, 0x80 lsls r1, 1 strh r1, [r4, 0x8] - bl sub_81282DC + bl SlideMultiPartyMenuBoxSpritesOneStep movs r1, 0x80 lsls r1, 9 movs r0, 0x2 movs r2, 0 bl ChangeBgX - ldr r0, _081281F8 @ =sub_81281FC + ldr r0, _081281F8 @ =Task_MultiPartnerPartySlideIn str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 _081281F4: .4byte gTasks -_081281F8: .4byte sub_81281FC - thumb_func_end sub_81281C4 +_081281F8: .4byte Task_MultiPartnerPartySlideIn + thumb_func_end Task_InitMultiPartnerPartySlideIn - thumb_func_start sub_81281FC -sub_81281FC: @ 81281FC + thumb_func_start Task_MultiPartnerPartySlideIn +Task_MultiPartnerPartySlideIn: @ 81281FC push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -19127,13 +19127,13 @@ sub_81281FC: @ 81281FC subs r0, 0x8 strh r0, [r4] adds r0, r5, 0 - bl sub_81282DC + bl SlideMultiPartyMenuBoxSpritesOneStep movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 bne _08128268 movs r4, 0x3 - ldr r7, _08128278 @ =gUnknown_2022B58 + ldr r7, _08128278 @ =gMultiPartnerParty _08128230: subs r0, r4, 0x3 lsls r0, 5 @@ -19141,13 +19141,13 @@ _08128230: ldrh r0, [r0] cmp r0, 0 beq _0812824C - ldr r0, _0812827C @ =gUnknown_203B0B4 + ldr r0, _0812827C @ =sPartyMenuBoxes ldr r1, [r0] lsls r0, r4, 4 adds r0, r1 ldrb r0, [r0, 0x9] movs r1, 0 - bl sub_812238C + bl AnimateSelectedPartyIcon _0812824C: adds r0, r4, 0x1 lsls r0, 24 @@ -19160,7 +19160,7 @@ _0812824C: adds r1, r6, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08128284 @ =sub_8128288 + ldr r0, _08128284 @ =Task_WaitAfterMultiPartnerPartySlideIn str r0, [r1] _08128268: pop {r4-r7} @@ -19169,14 +19169,14 @@ _08128268: .align 2, 0 _08128270: .4byte gTasks+0x8 _08128274: .4byte gPaletteFade -_08128278: .4byte gUnknown_2022B58 -_0812827C: .4byte gUnknown_203B0B4 +_08128278: .4byte gMultiPartnerParty +_0812827C: .4byte sPartyMenuBoxes _08128280: .4byte gTasks -_08128284: .4byte sub_8128288 - thumb_func_end sub_81281FC +_08128284: .4byte Task_WaitAfterMultiPartnerPartySlideIn + thumb_func_end Task_MultiPartnerPartySlideIn - thumb_func_start sub_8128288 -sub_8128288: @ 8128288 + thumb_func_start Task_WaitAfterMultiPartnerPartySlideIn +Task_WaitAfterMultiPartnerPartySlideIn: @ 8128288 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -19194,16 +19194,16 @@ sub_8128288: @ 8128288 cmp r1, r0 bne _081282AE adds r0, r2, 0 - bl sub_811FA78 + bl Task_ClosePartyMenu _081282AE: pop {r0} bx r0 .align 2, 0 _081282B4: .4byte gTasks+0x8 - thumb_func_end sub_8128288 + thumb_func_end Task_WaitAfterMultiPartnerPartySlideIn - thumb_func_start sub_81282B8 -sub_81282B8: @ 81282B8 + thumb_func_start MoveMultiPartyMenuBoxSprite +MoveMultiPartyMenuBoxSprite: @ 81282B8 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -19222,10 +19222,10 @@ _081282D2: bx r0 .align 2, 0 _081282D8: .4byte gSprites - thumb_func_end sub_81282B8 + thumb_func_end MoveMultiPartyMenuBoxSprite - thumb_func_start sub_81282DC -sub_81282DC: @ 81282DC + thumb_func_start SlideMultiPartyMenuBoxSpritesOneStep +SlideMultiPartyMenuBoxSpritesOneStep: @ 81282DC push {r4-r7,lr} lsls r0, 24 lsrs r0, 24 @@ -19235,9 +19235,9 @@ sub_81282DC: @ 81282DC ldr r0, _08128364 @ =gTasks+0x8 adds r5, r1, r0 movs r6, 0x3 - ldr r7, _08128368 @ =gUnknown_203B0B4 + ldr r7, _08128368 @ =sPartyMenuBoxes _081282F0: - ldr r0, _0812836C @ =gUnknown_2022B58 + ldr r0, _0812836C @ =gMultiPartnerParty subs r1, r6, 0x3 lsls r1, 5 adds r1, r0 @@ -19252,7 +19252,7 @@ _081282F0: subs r1, 0x8 lsls r1, 16 asrs r1, 16 - bl sub_81282B8 + bl MoveMultiPartyMenuBoxSprite ldr r0, [r7] adds r0, r4, r0 ldrb r0, [r0, 0xA] @@ -19260,7 +19260,7 @@ _081282F0: subs r1, 0x8 lsls r1, 16 asrs r1, 16 - bl sub_81282B8 + bl MoveMultiPartyMenuBoxSprite ldr r0, [r7] adds r0, r4, r0 ldrb r0, [r0, 0xB] @@ -19268,7 +19268,7 @@ _081282F0: subs r1, 0x8 lsls r1, 16 asrs r1, 16 - bl sub_81282B8 + bl MoveMultiPartyMenuBoxSprite ldr r0, [r7] adds r4, r0 ldrb r0, [r4, 0xC] @@ -19276,7 +19276,7 @@ _081282F0: subs r1, 0x8 lsls r1, 16 asrs r1, 16 - bl sub_81282B8 + bl MoveMultiPartyMenuBoxSprite _08128348: adds r0, r6, 0x1 lsls r0, 24 @@ -19293,20 +19293,20 @@ _08128348: bx r0 .align 2, 0 _08128364: .4byte gTasks+0x8 -_08128368: .4byte gUnknown_203B0B4 -_0812836C: .4byte gUnknown_2022B58 - thumb_func_end sub_81282DC +_08128368: .4byte sPartyMenuBoxes +_0812836C: .4byte gMultiPartnerParty + thumb_func_end SlideMultiPartyMenuBoxSpritesOneStep - thumb_func_start sub_8128370 -sub_8128370: @ 8128370 + thumb_func_start ChooseMonForDaycare +ChooseMonForDaycare: @ 8128370 push {lr} sub sp, 0xC ldr r1, _08128398 @ =gFieldCallback2 - ldr r0, _0812839C @ =hm_add_c3_without_phase_2 + ldr r0, _0812839C @ =CB2_FadeFromPartyMenu str r0, [r1] movs r0, 0xF str r0, [sp] - ldr r0, _081283A0 @ =sub_811FB28 + ldr r0, _081283A0 @ =Task_HandleChooseMonInput str r0, [sp, 0x4] ldr r0, _081283A4 @ =CB2_ReturnToField str r0, [sp, 0x8] @@ -19314,66 +19314,66 @@ sub_8128370: @ 8128370 movs r1, 0 movs r2, 0 movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 _08128398: .4byte gFieldCallback2 -_0812839C: .4byte hm_add_c3_without_phase_2 -_081283A0: .4byte sub_811FB28 +_0812839C: .4byte CB2_FadeFromPartyMenu +_081283A0: .4byte Task_HandleChooseMonInput _081283A4: .4byte CB2_ReturnToField - thumb_func_end sub_8128370 + thumb_func_end ChooseMonForDaycare - thumb_func_start sub_81283A8 -sub_81283A8: @ 81283A8 + thumb_func_start ChoosePartyMonByMenuType +ChoosePartyMonByMenuType: @ 81283A8 push {lr} sub sp, 0xC lsls r0, 24 lsrs r0, 24 ldr r2, _081283D4 @ =gFieldCallback2 - ldr r1, _081283D8 @ =hm_add_c3_without_phase_2 + ldr r1, _081283D8 @ =CB2_FadeFromPartyMenu str r1, [r2] movs r1, 0 str r1, [sp] - ldr r1, _081283DC @ =sub_811FB28 + ldr r1, _081283DC @ =Task_HandleChooseMonInput str r1, [sp, 0x4] ldr r1, _081283E0 @ =CB2_ReturnToField str r1, [sp, 0x8] movs r1, 0 movs r2, 0xB movs r3, 0 - bl PartyMenuInit + bl InitPartyMenu add sp, 0xC pop {r0} bx r0 .align 2, 0 _081283D4: .4byte gFieldCallback2 -_081283D8: .4byte hm_add_c3_without_phase_2 -_081283DC: .4byte sub_811FB28 +_081283D8: .4byte CB2_FadeFromPartyMenu +_081283DC: .4byte Task_HandleChooseMonInput _081283E0: .4byte CB2_ReturnToField - thumb_func_end sub_81283A8 + thumb_func_end ChoosePartyMonByMenuType - thumb_func_start hm_add_c3_without_phase_2 -hm_add_c3_without_phase_2: @ 81283E4 + thumb_func_start CB2_FadeFromPartyMenu +CB2_FadeFromPartyMenu: @ 81283E4 push {lr} bl sub_807DC00 - ldr r0, _081283F8 @ =task_hm_without_phase_2 + ldr r0, _081283F8 @ =Task_PartyMenuWaitForFade movs r1, 0xA bl CreateTask movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_081283F8: .4byte task_hm_without_phase_2 - thumb_func_end hm_add_c3_without_phase_2 +_081283F8: .4byte Task_PartyMenuWaitForFade + thumb_func_end CB2_FadeFromPartyMenu - thumb_func_start task_hm_without_phase_2 -task_hm_without_phase_2: @ 81283FC + thumb_func_start Task_PartyMenuWaitForFade +Task_PartyMenuWaitForFade: @ 81283FC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _0812841A @@ -19385,6 +19385,6 @@ _0812841A: pop {r4} pop {r0} bx r0 - thumb_func_end task_hm_without_phase_2 + thumb_func_end Task_PartyMenuWaitForFade .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 5c95eb22a..337361dcf 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1455,7 +1455,7 @@ _0808C3E0: .align 2, 0 _0808C444: .4byte gUnknown_83CDA20 _0808C448: - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 bne _0808C454 @@ -6591,7 +6591,7 @@ _0808EEE8: ldr r2, _0808EF08 @ =sub_808CE60 movs r0, 0x4 movs r1, 0 - bl sub_8107DB4 + bl GoToBagMenu _0808EEF6: adds r0, r7, 0 bl DestroyTask diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index d1d6ed06f..ee5a96156 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -3448,7 +3448,7 @@ _08136168: ldr r0, [r6] ldr r3, _08136208 @ =0x00003084 adds r0, r3 - ldr r1, _0813620C @ =gUnknown_8416221 + ldr r1, _0813620C @ =gText_FemaleSymbol bl StringCopy b _08136238 .align 2, 0 @@ -3459,19 +3459,19 @@ _081361FC: .4byte 0x00003220 _08136200: .4byte 0x00003221 _08136204: .4byte 0x00003034 _08136208: .4byte 0x00003084 -_0813620C: .4byte gUnknown_8416221 +_0813620C: .4byte gText_FemaleSymbol _08136210: cmp r7, 0 bne _0813622C ldr r0, [r6] ldr r1, _08136224 @ =0x00003084 adds r0, r1 - ldr r1, _08136228 @ =gUnknown_841621F + ldr r1, _08136228 @ =gText_MaleSymbol bl StringCopy b _08136238 .align 2, 0 _08136224: .4byte 0x00003084 -_08136228: .4byte gUnknown_841621F +_08136228: .4byte gText_MaleSymbol _0813622C: ldr r0, [r6] ldr r2, _08136308 @ =0x00003084 @@ -3622,7 +3622,7 @@ sub_8136350: @ 8136350 bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 - ldr r1, _08136504 @ =gUnknown_841620C + ldr r1, _08136504 @ =gText_Slash bl StringAppend ldr r0, [r6] adds r0, r7 @@ -3794,7 +3794,7 @@ _081363E6: _081364F8: .4byte gUnknown_203B140 _081364FC: .4byte 0x00003290 _08136500: .4byte 0x00003090 -_08136504: .4byte gUnknown_841620C +_08136504: .4byte gText_Slash _08136508: .4byte gUnknown_203B144 _0813650C: .4byte 0x000032f8 _08136510: .4byte sub_804CF14 @@ -5618,7 +5618,7 @@ _081373EA: str r6, [sp] mov r7, r9 str r7, [sp, 0x4] - ldr r1, _081374E0 @ =gUnknown_841620C + ldr r1, _081374E0 @ =gText_Slash str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0x3A @@ -5663,7 +5663,7 @@ _081374D0: .4byte gUnknown_8416238 _081374D4: .4byte gUnknown_203B144 _081374D8: .4byte 0x000030b8 _081374DC: .4byte 0x00003258 -_081374E0: .4byte gUnknown_841620C +_081374E0: .4byte gText_Slash _081374E4: .4byte 0x000030f0 thumb_func_end sub_81372E4 @@ -9489,7 +9489,7 @@ sub_8139388: @ 8139388 bl sub_8138BEC lsls r0, 16 lsrs r0, 16 - bl sub_8125A90 + bl IsMoveHm lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/region_map.s b/asm/region_map.s index 5d136385b..7b23cf1e3 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -7395,7 +7395,7 @@ sub_80C3B00: @ 80C3B00 asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId ldrb r0, [r0, 0x14] pop {r1} bx r1 @@ -7477,7 +7477,7 @@ _080C3BAC: asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r2, r0, 0 ldr r0, _080C3BEC @ =gUnknown_20399E4 ldr r1, [r0] @@ -7506,7 +7506,7 @@ _080C3BF0: asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r2, r0, 0 ldr r0, _080C3C28 @ =gUnknown_20399E4 ldr r1, [r0] @@ -7543,7 +7543,7 @@ _080C3C2C: ldrsb r1, [r5, r1] lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r2, r0, 0 b _080C3C8E .align 2, 0 @@ -7564,7 +7564,7 @@ _080C3C68: ldrsb r1, [r5, r1] lsls r1, 16 lsrs r1, 16 - bl get_mapheader_by_bank_and_number + bl Overworld_GetMapHeaderByGroupAndId adds r2, r0, 0 ldr r1, [r4] ldrb r0, [r2, 0x14] @@ -9761,8 +9761,8 @@ _080C4DF2: bx r1 thumb_func_end GetMapName - thumb_func_start sub_80C4DF8 -sub_80C4DF8: @ 80C4DF8 + thumb_func_start GetMapNameGeneric +GetMapNameGeneric: @ 80C4DF8 push {lr} lsls r1, 16 lsrs r1, 16 @@ -9770,14 +9770,14 @@ sub_80C4DF8: @ 80C4DF8 bl GetMapName pop {r1} bx r1 - thumb_func_end sub_80C4DF8 + thumb_func_end GetMapNameGeneric thumb_func_start sub_80C4E08 sub_80C4E08: @ 80C4E08 push {lr} lsls r1, 16 lsrs r1, 16 - bl sub_80C4DF8 + bl GetMapNameGeneric pop {r1} bx r1 thumb_func_end sub_80C4E08 @@ -10283,7 +10283,7 @@ _080C5220: _080C5250: .4byte gUnknown_20399FC _080C5254: .4byte CB2_ReturnToField _080C5258: - ldr r0, _080C5274 @ =sub_8124AB0 + ldr r0, _080C5274 @ =CB2_ReturnToPartyMenuFromFlyMap bl SetMainCallback2 _080C525E: ldr r4, _080C5278 @ =gUnknown_20399FC @@ -10298,7 +10298,7 @@ _080C526E: pop {r0} bx r0 .align 2, 0 -_080C5274: .4byte sub_8124AB0 +_080C5274: .4byte CB2_ReturnToPartyMenuFromFlyMap _080C5278: .4byte gUnknown_20399FC thumb_func_end sub_80C5208 diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 81b3b7efe..6f451b90a 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -385,7 +385,7 @@ sub_80A0334: @ 80A0334 ldr r0, _080A034C @ =sub_80A0350 str r0, [r1, 0x8] movs r0, 0 - bl sub_81274A8 + bl InitChooseHalfPartyForBattle pop {r0} bx r0 .align 2, 0 @@ -427,7 +427,7 @@ ChooseBattleTowerPlayerParty: @ 80A0380 ldr r0, _080A0398 @ =sub_80A039C str r0, [r1, 0x8] movs r0, 0x1 - bl sub_81274A8 + bl InitChooseHalfPartyForBattle pop {r0} bx r0 .align 2, 0 diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 15d19e08b..a909758c2 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -88,7 +88,7 @@ sub_80BF97C: @ 80BF97C lsls r0, 3 adds r0, r1 ldrb r0, [r0, 0x8] - bl sub_81283A8 + bl ChoosePartyMonByMenuType adds r0, r4, 0 bl DestroyTask _080BF9AC: diff --git a/asm/shop.s b/asm/shop.s index bc5eccd64..7df8f037a 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -291,7 +291,7 @@ sub_809ACD4: @ 809ACD4 ldr r2, _0809ACEC @ =CB2_ReturnToField movs r0, 0x2 movs r1, 0x3 - bl sub_8107DB4 + bl GoToBagMenu ldr r1, _0809ACF0 @ =gFieldCallback ldr r0, _0809ACF4 @ =sub_809AD74 str r0, [r1] @@ -386,7 +386,7 @@ sub_809AD8C: @ 809AD8C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/data/event_scripts.s b/data/event_scripts.s index f75442912..89099c58f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -9706,7 +9706,7 @@ EventScript_1BC13A:: @ 81BC13A goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 - special sub_8127888 + special ChooseMonForWirelessMinigame waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_1BB83F @@ -9726,7 +9726,7 @@ EventScript_1BC184:: @ 81BC184 goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 - special sub_8127888 + special ChooseMonForWirelessMinigame waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_1BB83F diff --git a/data/graphics.s b/data/graphics.s index 5eacc0cb2..9810abf91 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13892,15 +13892,15 @@ gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8 .incbin "graphics/battle_anims/sprites/188.gbapal.lz" .align 2 -gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700 +gPartyMenuBg_Gfx:: @ 8E82700 .incbin "graphics/interface/party_menu_misc.4bpp.lz" .align 2 -gUnknown_8E829C8:: @ 8E829C8 +gPartyMenuBg_Pal:: @ 8E829C8 .incbin "baserom.gba", 0xE829C8, 0xE8 .align 2 -gFile_graphics_interface_party_menu_misc_tilemap:: @ 8E82AB0 +gPartyMenuBg_Tilemap:: @ 8E82AB0 .incbin "graphics/interface/party_menu_misc.bin.lz" .align 2 diff --git a/data/party_menu.s b/data/party_menu.s index 7c484deb3..1f10d0ea5 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -23,7 +23,7 @@ gMoveTutorMoves:: @ 8459B60 .2byte MOVE_ROCK_SLIDE .2byte MOVE_SUBSTITUTE -gMoveTutorMoveCompatibilityTable:: @ 8459B7E +sTutorLearnsets:: @ 8459B7E .2byte 0x0000 .2byte 0x409a .2byte 0x409a @@ -438,16 +438,13 @@ gMoveTutorMoveCompatibilityTable:: @ 8459B7E .2byte 0x4490 .align 2 -gUnknown_8459EB8:: @ 8459EB8 +sPartyMenuBgTemplates:: @ 8459EB8 .incbin "baserom.gba", 0x459EB8, 0xC -gUnknown_8459EC4:: @ 8459EC4 - .incbin "baserom.gba", 0x459EC4, 0x20 +sPartyBoxInfoRects:: @ 8459EC4 + .incbin "baserom.gba", 0x459EC4, 0x40 -gUnknown_8459EE4:: @ 8459EE4 - .incbin "baserom.gba", 0x459EE4, 0x20 - -gUnknown_8459F04:: @ 8459F04 +sPartyMenuSpriteCoords:: @ 8459F04 .incbin "baserom.gba", 0x459F04, 0xC0 gUnknown_8459FC4:: @ 8459FC4 @@ -456,31 +453,31 @@ gUnknown_8459FC4:: @ 8459FC4 gUnknown_8459FE0:: @ 8459FE0 .incbin "baserom.gba", 0x459FE0, 0x1C -gUnknown_8459FFC:: @ 8459FFC +sFontColorTable:: @ 8459FFC .incbin "baserom.gba", 0x459FFC, 0xF gUnknown_845A00B:: @ 845A00B .incbin "baserom.gba", 0x45A00B, 0x5 -gUnknown_845A010:: @ 845A010 +sSinglePartyMenuWindowTemplate:: @ 845A010 .incbin "baserom.gba", 0x45A010, 0x40 -gUnknown_845A050:: @ 845A050 +sDoublePartyMenuWindowTemplate:: @ 845A050 .incbin "baserom.gba", 0x45A050, 0x40 -gUnknown_845A090:: @ 845A090 +sMultiPartyMenuWindowTemplate:: @ 845A090 .incbin "baserom.gba", 0x45A090, 0x40 -gUnknown_845A0D0:: @ 845A0D0 +sShowcaseMultiPartyMenuWindowTemplate:: @ 845A0D0 .incbin "baserom.gba", 0x45A0D0, 0x38 -gUnknown_845A108:: @ 845A108 +sCancelButtonWindowTemplate:: @ 845A108 .incbin "baserom.gba", 0x45A108, 0x8 -gUnknown_845A110:: @ 845A110 +sMultiCancelButtonWindowTemplate:: @ 845A110 .incbin "baserom.gba", 0x45A110, 0x8 -gUnknown_845A118:: @ 845A118 +sConfirmButtonWindowTemplate:: @ 845A118 .incbin "baserom.gba", 0x45A118, 0x8 gUnknown_845A120:: @ 845A120 @@ -498,19 +495,19 @@ gUnknown_845A138:: @ 845A138 gUnknown_845A140:: @ 845A140 .incbin "baserom.gba", 0x45A140, 0x8 -gUnknown_845A148:: @ 845A148 +sItemGiveTakeWindowTemplate:: @ 845A148 .incbin "baserom.gba", 0x45A148, 0x8 -gUnknown_845A150:: @ 845A150 +sMailReadTakeWindowTemplate:: @ 845A150 .incbin "baserom.gba", 0x45A150, 0x8 -gUnknown_845A158:: @ 845A158 +sMoveSelectWindowTemplate:: @ 845A158 .incbin "baserom.gba", 0x45A158, 0x8 -gUnknown_845A160:: @ 845A160 +sPartyMenuYesNoWindowTemplate:: @ 845A160 .incbin "baserom.gba", 0x45A160, 0x8 -gUnknown_845A168:: @ 845A168 +sLevelUpStatsWindowTemplate:: @ 845A168 .incbin "baserom.gba", 0x45A168, 0x8 gUnknown_845A170:: @ 845A170 @@ -519,22 +516,22 @@ gUnknown_845A170:: @ 845A170 gUnknown_845A178:: @ 845A178 .incbin "baserom.gba", 0x45A178, 0x8 -gUnknown_845A180:: @ 845A180 +sMainSlotTileNums:: @ 845A180 .incbin "baserom.gba", 0x45A180, 0x46 -gUnknown_845A1C6:: @ 845A1C6 +sMainSlotTileNums_Egg:: @ 845A1C6 .incbin "baserom.gba", 0x45A1C6, 0x46 -gUnknown_845A20C:: @ 845A20C +sOtherSlotTileNums:: @ 845A20C .incbin "baserom.gba", 0x45A20C, 0x36 -gUnknown_845A242:: @ 845A242 +sOtherSlotTileNums_Egg:: @ 845A242 .incbin "baserom.gba", 0x45A242, 0x36 gUnknown_845A278:: @ 845A278 .incbin "baserom.gba", 0x45A278, 0x36 -gUnknown_845A2AE:: @ 845A2AE +sGenderPalOffsets:: @ 845A2AE .incbin "baserom.gba", 0x45A2AE, 0x2 gUnknown_845A2B0:: @ 845A2B0 @@ -546,10 +543,10 @@ gUnknown_845A2B2:: @ 845A2B2 gUnknown_845A2B5:: @ 845A2B5 .incbin "baserom.gba", 0x45A2B5, 0x3 -gUnknown_845A2B8:: @ 845A2B8 +sGenderMalePalIds:: @ 845A2B8 .incbin "baserom.gba", 0x45A2B8, 0x2 -gUnknown_845A2BA:: @ 845A2BA +sGenderFemalePalIds:: @ 845A2BA .incbin "baserom.gba", 0x45A2BA, 0x2 gUnknown_845A2BC:: @ 845A2BC @@ -597,67 +594,67 @@ gUnknown_845A2E0:: @ 845A2E0 gUnknown_845A2E3:: @ 845A2E3 .incbin "baserom.gba", 0x45A2E3, 0x5 -gUnknown_845A2E8:: @ 845A2E8 +sActionStringTable:: @ 845A2E8 .incbin "baserom.gba", 0x45A2E8, 0x6C -gUnknown_845A354:: @ 845A354 +sDescriptionStringTable:: @ 845A354 .incbin "baserom.gba", 0x45A354, 0x28 gUnknown_845A37C:: @ 845A37C .incbin "baserom.gba", 0x45A37C, 0xB0 -gUnknown_845A42C:: @ 845A42C +sSpriteSheet_HeldItem:: @ 845A42C .incbin "baserom.gba", 0x45A42C, 0x8 -gUnknown_845A434:: @ 845A434 +sSpritePalette_HeldItem:: @ 845A434 .incbin "baserom.gba", 0x45A434, 0x8 -gUnknown_845A43C:: @ 845A43C +sSpriteTemplate_HeldItem:: @ 845A43C .incbin "baserom.gba", 0x45A43C, 0x38 -gUnknown_845A474:: @ 845A474 +sSpriteSheet_MenuPokeball:: @ 845A474 .incbin "baserom.gba", 0x45A474, 0x8 -gUnknown_845A47C:: @ 845A47C +sSpritePalette_MenuPokeball:: @ 845A47C .incbin "baserom.gba", 0x45A47C, 0x8 -gUnknown_845A484:: @ 845A484 +sSpriteTemplate_MenuPokeball:: @ 845A484 .incbin "baserom.gba", 0x45A484, 0x68 -gUnknown_845A4EC:: @ 845A4EC +sSpriteSheet_MenuPokeballSmall:: @ 845A4EC .incbin "baserom.gba", 0x45A4EC, 0x8 -gUnknown_845A4F4:: @ 845A4F4 +sSpriteTemplate_MenuPokeballSmall:: @ 845A4F4 .incbin "baserom.gba", 0x45A4F4, 0x80 -gUnknown_845A574:: @ 845A574 +sSpriteSheet_StatusIcons:: @ 845A574 .incbin "baserom.gba", 0x45A574, 0x8 -gUnknown_845A57C:: @ 845A57C +sSpritePalette_StatusIcons:: @ 845A57C .incbin "baserom.gba", 0x45A57C, 0x8 -gUnknown_845A584:: @ 845A584 +sSpriteTemplate_StatusIcons:: @ 845A584 .incbin "baserom.gba", 0x45A584, 0x18 -gUnknown_845A59C:: @ 845A59C +sMultiBattlePartnersPartyMask:: @ 845A59C .incbin "baserom.gba", 0x45A59C, 0x7C -gUnknown_845A618:: @ 845A618 +sCursorOptions:: @ 845A618 .incbin "baserom.gba", 0x45A618, 0x114 -gUnknown_845A72C:: @ 845A72C +sPartyMenuActions:: @ 845A72C .incbin "baserom.gba", 0x45A72C, 0x34 -gUnknown_845A760:: @ 845A760 +sPartyMenuActionCounts:: @ 845A760 .incbin "baserom.gba", 0x45A760, 0xE -gUnknown_845A76E:: @ 845A76E +sFieldMoves:: @ 845A76E .incbin "baserom.gba", 0x45A76E, 0x1A -gUnknown_845A788:: @ 845A788 +sFieldMoveCursorCallbacks:: @ 845A788 .incbin "baserom.gba", 0x45A788, 0x60 -gUnknown_845A7E8:: @ 845A7E8 +sUnionRoomTradeMessages:: @ 845A7E8 .4byte gUnknown_841718C @ Not what other player wants .4byte gUnknown_84171CC @ Not an egg .4byte gUnknown_84170BC @ Mon can't be traded @@ -668,5 +665,5 @@ gUnknown_845A7E8:: @ 845A7E8 .4byte gUnknown_8417164 @ Can't trade with trainer now .4byte gUnknown_8417164 @ Can't trade with trainer now -gUnknown_845A80C:: @ 845A80C +sTMHMMoves:: @ 845A80C .incbin "baserom.gba", 0x45A80C, 0x74 diff --git a/data/specials.inc b/data/specials.inc index 6c1cbfa8e..148da72dc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -406,7 +406,7 @@ gSpecials:: @ 815FD60 def_special Special_OpenMuseumFossilPic def_special Special_CloseMuseumFossilPic def_special sub_812781C - def_special sub_8127888 + def_special ChooseMonForWirelessMinigame def_special SetBattledTrainerFlag def_special sub_812B35C def_special Special_SSAnneDepartureCutscene diff --git a/data/strings.s b/data/strings.s index a1892e209..3cd263df9 100644 --- a/data/strings.s +++ b/data/strings.s @@ -463,7 +463,7 @@ gUnknown_8416202:: @ 8416202 gUnknown_8416206:: .string "?????$" -gUnknown_841620C:: @ 841620C +gText_Slash:: @ 841620C .string "/$" gUnknown_841620E:: @ 841620E @@ -478,10 +478,10 @@ gText_ThreeHyphens:: @ 8416213 gUnknown_8416217:: @ 8416217 .string "-------$" -gUnknown_841621F:: @ 841621F +gText_MaleSymbol:: @ 841621F .string "♂$" -gUnknown_8416221:: @ 8416221 +gText_FemaleSymbol:: @ 8416221 .string "♀$" gText_Lv:: @ 8416223 @@ -834,25 +834,25 @@ gUnknown_84169B7:: @ 0x84169B7 gUnknown_84169BC:: @ 0x84169BC .string "TRADE$" -gUnknown_84169C2:: @ 84169C2 +gText_HP3:: @ 84169C2 .string "HP$" -gUnknown_84169C5:: @ 84169C5 +gText_SpAtk3:: @ 84169C5 .string "SP. ATK$" -gUnknown_84169CD:: @ 84169CD +gText_SpDef3:: @ 84169CD .string "SP. DEF$" -gUnknown_84169D5:: @ 84169D5 +gMenuText_Confirm:: @ 84169D5 .string "OK$" gUnknown_84169D8:: @ 0x84169D8 .string "$" -gUnknown_84169D9:: @ 84169D9 +gText_PauseUntilPress:: @ 84169D9 .string "{PAUSE_UNTIL_PRESS}$" -gUnknown_84169DC:: @ 84169DC +gText_WontHaveEffect:: @ 84169DC .string "It won't have any effect.{PAUSE_UNTIL_PRESS}$" gUnknown_84169F8:: @ 84169F8 @@ -882,7 +882,7 @@ gUnknown_8416A98:: @ 8416A98 gUnknown_8416ACB:: @ 8416ACB .string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416AE2:: @ 8416AE2 +gText_CantUseUntilNewBadge:: @ 8416AE2 .string "This can't be used until a new\n" .string "BADGE is obtained.{PAUSE_UNTIL_PRESS}$" @@ -894,17 +894,17 @@ gUnknown_8416B3E:: @ 8416B3E .string "No more than two POKéMON\n" .string "may enter.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416B64:: @ 8416B64 +gText_SendMailToPC:: @ 8416B64 .string "Send the removed MAIL to\n" .string "your PC?$" -gUnknown_8416B86:: @ 8416B86 +gText_MailSentToPC:: @ 8416B86 .string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416BA6:: @ 8416BA6 +gText_PCMailboxFull:: @ 8416BA6 .string "Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416BC3:: @ 8416BC3 +gText_MailMessageWillBeLost:: @ 8416BC3 .string "If the MAIL is removed, the\n" .string "message will be lost. Okay?$" @@ -912,11 +912,11 @@ gUnknown_8416BFB:: @ 8416BFB .string "MAIL must be removed before\n" .string "holding an item.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416C2A:: @ 8416C2A +gText_PkmnWasGivenItem:: @ 8416C2A .string "{STR_VAR_1} was given the\n" .string "{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416C49:: @ 8416C49 +gText_PkmnAlreadyHoldingItemSwitch:: @ 8416C49 .string "{STR_VAR_1} is already holding\n" .string "one {STR_VAR_2}.\p" .string "Would you like to switch the\n" @@ -926,41 +926,41 @@ gUnknown_8416C8F:: @ 8416C8F .string "{STR_VAR_1} isn't holding\n" .string "anything.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416CAC:: @ 8416CAC +gText_ReceivedItemFromPkmn:: @ 8416CAC .string "Received the {STR_VAR_2}\n" .string "from {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416CC7:: @ 8416CC7 +gText_MailTakenFromPkmn:: @ 8416CC7 .string "MAIL was taken from the\n" .string "POKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416CEA:: @ 8416CEA +gText_SwitchedPkmnItem:: @ 8416CEA .string "The {STR_VAR_2} was taken and\n" .string "replaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416D17:: @ 8416D17 +gText_PkmnHoldingItemCantHoldMail:: @ 8416D17 .string "This POKéMON is holding an\n" .string "item. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416D4F:: @ 8416D4F +gText_MailTransferredFromMailbox:: @ 8416D4F .string "MAIL was transferred from\n" .string "the MAILBOX.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416D78:: @ 8416D78 +gText_BagFullCouldNotRemoveItem:: @ 8416D78 .string "The {STR_VAR_1} is full. The POKéMON's\n" .string "item could not be removed.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416DB3:: @ 8416DB3 +gText_PkmnLearnedMove3:: @ 8416DB3 .string "{STR_VAR_1} learned\n" .string "{STR_VAR_2}!$" -gUnknown_8416DC2:: @ 8416DC2 +gText_PkmnCantLearnMove:: @ 8416DC2 .string "{STR_VAR_1} and {STR_VAR_2}\n" .string "are not compatible.\p" .string "{STR_VAR_2} can't be\n" .string "learned.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416DF7:: @ 8416DF7 +gText_PkmnNeedsToReplaceMove:: @ 8416DF7 .string "{STR_VAR_1} wants to learn the\n" .string "move {STR_VAR_2}.\p" .string "However, {STR_VAR_1} already\n" @@ -968,15 +968,15 @@ gUnknown_8416DF7:: @ 8416DF7 .string "Should a move be deleted and\n" .string "replaced with {STR_VAR_2}?$" -gUnknown_8416E6B:: @ 8416E6B +gText_StopLearningMove2:: @ 8416E6B .string "Stop trying to teach\n" .string "{STR_VAR_2}?$" -gUnknown_8416E84:: @ 8416E84 +gText_MoveNotLearned:: @ 8416E84 .string "{STR_VAR_1} did not learn the\n" .string "move {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416EA4:: @ 8416EA4 +gText_WhichMoveToForget:: @ 8416EA4 .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" gUnknown_8416EC6:: @ 8416EC6 @@ -985,57 +985,57 @@ gUnknown_8416EC6:: @ 8416EC6 .string "use {STR_VAR_2}.\p" .string "And...{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F10:: @ 8416F10 +gText_PkmnAlreadyKnows:: @ 8416F10 .string "{STR_VAR_1} already knows\n" .string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F27:: @ 8416F27 +gText_PkmnHPRestoredByVar2:: @ 8416F27 .string "{STR_VAR_1}'s HP was restored\n" .string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F4E:: @ 8416F4E +gText_PkmnCuredOfPoison:: @ 8416F4E .string "{STR_VAR_1} was cured of its\n" .string "poisoning.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F6F:: @ 8416F6F +gText_PkmnCuredOfParalysis:: @ 8416F6F .string "{STR_VAR_1} was cured of\n" .string "paralysis.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F8C:: @ 8416F8C +gText_PkmnWokeUp2:: @ 8416F8C .string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F9A:: @ 8416F9A +gText_PkmnBurnHealed:: @ 8416F9A .string "{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416FB2:: @ 8416FB2 +gText_PkmnThawedOut:: @ 8416FB2 .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416FC7:: @ 8416FC7 +gText_PPWasRestored:: @ 8416FC7 .string "PP was restored.{PAUSE_UNTIL_PRESS}$" gUnknown_8416FDA:: @ 0x8416FDA .string "{STR_VAR_1}は\n" .string "げんきを とりもどした!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416FED:: @ 8416FED +gText_PkmnBecameHealthy:: @ 8416FED .string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417002:: @ 8417002 +gText_MovesPPIncreased:: @ 8417002 .string "{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417017:: @ 8417017 +gText_PkmnElevatedToLvVar2:: @ 8417017 .string "{STR_VAR_1} was elevated to\n" .string "Lv. {STR_VAR_2}.$" -gUnknown_8417032:: @ 8417032 +gText_PkmnBaseVar2StatIncreased:: @ 8417032 .string "{STR_VAR_1}'s base {STR_VAR_2}\n" .string "stat was raised.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417052:: @ 8417052 +gText_PkmnSnappedOutOfConfusion:: @ 8417052 .string "{STR_VAR_1} snapped out of its\n" .string "confusion.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417075:: @ 8417075 +gText_PkmnGotOverInfatuation:: @ 8417075 .string "{STR_VAR_1} got over its\n" .string "infatuation.{PAUSE_UNTIL_PRESS}$" @@ -1241,10 +1241,10 @@ gUnknown_8417640:: @ 8417640 .string "Want to return to the healing spot\n" .string "used last in {STR_VAR_1}?$" -gUnknown_8417674:: @ 8417674 +gText_Attack3:: @ 8417674 .string "ATTACK$" -gUnknown_841767B:: @ 841767B +gText_Defense3:: @ 841767B .string "DEFENSE$" gUnknown_8417683:: @ 0x8417683 @@ -1253,7 +1253,7 @@ gUnknown_8417683:: @ 0x8417683 gUnknown_8417688:: @ 0x8417688 .string "とくぼう$" -gUnknown_841768D:: @ 841768D +gText_Speed2:: @ 841768D .string "SPEED$" gUnknown_8417693:: @ 0x8417693 diff --git a/include/battle.h b/include/battle.h index 00f7dcea9..0298dd265 100644 --- a/include/battle.h +++ b/include/battle.h @@ -712,7 +712,7 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; extern u8 gBattleTerrain; -extern struct UnknownPokemonStruct4 gUnknown_2022B58[3]; +extern struct UnknownPokemonStruct4 gMultiPartnerParty[3]; extern u16 *gUnknown_2022BC0; extern u16 gRandomTurnNumber; diff --git a/include/field_weather.h b/include/field_weather.h index 96c1ce7cb..2709a7298 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -13,7 +13,7 @@ void DoCurrentWeather(void); void SetSav1WeatherFromCurrMapHeader(void); void sub_807B0C4(u16 *, u16 *, u32); void PlayRainStoppingSoundEffect(void); -bool8 field_weather_is_fade_finished(void); +bool8 IsWeatherNotFadingIn(void); void SetWeatherScreenFadeOut(void); void sub_807B070(void); u8 GetCurrentWeather(void); diff --git a/include/fldeff.h b/include/fldeff.h index 25d5b8d43..690d5f953 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -44,7 +44,7 @@ bool8 FldEff_UseTeleport(void); // softboiled bool8 hm_prepare_dive_probably(void); -void sub_80E56DC(u8 taskId); +void ChooseMonForSoftboiled(u8 taskId); void sub_80E5724(u8 taskId); // sweetscent diff --git a/include/item_menu.h b/include/item_menu.h index d12b9f394..187674e83 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -25,7 +25,7 @@ extern u16 gSpecialVar_ItemId; // Exported ROM declarations void sub_81AAC50(void); void sub_81AAC70(void); -void sub_8108CF0(void); +void CB2_SetUpReshowBattleScreenAfterMenu(void); void sub_81089BC(void); void sub_810B108(u8); void CB2_BagMenuFromStartMenu(void); @@ -39,6 +39,6 @@ void sub_8107ECC(void); void sub_810AF74(void); void sub_8108DC8(u8 pocketId); void sub_81089F4(u8 pocketId); -void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback); +void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback); #endif //GUARD_ITEM_MENU_H diff --git a/include/overworld.h b/include/overworld.h index 36c890eb5..d893899eb 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -72,7 +72,7 @@ void Overworld_ChangeMusicTo(u16); bool32 IsUpdateLinkStateCBActive(void); void strange_npc_table_clear(void); -const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16); +const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16); void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); void sub_8086230(void); void CB2_ReturnToField(void); diff --git a/include/party_menu.h b/include/party_menu.h index 19cdda1dc..6e96c47ee 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -40,55 +40,55 @@ struct Struct203B0A0 s16 unk10; }; -extern struct Struct203B0A0 gUnknown_203B0A0; -extern u8 gUnknown_203B0C0; +extern struct Struct203B0A0 gPartyMenu; +extern u8 gPartyMenuUseExitCallback; extern u8 gUnknown_203B0C1; -extern u8 gUnknown_203B0DC[3]; -extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func); +extern u8 gBattlePartyCurrentOrder[3]; +extern void (*gItemUseCB)(u8 taskId, TaskFunc func); extern u8 gSelectedOrderFromParty[3]; bool8 FieldCallback_PrepareFadeInFromMenu(void); bool8 MonKnowsMove(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); -u8 pokemon_ailments_get_primary(u32 status); +u8 GetAilmentFromStatus(u32 status); u16 ItemIdToBattleMoveId(u16 itemId); -void sub_8125B40(u8 taskId, TaskFunc func); -void sub_8124C8C(void); -void sub_8126EDC(void); -void c2_8123744(void); +void ItemUseCB_TMHM(u8 taskId, TaskFunc func); +void CB2_ShowPartyMenuForItemUse(void); +void CB2_ChooseMonToGiveItem(void); +void CB2_GiveHoldItem(void); u8 GetCursorSelectionMonId(void); -void sub_8128370(void); -void sub_811F818(u8 monId, u8 a1); -void sub_8121D0C(u8); -void sub_811FB28(u8 taskId); -void sub_8120760(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc); +void ChooseMonForDaycare(void); +void AnimatePartySlot(u8 monId, u8 a1); +void DisplayPartyMenuStdMessage(u8); +void Task_HandleChooseMonInput(u8 taskId); +void PartyMenuModifyHP(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc); void GetMonNickname(const struct Pokemon * mon, u8 * dest); -void sub_81202F8(const u8 * src, u8 a1); -bool8 sub_8120370(void); -void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback); +void DisplayPartyMenuMessage(const u8 * src, u8 a1); +bool8 IsPartyMenuTextPrinterActive(void); +void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback); void sub_81252D0(u8 taskId, TaskFunc followUpFunc); -void ItemUseCB_PpRestore(u8 taskId, TaskFunc followUpFunc); -void dp05_pp_up(u8 taskId, TaskFunc followUpFunc); +void ItemUseCB_PPRecovery(u8 taskId, TaskFunc followUpFunc); +void ItemUseCB_PPUp(u8 taskId, TaskFunc followUpFunc); void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc); void sub_8126B60(u8 taskId, TaskFunc followUpFunc); -void sub_8126894(u8 taskId, TaskFunc followUpFunc); +void ItemUseCB_SacredAsh(u8 taskId, TaskFunc followUpFunc); void sub_81279E0(void); void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc); u8 GetItemEffectType(u16 itemId); u8 pokemon_order_func(u8); -void sub_8127CAC(void); -void sub_8127DA8(u8 battlerId, u8 multiplayerFlag); -void OpenPartyMenuInBattle(u8 arg); -void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex); +void BufferBattlePartyCurrentOrder(void); +void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 multiplayerFlag); +void OpenPartyMenuInBattle(void); +void SwitchPartyOrderLinkMulti(u8 battlerId, u8 unk, u8 arrayIndex); bool8 IsMultiBattle(void); -void sub_8126EDC(void); -void sub_812256C(u8 *partyCount, u8 (*icons)[6], u8 side); -void PartyMenuInit_FromPlayerPc(void); +void CB2_ChooseMonToGiveItem(void); +void DrawHeldItemIconsForTrade(u8 *partyCount, u8 (*icons)[6], u8 side); +void ChooseMonToGiveMailFromMailbox(void); void CB2_PartyMenuFromStartMenu(void); -void sub_8128198(void); -void sub_8127FF4(u8 slot, u8 slot2); +void ShowPartyMenuToShowcaseMultiBattleParty(void); +void SwitchPartyMonSlots(u8 slot, u8 slot2); void LoadHeldItemIcons(void); -void sub_8127968(void); +void OpenPartyMenuInTutorialBattle(u8 partyAction); #endif // GUARD_PARTY_MENU_H diff --git a/include/region_map.h b/include/region_map.h index 394fee469..8d609f104 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -94,7 +94,7 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y); void CreateRegionMapCursor(u16 tileTag, u16 paletteTag); u8 *GetMapName(u8 *, u16, u16); bool32 sub_8124668(u8 mapSecId); -void sub_80C4DF8(u8 *, u8); +void GetMapNameGeneric(u8 *, u8); void sub_80BFF50(u8 a0, void (*a1)(void)); #endif //GUARD_REGION_MAP_H diff --git a/include/strings.h b/include/strings.h index 7750b271c..f5dc759e6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -181,7 +181,7 @@ extern const u8 gUnknown_8416644[]; extern const u8 gUnknown_841665C[]; extern const u8 gUnknown_8416690[]; extern const u8 gUnknown_84166A7[]; -extern const u8 gUnknown_84169DC[]; +extern const u8 gText_WontHaveEffect[]; extern const u8 gUnknown_841623D[]; extern const u8 gUnknown_84162BD[]; extern const u8 gUnknown_841D148[]; diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index a6730cbbb..da8530c72 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -355,7 +355,7 @@ static void OpenPartyMenuToChooseMon(void) caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0]; DestroyTask(gUnknown_3004FFC[gActiveBattler]); FreeAllWindowBuffers(); - OpenPartyMenuInBattle(caseId); + OpenPartyMenuInTutorialBattle(caseId); } } @@ -363,8 +363,8 @@ static void WaitForMonSelection(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { - if (gUnknown_203B0C0 == 1) - BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC); + if (gPartyMenuUseExitCallback == 1) + BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder); else BtlController_EmitChosenMonReturnValue(1, 6, NULL); OakOldManBufferExecCompleted(); @@ -1879,7 +1879,7 @@ static void OakOldManHandleChooseItem(void) gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerInMenuId = gActiveBattler; for (i = 0; i < 3; ++i) - gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1]; + gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1]; } static void OakOldManHandleChoosePokemon(void) @@ -1892,7 +1892,7 @@ static void OakOldManHandleChoosePokemon(void) *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; ++i) - gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i]; + gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i]; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 16bf1ec87..41d81052e 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1305,7 +1305,7 @@ static void OpenPartyMenuToChooseMon(void) caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0]; DestroyTask(gUnknown_3004FFC[gActiveBattler]); FreeAllWindowBuffers(); - OpenPartyMenuInBattle(caseId); + OpenPartyMenuInTutorialBattle(caseId); } } @@ -1313,8 +1313,8 @@ static void WaitForMonSelection(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { - if (gUnknown_203B0C0 == 1) - BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC); + if (gPartyMenuUseExitCallback == 1) + BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder); else BtlController_EmitChosenMonReturnValue(1, 6, NULL); if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1) @@ -2462,7 +2462,7 @@ static void PlayerHandleChooseItem(void) gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerInMenuId = gActiveBattler; for (i = 0; i < 3; ++i) - gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][1 + i]; + gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][1 + i]; } static void PlayerHandleChoosePokemon(void) @@ -2475,7 +2475,7 @@ static void PlayerHandleChoosePokemon(void) *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; ++i) - gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i]; + gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i]; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 57a405f3c..59fda163b 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -706,7 +706,7 @@ static void OpenPartyMenuToChooseMon(void) gBattlerControllerFuncs[gActiveBattler] = WaitForMonSelection; DestroyTask(gUnknown_3004FFC[gActiveBattler]); FreeAllWindowBuffers(); - sub_8127968(); + OpenPartyMenuInBattle(); } } @@ -714,8 +714,8 @@ static void WaitForMonSelection(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { - if (gUnknown_203B0C0 == 1) - BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC); + if (gPartyMenuUseExitCallback == 1) + BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder); else BtlController_EmitChosenMonReturnValue(1, 6, NULL); PokedudeBufferExecCompleted(); @@ -1985,7 +1985,7 @@ static void PokedudeHandleChooseItem(void) gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerInMenuId = gActiveBattler; for (i = 0; i < 3; ++i) - gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1]; + gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1]; } static void PokedudeHandleChoosePokemon(void) @@ -1998,7 +1998,7 @@ static void PokedudeHandleChoosePokemon(void) *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; ++i) - gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i]; + gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i]; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 6fb090307..ca2ef0b22 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -75,7 +75,7 @@ void sub_800D30C(void) SetBattlePartyIds(); if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) for (i = 0; i < gBattlersCount; ++i) - sub_8127DA8(i, 0); + BufferBattlePartyCurrentOrderBySide(i, 0); } static void InitSinglePlayerBtlControllers(void) @@ -199,11 +199,11 @@ static void InitLinkBtlControllers(void) { case 0: case 3: - sub_8127DA8(gLinkPlayers[i].id, 0); + BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0); break; case 1: case 2: - sub_8127DA8(gLinkPlayers[i].id, 1); + BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1); break; } if (i == multiplayerId) diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index d2e728d0c..55d413b3b 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -620,7 +620,7 @@ bool8 BattleInitAllSprites(u8 *state, u8 *battlerId) break; case 6: LoadAndCreateEnemyShadowSprites(); - sub_8127CAC(); + BufferBattlePartyCurrentOrder(); retVal = TRUE; break; } diff --git a/src/battle_main.c b/src/battle_main.c index 1125a8d2d..da9bc1a49 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -144,7 +144,7 @@ static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0}; EWRAM_DATA u32 gBattleTypeFlags = 0; EWRAM_DATA u8 gBattleTerrain = 0; EWRAM_DATA u32 gUnknown_2022B54 = 0; -EWRAM_DATA struct UnknownPokemonStruct4 gUnknown_2022B58[3] = {0}; +EWRAM_DATA struct UnknownPokemonStruct4 gMultiPartnerParty[3] = {0}; EWRAM_DATA u8 *gUnknown_2022BB8 = NULL; EWRAM_DATA u8 *gUnknown_2022BBC = NULL; EWRAM_DATA u16 *gUnknown_2022BC0 = NULL; @@ -1078,16 +1078,16 @@ static void sub_80108C4(void) for (i = 0; i < 3; ++i) { - gUnknown_2022B58[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES); - gUnknown_2022B58[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); - nick = gUnknown_2022B58[i].nickname; + gMultiPartnerParty[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES); + gMultiPartnerParty[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); + nick = gMultiPartnerParty[i].nickname; GetMonData(&gPlayerParty[i], MON_DATA_NICKNAME, nick); - gUnknown_2022B58[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); - gUnknown_2022B58[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP); - gUnknown_2022B58[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP); - gUnknown_2022B58[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS); - gUnknown_2022B58[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY); - gUnknown_2022B58[i].gender = GetMonGender(&gPlayerParty[i]); + gMultiPartnerParty[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); + gMultiPartnerParty[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP); + gMultiPartnerParty[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP); + gMultiPartnerParty[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS); + gMultiPartnerParty[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY); + gMultiPartnerParty[i].gender = GetMonGender(&gPlayerParty[i]); StripExtCtrlCodes(nick); if (GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE) { @@ -1098,7 +1098,7 @@ static void sub_80108C4(void) cur[j] = EOS; } } - memcpy(&gBattleStruct->field_184, gUnknown_2022B58, sizeof(gUnknown_2022B58)); + memcpy(&gBattleStruct->field_184, gMultiPartnerParty, sizeof(gMultiPartnerParty)); } static void CB2_PreInitMultiBattle(void) @@ -1123,7 +1123,7 @@ static void CB2_PreInitMultiBattle(void) if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished()) { sub_80108C4(); - SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gUnknown_2022B58)); + SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gMultiPartnerParty)); ++gBattleCommunication[MULTIUSE_STATE]; } break; @@ -1137,13 +1137,13 @@ static void CB2_PreInitMultiBattle(void) continue; if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1)) || (gLinkPlayers[i].id & 1 && gLinkPlayers[playerMultiplierId].id & 1)) - memcpy(gUnknown_2022B58, gBlockRecvBuffer[i], sizeof(gUnknown_2022B58)); + memcpy(gMultiPartnerParty, gBlockRecvBuffer[i], sizeof(gMultiPartnerParty)); } ++gBattleCommunication[MULTIUSE_STATE]; *savedCallback = gMain.savedCallback; *savedBattleTypeFlags = gBattleTypeFlags; gMain.savedCallback = CB2_PreInitMultiBattle; - sub_8128198(); + ShowPartyMenuToShowcaseMultiBattleParty(); } break; case 2: @@ -3004,22 +3004,22 @@ void sub_8013F6C(u8 battler) u8 r4, r1; for (i = 0; i < 3; ++i) - gUnknown_203B0DC[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)); + gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)); r4 = pokemon_order_func(gBattlerPartyIndexes[battler]); r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler)); - sub_8127FF4(r4, r1); + SwitchPartyMonSlots(r4, r1); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { for (i = 0; i < 3; ++i) { - *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i]; - *(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i]; + *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i]; + *(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i]; } } else { for (i = 0; i < 3; ++i) - *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i]; + *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i]; } } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 8a0e32ba8..c568d96f9 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7140,8 +7140,8 @@ static void atk8F_forcerandomswitch(void) *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i; if (!IsMultiBattle()) sub_8013F6C(gBattlerTarget); - sub_8127EC4(gBattlerTarget, i, 0); - sub_8127EC4(gBattlerTarget ^ 2, i, 1); + SwitchPartyOrderLinkMulti(gBattlerTarget, i, 0); + SwitchPartyOrderLinkMulti(gBattlerTarget ^ 2, i, 1); } } else diff --git a/src/berry_pouch.c b/src/berry_pouch.c index b8b66c0bc..466fe7927 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -1194,7 +1194,7 @@ static void Task_BerryPouch_Give(u8 taskId) Task_Give_PrintThereIsNoPokemon(taskId); else { - sResources->exitCallback = sub_8126EDC; + sResources->exitCallback = CB2_ChooseMonToGiveItem; gTasks[taskId].func = BerryPouch_StartFadeToExitCallback; } } @@ -1251,7 +1251,7 @@ static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId) } else { - sResources->exitCallback = c2_8123744; + sResources->exitCallback = CB2_GiveHoldItem; gTasks[taskId].func = BerryPouch_StartFadeToExitCallback; } } diff --git a/src/daycare.c b/src/daycare.c index f034bc220..8862dfda9 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1582,7 +1582,7 @@ void ShowDaycareLevelMenu(void) void ChooseSendDaycareMon(void) { - sub_8128370(); + ChooseMonForDaycare(); gMain.savedCallback = CB2_ReturnToField; } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 58caad509..d6bf4ea07 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -522,7 +522,7 @@ static bool32 sub_807E40C(void) bool32 sub_807E418(void) { - if (field_weather_is_fade_finished() == TRUE && sub_80F83B0()) + if (IsWeatherNotFadingIn() == TRUE && sub_80F83B0()) return TRUE; else return FALSE; diff --git a/src/field_poison.c b/src/field_poison.c index 474fbcd69..07c2b763f 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -43,7 +43,7 @@ static void FaintFromFieldPoison(u8 partyIdx) static bool32 MonFaintedFromPoison(u8 partyIdx) { struct Pokemon *pokemon = gPlayerParty + partyIdx; - if (IsMonValidSpecies(pokemon) && !GetMonData(pokemon, MON_DATA_HP) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN) + if (IsMonValidSpecies(pokemon) && !GetMonData(pokemon, MON_DATA_HP) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN) return TRUE; return FALSE; } @@ -97,7 +97,7 @@ s32 DoPoisonFieldEffect(void) u32 numFainted = 0; for (i = 0; i < PARTY_SIZE; i++) { - if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN) + if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN) { hp = GetMonData(pokemon, MON_DATA_HP); if (hp == 0 || --hp == 0) diff --git a/src/field_specials.c b/src/field_specials.c index 617faa017..374c74f3c 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1863,7 +1863,7 @@ void sub_80CC59C(void) { if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE22) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE23))) { - sp0.unk0 = get_mapheader_by_bank_and_number(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId; + sp0.unk0 = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId; if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22)) sp0.unk1 = r5; else @@ -1875,7 +1875,7 @@ void sub_80CC59C(void) } if (gSaveBlock1Ptr->location.mapGroup == sInsideOutsidePairs[r5].grp2 && gSaveBlock1Ptr->location.mapNum == sInsideOutsidePairs[r5].num2) { - sp0.unk0 = get_mapheader_by_bank_and_number(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId; + sp0.unk0 = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId; sp0.unk1 = r5; if (r5 == 22) { diff --git a/src/fieldmap.c b/src/fieldmap.c index 000b8105b..4244762c0 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -60,7 +60,7 @@ const u8 gUnknown_8352F10[] = { const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection) { - return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum); + return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum); } void not_trainer_hill_battle_pyramid(void) diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index 400a1d382..6840df686 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -13,7 +13,7 @@ static void sub_80E58A0(u8 taskId); static void sub_80E5934(u8 taskId); extern const u8 gUnknown_84169F8[]; -extern const u8 gUnknown_8416F27[]; +extern const u8 gText_PkmnHPRestoredByVar2[]; bool8 hm_prepare_dive_probably(void) { @@ -26,27 +26,27 @@ bool8 hm_prepare_dive_probably(void) return FALSE; } -void sub_80E56DC(u8 taskId) +void ChooseMonForSoftboiled(u8 taskId) { - gUnknown_203B0A0.unkB = 10; - gUnknown_203B0A0.unkA = gUnknown_203B0A0.unk9; - sub_811F818(GetCursorSelectionMonId(), 1); - sub_8121D0C(5); - gTasks[taskId].func = sub_811FB28; + gPartyMenu.unkB = 10; + gPartyMenu.unkA = gPartyMenu.unk9; + AnimatePartySlot(GetCursorSelectionMonId(), 1); + DisplayPartyMenuStdMessage(5); + gTasks[taskId].func = Task_HandleChooseMonInput; } void sub_80E5724(u8 taskId) { - u8 r8 = gUnknown_203B0A0.unk9; - u8 r5 = gUnknown_203B0A0.unkA; + u8 r8 = gPartyMenu.unk9; + u8 r5 = gPartyMenu.unkA; u16 curHp; s16 delta; if (r5 > 6) { - gUnknown_203B0A0.unkB = 0; - sub_8121D0C(0); - gTasks[taskId].func = sub_811FB28; + gPartyMenu.unkB = 0; + DisplayPartyMenuStdMessage(0); + gTasks[taskId].func = Task_HandleChooseMonInput; } else { @@ -58,7 +58,7 @@ void sub_80E5724(u8 taskId) else { PlaySE(SE_KAIFUKU); - sub_8120760(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8); + PartyMenuModifyHP(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8); } } } @@ -66,46 +66,46 @@ void sub_80E5724(u8 taskId) static void sub_80E57E8(u8 taskId) { PlaySE(SE_KAIFUKU); - sub_8120760(taskId, gUnknown_203B0A0.unkA, 1, GetMonData(&gPlayerParty[gUnknown_203B0A0.unk9], MON_DATA_MAX_HP) / 5, sub_80E583C); + PartyMenuModifyHP(taskId, gPartyMenu.unkA, 1, GetMonData(&gPlayerParty[gPartyMenu.unk9], MON_DATA_MAX_HP) / 5, sub_80E583C); } static void sub_80E583C(u8 taskId) { - GetMonNickname(&gPlayerParty[gUnknown_203B0A0.unkA], gStringVar1); - StringExpandPlaceholders(gStringVar4, gUnknown_8416F27); - sub_81202F8(gStringVar4, 0); + GetMonNickname(&gPlayerParty[gPartyMenu.unkA], gStringVar1); + StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2); + DisplayPartyMenuMessage(gStringVar4, 0); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = sub_80E58A0; } static void sub_80E58A0(u8 taskId) { - if (sub_8120370() != TRUE) + if (IsPartyMenuTextPrinterActive() != TRUE) { - gUnknown_203B0A0.unkB = 0; - sub_811F818(gUnknown_203B0A0.unk9, 0); - gUnknown_203B0A0.unk9 = gUnknown_203B0A0.unkA; - sub_811F818(gUnknown_203B0A0.unkA, 1); + gPartyMenu.unkB = 0; + AnimatePartySlot(gPartyMenu.unk9, 0); + gPartyMenu.unk9 = gPartyMenu.unkA; + AnimatePartySlot(gPartyMenu.unkA, 1); ClearStdWindowAndFrameToTransparent(6, 0); ClearWindowTilemap(6); - sub_8121D0C(0); - gTasks[taskId].func = sub_811FB28; + DisplayPartyMenuStdMessage(0); + gTasks[taskId].func = Task_HandleChooseMonInput; } } static void sub_80E5900(u8 taskId) { - if (sub_8120370() != TRUE) + if (IsPartyMenuTextPrinterActive() != TRUE) { - sub_8121D0C(5); - gTasks[taskId].func = sub_811FB28; + DisplayPartyMenuStdMessage(5); + gTasks[taskId].func = Task_HandleChooseMonInput; } } static void sub_80E5934(u8 taskId) { PlaySE(SE_SELECT); - sub_81202F8(gUnknown_84169F8, 0); + DisplayPartyMenuMessage(gUnknown_84169F8, 0); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = sub_80E5900; } diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 114bf0b57..c413f29c1 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -20,7 +20,7 @@ static void FailSweetScentEncounter(u8 taskId); static void Unused_StartSweetscentFldeff(void) { - gUnknown_203B0A0.unk9 = 0; + gPartyMenu.unk9 = 0; FieldCallback_SweetScent(); } diff --git a/src/item_pc.c b/src/item_pc.c index 60a74ac59..450e0d142 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -1029,8 +1029,8 @@ static void Task_ItemPcGive(u8 taskId) static void ItemPc_CB2_SwitchToPartyMenu(void) { - PartyMenuInit(0, 0, 6, 0, 6, sub_811FB28, ItemPc_CB2_ReturnFromPartyMenu); - gUnknown_203B0A0.unkC = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition()); + InitPartyMenu(0, 0, 6, 0, 6, Task_HandleChooseMonInput, ItemPc_CB2_ReturnFromPartyMenu); + gPartyMenu.unkC = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition()); } static void ItemPc_CB2_ReturnFromPartyMenu(void) diff --git a/src/item_use.c b/src/item_use.c index db0475370..73ad9a284 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -133,7 +133,7 @@ static const u8 sUnref_83E27B4[] = { }; void (*const gUnknown_83E2954[])(void) = { - sub_8124C8C, + CB2_ShowPartyMenuForItemUse, CB2_ReturnToField, NULL, NULL @@ -179,7 +179,7 @@ void sub_80A1084(void) void sub_80A109C(u8 taskId) { - if (field_weather_is_fade_finished() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { sItemUseOnFieldCB(taskId); } @@ -234,7 +234,7 @@ bool8 sub_80A1194(void) void sub_80A11C0(u8 taskId) { - if (field_weather_is_fade_finished() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { UnfreezeMapObjects(); ScriptContext2_Disable(); @@ -415,37 +415,37 @@ void sub_80A16D0(u8 taskId) void FieldUseFunc_Medicine(u8 taskId) { - gUnknown_3005E98 = sub_81252D0; + gItemUseCB = sub_81252D0; sub_80A16D0(taskId); } void FieldUseFunc_Ether(u8 taskId) { - gUnknown_3005E98 = ItemUseCB_PpRestore; + gItemUseCB = ItemUseCB_PPRecovery; sub_80A16D0(taskId); } void FieldUseFunc_PpUp(u8 taskId) { - gUnknown_3005E98 = dp05_pp_up; + gItemUseCB = ItemUseCB_PPUp; sub_80A16D0(taskId); } void FieldUseFunc_RareCandy(u8 taskId) { - gUnknown_3005E98 = dp05_rare_candy; + gItemUseCB = dp05_rare_candy; sub_80A16D0(taskId); } void FieldUseFunc_EvoItem(u8 taskId) { - gUnknown_3005E98 = sub_8126B60; + gItemUseCB = sub_8126B60; sub_80A16D0(taskId); } void FieldUseFunc_SacredAsh(u8 taskId) { - gUnknown_3005E98 = sub_8126894; + gItemUseCB = ItemUseCB_SacredAsh; sub_80A0FBC(taskId); } @@ -765,7 +765,7 @@ void BattleUseFunc_GuardSpec(u8 taskId) { if (ExecuteTableBasedItemEffect(&gPlayerParty[gBattlerPartyIndexes[gBattlerInMenuId]], gSpecialVar_ItemId, gBattlerPartyIndexes[gBattlerInMenuId], 0)) { - DisplayItemMessageInBag(taskId, 2, gUnknown_84169DC, sub_810A1F8); + DisplayItemMessageInBag(taskId, 2, gText_WontHaveEffect, sub_810A1F8); } else { @@ -812,19 +812,19 @@ void ItemUse_SwitchToPartyMenuInBattle(u8 taskId) void BattleUseFunc_Medicine(u8 taskId) { - gUnknown_3005E98 = ItemUseCB_Medicine; + gItemUseCB = ItemUseCB_Medicine; ItemUse_SwitchToPartyMenuInBattle(taskId); } void sub_80A1FD8(u8 taskId) { - gUnknown_3005E98 = sub_8126894; + gItemUseCB = ItemUseCB_SacredAsh; ItemUse_SwitchToPartyMenuInBattle(taskId); } void BattleUseFunc_Ether(u8 taskId) { - gUnknown_3005E98 = ItemUseCB_PpRestore; + gItemUseCB = ItemUseCB_PPRecovery; ItemUse_SwitchToPartyMenuInBattle(taskId); } diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index c465a5683..0747e8ade 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -495,7 +495,7 @@ static void sub_80F83D0(u8 taskId) } break; case 2: - if (field_weather_is_fade_finished()) + if (IsWeatherNotFadingIn()) { Overworld_PlaySpecialMapMusic(); data[0]++; diff --git a/src/player_pc.c b/src/player_pc.c index f454cd07f..c3dc81dd2 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -322,7 +322,7 @@ static void Task_DepositItem_WaitFadeAndGoToBag(u8 taskId) if (!gPaletteFade.active) { CleanupOverworldWindowsAndTilemaps(); - sub_8107DB4(3, POCKET_ITEMS - 1, CB2_ReturnToField); + GoToBagMenu(3, POCKET_ITEMS - 1, CB2_ReturnToField); gFieldCallback = CB2_ReturnFromDepositMenu; DestroyTask(taskId); } @@ -336,7 +336,7 @@ static void Task_PlayerPcDepositItem(u8 taskId) static void Task_ReturnToItemStorageSubmenu(u8 taskId) { - if (field_weather_is_fade_finished() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) gTasks[taskId].func = Task_TopMenu_ItemStorageSubmenu_HandleInput; } @@ -573,7 +573,7 @@ static void Task_WaitFadeAndReadSelectedMail(u8 taskId) static void Task_WaitFadeAndReturnToMailboxPcInputHandler(u8 taskId) { - if (field_weather_is_fade_finished() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) gTasks[taskId].func = Task_MailboxPcHandleInput; } @@ -674,7 +674,7 @@ static void Task_WaitFadeAndGoToPartyMenu(u8 taskId) { MailboxPC_DestroyListMenuBuffer(); CleanupOverworldWindowsAndTilemaps(); - PartyMenuInit_FromPlayerPc(); + ChooseMonToGiveMailFromMailbox(); DestroyTask(taskId); } } diff --git a/src/quest_log.c b/src/quest_log.c index d7b544882..9683d7799 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -987,7 +987,7 @@ void sub_8111708(void) gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE); if (gSaveBlock1Ptr->mapDataId == 0) { - sp0 = *get_mapheader_by_bank_and_number(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); + sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); gSaveBlock1Ptr->mapDataId = sp0.mapDataId; } } @@ -1363,7 +1363,7 @@ static void sub_8111FCC(u8 taskId) { if (gUnknown_203AE94.unk_0_6 != 1) { - sub_80C4DF8(gStringVar1, gMapHeader.regionMapSectionId); + GetMapNameGeneric(gStringVar1, gMapHeader.regionMapSectionId); StringExpandPlaceholders(gStringVar4, gUnknown_841B073); sub_8111D10(); } @@ -3166,7 +3166,7 @@ static const u16 *sub_8113FBC(const u16 *a0) StringCopy(gStringVar1, ItemId_GetName(r5[0])); if (r5[0] == ITEM_ESCAPE_ROPE) { - sub_80C4DF8(gStringVar2, r5[2]); + GetMapNameGeneric(gStringVar2, r5[2]); StringExpandPlaceholders(gStringVar4, gUnknown_841AFA6); } else if (r5[1] != 0xFFFF) @@ -3814,7 +3814,7 @@ static const u16 *sub_8114D68(const u16 *a0) a0 = sub_8113E88(30, a0); r6 = (const u8 *)a0 + 6; DynamicPlaceholderTextUtil_Reset(); - sub_80C4DF8(gStringVar1, r6[0]); + GetMapNameGeneric(gStringVar1, r6[0]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[a0[2]].trainerName); QuestLog_AutoGetSpeciesName(a0[0], 0, 2); @@ -3855,7 +3855,7 @@ static const u16 *sub_8114E68(const u16 *a0) r6 = (const u8 *)a0 + 8; DynamicPlaceholderTextUtil_Reset(); - sub_80C4DF8(gStringVar1, r6[2]); + GetMapNameGeneric(gStringVar1, r6[2]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); QuestLog_AutoGetSpeciesName(a0[2], NULL, 1); ConvertIntToDecimalStringN(gStringVar2, r6[0], STR_CONV_MODE_LEFT_ALIGN, 3); @@ -3983,7 +3983,7 @@ static const u16 *sub_81151DC(const u16 *a0) const u16 *r5 = sub_8113E88(34, a0); const u8 *r6 = (const u8 *)r5 + 6; DynamicPlaceholderTextUtil_Reset(); - sub_80C4DF8(gStringVar1, r6[0]); + GetMapNameGeneric(gStringVar1, r6[0]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); if ( gTrainers[r5[2]].trainerClass == 0x51 @@ -4164,7 +4164,7 @@ static const u16 *sub_81152BC(const u16 *a0) const u16 *r5 = sub_8113E88(35, a0); const u8 *r5_2 = (const u8 *)r5 + 0; r6 = r5_2[1]; - sub_80C4DF8(gStringVar1, r5_2[0]); + GetMapNameGeneric(gStringVar1, r5_2[0]); StringCopy(gStringVar2, gUnknown_8456AF0[r6]); if (gUnknown_8456BE4[r6] == 5) { @@ -4238,7 +4238,7 @@ static const u16 *sub_8115460(const u16 *a0) const u8 *r5 = (const u8 *)r4 + 2; QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0); if (r5[1] != 0xFF) - sub_80C4DF8(gStringVar2, r5[1]); + GetMapNameGeneric(gStringVar2, r5[1]); if (r5[0] == 7) { if (r5[1] == 0x58) @@ -4270,7 +4270,7 @@ static const u16 *sub_8115518(const u16 *a0) const u8 *r7 = (const u8 *)r4 + 8; u32 r6 = (r4[2] << 16) + r4[3]; DynamicPlaceholderTextUtil_Reset(); - sub_80C4DF8(gStringVar1, r7[0]); + GetMapNameGeneric(gStringVar1, r7[0]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r4[0])); if (r4[1] < 2) @@ -4303,7 +4303,7 @@ static const u16 *sub_81155E0(const u16 *a0) { const u8 *r7 = (const u8 *) r5 + 8; u32 r6 = (r5[2] << 16) + r5[3]; DynamicPlaceholderTextUtil_Reset(); - sub_80C4DF8(gStringVar1, r7[0]); + GetMapNameGeneric(gStringVar1, r7[0]); if (r7[1] == 0) { DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1); @@ -4344,7 +4344,7 @@ static const u16 *sub_8115700(const u16 *a0) { const u16 *r4 = sub_8113E88(40, a0); const u8 *r5 = (const u8 *)r4 + 2; - sub_80C4DF8(gStringVar1, r5[0]); + GetMapNameGeneric(gStringVar1, r5[0]); StringCopy(gStringVar2, ItemId_GetName(r4[0])); StringExpandPlaceholders(gStringVar4, gUnknown_841B03F); return (const u16 *)(r5 + 2); @@ -4420,7 +4420,7 @@ static u16 *sub_81157DC(u16 *a0, const u16 *a1) static const u16 *sub_8115800(const u16 *a0) { const u16 *r4 = sub_8113E88(42, a0); - sub_80C4DF8(gStringVar1, r4[0]); + GetMapNameGeneric(gStringVar1, r4[0]); StringExpandPlaceholders(gStringVar4, gUnknown_841B064); return r4 + 1; } diff --git a/src/roamer.c b/src/roamer.c index b42855644..b3cc67f85 100644 --- a/src/roamer.c +++ b/src/roamer.c @@ -236,5 +236,5 @@ u16 GetRoamerLocationMapSectionId(void) struct Roamer *roamer = &saveRoamer; if (!saveRoamer.active) return MAPSEC_NONE; - return get_mapheader_by_bank_and_number(sRoamerLocation[MAP_GRP], sRoamerLocation[MAP_NUM])->regionMapSectionId; + return Overworld_GetMapHeaderByGroupAndId(sRoamerLocation[MAP_GRP], sRoamerLocation[MAP_NUM])->regionMapSectionId; } diff --git a/src/save_menu_util.c b/src/save_menu_util.c index 195b29b0c..54073785e 100644 --- a/src/save_menu_util.c +++ b/src/save_menu_util.c @@ -41,7 +41,7 @@ void SaveStatToString(u8 gameStatId, u8 *dest0, u8 color) dest = ConvertIntToDecimalStringN(dest, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); break; case SAVE_STAT_LOCATION: - sub_80C4DF8(dest, gMapHeader.regionMapSectionId); + GetMapNameGeneric(dest, gMapHeader.regionMapSectionId); break; case SAVE_STAT_BADGES: for (flagId = FLAG_BADGE01_GET, nBadges = 0; flagId < FLAG_BADGE01_GET + 8; flagId++) diff --git a/src/tm_case.c b/src/tm_case.c index 25fe9a72c..0734c6d24 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -848,8 +848,8 @@ static void TMHMContextMenuAction_Use(u8 taskId) } else { - gUnknown_3005E98 = sub_8125B40; - sTMCaseDynamicResources->savedCallback = sub_8124C8C; + gItemUseCB = ItemUseCB_TMHM; + sTMCaseDynamicResources->savedCallback = CB2_ShowPartyMenuForItemUse; Task_BeginFadeOutFromTMCase(taskId); } } @@ -874,7 +874,7 @@ static void TMHMContextMenuAction_Give(u8 taskId) } else { - sTMCaseDynamicResources->savedCallback = sub_8126EDC; + sTMCaseDynamicResources->savedCallback = CB2_ChooseMonToGiveItem; Task_BeginFadeOutFromTMCase(taskId); } } @@ -945,7 +945,7 @@ static void Task_SelectTMAction_Type1(u8 taskId) if (!itemid_is_unique(BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1]))) { - sTMCaseDynamicResources->savedCallback = c2_8123744; + sTMCaseDynamicResources->savedCallback = CB2_GiveHoldItem; Task_BeginFadeOutFromTMCase(taskId); } else @@ -1274,7 +1274,7 @@ static void Task_TMCaseDude_Playback(u8 taskId) sTMCaseStaticResources.scrollOffset = sPokeDudePackBackup->unk_162; Free(sPokeDudePackBackup); CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); - sub_8108CF0(); + CB2_SetUpReshowBattleScreenAfterMenu(); BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0); data[8]++; } diff --git a/src/trade.c b/src/trade.c index 5151ecedd..792f1524b 100644 --- a/src/trade.c +++ b/src/trade.c @@ -879,11 +879,11 @@ static void sub_804C728(void) break; case 8: LoadHeldItemIcons(); - sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0); + DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0); gMain.state++; break; case 9: - sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1); + DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1); gMain.state++; break; case 10: @@ -1483,7 +1483,7 @@ static void sub_804C728(void) "\tadds r0, 0x36\n" "\tadds r1, 0x28\n" "\tmovs r2, 0\n" - "\tbl sub_812256C\n" + "\tbl DrawHeldItemIconsForTrade\n" "\tldr r1, _0804CB74 @ =gMain\n" "\tmovs r5, 0x87\n" "\tlsls r5, 3\n" @@ -1499,7 +1499,7 @@ static void sub_804C728(void) "\tadds r0, 0x36\n" "\tadds r1, 0x28\n" "\tmovs r2, 0x1\n" - "\tbl sub_812256C\n" + "\tbl DrawHeldItemIconsForTrade\n" "\tldr r1, _0804CB98 @ =gMain\n" "\tmovs r7, 0x87\n" "\tlsls r7, 3\n" @@ -1989,11 +1989,11 @@ void sub_804CF14(void) break; case 8: LoadHeldItemIcons(); - sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0); + DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0); gMain.state++; break; case 9: - sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1); + DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1); gMain.state++; break; case 10: @@ -2365,7 +2365,7 @@ void sub_804CF14(void) "\tadds r0, 0x36\n" "\tadds r1, 0x28\n" "\tmovs r2, 0\n" - "\tbl sub_812256C\n" + "\tbl DrawHeldItemIconsForTrade\n" "\tldr r1, _0804D174 @ =gMain\n" "\tmovs r5, 0x87\n" "\tlsls r5, 3\n" @@ -2381,7 +2381,7 @@ void sub_804CF14(void) "\tadds r0, 0x36\n" "\tadds r1, 0x28\n" "\tmovs r2, 0x1\n" - "\tbl sub_812256C\n" + "\tbl DrawHeldItemIconsForTrade\n" "\tldr r1, _0804D198 @ =gMain\n" "\tmovs r7, 0x87\n" "\tlsls r7, 3\n" @@ -4394,7 +4394,7 @@ static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isObedientBitSet) return FALSE; } -int sub_804FBEC(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet) +int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet) { u8 r9 = a0.unk_01_0; u8 r4 = a0.unk_00_7; diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c index fc4df06ed..3c5afaf25 100644 --- a/src/wild_pokemon_area.c +++ b/src/wild_pokemon_area.c @@ -289,7 +289,7 @@ static bool32 PokemonInEncounterTable(const struct WildPokemonInfo * info, s32 s static u16 GetMapSecIdFromWildMonHeader(const struct WildPokemonHeader * header) { - return get_mapheader_by_bank_and_number(header->mapGroup, header->mapNum)->regionMapSectionId; + return Overworld_GetMapHeaderByGroupAndId(header->mapGroup, header->mapNum)->regionMapSectionId; } static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lutIdx_p, u16 * tableIdx_p) diff --git a/sym_common.txt b/sym_common.txt index b6e5f8b5e..30b886f7a 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -180,7 +180,7 @@ gUnknown_3005E90: @ 3005E90 gUnknown_3005E94: @ 3005E94 .space 0x4 -gUnknown_3005E98: @ 3005E98 +gItemUseCB: @ 3005E98 .space 0x4 .include "help_system_812B1E0.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index 7a25f1726..891ba29a3 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -569,10 +569,10 @@ gUnknown_203B05C: @ 203B05C gUnknown_203B064: @ 203B064 .space 0x4 -gUnknown_203B068: @ 203B068 +gUnionRoomOfferedSpecies: @ 203B068 .space 0x2 -gUnknown_203B06A: @ 203B06A +gUnionRoomRequestedMonType: @ 203B06A .space 0x2 gUnknown_203B06C: @ 203B06C @@ -596,10 +596,10 @@ gUnknown_203B094: @ 203B094 gUnknown_203B098: @ 203B098 .space 0x4 -gUnknown_203B09C: @ 203B09C +sPartyMenuInternal: @ 203B09C .space 0x4 -gUnknown_203B0A0: @ 203B0A0 +gPartyMenu: @ 203B0A0 .space 0x9 gUnknown_203B0A9: @ 203B0A9 @@ -608,16 +608,16 @@ gUnknown_203B0A9: @ 203B0A9 gUnknown_203B0AE: @ 203B0AE .space 0x6 -gUnknown_203B0B4: @ 203B0B4 +sPartyMenuBoxes: @ 203B0B4 .space 0x4 -gUnknown_203B0B8: @ 203B0B8 +sPartyBgGfxTilemap: @ 203B0B8 .space 0x4 -gUnknown_203B0BC: @ 203B0BC +sPartyBgTilemapBuffer: @ 203B0BC .space 0x4 -gUnknown_203B0C0: @ 203B0C0 +gPartyMenuUseExitCallback: @ 203B0C0 .space 0x1 gUnknown_203B0C1: @ 203B0C1 @@ -626,10 +626,10 @@ gUnknown_203B0C1: @ 203B0C1 gPostMenuFieldCallback: @ 203B0C4 .space 0x4 -gUnknown_203B0C8: @ 203B0C8 +sSlot1TilemapBuffer: @ 203B0C8 .space 0x4 -gUnknown_203B0CC: @ 203B0CC +sSlot2TilemapBuffer: @ 203B0CC .space 0x4 gUnknown_203B0D0: @ 203B0D0 @@ -638,10 +638,10 @@ gUnknown_203B0D0: @ 203B0D0 gSelectedOrderFromParty: @ 203B0D4 .space 0x4 -gUnknown_203B0D8: @ 203B0D8 +sPartyMenuItemId: @ 203B0D8 .space 0x4 -gUnknown_203B0DC: @ 203B0DC +gBattlePartyCurrentOrder: @ 203B0DC .space 0x4 gUnknown_203B0E0: @ 203B0E0 |