diff options
| -rw-r--r-- | docs/design_flaws.md | 10 | ||||
| -rw-r--r-- | engine/gfx/load_pics.asm | 10 | ||||
| -rw-r--r-- | gfx/pics.asm | 18 | ||||
| -rw-r--r-- | pokecrystal.link | 5 |
4 files changed, 33 insertions, 10 deletions
diff --git a/docs/design_flaws.md b/docs/design_flaws.md index aee6a1daa..6b015a56a 100644 --- a/docs/design_flaws.md +++ b/docs/design_flaws.md @@ -66,11 +66,11 @@ GLOBAL PICS_FIX 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 + db BANK("Pics 20") ; BANK("Pics 1") + 19 + db BANK("Pics 21") ; BANK("Pics 1") + 20 + db BANK("Pics 22") ; BANK("Pics 1") + 21 + db BANK("Pics 23") ; BANK("Pics 1") + 22 + db BANK("Pics 24") ; BANK("Pics 1") + 23 ``` **Fix:** Use `dba` instead of `dba_pic`, delete `FixPicBank`, and remove all four calls to `FixPicBank`. diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index 438f64f87..9c909a5cd 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -282,11 +282,11 @@ GLOBAL PICS_FIX 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 + db BANK("Pics 20") ; BANK("Pics 1") + 19 + db BANK("Pics 21") ; BANK("Pics 1") + 20 + db BANK("Pics 22") ; BANK("Pics 1") + 21 + db BANK("Pics 23") ; BANK("Pics 1") + 22 + db BANK("Pics 24") ; BANK("Pics 1") + 23 Function511ec: ; 511ec ld a, c diff --git a/gfx/pics.asm b/gfx/pics.asm index 1dd606643..043e41489 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -793,3 +793,21 @@ INCBIN "gfx/pokemon/unown_y/back.2bpp.lz" INCBIN "gfx/pokemon/unown_p/back.2bpp.lz" INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" + + +; Sections "Pics 20" to "Pics 24" are not used for any graphics, +; but entries for their banks exist in FixPicBank (see engine/gfx/load_pics.asm). + +SECTION "Pics 20", ROMX + + +SECTION "Pics 21", ROMX + + +SECTION "Pics 22", ROMX + + +SECTION "Pics 23", ROMX + + +SECTION "Pics 24", ROMX diff --git a/pokecrystal.link b/pokecrystal.link index fc8fbb38a..157b39197 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -234,17 +234,22 @@ ROMX $5a "Pics 19" ROMX $5b "bank5B" + "Pics 20" ROMX $5c "Mobile 5C" + "Pics 21" ROMX $5d "Crystal Phone Text 2" + "Pics 22" ROMX $5e "UpdateBattleHUDs" "Songs 5" "Crystal Sound Effects" "Mobile 5E" + "Pics 23" ROMX $5f "Mobile 5F" + "Pics 24" ROMX $60 "Map Scripts 13" "Pokedex Entries 001-064" |