diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/emerald.s | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index a54c4f4d2..96ddf96bc 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -160138,7 +160138,7 @@ sub_805B4F0: ; 805B4F0 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] @@ -164878,7 +164878,7 @@ sub_805DF38: ; 805DF38 bl battle_get_per_side_status lsls r0, 24 lsls r4, 3 - ldr r2, =gUnknown_08305654 + ldr r2, =gTrainerPicTable adds r2, r4, r2 ldr r1, =0x020244d4 ldr r1, [r1] @@ -164889,7 +164889,7 @@ sub_805DF38: ; 805DF38 adds r0, r2, 0 movs r2, 0 bl LZ77UnCompAnyRam - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable adds r4, r0 adds r0, r4, 0 bl gpu_pal_obj_decompress_and_apply @@ -164951,7 +164951,7 @@ nullsub_25: ; 805DFE0 sub_805DFE4: ; 805DFE4 push {lr} lsls r0, 16 - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable lsrs r0, 13 adds r0, r1 ldrh r0, [r0, 0x4] @@ -171593,7 +171593,7 @@ sub_8061690: ; 8061690 adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x2E] - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -171830,7 +171830,7 @@ sub_80618D8: ; 80618D8 adds r0, r4 ldr r1, =0x0000fffe strh r1, [r0, 0x2E] - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -181284,7 +181284,7 @@ sub_8066748: ; 8066748 adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x2E] - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -181418,7 +181418,7 @@ sub_8066A58: ; 8066A58 adds r0, r4 ldr r1, =0x0000fffe strh r1, [r0, 0x2E] - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -342828,13 +342828,13 @@ sub_80B5E6C: ; 80B5E6C lsrs r0, 24 mov r9, r0 lsrs r4, 21 - ldr r3, =gUnknown_0830593C + ldr r3, =gTrainerPaletteTable mov r8, r3 add r8, r4 mov r0, r8 adds r1, r7, 0 bl gpu_pal_obj_decompress_and_apply2 - ldr r0, =gUnknown_08305654 + ldr r0, =gTrainerPicTable adds r4, r0 adds r0, r4, 0 adds r1, r7, 0 @@ -342886,12 +342886,12 @@ sub_80B5F0C: ; 80B5F0C lsls r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, =gUnknown_08305654 + ldr r0, =gTrainerPicTable lsrs r4, 21 adds r0, r4, r0 ldr r0, [r0] bl call_LZZUnCompVram - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable adds r4, r0 ldr r0, [r4] adds r1, r5, 0 @@ -757777,7 +757777,7 @@ sub_818888C: ; 818888C adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x2E] - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -763872,7 +763872,7 @@ sub_818BD04: ; 818BD04 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] @@ -766055,7 +766055,7 @@ load_pokemon_image_TODO: ; 818CFF4 cmp r2, 0 beq @0818D080 lsls r0, r4, 3 - ldr r1, =gUnknown_08305654 + ldr r1, =gTrainerPicTable adds r0, r1 adds r1, r5, 0 adds r2, r4, 0 @@ -766160,7 +766160,7 @@ sub_818D0C4: ; 818D0C4 adds r0, r3, 0 orrs r0, r1 strh r0, [r2, 0x2] - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable lsls r0, r4, 3 adds r0, r1 ldr r0, [r0] @@ -766180,7 +766180,7 @@ sub_818D0C4: ; 818D0C4 ldr r0, =0x0203ccec strh r1, [r0, 0x2] lsls r0, r6, 3 - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable adds r0, r1 bl gpu_pal_obj_decompress_and_apply @0818D16E: @@ -766212,7 +766212,7 @@ sub_818D180: ; 818D180 bl decompress_palette b @0818D1B4 @0818D1A4: - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable lsls r0, 3 adds r0, r1 ldr r0, [r0] @@ -860428,7 +860428,7 @@ sub_81BD37C: ; 81BD37C ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] @@ -861986,7 +861986,7 @@ sub_81BE10C: ; 81BE10C ldrh r0, [r2] bl sub_8162AA0 lsls r0, 24 - ldr r1, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable lsrs r0, 21 adds r0, r1 ldr r0, [r0] @@ -889704,14 +889704,14 @@ sub_81CC39C: ; 81CC39C cmp r0, 0 blt @081CC400 lsls r4, r0, 3 - ldr r0, =gUnknown_08305654 + ldr r0, =gTrainerPicTable adds r0, r4, r0 ldr r1, =0x00001828 adds r5, r7, r1 adds r1, r5, 0 movs r2, 0 bl sub_80345F0 - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable adds r4, r0 ldr r0, [r4] ldr r1, =0x00002028 |