diff --git a/revisions/F0/src/gfx/cgb_misc.png b/revisions/F0/src/gfx/cgb_misc.png deleted file mode 100644 index 89753bc8..00000000 Binary files a/revisions/F0/src/gfx/cgb_misc.png and /dev/null differ diff --git a/revisions/F0/src/gfx/cgb_misc2.png b/revisions/F0/src/gfx/cgb_misc2.png deleted file mode 100644 index 971d53a5..00000000 Binary files a/revisions/F0/src/gfx/cgb_misc2.png and /dev/null differ diff --git a/revisions/F0/src/gfx/ending/credits_roll.png b/revisions/F0/src/gfx/ending/credits_roll.png new file mode 100644 index 00000000..4637e84e Binary files /dev/null and b/revisions/F0/src/gfx/ending/credits_roll.png differ diff --git a/revisions/G0/src/gfx/cgb_misc.png b/revisions/G0/src/gfx/cgb_misc.png deleted file mode 100644 index 89753bc8..00000000 Binary files a/revisions/G0/src/gfx/cgb_misc.png and /dev/null differ diff --git a/revisions/G0/src/gfx/cgb_misc2.png b/revisions/G0/src/gfx/cgb_misc2.png deleted file mode 100644 index 6b172f0f..00000000 Binary files a/revisions/G0/src/gfx/cgb_misc2.png and /dev/null differ diff --git a/revisions/G0/src/gfx/ending/credits_roll.png b/revisions/G0/src/gfx/ending/credits_roll.png new file mode 100644 index 00000000..13d29729 Binary files /dev/null and b/revisions/G0/src/gfx/ending/credits_roll.png differ diff --git a/src/code/bank0.asm b/src/code/bank0.asm index e0e40765..26cfabf1 100644 --- a/src/code/bank0.asm +++ b/src/code/bank0.asm @@ -4654,8 +4654,8 @@ IF __PATCH_1__ jr .both .cgbOnly - ld a, BANK(CgbMiscTiles) - ld hl, CgbMiscTiles + $1100 + ld a, BANK(CreditsRollTiles) + ld hl, CreditsRollTiles + $100 .both ld [MBC3SelectBank], a @@ -4663,9 +4663,9 @@ IF __PATCH_1__ ld bc, TILE_SIZE * $70 call CopyData - ld a, BANK(CgbMiscTiles) + ld a, BANK(CreditsRollTiles) ld [MBC3SelectBank], a - ld hl, CgbMiscTiles + $10c0 + ld hl, CreditsRollTiles + $0c0 ld de, vTiles0 + $C0 ld bc, TILE_SIZE * $4 jp CopyData @@ -4679,9 +4679,9 @@ ELSE jp CopyData ; $2B5E: $C3 $14 $29 .cgbOnly - ld a, BANK(CgbMiscTiles) ; $2B61: $3E $38 + ld a, BANK(CreditsRollTiles) ; $2B61: $3E $38 ld [MBC3SelectBank], a ; $2B63: $EA $00 $21 - ld hl, CgbMiscTiles + $1000 ; $2B66: $21 $00 $50 + ld hl, CreditsRollTiles ; $2B66: $21 $00 $50 ld de, vTiles0 ; $2B69: $11 $00 $80 ld bc, TILE_SIZE * $80 ; $2B6C: $01 $00 $08 jp CopyData ; $2B6F: $C3 $14 $29 diff --git a/src/code/photos_animations.asm b/src/code/photos_animations.asm index 34a26217..fea6a807 100644 --- a/src/code/photos_animations.asm +++ b/src/code/photos_animations.asm @@ -1,13 +1,13 @@ ; Array of origin addresses Data_038_7800:: - dw CgbMiscTiles + $000 - dw CgbMiscTiles + $040 - dw CgbMiscTiles + $080 - dw CgbMiscTiles + $0C0 - dw CgbMiscTiles + $100 - dw CgbMiscTiles + $140 - dw CgbMiscTiles + $180 - dw CgbMiscTiles + $1C0 + dw PhotographerTiles + $000 + dw PhotographerTiles + $040 + dw PhotographerTiles + $080 + dw PhotographerTiles + $0C0 + dw PhotographerTiles + $100 + dw PhotographerTiles + $140 + dw PhotographerTiles + $180 + dw PhotographerTiles + $1C0 ; Array of destination addresses Data_038_7810:: diff --git a/src/gfx/cgb_misc.png b/src/gfx/cgb_misc.png deleted file mode 100644 index 94e2062a..00000000 Binary files a/src/gfx/cgb_misc.png and /dev/null differ diff --git a/src/gfx/cgb_misc2.png b/src/gfx/cgb_misc2.png deleted file mode 100644 index 299c65c6..00000000 Binary files a/src/gfx/cgb_misc2.png and /dev/null differ diff --git a/src/gfx/characters/oam_photographer.png b/src/gfx/characters/oam_photographer.png new file mode 100644 index 00000000..ff0382f3 Binary files /dev/null and b/src/gfx/characters/oam_photographer.png differ diff --git a/src/gfx/ending/credits_roll.png b/src/gfx/ending/credits_roll.png new file mode 100644 index 00000000..194348c3 Binary files /dev/null and b/src/gfx/ending/credits_roll.png differ diff --git a/src/main.asm b/src/main.asm index 963be2ea..1f9f1501 100644 --- a/src/main.asm +++ b/src/main.asm @@ -479,10 +479,10 @@ section "bank37",romx[$4000],bank[$37] include "code/photos.asm" section "bank38",romx[$4000],bank[$38] -CgbMiscTiles:: -incbin "gfx/cgb_misc.2bpp" -CgbMiscTiles2:: -incbin "gfx/cgb_misc2.2bpp" +PhotographerTiles:: +incbin "gfx/characters/oam_photographer.2bpp" +CreditsRollTiles:: +incbin "gfx/ending/credits_roll.2bpp" TitleDXTiles:: TitleDXTilesDMG:: incbin "gfx/intro/title_dx.dmg.2bpp"