diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 10:25:55 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-06 08:16:13 -0500 |
| commit | fc05a87ac0cf53539a19cd806468ac518e1913a7 (patch) | |
| tree | 0b3cb06ccb4244f9e8b43af1f3d42e24fe46e499 | |
| parent | 79eeb2d704c87c8460c2d05668415b3a99b97bf5 (diff) | |
sub_80F6DB8; some struct docs
| -rw-r--r-- | asm/pokenav.s | 196 | ||||
| -rw-r--r-- | asm/trainers_eye.s | 55 | ||||
| -rw-r--r-- | include/pokenav.h | 22 | ||||
| -rw-r--r-- | src/pokenav.c | 2 | ||||
| -rw-r--r-- | src/pokenav_after.c | 6 | ||||
| -rw-r--r-- | src/pokenav_before.c | 1556 | ||||
| -rw-r--r-- | src/trainers_eye.c | 46 | ||||
| -rw-r--r-- | src/use_pokeblock.c | 48 |
8 files changed, 953 insertions, 978 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index 0cfce4615..368dfe40e 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -149,7 +149,7 @@ _080F5772: cmp r4, r10 ble _080F5772 _080F5798: - ldr r1, _080F57DC @ =gUnknown_083DFEC4 + ldr r1, _080F57DC @ =gPokenavStructPtr ldr r0, [r1] ldr r2, [sp, 0x4] adds r1, r2, r5 @@ -185,7 +185,7 @@ _080F57D4: b _080F58C4 .align 2, 0 _080F57D8: .4byte 0x00026bff -_080F57DC: .4byte gUnknown_083DFEC4 +_080F57DC: .4byte gPokenavStructPtr _080F57E0: .4byte 0x00009340 _080F57E4: ldr r1, [sp, 0x8] @@ -238,7 +238,7 @@ _080F5838: movs r0, 0x9B strh r0, [r3] _080F5842: - ldr r2, _080F5888 @ =gUnknown_083DFEC4 + ldr r2, _080F5888 @ =gPokenavStructPtr ldr r0, [r2] ldr r3, [sp, 0x4] adds r1, r3, r5 @@ -274,10 +274,10 @@ _080F587E: b _080F58C4 .align 2, 0 _080F5884: .4byte 0x00026bff -_080F5888: .4byte gUnknown_083DFEC4 +_080F5888: .4byte gPokenavStructPtr _080F588C: .4byte 0x00009340 _080F5890: - ldr r0, _080F58BC @ =gUnknown_083DFEC4 + ldr r0, _080F58BC @ =gPokenavStructPtr ldr r0, [r0] ldr r1, _080F58C0 @ =0x00009340 adds r0, r1 @@ -299,7 +299,7 @@ _080F5890: strh r0, [r7, 0x2] b _080F58CC .align 2, 0 -_080F58BC: .4byte gUnknown_083DFEC4 +_080F58BC: .4byte gPokenavStructPtr _080F58C0: .4byte 0x00009340 _080F58C4: add r0, r12 @@ -330,7 +330,7 @@ sub_80F58DC: @ 80F58DC bcs _080F5914 adds r4, r0, 0 mov r8, r4 - ldr r0, _080F590C @ =gUnknown_083DFEC4 + ldr r0, _080F590C @ =gPokenavStructPtr ldr r0, [r0] ldr r1, _080F5910 @ =0x00009130 adds r0, r1 @@ -343,12 +343,12 @@ sub_80F58DC: @ 80F58DC bl sub_80F5688 b _080F5930 .align 2, 0 -_080F590C: .4byte gUnknown_083DFEC4 +_080F590C: .4byte gPokenavStructPtr _080F5910: .4byte 0x00009130 _080F5914: ldrh r4, [r5, 0x6] mov r8, r4 - ldr r0, _080F5A08 @ =gUnknown_083DFEC4 + ldr r0, _080F5A08 @ =gPokenavStructPtr ldr r0, [r0] ldr r1, _080F5A0C @ =0x00009130 adds r0, r1 @@ -361,7 +361,7 @@ _080F5914: bl sub_80F5688 _080F5930: adds r1, r4, 0 - ldr r0, _080F5A08 @ =gUnknown_083DFEC4 + ldr r0, _080F5A08 @ =gPokenavStructPtr ldr r6, [r0] ldr r0, _080F5A0C @ =0x00009130 adds r4, r6, r0 @@ -410,7 +410,7 @@ _080F5978: bcc _080F5978 _080F5990: ldrh r2, [r5, 0x2] - ldr r0, _080F5A08 @ =gUnknown_083DFEC4 + ldr r0, _080F5A08 @ =gPokenavStructPtr ldr r3, [r0] ldr r4, _080F5A18 @ =0x00009340 adds r1, r3, r4 @@ -474,7 +474,7 @@ _080F59FA: pop {r0} bx r0 .align 2, 0 -_080F5A08: .4byte gUnknown_083DFEC4 +_080F5A08: .4byte gPokenavStructPtr _080F5A0C: .4byte 0x00009130 _080F5A10: .4byte 0x00009238 _080F5A14: .4byte 0x00009132 @@ -493,7 +493,7 @@ sub_80F5A1C: @ 80F5A1C cmp r0, r1 bcs _080F5A54 adds r7, r0, 0 - ldr r0, _080F5A4C @ =gUnknown_083DFEC4 + ldr r0, _080F5A4C @ =gPokenavStructPtr ldr r0, [r0] ldr r2, _080F5A50 @ =0x00009238 adds r0, r2 @@ -507,11 +507,11 @@ sub_80F5A1C: @ 80F5A1C bl sub_80F5688 b _080F5A70 .align 2, 0 -_080F5A4C: .4byte gUnknown_083DFEC4 +_080F5A4C: .4byte gPokenavStructPtr _080F5A50: .4byte 0x00009238 _080F5A54: ldrh r7, [r5, 0x12] - ldr r0, _080F5B28 @ =gUnknown_083DFEC4 + ldr r0, _080F5B28 @ =gPokenavStructPtr ldr r0, [r0] ldr r4, _080F5B2C @ =0x00009238 adds r0, r4 @@ -525,7 +525,7 @@ _080F5A54: bl sub_80F5688 _080F5A70: adds r1, r4, 0 - ldr r0, _080F5B28 @ =gUnknown_083DFEC4 + ldr r0, _080F5B28 @ =gPokenavStructPtr ldr r0, [r0] mov r8, r0 ldr r4, _080F5B2C @ =0x00009238 @@ -559,7 +559,7 @@ _080F5A9A: bcc _080F5A9A _080F5AB2: ldrh r2, [r5, 0x2] - ldr r0, _080F5B28 @ =gUnknown_083DFEC4 + ldr r0, _080F5B28 @ =gPokenavStructPtr ldr r3, [r0] ldr r4, _080F5B34 @ =0x00009340 adds r1, r3, r4 @@ -623,7 +623,7 @@ _080F5B1C: pop {r0} bx r0 .align 2, 0 -_080F5B28: .4byte gUnknown_083DFEC4 +_080F5B28: .4byte gPokenavStructPtr _080F5B2C: .4byte 0x00009238 _080F5B30: .4byte 0x0000923a _080F5B34: .4byte 0x00009340 @@ -631,7 +631,7 @@ _080F5B34: .4byte 0x00009340 thumb_func_start sub_80F5B38 sub_80F5B38: @ 80F5B38 - ldr r0, _080F5B48 @ =gUnknown_083DFEC4 + ldr r0, _080F5B48 @ =gPokenavStructPtr ldr r0, [r0] ldr r1, _080F5B4C @ =0x00009345 adds r0, r1 @@ -639,7 +639,7 @@ sub_80F5B38: @ 80F5B38 strb r1, [r0] bx lr .align 2, 0 -_080F5B48: .4byte gUnknown_083DFEC4 +_080F5B48: .4byte gPokenavStructPtr _080F5B4C: .4byte 0x00009345 thumb_func_end sub_80F5B38 @@ -647,7 +647,7 @@ _080F5B4C: .4byte 0x00009345 sub_80F5B50: @ 80F5B50 push {r4,r5,lr} sub sp, 0xC - ldr r0, _080F5B68 @ =gUnknown_083DFEC4 + ldr r0, _080F5B68 @ =gPokenavStructPtr ldr r0, [r0] ldr r1, _080F5B6C @ =0x00009345 adds r4, r0, r1 @@ -658,7 +658,7 @@ sub_80F5B50: @ 80F5B50 beq _080F5BB4 b _080F5BCC .align 2, 0 -_080F5B68: .4byte gUnknown_083DFEC4 +_080F5B68: .4byte gPokenavStructPtr _080F5B6C: .4byte 0x00009345 _080F5B70: bl ScanlineEffect_Clear @@ -679,7 +679,7 @@ _080F5B82: subs r3, 0x1 cmp r3, 0 bge _080F5B82 - ldr r0, _080F5BAC @ =gUnknown_083DFEC4 + ldr r0, _080F5BAC @ =gPokenavStructPtr ldr r1, [r0] ldr r5, _080F5BB0 @ =0x00009345 adds r1, r5 @@ -690,7 +690,7 @@ _080F5B82: b _080F5BCE .align 2, 0 _080F5BA8: .4byte gScanlineEffectRegBuffers -_080F5BAC: .4byte gUnknown_083DFEC4 +_080F5BAC: .4byte gPokenavStructPtr _080F5BB0: .4byte 0x00009345 _080F5BB4: mov r0, sp @@ -736,7 +736,7 @@ sub_80F5BF0: @ 80F5BF0 mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r0, _080F5CB8 @ =gUnknown_083DFEC4 + ldr r0, _080F5CB8 @ =gPokenavStructPtr ldr r5, [r0] ldr r1, _080F5CBC @ =0x00009344 adds r0, r5, r1 @@ -812,7 +812,7 @@ _080F5C40: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _080F5CB8 @ =gUnknown_083DFEC4 + ldr r0, _080F5CB8 @ =gPokenavStructPtr cmp r6, 0x41 bls _080F5C40 ldr r0, [r0] @@ -830,7 +830,7 @@ _080F5CA6: pop {r0} bx r0 .align 2, 0 -_080F5CB8: .4byte gUnknown_083DFEC4 +_080F5CB8: .4byte gPokenavStructPtr _080F5CBC: .4byte 0x00009344 _080F5CC0: .4byte 0x0000911c _080F5CC4: .4byte gScanlineEffectRegBuffers @@ -851,7 +851,7 @@ sub_80F5CDC: @ 80F5CDC sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080F5DB0 @ =gUnknown_083DFEC4 + ldr r0, _080F5DB0 @ =gPokenavStructPtr ldr r6, [r0] ldr r1, _080F5DB4 @ =0x00009344 adds r0, r6, r1 @@ -932,7 +932,7 @@ _080F5D36: adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _080F5DB0 @ =gUnknown_083DFEC4 + ldr r0, _080F5DB0 @ =gPokenavStructPtr cmp r7, 0x41 bls _080F5D36 ldr r0, [r0] @@ -950,7 +950,7 @@ _080F5DA0: pop {r0} bx r0 .align 2, 0 -_080F5DB0: .4byte gUnknown_083DFEC4 +_080F5DB0: .4byte gPokenavStructPtr _080F5DB4: .4byte 0x00009344 _080F5DB8: .4byte 0x0000911c _080F5DBC: .4byte gScanlineEffectRegBuffers @@ -1008,7 +1008,7 @@ _080F5E1C: thumb_func_start sub_80F5E20 sub_80F5E20: @ 80F5E20 push {r4,r5,lr} - ldr r0, _080F5E38 @ =gUnknown_083DFEC4 + ldr r0, _080F5E38 @ =gPokenavStructPtr ldr r2, [r0] ldr r3, _080F5E3C @ =0x0000876e adds r1, r2, r3 @@ -1020,7 +1020,7 @@ sub_80F5E20: @ 80F5E20 movs r0, 0 b _080F5EC8 .align 2, 0 -_080F5E38: .4byte gUnknown_083DFEC4 +_080F5E38: .4byte gPokenavStructPtr _080F5E3C: .4byte 0x0000876e _080F5E40: ldr r1, _080F5E6C @ =0x000087c9 @@ -1105,7 +1105,7 @@ _080F5EE0: .4byte 0x00008774 thumb_func_start sub_80F5EE4 sub_80F5EE4: @ 80F5EE4 push {r4-r6,lr} - ldr r3, _080F5F04 @ =gUnknown_083DFEC4 + ldr r3, _080F5F04 @ =gPokenavStructPtr ldr r4, [r3] ldr r1, _080F5F08 @ =0x0000876e adds r0, r4, r1 @@ -1121,7 +1121,7 @@ sub_80F5EE4: @ 80F5EE4 movs r0, 0 b _080F5F98 .align 2, 0 -_080F5F04: .4byte gUnknown_083DFEC4 +_080F5F04: .4byte gPokenavStructPtr _080F5F08: .4byte 0x0000876e _080F5F0C: .4byte 0x00008774 _080F5F10: @@ -1207,7 +1207,7 @@ _080F5FB0: .4byte 0x00008774 thumb_func_start sub_80F5FB4 sub_80F5FB4: @ 80F5FB4 push {r4,lr} - ldr r0, _080F5FD8 @ =gUnknown_083DFEC4 + ldr r0, _080F5FD8 @ =gPokenavStructPtr ldr r1, [r0] ldr r2, _080F5FDC @ =0x00008770 adds r0, r1, r2 @@ -1225,7 +1225,7 @@ _080F5FD2: movs r0, 0 b _080F6004 .align 2, 0 -_080F5FD8: .4byte gUnknown_083DFEC4 +_080F5FD8: .4byte gPokenavStructPtr _080F5FDC: .4byte 0x00008770 _080F5FE0: .4byte 0x000087c9 _080F5FE4: @@ -1256,7 +1256,7 @@ _080F600C: .4byte 0x0000fff8 thumb_func_start sub_80F6010 sub_80F6010: @ 80F6010 push {r4-r6,lr} - ldr r0, _080F603C @ =gUnknown_083DFEC4 + ldr r0, _080F603C @ =gPokenavStructPtr ldr r3, [r0] ldr r1, _080F6040 @ =0x00008772 adds r0, r3, r1 @@ -1279,7 +1279,7 @@ _080F6038: movs r0, 0 b _080F606C .align 2, 0 -_080F603C: .4byte gUnknown_083DFEC4 +_080F603C: .4byte gPokenavStructPtr _080F6040: .4byte 0x00008772 _080F6044: .4byte 0x00008774 _080F6048: .4byte 0x000087c9 @@ -1308,7 +1308,7 @@ _080F606C: thumb_func_start sub_80F6074 sub_80F6074: @ 80F6074 push {r4-r7,lr} - ldr r1, _080F6120 @ =gUnknown_083DFEC4 + ldr r1, _080F6120 @ =gPokenavStructPtr ldr r6, [r1] ldr r1, _080F6124 @ =0x00008770 adds r3, r6, r1 @@ -1400,7 +1400,7 @@ _080F611A: pop {r0} bx r0 .align 2, 0 -_080F6120: .4byte gUnknown_083DFEC4 +_080F6120: .4byte gPokenavStructPtr _080F6124: .4byte 0x00008770 _080F6128: .4byte 0x00008774 _080F612C: .4byte 0x00008772 @@ -1410,7 +1410,7 @@ _080F6130: .4byte 0x0000876e thumb_func_start sub_80F6134 sub_80F6134: @ 80F6134 push {r4-r6,lr} - ldr r0, _080F6194 @ =gUnknown_083DFEC4 + ldr r0, _080F6194 @ =gPokenavStructPtr ldr r3, [r0] ldr r1, _080F6198 @ =0x000087c9 adds r0, r3, r1 @@ -1457,7 +1457,7 @@ sub_80F6134: @ 80F6134 strh r0, [r2] b _080F61F4 .align 2, 0 -_080F6194: .4byte gUnknown_083DFEC4 +_080F6194: .4byte gPokenavStructPtr _080F6198: .4byte 0x000087c9 _080F619C: .4byte 0x000087dc _080F61A0: .4byte 0x00008774 @@ -1513,7 +1513,7 @@ _080F6204: .4byte 0x0000876e thumb_func_start sub_80F6208 sub_80F6208: @ 80F6208 push {lr} - ldr r0, _080F623C @ =gUnknown_083DFEC4 + ldr r0, _080F623C @ =gPokenavStructPtr ldr r1, [r0] ldr r2, _080F6240 @ =0x00008fe6 adds r0, r1, r2 @@ -1540,7 +1540,7 @@ _080F6238: pop {r0} bx r0 .align 2, 0 -_080F623C: .4byte gUnknown_083DFEC4 +_080F623C: .4byte gPokenavStructPtr _080F6240: .4byte 0x00008fe6 _080F6244: .4byte 0x00008fe7 _080F6248: .4byte 0x00008fe8 @@ -1553,7 +1553,7 @@ sub_80F6250: @ 80F6250 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _080F6270 @ =gUnknown_083DFEC4 + ldr r0, _080F6270 @ =gPokenavStructPtr ldr r2, [r0] ldr r0, _080F6274 @ =0x00008fe8 adds r3, r2, r0 @@ -1567,7 +1567,7 @@ _080F626C: movs r0, 0 b _080F637E .align 2, 0 -_080F6270: .4byte gUnknown_083DFEC4 +_080F6270: .4byte gPokenavStructPtr _080F6274: .4byte 0x00008fe8 _080F6278: ldr r1, _080F630C @ =0x00008fe6 @@ -1668,14 +1668,14 @@ _080F632A: bl GetMonData cmp r0, 0 beq _080F6324 - ldr r0, _080F6360 @ =gUnknown_083DFEC4 + ldr r0, _080F6360 @ =gPokenavStructPtr ldr r0, [r0] ldr r1, _080F6364 @ =0x00008fe8 adds r0, r1 movs r1, 0x1 strb r1, [r0] _080F634C: - ldr r0, _080F6360 @ =gUnknown_083DFEC4 + ldr r0, _080F6360 @ =gPokenavStructPtr ldr r1, [r0] ldr r0, _080F6368 @ =0x00008fe6 adds r1, r0 @@ -1684,7 +1684,7 @@ _080F634C: b _080F6372 .align 2, 0 _080F635C: .4byte gPlayerParty -_080F6360: .4byte gUnknown_083DFEC4 +_080F6360: .4byte gPokenavStructPtr _080F6364: .4byte 0x00008fe8 _080F6368: .4byte 0x00008fe6 _080F636C: @@ -1710,7 +1710,7 @@ _080F637E: thumb_func_start sub_80F638C sub_80F638C: @ 80F638C push {r4,lr} - ldr r0, _080F63C0 @ =gUnknown_083DFEC4 + ldr r0, _080F63C0 @ =gPokenavStructPtr ldr r4, [r0] ldr r1, _080F63C4 @ =0x00008fe6 adds r0, r4, r1 @@ -1735,7 +1735,7 @@ _080F63B8: pop {r0} bx r0 .align 2, 0 -_080F63C0: .4byte gUnknown_083DFEC4 +_080F63C0: .4byte gPokenavStructPtr _080F63C4: .4byte 0x00008fe6 _080F63C8: .4byte 0x00008fe7 _080F63CC: .4byte 0x00006dac @@ -1745,7 +1745,7 @@ _080F63CC: .4byte 0x00006dac sub_80F63D0: @ 80F63D0 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _080F647C @ =gUnknown_083DFEC4 + ldr r0, _080F647C @ =gPokenavStructPtr ldr r2, [r0] ldr r1, _080F6480 @ =0x00008fe6 adds r0, r2, r1 @@ -1831,7 +1831,7 @@ _080F646E: bls _080F63FC b _080F6508 .align 2, 0 -_080F647C: .4byte gUnknown_083DFEC4 +_080F647C: .4byte gPokenavStructPtr _080F6480: .4byte 0x00008fe6 _080F6484: .4byte 0x00008fe7 _080F6488: .4byte gPokemonStorage + 0x4 @@ -1878,7 +1878,7 @@ _080F64DA: cmp r6, 0x5 bls _080F64A8 bl sub_80F49F4 - ldr r0, _080F6500 @ =gUnknown_083DFEC4 + ldr r0, _080F6500 @ =gPokenavStructPtr ldr r1, [r0] ldr r0, _080F6504 @ =0x00008fe6 adds r1, r0 @@ -1890,7 +1890,7 @@ _080F64F6: b _080F650A .align 2, 0 _080F64FC: .4byte gPlayerParty -_080F6500: .4byte gUnknown_083DFEC4 +_080F6500: .4byte gPokenavStructPtr _080F6504: .4byte 0x00008fe6 _080F6508: movs r0, 0x1 @@ -1917,7 +1917,7 @@ sub_80F6514: @ 80F6514 lsrs r2, 24 str r2, [sp, 0x4] mov r5, r10 - ldr r0, _080F65A4 @ =gUnknown_083DFEC4 + ldr r0, _080F65A4 @ =gPokenavStructPtr ldr r0, [r0] lsls r1, 2 adds r0, r1 @@ -1971,7 +1971,7 @@ _080F655E: bl GetMonGender b _080F65EA .align 2, 0 -_080F65A4: .4byte gUnknown_083DFEC4 +_080F65A4: .4byte gPokenavStructPtr _080F65A8: .4byte 0x0000893d _080F65AC: .4byte 0x0000893e _080F65B0: .4byte gPlayerParty @@ -2091,7 +2091,7 @@ _080F6656: ldr r0, [sp, 0x4] cmp r0, 0x1 bne _080F66C0 - ldr r0, _080F66B8 @ =gUnknown_083DFEC4 + ldr r0, _080F66B8 @ =gPokenavStructPtr ldr r0, [r0] ldr r2, [sp] lsls r1, r2, 2 @@ -2106,7 +2106,7 @@ _080F6656: adds r5, r0, 0 b _080F66CE .align 2, 0 -_080F66B8: .4byte gUnknown_083DFEC4 +_080F66B8: .4byte gPokenavStructPtr _080F66BC: .4byte 0x0000893c _080F66C0: strb r4, [r5] @@ -2137,7 +2137,7 @@ sub_80F66E0: @ 80F66E0 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _080F676C @ =gUnknown_083DFEC4 + ldr r0, _080F676C @ =gPokenavStructPtr mov r8, r0 ldr r4, [r0] ldr r1, _080F6770 @ =0x00008829 @@ -2200,7 +2200,7 @@ _080F674E: movs r0, 0x4 b _080F679A .align 2, 0 -_080F676C: .4byte gUnknown_083DFEC4 +_080F676C: .4byte gPokenavStructPtr _080F6770: .4byte 0x00008829 _080F6774: .4byte 0x0000876e _080F6778: .4byte 0x000087dc @@ -2271,7 +2271,7 @@ _080F67EC: mov r12, r0 cmp r0, 0x10 bls _080F674E - ldr r6, _080F6834 @ =gUnknown_083DFEC4 + ldr r6, _080F6834 @ =gPokenavStructPtr ldr r2, [r6] ldr r1, _080F6828 @ =0x0000bc8e adds r0, r2, r1 @@ -2293,7 +2293,7 @@ _080F67EC: _080F6828: .4byte 0x0000bc8e _080F682C: .4byte 0x0000bc4c _080F6830: .4byte 0x0000bc8f -_080F6834: .4byte gUnknown_083DFEC4 +_080F6834: .4byte gPokenavStructPtr _080F6838: .4byte 0x0000bc90 _080F683C: .4byte 0x0000bc91 _080F6840: @@ -2306,7 +2306,7 @@ _080F6840: movs r0, 0x3 strb r0, [r1] _080F6850: - ldr r5, _080F6890 @ =gUnknown_083DFEC4 + ldr r5, _080F6890 @ =gPokenavStructPtr ldr r1, [r5] ldr r6, _080F6894 @ =0x0000bc8e adds r0, r1, r6 @@ -2337,7 +2337,7 @@ _080F6870: .align 2, 0 _080F6888: .4byte 0x0000bc90 _080F688C: .4byte 0x0000bc91 -_080F6890: .4byte gUnknown_083DFEC4 +_080F6890: .4byte gPokenavStructPtr _080F6894: .4byte 0x0000bc8e _080F6898: .4byte 0x0000bc8f _080F689C: .4byte 0x0000bc96 @@ -2355,7 +2355,7 @@ _080F68AA: mov r12, r0 cmp r0, 0x2 bls _080F6870 - ldr r5, _080F68DC @ =gUnknown_083DFEC4 + ldr r5, _080F68DC @ =gPokenavStructPtr ldr r0, [r5] ldr r6, _080F68E0 @ =0x0000bc96 adds r1, r0, r6 @@ -2373,7 +2373,7 @@ _080F68AA: pop {r0} bx r0 .align 2, 0 -_080F68DC: .4byte gUnknown_083DFEC4 +_080F68DC: .4byte gPokenavStructPtr _080F68E0: .4byte 0x0000bc96 _080F68E4: .4byte 0x0000bc8f thumb_func_end sub_80F66E0 @@ -2381,7 +2381,7 @@ _080F68E4: .4byte 0x0000bc8f thumb_func_start sub_80F68E8 sub_80F68E8: @ 80F68E8 push {r4-r7,lr} - ldr r3, _080F6918 @ =gUnknown_083DFEC4 + ldr r3, _080F6918 @ =gPokenavStructPtr ldr r0, [r3] ldr r2, _080F691C @ =0x0000bc90 adds r1, r0, r2 @@ -2404,7 +2404,7 @@ sub_80F68E8: @ 80F68E8 ble _080F692E b _080F69BC .align 2, 0 -_080F6918: .4byte gUnknown_083DFEC4 +_080F6918: .4byte gPokenavStructPtr _080F691C: .4byte 0x0000bc90 _080F6920: .4byte 0x0000bc91 _080F6924: .4byte gMain @@ -2422,7 +2422,7 @@ _080F692E: asrs r0, 24 cmp r0, 0x2 bgt _080F6978 - ldr r3, _080F69B4 @ =gUnknown_083DFEC4 + ldr r3, _080F69B4 @ =gPokenavStructPtr ldr r2, _080F69B8 @ =0x0000bc96 _080F6944: lsls r0, r4, 24 @@ -2485,7 +2485,7 @@ _080F69AA: b _080F69FC .align 2, 0 _080F69B0: .4byte 0x0000bc91 -_080F69B4: .4byte gUnknown_083DFEC4 +_080F69B4: .4byte gPokenavStructPtr _080F69B8: .4byte 0x0000bc96 _080F69BC: lsls r0, r4, 24 @@ -2574,7 +2574,7 @@ sub_80F6A4C: @ 80F6A4C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r0, _080F6AC4 @ =gUnknown_083DFEC4 + ldr r0, _080F6AC4 @ =gPokenavStructPtr ldr r3, [r0] ldr r0, _080F6AC8 @ =0x0000876e adds r2, r3, r0 @@ -2633,7 +2633,7 @@ _080F6A88: pop {r0} bx r0 .align 2, 0 -_080F6AC4: .4byte gUnknown_083DFEC4 +_080F6AC4: .4byte gPokenavStructPtr _080F6AC8: .4byte 0x0000876e _080F6ACC: .4byte 0x00008774 _080F6AD0: .4byte 0x0000bc94 @@ -2649,7 +2649,7 @@ _080F6AEC: .4byte 0x000087de thumb_func_start sub_80F6AF0 sub_80F6AF0: @ 80F6AF0 push {r4,lr} - ldr r1, _080F6B10 @ =gUnknown_083DFEC4 + ldr r1, _080F6B10 @ =gPokenavStructPtr ldr r0, [r1] ldr r2, _080F6B14 @ =0x000087de adds r0, r2 @@ -2665,7 +2665,7 @@ _080F6B04: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F6B10: .4byte gUnknown_083DFEC4 +_080F6B10: .4byte gPokenavStructPtr _080F6B14: .4byte 0x000087de _080F6B18: .4byte _080F6B1C .align 2, 0 @@ -2682,13 +2682,13 @@ _080F6B38: lsls r0, 24 cmp r0, 0 bne _080F6C18 - ldr r0, _080F6B4C @ =gUnknown_083DFEC4 + ldr r0, _080F6B4C @ =gPokenavStructPtr ldr r1, [r0] ldr r3, _080F6B50 @ =0x000087de adds r1, r3 b _080F6BCE .align 2, 0 -_080F6B4C: .4byte gUnknown_083DFEC4 +_080F6B4C: .4byte gPokenavStructPtr _080F6B50: .4byte 0x000087de _080F6B54: movs r2, 0x80 @@ -2704,23 +2704,23 @@ _080F6B54: b _080F6BC6 _080F6B6E: bl DrawMonRibbonIcons - ldr r0, _080F6B7C @ =gUnknown_083DFEC4 + ldr r0, _080F6B7C @ =gPokenavStructPtr ldr r1, [r0] ldr r2, _080F6B80 @ =0x000087de adds r1, r2 b _080F6BCE .align 2, 0 -_080F6B7C: .4byte gUnknown_083DFEC4 +_080F6B7C: .4byte gPokenavStructPtr _080F6B80: .4byte 0x000087de _080F6B84: bl sub_80F13FC - ldr r0, _080F6B94 @ =gUnknown_083DFEC4 + ldr r0, _080F6B94 @ =gPokenavStructPtr ldr r1, [r0] ldr r3, _080F6B98 @ =0x000087de adds r1, r3 b _080F6BCE .align 2, 0 -_080F6B94: .4byte gUnknown_083DFEC4 +_080F6B94: .4byte gPokenavStructPtr _080F6B98: .4byte 0x000087de _080F6B9C: ldr r4, [r4] @@ -2743,7 +2743,7 @@ _080F6BC0: movs r0, 0 bl sub_80F2E18 _080F6BC6: - ldr r0, _080F6BD8 @ =gUnknown_083DFEC4 + ldr r0, _080F6BD8 @ =gPokenavStructPtr ldr r1, [r0] ldr r0, _080F6BDC @ =0x000087de adds r1, r0 @@ -2753,7 +2753,7 @@ _080F6BCE: strb r0, [r1] b _080F6C18 .align 2, 0 -_080F6BD8: .4byte gUnknown_083DFEC4 +_080F6BD8: .4byte gPokenavStructPtr _080F6BDC: .4byte 0x000087de _080F6BE0: bl sub_80F170C @@ -2767,7 +2767,7 @@ _080F6BE0: ldr r0, _080F6C0C @ =0x0000dfff ands r0, r1 strh r0, [r2] - ldr r0, _080F6C10 @ =gUnknown_083DFEC4 + ldr r0, _080F6C10 @ =gPokenavStructPtr ldr r1, [r0] ldr r2, _080F6C14 @ =0x000087de adds r1, r2 @@ -2779,7 +2779,7 @@ _080F6C08: b _080F6C1A .align 2, 0 _080F6C0C: .4byte 0x0000dfff -_080F6C10: .4byte gUnknown_083DFEC4 +_080F6C10: .4byte gPokenavStructPtr _080F6C14: .4byte 0x000087de _080F6C18: movs r0, 0x1 @@ -2797,7 +2797,7 @@ sub_80F708C: @ 80F708C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r0, _080F70E4 @ =gUnknown_083DFEC4 + ldr r0, _080F70E4 @ =gPokenavStructPtr ldr r3, [r0] ldr r0, _080F70E8 @ =0x0000876e adds r2, r3, r0 @@ -2840,7 +2840,7 @@ _080F70C8: pop {r0} bx r0 .align 2, 0 -_080F70E4: .4byte gUnknown_083DFEC4 +_080F70E4: .4byte gPokenavStructPtr _080F70E8: .4byte 0x0000876e _080F70EC: .4byte 0x00008774 _080F70F0: .4byte 0x0000bc94 @@ -2851,7 +2851,7 @@ _080F70F8: .4byte 0x000087de thumb_func_start sub_80F70FC sub_80F70FC: @ 80F70FC push {r4-r6,lr} - ldr r1, _080F711C @ =gUnknown_083DFEC4 + ldr r1, _080F711C @ =gPokenavStructPtr ldr r0, [r1] ldr r2, _080F7120 @ =0x000087de adds r0, r2 @@ -2867,7 +2867,7 @@ _080F7110: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F711C: .4byte gUnknown_083DFEC4 +_080F711C: .4byte gPokenavStructPtr _080F7120: .4byte 0x000087de _080F7124: .4byte _080F7128 .align 2, 0 @@ -2885,13 +2885,13 @@ _080F7144: _080F714A: movs r0, 0 bl sub_80F6E04 - ldr r0, _080F715C @ =gUnknown_083DFEC4 + ldr r0, _080F715C @ =gPokenavStructPtr ldr r1, [r0] ldr r2, _080F7160 @ =0x000087de adds r1, r2 b _080F7206 .align 2, 0 -_080F715C: .4byte gUnknown_083DFEC4 +_080F715C: .4byte gPokenavStructPtr _080F7160: .4byte 0x000087de _080F7164: movs r0, 0 @@ -2920,7 +2920,7 @@ _080F7198: .4byte 0x0000876e _080F719C: .4byte 0x000087de _080F71A0: bl LoadTrainerEyesDescriptionLines - ldr r0, _080F71D4 @ =gUnknown_083DFEC4 + ldr r0, _080F71D4 @ =gPokenavStructPtr ldr r1, [r0] ldr r0, _080F71D8 @ =0x0000bc95 adds r2, r1, r0 @@ -2932,7 +2932,7 @@ _080F71A0: adds r0, 0x1 strb r0, [r1] _080F71BA: - ldr r0, _080F71D4 @ =gUnknown_083DFEC4 + ldr r0, _080F71D4 @ =gPokenavStructPtr ldr r1, [r0] ldr r0, _080F71D8 @ =0x0000bc95 adds r4, r1, r0 @@ -2946,7 +2946,7 @@ _080F71CC: strb r0, [r4] b _080F721C .align 2, 0 -_080F71D4: .4byte gUnknown_083DFEC4 +_080F71D4: .4byte gPokenavStructPtr _080F71D8: .4byte 0x0000bc95 _080F71DC: .4byte 0x000087de _080F71E0: @@ -2966,7 +2966,7 @@ _080F71F8: cmp r0, 0 bne _080F721C _080F71FE: - ldr r0, _080F7214 @ =gUnknown_083DFEC4 + ldr r0, _080F7214 @ =gPokenavStructPtr ldr r1, [r0] ldr r0, _080F7210 @ =0x000087de adds r1, r0 @@ -2977,7 +2977,7 @@ _080F7206: b _080F721C .align 2, 0 _080F7210: .4byte 0x000087de -_080F7214: .4byte gUnknown_083DFEC4 +_080F7214: .4byte gPokenavStructPtr _080F7218: movs r0, 0 b _080F721E @@ -3002,7 +3002,7 @@ sub_80F7224: @ 80F7224 bl GetMonData lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F7264 @ =gUnknown_083DFEC4 + ldr r0, _080F7264 @ =gPokenavStructPtr ldr r0, [r0] ldr r3, _080F7268 @ =0x00008fe9 adds r1, r0, r3 @@ -3020,7 +3020,7 @@ sub_80F7224: @ 80F7224 b _080F7272 .align 2, 0 _080F7260: .4byte gPlayerParty -_080F7264: .4byte gUnknown_083DFEC4 +_080F7264: .4byte gPokenavStructPtr _080F7268: .4byte 0x00008fe9 _080F726C: .4byte 0x00008931 _080F7270: diff --git a/asm/trainers_eye.s b/asm/trainers_eye.s index e303eb95e..feaf75e33 100644 --- a/asm/trainers_eye.s +++ b/asm/trainers_eye.s @@ -5,41 +5,6 @@ .text - thumb_func_start sub_80F6DB8 -sub_80F6DB8: @ 80F6DB8 - push {r4,lr} - movs r1, 0 - ldr r0, _080F6DEC @ =gUnknown_083DFEC4 - ldr r4, [r0] - ldr r2, _080F6DF0 @ =0x00008fe9 - adds r0, r4, r2 - strb r1, [r0] - movs r0, 0 - bl sub_80F6E04 - ldr r0, _080F6DF4 @ =0x0000d15a - adds r1, r4, r0 - ldr r0, _080F6DF8 @ =0x0000ffb8 - strh r0, [r1] - movs r0, 0 - bl sub_80F2F7C - ldr r1, _080F6DFC @ =0x0000876e - adds r0, r4, r1 - ldrh r0, [r0] - ldr r2, _080F6E00 @ =0x000087dc - adds r4, r2 - strh r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F6DEC: .4byte gUnknown_083DFEC4 -_080F6DF0: .4byte 0x00008fe9 -_080F6DF4: .4byte 0x0000d15a -_080F6DF8: .4byte 0x0000ffb8 -_080F6DFC: .4byte 0x0000876e -_080F6E00: .4byte 0x000087dc - thumb_func_end sub_80F6DB8 - thumb_func_start sub_80F6E04 sub_80F6E04: @ 80F6E04 push {r4-r7,lr} @@ -49,7 +14,7 @@ sub_80F6E04: @ 80F6E04 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080F6E78 @ =gUnknown_083DFEC4 + ldr r0, _080F6E78 @ =gPokenavStructPtr ldr r5, [r0] ldr r1, _080F6E7C @ =0x0000876e adds r0, r5, r1 @@ -99,7 +64,7 @@ sub_80F6E04: @ 80F6E04 pop {r0} bx r0 .align 2, 0 -_080F6E78: .4byte gUnknown_083DFEC4 +_080F6E78: .4byte gPokenavStructPtr _080F6E7C: .4byte 0x0000876e _080F6E80: .4byte 0x0000cee8 _080F6E84: .4byte gTrainers @@ -113,7 +78,7 @@ _080F6E98: .4byte gTrainerFrontPicPaletteTable thumb_func_start sub_80F6E9C sub_80F6E9C: @ 80F6E9C push {lr} - ldr r0, _080F6EB4 @ =gUnknown_083DFEC4 + ldr r0, _080F6EB4 @ =gPokenavStructPtr ldr r0, [r0] ldr r2, _080F6EB8 @ =0x0000d15a adds r1, r0, r2 @@ -125,7 +90,7 @@ sub_80F6E9C: @ 80F6E9C movs r0, 0 b _080F6ED0 .align 2, 0 -_080F6EB4: .4byte gUnknown_083DFEC4 +_080F6EB4: .4byte gPokenavStructPtr _080F6EB8: .4byte 0x0000d15a _080F6EBC: adds r0, r2, 0 @@ -147,7 +112,7 @@ _080F6ED0: thumb_func_start sub_80F6ED4 sub_80F6ED4: @ 80F6ED4 push {lr} - ldr r0, _080F6F00 @ =gUnknown_083DFEC4 + ldr r0, _080F6F00 @ =gPokenavStructPtr ldr r0, [r0] ldr r2, _080F6F04 @ =0x0000d15a adds r1, r0, r2 @@ -168,7 +133,7 @@ sub_80F6ED4: @ 80F6ED4 movs r0, 0x1 b _080F6F0C .align 2, 0 -_080F6F00: .4byte gUnknown_083DFEC4 +_080F6F00: .4byte gPokenavStructPtr _080F6F04: .4byte 0x0000d15a _080F6F08: strh r2, [r1] @@ -182,7 +147,7 @@ _080F6F0C: thumb_func_start sub_80F6F10 sub_80F6F10: @ 80F6F10 push {lr} - ldr r0, _080F6F48 @ =gUnknown_083DFEC4 + ldr r0, _080F6F48 @ =gPokenavStructPtr ldr r0, [r0] ldr r2, _080F6F4C @ =0x0000d15e adds r1, r0, r2 @@ -209,7 +174,7 @@ sub_80F6F10: @ 80F6F10 pop {r0} bx r0 .align 2, 0 -_080F6F48: .4byte gUnknown_083DFEC4 +_080F6F48: .4byte gPokenavStructPtr _080F6F4C: .4byte 0x0000d15e _080F6F50: .4byte 0x0000d15f _080F6F54: .4byte REG_BLDCNT @@ -221,7 +186,7 @@ _080F6F60: .4byte 0x00001f1f thumb_func_start sub_80F6F64 sub_80F6F64: @ 80F6F64 push {lr} - ldr r0, _080F6F9C @ =gUnknown_083DFEC4 + ldr r0, _080F6F9C @ =gPokenavStructPtr ldr r1, [r0] ldr r0, _080F6FA0 @ =0x0000d15e adds r2, r1, r0 @@ -248,7 +213,7 @@ sub_80F6F64: @ 80F6F64 strh r0, [r1] b _080F6FB0 .align 2, 0 -_080F6F9C: .4byte gUnknown_083DFEC4 +_080F6F9C: .4byte gPokenavStructPtr _080F6FA0: .4byte 0x0000d15e _080F6FA4: .4byte 0x0000d15f _080F6FA8: .4byte REG_BLDY diff --git a/include/pokenav.h b/include/pokenav.h index c89db2051..0b78626e4 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -5,11 +5,11 @@ #include "region_map.h" #include "mon_markings.h" -struct UnkPokenavStruct_Sub { - /*0x0*/ u16 unk0; - /*0x2*/ u16 unk2; - /*0x4*/ u8 unk4; - /*0x5*/ u8 unk5; +struct TrainersEyeStruct { + /*0x0*/ u16 opponentId; + /*0x2*/ u16 regionMapSectionId; + /*0x4*/ u8 rematchTableIdx; + /*0x5*/ u8 rematchNo; }; struct UnkPokenavStruct_Sub1 { @@ -114,7 +114,7 @@ struct UnkPokenavStruct { /*0x877C*/ s16 unk877C; /*0x877E*/ u16 unk877E; /*0x8780*/ u16 unk8780; - /*0x8782*/ u8 filler8782[0x2]; + /*0x8782*/ u16 unk8782; /*0x8784*/ u16 unk8784; /*0x8786*/ u16 unk8786; /*0x8788*/ u8 unk8788[0x40]; @@ -125,11 +125,9 @@ struct UnkPokenavStruct { /*0x87CC*/ struct Sprite *unk87CC; /*0x87D0*/ struct Sprite *unk87D0[2]; /*0x87D8*/ u8 unk87D8; - /*0x87D9*/ u8 filler87D9[0x1]; /*0x87DA*/ s16 unk87DA; /*0x87DC*/ s16 unk87DC; /*0x87DE*/ u8 unk87DE; - /*0x87DF*/ u8 filler87DF[0x1]; /*0x87E0*/ bool8 (*unk87E0)(void); /*0x87E4*/ struct Sprite *unk87E4[7]; /*0x8800*/ struct Sprite *unk8800[10]; @@ -143,12 +141,11 @@ struct UnkPokenavStruct { /*0x8FE4*/ u16 unk8FE4; /*0x8FE6*/ u8 unk8FE6; /*0x8FE7*/ u8 unk8FE7; - /*0x8FE8*/ u8 filler8FE8[0x1]; + /*0x8FE8*/ u8 unk8FE8; /*0x8fe9*/ s8 unk8fe9; /*0x8fea*/ s8 unk8FEA; /*0x8feb*/ s8 unk8FEB; /*0x8fec*/ s8 unk8FEC; - /*0x8FED*/ u8 filler8FED[0x1]; /*0x8fee*/ u16 unk8FEE; /*0x8ff0*/ u8 unk8ff0[4][5]; /*0x9004*/ struct UnkPokenav11 unk9004[3][5]; @@ -183,7 +180,7 @@ struct UnkPokenavStruct { /*0xCE8E*/ u16 palettesCE8E[0x21]; /*0xCED0*/ struct Sprite *unkCED0; /*0xCED4*/ struct Sprite *unkCED4[5]; - /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[69]; + /*0xCEE8*/ struct TrainersEyeStruct trainersEye[69]; /*0xD110*/ const u8 *trainerEyeDescriptionLines[4]; /*0xD120*/ u8 fillerD114[0x18]; /*0xD138*/ u8 unkD138[0x20]; @@ -203,7 +200,7 @@ struct UnkPokenavStruct { /*0x131E4*/ u8 unk131E4[0x1000]; }; -extern struct UnkPokenavStruct *const gUnknown_083DFEC4; +extern struct UnkPokenavStruct *const gPokenavStructPtr; bool8 sub_80F170C(void); bool8 sub_80F1778(void); @@ -231,5 +228,6 @@ void sub_80F5550(struct UnkPokenav11*, struct UnkPokenav11*); bool8 sub_80F555C(void); void sub_80F7224(u8); void sub_80F5BDC(void); +void sub_80F2F7C(u8 arg0); #endif // GUARD_POKENAV_H diff --git a/src/pokenav.c b/src/pokenav.c index 7e15d3469..9a43a1727 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -16,7 +16,7 @@ EWRAM_DATA u16 gUnknown_020388B4 = 0; // .rodata -struct UnkPokenavStruct *const gUnknown_083DFEC4 = (struct UnkPokenavStruct *)gSharedMem; +struct UnkPokenavStruct *const gPokenavStructPtr = (struct UnkPokenavStruct *)gSharedMem; extern const u8 gUnknown_083E4890[]; diff --git a/src/pokenav_after.c b/src/pokenav_after.c index 7619577cc..a9408b2de 100644 --- a/src/pokenav_after.c +++ b/src/pokenav_after.c @@ -9,16 +9,16 @@ void sub_80F700C(u8 *arg0, u16 arg1) { - const struct Trainer *trainer = &gTrainers[gUnknown_083DFEC4->unkCEE8[arg1].unk0]; + const struct Trainer *trainer = &gTrainers[gPokenavStructPtr->trainersEye[arg1].opponentId]; u8 *ptr = arg0; ptr = arg0; - if (arg1 < gUnknown_083DFEC4->unkD158) + if (arg1 < gPokenavStructPtr->unkD158) { #if ENGLISH ptr = StringCopy(ptr, gTrainerClassNames[trainer->trainerClass]); #elif GERMAN - ptr = StringCopy(ptr, de_sub_8041024(0, gUnknown_083DFEC4->unkCEE8[arg1].unk0)); + ptr = StringCopy(ptr, de_sub_8041024(0, gPokenavStructPtr->trainersEye[arg1].opponentId)); #endif ptr[0] = EXT_CTRL_CODE_BEGIN; diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 710756c11..a00f88051 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -3750,13 +3750,13 @@ void sub_80EEDE8(void) void sub_80EEE08(void) { - gUnknown_083DFEC4->unkD160 = 0; + gPokenavStructPtr->unkD160 = 0; } void sub_80EEE20(void) { - gUnknown_083DFEC4->unkD160 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unkD160 = 0; + if (!gPokenavStructPtr->unk6DAC) { while (sub_80EEE54()) ; @@ -3765,7 +3765,7 @@ void sub_80EEE20(void) bool8 sub_80EEE54(void) { - switch (gUnknown_083DFEC4->unkD160) + switch (gPokenavStructPtr->unkD160) { case 0: LZ77UnCompVram(gPokenavHoennMapMisc_Gfx, (void *)VRAM + 0xC000); @@ -3782,15 +3782,15 @@ bool8 sub_80EEE54(void) sub_80EF58C(2); break; case 4: - gUnknown_083DFEC4->unk030C = 0; + gPokenavStructPtr->unk030C = 0; REG_BG1HOFS = 0; REG_BG1VOFS = 0; REG_BG1CNT = 0x1B0C; - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; default: return FALSE; } - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return TRUE; } @@ -3798,17 +3798,17 @@ bool8 sub_80EEF34(void) { bool8 retVal = TRUE; - if (gUnknown_083DFEC4->unk030C == 32) + if (gPokenavStructPtr->unk030C == 32) return FALSE; - gUnknown_083DFEC4->unk030C += 2; - if (gUnknown_083DFEC4->unk030C > 31) + gPokenavStructPtr->unk030C += 2; + if (gPokenavStructPtr->unk030C > 31) { - gUnknown_083DFEC4->unk030C = 32; + gPokenavStructPtr->unk030C = 32; retVal = FALSE; } - REG_BG1VOFS = gUnknown_083DFEC4->unk030C; + REG_BG1VOFS = gPokenavStructPtr->unk030C; return retVal; } @@ -3816,17 +3816,17 @@ bool8 sub_80EEF78(void) { bool8 retVal = TRUE; - if (gUnknown_083DFEC4->unk030C == 0) + if (gPokenavStructPtr->unk030C == 0) return FALSE; - gUnknown_083DFEC4->unk030C -= 2; - if (gUnknown_083DFEC4->unk030C <= 0) + gPokenavStructPtr->unk030C -= 2; + if (gPokenavStructPtr->unk030C <= 0) { - gUnknown_083DFEC4->unk030C = 0; + gPokenavStructPtr->unk030C = 0; retVal = FALSE; } - REG_BG1VOFS = gUnknown_083DFEC4->unk030C; + REG_BG1VOFS = gPokenavStructPtr->unk030C; return retVal; } @@ -3846,7 +3846,7 @@ void sub_80EEFBC(u8 a) sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2); break; case 2: - var1 = gUnknown_083DFEC4->unk6DAC; + var1 = gPokenavStructPtr->unk6DAC; if (!var1) { sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 2, 10, 2); @@ -3886,9 +3886,9 @@ void sub_80EEFBC(u8 a) void sub_80EF248(u8 a) { - gUnknown_083DFEC4->unkD160 = 0; + gPokenavStructPtr->unkD160 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + if (!gPokenavStructPtr->unk6DAC) { while (sub_80EF284(a)) ; @@ -3897,7 +3897,7 @@ void sub_80EF248(u8 a) bool8 sub_80EF284(u8 a) { - switch (gUnknown_083DFEC4->unkD160) + switch (gPokenavStructPtr->unkD160) { case 0: sub_80EEDE8(); @@ -3942,13 +3942,13 @@ bool8 sub_80EF284(u8 a) REG_BG3CNT = 0x1C0B; REG_BLDCNT = 0; - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return FALSE; default: return FALSE; } - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return TRUE; } @@ -3982,31 +3982,31 @@ void sub_80EF490(u8 a) if (a == 2) a = 1; - gUnknown_083DFEC4->unkCE4E = a * 30; - var1 = gUnknown_083DFEC4->unkCE4C; + gPokenavStructPtr->unkCE4E = a * 30; + var1 = gPokenavStructPtr->unkCE4C; var2 = a * 30; if (var1 < var2) - gUnknown_083DFEC4->unkCE50 = 2; + gPokenavStructPtr->unkCE50 = 2; else if (var1 > var2) - gUnknown_083DFEC4->unkCE50 = -2; + gPokenavStructPtr->unkCE50 = -2; else - gUnknown_083DFEC4->unkCE50 = 0; + gPokenavStructPtr->unkCE50 = 0; } bool8 sub_80EF4F8(void) { u16 *palettes; - if (gUnknown_083DFEC4->unkCE4C == gUnknown_083DFEC4->unkCE4E) + if (gPokenavStructPtr->unkCE4C == gPokenavStructPtr->unkCE4E) { return FALSE; } else { - gUnknown_083DFEC4->unkCE4C = gUnknown_083DFEC4->unkCE50 + gUnknown_083DFEC4->unkCE4C; + gPokenavStructPtr->unkCE4C = gPokenavStructPtr->unkCE50 + gPokenavStructPtr->unkCE4C; - palettes = gUnknown_083DFEC4->palettesCE52; - LoadPalette(&palettes[gUnknown_083DFEC4->unkCE4C], 0x31, 4); + palettes = gPokenavStructPtr->palettesCE52; + LoadPalette(&palettes[gPokenavStructPtr->unkCE4C], 0x31, 4); return TRUE; } @@ -4017,8 +4017,8 @@ void sub_80EF54C(u8 a) if (a == 2) a = 1; - gUnknown_083DFEC4->unkCE4C = a * 30; - LoadPalette(&gUnknown_083DFEC4->palettesCE52[gUnknown_083DFEC4->unkCE4C], 0x31, 4); + gPokenavStructPtr->unkCE4C = a * 30; + LoadPalette(&gPokenavStructPtr->palettesCE52[gPokenavStructPtr->unkCE4C], 0x31, 4); } void sub_80EF58C(u8 a) @@ -4031,15 +4031,15 @@ void sub_80EF58C(u8 a) { case 0: for (i = 0; i < 62; i++) - gUnknown_083DFEC4->palettesCE52[i] = 0; + gPokenavStructPtr->palettesCE52[i] = 0; break; case 1: - palettes = gUnknown_083DFEC4->palettesCE52; + palettes = gPokenavStructPtr->palettesCE52; var1 = gUnknown_083E003C; sub_80EF624(&var1[1], &var1[3], 16, 2, palettes); break; case 2: - palettes = gUnknown_083DFEC4->palettesCE8E; + palettes = gPokenavStructPtr->palettesCE8E; var1 = gUnknown_083E003C; sub_80EF624(&var1[3], &var1[7], 16, 2, palettes); break; @@ -4241,46 +4241,46 @@ _080EF72E:\n\ void sub_80EF740(void) { - gUnknown_083DFEC4->unk6DA0 = (gUnknown_083DFEC4->unk6DA0 + 1) & 1; - if (gUnknown_083DFEC4->unk6DA0) - gUnknown_083DFEC4->unk6DA2++; + gPokenavStructPtr->unk6DA0 = (gPokenavStructPtr->unk6DA0 + 1) & 1; + if (gPokenavStructPtr->unk6DA0) + gPokenavStructPtr->unk6DA2++; - REG_BG3HOFS = gUnknown_083DFEC4->unk6DA2; + REG_BG3HOFS = gPokenavStructPtr->unk6DA2; } void sub_80EF780(u8 taskId) { - if (gTasks[taskId].data[0] == 0 || (gUnknown_083DFEC4->unk6DA2 & 0x7) != 0) + if (gTasks[taskId].data[0] == 0 || (gPokenavStructPtr->unk6DA2 & 0x7) != 0) { sub_80EF740(); } else { - u16 value = gUnknown_083DFEC4->unk6DA2 & 0x7; - gUnknown_083DFEC4->unk6DA2 = value; - gUnknown_083DFEC4->unk6DA0 = value; + u16 value = gPokenavStructPtr->unk6DA2 & 0x7; + gPokenavStructPtr->unk6DA2 = value; + gPokenavStructPtr->unk6DA0 = value; REG_BG3HOFS = value; } } void sub_80EF7D4(void) { - gUnknown_083DFEC4->unk6DA2 = 0; - gUnknown_083DFEC4->unk6DA0 = 0; - gUnknown_083DFEC4->taskId6DA4 = CreateTask(sub_80EF780, 80); + gPokenavStructPtr->unk6DA2 = 0; + gPokenavStructPtr->unk6DA0 = 0; + gPokenavStructPtr->taskId6DA4 = CreateTask(sub_80EF780, 80); } void sub_80EF814(void) { if (FuncIsActiveTask(sub_80EF780)) - DestroyTask(gUnknown_083DFEC4->taskId6DA4); + DestroyTask(gPokenavStructPtr->taskId6DA4); } void sub_80EF840(void) { - gUnknown_083DFEC4->unkD160 = 0; + gPokenavStructPtr->unkD160 = 0; - if (gUnknown_083DFEC4->unk6DAC == 0) + if (gPokenavStructPtr->unk6DAC == 0) { while (sub_80EF874() != 0) ; @@ -4289,7 +4289,7 @@ void sub_80EF840(void) bool8 sub_80EF874(void) { - switch (gUnknown_083DFEC4->unkD160) + switch (gPokenavStructPtr->unkD160) { case 0: sub_80EEDE8(); @@ -4308,7 +4308,7 @@ bool8 sub_80EF874(void) Menu_EraseScreen(); break; case 5: - sub_80FA904(&gUnknown_083DFEC4->regionMap, gSaveBlock2.regionMapZoom ? TRUE : FALSE); + sub_80FA904(&gPokenavStructPtr->regionMap, gSaveBlock2.regionMapZoom ? TRUE : FALSE); break; case 6: if (sub_80FA940()) @@ -4330,14 +4330,14 @@ bool8 sub_80EF874(void) sub_80EF9F8(); break; case 11: - if (!gUnknown_083DFEC4->regionMap.zoomed) + if (!gPokenavStructPtr->regionMap.zoomed) { - gUnknown_083DFEC4->unk7698 = 160; + gPokenavStructPtr->unk7698 = 160; REG_BG0VOFS = 160; } else { - gUnknown_083DFEC4->unk7698 = 256; + gPokenavStructPtr->unk7698 = 256; REG_BG0VOFS = 0; } @@ -4349,7 +4349,7 @@ bool8 sub_80EF874(void) return FALSE; } - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return TRUE; } @@ -4362,13 +4362,13 @@ void sub_80EF9F8(void) u16 mapSectionId; u8 b; - switch (gUnknown_083DFEC4->regionMap.unk16) + switch (gPokenavStructPtr->regionMap.unk16) { case 0: break; case 1: case 4: - sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); + sub_8072A18(gPokenavStructPtr->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); top += 2; if (gLinkOpen == TRUE) { @@ -4382,8 +4382,8 @@ void sub_80EF9F8(void) for (i = 0; i < 4; i++) { const u8 *secName = GetLandmarkName( - gUnknown_083DFEC4->regionMap.mapSectionId, - gUnknown_083DFEC4->regionMap.everGrandeCityArea, + gPokenavStructPtr->regionMap.mapSectionId, + gPokenavStructPtr->regionMap.everGrandeCityArea, i); if (secName == NULL) @@ -4394,20 +4394,20 @@ void sub_80EF9F8(void) } break; case 2: - sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); + sub_8072A18(gPokenavStructPtr->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); top += 2; - mapSectionId = gUnknown_083DFEC4->regionMap.mapSectionId; - b = gUnknown_083DFEC4->regionMap.everGrandeCityArea; - if (gUnknown_083DFEC4->unkCDCC[mapSectionId][b] != NULL) + mapSectionId = gPokenavStructPtr->regionMap.mapSectionId; + b = gPokenavStructPtr->regionMap.everGrandeCityArea; + if (gPokenavStructPtr->unkCDCC[mapSectionId][b] != NULL) { Menu_BlankWindowRect(14, top, 15, 15); Menu_BlankWindowRect(26, top, 28, 15); - sub_8095C8C((void *)(VRAM + 0xF800), 16, 6, gUnknown_083DFEC4->unkCDCC[mapSectionId][b], 0, 0, 10, 10, 10); + sub_8095C8C((void *)(VRAM + 0xF800), 16, 6, gPokenavStructPtr->unkCDCC[mapSectionId][b], 0, 0, 10, 10, 10); top += 11; } break; case 3: - sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); + sub_8072A18(gPokenavStructPtr->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); top += 2; break; } @@ -4416,7 +4416,7 @@ void sub_80EF9F8(void) if (!someBool && top < 16) Menu_BlankWindowRect(14, top, 28, 15); - if (gUnknown_083DFEC4->regionMap.unk16 == 2) + if (gPokenavStructPtr->regionMap.unk16 == 2) sub_80EFD74(); else sub_80EFDA0(); @@ -4424,7 +4424,7 @@ void sub_80EF9F8(void) void sub_80EFBB0(void) { - if (!gUnknown_083DFEC4->regionMap.zoomed) + if (!gPokenavStructPtr->regionMap.zoomed) sub_80EEFBC(8); else sub_80EEFBC(7); @@ -4433,7 +4433,7 @@ void sub_80EFBB0(void) bool8 sub_80EFBDC(bool8 a) { bool8 retVal = TRUE; - u16 var1 = gUnknown_083DFEC4->unk7698; + u16 var1 = gPokenavStructPtr->unk7698; if (a) { @@ -4460,7 +4460,7 @@ bool8 sub_80EFBDC(bool8 a) } } - gUnknown_083DFEC4->unk7698 = var1; + gPokenavStructPtr->unk7698 = var1; REG_BG0VOFS = var1 & 0xFF; return retVal; @@ -4468,8 +4468,8 @@ bool8 sub_80EFBDC(bool8 a) void sub_80EFC3C(void) { - gUnknown_083DFEC4->unkBC9A = 0; - gUnknown_083DFEC4->unkBC9B = 0; + gPokenavStructPtr->unkBC9A = 0; + gPokenavStructPtr->unkBC9B = 0; sub_80EFD3C(); } @@ -4479,63 +4479,63 @@ bool8 sub_80EFC64(void) u8 var1; u16 var2; - if (gUnknown_083DFEC4->unkBC9A >= 16) + if (gPokenavStructPtr->unkBC9A >= 16) return FALSE; - var1 = gUnknown_083DFEC4->unkBC9A; - var2 = gUnknown_083DFEC4->unkBC9B; + var1 = gPokenavStructPtr->unkBC9A; + var2 = gPokenavStructPtr->unkBC9B; for (i = 0; i < 2; i++) { if (gPokenavCityMaps[var1][i] != 0) { - LZ77UnCompVram(gPokenavCityMaps[var1][i], gUnknown_083DFEC4->unkBC9C[var2]); - gUnknown_083DFEC4->unkCDCC[var1][i] = gUnknown_083DFEC4->unkBC9C[var2]; + LZ77UnCompVram(gPokenavCityMaps[var1][i], gPokenavStructPtr->unkBC9C[var2]); + gPokenavStructPtr->unkCDCC[var1][i] = gPokenavStructPtr->unkBC9C[var2]; var2++; } else { - gUnknown_083DFEC4->unkCDCC[var1][i] = NULL; + gPokenavStructPtr->unkCDCC[var1][i] = NULL; } } - if (++gUnknown_083DFEC4->unkBC9A >= 16) + if (++gPokenavStructPtr->unkBC9A >= 16) return FALSE; - gUnknown_083DFEC4->unkBC9B = var2; + gPokenavStructPtr->unkBC9B = var2; return TRUE; } void sub_80EFD3C(void) { - gUnknown_083DFEC4->unk769E = 0; - gUnknown_083DFEC4->unk769C = 47; - gUnknown_083DFEC4->unk769D = 0; - gUnknown_083DFEC4->unk769A = 0; + gPokenavStructPtr->unk769E = 0; + gPokenavStructPtr->unk769C = 47; + gPokenavStructPtr->unk769D = 0; + gPokenavStructPtr->unk769A = 0; } void sub_80EFD74(void) { - gUnknown_083DFEC4->unk769E = 1; - if (gUnknown_083DFEC4->unk769D == 1) - gUnknown_083DFEC4->unk769D = 2; + gPokenavStructPtr->unk769E = 1; + if (gPokenavStructPtr->unk769D == 1) + gPokenavStructPtr->unk769D = 2; } void sub_80EFDA0(void) { sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9AC2C, 0, 0, 15, 1, 15); - gUnknown_083DFEC4->unk769E = 0; + gPokenavStructPtr->unk769E = 0; } void sub_80EFDE4(u8 param0) { - u16 var1 = 60 - gUnknown_083DFEC4->unk769C; + u16 var1 = 60 - gPokenavStructPtr->unk769C; if (var1 > 15) var1 = 15; - if (gUnknown_083DFEC4->unk769E != 0) + if (gPokenavStructPtr->unk769E != 0) { - sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9ABB4, gUnknown_083DFEC4->unk769C, 0, var1, 1, 60); + sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9ABB4, gPokenavStructPtr->unk769C, 0, var1, 1, 60); if (var1 < 15) { @@ -4549,49 +4549,49 @@ void sub_80EFDE4(u8 param0) void sub_80EFE7C(void) { u16 var1; - u8 var2 = gUnknown_083DFEC4->unk769D; + u8 var2 = gPokenavStructPtr->unk769D; switch (var2) { case 0: - var1 = ++gUnknown_083DFEC4->unk769C; + var1 = ++gPokenavStructPtr->unk769C; if (var1 > 59) - gUnknown_083DFEC4->unk769C = var2; + gPokenavStructPtr->unk769C = var2; - sub_80EFDE4(gUnknown_083DFEC4->unk769E); + sub_80EFDE4(gPokenavStructPtr->unk769E); - switch (gUnknown_083DFEC4->unk769C) + switch (gPokenavStructPtr->unk769C) { case 0: case 15: case 30: case 45: - gUnknown_083DFEC4->unk769D = 1; - gUnknown_083DFEC4->unk769A = 0; + gPokenavStructPtr->unk769D = 1; + gPokenavStructPtr->unk769A = 0; break; } break; case 1: - var1 = ++gUnknown_083DFEC4->unk769A; + var1 = ++gPokenavStructPtr->unk769A; if (var1 > 120) { - gUnknown_083DFEC4->unk769A = 0; - gUnknown_083DFEC4->unk769D = 0; + gPokenavStructPtr->unk769A = 0; + gPokenavStructPtr->unk769D = 0; } break; case 2: sub_80EFDE4(1); - gUnknown_083DFEC4->unk769D = 1; + gPokenavStructPtr->unk769D = 1; break; } } void sub_80EFF34(void) { - gUnknown_083DFEC4->unkD160 = 0; + gPokenavStructPtr->unkD160 = 0; - if (gUnknown_083DFEC4->unk6DAC == 0) + if (gPokenavStructPtr->unk6DAC == 0) { while (sub_80EFF68()) ; @@ -4600,11 +4600,11 @@ void sub_80EFF34(void) bool8 sub_80EFF68(void) { - switch (gUnknown_083DFEC4->unkD160) + switch (gPokenavStructPtr->unkD160) { case 0: sub_80EEDE8(); - gUnknown_083DFEC4->unkD162 = 11; + gPokenavStructPtr->unkD162 = 11; break; case 1: Text_LoadWindowTemplate(&gWindowTemplate_81E7080); @@ -4634,7 +4634,7 @@ bool8 sub_80EFF68(void) LoadPalette(gPokenavConditionMenu2_Pal, 0x20, 0x20); break; case 9: - if (gUnknown_083DFEC4->unk76AA == 1) + if (gPokenavStructPtr->unk76AA == 1) sub_8095C8C((void *)VRAM + 0xF000, 0, 5, gUnknown_083E01AC, 0, 0, 9, 4, 9); break; case 10: @@ -4649,7 +4649,7 @@ bool8 sub_80EFF68(void) sub_80F01A4(); break; case 12: - sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + sub_80F01E0(gPokenavStructPtr->unk8fe9); break; case 13: REG_BG3CNT = 0x1E03; @@ -4661,7 +4661,7 @@ bool8 sub_80EFF68(void) return FALSE; } - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return TRUE; } @@ -4685,22 +4685,22 @@ void sub_80F01A4(void) static void sub_80F01E0(u16 a) { - Menu_PrintText(gUnknown_083DFEC4->unk8829[a], 13, 1); + Menu_PrintText(gPokenavStructPtr->unk8829[a], 13, 1); - if (gUnknown_083DFEC4->unk76AA == 1) + if (gPokenavStructPtr->unk76AA == 1) { - Menu_PrintText(gUnknown_083DFEC4->unk88E9[a], 13, 3); - sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk2); - Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 6); + Menu_PrintText(gPokenavStructPtr->unk88E9[a], 13, 3); + sub_80F443C(gPokenavStructPtr->unk8788, gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].unk2); + Menu_PrintText(gPokenavStructPtr->unk8788, 1, 6); } } void sub_80F0264(u8 a) { - gUnknown_083DFEC4->unk306 = 0; - gUnknown_083DFEC4->unk87CA = a; + gPokenavStructPtr->unk306 = 0; + gPokenavStructPtr->unk87CA = a; - if (gUnknown_083DFEC4->unk6DAC == 0) + if (gPokenavStructPtr->unk6DAC == 0) { while (sub_80F02A0()) ; @@ -4711,13 +4711,13 @@ bool8 sub_80F02A0(void) { const u16 *pointer; - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: sub_80EEDE8(); - gUnknown_083DFEC4->unk87C8 = gUnknown_083DFEC4->unk87CA == 1; - gUnknown_083DFEC4->unkD162 = 11; + gPokenavStructPtr->unk87C8 = gPokenavStructPtr->unk87CA == 1; + gPokenavStructPtr->unkD162 = 11; break; case 1: Text_LoadWindowTemplate(&gWindowTemplate_81E70D4); @@ -4745,7 +4745,7 @@ bool8 sub_80F02A0(void) LoadPalette(gUnknown_083E02B4, 0xF0, 0x20); LoadPalette(gUnknown_083E0334, 0x40, 0x20); - if (gUnknown_083DFEC4->unk87CA == 0) + if (gPokenavStructPtr->unk87CA == 0) { LoadPalette(gPokenavConditionSearch2_Pal, 0x30, 0x20); gPlttBufferUnfaded[0] = gPokenavConditionSearch2_Pal[5]; @@ -4754,7 +4754,7 @@ bool8 sub_80F02A0(void) LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); LoadPalette(&gPokenavConditionSearch2_Pal[5], 0xBF, 0x2); } - else if (gUnknown_083DFEC4->unk87CA == 1) + else if (gPokenavStructPtr->unk87CA == 1) { LoadPalette(gUnknown_083E0274, 0x30, 0x20); gPlttBufferUnfaded[0] = gUnknown_083E0274[5]; @@ -4775,7 +4775,7 @@ bool8 sub_80F02A0(void) } break; case 8: - if (gUnknown_083DFEC4->unk87CA != 2) + if (gPokenavStructPtr->unk87CA != 2) { sub_8095C8C((void *)VRAM + 0xE800, 0, 5, gUnknown_08E9FD1C, 0, 0, 9, 4, 9); } @@ -4801,14 +4801,14 @@ bool8 sub_80F02A0(void) } break; case 13: - if (gUnknown_083DFEC4->unk87CA != 2) + if (gPokenavStructPtr->unk87CA != 2) { ShowMapNamePopUpWindow(); } else { sub_80F081C(0); - sub_80F0FFC((u8)gUnknown_083DFEC4->unk876E); + sub_80F0FFC((u8)gPokenavStructPtr->unk876E); } break; case 14: @@ -4817,17 +4817,17 @@ bool8 sub_80F02A0(void) REG_BG0CNT = 0x1F01; REG_BG3VOFS = 0xF8; - gUnknown_083DFEC4->unk8776 = 0xF8; - gUnknown_083DFEC4->unk8778 = 0; + gPokenavStructPtr->unk8776 = 0xF8; + gPokenavStructPtr->unk8778 = 0; REG_BLDCNT = 0; - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return FALSE; default: return FALSE; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; } @@ -4837,25 +4837,25 @@ void sub_80F063C(s16 arg0) s16 var1; s16 var2; - gUnknown_083DFEC4->unk877C = arg0 * 16; - gUnknown_083DFEC4->unk877A = (arg0 == 1 || arg0 == -1) ? 4 : 8; + gPokenavStructPtr->unk877C = arg0 * 16; + gPokenavStructPtr->unk877A = (arg0 == 1 || arg0 == -1) ? 4 : 8; if (arg0 < 0) { - gUnknown_083DFEC4->unk877A *= -1; - var0 = arg0 * 2 + gUnknown_083DFEC4->unk8778; - var1 = arg0 + gUnknown_083DFEC4->unk8770; + gPokenavStructPtr->unk877A *= -1; + var0 = arg0 * 2 + gPokenavStructPtr->unk8778; + var1 = arg0 + gPokenavStructPtr->unk8770; if (var1 < 0) - var1 += gUnknown_083DFEC4->unk8774 + 1; + var1 += gPokenavStructPtr->unk8774 + 1; arg0 *= -1; } else { - var0 = gUnknown_083DFEC4->unk8778 + 16; - var1 = gUnknown_083DFEC4->unk8772 + 1; + var0 = gPokenavStructPtr->unk8778 + 16; + var1 = gPokenavStructPtr->unk8772 + 1; } - if (var1 > gUnknown_083DFEC4->unk8774) + if (var1 > gPokenavStructPtr->unk8774) var1 = 0; var2 = var0 & 0x1F; @@ -4866,16 +4866,16 @@ static bool8 sub_80F0718(void) { if (!sub_80F098C()) { - if (gUnknown_083DFEC4->unk877C == 0) + if (gPokenavStructPtr->unk877C == 0) return FALSE; - gUnknown_083DFEC4->unk877C -= gUnknown_083DFEC4->unk877A; - gUnknown_083DFEC4->unk8776 += gUnknown_083DFEC4->unk877A; - gUnknown_083DFEC4->unk8776 &= 0xFF; - REG_BG3VOFS = gUnknown_083DFEC4->unk8776; - if (gUnknown_083DFEC4->unk877C == 0) + gPokenavStructPtr->unk877C -= gPokenavStructPtr->unk877A; + gPokenavStructPtr->unk8776 += gPokenavStructPtr->unk877A; + gPokenavStructPtr->unk8776 &= 0xFF; + REG_BG3VOFS = gPokenavStructPtr->unk8776; + if (gPokenavStructPtr->unk877C == 0) { - gUnknown_083DFEC4->unk8778 = ((8 + gUnknown_083DFEC4->unk8776) & 0xFF) / 8; + gPokenavStructPtr->unk8778 = ((8 + gPokenavStructPtr->unk8776) & 0xFF) / 8; return FALSE; } } @@ -4885,20 +4885,20 @@ static bool8 sub_80F0718(void) static void ShowMapNamePopUpWindow(void) { - switch (gUnknown_083DFEC4->unk87CA) + switch (gPokenavStructPtr->unk87CA) { case 0: - sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk876E].unk2); + sub_80F443C(gPokenavStructPtr->unk8788, gPokenavStructPtr->unk893c[gPokenavStructPtr->unk876E].unk2); break; case 1: - sub_80F445C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk876E + 1); + sub_80F445C(gPokenavStructPtr->unk8788, gPokenavStructPtr->unk876E + 1); break; default: return; } BasicInitMenuWindow(&gWindowTemplate_81E710C); - Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 6); + Menu_PrintText(gPokenavStructPtr->unk8788, 1, 6); } void sub_80F081C(u8 arg0) @@ -4916,11 +4916,11 @@ void sub_80F081C(u8 arg0) // fall through case 2: ConvertIntToDecimalStringN( - gUnknown_083DFEC4->unk8788, - gUnknown_083DFEC4->unk8774 + 1, + gPokenavStructPtr->unk8788, + gPokenavStructPtr->unk8774 + 1, STR_CONV_MODE_RIGHT_ALIGN, 5); - MenuPrint_RightAligned(gUnknown_083DFEC4->unk8788, 10, 11); + MenuPrint_RightAligned(gPokenavStructPtr->unk8788, 10, 11); if (arg0 != 0) break; // fall through @@ -4935,11 +4935,11 @@ void sub_80F081C(u8 arg0) numTrainerBattles = 99999; ConvertIntToDecimalStringN( - gUnknown_083DFEC4->unk8788, + gPokenavStructPtr->unk8788, numTrainerBattles, STR_CONV_MODE_RIGHT_ALIGN, 5); - MenuPrint_RightAligned(gUnknown_083DFEC4->unk8788, 10, 15); + MenuPrint_RightAligned(gPokenavStructPtr->unk8788, 10, 15); break; } } @@ -4952,11 +4952,11 @@ static void sub_80F08E4(void) void sub_80F0900(void) { - s16 var0 = (gUnknown_083DFEC4->unk8772 - gUnknown_083DFEC4->unk8770) + 1; + s16 var0 = (gPokenavStructPtr->unk8772 - gPokenavStructPtr->unk8770) + 1; if (var0 < 8) Menu_EraseWindowRect(12, 1, 31, 15); - sub_80F0954(gUnknown_083DFEC4->unk8770, 0, var0); + sub_80F0954(gPokenavStructPtr->unk8770, 0, var0); } bool8 sub_80F0944(void) @@ -4966,32 +4966,32 @@ bool8 sub_80F0944(void) static void sub_80F0954(u16 arg0, u16 arg1, u16 arg2) { - gUnknown_083DFEC4->unk877E = arg0; - gUnknown_083DFEC4->unk8780 = arg1; - gUnknown_083DFEC4->unk8784 = arg2; - gUnknown_083DFEC4->unk8786 = 0; + gPokenavStructPtr->unk877E = arg0; + gPokenavStructPtr->unk8780 = arg1; + gPokenavStructPtr->unk8784 = arg2; + gPokenavStructPtr->unk8786 = 0; } #ifdef NONMATCHING static bool8 sub_80F098C(void) { register u16 zero asm("r8"); - if (!gUnknown_083DFEC4->unk8784) + if (!gPokenavStructPtr->unk8784) { DONE: return FALSE; } zero = 0; - gUnknown_083E3270[gUnknown_083DFEC4->unk87CA](gUnknown_083DFEC4->unk877E, gUnknown_083DFEC4->unk8780); - if (!--gUnknown_083DFEC4->unk8784) + gUnknown_083E3270[gPokenavStructPtr->unk87CA](gPokenavStructPtr->unk877E, gPokenavStructPtr->unk8780); + if (!--gPokenavStructPtr->unk8784) goto DONE; - if ((++gUnknown_083DFEC4->unk877E & 0xFFFF) > gUnknown_083DFEC4->unk8774) - gUnknown_083DFEC4->unk877E = zero; + if ((++gPokenavStructPtr->unk877E & 0xFFFF) > gPokenavStructPtr->unk8774) + gPokenavStructPtr->unk877E = zero; - gUnknown_083DFEC4->unk8780 += 2; - gUnknown_083DFEC4->unk8780 &= 0x1F; + gPokenavStructPtr->unk8780 += 2; + gPokenavStructPtr->unk8780 &= 0x1F; return TRUE; } #else @@ -5002,7 +5002,7 @@ static bool8 sub_80F098C(void) push {r4-r7,lr}\n\ mov r7, r8\n\ push {r7}\n\ - ldr r0, _080F09A4 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F09A4 @ =gPokenavStructPtr\n\ ldr r6, [r0]\n\ ldr r0, _080F09A8 @ =0x00008784\n\ adds r7, r6, r0\n\ @@ -5013,7 +5013,7 @@ _080F09A0:\n\ movs r0, 0\n\ b _080F0A02\n\ .align 2, 0\n\ -_080F09A4: .4byte gUnknown_083DFEC4\n\ +_080F09A4: .4byte gPokenavStructPtr\n\ _080F09A8: .4byte 0x00008784\n\ _080F09AC:\n\ movs r1, 0\n\ @@ -5078,19 +5078,19 @@ _080F0A20: .4byte 0x00008774\n\ void sub_80F0A24(u16 arg0, u16 arg1) { - u8 var0 = gUnknown_083DFEC4->unk87C8 == 0 ? 2 : 1; - sub_80F4428(gUnknown_083DFEC4->unk8788, arg0, var0); + u8 var0 = gPokenavStructPtr->unk87C8 == 0 ? 2 : 1; + sub_80F4428(gPokenavStructPtr->unk8788, arg0, var0); BasicInitMenuWindow(&gWindowTemplate_81E70D4); - Menu_PrintText(gUnknown_083DFEC4->unk8788, 13, arg1); + Menu_PrintText(gPokenavStructPtr->unk8788, 13, arg1); } static void sub_80F0A74(u16 arg0, u16 arg1) { - sub_80F700C(gUnknown_083DFEC4->unk8788, arg0); + sub_80F700C(gPokenavStructPtr->unk8788, arg0); arg1 &= 0x1F; BasicInitMenuWindow(&gWindowTemplate_81E70D4); - Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, arg1 * 8, 0); - if (arg0 < gUnknown_083DFEC4->unkD158 && gUnknown_083DFEC4->unkCEE8[arg0].unk5) + Menu_PrintTextPixelCoords(gPokenavStructPtr->unk8788, 97, arg1 * 8, 0); + if (arg0 < gPokenavStructPtr->unkD158 && gPokenavStructPtr->trainersEye[arg0].rematchNo != 0) sub_8095C8C((void *)VRAM + 0xF000, 29, arg1, gUnknown_083E039C, 0, 0, 1, 2, 1); else sub_8095C8C((void *)VRAM + 0xF000, 29, arg1, gUnknown_083E03A0, 0, 0, 1, 2, 1); @@ -5098,48 +5098,48 @@ static void sub_80F0A74(u16 arg0, u16 arg1) static void sub_80F0B24(void) { - gUnknown_083DFEC4->unkD15C = 0; - gUnknown_083DFEC4->unk306 = 0; + gPokenavStructPtr->unkD15C = 0; + gPokenavStructPtr->unk306 = 0; } static bool8 sub_80F0B44(void) { int top; - if (gUnknown_083DFEC4->unkD15C > 8) + if (gPokenavStructPtr->unkD15C > 8) { return FALSE; } - if (++gUnknown_083DFEC4->unk306 > 1) + if (++gPokenavStructPtr->unk306 > 1) { - gUnknown_083DFEC4->unk306 = 0; - if (gUnknown_083DFEC4->unkD15C < 8) + gPokenavStructPtr->unk306 = 0; + if (gPokenavStructPtr->unkD15C < 8) { - top = (gUnknown_083DFEC4->unk8778 + (gUnknown_083DFEC4->unkD15C * 2)) & 0x1F; - if (gUnknown_083DFEC4->unkD15C != gUnknown_083DFEC4->unk876C) + top = (gPokenavStructPtr->unk8778 + (gPokenavStructPtr->unkD15C * 2)) & 0x1F; + if (gPokenavStructPtr->unkD15C != gPokenavStructPtr->unk876C) { BasicInitMenuWindow(&gWindowTemplate_81E70D4); Menu_EraseWindowRect(12, top, 31, top + 1); } - if (!gUnknown_083DFEC4->unkD15C) + if (!gPokenavStructPtr->unkD15C) sub_80F08E4(); - gUnknown_083DFEC4->unkD15C++; + gPokenavStructPtr->unkD15C++; return TRUE; } else { u16 i; BasicInitMenuWindow(&gWindowTemplate_81E70D4); - top = (gUnknown_083DFEC4->unk8778 + 16) & 0x1F; + top = (gPokenavStructPtr->unk8778 + 16) & 0x1F; for (i = 0; i < 8; i++) { Menu_EraseWindowRect(12, top, 31, top + 1); top = (top + 2) & 0x1F; } - gUnknown_083DFEC4->unkD15C++; + gPokenavStructPtr->unkD15C++; return FALSE; } } @@ -5151,29 +5151,29 @@ static bool8 sub_80F0B44(void) static void sub_80F0C28(void) { - gUnknown_083DFEC4->unkD15C = 0; - gUnknown_083DFEC4->unk306 = 0; + gPokenavStructPtr->unkD15C = 0; + gPokenavStructPtr->unk306 = 0; } static bool8 sub_80F0C48(void) { - if (gUnknown_083DFEC4->unkD15C > 7) + if (gPokenavStructPtr->unkD15C > 7) return FALSE; - if (++gUnknown_083DFEC4->unk306 > 1) + if (++gPokenavStructPtr->unk306 > 1) { - gUnknown_083DFEC4->unk306 = 0; + gPokenavStructPtr->unk306 = 0; BasicInitMenuWindow(&gWindowTemplate_81E70D4); - sub_80F0A74(gUnknown_083DFEC4->unk8770 + gUnknown_083DFEC4->unkD15C, - gUnknown_083DFEC4->unk8778 + gUnknown_083DFEC4->unkD15C * 2); + sub_80F0A74(gPokenavStructPtr->unk8770 + gPokenavStructPtr->unkD15C, + gPokenavStructPtr->unk8778 + gPokenavStructPtr->unkD15C * 2); - if ((++gUnknown_083DFEC4->unkD15C) > 7) + if ((++gPokenavStructPtr->unkD15C) > 7) { sub_80F081C(0); return FALSE; } } - + return TRUE; } @@ -5183,18 +5183,18 @@ void LoadTrainerEyesDescriptionLines(void) int trainerEyesId; const u8 *curChar; - gUnknown_083DFEC4->unk306 = 0; - gUnknown_083DFEC4->unkD15C = 0; - trainerEyesId = gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unk876E].unk4; - gUnknown_083DFEC4->trainerEyeDescriptionLines[0] = gTrainerEyeDescriptions[trainerEyesId]; + gPokenavStructPtr->unk306 = 0; + gPokenavStructPtr->unkD15C = 0; + trainerEyesId = gPokenavStructPtr->trainersEye[gPokenavStructPtr->unk876E].rematchTableIdx; + gPokenavStructPtr->trainerEyeDescriptionLines[0] = gTrainerEyeDescriptions[trainerEyesId]; // Find the start of the 3 other lines in the Trainer's Eyes description. - curChar = gUnknown_083DFEC4->trainerEyeDescriptionLines[0]; + curChar = gPokenavStructPtr->trainerEyeDescriptionLines[0]; for (i = 0; i < 3; i++) { while (*curChar != EOS) curChar++; - gUnknown_083DFEC4->trainerEyeDescriptionLines[i + 1] = ++curChar; + gPokenavStructPtr->trainerEyeDescriptionLines[i + 1] = ++curChar; } } @@ -5203,61 +5203,61 @@ void LoadTrainerEyesDescriptionLines(void) bool8 sub_80F0D5C(void) { int var0; - if (gUnknown_083DFEC4->unkD15C == 7) + if (gPokenavStructPtr->unkD15C == 7) return FALSE; - if (++gUnknown_083DFEC4->unk306 > 1) + if (++gPokenavStructPtr->unk306 > 1) { - gUnknown_083DFEC4->unk306 = 0; + gPokenavStructPtr->unk306 = 0; BasicInitMenuWindow(&gWindowTemplate_81E70D4); - var0 = (gUnknown_083DFEC4->unk8778 + 2 + gUnknown_083DFEC4->unkD15C * 2) & 0x1F; - switch (gUnknown_083DFEC4->unkD15C) + var0 = (gPokenavStructPtr->unk8778 + 2 + gPokenavStructPtr->unkD15C * 2) & 0x1F; + switch (gPokenavStructPtr->unkD15C) { case 0: Menu_PrintTextPixelCoords(gOtherText_Strategy, 97, var0 * 8, 0); break; case 1: AlignStringInMenuWindow( - gUnknown_083DFEC4->unk8788, - gUnknown_083DFEC4->trainerEyeDescriptionLines[0], + gPokenavStructPtr->unk8788, + gPokenavStructPtr->trainerEyeDescriptionLines[0], 136, 0); - Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + Menu_PrintTextPixelCoords(gPokenavStructPtr->unk8788, 97, var0 * 8, 0); break; case 2: Menu_PrintTextPixelCoords(gOtherText_TrainersPokemon, 97, var0 * 8, 0); break; case 3: AlignStringInMenuWindow( - gUnknown_083DFEC4->unk8788, - gUnknown_083DFEC4->trainerEyeDescriptionLines[1], + gPokenavStructPtr->unk8788, + gPokenavStructPtr->trainerEyeDescriptionLines[1], 136, 0); - Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + Menu_PrintTextPixelCoords(gPokenavStructPtr->unk8788, 97, var0 * 8, 0); break; case 4: Menu_PrintTextPixelCoords(gOtherText_SelfIntroduction, 97, var0 * 8, 0); break; case 5: AlignStringInMenuWindow( - gUnknown_083DFEC4->unk8788, - gUnknown_083DFEC4->trainerEyeDescriptionLines[2], + gPokenavStructPtr->unk8788, + gPokenavStructPtr->trainerEyeDescriptionLines[2], 136, 0); - Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + Menu_PrintTextPixelCoords(gPokenavStructPtr->unk8788, 97, var0 * 8, 0); break; case 6: AlignStringInMenuWindow( - gUnknown_083DFEC4->unk8788, - gUnknown_083DFEC4->trainerEyeDescriptionLines[3], + gPokenavStructPtr->unk8788, + gPokenavStructPtr->trainerEyeDescriptionLines[3], 136, 0); - Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0); + Menu_PrintTextPixelCoords(gPokenavStructPtr->unk8788, 97, var0 * 8, 0); default: return FALSE; } - gUnknown_083DFEC4->unkD15C++; + gPokenavStructPtr->unkD15C++; return TRUE; } else @@ -5271,7 +5271,7 @@ bool8 sub_80F0D5C(void) { asm(".syntax unified\n\ push {r4,r5,lr}\n\ - ldr r0, _080F0D70 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F0D70 @ =gPokenavStructPtr\n\ ldr r4, [r0]\n\ ldr r0, _080F0D74 @ =0x0000d15c\n\ adds r5, r4, r0\n\ @@ -5282,7 +5282,7 @@ _080F0D6C:\n\ movs r0, 0\n\ b _080F0EB0\n\ .align 2, 0\n\ -_080F0D70: .4byte gUnknown_083DFEC4\n\ +_080F0D70: .4byte gPokenavStructPtr\n\ _080F0D74: .4byte 0x0000d15c\n\ _080F0D78:\n\ ldr r0, _080F0DB8 @ =0x00000306\n\ @@ -5337,14 +5337,14 @@ _080F0DE4:\n\ .align 2, 0\n\ _080F0DEC: .4byte gOtherText_Strategy\n\ _080F0DF0:\n\ - ldr r0, _080F0DFC @ =gUnknown_083DFEC4\n\ + ldr r0, _080F0DFC @ =gPokenavStructPtr\n\ ldr r0, [r0]\n\ ldr r1, _080F0E00 @ =0x00008788\n\ adds r4, r0, r1\n\ ldr r1, _080F0E04 @ =0x0000d110\n\ b _080F0E42\n\ .align 2, 0\n\ -_080F0DFC: .4byte gUnknown_083DFEC4\n\ +_080F0DFC: .4byte gPokenavStructPtr\n\ _080F0E00: .4byte 0x00008788\n\ _080F0E04: .4byte 0x0000d110\n\ _080F0E08:\n\ @@ -5354,14 +5354,14 @@ _080F0E08:\n\ .align 2, 0\n\ _080F0E10: .4byte gOtherText_TrainersPokemon\n\ _080F0E14:\n\ - ldr r0, _080F0E20 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F0E20 @ =gPokenavStructPtr\n\ ldr r0, [r0]\n\ ldr r1, _080F0E24 @ =0x00008788\n\ adds r4, r0, r1\n\ ldr r1, _080F0E28 @ =0x0000d114\n\ b _080F0E42\n\ .align 2, 0\n\ -_080F0E20: .4byte gUnknown_083DFEC4\n\ +_080F0E20: .4byte gPokenavStructPtr\n\ _080F0E24: .4byte 0x00008788\n\ _080F0E28: .4byte 0x0000d114\n\ _080F0E2C:\n\ @@ -5371,7 +5371,7 @@ _080F0E2C:\n\ .align 2, 0\n\ _080F0E34: .4byte gOtherText_SelfIntroduction\n\ _080F0E38:\n\ - ldr r0, _080F0E60 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F0E60 @ =gPokenavStructPtr\n\ ldr r0, [r0]\n\ ldr r1, _080F0E64 @ =0x00008788\n\ adds r4, r0, r1\n\ @@ -5391,11 +5391,11 @@ _080F0E54:\n\ bl Menu_PrintTextPixelCoords\n\ b _080F0EA0\n\ .align 2, 0\n\ -_080F0E60: .4byte gUnknown_083DFEC4\n\ +_080F0E60: .4byte gPokenavStructPtr\n\ _080F0E64: .4byte 0x00008788\n\ _080F0E68: .4byte 0x0000d118\n\ _080F0E6C:\n\ - ldr r0, _080F0E94 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F0E94 @ =gPokenavStructPtr\n\ ldr r0, [r0]\n\ ldr r1, _080F0E98 @ =0x00008788\n\ adds r4, r0, r1\n\ @@ -5413,11 +5413,11 @@ _080F0E6C:\n\ bl Menu_PrintTextPixelCoords\n\ b _080F0D6C\n\ .align 2, 0\n\ -_080F0E94: .4byte gUnknown_083DFEC4\n\ +_080F0E94: .4byte gPokenavStructPtr\n\ _080F0E98: .4byte 0x00008788\n\ _080F0E9C: .4byte 0x0000d11c\n\ _080F0EA0:\n\ - ldr r0, _080F0EB8 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F0EB8 @ =gPokenavStructPtr\n\ ldr r1, [r0]\n\ ldr r0, _080F0EBC @ =0x0000d15c\n\ adds r1, r0\n\ @@ -5431,7 +5431,7 @@ _080F0EB0:\n\ pop {r1}\n\ bx r1\n\ .align 2, 0\n\ -_080F0EB8: .4byte gUnknown_083DFEC4\n\ +_080F0EB8: .4byte gPokenavStructPtr\n\ _080F0EBC: .4byte 0x0000d15c\n\ .syntax divided\n"); } @@ -5439,24 +5439,24 @@ _080F0EBC: .4byte 0x0000d15c\n\ static void sub_80F0EC0(void) { - gUnknown_083DFEC4->unk306 = 0; - gUnknown_083DFEC4->unkD15C = 0; - StringFill(gUnknown_083DFEC4->unk8788, CHAR_SPACE, 16); + gPokenavStructPtr->unk306 = 0; + gPokenavStructPtr->unkD15C = 0; + StringFill(gPokenavStructPtr->unk8788, CHAR_SPACE, 16); } static bool8 sub_80F0EF4(void) { int top; - if (gUnknown_083DFEC4->unkD15C > 6) + if (gPokenavStructPtr->unkD15C > 6) return FALSE; - if (++gUnknown_083DFEC4->unk306 > 1) + if (++gPokenavStructPtr->unk306 > 1) { - gUnknown_083DFEC4->unk306 = 0; - top = (gUnknown_083DFEC4->unk8778 + 2 + gUnknown_083DFEC4->unkD15C * 2) & 0x1F; + gPokenavStructPtr->unk306 = 0; + top = (gPokenavStructPtr->unk8778 + 2 + gPokenavStructPtr->unkD15C * 2) & 0x1F; BasicInitMenuWindow(&gWindowTemplate_81E70D4); Menu_EraseWindowRect(12, top, 31, top + 1); - gUnknown_083DFEC4->unkD15C++; + gPokenavStructPtr->unkD15C++; } return TRUE; @@ -5464,16 +5464,16 @@ static bool8 sub_80F0EF4(void) static void sub_80F0F64(void) { - s16 var0 = gUnknown_083DFEC4->unk876C; - gUnknown_083DFEC4->unk877C = var0 * 16; - gUnknown_083DFEC4->unk877A = var0 == 1 ? 4 : 8; + s16 var0 = gPokenavStructPtr->unk876C; + gPokenavStructPtr->unk877C = var0 * 16; + gPokenavStructPtr->unk877A = var0 == 1 ? 4 : 8; } static void sub_80F0FA0(void) { - s16 var0 = gUnknown_083DFEC4->unk876C * -1; - gUnknown_083DFEC4->unk877C = var0 * 16; - gUnknown_083DFEC4->unk877A = var0 == -1 ? -4 : -8; + s16 var0 = gPokenavStructPtr->unk876C * -1; + gPokenavStructPtr->unk877C = var0 * 16; + gPokenavStructPtr->unk877A = var0 == -1 ? -4 : -8; } static bool8 sub_80F0FEC(void) @@ -5483,25 +5483,25 @@ static bool8 sub_80F0FEC(void) void sub_80F0FFC(u8 arg0) { - GetMapSectionName(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unkCEE8[arg0].unk2, 0); + GetMapSectionName(gPokenavStructPtr->unk8788, gPokenavStructPtr->trainersEye[arg0].regionMapSectionId, 0); BasicInitMenuWindow(&gWindowTemplate_81E710C); - sub_80F19DC(gUnknown_083DFEC4->unk8788); - AlignStringInMenuWindow(gUnknown_083DFEC4->unkD138, gUnknown_083DFEC4->unk8788, 88, 2); - Menu_PrintText(gUnknown_083DFEC4->unkD138, 0, 5); + sub_80F19DC(gPokenavStructPtr->unk8788); + AlignStringInMenuWindow(gPokenavStructPtr->unkD138, gPokenavStructPtr->unk8788, 88, 2); + Menu_PrintText(gPokenavStructPtr->unkD138, 0, 5); } void sub_80F105C(void) { - sub_80F0A74(gUnknown_083DFEC4->unk876E, gUnknown_083DFEC4->unk8778); + sub_80F0A74(gPokenavStructPtr->unk876E, gPokenavStructPtr->unk8778); } static bool8 sub_80F1080(void) { - switch (gUnknown_083DFEC4->unkD160) + switch (gPokenavStructPtr->unkD160) { case 0: sub_80EEDE8(); - gUnknown_083DFEC4->unkD162 = 11; + gPokenavStructPtr->unkD162 = 11; break; case 1: Text_LoadWindowTemplate(&gWindowTemplate_81E70B8); @@ -5524,7 +5524,7 @@ static bool8 sub_80F1080(void) return TRUE; break; case 7: - LZ77UnCompWram(gUnknown_08E9FBA0, gUnknown_083DFEC4->unk934C); + LZ77UnCompWram(gUnknown_08E9FBA0, gPokenavStructPtr->unk934C); break; case 8: DrawMonRibbonIcons(); @@ -5552,13 +5552,13 @@ static bool8 sub_80F1080(void) REG_BG2CNT = 0x1E02; REG_BG3CNT = 0x170B; REG_BLDCNT = 0; - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return FALSE; default: return FALSE; } - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return TRUE; } @@ -5568,22 +5568,22 @@ void DrawMonRibbonIcons(void) u16 offset; u8 index, palette, tile; u8 var0; - + offset = 0x8B; - var0 = gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F; + var0 = gPokenavStructPtr->unkBC8E - gPokenavStructPtr->unkBC8F; for (i = 0; i < 8; i++) - CpuFill16(0x2000, &gUnknown_083DFEC4->unk934C[offset + i * 32], 0x24); + CpuFill16(0x2000, &gPokenavStructPtr->unk934C[offset + i * 32], 0x24); for (i = 0; i < var0; i++) { - index = gUnknown_083DFEC4->unkBC4C[i]; + index = gPokenavStructPtr->unkBC4C[i]; palette = gPokenavRibbonsIconGfx[index][1] + 3; tile = gPokenavRibbonsIconGfx[index][0] * 2 + 0x10; - gUnknown_083DFEC4->unk934C[offset] = (palette << 12) | tile; - gUnknown_083DFEC4->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile; - gUnknown_083DFEC4->unk934C[offset + 0x20] = (palette << 12) | (tile + 1); - gUnknown_083DFEC4->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1); + gPokenavStructPtr->unk934C[offset] = (palette << 12) | tile; + gPokenavStructPtr->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile; + gPokenavStructPtr->unk934C[offset + 0x20] = (palette << 12) | (tile + 1); + gPokenavStructPtr->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1); if ((i + 1) % 9 == 0) offset += 0x30; @@ -5592,15 +5592,15 @@ void DrawMonRibbonIcons(void) } offset = 0x14B; - for (i = 0; i < gUnknown_083DFEC4->unkBC8F; i++) + for (i = 0; i < gPokenavStructPtr->unkBC8F; i++) { - index = gUnknown_083DFEC4->unkBC4C[var0 + i]; + index = gPokenavStructPtr->unkBC4C[var0 + i]; palette = gPokenavRibbonsIconGfx[index][1] + 3; tile = gPokenavRibbonsIconGfx[index][0] * 2 + 0x10; - gUnknown_083DFEC4->unk934C[offset] = (palette << 12) | tile; - gUnknown_083DFEC4->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile; - gUnknown_083DFEC4->unk934C[offset + 0x20] = (palette << 12) | (tile + 1); - gUnknown_083DFEC4->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1); + gPokenavStructPtr->unk934C[offset] = (palette << 12) | tile; + gPokenavStructPtr->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile; + gPokenavStructPtr->unk934C[offset + 0x20] = (palette << 12) | (tile + 1); + gPokenavStructPtr->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1); offset += 2; } @@ -5608,7 +5608,7 @@ void DrawMonRibbonIcons(void) void sub_80F13FC(void) { - u16 *src = gUnknown_083DFEC4->unk934C; + u16 *src = gPokenavStructPtr->unk934C; u16 *dest = (u16 *)(VRAM + 0xB800); DmaCopy32(3, src, dest, 0x500); gPlttBufferUnfaded[0] = *(gPokenavRibbonView_Pal + 14); @@ -5616,9 +5616,9 @@ void sub_80F13FC(void) void sub_80F1438(void) { - Menu_PrintText(gUnknown_083DFEC4->unk8829[0], 13, 1); - sub_80F445C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk876E + 1); - Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 5); + Menu_PrintText(gPokenavStructPtr->unk8829[0], 13, 1); + sub_80F445C(gPokenavStructPtr->unk8788, gPokenavStructPtr->unk876E + 1); + Menu_PrintText(gPokenavStructPtr->unk8788, 1, 5); } void sub_80F1480(void) @@ -5637,17 +5637,17 @@ static void sub_80F1494(void) u8 *tileBuffer1 = &gUnknown_083DFEC8[0x800]; u8 *tileBuffer2 = &gUnknown_083DFEC8[0xA98]; - if (gUnknown_083DFEC4->unkBC91 < 3) + if (gPokenavStructPtr->unkBC91 < 3) { - gUnknown_020388B4 = gUnknown_083DFEC4->unkBC91 * 9 + gUnknown_083DFEC4->unkBC90; - gUnknown_020388B4 = gUnknown_083DFEC4->unkBC4C[gUnknown_020388B4]; + gUnknown_020388B4 = gPokenavStructPtr->unkBC91 * 9 + gPokenavStructPtr->unkBC90; + gUnknown_020388B4 = gPokenavStructPtr->unkBC4C[gUnknown_020388B4]; AlignStringInMenuWindow(tileBuffer1, gRibbonDescriptions[gUnknown_020388B4][0], 128, 0); AlignStringInMenuWindow(tileBuffer2, gRibbonDescriptions[gUnknown_020388B4][1], 128, 0); } else { - gUnknown_020388B4 = gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F; - gUnknown_020388B4 = gUnknown_083DFEC4->unkBC4C[gUnknown_020388B4 + gUnknown_083DFEC4->unkBC90]; + gUnknown_020388B4 = gPokenavStructPtr->unkBC8E - gPokenavStructPtr->unkBC8F; + gUnknown_020388B4 = gPokenavStructPtr->unkBC4C[gUnknown_020388B4 + gPokenavStructPtr->unkBC90]; // FIXME! arr = ((u8*)&gSaveBlock1); @@ -5677,26 +5677,26 @@ static void sub_80F15A8(void) { u8 *buffer; Menu_EraseWindowRect(12, 13, 27, 16); - buffer = StringCopy(gUnknown_083DFEC4->unk8788, gOtherText_Ribbons); + buffer = StringCopy(gPokenavStructPtr->unk8788, gOtherText_Ribbons); buffer[0] = CHAR_SPACE; buffer++; buffer = ConvertIntToDecimalStringN( buffer, - gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk0, + gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].unk0, STR_CONV_MODE_LEFT_ALIGN, 2); buffer[0] = EOS; - Menu_PrintText(gUnknown_083DFEC4->unk8788, 12, 13); + Menu_PrintText(gPokenavStructPtr->unk8788, 12, 13); } void sub_80F1614(void) { - gUnknown_083DFEC4->unk8764 = 0; + gPokenavStructPtr->unk8764 = 0; } bool8 sub_80F162C(u8 arg0) { - switch (gUnknown_083DFEC4->unk8764) + switch (gPokenavStructPtr->unk8764) { case 0: break; @@ -5712,43 +5712,43 @@ bool8 sub_80F162C(u8 arg0) else LoadPalette(gUnknown_083E0144, 0xD0, 0x20); - gUnknown_083DFEC4->unk8766 = -80; + gPokenavStructPtr->unk8766 = -80; REG_BG0CNT = 0x1D0D; - gUnknown_083DFEC4->unk8764++; + gPokenavStructPtr->unk8764++; return FALSE; default: return FALSE; } - gUnknown_083DFEC4->unk8764++; + gPokenavStructPtr->unk8764++; return TRUE; } bool8 sub_80F170C(void) { - gUnknown_083DFEC4->unk8766 += 0x10; - if (gUnknown_083DFEC4->unk8766 > 0) - gUnknown_083DFEC4->unk8766 = 0; + gPokenavStructPtr->unk8766 += 0x10; + if (gPokenavStructPtr->unk8766 > 0) + gPokenavStructPtr->unk8766 = 0; - return gUnknown_083DFEC4->unk8766 != 0; + return gPokenavStructPtr->unk8766 != 0; } bool8 sub_80F173C(void) { - gUnknown_083DFEC4->unk8766 -= 0x10; - if (gUnknown_083DFEC4->unk8766 < -0x50) - gUnknown_083DFEC4->unk8766 = -0x50; + gPokenavStructPtr->unk8766 -= 0x10; + if (gPokenavStructPtr->unk8766 < -0x50) + gPokenavStructPtr->unk8766 = -0x50; - return gUnknown_083DFEC4->unk8766 != -0x50; + return gPokenavStructPtr->unk8766 != -0x50; } bool8 sub_80F1778(void) { - switch (gUnknown_083DFEC4->unkD160) + switch (gPokenavStructPtr->unkD160) { case 0: sub_80EEDE8(); - gUnknown_083DFEC4->unkD162 = 2; + gPokenavStructPtr->unkD162 = 2; break; case 1: sub_80F1614(); @@ -5779,7 +5779,7 @@ bool8 sub_80F1778(void) sub_80F01A4(); break; case 8: - sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + sub_80F01E0(gPokenavStructPtr->unk8fe9); break; case 9: REG_BG3CNT = 0x1E03; @@ -5791,16 +5791,16 @@ bool8 sub_80F1778(void) return FALSE; } - gUnknown_083DFEC4->unkD160++; + gPokenavStructPtr->unkD160++; return TRUE; } void sub_80F1934(void) { - u8 *buffer = gUnknown_083DFEC4->unk8788; - if (gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4) + u8 *buffer = gPokenavStructPtr->unk8788; + if (gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].unk4) { - u8 nature = GetNature(&gPlayerParty[sub_8137124(gUnknown_083DFEC4->unk87DC)]); + u8 nature = GetNature(&gPlayerParty[sub_8137124(gPokenavStructPtr->unk87DC)]); buffer = StringCopy(buffer, gOtherText_Nature2); AlignStringInMenuWindow(buffer, gNatureNames[nature], 87, 0); } @@ -5809,7 +5809,7 @@ void sub_80F1934(void) AlignStringInMenuWindow(buffer, gEmptyString_81E72B0, 87, 0); } - Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 1, 112, 1); + Menu_PrintTextPixelCoords(gPokenavStructPtr->unk8788, 1, 112, 1); } static void sub_80F19DC(u8 *text) @@ -5833,8 +5833,8 @@ static void sub_80F19FC(void) if (ptr[0] == 1) { const u8 *landmarkName = GetLandmarkName( - gUnknown_083DFEC4->regionMap.mapSectionId, - gUnknown_083DFEC4->regionMap.everGrandeCityArea, + gPokenavStructPtr->regionMap.mapSectionId, + gPokenavStructPtr->regionMap.everGrandeCityArea, ptr[1]); if (landmarkName) @@ -5862,8 +5862,8 @@ static void sub_80F1A80(void) static void sub_80F1A90(void) { - gUnknown_083DFEC4->unk306 = 0; - if (gUnknown_083DFEC4->unk6DAC == 0) + gPokenavStructPtr->unk306 = 0; + if (gPokenavStructPtr->unk6DAC == 0) while (sub_80F1AC4()); } @@ -5871,36 +5871,36 @@ static bool8 sub_80F1AC4(void) { u16 i, j; - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: for (i = 0; i < 6; i++) { for (j = 0; j < 4; j++) - gUnknown_083DFEC4->unk320[i][j] = NULL; + gPokenavStructPtr->unk320[i][j] = NULL; } - gUnknown_083DFEC4->unk311 = 0; + gPokenavStructPtr->unk311 = 0; break; case 1: - LZ77UnCompWram(gPokenavMenuOptions_Gfx, gUnknown_083DFEC4->unk388); + LZ77UnCompWram(gPokenavMenuOptions_Gfx, gPokenavStructPtr->unk388); break; case 2: - LZ77UnCompWram(gPokenavConditionMenu_Gfx, gUnknown_083DFEC4->unk1788); + LZ77UnCompWram(gPokenavConditionMenu_Gfx, gPokenavStructPtr->unk1788); break; case 3: - LZ77UnCompWram(gPokenavConditionSearch_Gfx, gUnknown_083DFEC4->unk2388); + LZ77UnCompWram(gPokenavConditionSearch_Gfx, gPokenavStructPtr->unk2388); return FALSE; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; } static void sub_80F1B8C(u8 arg0) { - gUnknown_083DFEC4->unk306 = 0; - if (gUnknown_083DFEC4->unk6DAC == 0) + gPokenavStructPtr->unk306 = 0; + if (gPokenavStructPtr->unk6DAC == 0) while (sub_80F1BC8(arg0)); } @@ -5915,7 +5915,7 @@ static bool8 sub_80F1BC8(u8 arg0) u16 middle; u8 spriteId; - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: sub_80F2458(arg0); @@ -5929,38 +5929,38 @@ static bool8 sub_80F1BC8(u8 arg0) case 0: topOffset = 42; height = 20; - gUnknown_083DFEC4->unk30E = 5; + gPokenavStructPtr->unk30E = 5; break; case 1: topOffset = 56; height = 20; - gUnknown_083DFEC4->unk30E = 3; + gPokenavStructPtr->unk30E = 3; break; case 2: topOffset = 40; height = 16; - gUnknown_083DFEC4->unk30E = 6; + gPokenavStructPtr->unk30E = 6; break; default: return FALSE; } animNum = 0; - for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + for (i = 0; i < gPokenavStructPtr->unk30E; i++) { middle = (height * i) + topOffset - 8; - gUnknown_083DFEC4->unk314[i] = (middle << 8) | (middle + 0x11); + gPokenavStructPtr->unk314[i] = (middle << 8) | (middle + 0x11); if (!arg0) { - if (gUnknown_083DFEC4->unk6DB2[i] == 0) + if (gPokenavStructPtr->unk6DB2[i] == 0) { for (j = 0; j < 4; j++) - gUnknown_083DFEC4->unk320[i][j] = NULL; + gPokenavStructPtr->unk320[i][j] = NULL; continue; } else { - animNum = (gUnknown_083DFEC4->unk6DB2[i] - 1) * 4; + animNum = (gPokenavStructPtr->unk6DB2[i] - 1) * 4; } } @@ -5969,15 +5969,15 @@ static bool8 sub_80F1BC8(u8 arg0) spriteId = CreateSprite(&gSpriteTemplate_83E4454, j * 32 + 256, (height * i) + topOffset, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk320[i][j] = &gSprites[spriteId]; - gUnknown_083DFEC4->unk320[i][j]->data[0] = i; - gUnknown_083DFEC4->unk320[i][j]->data[1] = j; - gUnknown_083DFEC4->unk320[i][j]->data[2] = j * 32 + 152; - gUnknown_083DFEC4->unk320[i][j]->data[3] = j * 32 + 256; - StartSpriteAnim(gUnknown_083DFEC4->unk320[i][j], animNum++); + gPokenavStructPtr->unk320[i][j] = &gSprites[spriteId]; + gPokenavStructPtr->unk320[i][j]->data[0] = i; + gPokenavStructPtr->unk320[i][j]->data[1] = j; + gPokenavStructPtr->unk320[i][j]->data[2] = j * 32 + 152; + gPokenavStructPtr->unk320[i][j]->data[3] = j * 32 + 256; + StartSpriteAnim(gPokenavStructPtr->unk320[i][j], animNum++); if ((arg0 == 2 || arg0 == 0) && i > 2) - gUnknown_083DFEC4->unk320[i][j]->oam.paletteNum = IndexOfSpritePaletteTag(0x1); + gPokenavStructPtr->unk320[i][j]->oam.paletteNum = IndexOfSpritePaletteTag(0x1); } } } @@ -5986,7 +5986,7 @@ static bool8 sub_80F1BC8(u8 arg0) return FALSE; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; } #else @@ -6003,7 +6003,7 @@ static bool8 sub_80F1BC8(u8 arg0) lsls r0, 24\n\ lsrs r0, 24\n\ mov r9, r0\n\ - ldr r1, _080F1BF4 @ =gUnknown_083DFEC4\n\ + ldr r1, _080F1BF4 @ =gPokenavStructPtr\n\ ldr r2, [r1]\n\ ldr r3, _080F1BF8 @ =0x00000306\n\ adds r0, r2, r3\n\ @@ -6017,7 +6017,7 @@ static bool8 sub_80F1BC8(u8 arg0) beq _080F1C02\n\ b _080F1DC4\n\ .align 2, 0\n\ -_080F1BF4: .4byte gUnknown_083DFEC4\n\ +_080F1BF4: .4byte gPokenavStructPtr\n\ _080F1BF8: .4byte 0x00000306\n\ _080F1BFC:\n\ cmp r0, 0x2\n\ @@ -6121,7 +6121,7 @@ _080F1C7E:\n\ cmp r0, 0\n\ bne _080F1CE8\n\ movs r5, 0\n\ - ldr r0, _080F1CE4 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F1CE4 @ =gPokenavStructPtr\n\ ldr r0, [r0]\n\ lsls r2, 4\n\ movs r3, 0xC8\n\ @@ -6142,7 +6142,7 @@ _080F1CC8:\n\ .align 2, 0\n\ _080F1CDC: .4byte 0x0000030e\n\ _080F1CE0: .4byte 0x00006db2\n\ -_080F1CE4: .4byte gUnknown_083DFEC4\n\ +_080F1CE4: .4byte gPokenavStructPtr\n\ _080F1CE8:\n\ ldrb r0, [r1]\n\ subs r0, 0x1\n\ @@ -6171,7 +6171,7 @@ _080F1CFC:\n\ lsrs r3, r0, 24\n\ cmp r3, 0x40\n\ beq _080F1DC4\n\ - ldr r0, _080F1DB8 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F1DB8 @ =gPokenavStructPtr\n\ ldr r2, [r0]\n\ lsls r1, r5, 2\n\ mov r4, r8\n\ @@ -6236,7 +6236,7 @@ _080F1D92:\n\ lsls r0, 16\n\ lsrs r0, 16\n\ mov r8, r0\n\ - ldr r1, _080F1DB8 @ =gUnknown_083DFEC4\n\ + ldr r1, _080F1DB8 @ =gPokenavStructPtr\n\ ldr r0, [r1]\n\ ldr r4, _080F1DC0 @ =0x0000030e\n\ adds r0, r4\n\ @@ -6250,14 +6250,14 @@ _080F1DB0:\n\ b _080F1DC8\n\ .align 2, 0\n\ _080F1DB4: .4byte gSpriteTemplate_83E4454\n\ -_080F1DB8: .4byte gUnknown_083DFEC4\n\ +_080F1DB8: .4byte gPokenavStructPtr\n\ _080F1DBC: .4byte gSprites\n\ _080F1DC0: .4byte 0x0000030e\n\ _080F1DC4:\n\ movs r0, 0\n\ b _080F1DD8\n\ _080F1DC8:\n\ - ldr r0, _080F1DE8 @ =gUnknown_083DFEC4\n\ + ldr r0, _080F1DE8 @ =gPokenavStructPtr\n\ ldr r1, [r0]\n\ ldr r5, _080F1DEC @ =0x00000306\n\ adds r1, r5\n\ @@ -6275,7 +6275,7 @@ _080F1DD8:\n\ pop {r1}\n\ bx r1\n\ .align 2, 0\n\ -_080F1DE8: .4byte gUnknown_083DFEC4\n\ +_080F1DE8: .4byte gPokenavStructPtr\n\ _080F1DEC: .4byte 0x00000306\n\ .syntax divided\n"); } @@ -6284,12 +6284,12 @@ _080F1DEC: .4byte 0x00000306\n\ static void sub_80F1DF0(void) { u16 i, j; - for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + for (i = 0; i < gPokenavStructPtr->unk30E; i++) { for (j = 0; j < 4; j++) { - if (gUnknown_083DFEC4->unk320[i][j]) - gUnknown_083DFEC4->unk320[i][j]->callback = sub_80F2218; + if (gPokenavStructPtr->unk320[i][j]) + gPokenavStructPtr->unk320[i][j]->callback = sub_80F2218; } } @@ -6318,16 +6318,16 @@ static void sub_80F1E84(void) { u16 i, j; - gUnknown_083DFEC4->unk30F = 0; + gPokenavStructPtr->unk30F = 0; sub_80F2148(); - for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + for (i = 0; i < gPokenavStructPtr->unk30E; i++) { - if (i != gUnknown_083DFEC4->unk6DAD) + if (i != gPokenavStructPtr->unk6DAD) { for (j = 0; j < 4; j++) { - if (gUnknown_083DFEC4->unk320[i][j]) - gUnknown_083DFEC4->unk320[i][j]->callback = sub_80F2240; + if (gPokenavStructPtr->unk320[i][j]) + gPokenavStructPtr->unk320[i][j]->callback = sub_80F2240; } } } @@ -6337,14 +6337,14 @@ static bool8 sub_80F1F10(void) { u16 j; - switch (gUnknown_083DFEC4->unk30F) + switch (gPokenavStructPtr->unk30F) { case 0: if (sub_80F2360()) { for (j = 0; j < 4; j++) { - struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j]; + struct Sprite *sprite = gPokenavStructPtr->unk320[gPokenavStructPtr->unk6DAD][j]; sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; sprite->affineAnims = gSpriteAffineAnimTable_83E4450; InitSpriteAffineAnim(sprite); @@ -6355,7 +6355,7 @@ static bool8 sub_80F1F10(void) } sub_80F2170(); - gUnknown_083DFEC4->unk30F++; + gPokenavStructPtr->unk30F++; } break; case 1: @@ -6375,18 +6375,18 @@ static bool8 sub_80F1F10(void) static void sub_80F1FF0(void) { - if (gUnknown_083DFEC4->unk311 == 1) + if (gPokenavStructPtr->unk311 == 1) { - REG_WIN0V = gUnknown_083DFEC4->unk314[gUnknown_083DFEC4->unk6DAD]; - REG_BLDY = gSineTable[gUnknown_083DFEC4->unk312] >> 5; - gUnknown_083DFEC4->unk312 += 3; - gUnknown_083DFEC4->unk312 &= 0x7F; + REG_WIN0V = gPokenavStructPtr->unk314[gPokenavStructPtr->unk6DAD]; + REG_BLDY = gSineTable[gPokenavStructPtr->unk312] >> 5; + gPokenavStructPtr->unk312 += 3; + gPokenavStructPtr->unk312 &= 0x7F; } - else if (gUnknown_083DFEC4->unk311 == 2) + else if (gPokenavStructPtr->unk311 == 2) { - REG_BLDALPHA = gUnknown_083E42F8[gUnknown_083DFEC4->unk312]; - if (gUnknown_083DFEC4->unk312 < 15) - gUnknown_083DFEC4->unk312++; + REG_BLDALPHA = gUnknown_083E42F8[gPokenavStructPtr->unk312]; + if (gPokenavStructPtr->unk312 < 15) + gPokenavStructPtr->unk312++; } } @@ -6398,7 +6398,7 @@ static void sub_80F208C(void) static void sub_80F2098(void) { REG_WIN0H = 0x77F0; - REG_WIN0V = gUnknown_083DFEC4->unk314[gUnknown_083DFEC4->unk6DAD]; + REG_WIN0V = gPokenavStructPtr->unk314[gPokenavStructPtr->unk6DAD]; REG_WININ = 0x3F; REG_WINOUT = 0x1F; REG_DISPCNT |= DISPCNT_WIN0_ON; @@ -6411,10 +6411,10 @@ static void sub_80F20F4(void) static void sub_80F2108(void) { - if (!gUnknown_083DFEC4->unk311) + if (!gPokenavStructPtr->unk311) { - gUnknown_083DFEC4->unk311 = 1; - gUnknown_083DFEC4->unk312 = 0; + gPokenavStructPtr->unk311 = 1; + gPokenavStructPtr->unk312 = 0; REG_BLDCNT = 0x90; REG_BLDY = 0; sub_80F2098(); @@ -6423,7 +6423,7 @@ static void sub_80F2108(void) static void sub_80F2148(void) { - gUnknown_083DFEC4->unk311 = 0; + gPokenavStructPtr->unk311 = 0; REG_BLDCNT = 0; sub_80F20F4(); } @@ -6432,17 +6432,17 @@ static void sub_80F2170(void) { u16 j; - if (!gUnknown_083DFEC4->unk311) + if (!gPokenavStructPtr->unk311) { sub_80F20F4(); for (j = 0; j < 4; j++) { - struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j]; + struct Sprite *sprite = gPokenavStructPtr->unk320[gPokenavStructPtr->unk6DAD][j]; sprite->oam.objMode = ST_OAM_OBJ_BLEND; } - gUnknown_083DFEC4->unk311 = 2; - gUnknown_083DFEC4->unk312 = 0; + gPokenavStructPtr->unk311 = 2; + gPokenavStructPtr->unk312 = 0; REG_BLDCNT = 0x3F40; REG_BLDALPHA = 0x10; } @@ -6450,7 +6450,7 @@ static void sub_80F2170(void) static void sub_80F21F8() { - gUnknown_083DFEC4->unk311 = 0; + gPokenavStructPtr->unk311 = 0; REG_BLDCNT = 0; } @@ -6466,7 +6466,7 @@ static void sub_80F2218(struct Sprite *sprite) static void sub_80F2240(struct Sprite *sprite) { - if (sprite->data[0] == gUnknown_083DFEC4->unk6DAD) + if (sprite->data[0] == gPokenavStructPtr->unk6DAD) { if (sprite->data[5]) { @@ -6487,7 +6487,7 @@ static void sub_80F2240(struct Sprite *sprite) static void sub_80F22B0(struct Sprite *sprite) { - if (sprite->data[0] == gUnknown_083DFEC4->unk6DAD) + if (sprite->data[0] == gPokenavStructPtr->unk6DAD) { if (sprite->pos2.x > -16) sprite->pos2.x -= 4; @@ -6503,11 +6503,11 @@ static bool8 sub_80F22F8(void) { u16 i, j; - for (i = 0; i < gUnknown_083DFEC4->unk6DAE; i++) + for (i = 0; i < gPokenavStructPtr->unk6DAE; i++) { for (j = 0; j < 4; j++) { - struct Sprite *sprite = gUnknown_083DFEC4->unk320[i][j]; + struct Sprite *sprite = gPokenavStructPtr->unk320[i][j]; if (!sprite) return TRUE; @@ -6523,13 +6523,13 @@ static bool8 sub_80F2360(void) { u16 i, j; - for (i = 0; i < gUnknown_083DFEC4->unk30E; i++) + for (i = 0; i < gPokenavStructPtr->unk30E; i++) { - if (i != gUnknown_083DFEC4->unk6DAD) + if (i != gPokenavStructPtr->unk6DAD) { for (j = 0; j < 4; j++) { - struct Sprite *sprite = gUnknown_083DFEC4->unk320[i][j]; + struct Sprite *sprite = gPokenavStructPtr->unk320[i][j]; if (sprite) return FALSE; } @@ -6545,7 +6545,7 @@ static bool8 sub_80F23C8(void) for (j = 0; j < 4; j++) { - struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j]; + struct Sprite *sprite = gPokenavStructPtr->unk320[gPokenavStructPtr->unk6DAD][j]; if (sprite) return FALSE; } @@ -6555,7 +6555,7 @@ static bool8 sub_80F23C8(void) static void sub_80F240C(struct Sprite *sprite) { - gUnknown_083DFEC4->unk320[sprite->data[0]][sprite->data[1]] = NULL; + gPokenavStructPtr->unk320[sprite->data[0]][sprite->data[1]] = NULL; if (sprite->affineAnimEnded) FreeOamMatrix(sprite->oam.matrixNum); @@ -6567,25 +6567,25 @@ static void sub_80F2458(u8 arg0) switch (arg0) { case 0: - gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk388; - gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk388); - gUnknown_083DFEC4->unk380.tag = 0x0; + gPokenavStructPtr->unk380.data = gPokenavStructPtr->unk388; + gPokenavStructPtr->unk380.size = sizeof(gPokenavStructPtr->unk388); + gPokenavStructPtr->unk380.tag = 0x0; break; case 1: - gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk1788; - gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk1788); - gUnknown_083DFEC4->unk380.tag = 0x0; + gPokenavStructPtr->unk380.data = gPokenavStructPtr->unk1788; + gPokenavStructPtr->unk380.size = sizeof(gPokenavStructPtr->unk1788); + gPokenavStructPtr->unk380.tag = 0x0; break; case 2: - gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk2388; - gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk2388); - gUnknown_083DFEC4->unk380.tag = 0x0; + gPokenavStructPtr->unk380.data = gPokenavStructPtr->unk2388; + gPokenavStructPtr->unk380.size = sizeof(gPokenavStructPtr->unk2388); + gPokenavStructPtr->unk380.tag = 0x0; break; default: return; } - LoadSpriteSheet(&gUnknown_083DFEC4->unk380); + LoadSpriteSheet(&gPokenavStructPtr->unk380); } static void sub_80F2514(u8 arg0) @@ -6623,7 +6623,7 @@ static void sub_80F2598(void) { u8 spriteId; - gUnknown_083DFEC4->unk6D9C = NULL; + gPokenavStructPtr->unk6D9C = NULL; if (DoesSomeoneWantRematchIn(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) == TRUE) { LoadSpriteSheet(&gSpriteSheet_PokenavBlueLight); @@ -6631,7 +6631,7 @@ static void sub_80F2598(void) spriteId = CreateSprite(&gSpriteTemplate_83E4484, 12, 96, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk6D9C = &gSprites[spriteId]; + gPokenavStructPtr->unk6D9C = &gSprites[spriteId]; } else { @@ -6643,12 +6643,12 @@ static void sub_80F2598(void) static void sub_80F2620(void) { - if (gUnknown_083DFEC4->unk6D9C) + if (gPokenavStructPtr->unk6D9C) { - DestroySprite(gUnknown_083DFEC4->unk6D9C); + DestroySprite(gPokenavStructPtr->unk6D9C); FreeSpriteTilesByTag(0x19); FreeSpritePaletteByTag(0x11); - gUnknown_083DFEC4->unk6D9C = NULL; + gPokenavStructPtr->unk6D9C = NULL; } } @@ -6663,35 +6663,35 @@ void sub_80F2654(struct Sprite *sprite) void sub_80F2688(void) { - gUnknown_083DFEC4->unk306 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unk306 = 0; + if (!gPokenavStructPtr->unk6DAC) while(sub_80F26BC()); } static bool8 sub_80F26BC(void) { - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: - LZ77UnCompWram(gPokenavMainMenu_Gfx, gUnknown_083DFEC4->unk3B98); + LZ77UnCompWram(gPokenavMainMenu_Gfx, gPokenavStructPtr->unk3B98); break; case 1: - LZ77UnCompWram(gPokenavConditionMenuHeader_Gfx, gUnknown_083DFEC4->unk4198); + LZ77UnCompWram(gPokenavConditionMenuHeader_Gfx, gPokenavStructPtr->unk4198); break; case 2: - LZ77UnCompWram(gPokenavRibbonsHeader_Gfx, gUnknown_083DFEC4->unk4D98); + LZ77UnCompWram(gPokenavRibbonsHeader_Gfx, gPokenavStructPtr->unk4D98); break; case 3: - LZ77UnCompWram(gPokenavHoennMapHeader_Gfx, gUnknown_083DFEC4->unk5398); + LZ77UnCompWram(gPokenavHoennMapHeader_Gfx, gPokenavStructPtr->unk5398); break; case 4: - LZ77UnCompWram(gPokenavConditionMenuOptions_Gfx, gUnknown_083DFEC4->unk5F98); + LZ77UnCompWram(gPokenavConditionMenuOptions_Gfx, gPokenavStructPtr->unk5F98); break; case 5: - LZ77UnCompWram(gPokenavConditionMenuOptions2_Gfx, gUnknown_083DFEC4->unk6798); + LZ77UnCompWram(gPokenavConditionMenuOptions2_Gfx, gPokenavStructPtr->unk6798); break; case 6: - LZ77UnCompWram(gPokenavTrainersEyesHeader_Gfx, gUnknown_083DFEC4->unk4798); + LZ77UnCompWram(gPokenavTrainersEyesHeader_Gfx, gPokenavStructPtr->unk4798); break; case 7: LoadSpritePalettes(gUnknown_083E449C); @@ -6700,7 +6700,7 @@ static bool8 sub_80F26BC(void) return FALSE; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; } @@ -6711,63 +6711,63 @@ static void sub_80F27DC(u8 arg0) switch (arg0) { case 0: - spriteSheet.data = gUnknown_083DFEC4->unk3B98; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk3B98); + spriteSheet.data = gPokenavStructPtr->unk3B98; + spriteSheet.size = sizeof(gPokenavStructPtr->unk3B98); spriteSheet.tag = 0x1; break; case 1: - spriteSheet.data = gUnknown_083DFEC4->unk4198; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4198); + spriteSheet.data = gPokenavStructPtr->unk4198; + spriteSheet.size = sizeof(gPokenavStructPtr->unk4198); spriteSheet.tag = 0x1; break; case 3: - spriteSheet.data = gUnknown_083DFEC4->unk4798; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4798); + spriteSheet.data = gPokenavStructPtr->unk4798; + spriteSheet.size = sizeof(gPokenavStructPtr->unk4798); spriteSheet.tag = 0x1; break; case 2: - spriteSheet.data = gUnknown_083DFEC4->unk4D98; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4D98); + spriteSheet.data = gPokenavStructPtr->unk4D98; + spriteSheet.size = sizeof(gPokenavStructPtr->unk4D98); spriteSheet.tag = 0x1; break; case 4: - spriteSheet.data = gUnknown_083DFEC4->unk5398; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk5398); + spriteSheet.data = gPokenavStructPtr->unk5398; + spriteSheet.size = sizeof(gPokenavStructPtr->unk5398); spriteSheet.tag = 0x1; break; case 5: - spriteSheet.data = gUnknown_083DFEC4->unk5F98; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk5F98); + spriteSheet.data = gPokenavStructPtr->unk5F98; + spriteSheet.size = sizeof(gPokenavStructPtr->unk5F98); spriteSheet.tag = 0x2; break; case 6: - spriteSheet.data = gUnknown_083DFEC4->unk6198; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6198); + spriteSheet.data = gPokenavStructPtr->unk6198; + spriteSheet.size = sizeof(gPokenavStructPtr->unk6198); spriteSheet.tag = 0x2; break; case 8: - spriteSheet.data = gUnknown_083DFEC4->unk6398; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6398); + spriteSheet.data = gPokenavStructPtr->unk6398; + spriteSheet.size = sizeof(gPokenavStructPtr->unk6398); spriteSheet.tag = 0x2; break; case 9: - spriteSheet.data = gUnknown_083DFEC4->unk6598; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6598); + spriteSheet.data = gPokenavStructPtr->unk6598; + spriteSheet.size = sizeof(gPokenavStructPtr->unk6598); spriteSheet.tag = 0x2; break; case 11: - spriteSheet.data = gUnknown_083DFEC4->unk6998; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6998); + spriteSheet.data = gPokenavStructPtr->unk6998; + spriteSheet.size = sizeof(gPokenavStructPtr->unk6998); spriteSheet.tag = 0x2; break; case 10: - spriteSheet.data = gUnknown_083DFEC4->unk6798; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6798); + spriteSheet.data = gPokenavStructPtr->unk6798; + spriteSheet.size = sizeof(gPokenavStructPtr->unk6798); spriteSheet.tag = 0x2; break; case 7: - spriteSheet.data = gUnknown_083DFEC4->unk6B98; - spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6B98); + spriteSheet.data = gPokenavStructPtr->unk6B98; + spriteSheet.size = sizeof(gPokenavStructPtr->unk6B98); spriteSheet.tag = 0x2; break; default: @@ -6795,21 +6795,21 @@ void sub_80F29B8(u8 arg0) case 2: case 3: initialX = -96; - y = 49 - gUnknown_083DFEC4->unk030C; + y = 49 - gPokenavStructPtr->unk030C; deltaX = 8; endX = 32; width = 64; - sprites = gUnknown_083DFEC4->unk3B88; + sprites = gPokenavStructPtr->unk3B88; spriteTemplate = arg0 != 3 ? &gSpriteTemplate_83E44E0 : &gSpriteTemplate_83E44F8; break; case 4: initialX = 272; - y = 49 - gUnknown_083DFEC4->unk030C; + y = 49 - gPokenavStructPtr->unk030C; deltaX = -8; endX = 152; width = 64; spriteTemplate = &gSpriteTemplate_83E44E0; - sprites = gUnknown_083DFEC4->unk3B88; + sprites = gPokenavStructPtr->unk3B88; break; case 5: case 6: @@ -6824,11 +6824,11 @@ void sub_80F29B8(u8 arg0) spriteTemplate = &gSpriteTemplate_83E4548; initialX = -96; - y = 68 - gUnknown_083DFEC4->unk030C; + y = 68 - gPokenavStructPtr->unk030C; deltaX = 8; endX = 16; width = 32; - sprites = gUnknown_083DFEC4->unk3B90; + sprites = gPokenavStructPtr->unk3B90; break; default: return; @@ -6845,7 +6845,7 @@ void sub_80F29B8(u8 arg0) gSprites[spriteId].data[3] = arg0; if (arg0 == 4 && i == 1) { - int anim = !gUnknown_083DFEC4->regionMap.zoomed ? 1 : 2; + int anim = !gPokenavStructPtr->regionMap.zoomed ? 1 : 2; StartSpriteAnim(&gSprites[spriteId], anim); } else @@ -6902,28 +6902,28 @@ static void sub_80F2C14(struct Sprite *sprite) static void sub_80F2C58(struct Sprite *sprite) { - int anim = !gUnknown_083DFEC4->regionMap.zoomed ? 1 : 2; + int anim = !gPokenavStructPtr->regionMap.zoomed ? 1 : 2; StartSpriteAnim(sprite, anim); } void sub_80F2C80(u8 arg0) { - gUnknown_083DFEC4->unk306 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unk306 = 0; + if (!gPokenavStructPtr->unk6DAC) while (sub_80F2CBC(arg0)); } bool8 sub_80F2CBC(u8 arg0) { - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: sub_80F27DC(arg0); - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; case 1: sub_80F29B8(arg0); - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return FALSE; default: return FALSE; @@ -6937,12 +6937,12 @@ static void sub_80F2D04(u8 arg0) if (arg0 < 5) { for (i = 0; i < 2; i++) - gUnknown_083DFEC4->unk3B88[i]->callback = sub_80F2C14; + gPokenavStructPtr->unk3B88[i]->callback = sub_80F2C14; } else { for (i = 0; i < 2; i++) - gUnknown_083DFEC4->unk3B90[i]->callback = sub_80F2C14; + gPokenavStructPtr->unk3B90[i]->callback = sub_80F2C14; } } @@ -6954,13 +6954,13 @@ static void sub_80F2D6C(u8 arg0) { FreeSpriteTilesByTag(0x1); for (i = 0; i < 2; i++) - DestroySprite(gUnknown_083DFEC4->unk3B88[i]); + DestroySprite(gPokenavStructPtr->unk3B88[i]); } else { FreeSpriteTilesByTag(0x2); for (i = 0; i < 2; i++) - DestroySprite(gUnknown_083DFEC4->unk3B90[i]); + DestroySprite(gPokenavStructPtr->unk3B90[i]); } } @@ -6978,7 +6978,7 @@ static void sub_80F2DF4(void) void sub_80F2E00(struct Sprite *sprite) { - sprite->pos1.x = gUnknown_083DFEC4->unk8766 + 38; + sprite->pos1.x = gPokenavStructPtr->unk8766 + 38; } static void sub_80F2E18(u8 arg0) @@ -6988,71 +6988,71 @@ static void sub_80F2E18(u8 arg0) struct SpritePalette spritePalette; struct SpriteSheet spriteSheet; - if (!gUnknown_083DFEC4->unk8768) + if (!gPokenavStructPtr->unk8768) { spriteSheet = gUnknown_083E4568; spriteTemplate = gSpriteTemplate_83E4570; spritePalette = gUnknown_083E4588; - spriteSheet.data = gUnknown_083DFEC4->unkD1E4[arg0]; - spritePalette.data = gUnknown_083DFEC4->unk0[arg0]; - gUnknown_083DFEC4->unkD1DC = LoadSpritePalette(&spritePalette); - gUnknown_083DFEC4->unkD1DE = LoadSpriteSheet(&spriteSheet); + spriteSheet.data = gPokenavStructPtr->unkD1E4[arg0]; + spritePalette.data = gPokenavStructPtr->unk0[arg0]; + gPokenavStructPtr->unkD1DC = LoadSpritePalette(&spritePalette); + gPokenavStructPtr->unkD1DE = LoadSpriteSheet(&spriteSheet); spriteId = CreateSprite(&spriteTemplate, 38, 104, 0); if (spriteId == MAX_SPRITES) { FreeSpriteTilesByTag(0x6); FreeSpritePaletteByTag(0x6); - gUnknown_083DFEC4->unk8768 = NULL; + gPokenavStructPtr->unk8768 = NULL; } else { - gUnknown_083DFEC4->unk8768 = &gSprites[spriteId]; - gUnknown_083DFEC4->unkD1E0 = (void *)(VRAM + 0x10000) + gUnknown_083DFEC4->unkD1DE * 32; - gUnknown_083DFEC4->unkD1DC = gUnknown_083DFEC4->unkD1DC * 16 + 0x100; + gPokenavStructPtr->unk8768 = &gSprites[spriteId]; + gPokenavStructPtr->unkD1E0 = (void *)(VRAM + 0x10000) + gPokenavStructPtr->unkD1DE * 32; + gPokenavStructPtr->unkD1DC = gPokenavStructPtr->unkD1DC * 16 + 0x100; } } else { - DmaCopy16Defvars(3, gUnknown_083DFEC4->unkD1E4[arg0], gUnknown_083DFEC4->unkD1E0, 0x800); - LoadPalette(gUnknown_083DFEC4->unk0[arg0], gUnknown_083DFEC4->unkD1DC, 0x20); + DmaCopy16Defvars(3, gPokenavStructPtr->unkD1E4[arg0], gPokenavStructPtr->unkD1E0, 0x800); + LoadPalette(gPokenavStructPtr->unk0[arg0], gPokenavStructPtr->unkD1DC, 0x20); } } void sub_80F2F48(void) { - if (gUnknown_083DFEC4->unk8768) + if (gPokenavStructPtr->unk8768) { - DestroySprite(gUnknown_083DFEC4->unk8768); + DestroySprite(gPokenavStructPtr->unk8768); FreeSpriteTilesByTag(0x6); FreeSpritePaletteByTag(0x6); - gUnknown_083DFEC4->unk8768 = NULL; + gPokenavStructPtr->unk8768 = NULL; } } void sub_80F2F7C(u8 arg0) { sub_80F2E18(arg0); - gUnknown_083DFEC4->unkCED0 = gUnknown_083DFEC4->unk8768; - gUnknown_083DFEC4->unkCED0->callback = sub_80F2FEC; + gPokenavStructPtr->unkCED0 = gPokenavStructPtr->unk8768; + gPokenavStructPtr->unkCED0->callback = sub_80F2FEC; } static void sub_80F2FB0(void) { - if (gUnknown_083DFEC4->unkCED0) + if (gPokenavStructPtr->unkCED0) { - DestroySprite(gUnknown_083DFEC4->unkCED0); + DestroySprite(gPokenavStructPtr->unkCED0); FreeSpriteTilesByTag(0x6); FreeSpritePaletteByTag(0x6); - gUnknown_083DFEC4->unkCED0 = NULL; - gUnknown_083DFEC4->unk8768 = NULL; + gPokenavStructPtr->unkCED0 = NULL; + gPokenavStructPtr->unk8768 = NULL; } } static void sub_80F2FEC(struct Sprite *sprite) { - sprite->pos1.x = gUnknown_083DFEC4->unkD15A + 40; + sprite->pos1.x = gPokenavStructPtr->unkD15A + 40; sprite->pos1.y = 104; } @@ -7078,17 +7078,17 @@ static void sub_80F3008(u8 arg0) spriteId = CreateSprite(&gSpriteTemplate_83E45B8, 95, 0, 0); if (spriteId == MAX_SPRITES) { - gUnknown_083DFEC4->unk87CC = NULL; + gPokenavStructPtr->unk87CC = NULL; } else { - gUnknown_083DFEC4->unk87CC = &gSprites[spriteId]; + gPokenavStructPtr->unk87CC = &gSprites[spriteId]; for (i = 0; i < 2; i++) { spriteId = CreateSprite(&gSpriteTemplate_83E45F0, 168, i * 128 + 8, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk87D0[i] = &gSprites[spriteId]; + gPokenavStructPtr->unk87D0[i] = &gSprites[spriteId]; gSprites[spriteId].invisible = 1; gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = 0; @@ -7099,7 +7099,7 @@ static void sub_80F3008(u8 arg0) } else { - gUnknown_083DFEC4->unk87D0[i] = NULL; + gPokenavStructPtr->unk87D0[i] = NULL; } } } @@ -7109,20 +7109,20 @@ static void sub_80F3130(void) { u16 i; - if (gUnknown_083DFEC4->unk87CC) + if (gPokenavStructPtr->unk87CC) { - DestroySprite(gUnknown_083DFEC4->unk87CC); + DestroySprite(gPokenavStructPtr->unk87CC); FreeSpriteTilesByTag(0x9); FreeSpritePaletteByTag(0x9); - gUnknown_083DFEC4->unk87CC = NULL; + gPokenavStructPtr->unk87CC = NULL; } for (i = 0; i < 2; i++) { - if (gUnknown_083DFEC4->unk87D0[i]) + if (gPokenavStructPtr->unk87D0[i]) { - DestroySprite(gUnknown_083DFEC4->unk87D0[i]); - gUnknown_083DFEC4->unk87D0[i] = NULL; + DestroySprite(gPokenavStructPtr->unk87D0[i]); + gPokenavStructPtr->unk87D0[i] = NULL; } } @@ -7131,19 +7131,19 @@ static void sub_80F3130(void) void sub_80F3190(struct Sprite *sprite) { - sprite->pos1.y = gUnknown_083DFEC4->unk876C * 16 + 16; + sprite->pos1.y = gPokenavStructPtr->unk876C * 16 + 16; } void sub_80F31AC(struct Sprite *sprite) { - if (gUnknown_083DFEC4->unk87C9) + if (gPokenavStructPtr->unk87C9) { if (sprite->data[4]) { if (!sprite->data[3]) - sprite->invisible = gUnknown_083DFEC4->unk8770 == 0; + sprite->invisible = gPokenavStructPtr->unk8770 == 0; else - sprite->invisible = gUnknown_083DFEC4->unk8772 == gUnknown_083DFEC4->unk8774; + sprite->invisible = gPokenavStructPtr->unk8772 == gPokenavStructPtr->unk8774; sprite->data[4] = 0; } @@ -7170,32 +7170,32 @@ static void sub_80F3264(void) for (i = 0; i < 2; i++) { - if (gUnknown_083DFEC4->unk87D0[i]) - gUnknown_083DFEC4->unk87D0[i]->data[4] = 1; + if (gPokenavStructPtr->unk87D0[i]) + gPokenavStructPtr->unk87D0[i]->data[4] = 1; } } static void sub_80F3294(u8 arg0) { - gUnknown_083DFEC4->unk87CC->invisible = arg0; - if (gUnknown_083DFEC4->unk87C9) + gPokenavStructPtr->unk87CC->invisible = arg0; + if (gPokenavStructPtr->unk87C9) { if (arg0 == 1) { - gUnknown_083DFEC4->unk87D0[0]->invisible = arg0; - gUnknown_083DFEC4->unk87D0[1]->invisible = arg0; + gPokenavStructPtr->unk87D0[0]->invisible = arg0; + gPokenavStructPtr->unk87D0[1]->invisible = arg0; } else { - gUnknown_083DFEC4->unk87D0[0]->data[4] = 1; - gUnknown_083DFEC4->unk87D0[1]->data[4] = 1; + gPokenavStructPtr->unk87D0[0]->data[4] = 1; + gPokenavStructPtr->unk87D0[1]->data[4] = 1; } } } void sub_80F3328(struct Sprite *sprite) { - if (sprite->data[0] == gUnknown_083DFEC4->unk87DC) + if (sprite->data[0] == gPokenavStructPtr->unk87DC) StartSpriteAnim(sprite, 0); else StartSpriteAnim(sprite, 1); @@ -7203,7 +7203,7 @@ void sub_80F3328(struct Sprite *sprite) static void sub_80F3360(struct Sprite *sprite) { - if (gUnknown_083DFEC4->unk87DC == gUnknown_083DFEC4->unk87DA - 1) + if (gPokenavStructPtr->unk87DC == gPokenavStructPtr->unk87DA - 1) sprite->oam.paletteNum = IndexOfSpritePaletteTag(0x4); else sprite->oam.paletteNum = IndexOfSpritePaletteTag(0x5); @@ -7223,17 +7223,17 @@ void sub_80F33A8(void) LoadSpriteSheets(spriteSheets); LoadSpritePalettes(spritePalettes); - for (i = 0; i < gUnknown_083DFEC4->unk87DA - 1; i++) + for (i = 0; i < gPokenavStructPtr->unk87DA - 1; i++) { spriteId = CreateSprite(&spriteTemplate, 226, i * 20 + 8, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId]; - gUnknown_083DFEC4->unk87E4[i]->data[0] = i; + gPokenavStructPtr->unk87E4[i] = &gSprites[spriteId]; + gPokenavStructPtr->unk87E4[i]->data[0] = i; } else { - gUnknown_083DFEC4->unk87E4[i] = NULL; + gPokenavStructPtr->unk87E4[i] = NULL; } } @@ -7244,12 +7244,12 @@ void sub_80F33A8(void) spriteId = CreateSprite(&spriteTemplate, 230, i * 20 + 8, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId]; - gUnknown_083DFEC4->unk87E4[i]->oam.size = 0; + gPokenavStructPtr->unk87E4[i] = &gSprites[spriteId]; + gPokenavStructPtr->unk87E4[i]->oam.size = 0; } else { - gUnknown_083DFEC4->unk87E4[i] = NULL; + gPokenavStructPtr->unk87E4[i] = NULL; } } @@ -7258,13 +7258,13 @@ void sub_80F33A8(void) spriteId = CreateSprite(&spriteTemplate, 222, i * 20 + 8, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId]; - gUnknown_083DFEC4->unk87E4[i]->oam.shape = ST_OAM_H_RECTANGLE; - gUnknown_083DFEC4->unk87E4[i]->oam.size = 2; + gPokenavStructPtr->unk87E4[i] = &gSprites[spriteId]; + gPokenavStructPtr->unk87E4[i]->oam.shape = ST_OAM_H_RECTANGLE; + gPokenavStructPtr->unk87E4[i]->oam.size = 2; } else { - gUnknown_083DFEC4->unk87E4[i] = NULL; + gPokenavStructPtr->unk87E4[i] = NULL; } } @@ -7274,10 +7274,10 @@ void sub_80F357C(void) for (i = 0; i < 7; i++) { - if (gUnknown_083DFEC4->unk87E4[i]) + if (gPokenavStructPtr->unk87E4[i]) { - DestroySprite(gUnknown_083DFEC4->unk87E4[i]); - gUnknown_083DFEC4->unk87E4[i] = NULL; + DestroySprite(gPokenavStructPtr->unk87E4[i]); + gPokenavStructPtr->unk87E4[i] = NULL; } } } @@ -7286,60 +7286,60 @@ static void sub_80F35B4(void) { struct Sprite *sprite; - gUnknown_083DFEC4->unk76B0.baseTileTag = 0x1C; - gUnknown_083DFEC4->unk76B0.basePaletteTag = 0x13; - sub_80F727C(&gUnknown_083DFEC4->unk76B0); + gPokenavStructPtr->unk76B0.baseTileTag = 0x1C; + gPokenavStructPtr->unk76B0.basePaletteTag = 0x13; + sub_80F727C(&gPokenavStructPtr->unk76B0); sub_80F7404(); sprite = sub_80F7920(27, 21, gUnknown_083E4678); sprite->oam.priority = 3; sprite->pos1.x = 192; sprite->pos1.y = 32; sprite->callback = sub_80F363C; - gUnknown_083DFEC4->unk76AC = sprite; + gPokenavStructPtr->unk76AC = sprite; } void sub_80F3614(void) { - DestroySprite(gUnknown_083DFEC4->unk76AC); + DestroySprite(gPokenavStructPtr->unk76AC); FreeSpriteTilesByTag(0x1B); FreeSpritePaletteByTag(0x15); } static void sub_80F363C(struct Sprite *sprite) { - StartSpriteAnim(sprite, gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9]); + StartSpriteAnim(sprite, gPokenavStructPtr->unk8934[gPokenavStructPtr->unk8fe9]); } void sub_80F3668(void) { - sub_80F7418(gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9], 176, 32); + sub_80F7418(gPokenavStructPtr->unk8934[gPokenavStructPtr->unk8fe9], 176, 32); } void sub_80F3698(void) { - struct UnkUsePokeblockSub *var0 = &gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC]; - gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9] = gUnknown_083DFEC4->unk76B0.markings; - SetMonMarkings(var0->unk1, var0->partyIdx, gUnknown_083DFEC4->unk76B0.markings); + struct UnkUsePokeblockSub *var0 = &gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC]; + gPokenavStructPtr->unk8934[gPokenavStructPtr->unk8fe9] = gPokenavStructPtr->unk76B0.markings; + SetMonMarkings(var0->unk1, var0->partyIdx, gPokenavStructPtr->unk76B0.markings); sub_80F7470(); } static void sub_80F36F0(void) { - gUnknown_083DFEC4->unk306 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unk306 = 0; + if (!gPokenavStructPtr->unk6DAC) while (sub_80F3724()); } static bool8 sub_80F3724(void) { - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: - LZ77UnCompWram(gUnknown_083E3D00, gUnknown_083DFEC4->unk984C); + LZ77UnCompWram(gUnknown_083E3D00, gPokenavStructPtr->unk984C); break; case 1: sub_80F379C(); - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; // fall through case 2: if (sub_80F37D0()) @@ -7349,14 +7349,14 @@ static bool8 sub_80F3724(void) return FALSE; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; } static void sub_80F379C(void) { - gUnknown_083DFEC4->unkBC93 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unkBC93 = 0; + if (!gPokenavStructPtr->unk6DAC) while (sub_80F37D0()); } @@ -7365,13 +7365,13 @@ static bool8 sub_80F37D0(void) u16 i; u8 j, k, l, m; - if (gUnknown_083DFEC4->unkBC93 > 11) + if (gPokenavStructPtr->unkBC93 > 11) return FALSE; for (i = 0; i < 2; i++) { - u8 *r4 = &gUnknown_083DFEC4->unk984C[gUnknown_083DFEC4->unkBC93][0]; - u8 *r5 = &gUnknown_083DFEC4->unkA44C[gUnknown_083DFEC4->unkBC93][0]; + u8 *r4 = &gPokenavStructPtr->unk984C[gPokenavStructPtr->unkBC93][0]; + u8 *r5 = &gPokenavStructPtr->unkA44C[gPokenavStructPtr->unkBC93][0]; for (j = 0; j < 4; j++) { CpuFastSet(r4, r5, 0x10); @@ -7394,15 +7394,15 @@ static bool8 sub_80F37D0(void) r4 -= 0x40; } - + r4 += 0x60; } - if (++gUnknown_083DFEC4->unkBC93 > 11) + if (++gPokenavStructPtr->unkBC93 > 11) return FALSE; } - if (gUnknown_083DFEC4->unkBC93 > 11) + if (gPokenavStructPtr->unkBC93 > 11) return FALSE; return TRUE; @@ -7410,25 +7410,25 @@ static bool8 sub_80F37D0(void) static void sub_80F38B8(void) { - gUnknown_083DFEC4->unk306 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unk306 = 0; + if (!gPokenavStructPtr->unk6DAC) while (sub_80F38EC()); } static bool8 sub_80F38EC(void) { - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: - gUnknown_083DFEC4->unk9348 = NULL; - gUnknown_083DFEC4->unkBC92 = 0; + gPokenavStructPtr->unk9348 = NULL; + gPokenavStructPtr->unkBC92 = 0; break; case 1: sub_80F2E18(0); break; case 2: sub_80F3970(); - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; // fall through case 3: if (sub_80F39A4()) @@ -7438,14 +7438,14 @@ static bool8 sub_80F38EC(void) return FALSE; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; } static void sub_80F3970(void) { - gUnknown_083DFEC4->unkBC93 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unkBC93 = 0; + if (!gPokenavStructPtr->unk6DAC) while (sub_80F39A4()); } @@ -7453,21 +7453,21 @@ static bool8 sub_80F39A4(void) { struct SpriteSheet spriteSheet; struct SpritePalette spritePalette; - if (gUnknown_083DFEC4->unkBC93 > 11) + if (gPokenavStructPtr->unkBC93 > 11) return FALSE; - spriteSheet.data = &gUnknown_083DFEC4->unkA44C[gUnknown_083DFEC4->unkBC93][0]; + spriteSheet.data = &gPokenavStructPtr->unkA44C[gPokenavStructPtr->unkBC93][0]; spriteSheet.size = 0x200; - spriteSheet.tag = gUnknown_083DFEC4->unkBC93 + 11; + spriteSheet.tag = gPokenavStructPtr->unkBC93 + 11; LoadSpriteSheet(&spriteSheet); - if (gUnknown_083DFEC4->unkBC93 < 5) + if (gPokenavStructPtr->unkBC93 < 5) { - spritePalette.data = gUnknown_083E3C60[gUnknown_083DFEC4->unkBC93]; - spritePalette.tag = gUnknown_083DFEC4->unkBC93 + 10; + spritePalette.data = gUnknown_083E3C60[gPokenavStructPtr->unkBC93]; + spritePalette.tag = gPokenavStructPtr->unkBC93 + 10; LoadSpritePalette(&spritePalette); } - if (++gUnknown_083DFEC4->unkBC93 > 11) + if (++gPokenavStructPtr->unkBC93 > 11) return FALSE; return TRUE; @@ -7483,9 +7483,9 @@ static struct Sprite *sub_80F3A3C(u16 arg0, u16 arg1) if (arg1 < 3) var0 = arg0 + arg1 * 9; else - var0 = arg0 + (gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F); + var0 = arg0 + (gPokenavStructPtr->unkBC8E - gPokenavStructPtr->unkBC8F); - ribbon = gUnknown_083DFEC4->unkBC4C[var0]; + ribbon = gPokenavStructPtr->unkBC4C[var0]; spriteTemplate = gSpriteTemplate_83E476C; spriteTemplate.tileTag = gPokenavRibbonsIconGfx[ribbon][0] + 11; spriteTemplate.paletteTag = gPokenavRibbonsIconGfx[ribbon][1] + 10; @@ -7498,24 +7498,24 @@ static struct Sprite *sub_80F3A3C(u16 arg0, u16 arg1) static void sub_80F3B00(void) { - gUnknown_083DFEC4->unk9348 = sub_80F3A3C(gUnknown_083DFEC4->unkBC90, gUnknown_083DFEC4->unkBC91); - if (gUnknown_083DFEC4->unk9348) + gPokenavStructPtr->unk9348 = sub_80F3A3C(gPokenavStructPtr->unkBC90, gPokenavStructPtr->unkBC91); + if (gPokenavStructPtr->unk9348) { - StartSpriteAffineAnim(gUnknown_083DFEC4->unk9348, 1); - gUnknown_083DFEC4->unkBC92 = 1; + StartSpriteAffineAnim(gPokenavStructPtr->unk9348, 1); + gPokenavStructPtr->unkBC92 = 1; } else { - gUnknown_083DFEC4->unkBC92 = 0; + gPokenavStructPtr->unkBC92 = 0; } } static bool8 sub_80F3B58(void) { - if (gUnknown_083DFEC4->unkBC92) + if (gPokenavStructPtr->unkBC92) { - gUnknown_083DFEC4->unkBC92 = !gUnknown_083DFEC4->unk9348->affineAnimEnded; - return gUnknown_083DFEC4->unkBC92; + gPokenavStructPtr->unkBC92 = !gPokenavStructPtr->unk9348->affineAnimEnded; + return gPokenavStructPtr->unkBC92; } else { @@ -7525,30 +7525,30 @@ static bool8 sub_80F3B58(void) static void sub_80F3B94(void) { - if (gUnknown_083DFEC4->unk9348) + if (gPokenavStructPtr->unk9348) { - StartSpriteAffineAnim(gUnknown_083DFEC4->unk9348, 2); - gUnknown_083DFEC4->unkBC92 = 1; + StartSpriteAffineAnim(gPokenavStructPtr->unk9348, 2); + gPokenavStructPtr->unkBC92 = 1; } else { - gUnknown_083DFEC4->unkBC92 = 0; + gPokenavStructPtr->unkBC92 = 0; } } static bool8 sub_80F3BD4(void) { - if (gUnknown_083DFEC4->unkBC92) + if (gPokenavStructPtr->unkBC92) { - gUnknown_083DFEC4->unkBC92 = !gUnknown_083DFEC4->unk9348->affineAnimEnded; - if (!gUnknown_083DFEC4->unkBC92) + gPokenavStructPtr->unkBC92 = !gPokenavStructPtr->unk9348->affineAnimEnded; + if (!gPokenavStructPtr->unkBC92) { - FreeOamMatrix(gUnknown_083DFEC4->unk9348->oam.matrixNum); - DestroySprite(gUnknown_083DFEC4->unk9348); - gUnknown_083DFEC4->unk9348 = NULL; + FreeOamMatrix(gPokenavStructPtr->unk9348->oam.matrixNum); + DestroySprite(gPokenavStructPtr->unk9348); + gPokenavStructPtr->unk9348 = NULL; } - return gUnknown_083DFEC4->unkBC92; + return gPokenavStructPtr->unkBC92; } else { @@ -7560,19 +7560,19 @@ static void sub_80F3C2C(void) { u16 i; - if (gUnknown_083DFEC4->unk9348) + if (gPokenavStructPtr->unk9348) { - FreeOamMatrix(gUnknown_083DFEC4->unk9348->oam.matrixNum); - DestroySprite(gUnknown_083DFEC4->unk9348); - gUnknown_083DFEC4->unk9348 = NULL; + FreeOamMatrix(gPokenavStructPtr->unk9348->oam.matrixNum); + DestroySprite(gPokenavStructPtr->unk9348); + gPokenavStructPtr->unk9348 = NULL; } for (i = 0; i < 12; i++) FreeSpriteTilesByTag(i + 0xB); - + for (i = 0; i < 5; i++) FreeSpritePaletteByTag(i + 0xA); - + sub_80F2F48(); } @@ -7587,7 +7587,7 @@ void sub_80F3C94(void) LoadSpriteSheet(&spriteSheet); LoadSpritePalette(&spritePalette); for (i = 0; i < 10; i++) - gUnknown_083DFEC4->unk8800[i] = NULL; + gPokenavStructPtr->unk8800[i] = NULL; } void sub_80F3CE8(void) @@ -7602,19 +7602,19 @@ void sub_80F3D00(void) u8 spriteId; u16 i; u8 var1; - struct UnkUsePokeblockSub *var0 = &gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC]; + struct UnkUsePokeblockSub *var0 = &gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC]; if (!var0->unk4) return; - var1 = gUnknown_083DFEC4->unk8931[gUnknown_083DFEC4->unk8fe9]; + var1 = gPokenavStructPtr->unk8931[gPokenavStructPtr->unk8fe9]; for (i = 0; i < var1 + 1; i++) { spriteId = CreateSprite(&gSpriteTemplate_83E4800, 0, 0, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk8800[i] = &gSprites[spriteId]; - gUnknown_083DFEC4->unk8800[i]->invisible = 1; + gPokenavStructPtr->unk8800[i] = &gSprites[spriteId]; + gPokenavStructPtr->unk8800[i]->invisible = 1; } else { @@ -7631,11 +7631,11 @@ void move_anim_execute(void) for (i = 0; i < 10; i++) { - if (!gUnknown_083DFEC4->unk8800[i]) + if (!gPokenavStructPtr->unk8800[i]) return; - - DestroySprite(gUnknown_083DFEC4->unk8800[i]); - gUnknown_083DFEC4->unk8800[i] = NULL; + + DestroySprite(gPokenavStructPtr->unk8800[i]); + gPokenavStructPtr->unk8800[i] = NULL; } } @@ -7659,13 +7659,13 @@ static void sub_80F3E04(struct Sprite *sprite) static void sub_80F3E24(struct Sprite *sprite) { - if (gUnknown_083DFEC4->unk8768) + if (gPokenavStructPtr->unk8768) { - sprite->pos1.x = gUnknown_083DFEC4->unk8768->pos1.x - + gUnknown_083DFEC4->unk8768->pos2.x + sprite->pos1.x = gPokenavStructPtr->unk8768->pos1.x + + gPokenavStructPtr->unk8768->pos2.x + gUnknown_083E4794[sprite->data[0]][0]; - sprite->pos1.y = gUnknown_083DFEC4->unk8768->pos1.y - + gUnknown_083DFEC4->unk8768->pos2.y + sprite->pos1.y = gPokenavStructPtr->unk8768->pos1.y + + gPokenavStructPtr->unk8768->pos2.y + gUnknown_083E4794[sprite->data[0]][1]; } else @@ -7715,23 +7715,23 @@ static void sub_80F3F20(u8 arg0, u8 arg1) for (i = 0; i < 10; i++) { - if (gUnknown_083DFEC4->unk8800[i]) + if (gPokenavStructPtr->unk8800[i]) { - gUnknown_083DFEC4->unk8800[i]->data[0] = i; - gUnknown_083DFEC4->unk8800[i]->data[1] = i * 16 + 1; - gUnknown_083DFEC4->unk8800[i]->data[2] = arg0; - gUnknown_083DFEC4->unk8800[i]->data[3] = i; + gPokenavStructPtr->unk8800[i]->data[0] = i; + gPokenavStructPtr->unk8800[i]->data[1] = i * 16 + 1; + gPokenavStructPtr->unk8800[i]->data[2] = arg0; + gPokenavStructPtr->unk8800[i]->data[3] = i; if (!arg1 || arg0 != 9) { - gUnknown_083DFEC4->unk8800[i]->callback = sub_80F3E9C; + gPokenavStructPtr->unk8800[i]->callback = sub_80F3E9C; } else { - sub_80F3E24(gUnknown_083DFEC4->unk8800[i]); + sub_80F3E24(gPokenavStructPtr->unk8800[i]); sub_80F3FAC(); - gUnknown_083DFEC4->unk8800[i]->callback = sub_80F3E04; - gUnknown_083DFEC4->unk8800[i]->invisible = 0; + gPokenavStructPtr->unk8800[i]->callback = sub_80F3E04; + gPokenavStructPtr->unk8800[i]->invisible = 0; } } } @@ -7743,18 +7743,18 @@ static void sub_80F3FAC(void) for (i = 0; i < 10; i++) { - if (gUnknown_083DFEC4->unk8800[i]) + if (gPokenavStructPtr->unk8800[i]) { - SeekSpriteAnim(gUnknown_083DFEC4->unk8800[i], 0); - gUnknown_083DFEC4->unk8800[i]->invisible = 0; + SeekSpriteAnim(gPokenavStructPtr->unk8800[i], 0); + gPokenavStructPtr->unk8800[i]->invisible = 0; } } } static void sub_80F3FF0(void) { - gUnknown_083DFEC4->unk306 = 0; - if (!gUnknown_083DFEC4->unk6DAC) + gPokenavStructPtr->unk306 = 0; + if (!gPokenavStructPtr->unk6DAC) while (sub_80F4024()); } @@ -7764,16 +7764,16 @@ static bool8 sub_80F4024(void) u8 spriteId; struct SpritePalette spritePalette; - switch (gUnknown_083DFEC4->unk306) + switch (gPokenavStructPtr->unk306) { case 0: - LZ77UnCompWram(gUnknown_083E329C, gUnknown_083DFEC4->unk131E4); + LZ77UnCompWram(gUnknown_083E329C, gPokenavStructPtr->unk131E4); break; case 1: { struct SpriteSheet spriteSheet = { - .data = gUnknown_083DFEC4->unk131E4, - .size = sizeof(gUnknown_083DFEC4->unk131E4), + .data = gPokenavStructPtr->unk131E4, + .size = sizeof(gPokenavStructPtr->unk131E4), .tag = 0x18, }; LoadSpriteSheet(&spriteSheet); @@ -7783,33 +7783,33 @@ static bool8 sub_80F4024(void) spritePalette = gUnknown_083E4818; LoadSpritePalette(&spritePalette); paletteIndex = IndexOfSpritePaletteTag(0x10); - gUnknown_083DFEC4->unk308 = -3 & ~(1 << (paletteIndex + 0x10)); + gPokenavStructPtr->unk308 = -3 & ~(1 << (paletteIndex + 0x10)); break; case 3: spriteId = CreateSprite(&gSpriteTemplate_83E4850, 218, 14, 0); if (spriteId != MAX_SPRITES) { - gUnknown_083DFEC4->unk6D98 = &gSprites[spriteId]; - gUnknown_083DFEC4->unk6D98->data[0] = 0; + gPokenavStructPtr->unk6D98 = &gSprites[spriteId]; + gPokenavStructPtr->unk6D98->data[0] = 0; } else { - gUnknown_083DFEC4->unk6D98 = NULL; + gPokenavStructPtr->unk6D98 = NULL; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return FALSE; default: return FALSE; } - gUnknown_083DFEC4->unk306++; + gPokenavStructPtr->unk306++; return TRUE; } void sub_80F4138(struct Sprite *sprite) { - sprite->pos2.y = -gUnknown_083DFEC4->unk030C; + sprite->pos2.y = -gPokenavStructPtr->unk030C; if (sprite->pos2.y <= -32) { if (sprite->data[0] == 0) @@ -8029,12 +8029,12 @@ static void sub_80F42C4(u8 *arg0) u16 i, tileOffset; u8 spriteId; struct SpriteSheet spriteSheet = { - .data = gUnknown_083DFEC4->unkD1E4[0], + .data = gPokenavStructPtr->unkD1E4[0], .size = 0x500, .tag = 0x1A, }; - sub_80F4194(gUnknown_083DFEC4->unkD1E4[0], arg0); + sub_80F4194(gPokenavStructPtr->unkD1E4[0], arg0); LoadSpriteSheet(&spriteSheet); LoadSpritePalette(&gUnknown_083E4868); @@ -8045,11 +8045,11 @@ static void sub_80F42C4(u8 *arg0) if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.tileNum += tileOffset; - gUnknown_083DFEC4->unkCED4[i] = &gSprites[spriteId]; + gPokenavStructPtr->unkCED4[i] = &gSprites[spriteId]; } else { - gUnknown_083DFEC4->unkCED4[i] = NULL; + gPokenavStructPtr->unkCED4[i] = NULL; } tileOffset += 8; @@ -8062,8 +8062,8 @@ static void sub_80F4394(void) for (i = 0; i < 5; i++) { - if (gUnknown_083DFEC4->unkCED4[i]) - DestroySprite(gUnknown_083DFEC4->unkCED4[i]); + if (gPokenavStructPtr->unkCED4[i]) + DestroySprite(gPokenavStructPtr->unkCED4[i]); } FreeSpriteTilesByTag(0x1A); @@ -8074,10 +8074,10 @@ void sub_80F43D4(u8 *arg0) { u16 tile; - sub_80F4194(gUnknown_083DFEC4->unkD1E4[0], arg0); + sub_80F4194(gPokenavStructPtr->unkD1E4[0], arg0); tile = GetSpriteTileStartByTag(0x1A); if (tile != 0xFFFF) - DmaCopy32Defvars(3, gUnknown_083DFEC4->unkD1E4[0], (void *)(VRAM + 0x10000 + (tile * 32)), 0x500); + DmaCopy32Defvars(3, gPokenavStructPtr->unkD1E4[0], (void *)(VRAM + 0x10000 + (tile * 32)), 0x500); } static u8 *sub_80F4428(u8 *arg0, u16 arg1, u8 arg2) @@ -8103,7 +8103,7 @@ static u8 *sub_80F445C(u8 *arg0, u16 arg1) buffer[1] = 0x11; buffer[2] = 1; buffer += 3; - buffer = AlignInt1InMenuWindow(buffer, gUnknown_083DFEC4->unk8774 + 1, 50, 1); + buffer = AlignInt1InMenuWindow(buffer, gPokenavStructPtr->unk8774 + 1, 50, 1); return buffer; } @@ -8136,23 +8136,23 @@ static void SetMonMarkings(u16 box, u16 monIndex, u8 markings) static void sub_80F45A0(s16 arg0, u8 arg1) { u8 box; - u8 var0 = gUnknown_083DFEC4->unk893c[arg0].unk4; + u8 var0 = gPokenavStructPtr->unk893c[arg0].unk4; if (var0) { - sub_80F4428(gUnknown_083DFEC4->unk8829[arg1], arg0, 0); - box = gUnknown_083DFEC4->unk893c[arg0].unk1; + sub_80F4428(gPokenavStructPtr->unk8829[arg1], arg0, 0); + box = gPokenavStructPtr->unk893c[arg0].unk1; if (box == 14) - AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gOtherText_InParty, 64, 0); + AlignStringInMenuWindow(gPokenavStructPtr->unk88E9[arg1], gOtherText_InParty, 64, 0); else - AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gPokemonStorage.boxNames[box], 64, 0); + AlignStringInMenuWindow(gPokenavStructPtr->unk88E9[arg1], gPokemonStorage.boxNames[box], 64, 0); - gUnknown_083DFEC4->unk8937[arg1] = 1; + gPokenavStructPtr->unk8937[arg1] = 1; } else { - AlignStringInMenuWindow(gUnknown_083DFEC4->unk8829[arg1], gEmptyString_81E72B0, 104, 0); - AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gEmptyString_81E72B0, 64, 0); - gUnknown_083DFEC4->unk8937[arg1] = var0; + AlignStringInMenuWindow(gPokenavStructPtr->unk8829[arg1], gEmptyString_81E72B0, 104, 0); + AlignStringInMenuWindow(gPokenavStructPtr->unk88E9[arg1], gEmptyString_81E72B0, 64, 0); + gPokenavStructPtr->unk8937[arg1] = var0; } } @@ -8162,30 +8162,30 @@ static void sub_80F468C(s16 arg0, u8 arg1) u16 box; u16 monIndex; - if (gUnknown_083DFEC4->unk893c[arg0].unk4) + if (gPokenavStructPtr->unk893c[arg0].unk4) { - box = gUnknown_083DFEC4->unk893c[arg0].unk1; - monIndex = gUnknown_083DFEC4->unk893c[arg0].partyIdx; - gUnknown_083DFEC4->unk8ff0[arg1][0] = sub_80F44B0(box, monIndex, MON_DATA_COOL, NULL); - gUnknown_083DFEC4->unk8ff0[arg1][1] = sub_80F44B0(box, monIndex, MON_DATA_TOUGH, NULL); - gUnknown_083DFEC4->unk8ff0[arg1][2] = sub_80F44B0(box, monIndex, MON_DATA_SMART, NULL); - gUnknown_083DFEC4->unk8ff0[arg1][3] = sub_80F44B0(box, monIndex, MON_DATA_CUTE, NULL); - gUnknown_083DFEC4->unk8ff0[arg1][4] = sub_80F44B0(box, monIndex, MON_DATA_BEAUTY, NULL); + box = gPokenavStructPtr->unk893c[arg0].unk1; + monIndex = gPokenavStructPtr->unk893c[arg0].partyIdx; + gPokenavStructPtr->unk8ff0[arg1][0] = sub_80F44B0(box, monIndex, MON_DATA_COOL, NULL); + gPokenavStructPtr->unk8ff0[arg1][1] = sub_80F44B0(box, monIndex, MON_DATA_TOUGH, NULL); + gPokenavStructPtr->unk8ff0[arg1][2] = sub_80F44B0(box, monIndex, MON_DATA_SMART, NULL); + gPokenavStructPtr->unk8ff0[arg1][3] = sub_80F44B0(box, monIndex, MON_DATA_CUTE, NULL); + gPokenavStructPtr->unk8ff0[arg1][4] = sub_80F44B0(box, monIndex, MON_DATA_BEAUTY, NULL); - gUnknown_083DFEC4->unk8931[arg1] = sub_80F44B0(box, monIndex, MON_DATA_SHEEN, NULL) != 255 + gPokenavStructPtr->unk8931[arg1] = sub_80F44B0(box, monIndex, MON_DATA_SHEEN, NULL) != 255 ? sub_80F44B0(box, monIndex, MON_DATA_SHEEN, NULL) / 29 : 9; - gUnknown_083DFEC4->unk8934[arg1] = sub_80F44B0(box, monIndex, MON_DATA_MARKINGS, NULL); - sub_80F55AC(gUnknown_083DFEC4->unk8ff0[arg1], gUnknown_083DFEC4->unk9004[arg1]); + gPokenavStructPtr->unk8934[arg1] = sub_80F44B0(box, monIndex, MON_DATA_MARKINGS, NULL); + sub_80F55AC(gPokenavStructPtr->unk8ff0[arg1], gPokenavStructPtr->unk9004[arg1]); } else { for (i = 0; i < 5; i++) { - gUnknown_083DFEC4->unk8ff0[arg1][i] = 0; - gUnknown_083DFEC4->unk9004[arg1][i].unk0 = 0x9B; - gUnknown_083DFEC4->unk9004[arg1][i].unk2 = 0x5B; + gPokenavStructPtr->unk8ff0[arg1][i] = 0; + gPokenavStructPtr->unk9004[arg1][i].unk0 = 0x9B; + gPokenavStructPtr->unk9004[arg1][i].unk2 = 0x5B; } } } @@ -8198,10 +8198,10 @@ static void sub_80F4824(s16 arg0, u8 arg1) u16 box; u16 monIndex; - if (gUnknown_083DFEC4->unk893c[arg0].unk4) + if (gPokenavStructPtr->unk893c[arg0].unk4) { - box = gUnknown_083DFEC4->unk893c[arg0].unk1; - monIndex = gUnknown_083DFEC4->unk893c[arg0].partyIdx; + box = gPokenavStructPtr->unk893c[arg0].unk1; + monIndex = gPokenavStructPtr->unk893c[arg0].partyIdx; species = sub_80F44B0(box, monIndex, MON_DATA_SPECIES2, NULL); otId = sub_80F44B0(box, monIndex, MON_DATA_OT_ID, NULL); personality = sub_80F44B0(box, monIndex, MON_DATA_PERSONALITY, NULL); @@ -8210,13 +8210,13 @@ static void sub_80F4824(s16 arg0, u8 arg1) &gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, 1, - (intptr_t)gUnknown_083DFEC4->unk131E4, - gUnknown_083DFEC4->unkD1E4[arg1], + (intptr_t)gPokenavStructPtr->unk131E4, + gPokenavStructPtr->unkD1E4[arg1], species, personality); - LZ77UnCompWram(GetMonSpritePalFromOtIdPersonality(species, otId, personality), gUnknown_083DFEC4->unk0[arg1]); - gUnknown_083DFEC4->unkD1D6[arg1] = species; + LZ77UnCompWram(GetMonSpritePalFromOtIdPersonality(species, otId, personality), gPokenavStructPtr->unk0[arg1]); + gPokenavStructPtr->unkD1D6[arg1] = species; } } @@ -8229,7 +8229,7 @@ void sub_80F4900(s16 arg0, u8 arg1) void sub_80F492C(void) { - gUnknown_083DFEC4->unk8FE4 = 0; + gPokenavStructPtr->unk8FE4 = 0; } #ifdef NONMATCHING @@ -8241,11 +8241,11 @@ void sub_80F4944(struct UnkUsePokeblockSub *arg0) u16 r4; i = 0; - r4 = gUnknown_083DFEC4->unk8FE4; + r4 = gPokenavStructPtr->unk8FE4; r3 = r4 / 2; while (r3 != r4) { - if (arg0->unk0 > gUnknown_083DFEC4->unk893c[r3].unk0) + if (arg0->unk0 > gPokenavStructPtr->unk893c[r3].unk0) r4 = r3; else i = r3 + 1; @@ -8253,15 +8253,15 @@ void sub_80F4944(struct UnkUsePokeblockSub *arg0) r3 = ((r4 - i) / 2) + i; } - r4 = gUnknown_083DFEC4->unk8FE4; + r4 = gPokenavStructPtr->unk8FE4; while (r4 > r3) { - gUnknown_083DFEC4->unk893c[r4] = gUnknown_083DFEC4->unk893c[r4 - 1]; + gPokenavStructPtr->unk893c[r4] = gPokenavStructPtr->unk893c[r4 - 1]; r4--; } - gUnknown_083DFEC4->unk893c[r3] = *arg0; - gUnknown_083DFEC4->unk8FE4++; + gPokenavStructPtr->unk893c[r3] = *arg0; + gPokenavStructPtr->unk8FE4++; } #else NAKED @@ -8273,7 +8273,7 @@ void sub_80F4944(struct UnkUsePokeblockSub *arg0) push {r7}\n\ mov r12, r0\n\ movs r2, 0\n\ - ldr r1, _080F4978 @ =gUnknown_083DFEC4\n\ + ldr r1, _080F4978 @ =gPokenavStructPtr\n\ ldr r5, [r1]\n\ ldr r3, _080F497C @ =0x00008fe4\n\ adds r0, r5, r3\n\ @@ -8296,7 +8296,7 @@ _080F4968:\n\ adds r4, r3, 0\n\ b _080F498A\n\ .align 2, 0\n\ -_080F4978: .4byte gUnknown_083DFEC4\n\ +_080F4978: .4byte gPokenavStructPtr\n\ _080F497C: .4byte 0x00008fe4\n\ _080F4980: .4byte 0x0000893c\n\ _080F4984:\n\ @@ -8366,21 +8366,21 @@ void sub_80F49F4(void) { u16 i; - gUnknown_083DFEC4->unk893c[0].unk2 = 1; - for (i = 1; i < gUnknown_083DFEC4->unk8FE4; i++) + gPokenavStructPtr->unk893c[0].unk2 = 1; + for (i = 1; i < gPokenavStructPtr->unk8FE4; i++) { - if (gUnknown_083DFEC4->unk893c[i].unk0 == gUnknown_083DFEC4->unk893c[i - 1].unk0) - gUnknown_083DFEC4->unk893c[i].unk2 = gUnknown_083DFEC4->unk893c[i - 1].unk2; + if (gPokenavStructPtr->unk893c[i].unk0 == gPokenavStructPtr->unk893c[i - 1].unk0) + gPokenavStructPtr->unk893c[i].unk2 = gPokenavStructPtr->unk893c[i - 1].unk2; else - gUnknown_083DFEC4->unk893c[i].unk2 = i + 1; + gPokenavStructPtr->unk893c[i].unk2 = i + 1; } - gUnknown_083DFEC4->unk876C = 0; - gUnknown_083DFEC4->unk8770 = 0; - gUnknown_083DFEC4->unk876E = 0; - gUnknown_083DFEC4->unk8772 = gUnknown_083DFEC4->unk8FE4 < 9 ? (gUnknown_083DFEC4->unk8FE4 - 1) : 7; - gUnknown_083DFEC4->unk8774 = gUnknown_083DFEC4->unk8FE4 - 1; - gUnknown_083DFEC4->unk87C9 = gUnknown_083DFEC4->unk8774 > 7; + gPokenavStructPtr->unk876C = 0; + gPokenavStructPtr->unk8770 = 0; + gPokenavStructPtr->unk876E = 0; + gPokenavStructPtr->unk8772 = gPokenavStructPtr->unk8FE4 < 9 ? (gPokenavStructPtr->unk8FE4 - 1) : 7; + gPokenavStructPtr->unk8774 = gPokenavStructPtr->unk8FE4 - 1; + gPokenavStructPtr->unk87C9 = gPokenavStructPtr->unk8774 > 7; } void sub_80F4B20(void) @@ -8388,27 +8388,27 @@ void sub_80F4B20(void) s16 var0; s16 var1; - sub_80F4900(gUnknown_083DFEC4->unk87DC, 0); + sub_80F4900(gPokenavStructPtr->unk87DC, 0); sub_80F2E18(0); - if (gUnknown_083DFEC4->unk87DA == 1) + if (gPokenavStructPtr->unk87DA == 1) { - gUnknown_083DFEC4->unk8fe9 = 0; - gUnknown_083DFEC4->unk8FEA = 0; - gUnknown_083DFEC4->unk8FEB = 0; + gPokenavStructPtr->unk8fe9 = 0; + gPokenavStructPtr->unk8FEA = 0; + gPokenavStructPtr->unk8FEB = 0; } else { - gUnknown_083DFEC4->unk8fe9 = 0; - gUnknown_083DFEC4->unk8FEA = 1; - gUnknown_083DFEC4->unk8FEB = 2; + gPokenavStructPtr->unk8fe9 = 0; + gPokenavStructPtr->unk8FEA = 1; + gPokenavStructPtr->unk8FEB = 2; - var0 = gUnknown_083DFEC4->unk87DC + 1; - if (var0 >= gUnknown_083DFEC4->unk87DA) + var0 = gPokenavStructPtr->unk87DC + 1; + if (var0 >= gPokenavStructPtr->unk87DA) var0 = 0; - var1 = gUnknown_083DFEC4->unk87DC - 1; + var1 = gPokenavStructPtr->unk87DC - 1; if (var1 < 0) - var1 = gUnknown_083DFEC4->unk87DA - 1; + var1 = gPokenavStructPtr->unk87DA - 1; sub_80F4900(var0, 1); sub_80F4900(var1, 2); @@ -8419,46 +8419,46 @@ void sub_80F4BD0(void) { u16 i, j; - for (i = 0, j = 0; i < gUnknown_083DFEC4->unk8828; i++) + for (i = 0, j = 0; i < gPokenavStructPtr->unk8828; i++) { if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) { - gUnknown_083DFEC4->unk893c[j].unk1 = 14; - gUnknown_083DFEC4->unk893c[j].partyIdx = i; - gUnknown_083DFEC4->unk893c[j].unk2 = j + 1; - gUnknown_083DFEC4->unk893c[j].unk4 = 1; + gPokenavStructPtr->unk893c[j].unk1 = 14; + gPokenavStructPtr->unk893c[j].partyIdx = i; + gPokenavStructPtr->unk893c[j].unk2 = j + 1; + gPokenavStructPtr->unk893c[j].unk4 = 1; j++; } } - gUnknown_083DFEC4->unk893c[j].unk1 = 0; - gUnknown_083DFEC4->unk893c[j].partyIdx = 0; - gUnknown_083DFEC4->unk893c[j].unk2 = 0; - gUnknown_083DFEC4->unk893c[j].unk4 = 0; - gUnknown_083DFEC4->unk87DC = 0; - gUnknown_083DFEC4->unk87DA = j + 1; + gPokenavStructPtr->unk893c[j].unk1 = 0; + gPokenavStructPtr->unk893c[j].partyIdx = 0; + gPokenavStructPtr->unk893c[j].unk2 = 0; + gPokenavStructPtr->unk893c[j].unk4 = 0; + gPokenavStructPtr->unk87DC = 0; + gPokenavStructPtr->unk87DA = j + 1; sub_80F4B20(); - gUnknown_083DFEC4->unk87CB = 1; + gPokenavStructPtr->unk87CB = 1; } static void sub_80F4CF0(void) { - gUnknown_083DFEC4->unk87DC = gUnknown_083DFEC4->unk876E; + gPokenavStructPtr->unk87DC = gPokenavStructPtr->unk876E; sub_80F4B20(); - if (gUnknown_083DFEC4->unk8774 == 0) - gUnknown_083DFEC4->unk87CB = 0; + if (gPokenavStructPtr->unk8774 == 0) + gPokenavStructPtr->unk87CB = 0; else - gUnknown_083DFEC4->unk87CB = 1; + gPokenavStructPtr->unk87CB = 1; } static void sub_80F4D44(void) { - gUnknown_083DFEC4->unk8FE6 = 0; - gUnknown_083DFEC4->unk8FE7 = 0; + gPokenavStructPtr->unk8FE6 = 0; + gPokenavStructPtr->unk8FE7 = 0; sub_80F492C(); - if (!gUnknown_083DFEC4->unk6DAC) + if (!gPokenavStructPtr->unk6DAC) while (sub_80F4D88()); } @@ -8469,31 +8469,31 @@ static bool8 sub_80F4D88(void) int nextValue; struct UnkUsePokeblockSub var0; - switch (gUnknown_083DFEC4->unk8FE6) + switch (gPokenavStructPtr->unk8FE6) { default: var0.unk4 = 1; for (i = 0; i < 15; i++) { - if (GetBoxMonData(&gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], MON_DATA_SPECIES) - && !GetBoxMonData(&gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], MON_DATA_IS_EGG)) + if (GetBoxMonData(&gPokemonStorage.boxes[gPokenavStructPtr->unk8FE6][gPokenavStructPtr->unk8FE7], MON_DATA_SPECIES) + && !GetBoxMonData(&gPokemonStorage.boxes[gPokenavStructPtr->unk8FE6][gPokenavStructPtr->unk8FE7], MON_DATA_IS_EGG)) { - var0.unk1 = gUnknown_083DFEC4->unk8FE6; - var0.partyIdx = gUnknown_083DFEC4->unk8FE7; + var0.unk1 = gPokenavStructPtr->unk8FE6; + var0.partyIdx = gPokenavStructPtr->unk8FE7; var0.unk0 = GetBoxMonData( - &gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], - gUnknown_083DFEC4->unk87D8); + &gPokemonStorage.boxes[gPokenavStructPtr->unk8FE6][gPokenavStructPtr->unk8FE7], + gPokenavStructPtr->unk87D8); sub_80F4944(&var0); } - gUnknown_083DFEC4->unk8FE7++; + gPokenavStructPtr->unk8FE7++; mask = 0xFF; - if (gUnknown_083DFEC4->unk8FE7 == 30) + if (gPokenavStructPtr->unk8FE7 == 30) { - gUnknown_083DFEC4->unk8FE7 = 0; - nextValue = gUnknown_083DFEC4->unk8FE6 + 1; - gUnknown_083DFEC4->unk8FE6 = nextValue; + gPokenavStructPtr->unk8FE7 = 0; + nextValue = gPokenavStructPtr->unk8FE6 + 1; + gPokenavStructPtr->unk8FE6 = nextValue; if ((nextValue & mask) == 14) break; } @@ -8502,19 +8502,19 @@ static bool8 sub_80F4D88(void) case 14: var0.unk4 = 1; var0.unk1 = 14; - for (i = 0; i < gUnknown_083DFEC4->unk8828; i++) + for (i = 0; i < gPokenavStructPtr->unk8828; i++) { if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) { var0.partyIdx = i; - var0.unk0 = GetMonData(&gPlayerParty[i], gUnknown_083DFEC4->unk87D8); + var0.unk0 = GetMonData(&gPlayerParty[i], gPokenavStructPtr->unk87D8); sub_80F4944(&var0); } } sub_80F49F4(); - gUnknown_083DFEC4->unk87DA = gUnknown_083DFEC4->unk8FE4; - gUnknown_083DFEC4->unk8FE6++; + gPokenavStructPtr->unk87DA = gPokenavStructPtr->unk8FE4; + gPokenavStructPtr->unk8FE6++; break; case 15: return FALSE; @@ -8525,7 +8525,7 @@ static bool8 sub_80F4D88(void) void sub_80F4F78(void) { - sub_80F53EC(gUnknown_083DFEC4->unk9040, gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9]); + sub_80F53EC(gPokenavStructPtr->unk9040, gPokenavStructPtr->unk9004[gPokenavStructPtr->unk8fe9]); sub_80F5504(); } @@ -8538,8 +8538,8 @@ bool8 sub_80F4FB4(void) void sub_80F4FDC(void) { - if (gUnknown_083DFEC4->unk76AA || gUnknown_083DFEC4->unk87DC != gUnknown_083DFEC4->unk8828) - sub_80F53EC(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9040); + if (gPokenavStructPtr->unk76AA || gPokenavStructPtr->unk87DC != gPokenavStructPtr->unk8828) + sub_80F53EC(gPokenavStructPtr->unk9004[gPokenavStructPtr->unk8fe9], gPokenavStructPtr->unk9040); } bool8 sub_80F5038(void) @@ -8556,71 +8556,71 @@ void sub_80F5060(u8 arg0) u8 var2; if (arg0) - var0 = gUnknown_083DFEC4->unk8FEB; + var0 = gPokenavStructPtr->unk8FEB; else - var0 = gUnknown_083DFEC4->unk8FEA; + var0 = gPokenavStructPtr->unk8FEA; - sub_80F53EC(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9004[var0]); - var1 = gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4; + sub_80F53EC(gPokenavStructPtr->unk9004[gPokenavStructPtr->unk8fe9], gPokenavStructPtr->unk9004[var0]); + var1 = gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].unk4; if (arg0) { - gUnknown_083DFEC4->unk8FEB = gUnknown_083DFEC4->unk8FEA; - gUnknown_083DFEC4->unk8FEA = gUnknown_083DFEC4->unk8fe9; - gUnknown_083DFEC4->unk8fe9 = var0; - gUnknown_083DFEC4->unk8FEC = gUnknown_083DFEC4->unk8FEB; + gPokenavStructPtr->unk8FEB = gPokenavStructPtr->unk8FEA; + gPokenavStructPtr->unk8FEA = gPokenavStructPtr->unk8fe9; + gPokenavStructPtr->unk8fe9 = var0; + gPokenavStructPtr->unk8FEC = gPokenavStructPtr->unk8FEB; - gUnknown_083DFEC4->unk87DC = gUnknown_083DFEC4->unk87DC - ? gUnknown_083DFEC4->unk87DC - 1 - : gUnknown_083DFEC4->unk87DA - 1; - gUnknown_083DFEC4->unk8FEE = gUnknown_083DFEC4->unk87DC - ? gUnknown_083DFEC4->unk87DC - 1 - : gUnknown_083DFEC4->unk87DA - 1; + gPokenavStructPtr->unk87DC = gPokenavStructPtr->unk87DC + ? gPokenavStructPtr->unk87DC - 1 + : gPokenavStructPtr->unk87DA - 1; + gPokenavStructPtr->unk8FEE = gPokenavStructPtr->unk87DC + ? gPokenavStructPtr->unk87DC - 1 + : gPokenavStructPtr->unk87DA - 1; } else { - gUnknown_083DFEC4->unk8FEA = gUnknown_083DFEC4->unk8FEB; - gUnknown_083DFEC4->unk8FEB = gUnknown_083DFEC4->unk8fe9; - gUnknown_083DFEC4->unk8fe9 = var0; - gUnknown_083DFEC4->unk8FEC = gUnknown_083DFEC4->unk8FEA; + gPokenavStructPtr->unk8FEA = gPokenavStructPtr->unk8FEB; + gPokenavStructPtr->unk8FEB = gPokenavStructPtr->unk8fe9; + gPokenavStructPtr->unk8fe9 = var0; + gPokenavStructPtr->unk8FEC = gPokenavStructPtr->unk8FEA; - gUnknown_083DFEC4->unk87DC = (gUnknown_083DFEC4->unk87DC < gUnknown_083DFEC4->unk87DA - 1) - ? gUnknown_083DFEC4->unk87DC + 1 + gPokenavStructPtr->unk87DC = (gPokenavStructPtr->unk87DC < gPokenavStructPtr->unk87DA - 1) + ? gPokenavStructPtr->unk87DC + 1 : 0; - gUnknown_083DFEC4->unk8FEE = (gUnknown_083DFEC4->unk87DC < gUnknown_083DFEC4->unk87DA - 1) - ? gUnknown_083DFEC4->unk87DC + 1 + gPokenavStructPtr->unk8FEE = (gPokenavStructPtr->unk87DC < gPokenavStructPtr->unk87DA - 1) + ? gPokenavStructPtr->unk87DC + 1 : 0; } - var2 = gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4; + var2 = gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].unk4; if (!var1) - gUnknown_083DFEC4->unk87E0 = sub_80F5264; + gPokenavStructPtr->unk87E0 = sub_80F5264; else if (!var2) - gUnknown_083DFEC4->unk87E0 = sub_80F52F8; + gPokenavStructPtr->unk87E0 = sub_80F52F8; else - gUnknown_083DFEC4->unk87E0 = sub_80F5364; + gPokenavStructPtr->unk87E0 = sub_80F5364; - gUnknown_083DFEC4->unk87DE = 0; + gPokenavStructPtr->unk87DE = 0; } bool8 gpu_sync_bg_show(void) { - return gUnknown_083DFEC4->unk87E0(); + return gPokenavStructPtr->unk87E0(); } static bool8 sub_80F5264(void) { - switch (gUnknown_083DFEC4->unk87DE) + switch (gPokenavStructPtr->unk87DE) { case 0: - sub_80F2E18(gUnknown_083DFEC4->unk8fe9); - sub_80F01E0(gUnknown_083DFEC4->unk8fe9); - gUnknown_083DFEC4->unk87DE++; + sub_80F2E18(gPokenavStructPtr->unk8fe9); + sub_80F01E0(gPokenavStructPtr->unk8fe9); + gPokenavStructPtr->unk87DE++; // fall through case 1: if (!sub_80F4FB4()) { - sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); - gUnknown_083DFEC4->unk87DE++; + sub_80F4900(gPokenavStructPtr->unk8FEE, gPokenavStructPtr->unk8FEC); + gPokenavStructPtr->unk87DE++; } break; case 2: @@ -8632,14 +8632,14 @@ static bool8 sub_80F5264(void) static bool8 sub_80F52F8(void) { - switch (gUnknown_083DFEC4->unk87DE) + switch (gPokenavStructPtr->unk87DE) { case 0: if (!sub_80F5038()) { - sub_80F01E0(gUnknown_083DFEC4->unk8fe9); - sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); - gUnknown_083DFEC4->unk87DE++; + sub_80F01E0(gPokenavStructPtr->unk8fe9); + sub_80F4900(gPokenavStructPtr->unk8FEE, gPokenavStructPtr->unk8FEC); + gPokenavStructPtr->unk87DE++; } break; case 1: @@ -8651,23 +8651,23 @@ static bool8 sub_80F52F8(void) static bool8 sub_80F5364(void) { - switch (gUnknown_083DFEC4->unk87DE) + switch (gPokenavStructPtr->unk87DE) { case 0: sub_80F5504(); if (!sub_80F173C()) { - sub_80F2E18(gUnknown_083DFEC4->unk8fe9); - sub_80F01E0(gUnknown_083DFEC4->unk8fe9); - gUnknown_083DFEC4->unk87DE++; + sub_80F2E18(gPokenavStructPtr->unk8fe9); + sub_80F01E0(gPokenavStructPtr->unk8fe9); + gPokenavStructPtr->unk87DE++; } break; case 1: if (!sub_80F4FB4()) - gUnknown_083DFEC4->unk87DE++; + gPokenavStructPtr->unk87DE++; break; case 2: - sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); + sub_80F4900(gPokenavStructPtr->unk8FEE, gPokenavStructPtr->unk8FEC); return FALSE; } @@ -8686,31 +8686,31 @@ static void sub_80F53EC(struct UnkPokenav11 *arg0, struct UnkPokenav11 *arg1) r6 = ((arg1[i].unk0 - arg0[i].unk0) << 8) / 10; for (j = 0; j < 9; j++) { - gUnknown_083DFEC4->unk9054[j][i].unk0 = (r5 >> 8) + ((r5 >> 7) & 1); + gPokenavStructPtr->unk9054[j][i].unk0 = (r5 >> 8) + ((r5 >> 7) & 1); r5 += r6; } - gUnknown_083DFEC4->unk9054[j][i].unk0 = arg1[i].unk0; + gPokenavStructPtr->unk9054[j][i].unk0 = arg1[i].unk0; r5 = arg0[i].unk2 << 8; r6 = ((arg1[i].unk2 - arg0[i].unk2) << 8) / 10; for (j = 0; j < 9; j++) { - gUnknown_083DFEC4->unk9054[j][i].unk2 = (r5 >> 8) + ((r5 >> 7) & 1); + gPokenavStructPtr->unk9054[j][i].unk2 = (r5 >> 8) + ((r5 >> 7) & 1); r5 += r6; } - gUnknown_083DFEC4->unk9054[j][i].unk2 = arg1[i].unk2; + gPokenavStructPtr->unk9054[j][i].unk2 = arg1[i].unk2; } - gUnknown_083DFEC4->unk9342 = 0; + gPokenavStructPtr->unk9342 = 0; } static bool8 sub_80F5504(void) { - if (gUnknown_083DFEC4->unk9342 < 10) + if (gPokenavStructPtr->unk9342 < 10) { - sub_80F556C(gUnknown_083DFEC4->unk9054[gUnknown_083DFEC4->unk9342++]); - return gUnknown_083DFEC4->unk9342 != 10; + sub_80F556C(gPokenavStructPtr->unk9054[gPokenavStructPtr->unk9342++]); + return gPokenavStructPtr->unk9342 != 10; } else { @@ -8733,7 +8733,7 @@ void sub_80F556C(struct UnkPokenav11 *arg0) u16 i; for (i = 0; i < 5; i++) - gUnknown_083DFEC4->unk911C[i] = arg0[i]; + gPokenavStructPtr->unk911C[i] = arg0[i]; - gUnknown_083DFEC4->unk9344 = 1; + gPokenavStructPtr->unk9344 = 1; } diff --git a/src/trainers_eye.c b/src/trainers_eye.c index 3b6ccf08a..66f5d4acb 100644 --- a/src/trainers_eye.c +++ b/src/trainers_eye.c @@ -27,21 +27,23 @@ static const struct TrainersEyeGymLeadersAndE4 sGymLeaderTrainersEye[13] = { {TRAINER_STEVEN, MAPSEC_EVER_GRANDE_CITY} }; +void sub_80F6E04(u8); + void sub_80F6C20(void) { u16 i; - gUnknown_083DFEC4->unkD158 = 0; + gPokenavStructPtr->unkD158 = 0; for (i = 0; i < 56; i++) { if (HasTrainerAlreadyBeenFought(gTrainerEyeTrainers[i].opponentIDs[0])) { - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk0 = gTrainerEyeTrainers[i].opponentIDs[0]; - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk4 = i; - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk5 = gSaveBlock1.trainerRematches[i]; - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk2 = Overworld_GetMapHeaderByGroupAndId(gTrainerEyeTrainers[i].mapGroup, gTrainerEyeTrainers[i].mapNum)->regionMapSectionId; - gUnknown_083DFEC4->unkD158++; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].opponentId = gTrainerEyeTrainers[i].opponentIDs[0]; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].rematchTableIdx = i; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].rematchNo = gSaveBlock1.trainerRematches[i]; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].regionMapSectionId = Overworld_GetMapHeaderByGroupAndId(gTrainerEyeTrainers[i].mapGroup, gTrainerEyeTrainers[i].mapNum)->regionMapSectionId; + gPokenavStructPtr->unkD158++; } } @@ -50,19 +52,29 @@ void sub_80F6C20(void) { if (HasTrainerAlreadyBeenFought(sGymLeaderTrainersEye[i].opponentId)) { - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk0 = sGymLeaderTrainersEye[i].opponentId; - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk2 = sGymLeaderTrainersEye[i].regionMapSectionId; - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk5 = 0; - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk4 = i + 0x38; - gUnknown_083DFEC4->unkD158++; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].opponentId = sGymLeaderTrainersEye[i].opponentId; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].regionMapSectionId = sGymLeaderTrainersEye[i].regionMapSectionId; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].rematchNo = 0; + gPokenavStructPtr->trainersEye[gPokenavStructPtr->unkD158].rematchTableIdx = i + 0x38; + gPokenavStructPtr->unkD158++; } } } - gUnknown_083DFEC4->unk876C = 0; - gUnknown_083DFEC4->unk8770 = 0; - gUnknown_083DFEC4->unk876E = 0; - gUnknown_083DFEC4->unk8772 = gUnknown_083DFEC4->unkD158 <= 8 ? gUnknown_083DFEC4->unkD158 - 1 : 7; - gUnknown_083DFEC4->unk8774 = gUnknown_083DFEC4->unkD158 - 1; - gUnknown_083DFEC4->unk87C9 = gUnknown_083DFEC4->unk8774 < 8 ? 0 : 1; + gPokenavStructPtr->unk876C = 0; + gPokenavStructPtr->unk8770 = 0; + gPokenavStructPtr->unk876E = 0; + gPokenavStructPtr->unk8772 = gPokenavStructPtr->unkD158 <= 8 ? gPokenavStructPtr->unkD158 - 1 : 7; + gPokenavStructPtr->unk8774 = gPokenavStructPtr->unkD158 - 1; + gPokenavStructPtr->unk87C9 = gPokenavStructPtr->unk8774 < 8 ? 0 : 1; +} + +void sub_80F6DB8(void) +{ + s32 r1 = 0; + gPokenavStructPtr->unk8fe9 = r1; + sub_80F6E04(0); + gPokenavStructPtr->unkD15A = -72; + sub_80F2F7C(0); + gPokenavStructPtr->unk87DC = gPokenavStructPtr->unk876E; } diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 5bfe47845..9deab01fc 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -138,10 +138,10 @@ static void sub_81371DC(struct Sprite *); void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback) { - gUnknown_02039304 = &gUnknown_083DFEC4->unkD164; + gUnknown_02039304 = &gPokenavStructPtr->unkD164; gUnknown_02039304->pokeblock = pokeblock; gUnknown_02039304->callback = callback; - gUnknown_083DFEC4->unkD162 = 2; + gPokenavStructPtr->unkD162 = 2; launch_c3_walk_stairs_and_run_once(sub_8136294); SetMainCallback2(sub_8136244); } @@ -152,7 +152,7 @@ static void sub_8136174(void) gUnknown_02039304->callback = gUnknown_02039308; gPokeblockMonID = sub_81370E4(gPokeblockMonID); gUnknown_02039304->unk56 = gPokeblockMonID < 4 ? 0 : 1; - gUnknown_083DFEC4->unkD162 = 2; + gPokenavStructPtr->unkD162 = 2; launch_c3_walk_stairs_and_run_once(sub_8136294); SetMainCallback2(sub_81361E4); } @@ -209,7 +209,7 @@ static void sub_8136294(void) { case 0: c1LinkRelatedActive = is_c1_link_related_active(); - gUnknown_083DFEC4->unk6DAC = c1LinkRelatedActive; + gPokenavStructPtr->unk6DAC = c1LinkRelatedActive; if ((bool8)c1LinkRelatedActive == FALSE) { gUnknown_02039304->unk55 = 0; @@ -241,9 +241,9 @@ static void sub_8136294(void) } break; case 6: - gUnknown_083DFEC4->unk76AA = 0; - gUnknown_083DFEC4->unk87E0 = NULL; - gUnknown_083DFEC4->unk030C = 0x20; + gPokenavStructPtr->unk76AA = 0; + gPokenavStructPtr->unk87E0 = NULL; + gPokenavStructPtr->unk030C = 0x20; gUnknown_02039304->unk50++; break; case 7: @@ -268,11 +268,11 @@ static void sub_8136294(void) break; case 11: gKeyRepeatStartDelay = 20; - gUnknown_083DFEC4->unk8828 = CalculatePlayerPartyCount(); - gUnknown_083DFEC4->unk9344 = 0; - gUnknown_083DFEC4->unk8768 = NULL; + gPokenavStructPtr->unk8828 = CalculatePlayerPartyCount(); + gPokenavStructPtr->unk9344 = 0; + gPokenavStructPtr->unk8768 = NULL; sub_80F4BD0(); - gUnknown_083DFEC4->unkD160 = 0; + gPokenavStructPtr->unkD160 = 0; gUnknown_02039304->unk50++; break; case 12: @@ -285,7 +285,7 @@ static void sub_8136294(void) break; case 13: sub_80F2E18(0); - gUnknown_083DFEC4->unk8768->pos2.y = 0xffd8; + gPokenavStructPtr->unk8768->pos2.y = 0xffd8; gUnknown_02039304->unk50++; break; case 14: @@ -306,7 +306,7 @@ static void sub_8136294(void) gUnknown_02039304->unk50++; break; case 17: - sub_80F567C(gUnknown_083DFEC4->unk8ff0[0], gUnknown_083DFEC4->unk9004[0]); + sub_80F567C(gPokenavStructPtr->unk8ff0[0], gPokenavStructPtr->unk9004[0]); sub_80F5B38(); gUnknown_02039304->unk50++; break; @@ -317,7 +317,7 @@ static void sub_8136294(void) } break; case 19: - sub_80F556C(gUnknown_083DFEC4->unk9004[0]); + sub_80F556C(gPokenavStructPtr->unk9004[0]); gUnknown_02039304->unk50++; break; case 20: @@ -396,7 +396,7 @@ static void sub_8136638(void) else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if (gUnknown_083DFEC4->unk87DC == gUnknown_083DFEC4->unk87DA - 1) + if (gPokenavStructPtr->unk87DC == gPokenavStructPtr->unk87DA - 1) { gUnknown_02039304->unk50 = 3; } @@ -464,7 +464,7 @@ static void sub_8136808(void) switch (gUnknown_02039304->unk50) { case 0: - gPokeblockMonID = sub_81370A4(gUnknown_083DFEC4->unk87DC); + gPokeblockMonID = sub_81370A4(gPokenavStructPtr->unk87DC); gUnknown_02039308 = gUnknown_02039304->callback; gUnknown_0203930C = gUnknown_02039304->pokeblock; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); @@ -485,7 +485,7 @@ static void sub_81368A4(void) switch (gUnknown_02039304->unk50) { case 0: - if (gUnknown_083DFEC4->unk87DC != gPokeblockMonID) + if (gPokenavStructPtr->unk87DC != gPokeblockMonID) { sub_80F5060(gUnknown_02039304->unk56); gUnknown_02039304->unk50++; @@ -539,7 +539,7 @@ static void sub_81369CC(void) { case 0: gUnknown_02039304->pokemon = &gPlayerParty[0]; - gUnknown_02039304->pokemon = &gPlayerParty[gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx]; + gUnknown_02039304->pokemon = &gPlayerParty[gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].partyIdx]; move_anim_execute(); gUnknown_02039304->unk50++; break; @@ -549,15 +549,15 @@ static void sub_81369CC(void) break; case 2: sub_8136EF0(); - sub_80F567C(gUnknown_02039304->unk5c, gUnknown_083DFEC4->unk9040); - sub_80F5550(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9040); + sub_80F567C(gUnknown_02039304->unk5c, gPokenavStructPtr->unk9040); + sub_80F5550(gPokenavStructPtr->unk9004[gPokenavStructPtr->unk8fe9], gPokenavStructPtr->unk9040); sub_8137138(); gUnknown_02039304->unk50++; break; case 3: if (!sub_80F555C()) { - sub_80F7224(sub_81370A4(gUnknown_083DFEC4->unk87DC)); + sub_80F7224(sub_81370A4(gPokenavStructPtr->unk87DC)); sub_80F3D00(); gUnknown_02039304->unk52 = 0; gUnknown_02039304->unk50++; @@ -606,7 +606,7 @@ static void sub_8136B44(void) static void sub_8136BB8(void) { - GetMonData(&gPlayerParty[sub_81370A4(gUnknown_083DFEC4->unk87DC)], MON_DATA_NICKNAME, gUnknown_02039304->stringBuffer); + GetMonData(&gPlayerParty[sub_81370A4(gPokenavStructPtr->unk87DC)], MON_DATA_NICKNAME, gUnknown_02039304->stringBuffer); StringGetEnd10(gUnknown_02039304->stringBuffer); StringAppend(gUnknown_02039304->stringBuffer, gOtherText_GetsAPokeBlock); BasicInitMenuWindow(&gWindowTemplate_81E709C); @@ -781,7 +781,7 @@ static void sub_8136EF0(void) { u16 i; struct Pokemon *pokemon = gPlayerParty; - pokemon += gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx; + pokemon += gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].partyIdx; Pokeblock_GetMonContestStats(pokemon, gUnknown_02039304->unk57); sub_8136E40(gUnknown_02039304->pokeblock, pokemon); Pokeblock_GetMonContestStats(pokemon, gUnknown_02039304->unk5c); @@ -826,7 +826,7 @@ static void sub_8136F74(struct Pokeblock *pokeblock, struct Pokemon *pokemon) static bool8 sub_8137058(void) { struct Pokemon *pokemon = gPlayerParty; - pokemon += gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx; + pokemon += gPokenavStructPtr->unk893c[gPokenavStructPtr->unk87DC].partyIdx; if (GetMonData(pokemon, MON_DATA_SHEEN) == 255) return TRUE; return FALSE; |