From 83f6200c7448e732a113bf46c36c01c765368d6b Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 28 Apr 2023 19:11:49 +0100 Subject: [PATCH] New sprites just dropped A selection of Game Corner sprites retooled to be overworld Pokemon. I also placed Voltorb, Diglett, and Magikarp. --- constants/hide_show_constants.asm | 4 ++-- constants/sprite_constants.asm | 11 +++++++++-- data/maps/objects/CeladonUniversityOutside.asm | 4 ++-- data/maps/objects/DiglettsCaveRoute2.asm | 1 + data/maps/objects/PowerPlant.asm | 16 ++++++++-------- data/maps/sprite_sets.asm | 2 +- data/sprites/sprites.asm | 10 ++++++++-- gfx/sprites.asm | 7 +++++++ gfx/sprites/arbok.png | Bin 0 -> 511 bytes gfx/sprites/clefairy2.png | Bin 0 -> 237 bytes gfx/sprites/diglett.png | Bin 0 -> 353 bytes gfx/sprites/gengar.png | Bin 0 -> 377 bytes gfx/sprites/koffing.png | Bin 0 -> 436 bytes gfx/sprites/magikarp.png | Bin 0 -> 363 bytes gfx/sprites/pidgey.png | Bin 0 -> 256 bytes gfx/sprites/poliwag.png | Bin 0 -> 266 bytes gfx/sprites/rattata.png | Bin 0 -> 250 bytes gfx/sprites/voltorb.png | Bin 0 -> 356 bytes scan_includes.exe.stackdump | 10 +++++----- scripts/DiglettsCaveRoute2.asm | 9 +++++++++ text/DiglettsCaveRoute2.asm | 4 ++++ 21 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 gfx/sprites/arbok.png create mode 100644 gfx/sprites/clefairy2.png create mode 100644 gfx/sprites/diglett.png create mode 100644 gfx/sprites/gengar.png create mode 100644 gfx/sprites/koffing.png create mode 100644 gfx/sprites/magikarp.png create mode 100644 gfx/sprites/pidgey.png create mode 100644 gfx/sprites/poliwag.png create mode 100644 gfx/sprites/rattata.png create mode 100644 gfx/sprites/voltorb.png diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 9afafb86..2bdcb965 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -35,6 +35,8 @@ DEF SHOW EQU $15 const HS_SAFFRON_CITY_E ; 17 const HS_SAFFRON_CITY_F ; 18 const HS_SAFFRON_CITY_UP_GRADE ; 19 + const HS_CACTUS ; 1A was ROUTE_2_ITEM_2 + const HS_BRUNSWICK_ZAPDOS_G ; 1B was ROUTE_4_ITEM const HS_CELESTE_ARTICUNO_G ; 1C was unused HS_ROUTE_9_ITEM const HS_ROUTE_12_SNORLAX ; 1D const HS_CELESTE_ZAPDOS_G ; 1E X was unused HS_ROUTE_12_ITEM_1 @@ -223,8 +225,6 @@ DEF SHOW EQU $15 const HS_VICTORY_ROAD_1F_ITEM_1 ; D4 X const HS_VICTORY_ROAD_1F_ITEM_2 ; D5 X const HS_CHAMPIONS_ROOM_OAK ; D6 - const HS_CACTUS ; 1A was ROUTE_2_ITEM_2 - const HS_ZAPDOSG ; 1B was ROUTE_4_ITEM const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D7 const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D8 const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D9 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 3e1fb0f8..1429ae7a 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -75,6 +75,12 @@ const SPRITE_JAMES ; $46 const SPRITE_CAT const SPRITE_SMALL_BIRD + const SPRITE_ARBOK + const SPRITE_KOFFING + const SPRITE_DIGLETT + const SPRITE_VOLTORB + const SPRITE_GENGAR + const SPRITE_MAGIKARP DEF FIRST_STILL_SPRITE EQU const_value const SPRITE_POKE_BALL ; $47 const SPRITE_FOSSIL ; $48 @@ -86,6 +92,7 @@ DEF FIRST_STILL_SPRITE EQU const_value const SPRITE_FAKE_TREE ; $4e was SPRITE_UNUSED_OLD_AMBER const SPRITE_OLD_AMBER ; $4f const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $50 - const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $51 + const SPRITE_POLIWAG ; $51 UNUSED_GAMBLER_ASLEEP_2 const SPRITE_GAMBLER_ASLEEP ; $52 -DEF NUM_SPRITES EQU const_value - 1 \ No newline at end of file +DEF NUM_SPRITES EQU const_value - 1 +;there are pidgey, and rattata sprites that I can't find discernible use for yet. diff --git a/data/maps/objects/CeladonUniversityOutside.asm b/data/maps/objects/CeladonUniversityOutside.asm index 33f4069b..386c52bd 100644 --- a/data/maps/objects/CeladonUniversityOutside.asm +++ b/data/maps/objects/CeladonUniversityOutside.asm @@ -14,6 +14,6 @@ CeladonUniversityOutside_Object: object_event 25, 20, SPRITE_SUPER_NERD, WALK, DOWN, 4 ; trainer object_event 4, 27, SPRITE_FISHER, WALK, LEFT, 5 ; Original SPRITE_ROCKER replaced. Reason: maximum of 10 sprites per set object_event 33, 16, SPRITE_GIRL, WALK, DOWN, 6 ; Original SPRITE_BEAUTY replaced. Reason: same as above - object_event 7, 22, SPRITE_SEEL, WALK, RIGHT, 7 ; Static sprite. Reason: same as above and used the slot 11 - object_event 34, 25, SPRITE_SEEL, WALK, LEFT, 7 ; Static sprite. Reason: same as above + object_event 7, 22, SPRITE_MAGIKARP, WALK, RIGHT, 7 ; Static sprite. Reason: same as above and used the slot 11 + object_event 34, 25, SPRITE_MAGIKARP, WALK, LEFT, 7 ; Static sprite. Reason: same as above def_warps_to CELADON_UNIVERSITY_OUTSIDE \ No newline at end of file diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index c8dc0561..856027a2 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -10,5 +10,6 @@ DiglettsCaveRoute2_Object: def_object_events object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person + object_event 2, 3, SPRITE_DIGLETT, STAY, NONE, 2 def_warps_to DIGLETTS_CAVE_ROUTE_2 diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 3e8f5d4a..8284f477 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -9,14 +9,14 @@ PowerPlant_Object: def_bg_events def_object_events - object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40 | OW_POKEMON - object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40 | OW_POKEMON - object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40 | OW_POKEMON - object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43 | OW_POKEMON - object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40 | OW_POKEMON - object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40 | OW_POKEMON - object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43 | OW_POKEMON - object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40 | OW_POKEMON + object_event 9, 20, SPRITE_VOLTORB, STAY, UP, 1, VOLTORB, 40 | OW_POKEMON + object_event 32, 18, SPRITE_VOLTORB, STAY, UP, 2, VOLTORB, 40 | OW_POKEMON + object_event 21, 25, SPRITE_VOLTORB, STAY, UP, 3, VOLTORB, 40 | OW_POKEMON + object_event 25, 18, SPRITE_VOLTORB, STAY, UP, 4, ELECTRODE, 43 | OW_POKEMON + object_event 23, 34, SPRITE_VOLTORB, STAY, UP, 5, VOLTORB, 40 | OW_POKEMON + object_event 26, 28, SPRITE_VOLTORB, STAY, UP, 6, VOLTORB, 40 | OW_POKEMON + object_event 21, 14, SPRITE_VOLTORB, STAY, UP, 7, ELECTRODE, 43 | OW_POKEMON + object_event 37, 32, SPRITE_VOLTORB, STAY, UP, 8, VOLTORB, 40 | OW_POKEMON object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50 | OW_POKEMON object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index f441296e..6b76f629 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -131,7 +131,7 @@ SpriteSets: db SPRITE_MONSTER db SPRITE_SUPER_NERD ; Original: SPRITE_GUARD db SPRITE_ROCKET - db SPRITE_SEEL ; Original: SPRITE_POKE_BALL (static sprite) + db SPRITE_MAGIKARP ; Original: SPRITE_POKE_BALL (static sprite) db SPRITE_SNORLAX ; SPRITESET_INDIGO diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index c3be9262..1c72a082 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -80,6 +80,12 @@ SpriteSheetPointerTable: overworld_sprite JamesSprite, 12 ; SPRITE_JAMES overworld_sprite CatSprite, 12 ; SPRITE_CAT overworld_sprite SmallBirdSprite, 12 ; SPRITE_SMALL_BIRD + overworld_sprite ArbokSprite, 12 ; SPRITE_ARBOK + overworld_sprite KoffingSprite, 12 ; SPRITE_KOFFING + overworld_sprite DiglettSprite, 12 ; SPRITE_DIGLETT + overworld_sprite VoltorbSprite, 12 ; SPRITE_VOLTORB + overworld_sprite GengarSprite, 12 ; SPRITE_GENGAR + overworld_sprite MagikarpSprite, 12 ; SPRITE_MAGIKARP overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER @@ -87,9 +93,9 @@ SpriteSheetPointerTable: overworld_sprite PokedexSprite, 4 ; SPRITE_POKEDEX overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX - overworld_sprite FakeTreeSprite, 4 ; was SPRITE_UNUSED_OLD_AMBER + overworld_sprite FakeTreeSprite, 4 ; SPRITE_FAKE_TREE, was SPRITE_UNUSED_OLD_AMBER overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1 - overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2 + overworld_sprite PoliwagSprite, 4 ; was SPRITE_UNUSED_GAMBLER_ASLEEP_2 overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP assert_table_length NUM_SPRITES \ No newline at end of file diff --git a/gfx/sprites.asm b/gfx/sprites.asm index 857b9194..4df105ce 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -90,3 +90,10 @@ JessieSprite:: INCBIN "gfx/sprites/jessie.2bpp" JamesSprite:: INCBIN "gfx/sprites/james.2bpp" SmallBirdSprite:: INCBIN "gfx/sprites/smallbird.2bpp" FakeTreeSprite:: INCBIN "gfx/sprites/fake_tree.2bpp" +ArbokSprite:: INCBIN "gfx/sprites/arbok.2bpp" +KoffingSprite:: INCBIN "gfx/sprites/koffing.2bpp" +DiglettSprite:: INCBIN "gfx/sprites/diglett.2bpp" +VoltorbSprite:: INCBIN "gfx/sprites/voltorb.2bpp" +GengarSprite:: INCBIN "gfx/sprites/gengar.2bpp" +MagikarpSprite:: INCBIN "gfx/sprites/magikarp.2bpp" +PoliwagSprite:: INCBIN "gfx/sprites/poliwag.2bpp" diff --git a/gfx/sprites/arbok.png b/gfx/sprites/arbok.png new file mode 100644 index 0000000000000000000000000000000000000000..759d5ebe7cb76fa2740574a438a3f715f2a145be GIT binary patch literal 511 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0hCEZK~zXf?Uhk- z!Y~X(lMYu5ha`ujer`5hD^dvMw{M1#ZKSm<3p_s?Q(&IwZS+gx))@p8_;@_Jb?*0j zw^8V}*&eJwoL$7{_zfak2G8cOTOU_zf}B~L)^%;esaxg|vRIa-kFm^K{PfjVHuyqc zItrG6v)4e#$wjJQxRHhmsAEKD=Kh`1hy5D;7Ub+m)Pv#UJ}5iUMdGf`ehUQYlVwoR zGdK(K+klwK&<75IF&Nm)8EzpGcLV%4356Vt- zk+`e#|9@Ztf8`)>H4`xiRK@gKM6sa;3g%_f>l6iJPaJN+-$1>CAd8?MGrdN=gNU&k z!36qIMA-)t0f_+CkB}D8UuR`eF=U{fbp9)(jTEmlrtPFPP$pMM1*(S1*aZmE=V~zY z8k_~iqr_U2eL!GV2R3tt-$Eqr2Kf1UdX3karf)-x<(6HO!@U3i002ovPDHLkV1ixj B+4%qf literal 0 HcmV?d00001 diff --git a/gfx/sprites/clefairy2.png b/gfx/sprites/clefairy2.png new file mode 100644 index 0000000000000000000000000000000000000000..7fc4bdf931f6fd0ff944a51204a7d164cd5a7580 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!6r`^#}Etusez7s4GKKWkHsHOtPv9T$}%_f z;$QsQN@7Cw`%L!ZG4+Q{pES^Tb z*Cu6eI5CA|mo%rAj7nnn+w{50FQ<545cuEdV#)D9?{8Vhv~BfOg-uo~?wA=duU&Y# d(&VR`m$=3JaK)+I?jYANc)I$ztaD0e0suM3QNI8H literal 0 HcmV?d00001 diff --git a/gfx/sprites/diglett.png b/gfx/sprites/diglett.png new file mode 100644 index 0000000000000000000000000000000000000000..c0c2dd5290c8145a1d3e1698aa1cda36eb0a9f9e GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3HEH;(vt$DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5M?jcysy3fAQ1F|li(`m~_uDDFe9a0xt%>C=&ZiX3!K}FJ|*85G(M1>TmNhy!?jz!x?NHi4q8r+5^(a!T^ke0VBzh~%k)y= zs%n9o!dt0mw!Jqy&n1~NuR8w0?B3>JPY~^_VixY pe`s=o0jAi~+u@ggEq~8XhPrZ-OKSRz4}c-S;OXk;vd$@?2>=d(iP8W7 literal 0 HcmV?d00001 diff --git a/gfx/sprites/gengar.png b/gfx/sprites/gengar.png new file mode 100644 index 0000000000000000000000000000000000000000..21fa42758f84043af3934a4c877b1b875e3e93bb GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3HEH;(vt$DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5M?jcysy3fAPy?T*i(`m~_uH^&z7_?Zmc7byLHsYHk~TZb z>v-6IOIA1B=4*XPQ{q#lqV9vz{qo9v3eRKY-OlILTw`cfPI&n!>OkU~-*wUQ2|UHp zyaEvloX(~zSgu{~f9$bz%B#(LbECgXx+HaJ2y=$@2$;L^^)M7q|K4cTd#5XAqV#l@ z%@KJI+c`W`?r_`g{ut@P)7P-IKRYpP){NU323%))GZVucn64jLli=piCiVD}$h=4Y z?Pn-_FpCan*7o`e+$!|j!rx&-7prhi?n3UfB0G25= zcUfndi%!(-=3K>E$v@duaxS~X0@Z4oE#3N$bnX7lF!|&+5Apx(ntK_o-~70} UGjM(-Ft`{zUHx3vIVCg!0B2*0fdBvi literal 0 HcmV?d00001 diff --git a/gfx/sprites/koffing.png b/gfx/sprites/koffing.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c0783795269a9f8c76c9657f629669317ae455 GIT binary patch literal 436 zcmV;l0ZaagP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0ZB%dCjB^yE7XAA89`_Gox_x&D4Oz0K_OgxUGJTupIm8Xh+ z?q^A6A_H4<#8Of#P{B7K41%1@FJ^KKBv$YS3O@I|qW$U*xXOZ{Rl1U6*0g{@Hmfkp znG7C#KoG?Kvs`K3L`~$Fb4iH;LQ%$qdcg?IJ$TEsVC^30DLA^PFmf9qqQve2zofW# zpa}Hq2y~V3GI7jy9~Jc4aBB}it5o3Df}od7a!fgekrN;g;Ur207-X}~-P*EaTz3-{ ziZUkD3r4VeFv7H8?H){>g5E|3_C%D}JwRek?p`F(ES|zHef>yaLD5x!{pjEDW z|JZ|8GRf<<1&rT_&_X!I^E~UKf_ZN7PKzyIAqSHzCA9*;<8%T*iKIjUarXk4P%ju^ e`tLj`*tS0(He2}MC=&z#0000Ufi(`m~_uDDie1{cyniFq{-gchmoLAZs zIE!`lC6l-O^N(os-w=@aS{k(P!Nu28qO$+bG8T3CP$(0oy|9Fv=i8g#ahvYOg*j}` zy{*HbdU*Y-%>C*-E+1V4&m4Yrn*03Prtl6ko8r>9L{tCkf@5Cj}nNUCw+;;Pu%z2(yq)=o{E$GF2=dwa{7{PN#a$nK2 zyI=OVsPieT;53(ezxuEf3Nr#pU~d0)^NA+a#vN%r#Q z_O+%fw`TFwi!I|gen~dv?b`(sEsC2sQj!-mZ1CoI&>VN=SgX`y9e;Tp>ki}Q*ghR5 zm2Gn#+6#T3V7pA=U2Po$W7CI}#S!OcE@e*8d|u(+nBMV+Az;?*qk4jmoPbVc@O1Ta JS?83{1OPMcV~_v< literal 0 HcmV?d00001 diff --git a/gfx/sprites/rattata.png b/gfx/sprites/rattata.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f7defddc63716e7dc5a84a154bb5fcfef6a92e GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G2E{#}EtuseOTB%?bj{3(KGUb6Ul0WZ+YAAy|?!U&r@lt8=f5txqJ0v(9ON+=Nj*O?@|1asBO}1cxFVdQ&MBb@04~pAEdT%j literal 0 HcmV?d00001 diff --git a/gfx/sprites/voltorb.png b/gfx/sprites/voltorb.png new file mode 100644 index 0000000000000000000000000000000000000000..e8e0d2563beac20ef886fbd2c8bb928518e26ec4 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3HEH;(vt$DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5M?jcysy3fAQ1GXxi(`m~_uDCfLWdPNT((};KIZ&N@p8^< zKS8IcwR2Cp-|O!?#ng0c&SxpJX{iS@_(-HR!`c{&) zj4N&hi_@Ve{Ax`McRN1+WB+btc5kUW@3{v$iwy)1{J7ja w>5R7Wp+)I7GO?@&On)x%6