diff --git a/audio.asm b/audio.asm index 69053194..9ccd9b69 100644 --- a/audio.asm +++ b/audio.asm @@ -384,7 +384,9 @@ INCLUDE "crysaudio/music/RBY/giovannisroom.asm" INCLUDE "crysaudio/music/RBY/rocketrby.asm" INCLUDE "crysaudio/music/RBY/giovannibattle.asm" INCLUDE "crysaudio/music/RBY/elitefourbattle.asm" -; INCLUDE "crysaudio/music/RBY/champrival.asm" +INCLUDE "crysaudio/music/RBY/champrival.asm" + +SECTION "RBY Songs 5", ROMX INCLUDE "crysaudio/music/RBY/galarbirds.asm" SECTION "TCG Songs 1", ROMX diff --git a/data/text/text_6.asm b/data/text/text_6.asm index 6aaa7860..b09659ce 100644 --- a/data/text/text_6.asm +++ b/data/text/text_6.asm @@ -69,7 +69,7 @@ _SurfingGotOnText:: text "!" prompt -_SurfingGotOnLaprasText:: +_SurfingGotOnLaprasText:: ; i cringed irl doing it this way pls understand i do not like this either - pvk text " got on" line "LAPRAS!" prompt diff --git a/data/wild/fishing_rod.asm b/data/wild/fishing_rod.asm index c1b04e28..231ca16d 100644 --- a/data/wild/fishing_rod.asm +++ b/data/wild/fishing_rod.asm @@ -1,48 +1,48 @@ FishingRodSlots:: - db PALLET_TOWN, MAGIKARP, 5, ORFRY, 5, MAGIKARP, 7, ORFRY, 7 + db PALLET_TOWN, MAGIKARP, 7, ORFRY, 6, MAGIKARP, 8, ORFRY, 7 db VIRIDIAN_CITY, MAGIKARP, 5, ORFRY, 5, MAGIKARP, 7, ORFRY, 7 - db ROUTE_22, MAGIKARP, 5, ORFRY, 5, MAGIKARP, 7, ORFRY, 7 - db ROUTE_4, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12 - db CERULEAN_CITY, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12 - db ROUTE_24, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12 - db ROUTE_25, MAGIKARP, 12, POLIWAG, 12, ORFRY, 12, CHEEP, 12 + db ROUTE_22, MAGIKARP, 6, ORFRY, 5, MAGIKARP, 7, ORFRY, 7 + db ROUTE_4, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 13 + db CERULEAN_CITY, MAGIKARP, 11, ORFRY, 14, POLIWAG, 13, STARYU, 13 + db ROUTE_24, MAGIKARP, 12, ORFRY, 13, POLIWAG, 12, PSYDUCK, 12 + db ROUTE_25, MAGIKARP, 11, POLIWAG, 12, ORFRY, 12, CHEEP, 12 db ROUTE_6, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12 - db VERMILION_CITY, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15 - db VERMILION_DOCK, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15 - db VERMILION_FERRY_DOCK, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15 - db ROUTE_11, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15 + db VERMILION_CITY, GOLDEEN, 14, SHELLDER, 13, CHEEP, 15, TENTACOOL, 13 + db VERMILION_DOCK, MAGIKARP, 15, BLOTTLE, 13, CHEEP, 15, TENTACOOL, 15 + db VERMILION_FERRY_DOCK, MAGIKARP, 16, BLOTTLE, 14, CHEEP, 13, TENTACOOL, 14 + db ROUTE_11, WIGLETT, 15, KRABBY, 15, CHEEP, 14, TENTACOOL, 13 db DIGLETTS_CAVE, WIGLETT, 18, WIGLETT, 19, WIGLETT, 20, WUGTRIO, 28 - db ROUTE_10, POLIWAG, 18, RIBBITO, 18, KRABBY, 18, SLOWPOKE, 18 - db ROCK_TUNNEL_1F, POLIWAG, 18, RIBBITO, 18, KRABBY, 18, SLOWPOKE, 18 - db ROUTE_12, POLIWAG, 18, RIBBITO, 18, KRABBY, 18, SLOWPOKE, 18 - db CELADON_CITY, MAGIKARP, 15, MAGIKARP, 18, GRIMER, 20, MAGIKARP, 20 - db CELADON_UNIVERSITY_OUTSIDE, MAGIKARP, 15, MAGIKARP, 18, GRIMER, 20, MAGIKARP, 20 - db ROUTE_13, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25 - db ROUTE_17, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25 - db ROUTE_18, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25 - db ROUTE_23, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25 - db FUCHSIA_CITY, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25 - db SAFARI_ZONE_CENTER, SLOWPOKE, 25, KRABBY, 25, DRATINI, 20, DRAGONAIR, 30 - db SAFARI_ZONE_EAST, SLOWPOKE, 25, KRABBY, 25, WEIRDUCK, 25, DRATINI, 20 - db SAFARI_ZONE_NORTH, SLOWPOKE, 25, KRABBY, 25, WEIRDUCK, 25, DRATINI, 20 - db SAFARI_ZONE_WEST, SLOWPOKE, 25, KRABBY, 25, WEIRDUCK, 25, DRATINI, 20 - db UNDERWATER_TUNNEL, SHELLDER, 30, STARYU, 30, CROAKOZUNA, 33, GOLDUCK, 33 - db ROUTE_19, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30 - db ROUTE_20, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30 - db ROUTE_21, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30 - db SEAFOAM_ISLANDS_B3F, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30 - db SEAFOAM_ISLANDS_B4F, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30 - db CINNABAR_ISLAND, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30 + db ROUTE_10, POLIWAG, 17, RIBBITO, 17, KRABBY, 19, SLOWPOKE, 18 + db ROCK_TUNNEL_1F, POLIWAG, 16, RIBBITO, 16, KRABBY, 17, SLOWPOKE, 17 + db ROUTE_12, POLIWAG, 18, RIBBITO, 15, KRABBY, 17, SLOWPOKE, 19 + db CELADON_CITY, MAGIKARP, 15, MAGIKARP, 17, GRIMER, 20, MAGIKARP, 20 + db CELADON_UNIVERSITY_OUTSIDE, MAGIKARP, 14, MAGIKARP, 18, GRIMER, 21, MAGIKARP, 19 + db ROUTE_13, PSYDUCK, 25, KRABBY, 25, HORSEA, 24, POLIWHIRL, 26 + db ROUTE_17, CHEEP, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25 + db ROUTE_18, CHEEP, 26, KRABBY, 27, HORSEA, 26, POLIWHIRL, 27 + db ROUTE_23, SLOWBRO, 23, KINGLER, 24, HORSEA, 22, POLIWHIRL, 25 + db FUCHSIA_CITY, GRIMER, 25, KRABBY, 25, HORSEA, 25, GYARADOS, 26 + db SAFARI_ZONE_CENTER, SLOWPOKE, 25, KRABBY, 26, DRATINI, 23, DRAGONAIR, 30 + db SAFARI_ZONE_EAST, SLOWPOKE, 24, KRABBY, 24, WEIRDUCK, 22, DRATINI, 19 + db SAFARI_ZONE_NORTH, SLOWPOKE, 26, KRABBY, 25, WEIRDUCK, 23, DRATINI, 21 + db SAFARI_ZONE_WEST, SLOWPOKE, 23, KRABBY, 27, WEIRDUCK, 24, DRATINI, 20 + db UNDERWATER_TUNNEL, SHELLDER, 30, STARYU, 29, JABETTA, 33, GOLDUCK, 34 + db ROUTE_19, STARYU, 31, HORSEA, 31, SHELLDER, 31, SHARPOON, 32 + db ROUTE_20, STARYU, 33, HORSEA, 33, SHELLDER, 33, SHARPOON, 34 + db ROUTE_21, STARYU, 31, HORSEA, 32, SHELLDER, 31, SHARPOON, 32 + db SEAFOAM_ISLANDS_B3F, KRABBY, 31, SEEL, 31, SHELLDER, 32, STARYU, 33 + db SEAFOAM_ISLANDS_B4F, KRABBY, 32, SEEL, 33, SHELLDER, 33, LAPRAS, 35 ; fish for nessie if ur stupid enough - pvk + db CINNABAR_ISLAND, STARYU, 30, HORSEA, 30, SHELLDER, 30, SHARPOON, 30 db CINNABAR_VOLCANO_FLOORS, GROWLITHE, 32, MAGMAR, 35, MAGMAR, 35, MAGMAR, 36 db CINNABAR_VOLCANO, MAGMAR, 35, MAGMAR, 35, MAGMAR, 36, ARCANINE, 38 - db BILLS_GARDEN, SQUIRTLE, 50, SQUIRTLE, 50, DRATINI, 50, DRAGONAIR, 50 - db MT_MOON_CRATER, SEAKING, 50, SLOWBRO, 50, CROAKOZUNA, 50, GYARADOS, 50 - db CITRINE_FERRY_DOCK, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50 - db CITRINE_CITY, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50 - db BRUNSWICK_TRAIL, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50 - db GARNET_CAVERN_1F, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50 - db GARNET_CAVERN_B1F, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50 - db SILPH_GAUNTLET_5F, SLOWBRO, 50, KINGLER, 50, GOLDUCK, 50, DRAGONAIR, 50 - db CERULEAN_CAVE_1F, SEAKING, 50, SLOWBRO, 50, CROAKOZUNA, 50, GYARADOS, 50 - db CERULEAN_CAVE_B1F, SEAKING, 50, SLOWBRO, 50, CROAKOZUNA, 50, GYARADOS, 50 + db BILLS_GARDEN, SQUIRTLE, 52, SQUIRTLE, 51, DRATINI, 50, DRAGONAIR, 53 + db MT_MOON_CRATER, KABUTOPS, 49, OMASTAR, 49, SEAKING, 50, GYARADOS, 53 + db CITRINE_FERRY_DOCK, PENDRAKEN, 48, TENTACRUEL, 49, KINGLER, 51, SHARPOON, 50 + db CITRINE_CITY, PENDRAKEN, 48, TENTACRUEL, 49, KINGLER, 52, SHARPOON, 51 + db BRUNSWICK_TRAIL, STARYU, 48, SEADRA, 49, GOLDUCK, 50, POLIWRATH, 50 + db GARNET_CAVERN_1F, PENDRAKEN, 50, SEADRA, 49, POLIWRATH, 53, GYARADOS, 54 + db GARNET_CAVERN_B1F, PENDRAKEN, 51, SEADRA, 48, POLITOED, 52, GYARADOS, 55 + db SILPH_GAUNTLET_5F, SLOWBRO, 50, KINGLER, 51, GOLDUCK, 51, DRAGONAIR, 52 + db CERULEAN_CAVE_1F, SHARPOON, 62, SLOWBRO, 64, CROAKOZUNA, 64, GYARADOS, 65 + db CERULEAN_CAVE_B1F, SHARPOON, 62, SLOWKING, 64, CROAKOZUNA, 64, GYARADOS, 65 db -1 ; end diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index effa7bda..8811ab72 100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm @@ -1,7 +1,7 @@ Route13WildMons: def_grass_wildmons 20 ; encounter rate db 24, ODDISH - db 25, PIDGEOTTO + db 25, FARFETCHD db 23, BELLSPROUT db 24, VENONAT db 24, VENONAT diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 5fabb7e7..b62c4ae2 100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -2,7 +2,7 @@ Route15WildMons: def_grass_wildmons 15 ; encounter rate db 24, BELLSPROUT db 26, VENONAT - db 25, SPEAROW + db 25, FARFETCHD db 25, DITTO db 22, BELLSPROUT db 28, ODDISH diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index 69dc2164..e6c59c72 100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm @@ -7,7 +7,7 @@ VictoryRoad3FWildMons: db 43, RHYHORN db 43, GOLBAT db 44, GAVILLAIN - db 44, SANDSLASH + db 50, CHANSEY ; Possible to Repel Trick, used for grinding. db 44, PARASECT db 45, HITMONCHAN ; LGPE Rare Spawn end_grass_wildmons diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index e52dfef9..631e6a8f 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -782,8 +782,17 @@ ItemUseLapras: ld a, 2 ld [wWalkBikeSurfState], a ; change player state to surfing call PlayDefaultMusic ; play surfing music + + ; no jimmy i will NOT make a new item + ld hl, SurfingGotOnLaprasText + ld a, [wSurfMonItemSwitch] ; check if the mon item switch has been set + and a + jr z, .skip + ld hl, SurfingGotOnText +.skip ; now shut the fuck up jp PrintText + .tryToStopSurfing xor a ldh [hSpriteIndexOrTextID], a diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index 2e0ed8b6..65f91873 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -165,6 +165,14 @@ StartMenu_Pokemon:: bit 1, [hl] res 1, [hl] jp z, .loop + + ; this makes it so the pokemon shows up instead of pocket lapras + ; no visible effect when using surf, it's actually for the item effect later + ; it makes it so I don't have to make a craptastic new function that falls through, which would require a new item, which is so unimaginably cringe i would fall off my chair and die + ; - pvk + ld a, 1 + ld [wSurfMonItemSwitch], a + ld a, POCKET_LAPRAS ld [wcf91], a ld [wPseudoItemID], a diff --git a/engine/overworld/field_moves.asm b/engine/overworld/field_moves.asm index 9cfaf19b..3b62572c 100644 --- a/engine/overworld/field_moves.asm +++ b/engine/overworld/field_moves.asm @@ -33,10 +33,18 @@ TrySurf: and a jr nz, .no2 call GetPartyMonName2 + + ; pocket lapras illusion maintenance service + ld a, 1 + ld [wSurfMonItemSwitch], a + ld a, POCKET_LAPRAS ld [wcf91], a ld [wPseudoItemID], a call UseItem + ; pocket lapras stuff + xor a + ld [wSurfMonItemSwitch], a .yes2 call CloseFieldMoveTextBox .yes diff --git a/ram/wram.asm b/ram/wram.asm index f78df62d..321eb92d 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -1465,7 +1465,7 @@ wEndBattleLoseTextPointer:: dw ds 2 wEndBattleTextRomBank:: db - ds 1 +wSurfMonItemSwitch:: db ; i cant be fucked making a new item just do it this way - pvk ; the address _of the address_ of the current subanimation entry wSubAnimAddrPtr:: dw diff --git a/text/SilphGauntlet6F.asm b/text/SilphGauntlet6F.asm index b133b004..3dba8aa1 100644 --- a/text/SilphGauntlet6F.asm +++ b/text/SilphGauntlet6F.asm @@ -69,7 +69,7 @@ _SilphGauntlet6FBattleText3:: cont "saved me during" cont "the war! They" cont "even powered my" - cont "plane!" + cont "Thunderchief!" ; Republic F-105 Thunderchief - Vietnam aircraft, referencing the FRLG Fame Checker, but also adding clarity for the player to figure out which war Surge was in. para "I'll zap you for" line "real this time!" @@ -83,19 +83,37 @@ _SilphGauntlet6FEndBattleText3:: line "a gallon, now!" prompt +; Originally, we wanted Surge to talk about being Major. +; But we realised RG Blaine wears a WWII-era Japanese uniform. +; Ergo, Blaine should loathe Surge for manning American war bases. + ; The implication is that Surge works at an American war base in Japan. Post-war, these propped up to ensure Japan never does what it did again. In modern-day, these are super controversial. Blaine, being a soldier, would get extremely mad. + ; Thus, we give Surge an explanation for being in Kanto at all... + ; While also giving a haunting backstory to RG Blaine's design. + ; This requires a lot of historical knowledge to get right, but we want to adequately represent Surge and Blaine's war uniforms. + ; This would make Surge around 40 years old, and Blaine around 60-70 years old. _SilphGauntlet6FAfterBattleText3:: - text "Huh? BLAINE?" - line "Oh, man!" + text "Huh? BLAINE? Oh," + line "man!" - para "He won't tell you" ; Referring to Blaine's original design. - line "this, but he was" - cont "my mentor!" + para "Ever since I told" + line "him where I work," + cont "he's got his" + cont "pants in a bunch!" ; s/o Megachiroptera for giving the american version of this saying - para "Once, the higher-" ; Commentary on the German, French, and Chinese translations. - line "ups demoted me" - cont "to MAJOR SURGE," - cont "but BLAINE got" - cont "me reinstated!" + para "Something about" + line "that war, maybe?" ; World War II + + para "C'mon, I wasn't" + line "even born yet!" ; This explains the age gap. He fought in the Vietnam War, deployed from the Japanese base. + + ; Old text. + ; We wanted to reference the Chinese and German translations. + ; But Surge is too young, and American, so the relations wouldn't work. +; para "Once, the higher-" +; line "ups demoted me" ; Old text from before we looked at the context of RG Blaine. +; cont "to MAJOR SURGE," +; cont "but BLAINE got" +; cont "me reinstated!" done