shithub: pokecrystal

Download patch

ref: 7cd5bcbae4a35471fe8473a63526d73e71b193cc
parent: 4df72a8474a24ebd261e2768c7f21273435364e4
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Jun 3 19:18:31 EDT 2018 

Change FixPicBank bank array


--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -36,7 +36,7 @@
 
 	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
@@ -47,33 +47,33 @@
 	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")  ; BANK("Pics 1") + 0
+	db BANK("Pics 2")  ; BANK("Pics 1") + 1
+	db BANK("Pics 3")  ; BANK("Pics 1") + 2
+	db BANK("Pics 4")  ; BANK("Pics 1") + 3
+	db BANK("Pics 5")  ; BANK("Pics 1") + 4
+	db BANK("Pics 6")  ; BANK("Pics 1") + 5
+	db BANK("Pics 7")  ; BANK("Pics 1") + 6
+	db BANK("Pics 8")  ; BANK("Pics 1") + 7
+	db BANK("Pics 9")  ; BANK("Pics 1") + 8
+	db BANK("Pics 10") ; BANK("Pics 1") + 9
+	db BANK("Pics 11") ; BANK("Pics 1") + 10
+	db BANK("Pics 12") ; BANK("Pics 1") + 11
+	db BANK("Pics 13") ; BANK("Pics 1") + 12
+	db BANK("Pics 14") ; BANK("Pics 1") + 13
+	db BANK("Pics 15") ; BANK("Pics 1") + 14
+	db BANK("Pics 16") ; BANK("Pics 1") + 15
+	db BANK("Pics 17") ; BANK("Pics 1") + 16
+	db BANK("Pics 18") ; BANK("Pics 1") + 17
+	db BANK("Pics 19") ; 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
 ```
 
-**Fix:** Use `dba` instead of `dba_pic`, and don't call `FixPicBank` to modify `a`.
+**Fix:** Use `dba` instead of `dba_pic`, delete `FixPicBank`, and remove all four calls to `FixPicBank`.
 
 
 ## `PokemonPicPointers` and `UnownPicPointers` are assumed to start at the same address
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -263,25 +263,25 @@
 	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")  ; BANK("Pics 1") + 0
+	db BANK("Pics 2")  ; BANK("Pics 1") + 1
+	db BANK("Pics 3")  ; BANK("Pics 1") + 2
+	db BANK("Pics 4")  ; BANK("Pics 1") + 3
+	db BANK("Pics 5")  ; BANK("Pics 1") + 4
+	db BANK("Pics 6")  ; BANK("Pics 1") + 5
+	db BANK("Pics 7")  ; BANK("Pics 1") + 6
+	db BANK("Pics 8")  ; BANK("Pics 1") + 7
+	db BANK("Pics 9")  ; BANK("Pics 1") + 8
+	db BANK("Pics 10") ; BANK("Pics 1") + 9
+	db BANK("Pics 11") ; BANK("Pics 1") + 10
+	db BANK("Pics 12") ; BANK("Pics 1") + 11
+	db BANK("Pics 13") ; BANK("Pics 1") + 12
+	db BANK("Pics 14") ; BANK("Pics 1") + 13
+	db BANK("Pics 15") ; BANK("Pics 1") + 14
+	db BANK("Pics 16") ; BANK("Pics 1") + 15
+	db BANK("Pics 17") ; BANK("Pics 1") + 16
+	db BANK("Pics 18") ; BANK("Pics 1") + 17
+	db BANK("Pics 19") ; BANK("Pics 1") + 18
 	db BANK("Pics 1") + 19
 	db BANK("Pics 1") + 20
 	db BANK("Pics 1") + 21