From aae999f72bd81a3156c7e00da4ebf499f52da5a6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 4 Nov 2020 15:16:20 -0500 Subject: Start reorganizing pokeyellow --- gfx/9_tile.png | Bin 86 -> 0 bytes gfx/blocksets/beach_house.bst | Bin 0 -> 320 bytes gfx/blocksets/beachhouse.bst | Bin 320 -> 0 bytes gfx/font.asm | 2 +- gfx/intro/clouds.png | Bin 0 -> 310 bytes gfx/intro/unknown_f9b6e.map | Bin 0 -> 120 bytes gfx/intro/unknown_f9be6.map | 1 + gfx/intro/unknown_f9bf2.map | 1 + gfx/intro/yellow_intro_1.png | Bin 0 -> 826 bytes gfx/intro/yellow_intro_2.png | Bin 0 -> 1977 bytes gfx/overworld/pikachu_ball.png | Bin 0 -> 92 bytes gfx/pics.asm | 7 ++ gfx/pikachu.asm | 128 +++++++++++++++++++++++++++++ gfx/printer/01.png | Bin 0 -> 92 bytes gfx/printer/hp.png | Bin 0 -> 82 bytes gfx/printer/lv.png | Bin 0 -> 78 bytes gfx/sprites.asm | 15 ++++ gfx/stats_screen_hp.png | Bin 82 -> 0 bytes gfx/stats_screen_lv.png | Bin 78 -> 0 bytes gfx/surfing_pikachu.asm | 3 + gfx/surfing_pikachu/surfing_pikachu_1a.png | Bin 0 -> 638 bytes gfx/surfing_pikachu/surfing_pikachu_1b.png | Bin 0 -> 2002 bytes gfx/surfing_pikachu/surfing_pikachu_1c.png | Bin 0 -> 1318 bytes gfx/surfing_pikachu/surfing_pikachu_2.png | Bin 0 -> 816 bytes gfx/surfing_pikachu/surfing_pikachu_3.png | Bin 0 -> 2783 bytes gfx/surfing_pikachu/unknown_f8946.map | 1 + gfx/surfing_pikachu/unknown_f90bc.map | Bin 0 -> 240 bytes gfx/surfing_pikachu/unknown_f91ac.map | 1 + gfx/surfing_pikachu/unknown_f91bb.map | 2 + gfx/surfing_pikachu/unknown_f91c8.map | 1 + gfx/surfing_pikachu_1a.png | Bin 638 -> 0 bytes gfx/surfing_pikachu_1b.png | Bin 2002 -> 0 bytes gfx/surfing_pikachu_1c.png | Bin 1318 -> 0 bytes gfx/surfing_pikachu_2.png | Bin 816 -> 0 bytes gfx/surfing_pikachu_3.png | Bin 2783 -> 0 bytes gfx/tilesets.asm | 7 ++ gfx/tilesets/beach_house.png | Bin 0 -> 566 bytes gfx/tilesets/beachhouse.png | Bin 566 -> 0 bytes gfx/title/nine.png | Bin 0 -> 86 bytes gfx/title/pika_bubble.tilemap | 1 + gfx/title/pikachu.tilemap | Bin 0 -> 108 bytes gfx/title/pikachu_bg.png | Bin 0 -> 528 bytes gfx/title/pikachu_ob.png | Bin 0 -> 144 bytes gfx/title/pokemon_logo.png | Bin 1793 -> 1253 bytes gfx/title/pokemon_logo.tilemap | 2 + gfx/title/pokemon_logo_corner.png | Bin 0 -> 97 bytes gfx/unknown_f8946.map | 1 - gfx/unknown_f90bc.map | Bin 240 -> 0 bytes gfx/unknown_f91ac.map | 1 - gfx/unknown_f91bb.map | 2 - gfx/unknown_f91c8.map | 1 - gfx/unknown_f9b6e.map | Bin 120 -> 0 bytes gfx/unknown_f9be6.map | 1 - gfx/unknown_f9bf2.map | 1 - gfx/unknown_f9c2c.png | Bin 120 -> 0 bytes gfx/unknown_f9c6c.png | Bin 117 -> 0 bytes gfx/unknown_fd86b.png | Bin 92 -> 0 bytes gfx/yellow_intro.asm | 4 + gfx/yellow_intro.png | Bin 2711 -> 0 bytes gfx/yellow_titlescreen.png | Bin 1017 -> 0 bytes gfx/zero_one_ea597.png | Bin 92 -> 0 bytes 61 files changed, 175 insertions(+), 8 deletions(-) delete mode 100644 gfx/9_tile.png create mode 100644 gfx/blocksets/beach_house.bst delete mode 100644 gfx/blocksets/beachhouse.bst create mode 100644 gfx/intro/clouds.png create mode 100644 gfx/intro/unknown_f9b6e.map create mode 100644 gfx/intro/unknown_f9be6.map create mode 100644 gfx/intro/unknown_f9bf2.map create mode 100644 gfx/intro/yellow_intro_1.png create mode 100644 gfx/intro/yellow_intro_2.png create mode 100644 gfx/overworld/pikachu_ball.png create mode 100644 gfx/pikachu.asm create mode 100644 gfx/printer/01.png create mode 100644 gfx/printer/hp.png create mode 100644 gfx/printer/lv.png delete mode 100644 gfx/stats_screen_hp.png delete mode 100644 gfx/stats_screen_lv.png create mode 100644 gfx/surfing_pikachu.asm create mode 100644 gfx/surfing_pikachu/surfing_pikachu_1a.png create mode 100644 gfx/surfing_pikachu/surfing_pikachu_1b.png create mode 100644 gfx/surfing_pikachu/surfing_pikachu_1c.png create mode 100644 gfx/surfing_pikachu/surfing_pikachu_2.png create mode 100644 gfx/surfing_pikachu/surfing_pikachu_3.png create mode 100644 gfx/surfing_pikachu/unknown_f8946.map create mode 100644 gfx/surfing_pikachu/unknown_f90bc.map create mode 100644 gfx/surfing_pikachu/unknown_f91ac.map create mode 100644 gfx/surfing_pikachu/unknown_f91bb.map create mode 100644 gfx/surfing_pikachu/unknown_f91c8.map delete mode 100644 gfx/surfing_pikachu_1a.png delete mode 100644 gfx/surfing_pikachu_1b.png delete mode 100644 gfx/surfing_pikachu_1c.png delete mode 100644 gfx/surfing_pikachu_2.png delete mode 100644 gfx/surfing_pikachu_3.png create mode 100644 gfx/tilesets/beach_house.png delete mode 100644 gfx/tilesets/beachhouse.png create mode 100644 gfx/title/nine.png create mode 100644 gfx/title/pika_bubble.tilemap create mode 100644 gfx/title/pikachu.tilemap create mode 100644 gfx/title/pikachu_bg.png create mode 100644 gfx/title/pikachu_ob.png create mode 100644 gfx/title/pokemon_logo.tilemap create mode 100644 gfx/title/pokemon_logo_corner.png delete mode 100644 gfx/unknown_f8946.map delete mode 100644 gfx/unknown_f90bc.map delete mode 100644 gfx/unknown_f91ac.map delete mode 100644 gfx/unknown_f91bb.map delete mode 100644 gfx/unknown_f91c8.map delete mode 100644 gfx/unknown_f9b6e.map delete mode 100644 gfx/unknown_f9be6.map delete mode 100644 gfx/unknown_f9bf2.map delete mode 100644 gfx/unknown_f9c2c.png delete mode 100644 gfx/unknown_f9c6c.png delete mode 100644 gfx/unknown_fd86b.png create mode 100644 gfx/yellow_intro.asm delete mode 100644 gfx/yellow_intro.png delete mode 100644 gfx/yellow_titlescreen.png delete mode 100644 gfx/zero_one_ea597.png (limited to 'gfx') diff --git a/gfx/9_tile.png b/gfx/9_tile.png deleted file mode 100644 index e6fc8911..00000000 Binary files a/gfx/9_tile.png and /dev/null differ diff --git a/gfx/blocksets/beach_house.bst b/gfx/blocksets/beach_house.bst new file mode 100644 index 00000000..bafbe0b2 Binary files /dev/null and b/gfx/blocksets/beach_house.bst differ diff --git a/gfx/blocksets/beachhouse.bst b/gfx/blocksets/beachhouse.bst deleted file mode 100644 index bafbe0b2..00000000 Binary files a/gfx/blocksets/beachhouse.bst and /dev/null differ diff --git a/gfx/font.asm b/gfx/font.asm index 51d61de4..06b02fdf 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -18,7 +18,7 @@ NintendoCopyrightLogoGraphics: INCBIN "gfx/splash/copyright.2bpp" GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp" GamefreakLogoGraphicsEnd: -NineTile: INCBIN "gfx/9_tile.2bpp" +NineTile: INCBIN "gfx/title/nine.2bpp" TextBoxGraphics:: INCBIN "gfx/font/font_extra.2bpp" TextBoxGraphicsEnd:: diff --git a/gfx/intro/clouds.png b/gfx/intro/clouds.png new file mode 100644 index 00000000..872492b1 Binary files /dev/null and b/gfx/intro/clouds.png differ diff --git a/gfx/intro/unknown_f9b6e.map b/gfx/intro/unknown_f9b6e.map new file mode 100644 index 00000000..3ce924dc Binary files /dev/null and b/gfx/intro/unknown_f9b6e.map differ diff --git a/gfx/intro/unknown_f9be6.map b/gfx/intro/unknown_f9be6.map new file mode 100644 index 00000000..18560135 --- /dev/null +++ b/gfx/intro/unknown_f9be6.map @@ -0,0 +1 @@ +0123@ABCPQRS \ No newline at end of file diff --git a/gfx/intro/unknown_f9bf2.map b/gfx/intro/unknown_f9bf2.map new file mode 100644 index 00000000..e587b7ce --- /dev/null +++ b/gfx/intro/unknown_f9bf2.map @@ -0,0 +1 @@ +"# \ No newline at end of file diff --git a/gfx/intro/yellow_intro_1.png b/gfx/intro/yellow_intro_1.png new file mode 100644 index 00000000..f7258169 Binary files /dev/null and b/gfx/intro/yellow_intro_1.png differ diff --git a/gfx/intro/yellow_intro_2.png b/gfx/intro/yellow_intro_2.png new file mode 100644 index 00000000..dc5313c3 Binary files /dev/null and b/gfx/intro/yellow_intro_2.png differ diff --git a/gfx/overworld/pikachu_ball.png b/gfx/overworld/pikachu_ball.png new file mode 100644 index 00000000..20bcf5a7 Binary files /dev/null and b/gfx/overworld/pikachu_ball.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index 4019fe36..2e410ea3 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -374,3 +374,10 @@ ChannelerPic:: INCBIN "gfx/trainers/channeler.pic" AgathaPic:: INCBIN "gfx/trainers/agatha.pic" LancePic:: INCBIN "gfx/trainers/lance.pic" JessieJamesPic:: INCBIN "gfx/trainers/yellow/jessiejames.pic" + + +SECTION "Pics 7", ROMX + +RedPicBack:: INCBIN "gfx/player/redb.pic" +OldManPic:: INCBIN "gfx/battle/oldman.pic" +ProfOakPicBack:: INCBIN "gfx/battle/prof.oakb.pic" diff --git a/gfx/pikachu.asm b/gfx/pikachu.asm new file mode 100644 index 00000000..6852e91e --- /dev/null +++ b/gfx/pikachu.asm @@ -0,0 +1,128 @@ +SECTION "Pikachu Graphics 1", ROMX + +Pic_e4000:: +INCBIN "gfx/pikachu/unknown_e4000.pic" +GFX_e40cc:: +INCBIN "gfx/pikachu/unknown_e40cc.2bpp" +Pic_e411c:: +INCBIN "gfx/pikachu/unknown_e411c.pic" +GFX_e41d2:: +INCBIN "gfx/pikachu/unknown_e41d2.2bpp" +Pic_e4272:: +INCBIN "gfx/pikachu/unknown_e4272.pic" +GFX_e4323:: +INCBIN "gfx/pikachu/unknown_e4323.2bpp" +Pic_e4383:: +INCBIN "gfx/pikachu/unknown_e4383.pic" +GFX_e444b:: +INCBIN "gfx/pikachu/unknown_e444b.2bpp" +Pic_e458b:: +INCBIN "gfx/pikachu/unknown_e458b.pic" +GFX_e463b:: +INCBIN "gfx/pikachu/unknown_e463b.2bpp" +Pic_e467b:: +INCBIN "gfx/pikachu/unknown_e467b.pic" +GFX_e472e:: +INCBIN "gfx/pikachu/unknown_e472e.2bpp" +Pic_e476e:: +INCBIN "gfx/pikachu/unknown_e476e.pic" +GFX_e4841:: +INCBIN "gfx/pikachu/unknown_e4841.2bpp" +Pic_e49d1:: +INCBIN "gfx/pikachu/unknown_e49d1.pic" +GFX_e4a99:: +INCBIN "gfx/pikachu/unknown_e4a99.2bpp" +Pic_e4b39:: +INCBIN "gfx/pikachu/unknown_e4b39.pic" +GFX_e4bde:: +INCBIN "gfx/pikachu/unknown_e4bde.2bpp" +Pic_e4c3e:: +INCBIN "gfx/pikachu/unknown_e4c3e.pic" +GFX_e4ce0:: +INCBIN "gfx/pikachu/unknown_e4ce0.2bpp" +GFX_e4e70:: +INCBIN "gfx/pikachu/unknown_e4e70.2bpp" +Pic_e5000:: +INCBIN "gfx/pikachu/unknown_e5000.pic" +GFX_e50af:: +INCBIN "gfx/pikachu/unknown_e50af.2bpp" +Pic_e523f:: +INCBIN "gfx/pikachu/unknown_e523f.pic" +GFX_e52fe:: +INCBIN "gfx/pikachu/unknown_e52fe.2bpp" +Pic_e548e:: +INCBIN "gfx/pikachu/unknown_e548e.pic" +GFX_e5541:: +INCBIN "gfx/pikachu/unknown_e5541.2bpp" +Pic_e56d1:: +INCBIN "gfx/pikachu/unknown_e56d1.pic" +GFX_e5794:: +INCBIN "gfx/pikachu/unknown_e5794.2bpp" +Pic_e5924:: +INCBIN "gfx/pikachu/unknown_e5924.pic" +GFX_e59ed:: +INCBIN "gfx/pikachu/unknown_e59ed.2bpp" +Pic_e5b7d:: +INCBIN "gfx/pikachu/unknown_e5b7d.pic" +GFX_e5c4d:: +INCBIN "gfx/pikachu/unknown_e5c4d.2bpp" +Pic_e5ddd:: +INCBIN "gfx/pikachu/unknown_e5ddd.pic" +GFX_e5e90:: +INCBIN "gfx/pikachu/unknown_e5e90.2bpp" +GFX_e6020:: +INCBIN "gfx/pikachu/unknown_e6020.2bpp" +GFX_e61b0:: +INCBIN "gfx/pikachu/unknown_e61b0.2bpp" +Pic_e6340:: +INCBIN "gfx/pikachu/unknown_e6340.pic" +GFX_e63f7:: +INCBIN "gfx/pikachu/unknown_e63f7.2bpp" +Pic_e6587:: +INCBIN "gfx/pikachu/unknown_e6587.pic" +GFX_e6646:: +INCBIN "gfx/pikachu/unknown_e6646.2bpp" +Pic_e67d6:: +INCBIN "gfx/pikachu/unknown_e67d6.pic" +GFX_e682f:: +INCBIN "gfx/pikachu/unknown_e682f.2bpp" +GFX_e69bf:: +INCBIN "gfx/pikachu/unknown_e69bf.2bpp" +GFX_e6b4f:: +INCBIN "gfx/pikachu/unknown_e6b4f.2bpp" +GFX_e6cdf:: +INCBIN "gfx/pikachu/unknown_e6cdf.2bpp" +GFX_e6e6f:: +INCBIN "gfx/pikachu/unknown_e6e6f.2bpp" +GFX_e6fff:: +INCBIN "gfx/pikachu/unknown_e6fff.2bpp" +GFX_e718f:: +INCBIN "gfx/pikachu/unknown_e718f.2bpp" +GFX_e731f:: +INCBIN "gfx/pikachu/unknown_e731f.2bpp" +GFX_e74af:: +INCBIN "gfx/pikachu/unknown_e74af.2bpp" +GFX_e763f:: +INCBIN "gfx/pikachu/unknown_e763f.2bpp" +Pic_e77cf:: +INCBIN "gfx/pikachu/unknown_e77cf.pic" +GFX_e7863:: +INCBIN "gfx/pikachu/unknown_e7863.2bpp" +GFX_e79f3:: +INCBIN "gfx/pikachu/unknown_e79f3.2bpp" +GFX_e7b83:: +INCBIN "gfx/pikachu/unknown_e7b83.2bpp" +GFX_e7d13:: +INCBIN "gfx/pikachu/unknown_e7d13.2bpp" + + +SECTION "Pikachu Graphics 2", ROMX + +Pic_f0abf:: +INCBIN "gfx/pikachu/unknown_f0abf.pic" +GFX_f0b64:: +INCBIN "gfx/pikachu/unknown_f0b64.2bpp" +Pic_f0cf4:: +INCBIN "gfx/pikachu/unknown_f0cf4.pic" +GFX_f0d82:: +INCBIN "gfx/pikachu/unknown_f0d82.2bpp" diff --git a/gfx/printer/01.png b/gfx/printer/01.png new file mode 100644 index 00000000..0c11b9da Binary files /dev/null and b/gfx/printer/01.png differ diff --git a/gfx/printer/hp.png b/gfx/printer/hp.png new file mode 100644 index 00000000..adf086ca Binary files /dev/null and b/gfx/printer/hp.png differ diff --git a/gfx/printer/lv.png b/gfx/printer/lv.png new file mode 100644 index 00000000..0d5c6620 Binary files /dev/null and b/gfx/printer/lv.png differ diff --git a/gfx/sprites.asm b/gfx/sprites.asm index ebafac20..c54aef3d 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -72,3 +72,18 @@ AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp" BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp" LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite:: INCBIN "gfx/sprites/seel.2bpp" + + +SECTION "NPC Sprites 3", ROMX + +OfficerJennySprite:: INCBIN "gfx/sprites/officer_jenny.2bpp" +PikachuSprite:: INCBIN "gfx/sprites/pikachu.2bpp" +SandshrewSprite:: INCBIN "gfx/sprites/sandshrew.2bpp" +OddishSprite:: INCBIN "gfx/sprites/oddish.2bpp" +BulbasaurSprite:: INCBIN "gfx/sprites/bulbasaur.2bpp" +JigglypuffSprite:: INCBIN "gfx/sprites/jigglypuff.2bpp" +ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp" +ChanseySprite:: INCBIN "gfx/sprites/chansey.2bpp" +SurfingPikachuSprite:: INCBIN "gfx/sprites/surfing_pikachu.2bpp" +JessieSprite:: INCBIN "gfx/sprites/jessie.2bpp" +JamesSprite:: INCBIN "gfx/sprites/james.2bpp" diff --git a/gfx/stats_screen_hp.png b/gfx/stats_screen_hp.png deleted file mode 100644 index adf086ca..00000000 Binary files a/gfx/stats_screen_hp.png and /dev/null differ diff --git a/gfx/stats_screen_lv.png b/gfx/stats_screen_lv.png deleted file mode 100644 index 0d5c6620..00000000 Binary files a/gfx/stats_screen_lv.png and /dev/null differ diff --git a/gfx/surfing_pikachu.asm b/gfx/surfing_pikachu.asm new file mode 100644 index 00000000..51884db2 --- /dev/null +++ b/gfx/surfing_pikachu.asm @@ -0,0 +1,3 @@ +SurfingPikachu1Graphics1:: INCBIN "gfx/surfing_pikachu/surfing_pikachu_1a.2bpp" +SurfingPikachu1Graphics2:: INCBIN "gfx/surfing_pikachu/surfing_pikachu_1b.2bpp" +SurfingPikachu1Graphics3:: INCBIN "gfx/surfing_pikachu/surfing_pikachu_1c.2bpp" diff --git a/gfx/surfing_pikachu/surfing_pikachu_1a.png b/gfx/surfing_pikachu/surfing_pikachu_1a.png new file mode 100644 index 00000000..0bc11684 Binary files /dev/null and b/gfx/surfing_pikachu/surfing_pikachu_1a.png differ diff --git a/gfx/surfing_pikachu/surfing_pikachu_1b.png b/gfx/surfing_pikachu/surfing_pikachu_1b.png new file mode 100644 index 00000000..a64eb4c7 Binary files /dev/null and b/gfx/surfing_pikachu/surfing_pikachu_1b.png differ diff --git a/gfx/surfing_pikachu/surfing_pikachu_1c.png b/gfx/surfing_pikachu/surfing_pikachu_1c.png new file mode 100644 index 00000000..eeedb243 Binary files /dev/null and b/gfx/surfing_pikachu/surfing_pikachu_1c.png differ diff --git a/gfx/surfing_pikachu/surfing_pikachu_2.png b/gfx/surfing_pikachu/surfing_pikachu_2.png new file mode 100644 index 00000000..f8752966 Binary files /dev/null and b/gfx/surfing_pikachu/surfing_pikachu_2.png differ diff --git a/gfx/surfing_pikachu/surfing_pikachu_3.png b/gfx/surfing_pikachu/surfing_pikachu_3.png new file mode 100644 index 00000000..91d4a607 Binary files /dev/null and b/gfx/surfing_pikachu/surfing_pikachu_3.png differ diff --git a/gfx/surfing_pikachu/unknown_f8946.map b/gfx/surfing_pikachu/unknown_f8946.map new file mode 100644 index 00000000..a89a52b8 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f8946.map @@ -0,0 +1 @@ +           \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f90bc.map b/gfx/surfing_pikachu/unknown_f90bc.map new file mode 100644 index 00000000..98b8ba51 Binary files /dev/null and b/gfx/surfing_pikachu/unknown_f90bc.map differ diff --git a/gfx/surfing_pikachu/unknown_f91ac.map b/gfx/surfing_pikachu/unknown_f91ac.map new file mode 100644 index 00000000..8a1f06b7 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f91ac.map @@ -0,0 +1 @@ +íîïÿðñòóôõöÿ÷øù \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f91bb.map b/gfx/surfing_pikachu/unknown_f91bb.map new file mode 100644 index 00000000..6d8ebb43 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f91bb.map @@ -0,0 +1,2 @@ +úûÿüýþÿ +ÿ \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f91c8.map b/gfx/surfing_pikachu/unknown_f91c8.map new file mode 100644 index 00000000..20d18de5 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f91c8.map @@ -0,0 +1 @@ +¶·¸¹ÿÿÿºÿÿÿÿ»¼½¾¿ÀÁÂÃÄÅÿÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÿÿÿÝÞßàáâãäÿÿÿÿåæçèéêëìÿÿ \ No newline at end of file diff --git a/gfx/surfing_pikachu_1a.png b/gfx/surfing_pikachu_1a.png deleted file mode 100644 index 0bc11684..00000000 Binary files a/gfx/surfing_pikachu_1a.png and /dev/null differ diff --git a/gfx/surfing_pikachu_1b.png b/gfx/surfing_pikachu_1b.png deleted file mode 100644 index a64eb4c7..00000000 Binary files a/gfx/surfing_pikachu_1b.png and /dev/null differ diff --git a/gfx/surfing_pikachu_1c.png b/gfx/surfing_pikachu_1c.png deleted file mode 100644 index eeedb243..00000000 Binary files a/gfx/surfing_pikachu_1c.png and /dev/null differ diff --git a/gfx/surfing_pikachu_2.png b/gfx/surfing_pikachu_2.png deleted file mode 100644 index f8752966..00000000 Binary files a/gfx/surfing_pikachu_2.png and /dev/null differ diff --git a/gfx/surfing_pikachu_3.png b/gfx/surfing_pikachu_3.png deleted file mode 100644 index 91d4a607..00000000 Binary files a/gfx/surfing_pikachu_3.png and /dev/null differ diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index e6db3c21..911ad34f 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -62,3 +62,10 @@ Club_GFX:: INCBIN "gfx/tilesets/club.2bpp" Club_Block:: INCBIN "gfx/blocksets/club.bst" Underground_GFX:: INCBIN "gfx/tilesets/underground.2bpp" Underground_Block:: INCBIN "gfx/blocksets/underground.bst" + + +SECTION "Tilesets 4", ROMX + +BeachHouse_GFX:: INCBIN "gfx/tilesets/beach_house.2bpp" + ds 384 +BeachHouse_Block:: INCBIN "gfx/blocksets/beach_house.bst" diff --git a/gfx/tilesets/beach_house.png b/gfx/tilesets/beach_house.png new file mode 100644 index 00000000..f5dccf7a Binary files /dev/null and b/gfx/tilesets/beach_house.png differ diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png deleted file mode 100644 index f5dccf7a..00000000 Binary files a/gfx/tilesets/beachhouse.png and /dev/null differ diff --git a/gfx/title/nine.png b/gfx/title/nine.png new file mode 100644 index 00000000..e6fc8911 Binary files /dev/null and b/gfx/title/nine.png differ diff --git a/gfx/title/pika_bubble.tilemap b/gfx/title/pika_bubble.tilemap new file mode 100644 index 00000000..892be3c7 --- /dev/null +++ b/gfx/title/pika_bubble.tilemap @@ -0,0 +1 @@ +$%fghi*PQRSTUVWXYZ[\]m^_`abc \ No newline at end of file diff --git a/gfx/title/pikachu.tilemap b/gfx/title/pikachu.tilemap new file mode 100644 index 00000000..9fc7de6f Binary files /dev/null and b/gfx/title/pikachu.tilemap differ diff --git a/gfx/title/pikachu_bg.png b/gfx/title/pikachu_bg.png new file mode 100644 index 00000000..245fdbf6 Binary files /dev/null and b/gfx/title/pikachu_bg.png differ diff --git a/gfx/title/pikachu_ob.png b/gfx/title/pikachu_ob.png new file mode 100644 index 00000000..066221cb Binary files /dev/null and b/gfx/title/pikachu_ob.png differ diff --git a/gfx/title/pokemon_logo.png b/gfx/title/pokemon_logo.png index 64f9b23f..30b4a46d 100644 Binary files a/gfx/title/pokemon_logo.png and b/gfx/title/pokemon_logo.png differ diff --git a/gfx/title/pokemon_logo.tilemap b/gfx/title/pokemon_logo.tilemap new file mode 100644 index 00000000..92488a1f --- /dev/null +++ b/gfx/title/pokemon_logo.tilemap @@ -0,0 +1,2 @@ +ôôôôôôIôr0ôôôôôôý + ô  !"#$%&'()*+,-./ô123456789:;<=>?ôABCDEFGHôJKLMNOôjklmôôôôôônopqô \ No newline at end of file diff --git a/gfx/title/pokemon_logo_corner.png b/gfx/title/pokemon_logo_corner.png new file mode 100644 index 00000000..ffb2a514 Binary files /dev/null and b/gfx/title/pokemon_logo_corner.png differ diff --git a/gfx/unknown_f8946.map b/gfx/unknown_f8946.map deleted file mode 100644 index a89a52b8..00000000 --- a/gfx/unknown_f8946.map +++ /dev/null @@ -1 +0,0 @@ -           \ No newline at end of file diff --git a/gfx/unknown_f90bc.map b/gfx/unknown_f90bc.map deleted file mode 100644 index 98b8ba51..00000000 Binary files a/gfx/unknown_f90bc.map and /dev/null differ diff --git a/gfx/unknown_f91ac.map b/gfx/unknown_f91ac.map deleted file mode 100644 index 8a1f06b7..00000000 --- a/gfx/unknown_f91ac.map +++ /dev/null @@ -1 +0,0 @@ -íîïÿðñòóôõöÿ÷øù \ No newline at end of file diff --git a/gfx/unknown_f91bb.map b/gfx/unknown_f91bb.map deleted file mode 100644 index 6d8ebb43..00000000 --- a/gfx/unknown_f91bb.map +++ /dev/null @@ -1,2 +0,0 @@ -úûÿüýþÿ -ÿ \ No newline at end of file diff --git a/gfx/unknown_f91c8.map b/gfx/unknown_f91c8.map deleted file mode 100644 index 20d18de5..00000000 --- a/gfx/unknown_f91c8.map +++ /dev/null @@ -1 +0,0 @@ -¶·¸¹ÿÿÿºÿÿÿÿ»¼½¾¿ÀÁÂÃÄÅÿÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÿÿÿÝÞßàáâãäÿÿÿÿåæçèéêëìÿÿ \ No newline at end of file diff --git a/gfx/unknown_f9b6e.map b/gfx/unknown_f9b6e.map deleted file mode 100644 index 3ce924dc..00000000 Binary files a/gfx/unknown_f9b6e.map and /dev/null differ diff --git a/gfx/unknown_f9be6.map b/gfx/unknown_f9be6.map deleted file mode 100644 index 18560135..00000000 --- a/gfx/unknown_f9be6.map +++ /dev/null @@ -1 +0,0 @@ -0123@ABCPQRS \ No newline at end of file diff --git a/gfx/unknown_f9bf2.map b/gfx/unknown_f9bf2.map deleted file mode 100644 index e587b7ce..00000000 --- a/gfx/unknown_f9bf2.map +++ /dev/null @@ -1 +0,0 @@ -"# \ No newline at end of file diff --git a/gfx/unknown_f9c2c.png b/gfx/unknown_f9c2c.png deleted file mode 100644 index b5c68424..00000000 Binary files a/gfx/unknown_f9c2c.png and /dev/null differ diff --git a/gfx/unknown_f9c6c.png b/gfx/unknown_f9c6c.png deleted file mode 100644 index 3725d6cc..00000000 Binary files a/gfx/unknown_f9c6c.png and /dev/null differ diff --git a/gfx/unknown_fd86b.png b/gfx/unknown_fd86b.png deleted file mode 100644 index 20bcf5a7..00000000 Binary files a/gfx/unknown_fd86b.png and /dev/null differ diff --git a/gfx/yellow_intro.asm b/gfx/yellow_intro.asm new file mode 100644 index 00000000..4bdd1a3f --- /dev/null +++ b/gfx/yellow_intro.asm @@ -0,0 +1,4 @@ +YellowIntroGraphics1: INCBIN "gfx/intro/yellow_intro_1.2bpp" +YellowIntroGraphics1End:: +YellowIntroGraphics2: INCBIN "gfx/intro/yellow_intro_2.2bpp" +YellowIntroGraphics2End:: diff --git a/gfx/yellow_intro.png b/gfx/yellow_intro.png deleted file mode 100644 index a9a2773c..00000000 Binary files a/gfx/yellow_intro.png and /dev/null differ diff --git a/gfx/yellow_titlescreen.png b/gfx/yellow_titlescreen.png deleted file mode 100644 index 285309ce..00000000 Binary files a/gfx/yellow_titlescreen.png and /dev/null differ diff --git a/gfx/zero_one_ea597.png b/gfx/zero_one_ea597.png deleted file mode 100644 index 0c11b9da..00000000 Binary files a/gfx/zero_one_ea597.png and /dev/null differ -- cgit v1.3.1-sl0p