diff options
Diffstat (limited to 'asm/rom_80A5C6C.s')
| -rw-r--r-- | asm/rom_80A5C6C.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/asm/rom_80A5C6C.s b/asm/rom_80A5C6C.s index 22e91ecdc..ea75d4e2b 100644 --- a/asm/rom_80A5C6C.s +++ b/asm/rom_80A5C6C.s @@ -263,7 +263,7 @@ _080A5E90: cmp r5, r0 bne _080A5EB0 ldr r0, =gUnknown_08525F8C - ldr r1, =gUnknown_020244E4 + ldr r1, =gBattleMonForms adds r1, r4, r1 ldrb r1, [r1] adds r1, r0 @@ -353,7 +353,7 @@ _080A5F58: cmp r5, r0 bne _080A5F7C ldr r0, =gUnknown_08525F78 - ldr r1, =gUnknown_020244E4 + ldr r1, =gBattleMonForms adds r1, r4, r1 ldrb r1, [r1] lsls r1, 2 @@ -407,7 +407,7 @@ sub_80A5FA0: @ 80A5FA0 cmp r4, r0 bne _080A5FE8 ldr r0, =gUnknown_08525F88 - ldr r1, =gUnknown_020244E4 + ldr r1, =gBattleMonForms adds r1, r6, r1 ldrb r1, [r1] adds r1, r0 @@ -4541,7 +4541,7 @@ sub_80A7F18: @ 80A7F18 movs r4, 0 ldr r1, =gBankSpriteIds ldr r7, =0x00000181 - ldr r0, =gUnknown_020244E4 + ldr r0, =gBattleMonForms adds r6, r5, r0 _080A7F38: adds r0, r4, r1 @@ -5155,7 +5155,7 @@ sub_80A8394: @ 80A8394 bl AllocSpritePalette lsls r0, 24 lsrs r5, r0, 24 - ldr r4, =gUnknown_020244D4 + ldr r4, =gBattleSpritesGfx ldr r0, [r4] cmp r0, 0 beq _080A8412 @@ -5213,7 +5213,7 @@ _080A845E: lsls r0, r6, 3 ldr r1, =gMonFrontPicTable adds r0, r1 - ldr r1, =gUnknown_020244D4 + ldr r1, =gBattleSpritesGfx ldr r1, [r1] movs r3, 0xBE lsls r3, 1 @@ -5226,7 +5226,7 @@ _080A8488: lsls r0, r6, 3 ldr r1, =gMonFrontPicTable adds r0, r1 - ldr r1, =gUnknown_020244D4 + ldr r1, =gBattleSpritesGfx ldr r1, [r1] movs r2, 0xBE lsls r2, 1 @@ -5276,7 +5276,7 @@ _080A84F6: lsls r0, r6, 3 ldr r1, =gMonBackPicTable adds r0, r1 - ldr r1, =gUnknown_020244D4 + ldr r1, =gBattleSpritesGfx ldr r1, [r1] movs r2, 0xBE lsls r2, 1 @@ -5294,7 +5294,7 @@ _080A8524: lsls r0, r6, 3 ldr r1, =gMonBackPicTable adds r0, r1 - ldr r1, =gUnknown_020244D4 + ldr r1, =gBattleSpritesGfx ldr r1, [r1] movs r3, 0xBE lsls r3, 1 @@ -5305,7 +5305,7 @@ _080A8524: mov r3, r8 bl LoadSpecialPokePic_2 _080A8540: - ldr r5, =gUnknown_020244D4 + ldr r5, =gBattleSpritesGfx ldr r0, [r5] movs r4, 0xBE lsls r4, 1 @@ -5658,7 +5658,7 @@ _080A882E: cmp r7, r0 bne _080A8850 _080A8834: - ldr r0, =gUnknown_020244E4 + ldr r0, =gBattleMonForms add r0, r8 ldrb r0, [r0] lsls r0, 2 |