From 953e8e295fd4330943398c12197a70e6bf3887fa Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Wed, 20 Sep 2023 08:17:34 +0100 Subject: [PATCH] Post-stream bits and bobs - Reused the double doors for the Route 2 gate, and added the warp for it - Changed the Route 2 map to have the ledge on the path this irritated the fucking LIFE out of me - Pokemon Tower takes you to the right place when going down. - Kotora line now has Flash - Refactored Gentlarva - Route 2 gate now uses the double doors. - New hidden Moon Stone where the Clefairy are in Mt. Moon - Added a new Paradox Pokemon-themed border by Gecko557 - Shifted a ledge in Cerulean City that was off-centre in a really jarring way - Added the Nugget glitch from FRLG because it's funny and cool --- 3DS Border/KEPBorder.png | Bin 0 -> 11860 bytes 3DS Border/READ THIS.md | 2 +- README.md | 3 ++- constants/pokedex_constants.asm | 2 +- constants/pokemon_constants.asm | 2 +- crysaudio/cry_headers.asm | 2 +- data/events/hidden_item_coords.asm | 1 + data/events/hidden_objects.asm | 6 ++++++ data/maps/objects/PokemonTower6F.asm | 2 +- data/maps/objects/Route2.asm | 3 ++- data/maps/objects/Route2Gate.asm | 2 +- data/pokemon/base_stats.asm | 2 +- data/pokemon/base_stats/gaotora.asm | 2 +- data/pokemon/base_stats/gorotora.asm | 2 +- data/pokemon/base_stats/kokana.asm | 8 ++++---- data/pokemon/base_stats/kotora.asm | 2 +- data/pokemon/dex_entries.asm | 6 +++--- data/pokemon/dex_order.asm | 2 +- data/pokemon/dex_text.asm | 2 +- data/pokemon/evos_moves.asm | 4 ++-- data/pokemon/menu_icons.asm | 2 +- data/pokemon/names.asm | 4 ++-- data/pokemon/new_dex_text.asm | 2 +- data/pokemon/palettes.asm | 2 +- data/pokemon/tradeback_moves.asm | 4 ++-- data/trainers/parties.asm | 6 +++--- data/wild/maps/ViridianForest.asm | 2 +- gfx/gallery_generator.cmd | 2 +- gfx/pics.asm | 4 ++-- maps/CeruleanCity.blk | 2 +- maps/Route2.blk | 2 +- maps/Route2Gate.blk | Bin 20 -> 20 bytes scripts/Route24.asm | 7 ++++--- 33 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 3DS Border/KEPBorder.png diff --git a/3DS Border/KEPBorder.png b/3DS Border/KEPBorder.png new file mode 100644 index 0000000000000000000000000000000000000000..890885b0b46956cb505d0e5c54aea83b70c7983a GIT binary patch literal 11860 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 literal 0 HcmV?d00001 diff --git a/3DS Border/READ THIS.md b/3DS Border/READ THIS.md index 2c8888e1..d9f15429 100644 --- a/3DS Border/READ THIS.md +++ b/3DS Border/READ THIS.md @@ -7,6 +7,6 @@ Download the software [here](https://www.gamebrew.org/wiki/New_Super_Ultimate_In # Credits * Shawesome (Initial suggestion) -* Gecko557 (Information & [Template](https://cdn.discordapp.com/attachments/1014321591657709569/1147616605166108744/3DSVCBorderForGBandGBC.png)) +* Gecko557 (Information, Paradox Pokemon Border, & [Template](https://cdn.discordapp.com/attachments/1014321591657709569/1147616605166108744/3DSVCBorderForGBandGBC.png)) * Plague von Karma (KEP OG Dimensions Border) * Mephistopheles (Prototype RG Expanded Border) diff --git a/README.md b/README.md index 3945f390..1ce3f56b 100644 --- a/README.md +++ b/README.md @@ -217,6 +217,7 @@ QoL Enhancements Bug Fixes ==== Many non-multiplayer, non-battle related bugs have been fixed. Battle-related bugs have been preserved for the sake of the RBY battle experience. Bugs that are fixed are ones that objectively hurt the gameplay experience, so glitches like the Mew Glitch, which arguably add to the gameplay, are preserved. Much of the fixes made here can be attributed to [the tutorials](https://github.com/pret/pokered/wiki/Bugs-and-Glitches) made by the good people at pret. +- Added the Infinite Nugget glitch from FireRed/LeafGreen. Why? It's funny, I dunno. - Fixed various translation errors/retcons (eg. Route 14 Birdkeeper's "birds of prey" line, Koji and Atsuko in Fuschia.) - More accurate translations from FRLG/LGPE (eg. Bill not being a PokeManiac, but a "Pokemon fanatic" from LGPE) have been ported. - Some grammar tweaks have been made (eg. If a move is disabled, it now has an upper-case D instead of a lower-case one.) @@ -313,7 +314,7 @@ Kanto Beta Pokemon: - Coinpur -> Meowth | L14 - Decilla -> Gawarhed | L40 - Gyopin -> Goldeen | L16 -- Kokana -> Pupal | L7 +- Gentlarva -> Pupal | L7 - Pupal -> Carapthor | L10 - Kotora -> Gaotora -> Gorotora | L16, L36 - Kolta -> Ponyta | L20 diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index e440e35d..d7dc9399 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -43,7 +43,7 @@ const DEX_WEEDLE ; 13 (037) const DEX_KAKUNA ; 14 (038) const DEX_BEEDRILL ; 15 (039) - const DEX_KOKANA ; (040) + const DEX_GENTLARVA ; (040) const DEX_PUPAL ; (041) const DEX_CARAPTHOR ; (042) const DEX_KOTORA ; (043) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 2e083e2b..bbbc7c44 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -221,7 +221,7 @@ const ELECTIVIRE ; $D4 const MAGMORTAR ; $D5 const DISTURBAN ; $D6 - const KOKANA ; $D7 + const GENTLARVA ; $D7 const PUPAL ; $D8 const CARAPTHOR ; $D9 const MAGNEZONE ; $DA diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index 5fa40ca5..78be39e5 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -44,7 +44,7 @@ PokemonCries:: mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL - mon_cry CRY_NIDORAN_M, 0, 0 ; KOKANA (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; GENTLARVA (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete) mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index e0472dfe..d9bc77ea 100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -63,4 +63,5 @@ HiddenItemCoords: hidden_item MT_MOON_CRATER, 20, 17 ; Black Augurite hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber hidden_item DAYCARE, 4, 1 ; Daycare PC + hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index 4ab1fc4d..bc6fdb26 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -89,6 +89,7 @@ HiddenObjectMaps: db VERMILION_DOCK db MT_MOON_CRATER db DAYCARE + db MT_MOON_SQUARE db -1 ; end HiddenObjectPointers: @@ -183,6 +184,7 @@ HiddenObjectPointers: dw VermilionDockHiddenObjects dw MtMoonCraterHiddenObjects dw DaycareHiddenItems + dw MtMoonSquareHiddenItems MACRO hidden_object db \2 ; y coord @@ -661,3 +663,7 @@ MtMoonCraterHiddenObjects: DaycareHiddenItems: hidden_object 4, 1, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 + +MtMoonSquareHiddenItems: + hidden_object 5, 5, MOON_STONE, HiddenItems + db -1 diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index d3b9d105..073413fb 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -2,7 +2,7 @@ PokemonTower6F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_2F, 2 + warp_event 3, 9, POKEMON_TOWER_2F, 1 warp_event 9, 16, POKEMON_TOWER_7F, 1 def_bg_events diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 6ff5c0c7..5eccd0d0 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -5,9 +5,10 @@ Route2_Object: warp_event 12, 9, DIGLETTS_CAVE_ROUTE_2, 1 warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 2 warp_event 15, 19, ROUTE_2_TRADE_HOUSE, 1 - warp_event 16, 35, ROUTE_2_GATE, 2 + warp_event 17, 35, ROUTE_2_GATE, 2 warp_event 15, 39, ROUTE_2_GATE, 3 warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3 + warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 1 def_bg_events bg_event 5, 65, 3 ; Route2Text3 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index 02205d00..4a6ca9b3 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -2,7 +2,7 @@ Route2Gate_Object: db $a ; border block def_warp_events - warp_event 4, 0, LAST_MAP, 4 + warp_event 4, 0, LAST_MAP, 7 warp_event 5, 0, LAST_MAP, 4 warp_event 4, 7, LAST_MAP, 5 warp_event 5, 7, LAST_MAP, 5 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index f129444f..56edcab1 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -39,7 +39,7 @@ INCLUDE "data/pokemon/base_stats/butterfree.asm" INCLUDE "data/pokemon/base_stats/weedle.asm" INCLUDE "data/pokemon/base_stats/kakuna.asm" INCLUDE "data/pokemon/base_stats/beedrill.asm" -INCLUDE "data/pokemon/base_stats/kokana.asm" +INCLUDE "data/pokemon/base_stats/kokana.asm" ; Gentlarva INCLUDE "data/pokemon/base_stats/pupal.asm" INCLUDE "data/pokemon/base_stats/carapthor.asm" INCLUDE "data/pokemon/base_stats/kotora.asm" diff --git a/data/pokemon/base_stats/gaotora.asm b/data/pokemon/base_stats/gaotora.asm index 260e60af..689dab60 100644 --- a/data/pokemon/base_stats/gaotora.asm +++ b/data/pokemon/base_stats/gaotora.asm @@ -16,7 +16,7 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, FLASH ; end db BANK(GaotoraPicFront) diff --git a/data/pokemon/base_stats/gorotora.asm b/data/pokemon/base_stats/gorotora.asm index bd4d0247..fb24cc29 100644 --- a/data/pokemon/base_stats/gorotora.asm +++ b/data/pokemon/base_stats/gorotora.asm @@ -17,7 +17,7 @@ tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ - REST, THUNDER_WAVE, SUBSTITUTE + REST, THUNDER_WAVE, SUBSTITUTE, FLASH ; end db BANK(GorotoraPicFront) diff --git a/data/pokemon/base_stats/kokana.asm b/data/pokemon/base_stats/kokana.asm index d6f3c65a..ebb2059d 100644 --- a/data/pokemon/base_stats/kokana.asm +++ b/data/pokemon/base_stats/kokana.asm @@ -1,4 +1,4 @@ - db DEX_KOKANA ; pokedex id + db DEX_GENTLARVA ; pokedex id db 40, 35, 30, 45, 25 ; hp atk def spd spc @@ -8,7 +8,7 @@ db 54 ; base exp INCBIN "gfx/pokemon/front/kokana.pic", 0, 1 ; sprite dimensions - dw KokanaPicFront, KokanaPicBack + dw GentlarvaPicFront, GentlarvaPicBack db LEECH_LIFE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate @@ -17,5 +17,5 @@ tmhm ; end - db BANK(KokanaPicFront) - assert BANK(KokanaPicFront) == BANK(KokanaPicBack) + db BANK(GentlarvaPicFront) + assert BANK(GentlarvaPicFront) == BANK(GentlarvaPicBack) diff --git a/data/pokemon/base_stats/kotora.asm b/data/pokemon/base_stats/kotora.asm index 74379a34..3f584eaf 100644 --- a/data/pokemon/base_stats/kotora.asm +++ b/data/pokemon/base_stats/kotora.asm @@ -16,7 +16,7 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, FLASH ; end db BANK(KotoraPicFront) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 3f9ae91e..e527e4ff 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -214,7 +214,7 @@ PokedexEntryPointers: dw ElectivireDexEntry dw MagmortarDexEntry dw DisturbanDexEntry - dw KokanaDexEntry + dw GentlarvaDexEntry dw PupalDexEntry dw CarapthorDexEntry dw MagnezoneDexEntry @@ -1749,11 +1749,11 @@ DisturbanDexEntry: text_far _DisturbanDexEntry text_end -KokanaDexEntry: +GentlarvaDexEntry: db "GRUB@" db 1,0 dw 80 - text_far _KokanaDexEntry + text_far _GentlarvaDexEntry text_end PupalDexEntry: diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 80d97bf8..31a6a285 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -214,7 +214,7 @@ PokedexOrder: db DEX_ELECTIVIRE db DEX_MAGMORTAR db DEX_DISTURBAN - db DEX_KOKANA + db DEX_GENTLARVA db DEX_PUPAL db DEX_CARAPTHOR db DEX_MAGNEZONE diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 215e9d05..3dedd60b 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -335,7 +335,7 @@ _PidgeyDexEntry:: ; new entry page "grass, feeding on" next "bugs like CATERPIE" - next "and KOKANA" + next "and GENTLARVA" dex _SlowpokeDexEntry:: diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 15fb5845..7ac5db30 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -226,7 +226,7 @@ EvosMovesPointerTable: dw ElectivireEvosMoves dw MagmortarEvosMoves dw DisturbanEvosMoves - dw KokanaEvosMoves + dw GentlarvaEvosMoves dw PupalEvosMoves dw CarapthorEvosMoves dw MagnezoneEvosMoves @@ -2840,7 +2840,7 @@ DisturbanEvosMoves: db 50, POISON_GAS db 0 -KokanaEvosMoves: +GentlarvaEvosMoves: ; Evolutions db EV_LEVEL, 7, PUPAL db 0 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 9492b9d3..5247e1b4 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -39,7 +39,7 @@ MonPartyData: nybble ICON_BUG ; Weedle nybble ICON_BUG ; Kakuna nybble ICON_BUG ; Beedrill - nybble ICON_BUG ; Kokana + nybble ICON_BUG ; Gentlarva nybble ICON_BUG ; Pupal nybble ICON_BUG ; Carapthor nybble ICON_CAT ; Kotora diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index aaf169be..5e8e71c4 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -214,8 +214,8 @@ MonsterNames:: db "ELECTIVIRE" db "MAGMORTAR@" db "DISTURBAN@" - db "KOKANA@@@@" - db "PUPAL@@@@@" + db "GENTLARVA@" ; Gentlarva + db "PUPAL@@@@@" ; Kasanagi db "CARAPTHOR@" db "MAGNEZONE@" db "PORYGON-Z@" diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index cd5e75ca..6524f67a 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -398,7 +398,7 @@ _DisturbanDexEntry:: next "it with venom" dex -_KokanaDexEntry:: +_GentlarvaDexEntry:: text "Closely related to" next "WEEDLE. Due to the" next "lack of a horn," diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 46587aad..1bc93ff7 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -40,7 +40,7 @@ MonsterPalettes: db PAL_YELLOWMON ; WEEDLE db PAL_YELLOWMON ; KAKUNA db PAL_YELLOWMON ; BEEDRILL - db PAL_YELLOWMON ; KOKANA + db PAL_YELLOWMON ; GENTLARVA db PAL_YELLOWMON ; PUPAL db PAL_YELLOWMON ; CARAPTHOR db PAL_YELLOWMON ; KOTORA diff --git a/data/pokemon/tradeback_moves.asm b/data/pokemon/tradeback_moves.asm index 6bad7833..69e34737 100644 --- a/data/pokemon/tradeback_moves.asm +++ b/data/pokemon/tradeback_moves.asm @@ -219,7 +219,7 @@ TradebackMovesPointerTable: dw ElectivireTradebackMoves dw MagmortarTradebackMoves dw DisturbanTradebackMoves - dw KokanaTradebackMoves + dw GentlarvaTradebackMoves dw PupalTradebackMoves dw CarapthorTradebackMoves dw MagnezoneTradebackMoves @@ -1977,7 +1977,7 @@ DisturbanTradebackMoves: db 1, SCREECH db 0 -KokanaTradebackMoves: +GentlarvaTradebackMoves: db 0 PupalTradebackMoves: diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 229e3b05..c3c85cf1 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -91,17 +91,17 @@ YoungsterData: BugCatcherData: ; Viridian Forest db 6, WEEDLE, CATERPIE, 0 - db 7, CATERPIE, KAKUNA, KOKANA, 0 + db 7, CATERPIE, KAKUNA, GENTLARVA, 0 db 9, VENONAT, 0 ; Route 3 - db 10, KOKANA, PUPAL, 0 ; trimmed down to create counterpart trainers + db 10, GENTLARVA, PUPAL, 0 ; trimmed down to create counterpart trainers db 10, WEEDLE, KAKUNA, 0 db 10, CATERPIE, METAPOD, 0 ; Mt. Moon 1F db 12, PARAS, 0 db 10, PUPAL, PARAS, 0 ; Route 24 - db 14, KOKANA, WEEDLE, 0 + db 14, GENTLARVA, WEEDLE, 0 ; Route 6 db 16, VENONAT, PARAS, 0 ; By this point, the player has fought like, 2 "three bugs" trainers. Toning it down. db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index 66d0af0c..9f31ba2d 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -4,7 +4,7 @@ ViridianForestWildMons: db 4, WEEDLE db 4, PIDGEY db 5, CATERPIE - db 4, KOKANA + db 4, GENTLARVA db 5, WEEDLE db 7, KAKUNA db 7, METAPOD diff --git a/gfx/gallery_generator.cmd b/gfx/gallery_generator.cmd index 08f94126..3a29086f 100644 --- a/gfx/gallery_generator.cmd +++ b/gfx/gallery_generator.cmd @@ -2,7 +2,7 @@ cd pokemon cd front magick bulbasaur.png ivysaur.png venusaur.png charmander.png charmeleon.png charizard.png squirtle.png wartortle.png totartle.png pikachu.png raichu.png raichua.png gorochu.png eevee.png vaporeon.png jolteon.png flareon.png espeon.png +append ../row1.png magick umbreon.png leafeon.png glaceon.png sylveon.png rattata.png raticate.png raticatea.png pidgey.png pidgeotto.png pidgeot.png konya.png meowth.png persian.png persiana.png perrserker.png caterpie.png metapod.png butterfree.png +append ../row2.png -magick weedle.png kakuna.png beedrill.png kokana.png kasanagi.png carapthor.png spearow.png fearow.png ekans.png arbok.png sandshrew.png sandslash.png sandslasha.png nidoranf.png nidorina.png nidoqueen.png nidoranm.png nidorino.png nidoking.png nidoreign.png +append ../row3.png +magick weedle.png kakuna.png beedrill.png Gentlarva.png kasanagi.png carapthor.png spearow.png fearow.png ekans.png arbok.png sandshrew.png sandslash.png sandslasha.png nidoranf.png nidorina.png nidoqueen.png nidoranm.png nidorino.png nidoking.png nidoreign.png +append ../row3.png magick bittybat.png zubat.png golbat.png crobat.png geodude.png graveler.png golem.png golema.png paras.png parasect.png clefairy.png clefable.png jigglypuff.png wigglytuff.png mikon.png vulpix.png ninetales.png ninetalesa.png +append ../row4.png magick growlithe.png arcanine.png arcanineh.png mankey.png primeape.png annihilape.png oddish.png gloom.png vileplume.png bellossom.png bellsprout.png weepinbell.png victreebel.png tsubomitto.png magikarp.png gyarados.png gyopin.png goldeen.png +append ../row5.png magick seaking.png venonat.png venomoth.png cheep.png jabetta.png psyduck.png weirduck.png golduck.png poliwag.png poliwhirl.png poliwrath.png politoed.png abra.png kadabra.png alakazam.png lickitung.png lickilicky.png +append ../row6.png diff --git a/gfx/pics.asm b/gfx/pics.asm index d8ca08e1..e82e9b75 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -452,8 +452,8 @@ GawarhedPicFront:: INCBIN "gfx/pokemon/front/gawarhed.pic" GawarhedPicBack:: INCBIN "gfx/pokemon/back/gawarhedb.pic" OmegadgePicFront:: INCBIN "gfx/pokemon/front/omegadge.pic" OmegadgePicBack:: INCBIN "gfx/pokemon/back/omegadgeb.pic" -KokanaPicFront:: INCBIN "gfx/pokemon/front/kokana.pic" -KokanaPicBack:: INCBIN "gfx/pokemon/back/kokanab.pic" +GentlarvaPicFront:: INCBIN "gfx/pokemon/front/kokana.pic" +GentlarvaPicBack:: INCBIN "gfx/pokemon/back/kokanab.pic" ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic" ScizorPicBack:: INCBIN "gfx/pokemon/back/scizorb.pic" RhyperiorPicFront:: INCBIN "gfx/pokemon/front/rhyperior.pic" diff --git a/maps/CeruleanCity.blk b/maps/CeruleanCity.blk index d7abfd3d..9931ffdd 100644 --- a/maps/CeruleanCity.blk +++ b/maps/CeruleanCity.blk @@ -16,7 +16,7 @@ N\  ! |r   -/\bQQN +bQQN tttttt111_NttN ! !ttt_NttN V|~0 |s0 _NttN_Nttbllll6V2llllllllNttNNttPRRm]nN]MRRRRNtttttm'n diff --git a/maps/Route2.blk b/maps/Route2.blk index dd6227fd..c8290128 100644 --- a/maps/Route2.blk +++ b/maps/Route2.blk @@ -42,7 +42,7 @@ lllmt t111 mtt -/4/tt +\4/tt 1 m diff --git a/maps/Route2Gate.blk b/maps/Route2Gate.blk index 19af95408a67a09392becf0bffbb98a67146f44c..f04746b6f9f6d370f760991038aa3b022d0c03b7 100644 GIT binary patch literal 20 Zcma!x(TIt+Vqi#01`-J=Rt(&UsQ@zp1f~E0 literal 20 Zcma!xDUOM^Vqi#01`-J=Rt(&UsQ@@f1n~d> diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 864dd06d..e88d9d51 100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -103,17 +103,18 @@ Route24TrainerHeader5: trainer EVENT_BEAT_ROUTE_24_TRAINER_5, 1, Route24BattleText6, Route24EndBattleText6, Route24AfterBattleText6 db -1 ; end +; We added the infinite Nugget glitch from FRLG to own the libs Route24Text1: text_asm ResetEvent EVENT_NUGGET_REWARD_AVAILABLE - CheckEvent EVENT_GOT_NUGGET - jr nz, .got_item + ;CheckEvent EVENT_GOT_NUGGET + ;jr nz, .got_item ld hl, Route24Text_51510 call PrintText lb bc, NUGGET, 1 call GiveItem jr nc, .bag_full - SetEvent EVENT_GOT_NUGGET + ;SetEvent EVENT_GOT_NUGGET - Introduces the Nugget glitch from FRLG ld hl, Route24Text_5151a call PrintText ld hl, Route24Text_51526