diff --git a/constants/item_constants.asm b/constants/item_constants.asm index bb40c5d3..31ab47f4 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -58,7 +58,7 @@ DEF SAFARI_ROCK EQU $16 ; overload const LEAF_STONE ; $2F const CARD_KEY ; $30 const NUGGET ; $31 - const PP_UP_2 ; $32 + const WING_FOSSIL ; $32 const POKE_DOLL ; $33 const FULL_HEAL ; $34 const REVIVE ; $35 diff --git a/data/items/key_items.asm b/data/items/key_items.asm index 6b11e2b4..6c9451ee 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -49,7 +49,7 @@ KeyItemFlags: dbit FALSE ; LEAF_STONE dbit TRUE ; CARD_KEY dbit FALSE ; NUGGET - dbit FALSE ; PP_UP_2 + dbit FALSE ; WING_FOSSIL dbit FALSE ; POKE_DOLL dbit FALSE ; FULL_HEAL dbit FALSE ; REVIVE diff --git a/data/items/names.asm b/data/items/names.asm index 0d375715..af9f9bf9 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -49,7 +49,7 @@ ItemNames:: li "LEAF STONE" li "CARD KEY" li "NUGGET" - li "PP UP" + li "WING FOSSIL" li "POKé DOLL" li "FULL HEAL" li "REVIVE" diff --git a/data/items/prices.asm b/data/items/prices.asm index 0837222c..9d52fcdc 100644 --- a/data/items/prices.asm +++ b/data/items/prices.asm @@ -49,7 +49,7 @@ ItemPrices:: bcd3 2100 ; LEAF_STONE bcd3 0 ; CARD_KEY bcd3 10000 ; NUGGET - bcd3 9800 ; XXX PP_UP + bcd3 0 ; WING_FOSSIL bcd3 1000 ; POKE_DOLL bcd3 600 ; FULL_HEAL bcd3 1500 ; REVIVE diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 4a8e2323..429305c7 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -9,6 +9,7 @@ PewterCity_Object: warp_event 23, 17, PEWTER_MART, 1 warp_event 7, 29, PEWTER_SPEECH_HOUSE, 1 warp_event 13, 25, PEWTER_POKECENTER, 1 + warp_event 27, 21, ROUTE_12_SUPER_ROD_HOUSE, 1 def_bg_events bg_event 19, 29, 6 ; PewterCityText6 diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index e7fc92f1..76e4ccb6 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -5,7 +5,6 @@ Route12_Object: warp_event 10, 15, ROUTE_12_GATE_1F, 1 warp_event 11, 15, ROUTE_12_GATE_1F, 2 warp_event 10, 21, ROUTE_12_GATE_1F, 3 - warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 1 def_bg_events bg_event 13, 13, 11 ; Route12Text11 diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index 14b7747a..044aa873 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -2,8 +2,8 @@ Route12SuperRodHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 8 + warp_event 3, 7, LAST_MAP, 8 def_bg_events diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 111b87b8..6c67114f 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -189,7 +189,7 @@ MapSongBanks:: db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_1F db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_2F db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_16_FLY_HOUSE - db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_12_SUPER_ROD_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_SUPER_ROD_HOUSE db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_1F db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_2F db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_1F diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 18154ac5..4c1e6480 100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -6,7 +6,7 @@ SuperRodData: dbw CERULEAN_CITY, .Group3 dbw VERMILION_CITY, .Group4 dbw CELADON_CITY, .Group5 - dbw FUCHSIA_CITY, .Group10 + dbw FUCHSIA_CITY, .Group7 dbw CINNABAR_ISLAND, .Group8 dbw ROUTE_4, .Group3 dbw ROUTE_6, .Group4 @@ -32,7 +32,7 @@ SuperRodData: dbw SAFARI_ZONE_WEST, .Group6 dbw SAFARI_ZONE_CENTER, .Group6 dbw CERULEAN_CAVE_2F, .Group9 - dbw CERULEAN_CAVE_B1F, .Group9 + dbw CERULEAN_CAVE_B1F, .Group10 dbw CERULEAN_CAVE_1F, .Group9 dbw ROCK_TUNNEL_1F, .Group5 dbw ROCK_TUNNEL_1F, .Group5 @@ -55,7 +55,7 @@ SuperRodData: .Group3: db 5 db 15, SKIMPER - db 19, MAGIKARP + db 15, MAGIKARP db 15, KRABBY db 15, BLOTTLE db 15, CHEEP @@ -87,19 +87,20 @@ SuperRodData: .Group7: db 6 - db 40, TENTACRUEL - db 40, KINGLER - db 40, SEAKING - db 40, GYARADOS - db 40, PENDRAKEN - db 40, JABETTA + db 35, TENTACRUEL + db 35, KINGLER + db 35, SEAKING + db 35, GYARADOS + db 35, PENDRAKEN + db 35, JABETTA .Group8: - db 4 + db 5 db 40, STARYU db 40, SEADRA db 40, SHELLDER db 40, PENDRAKEN + db 40, JAGG .Group9: db 5 diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index 547f782e..4c4889c9 100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm @@ -40,13 +40,18 @@ GiveFossilToCinnabarLab:: jr z, .choseDomeFossil cp HELIX_FOSSIL jr z, .choseHelixFossil - ld b, AERODACTYL + cp WING_FOSSIL + jr z, .choseWingFossil + ld b, DECILLA jr .fossilSelected .choseHelixFossil ld b, OMANYTE jr .fossilSelected .choseDomeFossil ld b, KABUTO + jr .fossilSelected +.choseWingFossil + ld b, AERODACTYL .fossilSelected ld [wFossilItem], a ld a, b diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index eff5b0b0..46e92a43 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -66,7 +66,7 @@ ItemUsePtrTable: dw ItemUseEvoStone ; LEAF_STONE dw ItemUseCardKey ; CARD_KEY dw UnusableItem ; NUGGET - dw UnusableItem ; ??? PP_UP + dw UnusableItem ; WING_FOSSIL dw ItemUsePokedoll ; POKE_DOLL dw ItemUseMedicine ; FULL_HEAL dw ItemUseMedicine ; REVIVE diff --git a/maps/PewterCity.blk b/maps/PewterCity.blk index b199480b..e2ca2d36 100644 --- a/maps/PewterCity.blk +++ b/maps/PewterCity.blk @@ -25,9 +25,7 @@ n,)tttttt>??,) ,),)ooooo - - - + >??,) !1wVww1(,,,) diff --git a/maps/Route12.blk b/maps/Route12.blk index d79f59e3..8d2ac6de 100644 --- a/maps/Route12.blk +++ b/maps/Route12.blk @@ -1,9 +1,9 @@ ,,,)1(,,,,,+W%1$WWWW,)CCTCCCC,)CCTCCkk,)CCTCCCC,)TTzTCCC,)TxxTyTT,)TCCTxxx,)TC !CC,)xChiCC,)kk7:~kk,)CCCTCCC,)CCCTCCC,)TTTzTTC,)xxxxxTC,)TCCTTTC,)TCCTxxC,)zTTTCTCW%TxxxCTCTCCCCxCzTzTTTCTxTxxxCxCTTTCCCCxxzTCTTTCTxCTxTCTTCTCTTzTCTCxxxxCTTTzTTCxxxTxxC66kkkTCCCLLaaayCCCxxxTCCCCCCTCCCCCCTCCCCCCTCCC nCCCTTTC nCCCxxTC -nT111C -nTwwwwwC +nzTTTTTC nTxxxxxC +nTCCCCCC nTTTzTCC nxxxTxCC nl6CTCCC diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm index 2c388119..b34064c5 100644 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -44,6 +44,7 @@ FossilsList: db DOME_FOSSIL db HELIX_FOSSIL db OLD_AMBER + db WING_FOSSIL db 0 ; end Lab4Text1: diff --git a/text/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm index 990fc631..a203dff3 100644 --- a/text/Route12SuperRodHouse.asm +++ b/text/Route12SuperRodHouse.asm @@ -1,8 +1,8 @@ _Route12HouseText_564c0:: text "I'm the FISHING" - line "GURU's brother!" + line "GURU!" - para "I simply Looove" + para "I simply looove" line "fishing!" para "Do you like to" @@ -43,8 +43,8 @@ _Route12HouseText_564d4:: text "Hello there," line "!" - para "Use the SUPER ROD" - line "in any water!" + para "Use that FISHING" + line "ROD in any water!" cont "You can catch" cont "different kinds" cont "of #MON."