diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /src/battle_interface.c | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index dedde2cb3..b91db9838 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1350,11 +1350,11 @@ void sub_8044338(u8 a, struct Pokemon *pkmn) int foo; foo = gSprites[a].oam.tileNum + MACRO1(r7); - CpuCopy32(r6, (u8 *)0x06010000 + foo * 32, 32); + CpuCopy32(r6, (u8 *)(VRAM + 0x10000) + foo * 32, 32); r6 += 32; foo = gSprites[a].oam.tileNum + 8 + MACRO1(r7); - CpuCopy32(r6, (u8 *)0x06010000 + foo * 32, 32); + CpuCopy32(r6, (u8 *)(VRAM + 0x10000) + foo * 32, 32); r6 += 32; } //_08044486 @@ -1370,12 +1370,12 @@ void sub_8044338(u8 a, struct Pokemon *pkmn) if (r7 <= 1) { int foo = (gSprites[r5].oam.tileNum + 2 + r7); - CpuCopy32(ewram0_9(1) + r7 * 0x40, (u8 *)0x06010000 + foo * 32, 32); + CpuCopy32(ewram0_9(1) + r7 * 0x40, (u8 *)(VRAM + 0x10000) + foo * 32, 32); } else { int foo = (r7 + gSprites[r5].oam.tileNum); - CpuCopy32(ewram0_9(1) + r7 * 0x40, (u8 *)0x060100C0 + foo * 32, 32); + CpuCopy32(ewram0_9(1) + r7 * 0x40, (u8 *)(VRAM + 0x100C0) + foo * 32, 32); } } } @@ -1524,7 +1524,7 @@ _08044446:\n\ lsls r5, 6\n\ adds r0, r5\n\ lsls r0, 5\n\ - ldr r2, _08044500 @ =0x06010000\n\ + ldr r2, _08044500 @ =(VRAM + 0x10000)\n\ adds r1, r0, r2\n\ adds r0, r6, 0\n\ mov r2, r10\n\ @@ -1538,7 +1538,7 @@ _08044446:\n\ adds r0, r4\n\ adds r0, r5\n\ lsls r0, 5\n\ - ldr r2, _08044500 @ =0x06010000\n\ + ldr r2, _08044500 @ =(VRAM + 0x10000)\n\ adds r1, r0, r2\n\ adds r0, r6, 0\n\ mov r2, r10\n\ @@ -1596,7 +1596,7 @@ _080444DA:\n\ adds r0, r7, 0x2\n\ adds r1, r0\n\ lsls r1, 5\n\ - ldr r0, _08044500 @ =0x06010000\n\ + ldr r0, _08044500 @ =(VRAM + 0x10000)\n\ adds r1, r0\n\ adds r0, r4, 0\n\ ldr r2, _080444F8 @ =REG_BG0CNT\n\ |