summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-05-29 19:14:04 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-05-29 19:14:04 -0400
commita71b7a92b7443ef60df96890e56917d67db9b80b (patch)
tree80ee6dc2602e33b3a74aca2ef99db665f56d9384
parent3927bcdb9d0429b5ff303cb787e522878bd01749 (diff)
Same pic bank solution as pokecrystal
-rw-r--r--engine/gfx/load_pics.asm50
-rw-r--r--gfx/pics.asm1
2 files changed, 25 insertions, 26 deletions
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index b533ee56b..2b9a7bb08 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -252,7 +252,7 @@ GLOBAL PICS_FIX
push hl
push bc
- sub BANK(Pics_1) - PICS_FIX
+ sub BANK("Pics 1") - PICS_FIX
ld c, a
ld b, 0
ld hl, .PicsBanks
@@ -263,30 +263,30 @@ GLOBAL PICS_FIX
ret
.PicsBanks: ; 511d4
- db BANK(Pics_1) + 0
- db BANK(Pics_1) + 1
- db BANK(Pics_1) + 2
- db BANK(Pics_1) + 3
- db BANK(Pics_1) + 4
- db BANK(Pics_1) + 5
- db BANK(Pics_1) + 6
- db BANK(Pics_1) + 7
- db BANK(Pics_1) + 8
- db BANK(Pics_1) + 9
- db BANK(Pics_1) + 10
- db BANK(Pics_1) + 11
- db BANK(Pics_1) + 12
- db BANK(Pics_1) + 13
- db BANK(Pics_1) + 14
- db BANK(Pics_1) + 15
- db BANK(Pics_1) + 16
- db BANK(Pics_1) + 17
- db BANK(Pics_1) + 18
- db BANK(Pics_1) + 19
- db BANK(Pics_1) + 20
- db BANK(Pics_1) + 21
- db BANK(Pics_1) + 22
- db BANK(Pics_1) + 23
+ db BANK("Pics 1") + 0
+ db BANK("Pics 1") + 1
+ db BANK("Pics 1") + 2
+ db BANK("Pics 1") + 3
+ db BANK("Pics 1") + 4
+ db BANK("Pics 1") + 5
+ db BANK("Pics 1") + 6
+ db BANK("Pics 1") + 7
+ db BANK("Pics 1") + 8
+ db BANK("Pics 1") + 9
+ db BANK("Pics 1") + 10
+ db BANK("Pics 1") + 11
+ db BANK("Pics 1") + 12
+ db BANK("Pics 1") + 13
+ db BANK("Pics 1") + 14
+ db BANK("Pics 1") + 15
+ db BANK("Pics 1") + 16
+ db BANK("Pics 1") + 17
+ db BANK("Pics 1") + 18
+ db BANK("Pics 1") + 19
+ db BANK("Pics 1") + 20
+ db BANK("Pics 1") + 21
+ db BANK("Pics 1") + 22
+ db BANK("Pics 1") + 23
Function511ec: ; 511ec
ld a, c
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 198569a76..1dd606643 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -20,7 +20,6 @@ INCLUDE "data/trainers/pic_pointers.asm"
SECTION "Pics 1", ROMX
-Pics_1::
HoOhFrontpic: INCBIN "gfx/pokemon/ho_oh/front.animated.2bpp.lz"
MachampFrontpic: INCBIN "gfx/pokemon/machamp/front.animated.2bpp.lz"