diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/berry.s | 311 | ||||
| -rw-r--r-- | asm/berry_crush_3.s | 4 | ||||
| -rw-r--r-- | asm/overworld.s | 2 | ||||
| -rw-r--r-- | asm/prof_pc.s | 204 | ||||
| -rw-r--r-- | asm/text_window_graphics.s | 30 |
5 files changed, 3 insertions, 548 deletions
diff --git a/asm/berry.s b/asm/berry.s deleted file mode 100644 index 5537e3590..000000000 --- a/asm/berry.s +++ /dev/null @@ -1,311 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_809C718 -sub_809C718: @ 809C718 - push {r4,r5,lr} - ldr r2, _0809C778 @ =gSaveBlock1Ptr - ldr r1, [r2] - ldr r0, _0809C77C @ =gUnknown_83DF7E8 - ldr r3, _0809C780 @ =0x000030ec - adds r1, r3 - movs r4, 0x93 - lsls r4, 3 - adds r0, r4 - ldm r0!, {r3-r5} - stm r1!, {r3-r5} - ldm r0!, {r3-r5} - stm r1!, {r3-r5} - ldr r0, [r0] - str r0, [r1] - movs r1, 0 - adds r4, r2, 0 - adds r5, r4, 0 - ldr r3, _0809C784 @ =0x00003108 - movs r2, 0 -_0809C740: - ldr r0, [r5] - adds r0, r3 - adds r0, r1 - strb r2, [r0] - adds r1, 0x1 - cmp r1, 0x11 - ble _0809C740 - ldr r0, [r4] - ldr r5, _0809C788 @ =0x0000311a - adds r0, r5 - movs r1, 0 - strb r1, [r0] - ldr r0, [r4] - ldr r2, _0809C78C @ =0x0000311b - adds r0, r2 - strb r1, [r0] - ldr r0, [r4] - ldr r3, _0809C780 @ =0x000030ec - adds r0, r3 - bl GetEnigmaBerryChecksum - ldr r1, [r4] - ldr r4, _0809C790 @ =0x0000311c - adds r1, r4 - str r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809C778: .4byte gSaveBlock1Ptr -_0809C77C: .4byte gUnknown_83DF7E8 -_0809C780: .4byte 0x000030ec -_0809C784: .4byte 0x00003108 -_0809C788: .4byte 0x0000311a -_0809C78C: .4byte 0x0000311b -_0809C790: .4byte 0x0000311c - thumb_func_end sub_809C718 - - thumb_func_start sub_809C794 -sub_809C794: @ 809C794 - push {lr} - sub sp, 0x4 - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r0, _0809C7B8 @ =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, _0809C7BC @ =0x000030ec - adds r1, r0 - ldr r2, _0809C7C0 @ =0x0100001a - mov r0, sp - bl CpuSet - bl sub_809C718 - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_0809C7B8: .4byte gSaveBlock1Ptr -_0809C7BC: .4byte 0x000030ec -_0809C7C0: .4byte 0x0100001a - thumb_func_end sub_809C794 - - thumb_func_start SetEnigmaBerry -SetEnigmaBerry: @ 809C7C4 - push {r4-r7,lr} - adds r4, r0, 0 - bl sub_809C794 - adds r5, r4, 0 - ldr r0, _0809C824 @ =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, _0809C828 @ =0x000030ec - adds r4, r2, r0 - adds r1, r4, 0 - adds r0, r5, 0 - ldm r0!, {r3,r6,r7} - stm r1!, {r3,r6,r7} - ldm r0!, {r3,r6,r7} - stm r1!, {r3,r6,r7} - ldr r0, [r0] - str r0, [r1] - movs r3, 0 - ldr r0, _0809C82C @ =0x00003108 - adds r6, r2, r0 - ldr r1, _0809C830 @ =0x00000516 - adds r2, r5, r1 -_0809C7F0: - adds r0, r6, r3 - adds r1, r2, r3 - ldrb r1, [r1] - strb r1, [r0] - adds r3, 0x1 - cmp r3, 0x11 - ble _0809C7F0 - movs r3, 0xA5 - lsls r3, 3 - adds r0, r5, r3 - ldrb r0, [r0] - adds r1, r4, 0 - adds r1, 0x2E - strb r0, [r1] - ldr r6, _0809C834 @ =0x00000529 - adds r0, r5, r6 - ldrb r0, [r0] - adds r1, 0x1 - strb r0, [r1] - adds r0, r4, 0 - bl GetEnigmaBerryChecksum - str r0, [r4, 0x30] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809C824: .4byte gSaveBlock1Ptr -_0809C828: .4byte 0x000030ec -_0809C82C: .4byte 0x00003108 -_0809C830: .4byte 0x00000516 -_0809C834: .4byte 0x00000529 - thumb_func_end SetEnigmaBerry - - thumb_func_start GetEnigmaBerryChecksum -GetEnigmaBerryChecksum: @ 809C838 - push {lr} - adds r3, r0, 0 - movs r2, 0 - movs r1, 0 -_0809C840: - adds r0, r3, r1 - ldrb r0, [r0] - adds r2, r0 - adds r1, 0x1 - cmp r1, 0x2F - bls _0809C840 - adds r0, r2, 0 - pop {r1} - bx r1 - thumb_func_end GetEnigmaBerryChecksum - - thumb_func_start IsEnigmaBerryValid -IsEnigmaBerryValid: @ 809C854 - push {r4,lr} - ldr r4, _0809C888 @ =gSaveBlock1Ptr - ldr r1, [r4] - movs r2, 0xC4 - lsls r2, 6 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _0809C898 - ldr r2, _0809C88C @ =0x000030f6 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _0809C898 - ldr r2, _0809C890 @ =0x000030ec - adds r0, r1, r2 - bl GetEnigmaBerryChecksum - ldr r1, [r4] - ldr r2, _0809C894 @ =0x0000311c - adds r1, r2 - ldr r1, [r1] - cmp r0, r1 - bne _0809C898 - movs r0, 0x1 - b _0809C89A - .align 2, 0 -_0809C888: .4byte gSaveBlock1Ptr -_0809C88C: .4byte 0x000030f6 -_0809C890: .4byte 0x000030ec -_0809C894: .4byte 0x0000311c -_0809C898: - movs r0, 0 -_0809C89A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end IsEnigmaBerryValid - - thumb_func_start sub_809C8A0 -sub_809C8A0: @ 809C8A0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2B - bne _0809C8C4 - bl IsEnigmaBerryValid - cmp r0, 0 - beq _0809C8C4 - ldr r0, _0809C8BC @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _0809C8C0 @ =0x000030ec - b _0809C8D8 - .align 2, 0 -_0809C8BC: .4byte gSaveBlock1Ptr -_0809C8C0: .4byte 0x000030ec -_0809C8C4: - subs r0, r4, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2A - bls _0809C8D0 - movs r4, 0x1 -_0809C8D0: - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - ldr r1, _0809C8E0 @ =gUnknown_83DF7CC -_0809C8D8: - adds r0, r1 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0809C8E0: .4byte gUnknown_83DF7CC - thumb_func_end sub_809C8A0 - - thumb_func_start ItemIdToBerryType -ItemIdToBerryType: @ 809C8E4 - push {lr} - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, _0809C900 @ =0xff7b0000 - adds r0, r2 - lsrs r0, 16 - cmp r0, 0x2A - bhi _0809C904 - adds r0, r1, 0 - adds r0, 0x7C - lsls r0, 24 - lsrs r0, 24 - b _0809C906 - .align 2, 0 -_0809C900: .4byte 0xff7b0000 -_0809C904: - movs r0, 0x1 -_0809C906: - pop {r1} - bx r1 - thumb_func_end ItemIdToBerryType - - thumb_func_start BerryTypeToItemId -BerryTypeToItemId: @ 809C90C - push {lr} - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, _0809C928 @ =0xffff0000 - adds r0, r2 - lsrs r0, 16 - cmp r0, 0x2A - bhi _0809C92C - adds r0, r1, 0 - adds r0, 0x84 - lsls r0, 16 - lsrs r0, 16 - b _0809C92E - .align 2, 0 -_0809C928: .4byte 0xffff0000 -_0809C92C: - movs r0, 0x85 -_0809C92E: - pop {r1} - bx r1 - thumb_func_end BerryTypeToItemId - - thumb_func_start GetBerryNameByBerryType -GetBerryNameByBerryType: @ 809C934 - push {r4,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r0, 24 - bl sub_809C8A0 - adds r1, r0, 0 - adds r0, r4, 0 - movs r2, 0x6 - bl memcpy - movs r0, 0xFF - strb r0, [r4, 0x6] - pop {r4} - pop {r0} - bx r0 - thumb_func_end GetBerryNameByBerryType - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s index 23968f655..f837c4929 100644 --- a/asm/berry_crush_3.s +++ b/asm/berry_crush_3.s @@ -1537,7 +1537,7 @@ _0814E21A: lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, _0814E294 @ =gUnknown_83DF7E8 + ldr r0, _0814E294 @ =sBerries adds r1, r0 ldr r0, _0814E298 @ =gStringVar1 bl StringCopy @@ -1591,7 +1591,7 @@ _0814E27E: bl StringCopy b _0814E2B8 .align 2, 0 -_0814E294: .4byte gUnknown_83DF7E8 +_0814E294: .4byte sBerries _0814E298: .4byte gStringVar1 _0814E29C: .4byte gUnknown_846F4B8 _0814E2A0: .4byte gStringVar4 diff --git a/asm/overworld.s b/asm/overworld.s index 4210aaa9d..103ed2c46 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -1178,7 +1178,7 @@ _080554B8: .4byte gSaveBlock1Ptr sub_80554BC: @ 80554BC push {lr} ldr r0, _080554C8 @ =gUnknown_2031DBC - bl sub_80BFCD0 + bl SetBlackoutRespawnWarpAndHealerNpc pop {r0} bx r0 .align 2, 0 diff --git a/asm/prof_pc.s b/asm/prof_pc.s deleted file mode 100644 index 9c9dfa79c..000000000 --- a/asm/prof_pc.s +++ /dev/null @@ -1,204 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80CA3D8 -sub_80CA3D8: @ 80CA3D8 - push {lr} - ldr r0, _080CA3F4 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _080CA3FC - movs r0, 0 - bl sub_8088EDC - ldr r1, _080CA3F8 @ =gSpecialVar_0x8005 - strh r0, [r1] - movs r0, 0x1 - bl sub_8088EDC - b _080CA40C - .align 2, 0 -_080CA3F4: .4byte gSpecialVar_0x8004 -_080CA3F8: .4byte gSpecialVar_0x8005 -_080CA3FC: - movs r0, 0 - bl pokedex_count - ldr r1, _080CA41C @ =gSpecialVar_0x8005 - strh r0, [r1] - movs r0, 0x1 - bl pokedex_count -_080CA40C: - ldr r1, _080CA420 @ =gSpecialVar_0x8006 - strh r0, [r1] - bl sub_806E25C - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .align 2, 0 -_080CA41C: .4byte gSpecialVar_0x8005 -_080CA420: .4byte gSpecialVar_0x8006 - thumb_func_end sub_80CA3D8 - - thumb_func_start sub_80CA424 -sub_80CA424: @ 80CA424 - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, _080CA440 @ =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] - cmp r2, 0x9 - bhi _080CA436 - b _080CA50C -_080CA436: - cmp r2, 0x13 - bhi _080CA448 - ldr r0, _080CA444 @ =gUnknown_81A6D6D - b _080CA51A - .align 2, 0 -_080CA440: .4byte gSpecialVar_Result -_080CA444: .4byte gUnknown_81A6D6D -_080CA448: - cmp r2, 0x1D - bhi _080CA454 - ldr r0, _080CA450 @ =gUnknown_81A6DDF - b _080CA51A - .align 2, 0 -_080CA450: .4byte gUnknown_81A6DDF -_080CA454: - cmp r2, 0x27 - bhi _080CA460 - ldr r0, _080CA45C @ =gUnknown_81A6E36 - b _080CA51A - .align 2, 0 -_080CA45C: .4byte gUnknown_81A6E36 -_080CA460: - cmp r2, 0x31 - bhi _080CA46C - ldr r0, _080CA468 @ =gUnknown_81A6EA4 - b _080CA51A - .align 2, 0 -_080CA468: .4byte gUnknown_81A6EA4 -_080CA46C: - cmp r2, 0x3B - bhi _080CA478 - ldr r0, _080CA474 @ =gUnknown_81A6F0B - b _080CA51A - .align 2, 0 -_080CA474: .4byte gUnknown_81A6F0B -_080CA478: - cmp r2, 0x45 - bhi _080CA484 - ldr r0, _080CA480 @ =gUnknown_81A6F71 - b _080CA51A - .align 2, 0 -_080CA480: .4byte gUnknown_81A6F71 -_080CA484: - cmp r2, 0x4F - bhi _080CA490 - ldr r0, _080CA48C @ =gUnknown_81A6FAB - b _080CA51A - .align 2, 0 -_080CA48C: .4byte gUnknown_81A6FAB -_080CA490: - cmp r2, 0x59 - bhi _080CA49C - ldr r0, _080CA498 @ =gUnknown_81A6FF1 - b _080CA51A - .align 2, 0 -_080CA498: .4byte gUnknown_81A6FF1 -_080CA49C: - cmp r2, 0x63 - bhi _080CA4A8 - ldr r0, _080CA4A4 @ =gUnknown_81A7031 - b _080CA51A - .align 2, 0 -_080CA4A4: .4byte gUnknown_81A7031 -_080CA4A8: - cmp r2, 0x6D - bhi _080CA4B4 - ldr r0, _080CA4B0 @ =gUnknown_81A7063 - b _080CA51A - .align 2, 0 -_080CA4B0: .4byte gUnknown_81A7063 -_080CA4B4: - cmp r2, 0x77 - bhi _080CA4C0 - ldr r0, _080CA4BC @ =gUnknown_81A70A5 - b _080CA51A - .align 2, 0 -_080CA4BC: .4byte gUnknown_81A70A5 -_080CA4C0: - cmp r2, 0x81 - bhi _080CA4CC - ldr r0, _080CA4C8 @ =gUnknown_81A70D8 - b _080CA51A - .align 2, 0 -_080CA4C8: .4byte gUnknown_81A70D8 -_080CA4CC: - cmp r2, 0x8B - bhi _080CA4D8 - ldr r0, _080CA4D4 @ =gUnknown_81A7108 - b _080CA51A - .align 2, 0 -_080CA4D4: .4byte gUnknown_81A7108 -_080CA4D8: - cmp r2, 0x95 - bls _080CA4F6 - cmp r2, 0x96 - bne _080CA508 - movs r0, 0x97 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - beq _080CA500 -_080CA4F6: - ldr r0, _080CA4FC @ =gUnknown_81A7137 - b _080CA51A - .align 2, 0 -_080CA4FC: .4byte gUnknown_81A7137 -_080CA500: - ldr r1, _080CA504 @ =gSpecialVar_Result - b _080CA514 - .align 2, 0 -_080CA504: .4byte gSpecialVar_Result -_080CA508: - cmp r2, 0x97 - beq _080CA514 -_080CA50C: - ldr r0, _080CA510 @ =gUnknown_81A6D17 - b _080CA51A - .align 2, 0 -_080CA510: .4byte gUnknown_81A6D17 -_080CA514: - movs r0, 0x1 - strh r0, [r1] - ldr r0, _080CA520 @ =gUnknown_81A7175 -_080CA51A: - pop {r1} - bx r1 - .align 2, 0 -_080CA520: .4byte gUnknown_81A7175 - thumb_func_end sub_80CA424 - - thumb_func_start sub_80CA524 -sub_80CA524: @ 80CA524 - push {lr} - ldr r0, _080CA538 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - bl sub_80CA424 - bl ShowFieldMessage - pop {r0} - bx r0 - .align 2, 0 -_080CA538: .4byte gSpecialVar_0x8004 - thumb_func_end sub_80CA524 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/text_window_graphics.s b/asm/text_window_graphics.s deleted file mode 100644 index 6c725a553..000000000 --- a/asm/text_window_graphics.s +++ /dev/null @@ -1,30 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_8069788 -sub_8069788: @ 8069788 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x13 - bhi _080697A0 - lsls r0, 3 - ldr r1, _0806979C @ =gUnknown_8471E8C - adds r0, r1 - b _080697A2 - .align 2, 0 -_0806979C: .4byte gUnknown_8471E8C -_080697A0: - ldr r0, _080697A8 @ =gUnknown_8471E8C -_080697A2: - pop {r1} - bx r1 - .align 2, 0 -_080697A8: .4byte gUnknown_8471E8C - thumb_func_end sub_8069788 - - .align 2, 0 @ Don't pad with nop. |