diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index a5e2c584..334908e3 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -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 diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index 1ef3f2f1..1008c0ed 100644 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm @@ -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 diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index d6d469be..f6377817 100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -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@" diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 31f3a472..33adab56 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -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 diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 3ecfa64b..5dd0f70d 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -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 diff --git a/gfx/pics.asm b/gfx/pics.asm index 4b65398c..d3759d0b 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -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" diff --git a/gfx/pokemon/back/blisseyb.png b/gfx/pokemon/back/blisseyb.png index 6f63aa52..b3661ab8 100644 Binary files a/gfx/pokemon/back/blisseyb.png and b/gfx/pokemon/back/blisseyb.png differ diff --git a/gfx/pokemon/back/carapthorb.png b/gfx/pokemon/back/carapthorb.png index 96b4d1eb..b29d5ef2 100644 Binary files a/gfx/pokemon/back/carapthorb.png and b/gfx/pokemon/back/carapthorb.png differ diff --git a/gfx/pokemon/back/espeonb.png b/gfx/pokemon/back/espeonb.png index 76879c0c..d9a75fcc 100644 Binary files a/gfx/pokemon/back/espeonb.png and b/gfx/pokemon/back/espeonb.png differ diff --git a/gfx/pokemon/back/glaceonb.png b/gfx/pokemon/back/glaceonb.png index 9ad0b6c1..61787efa 100644 Binary files a/gfx/pokemon/back/glaceonb.png and b/gfx/pokemon/back/glaceonb.png differ diff --git a/gfx/pokemon/back/hitmontopb.png b/gfx/pokemon/back/hitmontopb.png index 9bf21a7b..a1d9b1fc 100644 Binary files a/gfx/pokemon/back/hitmontopb.png and b/gfx/pokemon/back/hitmontopb.png differ diff --git a/gfx/pokemon/back/kleavorb.png b/gfx/pokemon/back/kleavorb.png index 2d2a5ad8..249de7fb 100644 Binary files a/gfx/pokemon/back/kleavorb.png and b/gfx/pokemon/back/kleavorb.png differ diff --git a/gfx/pokemon/back/lickilickyb.png b/gfx/pokemon/back/lickilickyb.png index 09aad09a..f4ce0da4 100644 Binary files a/gfx/pokemon/back/lickilickyb.png and b/gfx/pokemon/back/lickilickyb.png differ diff --git a/gfx/pokemon/back/magnezoneb.png b/gfx/pokemon/back/magnezoneb.png index 5d4868ed..43c14135 100644 Binary files a/gfx/pokemon/back/magnezoneb.png and b/gfx/pokemon/back/magnezoneb.png differ diff --git a/gfx/pokemon/back/melmetalb.png b/gfx/pokemon/back/melmetalb.png index 65b26c79..748814eb 100644 Binary files a/gfx/pokemon/back/melmetalb.png and b/gfx/pokemon/back/melmetalb.png differ diff --git a/gfx/pokemon/back/moltresgb.png b/gfx/pokemon/back/moltresgb.png index 54b9663b..1230abdf 100644 Binary files a/gfx/pokemon/back/moltresgb.png and b/gfx/pokemon/back/moltresgb.png differ diff --git a/gfx/pokemon/back/mr.rimeb.png b/gfx/pokemon/back/mr.rimeb.png index cf863f49..df686629 100644 Binary files a/gfx/pokemon/back/mr.rimeb.png and b/gfx/pokemon/back/mr.rimeb.png differ diff --git a/gfx/pokemon/back/perrserkerb.png b/gfx/pokemon/back/perrserkerb.png index 88a3540c..cad15ef2 100644 Binary files a/gfx/pokemon/back/perrserkerb.png and b/gfx/pokemon/back/perrserkerb.png differ diff --git a/gfx/pokemon/back/pupalb.png b/gfx/pokemon/back/pupalb.png index 1c8d830f..d41dd004 100644 Binary files a/gfx/pokemon/back/pupalb.png and b/gfx/pokemon/back/pupalb.png differ diff --git a/gfx/pokemon/back/rhyperiorb.png b/gfx/pokemon/back/rhyperiorb.png index 8b4f49c7..07edf19e 100644 Binary files a/gfx/pokemon/back/rhyperiorb.png and b/gfx/pokemon/back/rhyperiorb.png differ diff --git a/gfx/pokemon/back/sandyshocksb.png b/gfx/pokemon/back/sandyshocksb.png index 2b776bba..fc4bb6bc 100644 Binary files a/gfx/pokemon/back/sandyshocksb.png and b/gfx/pokemon/back/sandyshocksb.png differ diff --git a/gfx/pokemon/back/screamtailb.png b/gfx/pokemon/back/screamtailb.png index f8d0426e..823c1504 100644 Binary files a/gfx/pokemon/back/screamtailb.png and b/gfx/pokemon/back/screamtailb.png differ diff --git a/gfx/pokemon/back/slowbrogb.png b/gfx/pokemon/back/slowbrogb.png index a34ca4e3..776e0372 100644 Binary files a/gfx/pokemon/back/slowbrogb.png and b/gfx/pokemon/back/slowbrogb.png differ diff --git a/gfx/pokemon/back/taurospcombatb.png b/gfx/pokemon/back/taurospcombatb.png index 782fca20..c4f66f7e 100644 Binary files a/gfx/pokemon/back/taurospcombatb.png and b/gfx/pokemon/back/taurospcombatb.png differ diff --git a/gfx/pokemon/back/toedscoolb.png b/gfx/pokemon/back/toedscoolb.png index dc282006..29a5f6f2 100644 Binary files a/gfx/pokemon/back/toedscoolb.png and b/gfx/pokemon/back/toedscoolb.png differ diff --git a/gfx/pokemon/back/umbreonb.png b/gfx/pokemon/back/umbreonb.png index 693dba94..31ab72df 100644 Binary files a/gfx/pokemon/back/umbreonb.png and b/gfx/pokemon/back/umbreonb.png differ diff --git a/gfx/pokemon/front/carapthor.png b/gfx/pokemon/front/carapthor.png index b773f773..c69a5a22 100644 Binary files a/gfx/pokemon/front/carapthor.png and b/gfx/pokemon/front/carapthor.png differ diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index 68ec471b..ff5aa173 100644 Binary files a/gfx/pokemon/front/porygon.png and b/gfx/pokemon/front/porygon.png differ diff --git a/gfx/pokemon/front/rapidashg.png b/gfx/pokemon/front/rapidashg.png index 6abaf335..e345a154 100644 Binary files a/gfx/pokemon/front/rapidashg.png and b/gfx/pokemon/front/rapidashg.png differ diff --git a/gfx/pokemon/front/sirfetchd.png b/gfx/pokemon/front/sirfetchd.png index e08bf848..d4ab5b73 100644 Binary files a/gfx/pokemon/front/sirfetchd.png and b/gfx/pokemon/front/sirfetchd.png differ diff --git a/text/AgathasRoom.asm b/text/AgathasRoom.asm index 8177348b..ebb41fe3 100644 --- a/text/AgathasRoom.asm +++ b/text/AgathasRoom.asm @@ -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 "." - 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 diff --git a/text/BrunosRoom.asm b/text/BrunosRoom.asm index 874ff723..e3e810a3 100644 --- a/text/BrunosRoom.asm +++ b/text/BrunosRoom.asm @@ -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!" diff --git a/text/LancesRoom.asm b/text/LancesRoom.asm index 079d68b4..aa17ad6e 100644 --- a/text/LancesRoom.asm +++ b/text/LancesRoom.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you !" + line "you, !" 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 "." + para "Now, ." para "You know what's" line "next, don't you?" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index 4ee81c68..868cb7f3 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -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!"