summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2015-02-16 21:24:04 -0800
committerMarcus Huderle <huderlem@gmail.com>2015-02-16 21:24:04 -0800
commite59d178bef18886c11b6f4a6724a0dc4527a2faf (patch)
treeb5baea5feb1070400c8afdd58bbd60e0f5a19620
parent7b5d8aea9384f484bcb68d31d17ad098d8c5165f (diff)
Dump option menu graphics.
-rw-r--r--gfx/option_menu/arrow.pngbin0 -> 82 bytes
-rw-r--r--gfx/option_menu/bold_arrow.pngbin0 -> 84 bytes
-rw-r--r--gfx/option_menu/bouncing_pokeball.pngbin0 -> 220 bytes
-rw-r--r--gfx/option_menu/key_co_text.pngbin0 -> 187 bytes
-rw-r--r--gfx/option_menu/nfig_text.pngbin0 -> 164 bytes
-rw-r--r--gfx/option_menu/option_text.pngbin0 -> 171 bytes
-rw-r--r--gfx/option_menu/pika_bubble.pngbin0 -> 139 bytes
-rw-r--r--gfx/option_menu/pikachu.pngbin0 -> 250 bytes
-rw-r--r--gfx/option_menu/psyduck.pngbin0 -> 717 bytes
-rw-r--r--gfx/option_menu/psyduck_feet.pngbin0 -> 135 bytes
-rw-r--r--gfx/option_menu/rumble_pikachu_animation.pngbin0 -> 192 bytes
-rw-r--r--gfx/option_menu/rumble_text.pngbin0 -> 191 bytes
-rw-r--r--gfx/option_menu/sound_test_digits.pngbin0 -> 179 bytes
-rwxr-xr-xmain.asm39
14 files changed, 38 insertions, 1 deletions
diff --git a/gfx/option_menu/arrow.png b/gfx/option_menu/arrow.png
new file mode 100644
index 0000000..a8d3278
--- /dev/null
+++ b/gfx/option_menu/arrow.png
Binary files differ
diff --git a/gfx/option_menu/bold_arrow.png b/gfx/option_menu/bold_arrow.png
new file mode 100644
index 0000000..ac283c4
--- /dev/null
+++ b/gfx/option_menu/bold_arrow.png
Binary files differ
diff --git a/gfx/option_menu/bouncing_pokeball.png b/gfx/option_menu/bouncing_pokeball.png
new file mode 100644
index 0000000..8e4bc84
--- /dev/null
+++ b/gfx/option_menu/bouncing_pokeball.png
Binary files differ
diff --git a/gfx/option_menu/key_co_text.png b/gfx/option_menu/key_co_text.png
new file mode 100644
index 0000000..4fb02c0
--- /dev/null
+++ b/gfx/option_menu/key_co_text.png
Binary files differ
diff --git a/gfx/option_menu/nfig_text.png b/gfx/option_menu/nfig_text.png
new file mode 100644
index 0000000..7cda3c8
--- /dev/null
+++ b/gfx/option_menu/nfig_text.png
Binary files differ
diff --git a/gfx/option_menu/option_text.png b/gfx/option_menu/option_text.png
new file mode 100644
index 0000000..ba4728c
--- /dev/null
+++ b/gfx/option_menu/option_text.png
Binary files differ
diff --git a/gfx/option_menu/pika_bubble.png b/gfx/option_menu/pika_bubble.png
new file mode 100644
index 0000000..ab08369
--- /dev/null
+++ b/gfx/option_menu/pika_bubble.png
Binary files differ
diff --git a/gfx/option_menu/pikachu.png b/gfx/option_menu/pikachu.png
new file mode 100644
index 0000000..057d0f5
--- /dev/null
+++ b/gfx/option_menu/pikachu.png
Binary files differ
diff --git a/gfx/option_menu/psyduck.png b/gfx/option_menu/psyduck.png
new file mode 100644
index 0000000..a6918bc
--- /dev/null
+++ b/gfx/option_menu/psyduck.png
Binary files differ
diff --git a/gfx/option_menu/psyduck_feet.png b/gfx/option_menu/psyduck_feet.png
new file mode 100644
index 0000000..36d2d1a
--- /dev/null
+++ b/gfx/option_menu/psyduck_feet.png
Binary files differ
diff --git a/gfx/option_menu/rumble_pikachu_animation.png b/gfx/option_menu/rumble_pikachu_animation.png
new file mode 100644
index 0000000..6549a9b
--- /dev/null
+++ b/gfx/option_menu/rumble_pikachu_animation.png
Binary files differ
diff --git a/gfx/option_menu/rumble_text.png b/gfx/option_menu/rumble_text.png
new file mode 100644
index 0000000..b493c87
--- /dev/null
+++ b/gfx/option_menu/rumble_text.png
Binary files differ
diff --git a/gfx/option_menu/sound_test_digits.png b/gfx/option_menu/sound_test_digits.png
new file mode 100644
index 0000000..e676bac
--- /dev/null
+++ b/gfx/option_menu/sound_test_digits.png
Binary files differ
diff --git a/main.asm b/main.asm
index 440a172..03c6893 100755
--- a/main.asm
+++ b/main.asm
@@ -2690,7 +2690,44 @@ UnusedTitlescreenGfx2: ; 0xb4680
TitlescreenGfx: ; 0xb4800
INCBIN "gfx/titlescreen/titlescreen.2bpp"
-INCBIN "baserom.gbc",$b5800,$b8000 - $b5800 ; 0xb5800
+INCBIN "baserom.gbc",$b5800,$b5a00 - $b5800 ; 0xb5800
+
+OptionMenuArrowGfx: ; 0xb5a00
+ INCBIN "gfx/option_menu/arrow.2bpp"
+OptionMenuPikaBubbleGfx: ; 0xb5a20
+ INCBIN "gfx/option_menu/pika_bubble.2bpp"
+OptionMenuBouncingPokeballGfx: ; 0xb5a80
+ INCBIN "gfx/option_menu/bouncing_pokeball.2bpp"
+OptionMenuRumblePikachuAnimationGfx: ; 0xb5b40
+ INCBIN "gfx/option_menu/rumble_pikachu_animation.2bpp"
+OptionMenuPsyduckGfx: ; 0xb5c00
+ INCBIN "gfx/option_menu/psyduck.2bpp"
+OptionMenuBoldArrowGfx: ; 0xb5fc0
+ INCBIN "gfx/option_menu/bold_arrow.2bpp"
+OptionMenuUnknownGfx: ; 0xb5fd0
+ INCBIN "baserom.gbc",$b5fd0,$b6020 - $b5fd0
+OptionMenuOptionTextGfx: ; 0xb6020
+ INCBIN "gfx/option_menu/option_text.2bpp"
+OptionMenuPikachuGfx: ; 0xb6080
+ INCBIN "gfx/option_menu/pikachu.2bpp"
+OptionMenuPsyduckFeetGfx: ; 0xb6170
+ INCBIN "gfx/option_menu/psyduck_feet.2bpp"
+OptionMenuUnknown2Gfx: ; 0xb6200
+ INCBIN "baserom.gbc",$b6200,$b6250 - $b6200
+OptionMenuRumbleTextGfx: ; 0xb6250
+ INCBIN "gfx/option_menu/rumble_text.2bpp"
+OptionMenuUnknown3Gfx: ; 0xb62b0
+ INCBIN "baserom.gbc",$b62b0,$b6320 - $b62b0
+OptionMenuKeyCoTextGfx: ; 0xb6320
+ INCBIN "gfx/option_menu/key_co_text.2bpp"
+OptionMenuSoundTestDigitsGfx: ; 0xb6370
+ INCBIN "gfx/option_menu/sound_test_digits.2bpp"
+OptionMenuNfigTextGfx: ; 0xb6470
+ INCBIN "gfx/option_menu/nfig_text.2bpp"
+OptionMenuUnknown4Gfx: ; 0xb64a0
+ INCBIN "baserom.gbc",$b64a0,$b6500 - $b64a0
+
+INCBIN "baserom.gbc",$b6500,$b8000 - $b6500 ; 0xb6500
SECTION "bank2e", ROMX, BANK[$2e]