From 09ad87502385d51de6547d5252c528064aa7255e Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 23 Apr 2023 17:59:28 +0100 Subject: [PATCH] Finish Rocket House, Yellow sprite backport Some big dubs for KEP today. This commit backports the Yellow overworld spriteset, and also adds the cat sprite for Meowth. This allows Jessie and James to use their overworld sprites in the Rocket House and serves as groundwork for backporting their other events. There are altered Daisy and Nurse Joy sprites that may or may not warrant usage. That can be discussed. Naturally, this also means there's a ton of overworld sprites to use elsewhere. Revamps of the "Bulbasaur house" in Cerulean and the Surfing Pikachu sprite change come to mind. An & symbol has been backported from GSC for Jessie and James's trainer class as well. --- charmap.asm | 5 +-- constants/sprite_constants.asm | 44 ++++++++++++++--------- constants/sprite_set_constants.asm | 3 +- data/maps/objects/CitrineRocketHouse.asm | 6 ++-- data/maps/sprite_sets.asm | 10 +++--- data/sprites/sprites.asm | 20 ++++++++--- engine/debug/debug_party.asm | 2 +- gfx/font/font.png | Bin 625 -> 1809 bytes gfx/font/font_extra.png | Bin 283 -> 665 bytes gfx/sprites.asm | 16 +++++++-- gfx/sprites/bulbasaur.png | Bin 0 -> 547 bytes gfx/sprites/chansey.png | Bin 0 -> 544 bytes gfx/sprites/clefairy.png | Bin 0 -> 554 bytes gfx/sprites/daisy (1).png | Bin 0 -> 277 bytes gfx/sprites/james.png | Bin 0 -> 711 bytes gfx/sprites/jessie.png | Bin 0 -> 888 bytes gfx/sprites/jigglypuff.png | Bin 0 -> 467 bytes gfx/sprites/nurse (1).png | Bin 0 -> 272 bytes gfx/sprites/oddish.png | Bin 0 -> 421 bytes gfx/sprites/officer_jenny.png | Bin 0 -> 859 bytes gfx/sprites/pikachu.png | Bin 0 -> 847 bytes gfx/sprites/sandshrew.png | Bin 0 -> 625 bytes gfx/sprites/surfing_pikachu.png | Bin 0 -> 1092 bytes scripts/CitrineRocketHouse.asm | 6 ++-- text/CitrineRocketHouse.asm | 9 ++--- 25 files changed, 80 insertions(+), 41 deletions(-) create mode 100644 gfx/sprites/bulbasaur.png create mode 100644 gfx/sprites/chansey.png create mode 100644 gfx/sprites/clefairy.png create mode 100644 gfx/sprites/daisy (1).png create mode 100644 gfx/sprites/james.png create mode 100644 gfx/sprites/jessie.png create mode 100644 gfx/sprites/jigglypuff.png create mode 100644 gfx/sprites/nurse (1).png create mode 100644 gfx/sprites/oddish.png create mode 100644 gfx/sprites/officer_jenny.png create mode 100644 gfx/sprites/pikachu.png create mode 100644 gfx/sprites/sandshrew.png create mode 100644 gfx/sprites/surfing_pikachu.png diff --git a/charmap.asm b/charmap.asm index b9af1a05..3c947059 100644 --- a/charmap.asm +++ b/charmap.asm @@ -50,7 +50,7 @@ charmap "”", $73 ; closing quote charmap "·", $74 ; middle dot, unused charmap "…", $75 ; ellipsis - charmap "ぁ", $76 ; hiragana small a, unused + ;charmap "&", $76 ; and symbol, was unused hiragana small a charmap "ぇ", $77 ; hiragana small e, unused charmap "ぉ", $78 ; hiragana small o, unused @@ -71,6 +71,7 @@ charmap "", $72 ; was jp opening quote (“) charmap "", $73 charmap "№", $74 + charmap "&", $76 ; and symbol, was unused hiragana small a ; Actual characters (from other graphics files) @@ -166,7 +167,7 @@ charmap "!", $e7 charmap ".", $e8 - charmap "ァ", $e9 ; katakana small a, unused + charmap "&", $e9 ; & was unused katakana small a charmap "ゥ", $ea ; katakana small u, unused charmap "ェ", $eb ; katakana small e, unused diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 5f98c227..8eb1c625 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,3 +1,4 @@ +; ported from Yellow ; overworld sprites ; SpriteSheetPointerTable indexes (see data/sprites/sprites.asm) const_def @@ -32,7 +33,7 @@ const SPRITE_MIDDLE_AGED_WOMAN ; $1c const SPRITE_BRUNETTE_GIRL ; $1d const SPRITE_LANCE ; $1e - const SPRITE_UNUSED_SCIENTIST ; $1f + const SPRITE_UNUSED_RED_1 ; $1f const SPRITE_SCIENTIST ; $20 const SPRITE_ROCKER ; $21 const SPRITE_SWIMMER ; $22 @@ -51,28 +52,39 @@ const SPRITE_FISHER ; $2f const SPRITE_KOGA ; $30 const SPRITE_GUARD ; $31 - const SPRITE_FAKE_TREE ; $32 - fake tree, was guard + const SPRITE_UNUSED_RED_2 ; $32 const SPRITE_MOM ; $33 const SPRITE_BALDING_GUY ; $34 const SPRITE_LITTLE_BOY ; $35 - const SPRITE_UNUSED_GAMEBOY_KID ; $36 + const SPRITE_UNUSED_RED_3 ; $36 const SPRITE_GAMEBOY_KID ; $37 const SPRITE_FAIRY ; $38 const SPRITE_AGATHA ; $39 const SPRITE_BRUNO ; $3a const SPRITE_LORELEI ; $3b const SPRITE_SEEL ; $3c + const SPRITE_PIKACHU ; $3d + const SPRITE_OFFICER_JENNY ; $3e + const SPRITE_SANDSHREW ; $3f + const SPRITE_ODDISH ; $40 + const SPRITE_BULBASAUR ; $41 + const SPRITE_JIGGLYPUFF ; $42 + const SPRITE_CLEFAIRY ; $43 + const SPRITE_CHANSEY ; $44 + const SPRITE_JESSIE ; $45 + const SPRITE_JAMES ; $46 + const SPRITE_CAT DEF FIRST_STILL_SPRITE EQU const_value - const SPRITE_POKE_BALL ; $3d - const SPRITE_FOSSIL ; $3e - const SPRITE_BOULDER ; $3f - const SPRITE_PAPER ; $40 - const SPRITE_POKEDEX ; $41 - const SPRITE_CLIPBOARD ; $42 - const SPRITE_SNORLAX ; $43 - const SPRITE_UNUSED_OLD_AMBER ; $44 - const SPRITE_OLD_AMBER ; $45 - const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $46 - const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $47 - const SPRITE_GAMBLER_ASLEEP ; $48 -DEF NUM_SPRITES EQU const_value - 1 + const SPRITE_POKE_BALL ; $47 + const SPRITE_FOSSIL ; $48 + const SPRITE_BOULDER ; $49 + const SPRITE_PAPER ; $4a + const SPRITE_POKEDEX ; $4b + const SPRITE_CLIPBOARD ; $4c + const SPRITE_SNORLAX ; $4d + const SPRITE_UNUSED_OLD_AMBER ; $4e + const SPRITE_OLD_AMBER ; $4f + const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $50 + const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $51 + const SPRITE_GAMBLER_ASLEEP ; $52 +DEF NUM_SPRITES EQU const_value - 1 \ No newline at end of file diff --git a/constants/sprite_set_constants.asm b/constants/sprite_set_constants.asm index 56e4ccbb..48460fb5 100644 --- a/constants/sprite_set_constants.asm +++ b/constants/sprite_set_constants.asm @@ -1,3 +1,4 @@ +; Ported from Yellow ; sprite set ids ; indexes for SpriteSets (see data/maps/sprite_sets.asm) ; values for MapSpriteSets and SplitMapSpriteSets (see data/maps/sprite_sets.asm) @@ -38,4 +39,4 @@ DEF EAST_WEST EQU 1 DEF NORTH_SOUTH EQU 2 ; each sprite set has 9 walking sprites and 2 still sprites -DEF SPRITE_SET_LENGTH EQU 9 + 2 +DEF SPRITE_SET_LENGTH EQU 9 + 2 \ No newline at end of file diff --git a/data/maps/objects/CitrineRocketHouse.asm b/data/maps/objects/CitrineRocketHouse.asm index da939e66..70445c11 100644 --- a/data/maps/objects/CitrineRocketHouse.asm +++ b/data/maps/objects/CitrineRocketHouse.asm @@ -12,8 +12,8 @@ CitrineRocketHouse_Object: object_event 5, 1, SPRITE_ROCKET, STAY, DOWN, 2 ; Mart Guy object_event 1, 6, SPRITE_ROCKET, STAY, RIGHT, 3 ; person object_event 9, 3, SPRITE_ROCKET, STAY, UP, 4 ; person - object_event 9, 8, SPRITE_ROCKET, STAY, UP, 5 ; Meowth ; SPRITE_CAT - object_event 9, 5, SPRITE_ROCKET, STAY, DOWN, 6 ; James ; SPRITE_JAMES - object_event 7, 6, SPRITE_ROCKET, STAY, RIGHT, 7 ; Jessie ; SPRITE_JESSIE + object_event 9, 8, SPRITE_CAT, STAY, UP, 5 ; Meowth + object_event 9, 5, SPRITE_JAMES, STAY, DOWN, 6 ; James + object_event 7, 6, SPRITE_JESSIE, STAY, RIGHT, 7 ; Jessie def_warps_to CITRINE_ROCKET_HOUSE \ No newline at end of file diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 36c66d52..fdfec4f9 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -90,7 +90,7 @@ SpriteSets: db SPRITE_COOLTRAINER_F db SPRITE_COOLTRAINER_M db SPRITE_POKE_BALL - db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler + db SPRITE_CAT ; SPRITESET_LAVENDER db SPRITE_LITTLE_GIRL @@ -103,7 +103,7 @@ SpriteSets: db SPRITE_COOLTRAINER_M db SPRITE_GUARD db SPRITE_POKE_BALL - db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler + db SPRITE_CAT ; SPRITESET_VERMILION db SPRITE_BEAUTY @@ -116,7 +116,7 @@ SpriteSets: db SPRITE_COOLTRAINER_F db SPRITE_COOLTRAINER_M db SPRITE_POKE_BALL - db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler + db SPRITE_CAT ; SPRITESET_CELADON db SPRITE_LITTLE_GIRL @@ -142,7 +142,7 @@ SpriteSets: db SPRITE_GUARD db SPRITE_GAMBLER db SPRITE_POKE_BALL - db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler + db SPRITE_CAT ; SPRITESET_SAFFRON db SPRITE_ROCKET @@ -155,7 +155,7 @@ SpriteSets: db SPRITE_COOLTRAINER_M db SPRITE_MONSTER db SPRITE_POKE_BALL - db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler + db SPRITE_CAT ; SPRITESET_SILENCE_BRIDGE db SPRITE_BIKER diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 873ce4a1..54b848d1 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -1,3 +1,4 @@ +; Ported from Yellow MACRO overworld_sprite dw \1 db \2 tiles @@ -37,7 +38,7 @@ SpriteSheetPointerTable: overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL overworld_sprite LanceSprite, 12 ; SPRITE_LANCE - overworld_sprite ScientistSprite, 12 ; SPRITE_UNUSED_SCIENTIST + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_1 overworld_sprite ScientistSprite, 12 ; SPRITE_SCIENTIST overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER @@ -56,17 +57,28 @@ SpriteSheetPointerTable: overworld_sprite FisherSprite, 12 ; SPRITE_FISHER overworld_sprite KogaSprite, 12 ; SPRITE_KOGA overworld_sprite GuardSprite, 12 ; SPRITE_GUARD - overworld_sprite TreeSprite, 4 ; SPRITE_FAKE_TREE - used to be unused guard, now fake tree + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_2 overworld_sprite MomSprite, 12 ; SPRITE_MOM overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY - overworld_sprite GameboyKidSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_3 overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID overworld_sprite FairySprite, 12 ; SPRITE_FAIRY overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI overworld_sprite SeelSprite, 12 ; SPRITE_SEEL + overworld_sprite PikachuSprite, 12 ; SPRITE_PIKACHU + overworld_sprite OfficerJennySprite, 12 ; SPRITE_OFFICER_JENNY + overworld_sprite SandshrewSprite, 12 ; SPRITE_SANDSHREW + overworld_sprite OddishSprite, 12 ; SPRITE_ODDISH + overworld_sprite BulbasaurSprite, 12 ; SPRITE_BULBASAUR + overworld_sprite JigglypuffSprite, 12 ; SPRITE_JIGGLYPUFF + overworld_sprite ClefairySprite, 12 ; SPRITE_CLEFAIRY + overworld_sprite ChanseySprite, 12 ; SPRITE_CHANSEY + overworld_sprite JessieSprite, 12 ; SPRITE_JESSIE + overworld_sprite JamesSprite, 12 ; SPRITE_JAMES + overworld_sprite CatSprite, 12 ; SPRITE_CAT overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER @@ -79,4 +91,4 @@ SpriteSheetPointerTable: overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1 overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2 overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP - assert_table_length NUM_SPRITES + assert_table_length NUM_SPRITES \ No newline at end of file diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index ef187d28..0b0673cb 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -24,7 +24,7 @@ IshiharaTeam: db EXEGGUTOR_A, 90 db RHYDON, 90 db KANGASKHAN, 90 - db KASANAGI, 50 + db NIDORAN_M, 50 IF DEF(_DEBUG) db KOKANA, 50 ENDC diff --git a/gfx/font/font.png b/gfx/font/font.png index 34e86b4a683cb214b92f71e462ed372b19bfb984..af26395ebcd3b0bd28108fb127b48edc74372c74 100644 GIT binary patch literal 1809 zcmbW2`%}`10>!_CD`gv2PHU2aceSj`jMf^Otd!5lZGB|oYen>0k=V@#IIEyRYqe`W zHwRNuV9h6~=#XWMAa1EwZ^>p?UH20BMnORl6-DIQzi@x}oHJ+U%$y%jepm?hkQK}d z0Dwb5R|3NKoUw<`e#<=_8Kcwp3`7pc`T=dj_KSPLg6JFU3jiG@2X_*`*vkjfuEdZ5 z0Q&YbASM!e0st%z>e(Gk12zRTn=h;+>+`?;6A;L%fy=Ijek`~JA z`n_5T4nyf_?I%B1Z`S9vVR4F4O4jfg4T4^QF``HAZ&OP`oC?j`xjihN@8cu4o4(D% zm^gu`e_Q3k2mLdNDdM#Y0O`r&biVqIOhId*gwJKgbqX%129+AOQxm#cv`pZ-v9$x` z*5=(HoJn;XB*ZM%jiA{2;=zl*`YW8IH&Ns9^x=krosp@`;1jslcnpo*TOPxCsF|Bs z>!Pb(&281{oHnI5sv=mcFzGY4s`I4|vZNIq#hWAetLO8^nl$l9^K5VvU-fOxZA3{U zRW~;-VX0T=#(ipuely=ab#I3J>v_oO8RCKu`MgJKXdQZTw|m!>SNZWv!o7o&8Q@Xx zffO7V7P?8CCg<@=hG#NmHj*epp^H8nh;N**pQU6Y@ri`C$5PMxR+`45qxd(ibulCF z3hQ5^*rX`o$YMyz@W(RK`yUk3?%xJG!5LHm95W+~)gOfSUG*4SB&MD-o) z8T!FV$>=03)SpkP&d2ij-gb@r`MTpxJIHVXcNfQh>+Jb{A;P^;Xe2Y}zYG@iFjrX; z!GtAoi^Lz4w>oUK3s-=-2_(Q9ac4Dpv@y2*m7E-;OBcp33Hk_0qo@T9 z9(>)jh6VP;9dK6jbo(>*vlcU6^w3g*l^=e~)X*(gWbWgN`E-C{5O}n&|1HJbN_Mn0 zQF1-eZ;-W8%L1vV7~;qYD!S}VtOviZ+*pZzI8VjTxvz$L4I)}}jDB9q+1F9RxH)VN zbdm)jrWRm!`v%r$tR=`Whf>$#3ia+kaO<;8yR95>S_Q{qNZ>C@t(qxsR#0oHo9H#$eTO&+(Is(4M3TJRU0I(c+M?T3A}mMaJgpDh zD%T4n_E6)snU){85Zff@Wsa%hXBz$i_2Jk@*1?5wl`v_?i2-&#JpMjW1glP8_d$2P zn)NNZnpo7<%56}0JRJa4RPZ0o_je7$4mTmh)AGb_)qfWY$tR;ZR4_?6+;4gwV^bv+ zdAD71ovtH1nMMC<*{rKn3u$%RBxp&f##grwCl(A%)Y@o+8`c@GZOk7)hDF00(U7>; z~Okg)FQ^hcst znR@k<9BG&~gzM#<$KEL~N-fznsg2jKUY!yRARr0rrJ~av%09@-t=5fR)KhigT9sp{ zGHiLYSN1%6Qv=D&ag{6Au#AfrAh67@v=042xn3okeVrt9-u#jN;#zsL^@|LZ zqJ8gfv+TYNJsZec(Zz9=n5dm0gAT)B zfh*2xs4%!!@=2cI!LV%v`c?=TTqKCxv|eC!gJzg*T|a)kh_|L@EV3`B?sM?GhF+fF zrjFCck&6_3|C!l>Ik{o_9R6PO@G&z!M{L-D=!WeQV;RyEXo~ zLuQAZx(W9tk2G?j8-!sU$>;Qy!`Up-5htb_Sr|KQI$CCTsuOSK!6{zX&2CyyX~h#v zdB#fy)nVndUJbv3a-V4lg|~r3mds1ntXqRkI2Y#2Dta^B0)E8e^rMG``g_}^l8^WSFA8fP0w3}vHM)yG0H!kY`bG%|B!;Qao?-+YPoouqAE@eNG zMadM{ge?a^*l&VUzzsRd+fZX3$pezjv|K35h$J_Oc^rcaA>%E52cF<&qe#{g-)G_F b@?A)9YSB08AaB{;jR8S{ApvcE2|xW0ursJK delta 612 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 literal 0 HcmV?d00001 diff --git a/gfx/sprites/daisy (1).png b/gfx/sprites/daisy (1).png new file mode 100644 index 0000000000000000000000000000000000000000..84f330f1d7b94bdeb521873f193f2c9bbdc7c388 GIT binary patch literal 277 zcmV+w0qXvVP)TafLppa=;WxUND-V{ths~7(4kA0I=bp4Jw*q*c$(C?5Z_+~L4{%{A8p>B zkG#S=?cr78(I(2EjRJ#4B{7=GF@`Hkjr%z-;Lf>5v)D2K80?n}h9Lt$qXi6nHK6M4 zv(`M(SR41iSxcWvikAv}K7E0xA~|s&+RK>8J7h%3JwN5AuLLfWw>^QGTuppVd|dde zbSyoeKKf*He0xO6gQer&5}@1*!Z$ b-Iaa-vd76BLd$}Q00000NkvXXu0mjfe_43J literal 0 HcmV?d00001 diff --git a/gfx/sprites/james.png b/gfx/sprites/james.png new file mode 100644 index 0000000000000000000000000000000000000000..a96772cb5e1ac63b950ed6292c683713759eba1c GIT binary patch literal 711 zcmV;&0yzDNP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0$fQ%K~z{r?UxH` z!!Qs;?cOmtWOB&Xqh`c-c2~A=3nlb{@h8&kU#08k#*(nE>+9*8V%ZV|xbb$owL5t} zpY85KI{|F=jShrVy%( zbP}CjM$Ig((QW2Hz3Qce0Kx0Fx!tpizbUB)0A8pEY8||`Xxu2&2IP5K@upR)zr$uM3>9o^g4Y-aw$2Q8Qa5 zQ;)S?N(d0V{^)t2{GSK;caVnQ*peN=gRBR9gq5CyYBTT=R+_+QGpR&&RluSnA*Tr- zKJ9aTJ|gr1>RvTcMi7`K2+UY-pbrRMw5-%xKOCVXm9|8RAjo9VL-#{0%xpeTpp%35a?yp%vQT3BD*qT(UFkT1Q4J0xjrAU^8k$glxGBiS%Scf^#=NY;B`ylANq%b;Z#l3 tfCm7NdU+TXr2sA!sR+ZAAxn&9`2rYj8qmUTZHoW^002ovPDHLkV1hZ#IZXfn literal 0 HcmV?d00001 diff --git a/gfx/sprites/jessie.png b/gfx/sprites/jessie.png new file mode 100644 index 0000000000000000000000000000000000000000..2f4f5a29e463b7198a6ae9597afe0c7af9d71c41 GIT binary patch literal 888 zcmV-;1Bd*HP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0}V+;K~z{ry_XA) z+b|47lcHBl4w)RX^;12>m?AA3So8scEtwpCEIGT+KO2w4^ZDHG{!y3&2LU<0UaxT# z-|u%^E1?j;IXh-5pXaIfUdezhca<~@7E!MB2he&qPGFq2f*!SJg(L7XImCyjJceBU@W6b zRL;Y<5?Bovn9hP~&Zq~Q^XQM5L@;CrBN!ddFUHaWmj9$O#cKJ)Y6gWOP2Im6*N1Fx+@ z{m4Q?0O!szlbhJS#ts5`nUeqp8XYbY`+(Hslz#(Mf5nsm&iTiMc@|L?%O0GS0+T?F zz7m*rA`b49|1R)nlyzw*x`~1S0%Z?mpmHkFfD9a#G&X^_cYLiBa7Ul(x$fceX@q1t zIP{=%#<6mSDTBL|0y&ej7}G`q-z=bWPzi+q&e<_j2`vwkLjZ=CI0UXl@0c=B6p`n^ zTv>zw_3^;JMsj40d-cEx0UaE!euVuC#Z@B8VhGUHeC{ihiSz&e;n*^WF`n)IlW`dA zbKSc$9CqRrHs^7rL|o%7>^i4pXP8c7&Lj+N-CfG#e1}q?%c9~SAV<|Iv?nT|!&}IX znM!Cnjb{*m;Ux}%E73b{Wgt9@+XCu?I2Fjoj83blS$jem56rZp$9_W!L!uGrPJtS^Pm47bkVywhvN*qwhHwl3k?CBJI73JV*469 z2;^l>0vKp?xX2J7B~p`Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0cc4?K~zXf?Un74 zgCGn=ai_1S4_P0w>&f&w*8qOB{@5RTW+)KMB_wEv*FyP%pLhQ;_XteWREA-QCfvqY zWLx9_!}IwJgBCOw+0LBwMFitGuEw4tu%@|u)+%@u;9^;r`P;2L;-*ArrCDBDWgO~CDdvLb^d7yd1Wb5XL9DrVF8fI^9 z%R~gI>;Hb9=jc^NFDK(1NmPN5CBWF7S~M?`l#iUj1=b_rC}&S%3qML##v|uUCE$^q zVHLQ#vseZ4`OgZ502!47LPyT5S7ijhB)vSiGhF^2xN|9``~t`PR37{^PZt0H002ov JPDHLkV1ls$$(jHF literal 0 HcmV?d00001 diff --git a/gfx/sprites/nurse (1).png b/gfx/sprites/nurse (1).png new file mode 100644 index 0000000000000000000000000000000000000000..5defe155bff16b7c2f495bf73a80a47303c5f126 GIT binary patch literal 272 zcmV+r0q_2aP)3{YgHn{DcmUmMCvT7xEOk^cg9i}A$sf#lOF6uShoZ6eH^9S*(wuqYH zAw%-;J}^nmz&H-0TQ?v;f+oI1x;zC?`$(X%j|Ncvg+Kz-K%<_-!#(am=d*;dV*Y!x z886if?lA{hG5eHYpVk39tvxigUO~-g0;v@TpmCLb?d|SuHbQ;*kloxv4pL= literal 0 HcmV?d00001 diff --git a/gfx/sprites/oddish.png b/gfx/sprites/oddish.png new file mode 100644 index 0000000000000000000000000000000000000000..c63e9cc7d1c06a5e47113f1d870619d964eb60a8 GIT binary patch literal 421 zcmV;W0b2fvP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0Xj)UK~zXf?UvyV zf-nq(!T5^2Bs`>g3pa1wbrAHAiC==q+FoxPp!4I!lrYb8IS*2%+kU=G5kMz)Be-6c zr5rBCvFd<{F!nH%haJXI)51zY8D}GO1$+3}xfMIv^|@ zq>LBw3`GE)qD@@m{>R~B9IFnP7?Tyo^%;Z~?*okC+I0tw0~G-*Cb1aUDX0i>#h|;9 z+yW9O&^Tam_KR$HM;(m1ljx#bgQNcgk&o9PeHv9LNhx$wKw)%|yPBpa$m9NEitB#> P00000NkvXXu0mjf^m(Vn literal 0 HcmV?d00001 diff --git a/gfx/sprites/officer_jenny.png b/gfx/sprites/officer_jenny.png new file mode 100644 index 0000000000000000000000000000000000000000..06eb3e10d40606e5ae0e23d5abcdacce84af9191 GIT binary patch literal 859 zcmV-h1ElPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0`N&hK~z{r)t3Q| z;~)%0)6rb9J!E^xT^`L(KgN(`+mU9Ugh;?P=3`Rz@~5yEm&;{+$_eJn*Vven1#+*h2(kq6`K?#W_(maAAC91f&U{ zlh3!(hTHAdsqSEhjqLHQ8h8evAnX@>0iHEpT%Q5zTOkG-VJ`32!S~wN)k)p=s9q`4 zV}tFM1zQlsp&rq!VdHd{2}W8Zrnv^BPO3T$dTpnJ3^IH>F>U8(zXuu7=IuK8MFH5` z@Td%IT!-y89&vW`W%_bw)%*271@;6J#aY;a8rNh?6y4m2(Vh%g*m3AoO-bQypI zifJdNV-e--+sQ~X0A=Bv$^bYKoyuUHIx&Q4+DJecZs90t9n6U9H5x=`*FZ#@-Mg?0 zTM)d`5KYh7nA2!LdK3*+7mG(@T}2WAcr5#EdT((~R1I7hUl{>u!sq1ki~exLATw5% zN>c~3^hay~i0UcRB%-#EEpYfQ$Qd2nr3(NAaR;X}CqSg6j8)SZ%Sbag!(k0XTyOe4 z$cQ#?e-Az%Kt+?0%{6yn=Ir=KrDkx(8L*X@pZ&wZAO@psG^ZeJqbVd0l;MsW1Q5LL zwQ|X7FS=vQ?z}@5#czEpJmb7zNULNmlHNvX0izGe1_2^P#Aa0*V;N}%XXpZW`WbP( z<`i(=JB7Hw+t;}(WudCe@NM9U!q2zD%n`d-NKFP1HPG)uTtq>t2E2IG_+vuQn3)#c z6)`&%vY`>AsRITw2QtcZ!Zj@Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0^~_VK~z{ry_kV+ z+b|47lVQJ@d}Q*GYo5>(PSi=U+h7myY}4e4q^P#o_1}xjFZlC)Uvj-(zn?Nq04H4z z?~li$+mqjrfjc|0bFcj6AKIY6DssQy+ueh`Z9@}Rs|dtu&tns{s;KWy6i^l^{Rv6{ z9$${bU01a`y$A2=7qt(c@4?D>W&d>v%Q^5B-R8kCokmTeo0CmU0%wW4aE7gbQs2=9 zaMq=FnpZ`tU(7(km1OS%-plHw72PiXAp;rH4Cr2GA(nu%i|mL3a8#uIOcbh9fw$YO z-5tK;r!ocscs`%)u3(ADUfCWdiPTK^rm#uComn-Nfqf~U40bFtfLexdn}@{Xj0g;l z!3I&_49h_}%KsCf2kL{f?Li8t#BCJ2?F8(D0Kuz4!np<$+I#RW*ikSXZlagtRW|`& zy{-m)b36X()s%sRR_CAZ@`2vORS#T9$J>wdltC?l09}G-l`#EC14MSEcm{7v5T2QW zVHzZGAq9GnGmSDx2v&h23Y?({99=Q_4ckcV?&M%kO>P3dszmBlgR!+cCA6m($FUugnZ=J1u&?AD-rh*O~606NWDB* ztsDOTz#ZyJqRv7u0i*Vw;4}w`UP8^_C~Xcr*t1ySW%NNpM881wTX;qM-3V3WNFyf! z*sTuR430F?GZ;o$;Gkw!JQ#)yAnk}#+-Ct$FT$sZC~$_@gEJf!pe&WFuLV*bR>M)&!go}?{ ZE?*T-=TKw$1EBx_002ovPDHLkV1g}jd?^3` literal 0 HcmV?d00001 diff --git a/gfx/sprites/sandshrew.png b/gfx/sprites/sandshrew.png new file mode 100644 index 0000000000000000000000000000000000000000..8a31d24c961dd79e92ea9856530339f875227db4 GIT binary patch literal 625 zcmV-%0*?KOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0tQJ$K~zXf&6aC& z!Y~Ykf#Hg9NH`?br)14~ODLavI?0aj4$Kx>-VmsdN z_lOh2Zoq)!^?LPL!9G`_m~z3bl&120KBuYZveQrQHn*-rmsX6PAet+m8f-iYm2|iU zr*sK9_=Ld#{Ix{EN-n*FL`~_FA{EM)7>|+ZOkLeOb#lexz<>m{EM3LqDW8inDEsK3f7d}^98;v z2LI@LAc{^kC38SCpaSigO*Ahx{Lc=?^jqosTgbWk zYpjNT-cd49#hwTc_S3~<{T}G0(FrPHOm>Ks&<*q-iBlI=jV7BbaIF3+ zLsKF<&t^c6oKnGE`y%OcJH5Yv6_Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1KCMLK~z{rotFV_ zBq0n0cTf3Z^2p?oIm$PM8Z$GwO-YEw*llB&NO^o8yuZI6zg}YsJRXl4caQ|1OtuMJ ziD3Wy{M>y0j72e2AH$)>$H&Lx`Fzg78oPcYu71N4mE(6g;&27~84R-m`1<;)8OOvm zRZvl~2$`V27BOL2_E{~Drg4wkZIt2*s4z4BbCYb_RTIVcqf`AMM#Fl~W zjz!>qNzo}__8&7ImC3xu>~=oY>*w z6#~wdEq%Rw&K(4LMg+2%B|sZ&;Mt4pLL{3aBWT_~^Vr>0hlfDTUR&-lvtD|T4#0IH zqO*cPZ&*(O3^@8|AOqO*eK1o|33CpNJ$uJsPynWYC1sW~K`T^X9wE!W3Rav%R18ZK z*>E6cfMD;OeoSYMkjI>12nb8YD1UiK4%f+Y3uex_J#o+dtp}7goa#5-_XYsFd-xH$3FPOR0Ud<7(nY}FylWp$Vld2G z@T=_P5hQI>fI>Wff0=!qZ0`U8Dj~>B*m@-%cln>`s$pmLY9Jy<6PNqt_i)(OjP6&r zaF(5tu`!cPn@9PV_vnF(JZB2_elYC8=}S!KJE}4St{4LIyg9JTR>7_j9}dd((F}o_u?@dvk6HWdK{^0$0TG=Q1bXAT1Tf&p zEE&L_kBgbiCY#?vX73mb3P=f9Qf4_5#4m%Pj*#VF1uIUq$!sDOcy62#Gzi>dPLbtX z@F-{GF_&W?0Q_W(^0&V{4A-4`3s;$etn8olW=i&q4(!)_fBywcZ6Haftkp9B0000< KMNUMnLSTZm;`CJj literal 0 HcmV?d00001 diff --git a/scripts/CitrineRocketHouse.asm b/scripts/CitrineRocketHouse.asm index f678e69b..8b517d63 100644 --- a/scripts/CitrineRocketHouse.asm +++ b/scripts/CitrineRocketHouse.asm @@ -67,8 +67,8 @@ JessieFight: ld [wIsTrainerBattle], a ld a, $5 ld [wCitrineRocketHouseCurScript], a - ld hl, JessieWinText - ld de, JessieLoseText + ld hl, JessieLoseText + ld de, JessieWinText call SaveEndBattleTextPointers jp TextScriptEnd jr .done @@ -92,7 +92,7 @@ JessieWinText: text_end JessieLoseText: - text_far _JessieWinText + text_far _JessieLoseText text_end JessieText2: diff --git a/text/CitrineRocketHouse.asm b/text/CitrineRocketHouse.asm index c455e4aa..fb8516b4 100644 --- a/text/CitrineRocketHouse.asm +++ b/text/CitrineRocketHouse.asm @@ -28,7 +28,7 @@ _JamesText:: done _MeowthText:: - text "Nyarth!" + text "MEOWTH: Nyarth!" done _JessieText1:: @@ -57,7 +57,8 @@ _JessieWinText:: _JessieLoseText:: text "Grr!" - line "JAMES, you lout!" + line "JAMES! You lout!" + prompt _JessieText2:: text "That's it! I'm" @@ -66,10 +67,10 @@ _JessieText2:: _JessieAfterBattleText:: text "Too chicken to" - line "fight? Then go" + line "battle? Then go" cont "away!" done - +; This mart text is unused because implementing custom mart text is hell. _MartGuyPrompt1:: text "Alright, tell you" line "what. I sell TMs,"