thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-10 13:11:36 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into mistress

Browse source
This commit is contained in:
Thorn Avery 2023-12-09 06:53:27 +11:00
parent 64e15c75ef 2b2c95e52b
commit 2eae6462eb
101 changed files with 516 additions and 410 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
3DS Border/KEPBorder.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

22
README.md
View file

@ -261,8 +261,6 @@ Comprehensive list can be found on Discord.
- Occasionally, menu text sets itself to scroll.
- The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1.
- Fake Tears and Nasty Plot don't quite look right when done from the opponent's side.
- Citrine Dock's warp doesn't work, meaning you have to leave Citrine using Fly
- LAST_MAP isn't updated properly when sailing from Vermilion to Citrine
- After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house.
- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle
@ -285,7 +283,7 @@ New Pokemon:
- Electabuzz -> Electivire | Use Thunder Stone
- Farfetch'd -> Luxwan | L24
- Gloom -> Bellossom | Use Leaf Stone
- Golbat -> Crobat | L44
- Golbat -> Crobat | L40
- Lickitung -> Lickilicky | L32
- Magmar -> Magmortar | Use Fire Stone
- Magneton -> Magnezone | Use Thunder Stone
@ -322,7 +320,7 @@ Kanto Prototype Pokemon:
- Psyduck -> Weirduck -> Golduck | L22, L33
- Raichu -> Gorochu | Trade
- Ribbito -> Croakozuna | L30
- Squeamata -> Ministare -> Iguanarch | L30, L50
- Squeamata -> Ministare -> Iguanarch | L30, L55
- Vulpiii -> Vulpix | L15
- Wartortle -> Totartle | L36, replaces Blastoise
@ -384,7 +382,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
* HeadBoiSkye - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin.
* ZumiIsawhat? - Restorations of prototype OST.
* FrenchOrange - Reconstructions of various overworld prototype sprites.
* Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png).
* Helix Chamber (RacieBeep & Orchid) - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png) and below.
* Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI and Pokedex stats page. Assisted in bug fixes. Used their sprite sheet generator.
* Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites and the Battle Tent.
* Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual.
@ -400,15 +398,19 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
* Dr. Lava - Translations of some content used in this hack, particularly the 1996 Pokedex book's entries for DYKG.
* Nob Ogasawara - Prototype Pokemon names, produced for DYKG.
Helix Chamber sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge, Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck
Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espeon (back), Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking (back), Slowking-G, Sylveon (back), Tangrowth, Tauros-P (all forms), Toedscool, Toedscruel, Umbreon (back), Weezing-G, Wiglett, Zapdos-G
Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking-G, Tangrowth, Toedscool, Toedscruel, Weezing-G, Wiglett, Zapdos-G
Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Sylveon (front, with help from Albatross)
Martha’s Against Humanity sprites: Bellignan (with help from PvK), Mimmeo, Sylveon (with help from Albatross)
Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio
Albatross’ sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P, Wugtrio
RacieBeep sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge (front/back), Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck, Fossil Aerodactyl, Fossil Kabutops, Ghost, Articuno (back), Meowth (back)
Official sprites: Crobat, Disturban, Espeon (edited by Martha’s Against Humanity), Slowking, Steelix, Tricules (edited by Martha’s Against Humanity), Umbreon (edited by Martha’s Against Humanity)
Orchid: Luxwan (back), Buu (back)
Zeta_Null: Porygon (front)
Official sprites: Crobat (front, edited by Martha’s Against Humanity), Disturban, Espeon (front, edited by Martha’s Against Humanity), Slowking (front), Steelix (front), Tricules, Umbreon (front, edited by Martha’s Against Humanity)
Original README.md proceeding;
# Pokémon Red and Blue [![Build Status][ci-badge]][ci]

1
constants/credits_constants.asm
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

2
constants/map_constants.asm
View file

@ -136,7 +136,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F
map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70
map_const LANCES_ROOM, 13, 13 ; $73
map_const FARAWAY_ISLAND_OUTSIDE, 15, 18 ; $74 - Was UNUSED_MAP_72
map_const FARAWAY_ISLAND_OUTSIDE, 15, 20 ; $74 - Was UNUSED_MAP_72
map_const FARAWAY_ISLAND_INSIDE, 15, 11 ; $75 - Was UNUSED_MAP_73
map_const POKEMON_MANSION_B2F, 15, 12 ; $76 - Was UNUSED_MAP_74
map_const MT_MOON_CRATER, 25, 25 ; $77 - Was UNUSED_MAP_75

2
crysaudio/cry_headers.asm
View file

@ -239,7 +239,7 @@ PokemonCries::
mon_cry CRY_GRIMER, 85, 129 ; SNORLAX
mon_cry CRY_PIDGEY, 250, 256 ; SCREAM_TAIL
mon_cry CRY_METAPOD, 31, 349 ; SANDY_SHOCKS
mon_cry CRY_BULBASAUR, 99, 192 ; SQUEAMATA
mon_cry CRY_BULBASAUR, 100, 320 ; SQUEAMATA
mon_cry CRY_BULBASAUR, 64, 320 ; MINISTARE
mon_cry CRY_BULBASAUR, 32, 320 ; IGUANARCH
mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI

2
data/credits/credits_order.asm
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

5
data/credits/credits_text.asm
View file

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

2
data/pokemon/base_stats/beedrill.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions
dw BeedrillPicFront, BeedrillPicBack
db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db FURY_ATTACK, POISON_STING, STRING_SHOT, HARDEN ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/bellossom.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/bellossom.pic", 0, 1 ; sprite dimensions
dw BellossomPicFront, BellossomPicBack
db ABSORB, STUN_SPORE, PETAL_DANCE, NO_MOVE ; level 1 learnset
db STUN_SPORE, SLEEP_POWDER, ABSORB, PETAL_DANCE ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/bittybat.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/bittybat.pic", 0, 1 ; sprite dimensions
dw BittybatPicFront, BittybatPicBack
db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/butterfree.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions
dw ButterfreePicFront, ButterfreePicBack
db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db CONFUSION, TACKLE, STRING_SHOT, HARDEN ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/carapthor.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/carapthor.pic", 0, 1 ; sprite dimensions
dw CarapthorPicFront, CarapthorPicBack
db COMET_PUNCH, UPPERCUT, NO_MOVE, NO_MOVE ; level 1 learnset
db UPPERCUT, LEECH_LIFE, STRING_SHOT, HARDEN ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/croakozuna.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/croakozuna.pic", 0, 1 ; sprite dimensions
dw CroakozunaPicFront, CroakozunaPicBack
db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, NO_MOVE ; level 1 learnset
db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, MEDITATE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/crobat.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/crobat.pic", 0, 1 ; sprite dimensions
dw CrobatPicFront, CrobatPicBack
db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/disturban.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/disturban.pic", 0, 1 ; sprite dimensions
dw DisturbanPicFront, DisturbanPicBack
db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset
db WITHDRAW, SUPERSONIC, CLAMP, BITE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/doduo.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions
dw DoduoPicFront, DoduoPicBack
db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/gaotora.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/gaotora.pic", 0, 1 ; sprite dimensions
dw GaotoraPicFront, GaotoraPicBack
db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/golbat.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions
dw GolbatPicFront, GolbatPicBack
db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset
db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/golduck.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions
dw GolduckPicFront, GolduckPicBack
db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset
db SCRATCH, TAIL_WHIP, AMNESIA, DISABLE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/gorotora.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/gorotora.pic", 0, 1 ; sprite dimensions
dw GorotoraPicFront, GorotoraPicBack
db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/guardia.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/guardia.pic", 0, 1 ; sprite dimensions
dw GuardiaPicFront, GuardiaPicBack
db BONE_CLUB, TAIL_WHIP, GROWL, HEADBUTT ; level 1 learnset
db BONE_CLUB, GROWL, LEER, TAIL_WHIP ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/hitmontop.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/hitmontop.pic", 0, 1 ; sprite dimensions
dw HitmontopPicFront, HitmontopPicBack
db ROLLING_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db ROLLING_KICK, FOCUS_ENERGY, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/iguanarch.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/iguanarch.pic", 0, 1 ; sprite dimensions
dw IguanarchPicFront, IguanarchPicBack
db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, TAIL_WHIP, LEER, BITE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/jabetta.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/jabetta.pic", 0, 1 ; sprite dimensions
dw JabettaPicFront, JabettaPicBack
db BUBBLE, PECK, NO_MOVE, NO_MOVE ; level 1 learnset
db BUBBLE, PECK, COUNTER, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/kingdra.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/kingdra.pic", 0, 1 ; sprite dimensions
dw KingdraPicFront, KingdraPicBack
db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
db BUBBLE, SMOKESCREEN, LEER, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/kotora.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/kotora.pic", 0, 1 ; sprite dimensions
dw KotoraPicFront, KotoraPicBack
db THUNDERSHOCK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db THUNDERSHOCK, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/lickilicky.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/lickilicky.pic", 0, 1 ; sprite dimensions
dw LickilickyPicFront, LickilickyPicBack
db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset
db WRAP, SUPERSONIC, STOMP, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/luxwan.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/luxwan.pic", 0, 1 ; sprite dimensions
dw LuxwanPicFront, LuxwanPicBack
db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
db PECK, SAND_ATTACK, LEER, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/magnetite.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/magnetite.pic", 0, 1 ; sprite dimensions
dw MagnetitePicFront, MagnetitePicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db TACKLE, THUNDERSHOCK, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/magneton.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions
dw MagnetonPicFront, MagnetonPicBack
db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset
db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/magnezone.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/magnezone.pic", 0, 1 ; sprite dimensions
dw MagnezonePicFront, MagnezonePicBack
db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset
db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/melmetal.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions
dw MelmetalPicFront, MelmetalPicBack
db THUNDERSHOCK, HARDEN, THUNDER_WAVE, TAIL_WHIP ; level 1 learnset
db THUNDERSHOCK, HARDEN, TAIL_WHIP, HEADBUTT ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/ministare.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/ministare.pic", 0, 1 ; sprite dimensions
dw MinistarePicFront, MinistarePicBack
db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, TAIL_WHIP, LEER, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/mrrime.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/mr.rime.pic", 0, 1 ; sprite dimensions
dw MrRimePicFront, MrRimePicBack
db CONFUSION, REFLECT, NO_MOVE, NO_MOVE ; level 1 learnset
db CONFUSION, BARRIER, REFLECT, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/nidoking.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions
dw NidokingPicFront, NidokingPicBack
db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset
db TACKLE, HORN_ATTACK, FOCUS_ENERGY, THRASH ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/nidoreign.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/nidoreign.pic", 0, 1 ; sprite dimensions
dw NidoreignPicFront, NidoreignPicBack
db TACKLE, SPIKE_CANNON, POISON_STING, THRASH ; level 1 learnset
db TACKLE, POISON_STING, DOUBLE_KICK, SPIKE_CANNON ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/omastar.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions
dw OmastarPicFront, OmastarPicBack
db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset
db WATER_GUN, WITHDRAW, ROCK_THROW, HORN_ATTACK ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/pendraken.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/pendraken.pic", 0, 1 ; sprite dimensions
dw PendrakenPicFront, PendrakenPicBack
db CONSTRICT, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
db CONSTRICT, SMOKESCREEN, BUBBLE, WRAP ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/perrserker.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions
dw PerrserkerPicFront, PerrserkerPicBack
db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/politoed.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/politoed.pic", 0, 1 ; sprite dimensions
dw PolitoedPicFront, PolitoedPicBack
db HYPNOSIS, WATER_GUN, DOUBLESLAP, NO_MOVE ; level 1 learnset
db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/ponyta.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions
dw PonytaPicFront, PonytaPicBack
db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/scizor.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions
dw ScizorPicFront, ScizorPicBack
db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db QUICK_ATTACK, IRON_HEAD, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/sharpoon.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/sharpoon.pic", 0, 1 ; sprite dimensions
dw SharpoonPicFront, SharpoonPicBack
db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
db BITE, LEER, WATER_GUN, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/tangrowth.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/tangrowth.pic", 0, 1 ; sprite dimensions
dw TangrowthPicFront, TangrowthPicBack
db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset
db CONSTRICT, BIND, ABSORB, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/tauros.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions
dw TaurosPicFront, TaurosPicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/taurosp.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/taurospcombat.pic", 0, 1 ; sprite dimensions
dw TaurosPPicFront, TaurosPPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/taurospa.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/taurospaqua.pic", 0, 1 ; sprite dimensions
dw TaurosPAPicFront, TaurosPAPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/taurospb.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/taurospblaze.pic", 0, 1 ; sprite dimensions
dw TaurosPBPicFront, TaurosPBPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/toedscruel.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/toedscruel.pic", 0, 1 ; sprite dimensions
dw ToedscruelPicFront, ToedscruelPicBack
db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db ABSORB, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/totartle.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/totartle.pic", 0, 1 ; sprite dimensions
dw TotartlePicFront, TotartlePicBack
db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset
db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/trampel.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/trampel.pic", 0, 1 ; sprite dimensions
dw TrampelPicFront, TrampelPicBack
db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db TACKLE, GROWL, HORN_ATTACK, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/wugtrio.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/wugtrio.pic", 0, 1 ; sprite dimensions
dw WugtrioPicFront, WugtrioPicBack
db WATER_GUN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db WATER_GUN, SAND_ATTACK, WRAP, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/zubat.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions
dw ZubatPicFront, ZubatPicBack
db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

10
data/pokemon/dex_text.asm
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

667
data/pokemon/evos_moves.asm
View file

File diff suppressed because it is too large Load diff

2
data/pokemon/palettes.asm
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

2
data/tilesets/collision_tile_ids.asm
View file

@ -75,7 +75,7 @@ Citrine_Coll::
coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
Celeste_Coll::
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
coll_tiles $20, $2e, $30, $37, $39, $40, $51, $53, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
RocketHouse_Coll::
coll_tiles $13, $31, $01, $53

4
data/tilesets/door_tile_ids.asm
View file

@ -15,7 +15,6 @@ DoorTileIDPointers:
dbw INTERIOR, .InteriorDoorTileIDs ; fixes weirdness in silph co.
dbw CITRINE, .CitrineDoorTileIDs
dbw CELESTE, .CelesteDoorTileIDs
dbw SEAGALLOPPORT, .SeagallopPortDoorTileIDs
db -1 ; end
MACRO door_tiles
@ -66,6 +65,3 @@ ENDM
.CelesteDoorTileIDs:
door_tiles $0C, $1C
.SeagallopPortDoorTileIDs:
door_tiles $0E, $1E

3
data/tilesets/pair_collision_tile_ids.asm
View file

@ -6,6 +6,9 @@
TilePairCollisionsLand::
db CAVERN, $20, $05
db CAVERN, $41, $05
db CELESTE, $30, $2E
db CELESTE, $18, $2E
db CELESTE, $5E, $2E
db FOREST, $30, $2E
db CAVERN, $2A, $05
db CAVERN, $05, $21

4
data/tilesets/warp_carpet_tile_ids.asm
View file

@ -12,10 +12,10 @@ MACRO warp_carpet_tiles
ENDM
.FacingDownWarpTiles:
warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33
warp_carpet_tiles $01, $0B, $12, $16, $23, $17, $3D, $04, $18, $33, $51, $52
.FacingUpWarpTiles:
warp_carpet_tiles $01, $5C
warp_carpet_tiles $01, $34, $36, $5C, $5F,
.FacingLeftWarpTiles:
warp_carpet_tiles $1A, $4B

2
data/tilesets/warp_tile_ids.asm
View file

@ -107,7 +107,7 @@ ENDM
warp_tiles $1B, $1C, $0B, $0C, $58, $59
.CelesteWarpTileIDs:
warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better
warp_tiles $5A, $5C
.RocketHouseWarpTileIDs:
warp_tiles

8
data/wild/maps/DiglettsCave.asm
View file

@ -8,8 +8,8 @@ DiglettsCaveWildMons:
db 16, DIGLETT
db 21, DIGLETT
db 22, DIGLETT
db 29, DUGTRIO
db 31, DUGTRIO
db 28, DUGTRIO
db 30, DUGTRIO
end_grass_wildmons
def_water_wildmons 5 ; encounter rate
@ -21,6 +21,6 @@ DiglettsCaveWildMons:
db 15, WIGLETT
db 21, WIGLETT
db 22, WIGLETT
db 29, WUGTRIO
db 31, WUGTRIO
db 28, WUGTRIO
db 30, WUGTRIO
end_water_wildmons

BIN
gfx/blocksets/celeste.bst
View file

Binary file not shown.

4
gfx/pics.asm
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"

BIN
gfx/pokemon/back/blisseyb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 553 B

After

Width:  |  Height:  |  Size: 627 B

BIN
gfx/pokemon/back/carapthorb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 732 B

After

Width:  |  Height:  |  Size: 611 B

BIN
gfx/pokemon/back/espeonb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 612 B

BIN
gfx/pokemon/back/glaceonb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 649 B

BIN
gfx/pokemon/back/hitmontopb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 495 B

BIN
gfx/pokemon/back/kleavorb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 638 B

BIN
gfx/pokemon/back/lickilickyb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 500 B

BIN
gfx/pokemon/back/magnezoneb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 517 B

After

Width:  |  Height:  |  Size: 560 B

BIN
gfx/pokemon/back/melmetalb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 478 B

BIN
gfx/pokemon/back/moltresgb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 625 B

BIN
gfx/pokemon/back/mr.rimeb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 635 B

BIN
gfx/pokemon/back/perrserkerb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 615 B

BIN
gfx/pokemon/back/pupalb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 528 B

After

Width:  |  Height:  |  Size: 431 B

BIN
gfx/pokemon/back/rhyperiorb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 621 B

BIN
gfx/pokemon/back/sandyshocksb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 657 B

BIN
gfx/pokemon/back/screamtailb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 650 B

BIN
gfx/pokemon/back/slowbrogb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 577 B

After

Width:  |  Height:  |  Size: 492 B

BIN
gfx/pokemon/back/taurospcombatb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 616 B

BIN
gfx/pokemon/back/toedscoolb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 532 B

After

Width:  |  Height:  |  Size: 566 B

BIN
gfx/pokemon/back/umbreonb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 526 B

After

Width:  |  Height:  |  Size: 591 B

BIN
gfx/pokemon/front/carapthor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 988 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
gfx/pokemon/front/porygon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
gfx/pokemon/front/rapidashg.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 959 B

After

Width:  |  Height:  |  Size: 970 B

BIN
gfx/pokemon/front/sirfetchd.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 921 B

BIN
gfx/tilesets/celeste.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
gfx/tilesets/ship_port.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

6
home/overworld.asm
View file

@ -773,6 +773,12 @@ ExtraWarpCheck::
jr z, .useFunction2
cp SHIP_PORT ; Vermilion Port tileset
jr z, .useFunction2
cp SEAGALLOPPORT ; Ferry Port tileset
jr z, .useFunction2
cp CITRINE ; Citrine tileset
jr z, .useFunction2
cp CELESTE ; Celeste/Faraway tileset
jr z, .useFunction2
cp PLATEAU ; Indigo Plateau tileset
jr z, .useFunction2
.useFunction1

2
maps/BrunswickGlade.blk
View file

@ -1,2 +1,2 @@
Xg;"Z7bbb
7 $g)g. 7779 g):7 )I( g,,_(gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY
7 $g)g. 7779 g):7 )I8 g_:gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY

2
maps/CelesteHill.blk
View file

@ -1 +1 @@
@ƒ…B@ƒ…B@ƒ…B@ƒ$.%…B@ƒ…B@ƒ…B@ƒaU_a…B@ƒiaai…B@ƒj<C692>jŠj<C5A0>ˆ…B@†<>s)†<>‡BDEFYDEF
@ƒ…B@ƒ…B@ƒ…B@ƒ$.%…B@ƒ…B@ƒ…B@ƒaU_a…B@ƒii…B@ƒjVV‰VVˆ…B@†<>‡)†<>‡BDEFYDEF

2
maps/CelesteHillOutside.blk
View file

@ -1 +1 @@
<EFBFBD>,<2C>X<02>,,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a(,.gea<65><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>n<12><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>jsU<10><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>g.ggg)agg<67><67><EFBFBD><EFBFBD><EFBFBD>c<EFBFBD><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>g.<2E><>s,(((g_<14>d<EFBFBD><64><EFBFBD><EFBFBD><EFBFBD>H9:g!)gggg%<12><>gg)g./<01><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><02><><EFBFBD><EFBFBD><EFBFBD>(((<28>AAAAB@C<><43>(<28><>EEE?B@B<02>dsggg@B@Bggggggg@B@Bggg@BD?>g<CFD?>g<=CFD?>g<ACFDFYDEF
<EFBFBD>2X0<02><><EFBFBD><EFBFBD><EFBFBD>s,a`geaW/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD>2s<>VVVVVj/ag<61><67><EFBFBD><EFBFBD>2WV<57><56>gg)aWj<57><6A><EFBFBD>c<EFBFBD>s/<><3E><><EFBFBD><EFBFBD>jV<6A><56><EFBFBD>/@AB<41>g<EFBFBD>DFg<>_DdF<64><46><EFBFBD>g<><67><EFBFBD><EFBFBD><EFBFBD>DFg%0<>gg<>AAA<41><41>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/sV,<02><>AAABsV/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sV<73><56>@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bggggggg@B@Bggg@BD?>g<CFD?>g<=CFD?>g<ACFDFYDEF

4
maps/FarawayIslandInside.blk
View file

@ -1 +1,3 @@
b ((((((((b bb(((b (  bb(b(( ((((( Y
H )ggg)gggg ) ggg)g. .M
g
g))ggggg.Y

2
maps/FarawayIslandOutside.blk
View file

@ -1 +1 @@
@B…B@B…B@B…B@BZ…B@BUZX…B@BZ_…BDFUU…B<E280A6>(„<><E2809E>‡F†€‚U„<>‡bCF-@C<>_…bAAB--@B<>_‡ACEF--@B<>„Ť‚„<>AB----@B†‡A<E280A1>…DFEF-l--@BDE?†‡CF----<=@ANA@CGF-----@DEFADFAB--k--@-DEEEEGF-----@-pYk--k-DE
@B…B@B…B@B…B@Bn…B@B(nX…B@B'n((*…BDF*(((…B<E280A6>+„<><E2809E>‡F†€‚*+„<>‡bCF-@C<>''…bAAB--@B<>‡ACEF--@B<>„€‚„<>AB----@B†‡A<E280A1>…DFEF-l--@BDE?†‡CF----<=@ANA@CGF-----@DEFADFAB-----@-DEEEEGF-l---@--pŹŹŹŹk---l-DE--pŽmmm-----------Ž------k----

30
scripts/HallOfFame.asm
View file

@ -210,6 +210,36 @@ ResetLegendaryPokemon:
ld a, HS_MEWTWO
call ShowThis
.skipGalarianBirdsAndMewtwo
; trade flags are in groups based on the
; ordering in data/events/trades.asm
; the numbering follows LSB -> MSB
; (ie, trades 8 and 9 are the rightmost two bits)
; trades 0-7
; ld b, %11111111
; ld a, [wCompletedInGameTradeFlags]
; and b
; ld [wCompletedInGameTradeFlags], a
; trades 8-15
ld b, %00000011
ld a, [wCompletedInGameTradeFlags+1]
and b
ld [wCompletedInGameTradeFlags+1], a
; trades 16-23
ld b, %00000000
ld a, [wCompletedInGameTradeFlags+2]
and b
ld [wCompletedInGameTradeFlags+2], a
; trades 24-31
ld b, %00000000
ld a, [wCompletedInGameTradeFlags+3]
and b
ld [wCompletedInGameTradeFlags+3], a
; We set this last to save on processing earlier in the script.
SetEvent EVENT_POST_GAME_ATTAINED
ret

13
text/AgathasRoom.asm
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

12
text/BrunosRoom.asm
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!"

13
text/LancesRoom.asm
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?"

Some files were not shown because too many files have changed in this diff Show more