From ad28227d69bd29db891264d5ebae4d0d69356709 Mon Sep 17 00:00:00 2001 From: RainbowMetalPigeon Date: Sun, 27 Oct 2024 21:24:45 +0100 Subject: [PATCH] bug fixed the Cheat Candy; fixed the pair collision in Route 8; clarified info about Altered Types --- data/items/use_party.asm | 1 + data/text/text_4.asm | 255 ++++++++++++++++++++++ data/tilesets/pair_collision_tile_ids.asm | 1 + engine/items/item_effects.asm | 2 - engine/menus/personalization.asm | 29 ++- text.asm | 2 +- 6 files changed, 284 insertions(+), 6 deletions(-) diff --git a/data/items/use_party.asm b/data/items/use_party.asm index f5f0e778..74bef16b 100644 --- a/data/items/use_party.asm +++ b/data/items/use_party.asm @@ -48,4 +48,5 @@ UsableItems_PartyMenu: db PERFECTER ; new db CHROMOGENE ; new db LINK_CABLE ; new + db CHEAT_CANDY ; new db -1 ; end diff --git a/data/text/text_4.asm b/data/text/text_4.asm index f4b57628..97684423 100644 --- a/data/text/text_4.asm +++ b/data/text/text_4.asm @@ -280,3 +280,258 @@ _OptionsInfoTextExpGain:: para "NOTHING: no battle" line "earn any EXP." prompt + +_PersonalizationInfoTextTypes_WannaKnowThemAll:: + text "Want to see the" + line "full list?" + cont "It's pretty long." +; xxxx "123456789012345678" + done + +_PersonalizationInfoTextTypes_Details:: + text "VENUSAUR:" + line "GRASS/GROUND" + + para "CHARIZARD:" + line "FIRE/DRAGON" + + para "BLASTOISE:" + line "WATER/STEEL" + + para "BUTTERFREE:" + line "BUG/PSYCHIC" + + para "PIDGEY:" + line "FLYING/FLYING" + + para "PIDGEOTTO:" + line "FLYING/FLYING" + + para "PIDGEOT:" + line "FLYING/FLYING" + + para "RATTATA:" + line "NORMAL/GROUND" + + para "RATICATE:" + line "NORMAL/GROUND" + + para "SPEAROW:" + line "FLYING/FIGHTING" + + para "FEAROW:" + line "FLYING/FIGHTING" + + para "ARBOK:" + line "POISON/DARK" + + para "NIDOQUEEN:" + line "POISON/FAIRY" + + para "NIDOKING:" + line "POISON/FIGHTING" + + para "VULPIX:" + line "FIRE/GHOST" + + para "NINETALES:" + line "FIRE/GHOST" + + para "BELLOSSOM:" + line "GRASS/FIRE" + + para "PARAS:" + line "BUG/GHOST" + + para "PARASECT:" + line "BUG/GHOST" + + para "VENOMOTH:" + line "POISON/PSYCHIC" + + para "PSYDUCK:" + line "WATER/PSYCHIC" + + para "GOLDUCK:" + line "WATER/PSYCHIC" + + para "PRIMEAPE:" + line "FIGHTING/DARK" + + para "ARCANINE:" + line "FIRE/DRAGON" + + para "GEODUDE:" + line "ROCK/ROCK" + + para "GRAVELER:" + line "ROCK/ROCK" + + para "GOLEM:" + line "ROCK/ROCK" + + para "PONYTA:" + line "FIRE/GROUND" + + para "RAPIDASH:" + line "FIRE/GROUND" + + para "DODUO:" + line "FLYING/GROUND" + + para "DODRIO:" + line "FLYING/GROUND" + + para "DEWGONG:" + line "ICE/FAIRY" + + para "GRIMER:" + line "POISON/GROUND" + + para "MUK:" + line "POISON/GROUND" + + para "SHELLDER:" + line "WATER/ROCK" + + para "CLOYSTER:" + line "ICE/ROCK" + + para "GASTLY:" + line "GHOST/DARK" + + para "HAUNTER:" + line "GHOST/DARK" + + para "GENGAR:" + line "GHOST/DARK" + + para "DROWZEE:" + line "PSYCHIC/DARK" + + para "HYPNO:" + line "PSYCHIC/DARK" + + para "KRABBY:" + line "WATER/BUG" + + para "KINGLER:" + line "WATER/BUG" + + para "VOLTORB:" + line "ELECTRIC/FIRE" + + para "ELECTRODE:" + line "ELECTRIC/FIRE" + + para "CUBONE:" + line "GROUND/GHOST" + + para "MAROWAK:" + line "GROUND/GHOST" + + para "HITMONLEE:" + line "FIGHTING/GROUND" + + para "HITMONCHAN:" + line "FIGHTING/NORMAL" + + para "HITMONTOP:" + line "FIGHTING/FLYING" + + para "KOFFING:" + line "POISON/FIRE" + + para "WEEZING:" + line "POISON/FIRE" + + para "RHYDON:" + line "ROCK/FIGHTING" + + para "RHYPERIOR:" + line "ROCK/FIGHTING" + + para "HAPPINY:" + line "FAIRY/FAIRY" + + para "CHANSEY:" + line "FAIRY/FAIRY" + + para "BLISSEY:" + line "FAIRY/FAIRY" + + para "TANGELA:" + line "GRASS/DARK" + + para "TANGROWTH:" + line "GRASS/DARK" + + para "SEADRA:" + line "WATER/POISON" + + para "KINGDRA:" + line "DRAGON/POISON" + + para "GOLDEEN:" + line "WATER/NORMAL" + + para "SEAKING:" + line "WATER/NORMAL" + + para "STARYU:" + line "WATER/FAIRY" + + para "STARMIE:" + line "WATER/FAIRY" + + para "ELEKID:" + line "ELECTRIC/FIGHTING" + + para "ELECTABUZZ:" + line "ELECTRIC/FIGHTING" + + para "ELECTIVIRE:" + line "ELECTRIC/FIGHTING" + + para "MAGBY:" + line "FIRE/DARK" + + para "MAGMAR:" + line "FIRE/DARK" + + para "MAGMORTAR:" + line "FIRE/DARK" + + para "TAUROS:" + line "NORMAL/GROUND" + + para "GYARADOS:" + line "WATER/DRAGON" + + para "PORYGON:" + line "ELECTRIC/GHOST" + + para "PORYGON2:" + line "ELECTRIC/GHOST" + + para "PORYGON-Z:" + line "ELECTRIC/GHOST" + + para "KABUTO:" + line "ROCK/BUG" + + para "KABUTOPS:" + line "ROCK/BUG" + + para "AERODACTYL:" + line "ROCK/DRAGON" + + para "DRATINI:" + line "DRAGON/FAIRY" + + para "DRAGONAIR:" + line "DRAGON/FAIRY" + + para "DRAGONITE:" + line "DRAGON/FAIRY" + prompt \ No newline at end of file diff --git a/data/tilesets/pair_collision_tile_ids.asm b/data/tilesets/pair_collision_tile_ids.asm index 73c0660b..d085f987 100644 --- a/data/tilesets/pair_collision_tile_ids.asm +++ b/data/tilesets/pair_collision_tile_ids.asm @@ -33,6 +33,7 @@ TilePairCollisionsLand:: db OVERWORLD, $30, $11 ; new ; db OVERWORLD, $58, $11 ; new, should be unnecessary in all cases? it's between a cavern entrance and the rock plateau, but you should just warp db OVERWORLD, $20, $11 ; new + db OVERWORLD, $21, $11 ; new db OVERWORLD, $5B, $11 ; new db OVERWORLD, $62, $2C ; new, between new rock plateau and route grassy ground ; $39 db OVERWORLD, $6C, $58 ; cannot go from 4th copy of rock tile, which is always walkable, into the bottomleft corner of the cavern entrance diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 87c58ed1..d65e6dcd 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2083,8 +2083,6 @@ ItemUseMedicine: ld [wcf91], a pop af ld [wWhichPokemon], a - - ret ; new code for CHEAT_CANDY ld a, [wcf91] ; a contains the item ID cp CHEAT_CANDY diff --git a/engine/menus/personalization.asm b/engine/menus/personalization.asm index b32e32df..3675673a 100644 --- a/engine/menus/personalization.asm +++ b/engine/menus/personalization.asm @@ -259,6 +259,8 @@ PersonalizationControl: ld [wUniQuizAnswer], a cp 3 ; number of options ret nc + cp 1 ; second option is special as it doesn't just print one dialogue + jr z, .alteredTypes add a ; doubles a ld e, a ld d, 0 @@ -268,8 +270,21 @@ PersonalizationControl: ld h, [hl] ld l, a call PrintText +.conclude call InitPersonalizationMenu_Redo ret +.alteredTypes ; hard-coded exception + ld hl, PersonalizationInfoTextTypes + call PrintText + ld hl, PersonalizationInfoTextTypes_WannaKnowThemAll + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] ; YES=0, NO=1 + and a ; equivalent to cp 0 + jr nz, .conclude + ld hl, PersonalizationInfoTextTypes_Details + call PrintText + jr .conclude PersonalizationMenu_UpdateCursorPosition: hlcoord 1, 4 @@ -375,12 +390,12 @@ JapaneseText: PersonalizationTypesStringsPointerTable: dw ClassicText - dw NewText + dw AlteredText ClassicText: db "CLASSIC@" -NewText: - db "NEW @" +AlteredText: + db "ALTERED@" ; new, for info @@ -400,3 +415,11 @@ PersonalizationInfoTextTypes: PersonalizationInfoTextSound: text_far _PersonalizationInfoTextSound text_end + +PersonalizationInfoTextTypes_WannaKnowThemAll: + text_far _PersonalizationInfoTextTypes_WannaKnowThemAll + text_end + +PersonalizationInfoTextTypes_Details: + text_far _PersonalizationInfoTextTypes_Details + text_end diff --git a/text.asm b/text.asm index ed4fee2d..1248a514 100644 --- a/text.asm +++ b/text.asm @@ -88,7 +88,6 @@ INCLUDE "text/Route17.asm" INCLUDE "text/Route18.asm" INCLUDE "text/Route19.asm" INCLUDE "text/Route20.asm" -INCLUDE "text/Route21.asm" INCLUDE "data/text/text_4.asm" @@ -302,6 +301,7 @@ INCLUDE "text/BikeShop.asm" INCLUDE "text/PewterSpeechHouse.asm" INCLUDE "text/Route22.asm" INCLUDE "text/Route23.asm" +INCLUDE "text/Route21.asm" ; new: splitted the Pokédex text into two separate sections