diff options
Diffstat (limited to 'asm')
-rw-r--r-- | asm/emerald.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 96ddf96bc..3cb234744 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -162487,7 +162487,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 bl gpu_pal_alloc_new adds r4, r0, 0 lsls r4, 24 - ldr r1, =gUnknown_08305D8C + ldr r1, =gTrainerBackPicPaletteTable ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -164913,7 +164913,7 @@ sub_805DF84: ; 805DF84 bl battle_get_per_side_status lsls r0, 24 lsls r5, 3 - ldr r2, =gUnknown_08305D4C + ldr r2, =gTrainerBackPicTable adds r2, r5, r2 ldr r1, =0x020244d4 ldr r1, [r1] @@ -164924,7 +164924,7 @@ sub_805DF84: ; 805DF84 adds r0, r2, 0 movs r2, 0 bl LZ77UnCompAnyRam - ldr r0, =gUnknown_08305D8C + ldr r0, =gTrainerBackPicPaletteTable adds r5, r0 ldr r0, [r5] lsls r4, 20 @@ -642591,7 +642591,7 @@ sub_814DAA8: ; 814DAA8 adds r1, r4 ldrb r0, [r1, 0x13] @0814DC06: - ldr r1, =gUnknown_08305D8C + ldr r1, =gTrainerBackPicPaletteTable lsls r0, 3 adds r0, r1 ldr r0, [r0] @@ -699554,7 +699554,7 @@ sub_816A90C: ; 816A90C bl gpu_pal_alloc_new adds r4, r0, 0 lsls r4, 24 - ldr r0, =gUnknown_08305D8C + ldr r0, =gTrainerBackPicPaletteTable ldr r0, [r0, 0x30] lsrs r4, 20 movs r2, 0x80 @@ -765447,7 +765447,7 @@ sub_818CA64: ; 818CA64 ldr r0, [r0] ldrb r0, [r0, 0x8] @0818CB5A: - ldr r1, =gUnknown_08305D8C + ldr r1, =gTrainerBackPicPaletteTable lsls r0, 3 adds r0, r1 ldr r0, [r0] @@ -766065,7 +766065,7 @@ load_pokemon_image_TODO: ; 818CFF4 .pool @0818D080: lsls r0, r7, 3 - ldr r1, =gUnknown_08305D4C + ldr r1, =gTrainerBackPicTable adds r0, r1 adds r1, r5, 0 adds r2, r7, 0 @@ -861971,7 +861971,7 @@ sub_81BE10C: ; 81BE10C ldr r0, =0x00000c03 cmp r1, r0 bne @081BE1FC - ldr r0, =gUnknown_08305D8C + ldr r0, =gTrainerBackPicPaletteTable ldr r0, [r0, 0x38] lsls r4, 4 movs r2, 0x80 |