diff --git a/3DS Border/3DSVCBorderForGBandGBC.png b/3DS Border/3DSVCBorderForGBandGBC.png new file mode 100644 index 00000000..368fdeab Binary files /dev/null and b/3DS Border/3DSVCBorderForGBandGBC.png differ diff --git a/3DS Border/READ THIS.md b/3DS Border/READ THIS.md new file mode 100644 index 00000000..9e6fbec0 --- /dev/null +++ b/3DS Border/READ THIS.md @@ -0,0 +1,11 @@ +# Information +The border you see in this folder is for use with Nintendo Super Ultimate Injector for 3DS. + +Borders must be 400x240 in dimensions, with a transparent bounding rectangle of 161x145 centred in the middle for the screen. + +Download the software [here](https://www.gamebrew.org/wiki/New_Super_Ultimate_Injector_3DS). + +# Credits +* Shawesome (Initial suggestion) +* Gecko557 (Information & [Template](https://cdn.discordapp.com/attachments/1014321591657709569/1147616605166108744/3DSVCBorderForGBandGBC.png)) +* Plague von Karma (KEP OG Dimensions Border) diff --git a/3DS Border/border_400x240.png b/3DS Border/border_400x240.png new file mode 100644 index 00000000..6503a3d6 Binary files /dev/null and b/3DS Border/border_400x240.png differ diff --git a/README.md b/README.md index 7e4e41a7..3945f390 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ QoL Enhancements - PureRGB's AI enhancements are ported over; said hack was made by Vortiene. In general, it isn't as stupid as it was before. - Bag capacity is increased from 20 to 30 items. - Pokemon Box capacity is now 280 Pokemon with 14 boxes. -- Exp. All now works like the modern Exp. Share, giving all party members max exp. It also only has one message, though it does still take time to calculate all the exp being thrown around. It'll take around 3 seconds to calculate, sort of like saving. +- Exp. All now works like the modern Exp. Share, giving all party members max exp. It also only has one message, though it does still take time to calculate all the exp being thrown around. It'll take around 3 seconds to calculate, sort of like saving. Oh, and it's a Key Item now, so you can't sell it by accident. - New Pokedex entries for most Pokemon are available, sourced from the original 1996 Pokedex book by Creatures Inc., restoring a ton of old Kanto lore. Thanks to [Dr. Lava and Nob Ogasawara](http://lavacutcontent.com/1996-creatures-pokedex-translation-1/) for their incredible work translating and writing about it! - Pikachu and Eevee are now starters, featuring fully functional Rival lineups. If you pick Pikachu, he picks Eevee, and if you pick Eevee, he picks Pikachu! Their growth rates have been changed to Medium Slow to give them the early-game power spike the other starters have. - Item Descriptions are available! @@ -383,16 +383,16 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * 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). * Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI. 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. -* jojobear13 & Mateo - DV/StatExp display, move deleter, & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of. +* jojobear13 & Mateo - DV/StatExp display, move deleter, & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of. Thanks specifically to Mateo's Red++ for the ferry system! * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual. * BGVC - Composed the original 4-channel version of the unused Koukan (trading) music. * SatoMew - Technical advice. * wrulfy - Technical advice. * suloku - Technical advice regarding setting where you spawn after beating the Elite Four, Exp. All modernisation code -* Molk - Balancing of some beta Pokemon, most notably Deer. -* Shellnuts - Balancing of some beta Pokemon, especially Omega; made the type chart suggestions to balance Galarian Moltres properly. * 大吟醸 (Daiginjo) - Assistance in translating the Tamamushi University Student Book, allowing for an accurate adaptation of the location. -* ViWalls - Extremely early adopter of the hack who repeatedly reported bugs and gave general opinions. +* Molk - Balancing of some beta Pokemon, most notably Ramoose. +* Shellnuts - Balancing of some beta Pokemon, especially Omegadge. Made the SW97 type chart suggestion to balance Galarian Moltres; this would go on to define the mod's identity. +* ViWalls - Extremely early adopter of the hack who reported numerous bugs and gave many useful suggestions as a prime member of our target audience. Original README.md proceeding; # Pokémon Red and Blue [![Build Status][ci-badge]][ci] diff --git a/data/items/key_items.asm b/data/items/key_items.asm index af2ec098..361b9131 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -74,7 +74,7 @@ KeyItemFlags: dbit TRUE ; SILPH_SCOPE dbit TRUE ; POKE_FLUTE dbit TRUE ; LIFT_KEY - dbit FALSE ; EXP_ALL + dbit TRUE ; EXP_ALL - Did you know this wasn't a key item originally? Yeesh, what if someone sold or tossed it?? dbit TRUE ; was TRUE for OLD_ROD, now CANDY_JAR dbit FALSE ; was GOOD_ROD & TRUE, now BOTTLE_CAP dbit TRUE ; SUPER_ROD diff --git a/data/items/prices.asm b/data/items/prices.asm index 6ec46daa..115682c7 100644 --- a/data/items/prices.asm +++ b/data/items/prices.asm @@ -78,11 +78,11 @@ ItemPrices:: bcd3 0 ; was OLD_ROD, now CANDY_SACK. Plan to be one-of-a-kind, so 0 to discourage sale a la Master Ball. bcd3 9800 ; was GOOD_ROD, now BOTTLE_CAP. Sells for 5000 in SV, but making it in-line with the Stat Exp items feels right. bcd3 0 ; SUPER_ROD - bcd3 0 ; PP_UP + bcd3 3000 ; PP_UP bcd3 0 ; ETHER bcd3 0 ; MAX_ETHER bcd3 0 ; ELIXER - bcd3 0 ; MAX_ELIXER + bcd3 3000 ; MAX_ELIXER bcd3 2100 ; ICE_STONE bcd3 3000 ; PROTECTOR bcd3 2100 ; POISON_STONE diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index e5fa6329..cd5e75ca 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -338,7 +338,7 @@ _MagnetiteDexEntry:: ; unused next "levitating" dex -_NidoreignDexEntry:: +_NidoreignDexEntry:: ; Consider revising. Could expand on why the Nidos are associated with the Moon Stone at all. They're based on the Moon Rabbit of East Asian mythology. text "Exposure to a" next "MOON STONE caused" next "its evolution. It" diff --git a/scripts/CitrineMart.asm b/scripts/CitrineMart.asm index 45a45573..6f7823b8 100644 --- a/scripts/CitrineMart.asm +++ b/scripts/CitrineMart.asm @@ -28,4 +28,4 @@ CitrineMartText4: jp TextScriptEnd CitrineCashierText:: - script_mart ULTRA_BALL, FULL_RESTORE, MAX_REPEL, MAX_REVIVE, ESCAPE_ROPE, HP_UP, PROTEIN, IRON, CARBOS, CALCIUM \ No newline at end of file + script_mart ULTRA_BALL, FULL_RESTORE, MAX_REPEL, MAX_REVIVE, MAX_ELIXER, ESCAPE_ROPE, HP_UP, PP_UP, PROTEIN, IRON, CARBOS, CALCIUM \ No newline at end of file