diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/code_8012A18.s | 20 | ||||
| -rw-r--r-- | asm/code_801D760.s | 10 | ||||
| -rw-r--r-- | asm/code_803C1D0.s | 663 | ||||
| -rw-r--r-- | asm/code_809747C.s | 6 | ||||
| -rw-r--r-- | asm/code_8098BDC.s | 14 | ||||
| -rw-r--r-- | asm/code_809D148.s | 4 | ||||
| -rw-r--r-- | asm/credits.s | 46 | ||||
| -rw-r--r-- | asm/event_flag.s | 52 | ||||
| -rw-r--r-- | asm/main_menu.s | 40 | ||||
| -rw-r--r-- | asm/personality_test.s | 979 | ||||
| -rw-r--r-- | asm/wonder_mail.s | 12 |
11 files changed, 729 insertions, 1117 deletions
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s index e765d1a..3c4be5d 100644 --- a/asm/code_8012A18.s +++ b/asm/code_8012A18.s @@ -7182,8 +7182,8 @@ _080162E0: bx r1 thumb_func_end sub_80162B8 - thumb_func_start sub_80162E4 -sub_80162E4: + thumb_func_start DisplayPersianDialogueSprite +DisplayPersianDialogueSprite: push {r4-r6,lr} adds r4, r0, 0 bl ResetUnusedInputStruct @@ -7268,7 +7268,7 @@ _08016352: bx r1 .align 2, 0 _0801639C: .4byte gUnknown_203B204 - thumb_func_end sub_80162E4 + thumb_func_end DisplayPersianDialogueSprite thumb_func_start sub_80163A0 sub_80163A0: @@ -8400,8 +8400,8 @@ _08016C8C: .4byte gUnknown_80DB738 _08016C90: .4byte gUnknown_203B460 thumb_func_end sub_8016C40 - thumb_func_start sub_8016C94 -sub_8016C94: + thumb_func_start DisplayKangaskhanDialogueSprite +DisplayKangaskhanDialogueSprite: push {r4-r6,lr} adds r4, r0, 0 bl ResetUnusedInputStruct @@ -8488,7 +8488,7 @@ _08016D06: bx r1 .align 2, 0 _08016D50: .4byte gUnknown_203B208 - thumb_func_end sub_8016C94 + thumb_func_end DisplayKangaskhanDialogueSprite thumb_func_start sub_8016D54 sub_8016D54: @@ -12186,8 +12186,8 @@ _08018AFC: bx r0 thumb_func_end sub_8018AE4 - thumb_func_start sub_8018B00 -sub_8018B00: + thumb_func_start DisplayKeckleonDialogueSprite +DisplayKeckleonDialogueSprite: push {r4,r5,lr} adds r4, r0, 0 ldr r5, _08018B30 @@ -12311,7 +12311,7 @@ _08018BAE: _08018BF8: .4byte gUnknown_202E5D8 _08018BFC: .4byte gUnknown_202E1C8 _08018C00: .4byte gUnknown_203B210 - thumb_func_end sub_8018B00 + thumb_func_end DisplayKeckleonDialogueSprite thumb_func_start sub_8018C04 sub_8018C04: @@ -16876,7 +16876,7 @@ _0801B0E8: ldrsh r1, [r0, r3] adds r2, 0xC movs r0, 0x2 - bl sub_801E80C + bl DisplayGulpinDialogueSprite b _0801B168 _0801B0FC: ldr r1, [r4] diff --git a/asm/code_801D760.s b/asm/code_801D760.s index 3ec474f..fdd142e 100644 --- a/asm/code_801D760.s +++ b/asm/code_801D760.s @@ -1966,8 +1966,8 @@ _0801E804: .4byte gUnknown_203B268 _0801E808: .4byte gUnknown_80DAA98 thumb_func_end sub_801E7AC - thumb_func_start sub_801E80C -sub_801E80C: + thumb_func_start DisplayGulpinDialogueSprite +DisplayGulpinDialogueSprite: push {r4-r6,lr} mov r6, r8 push {r6} @@ -2055,7 +2055,7 @@ _0801E858: _0801E8B4: .4byte 0x00000155 _0801E8B8: .4byte gUnknown_203B26C _0801E8BC: .4byte 0x00000125 - thumb_func_end sub_801E80C + thumb_func_end DisplayGulpinDialogueSprite thumb_func_start sub_801E8C0 sub_801E8C0: @@ -5420,14 +5420,14 @@ _0802038C: ldrsh r1, [r2, r5] adds r2, 0x24 movs r0, 0 - bl sub_801E80C + bl DisplayGulpinDialogueSprite b _08020562 _080203A2: movs r0, 0xC ldrsh r1, [r2, r0] adds r2, 0x24 movs r0, 0x1 - bl sub_801E80C + bl DisplayGulpinDialogueSprite b _08020562 _080203B0: ldr r2, [r5] diff --git a/asm/code_803C1D0.s b/asm/code_803C1D0.s new file mode 100644 index 0000000..c40c6f7 --- /dev/null +++ b/asm/code_803C1D0.s @@ -0,0 +1,663 @@ + .include "constants/gba_constants.inc" + .include "asm/macros.inc" + + .syntax unified + + .text + + thumb_func_start sub_803C1D0 +sub_803C1D0: + push {lr} + lsls r1, 24 + lsrs r1, 24 + bl sub_803C1B4 + adds r1, r0, 0 + lsrs r0, r1, 31 + adds r0, r1, r0 + asrs r1, r0, 1 + lsls r0, r1, 24 + lsrs r0, 24 + cmp r0, 0x6 + bls _0803C1EC + movs r0, 0x6 +_0803C1EC: + pop {r1} + bx r1 + thumb_func_end sub_803C1D0 + + thumb_func_start sub_803C1F0 +sub_803C1F0: + lsls r0, 24 + ldr r1, _0803C1FC + lsrs r0, 22 + adds r0, r1 + ldr r0, [r0] + bx lr + .align 2, 0 +_0803C1FC: .4byte gUnknown_80E8BF8 + thumb_func_end sub_803C1F0 + + thumb_func_start sub_803C200 +sub_803C200: + push {lr} + lsls r1, 24 + lsrs r1, 24 + bl sub_803C1B4 + ldr r1, _0803C218 + lsls r0, 2 + adds r0, r1 + ldr r0, [r0] + pop {r1} + bx r1 + .align 2, 0 +_0803C218: .4byte gUnknown_80E80A0 + thumb_func_end sub_803C200 + + thumb_func_start sub_803C21C +sub_803C21C: + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r6, r0, 0 + adds r4, r1, 0 + adds r0, r6, 0x4 + ldrb r1, [r6, 0x1] + bl sub_803C1D0 + lsls r0, 24 + lsrs r2, r0, 24 + movs r0, 0 + str r0, [r4, 0x18] + movs r3, 0 + movs r1, 0x2 + adds r0, r4, 0 + adds r0, 0x1E +_0803C23E: + strb r3, [r0] + subs r0, 0x1 + subs r1, 0x1 + cmp r1, 0 + bge _0803C23E + adds r0, r4, 0 + adds r0, 0x20 + movs r1, 0 + strb r1, [r0] + movs r1, 0xA + strb r1, [r4, 0x1F] + ldrb r1, [r6, 0x11] + adds r3, r0, 0 + cmp r1, 0x9 + bhi _0803C354 + lsls r0, r1, 2 + ldr r1, _0803C268 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .align 2, 0 +_0803C268: .4byte _0803C26C + .align 2, 0 +_0803C26C: + .4byte _0803C294 + .4byte _0803C2A2 + .4byte _0803C2B4 + .4byte _0803C2BE + .4byte _0803C354 + .4byte _0803C2E0 + .4byte _0803C2EE + .4byte _0803C300 + .4byte _0803C30A + .4byte _0803C34A +_0803C294: + movs r0, 0 + strb r0, [r4, 0x16] + adds r1, r2, 0x1 + movs r0, 0x64 + muls r0, r1 + str r0, [r4, 0x18] + b _0803C358 +_0803C2A2: + movs r0, 0x1 + strb r0, [r4, 0x16] + adds r1, r2, 0x1 + movs r0, 0x64 + muls r0, r1 + str r0, [r4, 0x18] + ldrb r0, [r6, 0x12] + strb r0, [r4, 0x1C] + b _0803C358 +_0803C2B4: + movs r0, 0x2 + strb r0, [r4, 0x16] + ldrb r0, [r6, 0x12] + strb r0, [r4, 0x1C] + b _0803C358 +_0803C2BE: + movs r0, 0x3 + strb r0, [r4, 0x16] + ldrb r0, [r6, 0x12] + strb r0, [r4, 0x1C] + adds r5, r6, 0x4 + adds r7, r4, 0 + adds r7, 0x1D +_0803C2CC: + ldrb r1, [r6, 0x1] + adds r0, r5, 0 + adds r2, r7, 0 + bl sub_803C37C + ldrb r0, [r4, 0x1C] + ldrb r1, [r4, 0x1D] + cmp r0, r1 + beq _0803C2CC + b _0803C35A +_0803C2E0: + movs r0, 0 + strb r0, [r4, 0x16] + adds r1, r2, 0x1 + movs r0, 0xC8 + muls r0, r1 + str r0, [r4, 0x18] + b _0803C358 +_0803C2EE: + movs r0, 0x1 + strb r0, [r4, 0x16] + adds r1, r2, 0x1 + movs r0, 0xC8 + muls r0, r1 + str r0, [r4, 0x18] + ldrb r0, [r6, 0x12] + strb r0, [r4, 0x1C] + b _0803C358 +_0803C300: + movs r0, 0x2 + strb r0, [r4, 0x16] + ldrb r0, [r6, 0x12] + strb r0, [r4, 0x1C] + b _0803C358 +_0803C30A: + movs r0, 0x3 + strb r0, [r4, 0x16] + ldrb r0, [r6, 0x12] + strb r0, [r4, 0x1C] + adds r5, r6, 0x4 + adds r7, r4, 0 + adds r7, 0x1D + movs r0, 0x1E + adds r0, r4 + mov r8, r0 +_0803C31E: + ldrb r1, [r6, 0x1] + adds r0, r5, 0 + adds r2, r7, 0 + bl sub_803C37C + ldrb r0, [r4, 0x1C] + ldrb r1, [r4, 0x1D] + cmp r0, r1 + beq _0803C31E +_0803C330: + ldrb r1, [r6, 0x1] + adds r0, r5, 0 + mov r2, r8 + bl sub_803C37C + ldrb r0, [r4, 0x1C] + ldrb r1, [r4, 0x1E] + cmp r0, r1 + beq _0803C330 + ldrb r0, [r4, 0x1D] + cmp r0, r1 + beq _0803C330 + b _0803C35A +_0803C34A: + movs r0, 0x4 + strb r0, [r4, 0x16] + ldrb r0, [r6, 0x13] + strb r0, [r3] + b _0803C358 +_0803C354: + movs r0, 0x5 + strb r0, [r4, 0x16] +_0803C358: + adds r5, r6, 0x4 +_0803C35A: + movs r0, 0xC + ldrsh r1, [r6, r0] + adds r0, r4, 0 + bl sub_808D8E0 + ldrh r0, [r6, 0xC] + strh r0, [r4, 0x14] + ldrb r1, [r6, 0x1] + adds r0, r5, 0 + bl sub_803C200 + str r0, [r4, 0x24] + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_803C21C + + thumb_func_start sub_803C37C +sub_803C37C: + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r6, r0, 0 + mov r8, r2 + lsls r1, 24 + lsrs r1, 24 + bl sub_803C1B4 + adds r7, r0, 0 + adds r0, r6, 0 + adds r1, r7, 0 + bl sub_8090910 +_0803C398: + movs r5, 0 + adds r0, r6, 0 + adds r1, r7, 0 + bl sub_8090910 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0xEA + bne _0803C3BA + movs r0, 0 + movs r1, 0x47 + movs r2, 0x1 + bl sub_8001784 + negs r1, r0 + orrs r1, r0 + lsrs r5, r1, 31 +_0803C3BA: + cmp r4, 0xEB + bne _0803C3CE + movs r0, 0 + movs r1, 0x47 + movs r2, 0 + bl sub_8001784 + cmp r0, 0 + beq _0803C3CE + movs r5, 0x1 +_0803C3CE: + cmp r5, 0 + bne _0803C398 + mov r0, r8 + strb r4, [r0] + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_803C37C + + thumb_func_start sub_803C3E0 +sub_803C3E0: + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x54 + adds r7, r0, 0 + movs r6, 0 + ldr r5, _0803C42C + movs r4, 0 + mov r8, sp +_0803C3F2: + movs r1, 0 + ldrsh r0, [r5, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C41A + movs r1, 0x2 + ldrsh r0, [r5, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C41A + mov r0, r8 + adds r0, 0x4 + mov r8, r0 + subs r0, 0x4 + stm r0!, {r4} + adds r6, 0x1 +_0803C41A: + adds r5, 0x8 + adds r4, 0x1 + cmp r4, 0x14 + ble _0803C3F2 + ldr r5, _0803C42C + cmp r6, 0 + bne _0803C430 + movs r0, 0 + b _0803C44E + .align 2, 0 +_0803C42C: .4byte gUnknown_80E9920 +_0803C430: + adds r0, r6, 0 + bl RandomCapped + lsls r0, 2 + add r0, sp + ldr r4, [r0] + lsls r0, r4, 3 + adds r5, r0, r5 + ldrh r0, [r5] + strh r0, [r7, 0xC] + ldrh r0, [r5, 0x2] + strh r0, [r7, 0xE] + movs r0, 0x7 + strb r0, [r7, 0x2] + movs r0, 0x1 +_0803C44E: + add sp, 0x54 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_803C3E0 + + thumb_func_start sub_803C45C +sub_803C45C: + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0xB4 + adds r7, r0, 0 + movs r6, 0 + ldr r5, _0803C4CC + movs r4, 0 + mov r8, sp +_0803C46E: + movs r1, 0 + ldrsh r0, [r5, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C496 + movs r1, 0x2 + ldrsh r0, [r5, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C496 + mov r0, r8 + adds r0, 0x4 + mov r8, r0 + subs r0, 0x4 + stm r0!, {r4} + adds r6, 0x1 +_0803C496: + adds r5, 0xC + adds r4, 0x1 + cmp r4, 0x2C + ble _0803C46E + ldr r5, _0803C4CC + cmp r6, 0 + beq _0803C4E0 + adds r0, r6, 0 + bl RandomCapped + lsls r0, 2 + add r0, sp + ldr r4, [r0] + lsls r0, r4, 1 + adds r0, r4 + lsls r0, 2 + adds r5, r0, r5 + bl Random + movs r1, 0x10 + ands r1, r0 + cmp r1, 0 + beq _0803C4D0 + ldrh r0, [r5] + strh r0, [r7, 0xC] + ldrh r0, [r5, 0x2] + b _0803C4D6 + .align 2, 0 +_0803C4CC: .4byte gUnknown_80E9F8C +_0803C4D0: + ldrh r0, [r5, 0x2] + strh r0, [r7, 0xC] + ldrh r0, [r5] +_0803C4D6: + strh r0, [r7, 0xE] + movs r0, 0x8 + strb r0, [r7, 0x2] + movs r0, 0x1 + b _0803C4E2 +_0803C4E0: + movs r0, 0 +_0803C4E2: + add sp, 0xB4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_803C45C + + thumb_func_start sub_803C4F0 +sub_803C4F0: + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x18 + adds r7, r0, 0 + movs r6, 0 + ldr r5, _0803C55C + movs r4, 0 + mov r8, sp +_0803C502: + movs r1, 0 + ldrsh r0, [r5, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C52A + movs r1, 0x2 + ldrsh r0, [r5, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C52A + mov r0, r8 + adds r0, 0x4 + mov r8, r0 + subs r0, 0x4 + stm r0!, {r4} + adds r6, 0x1 +_0803C52A: + adds r5, 0x4 + adds r4, 0x1 + cmp r4, 0x5 + ble _0803C502 + ldr r5, _0803C55C + cmp r6, 0 + beq _0803C570 + adds r0, r6, 0 + bl RandomCapped + lsls r0, 2 + add r0, sp + ldr r4, [r0] + lsls r0, r4, 2 + adds r5, r0, r5 + bl Random + movs r1, 0x10 + ands r1, r0 + cmp r1, 0 + beq _0803C560 + ldrh r0, [r5] + strh r0, [r7, 0xC] + ldrh r0, [r5, 0x2] + b _0803C566 + .align 2, 0 +_0803C55C: .4byte gUnknown_80E8168 +_0803C560: + ldrh r0, [r5, 0x2] + strh r0, [r7, 0xC] + ldrh r0, [r5] +_0803C566: + strh r0, [r7, 0xE] + movs r0, 0x9 + strb r0, [r7, 0x2] + movs r0, 0x1 + b _0803C572 +_0803C570: + movs r0, 0 +_0803C572: + add sp, 0x18 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_803C4F0 + + thumb_func_start sub_803C580 +sub_803C580: + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x54 + adds r6, r0, 0 + movs r7, 0 + ldr r5, _0803C5D8 + movs r0, 0x6 + bl sub_80023E4 + lsls r0, 24 + cmp r0, 0 + beq _0803C5D2 + movs r4, 0 + mov r8, sp +_0803C59E: + movs r1, 0 + ldrsh r0, [r5, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C5C6 + ldrb r0, [r6, 0x4] + ldrb r1, [r5, 0x2] + bl sub_8091E60 + lsls r0, 24 + cmp r0, 0 + beq _0803C5C6 + mov r0, r8 + adds r0, 0x4 + mov r8, r0 + subs r0, 0x4 + stm r0!, {r4} + adds r7, 0x1 +_0803C5C6: + adds r5, 0x4 + adds r4, 0x1 + cmp r4, 0x14 + ble _0803C59E + cmp r7, 0 + bne _0803C5DC +_0803C5D2: + movs r0, 0 + b _0803C600 + .align 2, 0 +_0803C5D8: .4byte gUnknown_80E8180 +_0803C5DC: + adds r0, r7, 0 + bl RandomCapped + lsls r0, 2 + add r0, sp + ldr r4, [r0] + lsls r1, r4, 2 + ldr r0, _0803C60C + adds r5, r1, r0 + ldrh r0, [r5] + strh r0, [r6, 0xC] + ldrh r0, [r5] + strh r0, [r6, 0xE] + ldrb r0, [r5, 0x2] + strb r0, [r6, 0x10] + movs r0, 0x5 + strb r0, [r6, 0x2] + movs r0, 0x1 +_0803C600: + add sp, 0x54 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + .align 2, 0 +_0803C60C: .4byte gUnknown_80E8180 + thumb_func_end sub_803C580 + + thumb_func_start sub_803C610 +sub_803C610: + push {r4-r7,lr} + mov r7, r8 + push {r7} + ldr r4, _0803C660 + add sp, r4 + adds r6, r0, 0 + movs r7, 0 + ldr r4, _0803C664 + movs r5, 0 + mov r8, sp +_0803C624: + movs r1, 0 + ldrsh r0, [r4, r1] + bl sub_803C110 + lsls r0, 24 + cmp r0, 0 + beq _0803C64C + ldrb r0, [r6, 0x4] + ldrb r1, [r4, 0x2] + bl sub_8091E60 + lsls r0, 24 + cmp r0, 0 + beq _0803C64C + mov r0, r8 + adds r0, 0x4 + mov r8, r0 + subs r0, 0x4 + stm r0!, {r5} + adds r7, 0x1 +_0803C64C: + adds r4, 0x4 + adds r5, 0x1 + ldr r0, _0803C668 + cmp r5, r0 + ble _0803C624 + cmp r7, 0 + bne _0803C66C + movs r0, 0 + b _0803C690 + .align 2, 0 +_0803C660: .4byte 0xfffff9f8 +_0803C664: .4byte gUnknown_80E81D4 +_0803C668: .4byte 0x00000181 +_0803C66C: + adds r0, r7, 0 + bl RandomCapped + lsls r0, 2 + add r0, sp + ldr r5, [r0] + lsls r1, r5, 2 + ldr r0, _0803C6A0 + adds r4, r1, r0 + ldrh r0, [r4] + strh r0, [r6, 0xC] + ldrh r0, [r4] + strh r0, [r6, 0xE] + ldrb r0, [r4, 0x2] + strb r0, [r6, 0x10] + movs r0, 0x6 + strb r0, [r6, 0x2] + movs r0, 0x1 +_0803C690: + movs r3, 0xC1 + lsls r3, 3 + add sp, r3 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + .align 2, 0 +_0803C6A0: .4byte gUnknown_80E81D4 + thumb_func_end sub_803C610 + + .align 2,0 diff --git a/asm/code_809747C.s b/asm/code_809747C.s index 640d62c..7f04a7c 100644 --- a/asm/code_809747C.s +++ b/asm/code_809747C.s @@ -332,8 +332,8 @@ _08097732: bx r1 thumb_func_end sub_8097710 - thumb_func_start sub_8097738 -sub_8097738: + thumb_func_start GetAdventureLogLine +GetAdventureLogLine: lsls r0, 24 ldr r1, _08097744 lsrs r0, 22 @@ -342,7 +342,7 @@ sub_8097738: bx lr .align 2, 0 _08097744: .4byte gAdventureLogText - thumb_func_end sub_8097738 + thumb_func_end GetAdventureLogLine thumb_func_start sub_8097748 sub_8097748: diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index 3adf973..6008fe1 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -5704,7 +5704,7 @@ _0809BC26: lsrs r4, 31 bl sub_809B294 adds r0, r4, 0 - bl sub_8016C94 + bl DisplayKangaskhanDialogueSprite lsls r0, 24 cmp r0, 0 beq _0809BC5C @@ -5743,7 +5743,7 @@ _0809BC78: lsrs r4, 31 bl sub_809B294 adds r0, r4, 0 - bl sub_80162E4 + bl DisplayPersianDialogueSprite lsls r0, 24 cmp r0, 0 beq _0809BCB0 @@ -5789,7 +5789,7 @@ _0809BCE8: beq _0809BCF0 movs r0, 0x3 _0809BCF0: - bl sub_8018B00 + bl DisplayKeckleonDialogueSprite lsls r0, 24 cmp r0, 0 beq _0809BD10 @@ -6041,7 +6041,7 @@ _0809BEF2: ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] movs r0, 0x2 - bl sub_8001BB4 + bl ScenarioCalc ldr r0, _0809BF40 ldr r0, [r0] movs r1, 0x86 @@ -6087,7 +6087,7 @@ _0809BF4E: movs r0, 0x2 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc b _0809C392 .align 2, 0 _0809BF6C: .4byte gUnknown_3001B64 @@ -6145,7 +6145,7 @@ _0809BFCE: ldr r2, [sp, 0x18] adds r2, 0x1 movs r0, 0x2 - bl sub_8001BB4 + bl ScenarioCalc ldr r0, _0809BFF4 ldr r0, [r0] movs r2, 0x83 @@ -6700,7 +6700,7 @@ _0809C460: .4byte gUnknown_3001B64 thumb_func_start sub_809C464 sub_809C464: push {lr} - bl sub_803C850 + bl DeleteTestTracker bl sub_8001064 bl sub_809965C pop {r0} diff --git a/asm/code_809D148.s b/asm/code_809D148.s index 410ed17..8af7edf 100644 --- a/asm/code_809D148.s +++ b/asm/code_809D148.s @@ -6724,7 +6724,7 @@ _080A0BA2: ldrsh r0, [r0, r1] ldr r1, [sp, 0xC] ldr r2, [sp, 0x10] - bl sub_8001BB4 + bl ScenarioCalc bl _0809EAE0 _080A0BB4: add r0, sp, 0x8 @@ -6741,7 +6741,7 @@ _080A0BB4: add r2, sp, 0x168 ldr r2, [r2] adds r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc bl _0809EAE0 _080A0BDA: ldr r2, [sp, 0xC] diff --git a/asm/credits.s b/asm/credits.s index f42c628..fa7810b 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -5,52 +5,6 @@ .text - thumb_func_start sub_8035404 -sub_8035404: - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - mov r0, sp - bl sub_80144A4 - cmp r0, 0 - bne _0803541A - adds r0, r4, 0 - bl sub_80338C4 -_0803541A: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8035404 - - thumb_func_start sub_8035424 -sub_8035424: - push {lr} - movs r0, 0x6 - bl sub_80338C4 - pop {r0} - bx r0 - thumb_func_end sub_8035424 - - thumb_func_start sub_8035430 -sub_8035430: - push {lr} - movs r0, 0x4F - bl sub_80338C4 - pop {r0} - bx r0 - thumb_func_end sub_8035430 - - thumb_func_start nullsub_50 -nullsub_50: - bx lr - thumb_func_end nullsub_50 - - thumb_func_start nullsub_51 -nullsub_51: - bx lr - thumb_func_end nullsub_51 - thumb_func_start sub_8035444 sub_8035444: push {r4-r7,lr} diff --git a/asm/event_flag.s b/asm/event_flag.s index a07621c..fc1667f 100644 --- a/asm/event_flag.s +++ b/asm/event_flag.s @@ -62,47 +62,47 @@ _080013B4: movs r0, 0x2 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x3 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x4 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x5 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x6 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x7 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x8 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x9 movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0xA movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0xB movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0xC movs r1, 0 movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0 movs r1, 0xD movs r2, 0xA2 @@ -1070,8 +1070,8 @@ sub_8001B88: bx r0 thumb_func_end sub_8001B88 - thumb_func_start sub_8001BB4 -sub_8001BB4: + thumb_func_start ScenarioCalc +ScenarioCalc: push {r4-r6,lr} sub sp, 0x14 adds r5, r1, 0 @@ -1199,7 +1199,7 @@ _08001CBA: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8001BB4 + thumb_func_end ScenarioCalc thumb_func_start sub_8001CC4 sub_8001CC4: @@ -1342,7 +1342,7 @@ _08001DA0: movs r0, 0x4 movs r1, 0x1F movs r2, 0 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0xE movs r1, 0x1 bl sub_8097418 @@ -1369,7 +1369,7 @@ _08001DDE: movs r0, 0x4 movs r1, 0x1D movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _08001E08: movs r0, 0x4 movs r1, 0x1F @@ -1386,7 +1386,7 @@ _08001E08: movs r0, 0x4 movs r1, 0x1F movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0xF movs r1, 0x1 bl sub_809733C @@ -1496,7 +1496,7 @@ _08001F06: movs r0, 0x5 movs r1, 0x21 movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _08001F20: movs r0, 0xE2 bl sub_8091130 @@ -1523,7 +1523,7 @@ _08001F3E: movs r0, 0x7 movs r1, 0x26 movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _08001F58: movs r0, 0x9 movs r1, 0 @@ -1540,7 +1540,7 @@ _08001F58: movs r0, 0x9 movs r1, 0x2E movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _08001F7E: movs r0, 0x9 movs r1, 0x30 @@ -1574,7 +1574,7 @@ _08001F7E: movs r0, 0x5 movs r1, 0x22 movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _08001FCC: movs r0, 0xB movs r1, 0 @@ -1598,7 +1598,7 @@ _08001FCC: movs r0, 0xB movs r1, 0x33 movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _08002002: movs r0, 0xE bl GetFriendAreaStatus @@ -1635,7 +1635,7 @@ _0800202A: movs r0, 0xA movs r1, 0x31 movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc movs r0, 0x1B movs r1, 0x1 bl sub_809733C @@ -1657,7 +1657,7 @@ _0800205C: movs r0, 0xC movs r1, 0x35 movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _08002086: movs r0, 0x6 movs r1, 0 @@ -1675,7 +1675,7 @@ _08002086: movs r0, 0x6 movs r1, 0x24 movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _080020AE: movs r0, 0x8 movs r1, 0 @@ -1692,7 +1692,7 @@ _080020AE: movs r0, 0x8 movs r1, 0x2C movs r2, 0x1 - bl sub_8001BB4 + bl ScenarioCalc _080020D4: add sp, 0x8 pop {r0} diff --git a/asm/main_menu.s b/asm/main_menu.s index 0892fb3..1d102e8 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -5,46 +5,6 @@ .text - thumb_func_start sub_8035C00 -sub_8035C00: - ldr r1, _08035C0C - ldr r1, [r1] - ldr r0, [r0] - str r0, [r1, 0x2C] - bx lr - .align 2, 0 -_08035C0C: .4byte gUnknown_203B348 - thumb_func_end sub_8035C00 - - thumb_func_start sub_8035C10 -sub_8035C10: - ldr r0, _08035C18 - ldr r0, [r0] - adds r0, 0x2C - bx lr - .align 2, 0 -_08035C18: .4byte gUnknown_203B348 - thumb_func_end sub_8035C10 - - thumb_func_start sub_8035C1C -sub_8035C1C: - ldr r2, _08035C38 - ldr r0, [r2] - adds r0, 0x2E - movs r3, 0 - strb r3, [r0] - ldr r0, [r2] - adds r0, 0x2C - movs r1, 0x1 - strb r1, [r0] - ldr r0, [r2] - adds r0, 0x2D - strb r3, [r0] - bx lr - .align 2, 0 -_08035C38: .4byte gUnknown_203B348 - thumb_func_end sub_8035C1C - thumb_func_start SetMenuItems SetMenuItems: push {r4-r7,lr} diff --git a/asm/personality_test.s b/asm/personality_test.s index 60896e0..ad191c9 100644 --- a/asm/personality_test.s +++ b/asm/personality_test.s @@ -3,885 +3,7 @@ .syntax unified - .text - - thumb_func_start sub_803C1D0 -sub_803C1D0: - push {lr} - lsls r1, 24 - lsrs r1, 24 - bl sub_803C1B4 - adds r1, r0, 0 - lsrs r0, r1, 31 - adds r0, r1, r0 - asrs r1, r0, 1 - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, 0x6 - bls _0803C1EC - movs r0, 0x6 -_0803C1EC: - pop {r1} - bx r1 - thumb_func_end sub_803C1D0 - - thumb_func_start sub_803C1F0 -sub_803C1F0: - lsls r0, 24 - ldr r1, _0803C1FC - lsrs r0, 22 - adds r0, r1 - ldr r0, [r0] - bx lr - .align 2, 0 -_0803C1FC: .4byte gUnknown_80E8BF8 - thumb_func_end sub_803C1F0 - - thumb_func_start sub_803C200 -sub_803C200: - push {lr} - lsls r1, 24 - lsrs r1, 24 - bl sub_803C1B4 - ldr r1, _0803C218 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - pop {r1} - bx r1 - .align 2, 0 -_0803C218: .4byte gUnknown_80E80A0 - thumb_func_end sub_803C200 - - thumb_func_start sub_803C21C -sub_803C21C: - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - adds r4, r1, 0 - adds r0, r6, 0x4 - ldrb r1, [r6, 0x1] - bl sub_803C1D0 - lsls r0, 24 - lsrs r2, r0, 24 - movs r0, 0 - str r0, [r4, 0x18] - movs r3, 0 - movs r1, 0x2 - adds r0, r4, 0 - adds r0, 0x1E -_0803C23E: - strb r3, [r0] - subs r0, 0x1 - subs r1, 0x1 - cmp r1, 0 - bge _0803C23E - adds r0, r4, 0 - adds r0, 0x20 - movs r1, 0 - strb r1, [r0] - movs r1, 0xA - strb r1, [r4, 0x1F] - ldrb r1, [r6, 0x11] - adds r3, r0, 0 - cmp r1, 0x9 - bhi _0803C354 - lsls r0, r1, 2 - ldr r1, _0803C268 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0803C268: .4byte _0803C26C - .align 2, 0 -_0803C26C: - .4byte _0803C294 - .4byte _0803C2A2 - .4byte _0803C2B4 - .4byte _0803C2BE - .4byte _0803C354 - .4byte _0803C2E0 - .4byte _0803C2EE - .4byte _0803C300 - .4byte _0803C30A - .4byte _0803C34A -_0803C294: - movs r0, 0 - strb r0, [r4, 0x16] - adds r1, r2, 0x1 - movs r0, 0x64 - muls r0, r1 - str r0, [r4, 0x18] - b _0803C358 -_0803C2A2: - movs r0, 0x1 - strb r0, [r4, 0x16] - adds r1, r2, 0x1 - movs r0, 0x64 - muls r0, r1 - str r0, [r4, 0x18] - ldrb r0, [r6, 0x12] - strb r0, [r4, 0x1C] - b _0803C358 -_0803C2B4: - movs r0, 0x2 - strb r0, [r4, 0x16] - ldrb r0, [r6, 0x12] - strb r0, [r4, 0x1C] - b _0803C358 -_0803C2BE: - movs r0, 0x3 - strb r0, [r4, 0x16] - ldrb r0, [r6, 0x12] - strb r0, [r4, 0x1C] - adds r5, r6, 0x4 - adds r7, r4, 0 - adds r7, 0x1D -_0803C2CC: - ldrb r1, [r6, 0x1] - adds r0, r5, 0 - adds r2, r7, 0 - bl sub_803C37C - ldrb r0, [r4, 0x1C] - ldrb r1, [r4, 0x1D] - cmp r0, r1 - beq _0803C2CC - b _0803C35A -_0803C2E0: - movs r0, 0 - strb r0, [r4, 0x16] - adds r1, r2, 0x1 - movs r0, 0xC8 - muls r0, r1 - str r0, [r4, 0x18] - b _0803C358 -_0803C2EE: - movs r0, 0x1 - strb r0, [r4, 0x16] - adds r1, r2, 0x1 - movs r0, 0xC8 - muls r0, r1 - str r0, [r4, 0x18] - ldrb r0, [r6, 0x12] - strb r0, [r4, 0x1C] - b _0803C358 -_0803C300: - movs r0, 0x2 - strb r0, [r4, 0x16] - ldrb r0, [r6, 0x12] - strb r0, [r4, 0x1C] - b _0803C358 -_0803C30A: - movs r0, 0x3 - strb r0, [r4, 0x16] - ldrb r0, [r6, 0x12] - strb r0, [r4, 0x1C] - adds r5, r6, 0x4 - adds r7, r4, 0 - adds r7, 0x1D - movs r0, 0x1E - adds r0, r4 - mov r8, r0 -_0803C31E: - ldrb r1, [r6, 0x1] - adds r0, r5, 0 - adds r2, r7, 0 - bl sub_803C37C - ldrb r0, [r4, 0x1C] - ldrb r1, [r4, 0x1D] - cmp r0, r1 - beq _0803C31E -_0803C330: - ldrb r1, [r6, 0x1] - adds r0, r5, 0 - mov r2, r8 - bl sub_803C37C - ldrb r0, [r4, 0x1C] - ldrb r1, [r4, 0x1E] - cmp r0, r1 - beq _0803C330 - ldrb r0, [r4, 0x1D] - cmp r0, r1 - beq _0803C330 - b _0803C35A -_0803C34A: - movs r0, 0x4 - strb r0, [r4, 0x16] - ldrb r0, [r6, 0x13] - strb r0, [r3] - b _0803C358 -_0803C354: - movs r0, 0x5 - strb r0, [r4, 0x16] -_0803C358: - adds r5, r6, 0x4 -_0803C35A: - movs r0, 0xC - ldrsh r1, [r6, r0] - adds r0, r4, 0 - bl sub_808D8E0 - ldrh r0, [r6, 0xC] - strh r0, [r4, 0x14] - ldrb r1, [r6, 0x1] - adds r0, r5, 0 - bl sub_803C200 - str r0, [r4, 0x24] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_803C21C - - thumb_func_start sub_803C37C -sub_803C37C: - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - mov r8, r2 - lsls r1, 24 - lsrs r1, 24 - bl sub_803C1B4 - adds r7, r0, 0 - adds r0, r6, 0 - adds r1, r7, 0 - bl sub_8090910 -_0803C398: - movs r5, 0 - adds r0, r6, 0 - adds r1, r7, 0 - bl sub_8090910 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xEA - bne _0803C3BA - movs r0, 0 - movs r1, 0x47 - movs r2, 0x1 - bl sub_8001784 - negs r1, r0 - orrs r1, r0 - lsrs r5, r1, 31 -_0803C3BA: - cmp r4, 0xEB - bne _0803C3CE - movs r0, 0 - movs r1, 0x47 - movs r2, 0 - bl sub_8001784 - cmp r0, 0 - beq _0803C3CE - movs r5, 0x1 -_0803C3CE: - cmp r5, 0 - bne _0803C398 - mov r0, r8 - strb r4, [r0] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_803C37C - - thumb_func_start sub_803C3E0 -sub_803C3E0: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x54 - adds r7, r0, 0 - movs r6, 0 - ldr r5, _0803C42C - movs r4, 0 - mov r8, sp -_0803C3F2: - movs r1, 0 - ldrsh r0, [r5, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C41A - movs r1, 0x2 - ldrsh r0, [r5, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C41A - mov r0, r8 - adds r0, 0x4 - mov r8, r0 - subs r0, 0x4 - stm r0!, {r4} - adds r6, 0x1 -_0803C41A: - adds r5, 0x8 - adds r4, 0x1 - cmp r4, 0x14 - ble _0803C3F2 - ldr r5, _0803C42C - cmp r6, 0 - bne _0803C430 - movs r0, 0 - b _0803C44E - .align 2, 0 -_0803C42C: .4byte gUnknown_80E9920 -_0803C430: - adds r0, r6, 0 - bl RandomCapped - lsls r0, 2 - add r0, sp - ldr r4, [r0] - lsls r0, r4, 3 - adds r5, r0, r5 - ldrh r0, [r5] - strh r0, [r7, 0xC] - ldrh r0, [r5, 0x2] - strh r0, [r7, 0xE] - movs r0, 0x7 - strb r0, [r7, 0x2] - movs r0, 0x1 -_0803C44E: - add sp, 0x54 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_803C3E0 - - thumb_func_start sub_803C45C -sub_803C45C: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xB4 - adds r7, r0, 0 - movs r6, 0 - ldr r5, _0803C4CC - movs r4, 0 - mov r8, sp -_0803C46E: - movs r1, 0 - ldrsh r0, [r5, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C496 - movs r1, 0x2 - ldrsh r0, [r5, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C496 - mov r0, r8 - adds r0, 0x4 - mov r8, r0 - subs r0, 0x4 - stm r0!, {r4} - adds r6, 0x1 -_0803C496: - adds r5, 0xC - adds r4, 0x1 - cmp r4, 0x2C - ble _0803C46E - ldr r5, _0803C4CC - cmp r6, 0 - beq _0803C4E0 - adds r0, r6, 0 - bl RandomCapped - lsls r0, 2 - add r0, sp - ldr r4, [r0] - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r5, r0, r5 - bl Random - movs r1, 0x10 - ands r1, r0 - cmp r1, 0 - beq _0803C4D0 - ldrh r0, [r5] - strh r0, [r7, 0xC] - ldrh r0, [r5, 0x2] - b _0803C4D6 - .align 2, 0 -_0803C4CC: .4byte gUnknown_80E9F8C -_0803C4D0: - ldrh r0, [r5, 0x2] - strh r0, [r7, 0xC] - ldrh r0, [r5] -_0803C4D6: - strh r0, [r7, 0xE] - movs r0, 0x8 - strb r0, [r7, 0x2] - movs r0, 0x1 - b _0803C4E2 -_0803C4E0: - movs r0, 0 -_0803C4E2: - add sp, 0xB4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_803C45C - - thumb_func_start sub_803C4F0 -sub_803C4F0: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x18 - adds r7, r0, 0 - movs r6, 0 - ldr r5, _0803C55C - movs r4, 0 - mov r8, sp -_0803C502: - movs r1, 0 - ldrsh r0, [r5, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C52A - movs r1, 0x2 - ldrsh r0, [r5, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C52A - mov r0, r8 - adds r0, 0x4 - mov r8, r0 - subs r0, 0x4 - stm r0!, {r4} - adds r6, 0x1 -_0803C52A: - adds r5, 0x4 - adds r4, 0x1 - cmp r4, 0x5 - ble _0803C502 - ldr r5, _0803C55C - cmp r6, 0 - beq _0803C570 - adds r0, r6, 0 - bl RandomCapped - lsls r0, 2 - add r0, sp - ldr r4, [r0] - lsls r0, r4, 2 - adds r5, r0, r5 - bl Random - movs r1, 0x10 - ands r1, r0 - cmp r1, 0 - beq _0803C560 - ldrh r0, [r5] - strh r0, [r7, 0xC] - ldrh r0, [r5, 0x2] - b _0803C566 - .align 2, 0 -_0803C55C: .4byte gUnknown_80E8168 -_0803C560: - ldrh r0, [r5, 0x2] - strh r0, [r7, 0xC] - ldrh r0, [r5] -_0803C566: - strh r0, [r7, 0xE] - movs r0, 0x9 - strb r0, [r7, 0x2] - movs r0, 0x1 - b _0803C572 -_0803C570: - movs r0, 0 -_0803C572: - add sp, 0x18 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_803C4F0 - - thumb_func_start sub_803C580 -sub_803C580: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x54 - adds r6, r0, 0 - movs r7, 0 - ldr r5, _0803C5D8 - movs r0, 0x6 - bl sub_80023E4 - lsls r0, 24 - cmp r0, 0 - beq _0803C5D2 - movs r4, 0 - mov r8, sp -_0803C59E: - movs r1, 0 - ldrsh r0, [r5, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C5C6 - ldrb r0, [r6, 0x4] - ldrb r1, [r5, 0x2] - bl sub_8091E60 - lsls r0, 24 - cmp r0, 0 - beq _0803C5C6 - mov r0, r8 - adds r0, 0x4 - mov r8, r0 - subs r0, 0x4 - stm r0!, {r4} - adds r7, 0x1 -_0803C5C6: - adds r5, 0x4 - adds r4, 0x1 - cmp r4, 0x14 - ble _0803C59E - cmp r7, 0 - bne _0803C5DC -_0803C5D2: - movs r0, 0 - b _0803C600 - .align 2, 0 -_0803C5D8: .4byte gUnknown_80E8180 -_0803C5DC: - adds r0, r7, 0 - bl RandomCapped - lsls r0, 2 - add r0, sp - ldr r4, [r0] - lsls r1, r4, 2 - ldr r0, _0803C60C - adds r5, r1, r0 - ldrh r0, [r5] - strh r0, [r6, 0xC] - ldrh r0, [r5] - strh r0, [r6, 0xE] - ldrb r0, [r5, 0x2] - strb r0, [r6, 0x10] - movs r0, 0x5 - strb r0, [r6, 0x2] - movs r0, 0x1 -_0803C600: - add sp, 0x54 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0803C60C: .4byte gUnknown_80E8180 - thumb_func_end sub_803C580 - - thumb_func_start sub_803C610 -sub_803C610: - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r4, _0803C660 - add sp, r4 - adds r6, r0, 0 - movs r7, 0 - ldr r4, _0803C664 - movs r5, 0 - mov r8, sp -_0803C624: - movs r1, 0 - ldrsh r0, [r4, r1] - bl sub_803C110 - lsls r0, 24 - cmp r0, 0 - beq _0803C64C - ldrb r0, [r6, 0x4] - ldrb r1, [r4, 0x2] - bl sub_8091E60 - lsls r0, 24 - cmp r0, 0 - beq _0803C64C - mov r0, r8 - adds r0, 0x4 - mov r8, r0 - subs r0, 0x4 - stm r0!, {r5} - adds r7, 0x1 -_0803C64C: - adds r4, 0x4 - adds r5, 0x1 - ldr r0, _0803C668 - cmp r5, r0 - ble _0803C624 - cmp r7, 0 - bne _0803C66C - movs r0, 0 - b _0803C690 - .align 2, 0 -_0803C660: .4byte 0xfffff9f8 -_0803C664: .4byte gUnknown_80E81D4 -_0803C668: .4byte 0x00000181 -_0803C66C: - adds r0, r7, 0 - bl RandomCapped - lsls r0, 2 - add r0, sp - ldr r5, [r0] - lsls r1, r5, 2 - ldr r0, _0803C6A0 - adds r4, r1, r0 - ldrh r0, [r4] - strh r0, [r6, 0xC] - ldrh r0, [r4] - strh r0, [r6, 0xE] - ldrb r0, [r4, 0x2] - strb r0, [r6, 0x10] - movs r0, 0x6 - strb r0, [r6, 0x2] - movs r0, 0x1 -_0803C690: - movs r3, 0xC1 - lsls r3, 3 - add sp, r3 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0803C6A0: .4byte gUnknown_80E81D4 - thumb_func_end sub_803C610 - - thumb_func_start sub_803C6A4 -sub_803C6A4: - push {r4,lr} - ldr r4, _0803C6CC - movs r0, 0xC0 - movs r1, 0x8 - bl MemoryAlloc - str r0, [r4] - adds r0, 0xB4 - bl sub_801317C - bl sub_803C6D0 - movs r0, 0x1 - bl sub_8099690 - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0803C6CC: .4byte gUnknown_203B400 - thumb_func_end sub_803C6A4 - - thumb_func_start sub_803C6D0 -sub_803C6D0: - push {r4,r5,lr} - ldr r4, _0803C72C - ldr r0, [r4] - adds r0, 0x4 - bl sub_8001024 - ldr r1, [r4] - movs r0, 0 - str r0, [r1] - str r0, [r1, 0x34] - str r0, [r1, 0x38] - movs r2, 0 - movs r5, 0 - adds r3, r4, 0 -_0803C6EC: - ldr r0, [r4] - lsls r1, r2, 2 - adds r0, 0x44 - adds r0, r1 - str r5, [r0] - adds r2, 0x1 - cmp r2, 0xC - ble _0803C6EC - ldr r1, [r3] - movs r0, 0 - str r0, [r1, 0x3C] - movs r2, 0 - adds r4, r3, 0 - movs r1, 0 -_0803C708: - ldr r0, [r4] - adds r0, 0x78 - adds r0, r2 - strb r1, [r0] - adds r2, 0x1 - cmp r2, 0x36 - ble _0803C708 - ldr r0, [r3] - adds r0, 0x40 - movs r1, 0 - strb r1, [r0] - ldr r0, [r3] - adds r0, 0xB0 - str r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0803C72C: .4byte gUnknown_203B400 - thumb_func_end sub_803C6D0 - - thumb_func_start sub_803C730 -sub_803C730: - push {r4,r5,lr} - ldr r0, _0803C750 - ldr r1, [r0] - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - ldr r0, [r1, 0x34] - cmp r0, 0xF - bls _0803C744 - b _0803C848 -_0803C744: - lsls r0, 2 - ldr r1, _0803C754 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0803C750: .4byte gUnknown_203B400 -_0803C754: .4byte _0803C758 - .align 2, 0 -_0803C758: - .4byte _0803C798 - .4byte _0803C79E - .4byte _0803C7A4 - .4byte _0803C7AA - .4byte _0803C7B0 - .4byte _0803C7B6 - .4byte _0803C7BC - .4byte _0803C7C2 - .4byte _0803C7C8 - .4byte _0803C7CE - .4byte _0803C7D4 - .4byte _0803C7DA - .4byte _0803C7E0 - .4byte _0803C7E6 - .4byte _0803C7EC - .4byte _0803C7F2 -_0803C798: - bl sub_803C870 - b _0803C848 -_0803C79E: - bl sub_803C908 - b _0803C848 -_0803C7A4: - bl sub_803C920 - b _0803C848 -_0803C7AA: - bl sub_803C98C - b _0803C848 -_0803C7B0: - bl sub_803C9D8 - b _0803C848 -_0803C7B6: - bl sub_803CA54 - b _0803C848 -_0803C7BC: - bl sub_803CA8C - b _0803C848 -_0803C7C2: - bl sub_803CAAC - b _0803C848 -_0803C7C8: - bl sub_803CAD4 - b _0803C848 -_0803C7CE: - bl sub_803CAF4 - b _0803C848 -_0803C7D4: - bl sub_803CB14 - b _0803C848 -_0803C7DA: - bl sub_803CB5C - b _0803C848 -_0803C7E0: - bl sub_803CB7C - b _0803C848 -_0803C7E6: - bl sub_803CBB0 - b _0803C848 -_0803C7EC: - bl sub_803CBE4 - b _0803C848 -_0803C7F2: - bl Random - ldr r4, _0803C844 - ldr r1, [r4] - ldr r1, [r1] - adds r5, r0, 0 - muls r5, r1 - bl Random - bl sub_8094D28 - movs r1, 0 - ldr r0, [r4] - adds r2, r0, 0 - adds r2, 0x44 -_0803C810: - ldm r2!, {r0} - adds r0, r1 - adds r0, 0x3 - muls r5, r0 - adds r1, 0x1 - cmp r1, 0xC - ble _0803C810 - bl sub_8094E4C - adds r5, r0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _0803C838 - adds r4, r5, 0 -_0803C82E: - bl sub_8094E4C - adds r5, r0 - cmp r5, r4 - beq _0803C82E -_0803C838: - adds r0, r5, 0 - bl sub_8011C40 - movs r0, 0x3 - b _0803C84A - .align 2, 0 -_0803C844: .4byte gUnknown_203B400 -_0803C848: - movs r0, 0 -_0803C84A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_803C730 - - thumb_func_start sub_803C850 -sub_803C850: - push {r4,lr} - ldr r4, _0803C86C - ldr r0, [r4] - adds r0, 0x4 - bl sub_8001044 - ldr r0, [r4] - bl MemoryFree - movs r0, 0 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0803C86C: .4byte gUnknown_203B400 - thumb_func_end sub_803C850 + .text thumb_func_start sub_803C870 sub_803C870: @@ -1131,7 +253,7 @@ _0803CA1A: adds r1, r2 ldrh r0, [r1] strh r0, [r3, 0x8] - bl sub_803CC40 + bl PrintPersonalityTypeDescription ldr r1, [r6] movs r0, 0x5 str r0, [r1, 0x34] @@ -1407,8 +529,8 @@ _0803CC38: .4byte gPersonalityQuestionPointerTable _0803CC3C: .4byte gUnknown_203B400 thumb_func_end sub_803CC04 - thumb_func_start sub_803CC40 -sub_803CC40: + thumb_func_start PrintPersonalityTypeDescription +PrintPersonalityTypeDescription: push {r4,lr} ldr r0, _0803CC70 ldr r4, _0803CC74 @@ -1435,7 +557,7 @@ _0803CC70: .4byte gUnknown_202DF98 _0803CC74: .4byte gUnknown_203B400 _0803CC78: .4byte gPersonalityTypeDescriptionTable _0803CC7C: .4byte 0x00000101 - thumb_func_end sub_803CC40 + thumb_func_end PrintPersonalityTypeDescription thumb_func_start sub_803CC80 sub_803CC80: @@ -1564,7 +686,7 @@ sub_803CD08: bl sub_800641C ldr r4, [r5] adds r4, 0x18 - bl sub_803D030 + bl GetValidPartners adds r1, r0, 0 ldr r0, [r5] ldr r3, [r0, 0x4C] @@ -1650,7 +772,7 @@ sub_803CE34: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl sub_803D030 + bl GetValidPartners adds r1, r0, 0 ldr r5, _0803CE68 ldr r0, [r5] @@ -1896,91 +1018,4 @@ _0803CFF0: _0803D02C: .4byte gUnknown_203B404 thumb_func_end sub_803CFC0 - thumb_func_start sub_803D030 -sub_803D030: - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r0, 0 - mov r8, r0 - ldr r4, _0803D0D0 - ldr r0, [r4] - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0 - bl GetPokemonType - mov r1, sp - strb r0, [r1] - ldr r0, [r4] - movs r2, 0 - ldrsh r0, [r0, r2] - movs r1, 0x1 - bl GetPokemonType - mov r1, sp - strb r0, [r1, 0x1] - movs r7, 0 - add r6, sp, 0x4 - mov r5, sp -_0803D064: - ldr r0, _0803D0D4 - lsls r1, r7, 1 - adds r1, r0 - movs r0, 0 - ldrsh r4, [r1, r0] - adds r0, r4, 0 - movs r1, 0 - bl GetPokemonType - strb r0, [r6] - adds r0, r4, 0 - movs r1, 0x1 - bl GetPokemonType - adds r2, r0, 0 - strb r2, [r6, 0x1] - ldrb r1, [r6] - cmp r1, 0 - beq _0803D096 - ldrb r0, [r5] - cmp r1, r0 - beq _0803D0BC - ldrb r0, [r5, 0x1] - cmp r1, r0 - beq _0803D0BC -_0803D096: - lsls r0, r2, 24 - lsrs r1, r0, 24 - cmp r1, 0 - beq _0803D0AA - ldrb r2, [r5] - cmp r1, r2 - beq _0803D0BC - ldrb r0, [r5, 0x1] - cmp r1, r0 - beq _0803D0BC -_0803D0AA: - ldr r0, _0803D0D0 - ldr r0, [r0] - mov r2, r8 - lsls r1, r2, 1 - adds r0, 0x2 - adds r0, r1 - strh r4, [r0] - movs r0, 0x1 - add r8, r0 -_0803D0BC: - adds r7, 0x1 - cmp r7, 0x9 - ble _0803D064 - mov r0, r8 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0803D0D0: .4byte gUnknown_203B404 -_0803D0D4: .4byte gPartners - thumb_func_end sub_803D030 - .align 2,0 diff --git a/asm/wonder_mail.s b/asm/wonder_mail.s index 352d41c..ba61bb1 100644 --- a/asm/wonder_mail.s +++ b/asm/wonder_mail.s @@ -16778,7 +16778,7 @@ sub_8031F60: adds r3, r5, 0 bl sub_8013818 bl sub_8032084 - bl sub_80320F8 + bl DisplayAdventureLog movs r0, 0x1 pop {r4-r6} pop {r1} @@ -16830,7 +16830,7 @@ _0803201A: b _08032034 _0803202A: bl sub_8032084 - bl sub_80320F8 + bl DisplayAdventureLog movs r0, 0x1 _08032034: pop {r4} @@ -16933,8 +16933,8 @@ sub_8032084: _080320F4: .4byte gUnknown_203B338 thumb_func_end sub_8032084 - thumb_func_start sub_80320F8 -sub_80320F8: + thumb_func_start DisplayAdventureLog +DisplayAdventureLog: push {r4-r7,lr} sub sp, 0x8 ldr r5, _08032158 @@ -17053,7 +17053,7 @@ _080321EC: bl sub_8013800 adds r5, r0, 0 adds r0, r6, 0 - bl sub_8097738 + bl GetAdventureLogLine adds r2, r0, 0 ldr r0, [r4] ldr r3, [r0, 0x34] @@ -17097,7 +17097,7 @@ _0803223A: .align 2, 0 _08032254: .4byte gUnknown_80E2030 _08032258: .4byte gUnknown_203B338 - thumb_func_end sub_80320F8 + thumb_func_end DisplayAdventureLog thumb_func_start sub_803225C sub_803225C: |