summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdata/mon_gfx/mon_billboard_palette_maps_1.asm3
-rwxr-xr-xgfx/high_scores/high_scores_transition_palettes.asm391
-rwxr-xr-xgfx/high_scores/high_scores_transition_palettes_2.asm391
-rwxr-xr-xmain.asm51
4 files changed, 813 insertions, 23 deletions
diff --git a/data/mon_gfx/mon_billboard_palette_maps_1.asm b/data/mon_gfx/mon_billboard_palette_maps_1.asm
index 1286291..3c80102 100755
--- a/data/mon_gfx/mon_billboard_palette_maps_1.asm
+++ b/data/mon_gfx/mon_billboard_palette_maps_1.asm
@@ -289,4 +289,5 @@ SlowbroBillboardBGPaletteMap: ; 0xd7b68
db $6, $6, $6, $6, $6, $6
db $6, $6, $6, $6, $6, $6
db $6, $6, $6, $6, $6, $6
- dr $d7b80, $d8000
+
+ ds $280 ; free space
diff --git a/gfx/high_scores/high_scores_transition_palettes.asm b/gfx/high_scores/high_scores_transition_palettes.asm
new file mode 100755
index 0000000..cc79951
--- /dev/null
+++ b/gfx/high_scores/high_scores_transition_palettes.asm
@@ -0,0 +1,391 @@
+HighScoresTransitionPalettes1: ; 0x8fd00
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 0, 0, 31
+ RGB 31, 6, 6
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 0, 8, 31
+ RGB 31, 6, 6
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 0, 16, 31
+ RGB 31, 6, 6
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 0, 24, 31
+ RGB 31, 6, 6
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 0, 31, 31
+ RGB 31, 6, 6
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 6, 6
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes2: ; 0x8fd40
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 2, 0, 29
+ RGB 30, 6, 7
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 2, 8, 29
+ RGB 30, 6, 7
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 2, 16, 29
+ RGB 30, 6, 7
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 2, 24, 29
+ RGB 30, 6, 7
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 2, 31, 29
+ RGB 30, 6, 7
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 30, 6, 7
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes3: ; 0x8fd80
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 4, 0, 27
+ RGB 28, 6, 9
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 4, 8, 27
+ RGB 28, 6, 9
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 4, 16, 27
+ RGB 28, 6, 9
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 4, 24, 27
+ RGB 28, 6, 9
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 4, 31, 27
+ RGB 28, 6, 9
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 28, 6, 9
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes4: ; 0x8fdc0
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 6, 0, 25
+ RGB 27, 7, 10
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 6, 8, 25
+ RGB 27, 7, 10
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 6, 16, 25
+ RGB 27, 7, 10
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 6, 24, 25
+ RGB 27, 7, 10
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 6, 31, 25
+ RGB 27, 7, 10
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 27, 7, 10
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes5: ; 0x8fe00
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 8, 0, 23
+ RGB 25, 7, 12
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 8, 8, 23
+ RGB 25, 7, 12
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 8, 16, 23
+ RGB 25, 7, 12
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 8, 24, 23
+ RGB 25, 7, 12
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 8, 31, 23
+ RGB 25, 7, 12
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 25, 7, 12
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes6: ; 0x8fe40
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 10, 0, 21
+ RGB 24, 7, 13
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 10, 8, 21
+ RGB 24, 7, 13
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 10, 16, 21
+ RGB 24, 7, 13
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 10, 24, 21
+ RGB 24, 7, 13
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 10, 31, 21
+ RGB 24, 7, 13
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 24, 7, 13
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes7: ; 0x8fe80
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 12, 0, 19
+ RGB 22, 7, 14
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 12, 8, 19
+ RGB 22, 7, 14
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 12, 16, 19
+ RGB 22, 7, 14
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 12, 24, 19
+ RGB 22, 7, 14
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 12, 31, 19
+ RGB 22, 7, 14
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 22, 7, 14
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes8: ; 0x8fec0
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 14, 0, 17
+ RGB 21, 7, 16
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 14, 8, 17
+ RGB 21, 7, 16
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 14, 16, 17
+ RGB 21, 7, 16
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 14, 24, 17
+ RGB 21, 7, 16
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 14, 31, 17
+ RGB 21, 7, 16
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 21, 7, 16
+ RGB 0, 0, 0
diff --git a/gfx/high_scores/high_scores_transition_palettes_2.asm b/gfx/high_scores/high_scores_transition_palettes_2.asm
new file mode 100755
index 0000000..0cc9b61
--- /dev/null
+++ b/gfx/high_scores/high_scores_transition_palettes_2.asm
@@ -0,0 +1,391 @@
+HighScoresTransitionPalettes9: ; 0xd7e00
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 17, 0, 15
+ RGB 19, 8, 17
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 17, 8, 15
+ RGB 19, 8, 17
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 17, 16, 15
+ RGB 19, 8, 17
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 17, 24, 15
+ RGB 19, 8, 17
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 17, 31, 15
+ RGB 19, 8, 17
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 19, 8, 17
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes10: ; 0xd7e40
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 19, 0, 12
+ RGB 18, 8, 19
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 19, 8, 12
+ RGB 18, 8, 19
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 19, 16, 12
+ RGB 18, 8, 19
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 19, 24, 12
+ RGB 18, 8, 19
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 19, 31, 12
+ RGB 18, 8, 19
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 18, 8, 19
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes11: ; 0xd7e80
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 21, 0, 10
+ RGB 16, 8, 20
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 21, 8, 10
+ RGB 16, 8, 20
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 21, 16, 10
+ RGB 16, 8, 20
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 21, 24, 10
+ RGB 16, 8, 20
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 21, 31, 10
+ RGB 16, 8, 20
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 16, 8, 20
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes12: ; 0xd7ec0
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 23, 0, 8
+ RGB 15, 8, 21
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 23, 8, 8
+ RGB 15, 8, 21
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 23, 16, 8
+ RGB 15, 8, 21
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 23, 24, 8
+ RGB 15, 8, 21
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 23, 31, 8
+ RGB 15, 8, 21
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 15, 8, 21
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes13: ; 0xd7f00
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 25, 0, 6
+ RGB 14, 8, 23
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 25, 8, 6
+ RGB 14, 8, 23
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 25, 16, 6
+ RGB 14, 8, 23
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 25, 24, 6
+ RGB 14, 8, 23
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 25, 31, 6
+ RGB 14, 8, 23
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 14, 8, 23
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes14: ; 0xd7f40
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 27, 0, 4
+ RGB 12, 8, 24
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 27, 8, 4
+ RGB 12, 8, 24
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 27, 16, 4
+ RGB 12, 8, 24
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 27, 24, 4
+ RGB 12, 8, 24
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 27, 31, 4
+ RGB 12, 8, 24
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 12, 8, 24
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes15: ; 0xd7f80
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 29, 0, 2
+ RGB 11, 9, 25
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 29, 8, 2
+ RGB 11, 9, 25
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 29, 16, 2
+ RGB 11, 9, 25
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 29, 24, 2
+ RGB 11, 9, 25
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 29, 31, 2
+ RGB 11, 9, 25
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 11, 9, 25
+ RGB 0, 0, 0
+
+HighScoresTransitionPalettes16: ; 0xd7fc0
+ ; BG Palette 0
+ RGB 31, 31, 31
+ RGB 31, 0, 0
+ RGB 9, 9, 27
+ RGB 0, 0, 0
+
+ ; BG Palette 1
+ RGB 31, 31, 31
+ RGB 31, 8, 0
+ RGB 9, 9, 27
+ RGB 0, 0, 0
+
+ ; BG Palette 2
+ RGB 31, 31, 31
+ RGB 31, 16, 0
+ RGB 9, 9, 27
+ RGB 0, 0, 0
+
+ ; BG Palette 3
+ RGB 31, 31, 31
+ RGB 31, 24, 0
+ RGB 9, 9, 27
+ RGB 0, 0, 0
+
+ ; BG Palette 4
+ RGB 31, 31, 31
+ RGB 31, 31, 0
+ RGB 9, 9, 27
+ RGB 0, 0, 0
+
+ ; BG Palette 5
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ ; BG Palette 6
+ RGB 31, 29, 4
+ RGB 29, 18, 0
+ RGB 31, 0, 0
+ RGB 5, 5, 5
+
+ ; OBJ Palette 0
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 9, 9, 27
+ RGB 0, 0, 0
diff --git a/main.asm b/main.asm
index 3a4f7b3..35c8d5f 100755
--- a/main.asm
+++ b/main.asm
@@ -5410,7 +5410,7 @@ Func_d4cf: ; 0xd4cf
ld a, $27
sub b
bit 0, b
- call nz, Func_d626
+ call nz, TransitionHighScoresPalettes
ld hl, hWX
dec [hl]
dec [hl]
@@ -5452,7 +5452,7 @@ Func_d4cf: ; 0xd4cf
push bc
ld a, b
bit 0, b
- call nz, Func_d626
+ call nz, TransitionHighScoresPalettes
ld hl, hWX
inc [hl]
inc [hl]
@@ -5557,7 +5557,9 @@ Func_d5d0: ; 0xd5d0
ld [hNextFrameHBlankSCY], a
ret
-Func_d626: ; 0xd626
+TransitionHighScoresPalettes: ; 0xd626
+; When switching between the Red and Blue field high scores, the palettes
+; of the rows smoothly transition between red and blue.
ld c, a
ld a, [hGameBoyColorFlag]
and a
@@ -5572,7 +5574,7 @@ Func_d626: ; 0xd626
sla c
add c
ld c, a
- ld hl, PointerTable_d65a
+ ld hl, HighScoresPalettesTransition
add hl, bc
ld a, [hli]
ld c, a
@@ -5591,23 +5593,26 @@ Func_d626: ; 0xd626
call Func_7dc
ret
-PointerTable_d65a: ; 0xd65a
- dwb $7D00, $23
- dwb $7D40, $23
- dwb $7D80, $23
- dwb $7DC0, $23
- dwb $7E00, $23
- dwb $7E40, $23
- dwb $7E80, $23
- dwb $7EC0, $23
- dwb $7E00, $35
- dwb $7E40, $35
- dwb $7E80, $35
- dwb $7EC0, $35
- dwb $7F00, $35
- dwb $7F40, $35
- dwb $7F80, $35
- dwb $7FC0, $35
+HighScoresPalettesTransition: ; 0xd65a
+; When switching between the Red and Blue field high scores, the palette
+; of the rows fades between red and blue. This table defines the transition
+; of those palettes.
+ dwb HighScoresTransitionPalettes1, Bank(HighScoresTransitionPalettes1)
+ dwb HighScoresTransitionPalettes2, Bank(HighScoresTransitionPalettes2)
+ dwb HighScoresTransitionPalettes3, Bank(HighScoresTransitionPalettes3)
+ dwb HighScoresTransitionPalettes4, Bank(HighScoresTransitionPalettes4)
+ dwb HighScoresTransitionPalettes5, Bank(HighScoresTransitionPalettes5)
+ dwb HighScoresTransitionPalettes6, Bank(HighScoresTransitionPalettes6)
+ dwb HighScoresTransitionPalettes7, Bank(HighScoresTransitionPalettes7)
+ dwb HighScoresTransitionPalettes8, Bank(HighScoresTransitionPalettes8)
+ dwb HighScoresTransitionPalettes9, Bank(HighScoresTransitionPalettes9)
+ dwb HighScoresTransitionPalettes10, Bank(HighScoresTransitionPalettes10)
+ dwb HighScoresTransitionPalettes11, Bank(HighScoresTransitionPalettes11)
+ dwb HighScoresTransitionPalettes12, Bank(HighScoresTransitionPalettes12)
+ dwb HighScoresTransitionPalettes13, Bank(HighScoresTransitionPalettes13)
+ dwb HighScoresTransitionPalettes14, Bank(HighScoresTransitionPalettes14)
+ dwb HighScoresTransitionPalettes15, Bank(HighScoresTransitionPalettes15)
+ dwb HighScoresTransitionPalettes16, Bank(HighScoresTransitionPalettes16)
Func_d68a: ; 0xd68a
push bc
@@ -34601,8 +34606,8 @@ INCLUDE "data/mon_gfx/mon_animated_pics_5.asm"
DiglettBonusBaseGameBoyGfx: ; 0x8f000
INCBIN "gfx/stage/diglett_bonus/diglett_bonus_base_gameboy.2bpp"
- dr $8fd00, $8ff00
+INCLUDE "gfx/high_scores/high_scores_transition_palettes.asm"
INCLUDE "data/billboard/map_palettes.asm"
SECTION "bank24", ROMX, BANK[$24]
@@ -35201,6 +35206,8 @@ StageRedJapaneseCharactersGfx2: ; 0xd7000
INCBIN "gfx/stage/red_bottom/japanese_characters_2.2bpp"
INCLUDE "data/mon_gfx/mon_billboard_palette_maps_1.asm"
+INCLUDE "gfx/high_scores/high_scores_transition_palettes_2.asm"
+
SECTION "bank36", ROMX, BANK[$36]
dr $d8000, $d8400