diff options
Diffstat (limited to 'asm')
152 files changed, 2453 insertions, 2453 deletions
@@ -13,14 +13,14 @@ sub_810B858: @ 810B858 cmp r0, 0x3 beq _0810B874 ldr r0, _0810B870 @ =gUnknown_84530C4 - bl sub_8003B24 + bl InitWindows b _0810B87A .align 2, 0 _0810B86C: .4byte gUnknown_203ACFC _0810B870: .4byte gUnknown_84530C4 _0810B874: ldr r0, _0810B8E4 @ =gUnknown_84530E4 - bl sub_8003B24 + bl InitWindows _0810B87A: bl DeactivateAllTextPrinters movs r0, 0 @@ -118,7 +118,7 @@ sub_810B8F0: @ 810B8F0 str r4, [sp, 0xC] str r2, [sp, 0x10] mov r2, r9 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -152,7 +152,7 @@ sub_810B958: @ 810B958 movs r0, 0x2 movs r1, 0x1 movs r3, 0x1 - bl sub_812E51C + bl box_print add sp, 0xC pop {r4} pop {r0} @@ -213,7 +213,7 @@ sub_810B9DC: @ 810B9DC lsls r0, 3 ldr r1, _0810BA14 @ =gUnknown_8453104 adds r0, r1 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] cmp r5, 0x6 beq _0810BA18 @@ -285,7 +285,7 @@ sub_810BA70: @ 810BA70 lsls r0, r1, 3 ldr r1, _0810BA98 @ =gUnknown_8453104 adds r0, r1 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] _0810BA8C: ldrb r0, [r4] diff --git a/asm/battle_1.s b/asm/battle_1.s index e7d82740c..469f9b299 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -184,7 +184,7 @@ sub_800F324: @ 800F324 movs r2, 0x4 bl sub_8001658 ldr r0, _0800F348 @ =gUnknown_8248330 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters pop {r0} bx r0 @@ -291,8 +291,8 @@ sub_800F40C: @ 800F40C bx r0 thumb_func_end sub_800F40C - thumb_func_start sub_800F420 -sub_800F420: @ 800F420 + thumb_func_start LoadBattleTextboxAndBackground +LoadBattleTextboxAndBackground: @ 800F420 push {lr} ldr r0, _0800F454 @ =gUnknown_8D00000 movs r1, 0xC0 @@ -317,7 +317,7 @@ sub_800F420: @ 800F420 _0800F454: .4byte gUnknown_8D00000 _0800F458: .4byte gUnknown_8D0051C _0800F45C: .4byte gUnknown_8D004D8 - thumb_func_end sub_800F420 + thumb_func_end LoadBattleTextboxAndBackground thumb_func_start sub_800F460 sub_800F460: @ 800F460 diff --git a/asm/battle_2.s b/asm/battle_2.s index fc43a27a2..9e71b12d2 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -10,7 +10,7 @@ sub_800FD9C: @ 800FD9C push {r4,lr} bl sub_804C0A4 bl sub_802E03C - bl sub_8033DB8 + bl AllocateBattleSpritesData bl AllocateMonSpritesGfx ldr r4, _0800FDCC @ =gUnknown_2022B4C ldr r0, [r4] @@ -161,7 +161,7 @@ _0800FEA6: ldr r1, _0800FF64 @ =gUnknown_2022B50 strb r0, [r1] bl sub_800F34C - bl sub_800F420 + bl LoadBattleTextboxAndBackground bl ResetSpriteData bl ResetTasks bl sub_800FAE0 @@ -369,7 +369,7 @@ sub_80100B8: @ 80100B8 movs r0, 0xC4 lsls r0, 1 adds r4, r5, r0 - bl sub_809C854 + bl IsEnigmaBerryValid cmp r0, 0x1 bne _08010134 movs r2, 0 @@ -477,7 +477,7 @@ sub_801017C: @ 801017C beq _08010194 b _080102C0 _08010194: - bl sub_809C854 + bl IsEnigmaBerryValid cmp r0, 0x1 bne _08010250 movs r5, 0 @@ -2389,7 +2389,7 @@ sub_8011100: @ 8011100 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r0, _08011170 @ =sub_80111BC + ldr r0, _08011170 @ =CB2_QuitRecordedBattle bl SetMainCallback2 _08011158: add sp, 0x4 @@ -2400,11 +2400,11 @@ _08011160: .4byte gUnknown_30030F0 _08011164: .4byte gUnknown_2022B4C _08011168: .4byte gUnknown_20370D0 _0801116C: .4byte gUnknown_2023E8A -_08011170: .4byte sub_80111BC +_08011170: .4byte CB2_QuitRecordedBattle thumb_func_end sub_8011100 - thumb_func_start sub_8011174 -sub_8011174: @ 8011174 + thumb_func_start FreeRestoreBattleData +FreeRestoreBattleData: @ 8011174 push {lr} ldr r1, _080111AC @ =gUnknown_30030F0 ldr r0, _080111B0 @ =gUnknown_3004F80 @@ -2424,7 +2424,7 @@ sub_8011174: @ 8011174 movs r0, 0x53 bl m4aSongNumStop bl FreeMonSpritesGfx - bl sub_8033DF8 + bl FreeBattleSpritesData bl sub_802E138 pop {r0} bx r0 @@ -2433,10 +2433,10 @@ _080111AC: .4byte gUnknown_30030F0 _080111B0: .4byte gUnknown_3004F80 _080111B4: .4byte gUnknown_2039600 _080111B8: .4byte 0x00000439 - thumb_func_end sub_8011174 + thumb_func_end FreeRestoreBattleData - thumb_func_start sub_80111BC -sub_80111BC: @ 80111BC + thumb_func_start CB2_QuitRecordedBattle +CB2_QuitRecordedBattle: @ 80111BC push {lr} bl UpdatePaletteFade ldr r0, _080111E4 @ =gUnknown_2037AB8 @@ -2445,7 +2445,7 @@ sub_80111BC: @ 80111BC ands r0, r1 cmp r0, 0 bne _080111DE - bl sub_8011174 + bl FreeRestoreBattleData bl FreeAllWindowBuffers ldr r0, _080111E8 @ =gUnknown_30030F0 ldr r0, [r0, 0x8] @@ -2456,7 +2456,7 @@ _080111DE: .align 2, 0 _080111E4: .4byte gUnknown_2037AB8 _080111E8: .4byte gUnknown_30030F0 - thumb_func_end sub_80111BC + thumb_func_end CB2_QuitRecordedBattle thumb_func_start sub_80111EC sub_80111EC: @ 80111EC @@ -3737,7 +3737,7 @@ _08011C10: bl SetMainCallback2 bl sub_812C224 bl FreeMonSpritesGfx - bl sub_8033DF8 + bl FreeBattleSpritesData bl sub_802E138 _08011C34: add sp, 0x4 @@ -4780,14 +4780,14 @@ sub_80123C0: @ 80123C0 movs r0, 0 strb r0, [r1, 0x1] ldr r1, _080123DC @ =gUnknown_3004F84 - ldr r0, _080123E0 @ =sub_8012FAC + ldr r0, _080123E0 @ =BattleIntroGetMonsData str r0, [r1] pop {r0} bx r0 .align 2, 0 _080123D8: .4byte gUnknown_2023E82 _080123DC: .4byte gUnknown_3004F84 -_080123E0: .4byte sub_8012FAC +_080123E0: .4byte BattleIntroGetMonsData thumb_func_end sub_80123C0 thumb_func_start sub_80123E4 @@ -6259,8 +6259,8 @@ _08012FA4: .4byte gUnknown_2023FF4 _08012FA8: .4byte gUnknown_8254784 thumb_func_end sub_8012BC8 - thumb_func_start sub_8012FAC -sub_8012FAC: @ 8012FAC + thumb_func_start BattleIntroGetMonsData +BattleIntroGetMonsData: @ 8012FAC push {r4,r5,lr} ldr r5, _08012FBC @ =gUnknown_2023E82 ldrb r0, [r5] @@ -6302,24 +6302,24 @@ _08012FE4: cmp r0, r1 bne _08013018 ldr r1, _08013010 @ =gUnknown_3004F84 - ldr r0, _08013014 @ =sub_8013020 + ldr r0, _08013014 @ =BattleIntroPrepareBackgroundSlide str r0, [r1] b _0801301A .align 2, 0 _08013008: .4byte gUnknown_2023BC8 _0801300C: .4byte gUnknown_2023BCC _08013010: .4byte gUnknown_3004F84 -_08013014: .4byte sub_8013020 +_08013014: .4byte BattleIntroPrepareBackgroundSlide _08013018: strb r2, [r5] _0801301A: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_8012FAC + thumb_func_end BattleIntroGetMonsData - thumb_func_start sub_8013020 -sub_8013020: @ 8013020 + thumb_func_start BattleIntroPrepareBackgroundSlide +BattleIntroPrepareBackgroundSlide: @ 8013020 push {r4,r5,lr} ldr r0, _08013058 @ =gUnknown_2023BC8 ldr r5, [r0] @@ -6352,7 +6352,7 @@ _08013060: .4byte gUnknown_2022B50 _08013064: .4byte gUnknown_3004F84 _08013068: .4byte sub_8013070 _0801306C: .4byte gUnknown_2023E82 - thumb_func_end sub_8013020 + thumb_func_end BattleIntroPrepareBackgroundSlide thumb_func_start sub_8013070 sub_8013070: @ 8013070 @@ -6674,7 +6674,7 @@ _080132F8: b _080130A0 _0801330E: ldr r1, _08013334 @ =gUnknown_3004F84 - ldr r0, _08013338 @ =sub_801333C + ldr r0, _08013338 @ =BattleIntroDrawPartySummaryScreens str r0, [r1] _08013314: pop {r3-r5} @@ -6690,11 +6690,11 @@ _08013328: .4byte gUnknown_2022B4C _0801332C: .4byte gUnknown_2023BC4 _08013330: .4byte gUnknown_2023BCC _08013334: .4byte gUnknown_3004F84 -_08013338: .4byte sub_801333C +_08013338: .4byte BattleIntroDrawPartySummaryScreens thumb_func_end sub_8013070 - thumb_func_start sub_801333C -sub_801333C: @ 801333C + thumb_func_start BattleIntroDrawPartySummaryScreens +BattleIntroDrawPartySummaryScreens: @ 801333C push {r4-r7,lr} mov r7, r8 push {r7} @@ -6827,12 +6827,12 @@ _0801342E: ldrb r0, [r4] bl MarkBufferBankForExecution ldr r1, _08013460 @ =gUnknown_3004F84 - ldr r0, _08013464 @ =sub_80134DC + ldr r0, _08013464 @ =BattleIntroPrintTrainerWantsToBattle b _080134C6 .align 2, 0 _0801345C: .4byte gUnknown_2023BC4 _08013460: .4byte gUnknown_3004F84 -_08013464: .4byte sub_80134DC +_08013464: .4byte BattleIntroPrintTrainerWantsToBattle _08013468: movs r7, 0 add r6, sp, 0x4 @@ -6892,10 +6892,10 @@ _080134C8: .align 2, 0 _080134D4: .4byte gUnknown_3004F84 _080134D8: .4byte sub_8013514 - thumb_func_end sub_801333C + thumb_func_end BattleIntroDrawPartySummaryScreens - thumb_func_start sub_80134DC -sub_80134DC: @ 80134DC + thumb_func_start BattleIntroPrintTrainerWantsToBattle +BattleIntroPrintTrainerWantsToBattle: @ 80134DC push {lr} ldr r0, _08013504 @ =gUnknown_2023BC8 ldr r0, [r0] @@ -6919,7 +6919,7 @@ _08013504: .4byte gUnknown_2023BC8 _08013508: .4byte gUnknown_2023BC4 _0801350C: .4byte gUnknown_3004F84 _08013510: .4byte sub_8013568 - thumb_func_end sub_80134DC + thumb_func_end BattleIntroPrintTrainerWantsToBattle thumb_func_start sub_8013514 sub_8013514: @ 8013514 @@ -6946,7 +6946,7 @@ sub_8013514: @ 8013514 ldr r1, _08013560 @ =gUnknown_2023FC4 strb r0, [r1, 0x17] ldr r0, _08013564 @ =gUnknown_81D91A1 - bl sub_801BBE4 + bl BattleScriptExecute _0801354A: pop {r0} bx r0 @@ -7388,7 +7388,7 @@ _080138C0: ldrb r1, [r1] movs r2, 0x1 str r3, [sp, 0x4] - bl sub_8014CD8 + bl GetWhoStrikesFirst lsls r0, 24 ldr r3, [sp, 0x4] cmp r0, 0 @@ -7396,7 +7396,7 @@ _080138C0: lsls r1, r4, 24 lsrs r1, 24 lsrs r0, r7, 24 - bl sub_8014CA4 + bl SwapTurnOrder ldr r3, [sp, 0x4] _080138E4: adds r4, 0x1 @@ -7799,7 +7799,7 @@ _08013BF8: beq _08013C04 b _08013D20 _08013C04: - bl sub_8018F90 + bl HandleFaintedMonActions lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -7950,8 +7950,8 @@ _08013D4C: .4byte gUnknown_2023DC4 _08013D50: .4byte gUnknown_2023E80 thumb_func_end sub_8013BD4 - thumb_func_start sub_8013D54 -sub_8013D54: @ 8013D54 + thumb_func_start IsRunningFromBattleImpossible +IsRunningFromBattleImpossible: @ 8013D54 push {r4-r7,lr} sub sp, 0x4 ldr r1, _08013D78 @ =gUnknown_2023BE4 @@ -8216,7 +8216,7 @@ _08013F5E: bx r1 .align 2, 0 _08013F68: .4byte gUnknown_2023E82 - thumb_func_end sub_8013D54 + thumb_func_end IsRunningFromBattleImpossible thumb_func_start sub_8013F6C sub_8013F6C: @ 8013F6C @@ -9096,7 +9096,7 @@ _080146AC: cmp r0, 0x3 bne _080146EC ldr r0, _080146E4 @ =gUnknown_81D8924 - bl sub_801BBE4 + bl BattleScriptExecute ldr r1, _080146E8 @ =gUnknown_2023E82 ldrb r0, [r4] adds r0, r1 @@ -9108,7 +9108,7 @@ _080146E0: .4byte gUnknown_2023BC4 _080146E4: .4byte gUnknown_81D8924 _080146E8: .4byte gUnknown_2023E82 _080146EC: - bl sub_8013D54 + bl IsRunningFromBattleImpossible lsls r0, 24 cmp r0, 0 beq _08014750 @@ -9798,8 +9798,8 @@ _08014C9C: .4byte gUnknown_3004F84 _08014CA0: .4byte sub_80150A8 thumb_func_end sub_8014040 - thumb_func_start sub_8014CA4 -sub_8014CA4: @ 8014CA4 + thumb_func_start SwapTurnOrder +SwapTurnOrder: @ 8014CA4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -9825,10 +9825,10 @@ sub_8014CA4: @ 8014CA4 .align 2, 0 _08014CD0: .4byte gUnknown_2023BDA _08014CD4: .4byte gUnknown_2023BDE - thumb_func_end sub_8014CA4 + thumb_func_end SwapTurnOrder - thumb_func_start sub_8014CD8 -sub_8014CD8: @ 8014CD8 + thumb_func_start GetWhoStrikesFirst +GetWhoStrikesFirst: @ 8014CD8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -10314,7 +10314,7 @@ _08015096: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8014CD8 + thumb_func_end GetWhoStrikesFirst thumb_func_start sub_80150A8 sub_80150A8: @ 80150A8 @@ -10593,7 +10593,7 @@ _080152A8: beq _080152E4 adds r0, r3, 0 movs r2, 0 - bl sub_8014CD8 + bl GetWhoStrikesFirst lsls r0, 24 cmp r0, 0 beq _080152E4 @@ -10601,7 +10601,7 @@ _080152A8: lsrs r1, 24 mov r3, r8 lsrs r0, r3, 24 - bl sub_8014CA4 + bl SwapTurnOrder _080152E4: adds r4, 0x1 ldr r0, _08015320 @ =gUnknown_2023BCC @@ -10901,7 +10901,7 @@ _080154CC: cmp r0, 0 blt _08015550 ldr r0, _0801554C @ =gUnknown_81D9015 - bl sub_801BBE4 + bl BattleScriptExecute b _08015598 .align 2, 0 _08015528: .4byte gUnknown_2023DD0 @@ -10923,7 +10923,7 @@ _08015550: cmp r0, r1 bcc _080154CC _0801555E: - bl sub_8019284 + bl TryClearRageStatuses ldr r1, _080155A0 @ =gUnknown_2023BE2 movs r0, 0 strb r0, [r1] @@ -11502,14 +11502,14 @@ sub_8015A30: @ 8015A30 beq _08015A6C _08015A52: ldr r1, _08015A64 @ =gUnknown_3004F84 - ldr r0, _08015A68 @ =sub_8015B58 + ldr r0, _08015A68 @ =ReturnFromBattleToOverworld b _08015A70 .align 2, 0 _08015A58: .4byte gUnknown_2037AB8 _08015A5C: .4byte gUnknown_3004FD4 _08015A60: .4byte gUnknown_2023E8A _08015A64: .4byte gUnknown_3004F84 -_08015A68: .4byte sub_8015B58 +_08015A68: .4byte ReturnFromBattleToOverworld _08015A6C: ldr r1, _08015A94 @ =gUnknown_3004F84 ldr r0, _08015A98 @ =sub_8015AA0 @@ -11523,7 +11523,7 @@ _08015A70: cmp r0, 0 bne _08015A8E bl FreeMonSpritesGfx - bl sub_8033DF8 + bl FreeBattleSpritesData bl sub_802E138 _08015A8E: pop {r0} @@ -11594,7 +11594,7 @@ _08015B08: bne _08015AAC _08015B16: ldr r1, _08015B28 @ =gUnknown_3004F84 - ldr r0, _08015B2C @ =sub_8015B58 + ldr r0, _08015B2C @ =ReturnFromBattleToOverworld str r0, [r1] _08015B1C: pop {r4,r5} @@ -11603,7 +11603,7 @@ _08015B1C: .align 2, 0 _08015B24: .4byte gUnknown_3004FD4 _08015B28: .4byte gUnknown_3004F84 -_08015B2C: .4byte sub_8015B58 +_08015B2C: .4byte ReturnFromBattleToOverworld thumb_func_end sub_8015AA0 thumb_func_start sub_8015B30 @@ -11627,8 +11627,8 @@ _08015B50: .4byte gUnknown_3004F84 _08015B54: .4byte sub_8015AA0 thumb_func_end sub_8015B30 - thumb_func_start sub_8015B58 -sub_8015B58: @ 8015B58 + thumb_func_start ReturnFromBattleToOverworld +ReturnFromBattleToOverworld: @ 8015B58 push {r4-r6,lr} ldr r6, _08015BDC @ =gUnknown_2022B4C ldr r0, [r6] @@ -11703,10 +11703,10 @@ _08015BF0: .4byte gUnknown_30030F0 _08015BF4: .4byte 0x00000439 _08015BF8: .4byte gUnknown_3004F80 _08015BFC: .4byte gUnknown_202402C - thumb_func_end sub_8015B58 + thumb_func_end ReturnFromBattleToOverworld - thumb_func_start sub_8015C00 -sub_8015C00: @ 8015C00 + thumb_func_start RunBattleScriptCommands_PopCallbacksStack +RunBattleScriptCommands_PopCallbacksStack: @ 8015C00 push {lr} ldr r0, _08015C3C @ =gUnknown_2023BE3 ldrb r0, [r0] @@ -11761,7 +11761,7 @@ _08015C62: _08015C68: .4byte gUnknown_2023BC8 _08015C6C: .4byte gUnknown_825011C _08015C70: .4byte gUnknown_2023D74 - thumb_func_end sub_8015C00 + thumb_func_end RunBattleScriptCommands_PopCallbacksStack thumb_func_start sub_8015C74 sub_8015C74: @ 8015C74 @@ -13760,7 +13760,7 @@ _08016D10: .4byte gUnknown_2023BDA thumb_func_start HandleAction_Action11 HandleAction_Action11: @ 8016D14 push {lr} - bl sub_8018F90 + bl HandleFaintedMonActions lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 diff --git a/asm/battle_ai_script_commands.s b/asm/battle_ai_script_commands.s index e7267a8df..03ea976bc 100644 --- a/asm/battle_ai_script_commands.s +++ b/asm/battle_ai_script_commands.s @@ -2899,7 +2899,7 @@ sub_80C8238: @ 80C8238 ldr r1, _080C8274 @ =gUnknown_2023D6C ldrb r1, [r1] movs r2, 0x1 - bl sub_8014CD8 + bl GetWhoStrikesFirst ldr r3, _080C8278 @ =gUnknown_2039A00 ldr r2, [r3] lsls r0, 24 @@ -2939,7 +2939,7 @@ sub_80C8284: @ 80C8284 ldr r1, _080C82C0 @ =gUnknown_2023D6C ldrb r1, [r1] movs r2, 0x1 - bl sub_8014CD8 + bl GetWhoStrikesFirst ldr r3, _080C82C4 @ =gUnknown_2039A00 ldr r2, [r3] lsls r0, 24 @@ -3289,8 +3289,8 @@ _080C852C: .4byte gUnknown_2023BE4 _080C8530: .4byte gUnknown_2039A00 thumb_func_end sub_80C841C - thumb_func_start sub_80C8534 -sub_80C8534: @ 80C8534 + thumb_func_start BattleAICmd_get_highest_type_effectiveness +BattleAICmd_get_highest_type_effectiveness: @ 80C8534 push {r4-r7,lr} mov r7, r8 push {r7} @@ -3404,10 +3404,10 @@ _080C8610: .4byte gUnknown_2023BF0 _080C8614: .4byte gUnknown_2023D6B _080C8618: .4byte gUnknown_2023D6C _080C861C: .4byte gUnknown_2039A00 - thumb_func_end sub_80C8534 + thumb_func_end BattleAICmd_get_highest_type_effectiveness - thumb_func_start sub_80C8620 -sub_80C8620: @ 80C8620 + thumb_func_start BattleAICmd_if_type_effectiveness +BattleAICmd_if_type_effectiveness: @ 80C8620 push {r4,r5,lr} ldr r0, _080C86B8 @ =gUnknown_2023F50 movs r1, 0 @@ -3506,7 +3506,7 @@ _080C86E8: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80C8620 + thumb_func_end BattleAICmd_if_type_effectiveness thumb_func_start nullsub_66 nullsub_66: @ 80C86F0 @@ -5042,8 +5042,8 @@ _080C9244: _080C924C: .4byte gUnknown_2039A00 thumb_func_end sub_80C91B4 - thumb_func_start sub_80C9250 -sub_80C9250: @ 80C9250 + thumb_func_start BattleAICmd_watch +BattleAICmd_watch: @ 80C9250 ldr r0, _080C9260 @ =gUnknown_2023FF4 ldr r0, [r0] ldr r2, [r0, 0x14] @@ -5054,10 +5054,10 @@ sub_80C9250: @ 80C9250 bx lr .align 2, 0 _080C9260: .4byte gUnknown_2023FF4 - thumb_func_end sub_80C9250 + thumb_func_end BattleAICmd_watch - thumb_func_start sub_80C9264 -sub_80C9264: @ 80C9264 + thumb_func_start BattleAICmd_get_hold_effect +BattleAICmd_get_hold_effect: @ 80C9264 push {r4,lr} ldr r0, _080C9274 @ =gUnknown_2039A00 ldr r0, [r0] @@ -5119,7 +5119,7 @@ _080C92CA: _080C92D8: .4byte gUnknown_2023BE4 _080C92DC: .4byte gUnknown_2023FF4 _080C92E0: .4byte gUnknown_2039A00 - thumb_func_end sub_80C9264 + thumb_func_end BattleAICmd_get_hold_effect thumb_func_start BattleAICmd_get_gender BattleAICmd_get_gender: @ 80C92E4 diff --git a/asm/battle_ai_switch_items.s b/asm/battle_ai_switch_items.s index 85eb2ded9..18b361682 100644 --- a/asm/battle_ai_switch_items.s +++ b/asm/battle_ai_switch_items.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8039188 -sub_8039188: @ 8039188 + thumb_func_start ShouldSwitchIfPerishSong +ShouldSwitchIfPerishSong: @ 8039188 push {lr} ldr r1, _080391D4 @ =gUnknown_2023DFC ldr r0, _080391D8 @ =gUnknown_2023BC4 @@ -53,7 +53,7 @@ _080391E4: _080391E6: pop {r1} bx r1 - thumb_func_end sub_8039188 + thumb_func_end ShouldSwitchIfPerishSong thumb_func_start sub_80391EC sub_80391EC: @ 80391EC @@ -1323,7 +1323,7 @@ _08039BFA: mov r0, r8 cmp r0, 0 beq _08039C74 - bl sub_8039188 + bl ShouldSwitchIfPerishSong lsls r0, 24 cmp r0, 0 bne _08039C60 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index 1b53a9e21..9ec1ed55a 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80724C0 -sub_80724C0: @ 80724C0 + thumb_func_start ClearBattleAnimationVars +ClearBattleAnimationVars: @ 80724C0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -102,10 +102,10 @@ _0807258C: .4byte gUnknown_2037F24 _08072590: .4byte 0x0000ffff _08072594: .4byte gUnknown_2037EEE _08072598: .4byte gUnknown_2037F02 - thumb_func_end sub_80724C0 + thumb_func_end ClearBattleAnimationVars - thumb_func_start sub_807259C -sub_807259C: @ 807259C + thumb_func_start DoMoveAnim +DoMoveAnim: @ 807259C push {lr} adds r1, r0, 0 lsls r1, 16 @@ -129,7 +129,7 @@ _080725C4: .4byte gUnknown_2023D6B _080725C8: .4byte gUnknown_2037F1B _080725CC: .4byte gUnknown_2023D6C _080725D0: .4byte gUnknown_81C68F4 - thumb_func_end sub_807259C + thumb_func_end DoMoveAnim thumb_func_start sub_80725D4 sub_80725D4: @ 80725D4 @@ -1011,7 +1011,7 @@ _08072C88: ldr r0, _08072CDC @ =gUnknown_2023D44 adds r0, r5, r0 ldrb r4, [r0] - ldr r0, _08072CE0 @ =sub_8073174 + ldr r0, _08072CE0 @ =task_pA_ma0A_obj_to_bg_pal movs r1, 0xA bl CreateTask lsls r0, 24 @@ -1045,7 +1045,7 @@ _08072C88: .align 2, 0 _08072CD8: .4byte gUnknown_2037F1B _08072CDC: .4byte gUnknown_2023D44 -_08072CE0: .4byte sub_8073174 +_08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal _08072CE4: .4byte gUnknown_3005090 _08072CE8: .4byte gUnknown_202063C _08072CEC: .4byte gUnknown_2022978 @@ -1095,7 +1095,7 @@ _08072D3E: ldr r0, _08072D9C @ =gUnknown_2023D44 adds r0, r5, r0 ldrb r4, [r0] - ldr r0, _08072DA0 @ =sub_8073174 + ldr r0, _08072DA0 @ =task_pA_ma0A_obj_to_bg_pal movs r1, 0xA bl CreateTask lsls r0, 24 @@ -1132,7 +1132,7 @@ _08072D90: .4byte gUnknown_202297E _08072D94: .4byte gUnknown_3005090 _08072D98: .4byte gUnknown_2037F14 _08072D9C: .4byte gUnknown_2023D44 -_08072DA0: .4byte sub_8073174 +_08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal _08072DA4: .4byte gUnknown_202063C _08072DA8: .4byte gUnknown_2022978 _08072DAC: .4byte gUnknown_202297A @@ -1589,8 +1589,8 @@ _0807316C: .4byte gUnknown_202297C _08073170: .4byte gUnknown_202297E thumb_func_end sub_8073128 - thumb_func_start sub_8073174 -sub_8073174: @ 8073174 + thumb_func_start task_pA_ma0A_obj_to_bg_pal +task_pA_ma0A_obj_to_bg_pal: @ 8073174 push {r4-r6,lr} sub sp, 0x10 lsls r0, 24 @@ -1688,10 +1688,10 @@ _0807323C: .4byte gUnknown_202297C _08073240: .4byte gUnknown_202297E _08073244: .4byte gUnknown_20377F8 _08073248: .4byte 0x04000008 - thumb_func_end sub_8073174 + thumb_func_end task_pA_ma0A_obj_to_bg_pal - thumb_func_start sub_807324C -sub_807324C: @ 807324C + thumb_func_start ScriptCmd_clearmonbg +ScriptCmd_clearmonbg: @ 807324C push {r4,r5,lr} ldr r0, _08073260 @ =gUnknown_2037ED4 ldr r2, [r0] @@ -1796,7 +1796,7 @@ _080732E6: _08073310: .4byte sub_807331C _08073314: .4byte gUnknown_3005090 _08073318: .4byte gUnknown_2037ED4 - thumb_func_end sub_807324C + thumb_func_end ScriptCmd_clearmonbg thumb_func_start sub_807331C sub_807331C: @ 807331C @@ -3867,8 +3867,8 @@ _0807429E: bx r0 thumb_func_end sub_807423C - thumb_func_start sub_80742A4 -sub_80742A4: @ 80742A4 + thumb_func_start ScriptCmd_invisible +ScriptCmd_invisible: @ 80742A4 push {r4,lr} ldr r4, _080742D8 @ =gUnknown_2037ED4 ldr r0, [r4] @@ -3898,10 +3898,10 @@ _080742CC: .align 2, 0 _080742D8: .4byte gUnknown_2037ED4 _080742DC: .4byte gUnknown_202063C - thumb_func_end sub_80742A4 + thumb_func_end ScriptCmd_invisible - thumb_func_start sub_80742E0 -sub_80742E0: @ 80742E0 + thumb_func_start ScriptCmd_visible +ScriptCmd_visible: @ 80742E0 push {r4,lr} ldr r4, _08074318 @ =gUnknown_2037ED4 ldr r0, [r4] @@ -3932,7 +3932,7 @@ _0807430A: .align 2, 0 _08074318: .4byte gUnknown_2037ED4 _0807431C: .4byte gUnknown_202063C - thumb_func_end sub_80742E0 + thumb_func_end ScriptCmd_visible thumb_func_start sub_8074320 sub_8074320: @ 8074320 diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index 4edbae993..f25d784f9 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -545,8 +545,8 @@ _0807489E: bx r1 thumb_func_end sub_8074844 - thumb_func_start sub_80748A8 -sub_80748A8: @ 80748A8 + thumb_func_start GetBankSpriteDefault_Y +GetBankSpriteDefault_Y: @ 80748A8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -556,10 +556,10 @@ sub_80748A8: @ 80748A8 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_80748A8 + thumb_func_end GetBankSpriteDefault_Y - thumb_func_start sub_80748BC -sub_80748BC: @ 80748BC + thumb_func_start GetSubstituteSpriteDefault_Y +GetSubstituteSpriteDefault_Y: @ 80748BC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -592,7 +592,7 @@ _080748F0: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80748BC + thumb_func_end GetSubstituteSpriteDefault_Y thumb_func_start sub_8074900 sub_8074900: @ 8074900 diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s index b8afc40ce..9840155a2 100644 --- a/asm/battle_controller_link_opponent.s +++ b/asm/battle_controller_link_opponent.s @@ -929,7 +929,7 @@ _0803ADD4: .4byte gUnknown_3004FF0 CompleteOnInactiveTextPrinter_5: @ 803ADD8 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0803ADEA @@ -3586,7 +3586,7 @@ sub_803C3B4: @ 803C3B4 lsls r5, 24 lsrs r5, 24 ldrb r0, [r6] - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -3790,7 +3790,7 @@ sub_803C550: @ 803C550 lsls r5, 24 lsrs r5, 24 adds r0, r6, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -4609,8 +4609,8 @@ sub_803CC88: @ 803CC88 bx r0 thumb_func_end sub_803CC88 - thumb_func_start sub_803CC94 -sub_803CC94: @ 803CC94 + thumb_func_start RecordedOpponentHandleMoveAnimation +RecordedOpponentHandleMoveAnimation: @ 803CC94 push {r4-r6,lr} ldr r6, _0803CD78 @ =gUnknown_2023BC4 ldrb r0, [r6] @@ -4746,7 +4746,7 @@ _0803CD9C: ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0803CDC8 @ =sub_803CDCC + ldr r1, _0803CDC8 @ =RecordedOpponentDoMoveAnimation str r1, [r0] _0803CDBA: pop {r4-r6} @@ -4755,11 +4755,11 @@ _0803CDBA: .align 2, 0 _0803CDC0: .4byte gUnknown_2024018 _0803CDC4: .4byte gUnknown_3004FE0 -_0803CDC8: .4byte sub_803CDCC - thumb_func_end sub_803CC94 +_0803CDC8: .4byte RecordedOpponentDoMoveAnimation + thumb_func_end RecordedOpponentHandleMoveAnimation - thumb_func_start sub_803CDCC -sub_803CDCC: @ 803CDCC + thumb_func_start RecordedOpponentDoMoveAnimation +RecordedOpponentDoMoveAnimation: @ 803CDCC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -4845,7 +4845,7 @@ _0803CE64: movs r0, 0 bl sub_8035450 adds r0, r4, 0 - bl sub_807259C + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -4947,7 +4947,7 @@ _0803CF40: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_803CDCC + thumb_func_end RecordedOpponentDoMoveAnimation thumb_func_start sub_803CF50 sub_803CF50: @ 803CF50 @@ -5555,8 +5555,8 @@ _0803D3DC: .4byte gUnknown_2022BC4 _0803D3E0: .4byte gUnknown_2023BC4 thumb_func_end sub_803D3B4 - thumb_func_start sub_803D3E4 -sub_803D3E4: @ 803D3E4 + thumb_func_start RecordedOpponentHandleFaintingCry +RecordedOpponentHandleFaintingCry: @ 803D3E4 push {lr} ldr r1, _0803D414 @ =gUnknown_2023BCE ldr r0, _0803D418 @ =gUnknown_2023BC4 @@ -5582,10 +5582,10 @@ sub_803D3E4: @ 803D3E4 _0803D414: .4byte gUnknown_2023BCE _0803D418: .4byte gUnknown_2023BC4 _0803D41C: .4byte gUnknown_202402C - thumb_func_end sub_803D3E4 + thumb_func_end RecordedOpponentHandleFaintingCry - thumb_func_start sub_803D420 -sub_803D420: @ 803D420 + thumb_func_start RecordedOpponentHandleIntroSlide +RecordedOpponentHandleIntroSlide: @ 803D420 push {lr} ldr r1, _0803D448 @ =gUnknown_2022BC4 ldr r0, _0803D44C @ =gUnknown_2023BC4 @@ -5607,7 +5607,7 @@ sub_803D420: @ 803D420 _0803D448: .4byte gUnknown_2022BC4 _0803D44C: .4byte gUnknown_2023BC4 _0803D450: .4byte gUnknown_2023F4C - thumb_func_end sub_803D420 + thumb_func_end RecordedOpponentHandleIntroSlide thumb_func_start sub_803D454 sub_803D454: @ 803D454 diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s index 2e7443f1c..68d51cbcb 100644 --- a/asm/battle_controller_link_partner.s +++ b/asm/battle_controller_link_partner.s @@ -644,7 +644,7 @@ _080D4714: .4byte gUnknown_3004FF0 sub_80D4718: @ 80D4718 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080D472A @@ -838,7 +838,7 @@ sub_80D484C: @ 80D484C bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - ldr r0, _080D4924 @ =sub_802FDF4 + ldr r0, _080D4924 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask ldr r0, _080D4928 @ =gUnknown_2023BCE @@ -898,7 +898,7 @@ _080D490E: _080D4918: .4byte gUnknown_2024018 _080D491C: .4byte gUnknown_2023BC4 _080D4920: .4byte 0x000027f9 -_080D4924: .4byte sub_802FDF4 +_080D4924: .4byte c3_0802FDF4 _080D4928: .4byte gUnknown_2023BCE _080D492C: .4byte gUnknown_2024284 _080D4930: .4byte gUnknown_2023D44 @@ -3380,7 +3380,7 @@ sub_80D5DB4: @ 80D5DB4 lsls r5, 24 lsrs r5, 24 ldrb r0, [r6] - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -3572,7 +3572,7 @@ sub_80D5F40: @ 80D5F40 lsls r5, 24 lsrs r5, 24 adds r0, r6, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -4466,7 +4466,7 @@ _080D66E0: movs r0, 0 bl sub_8035450 adds r0, r4, 0 - bl sub_807259C + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 3e6b1dba9..4a87edd6e 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -176,7 +176,7 @@ _080E76EE: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -204,7 +204,7 @@ _080E7726: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -248,7 +248,7 @@ _080E777C: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -260,7 +260,7 @@ _080E7794: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt b _080E7838 .align 2, 0 _080E77A8: .4byte gUnknown_2023FF8 @@ -382,10 +382,10 @@ _080E787C: movs r0, 0x5 bl sub_80722CC movs r0, 0 - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt movs r0, 0x1 movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt ldr r0, [r4] adds r0, 0x96 movs r1, 0x40 @@ -451,7 +451,7 @@ _080E7914: .4byte nullsub_8 sub_80E7918: @ 80E7918 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080E792A @@ -1005,7 +1005,7 @@ _080E7D02: bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - ldr r0, _080E7DF0 @ =sub_802FDF4 + ldr r0, _080E7DF0 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask ldr r2, _080E7DF4 @ =gUnknown_2023BCE @@ -1039,7 +1039,7 @@ _080E7DE0: .4byte gUnknown_2023BC4 _080E7DE4: .4byte nullsub_8 _080E7DE8: .4byte gUnknown_2024018 _080E7DEC: .4byte 0x000027f9 -_080E7DF0: .4byte sub_802FDF4 +_080E7DF0: .4byte c3_0802FDF4 _080E7DF4: .4byte gUnknown_2023BCE _080E7DF8: .4byte gUnknown_2024284 _080E7DFC: .4byte gUnknown_3004FE0 @@ -1779,7 +1779,7 @@ _080E83FE: _080E8404: .4byte gUnknown_2037AB8 _080E8408: ldr r0, _080E8418 @ =gUnknown_83FDAE2 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080E841C @ =gUnknown_202298C movs r1, 0x18 bl sub_80D87BC @@ -1789,7 +1789,7 @@ _080E8418: .4byte gUnknown_83FDAE2 _080E841C: .4byte gUnknown_202298C _080E8420: movs r0, 0x18 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 @@ -1830,7 +1830,7 @@ _080E8468: cmp r0, 0 bne _080E855E ldr r0, _080E8488 @ =gUnknown_83FDB92 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080E848C @ =gUnknown_202298C movs r1, 0x18 bl sub_80D87BC @@ -1841,7 +1841,7 @@ _080E8488: .4byte gUnknown_83FDB92 _080E848C: .4byte gUnknown_202298C _080E8490: movs r0, 0x18 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 @@ -1880,7 +1880,7 @@ _080E84D8: cmp r0, 0 bne _080E855E ldr r0, _080E84F8 @ =gUnknown_83FDBEF - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080E84FC @ =gUnknown_202298C movs r1, 0x18 bl sub_80D87BC @@ -1891,7 +1891,7 @@ _080E84F8: .4byte gUnknown_83FDBEF _080E84FC: .4byte gUnknown_202298C _080E8500: movs r0, 0x18 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 @@ -2038,7 +2038,7 @@ _080E8600: .4byte _080E86B4 _080E8618: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080E86F2 @@ -2082,7 +2082,7 @@ _080E865A: _080E866C: .4byte gUnknown_2037AB8 _080E8670: adds r0, r2, 0 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080E8680 @ =gUnknown_202298C movs r1, 0x18 bl sub_80D87BC @@ -2091,7 +2091,7 @@ _080E8670: _080E8680: .4byte gUnknown_202298C _080E8684: movs r0, 0x18 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 @@ -2262,7 +2262,7 @@ _080E87D0: _080E87E4: .4byte gUnknown_2037AB8 _080E87E8: ldr r0, _080E87F8 @ =gUnknown_83FDCD2 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080E87FC @ =gUnknown_202298C movs r1, 0x18 bl sub_80D87BC @@ -2272,7 +2272,7 @@ _080E87F8: .4byte gUnknown_83FDCD2 _080E87FC: .4byte gUnknown_202298C _080E8800: movs r0, 0x18 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 @@ -2419,7 +2419,7 @@ _080E892C: .4byte gUnknown_2024284 sub_80E8930: @ 80E8930 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080E8942 @@ -5687,7 +5687,7 @@ _080EA46A: movs r0, 0 bl sub_8035450 adds r0, r4, 0 - bl sub_807259C + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -6014,7 +6014,7 @@ sub_80EA6FC: @ 80EA6FC _080EA71E: lsls r0, r4, 24 lsrs r0, 24 - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt adds r4, 0x1 cmp r4, 0x3 ble _080EA71E @@ -6024,7 +6024,7 @@ _080EA71E: adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt ldr r0, _080EA768 @ =gUnknown_2022B4C ldr r0, [r0] movs r1, 0x10 @@ -6032,7 +6032,7 @@ _080EA71E: cmp r0, 0 beq _080EA770 ldr r0, _080EA76C @ =gUnknown_83FE6D5 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString b _080EA776 .align 2, 0 _080EA750: .4byte gUnknown_3004FE0 @@ -6045,7 +6045,7 @@ _080EA768: .4byte gUnknown_2022B4C _080EA76C: .4byte gUnknown_83FE6D5 _080EA770: ldr r0, _080EA784 @ =gUnknown_83FE6FA - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString _080EA776: ldr r0, _080EA788 @ =gUnknown_202298C movs r1, 0x1 @@ -7081,7 +7081,7 @@ sub_80EAF34: @ 80EAF34 lsls r5, 24 lsrs r5, 24 adds r0, r6, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index a1a07c4c9..c362a6298 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -925,7 +925,7 @@ _080361E0: .4byte gUnknown_3004FF0 sub_80361E4: @ 80361E4 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080361F6 @@ -3638,7 +3638,7 @@ _08037890: adds r0, r6 bl BattleLoadOpponentMonSpriteGfx ldrb r0, [r4] - bl sub_80748A8 + bl GetBankSpriteDefault_Y lsls r0, 24 lsrs r5, r0, 24 _080378AA: @@ -3770,8 +3770,8 @@ _080379C0: .4byte gUnknown_3004FE0 _080379C4: .4byte sub_8035FE8 thumb_func_end sub_80377FC - thumb_func_start sub_80379C8 -sub_80379C8: @ 80379C8 + thumb_func_start OpponentHandleSwitchInAnim +OpponentHandleSwitchInAnim: @ 80379C8 push {r4,lr} ldr r4, _08037A10 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -3813,7 +3813,7 @@ _08037A18: .4byte gUnknown_2023BCE _08037A1C: .4byte gUnknown_2022BC4 _08037A20: .4byte gUnknown_3004FE0 _08037A24: .4byte sub_8036408 - thumb_func_end sub_80379C8 + thumb_func_end OpponentHandleSwitchInAnim thumb_func_start sub_8037A28 sub_8037A28: @ 8037A28 @@ -3882,7 +3882,7 @@ sub_8037A28: @ 8037A28 lsls r5, 24 lsrs r5, 24 adds r0, r6, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -5006,7 +5006,7 @@ _080383D0: movs r0, 0 bl sub_8035450 adds r0, r4, 0 - bl sub_807259C + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -6695,8 +6695,8 @@ sub_8039134: @ 8039134 bx r0 thumb_func_end sub_8039134 - thumb_func_start sub_8039140 -sub_8039140: @ 8039140 + thumb_func_start OpponentHandleCmd55 +OpponentHandleCmd55: @ 8039140 push {lr} ldr r0, _08039174 @ =gUnknown_2022B4C ldr r0, [r0] @@ -6726,7 +6726,7 @@ _08039174: .4byte gUnknown_2022B4C _08039178: .4byte gUnknown_30030F0 _0803917C: .4byte 0x00000439 _08039180: .4byte gUnknown_3004F80 - thumb_func_end sub_8039140 + thumb_func_end OpponentHandleCmd55 thumb_func_start nullsub_18 nullsub_18: @ 8039184 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 6b3260d11..c484163bd 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -249,7 +249,7 @@ _0802E4EA: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -277,7 +277,7 @@ _0802E522: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -321,7 +321,7 @@ _0802E578: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -333,7 +333,7 @@ _0802E590: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt b _0802E634 .align 2, 0 _0802E5A4: .4byte gUnknown_2023FF8 @@ -1145,7 +1145,7 @@ _0802EC38: b _0802EDBA _0802EC52: ldrb r0, [r2] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r6] adds r1, r4 ldrb r0, [r1] @@ -1179,7 +1179,7 @@ _0802EC84: b _0802EDBA _0802EC92: ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r6] adds r1, r4 ldrb r0, [r1] @@ -1204,7 +1204,7 @@ _0802ECAC: b _0802EDBA _0802ECC6: ldrb r0, [r2] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r6] adds r1, r4 ldrb r0, [r1] @@ -1234,7 +1234,7 @@ _0802ECDC: cmp r0, r1 bcs _0802EDBA ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r6] adds r1, r4 ldrb r0, [r1] @@ -1247,7 +1247,7 @@ _0802ED10: adds r0, r4 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt bl MoveSelectionDisplayPpNumber bl MoveSelectionDisplayMoveType _0802ED2C: @@ -1283,7 +1283,7 @@ _0802ED4C: adds r0, r4 ldrb r0, [r0] movs r1, 0x1D - bl sub_80309CC + bl MoveSelectionCreateCursorAt ldrb r0, [r6] adds r0, r4 ldrb r0, [r0] @@ -1305,7 +1305,7 @@ _0802ED94: _0802ED9C: ldrb r0, [r0] movs r1, 0x1B - bl sub_80309CC + bl MoveSelectionCreateCursorAt ldr r0, _0802EDCC @ =gUnknown_83FE7A0 movs r1, 0xB bl sub_80D87BC @@ -1379,7 +1379,7 @@ _0802EE18: cmp r0, 0 beq _0802EE58 ldrb r0, [r2] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -1392,7 +1392,7 @@ _0802EE18: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802EE58: ldr r0, _0802EF40 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -1417,7 +1417,7 @@ _0802EE58: cmp r0, r1 bcs _0802EEA6 ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -1429,7 +1429,7 @@ _0802EE58: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802EEA6: ldr r0, _0802EF40 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -1447,7 +1447,7 @@ _0802EEA6: cmp r0, 0 beq _0802EEE8 ldrb r0, [r2] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -1460,7 +1460,7 @@ _0802EEA6: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802EEE8: ldr r0, _0802EF40 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -1485,7 +1485,7 @@ _0802EEE8: cmp r0, r1 bcs _0802EF36 ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -1497,7 +1497,7 @@ _0802EEE8: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802EF36: adds r0, r7, 0 pop {r4-r7} @@ -2005,7 +2005,7 @@ _0802F324: adds r0, r2 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt bl MoveSelectionDisplayPpString bl MoveSelectionDisplayPpNumber bl MoveSelectionDisplayMoveType @@ -2020,14 +2020,14 @@ _0802F34C: bl sub_80722CC ldr r0, _0802F3A0 @ =gUnknown_3004FF4 ldrb r0, [r0] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldr r1, _0802F39C @ =gUnknown_2023FFC ldr r4, _0802F394 @ =gUnknown_2023BC4 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt ldr r0, _0802F3A8 @ =gUnknown_2022B4C ldr r0, [r0] movs r1, 0x10 @@ -2082,7 +2082,7 @@ _0802F3C8: bne _0802F410 ldrb r0, [r1] movs r1, 0x1D - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F416 .align 2, 0 _0802F3F8: .4byte gUnknown_3004FE0 @@ -2093,7 +2093,7 @@ _0802F408: .4byte gUnknown_2023FFC _0802F40C: .4byte gUnknown_2023BC4 _0802F410: ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt _0802F416: ldr r4, _0802F440 @ =gUnknown_3004FF4 ldrb r0, [r4] @@ -2112,7 +2112,7 @@ _0802F416: bne _0802F44C adds r0, r1, 0 movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F454 .align 2, 0 _0802F440: .4byte gUnknown_3004FF4 @@ -2121,7 +2121,7 @@ _0802F448: .4byte gUnknown_2023BC4 _0802F44C: ldrb r0, [r4] movs r1, 0x1B - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802F454: ldr r0, _0802F490 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -2150,7 +2150,7 @@ _0802F454: bne _0802F4A4 ldrb r0, [r1] movs r1, 0x1D - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F4AA .align 2, 0 _0802F490: .4byte gUnknown_30030F0 @@ -2160,7 +2160,7 @@ _0802F49C: .4byte gUnknown_2023FFC _0802F4A0: .4byte gUnknown_2023BC4 _0802F4A4: ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt _0802F4AA: ldr r4, _0802F4D4 @ =gUnknown_3004FF4 ldrb r0, [r4] @@ -2179,7 +2179,7 @@ _0802F4AA: bne _0802F4E0 adds r0, r1, 0 movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F4E8 .align 2, 0 _0802F4D4: .4byte gUnknown_3004FF4 @@ -2188,7 +2188,7 @@ _0802F4DC: .4byte gUnknown_2023BC4 _0802F4E0: ldrb r0, [r4] movs r1, 0x1B - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802F4E8: ldr r0, _0802F518 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -2211,7 +2211,7 @@ _0802F4E8: bne _0802F528 ldrb r0, [r1] movs r1, 0x1D - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F52E .align 2, 0 _0802F518: .4byte gUnknown_30030F0 @@ -2220,7 +2220,7 @@ _0802F520: .4byte gUnknown_2023FFC _0802F524: .4byte gUnknown_2023BC4 _0802F528: ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt _0802F52E: ldr r4, _0802F558 @ =gUnknown_3004FF4 ldrb r0, [r4] @@ -2239,7 +2239,7 @@ _0802F52E: bne _0802F564 adds r0, r1, 0 movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F56C .align 2, 0 _0802F558: .4byte gUnknown_3004FF4 @@ -2248,7 +2248,7 @@ _0802F560: .4byte gUnknown_2023BC4 _0802F564: ldrb r0, [r4] movs r1, 0x1B - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802F56C: ldr r0, _0802F5A8 @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] @@ -2277,7 +2277,7 @@ _0802F56C: bne _0802F5BC ldrb r0, [r1] movs r1, 0x1D - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F5C2 .align 2, 0 _0802F5A8: .4byte gUnknown_30030F0 @@ -2287,7 +2287,7 @@ _0802F5B4: .4byte gUnknown_2023FFC _0802F5B8: .4byte gUnknown_2023BC4 _0802F5BC: ldrb r0, [r3] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt _0802F5C2: ldr r4, _0802F5EC @ =gUnknown_3004FF4 ldrb r0, [r4] @@ -2306,7 +2306,7 @@ _0802F5C2: bne _0802F5F8 adds r0, r1, 0 movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt b _0802F600 .align 2, 0 _0802F5EC: .4byte gUnknown_3004FF4 @@ -2315,7 +2315,7 @@ _0802F5F4: .4byte gUnknown_2023BC4 _0802F5F8: ldrb r0, [r4] movs r1, 0x1B - bl sub_80309CC + bl MoveSelectionCreateCursorAt _0802F600: add sp, 0x24 pop {r3-r5} @@ -3282,8 +3282,8 @@ _0802FDEC: .4byte gUnknown_3004FE0 _0802FDF0: .4byte sub_802FBF4 thumb_func_end sub_802FD18 - thumb_func_start sub_802FDF4 -sub_802FDF4: @ 802FDF4 + thumb_func_start c3_0802FDF4 +c3_0802FDF4: @ 802FDF4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -3305,10 +3305,10 @@ _0802FE16: .align 2, 0 _0802FE1C: .4byte gMPlay_BGM _0802FE20: .4byte 0x0000ffff - thumb_func_end sub_802FDF4 + thumb_func_end c3_0802FDF4 - thumb_func_start sub_802FE24 -sub_802FE24: @ 802FE24 + thumb_func_start CompleteOnHealthbarDone +CompleteOnHealthbarDone: @ 802FE24 push {r4-r6,lr} ldr r5, _0802FE64 @ =gUnknown_2023BC4 ldrb r0, [r5] @@ -3359,13 +3359,13 @@ _0802FE86: .align 2, 0 _0802FE8C: .4byte gUnknown_2023BCE _0802FE90: .4byte gUnknown_2024284 - thumb_func_end sub_802FE24 + thumb_func_end CompleteOnHealthbarDone thumb_func_start sub_802FE94 sub_802FE94: @ 802FE94 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0802FEA6 @@ -4045,7 +4045,7 @@ _0803040C: .4byte _080304E8 _08030428: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0803051C @@ -4280,7 +4280,7 @@ _0803060C: .4byte gUnknown_3004FF0 sub_8030610: @ 8030610 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _08030622 @@ -4563,7 +4563,7 @@ sub_8030830: @ 8030830 _08030848: lsls r0, r5, 24 lsrs r0, 24 - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt adds r0, r6, 0 ldr r1, _080308A0 @ =gUnknown_83FE770 bl StringCopy @@ -4632,7 +4632,7 @@ MoveSelectionDisplayPpNumber: @ 80308CC ldrb r0, [r0] cmp r0, 0x1 beq _08030928 - bl sub_80D89DC + bl SetPpNumbersPaletteInMoveSelection ldrb r1, [r7] lsls r4, r1, 9 adds r0, r5, 0x4 @@ -4737,8 +4737,8 @@ _080309C4: .4byte gUnknown_2023FFC _080309C8: .4byte gUnknown_824F1A0 thumb_func_end MoveSelectionDisplayMoveType - thumb_func_start sub_80309CC -sub_80309CC: @ 80309CC + thumb_func_start MoveSelectionCreateCursorAt +MoveSelectionCreateCursorAt: @ 80309CC push {lr} sub sp, 0x10 adds r3, r0, 0 @@ -4773,10 +4773,10 @@ sub_80309CC: @ 80309CC add sp, 0x10 pop {r0} bx r0 - thumb_func_end sub_80309CC + thumb_func_end MoveSelectionCreateCursorAt - thumb_func_start sub_8030A14 -sub_8030A14: @ 8030A14 + thumb_func_start MoveSelectionDestroyCursorAt +MoveSelectionDestroyCursorAt: @ 8030A14 push {lr} sub sp, 0x10 adds r3, r0, 0 @@ -4807,10 +4807,10 @@ sub_8030A14: @ 8030A14 add sp, 0x10 pop {r0} bx r0 - thumb_func_end sub_8030A14 + thumb_func_end MoveSelectionDestroyCursorAt - thumb_func_start sub_8030A54 -sub_8030A54: @ 8030A54 + thumb_func_start ActionSelectionCreateCursorAt +ActionSelectionCreateCursorAt: @ 8030A54 push {r4,lr} sub sp, 0x10 adds r3, r0, 0 @@ -4843,10 +4843,10 @@ sub_8030A54: @ 8030A54 pop {r4} pop {r0} bx r0 - thumb_func_end sub_8030A54 + thumb_func_end ActionSelectionCreateCursorAt - thumb_func_start sub_8030A98 -sub_8030A98: @ 8030A98 + thumb_func_start ActionSelectionDestroyCursorAt +ActionSelectionDestroyCursorAt: @ 8030A98 push {lr} sub sp, 0x10 adds r3, r0, 0 @@ -4879,7 +4879,7 @@ sub_8030A98: @ 8030A98 add sp, 0x10 pop {r0} bx r0 - thumb_func_end sub_8030A98 + thumb_func_end ActionSelectionDestroyCursorAt thumb_func_start sub_8030ADC sub_8030ADC: @ 8030ADC @@ -7452,7 +7452,7 @@ sub_8031FF4: @ 8031FF4 lsls r5, 24 lsrs r5, 24 adds r0, r6, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -8640,7 +8640,7 @@ _08032A10: movs r0, 0 bl sub_8035450 adds r0, r4, 0 - bl sub_807259C + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -8867,7 +8867,7 @@ sub_8032BD4: @ 8032BD4 _08032BF6: lsls r0, r4, 24 lsrs r0, 24 - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt adds r4, 0x1 cmp r4, 0x3 ble _08032BF6 @@ -8877,9 +8877,9 @@ _08032BF6: adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt ldr r0, _08032C40 @ =gUnknown_83FE6D5 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _08032C44 @ =gUnknown_202298C movs r1, 0x1 bl sub_80D87BC @@ -8967,7 +8967,7 @@ sub_8032CB4: @ 8032CB4 adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt bl MoveSelectionDisplayPpString bl MoveSelectionDisplayPpNumber bl MoveSelectionDisplayMoveType @@ -9245,7 +9245,7 @@ _08032F16: ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08032F48 @ =sub_802FE24 + ldr r1, _08032F48 @ =CompleteOnHealthbarDone str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -9260,7 +9260,7 @@ _08032F38: .4byte gUnknown_2024284 _08032F3C: .4byte gUnknown_3004FF0 _08032F40: .4byte gUnknown_3004FE0 _08032F44: .4byte gUnknown_2023BC4 -_08032F48: .4byte sub_802FE24 +_08032F48: .4byte CompleteOnHealthbarDone thumb_func_end sub_8032E4C thumb_func_start PlayerHandleExpUpdate diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index 78aca5e46..786b76da2 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -79,7 +79,7 @@ _08156128: .4byte gUnknown_2023BC4 _0815612C: .4byte gUnknown_2022BC4 _08156130: .4byte gUnknown_8478F1C _08156134: - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156138: pop {r4,r5} pop {r0} @@ -112,7 +112,7 @@ sub_815614C: @ 815614C ldr r0, _08156180 @ =nullsub_8 cmp r1, r0 bne _08156170 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156170: pop {r0} bx r0 @@ -201,7 +201,7 @@ _081561F8: bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156230: pop {r4-r7} pop {r0} @@ -214,11 +214,11 @@ _08156238: .4byte 0x000027f9 sub_815623C: @ 815623C push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0815624E - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _0815624E: pop {r0} bx r0 @@ -273,7 +273,7 @@ sub_8156294: @ 8156294 ands r0, r1 cmp r0, 0 bne _081562D4 - ldr r0, _081562E4 @ =sub_802FDF4 + ldr r0, _081562E4 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask ldr r2, _081562E8 @ =gUnknown_2023BCE @@ -286,7 +286,7 @@ sub_8156294: @ 8156294 ldr r2, _081562EC @ =gUnknown_2024284 adds r0, r2 bl HandleLowHpMusicChange - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _081562D4: pop {r4} pop {r0} @@ -294,7 +294,7 @@ _081562D4: .align 2, 0 _081562DC: .4byte gUnknown_2024018 _081562E0: .4byte gUnknown_2023BC4 -_081562E4: .4byte sub_802FDF4 +_081562E4: .4byte c3_0802FDF4 _081562E8: .4byte gUnknown_2023BCE _081562EC: .4byte gUnknown_2024284 thumb_func_end sub_8156294 @@ -493,7 +493,7 @@ sub_8156484: @ 8156484 ldrb r0, [r0] cmp r0, 0 bne _08156492 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156492: pop {r0} bx r0 @@ -529,7 +529,7 @@ sub_815649C: @ 815649C adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _081564D4: pop {r4} pop {r0} @@ -618,7 +618,7 @@ _08156580: movs r2, 0 bl EmitChosenMonReturnValue _0815658A: - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _0815658E: pop {r0} bx r0 @@ -684,7 +684,7 @@ sub_81565E8: @ 81565E8 ldrh r1, [r0] movs r0, 0x1 bl EmitOneReturnValue - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _0815660E: pop {r0} bx r0 @@ -981,7 +981,7 @@ _081567DA: bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - ldr r0, _081568C8 @ =sub_802FDF4 + ldr r0, _081568C8 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask ldr r2, _081568CC @ =gUnknown_2023BCE @@ -1015,7 +1015,7 @@ _081568B8: .4byte gUnknown_2023BC4 _081568BC: .4byte nullsub_8 _081568C0: .4byte gUnknown_2024018 _081568C4: .4byte 0x000027f9 -_081568C8: .4byte sub_802FDF4 +_081568C8: .4byte c3_0802FDF4 _081568CC: .4byte gUnknown_2023BCE _081568D0: .4byte gUnknown_2024284 _081568D4: .4byte gUnknown_3004FE0 @@ -1667,7 +1667,7 @@ sub_8156DCC: @ 8156DCC adds r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted b _08156E66 .align 2, 0 _08156E2C: .4byte gUnknown_2023BC4 @@ -1693,7 +1693,7 @@ _08156E3C: adds r0, r3, r0 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156E66: pop {r4-r6} pop {r0} @@ -1748,7 +1748,7 @@ _08156EC0: ldr r2, _08156EE4 @ =gUnknown_2024284 adds r0, r2 bl HandleLowHpMusicChange - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156EDA: pop {r4-r6} pop {r0} @@ -1762,11 +1762,11 @@ _08156EE4: .4byte gUnknown_2024284 sub_8156EE8: @ 8156EE8 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _08156EFA - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156EFA: pop {r0} bx r0 @@ -1800,7 +1800,7 @@ sub_8156F00: @ 8156F00 strb r0, [r2] ldr r0, _08156F48 @ =gUnknown_2024005 strb r3, [r0] - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted b _08156F76 .align 2, 0 _08156F3C: .4byte gUnknown_2023D44 @@ -1875,7 +1875,7 @@ sub_8156F7C: @ 8156F7C adds r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08156FD0: pop {r4-r6} pop {r0} @@ -1906,7 +1906,7 @@ sub_8156FEC: @ 8156FEC ldr r0, _08157020 @ =nullsub_8 cmp r1, r0 bne _08157010 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08157010: pop {r0} bx r0 @@ -1934,7 +1934,7 @@ sub_8157024: @ 8157024 ands r0, r1 cmp r0, 0 bne _08157046 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08157046: pop {r0} bx r0 @@ -1960,7 +1960,7 @@ sub_8157054: @ 8157054 ands r0, r1 cmp r0, 0 bne _08157076 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08157076: pop {r0} bx r0 @@ -1969,8 +1969,8 @@ _0815707C: .4byte gUnknown_2024018 _08157080: .4byte gUnknown_2023BC4 thumb_func_end sub_8157054 - thumb_func_start sub_8157084 -sub_8157084: @ 8157084 + thumb_func_start PlayerPartnerBufferExecCompleted +PlayerPartnerBufferExecCompleted: @ 8157084 push {r4,lr} sub sp, 0x4 ldr r1, _081570C4 @ =gUnknown_3004FE0 @@ -2024,10 +2024,10 @@ _081570EA: .align 2, 0 _081570F4: .4byte gUnknown_2023BC8 _081570F8: .4byte gUnknown_825E45C - thumb_func_end sub_8157084 + thumb_func_end PlayerPartnerBufferExecCompleted - thumb_func_start sub_81570FC -sub_81570FC: @ 81570FC + thumb_func_start CompleteOnFinishedStatusAnimation_7 +CompleteOnFinishedStatusAnimation_7: @ 81570FC push {lr} ldr r0, _08157124 @ =gUnknown_2024018 ldr r2, [r0] @@ -2043,14 +2043,14 @@ sub_81570FC: @ 81570FC ands r0, r1 cmp r0, 0 bne _0815711E - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _0815711E: pop {r0} bx r0 .align 2, 0 _08157124: .4byte gUnknown_2024018 _08157128: .4byte gUnknown_2023BC4 - thumb_func_end sub_81570FC + thumb_func_end CompleteOnFinishedStatusAnimation_7 thumb_func_start sub_815712C sub_815712C: @ 815712C @@ -2103,7 +2103,7 @@ _08157186: movs r0, 0x1 mov r2, sp bl EmitDataTransfer - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted add sp, 0x100 pop {r4-r6} pop {r0} @@ -2843,7 +2843,7 @@ _0815779E: cmp r5, 0x5 bls _08157790 _081577AA: - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -3884,7 +3884,7 @@ _081580D0: .4byte gUnknown_2024284 thumb_func_start sub_81580D4 sub_81580D4: @ 81580D4 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81580D4 @@ -3922,7 +3922,7 @@ sub_81580E0: @ 81580E0 add r0, r10 bl BattleLoadOpponentMonSpriteGfx ldrb r0, [r6] - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -4025,7 +4025,7 @@ sub_81580E0: @ 81580E0 adds r0, r1 ldr r1, _08158238 @ =sub_8156184 str r1, [r0] - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r3-r5} mov r8, r3 mov r9, r4 @@ -4157,7 +4157,7 @@ _081582FC: adds r0, r1 ldrb r0, [r0] bl SetHealthboxSpriteInvisible - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08158332: pop {r4-r6} pop {r0} @@ -4497,7 +4497,7 @@ _0815860C: .4byte sub_8156FEC thumb_func_start sub_8158610 sub_8158610: @ 8158610 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8158610 @@ -4648,7 +4648,7 @@ _08158744: .4byte sub_8156DCC thumb_func_start sub_8158748 sub_8158748: @ 8158748 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8158748 @@ -4740,7 +4740,7 @@ _08158804: .4byte sub_8156484 thumb_func_start sub_8158808 sub_8158808: @ 8158808 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8158808 @@ -4849,7 +4849,7 @@ sub_8158814: @ 8158814 lsrs r3, r0, 24 cmp r3, 0 beq _0815890C - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted b _0815892A .align 2, 0 _081588E8: .4byte gUnknown_2022BC4 @@ -4966,7 +4966,7 @@ _081589C6: movs r0, 0 bl sub_8035450 adds r0, r4, 0 - bl sub_807259C + bl DoMoveAnim ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -5042,7 +5042,7 @@ _08158A40: lsls r0, 2 adds r0, r2 strb r4, [r0, 0x4] - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08158A7C: pop {r3,r4} mov r8, r3 @@ -5118,7 +5118,7 @@ sub_8158AFC: @ 8158AFC .align 2, 0 _08158B14: .4byte gUnknown_2023BC4 _08158B18: - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _08158B1C: pop {r0} bx r0 @@ -5180,7 +5180,7 @@ sub_8158B60: @ 8158B60 _08158B8E: lsls r0, r4, 24 lsrs r0, 24 - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt adds r4, 0x1 cmp r4, 0x3 ble _08158B8E @@ -5190,9 +5190,9 @@ _08158B8E: adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt ldr r0, _08158BD4 @ =gUnknown_83FE6D5 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _08158BD8 @ =gUnknown_202298C movs r1, 0x1 bl sub_80D87BC @@ -5225,7 +5225,7 @@ _08158BF4: .4byte sub_8156140 thumb_func_start sub_8158BF8 sub_8158BF8: @ 8158BF8 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8158BF8 @@ -5452,7 +5452,7 @@ _08158DC8: .4byte gUnknown_2024004 thumb_func_start sub_8158DCC sub_8158DCC: @ 8158DCC push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8158DCC @@ -5590,7 +5590,7 @@ sub_8158ED0: @ 8158ED0 bl GetMonData cmp r0, 0x63 bls _08158F08 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted b _08158F54 .align 2, 0 _08158EFC: .4byte gUnknown_2022BC4 @@ -5824,7 +5824,7 @@ _081590BC: movs r1, 0x37 mov r2, sp bl sub_804037C - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted add sp, 0x4 pop {r4} pop {r0} @@ -5839,7 +5839,7 @@ _081590FC: .4byte gUnknown_2023BC4 thumb_func_start sub_8159100 sub_8159100: @ 8159100 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159100 @@ -5847,7 +5847,7 @@ sub_8159100: @ 8159100 thumb_func_start sub_815910C sub_815910C: @ 815910C push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_815910C @@ -5855,7 +5855,7 @@ sub_815910C: @ 815910C thumb_func_start sub_8159118 sub_8159118: @ 8159118 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159118 @@ -5863,7 +5863,7 @@ sub_8159118: @ 8159118 thumb_func_start sub_8159124 sub_8159124: @ 8159124 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159124 @@ -5871,7 +5871,7 @@ sub_8159124: @ 8159124 thumb_func_start sub_8159130 sub_8159130: @ 8159130 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159130 @@ -5879,7 +5879,7 @@ sub_8159130: @ 8159130 thumb_func_start sub_815913C sub_815913C: @ 815913C push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_815913C @@ -5887,7 +5887,7 @@ sub_815913C: @ 815913C thumb_func_start sub_8159148 sub_8159148: @ 8159148 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159148 @@ -5895,7 +5895,7 @@ sub_8159148: @ 8159148 thumb_func_start sub_8159154 sub_8159154: @ 8159154 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159154 @@ -5903,7 +5903,7 @@ sub_8159154: @ 8159154 thumb_func_start sub_8159160 sub_8159160: @ 8159160 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159160 @@ -5911,7 +5911,7 @@ sub_8159160: @ 8159160 thumb_func_start sub_815916C sub_815916C: @ 815916C push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_815916C @@ -5919,7 +5919,7 @@ sub_815916C: @ 815916C thumb_func_start sub_8159178 sub_8159178: @ 8159178 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159178 @@ -5927,7 +5927,7 @@ sub_8159178: @ 8159178 thumb_func_start sub_8159184 sub_8159184: @ 8159184 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159184 @@ -5950,7 +5950,7 @@ sub_8159190: @ 8159190 lsls r0, 29 cmp r0, 0 bge _081591C4 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted b _081591EE .align 2, 0 _081591B8: .4byte gUnknown_202063C @@ -5990,7 +5990,7 @@ _081591FC: .4byte sub_8156F00 thumb_func_start sub_8159200 sub_8159200: @ 8159200 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159200 @@ -6011,7 +6011,7 @@ sub_815920C: @ 815920C lsls r1, 8 orrs r0, r1 bl sub_80722CC - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -6035,7 +6035,7 @@ sub_815923C: @ 815923C lsls r1, 8 orrs r0, r1 bl PlayFanfare - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -6082,7 +6082,7 @@ _081592AC: lsrs r0, 16 movs r1, 0x19 bl PlayCry1 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -6107,7 +6107,7 @@ sub_81592D0: @ 81592D0 movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -6346,7 +6346,7 @@ sub_8159478: @ 8159478 lsls r5, 24 lsrs r5, 24 adds r0, r6, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -6531,7 +6531,7 @@ sub_8159660: @ 8159660 lsls r0, 24 cmp r0, 0 bne _08159690 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted b _081596CE .align 2, 0 _08159688: .4byte gUnknown_2022BC4 @@ -6565,7 +6565,7 @@ _08159690: ldrb r1, [r5] adds r1, r2 strb r0, [r1] - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted _081596CE: pop {r4,r5} pop {r0} @@ -6580,7 +6580,7 @@ _081596E0: .4byte gUnknown_2024000 thumb_func_start sub_81596E4 sub_81596E4: @ 81596E4 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81596E4 @@ -6595,7 +6595,7 @@ sub_81596F0: @ 81596F0 ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -6606,7 +6606,7 @@ _08159710: .4byte gUnknown_2023BC4 thumb_func_start sub_8159714 sub_8159714: @ 8159714 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8159714 @@ -6637,7 +6637,7 @@ sub_8159720: @ 8159720 lsls r0, 24 cmp r0, 0 beq _08159760 - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted b _0815976C .align 2, 0 _08159758: .4byte gUnknown_2022BC4 @@ -6680,7 +6680,7 @@ sub_815977C: @ 815977C movs r1, 0 bl dp11b_obj_free _081597A4: - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -6692,7 +6692,7 @@ _081597B4: .4byte gUnknown_2023BC4 thumb_func_start sub_81597B8 sub_81597B8: @ 81597B8 push {lr} - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81597B8 @@ -6713,7 +6713,7 @@ sub_81597C4: @ 81597C4 bl FadeOutMapMusic movs r0, 0x3 bl BeginFastPaletteFade - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted ldr r0, _08159814 @ =gUnknown_2022B4C ldr r0, [r0] movs r1, 0x6 @@ -6847,7 +6847,7 @@ _081598E6: movs r2, 0 bl EmitTwoReturnValues _081598F0: - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted ldr r3, _08159924 @ =gUnknown_3005EE0 ldr r2, _08159928 @ =gUnknown_2023BC4 ldrb r0, [r2] @@ -6890,7 +6890,7 @@ _0815992C: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r2, r1, r5 lsls r0, r1, 2 @@ -6906,7 +6906,7 @@ _0815992C: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt _08159972: ldr r1, _08159990 @ =gUnknown_3005EE0 ldr r0, _08159994 @ =gUnknown_2023BC4 @@ -6985,7 +6985,7 @@ _081599DE: movs r0, 0x1 movs r1, 0xA bl EmitTwoReturnValues - bl sub_8157084 + bl PlayerPartnerBufferExecCompleted ldrb r0, [r6] lsls r0, 2 add r0, r8 @@ -7027,7 +7027,7 @@ _08159A48: ldrb r0, [r6] adds r0, r5 ldrb r0, [r0] - bl sub_8030A14 + bl MoveSelectionDestroyCursorAt ldrb r1, [r6] adds r2, r1, r5 lsls r0, r1, 2 @@ -7043,7 +7043,7 @@ _08159A48: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_80309CC + bl MoveSelectionCreateCursorAt _08159A8E: ldr r1, _08159AB0 @ =gUnknown_3005EE0 ldr r0, _08159AB4 @ =gUnknown_2023BC4 @@ -7266,7 +7266,7 @@ _08159C44: movs r0, 0 strh r0, [r1] bl sub_8159EF0 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _08159C60 @ =gUnknown_202298C movs r1, 0x18 bl sub_80D87BC @@ -7276,7 +7276,7 @@ _08159C5C: .4byte gUnknown_2022976 _08159C60: .4byte gUnknown_202298C _08159C64: movs r0, 0x18 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 @@ -7467,7 +7467,7 @@ _08159DEA: _08159DF0: .4byte gUnknown_2037AB8 _08159DF4: bl sub_8159EF0 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _08159E08 @ =gUnknown_202298C movs r1, 0x18 bl sub_80D87BC @@ -7476,7 +7476,7 @@ _08159DF4: _08159E08: .4byte gUnknown_202298C _08159E0C: movs r0, 0x18 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 50b090f7f..cf668a7b1 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -142,7 +142,7 @@ _080DD612: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -170,7 +170,7 @@ _080DD650: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -198,7 +198,7 @@ _080DD68C: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -210,7 +210,7 @@ _080DD6BE: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt b _080DD71A .align 2, 0 _080DD6D0: .4byte gUnknown_2023FF8 @@ -234,7 +234,7 @@ _080DD6D8: ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt ldrb r1, [r4] adds r1, r5 ldrb r0, [r1] @@ -245,7 +245,7 @@ _080DD6D8: adds r0, r5 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt _080DD71A: pop {r4,r5} pop {r0} @@ -288,7 +288,7 @@ _080DD75C: .4byte nullsub_8 CompleteOnInactiveTextPrinter_3: @ 80DD760 push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080DD772 @@ -969,7 +969,7 @@ sub_80DDC78: @ 80DDC78 _080DDC9A: lsls r0, r4, 24 lsrs r0, 24 - bl sub_8030A98 + bl ActionSelectionDestroyCursorAt adds r4, 0x1 cmp r4, 0x3 ble _080DDC9A @@ -979,9 +979,9 @@ _080DDC9A: adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt ldr r0, _080DDCE4 @ =gUnknown_83FE6E6 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080DDCE8 @ =gUnknown_202298C movs r1, 0x1 bl sub_80D87BC @@ -1078,8 +1078,8 @@ sub_80DDD68: @ 80DDD68 bx r0 thumb_func_end sub_80DDD68 - thumb_func_start sub_80DDD74 -sub_80DDD74: @ 80DDD74 + thumb_func_start SafariHandleStatusIconUpdate +SafariHandleStatusIconUpdate: @ 80DDD74 push {lr} ldr r0, _080DDDA0 @ =gUnknown_3004FF0 ldr r1, _080DDDA4 @ =gUnknown_2023BC4 @@ -1104,7 +1104,7 @@ _080DDDA0: .4byte gUnknown_3004FF0 _080DDDA4: .4byte gUnknown_2023BC4 _080DDDA8: .4byte gUnknown_2023BCE _080DDDAC: .4byte gUnknown_2024284 - thumb_func_end sub_80DDD74 + thumb_func_end SafariHandleStatusIconUpdate thumb_func_start sub_80DDDB0 sub_80DDDB0: @ 80DDDB0 @@ -1234,8 +1234,8 @@ sub_80DDE64: @ 80DDE64 bx r0 thumb_func_end sub_80DDE64 - thumb_func_start sub_80DDE70 -sub_80DDE70: @ 80DDE70 + thumb_func_start SafariHandlePlaySE +SafariHandlePlaySE: @ 80DDE70 push {r4,lr} ldr r4, _080DDEAC @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -1267,7 +1267,7 @@ _080DDE84: .align 2, 0 _080DDEAC: .4byte gUnknown_2023BC4 _080DDEB0: .4byte gUnknown_2022BC4 - thumb_func_end sub_80DDE70 + thumb_func_end SafariHandlePlaySE thumb_func_start sub_80DDEB4 sub_80DDEB4: @ 80DDEB4 diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index e28119066..48d73c079 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -80,7 +80,7 @@ _0800D298: ldr r0, _0800D300 @ =gUnknown_2023BC8 movs r4, 0 str r4, [r0] - bl sub_80724C0 + bl ClearBattleAnimationVars bl sub_8043FBC bl sub_80C6D0C ldr r0, _0800D304 @ =gUnknown_2022B54 @@ -1519,7 +1519,7 @@ _0800DE16: lsls r0, r1, 24 lsrs r4, r0, 24 _0800DE1C: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -3353,8 +3353,8 @@ sub_800EB54: @ 800EB54 _0800EB70: .4byte gUnknown_2022874 thumb_func_end sub_800EB54 - thumb_func_start sub_800EB74 -sub_800EB74: @ 800EB74 + thumb_func_start EmitResetActionMoveSelection +EmitResetActionMoveSelection: @ 800EB74 push {lr} adds r3, r1, 0 lsls r0, 24 @@ -3369,10 +3369,10 @@ sub_800EB74: @ 800EB74 bx r0 .align 2, 0 _0800EB90: .4byte gUnknown_2022874 - thumb_func_end sub_800EB74 + thumb_func_end EmitResetActionMoveSelection - thumb_func_start sub_800EB94 -sub_800EB94: @ 800EB94 + thumb_func_start EmitCmd55 +EmitCmd55: @ 800EB94 push {lr} adds r3, r1, 0 lsls r0, 24 @@ -3387,6 +3387,6 @@ sub_800EB94: @ 800EB94 bx r0 .align 2, 0 _0800EBB0: .4byte gUnknown_2022874 - thumb_func_end sub_800EB94 + thumb_func_end EmitCmd55 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index e14a88bb8..cb79b3878 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -666,7 +666,7 @@ sub_810C050: @ 810C050 lsrs r6, r3, 24 adds r0, r2, 0 movs r1, 0x7 - bl sub_8004950 + bl GetWindowAttribute adds r3, r0, 0 movs r0, 0 str r0, [sp] diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index efd3ba104..ec1e8ba19 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8033DB8 -sub_8033DB8: @ 8033DB8 + thumb_func_start AllocateBattleSpritesData +AllocateBattleSpritesData: @ 8033DB8 push {r4,lr} ldr r4, _08033DF4 @ =gUnknown_2024018 movs r0, 0x10 @@ -33,10 +33,10 @@ sub_8033DB8: @ 8033DB8 bx r0 .align 2, 0 _08033DF4: .4byte gUnknown_2024018 - thumb_func_end sub_8033DB8 + thumb_func_end AllocateBattleSpritesData - thumb_func_start sub_8033DF8 -sub_8033DF8: @ 8033DF8 + thumb_func_start FreeBattleSpritesData +FreeBattleSpritesData: @ 8033DF8 push {r4,r5,lr} ldr r5, _08033E38 @ =gUnknown_2024018 ldr r0, [r5] @@ -67,7 +67,7 @@ _08033E32: bx r0 .align 2, 0 _08033E38: .4byte gUnknown_2024018 - thumb_func_end sub_8033DF8 + thumb_func_end FreeBattleSpritesData thumb_func_start sub_8033E3C sub_8033E3C: @ 8033E3C @@ -1913,7 +1913,7 @@ _08034C16: adds r0, r7, 0 bl Free mov r0, r9 - bl sub_80748A8 + bl GetBankSpriteDefault_Y ldrb r2, [r4] lsls r1, r2, 4 adds r1, r2 @@ -2037,7 +2037,7 @@ _08034D88: bl CpuSet _08034E0E: mov r0, r9 - bl sub_80748A8 + bl GetBankSpriteDefault_Y ldrb r2, [r5] lsls r1, r2, 4 adds r1, r2 @@ -2284,7 +2284,7 @@ _08034FFC: ldrb r0, [r0] strb r0, [r4] mov r0, r9 - bl sub_80748A8 + bl GetBankSpriteDefault_Y ldr r1, [sp, 0x10] ldrb r2, [r1] lsls r1, r2, 4 @@ -2473,14 +2473,14 @@ LoadBattleMonGfxAndAnimate: @ 80351A8 cmp r5, 0 bne _080351EC adds r0, r6, 0 - bl sub_80748BC + bl GetSubstituteSpriteDefault_Y b _080351F2 .align 2, 0 _080351E4: .4byte gUnknown_202063C _080351E8: .4byte gUnknown_2024024 _080351EC: adds r0, r6, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y _080351F2: lsls r0, 24 lsrs r0, 24 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 9a6b4f873..64162ce2d 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -5524,7 +5524,7 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648 str r0, [sp, 0x18] str r1, [sp, 0x1C] add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 @@ -5559,12 +5559,12 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648 movs r1, 0 adds r2, r6, 0 mov r3, r8 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 mov r0, r10 str r4, [r0] adds r0, r5, 0 movs r1, 0x7 - bl sub_8004950 + bl GetWindowAttribute add sp, 0x20 pop {r3-r5} mov r8, r3 diff --git a/asm/battle_message.s b/asm/battle_message.s index 9283c7b45..19aa61d5a 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -690,7 +690,7 @@ _080D77D0: ldr r7, [r0] _080D77DC: adds r0, r7, 0 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString _080D77E2: pop {r3-r5} mov r8, r3 @@ -703,8 +703,8 @@ _080D77E2: _080D77F0: .4byte gUnknown_83FDF3C thumb_func_end sub_80D7274 - thumb_func_start sub_80D77F4 -sub_80D77F4: @ 80D77F4 + thumb_func_start BattleStringExpandPlaceholdersToDisplayedString +BattleStringExpandPlaceholdersToDisplayedString: @ 80D77F4 push {lr} ldr r1, _080D7800 @ =gUnknown_202298C bl sub_80D7868 @@ -712,10 +712,10 @@ sub_80D77F4: @ 80D77F4 bx r1 .align 2, 0 _080D7800: .4byte gUnknown_202298C - thumb_func_end sub_80D77F4 + thumb_func_end BattleStringExpandPlaceholdersToDisplayedString - thumb_func_start sub_80D7804 -sub_80D7804: @ 80D7804 + thumb_func_start TryGetStatusString +TryGetStatusString: @ 80D7804 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -768,7 +768,7 @@ _080D785E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80D7804 + thumb_func_end TryGetStatusString thumb_func_start sub_80D7868 sub_80D7868: @ 80D7868 @@ -871,7 +871,7 @@ _080D7984: .4byte gUnknown_2022AB8 _080D7988: .4byte gUnknown_2021CD0 _080D798C: adds r0, r5, 0 - bl sub_80D7804 + bl TryGetStatusString adds r4, r0, 0 cmp r4, 0 beq _080D799C @@ -2937,8 +2937,8 @@ _080D89D6: bx r1 thumb_func_end sub_80D89B0 - thumb_func_start sub_80D89DC -sub_80D89DC: @ 80D89DC + thumb_func_start SetPpNumbersPaletteInMoveSelection +SetPpNumbersPaletteInMoveSelection: @ 80D89DC push {r4,r5,lr} ldr r0, _080D8A38 @ =gUnknown_2023BC4 ldrb r2, [r0] @@ -2956,7 +2956,7 @@ sub_80D89DC: @ 80D89DC adds r1, 0xC adds r1, r2 ldrb r1, [r1] - bl sub_80D8A50 + bl GetCurrentPpToMaxPpState lsls r0, 24 ldr r5, _080D8A48 @ =gUnknown_20371F8 lsrs r0, 22 @@ -2988,10 +2988,10 @@ _080D8A40: .4byte gUnknown_8D2FBB4 _080D8A44: .4byte gUnknown_2023FFC _080D8A48: .4byte gUnknown_20371F8 _080D8A4C: .4byte gUnknown_20376B0 - thumb_func_end sub_80D89DC + thumb_func_end SetPpNumbersPaletteInMoveSelection - thumb_func_start sub_80D8A50 -sub_80D8A50: @ 80D8A50 + thumb_func_start GetCurrentPpToMaxPpState +GetCurrentPpToMaxPpState: @ 80D8A50 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -3038,6 +3038,6 @@ _080D8A98: _080D8A9A: pop {r1} bx r1 - thumb_func_end sub_80D8A50 + thumb_func_end GetCurrentPpToMaxPpState .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_records.s b/asm/battle_records.s index 177e3630a..b48dd4869 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -101,7 +101,7 @@ _080CD2E2: b _080CD324 _080CD302: ldr r0, _080CD310 @ =gUnknown_83F6C68 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters b _080CD324 .align 2, 0 @@ -777,12 +777,12 @@ _080CD836: movs r4, 0x19 _080CD838: adds r0, r4, 0 - bl sub_8054EC4 + bl GetGameStat ldr r1, _080CD850 @ =0x0000270e cmp r0, r1 bhi _080CD84A adds r0, r4, 0 - bl sub_8054E90 + bl IncrementGameStat _080CD84A: pop {r4} pop {r0} @@ -1007,13 +1007,13 @@ sub_80CD9F4: @ 80CD9F4 push {r4-r7,lr} sub sp, 0x14 movs r0, 0x17 - bl sub_8054EC4 + bl GetGameStat adds r4, r0, 0 movs r0, 0x18 - bl sub_8054EC4 + bl GetGameStat adds r5, r0, 0 movs r0, 0x19 - bl sub_8054EC4 + bl GetGameStat adds r6, r0, 0 ldr r0, _080CDAB0 @ =0x0000270f cmp r4, r0 @@ -1080,7 +1080,7 @@ _080CDA72: bls _080CDA54 adds r0, r7, 0 mov r1, r12 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 str r0, [sp] movs r1, 0x2 @@ -1092,7 +1092,7 @@ _080CDA72: movs r1, 0x2 movs r2, 0xC movs r3, 0x18 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r4-r7} pop {r0} @@ -1138,7 +1138,7 @@ sub_80CDAD0: @ 80CDAD0 movs r1, 0x2 movs r2, 0 mov r3, r8 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r6, 0 _080CDB0E: movs r4, 0x54 @@ -1161,7 +1161,7 @@ _080CDB1C: movs r0, 0 movs r1, 0x2 mov r3, r8 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -1230,7 +1230,7 @@ _080CDBA6: movs r0, 0 movs r1, 0x2 mov r3, r8 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -1268,7 +1268,7 @@ sub_80CDBE4: @ 80CDBE4 ldr r5, _080CDC9C @ =gUnknown_2021D18 ldr r1, _080CDCA0 @ =gUnknown_8418174 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r2, 0x1 negs r2, r2 movs r0, 0x2 @@ -1291,7 +1291,7 @@ sub_80CDBE4: @ 80CDBE4 movs r0, 0 movs r1, 0x2 movs r3, 0x4 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r5, _080CDCA8 @ =gUnknown_300500C ldr r0, [r5] ldr r1, _080CDCAC @ =0x00000a98 @@ -1309,7 +1309,7 @@ sub_80CDBE4: @ 80CDBE4 movs r1, 0x2 movs r2, 0x54 movs r3, 0x30 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 adds r7, r5, 0 movs r5, 0xF4 lsls r5, 22 diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 6eb059846..c32b29310 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -1288,8 +1288,8 @@ _0801E1C2: _0801E1D4: .4byte gUnknown_2023E82 thumb_func_end sub_801DDC4 - thumb_func_start sub_801E1D8 -sub_801E1D8: @ 801E1D8 + thumb_func_start atk02_attackstring +atk02_attackstring: @ 801E1D8 push {r4,r5,lr} ldr r0, _0801E218 @ =gUnknown_2023BC8 ldr r5, [r0] @@ -1328,10 +1328,10 @@ _0801E21C: .4byte gUnknown_2023DD0 _0801E220: .4byte gUnknown_2023D6B _0801E224: .4byte gUnknown_2023D74 _0801E228: .4byte gUnknown_2023E82 - thumb_func_end sub_801E1D8 + thumb_func_end atk02_attackstring - thumb_func_start sub_801E22C -sub_801E22C: @ 801E22C + thumb_func_start atk03_ppreduce +atk03_ppreduce: @ 801E22C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1561,7 +1561,7 @@ _0801E3F8: .4byte gUnknown_2023BC4 _0801E3FC: .4byte gUnknown_2023DD0 _0801E400: .4byte 0xfffff7ff _0801E404: .4byte gUnknown_2023D74 - thumb_func_end sub_801E22C + thumb_func_end atk03_ppreduce thumb_func_start sub_801E408 sub_801E408: @ 801E408 @@ -8928,7 +8928,7 @@ _08021EB6: muls r1, r2 adds r1, r3 ldrh r1, [r1] - bl sub_8043890 + bl MonGainEVs _08021F4C: ldr r0, _08021F5C @ =gUnknown_2023FE8 ldr r1, [r0] @@ -15314,7 +15314,7 @@ atk57: @ 80251C4 ldr r0, _080251F4 @ =gUnknown_2023E8A ldrb r1, [r0] movs r0, 0 - bl sub_800EB94 + bl EmitCmd55 ldrb r0, [r4] bl MarkBufferBankForExecution ldr r1, _080251F8 @ =gUnknown_2023D74 @@ -16510,7 +16510,7 @@ atk60_incrementgamestat: @ 8025B74 ldr r0, _08025BA0 @ =gUnknown_2023D74 ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8054E90 + bl IncrementGameStat _08025B8E: ldr r1, _08025BA0 @ =gUnknown_2023D74 ldr r0, [r1] @@ -18491,7 +18491,7 @@ _08026B78: _08026B84: .4byte gUnknown_2023D6C _08026B88: .4byte gUnknown_2023BC4 _08026B8C: - bl sub_8013D54 + bl IsRunningFromBattleImpossible ldr r1, _08026B98 @ =gUnknown_2023E82 strb r0, [r1] b _08026F4E @@ -23623,7 +23623,7 @@ _08029442: strb r0, [r1] movs r0, 0 movs r1, 0x2 - bl sub_800EB74 + bl EmitResetActionMoveSelection mov r2, r8 ldrb r0, [r2] bl MarkBufferBankForExecution @@ -28073,8 +28073,8 @@ _0802B76C: .4byte gUnknown_2023FE8 _0802B770: .4byte gUnknown_2023D74 thumb_func_end sub_802B678 - thumb_func_start sub_802B774 -sub_802B774: @ 802B774 + thumb_func_start atkC2_selectfirstvalidtarget +atkC2_selectfirstvalidtarget: @ 802B774 push {r4-r7,lr} mov r7, r8 push {r7} @@ -28131,10 +28131,10 @@ _0802B7D8: .4byte gUnknown_2023D74 _0802B7DC: .4byte gUnknown_2023D6B _0802B7E0: .4byte gUnknown_825E45C _0802B7E4: .4byte gUnknown_2023D70 - thumb_func_end sub_802B774 + thumb_func_end atkC2_selectfirstvalidtarget - thumb_func_start sub_802B7E8 -sub_802B7E8: @ 802B7E8 + thumb_func_start atkC3_trysetfutureattack +atkC3_trysetfutureattack: @ 802B7E8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -28275,7 +28275,7 @@ _0802B8F6: .align 2, 0 _0802B908: .4byte gUnknown_2023E82 _0802B90C: .4byte gUnknown_2023D74 - thumb_func_end sub_802B7E8 + thumb_func_end atkC3_trysetfutureattack thumb_func_start atkC4_trydobeatup atkC4_trydobeatup: @ 802B910 @@ -31165,7 +31165,7 @@ atkE7_trycastformdatachange: @ 802CF98 cmp r4, 0 beq _0802CFC2 ldr r0, _0802CFD0 @ =gUnknown_81D92F8 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r0, _0802CFD4 @ =gUnknown_2023FE8 ldr r0, [r0] adds r0, 0x7F @@ -32268,7 +32268,7 @@ _0802D88C: movs r1, 0x2 bl GetMonData ldr r4, _0802D938 @ =gUnknown_2021D04 - bl sub_80CC7A8 + bl get_unknown_box_id lsls r0, 24 lsrs r0, 24 bl GetBoxNamePtr @@ -32506,7 +32506,7 @@ _0802DAC0: .4byte 0x05006000 _0802DAC4: .4byte sub_80116F4 _0802DAC8: bl sub_800F34C - bl sub_800F420 + bl LoadBattleTextboxAndBackground ldr r1, _0802DADC @ =gUnknown_2022980 movs r2, 0x80 lsls r2, 1 @@ -33028,7 +33028,7 @@ _0802DE4E: movs r0, 0x2 adds r2, r6, 0 adds r3, r5, 0 - bl sub_809D954 + bl DoNamingScreen ldr r1, _0802DF14 @ =gUnknown_2023E82 ldrb r0, [r1] adds r0, 0x1 @@ -33120,8 +33120,8 @@ _0802DFA6: _0802DFB8: .4byte gUnknown_2023D74 thumb_func_end sub_802DD38 - thumb_func_start sub_802DFBC -sub_802DFBC: @ 802DFBC + thumb_func_start atkF4_subattackerhpbydmg +atkF4_subattackerhpbydmg: @ 802DFBC ldr r2, _0802DFDC @ =gUnknown_2023BE4 ldr r0, _0802DFE0 @ =gUnknown_2023D6B ldrb r1, [r0] @@ -33143,10 +33143,10 @@ _0802DFDC: .4byte gUnknown_2023BE4 _0802DFE0: .4byte gUnknown_2023D6B _0802DFE4: .4byte gUnknown_2023D50 _0802DFE8: .4byte gUnknown_2023D74 - thumb_func_end sub_802DFBC + thumb_func_end atkF4_subattackerhpbydmg - thumb_func_start sub_802DFEC -sub_802DFEC: @ 802DFEC + thumb_func_start atkF5_removeattackerstatus1 +atkF5_removeattackerstatus1: @ 802DFEC ldr r1, _0802E008 @ =gUnknown_2023BE4 ldr r0, _0802E00C @ =gUnknown_2023D6B ldrb r2, [r0] @@ -33165,7 +33165,7 @@ sub_802DFEC: @ 802DFEC _0802E008: .4byte gUnknown_2023BE4 _0802E00C: .4byte gUnknown_2023D6B _0802E010: .4byte gUnknown_2023D74 - thumb_func_end sub_802DFEC + thumb_func_end atkF5_removeattackerstatus1 thumb_func_start sub_802E014 sub_802E014: @ 802E014 diff --git a/asm/battle_setup.s b/asm/battle_setup.s index c783d8de7..cce33ff4d 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -78,7 +78,7 @@ sub_807F690: @ 807F690 adds r1, r2 strh r4, [r1, 0xA] adds r0, r5, 0 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM pop {r4,r5} pop {r0} bx r0 @@ -122,7 +122,7 @@ _0807F6FE: thumb_func_start sub_807F704 sub_807F704: @ 807F704 push {lr} - bl sub_80A0E90 + bl GetSafariZoneFlag cmp r0, 0 beq _0807F714 bl sub_807F7D8 @@ -172,9 +172,9 @@ sub_807F748: @ 807F748 movs r1, 0 bl sub_807F690 movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 .align 2, 0 @@ -202,9 +202,9 @@ sub_807F78C: @ 807F78C ldr r1, _0807F7D4 @ =0x00000155 bl sub_807F690 movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 .align 2, 0 @@ -262,9 +262,9 @@ sub_807F810: @ 807F810 movs r1, 0x2 bl sub_804037C movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 .align 2, 0 @@ -284,9 +284,9 @@ sub_807F868: @ 807F868 movs r1, 0 bl sub_807F690 movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x9 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 thumb_func_end sub_807F868 @@ -335,9 +335,9 @@ sub_807F8C4: @ 807F8C4 movs r1, 0 bl sub_807F690 movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 .align 2, 0 @@ -398,9 +398,9 @@ _0807F960: movs r1, 0x2 bl sub_804037C movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat add sp, 0xC pop {r0} bx r0 @@ -427,9 +427,9 @@ sub_807F998: @ 807F998 movs r1, 0 bl sub_807F690 movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 .align 2, 0 @@ -503,9 +503,9 @@ _0807FA4C: bl sub_807F690 _0807FA56: movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 thumb_func_end sub_807F9D8 @@ -542,9 +542,9 @@ _0807FAA0: bl sub_807F690 _0807FAAA: movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 thumb_func_end sub_807FA68 @@ -565,9 +565,9 @@ sub_807FABC: @ 807FABC movs r0, 0 bl sub_807F690 movs r0, 0x7 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x8 - bl sub_8054E90 + bl IncrementGameStat pop {r0} bx r0 .align 2, 0 @@ -814,7 +814,7 @@ _0807FCF4: lsls r0, r5, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8059F88 + bl MetatileBehavior_IsMB_0B lsls r0, 24 cmp r0, 0 beq _0807FD08 @@ -854,7 +854,7 @@ _0807FD2C: cmp r0, 0 bne _0807FD70 adds r0, r4, 0 - bl sub_8059F9C + bl MetatileBehavior_IsMountain lsls r0, 24 cmp r0, 0 beq _0807FD58 @@ -1308,8 +1308,8 @@ _0808008A: bx r1 thumb_func_end sub_8080060 - thumb_func_start sub_8080090 -sub_8080090: @ 8080090 + thumb_func_start TrainerBattleLoadArg32 +TrainerBattleLoadArg32: @ 8080090 adds r2, r0, 0 ldrb r0, [r2] ldrb r1, [r2, 0x1] @@ -1322,26 +1322,26 @@ sub_8080090: @ 8080090 lsls r1, 24 orrs r0, r1 bx lr - thumb_func_end sub_8080090 + thumb_func_end TrainerBattleLoadArg32 - thumb_func_start sub_80800A8 -sub_80800A8: @ 80800A8 + thumb_func_start TrainerBattleLoadArg16 +TrainerBattleLoadArg16: @ 80800A8 adds r1, r0, 0 ldrb r0, [r1] ldrb r1, [r1, 0x1] lsls r1, 8 orrs r0, r1 bx lr - thumb_func_end sub_80800A8 + thumb_func_end TrainerBattleLoadArg16 - thumb_func_start sub_80800B4 -sub_80800B4: @ 80800B4 + thumb_func_start TrainerBattleLoadArg8 +TrainerBattleLoadArg8: @ 80800B4 ldrb r0, [r0] bx lr - thumb_func_end sub_80800B4 + thumb_func_end TrainerBattleLoadArg8 - thumb_func_start sub_80800B8 -sub_80800B8: @ 80800B8 + thumb_func_start trainerflag_opponent +trainerflag_opponent: @ 80800B8 ldr r1, _080800CC @ =gUnknown_20386AE movs r2, 0xA0 lsls r2, 3 @@ -1353,7 +1353,7 @@ sub_80800B8: @ 80800B8 bx lr .align 2, 0 _080800CC: .4byte gUnknown_20386AE - thumb_func_end sub_80800B8 + thumb_func_end trainerflag_opponent thumb_func_start sub_80800D0 sub_80800D0: @ 80800D0 @@ -1425,8 +1425,8 @@ _08080160: .4byte gUnknown_20386C8 _08080164: .4byte gUnknown_20386CC thumb_func_end sub_8080110 - thumb_func_start sub_8080168 -sub_8080168: @ 8080168 + thumb_func_start TrainerBattleLoadArgs +TrainerBattleLoadArgs: @ 8080168 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -1452,21 +1452,21 @@ _08080184: .4byte _080801E4 _080801A0: adds r0, r5, 0 - bl sub_80800B4 + bl TrainerBattleLoadArg8 ldr r1, [r4] strb r0, [r1] adds r5, 0x1 b _080801E0 _080801AE: adds r0, r5, 0 - bl sub_80800A8 + bl TrainerBattleLoadArg16 ldr r1, [r4] strh r0, [r1] adds r5, 0x2 b _080801E0 _080801BC: adds r0, r5, 0 - bl sub_8080090 + bl TrainerBattleLoadArg32 ldr r1, [r4] str r0, [r1] adds r5, 0x4 @@ -1494,10 +1494,10 @@ _080801E4: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_8080168 + thumb_func_end TrainerBattleLoadArgs - thumb_func_start sub_80801F0 -sub_80801F0: @ 80801F0 + thumb_func_start battle_80801F0 +battle_80801F0: @ 80801F0 push {lr} ldr r0, _08080218 @ =gUnknown_20386B0 ldrh r1, [r0] @@ -1522,7 +1522,7 @@ _08080218: .4byte gUnknown_20386B0 _0808021C: .4byte gUnknown_20370D2 _08080220: .4byte gUnknown_3005008 _08080224: .4byte gUnknown_3005074 - thumb_func_end sub_80801F0 + thumb_func_end battle_80801F0 thumb_func_start sub_8080228 sub_8080228: @ 8080228 @@ -1531,7 +1531,7 @@ sub_8080228: @ 8080228 bl sub_8080110 ldr r4, _08080250 @ =gUnknown_20386AC adds r0, r5, 0 - bl sub_80800B4 + bl TrainerBattleLoadArg8 lsls r0, 24 lsrs r0, 24 strh r0, [r4] @@ -1577,8 +1577,8 @@ _08080294: ldr r0, _080802A4 @ =gUnknown_83C6A68 _08080296: adds r1, r5, 0 - bl sub_8080168 - bl sub_80801F0 + bl TrainerBattleLoadArgs + bl battle_80801F0 ldr r0, _080802A8 @ =gUnknown_81A4EE9 b _08080326 .align 2, 0 @@ -1588,8 +1588,8 @@ _080802AC: bl sub_811231C ldr r0, _080802CC @ =gUnknown_83C6990 adds r1, r5, 0 - bl sub_8080168 - bl sub_80801F0 + bl TrainerBattleLoadArgs + bl battle_80801F0 ldr r4, _080802D0 @ =gUnknown_20386AE ldrh r0, [r4] bl sub_810CE64 @@ -1604,8 +1604,8 @@ _080802D8: bl sub_811231C ldr r0, _080802F8 @ =gUnknown_83C6900 adds r1, r5, 0 - bl sub_8080168 - bl sub_80801F0 + bl TrainerBattleLoadArgs + bl battle_80801F0 ldr r4, _080802FC @ =gUnknown_20386AE ldrh r0, [r4] bl sub_810CE64 @@ -1620,7 +1620,7 @@ _08080304: ldr r0, _08080310 @ =gUnknown_83C6A20 _08080306: adds r1, r5, 0 - bl sub_8080168 + bl TrainerBattleLoadArgs ldr r0, _08080314 @ =gUnknown_81A4F21 b _08080326 .align 2, 0 @@ -1630,8 +1630,8 @@ _08080318: ldr r0, _0808032C @ =gUnknown_83C6900 _0808031A: adds r1, r5, 0 - bl sub_8080168 - bl sub_80801F0 + bl TrainerBattleLoadArgs + bl battle_80801F0 ldr r0, _08080330 @ =gUnknown_81A4EC1 _08080326: pop {r4,r5} @@ -1673,11 +1673,11 @@ _08080370: .4byte gUnknown_2036E38 _08080374: .4byte gUnknown_81A4EB4 thumb_func_end sub_8080334 - thumb_func_start sub_8080378 -sub_8080378: @ 8080378 + thumb_func_start GetTrainerFlagFromScriptPointer +GetTrainerFlagFromScriptPointer: @ 8080378 push {lr} adds r0, 0x2 - bl sub_80800A8 + bl TrainerBattleLoadArg16 lsls r0, 16 movs r1, 0xA0 lsls r1, 19 @@ -1688,7 +1688,7 @@ sub_8080378: @ 8080378 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_8080378 + thumb_func_end GetTrainerFlagFromScriptPointer thumb_func_start sub_8080398 sub_8080398: @ 8080398 @@ -1738,7 +1738,7 @@ _080803E0: .4byte gUnknown_20386CC thumb_func_start sub_80803E4 sub_80803E4: @ 80803E4 push {lr} - bl sub_80800B8 + bl trainerflag_opponent lsls r0, 16 lsrs r0, 16 bl FlagGet @@ -1751,7 +1751,7 @@ sub_80803E4: @ 80803E4 thumb_func_start sub_80803FC sub_80803FC: @ 80803FC push {lr} - bl sub_80800B8 + bl trainerflag_opponent lsls r0, 16 lsrs r0, 16 bl FlagSet @@ -1762,7 +1762,7 @@ sub_80803FC: @ 80803FC thumb_func_start sub_8080410 sub_8080410: @ 8080410 push {lr} - bl sub_80800B8 + bl trainerflag_opponent lsls r0, 16 lsrs r0, 16 bl FlagSet @@ -1866,7 +1866,7 @@ sub_80804AC: @ 80804AC ands r1, r0 cmp r1, 0 beq _08080530 - bl sub_80A0058 + bl sp000_heal_pokemon b _080804EE .align 2, 0 _080804D8: .4byte gUnknown_20386AC @@ -2136,7 +2136,7 @@ sub_80806EC: @ 80806EC bl sub_80806C8 adds r1, r0, 0 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 pop {r4} pop {r1} @@ -2155,7 +2155,7 @@ sub_8080710: @ 8080710 bl sub_80806C8 adds r1, r0, 0 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 pop {r4} pop {r1} diff --git a/asm/battle_tower.s b/asm/battle_tower.s index c83d1ad65..06c544b26 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2110,7 +2110,7 @@ _080E6970: movs r1, 0x1 bl CreateTask movs r0, 0 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM bl sub_8080060 lsls r0, 24 lsrs r0, 24 @@ -2150,7 +2150,7 @@ _080E69A0: movs r1, 0x1 bl CreateTask movs r0, 0 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM bl sub_8080060 lsls r0, 24 lsrs r0, 24 @@ -3317,7 +3317,7 @@ _080E7320: cmp r0, 0 beq _080E732E movs r0, 0x2A - bl sub_8054E90 + bl IncrementGameStat _080E732E: pop {r4-r7} pop {r0} diff --git a/asm/battle_util.s b/asm/battle_util.s index e04a269c0..36ae56be3 100644 --- a/asm/battle_util.s +++ b/asm/battle_util.s @@ -605,7 +605,7 @@ _080172B4: str r0, [r5] adds r4, 0x1 _080172C2: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -1820,7 +1820,7 @@ _08017C2C: adds r1, r4, r7 ldrb r1, [r1] movs r2, 0 - bl sub_8014CD8 + bl GetWhoStrikesFirst lsls r0, 24 cmp r0, 0 beq _08017C4C @@ -1828,7 +1828,7 @@ _08017C2C: lsrs r1, 24 mov r2, r8 lsrs r0, r2, 24 - bl sub_8014CA4 + bl SwapTurnOrder _08017C4C: adds r4, 0x1 ldr r0, _08017D18 @ =gUnknown_2023BCC @@ -1900,7 +1900,7 @@ _08017C8E: ands r0, r1 strh r0, [r3] ldr r0, _08017D38 @ =gUnknown_81D8B32 - bl sub_801BBE4 + bl BattleScriptExecute movs r0, 0xFD strb r0, [r5] movs r0, 0x2 @@ -1995,7 +1995,7 @@ _08017D56: ands r0, r1 strh r0, [r3] ldr r0, _08017DFC @ =gUnknown_81D8B32 - bl sub_801BBE4 + bl BattleScriptExecute ldr r0, _08017E00 @ =gUnknown_2023E82 strb r4, [r0, 0x5] movs r0, 0xFD @@ -2087,7 +2087,7 @@ _08017E20: ands r0, r1 strh r0, [r2] ldr r0, _08017ED8 @ =gUnknown_81D8B32 - bl sub_801BBE4 + bl BattleScriptExecute ldr r0, _08017EDC @ =gUnknown_2023E82 strb r4, [r0, 0x5] movs r0, 0xFD @@ -2190,7 +2190,7 @@ _08017EF4: ands r0, r1 strh r0, [r3] ldr r0, _08017F94 @ =gUnknown_81D8B43 - bl sub_801BBE4 + bl BattleScriptExecute mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -2281,7 +2281,7 @@ _08017FB0: ldr r0, _08018044 @ =gUnknown_2023D6C strb r2, [r0] ldr r0, _08018048 @ =gUnknown_81D8ED5 - bl sub_801BBE4 + bl BattleScriptExecute mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -2529,7 +2529,7 @@ _080181DC: _080181EC: ldr r0, [r3] _080181EE: - bl sub_801BBE4 + bl BattleScriptExecute mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -3190,7 +3190,7 @@ _08018734: movs r0, 0x1 strb r0, [r1, 0x5] ldr r0, _0801878C @ =gUnknown_81D904A - bl sub_801BBE4 + bl BattleScriptExecute ldr r4, _08018790 @ =gUnknown_2023BC4 ldrb r0, [r6] strb r0, [r4] @@ -3341,7 +3341,7 @@ _08018888: bl CancelMultiTurnMoves _08018894: ldr r0, _080188AC @ =gUnknown_81D90BC - bl sub_801BBE4 + bl BattleScriptExecute movs r5, 0x1 mov r9, r5 _0801889E: @@ -3432,7 +3432,7 @@ _08018926: b _08018C08 _08018944: ldr r0, _08018954 @ =gUnknown_81D90C5 - bl sub_801BBE4 + bl BattleScriptExecute b _08018C08 .align 2, 0 _0801894C: .4byte 0xffffefff @@ -3785,7 +3785,7 @@ _08018B6C: strb r0, [r1] ldr r0, _08018C30 @ =gUnknown_81D91C7 _08018C04: - bl sub_801BBE4 + bl BattleScriptExecute _08018C08: mov r0, r9 adds r0, 0x1 @@ -4188,7 +4188,7 @@ _08018F40: str r0, [r1] ldr r0, [r1] _08018F44: - bl sub_801BBE4 + bl BattleScriptExecute movs r0, 0x1 b _08018F74 .align 2, 0 @@ -4226,8 +4226,8 @@ _08018F88: .4byte gUnknown_2023DD0 _08018F8C: .4byte 0xfeffffdf thumb_func_end sub_8018C98 - thumb_func_start sub_8018F90 -sub_8018F90: @ 8018F90 + thumb_func_start HandleFaintedMonActions +HandleFaintedMonActions: @ 8018F90 push {r4-r7,lr} mov r7, r8 push {r7} @@ -4243,7 +4243,7 @@ sub_8018F90: @ 8018F90 _08018FA8: .4byte gUnknown_2022B4C _08018FAC: ldr r0, _08018FBC @ =gUnknown_81D8694 - bl sub_801BBE4 + bl BattleScriptExecute ldr r0, [r5] adds r0, 0x4D movs r1, 0x2 @@ -4252,7 +4252,7 @@ _08018FAC: _08018FBC: .4byte gUnknown_81D8694 _08018FC0: ldr r0, _08018FD4 @ =gUnknown_81D869D - bl sub_801BBE4 + bl BattleScriptExecute ldr r0, [r5] adds r0, 0x4D movs r1, 0x5 @@ -4602,10 +4602,10 @@ _08019274: bx r1 .align 2, 0 _08019280: .4byte gUnknown_2023FE8 - thumb_func_end sub_8018F90 + thumb_func_end HandleFaintedMonActions - thumb_func_start sub_8019284 -sub_8019284: @ 8019284 + thumb_func_start TryClearRageStatuses +TryClearRageStatuses: @ 8019284 push {r4-r6,lr} movs r3, 0 ldr r0, _080192C4 @ =gUnknown_2023BCC @@ -4645,7 +4645,7 @@ _080192C4: .4byte gUnknown_2023BCC _080192C8: .4byte gUnknown_2023DC4 _080192CC: .4byte gUnknown_2023C34 _080192D0: .4byte 0xff7fffff - thumb_func_end sub_8019284 + thumb_func_end TryClearRageStatuses thumb_func_start sub_80192D4 sub_80192D4: @ 80192D4 @@ -6518,7 +6518,7 @@ _0801A25A: ldr r1, _0801A274 @ =gUnknown_2023E82 strb r0, [r1, 0x5] ldr r0, _0801A278 @ =gUnknown_81D8B1F - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback bl _0801BBAA .align 2, 0 _0801A26C: .4byte gUnknown_2023F1C @@ -6537,7 +6537,7 @@ _0801A28C: movs r0, 0x5 strh r0, [r2] ldr r0, _0801A2A4 @ =gUnknown_81D927F - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r0, _0801A2A8 @ =gUnknown_2023FC4 mov r1, r10 strb r1, [r0, 0x17] @@ -6558,7 +6558,7 @@ _0801A2BC: movs r0, 0x18 strh r0, [r2] ldr r0, _0801A2D4 @ =gUnknown_81D92BF - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r0, _0801A2D8 @ =gUnknown_2023FC4 mov r2, r10 strb r2, [r0, 0x17] @@ -6579,7 +6579,7 @@ _0801A2EC: movs r0, 0x60 strh r0, [r2] ldr r0, _0801A304 @ =gUnknown_81D9379 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r0, _0801A308 @ =gUnknown_2023FC4 mov r3, r10 strb r3, [r0, 0x17] @@ -6625,7 +6625,7 @@ _0801A340: bl _0801BBC6 _0801A354: ldr r0, _0801A364 @ =gUnknown_81D92F8 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r0, _0801A368 @ =gUnknown_2023FC4 mov r1, r10 strb r1, [r0, 0x17] @@ -6766,7 +6766,7 @@ _0801A476: mov r0, r8 strb r5, [r0] ldr r0, _0801A4A0 @ =gUnknown_81D92AB - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r1, _0801A4A4 @ =gUnknown_2023D50 ldrh r0, [r4, 0x2C] lsrs r0, 4 @@ -6863,7 +6863,7 @@ _0801A52C: strb r1, [r4] strb r1, [r0, 0x17] ldr r0, _0801A588 @ =gUnknown_81D92D3 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback str r5, [sp] movs r0, 0 movs r1, 0x28 @@ -6911,7 +6911,7 @@ _0801A5B0: strb r0, [r4, 0x10] strb r1, [r4, 0x11] ldr r0, _0801A5D4 @ =gUnknown_81D9293 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback mov r0, r10 strb r0, [r4, 0x17] bl _0801BB5A @@ -9337,7 +9337,7 @@ _0801BA58: .4byte gUnknown_2023BE4 _0801BA5C: .4byte gUnknown_2023D6A _0801BA60: ldr r0, _0801BA78 @ =gUnknown_81D92F8 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r0, _0801BA7C @ =gUnknown_2023FC4 strb r4, [r0, 0x17] _0801BA6A: @@ -9354,7 +9354,7 @@ _0801BA7C: .4byte gUnknown_2023FC4 _0801BA80: .4byte gUnknown_2023FE8 _0801BA84: ldr r0, _0801BAA0 @ =gUnknown_81D92F8 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r0, _0801BAA4 @ =gUnknown_2023FC4 mov r3, r10 strb r3, [r0, 0x17] @@ -9377,14 +9377,14 @@ _0801BAAC: ands r0, r1 str r0, [r2] ldr r0, _0801BAC4 @ =gUnknown_81D9307 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback b _0801BB52 .align 2, 0 _0801BAC0: .4byte 0xfff7ffff _0801BAC4: .4byte gUnknown_81D9307 _0801BAC8: ldr r0, _0801BB18 @ =gUnknown_81D92A1 - bl sub_801BC24 + bl BattleScriptPushCursorAndCallback ldr r1, _0801BB1C @ =gUnknown_2023DFC ldr r0, [sp, 0x18] adds r1, r0, r1 @@ -9518,8 +9518,8 @@ _0801BBDC: .4byte gUnknown_2023BE4 _0801BBE0: .4byte gUnknown_2023D6A thumb_func_end sub_8019F18 - thumb_func_start sub_801BBE4 -sub_801BBE4: @ 801BBE4 + thumb_func_start BattleScriptExecute +BattleScriptExecute: @ 801BBE4 ldr r1, _0801BC10 @ =gUnknown_2023D74 str r0, [r1] ldr r0, _0801BC14 @ =gUnknown_2023FF4 @@ -9536,7 +9536,7 @@ sub_801BBE4: @ 801BBE4 ldr r1, _0801BC18 @ =gUnknown_3004F84 ldr r0, [r1] str r0, [r2] - ldr r0, _0801BC1C @ =sub_8015C00 + ldr r0, _0801BC1C @ =RunBattleScriptCommands_PopCallbacksStack str r0, [r1] ldr r1, _0801BC20 @ =gUnknown_2023BE3 movs r0, 0 @@ -9546,12 +9546,12 @@ sub_801BBE4: @ 801BBE4 _0801BC10: .4byte gUnknown_2023D74 _0801BC14: .4byte gUnknown_2023FF4 _0801BC18: .4byte gUnknown_3004F84 -_0801BC1C: .4byte sub_8015C00 +_0801BC1C: .4byte RunBattleScriptCommands_PopCallbacksStack _0801BC20: .4byte gUnknown_2023BE3 - thumb_func_end sub_801BBE4 + thumb_func_end BattleScriptExecute - thumb_func_start sub_801BC24 -sub_801BC24: @ 801BC24 + thumb_func_start BattleScriptPushCursorAndCallback +BattleScriptPushCursorAndCallback: @ 801BC24 push {r4,lr} adds r4, r0, 0 bl BattleScriptPushCursor @@ -9581,7 +9581,7 @@ _0801BC58: .4byte gUnknown_2023D74 _0801BC5C: .4byte gUnknown_2023FF4 _0801BC60: .4byte gUnknown_3004F84 _0801BC64: .4byte sub_8015C74 - thumb_func_end sub_801BC24 + thumb_func_end BattleScriptPushCursorAndCallback thumb_func_start sub_801BC68 sub_801BC68: @ 801BC68 @@ -9765,7 +9765,7 @@ _0801BDD0: strb r7, [r0] strb r7, [r1] ldr r0, _0801BE00 @ =gUnknown_81D95D9 - bl sub_801BBE4 + bl BattleScriptExecute bl _0801CFA6 .align 2, 0 _0801BDEC: .4byte gUnknown_2023BE4 @@ -9875,7 +9875,7 @@ _0801BF14: negs r0, r0 str r0, [r4] ldr r0, _0801BF28 @ =gUnknown_81D95EF - bl sub_801BBE4 + bl BattleScriptExecute b _0801C27E .align 2, 0 _0801BF24: .4byte gUnknown_2023D50 @@ -9981,7 +9981,7 @@ _0801BFE0: movs r0, 0xFF strb r0, [r1, 0x4] ldr r0, _0801C024 @ =gUnknown_81D960C - bl sub_801BBE4 + bl BattleScriptExecute mov r1, r10 adds r1, 0x9 lsls r1, 24 @@ -10043,7 +10043,7 @@ _0801C066: strb r7, [r0] strb r7, [r1] ldr r0, _0801C094 @ =gUnknown_81D95D9 - bl sub_801BBE4 + bl BattleScriptExecute bl _0801C952 .align 2, 0 _0801C080: .4byte gUnknown_2023BE4 @@ -10089,7 +10089,7 @@ _0801C0D4: negs r0, r0 str r0, [r3] ldr r0, _0801C0F4 @ =gUnknown_81D961C - bl sub_801BBE4 + bl BattleScriptExecute movs r0, 0x4 str r0, [sp, 0xC] adds r0, r7, 0 @@ -10286,7 +10286,7 @@ _0801C248: cmp r0, 0 bge _0801C278 ldr r0, _0801C274 @ =gUnknown_81D964F - bl sub_801BBE4 + bl BattleScriptExecute b _0801C27E .align 2, 0 _0801C26C: .4byte gUnknown_2022AB8 @@ -10294,7 +10294,7 @@ _0801C270: .4byte gUnknown_2023D50 _0801C274: .4byte gUnknown_81D964F _0801C278: ldr r0, _0801C284 @ =gUnknown_81D95EF - bl sub_801BBE4 + bl BattleScriptExecute _0801C27E: movs r0, 0x4 str r0, [sp, 0xC] @@ -10362,7 +10362,7 @@ _0801C2DC: bge _0801C30C _0801C2F8: ldr r0, _0801C308 @ =gUnknown_81D964F - bl sub_801BBE4 + bl BattleScriptExecute b _0801C312 .align 2, 0 _0801C300: .4byte gUnknown_2022AB8 @@ -10370,7 +10370,7 @@ _0801C304: .4byte gUnknown_2023D50 _0801C308: .4byte gUnknown_81D964F _0801C30C: ldr r0, _0801C318 @ =gUnknown_81D95EF - bl sub_801BBE4 + bl BattleScriptExecute _0801C312: movs r3, 0x4 str r3, [sp, 0xC] @@ -10437,7 +10437,7 @@ _0801C36E: bge _0801C3A0 _0801C38A: ldr r0, _0801C39C @ =gUnknown_81D964F - bl sub_801BBE4 + bl BattleScriptExecute b _0801C3A6 .align 2, 0 _0801C394: .4byte gUnknown_2022AB8 @@ -10445,7 +10445,7 @@ _0801C398: .4byte gUnknown_2023D50 _0801C39C: .4byte gUnknown_81D964F _0801C3A0: ldr r0, _0801C3AC @ =gUnknown_81D95EF - bl sub_801BBE4 + bl BattleScriptExecute _0801C3A6: movs r2, 0x4 str r2, [sp, 0xC] @@ -10632,7 +10632,7 @@ _0801C506: strb r0, [r1, 0x10] strb r6, [r1, 0x11] ldr r0, _0801C524 @ =gUnknown_81D9679 - bl sub_801BBE4 + bl BattleScriptExecute movs r2, 0x5 str r2, [sp, 0xC] b _0801C95A @@ -10682,7 +10682,7 @@ _0801C56C: strb r0, [r1, 0x10] strb r6, [r1, 0x11] ldr r0, _0801C588 @ =gUnknown_81D9679 - bl sub_801BBE4 + bl BattleScriptExecute movs r5, 0x5 str r5, [sp, 0xC] b _0801C95A @@ -10724,7 +10724,7 @@ _0801C5C2: orrs r2, r3 str r2, [r1] ldr r0, _0801C5D4 @ =gUnknown_81D9694 - bl sub_801BBE4 + bl BattleScriptExecute movs r2, 0x2 str r2, [sp, 0xC] b _0801C95A @@ -10832,7 +10832,7 @@ _0801C638: strb r0, [r1, 0x10] strb r2, [r1, 0x11] ldr r0, _0801C6BC @ =gUnknown_81D9679 - bl sub_801BBE4 + bl BattleScriptExecute movs r0, 0x5 str r0, [sp, 0xC] b _0801C95A @@ -10862,7 +10862,7 @@ _0801C6D8: ands r2, r0 str r2, [r1] ldr r0, _0801C6EC @ =gUnknown_81D9531 - bl sub_801BBE4 + bl BattleScriptExecute movs r1, 0x1 str r1, [sp, 0xC] b _0801C95A @@ -10886,7 +10886,7 @@ _0801C708: ands r2, r0 str r2, [r1] ldr r0, _0801C720 @ =gUnknown_81D9549 - bl sub_801BBE4 + bl BattleScriptExecute movs r2, 0x1 str r2, [sp, 0xC] b _0801C95A @@ -10912,7 +10912,7 @@ _0801C73C: ands r2, r0 str r2, [r1] ldr r0, _0801C750 @ =gUnknown_81D9561 - bl sub_801BBE4 + bl BattleScriptExecute movs r3, 0x1 str r3, [sp, 0xC] b _0801C95A @@ -10937,7 +10937,7 @@ _0801C76C: ands r2, r0 str r2, [r1] ldr r0, _0801C780 @ =gUnknown_81D9579 - bl sub_801BBE4 + bl BattleScriptExecute movs r5, 0x1 str r5, [sp, 0xC] b _0801C95A @@ -10992,7 +10992,7 @@ _0801C7D8: ands r2, r0 str r2, [r1] ldr r0, _0801C7EC @ =gUnknown_81D95A9 - bl sub_801BBE4 + bl BattleScriptExecute movs r1, 0x2 str r1, [sp, 0xC] b _0801C95A @@ -11133,7 +11133,7 @@ _0801C8E4: str r0, [r3] ldr r0, _0801C918 @ =gUnknown_81D95BF _0801C906: - bl sub_801BBE4 + bl BattleScriptExecute movs r0, 0x1 str r0, [sp, 0xC] b _0801C95A @@ -11161,7 +11161,7 @@ _0801C91C: ldr r1, _0801C980 @ =gUnknown_82500C4 bl StringCopy ldr r0, _0801C984 @ =gUnknown_81D95BF - bl sub_801BBE4 + bl BattleScriptExecute ldr r1, _0801C988 @ =gUnknown_2023E82 movs r0, 0 strb r0, [r1, 0x5] diff --git a/asm/berry.s b/asm/berry.s index 7b1acb25f..c45dec832 100644 --- a/asm/berry.s +++ b/asm/berry.s @@ -47,7 +47,7 @@ _0809C740: ldr r0, [r4] ldr r3, _0809C780 @ =0x000030ec adds r0, r3 - bl sub_809C838 + bl GetEnigmaBerryChecksum ldr r1, [r4] ldr r4, _0809C790 @ =0x0000311c adds r1, r4 @@ -133,7 +133,7 @@ _0809C7F0: adds r1, 0x1 strb r0, [r1] adds r0, r4, 0 - bl sub_809C838 + bl GetEnigmaBerryChecksum str r0, [r4, 0x30] pop {r4-r7} pop {r0} @@ -146,8 +146,8 @@ _0809C830: .4byte 0x00000516 _0809C834: .4byte 0x00000529 thumb_func_end sub_809C7C4 - thumb_func_start sub_809C838 -sub_809C838: @ 809C838 + thumb_func_start GetEnigmaBerryChecksum +GetEnigmaBerryChecksum: @ 809C838 push {lr} adds r3, r0, 0 movs r2, 0 @@ -162,10 +162,10 @@ _0809C840: adds r0, r2, 0 pop {r1} bx r1 - thumb_func_end sub_809C838 + thumb_func_end GetEnigmaBerryChecksum - thumb_func_start sub_809C854 -sub_809C854: @ 809C854 + thumb_func_start IsEnigmaBerryValid +IsEnigmaBerryValid: @ 809C854 push {r4,lr} ldr r4, _0809C888 @ =gUnknown_3005008 ldr r1, [r4] @@ -182,7 +182,7 @@ sub_809C854: @ 809C854 beq _0809C898 ldr r2, _0809C890 @ =0x000030ec adds r0, r1, r2 - bl sub_809C838 + bl GetEnigmaBerryChecksum ldr r1, [r4] ldr r2, _0809C894 @ =0x0000311c adds r1, r2 @@ -202,7 +202,7 @@ _0809C89A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_809C854 + thumb_func_end IsEnigmaBerryValid thumb_func_start sub_809C8A0 sub_809C8A0: @ 809C8A0 @@ -211,7 +211,7 @@ sub_809C8A0: @ 809C8A0 lsrs r4, r0, 24 cmp r4, 0x2B bne _0809C8C4 - bl sub_809C854 + bl IsEnigmaBerryValid cmp r0, 0 beq _0809C8C4 ldr r0, _0809C8BC @ =gUnknown_3005008 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index 0ed2f6481..c31a9d140 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -871,7 +871,7 @@ sub_813D430: @ 813D430 ldr r4, _0813D4A8 @ =gUnknown_2021D18 ldr r1, _0813D4AC @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -1549,7 +1549,7 @@ sub_813D940: @ 813D940 ldr r0, _0813D9F0 @ =gUnknown_2021D18 mov r9, r0 adds r1, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [sp] movs r6, 0x1 @@ -1576,7 +1576,7 @@ sub_813D940: @ 813D940 bl sub_8008E78 ldr r1, _0813D9F4 @ =gUnknown_84162B9 mov r0, r9 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] str r6, [sp, 0x4] @@ -1633,7 +1633,7 @@ sub_813D9F8: @ 813D9F8 ldr r4, _0813DA60 @ =gUnknown_2021D18 ldr r1, _0813DA64 @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r1, 0x1 @@ -1987,7 +1987,7 @@ _0813DC86: ldr r5, _0813DD6C @ =gUnknown_2021D18 ldr r1, _0813DD70 @ =gUnknown_84162FF adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [sp] movs r1, 0x1 @@ -2259,7 +2259,7 @@ sub_813DF54: @ 813DF54 ldr r5, _0813DFBC @ =gUnknown_2021D18 ldr r1, _0813DFC0 @ =gUnknown_8416409 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x7 bl sub_813EA08 lsls r0, 24 @@ -2436,7 +2436,7 @@ sub_813E0DC: @ 813E0DC ldr r5, _0813E158 @ =gUnknown_2021D18 ldr r1, _0813E15C @ =gUnknown_84163F4 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x9 bl sub_813EA08 lsls r0, 24 @@ -2740,7 +2740,7 @@ sub_813E37C: @ 813E37C ldr r4, _0813E3CC @ =gUnknown_2021D18 ldr r1, _0813E3D0 @ =gUnknown_8416374 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _0813E3D4 @ =sub_813E290 adds r0, r5, 0 movs r1, 0x2 @@ -2819,7 +2819,7 @@ sub_813E428: @ 813E428 ldr r4, _0813E47C @ =gUnknown_2021D18 ldr r1, _0813E480 @ =gUnknown_84168F1 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -2859,7 +2859,7 @@ _0813E4A8: ldr r4, _0813E4D8 @ =gUnknown_2021D18 ldr r1, _0813E4DC @ =gUnknown_8416911 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -2909,7 +2909,7 @@ sub_813E4E4: @ 813E4E4 ldr r4, _0813E548 @ =gUnknown_2021D18 ldr r1, _0813E54C @ =gUnknown_8416936 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -3006,7 +3006,7 @@ sub_813E5B8: @ 813E5B8 mov r8, r2 ldr r1, _0813E660 @ =gUnknown_84162B9 mov r0, r8 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r1, 0x1 @@ -3208,7 +3208,7 @@ sub_813E768: @ 813E768 ldr r4, _0813E7E4 @ =gUnknown_2021D18 ldr r1, _0813E7E8 @ =gUnknown_8416959 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _0813E7EC @ =sub_813E7F0 adds r0, r5, 0 movs r1, 0x2 @@ -3362,7 +3362,7 @@ _0813E90C: .4byte gUnknown_30030F0 sub_813E910: @ 813E910 push {r4,lr} ldr r0, _0813E994 @ =gUnknown_84643B8 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 movs r1, 0x1 @@ -3465,7 +3465,7 @@ sub_813E9A0: @ 813E9A0 str r4, [sp, 0xC] str r2, [sp, 0x10] mov r2, r9 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -3490,7 +3490,7 @@ sub_813EA08: @ 813EA08 lsls r0, r4, 3 ldr r1, _0813EA50 @ =gUnknown_84643D8 adds r0, r1 - bl sub_8003CE4 + bl AddWindow strb r0, [r5] cmp r4, 0x2 beq _0813EA38 @@ -3639,7 +3639,7 @@ sub_813EB20: @ 813EB20 cmp r0, 0xFF bne _0813EB44 ldr r0, _0813EB78 @ =gUnknown_8464400 - bl sub_8003CE4 + bl AddWindow strb r0, [r4, 0x5] _0813EB44: bl sub_80F78A8 diff --git a/asm/bike.s b/asm/bike.s index ab29e21b1..4c6efb4c3 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -681,8 +681,8 @@ _080BD582: bx r1 thumb_func_end sub_80BD540 - thumb_func_start sub_80BD58C -sub_80BD58C: @ 80BD58C + thumb_func_start player_should_look_direction_be_enforced_upon_movement +player_should_look_direction_be_enforced_upon_movement: @ 80BD58C push {lr} movs r0, 0x4 bl TestPlayerAvatarFlags @@ -711,7 +711,7 @@ _080BD5C0: _080BD5C2: pop {r1} bx r1 - thumb_func_end sub_80BD58C + thumb_func_end player_should_look_direction_be_enforced_upon_movement thumb_func_start sub_80BD5C8 sub_80BD5C8: @ 80BD5C8 @@ -728,8 +728,8 @@ sub_80BD5C8: @ 80BD5C8 cmp r0, 0 beq _080BD5F8 movs r0, 0x1 - bl sub_805BDEC - bl sub_8055E84 + bl SetPlayerAvatarTransitionFlags + bl sav1_reset_battle_music_maybe bl sub_8055DC4 b _080BD618 .align 2, 0 @@ -737,7 +737,7 @@ _080BD5F0: .4byte gUnknown_2036E2C _080BD5F4: .4byte gUnknown_2037078 _080BD5F8: adds r0, r2, 0 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags movs r4, 0x8D lsls r4, 1 adds r0, r4, 0 diff --git a/asm/blit.s b/asm/blit.s index 483d05321..84b56fd67 100644 --- a/asm/blit.s +++ b/asm/blit.s @@ -402,8 +402,8 @@ _08004D30: bx r0 thumb_func_end FillBitmapRect4Bit - thumb_func_start sub_8004D40 -sub_8004D40: @ 8004D40 + thumb_func_start BlitBitmapRect4BitTo8Bit +BlitBitmapRect4BitTo8Bit: @ 8004D40 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -716,10 +716,10 @@ _08004F7E: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8004D40 + thumb_func_end BlitBitmapRect4BitTo8Bit - thumb_func_start sub_8004F90 -sub_8004F90: @ 8004F90 + thumb_func_start FillBitmapRect8Bit +FillBitmapRect8Bit: @ 8004F90 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -808,6 +808,6 @@ _08005024: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8004F90 + thumb_func_end FillBitmapRect8Bit .align 2, 0 @ Don't pad with nop. diff --git a/asm/braille_text.s b/asm/braille_text.s index 4bf0e698b..3a46d7d8e 100644 --- a/asm/braille_text.s +++ b/asm/braille_text.s @@ -360,7 +360,7 @@ _0814FB38: _0814FB3A: strb r0, [r6, 0x1C] adds r0, r6, 0 - bl sub_80054C8 + bl TextPrinterInitDownArrowCounters _0814FB42: movs r0, 0x3 b _0814FC96 diff --git a/asm/buy_menu_helpers.s b/asm/buy_menu_helpers.s index cb0e3935e..30655defd 100644 --- a/asm/buy_menu_helpers.s +++ b/asm/buy_menu_helpers.s @@ -12,13 +12,13 @@ sub_813F66C: @ 813F66C cmp r4, 0x1 beq _0813F680 ldr r0, _0813F67C @ =gUnknown_8464804 - bl sub_8003B24 + bl InitWindows b _0813F686 .align 2, 0 _0813F67C: .4byte gUnknown_8464804 _0813F680: ldr r0, _0813F6CC @ =gUnknown_846483C - bl sub_8003B24 + bl InitWindows _0813F686: bl DeactivateAllTextPrinters movs r0, 0 @@ -114,7 +114,7 @@ sub_813F6F4: @ 813F6F4 str r4, [sp, 0xC] str r2, [sp, 0x10] mov r2, r9 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r3,r4} mov r8, r3 diff --git a/asm/cable_club.s b/asm/cable_club.s index b658fd8d9..4c159c698 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -59,7 +59,7 @@ sub_808078C: @ 808078C ldr r5, _080807E0 @ =gUnknown_2021D18 ldr r1, _080807E4 @ =gUnknown_841DF82 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r1, 0 str r1, [sp] movs r0, 0xFF @@ -388,7 +388,7 @@ sub_80809F8: @ 80809F8 bl sub_800AA24 bl sub_800A270 ldr r0, _08080A2C @ =gUnknown_83C6AB0 - bl sub_8003CE4 + bl AddWindow strh r0, [r4, 0xA] b _08080A3C .align 2, 0 @@ -817,7 +817,7 @@ _08080DA8: adds r4, 0x1C adds r5, 0x1 _08080DAC: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -975,7 +975,7 @@ _08080EF2: lsls r0, 24 lsrs r5, r0, 24 _08080EF8: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -1587,7 +1587,7 @@ _080813B8: cmp r0, 0 beq _080813D4 ldr r0, _080813D0 @ =0x00000109 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM b _080813DC .align 2, 0 _080813CC: .4byte gUnknown_202273C @@ -1595,7 +1595,7 @@ _080813D0: .4byte 0x00000109 _080813D4: movs r0, 0x85 lsls r0, 1 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM _080813DC: ldr r0, _080813F0 @ =gUnknown_20370C0 ldrh r0, [r0] @@ -1763,7 +1763,7 @@ _08081510: adds r5, 0x1C adds r4, 0x1 _08081536: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -1805,7 +1805,7 @@ _0808157A: cmp r0, 0 beq _08081598 ldr r0, _08081594 @ =0x00000109 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM b _080815A0 .align 2, 0 _08081590: .4byte gUnknown_202273C @@ -1813,7 +1813,7 @@ _08081594: .4byte 0x00000109 _08081598: movs r0, 0x85 lsls r0, 1 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM _080815A0: ldr r0, _080815B8 @ =gUnknown_202273C ldr r1, _080815BC @ =0x00002211 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 4b976864a..189e420cd 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -134,7 +134,7 @@ _080F5660: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram @@ -204,7 +204,7 @@ sub_80F5708: @ 80F5708 ldrb r0, [r0] cmp r0, 0 bne _080F578C - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r4, r0, 24 movs r0, 0x1 @@ -241,7 +241,7 @@ _080F5744: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -445,7 +445,7 @@ _080F5846: movs r2, 0 bl ChangeBgY ldr r0, _080F5948 @ =gUnknown_841EE68 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r1, 0x82 lsls r1, 5 diff --git a/asm/coins.s b/asm/coins.s index 7edf85651..ed30346d1 100644 --- a/asm/coins.s +++ b/asm/coins.s @@ -141,7 +141,7 @@ sub_80D060C: @ 80D060C ldr r0, _080D066C @ =gUnknown_2021D18 mov r9, r0 ldr r1, _080D0670 @ =gUnknown_84162C4 - bl sub_8008FCC + bl StringExpandPlaceholders str r4, [sp] str r5, [sp, 0x4] movs r0, 0 @@ -223,7 +223,7 @@ sub_80D06D0: @ 80D06D0 ldr r4, _080D0720 @ =gUnknown_2021D18 ldr r1, _080D0724 @ =gUnknown_84162C4 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -287,7 +287,7 @@ sub_80D072C: @ 80D072C str r1, [sp, 0x1C] ldr r4, _080D07BC @ =gUnknown_2039A28 add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, 0 diff --git a/asm/coord_event_weather.s b/asm/coord_event_weather.s index db305e8a0..8c987c6e2 100644 --- a/asm/coord_event_weather.s +++ b/asm/coord_event_weather.s @@ -70,8 +70,8 @@ nullsub_39: @ 806E7D8 bx lr thumb_func_end nullsub_39 - thumb_func_start sub_806E7DC -sub_806E7DC: @ 806E7DC + thumb_func_start trigger_activate_weather +trigger_activate_weather: @ 806E7DC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -100,6 +100,6 @@ _0806E80A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_806E7DC + thumb_func_end trigger_activate_weather .align 2, 0 @ Don't pad with nop. diff --git a/asm/credits.s b/asm/credits.s index 7b20b7f28..fc3afa96b 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -141,7 +141,7 @@ sub_80F3AA4: @ 80F3AA4 sub_80F3AC4: @ 80F3AC4 push {r4,lr} ldr r0, _080F3AFC @ =gUnknown_8410E08 - bl sub_8003CE4 + bl AddWindow ldr r4, _080F3B00 @ =gUnknown_203AB40 ldr r1, [r4] strb r0, [r1, 0xA] @@ -422,7 +422,7 @@ _080F3D0A: movs r1, 0x1 movs r2, 0x8 movs r3, 0x29 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r1, [r7] movs r0, 0x5 b _080F413C @@ -649,7 +649,7 @@ _080F3EB4: movs r1, 0x1 movs r2, 0x2 movs r3, 0x6 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r1, [r7] movs r0, 0x8 b _080F3FB8 @@ -696,7 +696,7 @@ _080F3F24: movs r1, 0x2 movs r2, 0x8 movs r3, 0x6 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r1, [r7] movs r0, 0x9 b _080F3FB8 @@ -1002,7 +1002,7 @@ _080F41BA: b _080F42C2 _080F41C4: ldr r0, _080F41F4 @ =gUnknown_840C5B0 - bl sub_8003B24 + bl InitWindows movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -1027,7 +1027,7 @@ _080F41F8: .4byte gUnknown_840CB8C _080F41FC: .4byte gUnknown_840D228 _080F4200: ldr r0, _080F4234 @ =gUnknown_840C5D0 - bl sub_8003B24 + bl InitWindows movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -1053,7 +1053,7 @@ _080F4238: .4byte gUnknown_840E158 _080F423C: .4byte gUnknown_840E904 _080F4240: ldr r0, _080F427C @ =gUnknown_840C5F0 - bl sub_8003B24 + bl InitWindows movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -1084,7 +1084,7 @@ _080F4280: .4byte gUnknown_840F240 _080F4284: .4byte gUnknown_840F944 _080F4288: ldr r0, _080F42E4 @ =gUnknown_840C610 - bl sub_8003B24 + bl InitWindows movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer diff --git a/asm/daycare.s b/asm/daycare.s index 0456be9d7..fa284cdb2 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -222,8 +222,8 @@ _08045554: .4byte gUnknown_3005008 _08045558: .4byte 0x00002cd0 thumb_func_end StorePokemonInDaycare - thumb_func_start sub_804555C -sub_804555C: @ 804555C + thumb_func_start StorePokemonInEmptyDaycareSlot +StorePokemonInEmptyDaycareSlot: @ 804555C push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -240,10 +240,10 @@ sub_804555C: @ 804555C pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_804555C + thumb_func_end StorePokemonInEmptyDaycareSlot - thumb_func_start sub_8045580 -sub_8045580: @ 8045580 + thumb_func_start StoreSelectedPokemonInDaycare +StoreSelectedPokemonInDaycare: @ 8045580 push {lr} bl GetCursorSelectionMonId lsls r0, 24 @@ -257,13 +257,13 @@ sub_8045580: @ 8045580 movs r2, 0xBE lsls r2, 6 adds r1, r2 - bl sub_804555C + bl StorePokemonInEmptyDaycareSlot pop {r0} bx r0 .align 2, 0 _080455A4: .4byte gUnknown_2024284 _080455A8: .4byte gUnknown_3005008 - thumb_func_end sub_8045580 + thumb_func_end StoreSelectedPokemonInDaycare thumb_func_start ShiftDaycareSlots ShiftDaycareSlots: @ 80455AC @@ -1763,7 +1763,7 @@ sub_80460D4: @ 80460D4 ldrh r1, [r4] mov r0, sp adds r2, r5, 0 - bl sub_8046208 + bl SetInitialEggData mov r0, sp adds r1, r5, 0 bl InheritIVs @@ -1803,8 +1803,8 @@ sub_80460D4: @ 80460D4 _0804614C: .4byte gUnknown_2024284 thumb_func_end sub_80460D4 - thumb_func_start sub_8046150 -sub_8046150: @ 8046150 + thumb_func_start CreateEgg +CreateEgg: @ 8046150 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1889,10 +1889,10 @@ _080461E2: .align 2, 0 _08046200: .4byte gUnknown_825F83E _08046204: .4byte gUnknown_8254795 - thumb_func_end sub_8046150 + thumb_func_end CreateEgg - thumb_func_start sub_8046208 -sub_8046208: @ 8046208 + thumb_func_start SetInitialEggData +SetInitialEggData: @ 8046208 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -1967,7 +1967,7 @@ sub_8046208: @ 8046208 .align 2, 0 _080462A4: .4byte gUnknown_825F83E _080462A8: .4byte gUnknown_8254795 - thumb_func_end sub_8046208 + thumb_func_end SetInitialEggData thumb_func_start sub_80462AC sub_80462AC: @ 80462AC @@ -3054,7 +3054,7 @@ ShowDaycareLevelMenu: @ 8046AB8 push {r4,r5,lr} sub sp, 0x18 ldr r0, _08046B18 @ =gUnknown_825F7F4 - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 diff --git a/asm/diploma.s b/asm/diploma.s index 0260a587d..7a73ccd98 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -395,7 +395,7 @@ _080F4E66: movs r2, 0 bl ChangeBgY ldr r0, _080F4F94 @ =gUnknown_8415A10 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r1, 0x82 lsls r1, 5 @@ -559,7 +559,7 @@ _080F5050: movs r0, 0 movs r1, 0x2 movs r3, 0x4 - bl sub_812E51C + bl box_print ldr r1, _080F50EC @ =gUnknown_841B619 add r0, sp, 0xC bl UnkTextUtil_StringExpandPlaceholders @@ -579,7 +579,7 @@ _080F5050: movs r1, 0x2 adds r2, r4, 0 movs r3, 0x1E - bl sub_812E51C + bl box_print str r6, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -589,7 +589,7 @@ _080F5050: movs r1, 0x2 movs r2, 0x78 movs r3, 0x69 - bl sub_812E51C + bl box_print movs r0, 0 bl PutWindowTilemap add sp, 0xAC diff --git a/asm/easy_chat.s b/asm/easy_chat.s index adf83de7e..60d0b4e9c 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -42,8 +42,8 @@ _080BD74E: bx r1 thumb_func_end sub_80BD718 - thumb_func_start sub_80BD754 -sub_80BD754: @ 80BD754 + thumb_func_start start_menu_is_selected_item_valid +start_menu_is_selected_item_valid: @ 80BD754 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -51,7 +51,7 @@ sub_80BD754: @ 80BD754 cmp r0, 0x15 bne _080BD76C movs r0, 0 - bl sub_8088E8C + bl pokedex_count lsls r0, 16 lsrs r0, 16 b _080BD782 @@ -73,7 +73,7 @@ _080BD782: bx r1 .align 2, 0 _080BD788: .4byte gUnknown_83ECED4 - thumb_func_end sub_80BD754 + thumb_func_end start_menu_is_selected_item_valid thumb_func_start sub_80BD78C sub_80BD78C: @ 80BD78C @@ -808,7 +808,7 @@ sub_80BDCA8: @ 80BDCA8 sub_80BDCB8: @ 80BDCB8 push {r4-r7,lr} movs r0, 0 - bl sub_80BD754 + bl start_menu_is_selected_item_valid lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 @@ -1054,7 +1054,7 @@ sub_80BDE88: @ 80BDE88 ldr r1, [r4] movs r0, 0 strh r0, [r1] - bl sub_8088E8C + bl pokedex_count lsls r0, 16 cmp r0, 0 beq _080BDEB0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index a1ae53f0f..2cde1b211 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -506,7 +506,7 @@ sub_8047004: @ 8047004 cmp r0, 0 bne _0804702C bl sub_80563F0 - ldr r0, _08047038 @ =sub_8047044 + ldr r0, _08047038 @ =CB2_EggHatch_0 bl SetMainCallback2 ldr r1, _0804703C @ =gUnknown_3005020 ldr r0, _08047040 @ =sub_807DD24 @@ -519,13 +519,13 @@ _0804702C: bx r0 .align 2, 0 _08047034: .4byte gUnknown_2037AB8 -_08047038: .4byte sub_8047044 +_08047038: .4byte CB2_EggHatch_0 _0804703C: .4byte gUnknown_3005020 _08047040: .4byte sub_807DD24 thumb_func_end sub_8047004 - thumb_func_start sub_8047044 -sub_8047044: @ 8047044 + thumb_func_start CB2_EggHatch_0 +CB2_EggHatch_0: @ 8047044 push {r4,lr} sub sp, 0x4 ldr r0, _08047064 @ =gUnknown_30030F0 @@ -632,7 +632,7 @@ _08047154: .4byte gUnknown_20370C2 _08047158: .4byte gUnknown_826019C _0804715C: ldr r0, _0804716C @ =gUnknown_82601A4 - bl sub_8003B24 + bl InitWindows ldr r0, _08047170 @ =gUnknown_3000E74 ldr r1, [r0] movs r0, 0 @@ -765,10 +765,10 @@ _0804727A: .align 2, 0 _08047298: .4byte sub_8047338 _0804729C: .4byte gUnknown_3000E74 - thumb_func_end sub_8047044 + thumb_func_end CB2_EggHatch_0 - thumb_func_start sub_80472A0 -sub_80472A0: @ 80472A0 + thumb_func_start EggHatchSetMonNickname +EggHatchSetMonNickname: @ 80472A0 push {lr} ldr r0, _080472D0 @ =gUnknown_20370C0 ldrh r1, [r0] @@ -794,7 +794,7 @@ _080472D4: .4byte gUnknown_2024284 _080472D8: .4byte gUnknown_2021D04 _080472DC: .4byte gUnknown_3000E74 _080472E0: .4byte c2_exit_to_overworld_2_switch - thumb_func_end sub_80472A0 + thumb_func_end EggHatchSetMonNickname thumb_func_start sub_80472E4 sub_80472E4: @ 80472E4 @@ -1004,7 +1004,7 @@ _08047482: ldr r4, _080474DC @ =gUnknown_2021D18 ldr r1, _080474E0 @ =gUnknown_841B6FD adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, [r5] ldrb r0, [r0, 0x8] movs r1, 0xFF @@ -1061,7 +1061,7 @@ _08047504: ldr r4, _08047540 @ =gUnknown_2021D18 ldr r1, _08047544 @ =gUnknown_841B716 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, [r5] ldrb r0, [r0, 0x8] movs r1, 0x1 @@ -1080,7 +1080,7 @@ _08047544: .4byte gUnknown_841B716 _08047548: ldr r0, [r5] ldrb r0, [r0, 0x8] - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 @@ -1108,7 +1108,7 @@ _0804755A: .align 2, 0 _08047584: .4byte gUnknown_82601B4 _08047588: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1173,19 +1173,19 @@ _080475A8: movs r2, 0 bl GetMonData str r0, [sp] - ldr r0, _08047630 @ =sub_80472A0 + ldr r0, _08047630 @ =EggHatchSetMonNickname str r0, [sp, 0x4] movs r0, 0x3 mov r1, r10 adds r2, r5, 0 adds r3, r4, 0 - bl sub_809D954 + bl DoNamingScreen b _08047684 .align 2, 0 _08047624: .4byte gUnknown_3000E74 _08047628: .4byte gUnknown_2024284 _0804762C: .4byte gUnknown_2021D04 -_08047630: .4byte sub_80472A0 +_08047630: .4byte EggHatchSetMonNickname _08047634: movs r0, 0x1 negs r0, r0 @@ -1806,7 +1806,7 @@ EggHatchPrintMessage: @ 8047A9C movs r1, 0x3 adds r2, r6, 0 ldr r3, [sp, 0x14] - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x18 pop {r3} mov r8, r3 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index a93d52fc1..6b1eb99b0 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -196,7 +196,7 @@ EvolutionScene: @ 80CDDF4 movs r0, 0x9 strb r0, [r1] bl sub_800F34C - bl sub_800F420 + bl LoadBattleTextboxAndBackground bl ResetSpriteData bl remove_some_task bl ResetTasks @@ -517,7 +517,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 movs r0, 0x9 strb r0, [r1] bl sub_800F34C - bl sub_800F420 + bl LoadBattleTextboxAndBackground bl ResetSpriteData bl FreeAllSpritePalettes ldr r1, _080CE2B4 @ =gUnknown_3003E58 @@ -1494,7 +1494,7 @@ _080CEAA0: ldr r4, _080CEAC4 @ =gUnknown_2021D18 ldr r1, _080CEAC8 @ =gUnknown_83FE672 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 bl sub_80D87BC @@ -1511,7 +1511,7 @@ _080CEAC8: .4byte gUnknown_83FE672 _080CEACC: .4byte gUnknown_3005090 _080CEAD0: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CEAE0 @@ -1799,7 +1799,7 @@ _080CED3A: ldr r4, _080CEDA8 @ =gUnknown_2021D18 ldr r1, _080CEDAC @ =gUnknown_83FE688 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 bl sub_80D87BC @@ -1837,7 +1837,7 @@ _080CED3A: movs r1, 0x3 bl sub_8088E74 movs r0, 0xE - bl sub_8054E90 + bl IncrementGameStat b _080CF528 .align 2, 0 _080CEDA8: .4byte gUnknown_2021D18 @@ -1846,7 +1846,7 @@ _080CEDB0: .4byte 0x00000103 _080CEDB4: .4byte gUnknown_3005090 _080CEDB8: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CEDC6 @@ -2042,7 +2042,7 @@ _080CEF48: beq _080CEF70 ldr r0, _080CEF68 @ =gUnknown_2021D18 ldr r1, _080CEF6C @ =gUnknown_83FE6D0 - bl sub_8008FCC + bl StringExpandPlaceholders b _080CEF78 .align 2, 0 _080CEF64: .4byte gUnknown_3005090 @@ -2051,7 +2051,7 @@ _080CEF6C: .4byte gUnknown_83FE6D0 _080CEF70: ldr r0, _080CEF90 @ =gUnknown_2021D18 ldr r1, _080CEF94 @ =gUnknown_83FE6B5 - bl sub_8008FCC + bl StringExpandPlaceholders _080CEF78: ldr r0, _080CEF90 @ =gUnknown_2021D18 movs r1, 0 @@ -2070,7 +2070,7 @@ _080CEF94: .4byte gUnknown_83FE6B5 _080CEF98: .4byte gUnknown_3005090 _080CEF9C: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CEFAA @@ -2087,7 +2087,7 @@ _080CEFB6: bl PlayFanfare ldr r0, _080CEFEC @ =gUnknown_83FDF3C ldr r0, [r0, 0xC] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CEFF0 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2110,7 +2110,7 @@ _080CEFF0: .4byte gUnknown_202298C _080CEFF4: .4byte gUnknown_3005090 _080CEFF8: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CF006 @@ -2175,7 +2175,7 @@ _080CF054: .4byte _080CF504 _080CF088: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CF096 @@ -2190,7 +2190,7 @@ _080CF0A2: bl BufferMoveToLearnIntoBattleTextBuff2 ldr r0, _080CF0C8 @ =gUnknown_83FDF3C ldr r0, [r0, 0x10] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF0CC @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2208,7 +2208,7 @@ _080CF0CC: .4byte gUnknown_202298C _080CF0D0: .4byte gUnknown_3005090 _080CF0D4: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CF0E2 @@ -2222,7 +2222,7 @@ _080CF0E2: _080CF0EE: ldr r0, _080CF110 @ =gUnknown_83FDF3C ldr r0, [r0, 0x14] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF114 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2240,7 +2240,7 @@ _080CF114: .4byte gUnknown_202298C _080CF118: .4byte gUnknown_3005090 _080CF11C: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080CF15A @@ -2250,7 +2250,7 @@ _080CF11C: bne _080CF15A ldr r0, _080CF1A8 @ =gUnknown_83FDF3C ldr r0, [r0, 0x18] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF1AC @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2268,7 +2268,7 @@ _080CF11C: strh r0, [r1, 0x14] _080CF15A: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CF168 @@ -2507,7 +2507,7 @@ _080CF34C: ldr r3, _080CF38C @ =0x000004cc adds r0, r3 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF390 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2563,7 +2563,7 @@ _080CF3E0: lsls r1, 2 adds r0, r1 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF40C @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2581,7 +2581,7 @@ _080CF40C: .4byte gUnknown_202298C _080CF410: .4byte gUnknown_3005090 _080CF414: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CF422 @@ -2595,7 +2595,7 @@ _080CF422: _080CF42E: ldr r0, _080CF450 @ =gUnknown_83FDF3C ldr r0, [r0, 0x1C] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF454 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2613,7 +2613,7 @@ _080CF454: .4byte gUnknown_202298C _080CF458: .4byte gUnknown_3005090 _080CF45C: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080CF528 @@ -2626,7 +2626,7 @@ _080CF45C: lsls r1, 2 adds r0, r1 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF49C @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2645,7 +2645,7 @@ _080CF4A0: .4byte gUnknown_3005090 _080CF4A4: ldr r0, _080CF4CC @ =gUnknown_83FDF3C ldr r0, [r0, 0x20] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF4D0 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2668,7 +2668,7 @@ _080CF4D4: .4byte gUnknown_3005090 _080CF4D8: ldr r0, _080CF4F8 @ =gUnknown_83FDF3C ldr r0, [r0, 0x24] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, _080CF4FC @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC @@ -2687,7 +2687,7 @@ _080CF4FC: .4byte gUnknown_202298C _080CF500: .4byte gUnknown_3005090 _080CF504: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080CF528 @@ -2813,7 +2813,7 @@ _080CF620: ldr r4, _080CF640 @ =gUnknown_2021D18 ldr r1, _080CF644 @ =gUnknown_83FE672 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0x1 @@ -2829,7 +2829,7 @@ _080CF644: .4byte gUnknown_83FE672 _080CF648: .4byte gUnknown_3005090 _080CF64C: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CF65C @@ -3106,7 +3106,7 @@ _080CF8A8: ldr r4, _080CF914 @ =gUnknown_2021D18 ldr r1, _080CF918 @ =gUnknown_83FE688 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0x1 @@ -3144,7 +3144,7 @@ _080CF8A8: movs r1, 0x3 bl sub_8088E74 movs r0, 0xE - bl sub_8054E90 + bl IncrementGameStat b _080D003A .align 2, 0 _080CF914: .4byte gUnknown_2021D18 @@ -3153,7 +3153,7 @@ _080CF91C: .4byte 0x00000103 _080CF920: .4byte gUnknown_3005090 _080CF924: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CF932 @@ -3233,7 +3233,7 @@ _080CF9C8: .4byte gUnknown_841E325 _080CF9CC: .4byte gUnknown_3005090 _080CF9D0: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 @@ -3337,7 +3337,7 @@ _080CFAA8: ldr r4, _080CFACC @ =gUnknown_2021D18 ldr r1, _080CFAD0 @ =gUnknown_83FE6D0 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0x1 @@ -3355,7 +3355,7 @@ _080CFAD0: .4byte gUnknown_83FE6D0 _080CFAD4: .4byte gUnknown_3005090 _080CFAD8: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CFAE6 @@ -3372,7 +3372,7 @@ _080CFAF2: bl PlayFanfare ldr r0, _080CFB28 @ =gUnknown_83FDF3C ldr r0, [r0, 0xC] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFB2C @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3395,7 +3395,7 @@ _080CFB2C: .4byte gUnknown_202298C _080CFB30: .4byte gUnknown_3005090 _080CFB34: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CFB42 @@ -3458,7 +3458,7 @@ _080CFB90: .4byte _080D0018 _080CFBC0: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CFBCE @@ -3473,7 +3473,7 @@ _080CFBDA: bl BufferMoveToLearnIntoBattleTextBuff2 ldr r0, _080CFC00 @ =gUnknown_83FDF3C ldr r0, [r0, 0x10] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFC04 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3491,7 +3491,7 @@ _080CFC04: .4byte gUnknown_202298C _080CFC08: .4byte gUnknown_3005090 _080CFC0C: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CFC1A @@ -3505,7 +3505,7 @@ _080CFC1A: _080CFC26: ldr r0, _080CFC48 @ =gUnknown_83FDF3C ldr r0, [r0, 0x14] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFC4C @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3523,7 +3523,7 @@ _080CFC4C: .4byte gUnknown_202298C _080CFC50: .4byte gUnknown_3005090 _080CFC54: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080CFC92 @@ -3533,7 +3533,7 @@ _080CFC54: bne _080CFC92 ldr r0, _080CFCE8 @ =gUnknown_83FDF3C ldr r0, [r0, 0x18] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFCEC @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3551,7 +3551,7 @@ _080CFC54: strh r0, [r1, 0x14] _080CFC92: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CFCA0 @@ -3597,7 +3597,7 @@ _080CFCF0: .4byte gUnknown_3005090 _080CFCF4: .4byte gUnknown_826D1CC _080CFCF8: .4byte gUnknown_2023E82 _080CFCFC: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r4, r0, 24 cmp r4, 0 @@ -3621,7 +3621,7 @@ _080CFD1C: lsls r3, 3 adds r0, r3 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFD68 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3661,7 +3661,7 @@ _080CFD70: lsls r1, 3 adds r0, r1 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFDA4 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3778,7 +3778,7 @@ _080CFE74: ldr r3, _080CFEB4 @ =0x000004cc adds r0, r3 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFEB8 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3821,7 +3821,7 @@ _080CFEC0: lsls r1, 2 adds r0, r1 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFF20 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3841,7 +3841,7 @@ _080CFF20: .4byte gUnknown_202298C _080CFF24: .4byte gUnknown_3005090 _080CFF28: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _080CFF36 @@ -3855,7 +3855,7 @@ _080CFF36: _080CFF42: ldr r0, _080CFF64 @ =gUnknown_83FDF3C ldr r0, [r0, 0x1C] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFF68 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3873,7 +3873,7 @@ _080CFF68: .4byte gUnknown_202298C _080CFF6C: .4byte gUnknown_3005090 _080CFF70: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080D003A @@ -3886,7 +3886,7 @@ _080CFF70: lsls r3, 2 adds r0, r3 ldr r0, [r0] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFFB0 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3905,7 +3905,7 @@ _080CFFB4: .4byte gUnknown_3005090 _080CFFB8: ldr r0, _080CFFE0 @ =gUnknown_83FDF3C ldr r0, [r0, 0x20] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080CFFE4 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3928,7 +3928,7 @@ _080CFFE8: .4byte gUnknown_3005090 _080CFFEC: ldr r0, _080D000C @ =gUnknown_83FDF3C ldr r0, [r0, 0x24] - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString ldr r1, _080D0010 @ =gUnknown_202298C movs r0, 0 movs r2, 0x1 @@ -3947,7 +3947,7 @@ _080D0010: .4byte gUnknown_202298C _080D0014: .4byte gUnknown_3005090 _080D0018: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080D003A diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 56635f05e..af3959b5e 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -220,7 +220,7 @@ _0812C540: b _0812C5BE _0812C578: ldr r0, _0812C598 @ =gUnknown_845FC04 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters bl sub_812CEC0 ldr r4, _0812C59C @ =gUnknown_203B100 @@ -515,7 +515,7 @@ _0812C7DC: cmp r0, 0 beq _0812C828 movs r0, 0x2 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0812C8EA @@ -887,7 +887,7 @@ sub_812CAD8: @ 812CAD8 cmp r0, 0 beq _0812CB2E movs r0, 0x2 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0812CB2E @@ -1228,7 +1228,7 @@ _0812CDAC: adds r0, r1 ldr r1, [r0] adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80F78A8 adds r3, r0, 0 lsls r3, 24 @@ -1299,7 +1299,7 @@ sub_812CE04: @ 812CE04 adds r0, r2 ldr r1, [r0] adds r0, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80F78A8 adds r3, r0, 0 lsls r3, 24 @@ -1665,7 +1665,7 @@ _0812D10A: movs r0, 0x1 movs r1, 0 movs r3, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r0, 0x1 bl sub_812CEE0 add sp, 0x14 @@ -2172,7 +2172,7 @@ sub_812D558: @ 812D558 bl dp13_810BB8C bl ResetPaletteFade movs r0, 0 - bl sub_805FECC + bl npc_paltag_set_load ldr r1, _0812D580 @ =gUnknown_3003E58 movs r0, 0x7 strb r0, [r1] @@ -2855,13 +2855,13 @@ sub_812DA14: @ 812DA14 movs r0, 0x3 movs r1, 0 movs r3, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r6, _0812DB08 @ =gUnknown_2021CD0 ldr r0, _0812DB0C @ =gUnknown_845FA1C adds r5, r0 ldr r1, [r5] adds r0, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r6, 0 movs r2, 0 @@ -2883,7 +2883,7 @@ sub_812DA14: @ 812DA14 movs r0, 0x3 movs r1, 0 movs r3, 0xA - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r0, 0x3 bl sub_812CEE0 add sp, 0x14 @@ -3315,7 +3315,7 @@ sub_812DDF0: @ 812DDF0 movs r0, 0 movs r1, 0x2 movs r2, 0x8 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 cmp r5, 0 bne _0812DEC0 add r0, sp, 0x14 @@ -3370,7 +3370,7 @@ _0812DE88: movs r0, 0 movs r1, 0x2 movs r2, 0x8 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _0812DEC0: ldr r1, _0812DEE4 @ =gUnknown_203B0FC ldr r0, [r1] @@ -4137,7 +4137,7 @@ sub_812E4A4: @ 812E4A4 movs r0, 0 movs r1, 0x2 movs r2, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 b _0812E50A .align 2, 0 _0812E4E0: .4byte gUnknown_203B0FC @@ -4157,7 +4157,7 @@ _0812E4EC: movs r0, 0 movs r1, 0x2 movs r2, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _0812E50A: add sp, 0x14 pop {r4} diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index e3b9145e3..95be13d7b 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -363,7 +363,7 @@ sub_806CAC8: @ 806CAC8 cmp r0, 0 beq _0806CB74 movs r0, 0x5 - bl sub_8054E90 + bl IncrementGameStat bl sub_8146CA4 bl sub_815D8C8 bl sub_80CC918 @@ -791,7 +791,7 @@ sub_806CEA0: @ 806CEA0 lsrs r2, 24 lsls r1, 24 lsrs r1, 24 - bl sub_806CEE0 + bl TryGetScriptOnPressingA adds r4, r0, 0 cmp r4, 0 bne _0806CEB8 @@ -819,8 +819,8 @@ _0806CED8: .4byte gUnknown_8168CE4 _0806CEDC: .4byte gUnknown_81A6955 thumb_func_end sub_806CEA0 - thumb_func_start sub_806CEE0 -sub_806CEE0: @ 806CEE0 + thumb_func_start TryGetScriptOnPressingA +TryGetScriptOnPressingA: @ 806CEE0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -861,7 +861,7 @@ _0806CF2C: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_806CEE0 + thumb_func_end TryGetScriptOnPressingA thumb_func_start sub_806CF38 sub_806CF38: @ 806CF38 @@ -1648,7 +1648,7 @@ _0806D59C: .4byte 0x00000824 _0806D5A0: .4byte gUnknown_81A6AC8 _0806D5A4: adds r0, r4, 0 - bl sub_805A104 + bl MetatileBehavior_IsWaterfall lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1833,7 +1833,7 @@ _0806D704: cmp r0, 0 beq _0806D720 movs r0, 0xD - bl sub_8054E90 + bl IncrementGameStat ldr r0, _0806D71C @ =gUnknown_81BF546 bl ScriptContext1_SetupScript b _0806D730 @@ -2176,7 +2176,7 @@ sub_806D964: @ 806D964 ldr r0, _0806D9B8 @ =gUnknown_2036DFC mov r8, r0 adds r1, r7, 0 - bl sub_806DC30 + bl map_warp_check_packed lsls r0, 24 asrs r5, r0, 24 movs r0, 0x1 @@ -2185,7 +2185,7 @@ sub_806D964: @ 806D964 beq _0806DA00 adds r0, r4, 0 adds r1, r6, 0 - bl sub_806DBD8 + bl is_non_stair_warp_tile lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2216,7 +2216,7 @@ _0806D9BC: cmp r0, 0 beq _0806D9E2 movs r0, 0x1 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags movs r4, 0xC _0806D9E2: bl sub_8055A08 @@ -2252,7 +2252,7 @@ sub_806DA10: @ 806DA10 ldr r7, _0806DA68 @ =gUnknown_2036DFC adds r0, r7, 0 adds r1, r6, 0 - bl sub_806DC30 + bl map_warp_check_packed lsls r0, 24 asrs r4, r0, 24 movs r0, 0x1 @@ -2296,7 +2296,7 @@ _0806DA6C: b _0806DAEE _0806DA82: adds r0, r4, 0 - bl sub_805A15C + bl MetatileBehavior_IsLavaridge1FWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2306,7 +2306,7 @@ _0806DA82: b _0806DAEE _0806DA98: adds r0, r4, 0 - bl sub_805A170 + bl MetatileBehavior_IsAquaHideoutWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2356,7 +2356,7 @@ sub_806DAF4: @ 806DAF4 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8059BC8 + bl MetatileBehavior_IsWarpDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2386,13 +2386,13 @@ sub_806DAF4: @ 806DAF4 cmp r0, 0x1 beq _0806DB7C adds r0, r4, 0 - bl sub_805A15C + bl MetatileBehavior_IsLavaridge1FWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _0806DB7C adds r0, r4, 0 - bl sub_805A170 + bl MetatileBehavior_IsAquaHideoutWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2467,8 +2467,8 @@ _0806DBD2: bx r1 thumb_func_end sub_806DB84 - thumb_func_start sub_806DBD8 -sub_806DBD8: @ 806DBD8 + thumb_func_start is_non_stair_warp_tile +is_non_stair_warp_tile: @ 806DBD8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -2501,12 +2501,12 @@ _0806DC06: _0806DC10: lsls r0, 24 lsrs r0, 24 - bl sub_8059CF0 + bl MetatileBehavior_IsWestArrowWarp b _0806DC22 _0806DC1A: lsls r0, 24 lsrs r0, 24 - bl sub_8059CDC + bl MetatileBehavior_IsEastArrowWarp _0806DC22: lsls r0, 24 lsrs r0, 24 @@ -2516,10 +2516,10 @@ _0806DC28: _0806DC2A: pop {r1} bx r1 - thumb_func_end sub_806DBD8 + thumb_func_end is_non_stair_warp_tile - thumb_func_start sub_806DC30 -sub_806DC30: @ 806DC30 + thumb_func_start map_warp_check_packed +map_warp_check_packed: @ 806DC30 push {lr} adds r3, r1, 0 ldrh r1, [r3] @@ -2536,7 +2536,7 @@ sub_806DC30: @ 806DC30 asrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_806DC30 + thumb_func_end map_warp_check_packed thumb_func_start sub_806DC54 sub_806DC54: @ 806DC54 @@ -2612,7 +2612,7 @@ sub_806DCD0: @ 806DCD0 bne _0806DD30 lsls r0, r5, 24 lsrs r0, 24 - bl sub_8059BC8 + bl MetatileBehavior_IsWarpDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2620,7 +2620,7 @@ sub_806DCD0: @ 806DCD0 ldr r7, _0806DD2C @ =gUnknown_2036DFC adds r0, r7, 0 adds r1, r6, 0 - bl sub_806DC30 + bl map_warp_check_packed lsls r0, 24 asrs r4, r0, 24 movs r0, 0x1 @@ -2706,7 +2706,7 @@ trigger_activate: @ 806DD80 cmp r1, 0 bne _0806DD96 ldrb r0, [r4, 0x6] - bl sub_806E7DC + bl trigger_activate_weather b _0806DDB6 _0806DD96: ldrh r0, [r4, 0x6] @@ -2990,7 +2990,7 @@ _0806DF98: cmp r0, 0 beq _0806DFB0 bl sub_8055A08 - bl sub_807E470 + bl sp13E_warp_to_last_warp movs r0, 0xE2 bl sub_80722CC movs r0, 0x1 @@ -3125,7 +3125,7 @@ sub_806E08C: @ 806E08C ldr r4, _0806E0CC @ =gUnknown_2036DFC adds r0, r4, 0 mov r1, sp - bl sub_806DC30 + bl map_warp_check_packed adds r1, r0, 0 lsls r1, 24 asrs r1, 24 diff --git a/asm/field_door.s b/asm/field_door.s index a29876ebc..cec25c04f 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -244,8 +244,8 @@ _0805B0BC: bx r1 thumb_func_end sub_805B060 - thumb_func_start sub_805B0C4 -sub_805B0C4: @ 805B0C4 + thumb_func_start door_find +door_find: @ 805B0C4 push {lr} adds r2, r0, 0 lsls r1, 16 @@ -267,10 +267,10 @@ _0805B0DA: _0805B0E2: pop {r1} bx r1 - thumb_func_end sub_805B0C4 + thumb_func_end door_find - thumb_func_start sub_805B0E8 -sub_805B0E8: @ 805B0E8 + thumb_func_start task_overworld_door_add_if_inactive +task_overworld_door_add_if_inactive: @ 805B0E8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -319,7 +319,7 @@ _0805B140: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_805B0E8 + thumb_func_end task_overworld_door_add_if_inactive thumb_func_start sub_805B14C sub_805B14C: @ 805B14C @@ -342,7 +342,7 @@ sub_805B158: @ 805B158 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 - bl sub_805B0C4 + bl door_find adds r4, r0, 0 cmp r0, 0 beq _0805B196 @@ -397,7 +397,7 @@ sub_805B1B8: @ 805B1B8 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 - bl sub_805B0C4 + bl door_find adds r2, r0, 0 adds r4, r2, 0 cmp r2, 0 @@ -420,7 +420,7 @@ _0805B1F4: _0805B1F8: adds r2, r5, 0 adds r3, r6, 0 - bl sub_805B0E8 + bl task_overworld_door_add_if_inactive lsls r0, 24 asrs r0, 24 _0805B204: @@ -444,7 +444,7 @@ sub_805B210: @ 805B210 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 - bl sub_805B0C4 + bl door_find adds r2, r0, 0 adds r4, r2, 0 cmp r2, 0 @@ -467,7 +467,7 @@ _0805B24C: _0805B250: adds r2, r5, 0 adds r3, r6, 0 - bl sub_805B0E8 + bl task_overworld_door_add_if_inactive lsls r0, 24 asrs r0, 24 _0805B25C: @@ -648,7 +648,7 @@ sub_805B388: @ 805B388 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 - bl sub_805B0C4 + bl door_find cmp r0, 0 beq _0805B3AC ldrb r0, [r0, 0x2] diff --git a/asm/field_effect.s b/asm/field_effect.s index 9ef43005c..7505b9b54 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2540,7 +2540,7 @@ sub_8084708: @ 8084708 movs r1, 0x1 bl VarSet movs r0, 0x8 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags movs r0, 0x16 bl sub_812B1F0 _08084760: @@ -3398,7 +3398,7 @@ sub_8084DCC: @ 8084DCC b _08084E1E _08084DE2: ldrb r0, [r4, 0x1E] - bl sub_805A104 + bl MetatileBehavior_IsWaterfall lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -6948,7 +6948,7 @@ sub_8086944: @ 8086944 ldr r0, _08086988 @ =gUnknown_20386E0 ldr r0, [r0] strh r0, [r1, 0x26] - bl sub_8055E84 + bl sav1_reset_battle_music_maybe ldr r4, _0808698C @ =0x00000131 adds r0, r4, 0 bl sub_8056124 @@ -7723,7 +7723,7 @@ sub_8086F64: @ 8086F64 movs r0, 0x10 strh r0, [r4, 0xC] movs r0, 0x1 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags ldr r0, _08086FA0 @ =gUnknown_2037078 ldrb r1, [r0, 0x5] lsls r0, r1, 3 diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index def6fcea3..86dd3d38a 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -202,7 +202,7 @@ _080DAEF4: b _080DAF12 _080DAF02: adds r0, r4, 0 - bl sub_805FF34 + bl npc_paltag_by_palslot lsls r0, 16 lsrs r0, 16 adds r1, r4, 0 @@ -2857,7 +2857,7 @@ sub_80DC348: @ 80DC348 movs r2, 0x32 ldrsh r1, [r4, r2] ldrh r2, [r4, 0x34] - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x30 ldrsh r0, [r4, r1] movs r2, 0x32 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index f81cc0cd7..10cf2dee5 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -505,10 +505,10 @@ _0807DEE8: lsrs r0, 24 cmp r0, 0x1 bne _0807DF04 - ldr r5, _0807DF00 @ =sub_807E20C + ldr r5, _0807DF00 @ =task_map_chg_seq_0807E20C b _0807DF2E .align 2, 0 -_0807DF00: .4byte sub_807E20C +_0807DF00: .4byte task_map_chg_seq_0807E20C _0807DF04: adds r0, r4, 0 bl sub_8059C5C @@ -518,17 +518,17 @@ _0807DF04: bne _0807DF2C ldr r0, _0807DF20 @ =gUnknown_2031DE0 ldrb r0, [r0] - ldr r5, _0807DF24 @ =sub_807E2CC + ldr r5, _0807DF24 @ =task_map_chg_seq_0807E2CC cmp r0, 0 bne _0807DF2E ldr r5, _0807DF28 @ =sub_807EC34 b _0807DF2E .align 2, 0 _0807DF20: .4byte gUnknown_2031DE0 -_0807DF24: .4byte sub_807E2CC +_0807DF24: .4byte task_map_chg_seq_0807E2CC _0807DF28: .4byte sub_807EC34 _0807DF2C: - ldr r5, _0807DF44 @ =sub_807E2CC + ldr r5, _0807DF44 @ =task_map_chg_seq_0807E2CC _0807DF2E: ldr r1, _0807DF48 @ =gUnknown_2031DE0 movs r0, 0 @@ -541,7 +541,7 @@ _0807DF2E: pop {r0} bx r0 .align 2, 0 -_0807DF44: .4byte sub_807E2CC +_0807DF44: .4byte task_map_chg_seq_0807E2CC _0807DF48: .4byte gUnknown_2031DE0 thumb_func_end sub_807DE78 @@ -871,8 +871,8 @@ _0807E206: bx r0 thumb_func_end sub_807DFBC - thumb_func_start sub_807E20C -sub_807E20C: @ 807E20C + thumb_func_start task_map_chg_seq_0807E20C +task_map_chg_seq_0807E20C: @ 807E20C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -960,10 +960,10 @@ _0807E2C6: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_807E20C + thumb_func_end task_map_chg_seq_0807E20C - thumb_func_start sub_807E2CC -sub_807E2CC: @ 807E2CC + thumb_func_start task_map_chg_seq_0807E2CC +task_map_chg_seq_0807E2CC: @ 807E2CC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -1000,7 +1000,7 @@ _0807E316: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_807E2CC + thumb_func_end task_map_chg_seq_0807E2CC thumb_func_start sub_807E31C sub_807E31C: @ 807E31C @@ -1176,8 +1176,8 @@ _0807E468: .4byte sub_807DF64 _0807E46C: .4byte sub_807E718 thumb_func_end sub_807E438 - thumb_func_start sub_807E470 -sub_807E470: @ 807E470 + thumb_func_start sp13E_warp_to_last_warp +sp13E_warp_to_last_warp: @ 807E470 push {lr} bl ScriptContext2_Enable bl sub_8055F88 @@ -1195,7 +1195,7 @@ sub_807E470: @ 807E470 _0807E494: .4byte gUnknown_3005020 _0807E498: .4byte sub_807DF64 _0807E49C: .4byte sub_807E718 - thumb_func_end sub_807E470 + thumb_func_end sp13E_warp_to_last_warp thumb_func_start sub_807E4A0 sub_807E4A0: @ 807E4A0 @@ -1282,10 +1282,10 @@ _0807E540: .4byte sub_807DF64 _0807E544: .4byte sub_807E784 thumb_func_end sub_807E524 - thumb_func_start sub_807E548 -sub_807E548: @ 807E548 + thumb_func_start sp13F_fall_to_last_warp +sp13F_fall_to_last_warp: @ 807E548 push {lr} - bl sub_807E470 + bl sp13E_warp_to_last_warp ldr r1, _0807E558 @ =gUnknown_3005020 ldr r0, _0807E55C @ =sub_8084454 str r0, [r1] @@ -1294,7 +1294,7 @@ sub_807E548: @ 807E548 .align 2, 0 _0807E558: .4byte gUnknown_3005020 _0807E55C: .4byte sub_8084454 - thumb_func_end sub_807E548 + thumb_func_end sp13F_fall_to_last_warp thumb_func_start sub_807E560 sub_807E560: @ 807E560 diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index bdc089b8e..98c64a45a 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -486,12 +486,12 @@ GetGroundEffectFlags_HotSprings: @ 8067EBC adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x1E] - bl sub_805A0F0 + bl MetatileBehavior_IsHotSprings lsls r0, 24 cmp r0, 0 beq _08067EFA ldrb r0, [r4, 0x1F] - bl sub_805A0F0 + bl MetatileBehavior_IsHotSprings lsls r0, 24 cmp r0, 0 beq _08067EFA @@ -755,7 +755,7 @@ GetReflectionTypeByMetatileBehavior: @ 80680C8 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8059BB4 + bl MetatileBehavior_IsIce lsls r0, 24 cmp r0, 0 beq _080680DE diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 148f9e948..b183cf8c3 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -2314,7 +2314,7 @@ _0805EEDC: bne _0805EF6A mov r0, r8 adds r1, r7, 0 - bl sub_805F02C + bl SetPlayerAvatarFieldObjectIdAndObjectId bl sub_80DB0C4 strb r0, [r6, 0x1B] _0805EF6A: @@ -2413,8 +2413,8 @@ sub_805EFF4: @ 805EFF4 bx r0 thumb_func_end sub_805EFF4 - thumb_func_start sub_805F02C -sub_805F02C: @ 805F02C + thumb_func_start SetPlayerAvatarFieldObjectIdAndObjectId +SetPlayerAvatarFieldObjectIdAndObjectId: @ 805F02C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 @@ -2438,7 +2438,7 @@ sub_805F02C: @ 805F02C .align 2, 0 _0805F058: .4byte gUnknown_2037078 _0805F05C: .4byte gUnknown_2036E38 - thumb_func_end sub_805F02C + thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId thumb_func_start sub_805F060 sub_805F060: @ 805F060 @@ -4474,8 +4474,8 @@ _0805FEC2: _0805FEC8: .4byte gUnknown_2036E38 thumb_func_end sub_805FE94 - thumb_func_start sub_805FECC -sub_805FECC: @ 805FECC + thumb_func_start npc_paltag_set_load +npc_paltag_set_load: @ 805FECC push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -4522,10 +4522,10 @@ _0805FF2A: bx r0 .align 2, 0 _0805FF30: .4byte gUnknown_83A5330 - thumb_func_end sub_805FECC + thumb_func_end npc_paltag_set_load - thumb_func_start sub_805FF34 -sub_805FF34: @ 805FF34 + thumb_func_start npc_paltag_by_palslot +npc_paltag_by_palslot: @ 805FF34 push {r4-r6,lr} lsls r0, 24 lsrs r2, r0, 24 @@ -4591,7 +4591,7 @@ _0805FFA2: _0805FFA8: .4byte gUnknown_83A5278 _0805FFAC: .4byte 0x000011ff _0805FFB0: .4byte gUnknown_203709A - thumb_func_end sub_805FF34 + thumb_func_end npc_paltag_by_palslot thumb_func_start sub_805FFB4 sub_805FFB4: @ 805FFB4 @@ -10995,7 +10995,7 @@ oac_hopping: @ 8062D98 movs r3, 0x2 bl sub_8063A6C adds r0, r6, 0 - bl sub_8064110 + bl GetJumpLedgeAnimId adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -13759,8 +13759,8 @@ _080640FC: _0806410C: .4byte gUnknown_83A652D thumb_func_end sub_80640E4 - thumb_func_start sub_8064110 -sub_8064110: @ 8064110 + thumb_func_start GetJumpLedgeAnimId +GetJumpLedgeAnimId: @ 8064110 push {r4,lr} sub sp, 0x8 lsls r0, 24 @@ -13782,7 +13782,7 @@ _08064128: bx r1 .align 2, 0 _08064138: .4byte gUnknown_83A6532 - thumb_func_end sub_8064110 + thumb_func_end GetJumpLedgeAnimId thumb_func_start sub_806413C sub_806413C: @ 806413C @@ -14791,8 +14791,8 @@ sub_8064830: @ 8064830 bx r0 thumb_func_end sub_8064830 - thumb_func_start sub_806485C -sub_806485C: @ 806485C + thumb_func_start an_walk_any_2 +an_walk_any_2: @ 806485C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -14821,7 +14821,7 @@ _0806488E: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_806485C + thumb_func_end an_walk_any_2 thumb_func_start sub_8064894 sub_8064894: @ 8064894 @@ -15103,7 +15103,7 @@ sub_8064A68: @ 8064A68 sub_8064A88: @ 8064A88 push {r4,lr} adds r4, r1, 0 - bl sub_806485C + bl an_walk_any_2 lsls r0, 24 cmp r0, 0 bne _08064A9A @@ -15140,7 +15140,7 @@ sub_8064AA8: @ 8064AA8 sub_8064AC8: @ 8064AC8 push {r4,lr} adds r4, r1, 0 - bl sub_806485C + bl an_walk_any_2 lsls r0, 24 cmp r0, 0 bne _08064ADA @@ -15177,7 +15177,7 @@ sub_8064AE8: @ 8064AE8 sub_8064B08: @ 8064B08 push {r4,lr} adds r4, r1, 0 - bl sub_806485C + bl an_walk_any_2 lsls r0, 24 cmp r0, 0 bne _08064B1A @@ -15214,7 +15214,7 @@ sub_8064B28: @ 8064B28 sub_8064B48: @ 8064B48 push {r4,lr} adds r4, r1, 0 - bl sub_806485C + bl an_walk_any_2 lsls r0, 24 cmp r0, 0 bne _08064B5A @@ -19861,7 +19861,7 @@ sub_8066BB0: @ 8066BB0 sub_8066BE4: @ 8066BE4 push {r4,lr} adds r4, r1, 0 - bl sub_806485C + bl an_walk_any_2 lsls r0, 24 cmp r0, 0 bne _08066BF6 @@ -19913,7 +19913,7 @@ sub_8066C10: @ 8066C10 sub_8066C44: @ 8066C44 push {r4,lr} adds r4, r1, 0 - bl sub_806485C + bl an_walk_any_2 lsls r0, 24 cmp r0, 0 bne _08066C56 diff --git a/asm/field_message_box.s b/asm/field_message_box.s index 25fb681a4..95a088c19 100644 --- a/asm/field_message_box.s +++ b/asm/field_message_box.s @@ -224,7 +224,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8 push {lr} adds r1, r0, 0 ldr r0, _080694E0 @ =gUnknown_2021D18 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1 bl sub_80F6D5C bl task_add_textbox diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 7752b92a9..b3bef080d 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -67,7 +67,7 @@ sub_805B3E0: @ 805B3E0 bne _0805B448 adds r0, r5, 0 bl npc_clear_strange_bits - bl sub_805BE08 + bl DoPlayerAvatarTransition bl sub_805B5A0 lsls r0, 24 cmp r0, 0 @@ -1150,7 +1150,7 @@ _0805BBF8: cmp r0, 0 beq _0805BC1C movs r0, 0x2B - bl sub_8054E90 + bl IncrementGameStat movs r0, 0x6 b _0805BC50 _0805BC1C: @@ -1394,8 +1394,8 @@ _0805BDE6: bx r0 thumb_func_end sub_805BDAC - thumb_func_start sub_805BDEC -sub_805BDEC: @ 805BDEC + thumb_func_start SetPlayerAvatarTransitionFlags +SetPlayerAvatarTransitionFlags: @ 805BDEC push {lr} lsls r0, 16 lsrs r0, 16 @@ -1403,15 +1403,15 @@ sub_805BDEC: @ 805BDEC ldrb r1, [r2, 0x1] orrs r0, r1 strb r0, [r2, 0x1] - bl sub_805BE08 + bl DoPlayerAvatarTransition pop {r0} bx r0 .align 2, 0 _0805BE04: .4byte gUnknown_2037078 - thumb_func_end sub_805BDEC + thumb_func_end SetPlayerAvatarTransitionFlags - thumb_func_start sub_805BE08 -sub_805BE08: @ 805BE08 + thumb_func_start DoPlayerAvatarTransition +DoPlayerAvatarTransition: @ 805BE08 push {r4,r5,lr} ldr r0, _0805BE50 @ =gUnknown_2037078 ldrb r4, [r0, 0x1] @@ -1453,7 +1453,7 @@ _0805BE48: _0805BE50: .4byte gUnknown_2037078 _0805BE54: .4byte gUnknown_835B844 _0805BE58: .4byte gUnknown_2036E38 - thumb_func_end sub_805BE08 + thumb_func_end DoPlayerAvatarTransition thumb_func_start nullsub_22 nullsub_22: @ 805BE5C @@ -2022,7 +2022,7 @@ sub_805C23C: @ 805C23C movs r0, 0xA bl sub_80722CC adds r0, r4, 0 - bl sub_8064110 + bl GetJumpLedgeAnimId lsls r0, 24 lsrs r0, 24 movs r1, 0x8 @@ -2052,7 +2052,7 @@ sub_805C270: @ 805C270 cmp r0, 0 bne _0805C2A6 _0805C27E: - bl sub_80BD58C + bl player_should_look_direction_be_enforced_upon_movement lsls r0, 24 cmp r0, 0 beq _0805C2A6 @@ -2365,7 +2365,7 @@ _0805C4A0: lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8059BC8 + bl MetatileBehavior_IsWarpDoor lsls r0, 24 cmp r0, 0 bne _0805C4DE @@ -3081,7 +3081,7 @@ SetPlayerAvatarExtraStateTransition: @ 805CA0C ldrb r1, [r5, 0x1] orrs r0, r1 strb r0, [r5, 0x1] - bl sub_805BE08 + bl DoPlayerAvatarTransition pop {r4,r5} pop {r0} bx r0 @@ -3965,8 +3965,8 @@ sub_805D0F8: @ 805D0F8 lsrs r4, 24 bl ScriptContext2_Enable bl player_bitmagic - bl sub_8055E84 - bl sub_8055F1C + bl sav1_reset_battle_music_maybe + bl Overworld_ChangeMusicToDefault ldr r2, _0805D148 @ =gUnknown_2037078 ldrb r1, [r2] movs r0, 0xF7 @@ -3976,7 +3976,7 @@ sub_805D0F8: @ 805D0F8 strb r0, [r2] movs r0, 0x1 strb r0, [r2, 0x6] - ldr r5, _0805D14C @ =sub_805D1D4 + ldr r5, _0805D14C @ =taskFF_0805D1D4 adds r0, r5, 0 movs r1, 0xFF bl CreateTask @@ -3994,7 +3994,7 @@ sub_805D0F8: @ 805D0F8 bx r0 .align 2, 0 _0805D148: .4byte gUnknown_2037078 -_0805D14C: .4byte sub_805D1D4 +_0805D14C: .4byte taskFF_0805D1D4 _0805D150: .4byte gUnknown_3005090 thumb_func_end sub_805D0F8 @@ -4015,7 +4015,7 @@ sub_805D154: @ 805D154 strb r0, [r2] movs r0, 0x1 strb r0, [r2, 0x6] - ldr r5, _0805D1A0 @ =sub_805D1D4 + ldr r5, _0805D1A0 @ =taskFF_0805D1D4 adds r0, r5, 0 movs r1, 0xFF bl CreateTask @@ -4033,7 +4033,7 @@ sub_805D154: @ 805D154 bx r0 .align 2, 0 _0805D19C: .4byte gUnknown_2037078 -_0805D1A0: .4byte sub_805D1D4 +_0805D1A0: .4byte taskFF_0805D1D4 _0805D1A4: .4byte gUnknown_3005090 thumb_func_end sub_805D154 @@ -4060,8 +4060,8 @@ _0805D1CC: .4byte gUnknown_3005E88 _0805D1D0: .4byte gUnknown_835B820 thumb_func_end sub_805D1A8 - thumb_func_start sub_805D1D4 -sub_805D1D4: @ 805D1D4 + thumb_func_start taskFF_0805D1D4 +taskFF_0805D1D4: @ 805D1D4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -4109,7 +4109,7 @@ _0805D230: .4byte gUnknown_2037078 _0805D234: .4byte gUnknown_2036E38 _0805D238: .4byte gUnknown_3005090 _0805D23C: .4byte sub_805D240 - thumb_func_end sub_805D1D4 + thumb_func_end taskFF_0805D1D4 thumb_func_start sub_805D240 sub_805D240: @ 805D240 @@ -4250,8 +4250,8 @@ sub_805D33C: @ 805D33C _0805D358: .4byte gUnknown_2037078 thumb_func_end sub_805D33C - thumb_func_start sub_805D35C -sub_805D35C: @ 805D35C + thumb_func_start fish1 +fish1: @ 805D35C push {r4-r6,lr} sub sp, 0x10 adds r5, r0, 0 @@ -4318,10 +4318,10 @@ _0805D3E4: .4byte gUnknown_835B90C _0805D3E8: .4byte gUnknown_835B912 _0805D3EC: .4byte gUnknown_2036E38 _0805D3F0: .4byte gUnknown_2037078 - thumb_func_end sub_805D35C + thumb_func_end fish1 - thumb_func_start sub_805D3F4 -sub_805D3F4: @ 805D3F4 + thumb_func_start fish2 +fish2: @ 805D3F4 push {r4,lr} adds r4, r0, 0 ldr r0, _0805D428 @ =gUnknown_2037078 @@ -4350,7 +4350,7 @@ _0805D41E: .align 2, 0 _0805D428: .4byte gUnknown_2037078 _0805D42C: .4byte gUnknown_202063C - thumb_func_end sub_805D3F4 + thumb_func_end fish2 thumb_func_start sub_805D430 sub_805D430: @ 805D430 @@ -4717,7 +4717,7 @@ _0805D6EA: cmp r0, 0 bne _0805D788 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 @@ -5032,7 +5032,7 @@ sub_805D980: @ 805D980 push {lr} bl sub_8002DE8 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index fcad6d755..ea891e55b 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -373,17 +373,17 @@ _0807F0AC: .4byte gUnknown_83C68D4 sub_807F0B0: @ 807F0B0 push {lr} bl sub_8055FD4 - ldr r0, _0807F0C4 @ =sub_807F0C8 + ldr r0, _0807F0C4 @ =task50_0807F0C8 movs r1, 0x50 bl CreateTask pop {r0} bx r0 .align 2, 0 -_0807F0C4: .4byte sub_807F0C8 +_0807F0C4: .4byte task50_0807F0C8 thumb_func_end sub_807F0B0 - thumb_func_start sub_807F0C8 -sub_807F0C8: @ 807F0C8 + thumb_func_start task50_0807F0C8 +task50_0807F0C8: @ 807F0C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -399,7 +399,7 @@ _0807F0E4: pop {r4} pop {r0} bx r0 - thumb_func_end sub_807F0C8 + thumb_func_end task50_0807F0C8 thumb_func_start sub_807F0EC sub_807F0EC: @ 807F0EC @@ -771,7 +771,7 @@ _0807F3E0: ldr r5, _0807F424 @ =gUnknown_2021D18 adds r0, r5, 0 mov r1, r8 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1 mov r8, r0 str r0, [sp] @@ -785,7 +785,7 @@ _0807F3E0: movs r1, 0x2 mov r2, r10 mov r3, r9 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r2, _0807F42C @ =gUnknown_3003E50 ldrb r1, [r2] movs r0, 0x2 @@ -802,7 +802,7 @@ _0807F42C: .4byte gUnknown_3003E50 _0807F430: bl sub_8002DE8 adds r0, r7, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r0, 16 cmp r0, 0 @@ -859,7 +859,7 @@ _0807F48C: .4byte _0807F5D0 _0807F4A8: ldr r0, _0807F518 @ =gUnknown_83C68E4 - bl sub_8003CE4 + bl AddWindow lsls r0, 24 lsrs r5, r0, 24 ldr r1, _0807F51C @ =gUnknown_3005090 diff --git a/asm/field_specials.s b/asm/field_specials.s index 9f895a5ba..8a3f3ed01 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -28,7 +28,7 @@ sub_80CA630: @ 80CA630 cmp r0, 0 beq _080CA644 movs r0, 0x2 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags _080CA644: movs r4, 0x8D lsls r4, 1 @@ -200,7 +200,7 @@ _080CA768: .4byte gUnknown_20370C0 thumb_func_start sub_80CA76C sub_80CA76C: @ 80CA76C push {r4,lr} - bl sub_80CACFC + bl GetLeadMonIndex lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -495,7 +495,7 @@ _080CA96E: adds r2, r3, 0 orrs r4, r2 adds r2, r4, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt pop {r4-r7} pop {r0} bx r0 @@ -571,7 +571,7 @@ _080CA9F6: adds r2, r3, 0 orrs r4, r2 adds r2, r4, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt bl DrawWholeMapView pop {r4-r6} pop {r0} @@ -581,8 +581,8 @@ _080CAA2C: .4byte 0x0000028f _080CAA30: .4byte gUnknown_3005008 thumb_func_end sub_80CA9A8 - thumb_func_start sub_80CAA34 -sub_80CAA34: @ 80CAA34 + thumb_func_start SpawnScriptFieldObject +SpawnScriptFieldObject: @ 80CAA34 push {lr} sub sp, 0x8 ldr r0, _080CAA80 @ =gUnknown_3005008 @@ -621,10 +621,10 @@ sub_80CAA34: @ 80CAA34 .align 2, 0 _080CAA80: .4byte gUnknown_3005008 _080CAA84: .4byte gUnknown_2036E38 - thumb_func_end sub_80CAA34 + thumb_func_end SpawnScriptFieldObject - thumb_func_start sub_80CAA88 -sub_80CAA88: @ 80CAA88 + thumb_func_start RemoveScriptFieldObject +RemoveScriptFieldObject: @ 80CAA88 push {lr} bl GetPlayerAvatarObjectId lsls r0, 24 @@ -640,7 +640,7 @@ sub_80CAA88: @ 80CAA88 bx r0 .align 2, 0 _080CAAA8: .4byte gUnknown_3005008 - thumb_func_end sub_80CAA88 + thumb_func_end RemoveScriptFieldObject thumb_func_start sub_80CAAAC sub_80CAAAC: @ 80CAAAC @@ -675,7 +675,7 @@ _080CAADC: .4byte gUnknown_83F5B1A thumb_func_start sub_80CAAE0 sub_80CAAE0: @ 80CAAE0 push {lr} - bl sub_80CACFC + bl GetLeadMonIndex lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -698,13 +698,13 @@ sub_80CAB08: @ 80CAB08 push {lr} sub sp, 0x4 movs r0, 0x2A - bl sub_8054E90 + bl IncrementGameStat ldr r0, _080CAB3C @ =0x0000083b bl FlagSet movs r1, 0x1 mov r0, sp strb r1, [r0] - bl sub_80CACFC + bl GetLeadMonIndex lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -725,14 +725,14 @@ _080CAB40: .4byte gUnknown_2024284 thumb_func_start sub_80CAB44 sub_80CAB44: @ 80CAB44 push {lr} - bl sub_80CACFC + bl GetLeadMonIndex lsls r0, 24 lsrs r0, 24 movs r1, 0x64 muls r0, r1 ldr r1, _080CAB68 @ =gUnknown_2024284 adds r0, r1 - bl sub_8043A40 + bl GetMonEVCount lsls r0, 16 ldr r1, _080CAB6C @ =0x01fd0000 cmp r0, r1 @@ -834,7 +834,7 @@ sub_80CAC08: @ 80CAC08 push {lr} ldr r0, _080CAC1C @ =gUnknown_2024284 movs r1, 0x3F - bl sub_8043A70 + bl CheckPartyPokerus lsls r0, 24 cmp r0, 0 beq _080CAC20 @@ -952,8 +952,8 @@ sub_80CACE8: @ 80CACE8 bx r0 thumb_func_end sub_80CACE8 - thumb_func_start sub_80CACFC -sub_80CACFC: @ 80CACFC + thumb_func_start GetLeadMonIndex +GetLeadMonIndex: @ 80CACFC push {r4-r6,lr} bl CalculatePlayerPartyCount lsls r0, 24 @@ -997,7 +997,7 @@ _080CAD4C: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80CACFC + thumb_func_end GetLeadMonIndex thumb_func_start sub_80CAD54 sub_80CAD54: @ 80CAD54 @@ -2065,7 +2065,7 @@ sub_80CB580: @ 80CB580 beq _080CB614 ldr r4, _080CB624 @ =gUnknown_2039A0C ldr r0, _080CB628 @ =gUnknown_83F5B3C - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] ldr r5, _080CB62C @ =0x0000021d @@ -2251,7 +2251,7 @@ _080CB6F6: orrs r2, r0 adds r0, r4, 0 adds r1, r7, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -2297,7 +2297,7 @@ _080CB752: orrs r2, r0 adds r0, r4, 0 adds r1, r7, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -2626,7 +2626,7 @@ _080CB9D2: str r0, [sp, 0x18] str r1, [sp, 0x1C] mov r0, r9 - bl sub_8003CE4 + bl AddWindow lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -3080,7 +3080,7 @@ sub_80CBD80: @ 80CBD80 movs r0, 0x16 bl sub_812B1F0 movs r0, 0x8 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags pop {r0} bx r0 thumb_func_end sub_80CBD80 @@ -3249,7 +3249,7 @@ _080CBEB2: thumb_func_start sub_80CBEBC sub_80CBEBC: @ 80CBEBC push {lr} - bl sub_80CACFC + bl GetLeadMonIndex lsls r0, 24 lsrs r0, 24 bl sub_80CBE50 @@ -3259,8 +3259,8 @@ sub_80CBEBC: @ 80CBEBC bx r1 thumb_func_end sub_80CBEBC - thumb_func_start sub_80CBED4 -sub_80CBED4: @ 80CBED4 + thumb_func_start TV_PrintIntToStringVar +TV_PrintIntToStringVar: @ 80CBED4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -3283,7 +3283,7 @@ sub_80CBED4: @ 80CBED4 bx r0 .align 2, 0 _080CBF00: .4byte gUnknown_83F5AF8 - thumb_func_end sub_80CBED4 + thumb_func_end TV_PrintIntToStringVar thumb_func_start sub_80CBF04 sub_80CBF04: @ 80CBF04 @@ -3401,8 +3401,8 @@ _080CBFDA: bx r1 thumb_func_end sub_80CBFA0 - thumb_func_start sub_80CBFE0 -sub_80CBFE0: @ 80CBFE0 + thumb_func_start ChangeBoxPokemonNickname +ChangeBoxPokemonNickname: @ 80CBFE0 push {r4-r6,lr} mov r6, r8 push {r6} @@ -3439,13 +3439,13 @@ sub_80CBFE0: @ 80CBFE0 movs r2, 0 bl GetBoxMonData str r0, [sp] - ldr r0, _080CC060 @ =sub_80CC064 + ldr r0, _080CC060 @ =ChangeBoxPokemonNickname_CB str r0, [sp, 0x4] movs r0, 0x3 mov r1, r8 adds r2, r5, 0 adds r3, r4, 0 - bl sub_809D954 + bl DoNamingScreen add sp, 0x8 pop {r3} mov r8, r3 @@ -3457,11 +3457,11 @@ _080CC050: .4byte gUnknown_20370D6 _080CC054: .4byte gUnknown_20370D8 _080CC058: .4byte gUnknown_2021D04 _080CC05C: .4byte gUnknown_2021CF0 -_080CC060: .4byte sub_80CC064 - thumb_func_end sub_80CBFE0 +_080CC060: .4byte ChangeBoxPokemonNickname_CB + thumb_func_end ChangeBoxPokemonNickname - thumb_func_start sub_80CC064 -sub_80CC064: @ 80CC064 + thumb_func_start ChangeBoxPokemonNickname_CB +ChangeBoxPokemonNickname_CB: @ 80CC064 push {lr} ldr r0, _080CC07C @ =gUnknown_20370D6 ldrb r0, [r0] @@ -3476,10 +3476,10 @@ sub_80CC064: @ 80CC064 _080CC07C: .4byte gUnknown_20370D6 _080CC080: .4byte gUnknown_20370D8 _080CC084: .4byte gUnknown_2021CF0 - thumb_func_end sub_80CC064 + thumb_func_end ChangeBoxPokemonNickname_CB - thumb_func_start sub_80CC088 -sub_80CC088: @ 80CC088 + thumb_func_start ChangePokemonNickname +ChangePokemonNickname: @ 80CC088 push {r4-r6,lr} mov r6, r10 mov r5, r9 @@ -3542,13 +3542,13 @@ sub_80CC088: @ 80CC088 movs r2, 0 bl GetMonData str r0, [sp] - ldr r0, _080CC140 @ =sub_80CC144 + ldr r0, _080CC140 @ =ChangePokemonNickname_CB str r0, [sp, 0x4] movs r0, 0x3 mov r1, r10 adds r2, r5, 0 adds r3, r4, 0 - bl sub_809D954 + bl DoNamingScreen add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -3562,11 +3562,11 @@ _080CC130: .4byte gUnknown_20370C0 _080CC134: .4byte gUnknown_2024284 _080CC138: .4byte gUnknown_2021D04 _080CC13C: .4byte gUnknown_2021CF0 -_080CC140: .4byte sub_80CC144 - thumb_func_end sub_80CC088 +_080CC140: .4byte ChangePokemonNickname_CB + thumb_func_end ChangePokemonNickname - thumb_func_start sub_80CC144 -sub_80CC144: @ 80CC144 + thumb_func_start ChangePokemonNickname_CB +ChangePokemonNickname_CB: @ 80CC144 push {lr} ldr r0, _080CC164 @ =gUnknown_20370C0 ldrh r1, [r0] @@ -3584,10 +3584,10 @@ sub_80CC144: @ 80CC144 _080CC164: .4byte gUnknown_20370C0 _080CC168: .4byte gUnknown_2024284 _080CC16C: .4byte gUnknown_2021CF0 - thumb_func_end sub_80CC144 + thumb_func_end ChangePokemonNickname_CB - thumb_func_start sub_80CC170 -sub_80CC170: @ 80CC170 + thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated +TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 push {r4,lr} ldr r0, _080CC194 @ =gUnknown_20370C0 ldrh r1, [r0] @@ -3608,10 +3608,10 @@ sub_80CC170: @ 80CC170 _080CC194: .4byte gUnknown_20370C0 _080CC198: .4byte gUnknown_2024284 _080CC19C: .4byte gUnknown_2021CD0 - thumb_func_end sub_80CC170 + thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated - thumb_func_start sub_80CC1A0 -sub_80CC1A0: @ 80CC1A0 + thumb_func_start TV_CheckMonOTIDEqualsPlayerID +TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 push {r4,lr} bl sub_80CC1E4 adds r4, r0, 0 @@ -3643,7 +3643,7 @@ _080CC1D8: bx r0 .align 2, 0 _080CC1E0: .4byte gUnknown_20370D0 - thumb_func_end sub_80CC1A0 + thumb_func_end TV_CheckMonOTIDEqualsPlayerID thumb_func_start sub_80CC1E4 sub_80CC1E4: @ 80CC1E4 @@ -3883,14 +3883,14 @@ sub_80CC3CC: @ 80CC3CC movs r5, 0 ldr r4, _080CC3F8 @ =gUnknown_20370C0 movs r0, 0xA - bl sub_8054EC4 + bl GetGameStat strh r0, [r4] movs r0, 0xD - bl sub_8054EC4 + bl GetGameStat adds r6, r0, 0 ldr r4, _080CC3FC @ =gUnknown_20370C4 movs r0, 0x17 - bl sub_8054EC4 + bl GetGameStat strh r0, [r4] ldr r1, _080CC400 @ =0x0000ffff cmp r6, r1 @@ -4385,23 +4385,23 @@ _080CC794: .4byte 0x00000f21 _080CC798: .4byte gUnknown_83F5F24 thumb_func_end sub_80CC730 - thumb_func_start sub_80CC79C -sub_80CC79C: @ 80CC79C + thumb_func_start set_unknown_box_id +set_unknown_box_id: @ 80CC79C ldr r1, _080CC7A4 @ =gUnknown_2039A1A strb r0, [r1] bx lr .align 2, 0 _080CC7A4: .4byte gUnknown_2039A1A - thumb_func_end sub_80CC79C + thumb_func_end set_unknown_box_id - thumb_func_start sub_80CC7A8 -sub_80CC7A8: @ 80CC7A8 + thumb_func_start get_unknown_box_id +get_unknown_box_id: @ 80CC7A8 ldr r0, _080CC7B0 @ =gUnknown_2039A1A ldrb r0, [r0] bx lr .align 2, 0 _080CC7B0: .4byte gUnknown_2039A1A - thumb_func_end sub_80CC7A8 + thumb_func_end get_unknown_box_id thumb_func_start sub_80CC7B4 sub_80CC7B4: @ 80CC7B4 @@ -4444,7 +4444,7 @@ sub_80CC7F8: @ 80CC7F8 bl VarGet lsls r0, 24 lsrs r0, 24 - bl sub_80CC79C + bl set_unknown_box_id bl StorageGetCurrentBox lsls r0, 24 lsrs r4, r0, 24 @@ -4462,7 +4462,7 @@ _080CC816: bl GetBoxMonData cmp r0, 0 bne _080CC858 - bl sub_80CC7A8 + bl get_unknown_box_id lsls r0, 16 lsrs r0, 16 cmp r0, r4 @@ -4900,7 +4900,7 @@ sub_80CCB94: @ 80CCB94 push {r6,r7} movs r7, 0 movs r6, 0 - bl sub_80CACFC + bl GetLeadMonIndex lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -5178,7 +5178,7 @@ sub_80CCDD0: @ 80CCDD0 lsls r2, 2 movs r0, 0x1F movs r1, 0x1F - bl sub_8058FA4 + bl MapGridSetMetatileIdAt bl DrawWholeMapView movs r0, 0x14 bl sub_80722CC @@ -5194,17 +5194,17 @@ _080CCDF8: .4byte 0x000002e3 thumb_func_start sub_80CCDFC sub_80CCDFC: @ 80CCDFC push {lr} - ldr r0, _080CCE0C @ =sub_80CCE10 + ldr r0, _080CCE0C @ =task_deoxys_sound movs r1, 0x8 bl CreateTask pop {r0} bx r0 .align 2, 0 -_080CCE0C: .4byte sub_80CCE10 +_080CCE0C: .4byte task_deoxys_sound thumb_func_end sub_80CCDFC - thumb_func_start sub_80CCE10 -sub_80CCE10: @ 80CCE10 + thumb_func_start task_deoxys_sound +task_deoxys_sound: @ 80CCE10 push {r4-r7,lr} mov r7, r8 push {r7} @@ -5299,7 +5299,7 @@ _080CCED6: .align 2, 0 _080CCEE0: .4byte 0x0000403e _080CCEE4: .4byte gUnknown_20370D0 - thumb_func_end sub_80CCE10 + thumb_func_end task_deoxys_sound thumb_func_start sub_80CCEE8 sub_80CCEE8: @ 80CCEE8 @@ -5618,7 +5618,7 @@ _080CD14C: sub_80CD154: @ 80CD154 push {r4,lr} movs r0, 0xA - bl sub_8054EC4 + bl GetGameStat adds r4, r0, 0 cmp r4, 0x18 bls _080CD1AE diff --git a/asm/field_tasks.s b/asm/field_tasks.s index b7e1713af..c6a908fad 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_806E810 -sub_806E810: @ 806E810 + thumb_func_start task_per_step_callback_manager +task_per_step_callback_manager: @ 806E810 push {lr} lsls r0, 24 lsrs r0, 24 @@ -27,7 +27,7 @@ sub_806E810: @ 806E810 .align 2, 0 _0806E834: .4byte gUnknown_3005090 _0806E838: .4byte gUnknown_83A7310 - thumb_func_end sub_806E810 + thumb_func_end task_per_step_callback_manager thumb_func_start sub_806E83C sub_806E83C: @ 806E83C @@ -65,7 +65,7 @@ _0806E878: .4byte gUnknown_203ADFA thumb_func_start sub_806E87C sub_806E87C: @ 806E87C push {r4,r5,lr} - ldr r5, _0806E8C4 @ =sub_806E810 + ldr r5, _0806E8C4 @ =task_per_step_callback_manager adds r0, r5, 0 bl FuncIsActiveTask lsls r0, 24 @@ -98,17 +98,17 @@ _0806E8BC: pop {r0} bx r0 .align 2, 0 -_0806E8C4: .4byte sub_806E810 +_0806E8C4: .4byte task_per_step_callback_manager _0806E8C8: .4byte gUnknown_3005090 _0806E8CC: .4byte sub_806E83C thumb_func_end sub_806E87C - thumb_func_start sub_806E8D0 -sub_806E8D0: @ 806E8D0 + thumb_func_start ActivatePerStepCallback +ActivatePerStepCallback: @ 806E8D0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0806E908 @ =sub_806E810 + ldr r0, _0806E908 @ =task_per_step_callback_manager bl FindTaskIdByFunc lsls r0, 24 lsrs r1, r0, 24 @@ -133,7 +133,7 @@ _0806E8F4: strh r0, [r1] b _0806E912 .align 2, 0 -_0806E908: .4byte sub_806E810 +_0806E908: .4byte task_per_step_callback_manager _0806E90C: .4byte gUnknown_3005098 _0806E910: strh r4, [r1] @@ -141,12 +141,12 @@ _0806E912: pop {r4} pop {r0} bx r0 - thumb_func_end sub_806E8D0 + thumb_func_end ActivatePerStepCallback - thumb_func_start sub_806E918 -sub_806E918: @ 806E918 + thumb_func_start wild_encounter_reset_coro_args +wild_encounter_reset_coro_args: @ 806E918 push {lr} - ldr r0, _0806E948 @ =sub_806E810 + ldr r0, _0806E948 @ =task_per_step_callback_manager bl FindTaskIdByFunc lsls r0, 24 lsrs r1, r0, 24 @@ -168,10 +168,10 @@ _0806E942: pop {r0} bx r0 .align 2, 0 -_0806E948: .4byte sub_806E810 +_0806E948: .4byte task_per_step_callback_manager _0806E94C: .4byte sub_806E83C _0806E950: .4byte gUnknown_3005098 - thumb_func_end sub_806E918 + thumb_func_end wild_encounter_reset_coro_args thumb_func_start nullsub_40 nullsub_40: @ 806E954 @@ -239,7 +239,7 @@ _0806E9A4: ldrb r1, [r1] adds r1, 0x7 ldr r2, _0806E9DC @ =0x0000035a - bl sub_8058FA4 + bl MapGridSetMetatileIdAt _0806E9C8: lsls r0, r5, 24 lsrs r4, r0, 24 @@ -380,7 +380,7 @@ _0806EAB0: movs r2, 0 ldrsh r1, [r4, r2] ldr r2, _0806EAF0 @ =0x0000035a - bl sub_8058FA4 + bl MapGridSetMetatileIdAt mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -416,7 +416,7 @@ _0806EB04: movs r2, 0 ldrsh r1, [r4, r2] ldr r2, _0806EB4C @ =0x0000035b - bl sub_8058FA4 + bl MapGridSetMetatileIdAt mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -543,7 +543,7 @@ sub_806EC04: @ 806EC04 _0806EC20: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt adds r0, r5, 0 adds r1, r4, 0 bl CurrentMapDrawMetatileAt diff --git a/asm/field_weather.s b/asm/field_weather.s index aa46120e1..be4c5153c 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -2981,8 +2981,8 @@ _0807B296: bx r1 thumb_func_end sub_807B1CC - thumb_func_start sub_807B29C -sub_807B29C: @ 807B29C + thumb_func_start UpdateWeatherPerDay +UpdateWeatherPerDay: @ 807B29C lsls r0, 16 ldr r1, _0807B2B8 @ =gUnknown_3005008 ldr r2, [r1] @@ -2999,7 +2999,7 @@ sub_807B29C: @ 807B29C bx lr .align 2, 0 _0807B2B8: .4byte gUnknown_3005008 - thumb_func_end sub_807B29C + thumb_func_end UpdateWeatherPerDay thumb_func_start sub_807B2BC sub_807B2BC: @ 807B2BC @@ -3015,7 +3015,7 @@ sub_807B2BC: @ 807B2BC bne _0807B2D6 _0807B2D0: movs r0, 0x28 - bl sub_8054E90 + bl IncrementGameStat _0807B2D6: pop {r0} bx r0 diff --git a/asm/fieldmap.s b/asm/fieldmap.s index d0339c4d2..e505631d5 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80589C4 -sub_80589C4: @ 80589C4 + thumb_func_start mapconnection_get_mapheader +mapconnection_get_mapheader: @ 80589C4 push {lr} ldrb r2, [r0, 0x8] ldrb r1, [r0, 0x9] @@ -14,10 +14,10 @@ sub_80589C4: @ 80589C4 bl get_mapheader_by_bank_and_number pop {r1} bx r1 - thumb_func_end sub_80589C4 + thumb_func_end mapconnection_get_mapheader - thumb_func_start sub_80589D4 -sub_80589D4: @ 80589D4 + thumb_func_start not_trainer_hill_battle_pyramid +not_trainer_hill_battle_pyramid: @ 80589D4 push {lr} ldr r0, _080589E4 @ =gUnknown_2036DFC bl sub_8058A00 @@ -26,7 +26,7 @@ sub_80589D4: @ 80589D4 bx r0 .align 2, 0 _080589E4: .4byte gUnknown_2036DFC - thumb_func_end sub_80589D4 + thumb_func_end not_trainer_hill_battle_pyramid thumb_func_start sub_80589E8 sub_80589E8: @ 80589E8 @@ -160,7 +160,7 @@ mapheader_copy_mapdata_of_adjacent_maps: @ 8058AC8 adds r7, r1, 0 _08058AE6: adds r0, r5, 0 - bl sub_80589C4 + bl mapconnection_get_mapheader adds r1, r0, 0 ldr r2, [r5, 0x4] ldrb r0, [r5] @@ -817,8 +817,8 @@ sub_8058F8C: @ 8058F8C bx r1 thumb_func_end sub_8058F8C - thumb_func_start sub_8058FA4 -sub_8058FA4: @ 8058FA4 + thumb_func_start MapGridSetMetatileIdAt +MapGridSetMetatileIdAt: @ 8058FA4 push {r4,r5,lr} adds r3, r0, 0 lsls r2, 16 @@ -854,10 +854,10 @@ _08058FDC: .align 2, 0 _08058FE4: .4byte gUnknown_3005040 _08058FE8: .4byte 0x00000fff - thumb_func_end sub_8058FA4 + thumb_func_end MapGridSetMetatileIdAt - thumb_func_start sub_8058FEC -sub_8058FEC: @ 8058FEC + thumb_func_start MapGridSetMetatileEntryAt +MapGridSetMetatileEntryAt: @ 8058FEC push {r4,r5,lr} adds r3, r0, 0 lsls r2, 16 @@ -886,7 +886,7 @@ _08059018: bx r0 .align 2, 0 _08059020: .4byte gUnknown_3005040 - thumb_func_end sub_8058FEC + thumb_func_end MapGridSetMetatileEntryAt thumb_func_start sub_8059024 sub_8059024: @ 8059024 @@ -1519,7 +1519,7 @@ sub_80594AC: @ 80594AC adds r4, r1, 0 adds r6, r2, 0 adds r7, r3, 0 - bl sub_80589C4 + bl mapconnection_get_mapheader adds r3, r0, 0 cmp r4, 0x2 beq _08059514 @@ -1748,7 +1748,7 @@ sub_8059658: @ 8059658 lsrs r4, r0, 24 adds r6, r4, 0 adds r0, r5, 0 - bl sub_80589C4 + bl mapconnection_get_mapheader adds r2, r0, 0 cmp r4, 0x1 blt _080596B0 @@ -1842,7 +1842,7 @@ sub_80596FC: @ 80596FC adds r4, r0, 0 adds r5, r1, 0 adds r6, r2, 0 - bl sub_80589C4 + bl mapconnection_get_mapheader adds r1, r0, 0 ldrb r0, [r4] cmp r0, 0x1 @@ -2027,8 +2027,8 @@ GetCameraCoords: @ 8059830 _08059840: .4byte gUnknown_3005008 thumb_func_end GetCameraCoords - thumb_func_start sub_8059844 -sub_8059844: @ 8059844 + thumb_func_start copy_tileset_patterns_to_vram +copy_tileset_patterns_to_vram: @ 8059844 push {r4-r7,lr} sub sp, 0x4 adds r3, r0, 0 @@ -2063,10 +2063,10 @@ _08059880: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8059844 + thumb_func_end copy_tileset_patterns_to_vram - thumb_func_start sub_8059888 -sub_8059888: @ 8059888 + thumb_func_start copy_tileset_patterns_to_vram2 +copy_tileset_patterns_to_vram2: @ 8059888 push {r4-r7,lr} sub sp, 0x4 adds r3, r0, 0 @@ -2101,7 +2101,7 @@ _080598C4: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8059888 + thumb_func_end copy_tileset_patterns_to_vram2 thumb_func_start sub_80598CC sub_80598CC: @ 80598CC @@ -2306,7 +2306,7 @@ sub_8059A54: @ 8059A54 movs r1, 0xA0 lsls r1, 2 movs r2, 0 - bl sub_8059844 + bl copy_tileset_patterns_to_vram pop {r0} bx r0 thumb_func_end sub_8059A54 @@ -2319,7 +2319,7 @@ sub_8059A68: @ 8059A68 lsls r1, 1 movs r2, 0xA0 lsls r2, 2 - bl sub_8059844 + bl copy_tileset_patterns_to_vram pop {r0} bx r0 thumb_func_end sub_8059A68 @@ -2332,7 +2332,7 @@ copy_map_tileset2_to_vram_2: @ 8059A7C lsls r1, 1 movs r2, 0xA0 lsls r2, 2 - bl sub_8059888 + bl copy_tileset_patterns_to_vram2 pop {r0} bx r0 thumb_func_end copy_map_tileset2_to_vram_2 @@ -2370,12 +2370,12 @@ copy_map_tileset1_tileset2_to_vram: @ 8059AB0 lsls r4, 2 adds r1, r4, 0 movs r2, 0 - bl sub_8059888 + bl copy_tileset_patterns_to_vram2 ldr r0, [r5, 0x14] movs r1, 0xC0 lsls r1, 1 adds r2, r4, 0 - bl sub_8059888 + bl copy_tileset_patterns_to_vram2 _08059AD2: pop {r4,r5} pop {r0} diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 99048cfe0..b28ac79ce 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -172,7 +172,7 @@ sub_80979A0: @ 80979A0 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] movs r0, 0x12 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0 pop {r1} bx r1 @@ -214,7 +214,7 @@ sub_80979F0: @ 80979F0 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] movs r0, 0x12 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0 pop {r1} bx r1 @@ -410,29 +410,29 @@ _08097B8C: adds r2, 0x2 adds r2, r3, r2 ldrh r2, [r2] - bl sub_8058FA4 + bl MapGridSetMetatileIdAt _08097BA0: pop {r4-r7} pop {r0} bx r0 thumb_func_end sub_8097B50 - thumb_func_start sub_8097BA8 -sub_8097BA8: @ 8097BA8 + thumb_func_start objc_8097BA8 +objc_8097BA8: @ 8097BA8 movs r2, 0 movs r1, 0x8 strh r1, [r0, 0x2E] strh r2, [r0, 0x30] strh r2, [r0, 0x34] - ldr r1, _08097BB8 @ =sub_8097BBC + ldr r1, _08097BB8 @ =objc_8097BBC str r1, [r0, 0x1C] bx lr .align 2, 0 -_08097BB8: .4byte sub_8097BBC - thumb_func_end sub_8097BA8 +_08097BB8: .4byte objc_8097BBC + thumb_func_end objc_8097BA8 - thumb_func_start sub_8097BBC -sub_8097BBC: @ 8097BBC + thumb_func_start objc_8097BBC +objc_8097BBC: @ 8097BBC push {r4,lr} adds r4, r0, 0 movs r1, 0x32 @@ -478,7 +478,7 @@ _08097C0C: bx r0 .align 2, 0 _08097C14: .4byte sub_8097C18 - thumb_func_end sub_8097BBC + thumb_func_end objc_8097BBC thumb_func_start sub_8097C18 sub_8097C18: @ 8097C18 diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index d5da57a20..6ab470630 100644 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -235,7 +235,7 @@ sub_80E583C: @ 80E583C ldr r4, _080E5890 @ =gUnknown_2021D18 ldr r1, _080E5894 @ =gUnknown_8416F27 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 bl sub_81202F8 diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s index 78fbf71ab..7352043ac 100644 --- a/asm/fldeff_teleport.s +++ b/asm/fldeff_teleport.s @@ -70,7 +70,7 @@ FldEff_UseTeleport: @ 80F6750 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] movs r0, 0x1 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags movs r0, 0 pop {r1} bx r1 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index a899cfbbb..ea92a7688 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -155,15 +155,15 @@ _080F1EF2: bx r1 thumb_func_end InitHallOfFameScreen - thumb_func_start sub_80F1EFC -sub_80F1EFC: @ 80F1EFC + thumb_func_start CB2_DoHallOfFameScreen +CB2_DoHallOfFameScreen: @ 80F1EFC push {r4,lr} bl InitHallOfFameScreen lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 bne _080F1F2C - ldr r0, _080F1F34 @ =sub_80F1F74 + ldr r0, _080F1F34 @ =Task_Hof_InitMonData movs r1, 0 bl CreateTask lsls r0, 24 @@ -183,19 +183,19 @@ _080F1F2C: pop {r0} bx r0 .align 2, 0 -_080F1F34: .4byte sub_80F1F74 +_080F1F34: .4byte Task_Hof_InitMonData _080F1F38: .4byte gUnknown_3005090 _080F1F3C: .4byte gUnknown_203AB38 - thumb_func_end sub_80F1EFC + thumb_func_end CB2_DoHallOfFameScreen - thumb_func_start sub_80F1F40 -sub_80F1F40: @ 80F1F40 + thumb_func_start CB2_DoHallOfFameScreenDontSaveData +CB2_DoHallOfFameScreenDontSaveData: @ 80F1F40 push {lr} bl InitHallOfFameScreen lsls r0, 24 cmp r0, 0 bne _080F1F66 - ldr r0, _080F1F6C @ =sub_80F1F74 + ldr r0, _080F1F6C @ =Task_Hof_InitMonData movs r1, 0 bl CreateTask lsls r0, 24 @@ -211,12 +211,12 @@ _080F1F66: pop {r0} bx r0 .align 2, 0 -_080F1F6C: .4byte sub_80F1F74 +_080F1F6C: .4byte Task_Hof_InitMonData _080F1F70: .4byte gUnknown_3005090 - thumb_func_end sub_80F1F40 + thumb_func_end CB2_DoHallOfFameScreenDontSaveData - thumb_func_start sub_80F1F74 -sub_80F1F74: @ 80F1F74 + thumb_func_start Task_Hof_InitMonData +Task_Hof_InitMonData: @ 80F1F74 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -405,7 +405,7 @@ _080F20F0: .4byte gUnknown_203AB34 _080F20F4: .4byte gUnknown_3005090 _080F20F8: .4byte sub_80F2294 _080F20FC: - ldr r0, _080F2110 @ =sub_80F2114 + ldr r0, _080F2110 @ =Task_Hof_InitTeamSaveData _080F20FE: str r0, [r1] add sp, 0xC @@ -416,11 +416,11 @@ _080F20FE: pop {r0} bx r0 .align 2, 0 -_080F2110: .4byte sub_80F2114 - thumb_func_end sub_80F1F74 +_080F2110: .4byte Task_Hof_InitTeamSaveData + thumb_func_end Task_Hof_InitMonData - thumb_func_start sub_80F2114 -sub_80F2114: @ 80F2114 + thumb_func_start Task_Hof_InitTeamSaveData +Task_Hof_InitTeamSaveData: @ 80F2114 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -546,7 +546,7 @@ _080F2210: .4byte gUnknown_203AB38 _080F2214: .4byte gUnknown_8419F54 _080F2218: .4byte gUnknown_3005090 _080F221C: .4byte sub_80F2220 - thumb_func_end sub_80F2114 + thumb_func_end Task_Hof_InitTeamSaveData thumb_func_start sub_80F2220 sub_80F2220: @ 80F2220 @@ -555,7 +555,7 @@ sub_80F2220: @ 80F2220 lsls r4, 24 lsrs r4, 24 ldr r1, _080F2254 @ =gUnknown_30053A4 - ldr r0, _080F2258 @ =sub_80F1F40 + ldr r0, _080F2258 @ =CB2_DoHallOfFameScreenDontSaveData str r0, [r1] movs r0, 0x3 bl TrySavingData @@ -575,7 +575,7 @@ sub_80F2220: @ 80F2220 bx r0 .align 2, 0 _080F2254: .4byte gUnknown_30053A4 -_080F2258: .4byte sub_80F1F40 +_080F2258: .4byte CB2_DoHallOfFameScreenDontSaveData _080F225C: .4byte gUnknown_3005090 _080F2260: .4byte sub_80F2264 thumb_func_end sub_80F2220 @@ -977,7 +977,7 @@ _080F2564: bls _080F2542 movs r0, 0 movs r1, 0xF - bl sub_80F313C + bl HallOfFame_PrintWelcomeText movs r0, 0x62 bl sub_80722CC ldr r1, _080F25A8 @ =gUnknown_3005090 @@ -1190,7 +1190,7 @@ sub_80F26D4: @ 80F26D4 adds r4, r1 strh r0, [r4, 0x10] ldr r0, _080F2754 @ =gUnknown_840C234 - bl sub_8003CE4 + bl AddWindow ldr r1, _080F2758 @ =0x0000021d movs r0, 0x1 movs r2, 0xD0 @@ -1676,7 +1676,7 @@ _080F2B3C: _080F2B46: strh r0, [r1, 0x8] movs r0, 0xA - bl sub_8054EC4 + bl GetGameStat ldr r2, _080F2B64 @ =gUnknown_3005090 adds r1, r5, r6 lsls r1, 3 @@ -1883,7 +1883,7 @@ _080F2CB4: ldr r5, _080F2D18 @ =gUnknown_2021D18 ldr r1, _080F2D1C @ =gUnknown_84160B4 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 @@ -1918,7 +1918,7 @@ _080F2D34: add r1, r9 lsls r1, 3 adds r1, r0 - ldr r0, _080F2D5C @ =sub_80F2D60 + ldr r0, _080F2D5C @ =Task_HofPC_PrintMonInfo str r0, [r1] add sp, 0x18 pop {r3-r5} @@ -1931,11 +1931,11 @@ _080F2D34: .align 2, 0 _080F2D54: .4byte gUnknown_8415D60 _080F2D58: .4byte gUnknown_3005090 -_080F2D5C: .4byte sub_80F2D60 +_080F2D5C: .4byte Task_HofPC_PrintMonInfo thumb_func_end sub_80F2B6C - thumb_func_start sub_80F2D60 -sub_80F2D60: @ 80F2D60 + thumb_func_start Task_HofPC_PrintMonInfo +Task_HofPC_PrintMonInfo: @ 80F2D60 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2059,7 +2059,7 @@ _080F2E4A: movs r1, 0 movs r2, 0xE bl sub_80F3194 - ldr r0, _080F2E88 @ =sub_80F2E8C + ldr r0, _080F2E88 @ =Task_HofPC_HandleInput str r0, [r6] pop {r3-r5} mov r8, r3 @@ -2077,11 +2077,11 @@ _080F2E78: .4byte 0xffff0000 _080F2E7C: .4byte gUnknown_203AB34 _080F2E80: .4byte 0x00007716 _080F2E84: .4byte 0x000001ff -_080F2E88: .4byte sub_80F2E8C - thumb_func_end sub_80F2D60 +_080F2E88: .4byte Task_HofPC_HandleInput + thumb_func_end Task_HofPC_PrintMonInfo - thumb_func_start sub_80F2E8C -sub_80F2E8C: @ 80F2E8C + thumb_func_start Task_HofPC_HandleInput +Task_HofPC_HandleInput: @ 80F2E8C push {r4-r7,lr} mov r7, r8 push {r7} @@ -2210,12 +2210,12 @@ _080F2F7C: beq _080F2FAC subs r0, r2, 0x1 strh r0, [r1, 0xC] - ldr r0, _080F2FA8 @ =sub_80F2D60 + ldr r0, _080F2FA8 @ =Task_HofPC_PrintMonInfo str r0, [r1] b _080F2FD8 .align 2, 0 _080F2FA4: .4byte gUnknown_3005090 -_080F2FA8: .4byte sub_80F2D60 +_080F2FA8: .4byte Task_HofPC_PrintMonInfo _080F2FAC: ldrh r1, [r3, 0x2E] movs r0, 0x80 @@ -2237,7 +2237,7 @@ _080F2FAC: ldrh r0, [r2, 0xC] adds r0, 0x1 strh r0, [r2, 0xC] - ldr r0, _080F2FE8 @ =sub_80F2D60 + ldr r0, _080F2FE8 @ =Task_HofPC_PrintMonInfo str r0, [r2] _080F2FD8: pop {r3} @@ -2247,8 +2247,8 @@ _080F2FD8: bx r0 .align 2, 0 _080F2FE4: .4byte gUnknown_3005090 -_080F2FE8: .4byte sub_80F2D60 - thumb_func_end sub_80F2E8C +_080F2FE8: .4byte Task_HofPC_PrintMonInfo + thumb_func_end Task_HofPC_HandleInput thumb_func_start sub_80F2FEC sub_80F2FEC: @ 80F2FEC @@ -2367,7 +2367,7 @@ sub_80F30A4: @ 80F30A4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080F3108 @ =sub_80F310C + ldr r1, _080F3108 @ =Task_HofPC_ExitOnButtonPress str r1, [r0] add sp, 0x10 pop {r4} @@ -2377,11 +2377,11 @@ sub_80F30A4: @ 80F30A4 _080F30FC: .4byte gUnknown_8415D8C _080F3100: .4byte gUnknown_8416090 _080F3104: .4byte gUnknown_3005090 -_080F3108: .4byte sub_80F310C +_080F3108: .4byte Task_HofPC_ExitOnButtonPress thumb_func_end sub_80F30A4 - thumb_func_start sub_80F310C -sub_80F310C: @ 80F310C + thumb_func_start Task_HofPC_ExitOnButtonPress +Task_HofPC_ExitOnButtonPress: @ 80F310C push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -2405,10 +2405,10 @@ _080F312C: _080F3130: .4byte gUnknown_30030F0 _080F3134: .4byte gUnknown_3005090 _080F3138: .4byte sub_80F2FEC - thumb_func_end sub_80F310C + thumb_func_end Task_HofPC_ExitOnButtonPress - thumb_func_start sub_80F313C -sub_80F313C: @ 80F313C + thumb_func_start HallOfFame_PrintWelcomeText +HallOfFame_PrintWelcomeText: @ 80F313C push {r4,r5,lr} sub sp, 0xC ldr r5, _080F318C @ =gUnknown_8416008 @@ -2436,7 +2436,7 @@ sub_80F313C: @ 80F313C movs r1, 0x2 adds r2, r4, 0 movs r3, 0x1 - bl sub_812E51C + bl box_print movs r0, 0 movs r1, 0x3 bl CopyWindowToVram @@ -2447,7 +2447,7 @@ sub_80F313C: @ 80F313C .align 2, 0 _080F318C: .4byte gUnknown_8416008 _080F3190: .4byte gUnknown_840C23C - thumb_func_end sub_80F313C + thumb_func_end HallOfFame_PrintWelcomeText thumb_func_start sub_80F3194 sub_80F3194: @ 80F3194 @@ -2535,7 +2535,7 @@ _080F322E: movs r1, 0x2 movs r2, 0x10 movs r3, 0x1 - bl sub_812E51C + bl box_print _080F3252: movs r2, 0 ldrb r0, [r7, 0xA] @@ -2606,7 +2606,7 @@ _080F32C4: movs r0, 0 movs r1, 0x2 movs r3, 0x1 - bl sub_812E51C + bl box_print ldrh r2, [r7, 0x8] ldr r4, _080F3320 @ =0x000001ff adds r0, r4, 0 @@ -2676,7 +2676,7 @@ _080F3348: movs r1, 0x2 movs r2, 0x80 movs r3, 0x1 - bl sub_812E51C + bl box_print ldr r1, _080F33D4 @ =gUnknown_84160F4 add r0, sp, 0xC bl StringCopy @@ -2694,7 +2694,7 @@ _080F3348: movs r1, 0x2 movs r2, 0x20 movs r3, 0x11 - bl sub_812E51C + bl box_print ldr r1, _080F33D8 @ =gUnknown_8416104 add r0, sp, 0xC bl StringCopy @@ -2711,7 +2711,7 @@ _080F3348: movs r1, 0x2 movs r2, 0x60 movs r3, 0x11 - bl sub_812E51C + bl box_print _080F33BA: movs r0, 0 movs r1, 0x3 @@ -2764,7 +2764,7 @@ sub_80F33DC: @ 80F33DC movs r1, 0x2 movs r2, 0x4 movs r3, 0x3 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r0, _080F35FC @ =gUnknown_300500C mov r10, r0 ldr r1, [r0] @@ -2785,7 +2785,7 @@ sub_80F33DC: @ 80F33DC movs r0, 0x1 movs r1, 0x2 movs r3, 0x3 - bl sub_812E51C + bl box_print mov r1, r10 ldr r0, [r1] ldrb r4, [r0, 0xA] @@ -2801,7 +2801,7 @@ sub_80F33DC: @ 80F33DC movs r1, 0x2 movs r2, 0x4 movs r3, 0x12 - bl sub_812E51C + bl box_print add r1, sp, 0x14 mov r8, r1 ldr r1, _080F3604 @ =0x000186a0 @@ -2869,7 +2869,7 @@ sub_80F33DC: @ 80F33DC movs r1, 0x2 adds r2, r6, 0 movs r3, 0x12 - bl sub_812E51C + bl box_print mov r1, r9 str r1, [sp] str r7, [sp, 0x4] @@ -2879,7 +2879,7 @@ sub_80F33DC: @ 80F33DC movs r1, 0x2 movs r2, 0x4 movs r3, 0x20 - bl sub_812E51C + bl box_print add r5, sp, 0x14 mov r0, r10 ldr r4, [r0] @@ -2957,7 +2957,7 @@ _080F3582: movs r0, 0x1 movs r1, 0x2 movs r3, 0x20 - bl sub_812E51C + bl box_print movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram diff --git a/asm/help_system.s b/asm/help_system.s index 13f9d8ec0..8099ba39d 100644 --- a/asm/help_system.s +++ b/asm/help_system.s @@ -384,7 +384,7 @@ sub_813BBC8: @ 813BBC8 ldr r0, _0813BBD8 @ =gUnknown_203F18A adds r1, r0, 0x1 adds r2, r0, 0x2 - bl sub_8002F5C + bl SaveTextColors pop {r0} bx r0 .align 2, 0 @@ -453,7 +453,7 @@ sub_813BC48: @ 813BC48 ldr r0, _0813BC58 @ =gUnknown_203F18A adds r1, r0, 0x1 adds r2, r0, 0x2 - bl sub_8002F7C + bl RestoreTextColors pop {r0} bx r0 .align 2, 0 diff --git a/asm/hof_pc.s b/asm/hof_pc.s index 3a24210db..554db8992 100644 --- a/asm/hof_pc.s +++ b/asm/hof_pc.s @@ -76,7 +76,7 @@ sub_80CA5C0: @ 80CA5C0 sub sp, 0x4 bl ScriptContext2_Enable bl sub_8055DC4 - bl sub_809D040 + bl sp109_CreatePCMenu bl sub_809D254 movs r0, 0x1 negs r0, r0 diff --git a/asm/intro.s b/asm/intro.s index ce50cfa9e..9a9b2add2 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -31,8 +31,8 @@ _080EC5CA: _080EC5D0: .4byte sub_80EC870 thumb_func_end sub_80EC5B8 - thumb_func_start sub_80EC5D4 -sub_80EC5D4: @ 80EC5D4 + thumb_func_start load_copyright_graphics +load_copyright_graphics: @ 80EC5D4 push {r4-r6,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -64,10 +64,10 @@ sub_80EC5D4: @ 80EC5D4 _080EC610: .4byte gUnknown_8402280 _080EC614: .4byte gUnknown_84024E4 _080EC618: .4byte gUnknown_8402260 - thumb_func_end sub_80EC5D4 + thumb_func_end load_copyright_graphics - thumb_func_start sub_80EC61C -sub_80EC61C: @ 80EC61C + thumb_func_start SerialCb_CopyrightScreen +SerialCb_CopyrightScreen: @ 80EC61C push {lr} ldr r0, _080EC628 @ =gUnknown_203AAD4 bl GameCubeMultiBoot_HandleSerialInterrupt @@ -75,7 +75,7 @@ sub_80EC61C: @ 80EC61C bx r0 .align 2, 0 _080EC628: .4byte gUnknown_203AAD4 - thumb_func_end sub_80EC61C + thumb_func_end SerialCb_CopyrightScreen thumb_func_start sub_80EC62C sub_80EC62C: @ 80EC62C @@ -165,7 +165,7 @@ _080EC65E: lsls r1, 6 movs r0, 0 movs r2, 0 - bl sub_80EC5D4 + bl load_copyright_graphics bl remove_some_task bl ResetTasks bl ResetSpriteData @@ -190,7 +190,7 @@ _080EC65E: lsls r1, 1 movs r0, 0 bl SetGpuReg - ldr r0, _080EC76C @ =sub_80EC61C + ldr r0, _080EC76C @ =SerialCb_CopyrightScreen bl sub_8000718 ldr r0, _080EC770 @ =gUnknown_203AAD4 bl GameCubeMultiBoot_Init @@ -215,7 +215,7 @@ _080EC75C: .4byte 0x05000002 _080EC760: .4byte 0x810001ff _080EC764: .4byte 0x0000ffff _080EC768: .4byte sub_80EC5A4 -_080EC76C: .4byte sub_80EC61C +_080EC76C: .4byte SerialCb_CopyrightScreen _080EC770: .4byte gUnknown_203AAD4 _080EC774: .4byte gUnknown_30030F0 _080EC778: @@ -316,7 +316,7 @@ sub_80EC820: @ 80EC820 cmp r0, 0x2 bne _080EC84A _080EC846: - bl sub_8054A18 + bl Sav2_ClearSetDefault _080EC84A: ldr r0, _080EC860 @ =gUnknown_300500C ldr r0, [r0] @@ -644,7 +644,7 @@ sub_80ECAF0: @ 80ECAF0 b _080ECB8A _080ECB02: ldr r0, _080ECB68 @ =gUnknown_840BBA8 - bl sub_8003B24 + bl InitWindows ldr r0, _080ECB6C @ =gUnknown_840272C ldr r1, _080ECB70 @ =0x0000043c adds r4, r5, r1 diff --git a/asm/item.s b/asm/item.s index ccb1e2fee..fb3784373 100644 --- a/asm/item.s +++ b/asm/item.s @@ -40,11 +40,11 @@ sub_8099DBC: @ 8099DBC _08099DD4: .4byte gUnknown_300500C thumb_func_end sub_8099DBC - thumb_func_start sub_8099DD8 -sub_8099DD8: @ 8099DD8 + thumb_func_start GetBagItemId +GetBagItemId: @ 8099DD8 ldrh r0, [r0] bx lr - thumb_func_end sub_8099DD8 + thumb_func_end GetBagItemId thumb_func_start sub_8099DDC sub_8099DDC: @ 8099DDC @@ -52,8 +52,8 @@ sub_8099DDC: @ 8099DDC bx lr thumb_func_end sub_8099DDC - thumb_func_start sub_8099DE0 -sub_8099DE0: @ 8099DE0 + thumb_func_start ApplyNewEncryptionKeyToBagItems +ApplyNewEncryptionKeyToBagItems: @ 8099DE0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -100,15 +100,15 @@ _08099E20: bx r0 .align 2, 0 _08099E34: .4byte gUnknown_203988C - thumb_func_end sub_8099DE0 + thumb_func_end ApplyNewEncryptionKeyToBagItems - thumb_func_start sub_8099E38 -sub_8099E38: @ 8099E38 + thumb_func_start ApplyNewEncryptionKeyToBagItems_ +ApplyNewEncryptionKeyToBagItems_: @ 8099E38 push {lr} - bl sub_8099DE0 + bl ApplyNewEncryptionKeyToBagItems pop {r0} bx r0 - thumb_func_end sub_8099E38 + thumb_func_end ApplyNewEncryptionKeyToBagItems_ thumb_func_start sub_8099E44 sub_8099E44: @ 8099E44 @@ -669,8 +669,8 @@ _0809A25A: bx r1 thumb_func_end sub_809A1D8 - thumb_func_start sub_809A260 -sub_809A260: @ 809A260 + thumb_func_start GetPocketByItemId +GetPocketByItemId: @ 809A260 push {lr} lsls r0, 16 lsrs r0, 16 @@ -679,10 +679,10 @@ sub_809A260: @ 809A260 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_809A260 + thumb_func_end GetPocketByItemId - thumb_func_start sub_809A274 -sub_809A274: @ 809A274 + thumb_func_start ClearItemSlots +ClearItemSlots: @ 809A274 push {r4-r7,lr} adds r6, r0, 0 lsls r1, 24 @@ -708,7 +708,7 @@ _0809A29E: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_809A274 + thumb_func_end ClearItemSlots thumb_func_start sub_809A2A4 sub_809A2A4: @ 809A2A4 @@ -751,7 +751,7 @@ _0809A2E2: adds r1, r5 ldr r0, [r1] ldrb r1, [r1, 0x4] - bl sub_809A274 + bl ClearItemSlots adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -854,7 +854,7 @@ _0809A380: adds r0, r1, r2 ldr r1, _0809A3B0 @ =0x0000029a adds r0, r1 - bl sub_8099DD8 + bl GetBagItemId lsls r0, 16 lsrs r0, 16 cmp r0, r5 @@ -900,7 +900,7 @@ _0809A3D6: adds r4, r1, r0 adds r0, r2, r4 adds r0, 0x2 - bl sub_8099DD8 + bl GetBagItemId lsls r0, 16 lsrs r0, 16 adds r1, r0, r5 @@ -1001,7 +1001,7 @@ _0809A49E: ldr r0, [r7] adds r0, r4 adds r0, 0x2 - bl sub_8099DD8 + bl GetBagItemId mov r1, r8 subs r0, r1 lsls r0, 16 diff --git a/asm/item_menu.s b/asm/item_menu.s index c9de423ac..00626d795 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -1101,14 +1101,14 @@ sub_8108654: @ 8108654 bne _08108688 adds r0, r6, 0 movs r1, 0x2 - bl sub_810878C + bl bag_menu_print_cursor b _08108690 .align 2, 0 _08108684: .4byte gUnknown_203AD10 _08108688: adds r0, r6, 0 movs r1, 0xFF - bl sub_810878C + bl bag_menu_print_cursor _08108690: movs r0, 0x2 negs r0, r0 @@ -1157,7 +1157,7 @@ _08108690: ldr r4, _08108724 @ =gUnknown_2021D18 ldr r1, _08108728 @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders str r6, [sp] str r5, [sp, 0x4] str r5, [sp, 0x8] @@ -1209,8 +1209,8 @@ _08108764: .4byte 0x00000296 _08108768: .4byte gUnknown_8452F7C thumb_func_end sub_8108654 - thumb_func_start sub_810876C -sub_810876C: @ 810876C + thumb_func_start bag_menu_print_cursor_ +bag_menu_print_cursor_: @ 810876C push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -1221,14 +1221,14 @@ sub_810876C: @ 810876C lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 - bl sub_810878C + bl bag_menu_print_cursor pop {r4} pop {r0} bx r0 - thumb_func_end sub_810876C + thumb_func_end bag_menu_print_cursor_ - thumb_func_start sub_810878C -sub_810878C: @ 810878C + thumb_func_start bag_menu_print_cursor +bag_menu_print_cursor: @ 810878C push {r4,r5,lr} sub sp, 0x14 lsls r0, 24 @@ -1274,7 +1274,7 @@ _081087DE: bx r0 .align 2, 0 _081087E8: .4byte gUnknown_841623B - thumb_func_end sub_810878C + thumb_func_end bag_menu_print_cursor thumb_func_start sub_81087EC sub_81087EC: @ 81087EC @@ -2413,7 +2413,7 @@ _08109084: bl sub_8108978 ldrb r0, [r7] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ strh r4, [r7, 0x2] ldrb r0, [r5, 0x6] adds r0, 0x1 @@ -2860,7 +2860,7 @@ sub_81093B8: @ 81093B8 ldr r4, _081094A4 @ =gUnknown_2021D18 ldr r1, _081094A8 @ =gUnknown_841633F adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -2890,7 +2890,7 @@ sub_81093B8: @ 81093B8 mov r2, r8 ldrb r0, [r2] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0x8 negs r0, r0 add r9, r0 @@ -3241,7 +3241,7 @@ sub_810971C: @ 810971C ldr r0, _081097DC @ =gUnknown_2021D18 mov r9, r0 adds r1, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [sp] movs r1, 0x1 @@ -3269,7 +3269,7 @@ sub_810971C: @ 810971C bl sub_8008E78 ldr r1, _081097E0 @ =gUnknown_84162B9 mov r0, r9 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] mov r0, r8 @@ -3326,7 +3326,7 @@ sub_81097E4: @ 81097E4 ldr r4, _0810984C @ =gUnknown_2021D18 ldr r1, _08109850 @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r1, 0x1 @@ -3551,7 +3551,7 @@ _081099EC: strb r0, [r4] ldr r0, _08109A10 @ =gUnknown_203AD30 ldrh r0, [r0] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3729,7 +3729,7 @@ _08109AD4: ldr r6, _08109BB0 @ =gUnknown_2021D18 ldr r1, _08109BB4 @ =gUnknown_84162FF adds r0, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [sp] movs r0, 0x1 @@ -3959,7 +3959,7 @@ sub_8109D38: @ 8109D38 ldr r5, _08109DA4 @ =gUnknown_2021D18 ldr r1, _08109DA8 @ =gUnknown_8416409 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x6 movs r1, 0x1 bl sub_810B9DC @@ -4011,7 +4011,7 @@ sub_8109DB0: @ 8109DB0 bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ adds r0, r5, 0 bl sub_810910C pop {r4,r5} @@ -4092,7 +4092,7 @@ _08109E64: bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ bl sub_8108978 adds r0, r6, 0 bl sub_810910C @@ -4135,7 +4135,7 @@ sub_8109EA8: @ 8109EA8 ldr r6, _08109F38 @ =gUnknown_2021D18 ldr r1, _08109F3C @ =gUnknown_84163F4 adds r0, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x6 movs r1, 0x3 bl sub_810B9DC @@ -4237,7 +4237,7 @@ _08109F6E: bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r7] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ mov r0, r8 bl sub_810910C _08109FE0: @@ -4451,7 +4451,7 @@ sub_810A18C: @ 810A18C ldr r5, _0810A1C4 @ =gUnknown_2021D18 ldr r1, _0810A1C8 @ =gUnknown_841635E adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _0810A1CC @ =sub_810A1D0 adds r0, r4, 0 movs r1, 0x2 @@ -4541,7 +4541,7 @@ sub_810A1F8: @ 810A1F8 bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r5] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ mov r0, r8 bl sub_810910C pop {r3,r4} @@ -4585,7 +4585,7 @@ sub_810A288: @ 810A288 bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ adds r0, r5, 0 bl sub_810910C add sp, 0x4 @@ -4619,7 +4619,7 @@ sub_810A2DC: @ 810A2DC adds r0, r1 ldrb r0, [r0, 0x8] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ adds r0, r4, 0 bl sub_810910C pop {r4} @@ -4817,7 +4817,7 @@ sub_810A468: @ 810A468 lsrs r4, r0, 16 adds r6, r4, 0 adds r0, r4, 0 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4973,7 +4973,7 @@ _0810A5B4: ldr r4, _0810A5EC @ =gUnknown_2021D18 ldr r1, _0810A5F0 @ =gUnknown_84168F1 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -5011,7 +5011,7 @@ _0810A618: ldr r4, _0810A648 @ =gUnknown_2021D18 ldr r1, _0810A64C @ =gUnknown_8416911 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -5104,7 +5104,7 @@ sub_810A690: @ 810A690 ldr r4, _0810A700 @ =gUnknown_2021D18 ldr r1, _0810A704 @ =gUnknown_8416936 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -5163,7 +5163,7 @@ sub_810A720: @ 810A720 bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ adds r0, r5, 0 bl sub_810910C pop {r4,r5} @@ -5204,7 +5204,7 @@ sub_810A770: @ 810A770 ldr r6, _0810A824 @ =gUnknown_2021D18 ldr r1, _0810A828 @ =gUnknown_84162B9 adds r0, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r1, 0x1 @@ -5370,7 +5370,7 @@ _0810A8F0: bl sub_8108978 ldrb r0, [r5] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ adds r0, r6, 0 bl sub_810910C _0810A93A: @@ -5421,7 +5421,7 @@ sub_810A940: @ 810A940 ldr r4, _0810A9C8 @ =gUnknown_2021D18 ldr r1, _0810A9CC @ =gUnknown_8416959 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _0810A9D0 @ =sub_810A9D4 adds r0, r5, 0 movs r1, 0x2 @@ -5525,7 +5525,7 @@ sub_810A9D4: @ 810A9D4 mov r1, r8 strh r0, [r1] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0x2 bl sub_810BAD8 lsls r0, 24 @@ -5714,7 +5714,7 @@ _0810AC00: bl schedule_bg_copy_tilemap_to_vram ldrb r0, [r4] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ bl sub_8108978 adds r0, r6, 0 bl sub_810910C @@ -5766,7 +5766,7 @@ sub_810AC40: @ 810AC40 ldr r4, _0810ACE0 @ =gUnknown_2021D18 ldr r1, _0810ACE4 @ =gUnknown_84163A7 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x6 movs r1, 0x3 bl sub_810B9DC @@ -6001,19 +6001,19 @@ _0810AE54: lsls r1, 2 adds r0, r1 movs r1, 0x2A - bl sub_809A274 + bl ClearItemSlots ldr r0, [r4] movs r2, 0xEE lsls r2, 2 adds r0, r2 movs r1, 0x1E - bl sub_809A274 + bl ClearItemSlots ldr r0, [r4] movs r3, 0x86 lsls r3, 3 adds r0, r3 movs r1, 0xD - bl sub_809A274 + bl ClearItemSlots ldr r0, [r4] ldr r1, _0810AEC4 @ =0x00000296 adds r0, r1 @@ -6184,7 +6184,7 @@ _0810AFF6: bl sub_80722CC ldrb r0, [r5] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 ldr r1, _0810B018 @ =gUnknown_203AD30 @@ -6490,7 +6490,7 @@ _0810B266: bl sub_80722CC ldrb r0, [r7] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 ldr r1, _0810B28C @ =gUnknown_203AD30 @@ -6555,7 +6555,7 @@ _0810B29E: bl sub_8109140 ldrb r0, [r7] movs r1, 0x1 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0 movs r1, 0x1 bl CopyWindowToVram @@ -6628,7 +6628,7 @@ _0810B396: lsrs r0, 24 cmp r0, 0x1 bne _0810B3B8 - bl sub_8011174 + bl FreeRestoreBattleData bl sub_804C230 b _0810B4B6 .align 2, 0 @@ -6710,7 +6710,7 @@ _0810B440: bl sub_80722CC ldrb r0, [r4] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 ldr r1, _0810B464 @ =gUnknown_203AD30 @@ -6790,7 +6790,7 @@ sub_810B4BC: @ 810B4BC lsrs r0, 24 cmp r0, 0x1 bne _0810B50C - bl sub_8011174 + bl FreeRestoreBattleData bl sub_804C230 b _0810B5C6 .align 2, 0 @@ -6826,7 +6826,7 @@ _0810B53C: bl sub_80722CC ldrb r0, [r5] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 ldr r1, _0810B560 @ =gUnknown_203AD30 @@ -6857,7 +6857,7 @@ _0810B564: bl sub_810713C bl sub_810AECC ldr r1, _0810B5B0 @ =gUnknown_3005E98 - ldr r0, _0810B5B4 @ =sub_81253B0 + ldr r0, _0810B5B4 @ =ItemUseCB_Medicine str r0, [r1] ldr r0, _0810B5B8 @ =sub_81279A4 bl sub_8108EE0 @@ -6869,7 +6869,7 @@ _0810B564: b _0810B5C6 .align 2, 0 _0810B5B0: .4byte gUnknown_3005E98 -_0810B5B4: .4byte sub_81253B0 +_0810B5B4: .4byte ItemUseCB_Medicine _0810B5B8: .4byte sub_81279A4 _0810B5BC: .4byte sub_810B070 _0810B5C0: @@ -6959,7 +6959,7 @@ _0810B660: bl sub_80722CC ldrb r0, [r6] movs r1, 0x2 - bl sub_810876C + bl bag_menu_print_cursor_ movs r0, 0x1 bl sub_8109140 ldr r1, _0810B688 @ =gUnknown_203AD30 diff --git a/asm/item_pc.s b/asm/item_pc.s index 0ee39e021..213d3486c 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -806,7 +806,7 @@ _0810DA58: ldr r4, _0810DAAC @ =gUnknown_2021D18 ldr r1, _0810DAB0 @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -1221,7 +1221,7 @@ sub_810DD80: @ 810DD80 adds r0, r1 ldr r1, _0810DDA0 @ =0x0000029a adds r0, r1 - bl sub_8099DD8 + bl GetBagItemId lsls r0, 16 lsrs r0, 16 pop {r1} @@ -1558,7 +1558,7 @@ sub_810DFE0: @ 810DFE0 ldr r4, _0810E0A8 @ =gUnknown_2021D18 ldr r1, _0810E0AC @ =gUnknown_841633F adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -1890,7 +1890,7 @@ sub_810E274: @ 810E274 ldr r6, _0810E34C @ =gUnknown_2021D18 ldr r1, _0810E350 @ =gUnknown_84162FF adds r0, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [sp] movs r0, 0x1 @@ -2058,7 +2058,7 @@ sub_810E418: @ 810E418 ldr r4, _0810E4AC @ =gUnknown_2021D18 ldr r1, _0810E4B0 @ =gUnknown_84177C5 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 bl sub_810EAB4 lsls r0, 24 @@ -2245,7 +2245,7 @@ sub_810E5E0: @ 810E5E0 ldr r5, _0810E664 @ =gUnknown_2021D18 ldr r1, _0810E668 @ =gUnknown_84177AC adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1 bl sub_810EAB4 lsls r0, 24 @@ -2265,7 +2265,7 @@ sub_810E5E0: @ 810E5E0 bl sub_8008E78 ldr r1, _0810E66C @ =gUnknown_84162B9 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x3 bl sub_810EA9C movs r0, 0xA @@ -2319,7 +2319,7 @@ sub_810E670: @ 810E670 ldr r4, _0810E6D0 @ =gUnknown_2021D18 ldr r1, _0810E6D4 @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r1, 0x1 @@ -2589,7 +2589,7 @@ _0810E8EC: .4byte gUnknown_3005098 sub_810E8F0: @ 810E8F0 push {r4,lr} ldr r0, _0810E974 @ =gUnknown_8453F98 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r1, 0xF0 lsls r1, 2 @@ -2782,7 +2782,7 @@ sub_810EA34: @ 810EA34 str r4, [sp, 0xC] str r2, [sp, 0x10] mov r2, r9 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -2821,7 +2821,7 @@ sub_810EAB4: @ 810EAB4 lsls r0, r1, 3 ldr r1, _0810EAE8 @ =gUnknown_8453FD0 adds r0, r1 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] ldr r2, _0810EAEC @ =0x000003a3 diff --git a/asm/item_use.s b/asm/item_use.s index f5a0f6541..5e29072ff 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -33,7 +33,7 @@ _080A0FE6: lsrs r4, r0, 24 ldr r0, _080A1010 @ =gUnknown_203AD30 ldrh r0, [r0] - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -153,7 +153,7 @@ sub_80A10C4: @ 80A10C4 lsrs r6, r2, 24 ldr r5, _080A10F0 @ =gUnknown_2021D18 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders cmp r4, 0 bne _080A10F8 ldr r3, _080A10F4 @ =sub_810A1F8 @@ -467,14 +467,14 @@ sub_80A1338: @ 80A1338 cmp r0, 0x1 bne _080A1360 ldr r1, _080A1358 @ =gUnknown_2039998 - ldr r0, _080A135C @ =sub_80A1410 + ldr r0, _080A135C @ =ItemUseOnFieldCB_Rod str r0, [r1] adds r0, r4, 0 bl sub_80A103C b _080A1372 .align 2, 0 _080A1358: .4byte gUnknown_2039998 -_080A135C: .4byte sub_80A1410 +_080A135C: .4byte ItemUseOnFieldCB_Rod _080A1360: ldr r0, _080A1378 @ =gUnknown_3005090 lsls r1, r4, 2 @@ -512,7 +512,7 @@ sub_80A137C: @ 80A137C lsls r0, r6, 24 lsrs r5, r0, 24 adds r0, r5, 0 - bl sub_805A104 + bl MetatileBehavior_IsWaterfall lsls r0, 24 cmp r0, 0 bne _080A1404 @@ -565,8 +565,8 @@ _080A1406: bx r1 thumb_func_end sub_80A137C - thumb_func_start sub_80A1410 -sub_80A1410: @ 80A1410 + thumb_func_start ItemUseOnFieldCB_Rod +ItemUseOnFieldCB_Rod: @ 80A1410 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -584,16 +584,16 @@ sub_80A1410: @ 80A1410 bx r0 .align 2, 0 _080A1434: .4byte gUnknown_203AD30 - thumb_func_end sub_80A1410 + thumb_func_end ItemUseOnFieldCB_Rod - thumb_func_start sub_80A1438 -sub_80A1438: @ 80A1438 + thumb_func_start ItemUseOutOfBattle_Itemfinder +ItemUseOutOfBattle_Itemfinder: @ 80A1438 push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x27 - bl sub_8054E90 + bl IncrementGameStat ldr r1, _080A1458 @ =gUnknown_2039998 ldr r0, _080A145C @ =sub_813EC8C str r0, [r1] @@ -605,7 +605,7 @@ sub_80A1438: @ 80A1438 .align 2, 0 _080A1458: .4byte gUnknown_2039998 _080A145C: .4byte sub_813EC8C - thumb_func_end sub_80A1438 + thumb_func_end ItemUseOutOfBattle_Itemfinder thumb_func_start sub_80A1460 sub_80A1460: @ 80A1460 @@ -624,7 +624,7 @@ sub_80A1460: @ 80A1460 ldr r4, _080A14B8 @ =gUnknown_2021D18 ldr r1, _080A14BC @ =gUnknown_8416537 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _080A14C0 @ =gUnknown_203AD30 ldrh r2, [r0] ldr r3, _080A14C4 @ =0x0000ffff @@ -683,7 +683,7 @@ sub_80A14E8: @ 80A14E8 ldr r4, _080A153C @ =gUnknown_2021D18 ldr r1, _080A1540 @ =gUnknown_8416644 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _080A1544 @ =gUnknown_203AD30 ldrh r2, [r0] ldr r3, _080A1548 @ =0x0000ffff @@ -963,14 +963,14 @@ sub_80A1734: @ 80A1734 lsls r0, 24 lsrs r0, 24 ldr r2, _080A1748 @ =gUnknown_3005E98 - ldr r1, _080A174C @ =sub_81262AC + ldr r1, _080A174C @ =dp05_rare_candy str r1, [r2] bl sub_80A16D0 pop {r0} bx r0 .align 2, 0 _080A1748: .4byte gUnknown_3005E98 -_080A174C: .4byte sub_81262AC +_080A174C: .4byte dp05_rare_candy thumb_func_end sub_80A1734 thumb_func_start sub_80A1750 @@ -1377,7 +1377,7 @@ sub_80A1A44: @ 80A1A44 bl sub_8099E90 ldr r0, _080A1A8C @ =gUnknown_2021D18 ldr r1, _080A1A90 @ =gUnknown_841658C - bl sub_8008FCC + bl StringExpandPlaceholders pop {r4} pop {r0} bx r0 @@ -1412,7 +1412,7 @@ sub_80A1A94: @ 80A1A94 bl sub_8099E90 ldr r0, _080A1AE8 @ =gUnknown_2021D18 ldr r1, _080A1AEC @ =gUnknown_84165D2 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r1, _080A1AF0 @ =gUnknown_3005090 lsls r0, r4, 2 adds r0, r4 @@ -1438,7 +1438,7 @@ _080A1AF4: bl sub_8099E90 ldr r0, _080A1B38 @ =gUnknown_2021D18 ldr r1, _080A1B3C @ =gUnknown_8416600 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r1, _080A1B40 @ =gUnknown_3005090 lsls r0, r6, 2 adds r0, r6 @@ -1517,8 +1517,8 @@ _080A1BA6: bx r1 thumb_func_end sub_80A1B8C - thumb_func_start sub_80A1BAC -sub_80A1BAC: @ 80A1BAC + thumb_func_start ItemUseOutOfBattle_EscapeRope +ItemUseOutOfBattle_EscapeRope: @ 80A1BAC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1560,7 +1560,7 @@ _080A1BFE: bx r0 .align 2, 0 _080A1C04: .4byte gUnknown_3005090 - thumb_func_end sub_80A1BAC + thumb_func_end ItemUseOutOfBattle_EscapeRope thumb_func_start sub_80A1C08 sub_80A1C08: @ 80A1C08 @@ -2011,7 +2011,7 @@ sub_80A1F78: @ 80A1F78 lsrs r4, r0, 24 ldr r0, _080A1F9C @ =gUnknown_203AD30 ldrh r0, [r0] - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -2043,14 +2043,14 @@ sub_80A1FBC: @ 80A1FBC lsls r0, 24 lsrs r0, 24 ldr r2, _080A1FD0 @ =gUnknown_3005E98 - ldr r1, _080A1FD4 @ =sub_81253B0 + ldr r1, _080A1FD4 @ =ItemUseCB_Medicine str r1, [r2] bl sub_80A1F78 pop {r0} bx r0 .align 2, 0 _080A1FD0: .4byte gUnknown_3005E98 -_080A1FD4: .4byte sub_81253B0 +_080A1FD4: .4byte ItemUseCB_Medicine thumb_func_end sub_80A1FBC thumb_func_start sub_80A1FD8 @@ -2125,8 +2125,8 @@ _080A2060: bx r0 thumb_func_end sub_80A2010 - thumb_func_start sub_80A2068 -sub_80A2068: @ 80A2068 + thumb_func_start ItemUseOutOfBattle_EnigmaBerry +ItemUseOutOfBattle_EnigmaBerry: @ 80A2068 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2252,10 +2252,10 @@ _080A2188: bx r0 .align 2, 0 _080A2190: .4byte gUnknown_3005090 - thumb_func_end sub_80A2068 + thumb_func_end ItemUseOutOfBattle_EnigmaBerry - thumb_func_start sub_80A2194 -sub_80A2194: @ 80A2194 + thumb_func_start ItemUseInBattle_EnigmaBerry +ItemUseInBattle_EnigmaBerry: @ 80A2194 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2317,7 +2317,7 @@ _080A2232: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80A2194 + thumb_func_end ItemUseInBattle_EnigmaBerry thumb_func_start sub_80A2238 sub_80A2238: @ 80A2238 @@ -2326,7 +2326,7 @@ sub_80A2238: @ 80A2238 lsrs r5, r0, 24 ldr r0, _080A2268 @ =gUnknown_203AD30 ldrh r0, [r0] - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -2334,7 +2334,7 @@ sub_80A2238: @ 80A2238 ldr r4, _080A226C @ =gUnknown_2021D18 ldr r1, _080A2270 @ =gUnknown_8416425 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _080A2274 @ =sub_813E2B8 adds r0, r5, 0 movs r1, 0x4 diff --git a/asm/itemfinder.s b/asm/itemfinder.s index 7ee3807d5..9e7c441f8 100644 --- a/asm/itemfinder.s +++ b/asm/itemfinder.s @@ -381,7 +381,7 @@ sub_813EF40: @ 813EF40 strh r5, [r0] ldrh r1, [r1] movs r0, 0 - bl sub_80CBED4 + bl TV_PrintIntToStringVar strh r5, [r4, 0x4] movs r0, 0 strh r0, [r4] @@ -524,7 +524,7 @@ sub_813F070: @ 813F070 adds r4, r0, 0 adds r5, r1, 0 adds r6, r2, 0 - bl sub_80589C4 + bl mapconnection_get_mapheader adds r3, r0, 0 ldrb r0, [r4] cmp r0, 0x2 diff --git a/asm/learn_move.s b/asm/learn_move.s index fcbfcef96..c4c40678d 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -78,7 +78,7 @@ sub_80E469C: @ 80E469C bl sub_8001658 bl reset_temp_tile_data_buffers ldr r0, _080E4778 @ =gUnknown_83FFA44 - bl sub_8003B24 + bl InitWindows lsls r0, 16 cmp r0, 0 beq _080E476C @@ -255,7 +255,7 @@ _080E486C: .4byte sub_80E4870 sub_80E4870: @ 80E4870 push {r4,lr} movs r0, 0x7 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _080E4882 @@ -295,7 +295,7 @@ sub_80E48C0: @ 80E48C0 adds r1, r0, 0 ldr r4, _080E48F0 @ =gUnknown_2021D18 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80F78A8 lsls r0, 24 lsrs r0, 24 @@ -1036,7 +1036,7 @@ sub_80E4F0C: @ 80E4F0C ldr r4, _080E4F4C @ =gUnknown_2021D18 ldr r1, _080E4F50 @ =gUnknown_841E3E3 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders str r5, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -1814,7 +1814,7 @@ _080E5570: .4byte 0x00000a67 thumb_func_start sub_80E5574 sub_80E5574: @ 80E5574 push {r4,lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 @@ -1936,7 +1936,7 @@ _080E563E: movs r1, 0x3 adds r2, r7, 0 adds r3, r6, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r3-r5} mov r8, r3 diff --git a/asm/link.s b/asm/link.s index bb05ea0dd..fe93ca1d4 100644 --- a/asm/link.s +++ b/asm/link.s @@ -1523,8 +1523,8 @@ _0800A080: _0800A084: .4byte gUnknown_3003F80 thumb_func_end sub_800A068 - thumb_func_start sub_800A088 -sub_800A088: @ 800A088 + thumb_func_start GetLinkPlayerCount +GetLinkPlayerCount: @ 800A088 push {lr} ldr r0, _0800A0A0 @ =gUnknown_3003F3C ldrb r0, [r0] @@ -1546,7 +1546,7 @@ _0800A0A8: _0800A0B0: pop {r1} bx r1 - thumb_func_end sub_800A088 + thumb_func_end GetLinkPlayerCount thumb_func_start sub_800A0B4 sub_800A0B4: @ 800A0B4 @@ -1590,7 +1590,7 @@ _0800A0F0: _0800A0F8: .4byte gUnknown_3003F64 _0800A0FC: .4byte gUnknown_3000E54 _0800A100: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 cmp r0, 0 bne _0800A112 @@ -1618,12 +1618,12 @@ _0800A134: adds r5, 0x1C adds r6, 0x1 _0800A138: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r6, r0 blt _0800A124 - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r7, r0 @@ -1738,12 +1738,12 @@ _0800A21A: lsls r0, 24 lsrs r4, r0, 24 _0800A220: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 bcc _0800A200 - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r6, r0 @@ -2687,7 +2687,7 @@ _0800A8DE: lsrs r4, r0, 24 adds r5, 0x1 _0800A8EA: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -3016,7 +3016,7 @@ _0800AB34: .4byte sub_800AB38 thumb_func_start sub_800AB38 sub_800AB38: @ 800AB38 push {r4,lr} - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r2, r0, 24 movs r3, 0 @@ -3120,7 +3120,7 @@ _0800ABFC: .4byte sub_800AC00 thumb_func_start sub_800AC00 sub_800AC00: @ 800AC00 push {r4,lr} - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 @@ -3283,7 +3283,7 @@ _0800AD30: movs r0, 0x1 bl SetBgTilemapBuffer ldr r0, _0800AE04 @ =gUnknown_82345F0 - bl sub_8003B24 + bl InitWindows lsls r0, 16 cmp r0, 0 beq _0800ADD8 @@ -3387,7 +3387,7 @@ sub_800AE1C: @ 800AE1C movs r1, 0x3 movs r2, 0x2 movs r3, 0x5 - bl sub_812E51C + bl box_print str r4, [sp] str r5, [sp, 0x4] ldr r0, _0800AECC @ =gUnknown_841DF05 @@ -3396,7 +3396,7 @@ sub_800AE1C: @ 800AE1C movs r1, 0x3 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print movs r0, 0 bl PutWindowTilemap movs r0, 0x2 @@ -3444,7 +3444,7 @@ sub_800AED0: @ 800AED0 movs r1, 0x3 movs r2, 0x2 movs r3, 0 - bl sub_812E51C + bl box_print movs r0, 0x1 bl PutWindowTilemap movs r0, 0x2 @@ -3522,7 +3522,7 @@ _0800AF7A: movs r1, 0x3 movs r2, 0x2 movs r3, 0x14 - bl sub_812E51C + bl box_print b _0800AFC4 .align 2, 0 _0800AF9C: .4byte gUnknown_3003F3C @@ -3541,7 +3541,7 @@ _0800AFA8: movs r1, 0x3 movs r2, 0x2 movs r3, 0x14 - bl sub_812E51C + bl box_print _0800AFC4: ldr r0, _0800B004 @ =gUnknown_30030F0 movs r2, 0x87 diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 29b9f559a..b29441cff 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -4359,7 +4359,7 @@ _080FF4A2: thumb_func_start sub_80FF4A8 sub_80FF4A8: @ 80FF4A8 push {lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4400,7 +4400,7 @@ _080FF4EA: thumb_func_start sub_80FF4F0 sub_80FF4F0: @ 80FF4F0 push {r4,lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4446,7 +4446,7 @@ _080FF53E: thumb_func_start sub_80FF544 sub_80FF544: @ 80FF544 push {lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -6055,7 +6055,7 @@ _080FFFD4: movs r0, 0x1 bl SetBgTilemapBuffer ldr r0, _08100030 @ =gUnknown_843F8B0 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters bl sub_8100CBC bl sub_8100C5C @@ -7823,7 +7823,7 @@ _08100E0A: str r0, [sp, 0x8] mov r0, r12 adds r2, r7, 0 - bl sub_812E51C + bl box_print add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -8021,7 +8021,7 @@ sub_8100F44: @ 8100F44 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl sub_8003CE4 + bl AddWindow ldr r1, _08100FD8 @ =gUnknown_203ACEC ldr r1, [r1] strh r0, [r1, 0x2] @@ -10787,7 +10787,7 @@ sub_8102428: @ 8102428 orrs r0, r1 str r0, [sp, 0x10] add r0, sp, 0xC - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index 8c51f53b8..03a1b32ed 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -3720,7 +3720,7 @@ sub_80FA2B0: @ 80FA2B0 bl sub_80F9D04 strh r4, [r5] _080FA2DE: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 @@ -3837,7 +3837,7 @@ _080FA3B8: .4byte 0x0000069e _080FA3BC: .4byte gUnknown_3003F50 _080FA3C0: .4byte sub_80FA2B0 _080FA3C4: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r2, r0, 24 movs r1, 0x1 @@ -9651,7 +9651,7 @@ _080FCF88: lsls r0, 24 lsrs r5, r0, 24 _080FCFA6: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 subs r0, 0x1 @@ -9992,7 +9992,7 @@ _080FD220: ble _080FD1F4 mov r4, r9 _080FD22C: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -10049,7 +10049,7 @@ _080FD29E: adds r5, 0x1C adds r4, 0x1 _080FD2A4: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index eee64233b..35ae2c48d 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -201,7 +201,7 @@ _081159B8: _08115A10: ldr r0, _08115A1C @ =gUnknown_2021D18 ldr r1, _08115A20 @ =gUnknown_8457234 - bl sub_8008FCC + bl StringExpandPlaceholders _08115A18: pop {r0} bx r0 @@ -374,13 +374,13 @@ _08115B5C: bl sub_811A054 strb r0, [r5, 0x17] ldr r0, _08115C48 @ =gUnknown_8456CD0 - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0x10] ldr r0, _08115C4C @ =gUnknown_8456CFC - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0xF] ldr r0, _08115C50 @ =gUnknown_8456D04 - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0x11] ldrb r0, [r5, 0x10] movs r1, 0x22 @@ -460,7 +460,7 @@ _08115C60: beq _08115CB0 ldr r0, _08115CA8 @ =gUnknown_2021D18 ldr r1, _08115CAC @ =gUnknown_8457264 - bl sub_8008FCC + bl StringExpandPlaceholders b _08115CCC .align 2, 0 _08115C98: .4byte gUnknown_2021CD0 @@ -472,7 +472,7 @@ _08115CAC: .4byte gUnknown_8457264 _08115CB0: ldr r0, _08115CBC @ =gUnknown_2021D18 ldr r1, _08115CC0 @ =gUnknown_8457234 - bl sub_8008FCC + bl StringExpandPlaceholders b _08115CCC .align 2, 0 _08115CBC: .4byte gUnknown_2021D18 @@ -828,7 +828,7 @@ _08115F5C: bl ConvertInternationalString ldr r0, _08115FA8 @ =gUnknown_2021D18 ldr r1, _08115FAC @ =gUnknown_8457554 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xD strb r0, [r5, 0xC] _08115F90: @@ -1215,14 +1215,14 @@ _081162C0: ldr r1, _081162CC @ =gUnknown_84574C4 _081162C2: adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders b _081162D8 .align 2, 0 _081162CC: .4byte gUnknown_84574C4 _081162D0: ldr r1, _081162DC @ =gUnknown_84574EC adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders _081162D8: pop {r0} bx r0 @@ -1251,13 +1251,13 @@ _081162F6: b _08116312 _08116300: ldr r1, _08116308 @ =gUnknown_8457E28 - bl sub_8008FCC + bl StringExpandPlaceholders b _08116312 .align 2, 0 _08116308: .4byte gUnknown_8457E28 _0811630C: ldr r1, _08116318 @ =gUnknown_8457E44 - bl sub_8008FCC + bl StringExpandPlaceholders _08116312: pop {r0} bx r0 @@ -1308,14 +1308,14 @@ _08116338: _08116390: ldr r1, _0811639C @ =gUnknown_8459238 adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders b _081163A8 .align 2, 0 _0811639C: .4byte gUnknown_8459238 _081163A0: ldr r1, _081163AC @ =gUnknown_8459250 adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders _081163A8: pop {r0} bx r0 @@ -1366,14 +1366,14 @@ _081163CC: _08116424: ldr r1, _08116430 @ =gUnknown_84576AC adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811643C .align 2, 0 _08116430: .4byte gUnknown_84576AC _08116434: ldr r1, _08116440 @ =gUnknown_84576C4 adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders _0811643C: pop {r0} bx r0 @@ -1892,13 +1892,13 @@ _08116838: movs r4, 0 strb r0, [r6, 0x11] ldr r0, _081168EC @ =gUnknown_8456CD0 - bl sub_8003CE4 + bl AddWindow strb r0, [r6, 0xC] ldr r0, _081168F0 @ =gUnknown_8456D4C - bl sub_8003CE4 + bl AddWindow strb r0, [r6, 0xB] ldr r0, _081168F4 @ =gUnknown_8456D54 - bl sub_8003CE4 + bl AddWindow strb r0, [r6, 0xD] ldrb r0, [r6, 0xC] movs r1, 0x22 @@ -2196,7 +2196,7 @@ _08116AF0: bl StringCopy ldr r1, _08116B40 @ =gUnknown_8457700 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders b _08116B70 .align 2, 0 _08116B30: .4byte gUnknown_2021D18 @@ -3033,7 +3033,7 @@ _0811719C: movs r2, 0x64 bl memcpy movs r0, 0x32 - bl sub_8054E90 + bl IncrementGameStat bl ResetBlockReceivedFlags b _081171FA .align 2, 0 @@ -3177,12 +3177,12 @@ _081172E8: adds r5, 0x60 adds r4, 0x1 _08117302: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 blt _081172E8 - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -3272,7 +3272,7 @@ sub_81173C0: @ 81173C0 adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 - bl sub_80A0058 + bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks ldr r5, _0811742C @ =gUnknown_202273C @@ -3310,7 +3310,7 @@ sub_81173C0: @ 81173C0 str r0, [r1, 0x8] ldr r0, _0811743C @ =gUnknown_2022B4C str r6, [r0] - bl sub_8044074 + bl PlayBattleBGM pop {r4-r6} pop {r0} bx r0 @@ -3400,7 +3400,7 @@ sub_81174B4: @ 81174B4 strh r1, [r0] ldr r0, _08117528 @ =0x0000406f bl VarSet - bl sub_800A088 + bl GetLinkPlayerCount ldr r1, _0811752C @ =gUnknown_3005030 strb r0, [r1] bl GetMultiplayerId @@ -3660,7 +3660,7 @@ _081177A0: ldr r0, _081177C4 @ =gUnknown_2022618 movs r1, 0x1 bl sub_8117594 - bl sub_80A0058 + bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks movs r0, 0x1 @@ -3673,7 +3673,7 @@ _081177A0: _081177C4: .4byte gUnknown_2022618 _081177C8: bl sub_80563F0 - bl sub_80A0058 + bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks ldr r0, _081177EC @ =gUnknown_2022618 @@ -3689,7 +3689,7 @@ _081177C8: _081177EC: .4byte gUnknown_2022618 _081177F0: bl sub_80563F0 - bl sub_80A0058 + bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks ldr r0, _08117814 @ =gUnknown_2022618 @@ -4064,7 +4064,7 @@ _08117AB8: orrs r1, r0 str r1, [sp, 0x4] mov r0, sp - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0xF] ldrb r0, [r5, 0xF] bl sub_814240C @@ -4292,7 +4292,7 @@ _08117CB2: bl ConvertInternationalString ldr r0, _08117D34 @ =gUnknown_2021D18 ldr r1, _08117D38 @ =gUnknown_8457554 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x9 strb r0, [r5, 0xC] bl sub_80F8F5C @@ -4617,10 +4617,10 @@ _08117FC0: orrs r1, r0 str r1, [sp, 0x4] mov r0, sp - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0xB] ldr r0, _08118064 @ =gUnknown_8456D54 - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0xD] ldrb r0, [r5, 0xB] bl sub_814240C @@ -5038,7 +5038,7 @@ _08118380: orrs r1, r0 str r1, [sp, 0x4] mov r0, sp - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0xB] ldrb r0, [r5, 0xB] bl sub_814240C @@ -5371,7 +5371,7 @@ sub_8118664: @ 8118664 cmp r3, r0 beq _0811867E adds r1, r3, 0 - bl sub_8008FCC + bl StringExpandPlaceholders _0811867E: pop {r0} bx r0 @@ -5392,7 +5392,7 @@ sub_811868C: @ 811868C cmp r2, r0 beq _081186A4 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders _081186A4: pop {r0} bx r0 @@ -6307,7 +6307,7 @@ _08118ED6: lsls r1, r5, 2 adds r1, r2 ldr r1, [r1] - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x21 bl _081198DA .align 2, 0 @@ -6557,7 +6557,7 @@ _08119122: lsls r1, r5, 2 adds r1, r2 ldr r1, [r1] - bl sub_8008FCC + bl StringExpandPlaceholders b _081198DC .align 2, 0 _08119150: .4byte sub_8117280 @@ -6899,7 +6899,7 @@ _08119414: bl sub_8008E78 ldr r0, _08119460 @ =gUnknown_2021D18 ldr r1, _08119464 @ =gUnknown_8458DBC - bl sub_8008FCC + bl StringExpandPlaceholders _0811944A: ldr r1, _08119460 @ =gUnknown_2021D18 movs r0, 0x2C @@ -7457,8 +7457,8 @@ _081198DC: _081198E8: .4byte gUnknown_2021D18 thumb_func_end sub_81186E0 - thumb_func_start sub_81198EC -sub_81198EC: @ 81198EC + thumb_func_start var_800D_set_xB +var_800D_set_xB: @ 81198EC push {lr} bl InUnionRoom cmp r0, 0x1 @@ -7471,7 +7471,7 @@ _081198FC: bx r0 .align 2, 0 _08119900: .4byte gUnknown_20370D0 - thumb_func_end sub_81198EC + thumb_func_end var_800D_set_xB thumb_func_start sub_8119904 sub_8119904: @ 8119904 @@ -8488,7 +8488,7 @@ sub_811A0B4: @ 811A0B4 bl sub_80F6EE4 ldr r0, _0811A0DC @ =gUnknown_2021D18 adds r1, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 movs r1, 0x1 bl sub_80F6E54 @@ -8534,7 +8534,7 @@ _0811A10A: bl sub_80F6EE4 ldr r0, _0811A12C @ =gUnknown_2021D18 adds r1, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1 bl sub_80F6E08 ldrb r0, [r4] @@ -8593,7 +8593,7 @@ _0811A174: negs r0, r0 b _0811A1A4 _0811A186: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 movs r2, 0x80 @@ -8618,7 +8618,7 @@ _0811A1A4: sub_811A1AC: @ 811A1AC push {r4,lr} sub sp, 0x8 - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -8684,7 +8684,7 @@ sub_811A218: @ 811A218 beq _0811A274 b _0811A2DA _0811A234: - bl sub_8003CE4 + bl AddWindow strb r0, [r5] ldrb r0, [r5] movs r1, 0 @@ -8790,7 +8790,7 @@ _0811A308: bl sub_811A1AC strb r0, [r7] ldr r0, [sp, 0x1C] - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, 0 @@ -9805,7 +9805,7 @@ sub_811AA5C: @ 811AA5C adds r1, r2 adds r1, r3 ldr r1, [r1] - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 b _0811ABD2 .align 2, 0 @@ -9925,7 +9925,7 @@ _0811ABB0: ldr r1, [r0] _0811ABB6: adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811ABD0 .align 2, 0 _0811ABC0: .4byte gUnknown_2021D18 @@ -9933,7 +9933,7 @@ _0811ABC4: .4byte gUnknown_84589AC _0811ABC8: ldr r0, _0811ABD8 @ =gUnknown_2021D18 ldr r1, _0811ABDC @ =gUnknown_8457F90 - bl sub_8008FCC + bl StringExpandPlaceholders _0811ABD0: movs r0, 0 _0811ABD2: @@ -10321,7 +10321,7 @@ _0811AEA4: ldr r1, _0811AEB0 @ =gUnknown_8458F9C _0811AEA6: adds r0, r3, 0 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811AEC2 .align 2, 0 _0811AEB0: .4byte gUnknown_8458F9C @@ -10331,7 +10331,7 @@ _0811AEB4: adds r1, r0 ldr r1, [r1] adds r0, r3, 0 - bl sub_8008FCC + bl StringExpandPlaceholders _0811AEC2: pop {r0} bx r0 @@ -10552,7 +10552,7 @@ _0811B078: ldr r1, _0811B084 @ =gUnknown_8457C48 _0811B07A: adds r0, r7, 0 - bl sub_8008FCC + bl StringExpandPlaceholders _0811B080: movs r2, 0x1 b _0811B092 @@ -10561,7 +10561,7 @@ _0811B084: .4byte gUnknown_8457C48 _0811B088: ldr r1, _0811B0A0 @ =gUnknown_8457E0C adds r0, r7, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r2, 0x2 _0811B092: adds r0, r2, 0 @@ -12702,7 +12702,7 @@ _0811C096: cmp r4, r6 ble _0811C096 movs r0, 0x32 - bl sub_8054E90 + bl IncrementGameStat bl CalculatePlayerPartyCount ldr r0, _0811C0D8 @ =gUnknown_20386AE movs r2, 0xC0 @@ -12766,7 +12766,7 @@ sub_811C0E0: @ 811C0E0 movs r1, 0x3 adds r2, r6, 0 ldr r3, [sp, 0x14] - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -12815,7 +12815,7 @@ _0811C168: b _0811C1AA _0811C196: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r0, 16 cmp r0, 0 @@ -12937,7 +12937,7 @@ _0811C2C0: bl sub_8001658 bl reset_temp_tile_data_buffers ldr r0, _0811C358 @ =gUnknown_8457198 - bl sub_8003B24 + bl InitWindows lsls r0, 16 cmp r0, 0 bne _0811C300 diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 8fcfe3f41..8da510f97 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -146,7 +146,7 @@ sub_8142504: @ 8142504 adds r1, r0, 0 ldr r4, _08142558 @ =gUnknown_2021D18 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer @@ -162,7 +162,7 @@ sub_8142504: @ 8142504 movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r0, 0x1 movs r1, 0x1 movs r2, 0xF @@ -518,7 +518,7 @@ _081427C8: b _081428E6 _081427CA: ldr r0, _081427D8 @ =gUnknown_2021D18 - bl sub_8008FCC + bl StringExpandPlaceholders cmp r6, 0 bne _081427E0 ldr r0, _081427DC @ =gUnknown_8466D90 @@ -529,7 +529,7 @@ _081427DC: .4byte gUnknown_8466D90 _081427E0: ldr r0, _08142828 @ =gUnknown_8466D98 _081427E2: - bl sub_8003CE4 + bl AddWindow strh r0, [r4] ldrb r0, [r4] movs r1, 0x11 @@ -546,7 +546,7 @@ _081427E2: str r1, [sp, 0x10] movs r1, 0x2 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldrb r0, [r4] movs r1, 0x1 movs r2, 0xF @@ -606,7 +606,7 @@ _0814287E: .align 2, 0 _08142888: .4byte 0xff00ffff _0814288C: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r6, r0, 24 movs r1, 0x80 @@ -678,7 +678,7 @@ _08142914: bne _0814292C ldr r0, _08142924 @ =gUnknown_2021D18 ldr r1, _08142928 @ =gUnknown_841EA86 - bl sub_8008FCC + bl StringExpandPlaceholders b _08142934 .align 2, 0 _08142924: .4byte gUnknown_2021D18 @@ -686,10 +686,10 @@ _08142928: .4byte gUnknown_841EA86 _0814292C: ldr r0, _08142984 @ =gUnknown_2021D18 ldr r1, _08142988 @ =gUnknown_841EAB7 - bl sub_8008FCC + bl StringExpandPlaceholders _08142934: ldr r0, _0814298C @ =gUnknown_8466DA0 - bl sub_8003CE4 + bl AddWindow strh r0, [r5] lsls r0, 24 lsrs r0, 24 @@ -707,7 +707,7 @@ _08142934: str r1, [sp, 0x10] movs r1, 0x2 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldrb r0, [r5] movs r1, 0x1 movs r2, 0xF diff --git a/asm/list_menu.s b/asm/list_menu.s index e18b71d14..d2f419d04 100644 --- a/asm/list_menu.s +++ b/asm/list_menu.s @@ -41,7 +41,7 @@ DoMysteryGiftListMenu: @ 8106ED0 beq _08106FCC _08106F06: mov r0, r12 - bl sub_8003CE4 + bl AddWindow strb r0, [r5, 0x5] cmp r6, 0x1 beq _08106F24 @@ -782,7 +782,7 @@ ListMenuPrint: @ 8107428 str r6, [sp, 0x10] adds r2, r7, 0 mov r3, r12 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldrb r1, [r5, 0x3] movs r0, 0x7F ands r0, r1 @@ -820,7 +820,7 @@ _08107494: str r6, [sp, 0x10] adds r2, r7, 0 mov r3, r12 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _081074D2: add sp, 0x18 pop {r4-r7} @@ -989,7 +989,7 @@ _08107608: ldrb r5, [r6, 0x1E] ldrb r0, [r6, 0x10] movs r1, 0x1 - bl sub_8004950 + bl GetWindowAttribute adds r4, r0, 0 lsls r4, 19 ldr r0, _0810763C @ =0xffff0000 @@ -997,7 +997,7 @@ _08107608: lsrs r4, 16 ldrb r0, [r6, 0x10] movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r2, r0, 0 lsls r2, 3 adds r2, r7 @@ -1023,7 +1023,7 @@ _08107650: ldrb r5, [r6, 0x1E] ldrb r0, [r6, 0x10] movs r1, 0x1 - bl sub_8004950 + bl GetWindowAttribute adds r4, r0, 0 lsls r4, 3 add r4, r8 @@ -1031,7 +1031,7 @@ _08107650: lsrs r4, 16 ldrb r0, [r6, 0x10] movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r2, r0, 0 lsls r2, 3 adds r2, r7 @@ -1062,7 +1062,7 @@ ListMenuAddCursorObject: @ 810768C strb r0, [r1, 0x1] ldrb r0, [r4, 0x10] movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute mov r1, sp lsls r0, 3 adds r0, 0x2 @@ -1379,13 +1379,13 @@ _0810789E: lsrs r4, 16 ldrb r0, [r6, 0x10] movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute adds r5, r0, 0 lsls r5, 19 lsrs r5, 16 ldrb r0, [r6, 0x10] movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 3 subs r0, r4 lsls r0, 16 @@ -1429,7 +1429,7 @@ _08107930: bl ListMenuPrintEntries ldrb r0, [r6, 0x10] movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 19 lsrs r0, 16 ldrb r3, [r6, 0x10] diff --git a/asm/load_save.s b/asm/load_save.s index 2c829401b..751e41739 100644 --- a/asm/load_save.s +++ b/asm/load_save.s @@ -15,7 +15,7 @@ CheckForFlashMemory: @ 804BFE4 ldr r1, _0804BFFC @ =gUnknown_3005004 movs r0, 0x1 str r0, [r1] - bl sub_80007C8 + bl InitFlashTimer b _0804C006 .align 2, 0 _0804BFFC: .4byte gUnknown_3005004 @@ -424,14 +424,14 @@ SaveSerializedGame: @ 804C300 bx r0 thumb_func_end SaveSerializedGame - thumb_func_start sub_804C310 -sub_804C310: @ 804C310 + thumb_func_start LoadSerializedGame +LoadSerializedGame: @ 804C310 push {lr} bl sub_804C230 bl sub_804C2B8 pop {r0} bx r0 - thumb_func_end sub_804C310 + thumb_func_end LoadSerializedGame thumb_func_start copy_bags_and_unk_data_from_save_blocks copy_bags_and_unk_data_from_save_blocks: @ 804C320 @@ -711,7 +711,7 @@ _0804C4FE: ldr r1, [r2] str r1, [r0] adds r0, r4, 0 - bl sub_8099DE0 + bl ApplyNewEncryptionKeyToBagItems mov r6, r8 ldr r0, [r6] adds r0, r5 @@ -787,7 +787,7 @@ _0804C5AE: adds r0, r5, 0 bl sub_8054F38 adds r0, r5, 0 - bl sub_8099E38 + bl ApplyNewEncryptionKeyToBagItems_ adds r0, r5, 0 bl sub_815EE6C ldr r4, _0804C5F8 @ =gUnknown_3005008 diff --git a/asm/mail.s b/asm/mail.s index aabaacc82..1597c407c 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -296,7 +296,7 @@ _080BEE70: .4byte gUnknown_20399C4 _080BEE74: .4byte 0x000010fc _080BEE78: ldr r0, _080BEE84 @ =gUnknown_83EE9A4 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters b _080BF0F4 .align 2, 0 @@ -811,7 +811,7 @@ _080BF260: str r0, [sp, 0x4] str r5, [sp, 0x8] movs r1, 0x1 - bl sub_812E51C + bl box_print mov r1, r8 ldr r0, [r1] adds r0, 0xF8 @@ -856,7 +856,7 @@ _080BF2CE: str r4, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 - bl sub_812E51C + bl box_print ldr r1, [r5] adds r0, r1, 0 adds r0, 0xE9 @@ -875,7 +875,7 @@ _080BF2CE: str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 - bl sub_812E51C + bl box_print movs r0, 0 movs r1, 0x3 bl CopyWindowToVram diff --git a/asm/mail_data.s b/asm/mail_data.s index 66ddc3656..a1fdc62a9 100644 --- a/asm/mail_data.s +++ b/asm/mail_data.s @@ -89,7 +89,7 @@ MonHasMail: @ 8097D08 bl GetMonData lsls r0, 16 lsrs r0, 16 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _08097D30 @@ -346,7 +346,7 @@ sub_8097F00: @ 8097F00 cmp r0, 0xC9 bne _08097F18 adds r0, r1, 0 - bl sub_8096F98 + bl mon_icon_personality_to_unown_id lsls r0, 16 ldr r1, _08097F1C @ =0x75300000 adds r0, r1 @@ -605,8 +605,8 @@ _080980E8: bx r1 thumb_func_end sub_809803C - thumb_func_start sub_80980F8 -sub_80980F8: @ 80980F8 + thumb_func_start itemid_is_mail +itemid_is_mail: @ 80980F8 push {lr} lsls r0, 16 lsrs r0, 16 @@ -621,6 +621,6 @@ _0809810A: _0809810C: pop {r1} bx r1 - thumb_func_end sub_80980F8 + thumb_func_end itemid_is_mail .align 2, 0 @ Don't pad with nop. diff --git a/asm/mailbox_pc.s b/asm/mailbox_pc.s index 45c10f1ad..145aef2aa 100644 --- a/asm/mailbox_pc.s +++ b/asm/mailbox_pc.s @@ -56,7 +56,7 @@ sub_810EBAC: @ 810EBAC lsls r0, r1, 3 ldr r1, _0810EBDC @ =gUnknown_8453FE8 adds r0, r1 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, 0 @@ -154,7 +154,7 @@ _0810EC62: movs r1, 0x2 movs r2, 0x8 adds r3, r5, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _0810EC82: add sp, 0x34 pop {r4,r5} diff --git a/asm/main.s b/asm/main.s index 50aabd51d..06d7e7d51 100644 --- a/asm/main.s +++ b/asm/main.s @@ -525,8 +525,8 @@ _080007C0: .4byte gUnknown_3003578 _080007C4: .4byte INTR_CHECK thumb_func_end sub_8000724 - thumb_func_start sub_80007C8 -sub_80007C8: @ 80007C8 + thumb_func_start InitFlashTimer +InitFlashTimer: @ 80007C8 push {lr} ldr r0, _080007D8 @ =gUnknown_81E9F60 ldr r1, [r0] @@ -536,10 +536,10 @@ sub_80007C8: @ 80007C8 bx r0 .align 2, 0 _080007D8: .4byte gUnknown_81E9F60 - thumb_func_end sub_80007C8 + thumb_func_end InitFlashTimer - thumb_func_start sub_80007DC -sub_80007DC: @ 80007DC + thumb_func_start HBlankIntr +HBlankIntr: @ 80007DC push {r4,lr} ldr r4, _08000804 @ =gUnknown_30030F0 ldr r0, [r4, 0x10] @@ -562,7 +562,7 @@ _080007EA: .align 2, 0 _08000804: .4byte gUnknown_30030F0 _08000808: .4byte INTR_CHECK - thumb_func_end sub_80007DC + thumb_func_end HBlankIntr thumb_func_start sub_800080C sub_800080C: @ 800080C diff --git a/asm/main_menu.s b/asm/main_menu.s index 06c979e19..a73f766de 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -149,7 +149,7 @@ sub_800C318: @ 800C318 movs r2, 0 bl ChangeBgY ldr r0, _0800C4B8 @ =gUnknown_8234618 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters ldr r0, _0800C4BC @ =gUnknown_8234648 movs r1, 0 @@ -438,7 +438,7 @@ sub_800C688: @ 800C688 bne _0800C6F8 bl sub_8002DE8 movs r0, 0x4 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0800C6F8 @@ -639,7 +639,7 @@ _0800C828: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print ldr r0, _0800C86C @ =gUnknown_8234618 bl sub_800D0B4 movs r0, 0 @@ -670,7 +670,7 @@ _0800C870: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] ldr r0, _0800C8E8 @ =gUnknown_8415A6E @@ -679,7 +679,7 @@ _0800C870: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print bl sub_800CE58 ldr r4, _0800C8EC @ =gUnknown_8234620 adds r0, r4, 0 @@ -725,7 +725,7 @@ _0800C8F0: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] ldr r0, _0800C9B8 @ =gUnknown_8415A6E @@ -734,7 +734,7 @@ _0800C8F0: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print movs r0, 0x1 strh r0, [r6, 0x1C] str r5, [sp] @@ -745,7 +745,7 @@ _0800C8F0: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print bl sub_800CE58 ldr r4, _0800C9C0 @ =gUnknown_8234620 adds r0, r4, 0 @@ -1094,7 +1094,7 @@ _0800CC18: .4byte gUnknown_2037AB8 _0800CC1C: bl sub_8002DE8 movs r0, 0x4 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 _0800CC28: cmp r0, 0 @@ -1355,7 +1355,7 @@ sub_800CDF8: @ 800CDF8 movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl sub_812E51C + bl box_print movs r0, 0x4 bl PutWindowTilemap movs r0, 0x4 @@ -1404,7 +1404,7 @@ sub_800CE70: @ 800CE70 movs r1, 0x2 movs r2, 0x2 movs r3, 0x12 - bl sub_812E51C + bl box_print add r1, sp, 0xC movs r2, 0 ldr r0, _0800CED0 @ =gUnknown_300500C @@ -1430,7 +1430,7 @@ _0800CE96: movs r1, 0x2 movs r2, 0x3E movs r3, 0x12 - bl sub_812E51C + bl box_print add sp, 0x14 pop {r0} bx r0 @@ -1455,7 +1455,7 @@ sub_800CED4: @ 800CED4 movs r1, 0x2 movs r2, 0x2 movs r3, 0x22 - bl sub_812E51C + bl box_print ldr r4, _0800CF38 @ =gUnknown_300500C ldr r0, [r4] ldrh r1, [r0, 0xE] @@ -1479,7 +1479,7 @@ sub_800CED4: @ 800CED4 movs r1, 0x2 movs r2, 0x3E movs r3, 0x22 - bl sub_812E51C + bl box_print add sp, 0x2C pop {r4-r6} pop {r0} @@ -1504,7 +1504,7 @@ sub_800CF3C: @ 800CF3C cmp r0, 0 beq _0800CF64 movs r0, 0x1 - bl sub_8088E8C + bl pokedex_count b _0800CF6A .align 2, 0 _0800CF60: .4byte 0x00000829 @@ -1525,7 +1525,7 @@ _0800CF6A: movs r1, 0x2 movs r2, 0x2 movs r3, 0x32 - bl sub_812E51C + bl box_print add r0, sp, 0xC adds r1, r6, 0 movs r2, 0 @@ -1541,7 +1541,7 @@ _0800CF6A: movs r1, 0x2 movs r2, 0x3E movs r3, 0x32 - bl sub_812E51C + bl box_print _0800CFAE: add sp, 0x2C pop {r4-r6} @@ -1586,7 +1586,7 @@ _0800CFE2: movs r1, 0x2 movs r2, 0x2 movs r3, 0x42 - bl sub_812E51C + bl box_print add r0, sp, 0xC adds r1, r6, 0 movs r2, 0x2 @@ -1602,7 +1602,7 @@ _0800CFE2: movs r1, 0x2 movs r2, 0x3E movs r3, 0x42 - bl sub_812E51C + bl box_print add sp, 0x2C pop {r4-r6} pop {r0} diff --git a/asm/malloc.s b/asm/malloc.s index 21562198f..03432dc2b 100644 --- a/asm/malloc.s +++ b/asm/malloc.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_800292C -sub_800292C: @ 800292C + thumb_func_start PutMemBlockHeader +PutMemBlockHeader: @ 800292C push {r4,lr} movs r4, 0 strh r4, [r0] @@ -20,19 +20,19 @@ sub_800292C: @ 800292C bx r0 .align 2, 0 _08002944: .4byte 0x0000a3a3 - thumb_func_end sub_800292C + thumb_func_end PutMemBlockHeader - thumb_func_start sub_8002948 -sub_8002948: @ 8002948 + thumb_func_start PutFirstMemBlockHeader +PutFirstMemBlockHeader: @ 8002948 push {lr} adds r2, r0, 0 adds r3, r1, 0 subs r3, 0x10 adds r1, r2, 0 - bl sub_800292C + bl PutMemBlockHeader pop {r0} bx r0 - thumb_func_end sub_8002948 + thumb_func_end PutFirstMemBlockHeader thumb_func_start sub_800295C sub_800295C: @ 800295C @@ -84,7 +84,7 @@ _080029A4: str r5, [r4, 0x4] ldr r2, [r4, 0xC] adds r1, r4, 0 - bl sub_800292C + bl PutMemBlockHeader ldr r0, [r6] ldr r1, [r7] str r1, [r0, 0xC] @@ -331,7 +331,7 @@ InitHeap: @ 8002B80 str r0, [r2] ldr r2, _08002B98 @ =gUnknown_3000A3C str r1, [r2] - bl sub_8002948 + bl PutFirstMemBlockHeader pop {r0} bx r0 .align 2, 0 diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s index 905dd2004..27588fe2d 100644 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -332,7 +332,7 @@ _08098384: movs r6, 0x2D _08098396: mov r0, sp - bl sub_8003CE4 + bl AddWindow lsls r0, 16 lsrs r5, r0, 16 cmp r4, 0 diff --git a/asm/map_preview_screen.s b/asm/map_preview_screen.s index 40dad1826..3b493fb66 100644 --- a/asm/map_preview_screen.s +++ b/asm/map_preview_screen.s @@ -297,7 +297,7 @@ sub_80F8318: @ 80F8318 lsls r4, 24 lsrs r4, 24 ldr r0, _080F83A8 @ =gUnknown_843EBA8 - bl sub_8003CE4 + bl AddWindow mov r8, r0 mov r0, r8 lsls r0, 16 @@ -345,7 +345,7 @@ sub_80F8318: @ 80F8318 adds r0, r6, 0 movs r1, 0x2 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 mov r0, r8 add sp, 0x14 pop {r3,r4} diff --git a/asm/menu.s b/asm/menu.s index 4f4478d73..5fea2df97 100644 --- a/asm/menu.s +++ b/asm/menu.s @@ -53,7 +53,7 @@ sub_810EE0C: @ 810EE0C ldr r5, _0810EE54 @ =gUnknown_203ADF2 adds r0, r6, 0 movs r1, 0x5 - bl sub_8004950 + bl GetWindowAttribute strb r0, [r5] ldr r1, _0810EE58 @ =sub_810EE5C adds r0, r6, 0 @@ -675,7 +675,7 @@ sub_810F330: @ 810F330 ldr r5, _0810F378 @ =gUnknown_203ADF2 adds r0, r6, 0 movs r1, 0x5 - bl sub_8004950 + bl GetWindowAttribute strb r0, [r5] ldr r1, _0810F37C @ =DrawWindowBorder adds r0, r6, 0 @@ -978,7 +978,7 @@ _0810F592: strh r4, [r1, 0x6] ldr r4, _0810F5BC @ =gUnknown_203ADF4 mov r0, sp - bl sub_8003CE4 + bl AddWindow strb r0, [r4] cmp r5, 0xF bls _0810F5C0 @@ -1041,7 +1041,7 @@ sub_810F5E8: @ 810F5E8 adds r0, r1, 0 movs r1, 0 movs r3, 0x1 - bl sub_812E51C + bl box_print cmp r6, 0 beq _0810F63E ldrb r0, [r4] @@ -1118,7 +1118,7 @@ _0810F684: adds r0, r1, 0 movs r1, 0 movs r3, 0x1 - bl sub_812E51C + bl box_print _0810F6CE: ldrb r0, [r6] movs r1, 0 @@ -1132,7 +1132,7 @@ _0810F6CE: movs r1, 0x1 movs r2, 0x4 movs r3, 0x1 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 cmp r7, 0 beq _0810F6F6 ldrb r0, [r6] @@ -2263,7 +2263,7 @@ sub_810FF04: @ 810FF04 str r0, [sp, 0x18] str r1, [sp, 0x1C] add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow lsls r0, 16 lsrs r0, 16 add sp, 0x20 @@ -2306,7 +2306,7 @@ sub_810FF60: @ 810FF60 lsrs r1, 24 mov r10, r1 ldr r7, _0811009C @ =gUnknown_203ADF3 - bl sub_8003CE4 + bl AddWindow strb r0, [r7] ldrb r0, [r7] movs r1, 0x1 @@ -2445,8 +2445,8 @@ sub_81100A4: @ 81100A4 bx r0 thumb_func_end sub_81100A4 - thumb_func_start sub_81100C8 -sub_81100C8: @ 81100C8 + thumb_func_start ProcessMenuInputNoWrap_ +ProcessMenuInputNoWrap_: @ 81100C8 push {r4,lr} bl ProcessMenuInputNoWrapAround lsls r0, 24 @@ -2461,7 +2461,7 @@ _081100DE: pop {r4} pop {r1} bx r1 - thumb_func_end sub_81100C8 + thumb_func_end ProcessMenuInputNoWrap_ thumb_func_start sub_81100E8 sub_81100E8: @ 81100E8 diff --git a/asm/menu2.s b/asm/menu2.s index 1108eacc6..12eae4147 100644 --- a/asm/menu2.s +++ b/asm/menu2.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_812E51C -sub_812E51C: @ 812E51C + thumb_func_start box_print +box_print: @ 812E51C push {r4-r6,lr} sub sp, 0x10 adds r4, r1, 0 @@ -72,10 +72,10 @@ sub_812E51C: @ 812E51C pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_812E51C + thumb_func_end box_print - thumb_func_start sub_812E5A4 -sub_812E5A4: @ 812E5A4 + thumb_func_start AddTextPrinterParametrized2 +AddTextPrinterParametrized2: @ 812E5A4 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -143,7 +143,7 @@ sub_812E5A4: @ 812E5A4 pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_812E5A4 + thumb_func_end AddTextPrinterParametrized2 thumb_func_start sub_812E62C sub_812E62C: @ 812E62C @@ -260,7 +260,7 @@ _0812E700: bne _0812E700 _0812E70A: adds r0, r7, 0 - bl sub_8008FCC + bl StringExpandPlaceholders cmp r4, 0x5 beq _0812E73C lsls r3, r5, 24 diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 830fabc3f..d4339a74b 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -38,7 +38,7 @@ DisplayMessageAndContinueTask: @ 80BF474 beq _080BF4B8 adds r0, r4, 0 ldr r1, [sp, 0x30] - bl sub_8008FCC + bl StringExpandPlaceholders _080BF4B8: ldr r2, _080BF508 @ =gUnknown_3003E50 ldrb r0, [r2] @@ -92,7 +92,7 @@ sub_80BF518: @ 80BF518 lsrs r4, 24 bl sub_8002DE8 adds r0, r4, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r0, 16 pop {r4} @@ -129,7 +129,7 @@ sub_80BF560: @ 80BF560 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -342,7 +342,7 @@ itemid_80BF6D8_mail_related: @ 80BF6D8 bne _080BF700 _080BF6EE: adds r0, r4, 0 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s index d92dbbcaf..12d5b243e 100644 --- a/asm/metatile_behavior.s +++ b/asm/metatile_behavior.s @@ -163,8 +163,8 @@ _08059BB0: bx r1 thumb_func_end sub_8059B90 - thumb_func_start sub_8059BB4 -sub_8059BB4: @ 8059BB4 + thumb_func_start MetatileBehavior_IsIce +MetatileBehavior_IsIce: @ 8059BB4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -177,10 +177,10 @@ _08059BC2: _08059BC4: pop {r1} bx r1 - thumb_func_end sub_8059BB4 + thumb_func_end MetatileBehavior_IsIce - thumb_func_start sub_8059BC8 -sub_8059BC8: @ 8059BC8 + thumb_func_start MetatileBehavior_IsWarpDoor +MetatileBehavior_IsWarpDoor: @ 8059BC8 push {lr} lsls r0, 24 lsrs r0, 24 @@ -193,7 +193,7 @@ _08059BD6: _08059BD8: pop {r1} bx r1 - thumb_func_end sub_8059BC8 + thumb_func_end MetatileBehavior_IsWarpDoor thumb_func_start sub_8059BDC sub_8059BDC: @ 8059BDC @@ -385,8 +385,8 @@ _08059CD8: bx r1 thumb_func_end sub_8059CC8 - thumb_func_start sub_8059CDC -sub_8059CDC: @ 8059CDC + thumb_func_start MetatileBehavior_IsEastArrowWarp +MetatileBehavior_IsEastArrowWarp: @ 8059CDC push {lr} lsls r0, 24 lsrs r0, 24 @@ -399,10 +399,10 @@ _08059CEA: _08059CEC: pop {r1} bx r1 - thumb_func_end sub_8059CDC + thumb_func_end MetatileBehavior_IsEastArrowWarp - thumb_func_start sub_8059CF0 -sub_8059CF0: @ 8059CF0 + thumb_func_start MetatileBehavior_IsWestArrowWarp +MetatileBehavior_IsWestArrowWarp: @ 8059CF0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -415,7 +415,7 @@ _08059CFE: _08059D00: pop {r1} bx r1 - thumb_func_end sub_8059CF0 + thumb_func_end MetatileBehavior_IsWestArrowWarp thumb_func_start sub_8059D04 sub_8059D04: @ 8059D04 @@ -456,12 +456,12 @@ sub_8059D2C: @ 8059D2C lsrs r4, r0, 24 movs r5, 0 adds r0, r4, 0 - bl sub_8059CDC + bl MetatileBehavior_IsEastArrowWarp lsls r0, 24 cmp r0, 0 bne _08059D64 adds r0, r4, 0 - bl sub_8059CF0 + bl MetatileBehavior_IsWestArrowWarp lsls r0, 24 cmp r0, 0 bne _08059D64 @@ -914,8 +914,8 @@ _08059F84: bx r1 thumb_func_end sub_8059F74 - thumb_func_start sub_8059F88 -sub_8059F88: @ 8059F88 + thumb_func_start MetatileBehavior_IsMB_0B +MetatileBehavior_IsMB_0B: @ 8059F88 push {lr} lsls r0, 24 lsrs r0, 24 @@ -928,10 +928,10 @@ _08059F96: _08059F98: pop {r1} bx r1 - thumb_func_end sub_8059F88 + thumb_func_end MetatileBehavior_IsMB_0B - thumb_func_start sub_8059F9C -sub_8059F9C: @ 8059F9C + thumb_func_start MetatileBehavior_IsMountain +MetatileBehavior_IsMountain: @ 8059F9C push {lr} lsls r0, 24 lsrs r0, 24 @@ -944,7 +944,7 @@ _08059FAA: _08059FAC: pop {r1} bx r1 - thumb_func_end sub_8059F9C + thumb_func_end MetatileBehavior_IsMountain thumb_func_start sub_8059FB0 sub_8059FB0: @ 8059FB0 @@ -1079,7 +1079,7 @@ MetatileBehavior_IsSurfableAndNotWaterfall: @ 805A050 cmp r0, 0 beq _0805A072 adds r0, r4, 0 - bl sub_805A104 + bl MetatileBehavior_IsWaterfall lsls r0, 24 cmp r0, 0 bne _0805A072 @@ -1183,8 +1183,8 @@ sub_805A0EC: @ 805A0EC bx lr thumb_func_end sub_805A0EC - thumb_func_start sub_805A0F0 -sub_805A0F0: @ 805A0F0 + thumb_func_start MetatileBehavior_IsHotSprings +MetatileBehavior_IsHotSprings: @ 805A0F0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1197,10 +1197,10 @@ _0805A0FE: _0805A100: pop {r1} bx r1 - thumb_func_end sub_805A0F0 + thumb_func_end MetatileBehavior_IsHotSprings - thumb_func_start sub_805A104 -sub_805A104: @ 805A104 + thumb_func_start MetatileBehavior_IsWaterfall +MetatileBehavior_IsWaterfall: @ 805A104 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1213,7 +1213,7 @@ _0805A112: _0805A114: pop {r1} bx r1 - thumb_func_end sub_805A104 + thumb_func_end MetatileBehavior_IsWaterfall thumb_func_start sub_805A118 sub_805A118: @ 805A118 @@ -1303,8 +1303,8 @@ sub_805A158: @ 805A158 bx lr thumb_func_end sub_805A158 - thumb_func_start sub_805A15C -sub_805A15C: @ 805A15C + thumb_func_start MetatileBehavior_IsLavaridge1FWarp +MetatileBehavior_IsLavaridge1FWarp: @ 805A15C push {lr} lsls r0, 24 lsrs r0, 24 @@ -1317,10 +1317,10 @@ _0805A16A: _0805A16C: pop {r1} bx r1 - thumb_func_end sub_805A15C + thumb_func_end MetatileBehavior_IsLavaridge1FWarp - thumb_func_start sub_805A170 -sub_805A170: @ 805A170 + thumb_func_start MetatileBehavior_IsAquaHideoutWarp +MetatileBehavior_IsAquaHideoutWarp: @ 805A170 push {lr} lsls r0, 24 lsrs r0, 24 @@ -1333,7 +1333,7 @@ _0805A17E: _0805A180: pop {r1} bx r1 - thumb_func_end sub_805A170 + thumb_func_end MetatileBehavior_IsAquaHideoutWarp thumb_func_start sub_805A184 sub_805A184: @ 805A184 diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 1039e206b..b5297f5e9 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -214,7 +214,7 @@ _08145790: bl decompress_and_copy_tile_data_to_vram ldr r4, _08145830 @ =gUnknown_8467074 adds r0, r4, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] movs r2, 0xBB lsls r2, 1 @@ -222,7 +222,7 @@ _08145790: strh r0, [r1] adds r0, r4, 0 adds r0, 0x8 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] movs r2, 0xBC lsls r2, 1 @@ -230,7 +230,7 @@ _08145790: strh r0, [r1] adds r4, 0x10 adds r0, r4, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] movs r2, 0xBD lsls r2, 1 @@ -920,7 +920,7 @@ _08145D70: movs r1, 0x3 movs r2, 0 movs r3, 0x1 - bl sub_812E51C + bl box_print ldr r4, [r7] movs r1, 0xDA lsls r1, 1 @@ -961,7 +961,7 @@ _08145DCE: adds r0, r5, 0 movs r1, 0x3 movs r3, 0x11 - bl sub_812E51C + bl box_print ldr r2, [r7] ldr r0, [r2, 0x4] mov r9, r6 @@ -988,7 +988,7 @@ _08145E06: movs r1, 0x2 movs r2, 0xA6 movs r3, 0x11 - bl sub_812E51C + bl box_print b _08146038 .align 2, 0 _08145E34: .4byte gUnknown_8467068 @@ -1032,7 +1032,7 @@ _08145E42: lsrs r0, r2, 24 movs r1, 0x3 movs r2, 0 - bl sub_812E51C + bl box_print adds r4, 0x1 lsls r4, 24 lsrs r0, r4, 24 @@ -1074,7 +1074,7 @@ _08145EA4: adds r0, r5, 0 movs r1, 0x3 movs r2, 0 - bl sub_812E51C + bl box_print ldr r2, [r7] ldrb r1, [r2, 0x8] movs r0, 0x3 @@ -1107,7 +1107,7 @@ _08145EA4: adds r0, r5, 0 movs r1, 0x3 movs r2, 0 - bl sub_812E51C + bl box_print mov r9, r6 b _08146038 .align 2, 0 @@ -1175,7 +1175,7 @@ _08145F6E: ldr r0, [sp, 0x10] movs r1, 0x3 ldr r3, [sp, 0x14] - bl sub_812E51C + bl box_print ldr r1, [r7] adds r0, r1, r5 ldr r2, _0814605C @ =0x00000306 @@ -1213,7 +1213,7 @@ _08145F6E: ldr r0, [sp, 0x10] movs r1, 0x2 ldr r3, [sp, 0x14] - bl sub_812E51C + bl box_print ldr r1, [r7] adds r1, r4 adds r1, 0x2A @@ -1754,7 +1754,7 @@ _081463EC: bl decompress_and_copy_tile_data_to_vram ldr r4, _08146490 @ =gUnknown_8468040 adds r0, r4, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] movs r2, 0xE4 lsls r2, 1 @@ -1762,7 +1762,7 @@ _081463EC: strh r0, [r1] adds r4, 0x8 adds r0, r4, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] movs r3, 0xE5 lsls r3, 1 @@ -2549,7 +2549,7 @@ _08146AA0: str r4, [sp, 0x8] movs r1, 0x3 movs r3, 0x6 - bl sub_812E51C + bl box_print _08146AD0: ldr r6, _08146B4C @ =gUnknown_203F3CC ldr r4, [r6] @@ -2584,7 +2584,7 @@ _08146AD0: str r4, [sp, 0x8] movs r1, 0x3 movs r2, 0 - bl sub_812E51C + bl box_print adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 diff --git a/asm/mevent_server.s b/asm/mevent_server.s index c7cdbf5e1..031f4ee67 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -695,7 +695,7 @@ _08144D3C: b _08144E5A _08144D4E: ldrb r0, [r2, 0x4] - bl sub_8054EC4 + bl GetGameStat adds r2, r0, 0 adds r0, r4, 0 movs r1, 0x12 diff --git a/asm/money.s b/asm/money.s index 64b3fcbb9..ae850ec92 100644 --- a/asm/money.s +++ b/asm/money.s @@ -175,7 +175,7 @@ _0809FE72: _0809FE7E: ldr r1, _0809FEC0 @ =gUnknown_841697A adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r4, _0809FEBC @ =gUnknown_2021D18 movs r0, 0 adds r1, r4, 0 @@ -248,7 +248,7 @@ _0809FF08: _0809FF14: ldr r1, _0809FF44 @ =gUnknown_841697A adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r2, _0809FF40 @ =gUnknown_2021D18 str r6, [sp] str r5, [sp, 0x4] @@ -361,7 +361,7 @@ sub_809FFB8: @ 809FFB8 str r1, [sp, 0x1C] ldr r4, _080A002C @ =gUnknown_2039990 add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, 0 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index d6afb7743..5a4306a80 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -40,7 +40,7 @@ sub_80DA830: @ 80DA830 push {lr} ldr r0, _080DA844 @ =gUnknown_2021D18 ldr r1, _080DA848 @ =gUnknown_8488DFD - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x3 bl sub_80DA8E8 pop {r0} @@ -57,10 +57,10 @@ sub_80DA84C: @ 80DA84C adds r5, r1, 0 ldr r1, _080DA874 @ =gUnknown_81DBCF0 ldr r2, _080DA878 @ =0x081dbd34 - bl sub_80697AC + bl InitScriptContext adds r0, r4, 0 adds r1, r5, 0 - bl sub_80697E8 + bl SetupBytecodeScript str r5, [r4, 0x64] movs r0, 0 str r0, [r4, 0x68] @@ -151,7 +151,7 @@ _080DA8F0: .4byte gUnknown_203AA3C thumb_func_start script_status_stop_and_ret_1 script_status_stop_and_ret_1: @ 80DA8F4 push {lr} - bl sub_80697FC + bl StopScript movs r0, 0x1 pop {r1} bx r1 @@ -234,7 +234,7 @@ sub_80DA964: @ 80DA964 bne _080DA98E _080DA988: ldr r0, _080DA998 @ =gUnknown_2021D18 - bl sub_8008FCC + bl StringExpandPlaceholders _080DA98E: movs r0, 0 pop {r4,r5} @@ -267,7 +267,7 @@ sub_80DA9B8: @ 80DA9B8 mov r6, r8 push {r6,r7} adds r7, r0, 0 - bl sub_809C854 + bl IsEnigmaBerryValid mov r8, r0 adds r0, r7, 0 bl ScriptReadWord @@ -321,10 +321,10 @@ _080DAA40: ldr r0, _080DAA60 @ =gUnknown_2021D18 ldr r1, _080DAA64 @ =gUnknown_8488CCE _080DAA44: - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [r7, 0x6C] - bl sub_809C854 + bl IsEnigmaBerryValid cmp r0, 0x1 bne _080DAA6C ldr r0, _080DAA68 @ =0x00004033 @@ -362,7 +362,7 @@ sub_80DAA80: @ 80DAA80 bl GiveGiftRibbonToParty ldr r0, _080DAAAC @ =gUnknown_2021D18 ldr r1, _080DAAB0 @ =gUnknown_8488CF6 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] movs r0, 0 @@ -433,7 +433,7 @@ sub_80DAB1C: @ 80DAB1C bl sub_806E22C ldr r0, _080DAB38 @ =gUnknown_2021D18 ldr r1, _080DAB3C @ =gUnknown_8488D2A - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] movs r0, 0 @@ -456,7 +456,7 @@ sub_80DAB40: @ 80DAB40 bl sub_80BDB70 ldr r0, _080DAB64 @ =gUnknown_2021D18 ldr r1, _080DAB68 @ =gUnknown_8488D60 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] movs r0, 0 @@ -530,7 +530,7 @@ _080DABDA: bne _080DAC04 ldr r0, _080DABFC @ =gUnknown_2021D18 ldr r1, _080DAC00 @ =gUnknown_8488D8E - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x3 b _080DAC6E .align 2, 0 @@ -570,7 +570,7 @@ _080DAC3E: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _080DAC5C @@ -582,7 +582,7 @@ _080DAC5C: bl CalculatePlayerPartyCount ldr r0, _080DAC84 @ =gUnknown_2021D18 ldr r1, _080DAC88 @ =gUnknown_8488D7C - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 _080DAC6E: str r0, [r6, 0x6C] @@ -619,7 +619,7 @@ sub_80DAC8C: @ 80DAC8C bl sub_80E7490 ldr r0, _080DACCC @ =gUnknown_2021D18 ldr r1, _080DACD0 @ =gUnknown_8488DBD - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] movs r0, 0 diff --git a/asm/mystery_gift_menu.s b/asm/mystery_gift_menu.s index feb50d231..813fbd66f 100644 --- a/asm/mystery_gift_menu.s +++ b/asm/mystery_gift_menu.s @@ -141,7 +141,7 @@ _081420D6: movs r3, 0 bl sub_80F696C ldr r0, _081421E8 @ =gUnknown_8466D70 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r1, 0xC0 lsls r1, 7 @@ -342,7 +342,7 @@ _08142362: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r0, 0 adds r1, r6, 0 movs r2, 0 @@ -359,7 +359,7 @@ _08142362: movs r0, 0 movs r1, 0 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 b _081423E8 .align 2, 0 _081423A4: .4byte gUnknown_841EDCA @@ -379,7 +379,7 @@ _081423B4: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -390,7 +390,7 @@ _081423B4: movs r1, 0 movs r2, 0x78 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _081423E8: movs r0, 0 movs r1, 0x2 diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 0fcce8d3e..5293e0c23 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_809D954 -sub_809D954: @ 809D954 + thumb_func_start DoNamingScreen +DoNamingScreen: @ 809D954 push {r4-r7,lr} mov r7, r8 push {r7} @@ -56,7 +56,7 @@ _0809D984: bne _0809D9B8 bl StartTimer1 _0809D9B8: - ldr r0, _0809D9DC @ =sub_809D9E0 + ldr r0, _0809D9DC @ =c2_choose_name_or_words_screen bl SetMainCallback2 _0809D9BE: pop {r3} @@ -70,11 +70,11 @@ _0809D9CC: .4byte 0x00001e34 _0809D9D0: .4byte 0x00001e38 _0809D9D4: .4byte 0x00001e30 _0809D9D8: .4byte 0x00001e3c -_0809D9DC: .4byte sub_809D9E0 - thumb_func_end sub_809D954 +_0809D9DC: .4byte c2_choose_name_or_words_screen + thumb_func_end DoNamingScreen - thumb_func_start sub_809D9E0 -sub_809D9E0: @ 809D9E0 + thumb_func_start c2_choose_name_or_words_screen +c2_choose_name_or_words_screen: @ 809D9E0 push {lr} ldr r0, _0809D9FC @ =gUnknown_30030F0 movs r1, 0x87 @@ -106,7 +106,7 @@ _0809DA24: bl sub_809DA84 b _0809DA62 _0809DA2E: - bl sub_809DBB0 + bl choose_name_or_words_screen_init_bgs b _0809DA62 _0809DA34: bl ResetPaletteFade @@ -145,7 +145,7 @@ _0809DA78: _0809DA80: pop {r0} bx r0 - thumb_func_end sub_809D9E0 + thumb_func_end c2_choose_name_or_words_screen thumb_func_start sub_809DA84 sub_809DA84: @ 809DA84 @@ -291,8 +291,8 @@ _0809DB94: _0809DBAC: .4byte gUnknown_202063C thumb_func_end sub_809DB70 - thumb_func_start sub_809DBB0 -sub_809DBB0: @ 809DBB0 + thumb_func_start choose_name_or_words_screen_init_bgs +choose_name_or_words_screen_init_bgs: @ 809DBB0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -407,7 +407,7 @@ _0809DCA4: lsls r0, r4, 3 ldr r1, _0809DD50 @ =gUnknown_83E22A0 adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r5, _0809DD54 @ =gUnknown_203998C ldr r1, [r5] ldr r2, _0809DD58 @ =0x00001e11 @@ -481,7 +481,7 @@ _0809DD50: .4byte gUnknown_83E22A0 _0809DD54: .4byte gUnknown_203998C _0809DD58: .4byte 0x00001e11 _0809DD5C: .4byte 0x0000080c - thumb_func_end sub_809DBB0 + thumb_func_end choose_name_or_words_screen_init_bgs thumb_func_start sub_809DD60 sub_809DD60: @ 809DD60 @@ -932,7 +932,7 @@ _0809E104: ldr r1, [r1] bl StringCopy ldr r4, _0809E1C0 @ =gUnknown_2021D04 - bl sub_80CC7A8 + bl get_unknown_box_id lsls r0, 24 lsrs r0, 24 bl GetBoxNamePtr @@ -956,7 +956,7 @@ _0809E156: adds r0, r1 ldr r1, [r0] adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 movs r1, 0 bl sub_80F6EE4 @@ -1006,7 +1006,7 @@ sub_809E1D4: @ 809E1D4 push {lr} bl sub_8002DE8 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0809E1FE @@ -3657,7 +3657,7 @@ _0809F5EE: movs r1, 0x2 movs r2, 0x68 movs r3, 0x1 - bl sub_812E51C + bl box_print _0809F614: add sp, 0x10 pop {r4,r5} @@ -4196,7 +4196,7 @@ _0809FA12: adds r0, r6, 0 movs r1, 0x1 movs r2, 0 - bl sub_812E51C + bl box_print adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -4317,7 +4317,7 @@ sub_809FAE4: @ 809FAE4 str r1, [sp, 0x8] movs r1, 0 movs r3, 0 - bl sub_812E51C + bl box_print ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -4494,7 +4494,7 @@ sub_809FC90: @ 809FC90 str r0, [sp, 0x4] movs r0, 0 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen add sp, 0x8 pop {r0} bx r0 @@ -4516,7 +4516,7 @@ sub_809FCB8: @ 809FCB8 str r0, [sp, 0x4] movs r0, 0x1 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen add sp, 0x8 pop {r0} bx r0 @@ -4538,7 +4538,7 @@ sub_809FCE0: @ 809FCE0 str r0, [sp, 0x4] movs r0, 0x2 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen add sp, 0x8 pop {r0} bx r0 @@ -4560,7 +4560,7 @@ sub_809FD08: @ 809FD08 str r0, [sp, 0x4] movs r0, 0x3 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen add sp, 0x8 pop {r0} bx r0 @@ -4582,7 +4582,7 @@ sub_809FD30: @ 809FD30 str r0, [sp, 0x4] movs r0, 0x4 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen add sp, 0x8 pop {r0} bx r0 diff --git a/asm/new_game.s b/asm/new_game.s index 9e1a05a67..b17cf8747 100644 --- a/asm/new_game.s +++ b/asm/new_game.s @@ -165,14 +165,14 @@ sub_80549F8: @ 80549F8 bx r0 thumb_func_end sub_80549F8 - thumb_func_start sub_8054A18 -sub_8054A18: @ 8054A18 + thumb_func_start Sav2_ClearSetDefault +Sav2_ClearSetDefault: @ 8054A18 push {lr} bl ClearSav2 bl SetDefaultOptions pop {r0} bx r0 - thumb_func_end sub_8054A18 + thumb_func_end Sav2_ClearSetDefault thumb_func_start sub_8054A28 sub_8054A28: @ 8054A28 diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s index c63066b14..7f58c7512 100644 --- a/asm/new_menu_helpers.s +++ b/asm/new_menu_helpers.s @@ -164,7 +164,7 @@ decompress_and_copy_tile_data_to_vram: @ 80F6878 bhi _080F68E0 adds r0, r4, 0 add r1, sp, 0x4 - bl sub_80F6AA0 + bl malloc_and_decompress adds r4, r0, 0 cmp r5, 0 bne _080F68B0 @@ -229,7 +229,7 @@ sub_80F68F0: @ 80F68F0 bhi _080F695C adds r0, r4, 0 add r1, sp, 0x4 - bl sub_80F6AA0 + bl malloc_and_decompress adds r4, r0, 0 ldr r0, [sp, 0x4] cmp r0, r6 @@ -291,7 +291,7 @@ sub_80F696C: @ 80F696C lsrs r7, r2, 24 adds r0, r1, 0 add r1, sp, 0x4 - bl sub_80F6AA0 + bl malloc_and_decompress adds r6, r0, 0 cmp r5, 0 bne _080F699A @@ -299,7 +299,7 @@ sub_80F696C: @ 80F696C _080F699A: cmp r6, 0 beq _080F69D2 - ldr r0, _080F69E0 @ =sub_80F6A64 + ldr r0, _080F69E0 @ =task_free_buf_after_copying_tile_data_to_vram movs r1, 0 bl CreateTask adds r4, r0, 0 @@ -331,7 +331,7 @@ _080F69D2: pop {r0} bx r0 .align 2, 0 -_080F69E0: .4byte sub_80F6A64 +_080F69E0: .4byte task_free_buf_after_copying_tile_data_to_vram _080F69E4: .4byte gUnknown_3005090 thumb_func_end sub_80F696C @@ -352,7 +352,7 @@ sub_80F69E8: @ 80F69E8 lsrs r6, r2, 24 adds r0, r1, 0 add r1, sp, 0x4 - bl sub_80F6AA0 + bl malloc_and_decompress adds r5, r0, 0 ldr r0, [sp, 0x4] cmp r0, r4 @@ -361,7 +361,7 @@ sub_80F69E8: @ 80F69E8 _080F6A14: cmp r5, 0 beq _080F6A4E - ldr r0, _080F6A5C @ =sub_80F6A64 + ldr r0, _080F6A5C @ =task_free_buf_after_copying_tile_data_to_vram movs r1, 0 bl CreateTask adds r4, r0, 0 @@ -393,12 +393,12 @@ _080F6A4E: pop {r0} bx r0 .align 2, 0 -_080F6A5C: .4byte sub_80F6A64 +_080F6A5C: .4byte task_free_buf_after_copying_tile_data_to_vram _080F6A60: .4byte gUnknown_3005090 thumb_func_end sub_80F69E8 - thumb_func_start sub_80F6A64 -sub_80F6A64: @ 80F6A64 + thumb_func_start task_free_buf_after_copying_tile_data_to_vram +task_free_buf_after_copying_tile_data_to_vram: @ 80F6A64 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -425,10 +425,10 @@ _080F6A94: bx r0 .align 2, 0 _080F6A9C: .4byte gUnknown_3005090 - thumb_func_end sub_80F6A64 + thumb_func_end task_free_buf_after_copying_tile_data_to_vram - thumb_func_start sub_80F6AA0 -sub_80F6AA0: @ 80F6AA0 + thumb_func_start malloc_and_decompress +malloc_and_decompress: @ 80F6AA0 push {r4,r5,lr} adds r5, r0, 0 ldrb r0, [r5, 0x1] @@ -452,7 +452,7 @@ _080F6AC8: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80F6AA0 + thumb_func_end malloc_and_decompress thumb_func_start sub_80F6AD0 sub_80F6AD0: @ 80F6AD0 @@ -676,7 +676,7 @@ sub_80F6C14: @ 80F6C14 sub_80F6C6C: @ 80F6C6C push {lr} ldr r0, _080F6C84 @ =gUnknown_841F42C - bl sub_8003B24 + bl InitWindows ldr r1, _080F6C88 @ =gUnknown_203ABE0 movs r0, 0xFF strb r0, [r1] @@ -718,7 +718,7 @@ sub_80F6CBC: @ 80F6CBC push {lr} bl sub_8002DE8 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r0, 16 pop {r1} @@ -2250,7 +2250,7 @@ sub_80F78E0: @ 80F78E0 str r0, [sp, 0x18] str r1, [sp, 0x1C] add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] bl PutWindowTilemap @@ -2265,17 +2265,17 @@ _080F7934: .4byte gUnknown_203ABE0 _080F7938: .4byte 0x0000013d thumb_func_end sub_80F78E0 - thumb_func_start sub_80F793C -sub_80F793C: @ 80F793C + thumb_func_start GetStartMenuWindowId +GetStartMenuWindowId: @ 80F793C ldr r0, _080F7944 @ =gUnknown_203ABE0 ldrb r0, [r0] bx lr .align 2, 0 _080F7944: .4byte gUnknown_203ABE0 - thumb_func_end sub_80F793C + thumb_func_end GetStartMenuWindowId - thumb_func_start sub_80F7948 -sub_80F7948: @ 80F7948 + thumb_func_start remove_start_menu_window_maybe +remove_start_menu_window_maybe: @ 80F7948 push {r4,lr} ldr r4, _080F7960 @ =gUnknown_203ABE0 ldrb r0, [r4] @@ -2290,7 +2290,7 @@ _080F795A: bx r0 .align 2, 0 _080F7960: .4byte gUnknown_203ABE0 - thumb_func_end sub_80F7948 + thumb_func_end remove_start_menu_window_maybe thumb_func_start sub_80F7964 sub_80F7964: @ 80F7964 diff --git a/asm/oak_speech.s b/asm/oak_speech.s index 43c27e100..622dbeab8 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -667,7 +667,7 @@ sub_812EEB0: @ 812EEB0 lsls r0, 2 adds r0, r1 ldr r0, [r0] - bl sub_8003CE4 + bl AddWindow ldr r1, [r4] movs r6, 0 strh r0, [r1, 0x14] @@ -690,7 +690,7 @@ sub_812EEB0: @ 812EEB0 movs r1, 0x2 movs r2, 0x2 movs r3, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r0, [r4] ldrb r0, [r0, 0x14] movs r1, 0x3 @@ -767,7 +767,7 @@ _0812EF9A: lsls r1, r6, 3 ldr r0, [r0] adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] lsls r4, r6, 1 adds r1, 0x14 @@ -804,7 +804,7 @@ _0812EF9A: movs r1, 0x2 movs r2, 0x6 movs r3, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r0, [r5] adds r0, 0x14 adds r0, r4 @@ -1240,7 +1240,7 @@ _0812F374: bl sub_810F5E8 ldr r0, _0812F488 @ =gUnknown_8460BA8 add r1, sp, 0x14 - bl sub_80F6AA0 + bl malloc_and_decompress adds r1, r0, 0 ldr r4, _0812F48C @ =gUnknown_203B108 ldr r0, [r4] @@ -1261,7 +1261,7 @@ _0812F374: ldr r0, [r4] str r6, [r0, 0x8] ldr r0, _0812F490 @ =gUnknown_8462EC0 - bl sub_8003CE4 + bl AddWindow strh r0, [r5, 0x1C] lsls r0, 24 lsrs r0, 24 @@ -1295,7 +1295,7 @@ _0812F374: movs r1, 0x2 movs r2, 0x3 movs r3, 0x5 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 str r6, [sp] movs r0, 0 movs r1, 0xE2 @@ -1532,7 +1532,7 @@ _0812F5D6: movs r1, 0x2 movs r2, 0x3 movs r3, 0x5 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r0, [r4] ldrh r0, [r0, 0x12] cmp r0, 0 @@ -1764,7 +1764,7 @@ _0812F7EC: .4byte gUnknown_3005098 _0812F7F0: ldr r0, _0812F870 @ =gUnknown_8460CA4 add r1, sp, 0x4 - bl sub_80F6AA0 + bl malloc_and_decompress adds r1, r0, 0 ldr r0, _0812F874 @ =gUnknown_203B108 ldr r0, [r0] @@ -1861,7 +1861,7 @@ _0812F8B8: beq _0812F8FC adds r0, r5, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _0812F8F8 @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -1924,7 +1924,7 @@ sub_812F944: @ 812F944 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 @@ -1938,7 +1938,7 @@ sub_812F944: @ 812F944 beq _0812F9A0 adds r0, r5, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _0812F99C @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -2008,7 +2008,7 @@ sub_812F9EC: @ 812F9EC ldr r7, _0812FA68 @ =gUnknown_3005098 adds r4, r6, r7 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 @@ -2115,7 +2115,7 @@ _0812FAA0: beq _0812FB14 adds r0, r4, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _0812FB10 @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -2175,7 +2175,7 @@ sub_812FB4C: @ 812FB4C lsls r0, 24 lsrs r6, r0, 24 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 @@ -2189,7 +2189,7 @@ sub_812FB4C: @ 812FB4C beq _0812FBA8 adds r0, r5, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _0812FBA4 @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -2252,7 +2252,7 @@ sub_812FBF0: @ 812FBF0 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 @@ -2379,7 +2379,7 @@ _0812FCEC: beq _0812FD30 adds r0, r5, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _0812FD2C @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -2446,7 +2446,7 @@ sub_812FD78: @ 812FD78 ldr r7, _0812FDB8 @ =gUnknown_3005098 adds r6, r5, r7 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0812FDB2 @@ -2512,7 +2512,7 @@ _0812FDF0: beq _0812FE40 adds r0, r5, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _0812FE3C @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -2578,13 +2578,13 @@ sub_812FE88: @ 812FE88 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0 bne _0812FF7E ldr r0, _0812FF8C @ =gUnknown_8462EC8 - bl sub_8003CE4 + bl AddWindow ldr r1, _0812FF90 @ =gUnknown_3005090 lsls r5, r4, 2 adds r5, r4 @@ -2636,7 +2636,7 @@ sub_812FE88: @ 812FE88 movs r1, 0x2 movs r2, 0x8 movs r3, 0x1 - bl sub_812E51C + bl box_print ldr r0, [r4] mov r1, r9 strb r1, [r0, 0x1C] @@ -2657,7 +2657,7 @@ sub_812FE88: @ 812FE88 movs r1, 0x2 movs r2, 0x8 movs r3, 0x11 - bl sub_812E51C + bl box_print movs r0, 0x2 movs r1, 0x1 bl GetFontAttribute @@ -2863,7 +2863,7 @@ _081300D0: beq _08130118 adds r0, r5, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _08130114 @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -2926,7 +2926,7 @@ sub_8130160: @ 8130160 lsls r0, 24 lsrs r5, r0, 24 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 @@ -2971,7 +2971,7 @@ sub_81301B0: @ 81301B0 ldr r7, _081301F8 @ =gUnknown_3005098 adds r4, r6, r7 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _08130218 @@ -3042,7 +3042,7 @@ sub_8130228: @ 8130228 beq _08130284 adds r0, r5, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders str r4, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -3087,7 +3087,7 @@ _081302A6: beq _081302E4 adds r0, r4, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -3240,7 +3240,7 @@ sub_81303B4: @ 81303B4 str r0, [sp, 0x4] movs r0, 0 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen b _08130440 .align 2, 0 _081303F8: .4byte gUnknown_2037AB8 @@ -3272,7 +3272,7 @@ _08130408: movs r0, 0x4 movs r2, 0 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen _08130440: adds r0, r6, 0 movs r1, 0x1 @@ -3318,7 +3318,7 @@ sub_8130464: @ 8130464 bne _081304B4 ldr r0, _081304AC @ =gUnknown_2021D18 ldr r1, _081304B0 @ =gUnknown_81C5E13 - bl sub_8008FCC + bl StringExpandPlaceholders b _081304BC .align 2, 0 _081304A0: .4byte gUnknown_3005098 @@ -3329,7 +3329,7 @@ _081304B0: .4byte gUnknown_81C5E13 _081304B4: ldr r0, _081304F4 @ =gUnknown_2021D18 ldr r1, _081304F8 @ =gUnknown_81C5EB5 - bl sub_8008FCC + bl StringExpandPlaceholders _081304BC: movs r0, 0 movs r1, 0 @@ -3362,7 +3362,7 @@ _081304F8: .4byte gUnknown_81C5EB5 _081304FC: .4byte gUnknown_203B108 _08130500: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _08130544 @@ -3409,7 +3409,7 @@ sub_8130554: @ 8130554 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r5, r0, 24 cmp r5, 0 @@ -3457,7 +3457,7 @@ _081305BC: ldr r4, _081305F8 @ =gUnknown_2021D18 ldr r1, _081305FC @ =gUnknown_81C5EC5 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 movs r1, 0 bl sub_80F6EE4 @@ -3567,7 +3567,7 @@ sub_8130694: @ 8130694 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _081306C4 @@ -3652,7 +3652,7 @@ sub_813071C: @ 813071C beq _08130780 adds r0, r4, 0 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r0, _0813077C @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -3802,7 +3802,7 @@ sub_8130858: @ 8130858 ldr r4, _081308C0 @ =gUnknown_2021D18 ldr r1, _081308C4 @ =gUnknown_81C5EF4 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 movs r1, 0 bl sub_80F6EE4 @@ -3847,7 +3847,7 @@ sub_81308D0: @ 81308D0 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0813090A @@ -5544,7 +5544,7 @@ sub_8131660: @ 8131660 ldr r5, _081316DC @ =gUnknown_3005098 adds r7, r4, r5 ldr r0, _081316E0 @ =gUnknown_8462ED8 - bl sub_8003CE4 + bl AddWindow strh r0, [r7, 0x1A] lsls r0, 24 lsrs r0, 24 diff --git a/asm/option_menu.s b/asm/option_menu.s index c405fcaa6..24a5947d1 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -347,7 +347,7 @@ _08088556: movs r2, 0 bl ChangeBgY ldr r0, _0808867C @ =gUnknown_83CC2B8 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r0, 0x50 movs r1, 0xC1 @@ -409,7 +409,7 @@ sub_8088680: @ 8088680 movs r1, 0 adds r2, r4, 0 movs r3, 0 - bl sub_812E51C + bl box_print movs r0, 0x2 bl PutWindowTilemap movs r0, 0x2 @@ -906,7 +906,7 @@ _08088A72: movs r1, 0x2 mov r2, r8 adds r3, r7, 0 - bl sub_812E51C + bl box_print b _08088ADE .align 2, 0 _08088A94: .4byte gUnknown_83CC354 @@ -940,7 +940,7 @@ _08088A9C: movs r1, 0x2 mov r2, r8 adds r3, r7, 0 - bl sub_812E51C + bl box_print _08088ADE: movs r0, 0x1 bl PutWindowTilemap diff --git a/asm/overworld.s b/asm/overworld.s index 908794f94..3a63b53f0 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -19,7 +19,7 @@ sub_8054BC8: @ 8054BC8 adds r1, r0, 0 adds r0, r4, 0 bl RemoveMoney - bl sub_80A0058 + bl sp000_heal_pokemon bl sub_8054DD8 bl sub_80554BC bl warp_in @@ -313,15 +313,15 @@ _08054E74: _08054E8C: .4byte gUnknown_3005008 thumb_func_end sub_8054E68 - thumb_func_start sub_8054E90 -sub_8054E90: @ 8054E90 + thumb_func_start IncrementGameStat +IncrementGameStat: @ 8054E90 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x33 bhi _08054EB8 adds r0, r4, 0 - bl sub_8054EC4 + bl GetGameStat adds r1, r0, 0 ldr r0, _08054EAC @ =0x00fffffe cmp r1, r0 @@ -341,10 +341,10 @@ _08054EB8: bx r0 .align 2, 0 _08054EC0: .4byte 0x00ffffff - thumb_func_end sub_8054E90 + thumb_func_end IncrementGameStat - thumb_func_start sub_8054EC4 -sub_8054EC4: @ 8054EC4 + thumb_func_start GetGameStat +GetGameStat: @ 8054EC4 push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -374,7 +374,7 @@ _08054EF8: _08054EFA: pop {r1} bx r1 - thumb_func_end sub_8054EC4 + thumb_func_end GetGameStat thumb_func_start sub_8054F00 sub_8054F00: @ 8054F00 @@ -1715,10 +1715,10 @@ sub_8055864: @ 8055864 bl sub_807B140 bl sub_805610C bl sub_8055CB8 - bl sub_8055E84 + bl sav1_reset_battle_music_maybe bl mapheader_run_script_with_tag_x3 bl sub_815D8F8 - bl sub_80589D4 + bl not_trainer_hill_battle_pyramid ldr r4, _0805591C @ =gUnknown_2036DFC ldr r0, [r4] bl copy_map_tileset2_to_vram_2 @@ -1737,7 +1737,7 @@ _080558D4: bl RoamerMove bl sub_8110920 bl sub_807B1A4 - bl sub_806E918 + bl wild_encounter_reset_coro_args bl mapheader_run_script_with_tag_x5 bl sub_80561B4 ldr r1, _0805591C @ =gUnknown_2036DFC @@ -1792,13 +1792,13 @@ sub_8055920: @ 8055920 bl FlagClear _08055974: bl sub_8055CB8 - bl sub_8055E84 + bl sav1_reset_battle_music_maybe bl mapheader_run_script_with_tag_x3 bl sub_815D8F8 bl UpdateLocationHistoryForRoamer bl RoamerMoveToOtherLocationSet bl sub_8110920 - bl sub_80589D4 + bl not_trainer_hill_battle_pyramid pop {r4} pop {r0} bx r0 @@ -1823,7 +1823,7 @@ sub_80559A8: @ 80559A8 bl sub_8110920 bl sub_8111708 bl set_current_map_header_from_sav1 - bl sub_80589D4 + bl not_trainer_hill_battle_pyramid pop {r0} bx r0 .align 2, 0 @@ -2103,13 +2103,13 @@ _08055BD8: cmp r0, 0x1 beq _08055C68 adds r0, r5, 0 - bl sub_8059CF0 + bl MetatileBehavior_IsWestArrowWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08055C3E adds r0, r5, 0 - bl sub_8059CDC + bl MetatileBehavior_IsEastArrowWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2474,8 +2474,8 @@ sub_8055E78: @ 8055E78 _08055E80: .4byte gUnknown_3005008 thumb_func_end sub_8055E78 - thumb_func_start sub_8055E84 -sub_8055E84: @ 8055E84 + thumb_func_start sav1_reset_battle_music_maybe +sav1_reset_battle_music_maybe: @ 8055E84 ldr r0, _08055E90 @ =gUnknown_3005008 ldr r1, [r0] movs r0, 0 @@ -2483,7 +2483,7 @@ sub_8055E84: @ 8055E84 bx lr .align 2, 0 _08055E90: .4byte gUnknown_3005008 - thumb_func_end sub_8055E84 + thumb_func_end sav1_reset_battle_music_maybe thumb_func_start sub_8055E94 sub_8055E94: @ 8055E94 @@ -2550,8 +2550,8 @@ _08055F14: bx r0 thumb_func_end sub_8055E94 - thumb_func_start sub_8055F1C -sub_8055F1C: @ 8055F1C + thumb_func_start Overworld_ChangeMusicToDefault +Overworld_ChangeMusicToDefault: @ 8055F1C push {r4,lr} bl GetCurrentMapMusic adds r4, r0, 0 @@ -2571,7 +2571,7 @@ _08055F42: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8055F1C + thumb_func_end Overworld_ChangeMusicToDefault thumb_func_start sub_8055F48 sub_8055F48: @ 8055F48 @@ -2811,7 +2811,7 @@ _08056106: sub_805610C: @ 805610C push {lr} ldr r0, _0805611C @ =gUnknown_2031DDC - bl sub_8082FE8 + bl GetLocalWildMon ldr r1, _08056120 @ =gUnknown_2031DDA strh r0, [r1] pop {r0} @@ -3071,7 +3071,7 @@ sub_80562B0: @ 80562B0 push {r4-r6,lr} mov r6, r8 push {r6} - bl sub_8056E74 + bl MoveSaveBlocks_ResetHeap_ bl sub_8056E80 movs r0, 0 bl sub_8001618 @@ -3220,7 +3220,7 @@ _0805641C: .4byte gUnknown_3005018 thumb_func_start sub_8056420 sub_8056420: @ 8056420 push {lr} - bl sub_80A0EB4 + bl ResetSafariZoneFlag pop {r0} bx r0 thumb_func_end sub_8056420 @@ -3421,7 +3421,7 @@ _080565C8: bl sub_8056578 cmp r4, 0 beq _080565D4 - bl sub_8056A04 + bl SetFieldVBlankCallback _080565D4: pop {r4} pop {r0} @@ -3505,8 +3505,8 @@ CB2_NewGame: @ 8056644 movs r0, 0 str r0, [r1] ldr r0, _08056698 @ =gUnknown_3003528 - bl sub_8056E5C - bl sub_8056A04 + bl do_load_map_stuff_loop + bl SetFieldVBlankCallback ldr r0, _0805669C @ =sub_8056534 bl sub_80565E0 ldr r0, _080566A0 @ =sub_80565B4 @@ -3552,9 +3552,9 @@ c2_whiteout: @ 80566A4 movs r0, 0 strb r0, [r1] mov r0, sp - bl sub_8056E5C + bl do_load_map_stuff_loop bl sub_8112364 - bl sub_8056A04 + bl SetFieldVBlankCallback ldr r0, _08056714 @ =sub_8056534 bl sub_80565E0 ldr r0, _08056718 @ =sub_80565B4 @@ -3596,7 +3596,7 @@ _08056748: .4byte sub_805674C sub_805674C: @ 805674C push {lr} ldr r0, _08056768 @ =gUnknown_3003528 - bl sub_8056E5C + bl do_load_map_stuff_loop bl sub_8113748 lsls r0, 24 lsrs r0, 24 @@ -3607,7 +3607,7 @@ sub_805674C: @ 805674C .align 2, 0 _08056768: .4byte gUnknown_3003528 _0805676C: - bl sub_8056A04 + bl SetFieldVBlankCallback ldr r0, _08056780 @ =sub_8056534 bl sub_80565E0 ldr r0, _08056784 @ =sub_80565B4 @@ -3644,7 +3644,7 @@ c2_80567AC: @ 80567AC bl sub_8056A5C cmp r0, 0 beq _080567CC - bl sub_8056A04 + bl SetFieldVBlankCallback ldr r0, _080567D4 @ =c1_link_related bl sub_80565E0 bl sub_80578D8 @@ -3688,7 +3688,7 @@ c2_exit_to_overworld_2_local: @ 8056808 bl sub_8056CD8 cmp r0, 0 beq _0805681E - bl sub_8056A04 + bl SetFieldVBlankCallback ldr r0, _08056828 @ =sub_80565B4 bl SetMainCallback2 _0805681E: @@ -3706,7 +3706,7 @@ c2_exit_to_overworld_2_link: @ 805682C cmp r0, 0 bne _08056846 ldr r0, _0805684C @ =gUnknown_3003528 - bl sub_8056D44 + bl map_loading_iteration_2_link cmp r0, 0 beq _08056846 ldr r0, _08056850 @ =sub_80565B4 @@ -3917,19 +3917,19 @@ _080569F4: bx r0 thumb_func_end sub_80569BC - thumb_func_start sub_8056A04 -sub_8056A04: @ 8056A04 + thumb_func_start SetFieldVBlankCallback +SetFieldVBlankCallback: @ 8056A04 push {lr} - ldr r0, _08056A10 @ =sub_8056A14 + ldr r0, _08056A10 @ =VBlankCB_Field bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_08056A10: .4byte sub_8056A14 - thumb_func_end sub_8056A04 +_08056A10: .4byte VBlankCB_Field + thumb_func_end SetFieldVBlankCallback - thumb_func_start sub_8056A14 -sub_8056A14: @ 8056A14 + thumb_func_start VBlankCB_Field +VBlankCB_Field: @ 8056A14 push {lr} bl LoadOam bl ProcessSpriteCopyRequests @@ -3939,7 +3939,7 @@ sub_8056A14: @ 8056A14 bl TransferTilesetAnimsBuffer pop {r0} bx r0 - thumb_func_end sub_8056A14 + thumb_func_end VBlankCB_Field thumb_func_start sub_8056A34 sub_8056A34: @ 8056A34 @@ -4298,8 +4298,8 @@ _08056D3E: bx r1 thumb_func_end sub_8056CD8 - thumb_func_start sub_8056D44 -sub_8056D44: @ 8056D44 + thumb_func_start map_loading_iteration_2_link +map_loading_iteration_2_link: @ 8056D44 push {r4,lr} adds r4, r0, 0 ldrb r0, [r4] @@ -4407,7 +4407,7 @@ _08056E3E: strb r0, [r4] b _08056E54 _08056E46: - bl sub_8056A04 + bl SetFieldVBlankCallback ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -4419,10 +4419,10 @@ _08056E56: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8056D44 + thumb_func_end map_loading_iteration_2_link - thumb_func_start sub_8056E5C -sub_8056E5C: @ 8056E5C + thumb_func_start do_load_map_stuff_loop +do_load_map_stuff_loop: @ 8056E5C push {r4,lr} adds r4, r0, 0 _08056E60: @@ -4434,15 +4434,15 @@ _08056E60: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8056E5C + thumb_func_end do_load_map_stuff_loop - thumb_func_start sub_8056E74 -sub_8056E74: @ 8056E74 + thumb_func_start MoveSaveBlocks_ResetHeap_ +MoveSaveBlocks_ResetHeap_: @ 8056E74 push {lr} bl sub_804C0A4 pop {r0} bx r0 - thumb_func_end sub_8056E74 + thumb_func_end MoveSaveBlocks_ResetHeap_ thumb_func_start sub_8056E80 sub_8056E80: @ 8056E80 @@ -4637,11 +4637,11 @@ sub_8057024: @ 8057024 cmp r4, 0 bne _08057050 movs r0, 0 - bl sub_805FECC + bl npc_paltag_set_load b _08057056 _08057050: movs r0, 0x1 - bl sub_805FECC + bl npc_paltag_set_load _08057056: bl FieldEffectActiveListClear bl sub_8079C08 @@ -4704,7 +4704,7 @@ mli4_mapscripts_and_other: @ 805709C ldrb r3, [r3, 0x8] bl InitPlayerAvatar ldrb r0, [r5] - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags bl sub_80559E4 movs r0, 0 movs r1, 0 @@ -4962,7 +4962,7 @@ sub_80572D8: @ 80572D8 push {lr} ldr r0, _080572F4 @ =gUnknown_3003528 bl sub_8057300 - bl sub_8056A04 + bl SetFieldVBlankCallback ldr r0, _080572F8 @ =sub_8056534 bl sub_80565E0 ldr r0, _080572FC @ =sub_80565B4 @@ -5180,7 +5180,7 @@ _080574B8: bl do_scheduled_bg_tilemap_copies_to_vram cmp r4, 0 beq _080574E0 - bl sub_8056A04 + bl SetFieldVBlankCallback _080574E0: pop {r4} pop {r0} @@ -5347,7 +5347,7 @@ _0805762C: ldr r0, _08057640 @ =gUnknown_3005050 ldr r1, _08057644 @ =sub_8057748 str r1, [r0] - bl sub_8056A04 + bl SetFieldVBlankCallback movs r0, 0 strb r0, [r7] movs r0, 0x1 diff --git a/asm/party_menu.s b/asm/party_menu.s index 30e002835..bd3adc61b 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -649,7 +649,7 @@ _0811EF8C: ldr r4, _0811EFAC @ =gUnknown_203B0B8 ldr r0, _0811EFB0 @ =gUnknown_8E82700 mov r1, sp - bl sub_80F6AA0 + bl malloc_and_decompress adds r1, r0, 0 str r1, [r4] ldr r2, [sp] @@ -2531,7 +2531,7 @@ sub_811FE24: @ 811FE24 ldr r5, _0811FE60 @ =gUnknown_2021D18 ldr r1, _0811FE64 @ =gUnknown_84176CF adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r5, 0 movs r1, 0x1 bl sub_81202F8 @@ -2585,7 +2585,7 @@ sub_811FEA4: @ 811FEA4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -3387,7 +3387,7 @@ _08120468: ldr r4, _081204A4 @ =gUnknown_2021D18 ldr r1, _081204A8 @ =gUnknown_8416C2A adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r6, 0 bl sub_81202F8 @@ -3428,7 +3428,7 @@ sub_81204AC: @ 81204AC ldr r4, _08120504 @ =gUnknown_2021D18 ldr r1, _08120508 @ =gUnknown_8416CAC adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r5, 0 bl sub_81202F8 @@ -3462,7 +3462,7 @@ sub_812050C: @ 812050C ldr r4, _08120550 @ =gUnknown_2021D18 ldr r1, _08120554 @ =gUnknown_8416C49 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r5, 0 bl sub_81202F8 @@ -3509,7 +3509,7 @@ sub_8120558: @ 8120558 ldr r4, _081205C0 @ =gUnknown_2021D18 ldr r1, _081205C4 @ =gUnknown_8416CEA adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 adds r1, r6, 0 bl sub_81202F8 @@ -3536,7 +3536,7 @@ sub_81205C8: @ 81205C8 lsrs r4, r5, 16 adds r7, r4, 0 adds r0, r4, 0 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3634,7 +3634,7 @@ _08120686: bl StringCopy ldr r0, _081206A0 @ =gUnknown_2021D18 ldr r1, _081206A4 @ =gUnknown_8416D78 - bl sub_8008FCC + bl StringExpandPlaceholders pop {r0} bx r0 .align 2, 0 @@ -3929,7 +3929,7 @@ _081208B6: bne _081208DE adds r0, r4, 0 movs r1, 0 - bl sub_8043A70 + bl CheckPartyPokerus lsls r0, 24 cmp r0, 0 bne _081208DC @@ -4198,7 +4198,7 @@ sub_8120AC4: @ 8120AC4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4876,7 +4876,7 @@ _08120FAC: .4byte sub_8120FB0 thumb_func_start sub_8120FB0 sub_8120FB0: @ 8120FB0 push {lr} - bl sub_8011174 + bl FreeRestoreBattleData bl sub_804C230 bl sub_815AC20 ldr r0, _08120FC8 @ =sub_815ABFC @@ -4982,25 +4982,25 @@ _08121076: b _081210A0 _0812107C: ldr r0, _08121084 @ =gUnknown_845A010 - bl sub_8003B24 + bl InitWindows b _081210A6 .align 2, 0 _08121084: .4byte gUnknown_845A010 _08121088: ldr r0, _08121090 @ =gUnknown_845A050 - bl sub_8003B24 + bl InitWindows b _081210A6 .align 2, 0 _08121090: .4byte gUnknown_845A050 _08121094: ldr r0, _0812109C @ =gUnknown_845A090 - bl sub_8003B24 + bl InitWindows b _081210A6 .align 2, 0 _0812109C: .4byte gUnknown_845A090 _081210A0: ldr r0, _081210F4 @ =gUnknown_845A0D0 - bl sub_8003B24 + bl InitWindows _081210A6: bl DeactivateAllTextPrinters movs r4, 0 @@ -5055,7 +5055,7 @@ _0812110E: cmp r2, 0x1 bne _08121188 ldr r0, _08121178 @ =gUnknown_845A118 - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -5084,14 +5084,14 @@ _0812110E: adds r0, r4, 0 movs r1, 0 movs r3, 0x1 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x2 bl CopyWindowToVram ldr r0, _08121184 @ =gUnknown_845A110 - bl sub_8003CE4 + bl AddWindow lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 @@ -5104,7 +5104,7 @@ _08121180: .4byte gUnknown_8459FFC _08121184: .4byte gUnknown_845A110 _08121188: ldr r0, _081211E0 @ =gUnknown_845A108 - bl sub_8003CE4 + bl AddWindow lsls r0, 24 lsrs r6, r0, 24 movs r5, 0x3 @@ -5141,7 +5141,7 @@ _08121194: movs r1, 0 adds r2, r5, 0 movs r3, 0x1 - bl sub_812E51C + bl box_print b _08121224 .align 2, 0 _081211E0: .4byte gUnknown_845A108 @@ -5172,7 +5172,7 @@ _081211F0: movs r1, 0 adds r2, r5, 0 movs r3, 0x1 - bl sub_812E51C + bl box_print _08121224: adds r0, r6, 0 bl PutWindowTilemap @@ -5459,7 +5459,7 @@ sub_812142C: @ 812142C adds r5, r4, 0 ldrb r0, [r0, 0x8] movs r1, 0x5 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 28 lsrs r6, r0, 24 adds r7, r6, 0 @@ -5778,7 +5778,7 @@ sub_8121704: @ 8121704 str r1, [sp, 0x8] movs r1, 0 adds r2, r5, 0 - bl sub_812E51C + bl box_print add sp, 0xC pop {r4,r5} pop {r0} @@ -5997,7 +5997,7 @@ sub_81218BC: @ 81218BC adds r5, r4, 0 ldrb r0, [r7, 0x8] movs r1, 0x5 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 28 lsrs r6, r0, 24 cmp r4, 0 @@ -6303,7 +6303,7 @@ sub_8121B2C: @ 8121B2C mov r9, r1 ldrb r0, [r6, 0x8] movs r1, 0x5 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 28 lsrs r7, r0, 24 mov r1, r8 @@ -6486,7 +6486,7 @@ _08121CAA: ldr r1, [r1] str r1, [sp, 0x8] movs r1, 0x1 - bl sub_812E51C + bl box_print _08121CD0: add sp, 0xC pop {r3} @@ -6574,14 +6574,14 @@ _08121D6C: .4byte gUnknown_845A138 _08121D70: ldr r0, _08121D7C @ =gUnknown_845A140 _08121D72: - bl sub_8003CE4 + bl AddWindow strb r0, [r5] b _08121D88 .align 2, 0 _08121D7C: .4byte gUnknown_845A140 _08121D80: ldr r0, _08121D9C @ =gUnknown_845A120 - bl sub_8003CE4 + bl AddWindow strb r0, [r4, 0xD] _08121D88: cmp r6, 0 @@ -6615,7 +6615,7 @@ _08121DB0: adds r0, r1 ldr r1, [r0] adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldrb r0, [r5] movs r1, 0x2 str r1, [sp] @@ -6761,7 +6761,7 @@ _08121ED2: str r0, [sp, 0x1C] str r1, [sp, 0x20] add r0, sp, 0x1C - bl sub_8003CE4 + bl AddWindow ldr r6, _08121EFC @ =gUnknown_203B09C ldr r1, [r6] strb r0, [r1, 0xC] @@ -6831,7 +6831,7 @@ _08121F3C: str r1, [sp, 0x10] movs r1, 0x2 mov r2, r9 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -6938,7 +6938,7 @@ _08122030: .4byte gUnknown_845A160 sub_8122034: @ 8122034 push {r4,lr} ldr r0, _0812205C @ =gUnknown_845A168 - bl sub_8003CE4 + bl AddWindow ldr r4, _08122060 @ =gUnknown_203B09C ldr r1, [r4] strb r0, [r1, 0xC] @@ -6984,7 +6984,7 @@ sub_8122084: @ 8122084 lsrs r4, 24 ldr r5, _081220CC @ =gUnknown_2021D18 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r2, _081220D0 @ =gUnknown_3003E50 ldrb r0, [r2] movs r1, 0x1 @@ -7019,7 +7019,7 @@ _081220D0: .4byte gUnknown_3003E50 sub_81220D4: @ 81220D4 push {r4,lr} ldr r0, _08122108 @ =gUnknown_845A170 - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -7093,7 +7093,7 @@ _0812216C: cmp r0, 0xFF bne _0812217A ldr r0, _081221C8 @ =gUnknown_845A178 - bl sub_8003CE4 + bl AddWindow strb r0, [r4, 0xE] _0812217A: ldrb r0, [r4, 0xE] @@ -7121,7 +7121,7 @@ _0812217A: movs r1, 0x2 movs r2, 0x3 movs r3, 0x6 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldrb r0, [r4, 0xE] bl PutWindowTilemap movs r0, 0x2 @@ -7553,7 +7553,7 @@ sub_81224D0: @ 81224D0 .align 2, 0 _081224F4: .4byte gUnknown_202063C _081224F8: - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _0812251C @@ -7643,7 +7643,7 @@ _08122588: adds r0, r7, r5 ldrb r4, [r0] adds r0, r1, 0 - bl sub_80980F8 + bl itemid_is_mail adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7676,7 +7676,7 @@ _081225CC: adds r0, r5, r7 ldrb r4, [r0, 0x6] adds r0, r1, 0 - bl sub_80980F8 + bl itemid_is_mail adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -8327,7 +8327,7 @@ _08122AB6: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _08122AEC @@ -8727,8 +8727,8 @@ _08122DF8: .4byte gUnknown_203B0A0 _08122DFC: .4byte sub_8122C30 thumb_func_end sub_8122DBC - thumb_func_start sub_8122E00 -sub_8122E00: @ 8122E00 + thumb_func_start brm_switch +brm_switch: @ 8122E00 push {r4-r6,lr} adds r6, r0, 0 lsls r6, 24 @@ -8767,7 +8767,7 @@ _08122E4C: .4byte gUnknown_203B0A0 _08122E50: .4byte gUnknown_203B09C _08122E54: .4byte gUnknown_3005090 _08122E58: .4byte sub_811FB28 - thumb_func_end sub_8122E00 + thumb_func_end brm_switch thumb_func_start sub_8122E5C sub_8122E5C: @ 8122E5C @@ -8808,22 +8808,22 @@ _08122E8C: adds r0, r2, 0 ldrb r0, [r0] movs r1, 0x1 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6] add r0, sp, 0x8 ldrb r0, [r0] movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6, 0x2] add r0, sp, 0x8 ldrb r0, [r0] movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6, 0x4] add r0, sp, 0x8 ldrb r0, [r0] movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6, 0x6] strh r4, [r6, 0x10] movs r1, 0x4 @@ -8855,22 +8855,22 @@ _08122EEE: adds r0, r2, 0 ldrb r0, [r0, 0x1] movs r1, 0x1 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6, 0x8] add r0, sp, 0x8 ldrb r0, [r0, 0x1] movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6, 0xA] add r0, sp, 0x8 ldrb r0, [r0, 0x1] movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6, 0xC] add r0, sp, 0x8 ldrb r0, [r0, 0x1] movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute strh r0, [r6, 0xE] strh r4, [r6, 0x12] movs r1, 0xC @@ -9339,7 +9339,7 @@ sub_8123270: @ 8123270 ldrsh r0, [r6, r2] negs r0, r0 strh r0, [r6, 0x16] - bl sub_81234EC + bl swap_pokemon_and_oams ldr r4, _08123374 @ =gUnknown_203B0A0 ldrb r0, [r4, 0x9] bl sub_811F234 @@ -9488,8 +9488,8 @@ _08123418: bx r0 thumb_func_end sub_8123388 - thumb_func_start sub_8123420 -sub_8123420: @ 8123420 + thumb_func_start oamt_swap_pos +oamt_swap_pos: @ 8123420 push {r4-r6,lr} mov r6, r10 mov r5, r9 @@ -9591,10 +9591,10 @@ sub_8123420: @ 8123420 bx r0 .align 2, 0 _081234E8: .4byte gUnknown_202063C - thumb_func_end sub_8123420 + thumb_func_end oamt_swap_pos - thumb_func_start sub_81234EC -sub_81234EC: @ 81234EC + thumb_func_start swap_pokemon_and_oams +swap_pokemon_and_oams: @ 81234EC push {r4-r6,lr} sub sp, 0x8 ldr r1, _08123580 @ =gUnknown_203B0B4 @@ -9639,22 +9639,22 @@ sub_81234EC: @ 81234EC adds r0, 0xB ldr r1, [sp, 0x4] adds r1, 0xB - bl sub_8123420 + bl oamt_swap_pos ldr r0, [sp] adds r0, 0xA ldr r1, [sp, 0x4] adds r1, 0xA - bl sub_8123420 + bl oamt_swap_pos ldr r0, [sp] adds r0, 0x9 ldr r1, [sp, 0x4] adds r1, 0x9 - bl sub_8123420 + bl oamt_swap_pos ldr r0, [sp] adds r0, 0xC ldr r1, [sp, 0x4] adds r1, 0xC - bl sub_8123420 + bl oamt_swap_pos add sp, 0x8 pop {r4-r6} pop {r0} @@ -9663,7 +9663,7 @@ sub_81234EC: @ 81234EC _08123580: .4byte gUnknown_203B0B4 _08123584: .4byte gUnknown_203B0A0 _08123588: .4byte gUnknown_2024284 - thumb_func_end sub_81234EC + thumb_func_end swap_pokemon_and_oams thumb_func_start sub_812358C sub_812358C: @ 812358C @@ -9748,8 +9748,8 @@ _08123638: .4byte gUnknown_3005090 _0812363C: .4byte sub_811FB28 thumb_func_end sub_81235E8 - thumb_func_start sub_8123640 -sub_8123640: @ 8123640 + thumb_func_start brm_cancel_1 +brm_cancel_1: @ 8123640 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -9791,7 +9791,7 @@ _08123682: .align 2, 0 _08123698: .4byte gUnknown_3005090 _0812369C: .4byte sub_811FB28 - thumb_func_end sub_8123640 + thumb_func_end brm_cancel_1 thumb_func_start sub_81236A0 sub_81236A0: @ 81236A0 @@ -9937,7 +9937,7 @@ _081237C4: .4byte gUnknown_2024284 _081237C8: .4byte sub_81238A4 _081237CC: ldrh r0, [r6] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _081237F8 @@ -10113,7 +10113,7 @@ sub_8123930: @ 8123930 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -10165,7 +10165,7 @@ _081239A4: .4byte gUnknown_3005090 _081239A8: .4byte sub_81203B8 _081239AC: ldrh r0, [r5] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _081239EC @@ -10521,7 +10521,7 @@ _08123C9C: ldr r4, _08123CB8 @ =gUnknown_2021D18 ldr r1, _08123CBC @ =gUnknown_8416C8F adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 b _08123CC8 .align 2, 0 @@ -10752,7 +10752,7 @@ sub_8123E8C: @ 8123E8C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -10871,7 +10871,7 @@ sub_8123F80: @ 8123F80 push {r7} lsls r0, 24 lsrs r5, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -11423,7 +11423,7 @@ _08124414: .4byte gUnknown_2024284 _08124418: ldr r0, _08124424 @ =gUnknown_2021D18 ldr r1, _08124428 @ =gUnknown_84170BC - bl sub_8008FCC + bl StringExpandPlaceholders b _08124434 .align 2, 0 _08124424: .4byte gUnknown_2021D18 @@ -11431,7 +11431,7 @@ _08124428: .4byte gUnknown_84170BC _0812442C: ldr r0, _08124478 @ =gUnknown_2021D18 ldr r1, _0812447C @ =gUnknown_84170E0 - bl sub_8008FCC + bl StringExpandPlaceholders _08124434: movs r0, 0x1A bl sub_80722CC @@ -11472,8 +11472,8 @@ _08124488: .4byte gUnknown_3005090 _0812448C: .4byte sub_81203B8 thumb_func_end sub_8124384 - thumb_func_start sub_8124490 -sub_8124490: @ 8124490 + thumb_func_start brm_trade_1 +brm_trade_1: @ 8124490 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -11539,7 +11539,7 @@ sub_8124490: @ 8124490 adds r0, r1 ldr r1, [r0] adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x1A bl sub_80722CC ldr r4, _08124574 @ =gUnknown_203B09C @@ -11588,7 +11588,7 @@ _08124590: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8124490 + thumb_func_end brm_trade_1 thumb_func_start nullsub_93 nullsub_93: @ 81245A0 @@ -11764,7 +11764,7 @@ _081246F0: ldr r0, _08124740 @ =gUnknown_2021D18 ldr r1, _08124744 @ =gUnknown_8417615 _08124720: - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r6, 0 bl sub_81247C4 ldr r0, _08124748 @ =gUnknown_203B09C @@ -11897,7 +11897,7 @@ sub_8124828: @ 8124828 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -12040,7 +12040,7 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 812492C beq _0812494C _08124946: adds r0, r2, 0 - bl sub_8123640 + bl brm_cancel_1 _0812494C: pop {r0} bx r0 @@ -12279,7 +12279,7 @@ hm_prepare_waterfall: @ 8124AF8 bl sub_8058F78 lsls r0, 24 lsrs r0, 24 - bl sub_805A104 + bl MetatileBehavior_IsWaterfall lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12531,7 +12531,7 @@ _08124D0C: _08124D16: ldr r0, _08124D30 @ =gUnknown_203AD30 ldrh r0, [r0] - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -12549,7 +12549,7 @@ _08124D3C: .4byte sub_8124DB0 _08124D40: .4byte sub_8124FC8 _08124D44: ldrh r0, [r4] - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -12986,7 +12986,7 @@ _0812507C: _081250C8: ldr r0, _081250D4 @ =gUnknown_2021D18 ldr r1, _081250D8 @ =gUnknown_8416F4E - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _081250D4: .4byte gUnknown_2021D18 @@ -12994,7 +12994,7 @@ _081250D8: .4byte gUnknown_8416F4E _081250DC: ldr r0, _081250E8 @ =gUnknown_2021D18 ldr r1, _081250EC @ =gUnknown_8416F8C - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _081250E8: .4byte gUnknown_2021D18 @@ -13002,7 +13002,7 @@ _081250EC: .4byte gUnknown_8416F8C _081250F0: ldr r0, _081250FC @ =gUnknown_2021D18 ldr r1, _08125100 @ =gUnknown_8416F9A - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _081250FC: .4byte gUnknown_2021D18 @@ -13010,7 +13010,7 @@ _08125100: .4byte gUnknown_8416F9A _08125104: ldr r0, _08125110 @ =gUnknown_2021D18 ldr r1, _08125114 @ =gUnknown_8416FB2 - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125110: .4byte gUnknown_2021D18 @@ -13018,7 +13018,7 @@ _08125114: .4byte gUnknown_8416FB2 _08125118: ldr r0, _08125124 @ =gUnknown_2021D18 ldr r1, _08125128 @ =gUnknown_8416F6F - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125124: .4byte gUnknown_2021D18 @@ -13026,7 +13026,7 @@ _08125128: .4byte gUnknown_8416F6F _0812512C: ldr r0, _08125138 @ =gUnknown_2021D18 ldr r1, _0812513C @ =gUnknown_8417052 - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125138: .4byte gUnknown_2021D18 @@ -13034,7 +13034,7 @@ _0812513C: .4byte gUnknown_8417052 _08125140: ldr r0, _0812514C @ =gUnknown_2021D18 ldr r1, _08125150 @ =gUnknown_8417075 - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _0812514C: .4byte gUnknown_2021D18 @@ -13042,7 +13042,7 @@ _08125150: .4byte gUnknown_8417075 _08125154: ldr r0, _08125160 @ =gUnknown_2021D18 ldr r1, _08125164 @ =gUnknown_8416FED - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _08125160: .4byte gUnknown_2021D18 @@ -13089,7 +13089,7 @@ _081251BC: bl StringCopy ldr r0, _081251D4 @ =gUnknown_2021D18 ldr r1, _081251D8 @ =gUnknown_8417032 - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _081251CC: .4byte gUnknown_2021CF0 @@ -13099,7 +13099,7 @@ _081251D8: .4byte gUnknown_8417032 _081251DC: ldr r0, _081251E8 @ =gUnknown_2021D18 ldr r1, _081251EC @ =gUnknown_8417002 - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _081251E8: .4byte gUnknown_2021D18 @@ -13107,7 +13107,7 @@ _081251EC: .4byte gUnknown_8417002 _081251F0: ldr r0, _081251FC @ =gUnknown_2021D18 ldr r1, _08125200 @ =gUnknown_8416FC7 - bl sub_8008FCC + bl StringExpandPlaceholders b _0812520C .align 2, 0 _081251FC: .4byte gUnknown_2021D18 @@ -13115,7 +13115,7 @@ _08125200: .4byte gUnknown_8416FC7 _08125204: ldr r0, _08125210 @ =gUnknown_2021D18 ldr r1, _08125214 @ =gUnknown_84169DC - bl sub_8008FCC + bl StringExpandPlaceholders _0812520C: pop {r0} bx r0 @@ -13316,7 +13316,7 @@ _08125380: adds r0, r7, 0 bl sub_8124DC0 ldr r1, _081253A8 @ =gUnknown_3005E98 - ldr r0, _081253AC @ =sub_81253B0 + ldr r0, _081253AC @ =ItemUseCB_Medicine str r0, [r1] _08125398: pop {r3} @@ -13327,11 +13327,11 @@ _08125398: .align 2, 0 _081253A4: .4byte 0x0000ffff _081253A8: .4byte gUnknown_3005E98 -_081253AC: .4byte sub_81253B0 +_081253AC: .4byte ItemUseCB_Medicine thumb_func_end sub_81252D0 - thumb_func_start sub_81253B0 -sub_81253B0: @ 81253B0 + thumb_func_start ItemUseCB_Medicine +ItemUseCB_Medicine: @ 81253B0 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -13523,7 +13523,7 @@ _08125538: _08125548: .4byte gUnknown_2021CD0 _0812554C: .4byte gUnknown_2021D18 _08125550: .4byte gUnknown_3005090 - thumb_func_end sub_81253B0 + thumb_func_end ItemUseCB_Medicine thumb_func_start sub_8125554 sub_8125554: @ 8125554 @@ -13543,7 +13543,7 @@ sub_8125554: @ 8125554 ldr r4, _081255AC @ =gUnknown_2021D18 ldr r1, _081255B0 @ =gUnknown_8416F27 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 bl sub_81202F8 @@ -14220,7 +14220,7 @@ sub_8125AF0: @ 8125AF0 adds r1, r0, 0 ldr r4, _08125B10 @ =gUnknown_2021D18 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 @@ -14422,7 +14422,7 @@ _08125C84: ldr r4, _08125CE4 @ =gUnknown_2021D18 ldr r1, _08125CE8 @ =gUnknown_8416DB3 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 @@ -14561,7 +14561,7 @@ sub_8125DBC: @ 8125DBC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -14951,7 +14951,7 @@ sub_81260D8: @ 81260D8 ldr r4, _0812612C @ =gUnknown_2021D18 ldr r1, _08126130 @ =gUnknown_8416E6B adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 @@ -15016,7 +15016,7 @@ sub_8126170: @ 8126170 muls r1, r0 ldr r0, _081261A4 @ =gUnknown_2024284 adds r4, r1, r0 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r5, r0, 24 cmp r5, 0 @@ -15050,7 +15050,7 @@ _081261AE: ldr r4, _08126200 @ =gUnknown_2021D18 ldr r1, _08126204 @ =gUnknown_8416E84 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 @@ -15149,8 +15149,8 @@ _081262A4: bx r0 thumb_func_end sub_812628C - thumb_func_start sub_81262AC -sub_81262AC: @ 81262AC + thumb_func_start dp05_rare_candy +dp05_rare_candy: @ 81262AC push {r4-r7,lr} mov r7, r8 push {r7} @@ -15225,7 +15225,7 @@ _0812633C: .align 2, 0 _08126348: .4byte gUnknown_3005E98 _0812634C: .4byte sub_8126350 - thumb_func_end sub_81262AC + thumb_func_end dp05_rare_candy thumb_func_start sub_8126350 sub_8126350: @ 8126350 @@ -15293,7 +15293,7 @@ sub_8126350: @ 8126350 ldr r4, _08126430 @ =gUnknown_2021D18 ldr r1, _08126434 @ =gUnknown_8417017 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 @@ -15760,7 +15760,7 @@ sub_8126770: @ 8126770 ldr r4, _081267F4 @ =gUnknown_2021D18 ldr r1, _081267F8 @ =gUnknown_8416DF7 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 @@ -15824,7 +15824,7 @@ sub_8126804: @ 8126804 ldr r4, _08126884 @ =gUnknown_2021D18 ldr r1, _08126888 @ =gUnknown_8416DB3 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 @@ -16165,7 +16165,7 @@ sub_8126AFC: @ 8126AFC ldr r4, _08126B50 @ =gUnknown_2021D18 ldr r1, _08126B54 @ =gUnknown_8416F27 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 bl sub_81202F8 @@ -16655,7 +16655,7 @@ sub_8126EDC: @ 8126EDC sub sp, 0xC ldr r0, _08126EF8 @ =gUnknown_203AD30 ldrh r0, [r0] - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -16736,7 +16736,7 @@ _08126F84: .4byte gUnknown_203B0A0 _08126F88: .4byte gUnknown_2024284 _08126F8C: ldrh r0, [r5] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _08126FA0 @@ -16780,7 +16780,7 @@ sub_8126FD8: @ 8126FD8 lsrs r4, r0, 24 ldr r5, _08127004 @ =gUnknown_203B0A0 ldrh r0, [r5, 0xC] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _08127010 @@ -17093,7 +17093,7 @@ sub_8127268: @ 8127268 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -17135,7 +17135,7 @@ _081272C4: .4byte gUnknown_203B0D8 _081272C8: .4byte gUnknown_2021D18 _081272CC: adds r0, r4, 0 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _081272F0 @@ -18090,7 +18090,7 @@ _08127A2C: .4byte sub_8107ECC _08127A30: ldr r0, _08127A74 @ =gUnknown_203AD30 ldrh r0, [r0] - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 ldr r4, _08127A78 @ =sub_8107ECC @@ -18361,7 +18361,7 @@ _08127C64: ldr r0, _08127CA4 @ =gUnknown_2021D18 ldr r1, _08127CA8 @ =gUnknown_8416A1E _08127C86: - bl sub_8008FCC + bl StringExpandPlaceholders _08127C8A: movs r0, 0 _08127C8C: @@ -19302,7 +19302,7 @@ sub_8128370: @ 8128370 push {lr} sub sp, 0xC ldr r1, _08128398 @ =gUnknown_3005024 - ldr r0, _0812839C @ =sub_81283E4 + ldr r0, _0812839C @ =hm_add_c3_without_phase_2 str r0, [r1] movs r0, 0xF str r0, [sp] @@ -19320,7 +19320,7 @@ sub_8128370: @ 8128370 bx r0 .align 2, 0 _08128398: .4byte gUnknown_3005024 -_0812839C: .4byte sub_81283E4 +_0812839C: .4byte hm_add_c3_without_phase_2 _081283A0: .4byte sub_811FB28 _081283A4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_8128370 @@ -19332,7 +19332,7 @@ sub_81283A8: @ 81283A8 lsls r0, 24 lsrs r0, 24 ldr r2, _081283D4 @ =gUnknown_3005024 - ldr r1, _081283D8 @ =sub_81283E4 + ldr r1, _081283D8 @ =hm_add_c3_without_phase_2 str r1, [r2] movs r1, 0 str r1, [sp] @@ -19349,27 +19349,27 @@ sub_81283A8: @ 81283A8 bx r0 .align 2, 0 _081283D4: .4byte gUnknown_3005024 -_081283D8: .4byte sub_81283E4 +_081283D8: .4byte hm_add_c3_without_phase_2 _081283DC: .4byte sub_811FB28 _081283E0: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_81283A8 - thumb_func_start sub_81283E4 -sub_81283E4: @ 81283E4 + thumb_func_start hm_add_c3_without_phase_2 +hm_add_c3_without_phase_2: @ 81283E4 push {lr} bl sub_807DC00 - ldr r0, _081283F8 @ =sub_81283FC + ldr r0, _081283F8 @ =task_hm_without_phase_2 movs r1, 0xA bl CreateTask movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_081283F8: .4byte sub_81283FC - thumb_func_end sub_81283E4 +_081283F8: .4byte task_hm_without_phase_2 + thumb_func_end hm_add_c3_without_phase_2 - thumb_func_start sub_81283FC -sub_81283FC: @ 81283FC + thumb_func_start task_hm_without_phase_2 +task_hm_without_phase_2: @ 81283FC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -19385,6 +19385,6 @@ _0812841A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_81283FC + thumb_func_end task_hm_without_phase_2 .align 2, 0 @ Don't pad with nop. diff --git a/asm/player_pc.s b/asm/player_pc.s index d6fd03d4a..58870c6b1 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -145,7 +145,7 @@ _080EB778: .4byte gUnknown_8402248 _080EB77C: ldr r0, _080EB804 @ =gUnknown_8402250 _080EB77E: - bl sub_8003CE4 + bl AddWindow strh r0, [r7, 0x14] ldrb r0, [r7, 0x14] movs r1, 0 @@ -459,7 +459,7 @@ _080EBA18: bl sub_812B1F0 _080EBA1E: ldr r0, _080EBA80 @ =gUnknown_8402258 - bl sub_8003CE4 + bl AddWindow strh r0, [r6, 0x14] lsls r0, 24 lsrs r0, 24 @@ -1255,7 +1255,7 @@ _080EC06C: ldr r4, _080EC088 @ =gUnknown_2021D18 ldr r1, _080EC08C @ =gUnknown_8417806 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _080EC090 @ =sub_80EC0D8 adds r0, r5, 0 movs r1, 0x2 @@ -1599,7 +1599,7 @@ sub_80EC324: @ 80EC324 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r0, 24 movs r1, 0x1 diff --git a/asm/pokedex.s b/asm/pokedex.s index 5eb3bc948..6ec2ca7be 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -72,8 +72,8 @@ sub_8088E74: @ 8088E74 bx r1 thumb_func_end sub_8088E74 - thumb_func_start sub_8088E8C -sub_8088E8C: @ 8088E8C + thumb_func_start pokedex_count +pokedex_count: @ 8088E8C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -117,7 +117,7 @@ _08088ECA: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8088E8C + thumb_func_end pokedex_count thumb_func_start sub_8088EDC sub_8088EDC: @ 8088EDC diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 6ed6ca7fd..75a55149c 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -109,7 +109,7 @@ _081025A0: bl sub_80F696C _081025AE: ldr r0, _081026A8 @ =gUnknown_8451ECC - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters bl m4aSoundVSyncOn ldr r0, _081026AC @ =sub_81024C0 @@ -903,16 +903,16 @@ sub_8102C28: @ 8102C28 movs r3, 0 bl FillBgTilemapBufferRect ldr r0, _08102DA4 @ =gUnknown_8451F54 - bl sub_8003CE4 + bl AddWindow ldr r7, _08102DA8 @ =gUnknown_203ACF0 ldr r1, [r7] strb r0, [r1, 0x14] ldr r0, _08102DAC @ =gUnknown_8451F5C - bl sub_8003CE4 + bl AddWindow ldr r1, [r7] strb r0, [r1, 0x15] ldr r0, _08102DB0 @ =gUnknown_8451F64 - bl sub_8003CE4 + bl AddWindow ldr r1, [r7] strb r0, [r1, 0x16] bl sub_806E25C @@ -1508,7 +1508,7 @@ sub_810317C: @ 810317C movs r3, 0 bl FillBgTilemapBufferRect ldr r0, _08103224 @ =gUnknown_845216C - bl sub_8003CE4 + bl AddWindow ldr r2, _08103228 @ =gUnknown_203ACF0 ldr r1, [r2] adds r1, 0x40 @@ -1837,7 +1837,7 @@ sub_810345C: @ 810345C movs r3, 0 bl FillBgTilemapBufferRect ldr r0, _08103504 @ =gUnknown_845216C - bl sub_8003CE4 + bl AddWindow ldr r2, _08103508 @ =gUnknown_203ACF0 ldr r1, [r2] adds r1, 0x40 @@ -4266,7 +4266,7 @@ _08104852: adds r0, r7, 0 adds r1, r5, 0 adds r2, r6, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x18 pop {r4-r7} pop {r0} @@ -4876,7 +4876,7 @@ sub_8104C64: @ 8104C64 orrs r0, r1 str r0, [sp, 0x1C] add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow ldr r1, [r7] adds r1, 0x20 adds r1, r5 @@ -4959,7 +4959,7 @@ _08104D72: adds r1, r0 strh r1, [r3, 0x6] adds r0, r3, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r6] adds r1, 0x24 adds r1, r5 @@ -7028,7 +7028,7 @@ sub_8105E1C: @ 8105E1C movs r3, 0x2 bl FillBgTilemapBufferRect_Palette0 ldr r0, _08105FD0 @ =gUnknown_84521D4 - bl sub_8003CE4 + bl AddWindow ldr r4, _08105FD4 @ =gUnknown_203ACF0 ldr r1, [r4] adds r1, 0x4A @@ -7036,12 +7036,12 @@ sub_8105E1C: @ 8105E1C mov r8, r2 strb r0, [r1] ldr r0, _08105FD8 @ =gUnknown_84521DC - bl sub_8003CE4 + bl AddWindow ldr r1, [r4] adds r1, 0x4B strb r0, [r1] ldr r0, _08105FDC @ =gUnknown_84521E4 - bl sub_8003CE4 + bl AddWindow ldr r1, [r4] adds r1, 0x4C strb r0, [r1] @@ -7436,7 +7436,7 @@ _081061F0: cmp r4, 0x6 ble _081061E2 ldr r0, _08106450 @ =gUnknown_8452214 - bl sub_8003CE4 + bl AddWindow ldr r5, _08106424 @ =gUnknown_203ACF0 ldr r1, [r5] adds r1, 0x4A @@ -7453,7 +7453,7 @@ _081061F0: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r2, r0, 0 add r2, r9 adds r0, r4, 0 @@ -7483,7 +7483,7 @@ _08106246: lsls r4, 3 adds r0, r4, r7 ldr r0, [r0] - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] adds r1, 0x4A adds r1, r6 @@ -7503,7 +7503,7 @@ _08106246: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r2, r0, 0 add r2, r9 adds r0, r4, 0 @@ -7525,7 +7525,7 @@ _081062B4: cmp r4, 0x6 ble _08106246 ldr r0, _0810645C @ =gUnknown_84521F4 - bl sub_8003CE4 + bl AddWindow ldr r7, _08106424 @ =gUnknown_203ACF0 ldr r1, [r7] adds r1, 0x52 @@ -7533,24 +7533,24 @@ _081062B4: strb r0, [r1] ldr r5, _08106460 @ =gUnknown_84521FC adds r0, r5, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r7] adds r1, 0x53 strb r0, [r1] ldr r3, _08106464 @ =gUnknown_8452204 mov r8, r3 mov r0, r8 - bl sub_8003CE4 + bl AddWindow ldr r1, [r7] adds r1, 0x54 strb r0, [r1] ldr r0, _08106468 @ =gUnknown_84521EC - bl sub_8003CE4 + bl AddWindow ldr r1, [r7] adds r1, 0x55 strb r0, [r1] ldr r0, _0810646C @ =gUnknown_845220C - bl sub_8003CE4 + bl AddWindow ldr r1, [r7] adds r1, 0x56 strb r0, [r1] @@ -7651,7 +7651,7 @@ _081062B4: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r2, r0, 0 add r2, r9 adds r0, r4, 0 diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index 1833e7dd3..f5a9e738e 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -2864,7 +2864,7 @@ SendMonToPC: @ 8040B90 bl VarGet lsls r0, 24 lsrs r0, 24 - bl sub_80CC79C + bl set_unknown_box_id bl StorageGetCurrentBox lsls r0, 24 lsrs r5, r0, 24 @@ -2892,7 +2892,7 @@ _08040BB2: strh r5, [r0] ldr r0, _08040C0C @ =gUnknown_20370D8 strh r6, [r0] - bl sub_80CC7A8 + bl get_unknown_box_id lsls r0, 16 lsrs r0, 16 cmp r0, r5 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index 52556f941..d4325b05f 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -691,7 +691,7 @@ _080428E4: .4byte _08042A4A _08042904: mov r0, r8 - bl sub_8043A40 + bl GetMonEVCount lsls r0, 16 ldr r1, _0804292C @ =0x01fd0000 cmp r0, r1 @@ -909,7 +909,7 @@ _08042A9C: .4byte _08042B92 _08042ABC: mov r0, r8 - bl sub_8043A40 + bl GetMonEVCount lsls r0, 16 ldr r1, _08042AEC @ =0x01fd0000 cmp r0, r1 @@ -1283,7 +1283,7 @@ sub_8042D50: @ 8042D50 ldr r1, _08042D9C @ =gUnknown_83FCB4A bl StringCopy ldr r0, _08042DA0 @ =gUnknown_83FCB6A - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString pop {r0} bx r0 .align 2, 0 @@ -1383,7 +1383,7 @@ _08042E4C: mov r1, r8 strb r0, [r1] ldr r0, _08042E8C @ =gUnknown_83FBBE9 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString _08042E5A: adds r6, 0x2 adds r5, 0x1 @@ -1399,7 +1399,7 @@ _08042E5A: ldrb r0, [r0] strb r0, [r1] ldr r0, _08042E94 @ =gUnknown_83FBBB4 - bl sub_80D77F4 + bl BattleStringExpandPlaceholdersToDisplayedString _08042E7A: ldr r0, _08042E98 @ =gUnknown_202298C pop {r3} @@ -2783,8 +2783,8 @@ _08043888: .4byte gUnknown_20386AE _0804388C: .4byte gUnknown_825DFF6 thumb_func_end sub_80436F8 - thumb_func_start sub_8043890 -sub_8043890: @ 8043890 + thumb_func_start MonGainEVs +MonGainEVs: @ 8043890 push {r4-r7,lr} mov r7, r8 push {r7} @@ -2816,7 +2816,7 @@ _080438A4: _080438C8: mov r0, r8 movs r1, 0 - bl sub_8043AD8 + bl CheckPartyHasHadPokerus lsls r0, 24 movs r2, 0x1 cmp r0, 0 @@ -3007,10 +3007,10 @@ _08043A2E: bx r0 .align 2, 0 _08043A3C: .4byte 0x000001fd - thumb_func_end sub_8043890 + thumb_func_end MonGainEVs - thumb_func_start sub_8043A40 -sub_8043A40: @ 8043A40 + thumb_func_start GetMonEVCount +GetMonEVCount: @ 8043A40 push {r4-r6,lr} adds r6, r0, 0 movs r5, 0 @@ -3031,7 +3031,7 @@ _08043A48: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_8043A40 + thumb_func_end GetMonEVCount thumb_func_start sub_8043A68 sub_8043A68: @ 8043A68 @@ -3040,8 +3040,8 @@ sub_8043A68: @ 8043A68 bx lr thumb_func_end sub_8043A68 - thumb_func_start sub_8043A70 -sub_8043A70: @ 8043A70 + thumb_func_start CheckPartyPokerus +CheckPartyPokerus: @ 8043A70 push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 @@ -3095,10 +3095,10 @@ _08043ACC: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8043A70 + thumb_func_end CheckPartyPokerus - thumb_func_start sub_8043AD8 -sub_8043AD8: @ 8043AD8 + thumb_func_start CheckPartyHasHadPokerus +CheckPartyHasHadPokerus: @ 8043AD8 push {r4-r7,lr} sub sp, 0x4 adds r7, r0, 0 @@ -3148,7 +3148,7 @@ _08043B2C: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8043AD8 + thumb_func_end CheckPartyHasHadPokerus thumb_func_start sub_8043B38 sub_8043B38: @ 8043B38 @@ -3862,8 +3862,8 @@ _08044070: bx r1 thumb_func_end sub_8043FD4 - thumb_func_start sub_8044074 -sub_8044074: @ 8044074 + thumb_func_start PlayBattleBGM +PlayBattleBGM: @ 8044074 push {lr} bl ResetMapMusic bl m4aMPlayAllStop @@ -3873,10 +3873,10 @@ sub_8044074: @ 8044074 bl PlayBGM pop {r0} bx r0 - thumb_func_end sub_8044074 + thumb_func_end PlayBattleBGM - thumb_func_start sub_8044090 -sub_8044090: @ 8044090 + thumb_func_start PlayMapChosenOrBattleBGM +PlayMapChosenOrBattleBGM: @ 8044090 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -3896,7 +3896,7 @@ _080440B6: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8044090 + thumb_func_end PlayMapChosenOrBattleBGM thumb_func_start GetMonFrontSpritePal GetMonFrontSpritePal: @ 80440BC @@ -4396,8 +4396,8 @@ _08044468: bx r0 thumb_func_end sub_80443F4 - thumb_func_start sub_8044470 -sub_8044470: @ 8044470 + thumb_func_start IsMonShiny +IsMonShiny: @ 8044470 push {r4,r5,lr} adds r4, r0, 0 movs r1, 0x1 @@ -4410,16 +4410,16 @@ sub_8044470: @ 8044470 bl GetMonData adds r1, r0, 0 adds r0, r5, 0 - bl sub_804449C + bl IsShinyOtIdPersonality lsls r0, 24 lsrs r0, 24 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8044470 + thumb_func_end IsMonShiny - thumb_func_start sub_804449C -sub_804449C: @ 804449C + thumb_func_start IsShinyOtIdPersonality +IsShinyOtIdPersonality: @ 804449C push {r4,lr} movs r4, 0 lsrs r2, r0, 16 @@ -4440,7 +4440,7 @@ _080444B6: bx r1 .align 2, 0 _080444C0: .4byte 0x0000ffff - thumb_func_end sub_804449C + thumb_func_end IsShinyOtIdPersonality thumb_func_start sub_80444C4 sub_80444C4: @ 80444C4 diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s index a36eb6839..c490813b7 100644 --- a/asm/pokemon_icon.s +++ b/asm/pokemon_icon.s @@ -166,7 +166,7 @@ mon_icon_convert_unown_species_id: @ 8096F5C cmp r2, 0xC9 bne _08096F86 adds r0, r1, 0 - bl sub_8096F98 + bl mon_icon_personality_to_unown_id lsls r0, 16 lsrs r0, 16 cmp r0, 0 @@ -195,8 +195,8 @@ _08096F92: bx r1 thumb_func_end mon_icon_convert_unown_species_id - thumb_func_start sub_8096F98 -sub_8096F98: @ 8096F98 + thumb_func_start mon_icon_personality_to_unown_id +mon_icon_personality_to_unown_id: @ 8096F98 push {lr} adds r2, r0, 0 cmp r2, 0 @@ -228,7 +228,7 @@ _08096FCE: _08096FD0: pop {r1} bx r1 - thumb_func_end sub_8096F98 + thumb_func_end mon_icon_personality_to_unown_id thumb_func_start sub_8096FD4 sub_8096FD4: @ 8096FD4 diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index fa0b2ac5e..e48b72e4b 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -892,7 +892,7 @@ _08041AC8: .4byte _0804202C _08041AE8: mov r0, r8 - bl sub_8043A40 + bl GetMonEVCount lsls r0, 16 lsrs r5, r0, 16 ldr r0, _08041B28 @ =0x000001fd @@ -1595,7 +1595,7 @@ _0804208C: .4byte _080422B4 _080420AC: mov r0, r8 - bl sub_8043A40 + bl GetMonEVCount lsls r0, 16 lsrs r5, r0, 16 ldr r0, _080420F4 @ =0x000001fd diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index 7a2b8650a..e76654864 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -1569,7 +1569,7 @@ sub_811D184: @ 811D184 movs r2, 0x2 bl sub_8001658 ldr r0, _0811D274 @ =gUnknown_8459988 - bl sub_8003B24 + bl InitWindows movs r0, 0 movs r1, 0 movs r2, 0 @@ -1948,7 +1948,7 @@ sub_811D4D4: @ 811D4D4 sub_811D4EC: @ 811D4EC push {lr} movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 24 lsrs r0, 24 pop {r1} @@ -4548,7 +4548,7 @@ _0811E880: movs r1, 0x2 movs r2, 0 adds r3, r5, 0 - bl sub_812E51C + bl box_print lsls r0, r7, 1 mov r4, sp adds r4, r0 @@ -4571,7 +4571,7 @@ _0811E8BA: movs r1, 0x2 movs r2, 0x38 adds r3, r5, 0 - bl sub_812E51C + bl box_print movs r0, 0 strb r0, [r6] movs r0, 0 @@ -4604,7 +4604,7 @@ _0811E8F4: mov r0, r8 movs r1, 0x2 adds r3, r5, 0 - bl sub_812E51C + bl box_print adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 @@ -4725,7 +4725,7 @@ _0811E9C0: movs r1, 0x2 movs r2, 0 adds r3, r5, 0 - bl sub_812E51C + bl box_print adds r4, 0x38 lsls r4, 24 lsrs r4, 24 @@ -4739,7 +4739,7 @@ _0811E9C0: movs r1, 0x2 adds r2, r4, 0 adds r3, r5, 0 - bl sub_812E51C + bl box_print adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 60f834cc8..1a0bf5a7b 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -754,7 +754,7 @@ sub_808BEB4: @ 808BEB4 orrs r0, r1 str r0, [r5, 0x4] adds r0, r5, 0 - bl sub_8003CE4 + bl AddWindow lsls r0, 16 lsrs r0, 16 mov r10, r0 @@ -769,7 +769,7 @@ sub_808BEB4: @ 808BEB4 bl FillWindowPixelBuffer adds r0, r4, 0 movs r1, 0x7 - bl sub_8004950 + bl GetWindowAttribute adds r6, r0, 0 ldrb r0, [r5, 0x3] lsls r0, 5 @@ -807,7 +807,7 @@ _0808BF3C: str r1, [sp, 0x10] movs r1, 0x1 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r0, [sp, 0x50] mov r10, r4 cmp r0, 0x6 @@ -922,7 +922,7 @@ sub_808BFE0: @ 808BFE0 lsrs r5, 24 lsls r5, 5 mov r0, r8 - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -934,7 +934,7 @@ sub_808BFE0: @ 808BFE0 bl FillWindowPixelBuffer adds r0, r4, 0 movs r1, 0x7 - bl sub_8004950 + bl GetWindowAttribute adds r7, r0, 0 mov r0, r8 ldrb r0, [r0, 0x3] @@ -960,7 +960,7 @@ sub_808BFE0: @ 808BFE0 movs r1, 0x1 movs r2, 0 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 lsrs r5, 1 adds r0, r7, 0 ldr r1, [sp, 0x24] @@ -1775,8 +1775,8 @@ _0808C6D0: .4byte c3_0808C39C _0808C6D4: .4byte gUnknown_3005090 thumb_func_end sub_808C6A8 - thumb_func_start sub_808C6D8 -sub_808C6D8: @ 808C6D8 + thumb_func_start mapldr_0808C6D8 +mapldr_0808C6D8: @ 808C6D8 push {r4,r5,lr} ldr r0, _0808C71C @ =gUnknown_30030F0 ldr r5, [r0, 0xC] @@ -1810,7 +1810,7 @@ _0808C71C: .4byte gUnknown_30030F0 _0808C720: .4byte c3_0808C39C _0808C724: .4byte gUnknown_3005090 _0808C728: .4byte gUnknown_20397A8 - thumb_func_end sub_808C6D8 + thumb_func_end mapldr_0808C6D8 thumb_func_start sub_808C72C sub_808C72C: @ 808C72C @@ -1825,7 +1825,7 @@ sub_808C72C: @ 808C72C lsls r6, 24 lsrs r6, 24 ldr r0, _0808C7AC @ =gUnknown_83CDA48 - bl sub_8003CE4 + bl AddWindow adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 @@ -1884,7 +1884,7 @@ sub_808C7B4: @ 808C7B4 ldr r1, _0808C7D0 @ =gUnknown_20397A8 strb r0, [r1] ldr r1, _0808C7D4 @ =gUnknown_3005020 - ldr r0, _0808C7D8 @ =sub_808C6D8 + ldr r0, _0808C7D8 @ =mapldr_0808C6D8 str r0, [r1] ldr r0, _0808C7DC @ =c2_exit_to_overworld_2_switch bl SetMainCallback2 @@ -1893,7 +1893,7 @@ sub_808C7B4: @ 808C7B4 .align 2, 0 _0808C7D0: .4byte gUnknown_20397A8 _0808C7D4: .4byte gUnknown_3005020 -_0808C7D8: .4byte sub_808C6D8 +_0808C7D8: .4byte mapldr_0808C6D8 _0808C7DC: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_808C7B4 @@ -3377,7 +3377,7 @@ _0808D3DC: ldr r1, _0808D40C @ =0x00000ce2 adds r0, r1 ldrh r0, [r0] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _0808D404 @@ -3491,7 +3491,7 @@ _0808D4D8: ldr r1, _0808D504 @ =0x00000ce2 adds r0, r1 ldrh r0, [r0] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _0808D508 @@ -4109,7 +4109,7 @@ _0808DA20: ldr r2, _0808DA54 @ =0x00000ce2 adds r0, r2 ldrh r0, [r0] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 bne _0808DAA0 @@ -4154,7 +4154,7 @@ _0808DA90: ldr r2, _0808DAA8 @ =0x00000ce2 adds r0, r1, r2 ldrh r0, [r0] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _0808DAAC @@ -4700,7 +4700,7 @@ _0808DF24: adds r0, 0x1 strb r0, [r1] _0808DF3A: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4971,7 +4971,7 @@ _0808E166: ldr r1, _0808E17C @ =0x00000ce2 adds r0, r1 ldrh r0, [r0] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 bne _0808E180 @@ -5275,7 +5275,7 @@ _0808E3FC: ldr r1, _0808E418 @ =0x00000ce2 adds r0, r1 ldrh r0, [r0] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 bne _0808E41C @@ -5479,7 +5479,7 @@ _0808E59C: .align 2, 0 _0808E5B8: .4byte gUnknown_20397B0 _0808E5BC: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -6284,7 +6284,7 @@ _0808EC40: .align 2, 0 _0808EC50: .4byte gUnknown_30030F0 _0808EC54: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -6426,7 +6426,7 @@ _0808ED74: .align 2, 0 _0808ED84: .4byte gUnknown_30030F0 _0808ED88: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -6582,7 +6582,7 @@ _0808EEBC: movs r0, 0x1 movs r2, 0 movs r3, 0 - bl sub_809D954 + bl DoNamingScreen b _0808EEF6 .align 2, 0 _0808EEE4: .4byte sub_808CE60 @@ -6755,7 +6755,7 @@ _0808F040: .4byte 0x00005abc sub_808F044: @ 808F044 push {lr} ldr r0, _0808F05C @ =gUnknown_83CEA30 - bl sub_8003B24 + bl InitWindows lsls r0, 16 cmp r0, 0 beq _0808F060 @@ -6988,7 +6988,7 @@ BoxSetMosaic: @ 808F200 movs r0, 0x1 strh r0, [r2, 0x30] ldr r2, [r1] - ldr r0, _0808F254 @ =sub_808F274 + ldr r0, _0808F254 @ =BoxSetMosaic2 str r0, [r2, 0x1C] ldr r0, [r1] ldrh r0, [r0, 0x2E] @@ -7005,7 +7005,7 @@ _0808F248: .align 2, 0 _0808F24C: .4byte gUnknown_20397B0 _0808F250: .4byte 0x00002238 -_0808F254: .4byte sub_808F274 +_0808F254: .4byte BoxSetMosaic2 thumb_func_end BoxSetMosaic thumb_func_start sub_808F258 @@ -7024,8 +7024,8 @@ _0808F26C: .4byte gUnknown_20397B0 _0808F270: .4byte 0x00002238 thumb_func_end sub_808F258 - thumb_func_start sub_808F274 -sub_808F274: @ 808F274 + thumb_func_start BoxSetMosaic2 +BoxSetMosaic2: @ 808F274 push {r4,lr} adds r4, r0, 0 ldrh r0, [r4, 0x2E] @@ -7063,7 +7063,7 @@ _0808F2B2: bx r0 .align 2, 0 _0808F2B8: .4byte nullsub_8 - thumb_func_end sub_808F274 + thumb_func_end BoxSetMosaic2 thumb_func_start sub_808F2BC sub_808F2BC: @ 808F2BC @@ -18314,7 +18314,7 @@ _08094A48: .4byte gUnknown_20397B0 _08094A4C: .4byte 0x00000ce2 _08094A50: ldrh r0, [r1] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 bne _08094A68 @@ -18344,7 +18344,7 @@ _08094A70: _08094A8C: .4byte 0x00000ce2 _08094A90: ldrh r0, [r1] - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -18915,7 +18915,7 @@ sub_8094E88: @ 8094E88 ldr r0, [r5] ldr r1, _08094F84 @ =0x00000c68 adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] ldr r4, _08094F88 @ =0x00000cac adds r1, r4 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 303f56a3a..30d8a7e23 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -3147,7 +3147,7 @@ _08135F64: ldr r0, [r5] ldr r1, _08135FB0 @ =0x00003290 adds r0, r1 - bl sub_8044470 + bl IsMonShiny lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4061,7 +4061,7 @@ _081366B8: mov r2, r8 adds r0, r1, r2 movs r1, 0 - bl sub_8043A70 + bl CheckPartyPokerus lsls r0, 24 cmp r0, 0 beq _0813676A @@ -4808,7 +4808,7 @@ sub_8136DA4: @ 8136DA4 movs r1, 0x2 movs r2, 0x4 movs r3, 0x1 - bl sub_812E51C + bl box_print ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -4853,7 +4853,7 @@ sub_8136DF0: @ 8136DF0 adds r0, r1, 0 movs r1, 0 movs r3, 0 - bl sub_812E51C + bl box_print ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -4904,7 +4904,7 @@ sub_8136E50: @ 8136E50 movs r1, 0x2 movs r2, 0x4 movs r3, 0x2 - bl sub_812E51C + bl box_print _08136E9A: ldr r2, [r6] adds r0, r2, r7 @@ -4920,7 +4920,7 @@ _08136E9A: movs r1, 0x2 movs r2, 0x28 movs r3, 0x2 - bl sub_812E51C + bl box_print ldr r0, [r6] ldr r3, _08136F04 @ =0x00003290 adds r0, r3 @@ -4941,7 +4941,7 @@ _08136E9A: movs r1, 0x2 movs r2, 0x69 movs r3, 0x2 - bl sub_812E51C + bl box_print b _08136F28 .align 2, 0 _08136EEC: .4byte gUnknown_203B140 @@ -4965,7 +4965,7 @@ _08136F0C: movs r1, 0x2 movs r2, 0x69 movs r3, 0x2 - bl sub_812E51C + bl box_print _08136F28: ldr r0, _08136F44 @ =gUnknown_203B140 ldr r0, [r0] @@ -5053,7 +5053,7 @@ sub_8136FB0: @ 8136FB0 movs r1, 0x2 movs r2, 0x2F movs r3, 0x13 - bl sub_812E51C + bl box_print ldr r3, [r6] movs r1, 0xC8 lsls r1, 6 @@ -5077,7 +5077,7 @@ sub_8136FB0: @ 8136FB0 str r1, [sp, 0x8] movs r1, 0x2 movs r3, 0x5 - bl sub_812E51C + bl box_print ldr r1, [r6] ldr r2, _08137064 @ =0x00003003 adds r0, r1, r2 @@ -5090,7 +5090,7 @@ sub_8136FB0: @ 8136FB0 movs r1, 0x2 movs r2, 0x2F movs r3, 0x31 - bl sub_812E51C + bl box_print ldr r1, [r6] ldr r2, _08137064 @ =0x00003003 adds r0, r1, r2 @@ -5103,7 +5103,7 @@ sub_8136FB0: @ 8136FB0 movs r1, 0x2 movs r2, 0x2F movs r3, 0x40 - bl sub_812E51C + bl box_print ldr r1, [r6] ldr r2, _08137064 @ =0x00003003 adds r0, r1, r2 @@ -5116,7 +5116,7 @@ sub_8136FB0: @ 8136FB0 movs r1, 0x2 movs r2, 0x2F movs r3, 0x4F - bl sub_812E51C + bl box_print b _081370CA .align 2, 0 _08137060: .4byte gUnknown_203B140 @@ -5167,7 +5167,7 @@ _081370A6: movs r1, 0x2 movs r2, 0x7 movs r3, 0x2D - bl sub_812E51C + bl box_print _081370CA: add sp, 0xC pop {r4-r7} @@ -5212,7 +5212,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x4 - bl sub_812E51C + bl box_print mov r2, r9 ldr r3, [r2] adds r0, r3, r4 @@ -5230,7 +5230,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x16 - bl sub_812E51C + bl box_print mov r2, r9 ldr r3, [r2] adds r0, r3, r4 @@ -5248,7 +5248,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x23 - bl sub_812E51C + bl box_print mov r2, r9 ldr r3, [r2] adds r0, r3, r4 @@ -5266,7 +5266,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x30 - bl sub_812E51C + bl box_print mov r2, r9 ldr r3, [r2] adds r0, r3, r4 @@ -5284,7 +5284,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x3D - bl sub_812E51C + bl box_print mov r2, r9 ldr r3, [r2] adds r0, r3, r4 @@ -5302,7 +5302,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x4A - bl sub_812E51C + bl box_print mov r2, r9 ldr r3, [r2] adds r0, r3, r4 @@ -5320,7 +5320,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x57 - bl sub_812E51C + bl box_print mov r2, r9 ldr r3, [r2] adds r4, r3, r4 @@ -5338,7 +5338,7 @@ sub_81370EC: @ 81370EC str r3, [sp, 0x8] movs r1, 0x2 movs r3, 0x64 - bl sub_812E51C + bl box_print add sp, 0xC pop {r3,r4} mov r8, r3 @@ -5406,7 +5406,7 @@ _081372B0: movs r1, 0x2 movs r2, 0x3 movs r3, 0x75 - bl sub_812E51C + bl box_print _081372CE: add sp, 0xC pop {r4} @@ -5490,7 +5490,7 @@ _0813733E: movs r1, 0x2 movs r2, 0x3 mov r3, r12 - bl sub_812E51C + bl box_print mov r1, r10 ldr r0, [r1] ldr r2, _081373A4 @ =0x00003258 @@ -5577,7 +5577,7 @@ _081373EA: movs r1, 0x2 movs r2, 0x24 mov r3, r8 - bl sub_812E51C + bl box_print mov r0, r10 ldr r3, [r0] adds r4, r3, r4 @@ -5603,7 +5603,7 @@ _081373EA: str r3, [sp, 0x8] movs r1, 0x2 mov r3, r8 - bl sub_812E51C + bl box_print mov r0, r10 ldr r1, [r0] ldr r2, _081374DC @ =0x00003258 @@ -5623,7 +5623,7 @@ _081373EA: movs r1, 0x2 movs r2, 0x3A mov r3, r8 - bl sub_812E51C + bl box_print mov r0, r10 ldr r3, [r0] ldr r1, _081374C8 @ =0x00003003 @@ -5645,7 +5645,7 @@ _081373EA: str r3, [sp, 0x8] movs r1, 0x2 mov r3, r8 - bl sub_812E51C + bl box_print _081374B4: add sp, 0x10 pop {r3-r5} @@ -5928,7 +5928,7 @@ _081376E6: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0xD4 pop {r4-r7} pop {r0} @@ -6052,7 +6052,7 @@ _081377F6: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 b _0813792C .align 2, 0 _08137820: .4byte gUnknown_8419782 @@ -6176,7 +6176,7 @@ _08137906: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _0813792C: add sp, 0xD4 pop {r4-r6} @@ -6341,7 +6341,7 @@ _08137A46: movs r1, 0x2 movs r2, 0 movs r3, 0x3 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r4-r7} pop {r0} @@ -6377,7 +6377,7 @@ sub_8137A90: @ 8137A90 movs r1, 0x2 movs r2, 0x1A movs r3, 0x7 - bl sub_812E51C + bl box_print mov r1, r8 ldr r0, [r1] adds r0, r6 @@ -6389,7 +6389,7 @@ sub_8137A90: @ 8137A90 movs r1, 0x2 movs r2, 0x1A movs r3, 0x14 - bl sub_812E51C + bl box_print add sp, 0xC pop {r3} mov r8, r3 @@ -6444,7 +6444,7 @@ _08137B1C: movs r1, 0x2 movs r2, 0x39 movs r3, 0x1 - bl sub_812E51C + bl box_print ldr r3, [r7] adds r0, r3, r4 ldrb r0, [r0] @@ -6461,7 +6461,7 @@ _08137B1C: movs r1, 0x2 movs r2, 0x39 movs r3, 0xF - bl sub_812E51C + bl box_print ldr r2, [r7] adds r4, r2, r4 ldrb r0, [r4] @@ -6486,7 +6486,7 @@ _08137B1C: movs r1, 0x2 movs r2, 0x7 movs r3, 0x2A - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _08137B9E: add sp, 0x14 pop {r3} @@ -6569,7 +6569,7 @@ sub_8137C18: @ 8137C18 movs r1, 0x2 movs r2, 0x42 movs r3, 0x1 - bl sub_812E51C + bl box_print ldr r1, [r5] adds r4, r1, r4 ldrb r0, [r4] @@ -6582,7 +6582,7 @@ sub_8137C18: @ 8137C18 movs r1, 0x2 movs r2, 0x2 movs r3, 0xF - bl sub_812E51C + bl box_print add sp, 0xC pop {r3} mov r8, r3 @@ -7266,13 +7266,13 @@ _081381CC: .4byte sub_813817C sub_81381D0: @ 81381D0 push {r4,r5,lr} ldr r0, _08138218 @ =gUnknown_8463F9C - bl sub_8003B24 + bl InitWindows movs r4, 0 _081381DA: lsls r0, r4, 3 ldr r1, _0813821C @ =gUnknown_8463F0C adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r2, _08138220 @ =gUnknown_203B140 ldr r1, [r2] movs r3, 0xC0 @@ -7316,7 +7316,7 @@ _08138238: lsls r0, r4, 3 ldr r1, _0813824C @ =gUnknown_8463F3C adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] adds r1, r4 ldr r3, _08138250 @ =0x00003003 @@ -7330,7 +7330,7 @@ _08138254: ldr r1, _08138278 @ =gUnknown_8463F5C _08138258: adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] adds r1, r4 ldr r2, _0813827C @ =0x00003003 @@ -7414,7 +7414,7 @@ _081382F0: lsls r0, r4, 3 ldr r1, _08138320 @ =gUnknown_8463F24 adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, _08138314 @ =gUnknown_203B140 ldr r1, [r1] movs r2, 0xC0 @@ -7439,7 +7439,7 @@ _08138326: lsls r0, r4, 3 ldr r1, _0813834C @ =gUnknown_8463F0C adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, _08138350 @ =gUnknown_203B140 ldr r1, [r1] movs r2, 0xC0 @@ -7464,7 +7464,7 @@ _0813835A: lsls r0, r4, 3 ldr r1, _08138380 @ =gUnknown_8463F0C adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, _08138384 @ =gUnknown_203B140 ldr r1, [r1] movs r2, 0xC0 @@ -7487,7 +7487,7 @@ _0813838A: lsls r0, r4, 3 ldr r1, _081383C0 @ =gUnknown_8463F24 adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, _081383C4 @ =gUnknown_203B140 ldr r1, [r1] movs r2, 0xC0 @@ -7533,7 +7533,7 @@ _081383E4: ldr r1, _0813840C @ =gUnknown_8463F5C _081383E8: adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] adds r1, r4 ldr r2, _08138410 @ =0x00003003 @@ -8639,7 +8639,7 @@ _08138CBC: ldr r0, [r6] adds r0, r5 movs r1, 0 - bl sub_8043A70 + bl CheckPartyPokerus lsls r0, 24 cmp r0, 0 bne _08138CD0 @@ -9875,7 +9875,7 @@ _081396A8: movs r1, 0x2 movs r2, 0x7 movs r3, 0x2A - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -12640,7 +12640,7 @@ sub_813ACB4: @ 813ACB4 ldr r1, _0813ACE8 @ =0x00003290 adds r0, r1 movs r1, 0 - bl sub_8043A70 + bl CheckPartyPokerus lsls r0, 24 cmp r0, 0 bne _0813ACEC @@ -12648,7 +12648,7 @@ sub_813ACB4: @ 813ACB4 ldr r1, _0813ACE8 @ =0x00003290 adds r0, r1 movs r1, 0 - bl sub_8043AD8 + bl CheckPartyHasHadPokerus lsls r0, 24 cmp r0, 0 beq _0813ACEC @@ -12677,7 +12677,7 @@ sub_813ACF8: @ 813ACF8 ldr r1, _0813AD48 @ =0x00003290 adds r0, r1 movs r1, 0 - bl sub_8043A70 + bl CheckPartyPokerus lsls r0, 24 cmp r0, 0 bne _0813AD50 @@ -12685,7 +12685,7 @@ sub_813ACF8: @ 813ACF8 ldr r1, _0813AD48 @ =0x00003290 adds r0, r1 movs r1, 0 - bl sub_8043AD8 + bl CheckPartyHasHadPokerus lsls r0, 24 cmp r0, 0 beq _0813AD50 @@ -12889,7 +12889,7 @@ sub_813AEB0: @ 813AEB0 ldr r0, [r4] ldr r1, _0813AEFC @ =0x00003290 adds r0, r1 - bl sub_8044470 + bl IsMonShiny lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12970,7 +12970,7 @@ sub_813AF50: @ 813AF50 ldr r0, [r4] ldr r1, _0813AF80 @ =0x00003290 adds r0, r1 - bl sub_8044470 + bl IsMonShiny lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13673,7 +13673,7 @@ _0813B4DC: ldr r0, [r4] ldr r1, _0813B530 @ =0x00003290 adds r0, r1 - bl sub_8044470 + bl IsMonShiny lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s index 33f13b5eb..a3f7b45a1 100644 --- a/asm/post_battle_event_funcs.s +++ b/asm/post_battle_event_funcs.s @@ -9,7 +9,7 @@ sub_80CA2E4: @ 80CA2E4 push {r4-r7,lr} sub sp, 0x4 - bl sub_80A0058 + bl sp000_heal_pokemon ldr r4, _080CA304 @ =0x0000082c adds r0, r4, 0 bl FlagGet @@ -31,7 +31,7 @@ _080CA30C: bl FlagSet _080CA318: movs r0, 0x1 - bl sub_8054EC4 + bl GetGameStat cmp r0, 0 bne _080CA33A ldr r0, _080CA3B4 @ =gUnknown_300500C @@ -87,11 +87,11 @@ _080CA388: cmp r6, 0x1 bne _080CA39E movs r0, 0x2A - bl sub_8054E90 + bl IncrementGameStat ldr r0, _080CA3BC @ =0x0000083b bl FlagSet _080CA39E: - ldr r0, _080CA3C0 @ =sub_80F1EFC + ldr r0, _080CA3C0 @ =CB2_DoHallOfFameScreen bl SetMainCallback2 movs r0, 0 add sp, 0x4 @@ -103,7 +103,7 @@ _080CA3B0: .4byte gUnknown_203AB44 _080CA3B4: .4byte gUnknown_300500C _080CA3B8: .4byte gUnknown_2024284 _080CA3BC: .4byte 0x0000083b -_080CA3C0: .4byte sub_80F1EFC +_080CA3C0: .4byte CB2_DoHallOfFameScreen thumb_func_end sub_80CA2E4 thumb_func_start sub_80CA3C4 diff --git a/asm/prof_pc.s b/asm/prof_pc.s index fe849abcf..36722e02b 100644 --- a/asm/prof_pc.s +++ b/asm/prof_pc.s @@ -24,11 +24,11 @@ _080CA3F4: .4byte gUnknown_20370C0 _080CA3F8: .4byte gUnknown_20370C2 _080CA3FC: movs r0, 0 - bl sub_8088E8C + bl pokedex_count ldr r1, _080CA41C @ =gUnknown_20370C2 strh r0, [r1] movs r0, 0x1 - bl sub_8088E8C + bl pokedex_count _080CA40C: ldr r1, _080CA420 @ =gUnknown_20370C4 strh r0, [r1] diff --git a/asm/quest_log.s b/asm/quest_log.s index ae0203e96..e0a4b3803 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -1088,7 +1088,7 @@ _0811107A: ldr r0, _0811111C @ =gUnknown_845661C adds r4, r0 adds r0, r4, 0 - bl sub_8003CE4 + bl AddWindow ldr r6, _08111120 @ =gUnknown_203ADFE adds r1, r5, r6 strb r0, [r1] @@ -1111,7 +1111,7 @@ _0811107A: ldr r5, _08111124 @ =gUnknown_2021D18 ldr r1, _08111128 @ =gUnknown_841A155 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders cmp r7, 0 beq _081110D2 ldr r4, _0811112C @ =gUnknown_2021CD0 @@ -1137,7 +1137,7 @@ _081110D2: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 ldrb r0, [r6] bl PutWindowTilemap ldrb r0, [r6, 0x1] @@ -2715,7 +2715,7 @@ _08111D42: str r1, [sp, 0x10] movs r1, 0x2 movs r2, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram add sp, 0x14 @@ -3051,7 +3051,7 @@ sub_8111FCC: @ 8111FCC bl sub_80C4DF8 ldr r0, _08112038 @ =gUnknown_2021D18 ldr r1, _0811203C @ =gUnknown_841B073 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_8111D10 _0811200E: strh r4, [r5, 0x8] @@ -4950,7 +4950,7 @@ sub_8112EB4: @ 8112EB4 cmp r0, 0xFF bne _08112ECC ldr r0, _08112ED8 @ =gUnknown_8456928 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] bl PutWindowTilemap @@ -5007,12 +5007,12 @@ sub_8112F18: @ 8112F18 lsrs r0, 24 mov r10, r0 movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r6, r0, 24 mov r0, r10 movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r7, r0, 24 lsls r0, r7, 5 @@ -5121,7 +5121,7 @@ sub_8112FE4: @ 8112FE4 movs r1, 0x2 movs r2, 0x2 movs r3, 0x5 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r0} bx r0 @@ -7232,7 +7232,7 @@ sub_8113F3C: @ 8113F3C bl sub_8113EAC ldr r0, _08113F78 @ =gUnknown_2021D18 ldr r1, _08113F7C @ =gUnknown_841A16F - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4} @@ -7326,7 +7326,7 @@ _08113FFC: bl sub_80C4DF8 ldr r0, _0811402C @ =gUnknown_2021D18 ldr r1, _08114030 @ =gUnknown_841AFA6 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811413C .align 2, 0 _08114024: .4byte gUnknown_2021CD0 @@ -7344,7 +7344,7 @@ _08114034: bl sub_8113EAC ldr r0, _08114058 @ =gUnknown_2021D18 ldr r1, _0811405C @ =gUnknown_841A1E7 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811413C .align 2, 0 _08114050: .4byte 0x0000ffff @@ -7354,7 +7354,7 @@ _0811405C: .4byte gUnknown_841A1E7 _08114060: ldr r0, _0811406C @ =gUnknown_2021D18 ldr r1, _08114070 @ =gUnknown_841A210 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811413C .align 2, 0 _0811406C: .4byte gUnknown_2021D18 @@ -7368,7 +7368,7 @@ _08114074: bl StringCopy ldr r0, _08114094 @ =gUnknown_2021D18 ldr r1, _08114098 @ =gUnknown_841A220 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811413C .align 2, 0 _08114090: .4byte gUnknown_2021CD0 @@ -7406,7 +7406,7 @@ _0811409C: bls _08114104 ldr r0, _081140FC @ =gUnknown_2021D18 ldr r1, _08114100 @ =gUnknown_841A965 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811413C .align 2, 0 _081140E8: .4byte gUnknown_2021CD0 @@ -7419,7 +7419,7 @@ _08114100: .4byte gUnknown_841A965 _08114104: ldr r0, _08114110 @ =gUnknown_2021D18 ldr r1, _08114114 @ =gUnknown_841A277 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811413C .align 2, 0 _08114110: .4byte gUnknown_2021D18 @@ -7432,7 +7432,7 @@ _08114118: bls _08114134 ldr r0, _0811412C @ =gUnknown_2021D18 ldr r1, _08114130 @ =gUnknown_841A938 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811413C .align 2, 0 _0811412C: .4byte gUnknown_2021D18 @@ -7440,7 +7440,7 @@ _08114130: .4byte gUnknown_841A938 _08114134: ldr r0, _08114144 @ =gUnknown_2021D18 ldr r1, _08114148 @ =gUnknown_841A255 - bl sub_8008FCC + bl StringExpandPlaceholders _0811413C: adds r0, r5, 0x6 pop {r4-r7} @@ -7506,7 +7506,7 @@ sub_8114188: @ 8114188 bl StringCopy ldr r0, _081141C8 @ =gUnknown_2021D18 ldr r1, _081141CC @ =gUnknown_841AB74 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4,r5} @@ -7550,7 +7550,7 @@ sub_81141E4: @ 81141E4 bl StringCopy ldr r0, _08114224 @ =gUnknown_2021D18 ldr r1, _08114228 @ =gUnknown_841AB8E - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4,r5} @@ -7594,7 +7594,7 @@ sub_8114240: @ 8114240 bl StringCopy ldr r0, _08114280 @ =gUnknown_2021D18 ldr r1, _08114284 @ =gUnknown_841A6A5 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4,r5} @@ -7638,7 +7638,7 @@ sub_811429C: @ 811429C bl StringCopy ldr r0, _081142DC @ =gUnknown_2021D18 ldr r1, _081142E0 @ =gUnknown_841A1CD - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4,r5} @@ -7714,7 +7714,7 @@ sub_8114324: @ 8114324 bl StringCopy ldr r0, _08114378 @ =gUnknown_2021D18 ldr r1, _0811437C @ =gUnknown_841A193 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x6 adds r0, r4, 0 pop {r4,r5} @@ -7765,7 +7765,7 @@ sub_8114394: @ 8114394 bl StringCopy ldr r0, _081143E8 @ =gUnknown_2021D18 ldr r1, _081143EC @ =gUnknown_841A6E1 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x6 adds r0, r4, 0 pop {r4,r5} @@ -7827,7 +7827,7 @@ sub_811443C: @ 811443C adds r4, r0, 0 ldr r0, _08114454 @ =gUnknown_2021D18 ldr r1, _08114458 @ =gUnknown_841A2B0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4} @@ -7892,7 +7892,7 @@ sub_811448C: @ 811448C bl sub_8113EAC ldr r0, _081144E4 @ =gUnknown_2021D18 ldr r1, _081144E8 @ =gUnknown_841A3FF - bl sub_8008FCC + bl StringExpandPlaceholders adds r6, 0x8 adds r0, r6, 0 pop {r4-r6} @@ -8171,7 +8171,7 @@ sub_8114724: @ 8114724 adds r4, r0, 0 ldr r0, _0811473C @ =gUnknown_2021D18 ldr r1, _08114740 @ =gUnknown_841A50B - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4} @@ -8201,7 +8201,7 @@ sub_8114758: @ 8114758 adds r4, r0, 0 ldr r0, _08114770 @ =gUnknown_2021D18 ldr r1, _08114774 @ =gUnknown_841A732 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x4 adds r0, r4, 0 pop {r4} @@ -8266,7 +8266,7 @@ sub_81147A8: @ 81147A8 bl sub_8113EAC ldr r0, _08114800 @ =gUnknown_2021D18 ldr r1, _08114804 @ =gUnknown_841A76A - bl sub_8008FCC + bl StringExpandPlaceholders adds r6, 0x8 adds r0, r6, 0 pop {r4-r6} @@ -8328,7 +8328,7 @@ sub_8114834: @ 8114834 bl StringCopy ldr r0, _08114884 @ =gUnknown_2021D18 ldr r1, _08114888 @ =gUnknown_841A7B0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r5, 0xC adds r0, r5, 0 pop {r4,r5} @@ -8879,7 +8879,7 @@ sub_8114C8C: @ 8114C8C bl sub_8099E90 ldr r0, _08114CB8 @ =gUnknown_2021D18 ldr r1, _08114CBC @ =gUnknown_841A391 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x2 adds r0, r4, 0 pop {r4} @@ -8926,7 +8926,7 @@ sub_8114CE4: @ 8114CE4 bl sub_8099E90 ldr r0, _08114D10 @ =gUnknown_2021D18 ldr r1, _08114D14 @ =gUnknown_841A3DA - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x2 adds r0, r4, 0 pop {r4} @@ -9677,7 +9677,7 @@ _081152F2: beq _08115364 ldr r0, _0811532C @ =gUnknown_2021D18 ldr r1, _08115330 @ =gUnknown_841AE48 - bl sub_8008FCC + bl StringExpandPlaceholders b _0811533E .align 2, 0 _08115318: .4byte gUnknown_2021CD0 @@ -9704,7 +9704,7 @@ _0811533E: lsls r1, 2 adds r1, r2 ldr r1, [r1] - bl sub_8008FCC + bl StringExpandPlaceholders b _0811538A .align 2, 0 _08115358: .4byte gUnknown_2021D18 @@ -9713,7 +9713,7 @@ _08115360: .4byte gUnknown_8456BE4 _08115364: ldr r0, _08115370 @ =gUnknown_2021D18 ldr r1, _08115374 @ =gUnknown_841AE8F - bl sub_8008FCC + bl StringExpandPlaceholders b _0811533E .align 2, 0 _08115370: .4byte gUnknown_2021D18 @@ -9725,7 +9725,7 @@ _08115378: lsls r1, 2 adds r1, r2 ldr r1, [r1] - bl sub_8008FCC + bl StringExpandPlaceholders adds r7, r5, 0x2 _0811538A: adds r0, r7, 0 @@ -9900,7 +9900,7 @@ _081154B4: lsls r1, 2 adds r1, r2 ldr r1, [r1] - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r5, 0x2 pop {r4,r5} pop {r1} @@ -10189,7 +10189,7 @@ sub_8115700: @ 8115700 bl StringCopy ldr r0, _08115740 @ =gUnknown_2021D18 ldr r1, _08115744 @ =gUnknown_841B03F - bl sub_8008FCC + bl StringExpandPlaceholders adds r5, 0x2 adds r0, r5, 0 pop {r4-r6} @@ -10318,7 +10318,7 @@ sub_8115800: @ 8115800 bl sub_80C4DF8 ldr r0, _0811582C @ =gUnknown_2021D18 ldr r1, _08115830 @ =gUnknown_841B064 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, 0x2 adds r0, r4, 0 pop {r4} diff --git a/asm/region_map.s b/asm/region_map.s index b9b1e3db1..d8962e7d5 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -1430,7 +1430,7 @@ _080C092A: movs r2, 0 bl ChangeBgY ldr r0, _080C0A24 @ =gUnknown_83F1A60 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters ldr r1, _080C0A28 @ =0x00006040 movs r0, 0 @@ -1600,7 +1600,7 @@ _080C0B44: movs r1, 0x2 movs r2, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print movs r0, 0 bl PutWindowTilemap movs r0, 0 @@ -1718,7 +1718,7 @@ sub_80C0BB0: @ 80C0BB0 movs r1, 0x2 movs r2, 0xC movs r3, 0x2 - bl sub_812E51C + bl box_print movs r0, 0x1 bl PutWindowTilemap movs r0, 0x1 @@ -3737,7 +3737,7 @@ _080C1CA8: movs r1, 0x2 movs r2, 0x4 movs r3, 0 - bl sub_812E51C + bl box_print bl sub_80C3580 lsls r0, 16 lsrs r0, 16 @@ -3750,7 +3750,7 @@ _080C1CA8: movs r1, 0x2 movs r2, 0x2 movs r3, 0xE - bl sub_812E51C + bl box_print movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram @@ -9815,7 +9815,7 @@ _080C4E48: movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_812E51C + bl box_print movs r0, 0x3 movs r1, 0x2 bl CopyWindowToVram @@ -9860,7 +9860,7 @@ _080C4EA4: movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_812E51C + bl box_print movs r0, 0x4 movs r1, 0x3 bl CopyWindowToVram diff --git a/asm/reset_save_heap.s b/asm/reset_save_heap.s index 978d8707f..9d07f4897 100644 --- a/asm/reset_save_heap.s +++ b/asm/reset_save_heap.s @@ -38,7 +38,7 @@ sub_8079B7C: @ 8079B7C cmp r0, 0x2 bne _08079BC8 _08079BC4: - bl sub_8054A18 + bl Sav2_ClearSetDefault _08079BC8: ldr r0, _08079BFC @ =gUnknown_300500C ldr r0, [r0] diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index 2f158b986..9142cc142 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -181,7 +181,7 @@ _080778E8: .align 2, 0 _080778FC: .4byte 0x01006000 _08077900: - bl sub_800F420 + bl LoadBattleTextboxAndBackground b _08077A8A _08077906: bl FreeAllSpritePalettes @@ -323,7 +323,7 @@ _08077A14: adds r0, r1 ldrb r0, [r0] movs r1, 0 - bl sub_8030A54 + bl ActionSelectionCreateCursorAt ldr r0, _08077A54 @ =gUnknown_3003F3C ldrb r0, [r0] cmp r0, 0 @@ -609,13 +609,13 @@ _08077C74: cmp r0, 0 beq _08077C94 adds r0, r7, 0 - bl sub_80748BC + bl GetSubstituteSpriteDefault_Y b _08077C9A .align 2, 0 _08077C90: .4byte gUnknown_2024018 _08077C94: adds r0, r7, 0 - bl sub_80748A8 + bl GetBankSpriteDefault_Y _08077C9A: lsls r0, 24 lsrs r0, 24 diff --git a/asm/rom6.s b/asm/rom6.s index 3e518219b..d02b6a7fe 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -341,7 +341,7 @@ oei_rocksmash: @ 80C9A30 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] movs r0, 0x13 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0 pop {r1} bx r1 @@ -423,7 +423,7 @@ sub_80C9ACC: @ 80C9ACC strh r0, [r1, 0x18] strh r2, [r1, 0x1A] movs r0, 0x1 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags movs r0, 0 pop {r1} bx r1 diff --git a/asm/safari_zone.s b/asm/safari_zone.s index da7faa603..b29c36739 100644 --- a/asm/safari_zone.s +++ b/asm/safari_zone.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80A0E90 -sub_80A0E90: @ 80A0E90 + thumb_func_start GetSafariZoneFlag +GetSafariZoneFlag: @ 80A0E90 push {lr} movs r0, 0x80 lsls r0, 4 @@ -15,7 +15,7 @@ sub_80A0E90: @ 80A0E90 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_80A0E90 + thumb_func_end GetSafariZoneFlag thumb_func_start sub_80A0EA4 sub_80A0EA4: @ 80A0EA4 @@ -27,21 +27,21 @@ sub_80A0EA4: @ 80A0EA4 bx r0 thumb_func_end sub_80A0EA4 - thumb_func_start sub_80A0EB4 -sub_80A0EB4: @ 80A0EB4 + thumb_func_start ResetSafariZoneFlag +ResetSafariZoneFlag: @ 80A0EB4 push {lr} movs r0, 0x80 lsls r0, 4 bl FlagClear pop {r0} bx r0 - thumb_func_end sub_80A0EB4 + thumb_func_end ResetSafariZoneFlag thumb_func_start sub_80A0EC4 sub_80A0EC4: @ 80A0EC4 push {lr} movs r0, 0x11 - bl sub_8054E90 + bl IncrementGameStat bl sub_80A0EA4 ldr r1, _080A0EE4 @ =gUnknown_2039994 movs r0, 0x1E @@ -61,7 +61,7 @@ _080A0EE8: .4byte gUnknown_2039996 thumb_func_start sub_80A0EEC sub_80A0EEC: @ 80A0EEC push {lr} - bl sub_80A0EB4 + bl ResetSafariZoneFlag ldr r1, _080A0F04 @ =gUnknown_2039994 movs r0, 0 strb r0, [r1] @@ -78,7 +78,7 @@ _080A0F08: .4byte gUnknown_2039996 thumb_func_start sub_80A0F0C sub_80A0F0C: @ 80A0F0C push {lr} - bl sub_80A0E90 + bl GetSafariZoneFlag cmp r0, 0 beq _080A0F24 ldr r1, _080A0F28 @ =gUnknown_2039996 diff --git a/asm/save.s b/asm/save.s index 6aa983d1c..9d7fa6927 100644 --- a/asm/save.s +++ b/asm/save.s @@ -1467,12 +1467,12 @@ _080DA28C: bls _080DA28C _080DA29E: movs r0, 0xA - bl sub_8054EC4 + bl GetGameStat ldr r1, _080DA2E0 @ =0x000003e6 cmp r0, r1 bhi _080DA2B0 movs r0, 0xA - bl sub_8054E90 + bl IncrementGameStat _080DA2B0: ldr r4, _080DA2E4 @ =gUnknown_201C000 movs r5, 0xF8 @@ -1794,7 +1794,7 @@ _080DA528: bl sub_80D9E14 lsls r0, 24 lsrs r4, r0, 24 - bl sub_804C310 + bl LoadSerializedGame ldr r0, _080DA54C @ =gUnknown_30053A0 strh r4, [r0] ldr r1, _080DA550 @ =gUnknown_30053A4 @@ -1834,8 +1834,8 @@ _080DA57C: _080DA584: .4byte gUnknown_201C000 thumb_func_end sub_80DA4FC - thumb_func_start sub_80DA588 -sub_80DA588: @ 80DA588 + thumb_func_start TryCopySpecialSaveSection +TryCopySpecialSaveSection: @ 80DA588 push {r4-r6,lr} adds r6, r1, 0 lsls r0, 24 @@ -1882,7 +1882,7 @@ _080DA5D6: bx r1 .align 2, 0 _080DA5DC: .4byte 0x00000ffb - thumb_func_end sub_80DA588 + thumb_func_end TryCopySpecialSaveSection thumb_func_start sub_80DA5E0 sub_80DA5E0: @ 80DA5E0 diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s index dae098dd3..ab6fd65f4 100644 --- a/asm/save_failed_screen.s +++ b/asm/save_failed_screen.s @@ -472,8 +472,8 @@ _080F549A: bx r1 thumb_func_end sub_80F5458 - thumb_func_start sub_80F54A0 -sub_80F54A0: @ 80F54A0 + thumb_func_start VerifySectorWipe +VerifySectorWipe: @ 80F54A0 push {r4,lr} lsls r0, 16 lsrs r0, 16 @@ -506,10 +506,10 @@ _080F54DA: pop {r4} pop {r1} bx r1 - thumb_func_end sub_80F54A0 + thumb_func_end VerifySectorWipe - thumb_func_start sub_80F54E0 -sub_80F54E0: @ 80F54E0 + thumb_func_start WipeSector +WipeSector: @ 80F54E0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -537,7 +537,7 @@ _080F54FA: cmp r4, r8 bls _080F54FA adds r0, r7, 0 - bl sub_80F54A0 + bl VerifySectorWipe lsls r0, 16 lsrs r1, r0, 16 lsls r0, r5, 16 @@ -557,7 +557,7 @@ _080F5528: .align 2, 0 _080F5538: .4byte ProgramFlashByte _080F553C: .4byte 0x00000fff - thumb_func_end sub_80F54E0 + thumb_func_end WipeSector thumb_func_start sub_80F5540 sub_80F5540: @ 80F5540 @@ -572,7 +572,7 @@ _080F5546: cmp r0, 0 beq _080F555E adds r0, r6, 0 - bl sub_80F54E0 + bl WipeSector cmp r0, 0 bne _080F555E bics r5, r4 diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s index 4859f01ba..064d9ec14 100644 --- a/asm/save_menu_util.s +++ b/asm/save_menu_util.s @@ -59,7 +59,7 @@ _080F8034: cmp r0, 0 beq _080F8044 movs r0, 0x1 - bl sub_8088E8C + bl pokedex_count b _080F804A _080F8044: movs r0, 0x1 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 1e97b5032..afe740df3 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -20,7 +20,7 @@ sub_8069ED4: @ 8069ED4 thumb_func_start ScrCmd_end ScrCmd_end: @ 8069ED8 push {lr} - bl sub_80697FC + bl StopScript movs r0, 0 pop {r1} bx r1 @@ -33,7 +33,7 @@ ScrCmd_gotonative: @ 8069EE4 bl ScriptReadWord adds r1, r0, 0 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} @@ -510,7 +510,7 @@ ScrCmd_killscript: @ 806A25C adds r4, r0, 0 bl ClearRamScript adds r0, r4, 0 - bl sub_80697FC + bl StopScript movs r0, 0x1 pop {r4} pop {r1} @@ -1053,8 +1053,8 @@ sub_806A610: @ 806A610 _0806A658: .4byte gUnknown_20370D0 thumb_func_end sub_806A610 - thumb_func_start sub_806A65C -sub_806A65C: @ 806A65C + thumb_func_start ScrCmd_takeitem +ScrCmd_takeitem: @ 806A65C push {r4,r5,lr} adds r5, r0, 0 bl ScriptReadHalfword @@ -1084,7 +1084,7 @@ sub_806A65C: @ 806A65C bx r1 .align 2, 0 _0806A69C: .4byte gUnknown_20370D0 - thumb_func_end sub_806A65C + thumb_func_end ScrCmd_takeitem thumb_func_start sub_806A6A0 sub_806A6A0: @ 806A6A0 @@ -1162,7 +1162,7 @@ ScrCmd_checkitemtype: @ 806A728 lsls r0, 16 lsrs r0, 16 ldr r4, _0806A750 @ =gUnknown_20370D0 - bl sub_809A260 + bl GetPocketByItemId lsls r0, 24 lsrs r0, 24 strh r0, [r4] @@ -1335,7 +1335,7 @@ ScrCmd_incrementgamestat: @ 806A870 adds r1, 0x1 str r1, [r0, 0x8] adds r0, r2, 0 - bl sub_8054E90 + bl IncrementGameStat movs r0, 0 pop {r1} bx r1 @@ -1353,7 +1353,7 @@ sub_806A888: @ 806A888 bl ScriptReadWord adds r6, r0, 0 adds r0, r4, 0 - bl sub_8054EC4 + bl GetGameStat cmp r0, r6 bcs _0806A8AA movs r0, 0 @@ -1452,7 +1452,7 @@ ScrCmd_fadescreen: @ 806A938 bl fade_screen ldr r1, _0806A95C @ =sub_806A918 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} @@ -1477,7 +1477,7 @@ ScrCmd_fadescreenspeed: @ 806A960 bl fade_screen ldr r1, _0806A98C @ =sub_806A918 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} @@ -1486,8 +1486,8 @@ ScrCmd_fadescreenspeed: @ 806A960 _0806A98C: .4byte sub_806A918 thumb_func_end ScrCmd_fadescreenspeed - thumb_func_start sub_806A990 -sub_806A990: @ 806A990 + thumb_func_start RunPauseTimer +RunPauseTimer: @ 806A990 push {lr} ldr r1, _0806A9A4 @ =gUnknown_20370AE ldrh r0, [r1] @@ -1505,26 +1505,26 @@ _0806A9A8: _0806A9AA: pop {r1} bx r1 - thumb_func_end sub_806A990 + thumb_func_end RunPauseTimer - thumb_func_start sub_806A9B0 -sub_806A9B0: @ 806A9B0 + thumb_func_start ScrCmd_delay +ScrCmd_delay: @ 806A9B0 push {r4,lr} adds r4, r0, 0 bl ScriptReadHalfword ldr r1, _0806A9CC @ =gUnknown_20370AE strh r0, [r1] - ldr r1, _0806A9D0 @ =sub_806A990 + ldr r1, _0806A9D0 @ =RunPauseTimer adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} bx r1 .align 2, 0 _0806A9CC: .4byte gUnknown_20370AE -_0806A9D0: .4byte sub_806A990 - thumb_func_end sub_806A9B0 +_0806A9D0: .4byte RunPauseTimer + thumb_func_end ScrCmd_delay thumb_func_start sub_806A9D4 sub_806A9D4: @ 806A9D4 @@ -1596,7 +1596,7 @@ ScrCmd_setstepcallback: @ 806AA30 adds r1, 0x1 str r1, [r0, 0x8] adds r0, r2, 0 - bl sub_806E8D0 + bl ActivatePerStepCallback movs r0, 0 pop {r1} bx r1 @@ -1733,7 +1733,7 @@ ScrCmd_warpsilent: @ 806AAEC adds r2, r6, 0 adds r3, r4, 0 bl Overworld_SetWarpDestination - bl sub_807E470 + bl sp13E_warp_to_last_warp bl sub_80559E4 movs r0, 0x1 add sp, 0x4 @@ -1859,7 +1859,7 @@ _0806AC3A: str r4, [sp] bl Overworld_SetWarpDestination _0806AC5E: - bl sub_807E548 + bl sp13F_fall_to_last_warp bl sub_80559E4 movs r0, 0x1 add sp, 0x8 @@ -2389,7 +2389,7 @@ _0806B08E: sub_806B094: @ 806B094 push {lr} ldr r1, _0806B0A4 @ =WaitForSoundEffectFinish - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r1} bx r1 @@ -2423,7 +2423,7 @@ WaitForFanfareFinish: @ 806B0BC sub_806B0CC: @ 806B0CC push {lr} ldr r1, _0806B0DC @ =WaitForFanfareFinish - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r1} bx r1 @@ -2488,7 +2488,7 @@ sub_806B134: @ 806B134 lsrs r0, 24 cmp r0, 0x1 bls _0806B148 - bl sub_8055F1C + bl Overworld_ChangeMusicToDefault _0806B148: movs r0, 0 pop {r1} @@ -2552,7 +2552,7 @@ _0806B1AE: _0806B1B4: ldr r1, _0806B1C4 @ =IsBGMPausedOrStopped adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 _0806B1BE: pop {r4} @@ -2706,7 +2706,7 @@ _0806B2CC: strh r0, [r1] ldr r1, _0806B300 @ =WaitForMovementFinish adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} @@ -2747,7 +2747,7 @@ _0806B320: strh r1, [r0] ldr r1, _0806B354 @ =WaitForMovementFinish adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} @@ -3222,7 +3222,7 @@ ScrCmd_lockall: @ 806B6DC bl ScriptFreezeMapObjects ldr r1, _0806B6F8 @ =sub_8069590 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 b _0806B6FE .align 2, 0 @@ -3259,7 +3259,7 @@ _0806B714: bl LockSelectedMapObject ldr r1, _0806B740 @ =sub_8069648 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript b _0806B750 .align 2, 0 _0806B738: .4byte gUnknown_2036E38 @@ -3269,7 +3269,7 @@ _0806B744: bl ScriptFreezeMapObjects ldr r1, _0806B758 @ =sub_8069590 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript _0806B750: movs r0, 0x1 _0806B752: @@ -3391,7 +3391,7 @@ sub_806B828: @ 806B828 ldr r0, [r4, 0x64] _0806B836: bl sub_80F7974 - bl sub_80F793C + bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -3431,7 +3431,7 @@ _0806B86A: sub_806B878: @ 806B878 push {lr} ldr r1, _0806B888 @ =IsFieldMessageBoxHidden - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r1} bx r1 @@ -3695,7 +3695,7 @@ _0806BA58: _0806BA5E: ldr r1, _0806BA7C @ =sub_806B898 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} @@ -3750,7 +3750,7 @@ ScrCmd_multichoice: @ 806BAAC adds r4, 0x1 str r4, [r0, 0x8] adds r0, r5, 0 - bl sub_809C9B4 + bl ScriptMenu_Multichoice lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3791,7 +3791,7 @@ ScrCmd_multichoicedefault: @ 806BAE8 str r4, [r0, 0x8] str r6, [sp] mov r0, r8 - bl sub_809CA04 + bl ScriptMenu_MultichoiceWithDefault lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3913,7 +3913,7 @@ sub_806BBD8: @ 806BBD8 cmp r1, 0 beq _0806BBF0 adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 b _0806BBF2 _0806BBF0: @@ -4046,7 +4046,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8 lsls r2, 2 adds r2, r0 ldr r4, [r2] - bl sub_80CACFC + bl GetLeadMonIndex lsls r0, 24 lsrs r0, 24 movs r1, 0x64 @@ -4352,7 +4352,7 @@ ScrCmd_vloadword: @ 806BF3C ldr r0, [r0] subs r1, r0 ldr r0, _0806BF5C @ =gUnknown_2021D18 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 pop {r1} bx r1 @@ -4460,7 +4460,7 @@ ScrCmd_givemon: @ 806BFD0 mov r1, r9 adds r2, r5, 0 mov r3, r8 - bl sub_80A011C + bl ScriptGiveMon lsls r0, 24 lsrs r0, 24 strh r0, [r4] @@ -4970,8 +4970,8 @@ sub_806C3D4: @ 806C3D4 bx r1 thumb_func_end sub_806C3D4 - thumb_func_start sub_806C3E8 -sub_806C3E8: @ 806C3E8 + thumb_func_start ScrCmd_playslotmachine +ScrCmd_playslotmachine: @ 806C3E8 push {lr} bl ScriptReadHalfword lsls r0, 16 @@ -4987,7 +4987,7 @@ sub_806C3E8: @ 806C3E8 bx r1 .align 2, 0 _0806C40C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music - thumb_func_end sub_806C3E8 + thumb_func_end ScrCmd_playslotmachine thumb_func_start sub_806C410 sub_806C410: @ 806C410 @@ -5106,7 +5106,7 @@ ScrCmd_waitfieldeffect: @ 806C4A8 strh r0, [r1] ldr r1, _0806C4D0 @ =WaitForFieldEffectFinish adds r0, r4, 0 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r4} pop {r1} @@ -5176,7 +5176,7 @@ ScrCmd_playmoncry: @ 806C508 sub_806C540: @ 806C540 push {lr} ldr r1, _0806C550 @ =IsCryFinished - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r1} bx r1 @@ -5225,7 +5225,7 @@ ScrCmd_setmetatile: @ 806C554 adds r0, r6, 0 adds r1, r5, 0 adds r2, r7, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt b _0806C5CA _0806C5B8: movs r1, 0xC0 @@ -5235,7 +5235,7 @@ _0806C5B8: orrs r2, r0 adds r0, r6, 0 adds r1, r5, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt _0806C5CA: movs r0, 0 pop {r4-r7} @@ -5336,7 +5336,7 @@ _0806C682: sub_806C688: @ 806C688 push {lr} ldr r1, _0806C698 @ =sub_806C670 - bl sub_80697F4 + bl SetupNativeScript movs r0, 0x1 pop {r1} bx r1 @@ -5518,8 +5518,8 @@ sub_806C7C8: @ 806C7C8 bx r1 thumb_func_end sub_806C7C8 - thumb_func_start sub_806C7D4 -sub_806C7D4: @ 806C7D4 + thumb_func_start ScrCmd_setmonobedient +ScrCmd_setmonobedient: @ 806C7D4 push {lr} sub sp, 0x4 movs r2, 0x1 @@ -5544,10 +5544,10 @@ sub_806C7D4: @ 806C7D4 bx r1 .align 2, 0 _0806C808: .4byte gUnknown_2024284 - thumb_func_end sub_806C7D4 + thumb_func_end ScrCmd_setmonobedient - thumb_func_start sub_806C80C -sub_806C80C: @ 806C80C + thumb_func_start ScrCmd_checkmonobedience +ScrCmd_checkmonobedience: @ 806C80C push {r4,lr} bl ScriptReadHalfword lsls r0, 16 @@ -5571,7 +5571,7 @@ sub_806C80C: @ 806C80C .align 2, 0 _0806C83C: .4byte gUnknown_20370D0 _0806C840: .4byte gUnknown_2024284 - thumb_func_end sub_806C80C + thumb_func_end ScrCmd_checkmonobedience thumb_func_start sub_806C844 sub_806C844: @ 806C844 diff --git a/asm/script.s b/asm/script.s index 45f3f6b8d..556c95856 100644 --- a/asm/script.s +++ b/asm/script.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80697AC -sub_80697AC: @ 80697AC + thumb_func_start InitScriptContext +InitScriptContext: @ 80697AC push {lr} adds r3, r0, 0 movs r0, 0 @@ -38,32 +38,32 @@ _080697DA: bge _080697DA pop {r0} bx r0 - thumb_func_end sub_80697AC + thumb_func_end InitScriptContext - thumb_func_start sub_80697E8 -sub_80697E8: @ 80697E8 + thumb_func_start SetupBytecodeScript +SetupBytecodeScript: @ 80697E8 str r1, [r0, 0x8] movs r1, 0x1 strb r1, [r0, 0x1] movs r0, 0x1 bx lr - thumb_func_end sub_80697E8 + thumb_func_end SetupBytecodeScript - thumb_func_start sub_80697F4 -sub_80697F4: @ 80697F4 + thumb_func_start SetupNativeScript +SetupNativeScript: @ 80697F4 movs r2, 0x2 strb r2, [r0, 0x1] str r1, [r0, 0x4] bx lr - thumb_func_end sub_80697F4 + thumb_func_end SetupNativeScript - thumb_func_start sub_80697FC -sub_80697FC: @ 80697FC + thumb_func_start StopScript +StopScript: @ 80697FC movs r1, 0 strb r1, [r0, 0x1] str r1, [r0, 0x8] bx lr - thumb_func_end sub_80697FC + thumb_func_end StopScript thumb_func_start sub_8069804 sub_8069804: @ 8069804 @@ -499,7 +499,7 @@ ScriptContext1_Init: @ 8069A80 ldr r0, _08069A98 @ =gUnknown_3000EB0 ldr r1, _08069A9C @ =gUnknown_815F9B4 ldr r2, _08069AA0 @ =gUnknown_815FD08 - bl sub_80697AC + bl InitScriptContext ldr r1, _08069AA4 @ =gUnknown_3000EA8 movs r0, 0x2 strb r0, [r1] @@ -555,10 +555,10 @@ ScriptContext1_SetupScript: @ 8069AE4 ldr r1, _08069B1C @ =gUnknown_815F9B4 ldr r2, _08069B20 @ =gUnknown_815FD08 adds r0, r4, 0 - bl sub_80697AC + bl InitScriptContext adds r0, r4, 0 adds r1, r5, 0 - bl sub_80697E8 + bl SetupBytecodeScript bl ScriptContext2_Enable ldr r1, _08069B24 @ =gUnknown_3000EA8 movs r0, 0 @@ -604,10 +604,10 @@ ScriptContext2_RunNewScript: @ 8069B48 ldr r1, _08069B78 @ =gUnknown_815F9B4 ldr r2, _08069B7C @ =gUnknown_815FD08 adds r0, r4, 0 - bl sub_80697AC + bl InitScriptContext adds r0, r4, 0 adds r1, r5, 0 - bl sub_80697E8 + bl SetupBytecodeScript _08069B60: ldr r0, _08069B74 @ =gUnknown_3000F28 bl sub_8069804 diff --git a/asm/script_menu.s b/asm/script_menu.s index 73f6d5f76..f1f1d260e 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -60,8 +60,8 @@ _0809C9AA: bx r1 thumb_func_end sub_809C974 - thumb_func_start sub_809C9B4 -sub_809C9B4: @ 809C9B4 + thumb_func_start ScriptMenu_Multichoice +ScriptMenu_Multichoice: @ 809C9B4 push {r4-r7,lr} sub sp, 0x4 lsls r0, 24 @@ -100,10 +100,10 @@ _0809C9FA: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_809C9B4 + thumb_func_end ScriptMenu_Multichoice - thumb_func_start sub_809CA04 -sub_809CA04: @ 809CA04 + thumb_func_start ScriptMenu_MultichoiceWithDefault +ScriptMenu_MultichoiceWithDefault: @ 809CA04 push {r4-r7,lr} mov r7, r8 push {r7} @@ -149,7 +149,7 @@ _0809CA56: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_809CA04 + thumb_func_end ScriptMenu_MultichoiceWithDefault thumb_func_start sub_809CA64 sub_809CA64: @ 809CA64 @@ -244,7 +244,7 @@ _0809CB02: mov r0, r9 ldr r1, [sp, 0x14] adds r2, r5, 0 - bl sub_809D654 + bl CreateWindowFromRect lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 @@ -616,7 +616,7 @@ _0809CDE8: .4byte gUnknown_83E0748 thumb_func_start sub_809CDEC sub_809CDEC: @ 809CDEC push {r4,lr} - ldr r4, _0809CE04 @ =sub_809CE54 + ldr r4, _0809CE04 @ =task_yes_no_maybe adds r0, r4, 0 bl FuncIsActiveTask lsls r0, 24 @@ -626,7 +626,7 @@ sub_809CDEC: @ 809CDEC movs r0, 0 b _0809CE28 .align 2, 0 -_0809CE04: .4byte sub_809CE54 +_0809CE04: .4byte task_yes_no_maybe _0809CE08: ldr r1, _0809CE30 @ =gUnknown_20370D0 movs r0, 0xFF @@ -669,8 +669,8 @@ _0809CE4E: bx r1 thumb_func_end sub_809CE38 - thumb_func_start sub_809CE54 -sub_809CE54: @ 809CE54 + thumb_func_start task_yes_no_maybe +task_yes_no_maybe: @ 809CE54 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -690,7 +690,7 @@ sub_809CE54: @ 809CE54 .align 2, 0 _0809CE74: .4byte gUnknown_3005090 _0809CE78: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 @@ -731,7 +731,7 @@ _0809CEBC: bx r0 .align 2, 0 _0809CEC4: .4byte gUnknown_20370D0 - thumb_func_end sub_809CE54 + thumb_func_end task_yes_no_maybe thumb_func_start sub_809CEC8 sub_809CEC8: @ 809CEC8 @@ -817,7 +817,7 @@ _0809CF08: lsrs r3, 24 ldr r0, [sp, 0x10] ldr r1, [sp, 0x14] - bl sub_809D654 + bl CreateWindowFromRect lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x14] @@ -914,8 +914,8 @@ _0809D034: _0809D03C: .4byte gUnknown_20370D0 thumb_func_end sub_809CFDC - thumb_func_start sub_809D040 -sub_809D040: @ 809D040 + thumb_func_start sp109_CreatePCMenu +sp109_CreatePCMenu: @ 809D040 push {lr} ldr r0, _0809D060 @ =sub_809CC98 bl FuncIsActiveTask @@ -937,7 +937,7 @@ _0809D068: _0809D06A: pop {r1} bx r1 - thumb_func_end sub_809D040 + thumb_func_end sp109_CreatePCMenu thumb_func_start sub_809D070 sub_809D070: @ 809D070 @@ -984,7 +984,7 @@ _0809D0B0: movs r1, 0 adds r2, r4, 0 movs r3, 0xA - bl sub_809D654 + bl CreateWindowFromRect lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -1045,7 +1045,7 @@ _0809D14C: movs r0, 0 movs r1, 0 adds r2, r4, 0 - bl sub_809D654 + bl CreateWindowFromRect lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 @@ -1122,7 +1122,7 @@ _0809D1FA: ldr r4, _0809D24C @ =gUnknown_2021D18 ldr r1, _0809D250 @ =gUnknown_8417BB6 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r6, 0 adds r1, r4, 0 adds r2, r7, 0 @@ -1295,7 +1295,7 @@ _0809D31C: adds r1, r6, 0 movs r2, 0x8 movs r3, 0x8 - bl sub_809D654 + bl CreateWindowFromRect ldr r1, _0809D3B4 @ =gUnknown_3005090 lsls r3, r4, 2 adds r3, r4 @@ -1600,7 +1600,7 @@ _0809D572: ldrb r1, [r6] movs r2, 0x8 movs r3, 0x8 - bl sub_809D654 + bl CreateWindowFromRect ldr r2, _0809D61C @ =gUnknown_3005090 lsls r1, r4, 2 adds r1, r4 @@ -1664,8 +1664,8 @@ _0809D64E: bx r1 thumb_func_end sub_809D620 - thumb_func_start sub_809D654 -sub_809D654: @ 809D654 + thumb_func_start CreateWindowFromRect +CreateWindowFromRect: @ 809D654 push {r4,r5,lr} sub sp, 0x20 adds r4, r0, 0 @@ -1698,7 +1698,7 @@ sub_809D654: @ 809D654 str r0, [sp, 0x18] str r1, [sp, 0x1C] add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -1709,7 +1709,7 @@ sub_809D654: @ 809D654 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_809D654 + thumb_func_end CreateWindowFromRect thumb_func_start sub_809D6B0 sub_809D6B0: @ 809D6B0 @@ -1854,7 +1854,7 @@ _0809D7B8: movs r0, 0x11 adds r1, r5, 0 movs r2, 0xB - bl sub_809D654 + bl CreateWindowFromRect lsls r0, 24 lsrs r7, r0, 24 adds r0, r7, 0 diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index f5372ab69..ba3a0b9d8 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80A0058 -sub_80A0058: @ 80A0058 + thumb_func_start sp000_heal_pokemon +sp000_heal_pokemon: @ 80A0058 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -100,10 +100,10 @@ _080A0104: .align 2, 0 _080A0114: .4byte gUnknown_2024029 _080A0118: .4byte gUnknown_2024284 - thumb_func_end sub_80A0058 + thumb_func_end sp000_heal_pokemon - thumb_func_start sub_80A011C -sub_80A011C: @ 80A011C + thumb_func_start ScriptGiveMon +ScriptGiveMon: @ 80A011C push {r4-r7,lr} mov r7, r8 push {r7} @@ -168,7 +168,7 @@ _080A0196: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A011C + thumb_func_end ScriptGiveMon thumb_func_start sub_80A01AC sub_80A01AC: @ 80A01AC @@ -182,7 +182,7 @@ sub_80A01AC: @ 80A01AC adds r5, r0, 0 adds r1, r4, 0 movs r2, 0x1 - bl sub_8046150 + bl CreateEgg movs r1, 0x1 mov r0, sp strb r1, [r0] diff --git a/asm/shop.s b/asm/shop.s index 266422735..f205eb8ec 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -45,7 +45,7 @@ _0809AAF8: strh r1, [r4, 0x16] ldr r4, _0809AB6C @ =gUnknown_2039950 ldr r0, _0809AB70 @ =gUnknown_83DF0BC - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, 0 @@ -1191,7 +1191,7 @@ _0809B450: _0809B45C: ldr r1, _0809B490 @ =gUnknown_841697A adds r0, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r2, _0809B48C @ =gUnknown_2021D18 str r5, [sp] movs r0, 0 @@ -2121,7 +2121,7 @@ sub_809BB44: @ 809BB44 ldr r4, _0809BBB8 @ =gUnknown_2021D18 ldr r1, _0809BBBC @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r0, 0 @@ -2274,7 +2274,7 @@ sub_809BCA0: @ 809BCA0 ldr r6, _0809BD48 @ =gUnknown_2021D18 ldr r1, _0809BD4C @ =gUnknown_8416749 adds r0, r6, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 str r0, [sp] movs r0, 0 @@ -2526,7 +2526,7 @@ sub_809BF0C: @ 809BF0C lsls r4, 24 lsrs r4, 24 movs r0, 0x26 - bl sub_8054E90 + bl IncrementGameStat ldr r6, _0809BF58 @ =gUnknown_3005008 ldr r0, [r6] movs r5, 0xA4 @@ -2955,7 +2955,7 @@ _0809C238: orrs r2, r0 adds r0, r5, 0 adds r1, r6, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt b _0809C280 .align 2, 0 _0809C26C: .4byte gUnknown_3005090 @@ -2966,7 +2966,7 @@ _0809C270: orrs r2, r0 adds r0, r5, 0 adds r1, r6, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt _0809C280: movs r2, 0x80 lsls r2, 9 @@ -3028,7 +3028,7 @@ _0809C2B8: orrs r2, r0 adds r0, r5, 0 adds r1, r6, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt b _0809C30A _0809C2FA: mov r1, r9 @@ -3037,7 +3037,7 @@ _0809C2FA: orrs r2, r0 adds r0, r5, 0 adds r1, r6, 0 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt _0809C30A: movs r2, 0x80 lsls r2, 9 @@ -3328,14 +3328,14 @@ sub_809C500: @ 809C500 movs r2, 0x6 ldrsh r1, [r4, r2] ldr r2, _0809C548 @ =0x00000eb5 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] adds r1, 0x2 ldr r2, _0809C54C @ =0x00000eb7 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt b _0809C56E .align 2, 0 _0809C544: .4byte gUnknown_3005098 @@ -3347,14 +3347,14 @@ _0809C550: movs r2, 0x6 ldrsh r1, [r4, r2] ldr r2, _0809C5EC @ =0x00000eb6 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] adds r1, 0x2 ldr r2, _0809C5F0 @ =0x00000eb8 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt _0809C56E: movs r1, 0x4 ldrsh r0, [r4, r1] @@ -3389,14 +3389,14 @@ _0809C588: movs r2, 0x6 ldrsh r1, [r4, r2] ldr r2, _0809C5F4 @ =0x00000e8a - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] adds r1, 0x2 ldr r2, _0809C5F8 @ =0x00000e96 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 @@ -3479,14 +3479,14 @@ sub_809C640: @ 809C640 movs r2, 0x6 ldrsh r1, [r4, r2] ldr r2, _0809C6AC @ =0x00000e85 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] adds r1, 0x1 ldr r2, _0809C6B0 @ =0x00000eb4 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 @@ -3519,14 +3519,14 @@ _0809C6BA: movs r2, 0x6 ldrsh r1, [r4, r2] ldr r2, _0809C710 @ =0x00000eb9 - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 ldrsh r1, [r4, r2] adds r1, 0x1 ldr r2, _0809C714 @ =0x00000eba - bl sub_8058FA4 + bl MapGridSetMetatileIdAt movs r1, 0x4 ldrsh r0, [r4, r1] movs r2, 0x6 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 4634d8b91..f65bae8f8 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -439,7 +439,7 @@ _0813FB98: cmp r0, 0x6 bne _0813FBA2 movs r0, 0x1C - bl sub_8054E90 + bl IncrementGameStat _0813FBA2: bl sub_8140A70 ldr r0, _0813FBB0 @ =sub_813FE1C @@ -629,7 +629,7 @@ _0813FD00: strh r0, [r4] b _0813FD78 _0813FD08: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -3480,7 +3480,7 @@ _081411D0: movs r2, 0x4 bl sub_8001658 ldr r0, _081413A4 @ =gUnknown_8466B20 - bl sub_8003B24 + bl InitWindows ldr r1, _081413A8 @ =0x0000205c add r1, r8 movs r0, 0x3 @@ -3603,7 +3603,7 @@ _081411D0: movs r0, 0x1 movs r1, 0 movs r3, 0 - bl sub_812E51C + bl box_print movs r0, 0 bl CopyBgTilemapBufferToVram movs r1, 0x83 diff --git a/asm/start_menu.s b/asm/start_menu.s index e9de595d3..c06cd944f 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -25,7 +25,7 @@ _0806ED70: bl sub_806EE58 b _0806ED90 _0806ED7E: - bl sub_80A0E90 + bl GetSafariZoneFlag cmp r0, 0x1 bne _0806ED8C bl sub_806EE04 @@ -152,7 +152,7 @@ sub_806EE7C: @ 806EE7C sub sp, 0xC ldr r4, _0806EEF4 @ =gUnknown_2037101 ldr r0, _0806EEF8 @ =gUnknown_83A738C - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] bl PutWindowTilemap @@ -180,7 +180,7 @@ sub_806EE7C: @ 806EE7C ldr r5, _0806EF10 @ =gUnknown_2021D18 ldr r1, _0806EF14 @ =gUnknown_84162A9 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldrb r0, [r4] movs r1, 0x3 str r1, [sp] @@ -214,7 +214,7 @@ _0806EF14: .4byte gUnknown_84162A9 thumb_func_start sub_806EF18 sub_806EF18: @ 806EF18 push {r4,lr} - bl sub_80A0E90 + bl GetSafariZoneFlag cmp r0, 0 beq _0806EF3A ldr r4, _0806EF40 @ =gUnknown_2037101 @@ -266,7 +266,7 @@ _0806EF68: cmp r1, 0x8 bne _0806EFA8 _0806EF7C: - bl sub_80F793C + bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 ldrb r1, [r4] @@ -290,8 +290,8 @@ _0806EFA8: add r0, r10 ldr r1, [r0] mov r0, r9 - bl sub_8008FCC - bl sub_80F793C + bl StringExpandPlaceholders + bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 lsls r1, r5, 4 @@ -397,7 +397,7 @@ _0806F06C: _0806F088: .4byte gUnknown_20370F5 _0806F08C: .4byte gUnknown_20370FF _0806F090: - bl sub_80A0E90 + bl GetSafariZoneFlag cmp r0, 0 beq _0806F09C bl sub_806EE7C @@ -424,7 +424,7 @@ _0806F0B8: .align 2, 0 _0806F0C0: .4byte gUnknown_2037100 _0806F0C4: - bl sub_80F793C + bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 movs r1, 0xF @@ -462,7 +462,7 @@ _0806F0C4: ldr r0, [r0] bl sub_80F7974 _0806F118: - bl sub_80F793C + bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -502,8 +502,8 @@ _0806F156: _0806F164: .4byte gUnknown_20370FF thumb_func_end sub_806F14C - thumb_func_start sub_806F168 -sub_806F168: @ 806F168 + thumb_func_start task50_startmenu +task50_startmenu: @ 806F168 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -518,7 +518,7 @@ _0806F180: pop {r4} pop {r0} bx r0 - thumb_func_end sub_806F168 + thumb_func_end task50_startmenu thumb_func_start sub_806F188 sub_806F188: @ 806F188 @@ -528,7 +528,7 @@ sub_806F188: @ 806F188 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] - ldr r4, _0806F1B4 @ =sub_806F168 + ldr r4, _0806F1B4 @ =task50_startmenu adds r0, r4, 0 movs r1, 0x50 bl CreateTask @@ -542,7 +542,7 @@ sub_806F188: @ 806F188 bx r0 .align 2, 0 _0806F1B0: .4byte gUnknown_20370FF -_0806F1B4: .4byte sub_806F168 +_0806F1B4: .4byte task50_startmenu thumb_func_end sub_806F188 thumb_func_start sub_806F1B8 @@ -601,7 +601,7 @@ _0806F214: bl InUnionRoom cmp r0, 0x1 bne _0806F220 - bl sub_81198EC + bl var_800D_set_xB _0806F220: ldr r1, _0806F230 @ =gUnknown_20370F0 ldr r0, _0806F234 @ =sub_806F280 @@ -820,7 +820,7 @@ sub_806F3CC: @ 806F3CC cmp r1, r0 bne _0806F408 movs r0, 0 - bl sub_8088E8C + bl pokedex_count lsls r0, 16 cmp r0, 0 bne _0806F408 @@ -853,7 +853,7 @@ sub_806F410: @ 806F410 _0806F424: .4byte gUnknown_2037AB8 _0806F428: movs r0, 0x29 - bl sub_8054E90 + bl IncrementGameStat bl play_some_sound bl sub_806EF18 bl sub_80563F0 @@ -1158,13 +1158,13 @@ sub_806F67C: @ 806F67C movs r0, 0xC bl sub_812B1F0 bl sub_806F624 - ldr r0, _0806F698 @ =sub_806F6D4 + ldr r0, _0806F698 @ =task50_save_game movs r1, 0x50 bl CreateTask pop {r0} bx r0 .align 2, 0 -_0806F698: .4byte sub_806F6D4 +_0806F698: .4byte task50_save_game thumb_func_end sub_806F67C thumb_func_start sub_806F69C @@ -1174,7 +1174,7 @@ sub_806F69C: @ 806F69C adds r4, r1, 0 ldr r0, _0806F6C8 @ =gUnknown_2021D18 adds r1, r2, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 movs r1, 0x1 bl sub_80F7768 @@ -1194,8 +1194,8 @@ _0806F6CC: .4byte gUnknown_3000FA9 _0806F6D0: .4byte gUnknown_3000FA4 thumb_func_end sub_806F69C - thumb_func_start sub_806F6D4 -sub_806F6D4: @ 806F6D4 + thumb_func_start task50_save_game +task50_save_game: @ 806F6D4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1232,7 +1232,7 @@ _0806F712: bx r0 .align 2, 0 _0806F718: .4byte gUnknown_20370D0 - thumb_func_end sub_806F6D4 + thumb_func_end task50_save_game thumb_func_start sub_806F71C sub_806F71C: @ 806F71C @@ -1324,12 +1324,12 @@ _0806F7A2: thumb_func_start sub_806F7A8 sub_806F7A8: @ 806F7A8 push {lr} - bl sub_80F793C + bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 movs r1, 0 bl sub_80F6F9C - bl sub_80F7948 + bl remove_start_menu_window_maybe movs r0, 0 bl sub_8112EDC bl sub_806FCF4 @@ -1362,7 +1362,7 @@ _0806F7F4: .4byte sub_806F7F8 thumb_func_start sub_806F7F8 sub_806F7F8: @ 806F7F8 push {lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1481,7 +1481,7 @@ _0806F8D8: .4byte sub_806F8DC thumb_func_start sub_806F8DC sub_806F8DC: @ 806F8DC push {lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1536,7 +1536,7 @@ _0806F93C: .4byte sub_806F940 sub_806F940: @ 806F940 push {r4,lr} movs r0, 0 - bl sub_8054E90 + bl IncrementGameStat ldr r4, _0806F95C @ =gUnknown_2031DB0 ldrb r0, [r4] cmp r0, 0x1 @@ -1777,7 +1777,7 @@ _0806FB12: movs r2, 0x1 bl sub_8001658 ldr r0, _0806FB38 @ =gUnknown_83A73BC - bl sub_8003B24 + bl InitWindows movs r0, 0 movs r1, 0x8 movs r2, 0xF0 @@ -2008,7 +2008,7 @@ sub_806FCF4: @ 806FCF4 sub sp, 0xC ldr r5, _0806FE54 @ =gUnknown_2037104 ldr r0, _0806FE58 @ =gUnknown_83A73CC - bl sub_8003CE4 + bl AddWindow strb r0, [r5] ldrb r0, [r5] ldr r4, _0806FE5C @ =0x0000021d @@ -2043,7 +2043,7 @@ sub_806FCF4: @ 806FCF4 str r4, [sp, 0x8] movs r1, 0x2 movs r3, 0 - bl sub_812E51C + bl box_print movs r0, 0x2 adds r1, r4, 0 adds r2, r6, 0 @@ -2058,7 +2058,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x2 movs r3, 0xE - bl sub_812E51C + bl box_print movs r0, 0 adds r1, r4, 0 movs r2, 0x2 @@ -2077,7 +2077,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x2 movs r3, 0x1C - bl sub_812E51C + bl box_print movs r0, 0x4 adds r1, r4, 0 movs r2, 0x2 @@ -2091,7 +2091,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x3C movs r3, 0x1C - bl sub_812E51C + bl box_print movs r7, 0x2A ldr r0, _0806FE78 @ =0x00000829 bl FlagGet @@ -2108,7 +2108,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x2 movs r3, 0x2A - bl sub_812E51C + bl box_print movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2 @@ -2121,7 +2121,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x3C movs r3, 0x2A - bl sub_812E51C + bl box_print movs r7, 0x38 _0806FE0A: ldrb r0, [r5] @@ -2133,7 +2133,7 @@ _0806FE0A: movs r1, 0 movs r2, 0x2 adds r3, r7, 0 - bl sub_812E51C + bl box_print movs r0, 0x2 adds r1, r4, 0 movs r2, 0x2 @@ -2146,7 +2146,7 @@ _0806FE0A: movs r1, 0 movs r2, 0x3C adds r3, r7, 0 - bl sub_812E51C + bl box_print ldrb r0, [r5] movs r1, 0x2 bl CopyWindowToVram @@ -2193,12 +2193,12 @@ sub_806FEA0: @ 806FEA0 push {lr} movs r0, 0x5 bl sub_80722CC - bl sub_80F793C + bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 movs r1, 0x1 bl sub_80F6F9C - bl sub_80F7948 + bl remove_start_menu_window_maybe bl sub_80696C0 bl ScriptContext2_Disable pop {r0} diff --git a/asm/string_util.s b/asm/string_util.s index bee215a0d..d8c42415b 100644 --- a/asm/string_util.s +++ b/asm/string_util.s @@ -454,8 +454,8 @@ _08008FB8: bx r1 thumb_func_end sub_8008F18 - thumb_func_start sub_8008FCC -sub_8008FCC: @ 8008FCC + thumb_func_start StringExpandPlaceholders +StringExpandPlaceholders: @ 8008FCC push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -487,7 +487,7 @@ _08009004: bl GetExpandedPlaceholder adds r1, r0, 0 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r4, r0, 0 b _08008FD2 _08009018: @@ -557,10 +557,10 @@ _080090AC: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8008FCC + thumb_func_end StringExpandPlaceholders - thumb_func_start sub_80090B8 -sub_80090B8: @ 80090B8 + thumb_func_start StringBraille +StringBraille: @ 80090B8 push {r4-r6,lr} sub sp, 0xC adds r5, r0, 0 @@ -608,7 +608,7 @@ _0800910A: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80090B8 + thumb_func_end StringBraille thumb_func_start sub_8009118 sub_8009118: @ 8009118 diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 69a442baf..c5e0c564e 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -363,7 +363,7 @@ _0815AEB4: .4byte 0x00002004 sub_815AEB8: @ 815AEB8 push {lr} ldr r0, _0815AEE4 @ =gUnknown_84792F0 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 movs r1, 0xCC @@ -2164,7 +2164,7 @@ sub_815BC90: @ 815BC90 bl copy_player_party_to_sav1 bl sub_8159F40 movs r0, 0 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM ldrb r0, [r4, 0x5] cmp r0, 0 bne _0815BCE0 diff --git a/asm/text.s b/asm/text.s index 484167df3..78b792d16 100644 --- a/asm/text.s +++ b/asm/text.s @@ -189,8 +189,8 @@ _080054B8: bx r1 thumb_func_end Font5Func - thumb_func_start sub_80054C8 -sub_80054C8: @ 80054C8 + thumb_func_start TextPrinterInitDownArrowCounters +TextPrinterInitDownArrowCounters: @ 80054C8 push {lr} adds r2, r0, 0 adds r2, 0x14 @@ -217,10 +217,10 @@ _080054E4: _080054F4: pop {r0} bx r0 - thumb_func_end sub_80054C8 + thumb_func_end TextPrinterInitDownArrowCounters - thumb_func_start sub_80054F8 -sub_80054F8: @ 80054F8 + thumb_func_start TextPrinterDrawDownArrow +TextPrinterDrawDownArrow: @ 80054F8 push {r4-r7,lr} sub sp, 0x18 adds r5, r0, 0 @@ -330,7 +330,7 @@ _080055C2: .align 2, 0 _080055CC: .4byte gUnknown_81EA24C _080055D0: .4byte gUnknown_81EA64C - thumb_func_end sub_80054F8 + thumb_func_end TextPrinterDrawDownArrow thumb_func_start sub_80055D4 sub_80055D4: @ 80055D4 @@ -407,7 +407,7 @@ TextPrinterWaitWithDownArrow: @ 8005634 _08005654: .4byte gUnknown_3003E50 _08005658: adds r0, r2, 0 - bl sub_80054F8 + bl TextPrinterDrawDownArrow ldr r0, _0800567C @ =gUnknown_30030F0 ldrh r1, [r0, 0x2E] movs r0, 0x3 @@ -1035,7 +1035,7 @@ _08005B26: _08005B28: strb r0, [r6, 0x1C] adds r0, r6, 0 - bl sub_80054C8 + bl TextPrinterInitDownArrowCounters _08005B30: movs r0, 0x3 b _08005D6A @@ -1333,8 +1333,8 @@ _08005D6A: bx r1 thumb_func_end sub_8005790 - thumb_func_start sub_8005D70 -sub_8005D70: @ 8005D70 + thumb_func_start GetStringWidthFixedWidthFont +GetStringWidthFixedWidthFont: @ 8005D70 push {r4-r7,lr} mov r7, r8 push {r7} @@ -1471,10 +1471,10 @@ _08005E80: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8005D70 + thumb_func_end GetStringWidthFixedWidthFont - thumb_func_start sub_8005EA4 -sub_8005EA4: @ 8005EA4 + thumb_func_start GetFontWidthFunc +GetFontWidthFunc: @ 8005EA4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1501,7 +1501,7 @@ _08005ECC: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8005EA4 + thumb_func_end GetFontWidthFunc thumb_func_start sub_8005ED4 sub_8005ED4: @ 8005ED4 @@ -1521,7 +1521,7 @@ sub_8005ED4: @ 8005ED4 mov r9, r0 movs r7, 0 ldr r0, [sp] - bl sub_8005EA4 + bl GetFontWidthFunc mov r8, r0 cmp r0, 0 bne _08005F02 @@ -1693,7 +1693,7 @@ _08006054: _08006058: adds r4, 0x1 ldrb r0, [r4] - bl sub_8005EA4 + bl GetFontWidthFunc mov r8, r0 cmp r0, 0 bne _08006068 @@ -1825,7 +1825,7 @@ sub_8006124: @ 8006124 mov r0, sp adds r1, r5, 0 adds r2, r6, 0 - bl sub_8002F5C + bl SaveTextColors movs r0, 0x1 str r0, [sp, 0x4] movs r1, 0 @@ -1973,7 +1973,7 @@ _08006286: adds r1, 0x1 mov r2, sp adds r2, 0x2 - bl sub_8002F7C + bl RestoreTextColors movs r0, 0x1 add sp, 0xC pop {r3-r5} diff --git a/asm/text_printer.s b/asm/text_printer.s index 3ccceebf1..5dc0ac6da 100644 --- a/asm/text_printer.s +++ b/asm/text_printer.s @@ -218,7 +218,7 @@ _08002DAA: cmp r4, r7 bhi _08002DB8 ldr r0, _08002DE0 @ =gUnknown_2020010 - bl sub_8002E7C + bl RenderFont cmp r0, 0x1 bne _08002DA4 _08002DB8: @@ -263,7 +263,7 @@ _08002DF8: cmp r0, 0 beq _08002E4C mov r0, r8 - bl sub_8002E7C + bl RenderFont lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 @@ -315,8 +315,8 @@ _08002E4C: bx r0 thumb_func_end sub_8002DE8 - thumb_func_start sub_8002E64 -sub_8002E64: @ 8002E64 + thumb_func_start IsTextPrinterActive +IsTextPrinterActive: @ 8002E64 lsls r0, 24 lsrs r0, 24 ldr r2, _08002E78 @ =gUnknown_2020034 @@ -328,10 +328,10 @@ sub_8002E64: @ 8002E64 bx lr .align 2, 0 _08002E78: .4byte gUnknown_2020034 - thumb_func_end sub_8002E64 + thumb_func_end IsTextPrinterActive - thumb_func_start sub_8002E7C -sub_8002E7C: @ 8002E7C + thumb_func_start RenderFont +RenderFont: @ 8002E7C push {r4,lr} adds r4, r0, 0 _08002E80: @@ -354,7 +354,7 @@ _08002E80: bx r1 .align 2, 0 _08002EA4: .4byte gUnknown_3003D90 - thumb_func_end sub_8002E7C + thumb_func_end RenderFont thumb_func_start sub_8002EA8 sub_8002EA8: @ 8002EA8 @@ -451,8 +451,8 @@ _08002F54: .4byte gUnknown_3000AE6 _08002F58: .4byte gUnknown_3000A40 thumb_func_end sub_8002EA8 - thumb_func_start sub_8002F5C -sub_8002F5C: @ 8002F5C + thumb_func_start SaveTextColors +SaveTextColors: @ 8002F5C ldr r3, _08002F70 @ =gUnknown_3000AE2 ldrh r3, [r3] strb r3, [r1] @@ -467,10 +467,10 @@ sub_8002F5C: @ 8002F5C _08002F70: .4byte gUnknown_3000AE2 _08002F74: .4byte gUnknown_3000AE4 _08002F78: .4byte gUnknown_3000AE6 - thumb_func_end sub_8002F5C + thumb_func_end SaveTextColors - thumb_func_start sub_8002F7C -sub_8002F7C: @ 8002F7C + thumb_func_start RestoreTextColors +RestoreTextColors: @ 8002F7C push {lr} ldrb r0, [r0] ldrb r1, [r1] @@ -478,7 +478,7 @@ sub_8002F7C: @ 8002F7C bl sub_8002EA8 pop {r0} bx r0 - thumb_func_end sub_8002F7C + thumb_func_end RestoreTextColors thumb_func_start sub_8002F8C sub_8002F8C: @ 8002F8C diff --git a/asm/text_window.s b/asm/text_window.s index 94e766306..ea5565a17 100644 --- a/asm/text_window.s +++ b/asm/text_window.s @@ -207,7 +207,7 @@ sub_814FE6C: @ 814FE6C lsls r5, 24 lsrs r5, 24 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 ldr r1, _0814FEA8 @ =gUnknown_84566A8 @@ -239,7 +239,7 @@ sub_814FEAC: @ 814FEAC lsls r5, 24 lsrs r5, 24 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 ldr r1, _0814FEE8 @ =gUnknown_841F1C8 @@ -271,7 +271,7 @@ sub_814FEEC: @ 814FEEC lsls r5, 24 lsrs r5, 24 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 ldr r1, _0814FF28 @ =gUnknown_8470B0C @@ -303,7 +303,7 @@ sub_814FF2C: @ 814FF2C lsls r5, 24 lsrs r5, 24 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 ldr r1, _0814FF68 @ =gUnknown_8471A4C @@ -332,7 +332,7 @@ sub_814FF6C: @ 814FF6C lsls r4, 16 lsrs r4, 16 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 ldr r1, _0814FF94 @ =gUnknown_8471A4C @@ -356,7 +356,7 @@ sub_814FF98: @ 814FF98 lsls r4, 16 lsrs r4, 16 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 ldr r1, _0814FFC0 @ =gUnknown_8471B6C @@ -390,7 +390,7 @@ sub_814FFC4: @ 814FFC4 lsrs r1, 24 mov r8, r1 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r0, 24 ldr r5, _08150018 @ =gUnknown_8471E8C @@ -459,25 +459,25 @@ sub_8150048: @ 8150048 str r2, [sp, 0xC] adds r0, r4, 0 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r7, r0, 24 adds r0, r4, 0 movs r1, 0x1 - bl sub_8004950 + bl GetWindowAttribute mov r8, r0 lsls r0, 16 lsrs r0, 16 mov r8, r0 adds r0, r4, 0 movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 adds r0, r4, 0 movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute mov r9, r0 mov r2, r9 lsls r2, 16 @@ -485,7 +485,7 @@ sub_8150048: @ 8150048 mov r9, r2 adds r0, r4, 0 movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x10] @@ -648,31 +648,31 @@ sub_81501D0: @ 81501D0 mov r10, r2 adds r0, r4, 0 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 24 lsrs r7, r0, 24 adds r0, r4, 0 movs r1, 0x1 - bl sub_8004950 + bl GetWindowAttribute mov r8, r0 lsls r0, 16 lsrs r0, 16 mov r8, r0 adds r0, r4, 0 movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 adds r0, r4, 0 movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 adds r0, r4, 0 movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 16 lsrs r0, 16 str r0, [sp, 0xC] @@ -836,14 +836,14 @@ rbox_fill_rectangle: @ 815036C lsrs r6, 24 adds r0, r6, 0 movs r1, 0 - bl sub_8004950 + bl GetWindowAttribute mov r9, r0 lsls r0, 24 lsrs r0, 24 mov r9, r0 adds r0, r6, 0 movs r1, 0x1 - bl sub_8004950 + bl GetWindowAttribute mov r8, r0 mov r1, r8 lsls r1, 16 @@ -851,19 +851,19 @@ rbox_fill_rectangle: @ 815036C mov r8, r1 adds r0, r6, 0 movs r1, 0x2 - bl sub_8004950 + bl GetWindowAttribute adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 adds r0, r6, 0 movs r1, 0x3 - bl sub_8004950 + bl GetWindowAttribute adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 adds r0, r6, 0 movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute movs r1, 0x1 negs r1, r1 add r8, r1 diff --git a/asm/tileset_anims.s b/asm/tileset_anims.s index c34a66793..80328c533 100644 --- a/asm/tileset_anims.s +++ b/asm/tileset_anims.s @@ -114,7 +114,7 @@ _0806FF98: .4byte gUnknown_2037108 cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 806FF9C push {lr} bl ResetTilesetAnimBuffer - bl sub_807002C + bl cur_mapheader_run_tileset1_func bl cur_mapheader_run_tileset2_func pop {r0} bx r0 @@ -184,8 +184,8 @@ _08070024: .4byte gUnknown_3000FB8 _08070028: .4byte gUnknown_3000FBC thumb_func_end sub_806FFBC - thumb_func_start sub_807002C -sub_807002C: @ 807002C + thumb_func_start cur_mapheader_run_tileset1_func +cur_mapheader_run_tileset1_func: @ 807002C push {lr} ldr r0, _08070058 @ =gUnknown_3000FAE movs r1, 0 @@ -212,7 +212,7 @@ _08070058: .4byte gUnknown_3000FAE _0807005C: .4byte gUnknown_3000FB0 _08070060: .4byte gUnknown_3000FB8 _08070064: .4byte gUnknown_2036DFC - thumb_func_end sub_807002C + thumb_func_end cur_mapheader_run_tileset1_func thumb_func_start cur_mapheader_run_tileset2_func cur_mapheader_run_tileset2_func: @ 8070068 diff --git a/asm/title_screen.s b/asm/title_screen.s index a507e4d80..604452899 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1117,7 +1117,7 @@ _08079248: cmp r0, 0x2 bne _0807927A _08079276: - bl sub_8054A18 + bl Sav2_ClearSetDefault _0807927A: ldr r0, _080792B8 @ =gUnknown_300500C ldr r0, [r0] diff --git a/asm/tm_case.s b/asm/tm_case.s index 55c112fe6..4759927d4 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -810,7 +810,7 @@ sub_8131E68: @ 8131E68 ldr r4, _08131EEC @ =gUnknown_2021D18 ldr r1, _08131EF0 @ =gUnknown_84162B9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders mov r0, r8 str r0, [sp] str r5, [sp, 0x4] @@ -1859,7 +1859,7 @@ sub_8132714: @ 8132714 ldr r5, _0813274C @ =gUnknown_2021D18 ldr r1, _08132750 @ =gUnknown_841635E adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _08132754 @ =sub_8132758 adds r0, r4, 0 movs r1, 0x2 @@ -2097,7 +2097,7 @@ sub_8132908: @ 8132908 ldr r4, _0813295C @ =gUnknown_2021D18 ldr r1, _08132960 @ =gUnknown_84168F1 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -2137,7 +2137,7 @@ _08132988: ldr r4, _081329B8 @ =gUnknown_2021D18 ldr r1, _081329BC @ =gUnknown_8416911 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -2187,7 +2187,7 @@ sub_81329C4: @ 81329C4 ldr r4, _08132A28 @ =gUnknown_2021D18 ldr r1, _08132A2C @ =gUnknown_8416936 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders bl sub_80BF8E4 adds r1, r0, 0 lsls r1, 24 @@ -2287,7 +2287,7 @@ sub_8132AAC: @ 8132AAC ldr r5, _08132B50 @ =gUnknown_2021D18 ldr r1, _08132B54 @ =gUnknown_84162B9 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r1, 0x1 @@ -2361,7 +2361,7 @@ sub_8132B5C: @ 8132B5C ldr r5, _08132BC0 @ =gUnknown_2021D18 ldr r1, _08132BC4 @ =gUnknown_84162B9 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0xA str r0, [sp] movs r0, 0x1 @@ -2526,7 +2526,7 @@ sub_8132CAC: @ 8132CAC ldr r4, _08132D28 @ =gUnknown_2021D18 ldr r1, _08132D2C @ =gUnknown_8416959 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r3, _08132D30 @ =sub_8132D34 adds r0, r5, 0 movs r1, 0x2 @@ -2721,11 +2721,11 @@ sub_8132E64: @ 8132E64 ldr r0, [r5] add r0, r8 movs r1, 0x3A - bl sub_809A274 + bl ClearItemSlots ldr r0, [r5] adds r0, r6 movs r1, 0x1E - bl sub_809A274 + bl ClearItemSlots bl sub_81320AC ldr r0, _08132F0C @ =0x00000121 movs r1, 0x1 @@ -2971,7 +2971,7 @@ _081330DC: .4byte sub_8132F60 _081330E0: bl sub_8002DE8 movs r0, 0x6 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 beq _081330F2 @@ -3130,7 +3130,7 @@ _08133240: .4byte gUnknown_203B10C sub_8133244: @ 8133244 push {r4,lr} ldr r0, _081332E0 @ =gUnknown_8463190 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters movs r0, 0 movs r1, 0x5B @@ -3239,7 +3239,7 @@ sub_81332EC: @ 81332EC str r4, [sp, 0xC] str r2, [sp, 0x10] mov r2, r9 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -3336,7 +3336,7 @@ sub_81333C4: @ 81333C4 movs r0, 0x3 movs r1, 0x1 movs r3, 0x1 - bl sub_812E51C + bl box_print add sp, 0xC pop {r4} pop {r0} @@ -3636,7 +3636,7 @@ sub_8133630: @ 8133630 lsls r0, r1, 3 ldr r1, _08133660 @ =gUnknown_84631E8 adds r0, r1 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] bl sub_8133354 diff --git a/asm/trade.s b/asm/trade.s index df4987a0b..7d60e96ba 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -43,7 +43,7 @@ sub_804C600: @ 804C600 movs r0, 0x1 bl SetBgTilemapBuffer ldr r0, _0804C70C @ =gUnknown_8261F2C - bl sub_8003B24 + bl InitWindows lsls r0, 16 cmp r0, 0 beq _0804C6F0 @@ -3912,7 +3912,7 @@ _0804E670: .4byte 0x0000bbcc thumb_func_start sub_804E674 sub_804E674: @ 804E674 push {r4,lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4019,7 +4019,7 @@ _0804E740: .4byte gUnknown_2031DA8 thumb_func_start sub_804E744 sub_804E744: @ 804E744 push {r4,r5,lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r5, r0, 24 cmp r5, 0 @@ -4827,7 +4827,7 @@ _0804ECEC: str r0, [sp, 0x8] adds r0, r5, 0 movs r3, 0x4 - bl sub_812E51C + bl box_print add r6, sp, 0x28 adds r0, r6, 0 ldr r1, [sp, 0x60] @@ -4847,7 +4847,7 @@ _0804ECEC: movs r1, 0x1 movs r2, 0 movs r3, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 adds r0, r5, 0 bl PutWindowTilemap adds r0, r5, 0 @@ -5110,7 +5110,7 @@ sub_804EFB4: @ 804EFB4 adds r0, r4, 0 movs r1, 0 movs r3, 0x4 - bl sub_812E51C + bl box_print adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0 @@ -7866,7 +7866,7 @@ sub_80504CC: @ 80504CC movs r2, 0x20 bl LoadCompressedPalette ldr r0, _080505C8 @ =gUnknown_826D1BC - bl sub_8003B24 + bl InitWindows mov r0, r9 str r0, [sp] movs r0, 0 @@ -9373,7 +9373,7 @@ _08051470: ldr r4, _080514AC @ =gUnknown_2021D18 ldr r1, _080514B0 @ =gUnknown_841E1E9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -9442,7 +9442,7 @@ _080514C8: ldr r4, _08051524 @ =gUnknown_2021D18 ldr r1, _08051528 @ =gUnknown_841E200 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -10916,7 +10916,7 @@ _08052128: ldr r4, _08052154 @ =gUnknown_2021D18 ldr r1, _08052158 @ =gUnknown_841E20D adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -11002,7 +11002,7 @@ _080521D0: ldr r4, _080521F8 @ =gUnknown_2021D18 ldr r1, _080521FC @ =gUnknown_841E21E adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -11549,7 +11549,7 @@ _08052860: ldr r4, _0805289C @ =gUnknown_2021D18 ldr r1, _080528A0 @ =gUnknown_841E1E9 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -11618,7 +11618,7 @@ _080528B8: ldr r4, _08052914 @ =gUnknown_2021D18 ldr r1, _08052918 @ =gUnknown_841E200 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -11823,7 +11823,7 @@ _08052AAC: lsls r1, 3 movs r0, 0x52 bl SetGpuReg - ldr r0, _08052ADC @ =sub_8054588 + ldr r0, _08052ADC @ =c3_08054588 movs r1, 0x5 bl CreateTask ldr r1, [r7] @@ -11831,9 +11831,9 @@ _08052AAC: .align 2, 0 _08052AD4: .4byte gUnknown_202063C _08052AD8: .4byte 0x00000452 -_08052ADC: .4byte sub_8054588 +_08052ADC: .4byte c3_08054588 _08052AE0: - ldr r0, _08052B00 @ =sub_8054588 + ldr r0, _08052B00 @ =c3_08054588 bl FuncIsActiveTask lsls r0, 24 cmp r0, 0 @@ -11847,7 +11847,7 @@ _08052AF0: strh r1, [r0] bl _08053774 .align 2, 0 -_08052B00: .4byte sub_8054588 +_08052B00: .4byte c3_08054588 _08052B04: .4byte gUnknown_2031DAC _08052B08: ldr r2, [r7] @@ -12151,11 +12151,11 @@ _08052D76: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r0, _08052D98 @ =sub_805465C + ldr r0, _08052D98 @ =c3_0805465C b _08052FBE .align 2, 0 _08052D94: .4byte gUnknown_202063C -_08052D98: .4byte sub_805465C +_08052D98: .4byte c3_0805465C _08052D9C: ldr r2, _08052DAC @ =0x0000ffff movs r0, 0x8 @@ -12654,7 +12654,7 @@ _08053180: str r0, [r2, 0x64] cmp r0, 0xA bne _080531C4 - ldr r0, _080531E0 @ =sub_8054588 + ldr r0, _080531E0 @ =c3_08054588 movs r1, 0x5 bl CreateTask lsls r0, 24 @@ -12682,7 +12682,7 @@ _080531D8: b _08053708 .align 2, 0 _080531DC: .4byte gUnknown_2031DAC -_080531E0: .4byte sub_8054588 +_080531E0: .4byte c3_08054588 _080531E4: .4byte gUnknown_3005090 _080531E8: ldr r0, [r7] @@ -12714,7 +12714,7 @@ _080531E8: .align 2, 0 _08053220: .4byte gUnknown_202063C _08053224: - ldr r0, _08053244 @ =sub_8054588 + ldr r0, _08053244 @ =c3_08054588 bl FuncIsActiveTask lsls r0, 24 lsrs r3, r0, 24 @@ -12731,7 +12731,7 @@ _08053234: str r3, [r2, 0x64] b _08053774 .align 2, 0 -_08053244: .4byte sub_8054588 +_08053244: .4byte c3_08054588 _08053248: .4byte gUnknown_2031DAC _0805324C: ldr r1, [r7] @@ -13141,7 +13141,7 @@ _08053584: ldr r4, _080535B0 @ =gUnknown_2021D18 ldr r1, _080535B4 @ =gUnknown_841E20D adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -13227,7 +13227,7 @@ _0805362C: ldr r4, _08053654 @ =gUnknown_2021D18 ldr r1, _08053658 @ =gUnknown_841E21E adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -13984,7 +13984,7 @@ sub_8053B48: @ 8053B48 ldrh r0, [r5, 0x28] cmp r0, 0 beq _08053CC0 - bl sub_80980F8 + bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _08053CB4 @@ -14446,7 +14446,7 @@ _080540DC: ldr r1, _08054100 @ =gUnknown_8419F54 _080540EA: adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -14474,7 +14474,7 @@ _08054120: movs r0, 0xC bl sub_8113550 movs r0, 0x15 - bl sub_8054E90 + bl IncrementGameStat _08054132: ldr r0, _08054178 @ =gUnknown_3003F3C ldrb r0, [r0] @@ -14989,7 +14989,7 @@ sub_8054508: @ 8054508 movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram @@ -15004,8 +15004,8 @@ _08054580: .4byte gUnknown_2031DAC _08054584: .4byte 0x00000105 thumb_func_end sub_8054508 - thumb_func_start sub_8054588 -sub_8054588: @ 8054588 + thumb_func_start c3_08054588 +c3_08054588: @ 8054588 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -15112,10 +15112,10 @@ _08054656: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_8054588 + thumb_func_end c3_08054588 - thumb_func_start sub_805465C -sub_805465C: @ 805465C + thumb_func_start c3_0805465C +c3_0805465C: @ 805465C push {r4-r7,lr} mov r7, r8 push {r7} @@ -15218,7 +15218,7 @@ _0805471E: _08054728: .4byte gUnknown_3005098 _0805472C: .4byte gUnknown_2031DAC _08054730: .4byte 0x0000010b - thumb_func_end sub_805465C + thumb_func_end c3_0805465C thumb_func_start sub_8054734 sub_8054734: @ 8054734 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 4d91fe2c7..22605dfaa 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -877,7 +877,7 @@ sav12_xor_get_clamped_above: @ 8089744 adds r4, r1, 0 lsls r0, 24 lsrs r0, 24 - bl sub_8054EC4 + bl GetGameStat cmp r0, r4 bls _08089756 adds r0, r4, 0 @@ -946,10 +946,10 @@ sub_808979C: @ 808979C ldrb r0, [r1, 0x10] strh r0, [r5, 0x12] movs r0, 0x1 - bl sub_8054EC4 + bl GetGameStat adds r4, r0, 0 movs r0, 0xA - bl sub_8054EC4 + bl GetGameStat cmp r0, 0 bne _080897D0 movs r4, 0 @@ -1632,7 +1632,7 @@ sub_8089D0C: @ 8089D0C movs r2, 0 bl ChangeBgY ldr r0, _08089D88 @ =gUnknown_83CD898 - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters pop {r0} bx r0 @@ -1856,7 +1856,7 @@ sub_8089EEC: @ 8089EEC add r0, sp, 0xC str r0, [sp, 0x8] movs r0, 0x1 - bl sub_812E51C + bl box_print add sp, 0x4C pop {r4,r5} pop {r0} @@ -1908,7 +1908,7 @@ sub_8089F78: @ 8089F78 add r0, sp, 0xC str r0, [sp, 0x8] movs r0, 0x1 - bl sub_812E51C + bl box_print add sp, 0x2C pop {r4} pop {r0} @@ -1972,7 +1972,7 @@ sub_8089FEC: @ 8089FEC adds r1, r6, 0 movs r2, 0x14 movs r3, 0x38 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] add r0, sp, 0xC @@ -1981,7 +1981,7 @@ sub_8089FEC: @ 8089FEC adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x38 - bl sub_812E51C + bl box_print b _0808A0CA .align 2, 0 _0808A068: .4byte gUnknown_8419CED @@ -2015,7 +2015,7 @@ _0808A080: adds r1, r6, 0 movs r2, 0x10 movs r3, 0x39 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] add r1, sp, 0xC @@ -2024,7 +2024,7 @@ _0808A080: adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x39 - bl sub_812E51C + bl box_print _0808A0CA: add sp, 0x18 pop {r4-r7} @@ -2047,7 +2047,7 @@ sub_808A0E0: @ 808A0E0 b _0808A0F8 _0808A0F2: movs r0, 0x1 - bl sub_8088E8C + bl pokedex_count _0808A0F8: lsls r0, 16 lsrs r0, 16 @@ -2108,7 +2108,7 @@ _0808A112: adds r1, r6, 0 movs r2, 0x14 movs r3, 0x48 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] add r0, sp, 0xC @@ -2117,7 +2117,7 @@ _0808A112: adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x48 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] ldr r0, _0808A1B0 @ =gUnknown_8419CF7 @@ -2126,7 +2126,7 @@ _0808A112: adds r1, r6, 0 movs r2, 0x8A movs r3, 0x48 - bl sub_812E51C + bl box_print b _0808A212 .align 2, 0 _0808A198: .4byte 0x00000829 @@ -2161,7 +2161,7 @@ _0808A1B4: adds r1, r6, 0 movs r2, 0x10 movs r3, 0x49 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] add r1, sp, 0xC @@ -2170,7 +2170,7 @@ _0808A1B4: adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x49 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] ldr r0, _0808A228 @ =gUnknown_8419CF7 @@ -2179,7 +2179,7 @@ _0808A1B4: adds r1, r6, 0 movs r2, 0x8A movs r3, 0x49 - bl sub_812E51C + bl box_print _0808A212: add sp, 0x18 pop {r4-r7} @@ -2258,7 +2258,7 @@ _0808A264: movs r0, 0x1 movs r2, 0x14 movs r3, 0x58 - bl sub_812E51C + bl box_print b _0808A2F4 .align 2, 0 _0808A2B0: .4byte gUnknown_300500C @@ -2284,7 +2284,7 @@ _0808A2D8: movs r0, 0x1 movs r2, 0x10 movs r3, 0x59 - bl sub_812E51C + bl box_print _0808A2F4: add r0, sp, 0xC adds r1, r5, 0 @@ -2316,7 +2316,7 @@ _0808A2F4: str r1, [sp, 0x8] movs r0, 0x1 mov r1, r10 - bl sub_812E51C + bl box_print ldr r1, _0808A3C0 @ =gUnknown_83CD932 mov r2, r9 ldr r4, [r2] @@ -2338,7 +2338,7 @@ _0808A2F4: str r0, [sp, 0x8] movs r0, 0x1 mov r1, r10 - bl sub_812E51C + bl box_print add r0, sp, 0xC adds r1, r7, 0 movs r2, 0x2 @@ -2360,7 +2360,7 @@ _0808A2F4: str r1, [sp, 0x8] movs r0, 0x1 mov r1, r10 - bl sub_812E51C + bl box_print add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -2412,7 +2412,7 @@ sub_808A3D0: @ 808A3D0 movs r0, 0x1 movs r1, 0x2 movs r2, 0xA - bl sub_812E51C + bl box_print ldr r1, [r7] adds r1, 0x19 movs r0, 0x2 @@ -2433,7 +2433,7 @@ sub_808A3D0: @ 808A3D0 str r1, [sp, 0x8] movs r0, 0x1 movs r1, 0x2 - bl sub_812E51C + bl box_print ldr r0, _0808A4A4 @ =gUnknown_83CD93A mov r8, r0 ldr r1, [r7] @@ -2448,7 +2448,7 @@ sub_808A3D0: @ 808A3D0 movs r0, 0x1 movs r1, 0x2 movs r2, 0xA - bl sub_812E51C + bl box_print ldr r1, [r7] adds r1, 0x33 movs r0, 0x2 @@ -2469,7 +2469,7 @@ sub_808A3D0: @ 808A3D0 str r1, [sp, 0x8] movs r0, 0x1 movs r1, 0x2 - bl sub_812E51C + bl box_print _0808A486: add sp, 0xC pop {r3} @@ -2553,7 +2553,7 @@ sub_808A4FC: @ 808A4FC adds r0, 0x4D str r0, [sp, 0x8] movs r0, 0x1 - bl sub_812E51C + bl box_print b _0808A59C .align 2, 0 _0808A538: .4byte gUnknown_20397A4 @@ -2597,7 +2597,7 @@ _0808A550: str r4, [sp, 0x8] movs r0, 0x1 adds r1, r5, 0 - bl sub_812E51C + bl box_print _0808A59C: add sp, 0xC pop {r4-r6} @@ -2708,7 +2708,7 @@ sub_808A654: @ 808A654 movs r0, 0x1 adds r1, r5, 0 movs r3, 0x23 - bl sub_812E51C + bl box_print ldr r0, _0808A6C4 @ =gUnknown_83CD8E3 str r0, [sp] str r4, [sp, 0x4] @@ -2719,7 +2719,7 @@ sub_808A654: @ 808A654 adds r1, r5, 0 movs r2, 0xA4 movs r3, 0x23 - bl sub_812E51C + bl box_print _0808A6A2: add sp, 0xC pop {r4-r6} @@ -2830,7 +2830,7 @@ sub_808A760: @ 808A760 movs r0, 0x1 adds r1, r6, 0 movs r3, 0x33 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] ldr r0, [r7] @@ -2841,7 +2841,7 @@ sub_808A760: @ 808A760 adds r1, r6, 0 movs r2, 0x82 movs r3, 0x33 - bl sub_812E51C + bl box_print ldr r5, _0808A804 @ =gUnknown_83CD8E3 str r5, [sp] str r4, [sp, 0x4] @@ -2853,7 +2853,7 @@ sub_808A760: @ 808A760 adds r1, r6, 0 movs r2, 0x90 movs r3, 0x33 - bl sub_812E51C + bl box_print str r5, [sp] str r4, [sp, 0x4] ldr r0, [r7] @@ -2864,7 +2864,7 @@ sub_808A760: @ 808A760 adds r1, r6, 0 movs r2, 0xC0 movs r3, 0x33 - bl sub_812E51C + bl box_print _0808A7E2: add sp, 0xC pop {r4-r7} @@ -2943,7 +2943,7 @@ sub_808A854: @ 808A854 movs r0, 0x1 adds r1, r5, 0 movs r3, 0x43 - bl sub_812E51C + bl box_print ldr r0, _0808A8C8 @ =gUnknown_83CD8E3 str r0, [sp] str r4, [sp, 0x4] @@ -2955,7 +2955,7 @@ sub_808A854: @ 808A854 adds r1, r5, 0 movs r2, 0xBA movs r3, 0x43 - bl sub_812E51C + bl box_print _0808A8A6: add sp, 0xC pop {r4-r6} @@ -3042,7 +3042,7 @@ sub_808A91C: @ 808A91C movs r0, 0x1 adds r1, r5, 0 movs r3, 0x63 - bl sub_812E51C + bl box_print ldr r0, _0808A99C @ =gUnknown_83CD8E3 str r0, [sp] str r4, [sp, 0x4] @@ -3054,7 +3054,7 @@ sub_808A91C: @ 808A91C adds r1, r5, 0 movs r2, 0xBA movs r3, 0x63 - bl sub_812E51C + bl box_print _0808A97A: add sp, 0xC pop {r4-r6} @@ -3140,7 +3140,7 @@ sub_808A9F0: @ 808A9F0 movs r0, 0x1 adds r1, r5, 0 movs r3, 0x53 - bl sub_812E51C + bl box_print ldr r0, _0808AA70 @ =gUnknown_83CD8E3 str r0, [sp] str r4, [sp, 0x4] @@ -3152,7 +3152,7 @@ sub_808A9F0: @ 808A9F0 adds r1, r5, 0 movs r2, 0xBA movs r3, 0x53 - bl sub_812E51C + bl box_print _0808AA4C: add sp, 0xC pop {r4-r6} diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 6ac237f95..e232fe9dc 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -64,7 +64,7 @@ sub_8081B84: @ 8081B84 adds r0, r5, 0 bl GetFieldObjectScriptPointerByFieldObjectId adds r6, r0, 0 - bl sub_8080378 + bl GetTrainerFlagFromScriptPointer cmp r0, 0 bne _08081BE4 lsls r4, r5, 3 @@ -1545,8 +1545,8 @@ _080826A0: .4byte gUnknown_20386E0 _080826A4: .4byte 0x0000fffb thumb_func_end sub_808265C - thumb_func_start sub_80826A8 -sub_80826A8: @ 80826A8 + thumb_func_start objc_exclamation_mark_probably +objc_exclamation_mark_probably: @ 80826A8 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 @@ -1623,6 +1623,6 @@ _08082736: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80826A8 + thumb_func_end objc_exclamation_mark_probably .align 2, 0 @ Don't pad with nop. diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s index 5e1845443..e121a02f3 100644 --- a/asm/trainer_tower.s +++ b/asm/trainer_tower.s @@ -11,7 +11,7 @@ sub_815D7BC: @ 815D7BC adds r5, r0, 0 adds r4, r1, 0 movs r0, 0x1E - bl sub_80DA588 + bl TryCopySpecialSaveSection cmp r0, 0x1 bne _0815D804 ldr r2, _0815D800 @ =0x00000f88 @@ -20,7 +20,7 @@ sub_815D7BC: @ 815D7BC bl memcpy movs r0, 0x1F adds r1, r4, 0 - bl sub_80DA588 + bl TryCopySpecialSaveSection cmp r0, 0x1 bne _0815D804 ldr r1, _0815D800 @ =0x00000f88 @@ -1312,7 +1312,7 @@ _0815E180: movs r1, 0x1 bl CreateTask movs r0, 0 - bl sub_8044090 + bl PlayMapChosenOrBattleBGM bl sub_8080060 lsls r0, 24 lsrs r0, 24 @@ -2018,7 +2018,7 @@ sub_815E720: @ 815E720 sub sp, 0xC bl sub_815EC0C ldr r0, _0815E85C @ =gUnknown_847A218 - bl sub_8003CE4 + bl AddWindow lsls r0, 24 lsrs r7, r0, 24 bl sub_80F6E9C @@ -2094,7 +2094,7 @@ _0815E76C: bl sub_8008E78 ldr r0, _0815E87C @ =gUnknown_2021D18 ldr r1, _0815E880 @ =gUnknown_83FE998 - bl sub_8008FCC + bl StringExpandPlaceholders ldr r1, _0815E884 @ =gUnknown_83FE9C4 mov r0, r8 subs r0, 0x1 @@ -2708,7 +2708,7 @@ sub_815EC8C: @ 815EC8C movs r1, 0x2 movs r2, 0x4A movs r3, 0 - bl sub_812E51C + bl box_print movs r7, 0 movs r0, 0x90 lsls r0, 22 @@ -2759,7 +2759,7 @@ _0815ECDC: bl sub_8008E78 ldr r0, _0815EDD0 @ =gUnknown_2021D18 ldr r1, _0815EDD4 @ =gUnknown_83FE998 - bl sub_8008FCC + bl StringExpandPlaceholders lsls r1, r7, 2 mov r0, r10 lsrs r4, r0, 24 @@ -2775,7 +2775,7 @@ _0815ECDC: movs r1, 0x2 movs r2, 0x18 adds r3, r4, 0 - bl sub_812E51C + bl box_print ldr r0, _0815EDB4 @ =gUnknown_847A22C str r0, [sp] movs r0, 0 @@ -2786,7 +2786,7 @@ _0815ECDC: movs r1, 0x2 movs r2, 0x60 adds r3, r4, 0 - bl sub_812E51C + bl box_print movs r0, 0xA0 lsls r0, 21 add r10, r0 diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index b80c25594..07ae5b08c 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -47,7 +47,7 @@ sub_812845C: @ 812845C strb r5, [r4, 0x16] movs r0, 0xFF strb r0, [r4, 0x1A] - bl sub_800A088 + bl GetLinkPlayerCount strb r0, [r4, 0xD] bl GetMultiplayerId strb r0, [r4, 0x13] @@ -2749,7 +2749,7 @@ _0812994E: movs r0, 0x1 strh r0, [r4] _08129952: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 @@ -2916,7 +2916,7 @@ _08129A8C: ldrsh r0, [r4, r3] cmp r0, 0 beq _08129AC0 - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -2998,7 +2998,7 @@ sub_8129B14: @ 8129B14 movs r2, 0x4 bl sub_8001658 ldr r0, _08129B6C @ =gUnknown_845AA94 - bl sub_8003B24 + bl InitWindows bl reset_temp_tile_data_buffers bl sub_812AD50 ldr r0, [r4] @@ -4246,7 +4246,7 @@ sub_812A424: @ 812A424 orrs r0, r1 str r0, [sp, 0x10] add r0, sp, 0xC - bl sub_8003CE4 + bl AddWindow adds r1, r0, 0 ldr r6, _0812A510 @ =gUnknown_203B0E4 ldr r0, [r6] @@ -4441,7 +4441,7 @@ sub_812A578: @ 812A578 str r0, [sp, 0x14] _0812A5F8: add r0, sp, 0x14 - bl sub_8003CE4 + bl AddWindow ldr r5, _0812A63C @ =gUnknown_203B0E4 ldr r1, [r5] strh r0, [r1, 0x1E] @@ -4689,7 +4689,7 @@ _0812A7B4: movs r0, 0x1 movs r1, 0x2 movs r3, 0x1 - bl sub_812E51C + bl box_print add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -4767,7 +4767,7 @@ _0812A866: movs r0, 0x2 movs r1, 0 lsrs r2, r5, 24 - bl sub_812E51C + bl box_print adds r4, 0x4 adds r7, 0x1 adds r0, r6, 0 @@ -4807,7 +4807,7 @@ _0812A8A8: movs r4, 0x80 lsls r4, 19 lsrs r2, r4, 24 - bl sub_812E51C + bl box_print adds r0, r7, 0x1 str r0, [sp, 0x48] adds r6, 0xC @@ -4858,7 +4858,7 @@ _0812A90C: movs r0, 0x2 movs r1, 0 adds r3, r4, 0 - bl sub_812E51C + bl box_print adds r2, r7, 0 add r0, sp, 0xC str r0, [sp] @@ -4870,7 +4870,7 @@ _0812A90C: movs r0, 0x2 movs r1, 0 adds r3, r4, 0 - bl sub_812E51C + bl box_print _0812A960: ldr r7, [sp, 0x48] mov r4, r10 @@ -5063,7 +5063,7 @@ sub_812AA78: @ 812AA78 movs r1, 0x2 movs r2, 0 adds r3, r4, 0 - bl sub_812E51C + bl box_print add sp, 0x10 pop {r4,r5} pop {r0} diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index eb3d4fe59..910d8bb02 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -92,7 +92,7 @@ _08147B5C: .4byte gUnknown_203F3D4 sub_8147B60: @ 8147B60 push {r4,lr} adds r4, r0, 0 - bl sub_800A088 + bl GetLinkPlayerCount movs r2, 0 strb r0, [r4, 0x5] adds r1, r4, 0 @@ -4176,7 +4176,7 @@ _0814999C: thumb_func_start sub_81499A4 sub_81499A4: @ 81499A4 push {lr} - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 pop {r1} @@ -4792,7 +4792,7 @@ _08149DF0: movs r2, 0x4 bl sub_8001658 ldr r0, _08149EEC @ =gUnknown_846D8E4 - bl sub_8003B24 + bl InitWindows bl sub_80F6C14 bl reset_temp_tile_data_buffers ldr r0, [r6] @@ -5961,7 +5961,7 @@ _0814A73C: thumb_func_start sub_814A744 sub_814A744: @ 814A744 push {lr} - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r0, 24 pop {r1} @@ -6006,7 +6006,7 @@ sub_814A754: @ 814A754 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp - bl sub_8003CE4 + bl AddWindow adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 @@ -6116,7 +6116,7 @@ sub_814A84C: @ 814A84C movs r1, 0 movs r2, 0 movs r3, 0x2 - bl sub_812E51C + bl box_print add r0, sp, 0xC str r0, [sp] str r4, [sp, 0x4] @@ -6126,7 +6126,7 @@ sub_814A84C: @ 814A84C movs r1, 0 movs r2, 0 movs r3, 0x2 - bl sub_812E51C + bl box_print add sp, 0x10 pop {r4} pop {r0} @@ -6493,7 +6493,7 @@ _0814AB2A: orrs r0, r2 str r0, [sp] mov r0, sp - bl sub_8003CE4 + bl AddWindow ldr r1, _0814AB94 @ =gUnknown_203F3D8 ldr r1, [r1] lsls r2, r5, 1 @@ -6582,7 +6582,7 @@ sub_814AB98: @ 814AB98 movs r1, 0 adds r2, r4, 0 movs r3, 0x2 - bl sub_812E51C + bl box_print ldr r0, [r6] adds r0, 0x1C add r0, r8 @@ -7854,7 +7854,7 @@ _0814B54C: b _0814B5BE _0814B556: ldr r0, _0814B56C @ =gUnknown_846E2CC - bl sub_8003CE4 + bl AddWindow strh r0, [r4, 0x2] ldrh r0, [r4, 0x2] bl sub_814B5C4 diff --git a/asm/unk_814B6F0.s b/asm/unk_814B6F0.s index 38735abff..645cb3cc1 100644 --- a/asm/unk_814B6F0.s +++ b/asm/unk_814B6F0.s @@ -88,7 +88,7 @@ _0814B784: .4byte gUnknown_3003F64 _0814B788: .4byte gUnknown_3003F3C _0814B78C: .4byte gUnknown_3005450 _0814B790: - bl sub_800A088 + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 mov r8, r0 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index d217d322e..b4fd68688 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -217,7 +217,7 @@ _0814BCA2: adds r0, r1 ldr r1, [r0] adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders ldrb r3, [r7, 0xB] str r6, [sp] mov r0, r8 @@ -260,7 +260,7 @@ _0814BD12: _0814BD1C: .4byte gUnknown_846E328 _0814BD20: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0814BD6E @@ -2949,7 +2949,7 @@ _0814D1CA: bl sub_80F7858 b _0814D230 _0814D1D0: - bl sub_81100C8 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 @@ -3259,7 +3259,7 @@ _0814D40C: _0814D418: .4byte gUnknown_846E328 _0814D41C: movs r0, 0 - bl sub_8002E64 + bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 bne _0814D45C @@ -3367,7 +3367,7 @@ sub_814D4D8: @ 814D4D8 adds r4, r0, 0 movs r5, 0 movs r0, 0x33 - bl sub_8054E90 + bl IncrementGameStat strb r5, [r4, 0xD] movs r1, 0 strh r5, [r4, 0x10] diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index 63f2ec759..f9d690cf0 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -1212,7 +1212,7 @@ sub_814DF44: @ 814DF44 movs r1, 0x2 adds r2, r4, 0 movs r3, 0 - bl sub_812E51C + bl box_print add sp, 0xC pop {r3} mov r8, r3 @@ -1355,7 +1355,7 @@ _0814E048: movs r1, 0x2 adds r2, r7, 0 adds r3, r4, 0 - bl sub_812E51C + bl box_print ldr r1, [sp, 0x2C] ldrb r0, [r1] adds r2, r7, 0 @@ -1370,7 +1370,7 @@ _0814E048: str r1, [sp, 0x8] movs r1, 0x2 adds r3, r4, 0 - bl sub_812E51C + bl box_print mov r9, r6 _0814E0C8: ldr r6, [sp, 0x20] @@ -1482,7 +1482,7 @@ _0814E178: adds r0, r2, r0 ldr r1, [r0] ldr r0, _0814E1F8 @ =gUnknown_2021D18 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 ldr r1, _0814E1F8 @ =gUnknown_2021D18 movs r2, 0 @@ -1509,7 +1509,7 @@ _0814E178: ldr r1, _0814E1F8 @ =gUnknown_2021D18 str r1, [sp, 0x8] movs r1, 0x2 - bl sub_812E51C + bl box_print b _0814E27E .align 2, 0 _0814E1E4: .4byte gUnknown_2021CD0 @@ -1544,7 +1544,7 @@ _0814E21A: ldr r0, _0814E29C @ =gUnknown_846F4B8 ldr r1, [r0, 0x8] ldr r0, _0814E2A0 @ =gUnknown_2021D18 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 ldr r1, _0814E2A0 @ =gUnknown_2021D18 movs r2, 0x1 @@ -1573,7 +1573,7 @@ _0814E21A: ldr r1, _0814E2A0 @ =gUnknown_2021D18 str r1, [sp, 0x8] movs r1, 0x2 - bl sub_812E51C + bl box_print mov r9, r4 mov r6, r8 adds r6, 0xA2 @@ -1632,7 +1632,7 @@ _0814E2B8: str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0x4 - bl sub_812E51C + bl box_print mov r2, r10 lsls r0, r2, 24 lsrs r0, 24 @@ -1681,7 +1681,7 @@ sub_814E32C: @ 814E32C mov r9, r4 ldrb r0, [r4] movs r1, 0x4 - bl sub_8004950 + bl GetWindowAttribute lsls r0, 27 movs r1, 0xD6 lsls r1, 24 @@ -1702,7 +1702,7 @@ sub_814E32C: @ 814E32C movs r1, 0x2 movs r2, 0x2 adds r3, r7, 0 - bl sub_812E51C + bl box_print ldr r4, _0814E568 @ =gUnknown_841D088 movs r0, 0x2 adds r1, r4, 0 @@ -1722,7 +1722,7 @@ sub_814E32C: @ 814E32C movs r1, 0x2 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print adds r0, r6, 0 subs r0, 0x20 lsls r0, 24 @@ -1748,7 +1748,7 @@ sub_814E32C: @ 814E32C ldr r5, _0814E574 @ =gUnknown_2021D18 ldr r1, _0814E578 @ =gUnknown_841D080 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders mov r4, r9 ldrb r0, [r4] ldr r1, _0814E560 @ =gUnknown_846E3DC @@ -1759,7 +1759,7 @@ sub_814E32C: @ 814E32C movs r1, 0x2 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print ldr r4, _0814E57C @ =gUnknown_841D078 movs r0, 0x2 adds r1, r4, 0 @@ -1779,7 +1779,7 @@ sub_814E32C: @ 814E32C movs r1, 0x2 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print adds r0, r6, 0 subs r0, 0x9 lsls r0, 24 @@ -1795,7 +1795,7 @@ sub_814E32C: @ 814E32C bl sub_8008E78 ldr r1, _0814E580 @ =gUnknown_841D074 adds r0, r5, 0 - bl sub_8008FCC + bl StringExpandPlaceholders mov r4, r9 ldrb r0, [r4] ldr r1, _0814E560 @ =gUnknown_846E3DC @@ -1806,7 +1806,7 @@ sub_814E32C: @ 814E32C movs r1, 0x2 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print adds r0, r7, 0 adds r0, 0xE lsls r0, 24 @@ -1821,7 +1821,7 @@ sub_814E32C: @ 814E32C movs r1, 0x2 movs r2, 0x2 adds r3, r7, 0 - bl sub_812E51C + bl box_print ldr r4, _0814E588 @ =gUnknown_841D098 movs r0, 0x2 adds r1, r4, 0 @@ -1842,7 +1842,7 @@ sub_814E32C: @ 814E32C movs r1, 0x3 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print mov r4, r8 ldrb r2, [r4, 0x16] ldrh r0, [r4, 0x16] @@ -1893,7 +1893,7 @@ _0814E4EA: ldr r4, _0814E574 @ =gUnknown_2021D18 ldr r1, _0814E594 @ =gUnknown_841D090 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders adds r0, r6, 0 subs r0, 0x26 lsls r0, 24 @@ -1919,7 +1919,7 @@ _0814E4EA: movs r1, 0x2 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print b _0814E5B6 .align 2, 0 _0814E560: .4byte gUnknown_846E3DC @@ -1949,7 +1949,7 @@ _0814E59C: movs r1, 0x2 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print _0814E5B6: adds r0, r7, 0 adds r0, 0xE @@ -1970,7 +1970,7 @@ _0814E5B6: movs r1, 0x2 movs r2, 0x2 adds r3, r7, 0 - bl sub_812E51C + bl box_print ldr r0, _0814E638 @ =gUnknown_2021CD0 ldr r4, [sp, 0x10] ldrh r1, [r4, 0x8] @@ -1980,7 +1980,7 @@ _0814E5B6: ldr r4, _0814E63C @ =gUnknown_2021D18 ldr r1, _0814E640 @ =gUnknown_841D0A4 adds r0, r4, 0 - bl sub_8008FCC + bl StringExpandPlaceholders movs r0, 0x2 adds r1, r4, 0 movs r2, 0 @@ -1998,7 +1998,7 @@ _0814E5B6: movs r1, 0x2 adds r2, r6, 0 adds r3, r7, 0 - bl sub_812E51C + bl box_print add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -2074,7 +2074,7 @@ _0814E6B2: mov r0, sp strb r1, [r0, 0x4] mov r0, sp - bl sub_8003CE4 + bl AddWindow adds r1, r6, 0 adds r1, 0x82 strb r0, [r1] @@ -2297,7 +2297,7 @@ _0814E874: b _0814EA66 _0814E876: ldr r0, _0814E8A8 @ =gUnknown_846E3F0 - bl sub_8003CE4 + bl AddWindow strh r0, [r7, 0x2] lsls r0, 24 lsrs r0, 24 @@ -2341,7 +2341,7 @@ _0814E8B0: str r5, [sp, 0x8] movs r1, 0x2 movs r3, 0x2 - bl sub_812E51C + bl box_print ldr r5, _0814EA04 @ =gUnknown_841D124 movs r0, 0x2 adds r1, r5, 0 @@ -2358,7 +2358,7 @@ _0814E8B0: str r5, [sp, 0x8] movs r1, 0x2 movs r3, 0x12 - bl sub_812E51C + bl box_print movs r0, 0x2A str r0, [sp, 0xC] ldr r1, _0814EA08 @ =gUnknown_2021D18 @@ -2372,7 +2372,7 @@ _0814E90E: bl sub_8008E78 mov r0, r8 ldr r1, _0814EA10 @ =gUnknown_841D13C - bl sub_8008FCC + bl StringExpandPlaceholders ldrb r0, [r7, 0x2] ldr r1, _0814EA14 @ =gUnknown_846E3DC str r1, [sp] @@ -2383,7 +2383,7 @@ _0814E90E: movs r1, 0x2 movs r2, 0x4 ldr r3, [sp, 0xC] - bl sub_812E51C + bl box_print movs r3, 0 mov r0, r9 lsls r4, r0, 1 @@ -2433,7 +2433,7 @@ _0814E96E: bl sub_8008E78 mov r0, r8 ldr r1, _0814EA24 @ =gUnknown_841D090 - bl sub_8008FCC + bl StringExpandPlaceholders movs r1, 0 strb r1, [r0] adds r0, 0x1 @@ -2456,7 +2456,7 @@ _0814E96E: str r1, [sp, 0x8] movs r1, 0x3 ldr r3, [sp, 0xC] - bl sub_812E51C + bl box_print ldr r1, [sp, 0x10] lsls r0, r1, 24 lsrs r0, 24 @@ -2651,7 +2651,7 @@ _0814EB46: lsls r0, 3 ldr r1, _0814EBA8 @ =gUnknown_846E3F8 adds r0, r1 - bl sub_8003CE4 + bl AddWindow ldr r1, _0814EBAC @ =0x000001bb adds r4, r5, r1 adds r4, r6 @@ -2723,7 +2723,7 @@ _0814EBC6: str r4, [sp, 0x10] movs r1, 0x2 movs r3, 0x1 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 b _0814EC4C .align 2, 0 _0814EC10: .4byte 0x000001bb @@ -2752,7 +2752,7 @@ _0814EC18: str r4, [sp, 0x10] movs r1, 0x2 movs r3, 0x1 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 _0814EC4C: ldr r1, _0814EC7C @ =0x000001bb adds r0, r6, r1 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 6c50c3d95..03b1c7c1e 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -273,7 +273,7 @@ _081509E8: _08150A26: ldr r0, [sp, 0x10] strb r1, [r0] - bl sub_800A088 + bl GetLinkPlayerCount mov r1, r8 strb r0, [r1] bl GetMultiplayerId @@ -3096,7 +3096,7 @@ sub_8152048: @ 8152048 push {r4,lr} adds r4, r0, 0 adds r0, r1, 0 - bl sub_8044470 + bl IsMonShiny strb r0, [r4] pop {r4} pop {r0} @@ -6394,7 +6394,7 @@ _08153858: b _081538CA _08153862: ldr r0, _08153878 @ =gUnknown_84755E0 - bl sub_8003CE4 + bl AddWindow strh r0, [r4, 0x2] lsls r0, 24 lsrs r0, 24 @@ -6580,7 +6580,7 @@ _081539E8: .4byte gUnknown_8475602 thumb_func_start sub_81539EC sub_81539EC: @ 81539EC push {lr} - bl sub_800A088 + bl GetLinkPlayerCount ldr r1, _08153A00 @ =gUnknown_203F3E0 ldr r1, [r1] adds r1, 0x24 @@ -8965,7 +8965,7 @@ _08154BD0: orrs r0, r2 str r0, [sp, 0xC] add r0, sp, 0xC - bl sub_8003CE4 + bl AddWindow mov r2, r10 ldr r1, [r2] add r1, r9 @@ -9014,7 +9014,7 @@ _08154C4E: str r4, [sp, 0x8] movs r1, 0 movs r3, 0x1 - bl sub_812E51C + bl box_print mov r2, r10 ldr r0, [r2] add r0, r9 @@ -9319,7 +9319,7 @@ _08154EC8: movs r1, 0 movs r2, 0x1C adds r3, r6, 0 - bl sub_812E51C + bl box_print add r0, sp, 0xC mov r1, r9 movs r2, 0x1 @@ -9440,7 +9440,7 @@ _08155004: .4byte 0x0000301c _08155008: ldr r6, _08155050 @ =gUnknown_8475674 adds r0, r6, 0 - bl sub_8003CE4 + bl AddWindow ldr r4, _08155054 @ =gUnknown_203F440 ldr r1, [r4] ldr r2, _08155058 @ =0x00003008 @@ -9450,7 +9450,7 @@ _08155008: movs r0, 0x8 adds r0, r6 mov r9, r0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r4] ldr r5, _0815505C @ =0x00003009 adds r1, r5 @@ -9563,7 +9563,7 @@ _081550EA: str r6, [sp, 0x8] movs r1, 0 movs r2, 0x2 - bl sub_812E51C + bl box_print movs r7, 0 mov r0, r9 adds r0, 0x1 @@ -9624,7 +9624,7 @@ _0815512E: add r1, sp, 0xC str r1, [sp, 0x8] movs r1, 0 - bl sub_812E51C + bl box_print b _081551FA .align 2, 0 _081551A8: .4byte gUnknown_203F440 @@ -9924,7 +9924,7 @@ _0815542C: bl RemoveWindow ldr r6, _0815547C @ =gUnknown_8475684 adds r0, r6, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] adds r1, r4 strb r0, [r1] @@ -10242,7 +10242,7 @@ _0815571C: _0815571E: ldr r5, _08155788 @ =gUnknown_847568C adds r0, r5, 0 - bl sub_8003CE4 + bl AddWindow mov r2, r10 ldr r1, [r2] ldr r3, _0815578C @ =0x00003008 @@ -10251,7 +10251,7 @@ _0815571E: movs r0, 0x8 adds r0, r5 mov r8, r0 - bl sub_8003CE4 + bl AddWindow mov r2, r10 ldr r1, [r2] ldr r4, _08155790 @ =0x00003009 @@ -10765,7 +10765,7 @@ _08155B74: _08155B7A: ldr r4, _08155B9C @ =gUnknown_84756A4 adds r0, r4, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r5] ldr r2, _08155BA0 @ =0x00003008 adds r1, r2 @@ -10918,7 +10918,7 @@ _08155CA8: _08155CB2: ldr r4, _08155CF8 @ =gUnknown_847569C adds r0, r4, 0 - bl sub_8003CE4 + bl AddWindow ldr r1, [r6] ldr r2, _08155CFC @ =0x00003008 adds r1, r2 diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index 50845e870..f2faaa338 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -818,7 +818,7 @@ sub_815A540: @ 815A540 ldr r0, _0815A5B4 @ =gUnknown_2036E38 adds r4, r0 movs r0, 0x1 - bl sub_805BDEC + bl SetPlayerAvatarTransitionFlags ldrb r1, [r4, 0x1A] lsls r0, r1, 4 adds r0, r1 diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s index 5fcae020a..c4db24359 100644 --- a/asm/unk_815EDDC.s +++ b/asm/unk_815EDDC.s @@ -411,7 +411,7 @@ sub_815F094: @ 815F094 str r1, [sp, 0x1C] ldr r4, _0815F10C @ =gUnknown_203F464 add r0, sp, 0x18 - bl sub_8003CE4 + bl AddWindow strb r0, [r4] ldrb r0, [r4] movs r1, 0 diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s index b7dcce10e..1d490add2 100644 --- a/asm/vs_seeker.s +++ b/asm/vs_seeker.s @@ -402,7 +402,7 @@ _0810C998: movs r1, 0x64 subs r1, r0 movs r0, 0 - bl sub_80CBED4 + bl TV_PrintIntToStringVar movs r0, 0 _0810C9A4: pop {r1} diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index a2b7ffed7..cfb19ea34 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -1159,7 +1159,7 @@ sub_8082FB0: @ 8082FB0 adds r1, r5, 0 bl sub_8082B64 movs r0, 0xC - bl sub_8054E90 + bl IncrementGameStat bl sub_807F704 pop {r4,r5} pop {r0} @@ -1168,8 +1168,8 @@ sub_8082FB0: @ 8082FB0 _08082FE4: .4byte gUnknown_83C9CB8 thumb_func_end sub_8082FB0 - thumb_func_start sub_8082FE8 -sub_8082FE8: @ 8082FE8 + thumb_func_start GetLocalWildMon +GetLocalWildMon: @ 8082FE8 push {r4-r6,lr} adds r6, r0, 0 movs r0, 0 @@ -1239,10 +1239,10 @@ _0808306E: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_8082FE8 + thumb_func_end GetLocalWildMon - thumb_func_start sub_8083074 -sub_8083074: @ 8083074 + thumb_func_start GetLocalWaterMon +GetLocalWaterMon: @ 8083074 push {r4,lr} bl sub_8082934 lsls r0, 16 @@ -1275,7 +1275,7 @@ _080830B2: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8083074 + thumb_func_end GetLocalWaterMon thumb_func_start sub_80830B8 sub_80830B8: @ 80830B8 diff --git a/asm/window.s b/asm/window.s index 61883168a..aaf823c12 100644 --- a/asm/window.s +++ b/asm/window.s @@ -10,8 +10,8 @@ nullsub_6: @ 8003B20 bx lr thumb_func_end nullsub_6 - thumb_func_start sub_8003B24 -sub_8003B24: @ 8003B24 + thumb_func_start InitWindows +InitWindows: @ 8003B24 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -154,7 +154,7 @@ _08003C2E: cmp r4, 0 bne _08003C70 adds r0, r7, 0 - bl sub_8004A34 + bl GetNumActiveWindowsOnBg lsls r0, 24 cmp r0, 0 bne _08003BB4 @@ -231,10 +231,10 @@ _08003CC8: _08003CD8: .4byte gUnknown_20204B4 _08003CDC: .4byte gUnknown_3003D8C _08003CE0: .4byte gUnknown_3003E30 - thumb_func_end sub_8003B24 + thumb_func_end InitWindows - thumb_func_start sub_8003CE4 -sub_8003CE4: @ 8003CE4 + thumb_func_start AddWindow +AddWindow: @ 8003CE4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -337,7 +337,7 @@ _08003D96: cmp r4, 0 bne _08003DE8 adds r0, r7, 0 - bl sub_8004A34 + bl GetNumActiveWindowsOnBg lsls r0, 24 cmp r0, 0 bne _08003DCE @@ -403,7 +403,7 @@ _08003E24: .align 2, 0 _08003E34: .4byte gUnknown_20204B4 _08003E38: .4byte gUnknown_3003D8C - thumb_func_end sub_8003CE4 + thumb_func_end AddWindow thumb_func_start RemoveWindow RemoveWindow: @ 8003E3C @@ -435,7 +435,7 @@ _08003E68: str r0, [r4] str r1, [r4, 0x4] adds r0, r7, 0 - bl sub_8004A34 + bl GetNumActiveWindowsOnBg lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -1894,8 +1894,8 @@ _0800494A: bx r1 thumb_func_end sub_80048BC - thumb_func_start sub_8004950 -sub_8004950: @ 8004950 + thumb_func_start GetWindowAttribute +GetWindowAttribute: @ 8004950 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -2006,10 +2006,10 @@ _08004A2C: _08004A2E: pop {r1} bx r1 - thumb_func_end sub_8004950 + thumb_func_end GetWindowAttribute - thumb_func_start sub_8004A34 -sub_8004A34: @ 8004A34 + thumb_func_start GetNumActiveWindowsOnBg +GetNumActiveWindowsOnBg: @ 8004A34 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -2034,6 +2034,6 @@ _08004A4C: bx r1 .align 2, 0 _08004A5C: .4byte gUnknown_20204B4 - thumb_func_end sub_8004A34 + thumb_func_end GetNumActiveWindowsOnBg .align 2, 0 @ Don't pad with nop. diff --git a/asm/window_8bpp.s b/asm/window_8bpp.s index d97b53164..c0a5ea68f 100644 --- a/asm/window_8bpp.s +++ b/asm/window_8bpp.s @@ -238,7 +238,7 @@ FillWindowPixelRect8Bit: @ 8005180 add r0, sp, 0x8 adds r1, r2, 0 mov r2, r9 - bl sub_8004F90 + bl FillBitmapRect8Bit add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -339,7 +339,7 @@ BlitBitmapRectToWindow4BitTo8Bit: @ 800520C ldr r6, [sp, 0x28] str r6, [sp, 0x14] add r0, sp, 0x18 - bl sub_8004D40 + bl BlitBitmapRect4BitTo8Bit add sp, 0x2C pop {r3-r5} mov r8, r3 diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s index 9b7bf922a..d65014cae 100644 --- a/asm/wireless_communication_status_screen.s +++ b/asm/wireless_communication_status_screen.s @@ -87,7 +87,7 @@ sub_814F1E4: @ 814F1E4 movs r3, 0 bl CopyToBgTilemapBuffer ldr r0, _0814F318 @ =gUnknown_846FA7C - bl sub_8003B24 + bl InitWindows bl DeactivateAllTextPrinters bl ResetPaletteFade bl ResetSpriteData @@ -654,7 +654,7 @@ _0814F6E6: adds r0, r7, 0 adds r1, r5, 0 adds r2, r6, 0 - bl sub_812E5A4 + bl AddTextPrinterParametrized2 add sp, 0x18 pop {r4-r7} pop {r0} |