diff options
Diffstat (limited to 'asm/pokenav.s')
| -rw-r--r-- | asm/pokenav.s | 102 |
1 files changed, 21 insertions, 81 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index 968386bd1..757a2a5a2 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -9571,7 +9571,7 @@ _080F088C: bne _080F08C6 _080F089A: movs r0, 0x9 - bl sub_8053108 + bl GetGameStat adds r1, r0, 0 ldr r0, _080F08E0 @ =0x0001869f cmp r1, r0 @@ -12455,7 +12455,7 @@ _080F1F4A: movs r1, 0x3 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, _080F1FB0 @ =gUnknown_083E4450 + ldr r0, _080F1FB0 @ =gSpriteAffineAnimTable_83E4450 str r0, [r4, 0x10] adds r0, r4, 0 bl InitSpriteAffineAnim @@ -12489,7 +12489,7 @@ _080F1F4A: b _080F1FE4 .align 2, 0 _080F1FAC: .4byte 0x00006dad -_080F1FB0: .4byte gUnknown_083E4450 +_080F1FB0: .4byte gSpriteAffineAnimTable_83E4450 _080F1FB4: .4byte sub_80F2240 _080F1FB8: .4byte gUnknown_083DFEC4 _080F1FBC: .4byte 0x0000030f @@ -17339,7 +17339,7 @@ _080F44FC: lsls r1, r2, 2 adds r1, r2 lsls r1, 4 - ldr r2, _080F451C @ =gUnknown_020300A4 + ldr r2, _080F451C @ =gPokemonStorage + 0x4 adds r1, r2 adds r0, r1 adds r1, r4, 0 @@ -17347,7 +17347,7 @@ _080F44FC: bl GetBoxMonData b _080F453C .align 2, 0 -_080F451C: .4byte gUnknown_020300A4 +_080F451C: .4byte gPokemonStorage + 0x4 _080F4520: lsls r1, r0, 2 adds r1, r0 @@ -17357,7 +17357,7 @@ _080F4520: lsls r1, r2, 2 adds r1, r2 lsls r1, 4 - ldr r2, _080F4544 @ =gUnknown_020300A4 + ldr r2, _080F4544 @ =gPokemonStorage + 0x4 adds r1, r2 adds r0, r1 adds r1, r4, 0 @@ -17367,7 +17367,7 @@ _080F453C: pop {r1} bx r1 .align 2, 0 -_080F4544: .4byte gUnknown_020300A4 +_080F4544: .4byte gPokemonStorage + 0x4 thumb_func_end sub_80F44B0 thumb_func_start sub_80F4548 @@ -17401,7 +17401,7 @@ _080F4574: lsls r1, r4, 2 adds r1, r4 lsls r1, 4 - ldr r2, _080F459C @ =gUnknown_020300A4 + ldr r2, _080F459C @ =gPokemonStorage + 0x4 adds r1, r2 adds r0, r1 movs r1, 0x8 @@ -17413,7 +17413,7 @@ _080F4592: pop {r0} bx r0 .align 2, 0 -_080F459C: .4byte gUnknown_020300A4 +_080F459C: .4byte gPokemonStorage + 0x4 thumb_func_end sub_80F4548 thumb_func_start sub_80F45A0 @@ -17472,7 +17472,7 @@ _080F4608: adds r0, r5, r0 lsls r1, r2, 3 adds r1, r2 - ldr r2, _080F4638 @ =gUnknown_020383E4 + ldr r2, _080F4638 @ =gPokemonStorage + 0x8344 adds r1, r2 movs r2, 0x40 movs r3, 0 @@ -17488,7 +17488,7 @@ _080F4624: b _080F4676 .align 2, 0 _080F4634: .4byte 0x000088e9 -_080F4638: .4byte gUnknown_020383E4 +_080F4638: .4byte gPokemonStorage + 0x8344 _080F463C: .4byte gUnknown_083DFEC4 _080F4640: .4byte 0x00008937 _080F4644: @@ -17783,7 +17783,7 @@ sub_80F4824: @ 80F4824 str r5, [sp, 0x4] str r4, [sp, 0x8] movs r2, 0x1 - bl sub_800D334 + bl HandleLoadSpecialPokePic adds r0, r5, 0 mov r1, r8 adds r2, r4, 0 @@ -18432,7 +18432,7 @@ _080F4DAA: ldr r0, _080F4EA4 @ =0x000087d8 adds r0, r4 mov r9, r0 - ldr r1, _080F4EA8 @ =gUnknown_020300A4 + ldr r1, _080F4EA8 @ =gPokemonStorage + 0x4 mov r8, r1 _080F4DCA: ldrb r0, [r6] @@ -18541,7 +18541,7 @@ _080F4E98: .4byte gUnknown_083DFEC4 _080F4E9C: .4byte 0x00008fe6 _080F4EA0: .4byte 0x00008fe7 _080F4EA4: .4byte 0x000087d8 -_080F4EA8: .4byte gUnknown_020300A4 +_080F4EA8: .4byte gPokemonStorage + 0x4 _080F4EAC: .4byte 0xffff00ff _080F4EB0: .4byte 0xffe0ffff _080F4EB4: .4byte 0xffffff00 @@ -21141,7 +21141,7 @@ _080F6278: adds r5, r7, r1 ldr r0, _080F6310 @ =0x00008fe7 adds r4, r7, r0 - ldr r1, _080F6314 @ =gUnknown_020300A4 + ldr r1, _080F6314 @ =gPokemonStorage + 0x4 mov r8, r1 ldr r0, _080F6318 @ =0x000041a0 add r0, r8 @@ -21205,7 +21205,7 @@ _080F62FE: .align 2, 0 _080F630C: .4byte 0x00008fe6 _080F6310: .4byte 0x00008fe7 -_080F6314: .4byte gUnknown_020300A4 +_080F6314: .4byte gPokemonStorage + 0x4 _080F6318: .4byte 0x000041a0 _080F631C: movs r0, 0 @@ -21336,7 +21336,7 @@ _080F63FC: lsls r1, r2, 2 adds r1, r2 lsls r1, 4 - ldr r2, _080F6488 @ =gUnknown_020300A4 + ldr r2, _080F6488 @ =gPokemonStorage + 0x4 adds r1, r2 adds r0, r1 movs r1, 0x51 @@ -21393,7 +21393,7 @@ _080F646E: _080F647C: .4byte gUnknown_083DFEC4 _080F6480: .4byte 0x00008fe6 _080F6484: .4byte 0x00008fe7 -_080F6488: .4byte gUnknown_020300A4 +_080F6488: .4byte gPokemonStorage + 0x4 _080F648C: .4byte 0xffff00ff _080F6490: .4byte 0xffe0ffff _080F6494: .4byte 0xffffff00 @@ -21544,7 +21544,7 @@ _080F65B4: lsls r1, r7, 2 adds r1, r7 lsls r1, 4 - ldr r2, _080F6620 @ =gUnknown_020300A4 + ldr r2, _080F6620 @ =gPokemonStorage + 0x4 adds r1, r2 adds r0, r1 bl GetLevelFromBoxMonExp @@ -21587,7 +21587,7 @@ _080F65FC: beq _080F663C b _080F6656 .align 2, 0 -_080F6620: .4byte gUnknown_020300A4 +_080F6620: .4byte gPokemonStorage + 0x4 _080F6624: strb r1, [r5] movs r0, 0x1 @@ -22849,67 +22849,7 @@ sub_80F6FFC: @ 80F6FFC _080F7008: .4byte REG_BLDCNT thumb_func_end sub_80F6FFC - thumb_func_start sub_80F700C -sub_80F700C: @ 80F700C - push {r4,r5,lr} - lsls r1, 16 - lsrs r1, 16 - ldr r2, _080F7078 @ =gUnknown_083DFEC4 - ldr r4, [r2] - lsls r2, r1, 3 - adds r2, r4, r2 - ldr r3, _080F707C @ =0x0000cee8 - adds r2, r3 - ldrh r3, [r2] - lsls r2, r3, 2 - adds r2, r3 - lsls r2, 3 - ldr r3, _080F7080 @ =gTrainers - adds r5, r2, r3 - adds r3, r0, 0 - ldr r0, _080F7084 @ =0x0000d158 - adds r4, r0 - ldrh r4, [r4] - cmp r1, r4 - bcs _080F7060 - ldrb r1, [r5, 0x1] - movs r0, 0xD - muls r1, r0 - ldr r0, _080F7088 @ =gTrainerClassNames - adds r1, r0 - adds r0, r3, 0 - bl StringCopy - adds r3, r0, 0 - movs r0, 0xFC - strb r0, [r3] - movs r0, 0x13 - strb r0, [r3, 0x1] - movs r0, 0x4B - strb r0, [r3, 0x2] - adds r3, 0x3 - adds r1, r5, 0x4 - adds r0, r3, 0 - bl StringCopy - adds r3, r0, 0 -_080F7060: - movs r0, 0xFC - strb r0, [r3] - movs r0, 0x13 - strb r0, [r3, 0x1] - movs r0, 0x80 - strb r0, [r3, 0x2] - movs r0, 0xFF - strb r0, [r3, 0x3] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F7078: .4byte gUnknown_083DFEC4 -_080F707C: .4byte 0x0000cee8 -_080F7080: .4byte gTrainers -_080F7084: .4byte 0x0000d158 -_080F7088: .4byte gTrainerClassNames - thumb_func_end sub_80F700C +.section .text_80F708C thumb_func_start sub_80F708C sub_80F708C: @ 80F708C |