diff options
| -rw-r--r-- | asm/trainers_eye.s | 70 | ||||
| -rw-r--r-- | src/trainers_eye.c | 11 |
2 files changed, 11 insertions, 70 deletions
diff --git a/asm/trainers_eye.s b/asm/trainers_eye.s index feaf75e33..f97acaf78 100644 --- a/asm/trainers_eye.s +++ b/asm/trainers_eye.s @@ -5,76 +5,6 @@ .text - thumb_func_start sub_80F6E04 -sub_80F6E04: @ 80F6E04 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _080F6E78 @ =gPokenavStructPtr - ldr r5, [r0] - ldr r1, _080F6E7C @ =0x0000876e - adds r0, r5, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - lsls r0, 3 - adds r0, r5, r0 - ldr r7, _080F6E80 @ =0x0000cee8 - adds r0, r7 - ldrh r1, [r0] - ldr r2, _080F6E84 @ =gTrainers - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r6, [r0, 0x3] - lsls r0, r6, 3 - mov r8, r0 - ldr r0, _080F6E88 @ =gTrainerFrontPicTable - add r0, r8 - ldr r2, _080F6E8C @ =gTrainerFrontPicCoords - lsls r1, r6, 2 - adds r1, r2 - ldrb r1, [r1] - ldr r2, _080F6E90 @ =0x000131e4 - adds r3, r5, r2 - lsls r2, r4, 13 - ldr r7, _080F6E94 @ =0x0000d1e4 - adds r2, r7 - adds r2, r5, r2 - str r2, [sp] - str r6, [sp, 0x4] - movs r2, 0x1 - bl DecompressPicFromTable_2 - ldr r0, _080F6E98 @ =gTrainerFrontPicPaletteTable - add r8, r0 - mov r1, r8 - ldr r0, [r1] - lsls r4, 7 - adds r5, r4 - adds r1, r5, 0 - bl LZ77UnCompWram - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F6E78: .4byte gPokenavStructPtr -_080F6E7C: .4byte 0x0000876e -_080F6E80: .4byte 0x0000cee8 -_080F6E84: .4byte gTrainers -_080F6E88: .4byte gTrainerFrontPicTable -_080F6E8C: .4byte gTrainerFrontPicCoords -_080F6E90: .4byte 0x000131e4 -_080F6E94: .4byte 0x0000d1e4 -_080F6E98: .4byte gTrainerFrontPicPaletteTable - thumb_func_end sub_80F6E04 - thumb_func_start sub_80F6E9C sub_80F6E9C: @ 80F6E9C push {lr} diff --git a/src/trainers_eye.c b/src/trainers_eye.c index 66f5d4acb..641f777b5 100644 --- a/src/trainers_eye.c +++ b/src/trainers_eye.c @@ -1,7 +1,10 @@ #include "global.h" +#include "decompress.h" #include "battle_setup.h" #include "overworld.h" #include "pokenav.h" +#include "battle.h" +#include "data2.h" #include "constants/opponents.h" #include "constants/region_map_sections.h" @@ -78,3 +81,11 @@ void sub_80F6DB8(void) sub_80F2F7C(0); gPokenavStructPtr->unk87DC = gPokenavStructPtr->unk876E; } + +void sub_80F6E04(u8 a0) +{ + u16 r1 = gPokenavStructPtr->trainersEye[gPokenavStructPtr->unk876E].opponentId; + u8 r6 = gTrainers[r1].trainerPic; + DecompressPicFromTable_2(&gTrainerFrontPicTable[r6], gTrainerFrontPicCoords[r6].coords, 1, gPokenavStructPtr->unk131E4, gPokenavStructPtr->unkD1E4[a0], r6); + LZ77UnCompWram(gTrainerFrontPicPaletteTable[r6].data, gPokenavStructPtr->unk0[a0]); +} |