Sprites? No, I prefer 7-Up

Added updated sprites for:

- Front: Sirfetch'd, Galarian Rapidash, Porygon, Carapthor

- Back: Blissey, Carapthor, Espeon, Glaceon, Hitmontop, Kleavor, Lickilicky, Magnezone, Melmetal, Galarian Moltres, Mr. Rime, Perrserker, Pupal, Rhyperior, Sandy Shocks, Scream Tail, Galarian Slowbro, Paldean Tauros Combat Breed, Toedscool, and Umbreon

(also some minor text fixes, notably adding Dr. Lava to the credits)

Thanks Albatross for being a total legend :3
This commit is contained in:
Martha Schilling 2023-12-05 17:15:12 +00:00
parent c5c521e48c
commit 5e675af15d
34 changed files with 32 additions and 36 deletions

View file

@ -94,6 +94,7 @@
const CRED_ENI
const CRED_VORT
const CRED_PRET
const CRED_DR_LAVA
DEF NUM_CRED_STRINGS EQU const_value
const_def -1, -1

View file

@ -45,6 +45,6 @@ CreditsOrder:
db CRED_KEP_THANKS, CRED_FRRF, CRED_MISTY, CRED_THORNAVERY, CRED_TEXT_FADE
db CRED_KEP_THANKS, CRED_PRET, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE
db CRED_KEP_THANKS, CRED_SKYE, CRED_BLUEZANGOOSE, CRED_CHATOT, CRED_TEXT_FADE
db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON
db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_DR_LAVA, CRED_TEXT_FADE_MON
db CRED_COPYRIGHT, CRED_TEXT_FADE_MON
db CRED_THE_END

View file

@ -95,6 +95,7 @@ CreditsTextPointers:
dw CredEni
dw CredVort
dw CredPret
dw CredDrLava
assert_table_length NUM_CRED_STRINGS
CredVersion:
@ -285,3 +286,5 @@ CredVort:
db -3, "VORTIENE@"
CredPret:
db -4, "PRET ET AL@"
CredDrLava:
db -3, "DR.LAVA@"

View file

@ -890,13 +890,13 @@ _ZubatDexEntry:: ; new entry
dex
_EkansDexEntry:: ; new entry
text "It flicks its"
text "EKANS flicks its"
next "tongue to check"
next "for danger. If"
next "for danger. If it"
page "it eats RATTATA,"
next "it can go without"
next "food for a month"
page "eats a RATTATA, it"
next "won't need to eat"
next "again for a month"
dex
_ParasDexEntry:: ; new entry

View file

@ -115,7 +115,7 @@ MonsterPalettes:
db PAL_REDMON ; ARCANINE_H
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; LUXWAN
db PAL_BROWNMON ; SIRFETCHD
db PAL_GREENMON ; SIRFETCHD
db PAL_YELLOWMON ; DROWZEE
db PAL_YELLOWMON ; HYPNO
db PAL_GREYMON ; MAGNEMITE

View file

@ -468,8 +468,6 @@ MoltresGPicFront:: INCBIN "gfx/pokemon/front/moltresg.pic"
MoltresGPicBack:: INCBIN "gfx/pokemon/back/moltresgb.pic"
PerrserkerPicFront:: INCBIN "gfx/pokemon/front/perrserker.pic"
PerrserkerPicBack:: INCBIN "gfx/pokemon/back/perrserkerb.pic"
SirfetchdPicFront:: INCBIN "gfx/pokemon/front/sirfetchd.pic"
SirfetchdPicBack:: INCBIN "gfx/pokemon/back/sirfetchdb.pic"
MrRimePicFront:: INCBIN "gfx/pokemon/front/mr.rime.pic"
MrRimePicBack:: INCBIN "gfx/pokemon/back/mr.rimeb.pic"
@ -584,6 +582,8 @@ MagnetitePicFront:: INCBIN "gfx/pokemon/front/magnetite.pic"
MagnetitePicBack:: INCBIN "gfx/pokemon/back/magnetiteb.pic"
BittybatPicFront:: INCBIN "gfx/pokemon/front/bittybat.pic"
BittybatPicBack:: INCBIN "gfx/pokemon/back/bittybatb.pic"
SirfetchdPicFront:: INCBIN "gfx/pokemon/front/sirfetchd.pic"
SirfetchdPicBack:: INCBIN "gfx/pokemon/back/sirfetchdb.pic"
LancePic:: INCBIN "gfx/trainers/lance.pic"
YujirouPic:: INCBIN "gfx/trainers/yujirou.pic"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 732 B

After

Width:  |  Height:  |  Size: 611 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 495 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 500 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 517 B

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 577 B

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

After

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 526 B

After

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 988 B

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 959 B

After

Width:  |  Height:  |  Size: 970 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 921 B

View file

@ -47,9 +47,8 @@ _AgathaRematchText::
text "So you've come!"
para "It's not in my"
line "character to"
cont "lose over and"
cont "over."
line "character to lose"
cont "over and over."
para "Give this battle"
line "everything you"
@ -73,10 +72,8 @@ _AgathaRematchAfterBattleText::
para "Just like you and"
line "<RIVAL>."
para "What are you"
line "waiting for?"
para "Off to the next"
line "room!"
para "So, what are you"
line "waiting for? Off"
cont "to the next room!"
done

View file

@ -44,14 +44,12 @@ _BrunoRematchText::
cont "from here!"
para "Now it's time to"
line "show you the"
cont "power of my"
cont "#MON!"
line "show you the true"
cont "power of my team!"
para "They've been"
line "training just"
cont "as hard as"
cont "yours, surely!"
para "We have trained"
line "just as hard as"
cont "you have, surely!"
para "Hoo hah!"

View file

@ -1,6 +1,6 @@
_LanceBeforeBattleText::
text "Ah! I heard about"
line "you <PLAYER>!"
line "you, <PLAYER>!"
para "I lead the ELITE"
line "FOUR! You can"
@ -65,10 +65,8 @@ _LanceAfterBattleText::
_LanceRematchText::
text "I'm glad you've"
line "come."
para "Thanks to you,"
line "the #MON"
line "come. Thanks to"
cont "you, the #MON"
cont "LEAGUE's rep has"
cont "really taken off!"
@ -91,12 +89,11 @@ _LanceRematchAfterBattleText::
line "dragon brigade is"
cont "weak..."
para "Hm? I'm saying"
para "I'm saying that"
line "your strength is"
cont "truly incredible!"
para "Now then..."
line "<PLAYER>."
para "Now, <PLAYER>."
para "You know what's"
line "next, don't you?"

View file

@ -41,11 +41,11 @@ _LoreleiRematchText::
text "Welcome to the"
line "#MON LEAGUE!"
para "Hey, fantastic"
line "timing! I was"
cont "just thinking"
para "Fantastic timing!"
line "I was thinking"
cont "how I'd like to"
cont "battle you."
cont "battle you just"
cont "now."
para "I hope you're"
line "ready!"