diff options
author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
---|---|---|
committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:44:39 -0800 |
commit | 3ddda066d91cbbd377584acacaea62a9deba8873 (patch) | |
tree | 4af711b5daff8a50548f1df28f3981024cb9be8e | |
parent | 3ff48ec8c890d95c5fbc467896414a018bf523ad (diff) |
import names from pokeruby
102 files changed, 1717 insertions, 1717 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index 9e71b12d2..a5dca1033 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -216,7 +216,7 @@ _0800FF7E: ldr r1, _0800FFD8 @ =gUnknown_20386AE ldrh r1, [r1] bl sub_80112E0 - bl sub_80443F4 + bl SetWildMonHeldItem _0800FF98: ldr r0, _0800FFDC @ =gUnknown_30030F0 ldr r1, _0800FFE0 @ =0x00000439 @@ -3892,8 +3892,8 @@ _08011D5C: .4byte 0x0000012f _08011D60: .4byte gUnknown_824F008 thumb_func_end sub_8011D0C - thumb_func_start sub_8011D64 -sub_8011D64: @ 8011D64 + thumb_func_start oac_poke_opponent +oac_poke_opponent: @ 8011D64 push {lr} sub sp, 0x4 ldr r1, _08011D8C @ =sub_8011D94 @@ -3914,7 +3914,7 @@ sub_8011D64: @ 8011D64 .align 2, 0 _08011D8C: .4byte sub_8011D94 _08011D90: .4byte 0x00002108 - thumb_func_end sub_8011D64 + thumb_func_end oac_poke_opponent thumb_func_start sub_8011D94 sub_8011D94: @ 8011D94 @@ -9602,7 +9602,7 @@ _08014ACA: _08014AFE: movs r0, 0 movs r1, 0 - bl sub_800EB54 + bl EmitLinkStandbyMsg b _08014B24 .align 2, 0 _08014B08: .4byte gUnknown_2023BC8 @@ -9613,7 +9613,7 @@ _08014B18: .4byte gUnknown_2023FE8 _08014B1C: movs r0, 0 movs r1, 0x1 - bl sub_800EB54 + bl EmitLinkStandbyMsg _08014B24: ldr r4, _08014B3C @ =gUnknown_2023BC4 _08014B26: diff --git a/asm/battle_ai_script_commands.s b/asm/battle_ai_script_commands.s index 03ea976bc..84bd60462 100644 --- a/asm/battle_ai_script_commands.s +++ b/asm/battle_ai_script_commands.s @@ -3518,8 +3518,8 @@ nullsub_67: @ 80C86F4 bx lr thumb_func_end nullsub_67 - thumb_func_start sub_80C86F8 -sub_80C86F8: @ 80C86F8 + thumb_func_start BattleAICmd_if_status_in_party +BattleAICmd_if_status_in_party: @ 80C86F8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3619,10 +3619,10 @@ _080C87A6: .align 2, 0 _080C87B4: .4byte gUnknown_2024284 _080C87B8: .4byte gUnknown_2039A00 - thumb_func_end sub_80C86F8 + thumb_func_end BattleAICmd_if_status_in_party - thumb_func_start sub_80C87BC -sub_80C87BC: @ 80C87BC + thumb_func_start BattleAICmd_if_status_not_in_party +BattleAICmd_if_status_not_in_party: @ 80C87BC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3719,7 +3719,7 @@ _080C8844: .align 2, 0 _080C8878: .4byte gUnknown_2024284 _080C887C: .4byte gUnknown_2039A00 - thumb_func_end sub_80C87BC + thumb_func_end BattleAICmd_if_status_not_in_party thumb_func_start BattleAICmd_get_weather BattleAICmd_get_weather: @ 80C8880 diff --git a/asm/battle_ai_switch_items.s b/asm/battle_ai_switch_items.s index 18b361682..c9f49c472 100644 --- a/asm/battle_ai_switch_items.s +++ b/asm/battle_ai_switch_items.s @@ -257,7 +257,7 @@ sub_803937C: @ 803937C mov r5, r8 push {r5-r7} movs r0, 0x1 - bl sub_8039698 + bl ai_has_super_effective_move_on_field lsls r0, 24 cmp r0, 0 beq _080393A8 @@ -640,8 +640,8 @@ _08039690: .4byte gUnknown_2023BC4 _08039694: .4byte gUnknown_2023FE8 thumb_func_end sub_8039598 - thumb_func_start sub_8039698 -sub_8039698: @ 8039698 + thumb_func_start ai_has_super_effective_move_on_field +ai_has_super_effective_move_on_field: @ 8039698 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -799,10 +799,10 @@ _080397D0: .4byte gUnknown_2023D70 _080397D4: .4byte gUnknown_825E45C _080397D8: .4byte gUnknown_2023BE4 _080397DC: .4byte gUnknown_2023BC4 - thumb_func_end sub_8039698 + thumb_func_end ai_has_super_effective_move_on_field - thumb_func_start sub_80397E0 -sub_80397E0: @ 80397E0 + thumb_func_start AI_AreStatsRaised +AI_AreStatsRaised: @ 80397E0 push {r4,lr} movs r4, 0 ldr r1, _08039820 @ =gUnknown_2023BE4 @@ -841,7 +841,7 @@ _0803981A: .align 2, 0 _08039820: .4byte gUnknown_2023BE4 _08039824: .4byte gUnknown_2023BC4 - thumb_func_end sub_80397E0 + thumb_func_end AI_AreStatsRaised thumb_func_start sub_8039828 sub_8039828: @ 8039828 @@ -1340,11 +1340,11 @@ _08039BFA: cmp r0, 0 bne _08039C60 movs r0, 0 - bl sub_8039698 + bl ai_has_super_effective_move_on_field lsls r0, 24 cmp r0, 0 bne _08039C74 - bl sub_80397E0 + bl AI_AreStatsRaised lsls r0, 24 cmp r0, 0 bne _08039C74 diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index f25d784f9..b904a785d 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -789,8 +789,8 @@ StoreSpriteCallbackInData6: @ 8074A68 bx lr thumb_func_end StoreSpriteCallbackInData6 - thumb_func_start sub_8074A70 -sub_8074A70: @ 8074A70 + thumb_func_start SetCallbackToStoredInData +SetCallbackToStoredInData: @ 8074A70 ldrh r2, [r0, 0x3A] movs r3, 0x3C ldrsh r1, [r0, r3] @@ -798,7 +798,7 @@ sub_8074A70: @ 8074A70 orrs r2, r1 str r2, [r0, 0x1C] bx lr - thumb_func_end sub_8074A70 + thumb_func_end SetCallbackToStoredInData thumb_func_start sub_8074A80 sub_8074A80: @ 8074A80 @@ -847,7 +847,7 @@ _08074ACC: b _08074ADA _08074AD4: adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074ADA: pop {r4} pop {r0} @@ -915,7 +915,7 @@ _08074B48: b _08074B56 _08074B50: adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074B56: pop {r4} pop {r0} @@ -991,7 +991,7 @@ _08074BD0: b _08074BDE _08074BD8: adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074BDE: pop {r4} pop {r0} @@ -1045,7 +1045,7 @@ _08074C30: b _08074C3E _08074C38: adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074C3E: pop {r4} pop {r0} @@ -1066,7 +1066,7 @@ sub_8074C44: @ 8074C44 b _08074C5E _08074C58: adds r0, r1, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074C5E: pop {r0} bx r0 @@ -1153,7 +1153,7 @@ sub_8074CD0: @ 8074CD0 b _08074CFA _08074CF4: adds r0, r1, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074CFA: pop {r0} bx r0 @@ -1187,7 +1187,7 @@ sub_8074D00: @ 8074D00 b _08074D36 _08074D30: adds r0, r2, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074D36: pop {r0} bx r0 @@ -1221,10 +1221,10 @@ sub_8074D3C: @ 8074D3C b _08074D72 _08074D6C: adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074D72: adds r0, r4, 0 - bl sub_8097228 + bl UpdateMonIconFrame pop {r4} pop {r0} bx r0 @@ -1302,7 +1302,7 @@ sub_8074DC4: @ 8074DC4 _08074E04: .4byte gUnknown_202063C _08074E08: adds r0, r3, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074E0E: pop {r4} pop {r0} @@ -1353,7 +1353,7 @@ sub_8074E14: @ 8074E14 _08074E60: .4byte gUnknown_202063C _08074E64: adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074E6A: pop {r4} pop {r0} @@ -1412,7 +1412,7 @@ sub_8074E70: @ 8074E70 b _08074ED8 _08074ED2: adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074ED8: pop {r4} pop {r0} @@ -1490,7 +1490,7 @@ sub_8074F50: @ 8074F50 cmp r0, 0 beq _08074F66 adds r0, r2, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074F66: pop {r0} bx r0 @@ -1507,7 +1507,7 @@ sub_8074F6C: @ 8074F6C cmp r0, 0 beq _08074F82 adds r0, r2, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08074F82: pop {r0} bx r0 @@ -2453,7 +2453,7 @@ sub_807563C: @ 807563C cmp r0, 0 beq _08075650 adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08075650: pop {r4} pop {r0} @@ -2471,7 +2471,7 @@ sub_8075658: @ 8075658 cmp r0, 0 beq _08075672 adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _08075672: pop {r4} pop {r0} @@ -2692,7 +2692,7 @@ sub_80757E8: @ 80757E8 cmp r0, 0 beq _080757FC adds r0, r4, 0 - bl sub_8074A70 + bl SetCallbackToStoredInData _080757FC: pop {r4} pop {r0} @@ -3112,8 +3112,8 @@ sub_8075AD8: @ 8075AD8 bx r0 thumb_func_end sub_8075AD8 - thumb_func_start sub_8075B18 -sub_8075B18: @ 8075B18 + thumb_func_start ArcTan2_ +ArcTan2_: @ 8075B18 push {lr} lsls r0, 16 asrs r0, 16 @@ -3124,7 +3124,7 @@ sub_8075B18: @ 8075B18 lsrs r0, 16 pop {r1} bx r1 - thumb_func_end sub_8075B18 + thumb_func_end ArcTan2_ thumb_func_start sub_8075B30 sub_8075B30: @ 8075B30 @@ -3133,7 +3133,7 @@ sub_8075B30: @ 8075B30 asrs r0, 16 lsls r1, 16 asrs r1, 16 - bl sub_8075B18 + bl ArcTan2_ lsls r0, 16 negs r0, r0 lsrs r0, 16 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 53ac8b1fd..d57db1b75 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -10834,7 +10834,7 @@ _080A756E: lsls r5, 16 asrs r5, 16 adds r1, r5, 0 - bl .gcc2_compiled._3 + bl sub_80D8AA0 adds r4, r0, 0 lsls r4, 16 asrs r4, 16 @@ -10846,13 +10846,13 @@ _080A756E: lsls r1, 16 asrs r1, 16 adds r0, r4, 0 - bl .gcc2_compiled._3 + bl sub_80D8AA0 strh r0, [r7, 0x34] mov r1, r8 lsls r0, r1, 16 asrs r0, 16 adds r1, r5, 0 - bl .gcc2_compiled._3 + bl sub_80D8AA0 adds r4, r0, 0 lsls r4, 16 asrs r4, 16 @@ -10862,7 +10862,7 @@ _080A756E: lsls r1, 16 asrs r1, 16 adds r0, r4, 0 - bl .gcc2_compiled._3 + bl sub_80D8AA0 strh r0, [r7, 0x36] ldr r0, _080A75E0 @ =sub_80A7400 str r0, [r7, 0x1C] @@ -11226,7 +11226,7 @@ _080A788A: lsls r1, 16 asrs r1, 16 adds r0, r4, 0 - bl .gcc2_compiled._3 + bl sub_80D8AA0 ldr r2, _080A7904 @ =gUnknown_3005090 mov r3, r8 adds r1, r3, r7 @@ -11236,7 +11236,7 @@ _080A788A: movs r1, 0x12 ldrsh r0, [r6, r1] movs r1, 0x80 - bl .gcc2_compiled._3 + bl sub_80D8AA0 strh r0, [r6, 0x14] ldrh r0, [r5, 0x4] strh r0, [r6, 0x16] @@ -11257,7 +11257,7 @@ _080A788A: lsls r1, 16 asrs r1, 16 adds r0, r4, 0 - bl .gcc2_compiled._3 + bl sub_80D8AA0 movs r1, 0x2 negs r1, r1 ands r1, r0 @@ -11277,7 +11277,7 @@ _080A7908: lsls r1, 16 asrs r1, 16 adds r0, r4, 0 - bl .gcc2_compiled._3 + bl sub_80D8AA0 movs r1, 0x1 orrs r0, r1 strh r0, [r6, 0x18] @@ -38055,8 +38055,8 @@ _080B480A: bx r0 thumb_func_end sub_80B47C4 - thumb_func_start sub_80B4810 -sub_80B4810: @ 80B4810 + thumb_func_start do_boulder_dust +do_boulder_dust: @ 80B4810 push {r4-r6,lr} sub sp, 0x10 lsls r0, 24 @@ -38161,7 +38161,7 @@ _080B48FC: .4byte gUnknown_2037F02 _080B4900: .4byte gUnknown_2037F1A _080B4904: .4byte gUnknown_3005090 _080B4908: .4byte sub_80B490C - thumb_func_end sub_80B4810 + thumb_func_end do_boulder_dust thumb_func_start sub_80B490C sub_80B490C: @ 80B490C diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s index 9840155a2..226991873 100644 --- a/asm/battle_controller_link_opponent.s +++ b/asm/battle_controller_link_opponent.s @@ -3535,8 +3535,8 @@ _0803C3AC: .4byte gUnknown_2022BC4 _0803C3B0: .4byte gUnknown_202402C thumb_func_end RecordedOpponentHandleSetRawMonData - thumb_func_start sub_803C3B4 -sub_803C3B4: @ 803C3B4 + thumb_func_start LinkOpponentHandleLoadPokeSprite +LinkOpponentHandleLoadPokeSprite: @ 803C3B4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3684,10 +3684,10 @@ _0803C4F4: .4byte 0x0000ff10 _0803C4F8: .4byte gUnknown_2024024 _0803C4FC: .4byte gUnknown_3004FE0 _0803C500: .4byte sub_803AC14 - thumb_func_end sub_803C3B4 + thumb_func_end LinkOpponentHandleLoadPokeSprite - thumb_func_start sub_803C504 -sub_803C504: @ 803C504 + thumb_func_start LinkOpponentHandleSendOutPoke +LinkOpponentHandleSendOutPoke: @ 803C504 push {r4,lr} ldr r1, _0803C53C @ =gUnknown_2023BCE ldr r4, _0803C540 @ =gUnknown_2023BC4 @@ -3721,7 +3721,7 @@ _0803C540: .4byte gUnknown_2023BC4 _0803C544: .4byte gUnknown_2022BC4 _0803C548: .4byte gUnknown_3004FE0 _0803C54C: .4byte sub_803AFFC - thumb_func_end sub_803C504 + thumb_func_end LinkOpponentHandleSendOutPoke thumb_func_start sub_803C550 sub_803C550: @ 803C550 @@ -3899,8 +3899,8 @@ _0803C6CC: .4byte gUnknown_2024024 _0803C6D0: .4byte nullsub_8 thumb_func_end sub_803C550 - thumb_func_start sub_803C6D4 -sub_803C6D4: @ 803C6D4 + thumb_func_start LinkOpponentHandleReturnPokeToBall +LinkOpponentHandleReturnPokeToBall: @ 803C6D4 push {r4-r6,lr} ldr r1, _0803C708 @ =gUnknown_2022BC4 ldr r6, _0803C70C @ =gUnknown_2023BC4 @@ -3966,7 +3966,7 @@ _0803C758: _0803C760: .4byte gUnknown_2023D44 _0803C764: .4byte gUnknown_202063C _0803C768: .4byte gUnknown_3004FF0 - thumb_func_end sub_803C6D4 + thumb_func_end LinkOpponentHandleReturnPokeToBall thumb_func_start sub_803C76C sub_803C76C: @ 803C76C @@ -5531,8 +5531,8 @@ _0803D3AC: .4byte gUnknown_2023BC4 _0803D3B0: .4byte gUnknown_2022BC4 thumb_func_end RecordedOpponentHandlePlaySE - thumb_func_start sub_803D3B4 -sub_803D3B4: @ 803D3B4 + thumb_func_start LinkOpponentHandlecmd44 +LinkOpponentHandlecmd44: @ 803D3B4 push {lr} ldr r2, _0803D3DC @ =gUnknown_2022BC4 ldr r0, _0803D3E0 @ =gUnknown_2023BC4 @@ -5553,7 +5553,7 @@ sub_803D3B4: @ 803D3B4 .align 2, 0 _0803D3DC: .4byte gUnknown_2022BC4 _0803D3E0: .4byte gUnknown_2023BC4 - thumb_func_end sub_803D3B4 + thumb_func_end LinkOpponentHandlecmd44 thumb_func_start RecordedOpponentHandleFaintingCry RecordedOpponentHandleFaintingCry: @ 803D3E4 diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s index 68d51cbcb..ed63591cb 100644 --- a/asm/battle_controller_link_partner.s +++ b/asm/battle_controller_link_partner.s @@ -17,17 +17,17 @@ sub_80D4204: @ 80D4204 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _080D421C @ =sub_80D4220 + ldr r1, _080D421C @ =LinkPartnerBufferRunCommand str r1, [r0] bx lr .align 2, 0 _080D4214: .4byte gUnknown_3004FE0 _080D4218: .4byte gUnknown_2023BC4 -_080D421C: .4byte sub_80D4220 +_080D421C: .4byte LinkPartnerBufferRunCommand thumb_func_end sub_80D4204 - thumb_func_start sub_80D4220 -sub_80D4220: @ 80D4220 + thumb_func_start LinkPartnerBufferRunCommand +LinkPartnerBufferRunCommand: @ 80D4220 push {lr} ldr r2, _080D4254 @ =gUnknown_2023BC8 ldr r1, _080D4258 @ =gUnknown_825E45C @@ -64,7 +64,7 @@ _080D4268: _080D426C: pop {r0} bx r0 - thumb_func_end sub_80D4220 + thumb_func_end LinkPartnerBufferRunCommand thumb_func_start sub_80D4270 sub_80D4270: @ 80D4270 @@ -994,7 +994,7 @@ sub_80D49E8: @ 80D49E8 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _080D4A30 @ =sub_80D4220 + ldr r1, _080D4A30 @ =LinkPartnerBufferRunCommand str r1, [r0] ldr r0, _080D4A34 @ =gUnknown_2022B4C ldr r0, [r0] @@ -1019,7 +1019,7 @@ sub_80D49E8: @ 80D49E8 .align 2, 0 _080D4A28: .4byte gUnknown_3004FE0 _080D4A2C: .4byte gUnknown_2023BC4 -_080D4A30: .4byte sub_80D4220 +_080D4A30: .4byte LinkPartnerBufferRunCommand _080D4A34: .4byte gUnknown_2022B4C _080D4A38: .4byte gUnknown_2022BC4 _080D4A3C: @@ -1094,8 +1094,8 @@ _080D4AB8: .4byte gUnknown_2024018 _080D4ABC: .4byte gUnknown_2023BC4 thumb_func_end sub_80D4A90 - thumb_func_start sub_80D4AC0 -sub_80D4AC0: @ 80D4AC0 + thumb_func_start LinkPartnerHandleGetAttributes +LinkPartnerHandleGetAttributes: @ 80D4AC0 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 @@ -1113,7 +1113,7 @@ sub_80D4AC0: @ 80D4AC0 adds r1, r0 ldrb r0, [r1] mov r1, sp - bl sub_80D4B34 + bl dp01_getattr_by_ch1_for_player_pokemon adds r6, r0, 0 b _080D4B1A .align 2, 0 @@ -1132,7 +1132,7 @@ _080D4AFC: lsrs r0, 24 mov r2, sp adds r1, r2, r6 - bl sub_80D4B34 + bl dp01_getattr_by_ch1_for_player_pokemon adds r6, r0 _080D4B12: lsrs r4, 1 @@ -1150,10 +1150,10 @@ _080D4B1A: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_80D4AC0 + thumb_func_end LinkPartnerHandleGetAttributes - thumb_func_start sub_80D4B34 -sub_80D4B34: @ 80D4B34 + thumb_func_start dp01_getattr_by_ch1_for_player_pokemon +dp01_getattr_by_ch1_for_player_pokemon: @ 80D4B34 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2084,7 +2084,7 @@ _080D52CA: bx r1 .align 2, 0 _080D52DC: .4byte gUnknown_2024284 - thumb_func_end sub_80D4B34 + thumb_func_end dp01_getattr_by_ch1_for_player_pokemon thumb_func_start sub_80D52E0 sub_80D52E0: @ 80D52E0 @@ -2094,8 +2094,8 @@ sub_80D52E0: @ 80D52E0 bx r0 thumb_func_end sub_80D52E0 - thumb_func_start sub_80D52EC -sub_80D52EC: @ 80D52EC + thumb_func_start LinkPartnerHandleSetAttributes +LinkPartnerHandleSetAttributes: @ 80D52EC push {r4,r5,lr} ldr r1, _080D5310 @ =gUnknown_2022BC4 ldr r0, _080D5314 @ =gUnknown_2023BC4 @@ -2138,7 +2138,7 @@ _080D533A: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80D52EC + thumb_func_end LinkPartnerHandleSetAttributes thumb_func_start sub_80D5344 sub_80D5344: @ 80D5344 @@ -3277,8 +3277,8 @@ _080D5D38: .4byte gUnknown_2023BC4 _080D5D3C: .4byte gUnknown_2023BCE thumb_func_end sub_80D5344 - thumb_func_start sub_80D5D40 -sub_80D5D40: @ 80D5D40 + thumb_func_start LinkPartnerHandlecmd3 +LinkPartnerHandlecmd3: @ 80D5D40 push {r4-r7,lr} ldr r1, _080D5DA4 @ =gUnknown_2023BCE ldr r7, _080D5DA8 @ =gUnknown_2023BC4 @@ -3334,10 +3334,10 @@ _080D5DA4: .4byte gUnknown_2023BCE _080D5DA8: .4byte gUnknown_2023BC4 _080D5DAC: .4byte gUnknown_2022BC4 _080D5DB0: .4byte gUnknown_2024284 - thumb_func_end sub_80D5D40 + thumb_func_end LinkPartnerHandlecmd3 - thumb_func_start sub_80D5DB4 -sub_80D5DB4: @ 80D5DB4 + thumb_func_start LinkPartnerHandleLoadPokeSprite +LinkPartnerHandleLoadPokeSprite: @ 80D5DB4 push {r4-r6,lr} mov r6, r8 push {r6} @@ -3461,10 +3461,10 @@ _080D5EC0: .4byte 0x0000ff10 _080D5EC4: .4byte gUnknown_2024024 _080D5EC8: .4byte gUnknown_3004FE0 _080D5ECC: .4byte sub_80D4590 - thumb_func_end sub_80D5DB4 + thumb_func_end LinkPartnerHandleLoadPokeSprite - thumb_func_start sub_80D5ED0 -sub_80D5ED0: @ 80D5ED0 + thumb_func_start LinkPartnerHandleSendOutPoke +LinkPartnerHandleSendOutPoke: @ 80D5ED0 push {r4-r6,lr} ldr r5, _080D5F28 @ =gUnknown_2023BC4 ldrb r0, [r5] @@ -3513,7 +3513,7 @@ _080D5F30: .4byte gUnknown_2023BCE _080D5F34: .4byte gUnknown_2024284 _080D5F38: .4byte gUnknown_3004FE0 _080D5F3C: .4byte sub_80D4944 - thumb_func_end sub_80D5ED0 + thumb_func_end LinkPartnerHandleSendOutPoke thumb_func_start sub_80D5F40 sub_80D5F40: @ 80D5F40 @@ -3681,8 +3681,8 @@ _080D60A4: .4byte gUnknown_2024024 _080D60A8: .4byte nullsub_8 thumb_func_end sub_80D5F40 - thumb_func_start sub_80D60AC -sub_80D60AC: @ 80D60AC + thumb_func_start LinkPartnerHandleReturnPokeToBall +LinkPartnerHandleReturnPokeToBall: @ 80D60AC push {r4-r6,lr} ldr r1, _080D60E0 @ =gUnknown_2022BC4 ldr r6, _080D60E4 @ =gUnknown_2023BC4 @@ -3746,7 +3746,7 @@ _080D612A: _080D6130: .4byte gUnknown_2023D44 _080D6134: .4byte gUnknown_202063C _080D6138: .4byte gUnknown_3004FF0 - thumb_func_end sub_80D60AC + thumb_func_end LinkPartnerHandleReturnPokeToBall thumb_func_start sub_80D613C sub_80D613C: @ 80D613C @@ -4973,8 +4973,8 @@ sub_80D6AD0: @ 80D6AD0 bx r0 thumb_func_end sub_80D6AD0 - thumb_func_start sub_80D6ADC -sub_80D6ADC: @ 80D6ADC + thumb_func_start LinkPartnerHandlecmd37 +LinkPartnerHandlecmd37: @ 80D6ADC push {lr} ldr r2, _080D6AF4 @ =gUnknown_2022870 ldrb r1, [r2] @@ -4987,10 +4987,10 @@ sub_80D6ADC: @ 80D6ADC bx r0 .align 2, 0 _080D6AF4: .4byte gUnknown_2022870 - thumb_func_end sub_80D6ADC + thumb_func_end LinkPartnerHandlecmd37 - thumb_func_start sub_80D6AF8 -sub_80D6AF8: @ 80D6AF8 + thumb_func_start LinkPartnerHandlecmd38 +LinkPartnerHandlecmd38: @ 80D6AF8 push {lr} ldr r3, _080D6B24 @ =gUnknown_2022870 ldr r1, _080D6B28 @ =gUnknown_2022BC4 @@ -5015,10 +5015,10 @@ sub_80D6AF8: @ 80D6AF8 _080D6B24: .4byte gUnknown_2022870 _080D6B28: .4byte gUnknown_2022BC4 _080D6B2C: .4byte gUnknown_2023BC4 - thumb_func_end sub_80D6AF8 + thumb_func_end LinkPartnerHandlecmd38 - thumb_func_start sub_80D6B30 -sub_80D6B30: @ 80D6B30 + thumb_func_start LinkPartnerHandlecmd39 +LinkPartnerHandlecmd39: @ 80D6B30 push {lr} ldr r2, _080D6B44 @ =gUnknown_2022870 ldrb r1, [r2] @@ -5030,10 +5030,10 @@ sub_80D6B30: @ 80D6B30 bx r0 .align 2, 0 _080D6B44: .4byte gUnknown_2022870 - thumb_func_end sub_80D6B30 + thumb_func_end LinkPartnerHandlecmd39 - thumb_func_start sub_80D6B48 -sub_80D6B48: @ 80D6B48 + thumb_func_start LinkPartnerHandlecmd40 +LinkPartnerHandlecmd40: @ 80D6B48 push {lr} ldr r3, _080D6B6C @ =gUnknown_2022870 ldr r1, [r3] @@ -5052,10 +5052,10 @@ sub_80D6B48: @ 80D6B48 bx r0 .align 2, 0 _080D6B6C: .4byte gUnknown_2022870 - thumb_func_end sub_80D6B48 + thumb_func_end LinkPartnerHandlecmd40 - thumb_func_start sub_80D6B70 -sub_80D6B70: @ 80D6B70 + thumb_func_start LinkPartnerHandleHitAnimation +LinkPartnerHandleHitAnimation: @ 80D6B70 push {r4,lr} ldr r3, _080D6B98 @ =gUnknown_202063C ldr r2, _080D6B9C @ =gUnknown_2023D44 @@ -5107,7 +5107,7 @@ _080D6BCE: _080D6BD4: .4byte gUnknown_2024005 _080D6BD8: .4byte gUnknown_3004FE0 _080D6BDC: .4byte sub_80D4730 - thumb_func_end sub_80D6B70 + thumb_func_end LinkPartnerHandleHitAnimation thumb_func_start sub_80D6BE0 sub_80D6BE0: @ 80D6BE0 @@ -5117,8 +5117,8 @@ sub_80D6BE0: @ 80D6BE0 bx r0 thumb_func_end sub_80D6BE0 - thumb_func_start sub_80D6BEC -sub_80D6BEC: @ 80D6BEC + thumb_func_start LinkPartnerHandleEffectivenessSound +LinkPartnerHandleEffectivenessSound: @ 80D6BEC push {r4,lr} ldr r4, _080D6C28 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -5150,10 +5150,10 @@ _080D6C00: .align 2, 0 _080D6C28: .4byte gUnknown_2023BC4 _080D6C2C: .4byte gUnknown_2022BC4 - thumb_func_end sub_80D6BEC + thumb_func_end LinkPartnerHandleEffectivenessSound - thumb_func_start sub_80D6C30 -sub_80D6C30: @ 80D6C30 + thumb_func_start LinkPartnerHandlecmd44 +LinkPartnerHandlecmd44: @ 80D6C30 push {lr} ldr r2, _080D6C58 @ =gUnknown_2022BC4 ldr r0, _080D6C5C @ =gUnknown_2023BC4 @@ -5174,10 +5174,10 @@ sub_80D6C30: @ 80D6C30 .align 2, 0 _080D6C58: .4byte gUnknown_2022BC4 _080D6C5C: .4byte gUnknown_2023BC4 - thumb_func_end sub_80D6C30 + thumb_func_end LinkPartnerHandlecmd44 - thumb_func_start sub_80D6C60 -sub_80D6C60: @ 80D6C60 + thumb_func_start LinkPartnerHandleFaintingCry +LinkPartnerHandleFaintingCry: @ 80D6C60 push {lr} ldr r1, _080D6C94 @ =gUnknown_2023BCE ldr r0, _080D6C98 @ =gUnknown_2023BC4 @@ -5204,10 +5204,10 @@ sub_80D6C60: @ 80D6C60 _080D6C94: .4byte gUnknown_2023BCE _080D6C98: .4byte gUnknown_2023BC4 _080D6C9C: .4byte gUnknown_2024284 - thumb_func_end sub_80D6C60 + thumb_func_end LinkPartnerHandleFaintingCry - thumb_func_start sub_80D6CA0 -sub_80D6CA0: @ 80D6CA0 + thumb_func_start LinkPartnerHandleIntroSlide +LinkPartnerHandleIntroSlide: @ 80D6CA0 push {lr} ldr r1, _080D6CC8 @ =gUnknown_2022BC4 ldr r0, _080D6CCC @ =gUnknown_2023BC4 @@ -5229,7 +5229,7 @@ sub_80D6CA0: @ 80D6CA0 _080D6CC8: .4byte gUnknown_2022BC4 _080D6CCC: .4byte gUnknown_2023BC4 _080D6CD0: .4byte gUnknown_2023F4C - thumb_func_end sub_80D6CA0 + thumb_func_end LinkPartnerHandleIntroSlide thumb_func_start sub_80D6CD4 sub_80D6CD4: @ 80D6CD4 @@ -5771,8 +5771,8 @@ sub_80D7138: @ 80D7138 bx r0 thumb_func_end sub_80D7138 - thumb_func_start sub_80D7144 -sub_80D7144: @ 80D7144 + thumb_func_start LinkPartnerHandleSpriteInvisibility +LinkPartnerHandleSpriteInvisibility: @ 80D7144 push {r4,lr} ldr r4, _080D7194 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -5816,10 +5816,10 @@ _080D7194: .4byte gUnknown_2023BC4 _080D7198: .4byte gUnknown_202063C _080D719C: .4byte gUnknown_2023D44 _080D71A0: .4byte gUnknown_2022BC4 - thumb_func_end sub_80D7144 + thumb_func_end LinkPartnerHandleSpriteInvisibility - thumb_func_start sub_80D71A4 -sub_80D71A4: @ 80D71A4 + thumb_func_start LinkPartnerHandleBattleAnimation +LinkPartnerHandleBattleAnimation: @ 80D71A4 push {r4-r6,lr} sub sp, 0x4 ldr r6, _080D71E8 @ =gUnknown_2023BC4 @@ -5869,7 +5869,7 @@ _080D71FC: .align 2, 0 _080D7204: .4byte gUnknown_3004FE0 _080D7208: .4byte sub_80D4A90 - thumb_func_end sub_80D71A4 + thumb_func_end LinkPartnerHandleBattleAnimation thumb_func_start sub_80D720C sub_80D720C: @ 80D720C @@ -5887,8 +5887,8 @@ sub_80D7218: @ 80D7218 bx r0 thumb_func_end sub_80D7218 - thumb_func_start sub_80D7224 -sub_80D7224: @ 80D7224 + thumb_func_start LinkPartnerHandlecmd55 +LinkPartnerHandlecmd55: @ 80D7224 push {r4,lr} ldr r2, _080D725C @ =gUnknown_2023E8A ldr r1, _080D7260 @ =gUnknown_2022BC4 @@ -5919,7 +5919,7 @@ _080D7260: .4byte gUnknown_2022BC4 _080D7264: .4byte gUnknown_2023BC4 _080D7268: .4byte gUnknown_3004FE0 _080D726C: .4byte sub_802F6A8 - thumb_func_end sub_80D7224 + thumb_func_end LinkPartnerHandlecmd55 thumb_func_start nullsub_78 nullsub_78: @ 80D7270 diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 4a87edd6e..8e9448f63 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -2134,7 +2134,7 @@ _080E86B4: _080E86D8: .4byte gUnknown_2037AB8 _080E86DC: .4byte gUnknown_2023BC4 _080E86E0: - bl sub_8036530 + bl OpponentBufferExecCompleted _080E86E4: ldr r0, _080E86FC @ =gUnknown_2023E82 movs r1, 0 diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index c362a6298..d1a2573dd 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -60,7 +60,7 @@ _08035AD4: .4byte gUnknown_2023BC4 _08035AD8: .4byte gUnknown_2022BC4 _08035ADC: .4byte gUnknown_8250A34 _08035AE0: - bl sub_8036530 + bl OpponentBufferExecCompleted _08035AE4: pop {r0} bx r0 @@ -84,7 +84,7 @@ sub_8035AE8: @ 8035AE8 ldr r0, _08035B1C @ =nullsub_8 cmp r1, r0 bne _08035B0C - bl sub_8036530 + bl OpponentBufferExecCompleted _08035B0C: pop {r0} bx r0 @@ -113,7 +113,7 @@ sub_8035B20: @ 8035B20 ldr r0, _08035B54 @ =nullsub_8 cmp r1, r0 bne _08035B44 - bl sub_8036530 + bl OpponentBufferExecCompleted _08035B44: pop {r0} bx r0 @@ -177,7 +177,7 @@ sub_8035B58: @ 8035B58 lsls r0, 2 adds r0, r4 bl DestroySprite - bl sub_8036530 + bl OpponentBufferExecCompleted _08035BC8: pop {r4-r6} pop {r0} @@ -219,7 +219,7 @@ sub_8035BE8: @ 8035BE8 adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - bl sub_8036530 + bl OpponentBufferExecCompleted _08035C20: pop {r4} pop {r0} @@ -759,7 +759,7 @@ _0803605C: bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - bl sub_8036530 + bl OpponentBufferExecCompleted _08036094: pop {r4-r7} pop {r0} @@ -827,7 +827,7 @@ _08036114: .4byte gUnknown_2022B4C _08036118: .4byte gUnknown_3004FE0 _0803611C: .4byte sub_80E8570 _08036120: - bl sub_8036530 + bl OpponentBufferExecCompleted _08036124: pop {r4-r6} pop {r0} @@ -856,7 +856,7 @@ sub_803612C: @ 803612C adds r0, r3, r0 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_8036530 + bl OpponentBufferExecCompleted _0803615A: pop {r0} bx r0 @@ -908,7 +908,7 @@ sub_8036170: @ 8036170 adds r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_8036530 + bl OpponentBufferExecCompleted _080361CA: pop {r4-r6} pop {r0} @@ -929,7 +929,7 @@ sub_80361E4: @ 80361E4 lsls r0, 16 cmp r0, 0 bne _080361F6 - bl sub_8036530 + bl OpponentBufferExecCompleted _080361F6: pop {r0} bx r0 @@ -963,7 +963,7 @@ sub_80361FC: @ 80361FC strb r0, [r2] ldr r0, _08036244 @ =gUnknown_2024005 strb r3, [r0] - bl sub_8036530 + bl OpponentBufferExecCompleted b _08036272 .align 2, 0 _08036238: .4byte gUnknown_2023D44 @@ -1079,7 +1079,7 @@ sub_80362E8: @ 80362E8 movs r2, 0x80 lsls r2, 1 bl m4aMPlayVolumeControl - bl sub_8036530 + bl OpponentBufferExecCompleted _08036320: pop {r0} bx r0 @@ -1294,7 +1294,7 @@ sub_80364D0: @ 80364D0 ands r0, r1 cmp r0, 0 bne _080364F2 - bl sub_8036530 + bl OpponentBufferExecCompleted _080364F2: pop {r0} bx r0 @@ -1320,7 +1320,7 @@ sub_8036500: @ 8036500 ands r0, r1 cmp r0, 0 bne _08036522 - bl sub_8036530 + bl OpponentBufferExecCompleted _08036522: pop {r0} bx r0 @@ -1329,8 +1329,8 @@ _08036528: .4byte gUnknown_2024018 _0803652C: .4byte gUnknown_2023BC4 thumb_func_end sub_8036500 - thumb_func_start sub_8036530 -sub_8036530: @ 8036530 + thumb_func_start OpponentBufferExecCompleted +OpponentBufferExecCompleted: @ 8036530 ldr r1, _08036554 @ =gUnknown_3004FE0 ldr r2, _08036558 @ =gUnknown_2023BC4 ldrb r0, [r2] @@ -1354,10 +1354,10 @@ _08036558: .4byte gUnknown_2023BC4 _0803655C: .4byte sub_8035A98 _08036560: .4byte gUnknown_2023BC8 _08036564: .4byte gUnknown_825E45C - thumb_func_end sub_8036530 + thumb_func_end OpponentBufferExecCompleted - thumb_func_start sub_8036568 -sub_8036568: @ 8036568 + thumb_func_start OpponentHandleGetAttributes +OpponentHandleGetAttributes: @ 8036568 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 @@ -1407,12 +1407,12 @@ _080365C2: movs r0, 0x1 mov r2, sp bl EmitDataTransfer - bl sub_8036530 + bl OpponentBufferExecCompleted add sp, 0x100 pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8036568 + thumb_func_end OpponentHandleGetAttributes thumb_func_start sub_80365DC sub_80365DC: @ 80365DC @@ -2348,8 +2348,8 @@ _08036D72: _08036D84: .4byte gUnknown_202402C thumb_func_end sub_80365DC - thumb_func_start sub_8036D88 -sub_8036D88: @ 8036D88 + thumb_func_start OpponentHandlecmd1 +OpponentHandlecmd1: @ 8036D88 push {r4-r7,lr} sub sp, 0x58 ldr r2, _08036E00 @ =gUnknown_2023BCE @@ -2404,7 +2404,7 @@ _08036DDE: movs r0, 0x1 adds r2, r4, 0 bl EmitDataTransfer - bl sub_8036530 + bl OpponentBufferExecCompleted add sp, 0x58 pop {r4-r7} pop {r0} @@ -2414,10 +2414,10 @@ _08036E00: .4byte gUnknown_2023BCE _08036E04: .4byte gUnknown_2023BC4 _08036E08: .4byte gUnknown_2022BC4 _08036E0C: .4byte gUnknown_202402C - thumb_func_end sub_8036D88 + thumb_func_end OpponentHandlecmd1 - thumb_func_start sub_8036E10 -sub_8036E10: @ 8036E10 + thumb_func_start OpponentHandleSetAttributes +OpponentHandleSetAttributes: @ 8036E10 push {r4,r5,lr} ldr r1, _08036E34 @ =gUnknown_2022BC4 ldr r0, _08036E38 @ =gUnknown_2023BC4 @@ -2456,11 +2456,11 @@ _08036E52: cmp r5, 0x5 bls _08036E44 _08036E5E: - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_8036E10 + thumb_func_end OpponentHandleSetAttributes thumb_func_start sub_8036E68 sub_8036E68: @ 8036E68 @@ -3502,8 +3502,8 @@ _08037774: _08037784: .4byte gUnknown_202402C thumb_func_end sub_8036E68 - thumb_func_start sub_8037788 -sub_8037788: @ 8037788 + thumb_func_start OpponentHandlecmd3 +OpponentHandlecmd3: @ 8037788 push {r4-r7,lr} ldr r1, _080377EC @ =gUnknown_2023BCE ldr r7, _080377F0 @ =gUnknown_2023BC4 @@ -3550,7 +3550,7 @@ _080377BE: cmp r3, r0 bcc _080377BE _080377E0: - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r4-r7} pop {r0} bx r0 @@ -3559,7 +3559,7 @@ _080377EC: .4byte gUnknown_2023BCE _080377F0: .4byte gUnknown_2023BC4 _080377F4: .4byte gUnknown_2022BC4 _080377F8: .4byte gUnknown_202402C - thumb_func_end sub_8037788 + thumb_func_end OpponentHandlecmd3 thumb_func_start sub_80377FC sub_80377FC: @ 80377FC @@ -4049,7 +4049,7 @@ _08037BF4: adds r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_8036530 + bl OpponentBufferExecCompleted _08037C30: pop {r4-r6} pop {r0} @@ -4741,7 +4741,7 @@ _080381CC: .4byte sub_803612C thumb_func_start sub_80381D0 sub_80381D0: @ 80381D0 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80381D0 @@ -4749,7 +4749,7 @@ sub_80381D0: @ 80381D0 thumb_func_start sub_80381DC sub_80381DC: @ 80381DC push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80381DC @@ -4757,7 +4757,7 @@ sub_80381DC: @ 80381DC thumb_func_start sub_80381E8 sub_80381E8: @ 80381E8 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80381E8 @@ -4765,7 +4765,7 @@ sub_80381E8: @ 80381E8 thumb_func_start sub_80381F4 sub_80381F4: @ 80381F4 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80381F4 @@ -4881,7 +4881,7 @@ _08038212: lsrs r3, r0, 24 cmp r3, 0 beq _08038308 - bl sub_8036530 + bl OpponentBufferExecCompleted b _08038326 .align 2, 0 _080382E4: .4byte gUnknown_2023BC4 @@ -5099,7 +5099,7 @@ _08038470: lsls r0, 2 adds r0, r2 strb r4, [r0, 0x4] - bl sub_8036530 + bl OpponentBufferExecCompleted _080384AC: pop {r3-r5} mov r8, r3 @@ -5204,7 +5204,7 @@ _08038584: .4byte sub_80361E4 thumb_func_start sub_8038588 sub_8038588: @ 8038588 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038588 @@ -5213,7 +5213,7 @@ sub_8038588: @ 8038588 sub_8038594: @ 8038594 push {lr} bl sub_8039C84 - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038594 @@ -5221,7 +5221,7 @@ sub_8038594: @ 8038594 thumb_func_start sub_80385A4 sub_80385A4: @ 80385A4 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80385A4 @@ -5318,7 +5318,7 @@ _08038656: adds r2, r4, 0 bl EmitTwoReturnValues _08038668: - bl sub_8036530 + bl OpponentBufferExecCompleted b _08038712 .align 2, 0 _08038670: .4byte gUnknown_8250C04 @@ -5393,7 +5393,7 @@ _080386F8: movs r1, 0xA bl EmitTwoReturnValues _0803870E: - bl sub_8036530 + bl OpponentBufferExecCompleted _08038712: pop {r4-r6} pop {r0} @@ -5414,7 +5414,7 @@ sub_8038718: @ 8038718 ldrb r1, [r0] movs r0, 0x1 bl EmitOneReturnValue - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -5529,7 +5529,7 @@ _0803880A: movs r0, 0x1 movs r2, 0 bl EmitChosenMonReturnValue - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r4-r6} pop {r0} bx r0 @@ -5541,7 +5541,7 @@ _08038834: .4byte gUnknown_2023FE8 thumb_func_start sub_8038838 sub_8038838: @ 8038838 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038838 @@ -5657,7 +5657,7 @@ _08038930: .4byte sub_80360A0 thumb_func_start sub_8038934 sub_8038934: @ 8038934 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038934 @@ -5772,7 +5772,7 @@ _08038A1C: .4byte sub_80364D0 thumb_func_start sub_8038A20 sub_8038A20: @ 8038A20 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A20 @@ -5780,7 +5780,7 @@ sub_8038A20: @ 8038A20 thumb_func_start sub_8038A2C sub_8038A2C: @ 8038A2C push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A2C @@ -5788,7 +5788,7 @@ sub_8038A2C: @ 8038A2C thumb_func_start sub_8038A38 sub_8038A38: @ 8038A38 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A38 @@ -5796,7 +5796,7 @@ sub_8038A38: @ 8038A38 thumb_func_start sub_8038A44 sub_8038A44: @ 8038A44 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A44 @@ -5804,7 +5804,7 @@ sub_8038A44: @ 8038A44 thumb_func_start sub_8038A50 sub_8038A50: @ 8038A50 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A50 @@ -5812,7 +5812,7 @@ sub_8038A50: @ 8038A50 thumb_func_start sub_8038A5C sub_8038A5C: @ 8038A5C push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A5C @@ -5820,7 +5820,7 @@ sub_8038A5C: @ 8038A5C thumb_func_start sub_8038A68 sub_8038A68: @ 8038A68 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A68 @@ -5828,7 +5828,7 @@ sub_8038A68: @ 8038A68 thumb_func_start sub_8038A74 sub_8038A74: @ 8038A74 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A74 @@ -5836,13 +5836,13 @@ sub_8038A74: @ 8038A74 thumb_func_start sub_8038A80 sub_8038A80: @ 8038A80 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038A80 - thumb_func_start sub_8038A8C -sub_8038A8C: @ 8038A8C + thumb_func_start OpponentHandlecmd37 +OpponentHandlecmd37: @ 8038A8C push {lr} ldr r2, _08038AA4 @ =gUnknown_2022870 ldrb r1, [r2] @@ -5850,15 +5850,15 @@ sub_8038A8C: @ 8038A8C negs r0, r0 ands r0, r1 strb r0, [r2] - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08038AA4: .4byte gUnknown_2022870 - thumb_func_end sub_8038A8C + thumb_func_end OpponentHandlecmd37 - thumb_func_start sub_8038AA8 -sub_8038AA8: @ 8038AA8 + thumb_func_start OpponentHandlecmd38 +OpponentHandlecmd38: @ 8038AA8 push {lr} ldr r3, _08038AD4 @ =gUnknown_2022870 ldr r1, _08038AD8 @ =gUnknown_2022BC4 @@ -5876,32 +5876,32 @@ sub_8038AA8: @ 8038AA8 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08038AD4: .4byte gUnknown_2022870 _08038AD8: .4byte gUnknown_2022BC4 _08038ADC: .4byte gUnknown_2023BC4 - thumb_func_end sub_8038AA8 + thumb_func_end OpponentHandlecmd38 - thumb_func_start sub_8038AE0 -sub_8038AE0: @ 8038AE0 + thumb_func_start OpponentHandlecmd39 +OpponentHandlecmd39: @ 8038AE0 push {lr} ldr r2, _08038AF4 @ =gUnknown_2022870 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 strb r0, [r2] - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08038AF4: .4byte gUnknown_2022870 - thumb_func_end sub_8038AE0 + thumb_func_end OpponentHandlecmd39 - thumb_func_start sub_8038AF8 -sub_8038AF8: @ 8038AF8 + thumb_func_start OpponentHandlecmd40 +OpponentHandlecmd40: @ 8038AF8 push {lr} ldr r3, _08038B1C @ =gUnknown_2022870 ldr r1, [r3] @@ -5915,15 +5915,15 @@ sub_8038AF8: @ 8038AF8 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08038B1C: .4byte gUnknown_2022870 - thumb_func_end sub_8038AF8 + thumb_func_end OpponentHandlecmd40 - thumb_func_start sub_8038B20 -sub_8038B20: @ 8038B20 + thumb_func_start OpponentHandleHitAnimation +OpponentHandleHitAnimation: @ 8038B20 push {r4,lr} ldr r3, _08038B48 @ =gUnknown_202063C ldr r2, _08038B4C @ =gUnknown_2023D44 @@ -5940,7 +5940,7 @@ sub_8038B20: @ 8038B20 lsls r0, 29 cmp r0, 0 bge _08038B54 - bl sub_8036530 + bl OpponentBufferExecCompleted b _08038B7E .align 2, 0 _08038B48: .4byte gUnknown_202063C @@ -5975,18 +5975,18 @@ _08038B7E: _08038B84: .4byte gUnknown_2024005 _08038B88: .4byte gUnknown_3004FE0 _08038B8C: .4byte sub_80361FC - thumb_func_end sub_8038B20 + thumb_func_end OpponentHandleHitAnimation thumb_func_start sub_8038B90 sub_8038B90: @ 8038B90 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8038B90 - thumb_func_start sub_8038B9C -sub_8038B9C: @ 8038B9C + thumb_func_start OpponentHandleEffectivenessSound +OpponentHandleEffectivenessSound: @ 8038B9C push {r4,lr} ldr r4, _08038BD8 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -6011,17 +6011,17 @@ _08038BB0: lsls r1, r3, 24 asrs r1, 24 bl PlaySE12WithPanning - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 _08038BD8: .4byte gUnknown_2023BC4 _08038BDC: .4byte gUnknown_2022BC4 - thumb_func_end sub_8038B9C + thumb_func_end OpponentHandleEffectivenessSound - thumb_func_start sub_8038BE0 -sub_8038BE0: @ 8038BE0 + thumb_func_start OpponentHandlecmd44 +OpponentHandlecmd44: @ 8038BE0 push {lr} ldr r2, _08038C08 @ =gUnknown_2022BC4 ldr r0, _08038C0C @ =gUnknown_2023BC4 @@ -6036,16 +6036,16 @@ sub_8038BE0: @ 8038BE0 lsls r1, 8 orrs r0, r1 bl PlayFanfare - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08038C08: .4byte gUnknown_2022BC4 _08038C0C: .4byte gUnknown_2023BC4 - thumb_func_end sub_8038BE0 + thumb_func_end OpponentHandlecmd44 - thumb_func_start sub_8038C10 -sub_8038C10: @ 8038C10 + thumb_func_start OpponentHandleFaintingCry +OpponentHandleFaintingCry: @ 8038C10 push {lr} ldr r1, _08038C40 @ =gUnknown_2023BCE ldr r0, _08038C44 @ =gUnknown_2023BC4 @@ -6064,17 +6064,17 @@ sub_8038C10: @ 8038C10 movs r1, 0x19 movs r2, 0x5 bl PlayCry3 - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08038C40: .4byte gUnknown_2023BCE _08038C44: .4byte gUnknown_2023BC4 _08038C48: .4byte gUnknown_202402C - thumb_func_end sub_8038C10 + thumb_func_end OpponentHandleFaintingCry - thumb_func_start sub_8038C4C -sub_8038C4C: @ 8038C4C + thumb_func_start OpponentHandleIntroSlide +OpponentHandleIntroSlide: @ 8038C4C push {lr} ldr r1, _08038C74 @ =gUnknown_2022BC4 ldr r0, _08038C78 @ =gUnknown_2023BC4 @@ -6089,14 +6089,14 @@ sub_8038C4C: @ 8038C4C movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08038C74: .4byte gUnknown_2022BC4 _08038C78: .4byte gUnknown_2023BC4 _08038C7C: .4byte gUnknown_2023F4C - thumb_func_end sub_8038C4C + thumb_func_end OpponentHandleIntroSlide thumb_func_start sub_8038C80 sub_8038C80: @ 8038C80 @@ -6376,7 +6376,7 @@ sub_8038EA8: @ 8038EA8 lsls r0, 24 cmp r0, 0 bne _08038ED8 - bl sub_8036530 + bl OpponentBufferExecCompleted b _08038FA2 .align 2, 0 _08038ED0: .4byte gUnknown_2022BC4 @@ -6522,7 +6522,7 @@ sub_8038FBC: @ 8038FBC adds r0, r2 movs r1, 0 strb r1, [r0, 0x5] - bl sub_8036530 + bl OpponentBufferExecCompleted _08038FF4: pop {r4} pop {r0} @@ -6560,7 +6560,7 @@ sub_8039004: @ 8039004 ldr r1, _08039050 @ =sub_80491B0 str r1, [r0] _08039036: - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -6574,7 +6574,7 @@ _08039050: .4byte sub_80491B0 thumb_func_start sub_8039054 sub_8039054: @ 8039054 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8039054 @@ -6615,7 +6615,7 @@ sub_8039060: @ 8039060 ldrb r0, [r4] bl CopyBattleSpriteInvisibility _080390A6: - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -6657,7 +6657,7 @@ sub_80390C0: @ 80390C0 lsls r0, 24 cmp r0, 0 beq _0803910C - bl sub_8036530 + bl OpponentBufferExecCompleted b _08039118 .align 2, 0 _08039104: .4byte gUnknown_2023BC4 @@ -6682,7 +6682,7 @@ _08039124: .4byte sub_8036500 thumb_func_start sub_8039128 sub_8039128: @ 8039128 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8039128 @@ -6690,7 +6690,7 @@ sub_8039128: @ 8039128 thumb_func_start sub_8039134 sub_8039134: @ 8039134 push {lr} - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8039134 @@ -6718,7 +6718,7 @@ OpponentHandleCmd55: @ 8039140 ldr r0, [r2, 0x8] bl SetMainCallback2 _0803916A: - bl sub_8036530 + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index c484163bd..2473a2ad1 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -10,8 +10,8 @@ nullsub_13: @ 802E310 bx lr thumb_func_end nullsub_13 - thumb_func_start sub_802E314 -sub_802E314: @ 802E314 + thumb_func_start SetBankFuncToPlayerBufferRunCommand +SetBankFuncToPlayerBufferRunCommand: @ 802E314 ldr r1, _0802E32C @ =gUnknown_3004FE0 ldr r0, _0802E330 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -28,7 +28,7 @@ _0802E32C: .4byte gUnknown_3004FE0 _0802E330: .4byte gUnknown_2023BC4 _0802E334: .4byte PlayerBufferRunCommand _0802E338: .4byte gUnknown_2024005 - thumb_func_end sub_802E314 + thumb_func_end SetBankFuncToPlayerBufferRunCommand thumb_func_start PlayerBufferExecCompleted PlayerBufferExecCompleted: @ 802E33C @@ -4648,7 +4648,7 @@ MoveSelectionDisplayPpNumber: @ 80308CC adds r0, r6, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r1, 0xBA strb r1, [r0] adds r0, 0x1 @@ -4660,7 +4660,7 @@ MoveSelectionDisplayPpNumber: @ 80308CC ldrb r1, [r4] movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r6, 0 movs r1, 0x9 bl sub_80D87BC @@ -7561,8 +7561,8 @@ _08032158: .4byte gUnknown_2024024 _0803215C: .4byte nullsub_8 thumb_func_end sub_8031FF4 - thumb_func_start sub_8032160 -sub_8032160: @ 8032160 + thumb_func_start PlayerHandleReturnPokeToBall +PlayerHandleReturnPokeToBall: @ 8032160 push {r4-r6,lr} ldr r1, _08032194 @ =gUnknown_2022BC4 ldr r6, _08032198 @ =gUnknown_2023BC4 @@ -7626,7 +7626,7 @@ _080321DE: _080321E4: .4byte gUnknown_2023D44 _080321E8: .4byte gUnknown_202063C _080321EC: .4byte gUnknown_3004FF0 - thumb_func_end sub_8032160 + thumb_func_end PlayerHandleReturnPokeToBall thumb_func_start sub_80321F0 sub_80321F0: @ 80321F0 @@ -9848,8 +9848,8 @@ _080333CC: .4byte gUnknown_2023BC4 _080333D0: .4byte gUnknown_2022BC4 thumb_func_end PlayerHandlePlaySE - thumb_func_start sub_80333D4 -sub_80333D4: @ 80333D4 + thumb_func_start PlayerHandlecmd44 +PlayerHandlecmd44: @ 80333D4 push {lr} ldr r2, _080333FC @ =gUnknown_2022BC4 ldr r0, _08033400 @ =gUnknown_2023BC4 @@ -9870,7 +9870,7 @@ sub_80333D4: @ 80333D4 .align 2, 0 _080333FC: .4byte gUnknown_2022BC4 _08033400: .4byte gUnknown_2023BC4 - thumb_func_end sub_80333D4 + thumb_func_end PlayerHandlecmd44 thumb_func_start PlayerHandleFaintingCry PlayerHandleFaintingCry: @ 8033404 @@ -10513,8 +10513,8 @@ _08033944: .4byte gUnknown_2023D44 _08033948: .4byte gUnknown_2022BC4 thumb_func_end PlayerHandleSpriteInvisibility - thumb_func_start sub_803394C -sub_803394C: @ 803394C + thumb_func_start PlayerHandleBattleAnimation +PlayerHandleBattleAnimation: @ 803394C push {r4-r6,lr} sub sp, 0x4 ldr r6, _08033990 @ =gUnknown_2023BC4 @@ -10564,10 +10564,10 @@ _080339A4: .align 2, 0 _080339AC: .4byte gUnknown_3004FE0 _080339B0: .4byte CompleteOnFinishedBattleAnimation - thumb_func_end sub_803394C + thumb_func_end PlayerHandleBattleAnimation - thumb_func_start sub_80339B4 -sub_80339B4: @ 80339B4 + thumb_func_start PlayerHandleLinkStandbyMsg +PlayerHandleLinkStandbyMsg: @ 80339B4 push {r4,lr} ldr r1, _080339D4 @ =gUnknown_2022BC4 ldr r0, _080339D8 @ =gUnknown_2023BC4 @@ -10610,10 +10610,10 @@ _08033A04: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80339B4 + thumb_func_end PlayerHandleLinkStandbyMsg - thumb_func_start sub_8033A10 -sub_8033A10: @ 8033A10 + thumb_func_start PlayerHandleResetActionMoveSelection +PlayerHandleResetActionMoveSelection: @ 8033A10 push {r4,lr} ldr r1, _08033A30 @ =gUnknown_2022BC4 ldr r4, _08033A34 @ =gUnknown_2023BC4 @@ -10666,10 +10666,10 @@ _08033A68: bx r0 .align 2, 0 _08033A74: .4byte gUnknown_2023FFC - thumb_func_end sub_8033A10 + thumb_func_end PlayerHandleResetActionMoveSelection - thumb_func_start sub_8033A78 -sub_8033A78: @ 8033A78 + thumb_func_start PlayerHandlecmd55 +PlayerHandlecmd55: @ 8033A78 push {r4,lr} ldr r2, _08033AB0 @ =gUnknown_2023E8A ldr r1, _08033AB4 @ =gUnknown_2022BC4 @@ -10700,7 +10700,7 @@ _08033AB4: .4byte gUnknown_2022BC4 _08033AB8: .4byte gUnknown_2023BC4 _08033ABC: .4byte gUnknown_3004FE0 _08033AC0: .4byte sub_802F6A8 - thumb_func_end sub_8033A78 + thumb_func_end PlayerHandlecmd55 thumb_func_start nullsub_15 nullsub_15: @ 8033AC4 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index cf668a7b1..be5f15841 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -1269,8 +1269,8 @@ _080DDEAC: .4byte gUnknown_2023BC4 _080DDEB0: .4byte gUnknown_2022BC4 thumb_func_end SafariHandlePlaySE - thumb_func_start sub_80DDEB4 -sub_80DDEB4: @ 80DDEB4 + thumb_func_start SafariHandlecmd44 +SafariHandlecmd44: @ 80DDEB4 push {lr} ldr r2, _080DDEDC @ =gUnknown_2022BC4 ldr r0, _080DDEE0 @ =gUnknown_2023BC4 @@ -1291,7 +1291,7 @@ sub_80DDEB4: @ 80DDEB4 .align 2, 0 _080DDEDC: .4byte gUnknown_2022BC4 _080DDEE0: .4byte gUnknown_2023BC4 - thumb_func_end sub_80DDEB4 + thumb_func_end SafariHandlecmd44 thumb_func_start SafariHandleFaintingCry SafariHandleFaintingCry: @ 80DDEE4 diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 48d73c079..d3be81b30 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -213,7 +213,7 @@ _0800D3DC: .4byte gUnknown_3004FE0 _0800D3E0: .4byte sub_80E75B0 _0800D3E4: ldr r1, _0800D400 @ =gUnknown_3004FE0 - ldr r0, _0800D404 @ =sub_802E314 + ldr r0, _0800D404 @ =SetBankFuncToPlayerBufferRunCommand _0800D3E8: str r0, [r1] adds r2, r1, 0 @@ -229,7 +229,7 @@ _0800D3E8: b _0800D478 .align 2, 0 _0800D400: .4byte gUnknown_3004FE0 -_0800D404: .4byte sub_802E314 +_0800D404: .4byte SetBankFuncToPlayerBufferRunCommand _0800D408: .4byte gUnknown_2023BD6 _0800D40C: .4byte sub_8035A7C _0800D410: .4byte gUnknown_2023BCC @@ -265,7 +265,7 @@ _0800D450: .4byte sub_81560A4 _0800D454: .4byte gUnknown_2023BD6 _0800D458: ldr r2, _0800D480 @ =gUnknown_3004FE0 - ldr r0, _0800D484 @ =sub_802E314 + ldr r0, _0800D484 @ =SetBankFuncToPlayerBufferRunCommand str r0, [r2] ldr r1, _0800D488 @ =gUnknown_2023BD6 strb r3, [r1] @@ -288,7 +288,7 @@ _0800D478: bx r0 .align 2, 0 _0800D480: .4byte gUnknown_3004FE0 -_0800D484: .4byte sub_802E314 +_0800D484: .4byte SetBankFuncToPlayerBufferRunCommand _0800D488: .4byte gUnknown_2023BD6 _0800D48C: .4byte sub_8035A7C _0800D490: .4byte gUnknown_2023BCC @@ -316,7 +316,7 @@ sub_800D494: @ 800D494 ldr r0, _0800D4D8 @ =sub_80123C0 str r0, [r1] ldr r2, _0800D4DC @ =gUnknown_3004FE0 - ldr r0, _0800D4E0 @ =sub_802E314 + ldr r0, _0800D4E0 @ =SetBankFuncToPlayerBufferRunCommand str r0, [r2] ldr r1, _0800D4E4 @ =gUnknown_2023BD6 strb r3, [r1] @@ -331,13 +331,13 @@ _0800D4D0: .4byte gUnknown_2022B4C _0800D4D4: .4byte gUnknown_3004F84 _0800D4D8: .4byte sub_80123C0 _0800D4DC: .4byte gUnknown_3004FE0 -_0800D4E0: .4byte sub_802E314 +_0800D4E0: .4byte SetBankFuncToPlayerBufferRunCommand _0800D4E4: .4byte gUnknown_2023BD6 _0800D4E8: .4byte sub_803A668 _0800D4EC: .4byte gUnknown_2023BCC _0800D4F0: ldr r2, _0800D508 @ =gUnknown_3004FE0 - ldr r0, _0800D50C @ =sub_802E314 + ldr r0, _0800D50C @ =SetBankFuncToPlayerBufferRunCommand str r0, [r2, 0x4] ldr r1, _0800D510 @ =gUnknown_2023BD6 strb r4, [r1, 0x1] @@ -349,7 +349,7 @@ _0800D4F0: b _0800D752 .align 2, 0 _0800D508: .4byte gUnknown_3004FE0 -_0800D50C: .4byte sub_802E314 +_0800D50C: .4byte SetBankFuncToPlayerBufferRunCommand _0800D510: .4byte gUnknown_2023BD6 _0800D514: .4byte sub_803A668 _0800D518: .4byte gUnknown_2023BCC @@ -367,7 +367,7 @@ _0800D51C: ldr r0, _0800D558 @ =sub_80123C0 str r0, [r1] ldr r2, _0800D55C @ =gUnknown_3004FE0 - ldr r4, _0800D560 @ =sub_802E314 + ldr r4, _0800D560 @ =SetBankFuncToPlayerBufferRunCommand str r4, [r2] ldr r1, _0800D564 @ =gUnknown_2023BD6 movs r0, 0 @@ -386,12 +386,12 @@ _0800D51C: _0800D554: .4byte gUnknown_3004F84 _0800D558: .4byte sub_80123C0 _0800D55C: .4byte gUnknown_3004FE0 -_0800D560: .4byte sub_802E314 +_0800D560: .4byte SetBankFuncToPlayerBufferRunCommand _0800D564: .4byte gUnknown_2023BD6 _0800D568: .4byte sub_803A668 _0800D56C: ldr r2, _0800D590 @ =gUnknown_3004FE0 - ldr r0, _0800D594 @ =sub_802E314 + ldr r0, _0800D594 @ =SetBankFuncToPlayerBufferRunCommand str r0, [r2, 0x4] ldr r1, _0800D598 @ =gUnknown_2023BD6 strb r3, [r1, 0x1] @@ -410,7 +410,7 @@ _0800D588: b _0800D754 .align 2, 0 _0800D590: .4byte gUnknown_3004FE0 -_0800D594: .4byte sub_802E314 +_0800D594: .4byte SetBankFuncToPlayerBufferRunCommand _0800D598: .4byte gUnknown_2023BD6 _0800D59C: .4byte sub_803A668 _0800D5A0: .4byte gUnknown_2023BCC @@ -480,7 +480,7 @@ _0800D61A: lsls r1, 2 ldr r2, _0800D644 @ =gUnknown_3004FE0 adds r1, r2 - ldr r2, _0800D648 @ =sub_802E314 + ldr r2, _0800D648 @ =SetBankFuncToPlayerBufferRunCommand str r2, [r1] ldrh r1, [r3, 0x18] mov r12, r0 @@ -494,7 +494,7 @@ _0800D61A: .align 2, 0 _0800D640: .4byte gUnknown_202273C _0800D644: .4byte gUnknown_3004FE0 -_0800D648: .4byte sub_802E314 +_0800D648: .4byte SetBankFuncToPlayerBufferRunCommand _0800D64C: cmp r1, 0x3 bne _0800D740 @@ -1239,7 +1239,7 @@ _0800DBEE: .align 2, 0 _0800DBF0: .4byte gUnknown_3003F64 _0800DBF4: - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r2, r0, 24 ldr r0, _0800DC10 @ =gUnknown_2022B4C @@ -2426,8 +2426,8 @@ EmitChooseAction: @ 800E4D4 _0800E4FC: .4byte gUnknown_2022874 thumb_func_end EmitChooseAction - thumb_func_start sub_800E500 -sub_800E500: @ 800E500 + thumb_func_start Emitcmd19 +Emitcmd19: @ 800E500 push {lr} adds r3, r1, 0 lsls r0, 24 @@ -2442,7 +2442,7 @@ sub_800E500: @ 800E500 bx r0 .align 2, 0 _0800E51C: .4byte gUnknown_2022874 - thumb_func_end sub_800E500 + thumb_func_end Emitcmd19 thumb_func_start EmitChooseMove EmitChooseMove: @ 800E520 @@ -3132,8 +3132,8 @@ EmitPlaySE: @ 800E9C4 _0800E9EC: .4byte gUnknown_2022874 thumb_func_end EmitPlaySE - thumb_func_start sub_800E9F0 -sub_800E9F0: @ 800E9F0 + thumb_func_start Emitcmd44 +Emitcmd44: @ 800E9F0 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -3155,7 +3155,7 @@ sub_800E9F0: @ 800E9F0 bx r0 .align 2, 0 _0800EA18: .4byte gUnknown_2022874 - thumb_func_end sub_800E9F0 + thumb_func_end Emitcmd44 thumb_func_start EmitFaintingCry EmitFaintingCry: @ 800EA1C @@ -3335,8 +3335,8 @@ EmitBattleAnimation: @ 800EB28 _0800EB50: .4byte gUnknown_2022874 thumb_func_end EmitBattleAnimation - thumb_func_start sub_800EB54 -sub_800EB54: @ 800EB54 + thumb_func_start EmitLinkStandbyMsg +EmitLinkStandbyMsg: @ 800EB54 push {lr} adds r3, r1, 0 lsls r0, 24 @@ -3351,7 +3351,7 @@ sub_800EB54: @ 800EB54 bx r0 .align 2, 0 _0800EB70: .4byte gUnknown_2022874 - thumb_func_end sub_800EB54 + thumb_func_end EmitLinkStandbyMsg thumb_func_start EmitResetActionMoveSelection EmitResetActionMoveSelection: @ 800EB74 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 64162ce2d..1c7342735 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -1140,7 +1140,7 @@ UpdateLvlInHealthbox: @ 8048398 adds r1, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r1, r0, 0 subs r1, 0x2 mov r0, sp @@ -1243,7 +1243,7 @@ sub_8048440: @ 8048440 add r0, sp, 0x10 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN add r3, sp, 0x2C add r0, sp, 0x10 movs r1, 0 @@ -1267,7 +1267,7 @@ _080484BC: add r0, sp, 0x10 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r1, 0xBA strb r1, [r0] movs r1, 0xFF @@ -1365,7 +1365,7 @@ _0804858A: asrs r1, 16 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _08048608 @ =gUnknown_202401C ldr r0, [r0] movs r1, 0xBA @@ -1485,7 +1485,7 @@ _0804866A: asrs r1, 16 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r2, r8 cmp r2, 0 bne _08048698 @@ -1852,14 +1852,14 @@ _08048966: adds r0, 0x16 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r5] adds r0, 0x7B ldrb r1, [r0] ldr r0, [sp, 0x28] movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN add r0, sp, 0x10 movs r1, 0 strb r1, [r0, 0x5] @@ -4311,7 +4311,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 ldrb r1, [r1] movs r2, 0 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0 mov r1, sp movs r2, 0 diff --git a/asm/battle_message.s b/asm/battle_message.s index 19aa61d5a..04f11b70c 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2281,7 +2281,7 @@ _080D84D6: adds r0, r6, 0 mov r1, r8 movs r2, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r5, 0x3 ldrb r4, [r4, 0x1] adds r5, r0, r4 diff --git a/asm/battle_records.s b/asm/battle_records.s index b48dd4869..e8a2c4af4 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -531,8 +531,8 @@ sub_80CD638: @ 80CD638 bx r0 thumb_func_end sub_80CD638 - thumb_func_start sub_80CD690 -sub_80CD690: @ 80CD690 + thumb_func_start InitLinkBattleRecord +InitLinkBattleRecord: @ 80CD690 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -556,16 +556,16 @@ sub_80CD690: @ 80CD690 bx r0 .align 2, 0 _080CD6BC: .4byte 0x01000008 - thumb_func_end sub_80CD690 + thumb_func_end InitLinkBattleRecord - thumb_func_start sub_80CD6C0 -sub_80CD6C0: @ 80CD6C0 + thumb_func_start InitLinkBattleRecords_ +InitLinkBattleRecords_: @ 80CD6C0 push {r4,r5,lr} adds r4, r0, 0 movs r5, 0x4 _080CD6C6: adds r0, r4, 0 - bl sub_80CD690 + bl InitLinkBattleRecord adds r4, 0x10 subs r5, 0x1 cmp r5, 0 @@ -582,10 +582,10 @@ _080CD6C6: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80CD6C0 + thumb_func_end InitLinkBattleRecords_ - thumb_func_start sub_80CD6F4 -sub_80CD6F4: @ 80CD6F4 + thumb_func_start GetLinkBattleRecordTotalBattles +GetLinkBattleRecordTotalBattles: @ 80CD6F4 adds r1, r0, 0 ldrh r0, [r1, 0xA] ldrh r2, [r1, 0xC] @@ -593,7 +593,7 @@ sub_80CD6F4: @ 80CD6F4 ldrh r1, [r1, 0xE] adds r0, r1 bx lr - thumb_func_end sub_80CD6F4 + thumb_func_end GetLinkBattleRecordTotalBattles thumb_func_start sub_80CD704 sub_80CD704: @ 80CD704 @@ -627,8 +627,8 @@ _080CD732: bx r1 thumb_func_end sub_80CD704 - thumb_func_start sub_80CD738 -sub_80CD738: @ 80CD738 + thumb_func_start SortLinkBattleRecords +SortLinkBattleRecords: @ 80CD738 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -649,10 +649,10 @@ _080CD746: _080CD758: adds r0, r6, 0 str r2, [sp, 0x10] - bl sub_80CD6F4 + bl GetLinkBattleRecordTotalBattles adds r4, r0, 0 adds r0, r5, 0 - bl sub_80CD6F4 + bl GetLinkBattleRecordTotalBattles ldr r2, [sp, 0x10] cmp r4, r0 ble _080CD792 @@ -693,10 +693,10 @@ _080CD7A0: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_80CD738 + thumb_func_end SortLinkBattleRecords - thumb_func_start sub_80CD7B4 -sub_80CD7B4: @ 80CD7B4 + thumb_func_start UpdateLinkBattleRecord +UpdateLinkBattleRecord: @ 80CD7B4 push {lr} adds r2, r0, 0 cmp r1, 0x2 @@ -751,10 +751,10 @@ _080CD80E: bx r0 .align 2, 0 _080CD814: .4byte 0x0000270f - thumb_func_end sub_80CD7B4 + thumb_func_end UpdateLinkBattleRecord - thumb_func_start sub_80CD818 -sub_80CD818: @ 80CD818 + thumb_func_start UpdateLinkBattleGameStats +UpdateLinkBattleGameStats: @ 80CD818 push {r4,lr} cmp r0, 0x2 beq _080CD832 @@ -789,7 +789,7 @@ _080CD84A: bx r0 .align 2, 0 _080CD850: .4byte 0x0000270e - thumb_func_end sub_80CD818 + thumb_func_end UpdateLinkBattleGameStats thumb_func_start sub_80CD854 sub_80CD854: @ 80CD854 @@ -821,9 +821,9 @@ _080CD882: bl StringCopy _080CD88A: mov r0, r8 - bl sub_80CD818 + bl UpdateLinkBattleGameStats adds r0, r6, 0 - bl sub_80CD738 + bl SortLinkBattleRecords adds r0, r6, 0 mov r1, sp adds r2, r7, 0 @@ -835,7 +835,7 @@ _080CD88A: adds r4, r6, 0 adds r4, 0x40 adds r0, r4, 0 - bl sub_80CD690 + bl InitLinkBattleRecord adds r0, r4, 0 mov r1, sp movs r2, 0x7 @@ -845,9 +845,9 @@ _080CD8BE: lsls r0, r5, 4 adds r0, r6, r0 mov r1, r8 - bl sub_80CD7B4 + bl UpdateLinkBattleRecord adds r0, r6, 0 - bl sub_80CD738 + bl SortLinkBattleRecords add sp, 0x8 pop {r3} mov r8, r3 @@ -863,7 +863,7 @@ InitLinkBattleRecords: @ 80CD8DC ldr r0, [r0] ldr r1, _080CD8F4 @ =0x00000a98 adds r0, r1 - bl sub_80CD6C0 + bl InitLinkBattleRecords_ pop {r0} bx r0 .align 2, 0 @@ -1032,17 +1032,17 @@ _080CDA24: adds r1, r4, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _080CDAB8 @ =gUnknown_2021CF0 adds r1, r5, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _080CDABC @ =gUnknown_2021D04 adds r1, r6, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r3, 0 ldr r6, _080CDAC0 @ =gUnknown_83F6C84 ldr r7, _080CDAC4 @ =gUnknown_2021D18 @@ -1205,7 +1205,7 @@ _080CDB86: ldr r0, _080CDB94 @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN b _080CDBA6 .align 2, 0 _080CDB94: .4byte gUnknown_2021CD0 @@ -1215,7 +1215,7 @@ _080CDB98: ldr r0, _080CDBDC @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _080CDBA6: adds r2, r4, 0 mov r0, r9 diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index c32b29310..0a99b658b 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -3634,8 +3634,8 @@ _0801F438: .4byte gUnknown_2023D68 _0801F43C: .4byte gUnknown_2023D74 thumb_func_end atk08_adjustnormaldamage2 - thumb_func_start sub_801F440 -sub_801F440: @ 801F440 + thumb_func_start atk09_attackanimation +atk09_attackanimation: @ 801F440 push {r4-r6,lr} mov r6, r8 push {r6} @@ -3786,7 +3786,7 @@ _0801F572: .align 2, 0 _0801F580: .4byte gUnknown_2023D74 _0801F584: .4byte gUnknown_81D89F1 - thumb_func_end sub_801F440 + thumb_func_end atk09_attackanimation thumb_func_start sub_801F588 sub_801F588: @ 801F588 @@ -7723,8 +7723,8 @@ _08021592: bx r0 thumb_func_end atk19_tryfaintmon - thumb_func_start sub_80215A0 -sub_80215A0: @ 80215A0 + thumb_func_start atk1A_faint_animation +atk1A_faint_animation: @ 80215A0 push {r4,r5,lr} ldr r0, _080215D0 @ =gUnknown_2023BC8 ldr r0, [r0] @@ -7751,10 +7751,10 @@ _080215CA: _080215D0: .4byte gUnknown_2023BC8 _080215D4: .4byte gUnknown_2023D74 _080215D8: .4byte gUnknown_2023BC4 - thumb_func_end sub_80215A0 + thumb_func_end atk1A_faint_animation - thumb_func_start sub_80215DC -sub_80215DC: @ 80215DC + thumb_func_start atk1B_faint_effects_clear +atk1B_faint_effects_clear: @ 80215DC push {r4-r6,lr} sub sp, 0x4 ldr r0, _08021630 @ =gUnknown_2023BC8 @@ -7799,7 +7799,7 @@ _08021630: .4byte gUnknown_2023BC8 _08021634: .4byte gUnknown_2023D74 _08021638: .4byte gUnknown_2023BC4 _0802163C: .4byte gUnknown_2023BE4 - thumb_func_end sub_80215DC + thumb_func_end atk1B_faint_effects_clear thumb_func_start atk1C_jumpifstatus atk1C_jumpifstatus: @ 8021640 @@ -10709,8 +10709,8 @@ atk3C_return: @ 8022CC0 bx r0 thumb_func_end atk3C_return - thumb_func_start sub_8022CCC -sub_8022CCC: @ 8022CCC + thumb_func_start atk3D_end +atk3D_end: @ 8022CCC ldr r0, _08022CE0 @ =gUnknown_2023DCC movs r1, 0 strb r1, [r0] @@ -10724,7 +10724,7 @@ sub_8022CCC: @ 8022CCC _08022CE0: .4byte gUnknown_2023DCC _08022CE4: .4byte gUnknown_2023BC4 _08022CE8: .4byte gUnknown_2023BE3 - thumb_func_end sub_8022CCC + thumb_func_end atk3D_end thumb_func_start atk3E_end2 atk3E_end2: @ 8022CEC @@ -13700,7 +13700,7 @@ _08024446: str r0, [r7] movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution b _080244F6 @@ -13740,7 +13740,7 @@ _080244E4: .4byte gUnknown_2023ECC _080244E8: movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution _080244F6: @@ -13839,7 +13839,7 @@ _080245B8: .4byte gUnknown_2023FE8 _080245BC: movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution movs r0, 0x1 @@ -13928,7 +13928,7 @@ _08024674: bne _0802468C movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution _0802468C: @@ -14006,7 +14006,7 @@ _08024724: .4byte gUnknown_2023FE8 _08024728: movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution movs r0, 0x2 @@ -14097,7 +14097,7 @@ _080247E4: bne _080247FC movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution _080247FC: @@ -14136,7 +14136,7 @@ _0802483C: _08024840: movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldr r0, _08024880 @ =gUnknown_2023BC4 ldrb r0, [r0] bl MarkBufferBankForExecution @@ -14176,7 +14176,7 @@ _08024894: strb r0, [r1] movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldr r0, _080248B0 @ =gUnknown_2023BC4 ldrb r0, [r0] bl MarkBufferBankForExecution @@ -14556,7 +14556,7 @@ _08024BB0: beq _08024BC4 movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution _08024BC4: @@ -14603,7 +14603,7 @@ _08024BF0: _08024C20: movs r0, 0 movs r1, 0x2 - bl sub_800EB54 + bl EmitLinkStandbyMsg ldrb r0, [r4] bl MarkBufferBankForExecution _08024C2E: @@ -15188,8 +15188,8 @@ _080250D4: .4byte gUnknown_2023BCC _080250D8: .4byte gUnknown_2023D70 thumb_func_end sub_8024E38 - thumb_func_start sub_80250DC -sub_80250DC: @ 80250DC + thumb_func_start atk53_trainer_slide +atk53_trainer_slide: @ 80250DC push {lr} ldr r0, _080250EC @ =gUnknown_2023D74 ldr r0, [r0] @@ -15220,7 +15220,7 @@ _080250F2: .align 2, 0 _08025114: .4byte gUnknown_2023BC4 _08025118: .4byte gUnknown_2023D74 - thumb_func_end sub_80250DC + thumb_func_end atk53_trainer_slide thumb_func_start atk54_playse atk54_playse: @ 802511C @@ -15251,8 +15251,8 @@ _08025150: .4byte gUnknown_2023D6B _08025154: .4byte gUnknown_2023D74 thumb_func_end atk54_playse - thumb_func_start sub_8025158 -sub_8025158: @ 8025158 + thumb_func_start atk55_play_sound +atk55_play_sound: @ 8025158 push {r4,r5,lr} ldr r5, _08025188 @ =gUnknown_2023BC4 ldr r0, _0802518C @ =gUnknown_2023D6B @@ -15265,7 +15265,7 @@ sub_8025158: @ 8025158 lsls r0, 8 orrs r1, r0 movs r0, 0 - bl sub_800E9F0 + bl Emitcmd44 ldrb r0, [r5] bl MarkBufferBankForExecution ldr r0, [r4] @@ -15278,7 +15278,7 @@ sub_8025158: @ 8025158 _08025188: .4byte gUnknown_2023BC4 _0802518C: .4byte gUnknown_2023D6B _08025190: .4byte gUnknown_2023D74 - thumb_func_end sub_8025158 + thumb_func_end atk55_play_sound thumb_func_start atk56_playfaintcry atk56_playfaintcry: @ 8025194 @@ -17760,7 +17760,7 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524 mov r1, r8 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r6, r0, 0 movs r1, 0 movs r2, 0x5 @@ -25852,7 +25852,7 @@ _0802A57C: adds r1, r6, 0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN strb r5, [r4] movs r0, 0x1 strb r0, [r4, 0x1] diff --git a/asm/battle_setup.s b/asm/battle_setup.s index cce33ff4d..303c4ce77 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -166,7 +166,7 @@ sub_807F748: @ 807F748 ldr r1, _0807F788 @ =gUnknown_2022B4C movs r0, 0 str r0, [r1] - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -196,7 +196,7 @@ sub_807F78C: @ 807F78C movs r0, 0x80 lsls r0, 3 str r0, [r1] - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 ldr r1, _0807F7D4 @ =0x00000155 @@ -226,7 +226,7 @@ sub_807F7D8: @ 807F7D8 ldr r1, _0807F80C @ =gUnknown_2022B4C movs r0, 0x80 str r0, [r1] - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -252,7 +252,7 @@ sub_807F810: @ 807F810 movs r0, 0x80 lsls r0, 8 str r0, [r1] - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -329,7 +329,7 @@ sub_807F8C4: @ 807F8C4 movs r0, 0x80 lsls r0, 10 str r0, [r1] - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -388,7 +388,7 @@ _0807F958: lsls r0, 8 str r0, [r1] _0807F960: - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -421,7 +421,7 @@ sub_807F998: @ 807F998 movs r0, 0x80 lsls r0, 6 str r0, [r1] - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -596,7 +596,7 @@ sub_807FB08: @ 807FB08 str r0, [r1, 0x8] bl copy_player_party_to_sav1 bl sub_8159F40 - bl sub_807FF34 + bl GetWildBattleTransition lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -625,7 +625,7 @@ sub_807FB40: @ 807FB40 bl ResetOamRange ldr r0, _0807FB78 @ =gUnknown_2023E8A ldrb r0, [r0] - bl sub_80800D0 + bl IsPlayerDefeated cmp r0, 0x1 bne _0807FB80 ldr r0, _0807FB7C @ =c2_whiteout @@ -668,7 +668,7 @@ sub_807FBA0: @ 807FBA0 bl ResetOamRange ldr r0, _0807FBD8 @ =gUnknown_2023E8A ldrb r0, [r0] - bl sub_80800D0 + bl IsPlayerDefeated cmp r0, 0x1 bne _0807FBE0 ldr r0, _0807FBDC @ =c2_whiteout @@ -706,7 +706,7 @@ sub_807FBF0: @ 807FBF0 bl ResetOamRange ldr r4, _0807FC28 @ =gUnknown_2023E8A ldrb r0, [r4] - bl sub_80800D0 + bl IsPlayerDefeated adds r1, r0, 0 cmp r1, 0 beq _0807FC30 @@ -893,8 +893,8 @@ _0807FD88: bx r1 thumb_func_end sub_807FC5C - thumb_func_start sub_807FD90 -sub_807FD90: @ 807FD90 + thumb_func_start GetBattleTransitionTypeByMap +GetBattleTransitionTypeByMap: @ 807FD90 push {r4,lr} sub sp, 0x4 mov r4, sp @@ -943,10 +943,10 @@ _0807FDEA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807FD90 + thumb_func_end GetBattleTransitionTypeByMap - thumb_func_start sub_807FDF4 -sub_807FDF4: @ 807FDF4 + thumb_func_start GetSumOfPlayerPartyLevel +GetSumOfPlayerPartyLevel: @ 807FDF4 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -995,7 +995,7 @@ _0807FE48: bx r1 .align 2, 0 _0807FE50: .4byte gUnknown_2024284 - thumb_func_end sub_807FDF4 + thumb_func_end GetSumOfPlayerPartyLevel thumb_func_start reads_trainer_data_byte0 reads_trainer_data_byte0: @ 807FE54 @@ -1123,10 +1123,10 @@ _0807FF2C: bx r1 thumb_func_end reads_trainer_data_byte0 - thumb_func_start sub_807FF34 -sub_807FF34: @ 807FF34 + thumb_func_start GetWildBattleTransition +GetWildBattleTransition: @ 807FF34 push {r4,r5,lr} - bl sub_807FD90 + bl GetBattleTransitionTypeByMap lsls r0, 24 lsrs r5, r0, 24 ldr r0, _0807FF64 @ =gUnknown_202402C @@ -1136,7 +1136,7 @@ sub_807FF34: @ 807FF34 lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl sub_807FDF4 + bl GetSumOfPlayerPartyLevel lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -1159,7 +1159,7 @@ _0807FF70: bx r1 .align 2, 0 _0807FF7C: .4byte gUnknown_83C68F0 - thumb_func_end sub_807FF34 + thumb_func_end GetWildBattleTransition thumb_func_start sub_807FF80 sub_807FF80: @ 807FF80 @@ -1246,7 +1246,7 @@ _08080010: bne _0808001A movs r5, 0x2 _0808001A: - bl sub_807FD90 + bl GetBattleTransitionTypeByMap lsls r0, 24 lsrs r6, r0, 24 ldrh r0, [r4] @@ -1256,7 +1256,7 @@ _0808001A: lsls r4, 24 lsrs r4, 24 adds r0, r5, 0 - bl sub_807FDF4 + bl GetSumOfPlayerPartyLevel lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -1291,7 +1291,7 @@ sub_8080060: @ 8080060 lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl sub_807FDF4 + bl GetSumOfPlayerPartyLevel lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -1355,8 +1355,8 @@ trainerflag_opponent: @ 80800B8 _080800CC: .4byte gUnknown_20386AE thumb_func_end trainerflag_opponent - thumb_func_start sub_80800D0 -sub_80800D0: @ 80800D0 + thumb_func_start IsPlayerDefeated +IsPlayerDefeated: @ 80800D0 push {lr} subs r0, 0x1 cmp r0, 0x6 @@ -1385,7 +1385,7 @@ _08080108: _0808010A: pop {r1} bx r1 - thumb_func_end sub_80800D0 + thumb_func_end IsPlayerDefeated thumb_func_start sub_8080110 sub_8080110: @ 8080110 @@ -1642,8 +1642,8 @@ _0808032C: .4byte gUnknown_83C6900 _08080330: .4byte gUnknown_81A4EC1 thumb_func_end sub_8080228 - thumb_func_start sub_8080334 -sub_8080334: @ 8080334 + thumb_func_start TrainerWantsBattle +TrainerWantsBattle: @ 8080334 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -1671,7 +1671,7 @@ _08080368: .4byte gUnknown_3005074 _0808036C: .4byte gUnknown_20370D2 _08080370: .4byte gUnknown_2036E38 _08080374: .4byte gUnknown_81A4EB4 - thumb_func_end sub_8080334 + thumb_func_end TrainerWantsBattle thumb_func_start GetTrainerFlagFromScriptPointer GetTrainerFlagFromScriptPointer: @ 8080378 @@ -1735,8 +1735,8 @@ sub_80803D8: @ 80803D8 _080803E0: .4byte gUnknown_20386CC thumb_func_end sub_80803D8 - thumb_func_start sub_80803E4 -sub_80803E4: @ 80803E4 + thumb_func_start ScrSpecial_HasTrainerBeenFought +ScrSpecial_HasTrainerBeenFought: @ 80803E4 push {lr} bl trainerflag_opponent lsls r0, 16 @@ -1746,7 +1746,7 @@ sub_80803E4: @ 80803E4 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_80803E4 + thumb_func_end ScrSpecial_HasTrainerBeenFought thumb_func_start sub_80803FC sub_80803FC: @ 80803FC @@ -1855,7 +1855,7 @@ sub_80804AC: @ 80804AC bne _08080508 ldr r0, _080804DC @ =gUnknown_2023E8A ldrb r0, [r0] - bl sub_80800D0 + bl IsPlayerDefeated adds r1, r0, 0 cmp r1, 0x1 bne _080804E8 @@ -1902,7 +1902,7 @@ _08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080524: ldr r0, _08080538 @ =gUnknown_2023E8A ldrb r0, [r0] - bl sub_80800D0 + bl IsPlayerDefeated cmp r0, 0x1 bne _08080540 _08080530: @@ -1942,7 +1942,7 @@ _08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080578: ldr r0, _0808058C @ =gUnknown_2023E8A ldrb r0, [r0] - bl sub_80800D0 + bl IsPlayerDefeated cmp r0, 0x1 bne _08080594 ldr r0, _08080590 @ =c2_whiteout diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 06c544b26..b2735d96b 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2844,7 +2844,7 @@ _080E6F68: ble _080E6F68 ldr r0, [r6] adds r0, 0xB0 - bl sub_80E70F4 + bl SetBattleTowerRecordChecksum bl sub_80E6E48 pop {r4-r6} pop {r0} @@ -2970,7 +2970,7 @@ _080E7076: beq _080E7098 adds r0, r1, 0 adds r0, 0xB0 - bl sub_80E7118 + bl ClearBattleTowerRecord _080E7098: movs r4, 0 adds r7, r5, 0 @@ -3008,7 +3008,7 @@ _080E70B4: lsls r3, 1 adds r0, r1, r3 adds r0, r2, r0 - bl sub_80E7118 + bl ClearBattleTowerRecord _080E70E0: adds r4, r5, 0 cmp r4, 0x4 @@ -3022,8 +3022,8 @@ _080E70E0: _080E70F0: .4byte gUnknown_300500C thumb_func_end sub_80E7064 - thumb_func_start sub_80E70F4 -sub_80E70F4: @ 80E70F4 + thumb_func_start SetBattleTowerRecordChecksum +SetBattleTowerRecordChecksum: @ 80E70F4 push {r4,lr} adds r2, r0, 0 adds r2, 0xA0 @@ -3042,10 +3042,10 @@ _080E7102: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80E70F4 + thumb_func_end SetBattleTowerRecordChecksum - thumb_func_start sub_80E7118 -sub_80E7118: @ 80E7118 + thumb_func_start ClearBattleTowerRecord +ClearBattleTowerRecord: @ 80E7118 push {lr} movs r1, 0 movs r2, 0 @@ -3056,7 +3056,7 @@ _080E711E: bls _080E711E pop {r0} bx r0 - thumb_func_end sub_80E7118 + thumb_func_end ClearBattleTowerRecord thumb_func_start sub_80E712C sub_80E712C: @ 80E712C diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 1d8f0275e..8db717936 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -19,7 +19,7 @@ sub_80D08B8: @ 80D08B8 ldr r0, _080D08E4 @ =sub_80565A8 str r0, [r1, 0x4] adds r0, r4, 0 - bl sub_80D0948 + bl LaunchBattleTransitionTask pop {r4,r5} pop {r0} bx r0 @@ -34,7 +34,7 @@ sub_80D08E8: @ 80D08E8 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_80D0948 + bl LaunchBattleTransitionTask pop {r0} bx r0 thumb_func_end sub_80D08E8 @@ -78,8 +78,8 @@ _080D093C: _080D0944: .4byte gUnknown_2039A2C thumb_func_end sub_80D08F8 - thumb_func_start sub_80D0948 -sub_80D0948: @ 80D0948 + thumb_func_start LaunchBattleTransitionTask +LaunchBattleTransitionTask: @ 80D0948 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -101,7 +101,7 @@ sub_80D0948: @ 80D0948 .align 2, 0 _080D0970: .4byte sub_80D0978 _080D0974: .4byte gUnknown_3005090 - thumb_func_end sub_80D0948 + thumb_func_end LaunchBattleTransitionTask thumb_func_start sub_80D0978 sub_80D0978: @ 80D0978 @@ -133,8 +133,8 @@ _080D09A8: .4byte gUnknown_83FA3B0 _080D09AC: .4byte gUnknown_3005090 thumb_func_end sub_80D0978 - thumb_func_start sub_80D09B0 -sub_80D09B0: @ 80D09B0 + thumb_func_start Transition_Phase1 +Transition_Phase1: @ 80D09B0 push {r4,lr} adds r4, r0, 0 bl sub_807B05C @@ -170,10 +170,10 @@ _080D09FA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80D09B0 + thumb_func_end Transition_Phase1 - thumb_func_start sub_80D0A00 -sub_80D0A00: @ 80D0A00 + thumb_func_start Transition_WaitForPhase1 +Transition_WaitForPhase1: @ 80D0A00 push {r4,lr} adds r4, r0, 0 ldr r1, _080D0A20 @ =gUnknown_83FA320 @@ -200,10 +200,10 @@ _080D0A2C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80D0A00 + thumb_func_end Transition_WaitForPhase1 - thumb_func_start sub_80D0A34 -sub_80D0A34: @ 80D0A34 + thumb_func_start Transition_Phase2 +Transition_Phase2: @ 80D0A34 push {r4,lr} adds r4, r0, 0 ldr r1, _080D0A58 @ =gUnknown_83FA368 @@ -223,10 +223,10 @@ sub_80D0A34: @ 80D0A34 bx r1 .align 2, 0 _080D0A58: .4byte gUnknown_83FA368 - thumb_func_end sub_80D0A34 + thumb_func_end Transition_Phase2 - thumb_func_start sub_80D0A5C -sub_80D0A5C: @ 80D0A5C + thumb_func_start Transition_WaitForPhase2 +Transition_WaitForPhase2: @ 80D0A5C push {r4,lr} adds r4, r0, 0 movs r0, 0 @@ -251,10 +251,10 @@ _080D0A80: bx r1 .align 2, 0 _080D0A88: .4byte gUnknown_83FA368 - thumb_func_end sub_80D0A5C + thumb_func_end Transition_WaitForPhase2 - thumb_func_start sub_80D0A8C -sub_80D0A8C: @ 80D0A8C + thumb_func_start Phase1Task_TransitionAll +Phase1Task_TransitionAll: @ 80D0A8C push {r4,lr} sub sp, 0x4 lsls r0, 24 @@ -278,7 +278,7 @@ sub_80D0A8C: @ 80D0A8C movs r1, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_80D3C40 + bl CreatePhase1Task b _080D0AD4 .align 2, 0 _080D0AC0: .4byte gUnknown_3005090 @@ -294,7 +294,7 @@ _080D0AD4: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80D0A8C + thumb_func_end Phase1Task_TransitionAll thumb_func_start sub_80D0ADC sub_80D0ADC: @ 80D0ADC @@ -1465,8 +1465,8 @@ _080D13F8: .4byte gUnknown_83FA3F4 _080D13FC: .4byte gUnknown_3005090 thumb_func_end sub_80D13C8 - thumb_func_start sub_80D1400 -sub_80D1400: @ 80D1400 + thumb_func_start Phase2_Transition_PokeballsTrail_Func1 +Phase2_Transition_PokeballsTrail_Func1: @ 80D1400 push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -1499,10 +1499,10 @@ sub_80D1400: @ 80D1400 _080D1440: .4byte gUnknown_83F8D20 _080D1444: .4byte 0x05000200 _080D1448: .4byte gUnknown_83FA638 - thumb_func_end sub_80D1400 + thumb_func_end Phase2_Transition_PokeballsTrail_Func1 - thumb_func_start sub_80D144C -sub_80D144C: @ 80D144C + thumb_func_start Phase2_Transition_PokeballsTrail_Func2 +Phase2_Transition_PokeballsTrail_Func2: @ 80D144C push {r4-r7,lr} mov r7, r8 push {r7} @@ -1568,10 +1568,10 @@ _080D147A: _080D14CC: .4byte gUnknown_83FA400 _080D14D0: .4byte gUnknown_83FA404 _080D14D4: .4byte gUnknown_20386E0 - thumb_func_end sub_80D144C + thumb_func_end Phase2_Transition_PokeballsTrail_Func2 - thumb_func_start sub_80D14D8 -sub_80D14D8: @ 80D14D8 + thumb_func_start Phase2_Transition_PokeballsTrail_Func3 +Phase2_Transition_PokeballsTrail_Func3: @ 80D14D8 push {lr} movs r0, 0x2D bl FieldEffectActiveListContains @@ -1590,10 +1590,10 @@ _080D14F8: bx r1 .align 2, 0 _080D1500: .4byte sub_80D13C8 - thumb_func_end sub_80D14D8 + thumb_func_end Phase2_Transition_PokeballsTrail_Func3 - thumb_func_start sub_80D1504 -sub_80D1504: @ 80D1504 + thumb_func_start FldEff_Pokeball +FldEff_Pokeball: @ 80D1504 push {r4,r5,lr} ldr r0, _080D1560 @ =gUnknown_83FA5CC ldr r5, _080D1564 @ =gUnknown_20386E0 @@ -1642,7 +1642,7 @@ _080D1560: .4byte gUnknown_83FA5CC _080D1564: .4byte gUnknown_20386E0 _080D1568: .4byte gUnknown_202063C _080D156C: .4byte 0x0000ffff - thumb_func_end sub_80D1504 + thumb_func_end FldEff_Pokeball thumb_func_start sub_80D1570 sub_80D1570: @ 80D1570 @@ -3973,8 +3973,8 @@ _080D2760: .4byte 0x04000040 _080D2764: .4byte 0xa6400001 thumb_func_end sub_80D2698 - thumb_func_start sub_80D2768 -sub_80D2768: @ 80D2768 + thumb_func_start Phase2Task_Transition_Sydney +Phase2Task_Transition_Sydney: @ 80D2768 push {lr} lsls r0, 24 lsrs r0, 24 @@ -3985,15 +3985,15 @@ sub_80D2768: @ 80D2768 adds r1, r2 movs r2, 0 strh r2, [r1, 0x26] - bl sub_80D2808 + bl Phase2Task_MugShotTransition pop {r0} bx r0 .align 2, 0 _080D2784: .4byte gUnknown_3005090 - thumb_func_end sub_80D2768 + thumb_func_end Phase2Task_Transition_Sydney - thumb_func_start sub_80D2788 -sub_80D2788: @ 80D2788 + thumb_func_start Phase2Task_Transition_Phoebe +Phase2Task_Transition_Phoebe: @ 80D2788 push {lr} lsls r0, 24 lsrs r0, 24 @@ -4004,15 +4004,15 @@ sub_80D2788: @ 80D2788 adds r1, r2 movs r2, 0x1 strh r2, [r1, 0x26] - bl sub_80D2808 + bl Phase2Task_MugShotTransition pop {r0} bx r0 .align 2, 0 _080D27A4: .4byte gUnknown_3005090 - thumb_func_end sub_80D2788 + thumb_func_end Phase2Task_Transition_Phoebe - thumb_func_start sub_80D27A8 -sub_80D27A8: @ 80D27A8 + thumb_func_start Phase2Task_Transition_Glacia +Phase2Task_Transition_Glacia: @ 80D27A8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -4023,15 +4023,15 @@ sub_80D27A8: @ 80D27A8 adds r1, r2 movs r2, 0x2 strh r2, [r1, 0x26] - bl sub_80D2808 + bl Phase2Task_MugShotTransition pop {r0} bx r0 .align 2, 0 _080D27C4: .4byte gUnknown_3005090 - thumb_func_end sub_80D27A8 + thumb_func_end Phase2Task_Transition_Glacia - thumb_func_start sub_80D27C8 -sub_80D27C8: @ 80D27C8 + thumb_func_start Phase2Task_Transition_Drake +Phase2Task_Transition_Drake: @ 80D27C8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -4042,15 +4042,15 @@ sub_80D27C8: @ 80D27C8 adds r1, r2 movs r2, 0x3 strh r2, [r1, 0x26] - bl sub_80D2808 + bl Phase2Task_MugShotTransition pop {r0} bx r0 .align 2, 0 _080D27E4: .4byte gUnknown_3005090 - thumb_func_end sub_80D27C8 + thumb_func_end Phase2Task_Transition_Drake - thumb_func_start sub_80D27E8 -sub_80D27E8: @ 80D27E8 + thumb_func_start Phase2Task_Transition_Steven +Phase2Task_Transition_Steven: @ 80D27E8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -4061,15 +4061,15 @@ sub_80D27E8: @ 80D27E8 adds r1, r2 movs r2, 0x4 strh r2, [r1, 0x26] - bl sub_80D2808 + bl Phase2Task_MugShotTransition pop {r0} bx r0 .align 2, 0 _080D2804: .4byte gUnknown_3005090 - thumb_func_end sub_80D27E8 + thumb_func_end Phase2Task_Transition_Steven - thumb_func_start sub_80D2808 -sub_80D2808: @ 80D2808 + thumb_func_start Phase2Task_MugShotTransition +Phase2Task_MugShotTransition: @ 80D2808 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -4096,10 +4096,10 @@ _080D281A: .align 2, 0 _080D2838: .4byte gUnknown_83FA46C _080D283C: .4byte gUnknown_3005090 - thumb_func_end sub_80D2808 + thumb_func_end Phase2Task_MugShotTransition - thumb_func_start sub_80D2840 -sub_80D2840: @ 80D2840 + thumb_func_start Phase2_Mugshot_Func1 +Phase2_Mugshot_Func1: @ 80D2840 push {r4,lr} adds r4, r0, 0 bl sub_80D3DD0 @@ -4146,10 +4146,10 @@ _080D2898: .4byte gUnknown_2039A2C _080D289C: .4byte gUnknown_2038E80 _080D28A0: .4byte 0x0000f0f1 _080D28A4: .4byte sub_80D2D50 - thumb_func_end sub_80D2840 + thumb_func_end Phase2_Mugshot_Func1 - thumb_func_start sub_80D28A8 -sub_80D28A8: @ 80D28A8 + thumb_func_start Phase2_Mugshot_Func2 +Phase2_Mugshot_Func2: @ 80D28A8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -4237,7 +4237,7 @@ _080D2958: .4byte gUnknown_83FA740 _080D295C: .4byte gUnknown_83FA754 _080D2960: .4byte gUnknown_300500C _080D2964: .4byte sub_80D2E6C - thumb_func_end sub_80D28A8 + thumb_func_end Phase2_Mugshot_Func2 thumb_func_start sub_80D2968 sub_80D2968: @ 80D2968 @@ -4945,7 +4945,7 @@ sub_80D2EA4: @ 80D2EA4 ldr r5, _080D3004 @ =gUnknown_201C000 str r5, [sp] movs r3, 0 - bl sub_8083858 + bl CreateTrainerSprite lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -4961,7 +4961,7 @@ sub_80D2EA4: @ 80D2EA4 str r5, [sp] movs r2, 0x6A movs r3, 0 - bl sub_8083858 + bl CreateTrainerSprite lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x24] @@ -6165,8 +6165,8 @@ _080D3848: .4byte gUnknown_83FA514 _080D384C: .4byte gUnknown_3005090 thumb_func_end sub_80D3818 - thumb_func_start sub_80D3850 -sub_80D3850: @ 80D3850 + thumb_func_start Phase2_Transition_GridSquares_Func1 +Phase2_Transition_GridSquares_Func1: @ 80D3850 push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -6202,10 +6202,10 @@ sub_80D3850: @ 80D3850 _080D3898: .4byte gUnknown_83FA140 _080D389C: .4byte 0x01000400 _080D38A0: .4byte gUnknown_83FA638 - thumb_func_end sub_80D3850 + thumb_func_end Phase2_Transition_GridSquares_Func1 - thumb_func_start sub_80D38A4 -sub_80D38A4: @ 80D38A4 + thumb_func_start Phase2_Transition_GridSquares_Func2 +Phase2_Transition_GridSquares_Func2: @ 80D38A4 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -6248,10 +6248,10 @@ _080D38E6: bx r1 .align 2, 0 _080D38F8: .4byte gUnknown_83FA140 - thumb_func_end sub_80D38A4 + thumb_func_end Phase2_Transition_GridSquares_Func2 - thumb_func_start sub_80D38FC -sub_80D38FC: @ 80D38FC + thumb_func_start Phase2_Transition_GridSquares_Func3 +Phase2_Transition_GridSquares_Func3: @ 80D38FC push {lr} ldrh r1, [r0, 0xA] subs r1, 0x1 @@ -6271,7 +6271,7 @@ _080D391C: bx r1 .align 2, 0 _080D3924: .4byte sub_80D3818 - thumb_func_end sub_80D38FC + thumb_func_end Phase2_Transition_GridSquares_Func3 thumb_func_start sub_80D3928 sub_80D3928: @ 80D3928 @@ -6676,8 +6676,8 @@ _080D3C38: .4byte 0x04000040 _080D3C3C: .4byte 0xa2400001 thumb_func_end sub_80D3BA4 - thumb_func_start sub_80D3C40 -sub_80D3C40: @ 80D3C40 + thumb_func_start CreatePhase1Task +CreatePhase1Task: @ 80D3C40 push {r4-r6,lr} mov r6, r8 push {r6} @@ -6726,7 +6726,7 @@ sub_80D3C40: @ 80D3C40 .align 2, 0 _080D3C9C: .4byte sub_80D3CC4 _080D3CA0: .4byte gUnknown_3005090 - thumb_func_end sub_80D3C40 + thumb_func_end CreatePhase1Task thumb_func_start sub_80D3CA4 sub_80D3CA4: @ 80D3CA4 @@ -6778,8 +6778,8 @@ _080D3CF4: .4byte gUnknown_83FA588 _080D3CF8: .4byte gUnknown_3005090 thumb_func_end sub_80D3CC4 - thumb_func_start sub_80D3CFC -sub_80D3CFC: @ 80D3CFC + thumb_func_start Phase1_TransitionAll_Func1 +Phase1_TransitionAll_Func1: @ 80D3CFC push {r4,lr} adds r4, r0, 0 ldrh r1, [r4, 0x14] @@ -6828,10 +6828,10 @@ _080D3D4A: bx r1 .align 2, 0 _080D3D54: .4byte 0x00002d6b - thumb_func_end sub_80D3CFC + thumb_func_end Phase1_TransitionAll_Func1 - thumb_func_start sub_80D3D58 -sub_80D3D58: @ 80D3D58 + thumb_func_start Phase1_TransitionAll_Func2 +Phase1_TransitionAll_Func2: @ 80D3D58 push {r4,lr} adds r4, r0, 0 ldrh r1, [r4, 0x14] @@ -6891,7 +6891,7 @@ _080D3DC6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80D3D58 + thumb_func_end Phase1_TransitionAll_Func2 thumb_func_start sub_80D3DD0 sub_80D3DD0: @ 80D3DD0 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index c31a9d140..1157a427b 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -727,7 +727,7 @@ sub_813D31C: @ 813D31C adds r0, r6, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r4, 0 adds r1, r6, 0 bl StringAppend @@ -867,7 +867,7 @@ sub_813D430: @ 813D430 ldr r0, _0813D4A4 @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0813D4A8 @ =gUnknown_2021D18 ldr r1, _0813D4AC @ =gUnknown_84162B9 adds r0, r4, 0 @@ -1573,7 +1573,7 @@ sub_813D940: @ 813D940 movs r1, 0x1 movs r2, 0x2 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0813D9F4 @ =gUnknown_84162B9 mov r0, r9 bl StringExpandPlaceholders @@ -1629,7 +1629,7 @@ sub_813D9F8: @ 813D9F8 adds r1, r4, 0 movs r2, 0x2 adds r3, r5, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0813DA60 @ =gUnknown_2021D18 ldr r1, _0813DA64 @ =gUnknown_84162B9 adds r0, r4, 0 @@ -2255,7 +2255,7 @@ sub_813DF54: @ 813DF54 ldrsh r1, [r1, r2] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _0813DFBC @ =gUnknown_2021D18 ldr r1, _0813DFC0 @ =gUnknown_8416409 adds r0, r5, 0 @@ -2432,7 +2432,7 @@ sub_813E0DC: @ 813E0DC ldrsh r1, [r5, r2] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _0813E158 @ =gUnknown_2021D18 ldr r1, _0813E15C @ =gUnknown_84163F4 adds r0, r5, 0 @@ -2905,7 +2905,7 @@ sub_813E4E4: @ 813E4E4 adds r0, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0813E548 @ =gUnknown_2021D18 ldr r1, _0813E54C @ =gUnknown_8416936 adds r0, r4, 0 @@ -3001,7 +3001,7 @@ sub_813E5B8: @ 813E5B8 movs r1, 0x1 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r2, _0813E65C @ =gUnknown_2021D18 mov r8, r2 ldr r1, _0813E660 @ =gUnknown_84162B9 @@ -3204,7 +3204,7 @@ sub_813E768: @ 813E768 adds r0, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0813E7E4 @ =gUnknown_2021D18 ldr r1, _0813E7E8 @ =gUnknown_8416959 adds r0, r4, 0 diff --git a/asm/bike.s b/asm/bike.s index 4c6efb4c3..6760c843d 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -266,7 +266,7 @@ sub_80BD27C: @ 80BD27C push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_805C1F4 + bl PlayerFaceDirection pop {r0} bx r0 thumb_func_end sub_80BD27C @@ -293,7 +293,7 @@ sub_80BD28C: @ 80BD28C lsrs r4, r0, 4 _080BD2B2: adds r0, r4, 0 - bl sub_805C1F4 + bl PlayerFaceDirection pop {r4,r5} pop {r0} bx r0 @@ -351,7 +351,7 @@ _080BD322: cmp r0, 0x3 bls _080BD350 adds r0, r4, 0 - bl sub_805C1AC + bl PlayerOnBikeCollide b _080BD350 _080BD334: cmp r1, 0xE @@ -782,8 +782,8 @@ _080BD638: _080BD64C: .4byte gUnknown_2037078 thumb_func_end sub_80BD620 - thumb_func_start sub_80BD650 -sub_80BD650: @ 80BD650 + thumb_func_start Bike_UpdateBikeCounterSpeed +Bike_UpdateBikeCounterSpeed: @ 80BD650 lsls r0, 24 lsrs r0, 24 ldr r2, _080BD660 @ =gUnknown_2037078 @@ -794,7 +794,7 @@ sub_80BD650: @ 80BD650 bx lr .align 2, 0 _080BD660: .4byte gUnknown_2037078 - thumb_func_end sub_80BD650 + thumb_func_end Bike_UpdateBikeCounterSpeed thumb_func_start sub_80BD664 sub_80BD664: @ 80BD664 @@ -807,8 +807,8 @@ sub_80BD664: @ 80BD664 _080BD670: .4byte gUnknown_2037078 thumb_func_end sub_80BD664 - thumb_func_start sub_80BD674 -sub_80BD674: @ 80BD674 + thumb_func_start GetPlayerSpeed +GetPlayerSpeed: @ 80BD674 push {lr} sub sp, 0x8 ldr r1, _080BD69C @ =gUnknown_83E7D1C @@ -850,10 +850,10 @@ _080BD6BE: add sp, 0x8 pop {r1} bx r1 - thumb_func_end sub_80BD674 + thumb_func_end GetPlayerSpeed - thumb_func_start sub_80BD6C4 -sub_80BD6C4: @ 80BD6C4 + thumb_func_start Bike_HandleBumpySlopeJump +Bike_HandleBumpySlopeJump: @ 80BD6C4 push {r4,r5,lr} sub sp, 0x4 ldr r5, _080BD714 @ =gUnknown_2037078 @@ -892,6 +892,6 @@ _080BD70C: bx r0 .align 2, 0 _080BD714: .4byte gUnknown_2037078 - thumb_func_end sub_80BD6C4 + thumb_func_end Bike_HandleBumpySlopeJump .align 2, 0 @ Don't pad with nop. diff --git a/asm/cable_club.s b/asm/cable_club.s index 4c159c698..9322fb528 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -50,7 +50,7 @@ sub_808078C: @ 808078C ldr r0, _080807DC @ =gUnknown_2021CD0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 @@ -177,14 +177,14 @@ _08080890: b _080808B6 _08080894: ldr r4, _080808B0 @ =gUnknown_2021CD0 - bl sub_800AA38 + bl GetLinkPlayerCount_2 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x4 b _080808B6 .align 2, 0 @@ -202,7 +202,7 @@ sub_80808BC: @ 80808BC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_800B0A8 + bl HasLinkErrorOccurred lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -238,7 +238,7 @@ sub_80808F0: @ 80808F0 ands r0, r1 cmp r0, 0 beq _08080934 - bl sub_800B08C + bl IsLinkConnectionEstablished lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -272,12 +272,12 @@ sub_808093C: @ 808093C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_800B08C + bl IsLinkConnectionEstablished lsls r0, 24 cmp r0, 0 beq _08080952 movs r0, 0x1 - bl sub_800B09C + bl SetSuppressLinkErrorMessage _08080952: ldr r0, _08080964 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -316,7 +316,7 @@ sub_8080990: @ 8080990 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_800B054 + bl GetSioMultiSI lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -417,7 +417,7 @@ sub_8080A4C: @ 8080A4C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r5, r0, 24 adds r0, r4, 0 @@ -431,7 +431,7 @@ sub_8080A4C: @ 8080A4C cmp r5, 0x1 bls _08080AC0 movs r0, 0x1 - bl sub_800B09C + bl SetSuppressLinkErrorMessage ldr r1, _08080AA4 @ =gUnknown_3005090 lsls r0, r4, 2 adds r0, r4 @@ -526,7 +526,7 @@ sub_8080B20: @ 8080B20 mov r9, r0 mov r7, r8 add r7, r9 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r5, r0, 24 adds r0, r4, 0 @@ -563,7 +563,7 @@ sub_8080B20: @ 8080B20 adds r1, r5, 0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _08080BC0 @ =gUnknown_81BC50D bl ShowFieldAutoScrollMessage mov r0, r9 @@ -610,7 +610,7 @@ sub_8080BC8: @ 8080BC8 bne _08080C5C bl sub_800A944 adds r4, r0, 0 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -683,7 +683,7 @@ sub_8080C6C: @ 8080C6C lsrs r0, 24 cmp r0, 0x1 beq _08080CCE - bl sub_800AA38 + bl GetLinkPlayerCount_2 adds r4, r0, 0 bl sub_800A944 lsls r4, 24 @@ -772,7 +772,7 @@ _08080D44: .align 2, 0 _08080D50: .4byte sub_8080F78 _08080D54: - bl sub_800AA38 + bl GetLinkPlayerCount_2 ldr r4, _08080D7C @ =gUnknown_3005030 strb r0, [r4] bl GetMultiplayerId @@ -875,7 +875,7 @@ _08080E02: _08080E18: .4byte gUnknown_3005090 _08080E1C: .4byte sub_8080F78 _08080E20: - bl sub_800AA38 + bl GetLinkPlayerCount_2 ldr r4, _08080E58 @ =gUnknown_3005030 strb r0, [r4] bl GetMultiplayerId @@ -981,7 +981,7 @@ _08080EF8: cmp r5, r0 bcc _08080E9A movs r0, 0 - bl sub_800B09C + bl SetSuppressLinkErrorMessage bl ResetBlockReceivedFlags bl HideFieldMessageBox ldr r0, _08080F44 @ =gUnknown_20370D0 @@ -1400,7 +1400,7 @@ sub_808124C: @ 808124C lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1445,7 +1445,7 @@ sub_80812A0: @ 80812A0 lsrs r5, r0, 24 bl sub_800A944 adds r4, r0, 0 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -1476,7 +1476,7 @@ sub_80812D8: @ 80812D8 ldrb r0, [r0] cmp r0, 0x1 bne _08081300 - bl sub_800A1F0 + bl IsLinkPlayerDataExchangeComplete lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 189e420cd..14572b868 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -245,7 +245,7 @@ _080F5744: movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram - bl sub_80D972C + bl ClearSaveData _080F577A: ldr r1, [r5] ldrb r0, [r1] diff --git a/asm/coins.s b/asm/coins.s index ed30346d1..131a21ff7 100644 --- a/asm/coins.s +++ b/asm/coins.s @@ -137,7 +137,7 @@ sub_80D060C: @ 80D060C ldr r0, _080D0668 @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _080D066C @ =gUnknown_2021D18 mov r9, r0 ldr r1, _080D0670 @ =gUnknown_84162C4 @@ -219,7 +219,7 @@ sub_80D06D0: @ 80D06D0 ldr r0, _080D071C @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _080D0720 @ =gUnknown_2021D18 ldr r1, _080D0724 @ =gUnknown_84162C4 adds r0, r4, 0 diff --git a/asm/daycare.s b/asm/daycare.s index fa284cdb2..177c13035 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -534,7 +534,7 @@ GetNumLevelsGainedForDaycareMon: @ 80457B4 adds r1, r4, 0 movs r2, 0 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _080457E4 @ =gUnknown_2021CD0 adds r0, r5, 0 bl GetBoxMonNick @@ -565,7 +565,7 @@ GetDaycareCostForSelectedMon: @ 80457E8 adds r1, r4, 0 movs r2, 0 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -1395,7 +1395,7 @@ _08045E22: lsls r1, r5, 24 lsrs r1, 24 adds r0, r7, 0 - bl sub_8043C2C + bl CanMonLearnTMHM cmp r0, 0 beq _08045E5E ldrh r1, [r4] @@ -1969,8 +1969,8 @@ _080462A4: .4byte gUnknown_825F83E _080462A8: .4byte gUnknown_8254795 thumb_func_end SetInitialEggData - thumb_func_start sub_80462AC -sub_80462AC: @ 80462AC + thumb_func_start GiveEggFromDaycare +GiveEggFromDaycare: @ 80462AC push {lr} ldr r0, _080462C0 @ =gUnknown_3005008 ldr r0, [r0] @@ -1982,7 +1982,7 @@ sub_80462AC: @ 80462AC bx r0 .align 2, 0 _080462C0: .4byte gUnknown_3005008 - thumb_func_end sub_80462AC + thumb_func_end GiveEggFromDaycare thumb_func_start sub_80462C4 sub_80462C4: @ 80462C4 @@ -2757,7 +2757,7 @@ _08046842: mov r0, sp movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r4, 0 mov r1, sp bl StringAppend @@ -2898,7 +2898,7 @@ DaycarePrintMonLvl: @ 8046944 adds r0, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r0, sp adds r1, r4, 0 bl StringAppend diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 2cde1b211..4a0b4ea45 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -412,7 +412,7 @@ _08046F1C: adds r2, r4, 0 bl sub_800ECC4 adds r0, r5, 0 - bl sub_8044148 + bl GetMonSpritePalStruct bl LoadCompressedObjectPalette mov r0, r9 strh r4, [r0] @@ -422,7 +422,7 @@ _08046F64: .4byte gUnknown_82350AC _08046F68: .4byte gUnknown_202401C _08046F6C: adds r0, r5, 0 - bl sub_8044148 + bl GetMonSpritePalStruct ldrh r0, [r0, 0x4] adds r1, r4, 0 bl sub_803F7D4 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 95be13d7b..932258c6f 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -78,7 +78,7 @@ _0806C910: cmp r6, 0 bne _0806C9D0 _0806C914: - bl sub_80BD674 + bl GetPlayerSpeed lsls r0, 16 asrs r0, 16 cmp r0, 0x4 @@ -3108,8 +3108,8 @@ GetFieldObjectScriptPointerForComparison: @ 806E050 bx r1 thumb_func_end GetFieldObjectScriptPointerForComparison - thumb_func_start sub_806E08C -sub_806E08C: @ 806E08C + thumb_func_start SetCableClubWarp +SetCableClubWarp: @ 806E08C push {r4,lr} sub sp, 0x8 bl player_get_direction_upper_nybble @@ -3139,6 +3139,6 @@ sub_806E08C: @ 806E08C bx r1 .align 2, 0 _0806E0CC: .4byte gUnknown_2036DFC - thumb_func_end sub_806E08C + thumb_func_end SetCableClubWarp .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_door.s b/asm/field_door.s index cec25c04f..0e5cc9b6f 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -321,13 +321,13 @@ _0805B140: bx r1 thumb_func_end task_overworld_door_add_if_inactive - thumb_func_start sub_805B14C -sub_805B14C: @ 805B14C + thumb_func_start DrawClosedDoor +DrawClosedDoor: @ 805B14C push {lr} bl sub_805AF54 pop {r0} bx r0 - thumb_func_end sub_805B14C + thumb_func_end DrawClosedDoor thumb_func_start sub_805B158 sub_805B158: @ 805B158 @@ -525,7 +525,7 @@ sub_805B29C: @ 805B29C ldr r0, _0805B2CC @ =gUnknown_835B5D8 adds r1, r4, 0 adds r2, r5, 0 - bl sub_805B14C + bl DrawClosedDoor _0805B2C6: pop {r4,r5} pop {r0} diff --git a/asm/field_effect.s b/asm/field_effect.s index 7505b9b54..f7ae6897b 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -581,8 +581,8 @@ _08083854: bx r1 thumb_func_end FieldEffectActiveListContains - thumb_func_start sub_8083858 -sub_8083858: @ 8083858 + thumb_func_start CreateTrainerSprite +CreateTrainerSprite: @ 8083858 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -655,10 +655,10 @@ _080838E8: .4byte gUnknown_83CBE50 _080838EC: .4byte gUnknown_8231CF0 _080838F0: .4byte gUnknown_8231CFC _080838F4: .4byte nullsub_8 - thumb_func_end sub_8083858 + thumb_func_end CreateTrainerSprite - thumb_func_start sub_80838F8 -sub_80838F8: @ 80838F8 + thumb_func_start LoadTrainerGfx_TrainerCard +LoadTrainerGfx_TrainerCard: @ 80838F8 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -683,7 +683,7 @@ sub_80838F8: @ 80838F8 .align 2, 0 _08083928: .4byte gUnknown_823957C _0808392C: .4byte gUnknown_8239A1C - thumb_func_end sub_80838F8 + thumb_func_end LoadTrainerGfx_TrainerCard thumb_func_start AddNewGameBirchObject AddNewGameBirchObject: @ 8083930 @@ -860,8 +860,8 @@ _08083A7A: bx r0 thumb_func_end sub_8083A5C - thumb_func_start sub_8083A88 -sub_8083A88: @ 8083A88 + thumb_func_start MultiplyInvertedPaletteRGBComponents +MultiplyInvertedPaletteRGBComponents: @ 8083A88 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -930,10 +930,10 @@ sub_8083A88: @ 8083A88 .align 2, 0 _08083B0C: .4byte gUnknown_20371F8 _08083B10: .4byte gUnknown_20375F8 - thumb_func_end sub_8083A88 + thumb_func_end MultiplyInvertedPaletteRGBComponents - thumb_func_start sub_8083B14 -sub_8083B14: @ 8083B14 + thumb_func_start MultiplyPaletteRGBComponents +MultiplyPaletteRGBComponents: @ 8083B14 push {r4-r6,lr} mov r6, r8 push {r6} @@ -992,7 +992,7 @@ sub_8083B14: @ 8083B14 .align 2, 0 _08083B84: .4byte gUnknown_20371F8 _08083B88: .4byte gUnknown_20375F8 - thumb_func_end sub_8083B14 + thumb_func_end MultiplyPaletteRGBComponents thumb_func_start sub_8083B8C sub_8083B8C: @ 8083B8C @@ -1054,8 +1054,8 @@ _08083BF8: .4byte gUnknown_3005090 _08083BFC: .4byte gUnknown_83CBFD0 thumb_func_end sub_8083BD0 - thumb_func_start sub_8083C00 -sub_8083C00: @ 8083C00 + thumb_func_start PokecenterHealEffect_0 +PokecenterHealEffect_0: @ 8083C00 push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x8] @@ -1076,17 +1076,17 @@ sub_8083C00: @ 8083C00 ldrsh r0, [r4, r1] movs r2, 0x12 ldrsh r1, [r4, r2] - bl sub_8084200 + bl PokecenterHealEffectHelper lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x16] pop {r4} pop {r0} bx r0 - thumb_func_end sub_8083C00 + thumb_func_end PokecenterHealEffect_0 - thumb_func_start sub_8083C3C -sub_8083C3C: @ 8083C3C + thumb_func_start PokecenterHealEffect_1 +PokecenterHealEffect_1: @ 8083C3C push {r4,lr} adds r2, r0, 0 ldr r3, _08083C74 @ =gUnknown_202063C @@ -1118,7 +1118,7 @@ _08083C6E: bx r0 .align 2, 0 _08083C74: .4byte gUnknown_202063C - thumb_func_end sub_8083C3C + thumb_func_end PokecenterHealEffect_1 thumb_func_start sub_8083C78 sub_8083C78: @ 8083C78 @@ -1145,8 +1145,8 @@ _08083C98: _08083C9C: .4byte gUnknown_202063C thumb_func_end sub_8083C78 - thumb_func_start sub_8083CA0 -sub_8083CA0: @ 8083CA0 + thumb_func_start PokecenterHealEffect_3 +PokecenterHealEffect_3: @ 8083CA0 push {lr} ldr r2, _08083CD8 @ =gUnknown_202063C movs r3, 0x14 @@ -1174,7 +1174,7 @@ _08083CD2: .align 2, 0 _08083CD8: .4byte gUnknown_202063C _08083CDC: .4byte sub_8083BD0 - thumb_func_end sub_8083CA0 + thumb_func_end PokecenterHealEffect_3 thumb_func_start sub_8083CE0 sub_8083CE0: @ 8083CE0 @@ -1232,8 +1232,8 @@ _08083D44: .4byte gUnknown_3005090 _08083D48: .4byte gUnknown_83CBFE0 thumb_func_end sub_8083D1C - thumb_func_start sub_8083D4C -sub_8083D4C: @ 8083D4C + thumb_func_start HallOfFameRecordEffect_0 +HallOfFameRecordEffect_0: @ 8083D4C push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x8] @@ -1253,7 +1253,7 @@ sub_8083D4C: @ 8083D4C pop {r4} pop {r0} bx r0 - thumb_func_end sub_8083D4C + thumb_func_end HallOfFameRecordEffect_0 thumb_func_start sub_8083D74 sub_8083D74: @ 8083D74 @@ -1406,8 +1406,8 @@ sub_8083E70: @ 8083E70 _08083E88: .4byte gUnknown_83CBFF0 thumb_func_end sub_8083E70 - thumb_func_start sub_8083E8C -sub_8083E8C: @ 8083E8C + thumb_func_start PokeballGlowEffect_0 +PokeballGlowEffect_0: @ 8083E8C push {r4,lr} adds r4, r0, 0 ldrh r1, [r4, 0x30] @@ -1483,10 +1483,10 @@ _08083F12: _08083F18: .4byte gUnknown_83CBF88 _08083F1C: .4byte gUnknown_83CC010 _08083F20: .4byte gUnknown_202063C - thumb_func_end sub_8083E8C + thumb_func_end PokeballGlowEffect_0 - thumb_func_start sub_8083F24 -sub_8083F24: @ 8083F24 + thumb_func_start PokeballGlowEffect_1 +PokeballGlowEffect_1: @ 8083F24 push {lr} adds r1, r0, 0 ldrh r0, [r1, 0x30] @@ -1513,10 +1513,10 @@ sub_8083F24: @ 8083F24 _08083F54: pop {r0} bx r0 - thumb_func_end sub_8083F24 + thumb_func_end PokeballGlowEffect_1 - thumb_func_start sub_8083F58 -sub_8083F58: @ 8083F58 + thumb_func_start PokeballGlowEffect_2 +PokeballGlowEffect_2: @ 8083F58 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1568,7 +1568,7 @@ _08083F88: mov r9, r3 add r4, r9 ldrb r3, [r4] - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents ldrh r4, [r7, 0x32] adds r4, 0x2 mov r0, r8 @@ -1587,7 +1587,7 @@ _08083F88: ldrb r2, [r2] add r4, r9 ldrb r3, [r4] - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents ldrh r4, [r7, 0x32] adds r4, 0x1 mov r3, r8 @@ -1606,7 +1606,7 @@ _08083F88: ldrb r2, [r2] add r4, r9 ldrb r3, [r4] - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents ldrh r4, [r7, 0x32] lsls r4, 24 lsrs r4, 24 @@ -1626,7 +1626,7 @@ _08083F88: adds r1, r6, 0 adds r2, r5, 0 adds r3, r4, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents mov r0, r10 bl IndexOfSpritePaletteTag lsls r0, 24 @@ -1637,7 +1637,7 @@ _08083F88: adds r1, r6, 0 adds r2, r5, 0 adds r3, r4, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents movs r3, 0x34 ldrsh r0, [r7, r3] cmp r0, 0x2 @@ -1664,10 +1664,10 @@ _08084088: .4byte gUnknown_83CC02C _0808408C: .4byte gUnknown_83CC030 _08084090: .4byte 0x01050000 _08084094: .4byte 0x01030000 - thumb_func_end sub_8083F58 + thumb_func_end PokeballGlowEffect_2 - thumb_func_start sub_8084098 -sub_8084098: @ 8084098 + thumb_func_start PokeballGlowEffect_3 +PokeballGlowEffect_3: @ 8084098 push {r4-r6,lr} mov r6, r8 push {r6} @@ -1717,7 +1717,7 @@ _080840C8: adds r1, r6, 0 adds r2, r5, 0 adds r3, r4, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents mov r0, r8 bl IndexOfSpritePaletteTag lsls r0, 24 @@ -1729,7 +1729,7 @@ _080840C8: adds r1, r6, 0 adds r2, r5, 0 adds r3, r4, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents mov r0, r8 bl IndexOfSpritePaletteTag lsls r0, 24 @@ -1741,7 +1741,7 @@ _080840C8: adds r1, r6, 0 adds r2, r5, 0 adds r3, r4, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents mov r0, r8 bl IndexOfSpritePaletteTag lsls r0, 24 @@ -1752,7 +1752,7 @@ _080840C8: adds r1, r6, 0 adds r2, r5, 0 adds r3, r4, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents mov r0, r8 bl IndexOfSpritePaletteTag lsls r0, 24 @@ -1763,7 +1763,7 @@ _080840C8: adds r1, r6, 0 adds r2, r5, 0 adds r3, r4, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents pop {r3} mov r8, r3 pop {r4-r6} @@ -1776,10 +1776,10 @@ _0808417C: .4byte gUnknown_83CC02C _08084180: .4byte gUnknown_83CC030 _08084184: .4byte 0x01050000 _08084188: .4byte 0x01030000 - thumb_func_end sub_8084098 + thumb_func_end PokeballGlowEffect_3 - thumb_func_start sub_808418C -sub_808418C: @ 808418C + thumb_func_start PokeballGlowEffect_4 +PokeballGlowEffect_4: @ 808418C push {lr} adds r1, r0, 0 ldrh r0, [r1, 0x30] @@ -1794,18 +1794,18 @@ sub_808418C: @ 808418C _080841A2: pop {r0} bx r0 - thumb_func_end sub_808418C + thumb_func_end PokeballGlowEffect_4 - thumb_func_start sub_80841A8 -sub_80841A8: @ 80841A8 + thumb_func_start PokeballGlowEffect_5 +PokeballGlowEffect_5: @ 80841A8 ldrh r1, [r0, 0x2E] adds r1, 0x1 strh r1, [r0, 0x2E] bx lr - thumb_func_end sub_80841A8 + thumb_func_end PokeballGlowEffect_5 - thumb_func_start sub_80841B0 -sub_80841B0: @ 80841B0 + thumb_func_start PokeballGlowEffect_6 +PokeballGlowEffect_6: @ 80841B0 push {r4,lr} adds r4, r0, 0 movs r1, 0x38 @@ -1824,15 +1824,15 @@ _080841CC: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80841B0 + thumb_func_end PokeballGlowEffect_6 thumb_func_start nullsub_50 nullsub_50: @ 80841D4 bx lr thumb_func_end nullsub_50 - thumb_func_start sub_80841D8 -sub_80841D8: @ 80841D8 + thumb_func_start SpriteCB_PokeballGlow +SpriteCB_PokeballGlow: @ 80841D8 push {lr} adds r3, r0, 0 ldr r2, _080841FC @ =gUnknown_202063C @@ -1853,10 +1853,10 @@ _080841F8: bx r0 .align 2, 0 _080841FC: .4byte gUnknown_202063C - thumb_func_end sub_80841D8 + thumb_func_end SpriteCB_PokeballGlow - thumb_func_start sub_8084200 -sub_8084200: @ 8084200 + thumb_func_start PokecenterHealEffectHelper +PokecenterHealEffectHelper: @ 8084200 push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -1892,7 +1892,7 @@ sub_8084200: @ 8084200 .align 2, 0 _08084244: .4byte gUnknown_83CBFA0 _08084248: .4byte gUnknown_202063C - thumb_func_end sub_8084200 + thumb_func_end PokecenterHealEffectHelper thumb_func_start sub_808424C sub_808424C: @ 808424C @@ -3428,8 +3428,8 @@ _08084E1E: bx r1 thumb_func_end sub_8084DCC - thumb_func_start sub_8084E24 -sub_8084E24: @ 8084E24 + thumb_func_start FldEff_UseDive +FldEff_UseDive: @ 8084E24 push {r4,lr} ldr r4, _08084E54 @ =sub_8084E60 adds r0, r4, 0 @@ -3456,7 +3456,7 @@ sub_8084E24: @ 8084E24 _08084E54: .4byte sub_8084E60 _08084E58: .4byte gUnknown_3005090 _08084E5C: .4byte gUnknown_20386E0 - thumb_func_end sub_8084E24 + thumb_func_end FldEff_UseDive thumb_func_start sub_8084E60 sub_8084E60: @ 8084E60 @@ -4107,8 +4107,8 @@ _08085344: .4byte gUnknown_2037078 _08085348: .4byte sub_80851E8 thumb_func_end sub_8085314 - thumb_func_start sub_808534C -sub_808534C: @ 808534C + thumb_func_start FldEff_LavaridgeGymWarp +FldEff_LavaridgeGymWarp: @ 808534C push {r4,lr} ldr r4, _080853A4 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -4154,7 +4154,7 @@ sub_808534C: @ 808534C _080853A4: .4byte gUnknown_20386E0 _080853A8: .4byte gUnknown_83A0010 _080853AC: .4byte gUnknown_202063C - thumb_func_end sub_808534C + thumb_func_end FldEff_LavaridgeGymWarp thumb_func_start sub_80853B0 sub_80853B0: @ 80853B0 @@ -4411,8 +4411,8 @@ _08085598: .4byte sub_805671C _0808559C: .4byte sub_80853E4 thumb_func_end sub_808554C - thumb_func_start sub_80855A0 -sub_80855A0: @ 80855A0 + thumb_func_start FldEff_PopOutOfAsh +FldEff_PopOutOfAsh: @ 80855A0 push {r4,lr} ldr r4, _080855F8 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -4458,7 +4458,7 @@ sub_80855A0: @ 80855A0 _080855F8: .4byte gUnknown_20386E0 _080855FC: .4byte gUnknown_83A0010 _08085600: .4byte gUnknown_202063C - thumb_func_end sub_80855A0 + thumb_func_end FldEff_PopOutOfAsh thumb_func_start sub_8085604 sub_8085604: @ 8085604 @@ -5410,7 +5410,7 @@ sub_8085D34: @ 8085D34 ldr r0, _08085D78 @ =sub_805671C bl SetMainCallback2 ldr r1, _08085D7C @ =gUnknown_3005020 - ldr r0, _08085D80 @ =sub_8085D88 + ldr r0, _08085D80 @ =mapldr_08085D88 str r0, [r1] ldr r0, _08085D84 @ =sub_8085B78 bl FindTaskIdByFunc @@ -5424,12 +5424,12 @@ _08085D70: _08085D74: .4byte gUnknown_2037AB8 _08085D78: .4byte sub_805671C _08085D7C: .4byte gUnknown_3005020 -_08085D80: .4byte sub_8085D88 +_08085D80: .4byte mapldr_08085D88 _08085D84: .4byte sub_8085B78 thumb_func_end sub_8085D34 - thumb_func_start sub_8085D88 -sub_8085D88: @ 8085D88 + thumb_func_start mapldr_08085D88 +mapldr_08085D88: @ 8085D88 push {lr} bl sub_8055DC4 bl pal_fill_for_maplights @@ -5461,7 +5461,7 @@ _08085DCC: .4byte gUnknown_3005020 _08085DD0: .4byte gUnknown_2036E38 _08085DD4: .4byte gUnknown_2037078 _08085DD8: .4byte sub_8085DDC - thumb_func_end sub_8085D88 + thumb_func_end mapldr_08085D88 thumb_func_start sub_8085DDC sub_8085DDC: @ 8085DDC @@ -5755,8 +5755,8 @@ _08086020: .4byte gUnknown_2036E38 _08086024: .4byte sub_8085DDC thumb_func_end sub_8085F9C - thumb_func_start sub_8086028 -sub_8086028: @ 8086028 + thumb_func_start FldEff_FieldMoveShowMon +FldEff_FieldMoveShowMon: @ 8086028 push {r4,lr} bl sav1_map_get_light_level lsls r0, 24 @@ -5798,10 +5798,10 @@ _0808604A: _08086078: .4byte sub_8086468 _0808607C: .4byte gUnknown_20386E0 _08086080: .4byte gUnknown_3005090 - thumb_func_end sub_8086028 + thumb_func_end FldEff_FieldMoveShowMon - thumb_func_start sub_8086084 -sub_8086084: @ 8086084 + thumb_func_start FldEff_FieldMoveShowMonInit +FldEff_FieldMoveShowMonInit: @ 8086084 push {r4-r6,lr} ldr r5, _080860D8 @ =gUnknown_20386E0 ldr r0, [r5] @@ -5841,7 +5841,7 @@ sub_8086084: @ 8086084 .align 2, 0 _080860D8: .4byte gUnknown_20386E0 _080860DC: .4byte gUnknown_2024284 - thumb_func_end sub_8086084 + thumb_func_end FldEff_FieldMoveShowMonInit thumb_func_start sub_80860E0 sub_80860E0: @ 80860E0 @@ -7537,8 +7537,8 @@ _08086E06: _08086E0C: .4byte gUnknown_202063C thumb_func_end sub_8086D94 - thumb_func_start sub_8086E10 -sub_8086E10: @ 8086E10 + thumb_func_start FldEff_UseFly +FldEff_UseFly: @ 8086E10 push {lr} ldr r0, _08086E34 @ =sub_8086E40 movs r1, 0xFE @@ -7560,7 +7560,7 @@ sub_8086E10: @ 8086E10 _08086E34: .4byte sub_8086E40 _08086E38: .4byte gUnknown_3005090 _08086E3C: .4byte gUnknown_20386E0 - thumb_func_end sub_8086E10 + thumb_func_end FldEff_UseFly thumb_func_start sub_8086E40 sub_8086E40: @ 8086E40 @@ -8383,8 +8383,8 @@ _0808747C: .4byte gUnknown_202063C _08087480: .4byte sub_8087364 thumb_func_end sub_8087458 - thumb_func_start sub_8087484 -sub_8087484: @ 8087484 + thumb_func_start FldEff_FlyIn +FldEff_FlyIn: @ 8087484 push {lr} ldr r0, _08087494 @ =sub_8087498 movs r1, 0xFE @@ -8394,7 +8394,7 @@ sub_8087484: @ 8087484 bx r1 .align 2, 0 _08087494: .4byte sub_8087498 - thumb_func_end sub_8087484 + thumb_func_end FldEff_FlyIn thumb_func_start sub_8087498 sub_8087498: @ 8087498 @@ -8761,8 +8761,8 @@ _08087774: _0808777C: .4byte gUnknown_202063C thumb_func_end sub_8087748 - thumb_func_start sub_8087780 -sub_8087780: @ 8087780 + thumb_func_start fishE +fishE: @ 8087780 push {r4-r7,lr} adds r5, r0, 0 ldrh r0, [r5, 0xA] @@ -8818,7 +8818,7 @@ _080877EA: _080877F0: .4byte gUnknown_2037078 _080877F4: .4byte gUnknown_2036E38 _080877F8: .4byte sub_8087498 - thumb_func_end sub_8087780 + thumb_func_end fishE thumb_func_start sub_80877FC sub_80877FC: @ 80877FC diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 86dd3d38a..c70033cc8 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -105,7 +105,7 @@ _080DAE3C: .4byte gUnknown_8231CFC sub_80DAE40: @ 80DAE40 push {lr} ldrb r0, [r0, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldrh r0, [r0, 0xA] subs r0, 0x2 lsls r0, 16 @@ -127,7 +127,7 @@ npc_pal_op: @ 80DAE54 movs r0, 0 strh r0, [r4, 0x32] ldrb r0, [r5, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldrb r1, [r0, 0xC] movs r0, 0x80 ands r0, r1 @@ -176,7 +176,7 @@ npc_pal_op_B: @ 80DAEC4 lsls r1, 24 lsrs r4, r1, 24 ldrb r0, [r0, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r2, r0, 0 ldrh r1, [r2, 0x4] ldr r0, _080DAEF0 @ =0x000011ff @@ -222,7 +222,7 @@ npc_pal_op_A: @ 80DAF20 lsls r1, 24 lsrs r4, r1, 24 ldrb r0, [r0, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r2, r0, 0 ldrh r1, [r2, 0x4] ldr r0, _080DAF4C @ =0x000011ff @@ -593,7 +593,7 @@ oei_shadow: @ 80DB1DC lsls r1, 2 adds r1, r2 ldrb r0, [r1, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r4, r0, 0 ldr r2, _080DB270 @ =gUnknown_83A0010 ldr r1, _080DB274 @ =gUnknown_83FECD2 @@ -969,8 +969,8 @@ _080DB4E4: _080DB4F0: .4byte gUnknown_2036E38 thumb_func_end unc_grass_normal - thumb_func_start sub_80DB4F4 -sub_80DB4F4: @ 80DB4F4 + thumb_func_start FldEff_JumpTallGrass +FldEff_JumpTallGrass: @ 80DB4F4 push {r4,lr} ldr r4, _080DB558 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -1024,7 +1024,7 @@ _080DB550: _080DB558: .4byte gUnknown_20386E0 _080DB55C: .4byte gUnknown_83A0010 _080DB560: .4byte gUnknown_202063C - thumb_func_end sub_80DB4F4 + thumb_func_end FldEff_JumpTallGrass thumb_func_start sub_80DB564 sub_80DB564: @ 80DB564 @@ -1103,8 +1103,8 @@ _080DB5E8: bx r1 thumb_func_end sub_80DB564 - thumb_func_start sub_80DB5F4 -sub_80DB5F4: @ 80DB5F4 + thumb_func_start FldEff_LongGrass +FldEff_LongGrass: @ 80DB5F4 push {r4,r5,lr} sub sp, 0x4 ldr r5, _080DB690 @ =gUnknown_20386E0 @@ -1183,7 +1183,7 @@ _080DB684: _080DB690: .4byte gUnknown_20386E0 _080DB694: .4byte gUnknown_83A0010 _080DB698: .4byte gUnknown_202063C - thumb_func_end sub_80DB5F4 + thumb_func_end FldEff_LongGrass thumb_func_start unc_grass_tall unc_grass_tall: @ 80DB69C @@ -1312,8 +1312,8 @@ _080DB786: _080DB794: .4byte gUnknown_2036E38 thumb_func_end unc_grass_tall - thumb_func_start sub_80DB798 -sub_80DB798: @ 80DB798 + thumb_func_start FldEff_JumpLongGrass +FldEff_JumpLongGrass: @ 80DB798 push {r4,lr} ldr r4, _080DB7FC @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -1367,7 +1367,7 @@ _080DB7F4: _080DB7FC: .4byte gUnknown_20386E0 _080DB800: .4byte gUnknown_83A0010 _080DB804: .4byte gUnknown_202063C - thumb_func_end sub_80DB798 + thumb_func_end FldEff_JumpLongGrass thumb_func_start sub_80DB808 sub_80DB808: @ 80DB808 @@ -1492,7 +1492,7 @@ _080DB8EA: _080DB8F4: .4byte gUnknown_2036E38 _080DB8F8: ldrb r0, [r1, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo mov r8, r0 mov r0, sp ldrb r1, [r0] @@ -1576,8 +1576,8 @@ _080DB98E: _080DB99C: .4byte gUnknown_202063C thumb_func_end sub_80DB8AC - thumb_func_start sub_80DB9A0 -sub_80DB9A0: @ 80DB9A0 + thumb_func_start FldEff_SandFootprints +FldEff_SandFootprints: @ 80DB9A0 push {r4,lr} ldr r4, _080DBA08 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -1631,10 +1631,10 @@ _080DB9FE: _080DBA08: .4byte gUnknown_20386E0 _080DBA0C: .4byte gUnknown_83A0010 _080DBA10: .4byte gUnknown_202063C - thumb_func_end sub_80DB9A0 + thumb_func_end FldEff_SandFootprints - thumb_func_start sub_80DBA14 -sub_80DBA14: @ 80DBA14 + thumb_func_start FldEff_DeepSandFootprints +FldEff_DeepSandFootprints: @ 80DBA14 push {r4,r5,lr} ldr r4, _080DBA7C @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -1689,10 +1689,10 @@ _080DBA74: _080DBA7C: .4byte gUnknown_20386E0 _080DBA80: .4byte gUnknown_83A0010 _080DBA84: .4byte gUnknown_202063C - thumb_func_end sub_80DBA14 + thumb_func_end FldEff_DeepSandFootprints - thumb_func_start sub_80DBA88 -sub_80DBA88: @ 80DBA88 + thumb_func_start FldEff_BikeTireTracks +FldEff_BikeTireTracks: @ 80DBA88 push {r4,r5,lr} ldr r4, _080DBAF0 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -1747,7 +1747,7 @@ _080DBAE8: _080DBAF0: .4byte gUnknown_20386E0 _080DBAF4: .4byte gUnknown_83A0010 _080DBAF8: .4byte gUnknown_202063C - thumb_func_end sub_80DBA88 + thumb_func_end FldEff_BikeTireTracks thumb_func_start sub_80DBAFC sub_80DBAFC: @ 80DBAFC @@ -1826,8 +1826,8 @@ _080DBB80: bx r0 thumb_func_end sub_80DBB3C - thumb_func_start sub_80DBB88 -sub_80DBB88: @ 80DBB88 + thumb_func_start FldEff_Splash +FldEff_Splash: @ 80DBB88 push {r4-r6,lr} ldr r6, _080DBC1C @ =gUnknown_20386E0 ldrb r0, [r6] @@ -1852,7 +1852,7 @@ sub_80DBB88: @ 80DBB88 cmp r4, 0x40 beq _080DBC12 ldrb r0, [r5, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -1903,7 +1903,7 @@ _080DBC1C: .4byte gUnknown_20386E0 _080DBC20: .4byte gUnknown_2036E38 _080DBC24: .4byte gUnknown_83A0010 _080DBC28: .4byte gUnknown_202063C - thumb_func_end sub_80DBB88 + thumb_func_end FldEff_Splash thumb_func_start sub_80DBC2C sub_80DBC2C: @ 80DBC2C @@ -1977,8 +1977,8 @@ _080DBCB0: .4byte gUnknown_202063C _080DBCB4: .4byte gUnknown_2036E38 thumb_func_end sub_80DBC2C - thumb_func_start sub_80DBCB8 -sub_80DBCB8: @ 80DBCB8 + thumb_func_start FldEff_JumpSmallSplash +FldEff_JumpSmallSplash: @ 80DBCB8 push {r4,lr} ldr r4, _080DBD1C @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -2032,7 +2032,7 @@ _080DBD14: _080DBD1C: .4byte gUnknown_20386E0 _080DBD20: .4byte gUnknown_83A0010 _080DBD24: .4byte gUnknown_202063C - thumb_func_end sub_80DBCB8 + thumb_func_end FldEff_JumpSmallSplash thumb_func_start oei_water_drop_tall oei_water_drop_tall: @ 80DBD28 @@ -2091,8 +2091,8 @@ _080DBD90: .4byte gUnknown_83A0010 _080DBD94: .4byte gUnknown_202063C thumb_func_end oei_water_drop_tall - thumb_func_start sub_80DBD98 -sub_80DBD98: @ 80DBD98 + thumb_func_start FldEff_FeetInFlowingWater +FldEff_FeetInFlowingWater: @ 80DBD98 push {r4-r7,lr} ldr r7, _080DBE38 @ =gUnknown_20386E0 ldrb r0, [r7] @@ -2117,7 +2117,7 @@ sub_80DBD98: @ 80DBD98 cmp r5, 0x40 beq _080DBE2E ldrb r0, [r6, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r4, r0, 0 lsls r0, r5, 4 adds r0, r5 @@ -2176,7 +2176,7 @@ _080DBE40: .4byte gUnknown_83A0010 _080DBE44: .4byte gUnknown_202063C _080DBE48: .4byte sub_80DBE50 _080DBE4C: .4byte 0x0000ffff - thumb_func_end sub_80DBD98 + thumb_func_end FldEff_FeetInFlowingWater thumb_func_start sub_80DBE50 sub_80DBE50: @ 80DBE50 @@ -2431,7 +2431,7 @@ _080DC02E: _080DC038: .4byte gUnknown_2036E38 _080DC03C: ldrb r0, [r1, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, 3 @@ -2471,8 +2471,8 @@ _080DC080: _080DC088: .4byte gUnknown_202063C thumb_func_end sub_80DBFF4 - thumb_func_start sub_80DC08C -sub_80DC08C: @ 80DC08C + thumb_func_start FldEff_Unknown19 +FldEff_Unknown19: @ 80DC08C push {r4,lr} ldr r4, _080DC0EC @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -2524,10 +2524,10 @@ _080DC0E4: _080DC0EC: .4byte gUnknown_20386E0 _080DC0F0: .4byte gUnknown_83A0010 _080DC0F4: .4byte gUnknown_202063C - thumb_func_end sub_80DC08C + thumb_func_end FldEff_Unknown19 - thumb_func_start sub_80DC0F8 -sub_80DC0F8: @ 80DC0F8 + thumb_func_start FldEff_Unknown20 +FldEff_Unknown20: @ 80DC0F8 push {r4,lr} ldr r4, _080DC158 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -2579,10 +2579,10 @@ _080DC150: _080DC158: .4byte gUnknown_20386E0 _080DC15C: .4byte gUnknown_83A0010 _080DC160: .4byte gUnknown_202063C - thumb_func_end sub_80DC0F8 + thumb_func_end FldEff_Unknown20 - thumb_func_start sub_80DC164 -sub_80DC164: @ 80DC164 + thumb_func_start FldEff_Unknown21 +FldEff_Unknown21: @ 80DC164 push {r4,lr} ldr r4, _080DC1C4 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -2634,10 +2634,10 @@ _080DC1BC: _080DC1C4: .4byte gUnknown_20386E0 _080DC1C8: .4byte gUnknown_83A0010 _080DC1CC: .4byte gUnknown_202063C - thumb_func_end sub_80DC164 + thumb_func_end FldEff_Unknown21 - thumb_func_start sub_80DC1D0 -sub_80DC1D0: @ 80DC1D0 + thumb_func_start FldEff_Unknown22 +FldEff_Unknown22: @ 80DC1D0 push {r4,lr} ldr r4, _080DC230 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -2689,7 +2689,7 @@ _080DC228: _080DC230: .4byte gUnknown_20386E0 _080DC234: .4byte gUnknown_83A0010 _080DC238: .4byte gUnknown_202063C - thumb_func_end sub_80DC1D0 + thumb_func_end FldEff_Unknown22 thumb_func_start ash ash: @ 80DC23C @@ -3384,8 +3384,8 @@ _080DC738: _080DC73C: .4byte gUnknown_202063C thumb_func_end sub_80DC700 - thumb_func_start sub_80DC740 -sub_80DC740: @ 80DC740 + thumb_func_start FldEff_Dust +FldEff_Dust: @ 80DC740 push {r4,lr} ldr r4, _080DC7A4 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -3439,10 +3439,10 @@ _080DC79C: _080DC7A4: .4byte gUnknown_20386E0 _080DC7A8: .4byte gUnknown_83A0010 _080DC7AC: .4byte gUnknown_202063C - thumb_func_end sub_80DC740 + thumb_func_end FldEff_Dust - thumb_func_start sub_80DC7B0 -sub_80DC7B0: @ 80DC7B0 + thumb_func_start FldEff_SandPile +FldEff_SandPile: @ 80DC7B0 push {r4-r7,lr} ldr r7, _080DC85C @ =gUnknown_20386E0 ldrb r0, [r7] @@ -3467,7 +3467,7 @@ sub_80DC7B0: @ 80DC7B0 cmp r4, 0x40 beq _080DC854 ldrb r0, [r6, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r5, r0, 0 lsls r0, r4, 4 adds r0, r4 @@ -3531,7 +3531,7 @@ _080DC85C: .4byte gUnknown_20386E0 _080DC860: .4byte gUnknown_2036E38 _080DC864: .4byte gUnknown_83A0010 _080DC868: .4byte gUnknown_202063C - thumb_func_end sub_80DC7B0 + thumb_func_end FldEff_SandPile thumb_func_start sub_80DC86C sub_80DC86C: @ 80DC86C @@ -3638,8 +3638,8 @@ _080DC930: .4byte gUnknown_202063C _080DC934: .4byte gUnknown_2036E38 thumb_func_end sub_80DC86C - thumb_func_start sub_80DC938 -sub_80DC938: @ 80DC938 + thumb_func_start FldEff_Bubbles +FldEff_Bubbles: @ 80DC938 push {r4,lr} ldr r4, _080DC990 @ =gUnknown_20386E0 adds r1, r4, 0x4 @@ -3687,7 +3687,7 @@ _080DC988: _080DC990: .4byte gUnknown_20386E0 _080DC994: .4byte gUnknown_83A0010 _080DC998: .4byte gUnknown_202063C - thumb_func_end sub_80DC938 + thumb_func_end FldEff_Bubbles thumb_func_start sub_80DC99C sub_80DC99C: @ 80DC99C @@ -3890,7 +3890,7 @@ _080DCAF8: lsls r0, 2 adds r0, r4 ldrb r0, [r0, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo mov r1, sp ldrb r2, [r1] lsls r1, r2, 3 @@ -4040,8 +4040,8 @@ _080DCC18: bx r1 thumb_func_end sub_80DCBE0 - thumb_func_start sub_80DCC1C -sub_80DCC1C: @ 80DCC1C + thumb_func_start FldEff_Sparkle +FldEff_Sparkle: @ 80DCC1C push {r4,lr} ldr r4, _080DCC84 @ =gUnknown_20386E0 ldr r0, [r4] @@ -4097,7 +4097,7 @@ _080DCC7C: _080DCC84: .4byte gUnknown_20386E0 _080DCC88: .4byte gUnknown_83A0010 _080DCC8C: .4byte gUnknown_202063C - thumb_func_end sub_80DCC1C + thumb_func_end FldEff_Sparkle thumb_func_start sub_80DCC90 sub_80DCC90: @ 80DCC90 @@ -4224,7 +4224,7 @@ _080DCD5E: cmp r0, 0 beq _080DCE00 ldrb r0, [r4, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 98c64a45a..9bcaa32d5 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -602,7 +602,7 @@ sub_8067F88: @ 8067F88 push {r5-r7} adds r5, r0, 0 ldrb r0, [r5, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo movs r4, 0 movs r0, 0x1 mov r10, r0 @@ -1330,7 +1330,7 @@ GroundEffect_SandTracks: @ 80684D4 adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldr r1, _080684FC @ =gUnknown_83A709C ldrb r0, [r0, 0xD] lsls r0, 2 @@ -1353,7 +1353,7 @@ GroundEffect_DeepSandTracks: @ 8068500 adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldr r1, _08068528 @ =gUnknown_83A709C ldrb r0, [r0, 0xD] lsls r0, 2 diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index b183cf8c3..1471ca4cd 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -975,7 +975,7 @@ RemoveFieldObjectInternal: @ 805E510 sub sp, 0x8 adds r4, r0, 0 ldrb r0, [r4, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldrh r2, [r0, 0x6] ldr r1, _0805E554 @ =0xffff0000 ldr r0, [sp, 0x4] @@ -1074,7 +1074,7 @@ _0805E5CA: ldr r1, _0805E5F4 @ =gUnknown_2036E38 adds r5, r0, r1 ldrb r0, [r5, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r6, r0, 0 ldrb r1, [r6, 0xC] movs r0, 0xF @@ -1266,7 +1266,7 @@ SpawnFieldObject: @ 805E72C str r0, [sp, 0x20] mov r1, r9 ldrb r0, [r1, 0x1] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r7, r0, 0 add r2, sp, 0x20 mov r0, r9 @@ -1478,7 +1478,7 @@ sub_805E8E8: @ 805E8E8 adds r7, r3, 0 lsls r0, 24 lsrs r0, 24 - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r5, r0, 0 ldrh r0, [r5] strh r0, [r4] @@ -1643,7 +1643,7 @@ sub_805E9F8: @ 805E9F8 lsrs r4, 24 str r4, [sp, 0x20] adds r0, r5, 0 - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r4, r0, 0 ldr r1, _0805EB38 @ =sub_8068FA8 add r3, sp, 0x1C @@ -1793,7 +1793,7 @@ sub_805EB44: @ 805EB44 lsls r5, 16 lsrs r5, 16 adds r0, r6, 0 - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r7, r0, 0 ldr r1, _0805EC24 @ =nullsub_8 add r3, sp, 0x18 @@ -2212,7 +2212,7 @@ _0805EE70: movs r0, 0 str r0, [sp, 0x20] ldrb r0, [r6, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r5, r0, 0 ldrh r2, [r5, 0x6] ldr r1, _0805EFE8 @ =0xffff0000 @@ -2453,7 +2453,7 @@ sub_805F060: @ 805F060 lsrs r1, 24 str r1, [sp] adds r0, r1, 0 - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r5, r0, 0 ldrb r1, [r6, 0x4] lsls r0, r1, 4 @@ -2756,8 +2756,8 @@ PlayerObjectTurn: @ 805F2A8 _0805F2C4: .4byte gUnknown_2036E38 thumb_func_end PlayerObjectTurn - thumb_func_start sub_805F2C8 -sub_805F2C8: @ 805F2C8 + thumb_func_start GetFieldObjectGraphicsInfo +GetFieldObjectGraphicsInfo: @ 805F2C8 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -2782,7 +2782,7 @@ _0805F2E6: bx r1 .align 2, 0 _0805F2F4: .4byte gUnknown_839FDB0 - thumb_func_end sub_805F2C8 + thumb_func_end GetFieldObjectGraphicsInfo thumb_func_start FieldObjectHandleDynamicGraphicsId FieldObjectHandleDynamicGraphicsId: @ 805F2F8 @@ -3395,7 +3395,7 @@ sub_805F724: @ 805F724 ldr r1, _0805F7C0 @ =gUnknown_202063C adds r7, r0, r1 ldrb r0, [r6, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo mov r8, r0 lsls r4, 16 asrs r4, 16 @@ -12683,8 +12683,8 @@ _08063978: bx r1 thumb_func_end CheckForCollisionBetweenFieldObjects - thumb_func_start sub_8063980 -sub_8063980: @ 8063980 + thumb_func_start IsBerryTreeSparkling +IsBerryTreeSparkling: @ 8063980 push {lr} sub sp, 0x4 lsls r0, 24 @@ -12727,7 +12727,7 @@ _080639CE: add sp, 0x4 pop {r1} bx r1 - thumb_func_end sub_8063980 + thumb_func_end IsBerryTreeSparkling thumb_func_start sub_80639D4 sub_80639D4: @ 80639D4 @@ -17835,8 +17835,8 @@ _08065DE8: bx r1 thumb_func_end sub_8065DD0 - thumb_func_start sub_8065DF0 -sub_8065DF0: @ 8065DF0 + thumb_func_start do_run_south_anim +do_run_south_anim: @ 8065DF0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -17850,7 +17850,7 @@ sub_8065DF0: @ 8065DF0 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8065DF0 + thumb_func_end do_run_south_anim thumb_func_start sub_8065E10 sub_8065E10: @ 8065E10 @@ -17872,8 +17872,8 @@ _08065E28: bx r1 thumb_func_end sub_8065E10 - thumb_func_start sub_8065E30 -sub_8065E30: @ 8065E30 + thumb_func_start do_run_north_anim +do_run_north_anim: @ 8065E30 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -17887,7 +17887,7 @@ sub_8065E30: @ 8065E30 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8065E30 + thumb_func_end do_run_north_anim thumb_func_start sub_8065E50 sub_8065E50: @ 8065E50 @@ -17909,8 +17909,8 @@ _08065E68: bx r1 thumb_func_end sub_8065E50 - thumb_func_start sub_8065E70 -sub_8065E70: @ 8065E70 + thumb_func_start do_run_west_anim +do_run_west_anim: @ 8065E70 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -17924,7 +17924,7 @@ sub_8065E70: @ 8065E70 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8065E70 + thumb_func_end do_run_west_anim thumb_func_start sub_8065E90 sub_8065E90: @ 8065E90 @@ -17946,8 +17946,8 @@ _08065EA8: bx r1 thumb_func_end sub_8065E90 - thumb_func_start sub_8065EB0 -sub_8065EB0: @ 8065EB0 + thumb_func_start do_run_east_anim +do_run_east_anim: @ 8065EB0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -17961,7 +17961,7 @@ sub_8065EB0: @ 8065EB0 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8065EB0 + thumb_func_end do_run_east_anim thumb_func_start sub_8065ED0 sub_8065ED0: @ 8065ED0 @@ -19417,7 +19417,7 @@ sub_80668D4: @ 80668D4 adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldrb r1, [r0, 0xC] lsls r1, 25 lsrs r1, 31 @@ -21913,7 +21913,7 @@ sub_8067A10: @ 8067A10 ands r0, r1 strb r0, [r5, 0x1] ldrb r0, [r5, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo adds r7, r0, 0 adds r0, r4, 0 adds r0, 0x3E diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index b3bef080d..2e430872d 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -848,7 +848,7 @@ PlayerNotOnBikeNotMoving: @ 805B9B0 bl player_get_direction_lower_nybble lsls r0, 24 lsrs r0, 24 - bl sub_805C1F4 + bl PlayerFaceDirection pop {r0} bx r0 thumb_func_end PlayerNotOnBikeNotMoving @@ -886,7 +886,7 @@ _0805B9FA: cmp r0, 0x8 bne _0805BA06 adds r0, r4, 0 - bl sub_805C1F4 + bl PlayerFaceDirection b _0805BAA4 _0805BA06: subs r0, r1, 0x5 @@ -895,7 +895,7 @@ _0805BA06: cmp r0, 0x3 bls _0805BAA4 adds r0, r4, 0 - bl sub_805C1D0 + bl PlayerNotOnBikeCollide b _0805BAA4 _0805BA18: ldr r6, _0805BA2C @ =gUnknown_2037078 @@ -1176,7 +1176,7 @@ _0805BC38: asrs r1, r4, 16 mov r2, r10 mov r3, sp - bl sub_805BDAC + bl check_acro_bike_metatile _0805BC4C: mov r0, sp ldrb r0, [r0] @@ -1357,8 +1357,8 @@ _0805BDA2: bx r1 thumb_func_end sub_805BCEC - thumb_func_start sub_805BDAC -sub_805BDAC: @ 805BDAC + thumb_func_start check_acro_bike_metatile +check_acro_bike_metatile: @ 805BDAC push {r4-r7,lr} adds r6, r3, 0 lsls r2, 24 @@ -1392,7 +1392,7 @@ _0805BDE6: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_805BDAC + thumb_func_end check_acro_bike_metatile thumb_func_start SetPlayerAvatarTransitionFlags SetPlayerAvatarTransitionFlags: @ 805BDEC @@ -1933,8 +1933,8 @@ sub_805C194: @ 805C194 bx r0 thumb_func_end sub_805C194 - thumb_func_start sub_805C1AC -sub_805C1AC: @ 805C1AC + thumb_func_start PlayerOnBikeCollide +PlayerOnBikeCollide: @ 805C1AC push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -1950,10 +1950,10 @@ sub_805C1AC: @ 805C1AC pop {r4} pop {r0} bx r0 - thumb_func_end sub_805C1AC + thumb_func_end PlayerOnBikeCollide - thumb_func_start sub_805C1D0 -sub_805C1D0: @ 805C1D0 + thumb_func_start PlayerNotOnBikeCollide +PlayerNotOnBikeCollide: @ 805C1D0 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -1969,10 +1969,10 @@ sub_805C1D0: @ 805C1D0 pop {r4} pop {r0} bx r0 - thumb_func_end sub_805C1D0 + thumb_func_end PlayerNotOnBikeCollide - thumb_func_start sub_805C1F4 -sub_805C1F4: @ 805C1F4 + thumb_func_start PlayerFaceDirection +PlayerFaceDirection: @ 805C1F4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1983,7 +1983,7 @@ sub_805C1F4: @ 805C1F4 bl sub_805C024 pop {r0} bx r0 - thumb_func_end sub_805C1F4 + thumb_func_end PlayerFaceDirection thumb_func_start sub_805C20C sub_805C20C: @ 805C20C @@ -2718,9 +2718,9 @@ sub_805C780: @ 805C780 lsls r0, 24 cmp r0, 0 beq _0805C7B8 - bl sub_80BD6C4 + bl Bike_HandleBumpySlopeJump movs r0, 0 - bl sub_80BD650 + bl Bike_UpdateBikeCounterSpeed _0805C7B8: pop {r4} pop {r0} @@ -3695,8 +3695,8 @@ _0805CEE4: .4byte gUnknown_2037078 _0805CEE8: .4byte gUnknown_2036E38 thumb_func_end sub_805CEA0 - thumb_func_start sub_805CEEC -sub_805CEEC: @ 805CEEC + thumb_func_start PlayerAvatar_DoSecretBaseMatJump +PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC push {r4-r6,lr} adds r6, r0, 0 adds r4, r1, 0 @@ -3745,7 +3745,7 @@ _0805CF48: .align 2, 0 _0805CF50: .4byte gUnknown_2037078 _0805CF54: .4byte sub_805CEA0 - thumb_func_end sub_805CEEC + thumb_func_end PlayerAvatar_DoSecretBaseMatJump thumb_func_start sub_805CF58 sub_805CF58: @ 805CF58 diff --git a/asm/field_poison.s b/asm/field_poison.s index dc5f74ec4..05522fa61 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -5,8 +5,8 @@ .text - thumb_func_start .gcc2_compiled._0 -.gcc2_compiled._0: @ 80A0460 + thumb_func_start CheckMonIsValid +CheckMonIsValid: @ 80A0460 push {lr} movs r1, 0x41 bl GetMonData @@ -26,16 +26,16 @@ _080A047C: _080A047E: pop {r1} bx r1 - thumb_func_end .gcc2_compiled._0 + thumb_func_end CheckMonIsValid - thumb_func_start sub_80A0484 -sub_80A0484: @ 80A0484 + thumb_func_start AllMonsFainted +AllMonsFainted: @ 80A0484 push {r4,r5,lr} ldr r4, _080A04A4 @ =gUnknown_2024284 movs r5, 0 _080A048A: adds r0, r4, 0 - bl .gcc2_compiled._0 + bl CheckMonIsValid cmp r0, 0 beq _080A04A8 adds r0, r4, 0 @@ -57,10 +57,10 @@ _080A04B2: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80A0484 + thumb_func_end AllMonsFainted - thumb_func_start sub_80A04B8 -sub_80A04B8: @ 80A04B8 + thumb_func_start MonFaintFromPoisonOnField +MonFaintFromPoisonOnField: @ 80A04B8 push {r4,r5,lr} sub sp, 0x4 lsls r0, 24 @@ -93,10 +93,10 @@ sub_80A04B8: @ 80A04B8 .align 2, 0 _080A04FC: .4byte gUnknown_2024284 _080A0500: .4byte gUnknown_2021CD0 - thumb_func_end sub_80A04B8 + thumb_func_end MonFaintFromPoisonOnField - thumb_func_start sub_80A0504 -sub_80A0504: @ 80A0504 + thumb_func_start CheckMonFaintedFromPoison +CheckMonFaintedFromPoison: @ 80A0504 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -105,7 +105,7 @@ sub_80A0504: @ 80A0504 ldr r0, _080A0540 @ =gUnknown_2024284 adds r4, r1, r0 adds r0, r4, 0 - bl .gcc2_compiled._0 + bl CheckMonIsValid cmp r0, 0 beq _080A0544 adds r0, r4, 0 @@ -131,10 +131,10 @@ _080A0546: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80A0504 + thumb_func_end CheckMonFaintedFromPoison - thumb_func_start sub_80A054C -sub_80A054C: @ 80A054C + thumb_func_start Task_WhiteOut +Task_WhiteOut: @ 80A054C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -167,7 +167,7 @@ _080A057A: _080A0584: lsls r0, r1, 24 lsrs r0, 24 - bl sub_80A0504 + bl CheckMonFaintedFromPoison cmp r0, 0 bne _080A05D0 ldrh r0, [r4, 0x2] @@ -192,7 +192,7 @@ _080A05A6: strh r0, [r4] b _080A05F6 _080A05B8: - bl sub_80A0484 + bl AllMonsFainted adds r1, r0, 0 cmp r1, 0 beq _080A05E8 @@ -204,7 +204,7 @@ _080A05B8: _080A05CC: .4byte gUnknown_20370D0 _080A05D0: ldrb r0, [r4, 0x2] - bl sub_80A04B8 + bl MonFaintFromPoisonOnField ldr r0, _080A05E4 @ =gUnknown_81A5476 bl ShowFieldMessage ldrh r0, [r4] @@ -226,20 +226,20 @@ _080A05F6: bx r0 .align 2, 0 _080A05FC: .4byte gUnknown_20370D0 - thumb_func_end sub_80A054C + thumb_func_end Task_WhiteOut - thumb_func_start sub_80A0600 -sub_80A0600: @ 80A0600 + thumb_func_start ExecuteWhiteOut +ExecuteWhiteOut: @ 80A0600 push {lr} - ldr r0, _080A0614 @ =sub_80A054C + ldr r0, _080A0614 @ =Task_WhiteOut movs r1, 0x50 bl CreateTask bl ScriptContext1_Stop pop {r0} bx r0 .align 2, 0 -_080A0614: .4byte sub_80A054C - thumb_func_end sub_80A0600 +_080A0614: .4byte Task_WhiteOut + thumb_func_end ExecuteWhiteOut thumb_func_start overworld_poison overworld_poison: @ 80A0618 diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index ea891e55b..d1fee0015 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -372,7 +372,7 @@ _0807F0AC: .4byte gUnknown_83C68D4 thumb_func_start sub_807F0B0 sub_807F0B0: @ 807F0B0 push {lr} - bl sub_8055FD4 + bl Overworld_FadeOutMapMusic ldr r0, _0807F0C4 @ =task50_0807F0C8 movs r1, 0x50 bl CreateTask diff --git a/asm/field_specials.s b/asm/field_specials.s index 8a3f3ed01..e56ad2b80 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -672,8 +672,8 @@ sub_80CAABC: @ 80CAABC _080CAADC: .4byte gUnknown_83F5B1A thumb_func_end sub_80CAABC - thumb_func_start sub_80CAAE0 -sub_80CAAE0: @ 80CAAE0 + thumb_func_start LeadMonHasEffortRibbon +LeadMonHasEffortRibbon: @ 80CAAE0 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -691,10 +691,10 @@ sub_80CAAE0: @ 80CAAE0 bx r1 .align 2, 0 _080CAB04: .4byte gUnknown_2024284 - thumb_func_end sub_80CAAE0 + thumb_func_end LeadMonHasEffortRibbon - thumb_func_start sub_80CAB08 -sub_80CAB08: @ 80CAB08 + thumb_func_start GivLeadMonEffortRibbon +GivLeadMonEffortRibbon: @ 80CAB08 push {lr} sub sp, 0x4 movs r0, 0x2A @@ -720,10 +720,10 @@ sub_80CAB08: @ 80CAB08 .align 2, 0 _080CAB3C: .4byte 0x0000083b _080CAB40: .4byte gUnknown_2024284 - thumb_func_end sub_80CAB08 + thumb_func_end GivLeadMonEffortRibbon - thumb_func_start sub_80CAB44 -sub_80CAB44: @ 80CAB44 + thumb_func_start ScrSpecial_AreLeadMonEVsMaxedOut +ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44 push {lr} bl GetLeadMonIndex lsls r0, 24 @@ -747,7 +747,7 @@ _080CAB70: _080CAB72: pop {r1} bx r1 - thumb_func_end sub_80CAB44 + thumb_func_end ScrSpecial_AreLeadMonEVsMaxedOut thumb_func_start sub_80CAB78 sub_80CAB78: @ 80CAB78 @@ -3277,7 +3277,7 @@ TV_PrintIntToStringVar: @ 80CBED4 lsrs r3, 24 adds r1, r5, 0 movs r2, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN pop {r4,r5} pop {r0} bx r0 @@ -3806,7 +3806,7 @@ _080CC318: mov r0, sp ldrh r0, [r0] ldr r1, [sp, 0xC] - bl sub_8097F00 + bl SpeciesToMailSpecies adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -3816,7 +3816,7 @@ _080CC318: mov r0, sp ldrh r0, [r0, 0x2] ldr r1, [r7, 0x4] - bl sub_8097F00 + bl SpeciesToMailSpecies adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -3826,7 +3826,7 @@ _080CC318: mov r0, sp ldrh r0, [r0, 0x4] ldr r1, [r7, 0x8] - bl sub_8097F00 + bl SpeciesToMailSpecies adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -3836,7 +3836,7 @@ _080CC318: mov r0, sp ldrh r0, [r0, 0x6] ldr r1, [r7, 0xC] - bl sub_8097F00 + bl SpeciesToMailSpecies adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -3846,7 +3846,7 @@ _080CC318: mov r0, sp ldrh r0, [r0, 0x8] ldr r1, [r7, 0x10] - bl sub_8097F00 + bl SpeciesToMailSpecies adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -3856,7 +3856,7 @@ _080CC318: mov r0, sp ldrh r0, [r0, 0xA] ldr r1, [r7, 0x14] - bl sub_8097F00 + bl SpeciesToMailSpecies adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 diff --git a/asm/field_tasks.s b/asm/field_tasks.s index c6a908fad..aefda5fab 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -637,7 +637,7 @@ _0806ECCE: lsls r0, 24 cmp r0, 0 beq _0806ED2E - bl sub_80BD674 + bl GetPlayerSpeed lsls r0, 16 asrs r0, 16 cmp r0, 0x4 diff --git a/asm/field_weather.s b/asm/field_weather.s index be4c5153c..bf5b8d883 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -8,7 +8,7 @@ thumb_func_start sub_8079C08 sub_8079C08: @ 8079C08 push {r4-r6,lr} - ldr r0, _08079CCC @ =sub_8079E0C + ldr r0, _08079CCC @ =Task_WeatherMain bl FuncIsActiveTask lsls r0, 24 lsrs r6, r0, 24 @@ -71,7 +71,7 @@ sub_8079C08: @ 8079C08 strb r6, [r0] movs r0, 0x10 movs r1, 0 - bl sub_807ADB0 + bl Weather_SetBlendCoeffs movs r1, 0xDA lsls r1, 3 adds r0, r4, r1 @@ -88,7 +88,7 @@ sub_8079C08: @ 8079C08 adds r1, r4, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, _08079CEC @ =sub_8079DBC + ldr r0, _08079CEC @ =Task_WeatherInit movs r1, 0x50 bl CreateTask ldr r1, _08079CF0 @ =0x000006c9 @@ -99,7 +99,7 @@ _08079CC4: pop {r0} bx r0 .align 2, 0 -_08079CCC: .4byte sub_8079E0C +_08079CCC: .4byte Task_WeatherMain _08079CD0: .4byte gUnknown_83C2CE0 _08079CD4: .4byte gUnknown_20373F8 _08079CD8: .4byte 0x04000008 @@ -107,7 +107,7 @@ _08079CDC: .4byte gUnknown_2037F34 _08079CE0: .4byte 0x000006d5 _08079CE4: .4byte 0x000006c6 _08079CE8: .4byte 0x000006d3 -_08079CEC: .4byte sub_8079DBC +_08079CEC: .4byte Task_WeatherInit _08079CF0: .4byte 0x000006c9 thumb_func_end sub_8079C08 @@ -214,8 +214,8 @@ sub_8079D8C: @ 8079D8C _08079DB8: .4byte gUnknown_2037F34 thumb_func_end sub_8079D8C - thumb_func_start sub_8079DBC -sub_8079DBC: @ 8079DBC + thumb_func_start Task_WeatherInit +Task_WeatherInit: @ 8079DBC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -241,7 +241,7 @@ sub_8079DBC: @ 8079DBC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08079E08 @ =sub_8079E0C + ldr r1, _08079E08 @ =Task_WeatherMain str r1, [r0] _08079DF4: pop {r4} @@ -251,11 +251,11 @@ _08079DF4: _08079DFC: .4byte gUnknown_2037F34 _08079E00: .4byte gUnknown_83C2BC0 _08079E04: .4byte gUnknown_3005090 -_08079E08: .4byte sub_8079E0C - thumb_func_end sub_8079DBC +_08079E08: .4byte Task_WeatherMain + thumb_func_end Task_WeatherInit - thumb_func_start sub_8079E0C -sub_8079E0C: @ 8079E0C + thumb_func_start Task_WeatherMain +Task_WeatherMain: @ 8079E0C push {r4-r7,lr} mov r7, r8 push {r7} @@ -335,7 +335,7 @@ _08079EB0: .4byte gUnknown_83C2BC0 _08079EB4: .4byte gUnknown_83C2CB0 _08079EB8: .4byte gUnknown_2037F34 _08079EBC: .4byte 0x000006c6 - thumb_func_end sub_8079E0C + thumb_func_end Task_WeatherMain thumb_func_start sub_8079EC0 sub_8079EC0: @ 8079EC0 @@ -1720,7 +1720,7 @@ _0807A8FA: adds r2, 0x68 adds r1, r4, r2 ldrb r1, [r1] - bl sub_807ADB0 + bl Weather_SetBlendCoeffs movs r3, 0xD9 lsls r3, 3 adds r4, r3 @@ -1872,7 +1872,7 @@ _0807AA24: adds r2, 0x68 adds r1, r4, r2 ldrb r1, [r1] - bl sub_807ADB0 + bl Weather_SetBlendCoeffs movs r3, 0xD9 lsls r3, 3 adds r4, r3 @@ -2318,8 +2318,8 @@ _0807ADA8: .4byte gUnknown_20386A8 _0807ADAC: .4byte 0x0000073c thumb_func_end sub_807AC98 - thumb_func_start sub_807ADB0 -sub_807ADB0: @ 807ADB0 + thumb_func_start Weather_SetBlendCoeffs +Weather_SetBlendCoeffs: @ 807ADB0 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -2349,10 +2349,10 @@ sub_807ADB0: @ 807ADB0 .align 2, 0 _0807ADE8: .4byte gUnknown_2037F34 _0807ADEC: .4byte 0x00000736 - thumb_func_end sub_807ADB0 + thumb_func_end Weather_SetBlendCoeffs - thumb_func_start sub_807ADF0 -sub_807ADF0: @ 807ADF0 + thumb_func_start Weather_SetTargetBlendCoeffs +Weather_SetTargetBlendCoeffs: @ 807ADF0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -2384,10 +2384,10 @@ _0807AE24: .4byte gUnknown_2037F34 _0807AE28: .4byte 0x00000734 _0807AE2C: .4byte 0x00000736 _0807AE30: .4byte 0x0000073a - thumb_func_end sub_807ADF0 + thumb_func_end Weather_SetTargetBlendCoeffs - thumb_func_start sub_807AE34 -sub_807AE34: @ 807AE34 + thumb_func_start Weather_UpdateBlend +Weather_UpdateBlend: @ 807AE34 push {r4-r6,lr} ldr r0, _0807AE8C @ =gUnknown_2037F34 movs r1, 0xE6 @@ -2488,7 +2488,7 @@ _0807AEFA: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_807AE34 + thumb_func_end Weather_UpdateBlend thumb_func_start sub_807AF00 sub_807AF00: @ 807AF00 @@ -2519,43 +2519,43 @@ _0807AF1C: .4byte _0807AF8C _0807AF44: movs r0, 0x1 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF4C: movs r0, 0x2 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF54: movs r0, 0x3 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF5C: movs r0, 0x4 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF64: movs r0, 0x5 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF6C: movs r0, 0x6 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF74: movs r0, 0x9 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF7C: movs r0, 0x7 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF84: movs r0, 0x8 - bl sub_807B174 + bl SetWeather b _0807AF92 _0807AF8C: movs r0, 0xB - bl sub_807B174 + bl SetWeather _0807AF92: pop {r0} bx r0 @@ -2573,8 +2573,8 @@ weather_get_current: @ 807AF98 _0807AFA4: .4byte gUnknown_2037F34 thumb_func_end weather_get_current - thumb_func_start sub_807AFA8 -sub_807AFA8: @ 807AFA8 + thumb_func_start SetRainStrengthFromSoundEffect +SetRainStrengthFromSoundEffect: @ 807AFA8 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -2623,7 +2623,7 @@ _0807AFFA: bx r0 .align 2, 0 _0807B000: .4byte 0x000006dd - thumb_func_end sub_807AFA8 + thumb_func_end SetRainStrengthFromSoundEffect thumb_func_start play_some_sound play_some_sound: @ 807B004 @@ -2777,7 +2777,7 @@ SetSav1Weather: @ 807B100 ldrb r5, [r1] lsls r0, 24 lsrs r0, 24 - bl sub_807B1CC + bl TranslateWeatherNum ldr r1, [r4] adds r1, 0x2E strb r0, [r1] @@ -2785,7 +2785,7 @@ SetSav1Weather: @ 807B100 adds r0, 0x2E ldrb r0, [r0] adds r1, r5, 0 - bl sub_807B2BC + bl UpdateRainCounter pop {r4,r5} pop {r0} bx r0 @@ -2813,7 +2813,7 @@ sub_807B140: @ 807B140 ldrb r5, [r0] ldr r0, _0807B170 @ =gUnknown_2036DFC ldrb r0, [r0, 0x16] - bl sub_807B1CC + bl TranslateWeatherNum ldr r1, [r4] adds r1, 0x2E strb r0, [r1] @@ -2821,7 +2821,7 @@ sub_807B140: @ 807B140 adds r0, 0x2E ldrb r0, [r0] adds r1, r5, 0 - bl sub_807B2BC + bl UpdateRainCounter pop {r4,r5} pop {r0} bx r0 @@ -2830,8 +2830,8 @@ _0807B16C: .4byte gUnknown_3005008 _0807B170: .4byte gUnknown_2036DFC thumb_func_end sub_807B140 - thumb_func_start sub_807B174 -sub_807B174: @ 807B174 + thumb_func_start SetWeather +SetWeather: @ 807B174 push {lr} bl SetSav1Weather bl sav1_get_weather_probably @@ -2840,7 +2840,7 @@ sub_807B174: @ 807B174 bl weather_set pop {r0} bx r0 - thumb_func_end sub_807B174 + thumb_func_end SetWeather thumb_func_start sub_807B18C sub_807B18C: @ 807B18C @@ -2854,8 +2854,8 @@ sub_807B18C: @ 807B18C bx r0 thumb_func_end sub_807B18C - thumb_func_start sub_807B1A4 -sub_807B1A4: @ 807B1A4 + thumb_func_start DoCurrentWeather +DoCurrentWeather: @ 807B1A4 push {lr} bl sav1_get_weather_probably lsls r0, 24 @@ -2863,7 +2863,7 @@ sub_807B1A4: @ 807B1A4 bl weather_set pop {r0} bx r0 - thumb_func_end sub_807B1A4 + thumb_func_end DoCurrentWeather thumb_func_start sub_807B1B8 sub_807B1B8: @ 807B1B8 @@ -2876,8 +2876,8 @@ sub_807B1B8: @ 807B1B8 bx r0 thumb_func_end sub_807B1B8 - thumb_func_start sub_807B1CC -sub_807B1CC: @ 807B1CC + thumb_func_start TranslateWeatherNum +TranslateWeatherNum: @ 807B1CC push {lr} lsls r0, 24 lsrs r0, 24 @@ -2979,7 +2979,7 @@ _0807B294: _0807B296: pop {r1} bx r1 - thumb_func_end sub_807B1CC + thumb_func_end TranslateWeatherNum thumb_func_start UpdateWeatherPerDay UpdateWeatherPerDay: @ 807B29C @@ -3001,8 +3001,8 @@ UpdateWeatherPerDay: @ 807B29C _0807B2B8: .4byte gUnknown_3005008 thumb_func_end UpdateWeatherPerDay - thumb_func_start sub_807B2BC -sub_807B2BC: @ 807B2BC + thumb_func_start UpdateRainCounter +UpdateRainCounter: @ 807B2BC push {lr} lsls r0, 24 lsls r1, 24 @@ -3019,6 +3019,6 @@ _0807B2D0: _0807B2D6: pop {r0} bx r0 - thumb_func_end sub_807B2BC + thumb_func_end UpdateRainCounter .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_weather_effects.s b/asm/field_weather_effects.s index 4c0caabe3..4412f2d2c 100644 --- a/asm/field_weather_effects.s +++ b/asm/field_weather_effects.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_807B2DC -sub_807B2DC: @ 807B2DC + thumb_func_start Clouds_InitVars +Clouds_InitVars: @ 807B2DC push {lr} ldr r0, _0807B314 @ =gUnknown_83C2BBC ldr r0, [r0] @@ -31,7 +31,7 @@ sub_807B2DC: @ 807B2DC bne _0807B310 movs r0, 0 movs r1, 0x10 - bl sub_807ADB0 + bl Weather_SetBlendCoeffs _0807B310: pop {r0} bx r0 @@ -41,12 +41,12 @@ _0807B318: .4byte 0x000006c1 _0807B31C: .4byte 0x000006c2 _0807B320: .4byte 0x000006d2 _0807B324: .4byte 0x000006de - thumb_func_end sub_807B2DC + thumb_func_end Clouds_InitVars - thumb_func_start sub_807B328 -sub_807B328: @ 807B328 + thumb_func_start Clouds_InitAll +Clouds_InitAll: @ 807B328 push {r4,lr} - bl sub_807B2DC + bl Clouds_InitVars ldr r0, _0807B350 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807B354 @ =0x000006d2 @@ -56,7 +56,7 @@ sub_807B328: @ 807B328 bne _0807B348 adds r4, r1, r2 _0807B33E: - bl sub_807B358 + bl Clouds_Main ldrb r0, [r4] cmp r0, 0 beq _0807B33E @@ -67,10 +67,10 @@ _0807B348: .align 2, 0 _0807B350: .4byte gUnknown_83C2BBC _0807B354: .4byte 0x000006d2 - thumb_func_end sub_807B328 + thumb_func_end Clouds_InitAll - thumb_func_start sub_807B358 -sub_807B358: @ 807B358 + thumb_func_start Clouds_Main +Clouds_Main: @ 807B358 push {r4,r5,lr} ldr r0, _0807B374 @ =gUnknown_83C2BBC ldr r5, [r0] @@ -92,16 +92,16 @@ _0807B37C: beq _0807B394 b _0807B3AC _0807B382: - bl sub_807B438 + bl CreateCloudSprites b _0807B3A6 _0807B388: movs r0, 0xC movs r1, 0x8 movs r2, 0x1 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807B3A6 _0807B394: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807B3AC @@ -119,10 +119,10 @@ _0807B3AC: bx r0 .align 2, 0 _0807B3B4: .4byte 0x000006d2 - thumb_func_end sub_807B358 + thumb_func_end Clouds_Main - thumb_func_start sub_807B3B8 -sub_807B3B8: @ 807B3B8 + thumb_func_start Clouds_Finish +Clouds_Finish: @ 807B3B8 push {r4,lr} ldr r0, _0807B3D0 @ =gUnknown_83C2BBC ldr r0, [r0] @@ -142,10 +142,10 @@ _0807B3D8: movs r0, 0 movs r1, 0x10 movs r2, 0x1 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807B3F2 _0807B3E4: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807B3F8 @@ -160,10 +160,10 @@ _0807B3FA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807B3B8 + thumb_func_end Clouds_Finish - thumb_func_start sub_807B400 -sub_807B400: @ 807B400 + thumb_func_start Weather2_InitVars +Weather2_InitVars: @ 807B400 ldr r0, _0807B418 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r0, _0807B41C @ =0x000006c1 @@ -179,15 +179,15 @@ sub_807B400: @ 807B400 _0807B418: .4byte gUnknown_83C2BBC _0807B41C: .4byte 0x000006c1 _0807B420: .4byte 0x000006c2 - thumb_func_end sub_807B400 + thumb_func_end Weather2_InitVars - thumb_func_start sub_807B424 -sub_807B424: @ 807B424 + thumb_func_start Weather2_InitAll +Weather2_InitAll: @ 807B424 push {lr} - bl sub_807B400 + bl Weather2_InitVars pop {r0} bx r0 - thumb_func_end sub_807B424 + thumb_func_end Weather2_InitAll thumb_func_start nullsub_48 nullsub_48: @ 807B430 @@ -200,8 +200,8 @@ sub_807B434: @ 807B434 bx lr thumb_func_end sub_807B434 - thumb_func_start sub_807B438 -sub_807B438: @ 807B438 + thumb_func_start CreateCloudSprites +CreateCloudSprites: @ 807B438 push {r4,r5,lr} ldr r0, _0807B4B0 @ =gUnknown_83C2BBC ldr r0, [r0] @@ -296,7 +296,7 @@ _0807B4F4: .align 2, 0 _0807B4FC: .4byte gUnknown_83C2BBC _0807B500: .4byte 0x000006de - thumb_func_end sub_807B438 + thumb_func_end CreateCloudSprites thumb_func_start sub_807B504 sub_807B504: @ 807B504 @@ -362,8 +362,8 @@ _0807B570: bx r0 thumb_func_end sub_807B558 - thumb_func_start sub_807B574 -sub_807B574: @ 807B574 + thumb_func_start Drought_InitVars +Drought_InitVars: @ 807B574 ldr r0, _0807B598 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r0, _0807B59C @ =0x000006cc @@ -386,12 +386,12 @@ _0807B598: .4byte gUnknown_83C2BBC _0807B59C: .4byte 0x000006cc _0807B5A0: .4byte 0x000006d2 _0807B5A4: .4byte 0x000006c2 - thumb_func_end sub_807B574 + thumb_func_end Drought_InitVars - thumb_func_start sub_807B5A8 -sub_807B5A8: @ 807B5A8 + thumb_func_start Drought_InitAll +Drought_InitAll: @ 807B5A8 push {r4,lr} - bl sub_807B574 + bl Drought_InitVars ldr r0, _0807B5D0 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807B5D4 @ =0x000006d2 @@ -401,7 +401,7 @@ sub_807B5A8: @ 807B5A8 bne _0807B5C8 adds r4, r1, r2 _0807B5BE: - bl sub_807B5D8 + bl Drought_Main ldrb r0, [r4] cmp r0, 0 beq _0807B5BE @@ -412,10 +412,10 @@ _0807B5C8: .align 2, 0 _0807B5D0: .4byte gUnknown_83C2BBC _0807B5D4: .4byte 0x000006d2 - thumb_func_end sub_807B5A8 + thumb_func_end Drought_InitAll - thumb_func_start sub_807B5D8 -sub_807B5D8: @ 807B5D8 + thumb_func_start Drought_Main +Drought_Main: @ 807B5D8 push {lr} ldr r1, _0807B5F4 @ =gUnknown_83C2BBC ldr r0, [r1] @@ -518,7 +518,7 @@ _0807B6B4: _0807B6B8: pop {r0} bx r0 - thumb_func_end sub_807B5D8 + thumb_func_end Drought_Main thumb_func_start sub_807B6BC sub_807B6BC: @ 807B6BC @@ -657,8 +657,8 @@ _0807B7C2: bx r0 thumb_func_end task50_0807B6D4 - thumb_func_start sub_807B7C8 -sub_807B7C8: @ 807B7C8 + thumb_func_start LightRain_InitVars +LightRain_InitVars: @ 807B7C8 push {r4,lr} ldr r0, _0807B818 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -693,7 +693,7 @@ sub_807B7C8: @ 807B7C8 movs r0, 0x14 strb r0, [r1] movs r0, 0x4E - bl sub_807AFA8 + bl SetRainStrengthFromSoundEffect pop {r4} pop {r0} bx r0 @@ -705,12 +705,12 @@ _0807B824: .4byte 0x000006db _0807B828: .4byte 0x000006dc _0807B82C: .4byte 0x000006c1 _0807B830: .4byte 0x000006c2 - thumb_func_end sub_807B7C8 + thumb_func_end LightRain_InitVars - thumb_func_start sub_807B834 -sub_807B834: @ 807B834 + thumb_func_start LightRain_InitAll +LightRain_InitAll: @ 807B834 push {r4,lr} - bl sub_807B7C8 + bl LightRain_InitVars ldr r0, _0807B85C @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807B860 @ =0x000006d2 @@ -720,7 +720,7 @@ sub_807B834: @ 807B834 bne _0807B854 adds r4, r1, r2 _0807B84A: - bl sub_807B864 + bl LightRain_Main ldrb r0, [r4] cmp r0, 0 beq _0807B84A @@ -731,10 +731,10 @@ _0807B854: .align 2, 0 _0807B85C: .4byte gUnknown_83C2BBC _0807B860: .4byte 0x000006d2 - thumb_func_end sub_807B834 + thumb_func_end LightRain_InitAll - thumb_func_start sub_807B864 -sub_807B864: @ 807B864 + thumb_func_start LightRain_Main +LightRain_Main: @ 807B864 push {r4,r5,lr} ldr r0, _0807B880 @ =gUnknown_83C2BBC ldr r5, [r0] @@ -756,10 +756,10 @@ _0807B888: beq _0807B8A0 b _0807B8B8 _0807B88E: - bl sub_807BC08 + bl LoadRainSpriteSheet b _0807B8B2 _0807B894: - bl sub_807BC18 + bl CreateRainSprite lsls r0, 24 cmp r0, 0 bne _0807B8B8 @@ -783,10 +783,10 @@ _0807B8B8: bx r0 .align 2, 0 _0807B8C0: .4byte 0x000006d2 - thumb_func_end sub_807B864 + thumb_func_end LightRain_Main - thumb_func_start sub_807B8C4 -sub_807B8C4: @ 807B8C4 + thumb_func_start LightRain_Finish +LightRain_Finish: @ 807B8C4 push {r4,r5,lr} ldr r0, _0807B8E0 @ =gUnknown_83C2BBC ldr r2, [r0] @@ -836,7 +836,7 @@ _0807B91C: lsls r0, 24 cmp r0, 0 bne _0807B948 - bl sub_807BDD8 + bl DestroyRainSprites ldr r0, _0807B940 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r5, _0807B944 @ =0x000006ce @@ -856,7 +856,7 @@ _0807B94A: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_807B8C4 + thumb_func_end LightRain_Finish thumb_func_start sub_807B950 sub_807B950: @ 807B950 @@ -1207,8 +1207,8 @@ _0807BBFC: bx r0 thumb_func_end sub_807BB54 - thumb_func_start sub_807BC08 -sub_807BC08: @ 807BC08 + thumb_func_start LoadRainSpriteSheet +LoadRainSpriteSheet: @ 807BC08 push {lr} ldr r0, _0807BC14 @ =gUnknown_83C66CC bl LoadSpriteSheet @@ -1216,10 +1216,10 @@ sub_807BC08: @ 807BC08 bx r0 .align 2, 0 _0807BC14: .4byte gUnknown_83C66CC - thumb_func_end sub_807BC08 + thumb_func_end LoadRainSpriteSheet - thumb_func_start sub_807BC18 -sub_807BC18: @ 807BC18 + thumb_func_start CreateRainSprite +CreateRainSprite: @ 807BC18 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1372,7 +1372,7 @@ _0807BD3E: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807BC18 + thumb_func_end CreateRainSprite thumb_func_start sub_807BD4C sub_807BD4C: @ 807BD4C @@ -1449,8 +1449,8 @@ _0807BDD2: bx r1 thumb_func_end sub_807BD4C - thumb_func_start sub_807BDD8 -sub_807BDD8: @ 807BDD8 + thumb_func_start DestroyRainSprites +DestroyRainSprites: @ 807BDD8 push {r4-r7,lr} movs r4, 0 ldr r0, _0807BE20 @ =gUnknown_83C2BBC @@ -1492,10 +1492,10 @@ _0807BE0A: _0807BE20: .4byte gUnknown_83C2BBC _0807BE24: .4byte 0x000006da _0807BE28: .4byte 0x00001206 - thumb_func_end sub_807BDD8 + thumb_func_end DestroyRainSprites - thumb_func_start sub_807BE2C -sub_807BE2C: @ 807BE2C + thumb_func_start Snow_InitVars +Snow_InitVars: @ 807BE2C push {r4,lr} ldr r0, _0807BE68 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -1532,14 +1532,14 @@ _0807BE6C: .4byte 0x000006cc _0807BE70: .4byte 0x000006d2 _0807BE74: .4byte 0x000006c1 _0807BE78: .4byte 0x000006e5 - thumb_func_end sub_807BE2C + thumb_func_end Snow_InitVars - thumb_func_start sub_807BE7C -sub_807BE7C: @ 807BE7C + thumb_func_start Snow_InitAll +Snow_InitAll: @ 807BE7C push {r4-r7,lr} mov r7, r8 push {r7} - bl sub_807BE2C + bl Snow_InitVars ldr r2, _0807BEDC @ =gUnknown_83C2BBC ldr r1, [r2] ldr r3, _0807BEE0 @ =0x000006d2 @@ -1589,7 +1589,7 @@ _0807BED2: _0807BEDC: .4byte gUnknown_83C2BBC _0807BEE0: .4byte 0x000006d2 _0807BEE4: .4byte 0x000006e4 - thumb_func_end sub_807BE7C + thumb_func_end Snow_InitAll thumb_func_start snowflakes_progress2 snowflakes_progress2: @ 807BEE8 @@ -1622,8 +1622,8 @@ _0807BF1C: .4byte 0x000006cc _0807BF20: .4byte 0x000006d2 thumb_func_end snowflakes_progress2 - thumb_func_start sub_807BF24 -sub_807BF24: @ 807BF24 + thumb_func_start Snow_Finish +Snow_Finish: @ 807BF24 push {r4,lr} ldr r0, _0807BF3C @ =gUnknown_83C2BBC ldr r2, [r0] @@ -1673,7 +1673,7 @@ _0807BF82: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807BF24 + thumb_func_end Snow_Finish thumb_func_start snowflakes_progress snowflakes_progress: @ 807BF88 @@ -2157,7 +2157,7 @@ sub_807C2E4: @ 807C2E4 adds r1, r0 strb r3, [r1] movs r0, 0x4A - bl sub_807AFA8 + bl SetRainStrengthFromSoundEffect pop {r4,r5} pop {r0} bx r0 @@ -2184,7 +2184,7 @@ sub_807C358: @ 807C358 bne _0807C378 adds r4, r1, r2 _0807C36E: - bl sub_807C424 + bl Rain_Main ldrb r0, [r4] cmp r0, 0 beq _0807C36E @@ -2235,7 +2235,7 @@ sub_807C388: @ 807C388 strb r0, [r1] strb r4, [r3] movs r0, 0x4C - bl sub_807AFA8 + bl SetRainStrengthFromSoundEffect pop {r4,r5} pop {r0} bx r0 @@ -2261,7 +2261,7 @@ sub_807C3F4: @ 807C3F4 bne _0807C414 adds r4, r1, r2 _0807C40A: - bl sub_807C424 + bl Rain_Main ldrb r0, [r4] cmp r0, 0 beq _0807C40A @@ -2274,10 +2274,10 @@ _0807C41C: .4byte gUnknown_83C2BBC _0807C420: .4byte 0x000006d2 thumb_func_end sub_807C3F4 - thumb_func_start sub_807C424 -sub_807C424: @ 807C424 + thumb_func_start Rain_Main +Rain_Main: @ 807C424 push {r4,r5,lr} - bl sub_807C898 + bl UpdateThunderSound ldr r0, _0807C444 @ =gUnknown_83C2BBC ldr r0, [r0] ldr r1, _0807C448 @ =0x000006cc @@ -2314,7 +2314,7 @@ _0807C450: .4byte _0807C748 .4byte _0807C77C _0807C48C: - bl sub_807BC08 + bl LoadRainSpriteSheet ldr r0, _0807C4A0 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807C4A4 @ =0x000006cc @@ -2326,7 +2326,7 @@ _0807C48C: _0807C4A0: .4byte gUnknown_83C2BBC _0807C4A4: .4byte 0x000006cc _0807C4A8: - bl sub_807BC18 + bl CreateRainSprite lsls r0, 24 cmp r0, 0 beq _0807C4B4 @@ -2478,7 +2478,7 @@ _0807C5CA: cmp r0, 0x1 bne _0807C5EE movs r0, 0x14 - bl sub_807C85C + bl SetThunderCounter _0807C5EE: bl Random ldr r1, _0807C614 @ =gUnknown_83C2BBC @@ -2620,7 +2620,7 @@ _0807C704: cmp r0, 0 bne _0807C79A movs r0, 0x64 - bl sub_807C85C + bl SetThunderCounter movs r0, 0x13 bl sub_807A790 bl Random @@ -2688,10 +2688,10 @@ _0807C7A0: .4byte gUnknown_83C2BBC _0807C7A4: .4byte 0x000006c6 _0807C7A8: .4byte 0x000006ea _0807C7AC: .4byte 0x000006cc - thumb_func_end sub_807C424 + thumb_func_end Rain_Main - thumb_func_start sub_807C7B0 -sub_807C7B0: @ 807C7B0 + thumb_func_start Rain_Finish +Rain_Finish: @ 807C7B0 push {r4-r6,lr} ldr r0, _0807C7CC @ =gUnknown_83C2BBC ldr r6, [r0] @@ -2720,7 +2720,7 @@ _0807C7DA: adds r0, 0x1 strh r0, [r5] _0807C7E6: - bl sub_807C424 + bl Rain_Main ldr r0, _0807C824 @ =gUnknown_83C2BBC ldr r2, [r0] ldr r1, _0807C820 @ =0x000006ea @@ -2758,7 +2758,7 @@ _0807C830: lsrs r4, r0, 24 cmp r4, 0 bne _0807C854 - bl sub_807BDD8 + bl DestroyRainSprites ldr r1, _0807C850 @ =0x000006ed adds r0, r6, r1 strb r4, [r0] @@ -2776,10 +2776,10 @@ _0807C856: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_807C7B0 + thumb_func_end Rain_Finish - thumb_func_start sub_807C85C -sub_807C85C: @ 807C85C + thumb_func_start SetThunderCounter +SetThunderCounter: @ 807C85C push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -2808,10 +2808,10 @@ _0807C88A: .align 2, 0 _0807C890: .4byte gUnknown_83C2BBC _0807C894: .4byte 0x000006ed - thumb_func_end sub_807C85C + thumb_func_end SetThunderCounter - thumb_func_start sub_807C898 -sub_807C898: @ 807C898 + thumb_func_start UpdateThunderSound +UpdateThunderSound: @ 807C898 push {r4,lr} ldr r0, _0807C8D0 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -2861,10 +2861,10 @@ _0807C8F8: pop {r4} pop {r0} bx r0 - thumb_func_end sub_807C898 + thumb_func_end UpdateThunderSound - thumb_func_start sub_807C900 -sub_807C900: @ 807C900 + thumb_func_start Fog1_InitVars +Fog1_InitVars: @ 807C900 push {lr} ldr r0, _0807C94C @ =gUnknown_83C2BBC ldr r3, [r0] @@ -2899,7 +2899,7 @@ sub_807C900: @ 807C900 strh r1, [r0] movs r0, 0 movs r1, 0x10 - bl sub_807ADB0 + bl Weather_SetBlendCoeffs _0807C948: pop {r0} bx r0 @@ -2909,12 +2909,12 @@ _0807C950: .4byte 0x000006cc _0807C954: .4byte 0x000006d2 _0807C958: .4byte 0x000006c2 _0807C95C: .4byte 0x000006fb - thumb_func_end sub_807C900 + thumb_func_end Fog1_InitVars - thumb_func_start sub_807C960 -sub_807C960: @ 807C960 + thumb_func_start Fog1_InitAll +Fog1_InitAll: @ 807C960 push {r4,lr} - bl sub_807C900 + bl Fog1_InitVars ldr r0, _0807C988 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807C98C @ =0x000006d2 @@ -2924,7 +2924,7 @@ sub_807C960: @ 807C960 bne _0807C980 adds r4, r1, r2 _0807C976: - bl sub_807C990 + bl Fog1_Main ldrb r0, [r4] cmp r0, 0 beq _0807C976 @@ -2935,10 +2935,10 @@ _0807C980: .align 2, 0 _0807C988: .4byte gUnknown_83C2BBC _0807C98C: .4byte 0x000006d2 - thumb_func_end sub_807C960 + thumb_func_end Fog1_InitAll - thumb_func_start sub_807C990 -sub_807C990: @ 807C990 + thumb_func_start Fog1_Main +Fog1_Main: @ 807C990 push {r4-r6,lr} ldr r0, _0807C9DC @ =gUnknown_83C2BBC ldr r6, [r0] @@ -2984,7 +2984,7 @@ _0807C9E4: .4byte 0x000006f2 _0807C9E8: .4byte 0x000006ee _0807C9EC: .4byte 0x000006cc _0807C9F0: - bl sub_807CB4C + bl CreateFog1Sprites movs r3, 0xDA lsls r3, 3 adds r0, r6, r3 @@ -2994,13 +2994,13 @@ _0807C9F0: movs r0, 0xC movs r1, 0x8 movs r2, 0x3 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807CA16 _0807CA0C: movs r0, 0x4 movs r1, 0x10 movs r2, 0 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs _0807CA16: ldr r0, _0807CA28 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -3014,7 +3014,7 @@ _0807CA16: _0807CA28: .4byte gUnknown_83C2BBC _0807CA2C: .4byte 0x000006cc _0807CA30: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807CA46 @@ -3030,10 +3030,10 @@ _0807CA46: bx r0 .align 2, 0 _0807CA4C: .4byte 0x000006d2 - thumb_func_end sub_807C990 + thumb_func_end Fog1_Main - thumb_func_start sub_807CA50 -sub_807CA50: @ 807CA50 + thumb_func_start Fog1_Finish +Fog1_Finish: @ 807CA50 push {r4,lr} ldr r0, _0807CAA0 @ =gUnknown_83C2BBC ldr r2, [r0] @@ -3088,16 +3088,16 @@ _0807CABA: movs r0, 0 movs r1, 0x10 movs r2, 0x3 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807CAD6 _0807CAC6: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807CAE2 b _0807CAD6 _0807CAD2: - bl sub_807CC08 + bl DestroyFog1Sprites _0807CAD6: ldrh r0, [r4] adds r0, 0x1 @@ -3112,10 +3112,10 @@ _0807CAE4: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807CA50 + thumb_func_end Fog1_Finish - thumb_func_start sub_807CAEC -sub_807CAEC: @ 807CAEC + thumb_func_start Fog1SpriteCallback +Fog1SpriteCallback: @ 807CAEC push {r4,lr} adds r3, r0, 0 ldr r0, _0807CB38 @ =gUnknown_2021BCA @@ -3160,10 +3160,10 @@ _0807CB3C: .4byte gUnknown_83C2BBC _0807CB40: .4byte 0x000006ee _0807CB44: .4byte 0x010f0000 _0807CB48: .4byte 0x000001ff - thumb_func_end sub_807CAEC + thumb_func_end Fog1SpriteCallback - thumb_func_start sub_807CB4C -sub_807CB4C: @ 807CB4C + thumb_func_start CreateFog1Sprites +CreateFog1Sprites: @ 807CB4C push {r4,r5,lr} sub sp, 0x8 ldr r0, _0807CBC0 @ =gUnknown_83C2BBC @@ -3251,10 +3251,10 @@ _0807CBF6: .align 2, 0 _0807CC00: .4byte gUnknown_83C2BBC _0807CC04: .4byte 0x000006fb - thumb_func_end sub_807CB4C + thumb_func_end CreateFog1Sprites - thumb_func_start sub_807CC08 -sub_807CC08: @ 807CC08 + thumb_func_start DestroyFog1Sprites +DestroyFog1Sprites: @ 807CC08 push {r4,r5,lr} ldr r0, _0807CC50 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -3295,10 +3295,10 @@ _0807CC48: _0807CC50: .4byte gUnknown_83C2BBC _0807CC54: .4byte 0x000006fb _0807CC58: .4byte 0x00001201 - thumb_func_end sub_807CC08 + thumb_func_end DestroyFog1Sprites - thumb_func_start sub_807CC5C -sub_807CC5C: @ 807CC5C + thumb_func_start Ash_InitVars +Ash_InitVars: @ 807CC5C push {lr} ldr r0, _0807CCA8 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -3328,7 +3328,7 @@ sub_807CC5C: @ 807CC5C bne _0807CCA4 movs r0, 0 movs r1, 0x10 - bl sub_807ADB0 + bl Weather_SetBlendCoeffs movs r1, 0xFD lsls r1, 6 movs r0, 0x52 @@ -3341,12 +3341,12 @@ _0807CCA8: .4byte gUnknown_83C2BBC _0807CCAC: .4byte 0x000006cc _0807CCB0: .4byte 0x000006d2 _0807CCB4: .4byte 0x000006c2 - thumb_func_end sub_807CC5C + thumb_func_end Ash_InitVars - thumb_func_start sub_807CCB8 -sub_807CCB8: @ 807CCB8 + thumb_func_start Ash_InitAll +Ash_InitAll: @ 807CCB8 push {r4,lr} - bl sub_807CC5C + bl Ash_InitVars ldr r0, _0807CCE0 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807CCE4 @ =0x000006d2 @@ -3356,7 +3356,7 @@ sub_807CCB8: @ 807CCB8 bne _0807CCD8 adds r4, r1, r2 _0807CCCE: - bl sub_807CCE8 + bl Ash_Main ldrb r0, [r4] cmp r0, 0 beq _0807CCCE @@ -3367,10 +3367,10 @@ _0807CCD8: .align 2, 0 _0807CCE0: .4byte gUnknown_83C2BBC _0807CCE4: .4byte 0x000006d2 - thumb_func_end sub_807CCB8 + thumb_func_end Ash_InitAll - thumb_func_start sub_807CCE8 -sub_807CCE8: @ 807CCE8 + thumb_func_start Ash_Main +Ash_Main: @ 807CCE8 push {r4,r5,lr} ldr r2, _0807CD2C @ =gUnknown_83C2BBC ldr r1, [r2] @@ -3417,7 +3417,7 @@ _0807CD40: beq _0807CD68 b _0807CD88 _0807CD46: - bl sub_807CDFC + bl LoadAshSpriteSheet b _0807CD7A _0807CD4C: movs r1, 0xE0 @@ -3426,15 +3426,15 @@ _0807CD4C: ldrb r0, [r0] cmp r0, 0 bne _0807CD5C - bl sub_807CE0C + bl CreateAshSprites _0807CD5C: movs r0, 0x10 movs r1, 0 movs r2, 0x1 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807CD7A _0807CD68: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807CD8C @@ -3450,15 +3450,15 @@ _0807CD7A: .align 2, 0 _0807CD84: .4byte 0x000006d2 _0807CD88: - bl sub_807AE34 + bl Weather_UpdateBlend _0807CD8C: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_807CCE8 + thumb_func_end Ash_Main - thumb_func_start sub_807CD94 -sub_807CD94: @ 807CD94 + thumb_func_start Ash_Finish +Ash_Finish: @ 807CD94 push {r4,lr} ldr r0, _0807CDB0 @ =gUnknown_83C2BBC ldr r0, [r0] @@ -3483,14 +3483,14 @@ _0807CDBE: movs r0, 0 movs r1, 0x10 movs r2, 0x1 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807CDD8 _0807CDCA: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807CDF2 - bl sub_807CEB4 + bl DestroyAshSprites _0807CDD8: ldrh r0, [r4] adds r0, 0x1 @@ -3512,10 +3512,10 @@ _0807CDF4: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807CD94 + thumb_func_end Ash_Finish - thumb_func_start sub_807CDFC -sub_807CDFC: @ 807CDFC + thumb_func_start LoadAshSpriteSheet +LoadAshSpriteSheet: @ 807CDFC push {lr} ldr r0, _0807CE08 @ =gUnknown_83C67B0 bl LoadSpriteSheet @@ -3523,10 +3523,10 @@ sub_807CDFC: @ 807CDFC bx r0 .align 2, 0 _0807CE08: .4byte gUnknown_83C67B0 - thumb_func_end sub_807CDFC + thumb_func_end LoadAshSpriteSheet - thumb_func_start sub_807CE0C -sub_807CE0C: @ 807CE0C + thumb_func_start CreateAshSprites +CreateAshSprites: @ 807CE0C push {r4,r5,lr} ldr r0, _0807CE78 @ =gUnknown_83C2BBC ldr r0, [r0] @@ -3608,10 +3608,10 @@ _0807CEA8: bx r0 .align 2, 0 _0807CEB0: .4byte gUnknown_83C2BBC - thumb_func_end sub_807CE0C + thumb_func_end CreateAshSprites - thumb_func_start sub_807CEB4 -sub_807CEB4: @ 807CEB4 + thumb_func_start DestroyAshSprites +DestroyAshSprites: @ 807CEB4 push {r4,r5,lr} ldr r0, _0807CF00 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -3653,7 +3653,7 @@ _0807CEF8: .align 2, 0 _0807CF00: .4byte gUnknown_83C2BBC _0807CF04: .4byte 0x00001202 - thumb_func_end sub_807CEB4 + thumb_func_end DestroyAshSprites thumb_func_start sub_807CF08 sub_807CF08: @ 807CF08 @@ -3718,8 +3718,8 @@ _0807CF7C: .4byte 0x010f0000 _0807CF80: .4byte 0x000001ff thumb_func_end sub_807CF08 - thumb_func_start sub_807CF84 -sub_807CF84: @ 807CF84 + thumb_func_start Fog2_InitVars +Fog2_InitVars: @ 807CF84 push {r4,lr} ldr r0, _0807CFF4 @ =gUnknown_83C2BBC ldr r3, [r0] @@ -3771,7 +3771,7 @@ sub_807CF84: @ 807CF84 strh r2, [r0] movs r0, 0 movs r1, 0x10 - bl sub_807ADB0 + bl Weather_SetBlendCoeffs _0807CFEE: pop {r4} pop {r0} @@ -3782,12 +3782,12 @@ _0807CFF8: .4byte 0x000006cc _0807CFFC: .4byte 0x000006d2 _0807D000: .4byte 0x000006c2 _0807D004: .4byte 0x00000724 - thumb_func_end sub_807CF84 + thumb_func_end Fog2_InitVars - thumb_func_start sub_807D008 -sub_807D008: @ 807D008 + thumb_func_start Fog2_InitAll +Fog2_InitAll: @ 807D008 push {r4,lr} - bl sub_807CF84 + bl Fog2_InitVars ldr r0, _0807D030 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807D034 @ =0x000006d2 @@ -3797,7 +3797,7 @@ sub_807D008: @ 807D008 bne _0807D028 adds r4, r1, r2 _0807D01E: - bl sub_807D038 + bl Fog2_Main ldrb r0, [r4] cmp r0, 0 beq _0807D01E @@ -3808,10 +3808,10 @@ _0807D028: .align 2, 0 _0807D030: .4byte gUnknown_83C2BBC _0807D034: .4byte 0x000006d2 - thumb_func_end sub_807D008 + thumb_func_end Fog2_InitAll - thumb_func_start sub_807D038 -sub_807D038: @ 807D038 + thumb_func_start Fog2_Main +Fog2_Main: @ 807D038 push {r4,r5,lr} bl sub_807D0FC ldr r0, _0807D058 @ =gUnknown_83C2BBC @@ -3834,16 +3834,16 @@ _0807D060: beq _0807D078 b _0807D090 _0807D066: - bl sub_807D190 + bl CreateFog2Sprites b _0807D08A _0807D06C: movs r0, 0xC movs r1, 0x8 movs r2, 0x8 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807D08A _0807D078: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807D090 @@ -3861,10 +3861,10 @@ _0807D090: bx r0 .align 2, 0 _0807D098: .4byte 0x000006d2 - thumb_func_end sub_807D038 + thumb_func_end Fog2_Main - thumb_func_start sub_807D09C -sub_807D09C: @ 807D09C + thumb_func_start Fog2_Finish +Fog2_Finish: @ 807D09C push {r4,lr} bl sub_807D0FC ldr r0, _0807D0BC @ =gUnknown_83C2BBC @@ -3890,16 +3890,16 @@ _0807D0CA: movs r0, 0 movs r1, 0x10 movs r2, 0x1 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807D0E6 _0807D0D6: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807D0F2 b _0807D0E6 _0807D0E2: - bl sub_807D248 + bl DestroyFog2Sprites _0807D0E6: ldrh r0, [r4] adds r0, 0x1 @@ -3914,7 +3914,7 @@ _0807D0F4: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807D09C + thumb_func_end Fog2_Finish thumb_func_start sub_807D0FC sub_807D0FC: @ 807D0FC @@ -3990,8 +3990,8 @@ _0807D188: .4byte gUnknown_2021BC8 _0807D18C: .4byte gUnknown_2021BCA thumb_func_end sub_807D0FC - thumb_func_start sub_807D190 -sub_807D190: @ 807D190 + thumb_func_start CreateFog2Sprites +CreateFog2Sprites: @ 807D190 push {r4-r6,lr} sub sp, 0x8 ldr r0, _0807D1FC @ =gUnknown_83C2BBC @@ -4078,10 +4078,10 @@ _0807D236: .align 2, 0 _0807D240: .4byte gUnknown_83C2BBC _0807D244: .4byte 0x00000724 - thumb_func_end sub_807D190 + thumb_func_end CreateFog2Sprites - thumb_func_start sub_807D248 -sub_807D248: @ 807D248 + thumb_func_start DestroyFog2Sprites +DestroyFog2Sprites: @ 807D248 push {r4,r5,lr} ldr r0, _0807D290 @ =gUnknown_83C2BBC ldr r1, [r0] @@ -4123,10 +4123,10 @@ _0807D28A: _0807D290: .4byte gUnknown_83C2BBC _0807D294: .4byte 0x00000724 _0807D298: .4byte 0x00001203 - thumb_func_end sub_807D248 + thumb_func_end DestroyFog2Sprites - thumb_func_start sub_807D29C -sub_807D29C: @ 807D29C + thumb_func_start Fog2SpriteCallback +Fog2SpriteCallback: @ 807D29C push {r4,lr} adds r3, r0, 0 ldr r0, _0807D2EC @ =gUnknown_83C2BBC @@ -4172,10 +4172,10 @@ _0807D2EC: .4byte gUnknown_83C2BBC _0807D2F0: .4byte 0x0000071a _0807D2F4: .4byte 0x010f0000 _0807D2F8: .4byte 0x000001ff - thumb_func_end sub_807D29C + thumb_func_end Fog2SpriteCallback - thumb_func_start sub_807D2FC -sub_807D2FC: @ 807D2FC + thumb_func_start Sandstorm_InitVars +Sandstorm_InitVars: @ 807D2FC push {r4,lr} ldr r0, _0807D360 @ =gUnknown_83C2BBC ldr r3, [r0] @@ -4221,7 +4221,7 @@ sub_807D2FC: @ 807D2FC _0807D350: movs r0, 0 movs r1, 0x10 - bl sub_807ADB0 + bl Weather_SetBlendCoeffs _0807D358: pop {r4} pop {r0} @@ -4234,12 +4234,12 @@ _0807D36C: .4byte 0x000006c1 _0807D370: .4byte 0x000006c2 _0807D374: .4byte 0x00000716 _0807D378: .4byte 0x00000712 - thumb_func_end sub_807D2FC + thumb_func_end Sandstorm_InitVars - thumb_func_start sub_807D37C -sub_807D37C: @ 807D37C + thumb_func_start Sandstorm_InitAll +Sandstorm_InitAll: @ 807D37C push {r4,lr} - bl sub_807D2FC + bl Sandstorm_InitVars ldr r0, _0807D3A4 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807D3A8 @ =0x000006d2 @@ -4249,7 +4249,7 @@ sub_807D37C: @ 807D37C bne _0807D39C adds r4, r1, r2 _0807D392: - bl sub_807D3AC + bl Sandstorm_Main ldrb r0, [r4] cmp r0, 0 beq _0807D392 @@ -4260,10 +4260,10 @@ _0807D39C: .align 2, 0 _0807D3A4: .4byte gUnknown_83C2BBC _0807D3A8: .4byte 0x000006d2 - thumb_func_end sub_807D37C + thumb_func_end Sandstorm_InitAll - thumb_func_start sub_807D3AC -sub_807D3AC: @ 807D3AC + thumb_func_start Sandstorm_Main +Sandstorm_Main: @ 807D3AC push {r4,r5,lr} bl sub_807D4C4 bl sub_807D48C @@ -4296,17 +4296,17 @@ _0807D3E8: beq _0807D404 b _0807D41C _0807D3EE: - bl sub_807D5D8 - bl sub_807D698 + bl CreateSandstormSprites_1 + bl CreateSandstormSprites_2 b _0807D416 _0807D3F8: movs r0, 0x10 movs r1, 0 movs r2, 0 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807D416 _0807D404: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807D41C @@ -4324,10 +4324,10 @@ _0807D41C: bx r0 .align 2, 0 _0807D424: .4byte 0x000006d2 - thumb_func_end sub_807D3AC + thumb_func_end Sandstorm_Main - thumb_func_start sub_807D428 -sub_807D428: @ 807D428 + thumb_func_start Sandstorm_Finish +Sandstorm_Finish: @ 807D428 push {r4,lr} bl sub_807D4C4 bl sub_807D48C @@ -4354,10 +4354,10 @@ _0807D45A: movs r0, 0 movs r1, 0x10 movs r2, 0 - bl sub_807ADF0 + bl Weather_SetTargetBlendCoeffs b _0807D476 _0807D466: - bl sub_807AE34 + bl Weather_UpdateBlend lsls r0, 24 cmp r0, 0 beq _0807D482 @@ -4378,7 +4378,7 @@ _0807D484: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807D428 + thumb_func_end Sandstorm_Finish thumb_func_start sub_807D48C sub_807D48C: @ 807D48C @@ -4549,8 +4549,8 @@ _0807D5D0: .4byte 0x00001204 _0807D5D4: .4byte 0x00000717 thumb_func_end sub_807D544 - thumb_func_start sub_807D5D8 -sub_807D5D8: @ 807D5D8 + thumb_func_start CreateSandstormSprites_1 +CreateSandstormSprites_1: @ 807D5D8 push {r4-r7,lr} sub sp, 0x4 ldr r0, _0807D648 @ =gUnknown_83C2BBC @@ -4638,10 +4638,10 @@ _0807D686: .align 2, 0 _0807D690: .4byte gUnknown_83C2BBC _0807D694: .4byte 0x00000716 - thumb_func_end sub_807D5D8 + thumb_func_end CreateSandstormSprites_1 - thumb_func_start sub_807D698 -sub_807D698: @ 807D698 + thumb_func_start CreateSandstormSprites_2 +CreateSandstormSprites_2: @ 807D698 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -4720,7 +4720,7 @@ _0807D6B8: movs r3, 0 bl CalcCenterToCornerVec ldr r1, [r4] - ldr r0, _0807D758 @ =sub_807D7F8 + ldr r0, _0807D758 @ =SandstormSpriteCallback2 str r0, [r1, 0x1C] b _0807D76E .align 2, 0 @@ -4730,7 +4730,7 @@ _0807D748: .4byte gUnknown_83C683C _0807D74C: .4byte gUnknown_202063C _0807D750: .4byte 0x00006730 _0807D754: .4byte gUnknown_83C685C -_0807D758: .4byte sub_807D7F8 +_0807D758: .4byte SandstormSpriteCallback2 _0807D75C: mov r2, r9 ldr r0, [r2] @@ -4763,10 +4763,10 @@ _0807D784: bx r0 .align 2, 0 _0807D794: .4byte 0x00000717 - thumb_func_end sub_807D698 + thumb_func_end CreateSandstormSprites_2 - thumb_func_start sub_807D798 -sub_807D798: @ 807D798 + thumb_func_start SandstormSpriteCallback1 +SandstormSpriteCallback1: @ 807D798 push {r4,lr} adds r3, r0, 0 ldr r0, _0807D7E8 @ =gUnknown_83C2BBC @@ -4812,10 +4812,10 @@ _0807D7E8: .4byte gUnknown_83C2BBC _0807D7EC: .4byte 0x0000070e _0807D7F0: .4byte 0x010f0000 _0807D7F4: .4byte 0x000001ff - thumb_func_end sub_807D798 + thumb_func_end SandstormSpriteCallback1 - thumb_func_start sub_807D7F8 -sub_807D7F8: @ 807D7F8 + thumb_func_start SandstormSpriteCallback2 +SandstormSpriteCallback2: @ 807D7F8 push {lr} adds r2, r0, 0 ldrh r0, [r2, 0x34] @@ -4827,17 +4827,17 @@ sub_807D7F8: @ 807D7F8 negs r1, r1 cmp r0, r1 bne _0807D812 - ldr r0, _0807D818 @ =sub_807D81C + ldr r0, _0807D818 @ =SandstormSpriteCallback3 str r0, [r2, 0x1C] _0807D812: pop {r0} bx r0 .align 2, 0 -_0807D818: .4byte sub_807D81C - thumb_func_end sub_807D7F8 +_0807D818: .4byte SandstormSpriteCallback3 + thumb_func_end SandstormSpriteCallback2 - thumb_func_start sub_807D81C -sub_807D81C: @ 807D81C + thumb_func_start SandstormSpriteCallback3 +SandstormSpriteCallback3: @ 807D81C push {r4,r5,lr} adds r5, r0, 0 ldrh r0, [r5, 0x22] @@ -4898,10 +4898,10 @@ _0807D886: bx r0 .align 2, 0 _0807D88C: .4byte gUnknown_825E074 - thumb_func_end sub_807D81C + thumb_func_end SandstormSpriteCallback3 - thumb_func_start sub_807D890 -sub_807D890: @ 807D890 + thumb_func_start Weather11_InitVars +Weather11_InitVars: @ 807D890 ldr r0, _0807D8B0 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r0, _0807D8B4 @ =0x000006cc @@ -4922,15 +4922,15 @@ _0807D8B0: .4byte gUnknown_83C2BBC _0807D8B4: .4byte 0x000006cc _0807D8B8: .4byte 0x000006c1 _0807D8BC: .4byte 0x000006c2 - thumb_func_end sub_807D890 + thumb_func_end Weather11_InitVars - thumb_func_start sub_807D8C0 -sub_807D8C0: @ 807D8C0 + thumb_func_start Weather11_InitAll +Weather11_InitAll: @ 807D8C0 push {lr} - bl sub_807D890 + bl Weather11_InitVars pop {r0} bx r0 - thumb_func_end sub_807D8C0 + thumb_func_end Weather11_InitAll thumb_func_start nullsub_49 nullsub_49: @ 807D8CC @@ -4943,10 +4943,10 @@ sub_807D8D0: @ 807D8D0 bx lr thumb_func_end sub_807D8D0 - thumb_func_start sub_807D8D4 -sub_807D8D4: @ 807D8D4 + thumb_func_start Bubbles_InitVars +Bubbles_InitVars: @ 807D8D4 push {r4,r5,lr} - bl sub_807C900 + bl Fog1_InitVars ldr r0, _0807D914 @ =gUnknown_83C2BBC ldr r4, [r0] ldr r1, _0807D918 @ =0x0000072e @@ -4981,12 +4981,12 @@ _0807D918: .4byte 0x0000072e _0807D91C: .4byte gUnknown_83C6870 _0807D920: .4byte gUnknown_83C6868 _0807D924: .4byte 0x0000072a - thumb_func_end sub_807D8D4 + thumb_func_end Bubbles_InitVars - thumb_func_start sub_807D928 -sub_807D928: @ 807D928 + thumb_func_start Bubbles_InitAll +Bubbles_InitAll: @ 807D928 push {r4,lr} - bl sub_807D8D4 + bl Bubbles_InitVars ldr r0, _0807D950 @ =gUnknown_83C2BBC ldr r1, [r0] ldr r2, _0807D954 @ =0x000006d2 @@ -4996,7 +4996,7 @@ sub_807D928: @ 807D928 bne _0807D948 adds r4, r1, r2 _0807D93E: - bl sub_807D958 + bl Bubbles_Main ldrb r0, [r4] cmp r0, 0 beq _0807D93E @@ -5007,12 +5007,12 @@ _0807D948: .align 2, 0 _0807D950: .4byte gUnknown_83C2BBC _0807D954: .4byte 0x000006d2 - thumb_func_end sub_807D928 + thumb_func_end Bubbles_InitAll - thumb_func_start sub_807D958 -sub_807D958: @ 807D958 + thumb_func_start Bubbles_Main +Bubbles_Main: @ 807D958 push {r4-r7,lr} - bl sub_807C990 + bl Fog1_Main ldr r0, _0807D9B8 @ =gUnknown_83C2BBC ldr r5, [r0] ldr r0, _0807D9BC @ =0x00000726 @@ -5064,12 +5064,12 @@ _0807D9BC: .4byte 0x00000726 _0807D9C0: .4byte 0x0000ffff _0807D9C4: .4byte gUnknown_83C6868 _0807D9C8: .4byte 0x0000072a - thumb_func_end sub_807D958 + thumb_func_end Bubbles_Main - thumb_func_start sub_807D9CC -sub_807D9CC: @ 807D9CC + thumb_func_start Bubbles_Finish +Bubbles_Finish: @ 807D9CC push {lr} - bl sub_807CA50 + bl Fog1_Finish lsls r0, 24 cmp r0, 0 beq _0807D9DC @@ -5081,7 +5081,7 @@ _0807D9DC: _0807D9E2: pop {r1} bx r1 - thumb_func_end sub_807D9CC + thumb_func_end Bubbles_Finish thumb_func_start sub_807D9E8 sub_807D9E8: @ 807D9E8 @@ -5184,8 +5184,8 @@ _0807DAAC: .4byte gUnknown_83C68BC _0807DAB0: .4byte 0x00001205 thumb_func_end sub_807DA70 - thumb_func_start sub_807DAB4 -sub_807DAB4: @ 807DAB4 + thumb_func_start unc_0807DAB4 +unc_0807DAB4: @ 807DAB4 push {lr} adds r1, r0, 0 ldrh r0, [r1, 0x2E] @@ -5235,6 +5235,6 @@ _0807DAF4: _0807DB0E: pop {r0} bx r0 - thumb_func_end sub_807DAB4 + thumb_func_end unc_0807DAB4 .align 2, 0 @ Don't pad with nop. diff --git a/asm/fieldmap.s b/asm/fieldmap.s index e505631d5..3eaad3a9c 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -182,25 +182,25 @@ _08058B08: b _08058B44 _08058B12: adds r0, r6, 0 - bl sub_8058BB8 + bl fillSouthConnection ldrb r0, [r4] movs r1, 0x1 b _08058B40 _08058B1E: adds r0, r6, 0 - bl sub_8058C20 + bl fillNorthConnection ldrb r0, [r4] movs r1, 0x2 b _08058B40 _08058B2A: adds r0, r6, 0 - bl sub_8058C80 + bl fillWestConnection ldrb r0, [r4] movs r1, 0x4 b _08058B40 _08058B36: adds r0, r6, 0 - bl sub_8058CE0 + bl fillEastConnection ldrb r0, [r4] movs r1, 0x8 _08058B40: @@ -271,8 +271,8 @@ _08058BB0: .4byte gUnknown_3005040 _08058BB4: .4byte 0x001fffff thumb_func_end sub_8058B54 - thumb_func_start sub_8058BB8 -sub_8058BB8: @ 8058BB8 + thumb_func_start fillSouthConnection +fillSouthConnection: @ 8058BB8 push {r4-r7,lr} sub sp, 0xC adds r3, r0, 0 @@ -326,10 +326,10 @@ _08058C12: bx r0 .align 2, 0 _08058C1C: .4byte gUnknown_3005040 - thumb_func_end sub_8058BB8 + thumb_func_end fillSouthConnection - thumb_func_start sub_8058C20 -sub_8058C20: @ 8058C20 + thumb_func_start fillNorthConnection +fillNorthConnection: @ 8058C20 push {r4-r7,lr} sub sp, 0xC adds r5, r1, 0 @@ -380,10 +380,10 @@ _08058C74: bx r0 .align 2, 0 _08058C7C: .4byte gUnknown_3005040 - thumb_func_end sub_8058C20 + thumb_func_end fillNorthConnection - thumb_func_start sub_8058C80 -sub_8058C80: @ 8058C80 + thumb_func_start fillWestConnection +fillWestConnection: @ 8058C80 push {r4-r7,lr} sub sp, 0xC adds r5, r1, 0 @@ -434,10 +434,10 @@ _08058CD4: bx r0 .align 2, 0 _08058CDC: .4byte gUnknown_3005040 - thumb_func_end sub_8058C80 + thumb_func_end fillWestConnection - thumb_func_start sub_8058CE0 -sub_8058CE0: @ 8058CE0 + thumb_func_start fillEastConnection +fillEastConnection: @ 8058CE0 push {r4-r7,lr} sub sp, 0xC adds r3, r0, 0 @@ -490,7 +490,7 @@ _08058D38: bx r0 .align 2, 0 _08058D40: .4byte gUnknown_3005040 - thumb_func_end sub_8058CE0 + thumb_func_end fillEastConnection thumb_func_start MapGridGetZCoordAt MapGridGetZCoordAt: @ 8058D44 diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s index 7352043ac..b258e88dc 100644 --- a/asm/fldeff_teleport.s +++ b/asm/fldeff_teleport.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80F66F0 -sub_80F66F0: @ 80F66F0 + thumb_func_start SetUpFieldMove_Teleport +SetUpFieldMove_Teleport: @ 80F66F0 push {lr} ldr r0, _080F6708 @ =gUnknown_2036DFC ldrb r0, [r0, 0x17] @@ -35,7 +35,7 @@ _080F6720: .4byte gUnknown_3005024 _080F6724: .4byte hm_add_c3_launch_phase_2 _080F6728: .4byte gUnknown_203B0C4 _080F672C: .4byte hm_teleport_run_dp02scr - thumb_func_end sub_80F66F0 + thumb_func_end SetUpFieldMove_Teleport thumb_func_start hm_teleport_run_dp02scr hm_teleport_run_dp02scr: @ 80F6730 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index ea92a7688..b171801bd 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -1879,7 +1879,7 @@ _080F2CB4: ldrsh r1, [r4, r5] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _080F2D18 @ =gUnknown_2021D18 ldr r1, _080F2D1C @ =gUnknown_84160B4 adds r0, r5, 0 @@ -2685,7 +2685,7 @@ _080F3348: lsrs r1, 1 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN str r5, [sp] str r4, [sp, 0x4] add r0, sp, 0xC @@ -2702,7 +2702,7 @@ _080F3348: ldrh r1, [r7] movs r2, 0x2 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN str r5, [sp] str r4, [sp, 0x4] add r0, sp, 0xC diff --git a/asm/intro.s b/asm/intro.s index 9a9b2add2..8799502dd 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -276,13 +276,13 @@ _080EC7EC: .4byte 0x65366347 _080EC7F0: .4byte gMultiBootProgram_PokemonColosseum_Start _080EC7F4: bl GameCubeMultiBoot_Quit - ldr r0, _080EC804 @ =sub_800B798 + ldr r0, _080EC804 @ =SerialCB bl sub_8000718 _080EC7FE: movs r0, 0 b _080EC814 .align 2, 0 -_080EC804: .4byte sub_800B798 +_080EC804: .4byte SerialCB _080EC808: bl sub_800B388 ldr r0, _080EC81C @ =sub_80EC5B8 diff --git a/asm/item_menu.s b/asm/item_menu.s index 00626d795..0431ce7c9 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -1153,7 +1153,7 @@ _08108690: adds r1, r4, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08108724 @ =gUnknown_2021D18 ldr r1, _08108728 @ =gUnknown_84162B9 adds r0, r4, 0 @@ -3266,7 +3266,7 @@ sub_810971C: @ 810971C movs r1, 0x1 movs r2, 0x2 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _081097E0 @ =gUnknown_84162B9 mov r0, r9 bl StringExpandPlaceholders @@ -3322,7 +3322,7 @@ sub_81097E4: @ 81097E4 adds r1, r4, 0 movs r2, 0x2 adds r3, r5, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0810984C @ =gUnknown_2021D18 ldr r1, _08109850 @ =gUnknown_84162B9 adds r0, r4, 0 @@ -3955,7 +3955,7 @@ sub_8109D38: @ 8109D38 ldrsh r1, [r1, r2] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _08109DA4 @ =gUnknown_2021D18 ldr r1, _08109DA8 @ =gUnknown_8416409 adds r0, r5, 0 @@ -4131,7 +4131,7 @@ sub_8109EA8: @ 8109EA8 ldrsh r1, [r6, r2] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r6, _08109F38 @ =gUnknown_2021D18 ldr r1, _08109F3C @ =gUnknown_84163F4 adds r0, r6, 0 @@ -5100,7 +5100,7 @@ sub_810A690: @ 810A690 adds r0, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0810A700 @ =gUnknown_2021D18 ldr r1, _0810A704 @ =gUnknown_8416936 adds r0, r4, 0 @@ -5200,7 +5200,7 @@ sub_810A770: @ 810A770 movs r1, 0x1 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r6, _0810A824 @ =gUnknown_2021D18 ldr r1, _0810A828 @ =gUnknown_84162B9 adds r0, r6, 0 @@ -5417,7 +5417,7 @@ sub_810A940: @ 810A940 adds r0, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0810A9C8 @ =gUnknown_2021D18 ldr r1, _0810A9CC @ =gUnknown_8416959 adds r0, r4, 0 @@ -5762,7 +5762,7 @@ sub_810AC40: @ 810AC40 ldrsh r1, [r7, r2] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0810ACE0 @ =gUnknown_2021D18 ldr r1, _0810ACE4 @ =gUnknown_84163A7 adds r0, r4, 0 diff --git a/asm/item_pc.s b/asm/item_pc.s index 213d3486c..239cc0f6e 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -802,7 +802,7 @@ _0810DA58: ldr r0, _0810DAA8 @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0810DAAC @ =gUnknown_2021D18 ldr r1, _0810DAB0 @ =gUnknown_84162B9 adds r0, r4, 0 @@ -2054,7 +2054,7 @@ sub_810E418: @ 810E418 ldrsh r1, [r5, r2] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0810E4AC @ =gUnknown_2021D18 ldr r1, _0810E4B0 @ =gUnknown_84177C5 adds r0, r4, 0 @@ -2262,7 +2262,7 @@ sub_810E5E0: @ 810E5E0 movs r1, 0x1 movs r2, 0x2 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0810E66C @ =gUnknown_84162B9 adds r0, r5, 0 bl StringExpandPlaceholders @@ -2315,7 +2315,7 @@ sub_810E670: @ 810E670 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0810E6D0 @ =gUnknown_2021D18 ldr r1, _0810E6D4 @ =gUnknown_84162B9 adds r0, r4, 0 diff --git a/asm/item_use.s b/asm/item_use.s index 5e29072ff..63cd71e10 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -620,7 +620,7 @@ sub_80A1460: @ 80A1460 adds r0, r4, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _080A14B8 @ =gUnknown_2021D18 ldr r1, _080A14BC @ =gUnknown_8416537 adds r0, r4, 0 @@ -679,7 +679,7 @@ sub_80A14E8: @ 80A14E8 adds r0, r4, 0 movs r2, 0 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _080A153C @ =gUnknown_2021D18 ldr r1, _080A1540 @ =gUnknown_8416644 adds r0, r4, 0 diff --git a/asm/itemfinder.s b/asm/itemfinder.s index 9e7c441f8..c3d2e64a5 100644 --- a/asm/itemfinder.s +++ b/asm/itemfinder.s @@ -112,7 +112,7 @@ sub_813ED3C: @ 813ED3C ldrsh r0, [r4, r2] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_813F2F0 + bl GetPlayerDirectionTowardsHiddenItem lsls r0, 24 lsrs r5, r0, 24 movs r1, 0x8 @@ -871,8 +871,8 @@ _0813F2E2: bx r0 thumb_func_end sub_813F220 - thumb_func_start sub_813F2F0 -sub_813F2F0: @ 813F2F0 + thumb_func_start GetPlayerDirectionTowardsHiddenItem +GetPlayerDirectionTowardsHiddenItem: @ 813F2F0 push {r4,r5,lr} lsls r0, 16 lsls r1, 16 @@ -943,7 +943,7 @@ _0813F35E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_813F2F0 + thumb_func_end GetPlayerDirectionTowardsHiddenItem thumb_func_start sub_813F364 sub_813F364: @ 813F364 diff --git a/asm/learn_move.s b/asm/learn_move.s index c4c40678d..70ec808d5 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1589,7 +1589,7 @@ _080E5388: add r0, sp, 0x8 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -1625,7 +1625,7 @@ _080E53D4: add r0, sp, 0x8 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -1644,7 +1644,7 @@ _080E53F4: add r0, sp, 0x8 movs r2, 0 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r4, 0 str r4, [sp] str r4, [sp, 0x4] diff --git a/asm/link.s b/asm/link.s index fe93ca1d4..5f29d6806 100644 --- a/asm/link.s +++ b/asm/link.s @@ -231,7 +231,7 @@ sub_8009640: @ 8009640 bl ResetTasks ldr r0, _080096D4 @ =sub_800978C bl SetVBlankCallback - bl sub_800A294 + bl ResetBlockSend ldr r1, _080096D8 @ =gUnknown_202271A ldr r2, _080096DC @ =0x00001111 adds r0, r2, 0 @@ -239,7 +239,7 @@ sub_8009640: @ 8009640 bl sub_8009804 ldr r0, _080096E0 @ =gUnknown_30030F0 ldrh r0, [r0, 0x24] - bl sub_8044EE8 + bl SeedRng movs r4, 0 _08009670: bl Random @@ -450,7 +450,7 @@ sub_8009804: @ 8009804 ldr r0, _08009860 @ =gUnknown_3003F38 strb r4, [r0] bl ResetBlockReceivedFlags - bl sub_800A294 + bl ResetBlockSend ldr r0, _08009864 @ =gUnknown_3000E4C str r4, [r0] ldr r0, _08009868 @ =gUnknown_3003F28 @@ -531,8 +531,8 @@ _080098E0: .4byte gUnknown_3003F3C _080098E4: .4byte gUnknown_2022718 thumb_func_end sub_80098B8 - thumb_func_start sub_80098E8 -sub_80098E8: @ 80098E8 + thumb_func_start TestBlockTransfer +TestBlockTransfer: @ 80098E8 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -604,7 +604,7 @@ _08009958: lsls r1, 2 add r1, r9 ldrh r1, [r1, 0x2] - bl sub_800A5E4 + bl LinkTestCalcBlockChecksum ldr r1, _080099C4 @ =gUnknown_3003F88 adds r4, r1 movs r6, 0 @@ -641,10 +641,10 @@ _080099C0: .4byte gUnknown_2022118 _080099C4: .4byte gUnknown_3003F88 _080099C8: .4byte gUnknown_2022110 _080099CC: .4byte gUnknown_2022111 - thumb_func_end sub_80098E8 + thumb_func_end TestBlockTransfer - thumb_func_start sub_80099D0 -sub_80099D0: @ 80099D0 + thumb_func_start LinkTestProcessKeyInput +LinkTestProcessKeyInput: @ 80099D0 push {r4,r5,lr} sub sp, 0x4 ldr r4, _08009A70 @ =gUnknown_30030F0 @@ -665,7 +665,7 @@ _080099E6: beq _080099FA ldr r0, _08009A78 @ =gHeap + 0x4000 ldr r1, _08009A7C @ =0x00002004 - bl sub_800A2A8 + bl InitBlockSend _080099FA: ldrh r1, [r4, 0x2E] movs r0, 0x80 @@ -687,7 +687,7 @@ _08009A16: cmp r0, 0 beq _08009A26 movs r0, 0x1 - bl sub_800B09C + bl SetSuppressLinkErrorMessage _08009A26: ldrh r1, [r4, 0x2E] movs r0, 0x80 @@ -734,16 +734,16 @@ _08009A7C: .4byte 0x00002004 _08009A80: .4byte gUnknown_2022110 _08009A84: .4byte gUnknown_300357C _08009A88: .4byte gUnknown_3003F80 - thumb_func_end sub_80099D0 + thumb_func_end LinkTestProcessKeyInput thumb_func_start c2_08009A8C c2_08009A8C: @ 8009A8C push {lr} - bl sub_80099D0 + bl LinkTestProcessKeyInput movs r0, 0x1 movs r1, 0x1 movs r2, 0 - bl sub_80098E8 + bl TestBlockTransfer bl RunTasks bl AnimateSprites bl BuildOamBuffer @@ -752,8 +752,8 @@ c2_08009A8C: @ 8009A8C bx r0 thumb_func_end c2_08009A8C - thumb_func_start sub_8009AB0 -sub_8009AB0: @ 8009AB0 + thumb_func_start LinkMain2 +LinkMain2: @ 8009AB0 push {r4,r5,lr} adds r4, r0, 0 ldr r0, _08009AC0 @ =gUnknown_2022718 @@ -811,10 +811,10 @@ _08009B18: .4byte gUnknown_3003F50 _08009B1C: .4byte gUnknown_3003F20 _08009B20: .4byte 0x04000128 _08009B24: .4byte gUnknown_3003F80 - thumb_func_end sub_8009AB0 + thumb_func_end LinkMain2 - thumb_func_start sub_8009B28 -sub_8009B28: @ 8009B28 + thumb_func_start HandleReceiveRemoteLinkPlayer +HandleReceiveRemoteLinkPlayer: @ 8009B28 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 @@ -833,7 +833,7 @@ _08009B40: adds r5, r0 adds r4, 0x1 _08009B48: - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -852,7 +852,7 @@ _08009B64: bx r0 .align 2, 0 _08009B6C: .4byte gUnknown_3003F64 - thumb_func_end sub_8009B28 + thumb_func_end HandleReceiveRemoteLinkPlayer thumb_func_start sub_8009B70 sub_8009B70: @ 8009B70 @@ -985,7 +985,7 @@ _08009C38: ldrb r2, [r4, 0x2] strb r2, [r1, 0x2] movs r1, 0x3C - bl sub_800A2A8 + bl InitBlockSend b _08009E3E .align 2, 0 _08009C7C: .4byte gUnknown_3003E70 @@ -1161,7 +1161,7 @@ _08009DD8: .4byte c2_800ACD4 _08009DDC: lsls r0, r6, 24 lsrs r0, 24 - bl sub_8009B28 + bl HandleReceiveRemoteLinkPlayer b _08009E3E _08009DE6: lsls r0, r6, 24 @@ -1574,7 +1574,7 @@ sub_800A0D0: @ 800A0D0 ldrb r4, [r0] cmp r4, 0x1 bne _0800A1C8 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -1710,8 +1710,8 @@ _0800A1E8: .4byte gUnknown_202271C _0800A1EC: .4byte gUnknown_3000E54 thumb_func_end sub_800A0D0 - thumb_func_start sub_800A1F0 -sub_800A1F0: @ 800A1F0 + thumb_func_start IsLinkPlayerDataExchangeComplete +IsLinkPlayerDataExchangeComplete: @ 800A1F0 push {r4-r6,lr} movs r6, 0 movs r4, 0 @@ -1766,7 +1766,7 @@ _0800A24C: bx r1 .align 2, 0 _0800A254: .4byte gUnknown_3000E54 - thumb_func_end sub_800A1F0 + thumb_func_end IsLinkPlayerDataExchangeComplete thumb_func_start GetLinkPlayerTrainerId GetLinkPlayerTrainerId: @ 800A258 @@ -1805,8 +1805,8 @@ _0800A276: _0800A290: .4byte gUnknown_202273C thumb_func_end sub_800A270 - thumb_func_start sub_800A294 -sub_800A294: @ 800A294 + thumb_func_start ResetBlockSend +ResetBlockSend: @ 800A294 ldr r1, _0800A2A4 @ =gUnknown_3000E08 movs r0, 0 strb r0, [r1, 0x8] @@ -1816,10 +1816,10 @@ sub_800A294: @ 800A294 bx lr .align 2, 0 _0800A2A4: .4byte gUnknown_3000E08 - thumb_func_end sub_800A294 + thumb_func_end ResetBlockSend - thumb_func_start sub_800A2A8 -sub_800A2A8: @ 800A2A8 + thumb_func_start InitBlockSend +InitBlockSend: @ 800A2A8 push {r4-r7,lr} adds r7, r0, 0 adds r6, r1, 0 @@ -1857,7 +1857,7 @@ _0800A2EA: ldr r0, _0800A308 @ =0x0000bbbb bl sub_8009E60 ldr r1, _0800A30C @ =gUnknown_3003F80 - ldr r0, _0800A310 @ =sub_800A318 + ldr r0, _0800A310 @ =LinkCB_BlockSendBegin str r0, [r1] ldr r1, _0800A314 @ =gUnknown_3000E48 movs r0, 0 @@ -1871,12 +1871,12 @@ _0800A2FE: _0800A304: .4byte gUnknown_2022618 _0800A308: .4byte 0x0000bbbb _0800A30C: .4byte gUnknown_3003F80 -_0800A310: .4byte sub_800A318 +_0800A310: .4byte LinkCB_BlockSendBegin _0800A314: .4byte gUnknown_3000E48 - thumb_func_end sub_800A2A8 + thumb_func_end InitBlockSend - thumb_func_start sub_800A318 -sub_800A318: @ 800A318 + thumb_func_start LinkCB_BlockSendBegin +LinkCB_BlockSendBegin: @ 800A318 push {lr} ldr r1, _0800A330 @ =gUnknown_3000E48 ldr r0, [r1] @@ -1885,7 +1885,7 @@ sub_800A318: @ 800A318 cmp r0, 0x2 bls _0800A32C ldr r1, _0800A334 @ =gUnknown_3003F80 - ldr r0, _0800A338 @ =sub_800A33C + ldr r0, _0800A338 @ =LinkCB_BlockSend str r0, [r1] _0800A32C: pop {r0} @@ -1893,11 +1893,11 @@ _0800A32C: .align 2, 0 _0800A330: .4byte gUnknown_3000E48 _0800A334: .4byte gUnknown_3003F80 -_0800A338: .4byte sub_800A33C - thumb_func_end sub_800A318 +_0800A338: .4byte LinkCB_BlockSend + thumb_func_end LinkCB_BlockSendBegin - thumb_func_start sub_800A33C -sub_800A33C: @ 800A33C + thumb_func_start LinkCB_BlockSend +LinkCB_BlockSend: @ 800A33C push {r4-r6,lr} ldr r0, _0800A38C @ =gUnknown_3000E08 ldr r5, [r0, 0x4] @@ -1945,7 +1945,7 @@ _0800A390: .4byte gUnknown_3003F50 _0800A394: .4byte 0x00008888 _0800A398: .4byte gUnknown_3003F80 _0800A39C: .4byte sub_800A3A0 - thumb_func_end sub_800A33C + thumb_func_end LinkCB_BlockSend thumb_func_start sub_800A3A0 sub_800A3A0: @ 800A3A0 @@ -2061,7 +2061,7 @@ SendBlock: @ 800A448 cmp r0, 0x1 beq _0800A464 adds r0, r3, 0 - bl sub_800A2A8 + bl InitBlockSend b _0800A46A .align 2, 0 _0800A460: .4byte gUnknown_3003F3C @@ -2289,8 +2289,8 @@ _0800A5DC: .4byte gUnknown_3003F20 _0800A5E0: .4byte gUnknown_3003F84 thumb_func_end sub_800A5BC - thumb_func_start sub_800A5E4 -sub_800A5E4: @ 800A5E4 + thumb_func_start LinkTestCalcBlockChecksum +LinkTestCalcBlockChecksum: @ 800A5E4 push {r4,lr} adds r4, r0, 0 lsls r1, 16 @@ -2316,10 +2316,10 @@ _0800A60A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_800A5E4 + thumb_func_end LinkTestCalcBlockChecksum - thumb_func_start sub_800A614 -sub_800A614: @ 800A614 + thumb_func_start PrintHexDigit +PrintHexDigit: @ 800A614 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -2348,7 +2348,7 @@ sub_800A614: @ 800A614 bx r0 .align 2, 0 _0800A648: .4byte gUnknown_3003F70 - thumb_func_end sub_800A614 + thumb_func_end PrintHexDigit thumb_func_start sub_800A64C sub_800A64C: @ 800A64C @@ -2416,7 +2416,7 @@ _0800A6B6: ldrb r0, [r0] adds r1, r6, 0 adds r2, r7, 0 - bl sub_800A614 + bl PrintHexDigit adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -2570,28 +2570,28 @@ task00_link_test: @ 800A74C movs r2, 0xD movs r3, 0x8 bl sub_800A684 - bl sub_800B054 + bl GetSioMultiSI lsls r0, 24 lsrs r0, 24 movs r1, 0x19 movs r2, 0x5 movs r3, 0x1 bl sub_800A684 - bl sub_800B064 + bl IsSioMultiMaster lsls r0, 24 lsrs r0, 24 movs r1, 0x19 movs r2, 0x6 movs r3, 0x1 bl sub_800A684 - bl sub_800B08C + bl IsLinkConnectionEstablished lsls r0, 24 lsrs r0, 24 movs r1, 0x19 movs r2, 0x7 movs r3, 0x1 bl sub_800A684 - bl sub_800B0A8 + bl HasLinkErrorOccurred lsls r0, 24 lsrs r0, 24 movs r1, 0x19 @@ -2871,8 +2871,8 @@ _0800AA30: .4byte gUnknown_3003F40 _0800AA34: .4byte gUnknown_3003F60 thumb_func_end sub_800AA24 - thumb_func_start sub_800AA38 -sub_800AA38: @ 800AA38 + thumb_func_start GetLinkPlayerCount_2 +GetLinkPlayerCount_2: @ 800AA38 ldr r0, _0800AA44 @ =gUnknown_3003F20 ldr r0, [r0] movs r1, 0x1C @@ -2881,7 +2881,7 @@ sub_800AA38: @ 800AA38 bx lr .align 2, 0 _0800AA44: .4byte gUnknown_3003F20 - thumb_func_end sub_800AA38 + thumb_func_end GetLinkPlayerCount_2 thumb_func_start sub_800AA48 sub_800AA48: @ 800AA48 @@ -3610,8 +3610,8 @@ _0800B048: _0800B050: .4byte gUnknown_30030F0 thumb_func_end sub_800AF2C - thumb_func_start sub_800B054 -sub_800B054: @ 800B054 + thumb_func_start GetSioMultiSI +GetSioMultiSI: @ 800B054 ldr r0, _0800B060 @ =0x04000128 ldrh r0, [r0] lsrs r0, 2 @@ -3620,10 +3620,10 @@ sub_800B054: @ 800B054 bx lr .align 2, 0 _0800B060: .4byte 0x04000128 - thumb_func_end sub_800B054 + thumb_func_end GetSioMultiSI - thumb_func_start sub_800B064 -sub_800B064: @ 800B064 + thumb_func_start IsSioMultiMaster +IsSioMultiMaster: @ 800B064 push {lr} movs r3, 0 ldr r2, _0800B088 @ =0x04000128 @@ -3644,10 +3644,10 @@ _0800B080: bx r1 .align 2, 0 _0800B088: .4byte 0x04000128 - thumb_func_end sub_800B064 + thumb_func_end IsSioMultiMaster - thumb_func_start sub_800B08C -sub_800B08C: @ 800B08C + thumb_func_start IsLinkConnectionEstablished +IsLinkConnectionEstablished: @ 800B08C ldr r0, _0800B098 @ =gUnknown_3003F20 ldr r0, [r0] lsrs r0, 6 @@ -3656,25 +3656,25 @@ sub_800B08C: @ 800B08C bx lr .align 2, 0 _0800B098: .4byte gUnknown_3003F20 - thumb_func_end sub_800B08C + thumb_func_end IsLinkConnectionEstablished - thumb_func_start sub_800B09C -sub_800B09C: @ 800B09C + thumb_func_start SetSuppressLinkErrorMessage +SetSuppressLinkErrorMessage: @ 800B09C ldr r1, _0800B0A4 @ =gUnknown_3003F38 strb r0, [r1] bx lr .align 2, 0 _0800B0A4: .4byte gUnknown_3003F38 - thumb_func_end sub_800B09C + thumb_func_end SetSuppressLinkErrorMessage - thumb_func_start sub_800B0A8 -sub_800B0A8: @ 800B0A8 + thumb_func_start HasLinkErrorOccurred +HasLinkErrorOccurred: @ 800B0A8 ldr r0, _0800B0B0 @ =gUnknown_3003EAC ldrb r0, [r0] bx lr .align 2, 0 _0800B0B0: .4byte gUnknown_3003EAC - thumb_func_end sub_800B0A8 + thumb_func_end HasLinkErrorOccurred thumb_func_start sub_800B0B4 sub_800B0B4: @ 800B0B4 @@ -3780,11 +3780,11 @@ HandleLinkConnection: @ 800B178 ldr r0, _0800B1B4 @ =gUnknown_3003F84 ldr r1, _0800B1B8 @ =gUnknown_3003F50 ldr r2, _0800B1BC @ =gUnknown_3003ED0 - bl sub_800B398 + bl LinkMain1 ldr r4, _0800B1C0 @ =gUnknown_3003F20 str r0, [r4] ldr r0, _0800B1C4 @ =gUnknown_300311C - bl sub_8009AB0 + bl LinkMain2 ldr r0, [r4] movs r1, 0x80 lsls r1, 1 @@ -4044,8 +4044,8 @@ sub_800B388: @ 800B388 bx r0 thumb_func_end sub_800B388 - thumb_func_start sub_800B398 -sub_800B398: @ 800B398 + thumb_func_start LinkMain1 +LinkMain1: @ 800B398 push {r4-r7,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -4094,7 +4094,7 @@ _0800B3F8: beq _0800B408 cmp r1, 0x2 beq _0800B420 - bl sub_800B4C4 + bl CheckMasterOrSlave b _0800B44A _0800B408: ldr r2, _0800B41C @ =gUnknown_3003FB0 @@ -4119,7 +4119,7 @@ _0800B420: _0800B42C: .4byte gUnknown_3003FB0 _0800B430: .4byte 0x0400012a _0800B434: - bl sub_800B4F0 + bl InitTimer ldr r1, _0800B484 @ =gUnknown_3003FB0 movs r0, 0x4 strb r0, [r1, 0x1] @@ -4195,10 +4195,10 @@ _0800B4BA: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_800B398 + thumb_func_end LinkMain1 - thumb_func_start sub_800B4C4 -sub_800B4C4: @ 800B4C4 + thumb_func_start CheckMasterOrSlave +CheckMasterOrSlave: @ 800B4C4 push {lr} ldr r0, _0800B4E0 @ =0x04000128 ldr r1, [r0] @@ -4221,10 +4221,10 @@ _0800B4E8: _0800B4EC: pop {r0} bx r0 - thumb_func_end sub_800B4C4 + thumb_func_end CheckMasterOrSlave - thumb_func_start sub_800B4F0 -sub_800B4F0: @ 800B4F0 + thumb_func_start InitTimer +InitTimer: @ 800B4F0 push {lr} ldr r0, _0800B514 @ =gUnknown_3003FB0 ldrb r0, [r0] @@ -4246,7 +4246,7 @@ _0800B50E: _0800B514: .4byte gUnknown_3003FB0 _0800B518: .4byte 0x0400010c _0800B51C: .4byte 0x0000ff3b - thumb_func_end sub_800B4F0 + thumb_func_end InitTimer thumb_func_start sub_800B520 sub_800B520: @ 800B520 @@ -4573,14 +4573,14 @@ _0800B784: .4byte gUnknown_3000E64 thumb_func_start Timer3Intr Timer3Intr: @ 800B788 push {lr} - bl sub_800BAF8 + bl StopTimer bl sub_800B820 pop {r0} bx r0 thumb_func_end Timer3Intr - thumb_func_start sub_800B798 -sub_800B798: @ 800B798 + thumb_func_start SerialCB +SerialCB: @ 800B798 push {r4,lr} ldr r4, _0800B7C4 @ =gUnknown_3003FB0 ldr r0, _0800B7C8 @ =0x04000128 @@ -4596,15 +4596,15 @@ sub_800B798: @ 800B798 lsls r0, r1, 25 lsrs r0, 31 strb r0, [r4, 0x10] - bl sub_800B92C - bl sub_800BA44 - bl sub_800BB2C + bl DoRecv + bl DoSend + bl SendRecvDone b _0800B7EA .align 2, 0 _0800B7C4: .4byte gUnknown_3003FB0 _0800B7C8: .4byte 0x04000128 _0800B7CC: - bl sub_800B830 + bl DoHandshake lsls r0, 24 cmp r0, 0 beq _0800B7EA @@ -4645,7 +4645,7 @@ _0800B810: .4byte gUnknown_3003FB0 _0800B814: .4byte gUnknown_3000E64 _0800B818: .4byte gUnknown_3004F70 _0800B81C: .4byte 0x00000fbd - thumb_func_end sub_800B798 + thumb_func_end SerialCB thumb_func_start sub_800B820 sub_800B820: @ 800B820 @@ -4659,8 +4659,8 @@ sub_800B820: @ 800B820 _0800B82C: .4byte 0x04000128 thumb_func_end sub_800B820 - thumb_func_start sub_800B830 -sub_800B830: @ 800B830 + thumb_func_start DoHandshake +DoHandshake: @ 800B830 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -4787,10 +4787,10 @@ _0800B91E: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_800B830 + thumb_func_end DoHandshake - thumb_func_start sub_800B92C -sub_800B92C: @ 800B92C + thumb_func_start DoRecv +DoRecv: @ 800B92C push {r4-r7,lr} mov r7, r8 push {r7} @@ -4936,10 +4936,10 @@ _0800BA30: .align 2, 0 _0800BA3C: .4byte gUnknown_3000E68 _0800BA40: .4byte 0x00000fbd - thumb_func_end sub_800B92C + thumb_func_end DoRecv - thumb_func_start sub_800BA44 -sub_800BA44: @ 800BA44 + thumb_func_start DoSend +DoSend: @ 800BA44 push {r4,lr} ldr r0, _0800BA80 @ =gUnknown_3003FB0 ldrb r1, [r0, 0x16] @@ -5030,10 +5030,10 @@ _0800BAEC: bx r0 .align 2, 0 _0800BAF4: .4byte 0x0400012a - thumb_func_end sub_800BA44 + thumb_func_end DoSend - thumb_func_start sub_800BAF8 -sub_800BAF8: @ 800BAF8 + thumb_func_start StopTimer +StopTimer: @ 800BAF8 push {lr} ldr r0, _0800BB18 @ =gUnknown_3003FB0 ldrb r0, [r0] @@ -5057,10 +5057,10 @@ _0800BB1C: .4byte 0x0400010e _0800BB20: .4byte 0x0000ff7f _0800BB24: .4byte 0x0400010c _0800BB28: .4byte 0x0000ff3b - thumb_func_end sub_800BAF8 + thumb_func_end StopTimer - thumb_func_start sub_800BB2C -sub_800BB2C: @ 800BB2C + thumb_func_start SendRecvDone +SendRecvDone: @ 800BB2C push {lr} ldr r1, _0800BB40 @ =gUnknown_3003FB0 ldrb r0, [r1, 0x17] @@ -5086,10 +5086,10 @@ _0800BB54: bx r0 .align 2, 0 _0800BB58: .4byte 0x0400010e - thumb_func_end sub_800BB2C + thumb_func_end SendRecvDone - thumb_func_start sub_800BB5C -sub_800BB5C: @ 800BB5C + thumb_func_start ResetSendBuffer +ResetSendBuffer: @ 800BB5C push {r4-r6,lr} ldr r1, _0800BBA4 @ =gUnknown_3003FB0 ldr r2, _0800BBA8 @ =0x00000339 @@ -5131,10 +5131,10 @@ _0800BB82: _0800BBA4: .4byte gUnknown_3003FB0 _0800BBA8: .4byte 0x00000339 _0800BBAC: .4byte 0x0000efff - thumb_func_end sub_800BB5C + thumb_func_end ResetSendBuffer - thumb_func_start sub_800BBB0 -sub_800BBB0: @ 800BBB0 + thumb_func_start ResetRecvBuffer +ResetRecvBuffer: @ 800BBB0 push {r4-r7,lr} ldr r1, _0800BC10 @ =gUnknown_3003FB0 ldr r2, _0800BC14 @ =0x00000fbd @@ -5191,6 +5191,6 @@ _0800BC10: .4byte gUnknown_3003FB0 _0800BC14: .4byte 0x00000fbd _0800BC18: .4byte 0x00000fbc _0800BC1C: .4byte 0x0000efff - thumb_func_end sub_800BBB0 + thumb_func_end ResetRecvBuffer .align 2, 0 @ Don't pad with nop. diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index 03a1b32ed..8609dd759 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -6878,7 +6878,7 @@ sub_80FBA78: @ 80FBA78 bl sub_8009804 ldr r0, _080FBB00 @ =gUnknown_30030F0 ldrh r0, [r0, 0x24] - bl sub_8044EE8 + bl SeedRng movs r4, 0 _080FBAB4: bl Random diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 35ae2c48d..9e0ecef51 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -135,7 +135,7 @@ sub_8115924: @ 8115924 add r0, sp, 0x8 movs r2, 0x2 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r5, 0 add r1, sp, 0x8 bl StringAppend @@ -3406,7 +3406,7 @@ sub_81174B4: @ 81174B4 bl GetMultiplayerId ldr r1, _08117530 @ =gUnknown_300502C strb r0, [r1] - bl sub_806E08C + bl SetCableClubWarp lsls r4, 24 asrs r4, 24 lsls r5, 24 @@ -6896,7 +6896,7 @@ _08119414: adds r0, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _08119460 @ =gUnknown_2021D18 ldr r1, _08119464 @ =gUnknown_8458DBC bl StringExpandPlaceholders @@ -9500,7 +9500,7 @@ sub_811A81C: @ 811A81C adds r1, 0x1 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0811A908 @ =gUnknown_84571B0 mov r0, r8 bl StringAppend @@ -9553,7 +9553,7 @@ sub_811A81C: @ 811A81C add r0, sp, 0x8 movs r2, 0x2 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0811A90C @ =gUnknown_84571B4 mov r0, r8 bl StringCopy @@ -9635,7 +9635,7 @@ sub_811A910: @ 811A910 add r0, sp, 0x8 movs r2, 0x2 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0811A9B0 @ =gUnknown_2021D18 ldr r1, _0811A9B4 @ =gUnknown_84571B4 adds r0, r4, 0 @@ -10015,7 +10015,7 @@ _0811AC3C: mov r1, r9 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x2 add r1, sp, 0x8 movs r2, 0 @@ -10474,7 +10474,7 @@ _0811AFC8: ldrh r1, [r4, 0xC] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r6, 0 adds r0, 0x63 ldrh r2, [r4, 0xA] @@ -10505,7 +10505,7 @@ _0811AFFA: adds r0, 0x6E movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldrh r1, [r5, 0x2] movs r0, 0xB muls r1, r0 @@ -10992,7 +10992,7 @@ sub_811B31C: @ 811B31C adds r0, r5, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x3 adds r1, r5, 0 bl UnkTextUtil_SetPtrI @@ -11004,7 +11004,7 @@ sub_811B31C: @ 811B31C mov r0, r10 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r4, r9 adds r4, 0xE8 mov r2, r8 @@ -11012,7 +11012,7 @@ sub_811B31C: @ 811B31C adds r0, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x4 mov r1, r10 bl UnkTextUtil_SetPtrI @@ -11038,7 +11038,7 @@ _0811B40A: adds r0, r6, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0 adds r1, r6, 0 bl UnkTextUtil_SetPtrI @@ -11053,7 +11053,7 @@ _0811B426: adds r0, r4, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x2 adds r1, r4, 0 bl UnkTextUtil_SetPtrI @@ -11062,7 +11062,7 @@ _0811B426: adds r0, r5, 0 movs r2, 0 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x3 adds r1, r5, 0 bl UnkTextUtil_SetPtrI @@ -11460,7 +11460,7 @@ _0811B730: b _0811B748 _0811B742: adds r0, r4, 0 - bl sub_80688E4 + bl FreezeMapObject _0811B748: movs r0, 0x1 _0811B74A: diff --git a/asm/mail.s b/asm/mail.s index 1597c407c..c4f41b453 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -92,7 +92,7 @@ _080BEC90: str r0, [r2] ldrh r0, [r5, 0x1E] mov r1, sp - bl sub_8097F20 + bl MailSpeciesToSpecies lsls r0, 16 ldr r1, _080BECCC @ =0xffff0000 adds r0, r1 diff --git a/asm/mail_data.s b/asm/mail_data.s index a1fdc62a9..191120b57 100644 --- a/asm/mail_data.s +++ b/asm/mail_data.s @@ -276,7 +276,7 @@ _08097E36: bl GetBoxMonData adds r1, r0, 0 adds r0, r4, 0 - bl sub_8097F00 + bl SpeciesToMailSpecies ldr r1, _08097EC0 @ =gUnknown_3005008 ldr r3, [r1] mov r4, r9 @@ -338,8 +338,8 @@ _08097EEE: bx r1 thumb_func_end sub_8097D38 - thumb_func_start sub_8097F00 -sub_8097F00: @ 8097F00 + thumb_func_start SpeciesToMailSpecies +SpeciesToMailSpecies: @ 8097F00 push {lr} lsls r0, 16 lsrs r0, 16 @@ -356,10 +356,10 @@ _08097F18: bx r1 .align 2, 0 _08097F1C: .4byte 0x75300000 - thumb_func_end sub_8097F00 + thumb_func_end SpeciesToMailSpecies - thumb_func_start sub_8097F20 -sub_8097F20: @ 8097F20 + thumb_func_start MailSpeciesToSpecies +MailSpeciesToSpecies: @ 8097F20 push {lr} lsls r0, 16 lsrs r3, r0, 16 @@ -379,7 +379,7 @@ _08097F3C: _08097F3E: pop {r1} bx r1 - thumb_func_end sub_8097F20 + thumb_func_end MailSpeciesToSpecies thumb_func_start GiveMailToMon2 GiveMailToMon2: @ 8097F44 diff --git a/asm/main.s b/asm/main.s index 06d7e7d51..b7ac8c75c 100644 --- a/asm/main.s +++ b/asm/main.s @@ -217,7 +217,7 @@ SeedRngAndSetTrainerId: @ 8000564 ldr r0, _08000580 @ =0x04000104 ldrh r4, [r0] adds r0, r4, 0 - bl sub_8044EE8 + bl SeedRng ldr r1, _08000584 @ =0x04000106 movs r0, 0 strh r0, [r1] diff --git a/asm/main_menu.s b/asm/main_menu.s index a73f766de..7ad15ad26 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -1462,7 +1462,7 @@ sub_800CED4: @ 800CED4 add r0, sp, 0xC movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r1, 0xF0 strb r1, [r0] adds r0, 0x1 @@ -1470,7 +1470,7 @@ sub_800CED4: @ 800CED4 ldrb r1, [r1, 0x10] movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN str r6, [sp] str r5, [sp, 0x4] add r0, sp, 0xC @@ -1530,7 +1530,7 @@ _0800CF6A: adds r1, r6, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0800CFC0 @ =gUnknown_841B6EB bl StringAppend str r5, [sp] @@ -1591,7 +1591,7 @@ _0800CFE2: adds r1, r6, 0 movs r2, 0x2 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0800D040 @ =gUnknown_841B6F3 bl StringAppend str r5, [sp] diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s index 27588fe2d..64836a40e 100644 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -473,7 +473,7 @@ _080984B4: adds r0, r2, 0 movs r2, 0 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r2, r0, 0 adds r1, r2, 0 movs r0, 0xC0 diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index 341d6608a..abbdfb115 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80688E4 -sub_80688E4: @ 80688E4 + thumb_func_start FreezeMapObject +FreezeMapObject: @ 80688E4 push {r4,r5,lr} adds r5, r0, 0 ldrh r1, [r5] @@ -80,7 +80,7 @@ _0806896E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80688E4 + thumb_func_end FreezeMapObject thumb_func_start player_bitmagic player_bitmagic: @ 8068974 @@ -101,7 +101,7 @@ _0806897A: cmp r4, r0 beq _08068998 adds r0, r1, 0 - bl sub_80688E4 + bl FreezeMapObject _08068998: adds r0, r4, 0x1 lsls r0, 24 @@ -116,8 +116,8 @@ _080689A8: .4byte gUnknown_2036E38 _080689AC: .4byte gUnknown_2037078 thumb_func_end player_bitmagic - thumb_func_start sub_80689B0 -sub_80689B0: @ 80689B0 + thumb_func_start FreezeMapObjectsExceptOne +FreezeMapObjectsExceptOne: @ 80689B0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -139,7 +139,7 @@ _080689BA: cmp r4, r0 beq _080689DC adds r0, r1, 0 - bl sub_80688E4 + bl FreezeMapObject _080689DC: adds r0, r4, 0x1 lsls r0, 24 @@ -152,7 +152,7 @@ _080689DC: .align 2, 0 _080689EC: .4byte gUnknown_2036E38 _080689F0: .4byte gUnknown_2037078 - thumb_func_end sub_80689B0 + thumb_func_end FreezeMapObjectsExceptOne thumb_func_start npc_sync_anim_pause_bits npc_sync_anim_pause_bits: @ 80689F4 @@ -1130,7 +1130,7 @@ sub_8069094: @ 8069094 ldr r1, _080690F8 @ =gUnknown_202063C adds r4, r0, r1 adds r0, r5, 0 - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldrh r3, [r4, 0x4] lsls r3, 22 ldr r1, [r0, 0x10] @@ -1474,7 +1474,7 @@ DoRippleFieldEffect: @ 806930C push {r4,lr} adds r4, r1, 0 ldrb r0, [r0, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo ldr r2, _08069344 @ =gUnknown_20386E0 movs r3, 0x20 ldrsh r1, [r4, r3] diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index b461e6339..cc0b11174 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -112,7 +112,7 @@ _080695F6: cmp r0, 0 blt _0806961E adds r0, r1, 0 - bl sub_80688E4 + bl FreezeMapObject movs r0, 0x1 strh r0, [r5, 0xA] _0806961E: @@ -161,7 +161,7 @@ LockSelectedMapObject: @ 806966C push {r4,r5,lr} ldr r4, _080696B0 @ =gUnknown_3005074 ldrb r0, [r4] - bl sub_80689B0 + bl FreezeMapObjectsExceptOne ldr r0, _080696B4 @ =sub_80695CC movs r1, 0x50 bl CreateTask @@ -178,7 +178,7 @@ LockSelectedMapObject: @ 806966C cmp r0, 0 blt _080696AA adds r0, r1, 0 - bl sub_80688E4 + bl FreezeMapObject ldr r0, _080696BC @ =gUnknown_3005090 lsls r1, r5, 2 adds r1, r5 diff --git a/asm/math_util.s b/asm/math_util.s index 249a4508d..fc245ab7f 100644 --- a/asm/math_util.s +++ b/asm/math_util.s @@ -5,8 +5,8 @@ .text - thumb_func_start .gcc2_compiled._3 -.gcc2_compiled._3: @ 80D8AA0 + thumb_func_start sub_80D8AA0 +sub_80D8AA0: @ 80D8AA0 push {lr} lsls r0, 16 asrs r0, 16 @@ -22,7 +22,7 @@ _080D8AB4: asrs r0, 16 pop {r1} bx r1 - thumb_func_end .gcc2_compiled._3 + thumb_func_end sub_80D8AA0 thumb_func_start sub_80D8ABC sub_80D8ABC: @ 80D8ABC diff --git a/asm/mevent.s b/asm/mevent.s index 43540662c..e8cf40c37 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -133,7 +133,7 @@ sub_81436BC: @ 81436BC strh r0, [r1] bl sub_8009804 movs r0, 0x1 - bl sub_800B09C + bl SetSuppressLinkErrorMessage pop {r0} bx r0 .align 2, 0 @@ -199,7 +199,7 @@ sub_814374C: @ 814374C lsls r0, 24 cmp r0, 0 beq _08143768 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -224,7 +224,7 @@ sub_8143770: @ 8143770 lsrs r0, 24 cmp r0, 0x2 bhi _08143794 - bl sub_800B0A8 + bl HasLinkErrorOccurred lsls r0, 24 cmp r0, 0 beq _08143794 @@ -258,7 +258,7 @@ _081437C4: lsls r0, 24 cmp r0, 0 beq _08143814 - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -280,7 +280,7 @@ _081437E0: strb r0, [r4] b _08143898 _081437F8: - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -317,7 +317,7 @@ _0814382C: movs r0, 0x5 b _0814389A _08143842: - bl sub_800B08C + bl IsLinkConnectionEstablished lsls r0, 24 cmp r0, 0 beq _08143898 @@ -325,7 +325,7 @@ _08143842: ldrb r0, [r0] cmp r0, 0 beq _08143872 - bl sub_800A1F0 + bl IsLinkPlayerDataExchangeComplete lsls r0, 24 cmp r0, 0 beq _0814386C @@ -586,7 +586,7 @@ _08143A5C: .align 2, 0 _08143A7C: .4byte gUnknown_30030F0 _08143A80: - bl sub_800AA38 + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -756,7 +756,7 @@ _08143BEC: strb r0, [r4, 0x8] b _08143D1A _08143BF6: - bl sub_800B0A8 + bl HasLinkErrorOccurred lsls r0, 24 cmp r0, 0 beq _08143C06 diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index b5297f5e9..12ddb1f2c 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -477,7 +477,7 @@ _081459F2: _08145A2C: .4byte gUnknown_203F3C8 _08145A30: bl sub_81461D8 - bl sub_8097114 + bl FreeMonIconPalettes b _08145A7A _08145A3A: ldr r0, _08145A48 @ =gUnknown_203F3B8 @@ -581,7 +581,7 @@ _08145AF4: ldr r1, [r1, 0x4] movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r6, r4, 0 _08145B06: ldr r2, [r6] @@ -802,7 +802,7 @@ _08145CA8: ldrh r1, [r1] movs r2, 0x2 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r0, r8 ldr r1, [r0] adds r0, r1, r7 diff --git a/asm/money.s b/asm/money.s index ae850ec92..7f8b514fc 100644 --- a/asm/money.s +++ b/asm/money.s @@ -152,7 +152,7 @@ sub_809FE40: @ 809FE40 adds r0, r4, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r4, 0 bl StringLength lsls r0, 16 @@ -225,7 +225,7 @@ sub_809FEC4: @ 809FEC4 adds r1, r3, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r4, 0 bl StringLength lsls r0, 16 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index 5a4306a80..c826cefd8 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -35,8 +35,8 @@ _080DA82A: bx r1 thumb_func_end sub_80DA800 - thumb_func_start sub_80DA830 -sub_80DA830: @ 80DA830 + thumb_func_start SetIncompatible +SetIncompatible: @ 80DA830 push {lr} ldr r0, _080DA844 @ =gUnknown_2021D18 ldr r1, _080DA848 @ =gUnknown_8488DFD @@ -48,10 +48,10 @@ sub_80DA830: @ 80DA830 .align 2, 0 _080DA844: .4byte gUnknown_2021D18 _080DA848: .4byte gUnknown_8488DFD - thumb_func_end sub_80DA830 + thumb_func_end SetIncompatible - thumb_func_start sub_80DA84C -sub_80DA84C: @ 80DA84C + thumb_func_start InitMysteryEventScript +InitMysteryEventScript: @ 80DA84C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -72,10 +72,10 @@ sub_80DA84C: @ 80DA84C .align 2, 0 _080DA874: .4byte gUnknown_81DBCF0 _080DA878: .4byte 0x081dbd34 - thumb_func_end sub_80DA84C + thumb_func_end InitMysteryEventScript - thumb_func_start sub_80DA87C -sub_80DA87C: @ 80DA87C + thumb_func_start RunMysteryEventScriptCommand +RunMysteryEventScriptCommand: @ 80DA87C push {r4,lr} adds r4, r0, 0 bl sub_8069804 @@ -93,14 +93,14 @@ _080DA896: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80DA87C + thumb_func_end RunMysteryEventScriptCommand thumb_func_start sub_80DA89C sub_80DA89C: @ 80DA89C push {lr} adds r1, r0, 0 ldr r0, _080DA8AC @ =gUnknown_203AA3C - bl sub_80DA84C + bl InitMysteryEventScript pop {r0} bx r0 .align 2, 0 @@ -113,7 +113,7 @@ sub_80DA8B0: @ 80DA8B0 adds r5, r0, 0 ldr r4, _080DA8C8 @ =gUnknown_203AA3C adds r0, r4, 0 - bl sub_80DA87C + bl RunMysteryEventScriptCommand ldr r1, [r4, 0x6C] str r1, [r5] pop {r4,r5} @@ -157,8 +157,8 @@ script_status_stop_and_ret_1: @ 80DA8F4 bx r1 thumb_func_end script_status_stop_and_ret_1 - thumb_func_start sub_80DA900 -sub_80DA900: @ 80DA900 + thumb_func_start MEScrCmd_checkcompat +MEScrCmd_checkcompat: @ 80DA900 push {r4-r7,lr} adds r7, r0, 0 bl ScriptReadWord @@ -188,13 +188,13 @@ sub_80DA900: @ 80DA900 str r0, [r7, 0x70] b _080DA948 _080DA944: - bl sub_80DA830 + bl SetIncompatible _080DA948: movs r0, 0x1 pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80DA900 + thumb_func_end MEScrCmd_checkcompat thumb_func_start sub_80DA950 sub_80DA950: @ 80DA950 @@ -202,8 +202,8 @@ sub_80DA950: @ 80DA950 bx lr thumb_func_end sub_80DA950 - thumb_func_start sub_80DA954 -sub_80DA954: @ 80DA954 + thumb_func_start MEScrCmd_setstatus +MEScrCmd_setstatus: @ 80DA954 ldr r1, [r0, 0x8] ldrb r2, [r1] adds r1, 0x1 @@ -211,10 +211,10 @@ sub_80DA954: @ 80DA954 str r2, [r0, 0x6C] movs r0, 0 bx lr - thumb_func_end sub_80DA954 + thumb_func_end MEScrCmd_setstatus - thumb_func_start sub_80DA964 -sub_80DA964: @ 80DA964 + thumb_func_start MEScrCmd_setmsg +MEScrCmd_setmsg: @ 80DA964 push {r4,r5,lr} adds r4, r0, 0 ldr r0, [r4, 0x8] @@ -242,10 +242,10 @@ _080DA98E: bx r1 .align 2, 0 _080DA998: .4byte gUnknown_2021D18 - thumb_func_end sub_80DA964 + thumb_func_end MEScrCmd_setmsg - thumb_func_start sub_80DA99C -sub_80DA99C: @ 80DA99C + thumb_func_start MEScrCmd_runscript +MEScrCmd_runscript: @ 80DA99C push {r4,lr} adds r4, r0, 0 bl ScriptReadWord @@ -258,10 +258,10 @@ sub_80DA99C: @ 80DA99C pop {r4} pop {r1} bx r1 - thumb_func_end sub_80DA99C + thumb_func_end MEScrCmd_runscript - thumb_func_start sub_80DA9B8 -sub_80DA9B8: @ 80DA9B8 + thumb_func_start MEScrCmd_setenigmaberry +MEScrCmd_setenigmaberry: @ 80DA9B8 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -346,10 +346,10 @@ _080DAA70: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80DA9B8 + thumb_func_end MEScrCmd_setenigmaberry - thumb_func_start sub_80DAA80 -sub_80DAA80: @ 80DAA80 + thumb_func_start MEScrCmd_giveribbon +MEScrCmd_giveribbon: @ 80DAA80 push {r4,lr} adds r4, r0, 0 ldr r2, [r4, 0x8] @@ -372,10 +372,10 @@ sub_80DAA80: @ 80DAA80 .align 2, 0 _080DAAAC: .4byte gUnknown_2021D18 _080DAAB0: .4byte gUnknown_8488CF6 - thumb_func_end sub_80DAA80 + thumb_func_end MEScrCmd_giveribbon - thumb_func_start sub_80DAAB4 -sub_80DAAB4: @ 80DAAB4 + thumb_func_start MEScrCmd_initramscript +MEScrCmd_initramscript: @ 80DAAB4 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -424,7 +424,7 @@ sub_80DAAB4: @ 80DAAB4 pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80DAAB4 + thumb_func_end MEScrCmd_initramscript thumb_func_start sub_80DAB1C sub_80DAB1C: @ 80DAB1C @@ -445,8 +445,8 @@ _080DAB38: .4byte gUnknown_2021D18 _080DAB3C: .4byte gUnknown_8488D2A thumb_func_end sub_80DAB1C - thumb_func_start sub_80DAB40 -sub_80DAB40: @ 80DAB40 + thumb_func_start MEScrCmd_addrareword +MEScrCmd_addrareword: @ 80DAB40 push {r4,lr} adds r4, r0, 0 ldr r1, [r4, 0x8] @@ -466,13 +466,13 @@ sub_80DAB40: @ 80DAB40 .align 2, 0 _080DAB64: .4byte gUnknown_2021D18 _080DAB68: .4byte gUnknown_8488D60 - thumb_func_end sub_80DAB40 + thumb_func_end MEScrCmd_addrareword thumb_func_start sub_80DAB6C sub_80DAB6C: @ 80DAB6C push {r4,lr} adds r4, r0, 0 - bl sub_80DA830 + bl SetIncompatible movs r0, 0 str r0, [r4, 0x70] movs r0, 0x1 @@ -636,7 +636,7 @@ _080DACD0: .4byte gUnknown_8488DBD sub_80DACD4: @ 80DACD4 push {r4,lr} adds r4, r0, 0 - bl sub_80DA830 + bl SetIncompatible movs r0, 0 str r0, [r4, 0x70] movs r0, 0x1 @@ -645,8 +645,8 @@ sub_80DACD4: @ 80DACD4 bx r1 thumb_func_end sub_80DACD4 - thumb_func_start sub_80DACE8 -sub_80DACE8: @ 80DACE8 + thumb_func_start MEScrCmd_checksum +MEScrCmd_checksum: @ 80DACE8 push {r4-r6,lr} adds r6, r0, 0 bl ScriptReadWord @@ -679,10 +679,10 @@ _080DAD26: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80DACE8 + thumb_func_end MEScrCmd_checksum - thumb_func_start sub_80DAD30 -sub_80DAD30: @ 80DAD30 + thumb_func_start MEScrCmd_crc +MEScrCmd_crc: @ 80DAD30 push {r4-r6,lr} adds r6, r0, 0 bl ScriptReadWord @@ -717,6 +717,6 @@ _080DAD72: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80DAD30 + thumb_func_end MEScrCmd_crc .align 2, 0 @ Don't pad with nop. diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 5293e0c23..86cf748d3 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -699,7 +699,7 @@ sub_809DF28: @ 809DF28 cmp r0, 0 bne _0809DF50 movs r0, 0x1 - bl sub_809F240 + bl SetInputState movs r0, 0x1 bl sub_809EA64 ldr r0, _0809DF5C @ =gUnknown_203998C @@ -737,7 +737,7 @@ sub_809DF74: @ 809DF74 cmp r0, 0 beq _0809DF96 movs r0, 0x1 - bl sub_809F240 + bl SetInputState bl sub_809E9F8 ldr r0, _0809DF9C @ =gUnknown_203998C ldr r0, [r0] @@ -759,7 +759,7 @@ pokemon_store: @ 809DFA4 push {r4,lr} bl sub_809F7EC movs r0, 0 - bl sub_809F240 + bl SetInputState movs r0, 0 bl sub_809EA64 movs r0, 0x3 @@ -1036,7 +1036,7 @@ _0809E20C: .4byte 0x00001e10 sub_809E210: @ 809E210 push {lr} movs r0, 0 - bl sub_809F240 + bl SetInputState bl sub_809EC20 bl sub_809E30C movs r0, 0x1 @@ -1140,7 +1140,7 @@ _0809E2E4: bl sub_809E948 bl sub_809FA60 movs r0, 0x1 - bl sub_809F240 + bl SetInputState movs r0, 0 bl sub_809EA0C _0809E302: @@ -1511,7 +1511,7 @@ c3_0809E58C: @ 809E58C ldrb r3, [r4, 0xE] adds r1, r3, 0 adds r2, r3, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents ldrh r1, [r4, 0x12] movs r2, 0x12 ldrsh r0, [r4, r2] @@ -1800,7 +1800,7 @@ _0809E7AE: adds r1, r4, 0 adds r2, r5, 0 adds r3, r5, 0 - bl sub_8083A88 + bl MultiplyInvertedPaletteRGBComponents _0809E7E4: pop {r4-r6} pop {r0} @@ -2951,7 +2951,7 @@ _0809F0C8: .4byte gUnknown_202063C thumb_func_start sub_809F0CC sub_809F0CC: @ 809F0CC push {r4,r5,lr} - bl sub_809F21C + bl GetInputEvent lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 @@ -3012,7 +3012,7 @@ sub_809F11C: @ 809F11C cmp r4, 0 beq _0809F156 movs r0, 0 - bl sub_809F240 + bl SetInputState ldr r0, _0809F160 @ =gUnknown_203998C ldr r0, [r0] ldr r1, _0809F164 @ =0x00001e10 @@ -3029,8 +3029,8 @@ _0809F160: .4byte gUnknown_203998C _0809F164: .4byte 0x00001e10 thumb_func_end sub_809F11C - thumb_func_start sub_809F168 -sub_809F168: @ 809F168 + thumb_func_start KeyboardKeyHandler_Page +KeyboardKeyHandler_Page: @ 809F168 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -3051,10 +3051,10 @@ _0809F18A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_809F168 + thumb_func_end KeyboardKeyHandler_Page - thumb_func_start sub_809F190 -sub_809F190: @ 809F190 + thumb_func_start KeyboardKeyHandler_Backspace +KeyboardKeyHandler_Backspace: @ 809F190 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -3071,10 +3071,10 @@ _0809F1AA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_809F190 + thumb_func_end KeyboardKeyHandler_Backspace - thumb_func_start sub_809F1B4 -sub_809F1B4: @ 809F1B4 + thumb_func_start KeyboardKeyHandler_OK +KeyboardKeyHandler_OK: @ 809F1B4 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -3104,7 +3104,7 @@ _0809F1E2: .align 2, 0 _0809F1E8: .4byte gUnknown_203998C _0809F1EC: .4byte 0x00001e10 - thumb_func_end sub_809F1B4 + thumb_func_end KeyboardKeyHandler_OK thumb_func_start sub_809F1F0 sub_809F1F0: @ 809F1F0 @@ -3121,8 +3121,8 @@ _0809F200: .4byte gUnknown_203998C _0809F204: .4byte 0x00001e10 thumb_func_end sub_809F1F0 - thumb_func_start sub_809F208 -sub_809F208: @ 809F208 + thumb_func_start InputInit +InputInit: @ 809F208 push {lr} ldr r0, _0809F218 @ =sub_809F26C movs r1, 0x1 @@ -3131,10 +3131,10 @@ sub_809F208: @ 809F208 bx r0 .align 2, 0 _0809F218: .4byte sub_809F26C - thumb_func_end sub_809F208 + thumb_func_end InputInit - thumb_func_start sub_809F21C -sub_809F21C: @ 809F21C + thumb_func_start GetInputEvent +GetInputEvent: @ 809F21C push {lr} ldr r0, _0809F238 @ =sub_809F26C bl FindTaskIdByFunc @@ -3151,10 +3151,10 @@ sub_809F21C: @ 809F21C .align 2, 0 _0809F238: .4byte sub_809F26C _0809F23C: .4byte gUnknown_3005090 - thumb_func_end sub_809F21C + thumb_func_end GetInputEvent - thumb_func_start sub_809F240 -sub_809F240: @ 809F240 + thumb_func_start SetInputState +SetInputState: @ 809F240 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -3175,7 +3175,7 @@ sub_809F240: @ 809F240 .align 2, 0 _0809F264: .4byte sub_809F26C _0809F268: .4byte gUnknown_3005090 - thumb_func_end sub_809F240 + thumb_func_end SetInputState thumb_func_start sub_809F26C sub_809F26C: @ 809F26C @@ -3202,15 +3202,15 @@ _0809F294: .4byte gUnknown_83E23E0 _0809F298: .4byte gUnknown_3005090 thumb_func_end sub_809F26C - thumb_func_start sub_809F29C -sub_809F29C: @ 809F29C + thumb_func_start InputState_Disabled +InputState_Disabled: @ 809F29C movs r1, 0 strh r1, [r0, 0xA] bx lr - thumb_func_end sub_809F29C + thumb_func_end InputState_Disabled - thumb_func_start sub_809F2A4 -sub_809F2A4: @ 809F2A4 + thumb_func_start InputState_Enabled +InputState_Enabled: @ 809F2A4 push {lr} adds r2, r0, 0 movs r0, 0 @@ -3256,7 +3256,7 @@ _0809F2EE: _0809F2F4: pop {r0} bx r0 - thumb_func_end sub_809F2A4 + thumb_func_end InputState_Enabled thumb_func_start sub_809F2F8 sub_809F2F8: @ 809F2F8 @@ -4012,7 +4012,7 @@ _0809F8BC: .4byte gUnknown_83E26E4 thumb_func_start sub_809F8C0 sub_809F8C0: @ 809F8C0 push {lr} - bl sub_809F208 + bl InputInit bl sub_809E4F0 pop {r0} bx r0 diff --git a/asm/option_menu.s b/asm/option_menu.s index 24a5947d1..6d10782d7 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -925,7 +925,7 @@ _08088A9C: adds r0, r4, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN add r0, sp, 0xC adds r1, r4, 0 movs r2, 0x3 diff --git a/asm/overworld.s b/asm/overworld.s index 3a63b53f0..1f545aa1e 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -79,7 +79,7 @@ sub_8054C48: @ 8054C48 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN pop {r4,r5} pop {r0} bx r0 @@ -1564,8 +1564,8 @@ sub_8055778: @ 8055778 _08055788: .4byte gUnknown_3005008 thumb_func_end sub_8055778 - thumb_func_start sub_805578C -sub_805578C: @ 805578C + thumb_func_start GetMapConnection +GetMapConnection: @ 805578C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1599,7 +1599,7 @@ _080557BE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_805578C + thumb_func_end GetMapConnection thumb_func_start sub_80557C4 sub_80557C4: @ 80557C4 @@ -1611,7 +1611,7 @@ sub_80557C4: @ 80557C4 lsrs r4, r1, 16 lsls r2, 16 lsrs r5, r2, 16 - bl sub_805578C + bl GetMapConnection adds r1, r0, 0 cmp r1, 0 beq _080557FC @@ -1736,7 +1736,7 @@ _080558D4: bl UpdateLocationHistoryForRoamer bl RoamerMove bl sub_8110920 - bl sub_807B1A4 + bl DoCurrentWeather bl wild_encounter_reset_coro_args bl mapheader_run_script_with_tag_x5 bl sub_80561B4 @@ -2592,8 +2592,8 @@ _08055F62: bx r0 thumb_func_end sub_8055F48 - thumb_func_start sub_8055F68 -sub_8055F68: @ 8055F68 + thumb_func_start GetMapMusicFadeoutSpeed +GetMapMusicFadeoutSpeed: @ 8055F68 push {lr} bl warp1_get_mapheader ldrb r0, [r0, 0x17] @@ -2609,7 +2609,7 @@ _08055F80: _08055F82: pop {r1} bx r1 - thumb_func_end sub_8055F68 + thumb_func_end GetMapMusicFadeoutSpeed thumb_func_start sub_8055F88 sub_8055F88: @ 8055F88 @@ -2628,7 +2628,7 @@ sub_8055F88: @ 8055F88 lsrs r0, 16 cmp r4, r0 beq _08055FB8 - bl sub_8055F68 + bl GetMapMusicFadeoutSpeed lsls r0, 24 lsrs r0, 24 bl FadeOutMapMusic @@ -2650,14 +2650,14 @@ sub_8055FC4: @ 8055FC4 bx r1 thumb_func_end sub_8055FC4 - thumb_func_start sub_8055FD4 -sub_8055FD4: @ 8055FD4 + thumb_func_start Overworld_FadeOutMapMusic +Overworld_FadeOutMapMusic: @ 8055FD4 push {lr} movs r0, 0x4 bl FadeOutMapMusic pop {r0} bx r0 - thumb_func_end sub_8055FD4 + thumb_func_end Overworld_FadeOutMapMusic thumb_func_start sub_8055FE0 sub_8055FE0: @ 8055FE0 @@ -4852,7 +4852,7 @@ _080571D8: adds r4, r7 ldrb r3, [r4, 0x13] adds r0, r5, 0 - bl sub_805839C + bl SpawnLinkPlayerMapObject ldrb r1, [r4] adds r0, r5, 0 bl sub_8058878 @@ -6783,7 +6783,7 @@ _08058074: movs r2, 0 ldrsh r0, [r0, r2] asrs r1, 16 - bl sub_80585B8 + bl GetLinkPlayerIdAt lsls r0, 24 lsrs r1, r0, 24 adds r2, r1, 0 @@ -7136,12 +7136,12 @@ _08058368: .4byte gUnknown_3005450 _0805836C: .4byte 0x000008d2 thumb_func_end sub_805833C - thumb_func_start sub_8058370 -sub_8058370: @ 8058370 + thumb_func_start ZeroLinkPlayerMapObject +ZeroLinkPlayerMapObject: @ 8058370 movs r1, 0 str r1, [r0] bx lr - thumb_func_end sub_8058370 + thumb_func_end ZeroLinkPlayerMapObject thumb_func_start strange_npc_table_clear strange_npc_table_clear: @ 8058378 @@ -7156,18 +7156,18 @@ strange_npc_table_clear: @ 8058378 _08058388: .4byte gUnknown_2031DEC thumb_func_end strange_npc_table_clear - thumb_func_start sub_805838C -sub_805838C: @ 805838C + thumb_func_start ZeroMapObject +ZeroMapObject: @ 805838C push {lr} movs r1, 0 movs r2, 0x24 bl memset pop {r0} bx r0 - thumb_func_end sub_805838C + thumb_func_end ZeroMapObject - thumb_func_start sub_805839C -sub_805839C: @ 805839C + thumb_func_start SpawnLinkPlayerMapObject +SpawnLinkPlayerMapObject: @ 805839C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -7203,9 +7203,9 @@ sub_805839C: @ 805839C ldr r0, _08058444 @ =gUnknown_2036E38 adds r5, r0 adds r0, r4, 0 - bl sub_8058370 + bl ZeroLinkPlayerMapObject adds r0, r5, 0 - bl sub_805838C + bl ZeroMapObject movs r2, 0 movs r1, 0x1 movs r0, 0x1 @@ -7238,7 +7238,7 @@ sub_805839C: @ 805839C adds r0, r5, 0 mov r1, r9 mov r2, r10 - bl sub_8058448 + bl InitLinkPlayerMapObjectPos pop {r3-r5} mov r8, r3 mov r9, r4 @@ -7249,10 +7249,10 @@ sub_805839C: @ 805839C .align 2, 0 _08058440: .4byte gUnknown_2031DEC _08058444: .4byte gUnknown_2036E38 - thumb_func_end sub_805839C + thumb_func_end SpawnLinkPlayerMapObject - thumb_func_start sub_8058448 -sub_8058448: @ 8058448 + thumb_func_start InitLinkPlayerMapObjectPos +InitLinkPlayerMapObjectPos: @ 8058448 push {r4,lr} adds r4, r0, 0 adds r0, r1, 0 @@ -7282,7 +7282,7 @@ sub_8058448: @ 8058448 pop {r4} pop {r0} bx r0 - thumb_func_end sub_8058448 + thumb_func_end InitLinkPlayerMapObjectPos thumb_func_start sub_8058488 sub_8058488: @ 8058488 @@ -7454,8 +7454,8 @@ _080585B0: .4byte gUnknown_2031DEC _080585B4: .4byte gUnknown_2036E38 thumb_func_end sub_8058590 - thumb_func_start sub_80585B8 -sub_80585B8: @ 80585B8 + thumb_func_start GetLinkPlayerIdAt +GetLinkPlayerIdAt: @ 80585B8 push {r4-r6,lr} movs r2, 0 ldr r5, _080585FC @ =gUnknown_2031DEC @@ -7505,7 +7505,7 @@ _08058610: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80585B8 + thumb_func_end GetLinkPlayerIdAt thumb_func_start sub_8058618 sub_8058618: @ 8058618 @@ -7884,7 +7884,7 @@ _080588BC: _080588C6: lsls r0, 24 lsrs r0, 24 - ldr r1, _08058904 @ =sub_805890C + ldr r1, _08058904 @ =SpriteCB_LinkPlayer movs r2, 0 str r2, [sp] movs r3, 0 @@ -7914,12 +7914,12 @@ _080588FC: pop {r0} bx r0 .align 2, 0 -_08058904: .4byte sub_805890C +_08058904: .4byte SpriteCB_LinkPlayer _08058908: .4byte gUnknown_202063C thumb_func_end sub_8058878 - thumb_func_start sub_805890C -sub_805890C: @ 805890C + thumb_func_start SpriteCB_LinkPlayer +SpriteCB_LinkPlayer: @ 805890C push {r4-r6,lr} adds r5, r0, 0 movs r0, 0x2E @@ -8005,6 +8005,6 @@ _080589BC: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_805890C + thumb_func_end SpriteCB_LinkPlayer .align 2, 0 @ Don't pad with nop. diff --git a/asm/party_menu.s b/asm/party_menu.s index bd3adc61b..deae6236d 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -3718,7 +3718,7 @@ _08120724: subs r1, r2 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _08120740: mov r0, r8 bl SwitchTaskToFollowupFunc @@ -4271,7 +4271,7 @@ _08120B42: lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl sub_8043C2C + bl CanMonLearnTMHM cmp r0, 0 beq _08120B7C adds r0, r7, 0 @@ -5907,7 +5907,7 @@ sub_8121808: @ 8121808 adds r1, r2, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0812184C @ =gUnknown_2021CD0 ldr r1, _08121850 @ =gUnknown_8416223 adds r0, r4, 0 @@ -6150,7 +6150,7 @@ sub_8121A04: @ 8121A04 adds r1, r2, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r1, 0xBA strb r1, [r0] movs r1, 0xFF @@ -6234,7 +6234,7 @@ sub_8121AA4: @ 8121AA4 adds r1, r2, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08121AE8 @ =gUnknown_2021CD0 ldr r1, _08121AEC @ =gUnknown_841620C adds r0, r4, 0 @@ -7420,7 +7420,7 @@ _081223F8: .4byte sub_81223FC sub_81223FC: @ 81223FC push {r4,lr} adds r4, r0, 0 - bl sub_8097228 + bl UpdateMonIconFrame lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -7445,7 +7445,7 @@ _08122422: thumb_func_start sub_8122428 sub_8122428: @ 8122428 push {lr} - bl sub_8097228 + bl UpdateMonIconFrame pop {r0} bx r0 thumb_func_end sub_8122428 @@ -15289,7 +15289,7 @@ sub_8126350: @ 8126350 ldr r0, _0812642C @ =gUnknown_2021CF0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08126430 @ =gUnknown_2021D18 ldr r1, _08126434 @ =gUnknown_8417017 adds r0, r4, 0 diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 75a55149c..e7f305065 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -5097,7 +5097,7 @@ sub_8104EC0: @ 8104EC0 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r1, r0, 0 movs r0, 0xBA strb r0, [r1] @@ -5106,7 +5106,7 @@ sub_8104EC0: @ 8104EC0 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r0, sp movs r1, 0x2 bl sub_8106E78 diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s index 5fab87dc7..6efd98cac 100644 --- a/asm/pokemon_1.s +++ b/asm/pokemon_1.s @@ -1519,7 +1519,7 @@ _0803E5CE: add r4, sp, 0x8 ldrh r1, [r4] movs r2, 0x1 - bl sub_8043698 + bl nature_stat_mod lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x8] @@ -1551,7 +1551,7 @@ _0803E614: add r4, sp, 0xC ldrh r1, [r4] movs r2, 0x2 - bl sub_8043698 + bl nature_stat_mod lsls r0, 16 lsrs r0, 16 str r0, [sp, 0xC] @@ -1583,7 +1583,7 @@ _0803E65A: add r4, sp, 0x10 ldrh r1, [r4] movs r2, 0x3 - bl sub_8043698 + bl nature_stat_mod lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x10] @@ -1615,7 +1615,7 @@ _0803E6A0: add r4, sp, 0x14 ldrh r1, [r4] movs r2, 0x4 - bl sub_8043698 + bl nature_stat_mod lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x14] @@ -1647,7 +1647,7 @@ _0803E6E6: add r4, sp, 0x18 ldrh r1, [r4] movs r2, 0x5 - bl sub_8043698 + bl nature_stat_mod lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x18] diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index d4325b05f..b84d9b18b 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -2522,8 +2522,8 @@ sub_804367C: @ 804367C _08043694: .4byte gUnknown_823EAC8 thumb_func_end sub_804367C - thumb_func_start sub_8043698 -sub_8043698: @ 8043698 + thumb_func_start nature_stat_mod +nature_stat_mod: @ 8043698 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2576,7 +2576,7 @@ _080436F2: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8043698 + thumb_func_end nature_stat_mod thumb_func_start sub_80436F8 sub_80436F8: @ 80436F8 @@ -3280,8 +3280,8 @@ _08043C22: bx r1 thumb_func_end sub_8043B90 - thumb_func_start sub_8043C2C -sub_8043C2C: @ 8043C2C + thumb_func_start CanMonLearnTMHM +CanMonLearnTMHM: @ 8043C2C push {r4,r5,lr} lsls r1, 24 lsrs r4, r1, 24 @@ -3328,7 +3328,7 @@ _08043C7A: bx r1 .align 2, 0 _08043C80: .4byte gUnknown_8252BC8 - thumb_func_end sub_8043C2C + thumb_func_end CanMonLearnTMHM thumb_func_start GetMoveRelearnerMoves GetMoveRelearnerMoves: @ 8043C84 @@ -3973,8 +3973,8 @@ _0804413C: _08044144: .4byte gUnknown_82380CC thumb_func_end GetFrontSpritePalFromSpeciesAndPersonality - thumb_func_start sub_8044148 -sub_8044148: @ 8044148 + thumb_func_start GetMonSpritePalStruct +GetMonSpritePalStruct: @ 8044148 push {r4-r6,lr} adds r5, r0, 0 movs r1, 0x41 @@ -3999,7 +3999,7 @@ sub_8044148: @ 8044148 pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_8044148 + thumb_func_end GetMonSpritePalStruct thumb_func_start GetMonSpritePalStructFromOtIdPersonality GetMonSpritePalStructFromOtIdPersonality: @ 8044180 @@ -4336,8 +4336,8 @@ _080443EC: .4byte gUnknown_83FCA2C _080443F0: .4byte gUnknown_2021D18 thumb_func_end sub_8044348 - thumb_func_start sub_80443F4 -sub_80443F4: @ 80443F4 + thumb_func_start SetWildMonHeldItem +SetWildMonHeldItem: @ 80443F4 push {r4,r5,lr} ldr r0, _0804444C @ =gUnknown_2022B4C ldr r0, [r0] @@ -4394,7 +4394,7 @@ _08044468: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80443F4 + thumb_func_end SetWildMonHeldItem thumb_func_start IsMonShiny IsMonShiny: @ 8044470 @@ -4726,7 +4726,7 @@ _080446CC: lsls r2, r6, 24 lsrs r2, 24 adds r1, r4, 0 - bl sub_8043698 + bl nature_stat_mod lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s index c490813b7..1a5724e90 100644 --- a/asm/pokemon_icon.s +++ b/asm/pokemon_icon.s @@ -64,7 +64,7 @@ _08096E7E: asrs r2, 16 mov r0, sp mov r3, r9 - bl sub_8097300 + bl CreateMonIconSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -73,7 +73,7 @@ _08096E7E: lsls r0, 2 ldr r1, _08096EC8 @ =gUnknown_202063C adds r0, r1 - bl sub_8097228 + bl UpdateMonIconFrame adds r0, r4, 0 add sp, 0x30 pop {r3,r4} @@ -134,7 +134,7 @@ sub_8096ECC: @ 8096ECC adds r1, r4, 0 adds r2, r5, 0 adds r3, r6, 0 - bl sub_8097300 + bl CreateMonIconSprite adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -143,7 +143,7 @@ sub_8096ECC: @ 8096ECC lsls r0, 2 ldr r1, _08096F58 @ =gUnknown_202063C adds r0, r1 - bl sub_8097228 + bl UpdateMonIconFrame adds r0, r4, 0 add sp, 0x18 pop {r4-r7} @@ -238,7 +238,7 @@ sub_8096FD4: @ 8096FD4 lsrs r4, r0, 16 adds r0, r4, 0 mov r1, sp - bl sub_8097F20 + bl MailSpeciesToSpecies lsls r0, 16 lsrs r0, 16 cmp r0, 0xC9 @@ -351,8 +351,8 @@ _08097082: _0809709C: .4byte gUnknown_83D4038 thumb_func_end sub_809707C - thumb_func_start sub_80970A0 -sub_80970A0: @ 80970A0 + thumb_func_start SafeLoadMonIconPalette +SafeLoadMonIconPalette: @ 80970A0 push {r4,lr} lsls r0, 16 lsrs r1, r0, 16 @@ -383,7 +383,7 @@ _080970D0: .align 2, 0 _080970D8: .4byte gUnknown_83D3E80 _080970DC: .4byte gUnknown_83D4038 - thumb_func_end sub_80970A0 + thumb_func_end SafeLoadMonIconPalette thumb_func_start sub_80970E0 sub_80970E0: @ 80970E0 @@ -413,8 +413,8 @@ _0809710C: .4byte gUnknown_83D3E80 _08097110: .4byte gUnknown_83D4038 thumb_func_end sub_80970E0 - thumb_func_start sub_8097114 -sub_8097114: @ 8097114 + thumb_func_start FreeMonIconPalettes +FreeMonIconPalettes: @ 8097114 push {r4,r5,lr} movs r4, 0 ldr r5, _08097134 @ =gUnknown_83D4038 @@ -433,7 +433,7 @@ _0809711A: bx r0 .align 2, 0 _08097134: .4byte gUnknown_83D4038 - thumb_func_end sub_8097114 + thumb_func_end FreeMonIconPalettes thumb_func_start sub_8097138 sub_8097138: @ 8097138 @@ -484,7 +484,7 @@ _08097188: .4byte gUnknown_83D4038 thumb_func_start sub_809718C sub_809718C: @ 809718C push {lr} - bl sub_8097228 + bl UpdateMonIconFrame pop {r0} bx r0 thumb_func_end sub_809718C @@ -576,8 +576,8 @@ sub_8097218: @ 8097218 _08097224: .4byte gUnknown_83D3E80 thumb_func_end sub_8097218 - thumb_func_start sub_8097228 -sub_8097228: @ 8097228 + thumb_func_start UpdateMonIconFrame +UpdateMonIconFrame: @ 8097228 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -686,10 +686,10 @@ _080972F0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8097228 + thumb_func_end UpdateMonIconFrame - thumb_func_start sub_8097300 -sub_8097300: @ 8097300 + thumb_func_start CreateMonIconSprite +CreateMonIconSprite: @ 8097300 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -792,7 +792,7 @@ _080973C8: .4byte gUnknown_83D40E8 _080973CC: .4byte 0xffff0000 _080973D0: .4byte 0x0000ffff _080973D4: .4byte gUnknown_202063C - thumb_func_end sub_8097300 + thumb_func_end CreateMonIconSprite thumb_func_start sub_80973D8 sub_80973D8: @ 80973D8 diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s index d639da8cf..a80fc6425 100644 --- a/asm/pokemon_size_record.s +++ b/asm/pokemon_size_record.s @@ -185,7 +185,7 @@ sub_80A07E4: @ 80A07E4 adds r0, r4, 0 movs r2, 0 movs r3, 0x8 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _080A0828 @ =gUnknown_8417FB9 bl StringAppend adds r4, r0, 0 @@ -196,7 +196,7 @@ sub_80A07E4: @ 80A07E4 adds r0, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN pop {r4,r5} pop {r0} bx r0 diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index e76654864..b6cad48be 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -1806,7 +1806,7 @@ _0811D3C0: adds r0, r2, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r2, r0, 0 ldr r1, _0811D3D8 @ =gUnknown_841B2A7 bl StringAppend @@ -4593,7 +4593,7 @@ _0811E8F4: ldr r0, [sp, 0x28] movs r2, 0 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r2, r4, 0 adds r2, 0x38 mov r1, r10 @@ -4701,7 +4701,7 @@ _0811E9C0: mov r0, r9 movs r2, 0 adds r3, r4, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x4 subs r0, r4 lsls r4, r0, 1 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 1a0bf5a7b..f80eb5441 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1932,7 +1932,7 @@ _0808C80E: adds r1, r4, 0 movs r2, 0 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN lsls r4, 16 lsrs r5, r4, 16 cmp r5, 0xD @@ -2548,7 +2548,7 @@ _0808CCC0: adds r1, r7, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r5] adds r0, r4 movs r1, 0x3 @@ -16863,7 +16863,7 @@ _08093EF2: adds r0, r2, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r2, r0, 0 strb r5, [r2] movs r0, 0xFF diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 30d8a7e23..2807c869b 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -3364,7 +3364,7 @@ _0813611C: adds r1, r4, 0 movs r2, 0x2 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _0813612C: ldr r0, _08136158 @ =gUnknown_203B144 ldr r1, [r0] @@ -3536,7 +3536,7 @@ _08136264: adds r0, r2 movs r2, 0x2 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r5 movs r1, 0x38 @@ -3545,7 +3545,7 @@ _08136264: mov r0, sp movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] ldr r4, _08136328 @ =0x00003088 adds r0, r4 @@ -3619,7 +3619,7 @@ sub_8136350: @ 8136350 adds r0, r4 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 ldr r1, _08136504 @ =gUnknown_841620C @@ -3634,7 +3634,7 @@ sub_8136350: @ 8136350 mov r0, sp movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 mov r1, sp @@ -3679,7 +3679,7 @@ _081363E6: adds r0, r4 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 bl StringLength @@ -3704,7 +3704,7 @@ _081363E6: adds r0, r4 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 bl StringLength @@ -3728,7 +3728,7 @@ _081363E6: adds r0, r4 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 bl StringLength @@ -3752,7 +3752,7 @@ _081363E6: adds r0, r4 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 bl StringLength @@ -3776,7 +3776,7 @@ _081363E6: adds r0, r4 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 bl StringLength @@ -3814,7 +3814,7 @@ _08136518: adds r0, r5 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] adds r0, r5 bl StringLength @@ -3840,7 +3840,7 @@ _08136518: adds r0, r5 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] adds r0, r5 bl StringLength @@ -3864,7 +3864,7 @@ _08136518: adds r0, r5 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] adds r0, r5 bl StringLength @@ -3888,7 +3888,7 @@ _08136518: adds r0, r5 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] adds r0, r5 bl StringLength @@ -3912,7 +3912,7 @@ _08136518: adds r0, r5 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] adds r0, r5 bl StringLength @@ -3940,7 +3940,7 @@ _08136630: adds r1, r7, 0 movs r2, 0 movs r3, 0x7 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 bl StringLength @@ -3995,7 +3995,7 @@ _081366B8: adds r0, r4 movs r2, 0 movs r3, 0x7 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r6] adds r0, r4 bl StringLength @@ -4268,7 +4268,7 @@ _081368B0: ldrb r1, [r1, 0x4] movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _08136968 @ =0x000030f0 adds r4, r0 ldr r0, [r6] @@ -4284,7 +4284,7 @@ _081368B0: adds r0, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN b _081369D0 .align 2, 0 _08136948: .4byte 0x00003264 @@ -4316,7 +4316,7 @@ _0813696C: adds r0, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r3, _08136A58 @ =0x000030f0 adds r5, r3 mov r4, r8 @@ -4341,7 +4341,7 @@ _0813696C: adds r0, r5, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _081369D0: ldr r6, _08136A4C @ =gUnknown_203B140 movs r0, 0xB @@ -4421,7 +4421,7 @@ _08136A70: ldrb r1, [r1, 0x1] movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _08136A84: ldr r2, _08136AB4 @ =gUnknown_8250C04 ldr r0, _08136AB8 @ =gUnknown_203B140 @@ -4459,7 +4459,7 @@ _08136AC8: ldrb r1, [r1, 0x3] movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _08136ADA: pop {r3,r4} mov r8, r3 @@ -5774,7 +5774,7 @@ _081375B2: add r0, sp, 0x14 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x1 add r1, sp, 0x14 bl UnkTextUtil_SetPtrI @@ -5971,7 +5971,7 @@ _0813775E: add r0, sp, 0x14 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x1 add r1, sp, 0x14 bl UnkTextUtil_SetPtrI @@ -10757,7 +10757,7 @@ sub_8139DBC: @ 8139DBC bl GetMonData adds r4, r0, 0 adds r0, r5, 0 - bl sub_80970A0 + bl SafeLoadMonIconPalette ldr r2, [r6] ldr r1, _08139E10 @ =0x000032f8 adds r0, r2, r1 diff --git a/asm/quest_log.s b/asm/quest_log.s index e0a4b3803..594601af2 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -1119,7 +1119,7 @@ _0811107A: adds r1, r7, 0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r5, 0 adds r1, r4, 0 bl StringAppend @@ -9149,7 +9149,7 @@ _08114E84: adds r0, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x2 adds r1, r4, 0 bl UnkTextUtil_SetPtrI @@ -9162,7 +9162,7 @@ _08114E84: adds r0, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x4 adds r1, r4, 0 bl UnkTextUtil_SetPtrI @@ -9989,7 +9989,7 @@ _08115570: adds r1, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x2 adds r1, r4, 0 bl UnkTextUtil_SetPtrI @@ -10091,7 +10091,7 @@ _08115648: adds r0, r4, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x4 adds r1, r4, 0 bl UnkTextUtil_SetPtrI @@ -10127,7 +10127,7 @@ _08115690: adds r1, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x2 adds r1, r4, 0 bl UnkTextUtil_SetPtrI diff --git a/asm/random.s b/asm/random.s index d0c7895f7..dcf706524 100644 --- a/asm/random.s +++ b/asm/random.s @@ -22,8 +22,8 @@ _08044EE0: .4byte 0x41c64e6d _08044EE4: .4byte 0x00006073 thumb_func_end Random - thumb_func_start sub_8044EE8 -sub_8044EE8: @ 8044EE8 + thumb_func_start SeedRng +SeedRng: @ 8044EE8 lsls r0, 16 lsrs r0, 16 ldr r1, _08044EF4 @ =gUnknown_3005000 @@ -31,6 +31,6 @@ sub_8044EE8: @ 8044EE8 bx lr .align 2, 0 _08044EF4: .4byte gUnknown_3005000 - thumb_func_end sub_8044EE8 + thumb_func_end SeedRng .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom6.s b/asm/rom6.s index d02b6a7fe..2d64361ff 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -279,8 +279,8 @@ _080C99D0: .4byte gUnknown_3005090 _080C99D4: .4byte gUnknown_2037078 thumb_func_end sub_80C99A0 - thumb_func_start sub_80C99D8 -sub_80C99D8: @ 80C99D8 + thumb_func_start SetUpFieldMove_RockSmash +SetUpFieldMove_RockSmash: @ 80C99D8 push {lr} movs r0, 0x60 bl npc_before_player_of_type @@ -306,7 +306,7 @@ _080C9A00: .4byte gUnknown_3005024 _080C9A04: .4byte hm_add_c3_launch_phase_2 _080C9A08: .4byte gUnknown_203B0C4 _080C9A0C: .4byte sub_80C9A10 - thumb_func_end sub_80C99D8 + thumb_func_end SetUpFieldMove_RockSmash thumb_func_start sub_80C9A10 sub_80C9A10: @ 80C9A10 @@ -362,8 +362,8 @@ sub_80C9A60: @ 80C9A60 bx r0 thumb_func_end sub_80C9A60 - thumb_func_start sub_80C9A78 -sub_80C9A78: @ 80C9A78 + thumb_func_start SetUpFieldMove_Dig +SetUpFieldMove_Dig: @ 80C9A78 push {lr} bl sub_80A1B8C lsls r0, 24 @@ -388,7 +388,7 @@ _080C9A9C: .4byte gUnknown_3005024 _080C9AA0: .4byte hm_add_c3_launch_phase_2 _080C9AA4: .4byte gUnknown_203B0C4 _080C9AA8: .4byte hm2_dig - thumb_func_end sub_80C9A78 + thumb_func_end SetUpFieldMove_Dig thumb_func_start hm2_dig hm2_dig: @ 80C9AAC diff --git a/asm/save.s b/asm/save.s index 9d7fa6927..35466da0c 100644 --- a/asm/save.s +++ b/asm/save.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80D972C -sub_80D972C: @ 80D972C + thumb_func_start ClearSaveData +ClearSaveData: @ 80D972C push {r4,r5,lr} movs r4, 0 ldr r5, _080D974C @ =EraseFlashSector @@ -24,7 +24,7 @@ _080D9732: bx r0 .align 2, 0 _080D974C: .4byte EraseFlashSector - thumb_func_end sub_80D972C + thumb_func_end ClearSaveData thumb_func_start ResetSaveCounters ResetSaveCounters: @ 80D9750 diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s index 064d9ec14..db7f73b86 100644 --- a/asm/save_menu_util.s +++ b/asm/save_menu_util.s @@ -71,7 +71,7 @@ _080F804A: adds r0, r5, 0 movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN b _080F80D8 _080F805C: ldr r4, _080F8068 @ =gUnknown_300500C @@ -90,7 +90,7 @@ _080F806C: movs r2, 0x1 _080F8076: movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r5, r0, 0 movs r0, 0xF0 strb r0, [r5] @@ -100,7 +100,7 @@ _080F8076: adds r0, r5, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN b _080F80D8 .align 2, 0 _080F8094: .4byte gUnknown_300500C diff --git a/asm/scrcmd.s b/asm/scrcmd.s index afe740df3..d59671450 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -1579,14 +1579,14 @@ ScrCmd_resetweather: @ 806AA18 bx r1 thumb_func_end ScrCmd_resetweather - thumb_func_start sub_806AA24 -sub_806AA24: @ 806AA24 + thumb_func_start ScrCmd_doweather +ScrCmd_doweather: @ 806AA24 push {lr} - bl sub_807B1A4 + bl DoCurrentWeather movs r0, 0 pop {r1} bx r1 - thumb_func_end sub_806AA24 + thumb_func_end ScrCmd_doweather thumb_func_start ScrCmd_setstepcallback ScrCmd_setstepcallback: @ 806AA30 @@ -4281,7 +4281,7 @@ ScrCmd_buffernumberstring: @ 806BE90 ldr r0, [r5] adds r1, r4, 0 movs r2, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0 pop {r4,r5} pop {r1} @@ -4584,8 +4584,8 @@ _0806C116: _0806C120: .4byte gUnknown_2024284 thumb_func_end ScrCmd_checkpartymove - thumb_func_start sub_806C124 -sub_806C124: @ 806C124 + thumb_func_start ScrCmd_givemoney +ScrCmd_givemoney: @ 806C124 push {r4,lr} adds r4, r0, 0 bl ScriptReadWord @@ -4610,7 +4610,7 @@ _0806C14A: bx r1 .align 2, 0 _0806C154: .4byte gUnknown_3005008 - thumb_func_end sub_806C124 + thumb_func_end ScrCmd_givemoney thumb_func_start ScrCmd_takemoney ScrCmd_takemoney: @ 806C158 @@ -5344,8 +5344,8 @@ sub_806C688: @ 806C688 _0806C698: .4byte sub_806C670 thumb_func_end sub_806C688 - thumb_func_start sub_806C69C -sub_806C69C: @ 806C69C + thumb_func_start ScrCmd_setdooropen +ScrCmd_setdooropen: @ 806C69C push {r4,r5,lr} adds r5, r0, 0 bl ScriptReadHalfword @@ -5375,10 +5375,10 @@ sub_806C69C: @ 806C69C pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_806C69C + thumb_func_end ScrCmd_setdooropen - thumb_func_start sub_806C6E0 -sub_806C6E0: @ 806C6E0 + thumb_func_start ScrCmd_setdoorclosed +ScrCmd_setdoorclosed: @ 806C6E0 push {r4,r5,lr} adds r5, r0, 0 bl ScriptReadHalfword @@ -5408,7 +5408,7 @@ sub_806C6E0: @ 806C6E0 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_806C6E0 + thumb_func_end ScrCmd_setdoorclosed thumb_func_start sub_806C724 sub_806C724: @ 806C724 diff --git a/asm/script_movement.s b/asm/script_movement.s index a760af388..5ee414498 100644 --- a/asm/script_movement.s +++ b/asm/script_movement.s @@ -24,7 +24,7 @@ ScriptMovement_StartObjectMovementScript: @ 8097434 movs r0, 0x1 b _0809747E _08097456: - ldr r0, _08097488 @ =sub_80977AC + ldr r0, _08097488 @ =Task_80A244C bl FuncIsActiveTask lsls r0, 24 cmp r0, 0 @@ -47,7 +47,7 @@ _0809747E: pop {r1} bx r1 .align 2, 0 -_08097488: .4byte sub_80977AC +_08097488: .4byte Task_80A244C thumb_func_end ScriptMovement_StartObjectMovementScript thumb_func_start ScriptMovement_IsObjectMovementFinished @@ -99,7 +99,7 @@ sub_80974D8: @ 80974D8 cmp r4, 0xFF beq _080974F2 adds r0, r4, 0 - bl sub_8097768 + bl UnfreezeObjects adds r0, r4, 0 bl DestroyTask _080974F2: @@ -114,7 +114,7 @@ sub_80974F8: @ 80974F8 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _08097534 @ =sub_80977AC + ldr r0, _08097534 @ =Task_80A244C bl CreateTask lsls r0, 24 lsrs r0, 24 @@ -141,7 +141,7 @@ _08097518: pop {r0} bx r0 .align 2, 0 -_08097534: .4byte sub_80977AC +_08097534: .4byte Task_80A244C _08097538: .4byte gUnknown_3005098 _0809753C: .4byte 0x0000ffff thumb_func_end sub_80974F8 @@ -149,14 +149,14 @@ _0809753C: .4byte 0x0000ffff thumb_func_start sub_8097540 sub_8097540: @ 8097540 push {lr} - ldr r0, _08097550 @ =sub_80977AC + ldr r0, _08097550 @ =Task_80A244C bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_08097550: .4byte sub_80977AC +_08097550: .4byte Task_80A244C thumb_func_end sub_8097540 thumb_func_start sub_8097554 @@ -460,8 +460,8 @@ sub_8097728: @ 8097728 bx r0 thumb_func_end sub_8097728 - thumb_func_start sub_8097768 -sub_8097768: @ 8097768 + thumb_func_start UnfreezeObjects +UnfreezeObjects: @ 8097768 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -496,10 +496,10 @@ _08097792: .align 2, 0 _080977A4: .4byte gUnknown_3005098 _080977A8: .4byte gUnknown_2036E38 - thumb_func_end sub_8097768 + thumb_func_end UnfreezeObjects - thumb_func_start sub_80977AC -sub_80977AC: @ 80977AC + thumb_func_start Task_80A244C +Task_80A244C: @ 80977AC push {r4-r7,lr} sub sp, 0x4 lsls r0, 24 @@ -532,7 +532,7 @@ _080977DC: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_80977AC + thumb_func_end Task_80A244C thumb_func_start sub_80977F0 sub_80977F0: @ 80977F0 @@ -577,7 +577,7 @@ _08097838: adds r1, r5, 0 bl sub_80976A8 adds r0, r4, 0 - bl sub_80688E4 + bl FreezeMapObject b _0809786A .align 2, 0 _08097850: .4byte gUnknown_2036E38 diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index ba3a0b9d8..431e0cae7 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -204,8 +204,8 @@ sub_80A01AC: @ 80A01AC bx r1 thumb_func_end sub_80A01AC - thumb_func_start sub_80A01F4 -sub_80A01F4: @ 80A01F4 + thumb_func_start CheckForAlivePartyMons +CheckForAlivePartyMons: @ 80A01F4 push {lr} bl GetMonsStateToDoubles lsls r0, 24 @@ -228,10 +228,10 @@ _080A0214: bx r0 .align 2, 0 _080A0218: .4byte gUnknown_20370D0 - thumb_func_end sub_80A01F4 + thumb_func_end CheckForAlivePartyMons - thumb_func_start sub_80A021C -sub_80A021C: @ 80A021C + thumb_func_start CheckPartyMonHasHeldItem +CheckPartyMonHasHeldItem: @ 80A021C push {r4-r7,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -271,13 +271,13 @@ _080A0264: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A021C + thumb_func_end CheckPartyMonHasHeldItem - thumb_func_start sub_80A026C -sub_80A026C: @ 80A026C + thumb_func_start GetNameOfEnigmaBerryInPlayerParty +GetNameOfEnigmaBerryInPlayerParty: @ 80A026C push {r4,lr} movs r0, 0xAF - bl sub_80A021C + bl CheckPartyMonHasHeldItem lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 @@ -296,7 +296,7 @@ _080A028E: bx r1 .align 2, 0 _080A0298: .4byte gUnknown_2021CD0 - thumb_func_end sub_80A026C + thumb_func_end GetNameOfEnigmaBerryInPlayerParty thumb_func_start CreateScriptedWildMon CreateScriptedWildMon: @ 80A029C diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 7e1784a5e..d13320223 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -134,8 +134,8 @@ _080BFA00: .4byte gUnknown_3005020 _080BFA04: .4byte sub_807DD24 thumb_func_end sub_80BF9BC - thumb_func_start sub_80BFA08 -sub_80BFA08: @ 80BFA08 + thumb_func_start ScrSpecial_CountPokemonMoves +ScrSpecial_CountPokemonMoves: @ 80BFA08 push {r4,r5,lr} ldr r1, _080BFA44 @ =gUnknown_20370D0 movs r0, 0 @@ -170,10 +170,10 @@ _080BFA32: _080BFA44: .4byte gUnknown_20370D0 _080BFA48: .4byte gUnknown_20370C0 _080BFA4C: .4byte gUnknown_2024284 - thumb_func_end sub_80BFA08 + thumb_func_end ScrSpecial_CountPokemonMoves - thumb_func_start sub_80BFA50 -sub_80BFA50: @ 80BFA50 + thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName +ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 push {r4,r5,lr} ldr r0, _080BFA90 @ =gUnknown_20370C0 ldrh r1, [r0] @@ -209,7 +209,7 @@ _080BFA98: .4byte gUnknown_20370C2 _080BFA9C: .4byte gUnknown_2021CD0 _080BFAA0: .4byte gUnknown_2021CF0 _080BFAA4: .4byte gUnknown_8247094 - thumb_func_end sub_80BFA50 + thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName thumb_func_start sub_80BFAA8 sub_80BFAA8: @ 80BFAA8 diff --git a/asm/seagallop.s b/asm/seagallop.s index 74a71d4a7..ac16351b0 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -293,7 +293,7 @@ sub_81470CC: @ 81470CC asrs r0, 16 cmp r0, 0x8C bne _081470FA - bl sub_8055FD4 + bl Overworld_FadeOutMapMusic bl sub_807DC18 ldr r0, _08147104 @ =sub_8147108 str r0, [r4] diff --git a/asm/shop.s b/asm/shop.s index f205eb8ec..6c6fc2078 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -1168,7 +1168,7 @@ sub_809B408: @ 809B408 adds r0, r4, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r4, 0 bl StringLength lsls r0, 16 @@ -1231,7 +1231,7 @@ sub_809B494: @ 809B494 adds r0, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _0809B51C @ =gUnknown_2021D18 ldr r1, _0809B520 @ =gUnknown_8416226 adds r0, r5, 0 @@ -1985,7 +1985,7 @@ _0809BA56: lsls r0, 2 add r0, r8 ldrb r0, [r0, 0x5] - bl sub_805F2C8 + bl GetFieldObjectGraphicsInfo movs r1, 0 ldrsh r2, [r4, r1] lsls r1, r2, 3 @@ -2117,7 +2117,7 @@ sub_809BB44: @ 809BB44 ldrsh r1, [r4, r2] movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0809BBB8 @ =gUnknown_2021D18 ldr r1, _0809BBBC @ =gUnknown_84162B9 adds r0, r4, 0 @@ -2270,7 +2270,7 @@ sub_809BCA0: @ 809BCA0 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r6, _0809BD48 @ =gUnknown_2021D18 ldr r1, _0809BD4C @ =gUnknown_8416749 adds r0, r6, 0 @@ -2414,12 +2414,12 @@ _0809BDD4: ldrsh r1, [r4, r2] movs r2, 0 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0809BE48 @ =gUnknown_2021D04 ldr r1, [r6, 0x8] movs r2, 0 movs r3, 0x8 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0809BE4C @ =gUnknown_841678E ldr r2, _0809BE50 @ =sub_809BE90 adds r0, r5, 0 diff --git a/asm/start_menu.s b/asm/start_menu.s index c06cd944f..72482e9a3 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -164,19 +164,19 @@ sub_806EE7C: @ 806EE7C ldrh r1, [r1] movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0806EF04 @ =gUnknown_2021CF0 movs r1, 0x96 lsls r1, 2 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0806EF08 @ =gUnknown_2021D04 ldr r1, _0806EF0C @ =gUnknown_2039994 ldrb r1, [r1] movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _0806EF10 @ =gUnknown_2021D18 ldr r1, _0806EF14 @ =gUnknown_84162A9 adds r0, r5, 0 @@ -1603,7 +1603,7 @@ sub_806F9B8: @ 806F9B8 movs r0, 0x30 bl sub_80722CC ldr r1, _0806F9D8 @ =gUnknown_3000FA4 - ldr r0, _0806F9DC @ =sub_806F9E0 + ldr r0, _0806F9DC @ =SaveDialogCB_ReturnSuccess str r0, [r1] _0806F9D0: movs r0, 0 @@ -1611,11 +1611,11 @@ _0806F9D0: bx r1 .align 2, 0 _0806F9D8: .4byte gUnknown_3000FA4 -_0806F9DC: .4byte sub_806F9E0 +_0806F9DC: .4byte SaveDialogCB_ReturnSuccess thumb_func_end sub_806F9B8 - thumb_func_start sub_806F9E0 -sub_806F9E0: @ 806F9E0 + thumb_func_start SaveDialogCB_ReturnSuccess +SaveDialogCB_ReturnSuccess: @ 806F9E0 push {lr} bl IsSEPlaying lsls r0, 24 @@ -1633,7 +1633,7 @@ _0806F9FE: _0806FA00: pop {r1} bx r1 - thumb_func_end sub_806F9E0 + thumb_func_end SaveDialogCB_ReturnSuccess thumb_func_start sub_806FA04 sub_806FA04: @ 806FA04 @@ -1645,7 +1645,7 @@ sub_806FA04: @ 806FA04 movs r0, 0x16 bl sub_80722CC ldr r1, _0806FA24 @ =gUnknown_3000FA4 - ldr r0, _0806FA28 @ =sub_806FA2C + ldr r0, _0806FA28 @ =SaveDialogCB_ReturnError str r0, [r1] _0806FA1C: movs r0, 0 @@ -1653,11 +1653,11 @@ _0806FA1C: bx r1 .align 2, 0 _0806FA24: .4byte gUnknown_3000FA4 -_0806FA28: .4byte sub_806FA2C +_0806FA28: .4byte SaveDialogCB_ReturnError thumb_func_end sub_806FA04 - thumb_func_start sub_806FA2C -sub_806FA2C: @ 806FA2C + thumb_func_start SaveDialogCB_ReturnError +SaveDialogCB_ReturnError: @ 806FA2C push {lr} bl sub_806F778 lsls r0, 24 @@ -1671,7 +1671,7 @@ _0806FA40: _0806FA42: pop {r1} bx r1 - thumb_func_end sub_806FA2C + thumb_func_end SaveDialogCB_ReturnError thumb_func_start sub_806FA48 sub_806FA48: @ 806FA48 diff --git a/asm/string_util.s b/asm/string_util.s index d8c42415b..9575f3977 100644 --- a/asm/string_util.s +++ b/asm/string_util.s @@ -259,8 +259,8 @@ _08008E72: bx r1 thumb_func_end StringCompareN - thumb_func_start sub_8008E78 -sub_8008E78: @ 8008E78 + thumb_func_start ConvertIntToDecimalStringN +ConvertIntToDecimalStringN: @ 8008E78 push {r4-r7,lr} mov r7, r8 push {r7} @@ -348,7 +348,7 @@ _08008F08: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8008E78 + thumb_func_end ConvertIntToDecimalStringN thumb_func_start sub_8008F18 sub_8008F18: @ 8008F18 diff --git a/asm/tm_case.s b/asm/tm_case.s index 4759927d4..99541907f 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -664,7 +664,7 @@ sub_8131D48: @ 8131D48 adds r0, r4, 0 movs r2, 0x2 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r5, 0 adds r1, r4, 0 bl StringAppend @@ -686,7 +686,7 @@ _08131DA4: adds r0, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r5, 0 adds r1, r4, 0 bl StringAppend @@ -806,7 +806,7 @@ sub_8131E68: @ 8131E68 adds r0, r4, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08131EEC @ =gUnknown_2021D18 ldr r1, _08131EF0 @ =gUnknown_84162B9 adds r0, r4, 0 @@ -2183,7 +2183,7 @@ sub_81329C4: @ 81329C4 adds r0, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08132A28 @ =gUnknown_2021D18 ldr r1, _08132A2C @ =gUnknown_8416936 adds r0, r4, 0 @@ -2283,7 +2283,7 @@ sub_8132AAC: @ 8132AAC movs r1, 0x1 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _08132B50 @ =gUnknown_2021D18 ldr r1, _08132B54 @ =gUnknown_84162B9 adds r0, r5, 0 @@ -2357,7 +2357,7 @@ sub_8132B5C: @ 8132B5C adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _08132BC0 @ =gUnknown_2021D18 ldr r1, _08132BC4 @ =gUnknown_84162B9 adds r0, r5, 0 @@ -2522,7 +2522,7 @@ sub_8132CAC: @ 8132CAC adds r0, r6, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _08132D28 @ =gUnknown_2021D18 ldr r1, _08132D2C @ =gUnknown_8416959 adds r0, r4, 0 @@ -3458,7 +3458,7 @@ _081334E0: adds r0, r4, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r2, r4, 0 _081334F0: movs r0, 0xC @@ -3495,7 +3495,7 @@ _08133530: adds r0, r4, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r2, r4, 0 _08133540: movs r0, 0x18 @@ -3522,7 +3522,7 @@ _08133540: adds r0, r5, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x24 str r0, [sp] str r4, [sp, 0x4] diff --git a/asm/trade.s b/asm/trade.s index 7d60e96ba..393db5bc7 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -332,7 +332,7 @@ _0804C8E2: .align 2, 0 _0804C8F0: .4byte gUnknown_2031DA8 _0804C8F4: - bl sub_800AA38 + bl GetLinkPlayerCount_2 adds r4, r0, 0 bl sub_800A944 lsls r4, 24 @@ -381,7 +381,7 @@ _0804C950: beq _0804C95A b _0804CEE6 _0804C95A: - bl sub_800A1F0 + bl IsLinkPlayerDataExchangeComplete lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3152,8 +3152,8 @@ _0804E06C: bx r1 thumb_func_end sub_804E028 - thumb_func_start sub_804E074 -sub_804E074: @ 804E074 + thumb_func_start TradeMenuMoveCursor +TradeMenuMoveCursor: @ 804E074 push {r4-r7,lr} adds r7, r0, 0 lsls r1, 24 @@ -3246,7 +3246,7 @@ _0804E120: _0804E128: .4byte gUnknown_2031DA8 _0804E12C: .4byte gUnknown_202063C _0804E130: .4byte gUnknown_8261E40 - thumb_func_end sub_804E074 + thumb_func_end TradeMenuMoveCursor thumb_func_start sub_804E134 sub_804E134: @ 804E134 @@ -3309,7 +3309,7 @@ sub_804E194: @ 804E194 ldr r0, [r0] adds r0, 0x35 movs r1, 0 - bl sub_804E074 + bl TradeMenuMoveCursor b _0804E208 .align 2, 0 _0804E1B4: .4byte gUnknown_30030F0 @@ -3323,7 +3323,7 @@ _0804E1BC: ldr r0, [r0] adds r0, 0x35 movs r1, 0x1 - bl sub_804E074 + bl TradeMenuMoveCursor b _0804E208 .align 2, 0 _0804E1D4: .4byte gUnknown_2031DA8 @@ -3336,7 +3336,7 @@ _0804E1D8: ldr r0, [r0] adds r0, 0x35 movs r1, 0x2 - bl sub_804E074 + bl TradeMenuMoveCursor b _0804E208 .align 2, 0 _0804E1F0: .4byte gUnknown_2031DA8 @@ -3349,7 +3349,7 @@ _0804E1F4: ldr r0, [r0] adds r0, 0x35 movs r1, 0x3 - bl sub_804E074 + bl TradeMenuMoveCursor _0804E208: ldr r0, _0804E280 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -7315,7 +7315,7 @@ _0805007C: bl HandleLoadSpecialPokePic_DontHandleDeoxys _0805009A: mov r0, r8 - bl sub_8044148 + bl GetMonSpritePalStruct bl LoadCompressedObjectPalette ldr r0, _080500C4 @ =gUnknown_2031DAC ldr r1, [r0] @@ -7334,7 +7334,7 @@ _080500C0: .4byte gUnknown_202401C _080500C4: .4byte gUnknown_2031DAC _080500C8: mov r0, r8 - bl sub_8044148 + bl GetMonSpritePalStruct ldrh r0, [r0, 0x4] adds r1, r4, 0 bl sub_803F7D4 @@ -7555,7 +7555,7 @@ _080502A8: bne _080502B4 b _08050438 _080502B4: - bl sub_800AA38 + bl GetLinkPlayerCount_2 adds r4, r0, 0 bl sub_800A944 lsls r4, 24 @@ -7591,7 +7591,7 @@ _080502F2: beq _08050300 b _08050472 _08050300: - bl sub_800A1F0 + bl IsLinkPlayerDataExchangeComplete lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13447,7 +13447,7 @@ _0805380E: _08053812: strb r0, [r1] _08053814: - bl sub_800B0A8 + bl HasLinkErrorOccurred lsls r0, 24 cmp r0, 0 bne _08053822 @@ -14770,7 +14770,7 @@ _08054384: ldr r0, _080543C0 @ =sub_80543C4 bl SetMainCallback2 _08054396: - bl sub_800B0A8 + bl HasLinkErrorOccurred lsls r0, 24 cmp r0, 0 bne _080543A4 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 22605dfaa..798d63163 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -1887,7 +1887,7 @@ sub_8089F78: @ 8089F78 ldrh r1, [r1] movs r2, 0x2 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _08089FD8 @ =gUnknown_83CD8E9 ldrb r1, [r0, 0x1] ldr r2, _08089FDC @ =gUnknown_83CD924 @@ -1939,7 +1939,7 @@ sub_8089FEC: @ 8089FEC ldr r1, [r1] movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] ldr r1, _0808A070 @ =0x00000457 adds r0, r1 @@ -2075,7 +2075,7 @@ _0808A112: add r0, sp, 0xC movs r2, 0 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] ldr r2, _0808A1A0 @ =0x00000457 adds r0, r2 @@ -2290,7 +2290,7 @@ _0808A2F4: adds r1, r5, 0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0808A3A4 @ =gUnknown_83CD8E9 ldrb r0, [r0, 0x1] mov r10, r0 @@ -2343,7 +2343,7 @@ _0808A2F4: adds r1, r7, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0808A3CC @ =gUnknown_83CD934 mov r2, r9 ldr r0, [r2] @@ -2626,7 +2626,7 @@ sub_808A5B8: @ 808A5B8 mov r0, sp movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r5] adds r0, 0x93 mov r1, sp @@ -2644,7 +2644,7 @@ sub_808A5B8: @ 808A5B8 mov r0, sp movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r5] adds r0, 0x93 mov r1, sp @@ -2662,7 +2662,7 @@ sub_808A5B8: @ 808A5B8 mov r0, sp movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r5] adds r0, 0x93 mov r1, sp @@ -2767,7 +2767,7 @@ sub_808A6C8: @ 808A6C8 mov r0, sp movs r2, 0x1 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] ldr r1, _0808A754 @ =0x00000165 adds r0, r1 @@ -2780,7 +2780,7 @@ sub_808A6C8: @ 808A6C8 mov r0, sp movs r2, 0x1 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, [r4] ldr r1, _0808A75C @ =0x000001ab adds r0, r1 @@ -2902,7 +2902,7 @@ sub_808A810: @ 808A810 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _0808A83A: pop {r4} pop {r0} @@ -2995,7 +2995,7 @@ sub_808A8D0: @ 808A8D0 ldr r1, [r1] movs r2, 0x1 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _0808A900: pop {r4} pop {r0} @@ -3093,7 +3093,7 @@ sub_808A9A4: @ 808A9A4 ldr r1, [r1] movs r2, 0x1 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN _0808A9D2: pop {r4} pop {r0} diff --git a/asm/trainer_see.s b/asm/trainer_see.s index e232fe9dc..8bd1c28a3 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -87,7 +87,7 @@ sub_8081B84: @ 8081B84 _08081BC0: adds r0, r5, 0 adds r1, r6, 0 - bl sub_8080334 + bl TrainerWantsBattle adds r0, r4, r5 lsls r0, 2 ldr r1, _08081BE0 @ =gUnknown_2036E38 @@ -462,7 +462,7 @@ sub_8081E68: @ 8081E68 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r0, _08081E94 @ =sub_8081EDC + ldr r0, _08081E94 @ =RunTrainerSeeFuncList movs r1, 0x50 bl CreateTask lsls r0, 24 @@ -480,7 +480,7 @@ sub_8081E68: @ 8081E68 pop {r0} bx r0 .align 2, 0 -_08081E94: .4byte sub_8081EDC +_08081E94: .4byte RunTrainerSeeFuncList _08081E98: .4byte gUnknown_3005090 thumb_func_end sub_8081E68 @@ -488,7 +488,7 @@ _08081E98: .4byte gUnknown_3005090 sub_8081E9C: @ 8081E9C push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _08081ED4 @ =sub_8081EDC + ldr r5, _08081ED4 @ =RunTrainerSeeFuncList adds r0, r5, 0 bl FindTaskIdByFunc adds r4, r0, 0 @@ -511,12 +511,12 @@ sub_8081E9C: @ 8081E9C pop {r0} bx r0 .align 2, 0 -_08081ED4: .4byte sub_8081EDC +_08081ED4: .4byte RunTrainerSeeFuncList _08081ED8: .4byte gUnknown_3005090 thumb_func_end sub_8081E9C - thumb_func_start sub_8081EDC -sub_8081EDC: @ 8081EDC + thumb_func_start RunTrainerSeeFuncList +RunTrainerSeeFuncList: @ 8081EDC push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -560,7 +560,7 @@ _08081F28: bx r0 .align 2, 0 _08081F30: .4byte gUnknown_83C7258 - thumb_func_end sub_8081EDC + thumb_func_end RunTrainerSeeFuncList thumb_func_start sub_8081F34 sub_8081F34: @ 8081F34 @@ -1338,8 +1338,8 @@ _08082518: .4byte sub_808243C _0808251C: .4byte gUnknown_3005098 thumb_func_end sub_80824EC - thumb_func_start sub_8082520 -sub_8082520: @ 8082520 + thumb_func_start ScrSpecial_EndTrainerApproach +ScrSpecial_EndTrainerApproach: @ 8082520 push {lr} ldr r0, _0808252C @ =sub_8082530 bl sub_8081E9C @@ -1347,7 +1347,7 @@ sub_8082520: @ 8082520 bx r0 .align 2, 0 _0808252C: .4byte sub_8082530 - thumb_func_end sub_8082520 + thumb_func_end ScrSpecial_EndTrainerApproach thumb_func_start sub_8082530 sub_8082530: @ 8082530 @@ -1360,8 +1360,8 @@ sub_8082530: @ 8082530 bx r0 thumb_func_end sub_8082530 - thumb_func_start sub_8082544 -sub_8082544: @ 8082544 + thumb_func_start FldEff_ExclamationMarkIcon1 +FldEff_ExclamationMarkIcon1: @ 8082544 push {lr} ldr r0, _08082574 @ =gUnknown_83C7388 movs r1, 0 @@ -1387,7 +1387,7 @@ _0808256C: .align 2, 0 _08082574: .4byte gUnknown_83C7388 _08082578: .4byte gUnknown_202063C - thumb_func_end sub_8082544 + thumb_func_end FldEff_ExclamationMarkIcon1 thumb_func_start sub_808257C sub_808257C: @ 808257C diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s index e121a02f3..4a8812ad1 100644 --- a/asm/trainer_tower.s +++ b/asm/trainer_tower.s @@ -1983,17 +1983,17 @@ _0815E690: adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815E718 @ =gUnknown_2021CF0 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815E71C @ =gUnknown_2021D04 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN pop {r4-r6} pop {r0} bx r0 @@ -2081,17 +2081,17 @@ _0815E76C: adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815E874 @ =gUnknown_2021CF0 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815E878 @ =gUnknown_2021D04 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815E87C @ =gUnknown_2021D18 ldr r1, _0815E880 @ =gUnknown_83FE998 bl StringExpandPlaceholders @@ -2212,7 +2212,7 @@ sub_815E8CC: @ 815E8CC ldrb r1, [r1, 0x4] movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0815E8F4 @ =gUnknown_20370D0 movs r0, 0x1 b _0815E8FC @@ -2746,17 +2746,17 @@ _0815ECDC: adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815EDC8 @ =gUnknown_2021CF0 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815EDCC @ =gUnknown_2021D04 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0815EDD0 @ =gUnknown_2021D18 ldr r1, _0815EDD4 @ =gUnknown_83FE998 bl StringExpandPlaceholders diff --git a/asm/unk_810C3A4.s b/asm/unk_810C3A4.s index cc01306f6..78d3c9606 100644 --- a/asm/unk_810C3A4.s +++ b/asm/unk_810C3A4.s @@ -61,7 +61,7 @@ _0810C3EE: cmp r0, 0 blt _0810C436 adds r0, r1, 0 - bl sub_80688E4 + bl FreezeMapObject _0810C412: adds r0, r4, 0x1 lsls r0, 24 diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index 910d8bb02..314436170 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -5619,7 +5619,7 @@ sub_814A468: @ 814A468 adds r1, r6, 0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN subs r4, 0x85 lsls r4, 16 lsrs r4, 16 @@ -7987,7 +7987,7 @@ _0814B63E: adds r0, r5, 0 movs r2, 0 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN adds r0, r5, 0 bl sub_814B6D4 movs r0, 0x2 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index b4fd68688..4e92a3310 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -2180,7 +2180,7 @@ _0814CBBC: ldr r1, [r5, 0x1C] movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r4, 0 str r4, [sp] adds r0, r6, 0 @@ -2756,14 +2756,14 @@ _0814D03C: ldr r1, [r5, 0x1C] movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0814D080 @ =gUnknown_2021CF0 bl sub_815EFA0 adds r1, r0, 0 adds r0, r4, 0 movs r2, 0 movs r3, 0x6 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r4, 0 str r4, [sp] adds r0, r6, 0 diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index f9d690cf0..3f7819eb3 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -1135,7 +1135,7 @@ sub_814DEC0: @ 814DEC0 lsls r0, 24 asrs r0, 16 movs r1, 0x4 - bl .gcc2_compiled._3 + bl sub_80D8AA0 adds r2, r7, 0 lsls r0, 16 asrs r3, r0, 16 @@ -1322,7 +1322,7 @@ _0814E048: ldr r0, _0814E0D8 @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0814E0DC @ =gUnknown_846F4B8 ldr r1, [sp, 0x28] adds r0, r1, r0 @@ -1423,7 +1423,7 @@ _0814E116: ldr r0, _0814E1E4 @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r3, 0 ldrb r0, [r4] movs r7, 0xF @@ -1476,7 +1476,7 @@ _0814E178: adds r1, r7, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0814E1F4 @ =gUnknown_846F4B8 ldr r2, [sp, 0x34] adds r0, r2, r0 @@ -1735,7 +1735,7 @@ sub_814E32C: @ 814E32C ldr r0, _0814E56C @ =gUnknown_2021CD0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r0, _0814E570 @ =gUnknown_2021CF0 movs r1, 0xA0 lsls r1, 1 @@ -1744,7 +1744,7 @@ sub_814E32C: @ 814E32C ldrsh r1, [r1, r2] movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r5, _0814E574 @ =gUnknown_2021D18 ldr r1, _0814E578 @ =gUnknown_841D080 adds r0, r5, 0 @@ -1792,7 +1792,7 @@ sub_814E32C: @ 814E32C ldr r0, _0814E56C @ =gUnknown_2021CD0 movs r2, 0x2 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r1, _0814E580 @ =gUnknown_841D074 adds r0, r5, 0 bl StringExpandPlaceholders @@ -1880,7 +1880,7 @@ _0814E4EA: lsrs r1, r2, 8 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0814E570 @ =gUnknown_2021CF0 ldr r1, _0814E590 @ =0x000f4240 ldr r0, [sp, 0xC] @@ -1889,7 +1889,7 @@ _0814E4EA: adds r0, r4, 0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0814E574 @ =gUnknown_2021D18 ldr r1, _0814E594 @ =gUnknown_841D090 adds r0, r4, 0 @@ -1976,7 +1976,7 @@ _0814E5B6: ldrh r1, [r4, 0x8] movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN ldr r4, _0814E63C @ =gUnknown_2021D18 ldr r1, _0814E640 @ =gUnknown_841D0A4 adds r0, r4, 0 @@ -2369,7 +2369,7 @@ _0814E90E: ldr r0, _0814EA0C @ =gUnknown_2021CD0 movs r2, 0 movs r3, 0x1 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r0, r8 ldr r1, _0814EA10 @ =gUnknown_841D13C bl StringExpandPlaceholders @@ -2422,7 +2422,7 @@ _0814E96E: ldr r0, _0814EA0C @ =gUnknown_2021CD0 movs r2, 0x1 movs r3, 0x3 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r0, r10 ldr r1, _0814EA1C @ =0x000f4240 bl __udivsi3 @@ -2430,7 +2430,7 @@ _0814E96E: ldr r0, _0814EA20 @ =gUnknown_2021CF0 movs r2, 0x2 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN mov r0, r8 ldr r1, _0814EA24 @ =gUnknown_841D090 bl StringExpandPlaceholders diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 03b1c7c1e..384fe48eb 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -6512,7 +6512,7 @@ _08153946: ldrb r3, [r0] mov r0, r8 movs r2, 0 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0x2 mov r1, r8 movs r2, 0x1 @@ -9324,7 +9324,7 @@ _08154EC8: mov r1, r9 movs r2, 0x1 movs r3, 0x7 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0 add r1, sp, 0xC adds r2, r4, 0 @@ -9592,7 +9592,7 @@ _0815512E: adds r1, r4, 0 movs r2, 0 movs r3, 0x4 - bl sub_8008E78 + bl ConvertIntToDecimalStringN movs r0, 0 add r1, sp, 0xC movs r2, 0x1 diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s index c4db24359..b2e204215 100644 --- a/asm/unk_815EDDC.s +++ b/asm/unk_815EDDC.s @@ -294,7 +294,7 @@ sub_815EFBC: @ 815EFBC mov r9, r0 movs r2, 0x1 movs r3, 0x5 - bl sub_8008E78 + bl ConvertIntToDecimalStringN str r4, [sp] str r5, [sp, 0x4] movs r0, 0 diff --git a/asm/util.s b/asm/util.s index 160b722af..f27e3c28f 100644 --- a/asm/util.s +++ b/asm/util.s @@ -120,8 +120,8 @@ DoBgAffineSet: @ 8044F78 bx r0 thumb_func_end DoBgAffineSet - thumb_func_start sub_8044FC4 -sub_8044FC4: @ 8044FC4 + thumb_func_start CopySpriteTiles +CopySpriteTiles: @ 8044FC4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -357,7 +357,7 @@ _0804517A: bx r0 .align 2, 0 _0804518C: .4byte 0x84000008 - thumb_func_end sub_8044FC4 + thumb_func_end CopySpriteTiles thumb_func_start CountTrailingZeroBits CountTrailingZeroBits: @ 8045190 diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index cfb19ea34..23bb15d9e 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -261,8 +261,8 @@ _080828F0: bx r1 thumb_func_end ChooseWildMonIndex_Fishing - thumb_func_start sub_80828F8 -sub_80828F8: @ 80828F8 + thumb_func_start ChooseWildMonLevel +ChooseWildMonLevel: @ 80828F8 push {r4,r5,lr} adds r4, r0, 0 ldrb r0, [r4, 0x1] @@ -292,7 +292,7 @@ _0808290C: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80828F8 + thumb_func_end ChooseWildMonLevel thumb_func_start sub_8082934 sub_8082934: @ 8082934 @@ -558,7 +558,7 @@ _08082B24: lsls r4, r6, 2 ldr r0, [r7, 0x4] adds r0, r4 - bl sub_80828F8 + bl ChooseWildMonLevel lsls r0, 24 lsrs r5, r0, 24 mov r0, r8 @@ -600,7 +600,7 @@ sub_8082B64: @ 8082B64 lsls r5, r4, 2 ldr r0, [r6, 0x4] adds r0, r5 - bl sub_80828F8 + bl ChooseWildMonLevel adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s index d65014cae..318f23f33 100644 --- a/asm/wireless_communication_status_screen.s +++ b/asm/wireless_communication_status_screen.s @@ -434,7 +434,7 @@ _0814F542: adds r0, r6, 0 movs r2, 0x1 movs r3, 0x2 - bl sub_8008E78 + bl ConvertIntToDecimalStringN cmp r4, 0x3 beq _0814F578 lsrs r0, r7, 24 |