diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-23 15:31:23 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-23 15:31:23 -0400 |
commit | 661e5d92217c0b40146b35e7b023a28fd567b406 (patch) | |
tree | 0bf026238d8b965dcb863a7c959a46561685d921 /asm | |
parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) |
field_specials through Task_AnimateElevatorWindowView
Diffstat (limited to 'asm')
-rw-r--r-- | asm/battle_message.s | 2 | ||||
-rw-r--r-- | asm/battle_tower.s | 6 | ||||
-rw-r--r-- | asm/field_control_avatar.s | 2 | ||||
-rw-r--r-- | asm/field_specials.s | 2350 | ||||
-rw-r--r-- | asm/learn_move.s | 4 | ||||
-rw-r--r-- | asm/pokemon_summary_screen.s | 4 |
6 files changed, 18 insertions, 2350 deletions
diff --git a/asm/battle_message.s b/asm/battle_message.s index bd1011f9a..a7a52f5f7 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -1802,7 +1802,7 @@ _080D8120: cmp r1, 0 beq _080D8134 mov r0, sp - bl sub_80E7460 + bl CopyEReaderTrainerName5 mov r4, sp b _080D8382 _080D8134: diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 08fefffbc..6b8b36642 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -3469,8 +3469,8 @@ _080E7458: .4byte gSaveBlock2Ptr _080E745C: .4byte 0x000004a1 thumb_func_end GetEreaderTrainerClassId - thumb_func_start sub_80E7460 -sub_80E7460: @ 80E7460 + thumb_func_start CopyEReaderTrainerName5 +CopyEReaderTrainerName5: @ 80E7460 push {r4,lr} adds r3, r0, 0 movs r2, 0 @@ -3495,7 +3495,7 @@ _080E746E: .align 2, 0 _080E7488: .4byte gSaveBlock2Ptr _080E748C: .4byte 0x000004a4 - thumb_func_end sub_80E7460 + thumb_func_end CopyEReaderTrainerName5 thumb_func_start ValidateEReaderTrainer ValidateEReaderTrainer: @ 80E7490 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 842c9c33e..515d4b606 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -367,7 +367,7 @@ sub_806CAC8: @ 806CAC8 bl MENewsJisanStepCounter bl IncrementRenewableHiddenItemStepCounter bl sub_80CC918 - bl sub_80CB054 + bl IncrementResortGorgeousStepCounter bl sub_80CCFBC mov r0, sp adds r1, r4, 0 diff --git a/asm/field_specials.s b/asm/field_specials.s index 653923fda..5e17271e6 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -5,2338 +5,6 @@ .text - thumb_func_start sub_80CA618 -sub_80CA618: @ 80CA618 - push {lr} - bl sub_8112364 - ldr r0, _080CA62C @ =CB2_ShowDiploma - bl SetMainCallback2 - bl ScriptContext2_Enable - pop {r0} - bx r0 - .align 2, 0 -_080CA62C: .4byte CB2_ShowDiploma - thumb_func_end sub_80CA618 - - thumb_func_start sub_80CA630 -sub_80CA630: @ 80CA630 - push {r4,lr} - ldr r0, _080CA65C @ =gPlayerAvatar - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080CA644 - movs r0, 0x2 - bl SetPlayerAvatarTransitionFlags -_080CA644: - movs r4, 0x8D - lsls r4, 1 - adds r0, r4, 0 - bl Overworld_SetSavedMusic - adds r0, r4, 0 - bl Overworld_ChangeMusicTo - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080CA65C: .4byte gPlayerAvatar - thumb_func_end sub_80CA630 - - thumb_func_start nullsub_74 -nullsub_74: @ 80CA660 - bx lr - thumb_func_end nullsub_74 - - thumb_func_start sub_80CA664 -sub_80CA664: @ 80CA664 - push {lr} - movs r0, 0x4 - bl TestPlayerAvatarFlags - lsls r0, 24 - cmp r0, 0 - beq _080CA676 - movs r0, 0x1 - b _080CA688 -_080CA676: - movs r0, 0x2 - bl TestPlayerAvatarFlags - lsls r0, 24 - cmp r0, 0 - bne _080CA686 - movs r0, 0 - b _080CA688 -_080CA686: - movs r0, 0x2 -_080CA688: - pop {r1} - bx r1 - thumb_func_end sub_80CA664 - - thumb_func_start sub_80CA68C -sub_80CA68C: @ 80CA68C - push {lr} - ldr r0, _080CA698 @ =gStringVar4 - bl ShowFieldMessage - pop {r0} - bx r0 - .align 2, 0 -_080CA698: .4byte gStringVar4 - thumb_func_end sub_80CA68C - - thumb_func_start sub_80CA69C -sub_80CA69C: @ 80CA69C - ldr r1, _080CA6B0 @ =gSpecialVar_0x8004 - ldr r0, _080CA6B4 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldrh r0, [r2] - strh r0, [r1] - ldr r1, _080CA6B8 @ =gSpecialVar_0x8005 - ldrh r0, [r2, 0x2] - strh r0, [r1] - bx lr - .align 2, 0 -_080CA6B0: .4byte gSpecialVar_0x8004 -_080CA6B4: .4byte gSaveBlock1Ptr -_080CA6B8: .4byte gSpecialVar_0x8005 - thumb_func_end sub_80CA69C - - thumb_func_start sub_80CA6BC -sub_80CA6BC: @ 80CA6BC - push {lr} - ldr r0, _080CA6D8 @ =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r1, [r0, 0xB] - lsls r1, 8 - ldrb r0, [r0, 0xA] - orrs r0, r1 - movs r1, 0xA - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_080CA6D8: .4byte gSaveBlock2Ptr - thumb_func_end sub_80CA6BC - - thumb_func_start sub_80CA6DC -sub_80CA6DC: @ 80CA6DC - push {lr} - ldr r0, _080CA6F4 @ =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0 - bne _080CA700 - ldr r0, _080CA6F8 @ =gStringVar1 - ldr r1, _080CA6FC @ =gUnknown_8417FBB - bl StringCopy - b _080CA708 - .align 2, 0 -_080CA6F4: .4byte gSaveBlock2Ptr -_080CA6F8: .4byte gStringVar1 -_080CA6FC: .4byte gUnknown_8417FBB -_080CA700: - ldr r0, _080CA70C @ =gStringVar1 - ldr r1, _080CA710 @ =gUnknown_8417FC3 - bl StringCopy -_080CA708: - pop {r0} - bx r0 - .align 2, 0 -_080CA70C: .4byte gStringVar1 -_080CA710: .4byte gUnknown_8417FC3 - thumb_func_end sub_80CA6DC - - thumb_func_start sub_80CA714 -sub_80CA714: @ 80CA714 - push {lr} - ldr r0, _080CA72C @ =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0 - bne _080CA738 - ldr r0, _080CA730 @ =gStringVar1 - ldr r1, _080CA734 @ =gUnknown_8417FD0 - bl StringCopy - b _080CA740 - .align 2, 0 -_080CA72C: .4byte gSaveBlock2Ptr -_080CA730: .4byte gStringVar1 -_080CA734: .4byte gUnknown_8417FD0 -_080CA738: - ldr r0, _080CA744 @ =gStringVar1 - ldr r1, _080CA748 @ =gUnknown_8417FCC - bl StringCopy -_080CA740: - pop {r0} - bx r0 - .align 2, 0 -_080CA744: .4byte gStringVar1 -_080CA748: .4byte gUnknown_8417FCC - thumb_func_end sub_80CA714 - - thumb_func_start Special_GetBattleOutcome -Special_GetBattleOutcome: @ 80CA74C - ldr r0, _080CA754 @ =gBattleOutcome - ldrb r0, [r0] - bx lr - .align 2, 0 -_080CA754: .4byte gBattleOutcome - thumb_func_end Special_GetBattleOutcome - - thumb_func_start Special_SetHiddenItemFlag -Special_SetHiddenItemFlag: @ 80CA758 - push {lr} - ldr r0, _080CA768 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - bl FlagSet - pop {r0} - bx r0 - .align 2, 0 -_080CA768: .4byte gSpecialVar_0x8004 - thumb_func_end Special_SetHiddenItemFlag - - thumb_func_start sub_80CA76C -sub_80CA76C: @ 80CA76C - push {r4,lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r1, r0 - ldr r0, _080CA790 @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0xFF - bne _080CA794 - movs r0, 0x6 - b _080CA7E6 - .align 2, 0 -_080CA790: .4byte gPlayerParty -_080CA794: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0xC7 - bls _080CA7A4 - movs r0, 0x5 - b _080CA7E6 -_080CA7A4: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0x95 - bls _080CA7B4 - movs r0, 0x4 - b _080CA7E6 -_080CA7B4: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0x63 - bls _080CA7C4 - movs r0, 0x3 - b _080CA7E6 -_080CA7C4: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0x31 - bls _080CA7D4 - movs r0, 0x2 - b _080CA7E6 -_080CA7D4: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0 - bne _080CA7E4 - movs r0, 0 - b _080CA7E6 -_080CA7E4: - movs r0, 0x1 -_080CA7E6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80CA76C - - thumb_func_start sub_80CA7EC -sub_80CA7EC: @ 80CA7EC - push {lr} - bl sub_8112364 - ldr r1, _080CA800 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic - movs r0, 0x1 - bl sub_80BFF50 - pop {r0} - bx r0 - .align 2, 0 -_080CA800: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic - thumb_func_end sub_80CA7EC - - thumb_func_start sub_80CA804 -sub_80CA804: @ 80CA804 - push {r4-r6,lr} - movs r5, 0 - ldr r6, _080CA850 @ =gBaseStats -_080CA80A: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, _080CA854 @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _080CA858 - adds r0, r4, 0 - movs r1, 0x2D - bl GetMonData - cmp r0, 0 - bne _080CA858 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r1, r6 - ldrb r0, [r1, 0x6] - cmp r0, 0xC - beq _080CA84C - ldrb r0, [r1, 0x7] - cmp r0, 0xC - bne _080CA858 -_080CA84C: - movs r0, 0x1 - b _080CA864 - .align 2, 0 -_080CA850: .4byte gBaseStats -_080CA854: .4byte gPlayerParty -_080CA858: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x5 - bls _080CA80A - movs r0, 0 -_080CA864: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80CA804 - - thumb_func_start sub_80CA86C -sub_80CA86C: @ 80CA86C - push {r4,lr} - ldr r4, _080CA8A0 @ =sub_80CA8A8 - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080CA89A - adds r0, r4, 0 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080CA8A4 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - strh r0, [r1, 0xA] -_080CA89A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080CA8A0: .4byte sub_80CA8A8 -_080CA8A4: .4byte gTasks - thumb_func_end sub_80CA86C - - thumb_func_start sub_80CA8A8 -sub_80CA8A8: @ 80CA8A8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _080CA8F4 @ =gTasks+0x8 - adds r4, r0, r1 - movs r1, 0x2 - ldrsh r0, [r4, r1] - cmp r0, 0x6 - bne _080CA8E6 - ldrh r1, [r4] - movs r0, 0x1 - ands r0, r1 - bl sub_80CA8F8 - bl DrawWholeMapView - movs r0, 0 - strh r0, [r4, 0x2] - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _080CA8E6 - adds r0, r5, 0 - bl DestroyTask -_080CA8E6: - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080CA8F4: .4byte gTasks+0x8 - thumb_func_end sub_80CA8A8 - - thumb_func_start sub_80CA8F8 -sub_80CA8F8: @ 80CA8F8 - push {r4-r7,lr} - lsls r0, 16 - lsrs r6, r0, 16 - movs r4, 0 - movs r7, 0 - movs r5, 0 - bl GetPlayerFacingDirection - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x3 - beq _080CA926 - cmp r0, 0x3 - bgt _080CA91C - cmp r0, 0x2 - beq _080CA922 - b _080CA92E -_080CA91C: - cmp r1, 0x4 - beq _080CA92A - b _080CA92E -_080CA922: - movs r7, 0 - b _080CA92C -_080CA926: - movs r7, 0xFF - b _080CA92C -_080CA92A: - movs r7, 0x1 -_080CA92C: - movs r5, 0xFF -_080CA92E: - cmp r6, 0 - beq _080CA954 - ldr r0, _080CA940 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _080CA944 - movs r4, 0x62 - b _080CA96E - .align 2, 0 -_080CA940: .4byte gSpecialVar_0x8004 -_080CA944: - cmp r0, 0x1 - beq _080CA94C - cmp r0, 0x2 - bne _080CA96E -_080CA94C: - ldr r4, _080CA950 @ =0x0000028f - b _080CA96E - .align 2, 0 -_080CA950: .4byte 0x0000028f -_080CA954: - ldr r0, _080CA960 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _080CA964 - movs r4, 0x63 - b _080CA96E - .align 2, 0 -_080CA960: .4byte gSpecialVar_0x8004 -_080CA964: - cmp r0, 0x1 - beq _080CA96C - cmp r0, 0x2 - bne _080CA96E -_080CA96C: - ldr r4, _080CA9A0 @ =0x0000028a -_080CA96E: - ldr r0, _080CA9A4 @ =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r1, r7, 24 - asrs r1, 24 - adds r0, r1 - adds r0, 0x7 - movs r3, 0x2 - ldrsh r1, [r2, r3] - lsls r2, r5, 24 - asrs r2, 24 - adds r1, r2 - adds r1, 0x7 - movs r3, 0xC0 - lsls r3, 4 - adds r2, r3, 0 - orrs r4, r2 - adds r2, r4, 0 - bl MapGridSetMetatileIdAt - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080CA9A0: .4byte 0x0000028a -_080CA9A4: .4byte gSaveBlock1Ptr - thumb_func_end sub_80CA8F8 - - thumb_func_start sub_80CA9A8 -sub_80CA9A8: @ 80CA9A8 - push {r4-r6,lr} - movs r4, 0 - movs r6, 0 - movs r5, 0 - bl GetPlayerFacingDirection - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x3 - beq _080CA9D2 - cmp r0, 0x3 - bgt _080CA9C8 - cmp r0, 0x2 - beq _080CA9CE - b _080CA9DA -_080CA9C8: - cmp r1, 0x4 - beq _080CA9D6 - b _080CA9DA -_080CA9CE: - movs r6, 0 - b _080CA9D8 -_080CA9D2: - movs r6, 0xFF - b _080CA9D8 -_080CA9D6: - movs r6, 0x1 -_080CA9D8: - movs r5, 0xFF -_080CA9DA: - ldr r0, _080CA9E8 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _080CA9EC - movs r4, 0x62 - b _080CA9F6 - .align 2, 0 -_080CA9E8: .4byte gSpecialVar_0x8004 -_080CA9EC: - cmp r0, 0x1 - beq _080CA9F4 - cmp r0, 0x2 - bne _080CA9F6 -_080CA9F4: - ldr r4, _080CAA2C @ =0x0000028f -_080CA9F6: - ldr r0, _080CAA30 @ =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r1, r6, 24 - asrs r1, 24 - adds r0, r1 - adds r0, 0x7 - movs r3, 0x2 - ldrsh r1, [r2, r3] - lsls r2, r5, 24 - asrs r2, 24 - adds r1, r2 - adds r1, 0x7 - movs r3, 0xC0 - lsls r3, 4 - adds r2, r3, 0 - orrs r4, r2 - adds r2, r4, 0 - bl MapGridSetMetatileIdAt - bl DrawWholeMapView - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080CAA2C: .4byte 0x0000028f -_080CAA30: .4byte gSaveBlock1Ptr - thumb_func_end sub_80CA9A8 - - thumb_func_start SpawnCameraObject -SpawnCameraObject: @ 80CAA34 - push {lr} - sub sp, 0x8 - ldr r0, _080CAA80 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r3, [r0] - adds r3, 0x7 - lsls r3, 16 - asrs r3, 16 - ldrh r0, [r0, 0x2] - adds r0, 0x7 - lsls r0, 16 - asrs r0, 16 - str r0, [sp] - movs r0, 0x3 - str r0, [sp, 0x4] - movs r0, 0x12 - movs r1, 0x8 - movs r2, 0x7F - bl SpawnSpecialFieldObjectParameterized - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080CAA84 @ =gMapObjects - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1, 0x1] - movs r2, 0x20 - orrs r0, r2 - strb r0, [r1, 0x1] - ldrb r0, [r1, 0x4] - bl CameraObjectSetFollowedObjectId - add sp, 0x8 - pop {r0} - bx r0 - .align 2, 0 -_080CAA80: .4byte gSaveBlock1Ptr -_080CAA84: .4byte gMapObjects - thumb_func_end SpawnCameraObject - - thumb_func_start RemoveCameraObject -RemoveCameraObject: @ 80CAA88 - push {lr} - bl GetPlayerAvatarObjectId - lsls r0, 24 - lsrs r0, 24 - bl CameraObjectSetFollowedObjectId - ldr r0, _080CAAA8 @ =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - movs r0, 0x7F - bl RemoveFieldObjectByLocalIdAndMap - pop {r0} - bx r0 - .align 2, 0 -_080CAAA8: .4byte gSaveBlock1Ptr - thumb_func_end RemoveCameraObject - - thumb_func_start sub_80CAAAC -sub_80CAAAC: @ 80CAAAC - push {lr} - ldr r0, _080CAAB8 @ =gStringVar1 - bl sub_80E7460 - pop {r0} - bx r0 - .align 2, 0 -_080CAAB8: .4byte gStringVar1 - thumb_func_end sub_80CAAAC - - thumb_func_start sub_80CAABC -sub_80CAABC: @ 80CAABC - push {lr} - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x16 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - ldr r1, _080CAADC @ =gUnknown_83F5B1A - adds r0, r1 - ldrb r0, [r0] - pop {r1} - bx r1 - .align 2, 0 -_080CAADC: .4byte gUnknown_83F5B1A - thumb_func_end sub_80CAABC - - thumb_func_start LeadMonHasEffortRibbon -LeadMonHasEffortRibbon: @ 80CAAE0 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, _080CAB04 @ =gPlayerParty - adds r0, r1 - movs r1, 0x47 - movs r2, 0 - bl GetMonData - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_080CAB04: .4byte gPlayerParty - thumb_func_end LeadMonHasEffortRibbon - - thumb_func_start GivLeadMonEffortRibbon -GivLeadMonEffortRibbon: @ 80CAB08 - push {lr} - sub sp, 0x4 - movs r0, 0x2A - bl IncrementGameStat - ldr r0, _080CAB3C @ =0x0000083b - bl FlagSet - movs r1, 0x1 - mov r0, sp - strb r1, [r0] - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, _080CAB40 @ =gPlayerParty - adds r0, r1 - movs r1, 0x47 - mov r2, sp - bl SetMonData - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_080CAB3C: .4byte 0x0000083b -_080CAB40: .4byte gPlayerParty - thumb_func_end GivLeadMonEffortRibbon - - thumb_func_start ScrSpecial_AreLeadMonEVsMaxedOut -ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, _080CAB68 @ =gPlayerParty - adds r0, r1 - bl GetMonEVCount - lsls r0, 16 - ldr r1, _080CAB6C @ =0x01fd0000 - cmp r0, r1 - bhi _080CAB70 - movs r0, 0 - b _080CAB72 - .align 2, 0 -_080CAB68: .4byte gPlayerParty -_080CAB6C: .4byte 0x01fd0000 -_080CAB70: - movs r0, 0x1 -_080CAB72: - pop {r1} - bx r1 - thumb_func_end ScrSpecial_AreLeadMonEVsMaxedOut - - thumb_func_start sub_80CAB78 -sub_80CAB78: @ 80CAB78 - push {r4-r6,lr} - ldr r0, _080CABB4 @ =0x00004031 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - bl GetStarterPokemon - lsls r0, 16 - lsrs r6, r0, 16 - bl CalculatePlayerPartyCount - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - cmp r4, r5 - bcs _080CABC6 -_080CAB9A: - movs r0, 0x64 - muls r0, r4 - ldr r1, _080CABB8 @ =gPlayerParty - adds r0, r1 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - cmp r0, r6 - bne _080CABBC - movs r0, 0x1 - b _080CABC8 - .align 2, 0 -_080CABB4: .4byte 0x00004031 -_080CABB8: .4byte gPlayerParty -_080CABBC: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r5 - bcc _080CAB9A -_080CABC6: - movs r0, 0 -_080CABC8: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80CAB78 - - thumb_func_start sub_80CABD0 -sub_80CABD0: @ 80CABD0 - push {r4-r6,lr} - movs r6, 0 -_080CABD4: - movs r4, 0 - lsls r5, r6, 24 -_080CABD8: - lsls r1, r4, 24 - lsrs r1, 24 - lsrs r0, r5, 24 - movs r2, 0xB - bl GetBoxMonDataFromAnyBox - cmp r0, 0 - bne _080CABEC - movs r0, 0x1 - b _080CAC02 -_080CABEC: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1D - bls _080CABD8 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0xD - bls _080CABD4 - movs r0, 0 -_080CAC02: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80CABD0 - - thumb_func_start sub_80CAC08 -sub_80CAC08: @ 80CAC08 - push {lr} - ldr r0, _080CAC1C @ =gPlayerParty - movs r1, 0x3F - bl CheckPartyPokerus - lsls r0, 24 - cmp r0, 0 - beq _080CAC20 - movs r0, 0x1 - b _080CAC22 - .align 2, 0 -_080CAC1C: .4byte gPlayerParty -_080CAC20: - movs r0, 0 -_080CAC22: - pop {r1} - bx r1 - thumb_func_end sub_80CAC08 - - thumb_func_start sub_80CAC28 -sub_80CAC28: @ 80CAC28 - push {lr} - ldr r0, _080CAC6C @ =sub_80CAC84 - movs r1, 0x9 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080CAC70 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, _080CAC74 @ =gSpecialVar_0x8005 - ldrh r0, [r0] - movs r2, 0 - strh r0, [r1, 0x8] - strh r2, [r1, 0xA] - ldr r0, _080CAC78 @ =gSpecialVar_0x8006 - ldrh r0, [r0] - strh r0, [r1, 0xC] - ldr r0, _080CAC7C @ =gSpecialVar_0x8007 - ldrh r0, [r0] - strh r0, [r1, 0xE] - ldr r0, _080CAC80 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - strh r0, [r1, 0x10] - movs r0, 0 - bl SetCameraPanningCallback - movs r0, 0xCF - bl PlaySE - pop {r0} - bx r0 - .align 2, 0 -_080CAC6C: .4byte sub_80CAC84 -_080CAC70: .4byte gTasks -_080CAC74: .4byte gSpecialVar_0x8005 -_080CAC78: .4byte gSpecialVar_0x8006 -_080CAC7C: .4byte gSpecialVar_0x8007 -_080CAC80: .4byte gSpecialVar_0x8004 - thumb_func_end sub_80CAC28 - - thumb_func_start sub_80CAC84 -sub_80CAC84: @ 80CAC84 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _080CACE4 @ =gTasks+0x8 - adds r4, r0, r1 - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - movs r1, 0x2 - ldrsh r0, [r4, r1] - movs r2, 0x6 - ldrsh r1, [r4, r2] - bl __modsi3 - cmp r0, 0 - bne _080CACDC - strh r0, [r4, 0x2] - ldrh r0, [r4, 0x4] - subs r0, 0x1 - strh r0, [r4, 0x4] - ldrh r0, [r4] - negs r0, r0 - strh r0, [r4] - ldrh r0, [r4, 0x8] - negs r0, r0 - strh r0, [r4, 0x8] - movs r1, 0 - ldrsh r0, [r4, r1] - movs r2, 0x8 - ldrsh r1, [r4, r2] - bl SetCameraPanning - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080CACDC - adds r0, r5, 0 - bl sub_80CACE8 - bl InstallCameraPanAheadCallback -_080CACDC: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080CACE4: .4byte gTasks+0x8 - thumb_func_end sub_80CAC84 - - thumb_func_start sub_80CACE8 -sub_80CACE8: @ 80CACE8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - bl EnableBothScriptContexts - pop {r0} - bx r0 - thumb_func_end sub_80CACE8 - - thumb_func_start GetLeadMonIndex -GetLeadMonIndex: @ 80CACFC - push {r4-r6,lr} - bl CalculatePlayerPartyCount - lsls r0, 24 - lsrs r6, r0, 24 - movs r5, 0 - cmp r5, r6 - bcs _080CAD4A -_080CAD0C: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, _080CAD3C @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _080CAD40 - adds r0, r4, 0 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - cmp r0, 0 - beq _080CAD40 - adds r0, r5, 0 - b _080CAD4C - .align 2, 0 -_080CAD3C: .4byte gPlayerParty -_080CAD40: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, r6 - bcc _080CAD0C -_080CAD4A: - movs r0, 0 -_080CAD4C: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end GetLeadMonIndex - - thumb_func_start sub_80CAD54 -sub_80CAD54: @ 80CAD54 - push {lr} - ldr r0, _080CAD74 @ =gSpecialVar_0x8004 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _080CAD78 @ =gPlayerParty - adds r0, r1 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .align 2, 0 -_080CAD74: .4byte gSpecialVar_0x8004 -_080CAD78: .4byte gPlayerParty - thumb_func_end sub_80CAD54 - - thumb_func_start sub_80CAD7C -sub_80CAD7C: @ 80CAD7C - push {r4,lr} - ldr r0, _080CADA8 @ =gSpecialVar_0x8004 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _080CADAC @ =gPlayerParty - adds r0, r1 - ldr r4, _080CADB0 @ =gStringVar1 - movs r1, 0x7 - adds r2, r4, 0 - bl GetMonData - ldr r0, _080CADB4 @ =gSaveBlock2Ptr - ldr r0, [r0] - adds r1, r4, 0 - bl StringCompare - cmp r0, 0 - beq _080CADB8 - movs r0, 0x1 - b _080CADBA - .align 2, 0 -_080CADA8: .4byte gSpecialVar_0x8004 -_080CADAC: .4byte gPlayerParty -_080CADB0: .4byte gStringVar1 -_080CADB4: .4byte gSaveBlock2Ptr -_080CADB8: - movs r0, 0 -_080CADBA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80CAD7C - - thumb_func_start nullsub_75 -nullsub_75: @ 80CADC0 - bx lr - thumb_func_end nullsub_75 - - thumb_func_start sub_80CADC4 -sub_80CADC4: @ 80CADC4 - push {lr} - sub sp, 0x10 - movs r1, 0xFF - add r0, sp, 0xC - strb r1, [r0] - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - movs r1, 0x2 - add r2, sp, 0xC - movs r3, 0 - bl AddTextPrinterParameterized - bl sub_809D424 - add sp, 0x10 - pop {r0} - bx r0 - thumb_func_end sub_80CADC4 - - thumb_func_start Special_SetVermilionTrashCans -Special_SetVermilionTrashCans: @ 80CADEC - push {r4,r5,lr} - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xF - bl __umodsi3 - adds r0, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, _080CAE20 @ =gSpecialVar_0x8004 - strh r2, [r1] - ldr r0, _080CAE24 @ =gSpecialVar_0x8005 - strh r2, [r0] - ldrh r0, [r1] - subs r0, 0x1 - cmp r0, 0xE - bls _080CAE14 - b _080CB01C -_080CAE14: - lsls r0, 2 - ldr r1, _080CAE28 @ =_080CAE2C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080CAE20: .4byte gSpecialVar_0x8004 -_080CAE24: .4byte gSpecialVar_0x8005 -_080CAE28: .4byte _080CAE2C - .align 2, 0 -_080CAE2C: - .4byte _080CAE68 - .4byte _080CAE90 - .4byte _080CAE90 - .4byte _080CAE90 - .4byte _080CAEC8 - .4byte _080CAEE8 - .4byte _080CAF28 - .4byte _080CAF28 - .4byte _080CAF28 - .4byte _080CAF68 - .4byte _080CAF9C - .4byte _080CAFC4 - .4byte _080CAFC4 - .4byte _080CAFC4 - .4byte _080CAFF8 -_080CAE68: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080CAE84 - ldr r1, _080CAE80 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x1 - b _080CB01A - .align 2, 0 -_080CAE80: .4byte gSpecialVar_0x8005 -_080CAE84: - ldr r1, _080CAE8C @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAE8C: .4byte gSpecialVar_0x8005 -_080CAE90: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0 - bne _080CAEB4 - ldr r1, _080CAEB0 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x1 - b _080CB01A - .align 2, 0 -_080CAEB0: .4byte gSpecialVar_0x8005 -_080CAEB4: - cmp r2, 0x1 - beq _080CAEBA - b _080CB014 -_080CAEBA: - ldr r1, _080CAEC4 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAEC4: .4byte gSpecialVar_0x8005 -_080CAEC8: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080CAEDA - b _080CB014 -_080CAEDA: - ldr r1, _080CAEE4 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAEE4: .4byte gSpecialVar_0x8005 -_080CAEE8: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0 - bne _080CAF0C - ldr r1, _080CAF08 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - subs r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAF08: .4byte gSpecialVar_0x8005 -_080CAF0C: - cmp r2, 0x1 - bne _080CAF1C - ldr r1, _080CAF18 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x1 - b _080CB01A - .align 2, 0 -_080CAF18: .4byte gSpecialVar_0x8005 -_080CAF1C: - ldr r1, _080CAF24 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAF24: .4byte gSpecialVar_0x8005 -_080CAF28: - bl Random - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 10 - ands r1, r0 - lsrs r2, r1, 16 - cmp r2, 0 - bne _080CAF48 - ldr r1, _080CAF44 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - subs r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAF44: .4byte gSpecialVar_0x8005 -_080CAF48: - cmp r2, 0x1 - bne _080CAF58 - ldr r1, _080CAF54 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x1 - b _080CB01A - .align 2, 0 -_080CAF54: .4byte gSpecialVar_0x8005 -_080CAF58: - cmp r2, 0x2 - bne _080CB014 - ldr r1, _080CAF64 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAF64: .4byte gSpecialVar_0x8005 -_080CAF68: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0 - bne _080CAF8C - ldr r1, _080CAF88 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - subs r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAF88: .4byte gSpecialVar_0x8005 -_080CAF8C: - cmp r2, 0x1 - bne _080CB014 - ldr r1, _080CAF98 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAF98: .4byte gSpecialVar_0x8005 -_080CAF9C: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080CAFB8 - ldr r1, _080CAFB4 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - subs r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAFB4: .4byte gSpecialVar_0x8005 -_080CAFB8: - ldr r1, _080CAFC0 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x1 - b _080CB01A - .align 2, 0 -_080CAFC0: .4byte gSpecialVar_0x8005 -_080CAFC4: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0 - bne _080CAFE8 - ldr r1, _080CAFE4 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - subs r0, 0x5 - b _080CB01A - .align 2, 0 -_080CAFE4: .4byte gSpecialVar_0x8005 -_080CAFE8: - cmp r2, 0x1 - bne _080CB014 - ldr r1, _080CAFF4 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - adds r0, 0x1 - b _080CB01A - .align 2, 0 -_080CAFF4: .4byte gSpecialVar_0x8005 -_080CAFF8: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080CB014 - ldr r1, _080CB010 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - subs r0, 0x5 - b _080CB01A - .align 2, 0 -_080CB010: .4byte gSpecialVar_0x8005 -_080CB014: - ldr r1, _080CB040 @ =gSpecialVar_0x8005 - ldrh r0, [r1] - subs r0, 0x1 -_080CB01A: - strh r0, [r1] -_080CB01C: - ldr r5, _080CB040 @ =gSpecialVar_0x8005 - ldrh r0, [r5] - cmp r0, 0xF - bls _080CB04C - ldr r0, _080CB044 @ =gSpecialVar_0x8004 - ldrh r4, [r0] - adds r0, r4, 0 - movs r1, 0x5 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - beq _080CB048 - cmp r0, 0 - bne _080CB048 - subs r0, r4, 0x1 - b _080CB04A - .align 2, 0 -_080CB040: .4byte gSpecialVar_0x8005 -_080CB044: .4byte gSpecialVar_0x8004 -_080CB048: - adds r0, r4, 0x1 -_080CB04A: - strh r0, [r5] -_080CB04C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end Special_SetVermilionTrashCans - - thumb_func_start sub_80CB054 -sub_80CB054: @ 80CB054 - push {r4-r6,lr} - ldr r5, _080CB08C @ =0x00004035 - adds r0, r5, 0 - bl VarGet - lsls r0, 16 - lsrs r4, r0, 16 - ldr r6, _080CB090 @ =0x00004036 - adds r0, r6, 0 - bl VarGet - lsls r0, 16 - cmp r0, 0 - beq _080CB0A0 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0xF9 - bls _080CB098 - ldr r1, _080CB094 @ =0x0000ffff - adds r0, r6, 0 - bl VarSet - adds r0, r5, 0 - movs r1, 0 - bl VarSet - b _080CB0A0 - .align 2, 0 -_080CB08C: .4byte 0x00004035 -_080CB090: .4byte 0x00004036 -_080CB094: .4byte 0x0000ffff -_080CB098: - adds r0, r5, 0 - adds r1, r4, 0 - bl VarSet -_080CB0A0: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80CB054 - - thumb_func_start sub_80CB0A8 -sub_80CB0A8: @ 80CB0A8 - push {r4,lr} - ldr r4, _080CB10C @ =0x00004036 - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0 - beq _080CB0C0 - ldr r0, _080CB110 @ =0x0000ffff - cmp r1, r0 - bne _080CB0EA -_080CB0C0: - bl sub_80CB124 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl VarSet - ldr r4, _080CB114 @ =0x0000403b - bl sub_80CB198 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl VarSet - ldr r0, _080CB118 @ =0x00004035 - movs r1, 0 - bl VarSet -_080CB0EA: - ldr r4, _080CB11C @ =gStringVar1 - ldr r0, _080CB10C @ =0x00004036 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xB - muls r1, r0 - ldr r0, _080CB120 @ =gSpeciesNames - adds r1, r0 - adds r0, r4, 0 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080CB10C: .4byte 0x00004036 -_080CB110: .4byte 0x0000ffff -_080CB114: .4byte 0x0000403b -_080CB118: .4byte 0x00004035 -_080CB11C: .4byte gStringVar1 -_080CB120: .4byte gSpeciesNames - thumb_func_end sub_80CB0A8 - - thumb_func_start sub_80CB124 -sub_80CB124: @ 80CB124 - push {r4,r5,lr} - movs r5, 0 -_080CB128: - bl Random - lsls r0, 16 - lsrs r0, 16 - ldr r1, _080CB160 @ =0x0000019b - bl __umodsi3 - adds r0, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - beq _080CB18E - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x63 - bls _080CB128 - b _080CB176 - .align 2, 0 -_080CB160: .4byte 0x0000019b -_080CB164: - cmp r4, 0x1 - bne _080CB170 - ldr r4, _080CB16C @ =0x0000019b - b _080CB176 - .align 2, 0 -_080CB16C: .4byte 0x0000019b -_080CB170: - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_080CB176: - adds r0, r4, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _080CB164 -_080CB18E: - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80CB124 - - thumb_func_start sub_80CB198 -sub_80CB198: @ 80CB198 - push {r4,lr} - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x64 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1D - bhi _080CB1D0 - ldr r4, _080CB1CC @ =gUnknown_83F5B30 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x6 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 15 - adds r0, r4 - ldrh r0, [r0] - b _080CB1D2 - .align 2, 0 -_080CB1CC: .4byte gUnknown_83F5B30 -_080CB1D0: - movs r0, 0xB -_080CB1D2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80CB198 - - thumb_func_start Special_CheckAddCoins -Special_CheckAddCoins: @ 80CB1D8 -@ addcoins but it's a dry run - push {lr} - ldr r0, _080CB1F0 @ =gSpecialVar_Result - ldrh r1, [r0] - ldr r0, _080CB1F4 @ =gSpecialVar_0x8006 - ldrh r0, [r0] - adds r1, r0 - ldr r0, _080CB1F8 @ =0x0000270f - cmp r1, r0 - bgt _080CB1FC - movs r0, 0x1 - b _080CB1FE - .align 2, 0 -_080CB1F0: .4byte gSpecialVar_Result -_080CB1F4: .4byte gSpecialVar_0x8006 -_080CB1F8: .4byte 0x0000270f -_080CB1FC: - movs r0, 0 -_080CB1FE: - pop {r1} - bx r1 - thumb_func_end Special_CheckAddCoins - - thumb_func_start Special_GetElevatorFloor -Special_GetElevatorFloor: @ 80CB204 - push {r4,lr} - movs r3, 0x4 - ldr r0, _080CB22C @ =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0x14 - ldrsb r1, [r2, r1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080CB2AA - ldrb r0, [r2, 0x15] - subs r0, 0x2A - lsls r0, 24 - asrs r0, 24 - cmp r0, 0xF - bhi _080CB2AA - lsls r0, 2 - ldr r1, _080CB230 @ =_080CB234 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080CB22C: .4byte gSaveBlock1Ptr -_080CB230: .4byte _080CB234 - .align 2, 0 -_080CB234: - .4byte _080CB2A0 - .4byte _080CB2A4 - .4byte _080CB2AA - .4byte _080CB2A8 - .4byte _080CB2AA - .4byte _080CB274 - .4byte _080CB278 - .4byte _080CB27C - .4byte _080CB280 - .4byte _080CB284 - .4byte _080CB288 - .4byte _080CB28C - .4byte _080CB290 - .4byte _080CB294 - .4byte _080CB298 - .4byte _080CB29C -_080CB274: - movs r3, 0x4 - b _080CB2AA -_080CB278: - movs r3, 0x5 - b _080CB2AA -_080CB27C: - movs r3, 0x6 - b _080CB2AA -_080CB280: - movs r3, 0x7 - b _080CB2AA -_080CB284: - movs r3, 0x8 - b _080CB2AA -_080CB288: - movs r3, 0x9 - b _080CB2AA -_080CB28C: - movs r3, 0xA - b _080CB2AA -_080CB290: - movs r3, 0xB - b _080CB2AA -_080CB294: - movs r3, 0xC - b _080CB2AA -_080CB298: - movs r3, 0xD - b _080CB2AA -_080CB29C: - movs r3, 0xE - b _080CB2AA -_080CB2A0: - movs r3, 0x3 - b _080CB2AA -_080CB2A4: - movs r3, 0x2 - b _080CB2AA -_080CB2A8: - movs r3, 0 -_080CB2AA: - ldr r1, [r4] - movs r0, 0x14 - ldrsb r0, [r1, r0] - cmp r0, 0xA - bne _080CB2F2 - movs r0, 0x15 - ldrsb r0, [r1, r0] - cmp r0, 0x4 - bhi _080CB2F2 - lsls r0, 2 - ldr r1, _080CB2C8 @ =_080CB2CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080CB2C8: .4byte _080CB2CC - .align 2, 0 -_080CB2CC: - .4byte _080CB2E0 - .4byte _080CB2E4 - .4byte _080CB2E8 - .4byte _080CB2EC - .4byte _080CB2F0 -_080CB2E0: - movs r3, 0x4 - b _080CB2F2 -_080CB2E4: - movs r3, 0x5 - b _080CB2F2 -_080CB2E8: - movs r3, 0x6 - b _080CB2F2 -_080CB2EC: - movs r3, 0x7 - b _080CB2F2 -_080CB2F0: - movs r3, 0x8 -_080CB2F2: - ldr r1, [r4] - movs r0, 0x14 - ldrsb r0, [r1, r0] - cmp r0, 0x2 - bne _080CB314 - movs r0, 0x15 - ldrsb r0, [r1, r0] - cmp r0, 0x1 - blt _080CB314 - cmp r0, 0x9 - ble _080CB30E - cmp r0, 0xA - beq _080CB312 - b _080CB314 -_080CB30E: - movs r3, 0xF - b _080CB314 -_080CB312: - movs r3, 0x3 -_080CB314: - ldr r0, _080CB324 @ =0x0000403a - adds r1, r3, 0 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080CB324: .4byte 0x0000403a - thumb_func_end Special_GetElevatorFloor - - thumb_func_start sub_80CB328 -sub_80CB328: @ 80CB328 - push {r4-r6,lr} - ldr r3, _080CB35C @ =gUnknown_2039A0E - movs r0, 0 - strh r0, [r3] - ldr r1, _080CB360 @ =gUnknown_2039A10 - strh r0, [r1] - ldr r0, _080CB364 @ =gSaveBlock1Ptr - ldr r5, [r0] - movs r2, 0x14 - ldrsb r2, [r5, r2] - adds r4, r3, 0 - adds r3, r1, 0 - adds r6, r0, 0 - cmp r2, 0x1 - bne _080CB40C - ldrb r0, [r5, 0x15] - subs r0, 0x2A - lsls r0, 24 - asrs r0, 24 - cmp r0, 0xF - bhi _080CB40C - lsls r0, 2 - ldr r1, _080CB368 @ =_080CB36C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080CB35C: .4byte gUnknown_2039A0E -_080CB360: .4byte gUnknown_2039A10 -_080CB364: .4byte gSaveBlock1Ptr -_080CB368: .4byte _080CB36C - .align 2, 0 -_080CB36C: - .4byte _080CB3F6 - .4byte _080CB3FC - .4byte _080CB40C - .4byte _080CB404 - .4byte _080CB40C - .4byte _080CB3F0 - .4byte _080CB3E8 - .4byte _080CB3E2 - .4byte _080CB3DA - .4byte _080CB3D2 - .4byte _080CB3CA - .4byte _080CB3C2 - .4byte _080CB3BA - .4byte _080CB404 - .4byte _080CB3B2 - .4byte _080CB3AC -_080CB3AC: - movs r0, 0 - strh r0, [r4] - b _080CB40A -_080CB3B2: - movs r0, 0 - strh r0, [r4] - movs r0, 0x1 - b _080CB40A -_080CB3BA: - movs r0, 0 - strh r0, [r4] - movs r0, 0x3 - b _080CB40A -_080CB3C2: - movs r0, 0 - strh r0, [r4] - movs r0, 0x4 - b _080CB40A -_080CB3CA: - movs r0, 0x1 - strh r0, [r4] - movs r0, 0x4 - b _080CB40A -_080CB3D2: - movs r0, 0x2 - strh r0, [r4] - movs r0, 0x4 - b _080CB40A -_080CB3DA: - movs r0, 0x3 - strh r0, [r4] - movs r0, 0x4 - b _080CB40A -_080CB3E2: - movs r0, 0x4 - strh r0, [r4] - b _080CB40A -_080CB3E8: - movs r0, 0x5 - strh r0, [r4] - movs r0, 0x4 - b _080CB40A -_080CB3F0: - movs r0, 0x5 - strh r0, [r4] - b _080CB40A -_080CB3F6: - movs r0, 0 - strh r0, [r4] - b _080CB40A -_080CB3FC: - movs r0, 0 - strh r0, [r4] - movs r0, 0x1 - b _080CB40A -_080CB404: - movs r0, 0 - strh r0, [r4] - movs r0, 0x2 -_080CB40A: - strh r0, [r3] -_080CB40C: - ldr r1, [r6] - movs r0, 0x14 - ldrsb r0, [r1, r0] - cmp r0, 0xA - bne _080CB466 - movs r0, 0x15 - ldrsb r0, [r1, r0] - cmp r0, 0x4 - bhi _080CB466 - lsls r0, 2 - ldr r1, _080CB428 @ =_080CB42C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080CB428: .4byte _080CB42C - .align 2, 0 -_080CB42C: - .4byte _080CB45E - .4byte _080CB456 - .4byte _080CB44E - .4byte _080CB446 - .4byte _080CB440 -_080CB440: - movs r0, 0 - strh r0, [r4] - b _080CB464 -_080CB446: - movs r0, 0 - strh r0, [r4] - movs r0, 0x1 - b _080CB464 -_080CB44E: - movs r0, 0 - strh r0, [r4] - movs r0, 0x2 - b _080CB464 -_080CB456: - movs r0, 0 - strh r0, [r4] - movs r0, 0x3 - b _080CB464 -_080CB45E: - movs r0, 0 - strh r0, [r4] - movs r0, 0x4 -_080CB464: - strh r0, [r3] -_080CB466: - ldr r1, [r6] - movs r0, 0x14 - ldrsb r0, [r1, r0] - cmp r0, 0x2 - bne _080CB490 - movs r0, 0x15 - ldrsb r0, [r1, r0] - cmp r0, 0x1 - blt _080CB490 - cmp r0, 0x9 - ble _080CB482 - cmp r0, 0xA - beq _080CB488 - b _080CB490 -_080CB482: - movs r0, 0 - strh r0, [r4] - b _080CB48E -_080CB488: - movs r0, 0 - strh r0, [r4] - movs r0, 0x1 -_080CB48E: - strh r0, [r3] -_080CB490: - ldrh r0, [r3] - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80CB328 - - thumb_func_start sub_80CB498 -sub_80CB498: @ 80CB498 - push {r4-r6,lr} - ldr r0, _080CB4D0 @ =sub_80CB514 - movs r1, 0x9 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080CB4D4 @ =gTasks+0x8 - adds r4, r1, r0 - movs r3, 0 - strh r3, [r4, 0x2] - strh r3, [r4, 0x4] - movs r6, 0x1 - strh r6, [r4, 0x8] - ldr r0, _080CB4D8 @ =gSpecialVar_0x8005 - ldr r1, _080CB4DC @ =gSpecialVar_0x8006 - ldrh r2, [r0] - ldrh r0, [r1] - cmp r2, r0 - bls _080CB4E0 - subs r0, r2, r0 - lsls r0, 16 - lsrs r5, r0, 16 - strh r6, [r4, 0xC] - b _080CB4E8 - .align 2, 0 -_080CB4D0: .4byte sub_80CB514 -_080CB4D4: .4byte gTasks+0x8 -_080CB4D8: .4byte gSpecialVar_0x8005 -_080CB4DC: .4byte gSpecialVar_0x8006 -_080CB4E0: - subs r0, r2 - lsls r0, 16 - lsrs r5, r0, 16 - strh r3, [r4, 0xC] -_080CB4E8: - cmp r5, 0x8 - bls _080CB4EE - movs r5, 0x8 -_080CB4EE: - ldr r0, _080CB510 @ =gUnknown_83F5BB8 - adds r0, r5, r0 - ldrb r0, [r0] - strh r0, [r4, 0xA] - movs r0, 0 - bl SetCameraPanningCallback - ldrb r1, [r4, 0xC] - adds r0, r5, 0 - bl sub_80CB658 - movs r0, 0x52 - bl PlaySE - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080CB510: .4byte gUnknown_83F5BB8 - thumb_func_end sub_80CB498 - - thumb_func_start sub_80CB514 -sub_80CB514: @ 80CB514 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _080CB57C @ =gTasks+0x8 - adds r4, r0, r1 - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - movs r1, 0x2 - ldrsh r0, [r4, r1] - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bne _080CB574 - strh r0, [r4, 0x2] - ldrh r0, [r4, 0x4] - adds r0, 0x1 - strh r0, [r4, 0x4] - ldrh r0, [r4, 0x8] - negs r0, r0 - strh r0, [r4, 0x8] - movs r2, 0x8 - ldrsh r1, [r4, r2] - movs r0, 0 - bl SetCameraPanning - movs r0, 0x4 - ldrsh r1, [r4, r0] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _080CB574 - movs r0, 0x42 - bl PlaySE - adds r0, r5, 0 - bl DestroyTask - bl EnableBothScriptContexts - bl InstallCameraPanAheadCallback -_080CB574: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080CB57C: .4byte gTasks+0x8 - thumb_func_end sub_80CB514 - - thumb_func_start sub_80CB580 -sub_80CB580: @ 80CB580 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0xC - ldr r0, _080CB620 @ =sub_809D6D4 - bl sub_81119D4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080CB614 - ldr r4, _080CB624 @ =gUnknown_2039A0C - ldr r0, _080CB628 @ =gUnknown_83F5B3C - bl AddWindow - strb r0, [r4] - ldrb r0, [r4] - ldr r5, _080CB62C @ =0x0000021d - adds r1, r5, 0 - movs r2, 0xD0 - bl TextWindow_SetStdFrame0_WithPal - ldrb r0, [r4] - movs r1, 0 - adds r2, r5, 0 - movs r3, 0xD - bl DrawStdFrameWithCustomTileAndPalette - ldrb r0, [r4] - ldr r2, _080CB630 @ =gUnknown_8418075 - movs r1, 0x2 - str r1, [sp] - movs r1, 0xFF - mov r8, r1 - str r1, [sp, 0x4] - movs r6, 0 - str r6, [sp, 0x8] - movs r1, 0x2 - movs r3, 0 - bl AddTextPrinterParameterized - ldr r1, _080CB634 @ =gUnknown_83F5B44 - ldr r0, _080CB638 @ =gSpecialVar_0x8005 - ldrh r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r5, [r0] - movs r0, 0x2 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - ldrb r1, [r4] - movs r3, 0x38 - subs r3, r0 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0x10 - str r0, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r6, [sp, 0x8] - adds r0, r1, 0 - movs r1, 0x2 - adds r2, r5, 0 - bl AddTextPrinterParameterized - ldrb r0, [r4] - bl PutWindowTilemap - ldrb r0, [r4] - movs r1, 0x3 - bl CopyWindowToVram -_080CB614: - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080CB620: .4byte sub_809D6D4 -_080CB624: .4byte gUnknown_2039A0C -_080CB628: .4byte gUnknown_83F5B3C -_080CB62C: .4byte 0x0000021d -_080CB630: .4byte gUnknown_8418075 -_080CB634: .4byte gUnknown_83F5B44 -_080CB638: .4byte gSpecialVar_0x8005 - thumb_func_end sub_80CB580 - - thumb_func_start sub_80CB63C -sub_80CB63C: @ 80CB63C - push {r4,lr} - ldr r4, _080CB654 @ =gUnknown_2039A0C - ldrb r0, [r4] - movs r1, 0x1 - bl ClearStdWindowAndFrameToTransparent - ldrb r0, [r4] - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080CB654: .4byte gUnknown_2039A0C - thumb_func_end sub_80CB63C - - thumb_func_start sub_80CB658 -sub_80CB658: @ 80CB658 - push {r4-r6,lr} - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r4, _080CB6A0 @ =sub_80CB6AC - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080CB698 - adds r0, r4, 0 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080CB6A4 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - strh r0, [r1, 0xA] - strh r5, [r1, 0xC] - ldr r0, _080CB6A8 @ =gUnknown_83F5BC1 - adds r0, r6, r0 - ldrb r0, [r0] - strh r0, [r1, 0xE] -_080CB698: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080CB6A0: .4byte sub_80CB6AC -_080CB6A4: .4byte gTasks -_080CB6A8: .4byte gUnknown_83F5BC1 - thumb_func_end sub_80CB658 - - thumb_func_start sub_80CB6AC -sub_80CB6AC: @ 80CB6AC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - lsls r0, 2 - ldr r1, [sp] - adds r0, r1 - lsls r0, 3 - ldr r1, _080CB734 @ =gTasks+0x8 - adds r6, r0, r1 - movs r2, 0x2 - ldrsh r0, [r6, r2] - cmp r0, 0x6 - bne _080CB7A8 - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - movs r1, 0x4 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _080CB73C - movs r1, 0 - ldr r2, _080CB738 @ =gUnknown_83F5B94 - mov r10, r2 -_080CB6E6: - movs r5, 0 - adds r7, r1, 0x7 - lsls r0, r1, 1 - adds r2, r1, 0x1 - mov r8, r2 - adds r0, r1 - lsls r0, 1 - mov r9, r0 -_080CB6F6: - adds r4, r5, 0 - adds r4, 0x8 - movs r1, 0 - ldrsh r0, [r6, r1] - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 15 - add r0, r9 - add r0, r10 - ldrh r0, [r0] - movs r1, 0xC0 - lsls r1, 4 - adds r2, r1, 0 - orrs r2, r0 - adds r0, r4, 0 - adds r1, r7, 0 - bl MapGridSetMetatileIdAt - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _080CB6F6 - mov r2, r8 - lsls r0, r2, 24 - lsrs r1, r0, 24 - cmp r1, 0x2 - bls _080CB6E6 - b _080CB78E - .align 2, 0 -_080CB734: .4byte gTasks+0x8 -_080CB738: .4byte gUnknown_83F5B94 -_080CB73C: - movs r1, 0 - ldr r0, _080CB7C0 @ =gUnknown_83F5BA6 - mov r10, r0 -_080CB742: - movs r5, 0 - adds r7, r1, 0x7 - lsls r0, r1, 1 - adds r2, r1, 0x1 - mov r8, r2 - adds r0, r1 - lsls r0, 1 - mov r9, r0 -_080CB752: - adds r4, r5, 0 - adds r4, 0x8 - movs r1, 0 - ldrsh r0, [r6, r1] - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 15 - add r0, r9 - add r0, r10 - ldrh r0, [r0] - movs r1, 0xC0 - lsls r1, 4 - adds r2, r1, 0 - orrs r2, r0 - adds r0, r4, 0 - adds r1, r7, 0 - bl MapGridSetMetatileIdAt - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _080CB752 - mov r2, r8 - lsls r0, r2, 24 - lsrs r1, r0, 24 - cmp r1, 0x2 - bls _080CB742 -_080CB78E: - bl DrawWholeMapView - movs r0, 0 - strh r0, [r6, 0x2] - movs r0, 0 - ldrsh r1, [r6, r0] - movs r2, 0x6 - ldrsh r0, [r6, r2] - cmp r1, r0 - bne _080CB7A8 - ldr r0, [sp] - bl DestroyTask -_080CB7A8: - ldrh r0, [r6, 0x2] - adds r0, 0x1 - strh r0, [r6, 0x2] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080CB7C0: .4byte gUnknown_83F5BA6 - thumb_func_end sub_80CB6AC - thumb_func_start sub_80CB7C4 sub_80CB7C4: @ 80CB7C4 push {r4,r5,lr} @@ -2412,16 +80,16 @@ _080CB842: strh r1, [r3, 0x12] strh r2, [r3, 0x14] strh r5, [r3, 0x26] - ldr r0, _080CB868 @ =gUnknown_2039A0E + ldr r0, _080CB868 @ =sElevatorScroll ldrh r0, [r0] strh r0, [r3, 0x16] - ldr r0, _080CB86C @ =gUnknown_2039A10 + ldr r0, _080CB86C @ =sElevatorCursorPos ldrh r0, [r0] strh r0, [r3, 0x18] b _080CB8F8 .align 2, 0 -_080CB868: .4byte gUnknown_2039A0E -_080CB86C: .4byte gUnknown_2039A10 +_080CB868: .4byte sElevatorScroll +_080CB86C: .4byte sElevatorCursorPos _080CB870: movs r1, 0 movs r0, 0x4 @@ -2525,7 +193,7 @@ sub_80CB904: @ 80CB904 cmp r0, 0x1 bne _080CB944 ldr r0, _080CB93C @ =gUnknown_2039A18 - ldr r1, _080CB940 @ =gUnknown_2039A0E + ldr r1, _080CB940 @ =sElevatorScroll ldrh r1, [r1] strh r1, [r0] b _080CB94A @@ -2533,7 +201,7 @@ sub_80CB904: @ 80CB904 _080CB934: .4byte gTasks _080CB938: .4byte gSpecialVar_0x8004 _080CB93C: .4byte gUnknown_2039A18 -_080CB940: .4byte gUnknown_2039A0E +_080CB940: .4byte sElevatorScroll _080CB944: ldr r1, _080CBA60 @ =gUnknown_2039A18 movs r0, 0 @@ -3983,8 +1651,8 @@ _080CC486: bx r1 thumb_func_end GetHiddenItemAttr - thumb_func_start sub_80CC48C -sub_80CC48C: @ 80CC48C + thumb_func_start Special_PlayerPartyContainsSpecies +Special_PlayerPartyContainsSpecies: @ 80CC48C push {r4,r5,lr} bl CalculatePlayerPartyCount lsls r0, 24 @@ -4021,7 +1689,7 @@ _080CC4CC: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80CC48C + thumb_func_end Special_PlayerPartyContainsSpecies thumb_func_start sub_80CC4D4 sub_80CC4D4: @ 80CC4D4 diff --git a/asm/learn_move.s b/asm/learn_move.s index a7a5b264d..d93c534c0 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1653,7 +1653,7 @@ _080E53F4: movs r2, 0x2 movs r3, 0x2 bl sub_80E559C - ldr r1, _080E5440 @ =gUnknown_84886E8 + ldr r1, _080E5440 @ =gMoveDescriptionPointers subs r0, r5, 0x1 lsls r0, 2 adds r0, r1 @@ -1670,7 +1670,7 @@ _080E53F4: bx r0 .align 2, 0 _080E543C: .4byte gBattleMoves -_080E5440: .4byte gUnknown_84886E8 +_080E5440: .4byte gMoveDescriptionPointers thumb_func_end sub_80E5340 thumb_func_start sub_80E5444 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 8a01dcfb6..dcf8f6bfe 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -6470,7 +6470,7 @@ _08137B1C: str r1, [sp, 0x4] str r6, [sp, 0x8] str r5, [sp, 0xC] - ldr r3, _08137BC8 @ =gUnknown_84886E8 + ldr r3, _08137BC8 @ =gMoveDescriptionPointers mov r4, r8 ldrb r1, [r4] lsls r1, 1 @@ -6502,7 +6502,7 @@ _08137BB8: .4byte 0x00003004 _08137BBC: .4byte gUnknown_8463FA4 _08137BC0: .4byte 0x0000316c _08137BC4: .4byte 0x00003188 -_08137BC8: .4byte gUnknown_84886E8 +_08137BC8: .4byte gMoveDescriptionPointers _08137BCC: .4byte 0x00003258 thumb_func_end sub_8137AF8 |