Merge branch 'mistress' into renewables

.direnv/flake-inputs/xmyd2lyqdjsn4hcgwsl8z5587y8jvqkh-source

@@ -1 +0,0 @@
-/nix/store/xmyd2lyqdjsn4hcgwsl8z5587y8jvqkh-source

.envrc

@@ -0,0 +1 @@
+use flake .

.gitignore

@@ -31,3 +31,9 @@
 *.sg1
 
 .vscode/*
+
+# nix stuff
+
+.direnv/*
+result
+.envrc

README.md

@@ -4,12 +4,12 @@ This is a ROM Hack of Pokémon Red and Blue, aiming to expand the Kanto region w
 
 If playing on an emulator, BGB is strongly recommended for its accuracy and features. Inaccurate emulators, such as VBA and TGB Dual, can experience unintended glitches. This hack is fully playable on official hardware as well.
 
-New Pokemon:
+New Pokemon
 ====
 The Kanto Expansion Pak's ethos is to add every "Kanto-related" Pokemon to RBY without fundamentally changing the grander metagame. What's defined as "Kanto-related" is a Pokemon that evolves from an existing Kanto Pokemon, made an appearance in a Kanto-based game (LGPE), is a regional variant, or was a Kanto-related Pokemon cut during the development of an official game.
 
 With this criteria, we get:
-- The 34 known beta Pokemon that were cut from Red and Green; eg. Gorochu, Kotora
+- The 34 known prototype Pokemon that were cut from Red and Green; eg. Gorochu, Kotora
 - Evolutions or pre-evolutions of a Kanto Pokemon found in a future generation eg. Steelix, Glaceon, Kleavor, Annihilape
 - Evolutions of Kanto Pokemon found in the SpaceWorld '97 demo of Gold and Silver; eg. Luxwan, Bellignan
 - All fully-evolved regional variants of Kanto Pokemon; eg. Alolan Muk, Galarian Slowbro, Hisuian Arcanine, Paldean Tauros
@@ -39,7 +39,7 @@ In general, the following Pokemon are not available;
 
 Mega Evolutions and Gigantamax forms are not in the game mainly by choice. There are no held items and there isn't a special button or anything, so it felt kind of weird to add, would deviate significantly from the RBY experience, and requires a pretty big overhaul to the battle system. It's definitely possible, just not for me.
 
-New Types:
+New Types
 ====
 To accomodate the new Pokemon, the Dark, Steel, and Fairy types are added. They are effectively "tacked on", with no vanilla Pokemon or moves being changed, which is a big part of what this hack wants. 
 
@@ -76,7 +76,7 @@ Naturally, these types get appropriate moves. They are currently distributed to
 - Dark: Brutal Swing, Fake Tears, False Surrender, Feint Attack, Kowtow Cleave, Nasty Plot, Night Slash
 - Fairy: Charm, Dazzling Gleam, Disarming Voice, Draining Kiss, Fairy Wind, Play Rough, Sweet Kiss
 
-New Items:
+New Items
 ====
 There are some new items here, with the aim of accomodating new Pokemon, adding features, and acting as methods of getting to new locations. 
 - The Wing Fossil is a new item that allows Aerodactyl to be revived, as the Old Amber is instead used for Decilla. It's hidden in Mt. Moon.
@@ -130,7 +130,7 @@ Improved Areas
 	- In effect, you get two stages: Pewter/Cerulean/Vermilion, then Celadon/Fuchsia/Saffron/Cinnabar. Some limits were placed due to the power spike introduced by Celadon City.
 - Giovanni now uses his unused theme song from Yellow, plus has his LGPE monologue in the Rocket Hideout.
 - Jessie and James have been backported from Yellow, appearing in Mt. Moon, Rocket Hideout, Pokemon Tower, and Silph Co. Additionally, they have a closure role in the post-game.
-- Diglett's Cave has a more detailed map with Onix, Wiglett, and Wugtrio also appearing! It also has its beta music!
+- Diglett's Cave has a more detailed map with Onix, Wiglett, and Wugtrio also appearing! It also has its prototype music!
 - The Day Care now contains a PC, is generally more detailed, and houses Melanie from Yellow. If you pick Pikachu or Eevee and beat Misty, Melanie will give you a Bulbasaur.
 - Route 24 now features two things;
 	- There's a new Fishing Rod house, which merges all the Rods in the game.
@@ -270,7 +270,7 @@ Comprehensive list can be found on Discord.
 Evolution Methods for new Pokemon
 ====
 Due to the odd way some new Pokemon evolve, methods are listed here. 
-- Beta Pokemon are included with their original methods. 
+- Prototype Pokemon are included with their original methods. 
 - Some Pokemon will have methods from the Spaceworld '97 demo to be closer to, or functional in the context of, RBY. Sometimes the newer version is available (eg. Metal Coat evolutions) for the sake of familiarity.
 - To accomodate new additions and ensure everything makes sense, some Pokemon have also had their methods changed. These situations are usually very extreme.
 
@@ -306,7 +306,7 @@ New Pokemon:
 - Tangela -> Tangrowth | L44
 - Weepinbell -> Bellignan | Use Poison Stone
 
-Kanto Beta Pokemon:
+Kanto Prototype Pokemon:
 - Bittybat -> Zubat | L14
 - Blastyke -> Blastoise | L36
 - Blottle -> Pendraken | L30
@@ -383,8 +383,8 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
 * Enigami - Reworking the Battle Tent's RestoreTeam code to make it work properly.
 * LadyMisticus - Made a well-documented spreadsheet for the hack that details every Pokemon's stats, movepools and locations, plus more! 
 * Ness the Unexplained - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin.
-* ZumiIsawhat? - Restorations of beta OST.
-* FrenchOrange - Reconstructions of various overworld beta sprites.
+* ZumiIsawhat? - Restorations of prototype OST.
+* FrenchOrange - Reconstructions of various overworld prototype sprites.
 * 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.
@@ -395,9 +395,11 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
 * wrulfy - Technical advice.
 * suloku - Technical advice regarding setting where you spawn after beating the Elite Four, Exp. All modernisation code
 * 大吟醸 (Daiginjo) - Assistance in translating the Tamamushi University Student Book, allowing for an accurate adaptation of the location.
-* 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.
+* Molk - Balancing of some prototype Pokemon, most notably Ramoose.
+* Shellnuts - Balancing of some prototype 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.
+* Dr. Lava - Translations of some content used in this hack, particularly the 1996 Pokedex book's entries for DYKG.
+* Nob Ogasawara - Prototype Pokemon names, produced for DYKG.
 
 Helix Chamber sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge, Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck
 

data/pokemon/base_stats/arcanineh.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/arcanineh.pic", 0, 1 ; sprite dimensions
 	dw ArcanineHPicFront, ArcanineHPicBack
 
-	db ROAR, EMBER, ROCK_THROW, TAKE_DOWN ; level 1 learnset, has rock throw for kicks
+	db BITE, ROAR, ROCK_THROW, NO_MOVE ; level 1 learnset, has rock throw for kicks
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset

flake.lock

@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1697957990,
+        "narHash": "sha256-LlyEQ4z1immaiZV+MQMUXM3KpNoRY/xZVm8mmN5j3yg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b3ddf9649fdac7db15aeea95cb3114c13594d265",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,59 @@
+{
+  description = "Kanto Expansion Pack Romhack";
+  inputs = {
+    nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
+    flake-utils.url = github:numtide/flake-utils;
+  };
+  outputs = { self, nixpkgs, flake-utils, ... }:
+    let
+      kepDerivation = { stdenv, src, pkgs,
+        make ? pkgs.gnumake,
+        gcc ? pkgs.gcc,
+        rgbds ? pkgs.rgbds,
+        files ? ["*.*gb*"],
+        # python3 ? pkgs.python3,
+      }: stdenv.mkDerivation rec {
+          src = ./.;
+          name = "kep-hack";
+          buildInputs = [ rgbds gcc make ];
+          installPhase = ''
+            shopt -s extglob
+            ls
+            mkdir $out
+            ${builtins.concatStringsSep "\n" (map (item: 
+                if builtins.isList item && (builtins.length item == 2)
+                then "mv ${builtins.elemAt item 0} $out/${builtins.elemAt item 1}"
+                else "cp ${item}* $out"
+              ) files)}
+          '';
+        };
+    in flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs { inherit system; overlays = [self.overlays.default]; };
+    in {
+      packages = {
+        default = pkgs.kep-hack;
+        kep-hack = pkgs.kep-hack;
+      };
+      devShells = {
+        default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            rgbds
+            gcc
+            gnumake
+            sameboy
+            imagemagick
+          ];
+        };
+      };
+    }) // {
+      overlays = {
+        default = final: prev: {
+          kep-hack = final.callPackage kepDerivation {
+            files = [
+              ["kep.gbc" "kanto-expansion-pak.gbc"]
+            ];
+          };
+        };
+      };
+    };
+}

scripts/CitrineRocketHouse.asm

@@ -74,25 +74,26 @@ JamesText:
 	ld bc, wPartyMon2 - wPartyMon1 ; This gets to the right slot for DVs
 	call AddNTimes ; Gets us there
 	; check if already maxed
-	ld b, h
+	ld b, h ; store beginning address
 	ld c, l
-	ld a, [hli]
+	ld a, [hli] ; Attack + Defence
 	cp a, %11111111
-	jr nz, .train
-	ld a, [hl]
+	jr nz, .train ; at least one stat isnt maxed
+	ld a, [hl] ; Speed + Special
 	cp a, %11111111
-	jr z, .alreadyTrained
+	jr z, .alreadyTrained ; all stats were maxed
 .train
-	; Set the DVS
-	ld h, b
+	ld h, b ; restore address
 	ld l, c
 	ld a, %11111111 ; Load FFFF FFFF, perfect 15s
 	ld [hli], a ; Attack + Defence
 	ld [hl], a ; Speed + Special
 	; And we're done!
+	
 	; Currently this doesn't automatically change the stats because it's fucking insane
 	ld hl, JamesDone
 	call PrintText
+	
 	; Bottle Cap removal service
 	ld hl, BottleCapList
 .loop

text/SilphGauntlet6F.asm

@@ -1,126 +1,254 @@
 _SilphGauntlet6FBattleText1::
-	text "Comment to be"
-	line "written."
-	cont "BROCK"
+	text "Congratulations on"
+	line "making it this far!"
+	
+	para "Now, my rock type"
+	line "#MON will pound"
+	cont "you into dust!"
 	done
 
 _SilphGauntlet6FEndBattleText1::
-	text "Comment to be"
-	line "written."
-	cont "BROCK"
+	text "Crushed again!"
 	done
 
 _SilphGauntlet6FAfterBattleText1::
-	text "Comment to be"
+	text "The CHIEF has kept"
+	line "the #MON LEAGUE"
+	cont "afloat for years!"
+	
+	para "Comment to be" ; Follow the line with something along the lines of "it's only fair..."
 	line "written."
-	cont "BROCK"
 	done
 
 _SilphGauntlet6FBattleText2::
-	text "Comment to be"
-	line "written."
-	cont "MISTY"
+	text "I've been waiting"
+	line "for this, you"
+	cont "pest!"
+	
+	para "Ever since you"
+	line "beat me, I've"
+	cont "been down on my"
+	cont "luck!"
+	
+	para "I'll give you"
+	line "the beating of"
+	cont "a lifetime!"
 	done
 
 _SilphGauntlet6FEndBattleText2::
-	text "Comment to be"
-	line "written."
-	cont "MISTY"
+	text "Eeeek! No!"
 	done
 
 _SilphGauntlet6FAfterBattleText2::
-	text "Comment to be"
-	line "written."
-	cont "MISTY" ; she idolises Lorelei and is an Elite 4 member in SW 97, a reference to that could be neat
+	text "Tell you what,"
+	line "here's a secret!"
+
+	para "One day, I want"
+	line "to be as strong"
+	cont "and beautiful as"
+	cont "LORELEI!"
+	
 	done
 
 _SilphGauntlet6FBattleText3::
-	text "Comment to be"
-	line "written."
-	cont "SURGE"
+	text "Fancy seeing you"
+	line "here!"
+	
+	para "I tell you, kid,"
+	line "electric #MON"
+	cont "saved me during"
+	cont "the war! They"
+	cont "even powered my"
+	cont "plane!"
+	
+	para "The same as I'll"
+	line "do to you!"
 	done
 
 _SilphGauntlet6FEndBattleText3::
-	text "Comment to be"
-	line "written."
-	cont "SURGE"
+	text "Did I call" ; Get this shortened.
+	line "you a pint-sized"
+	cont "challenger?"
+	
+	para "I think you're"
+	line "a gallon, now!"
 	done
 
 _SilphGauntlet6FAfterBattleText3::
-	text "Comment to be"
-	line "written."
-	cont "SURGE" ; maybe comment on how him and Blaine fought in the war together?
+	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 "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!"
+	
 	done
 
 _SilphGauntlet6FBattleText4::
-	text "Comment to be"
-	line "written."
-	cont "ERIKA"
+	text "It takes a lot" ; This sucks can you fix it
+	line "to inspire me,"
+	cont "you know!"
+	
+	para "I'm not fond of"
+	line "public things,"
+	cont "but..."
+	
+	para "Battles are quite"
+	line "different."
 	done
 
 _SilphGauntlet6FEndBattleText4::
-	text "Comment to be"
-	line "written."
-	cont "ERIKA"
+	text "You have"
+	line "grown even"
+	cont "stronger..."
 	done
 
 _SilphGauntlet6FAfterBattleText4::
-	text "Comment to be"
-	line "written."
-	cont "ERIKA"
+	text "Hmm? How did I"
+	line "become a TRAINER?"
+	cont "It's quite odd,"
+	cont "isn't it?"
+	
+	para "My VILEPLUME" ; Anime reference.
+	line "saved me from a"
+	cont "GRIMER attack"
+	cont "when I was..."
+	
+	para "About your age!"
+	
+	para "CELADON is still"
+	line "polluted, but"
+	cont "we're working"
+	cont "on it!"
 	done
 	
+; An alternate quote.
+; It's a bit too fanficy and I think Erika getting zooted off Vileplume violates her lore a bit.
+; Maybe it could be used somewhere else?
+;	text "Hmm? Why am I"
+;	line "always asleep?"
+;	
+;	para "VILEPLUME'S"
+;	line "SLEEP POWDER..."
+;	
+;	para "Before I drift"
+;	line "off, it gives"
+;	cont "a euphoric"
+;	cont "feeling..."
+;	
+;	para "Zzz..."
+
+
 _SilphGauntlet6FBattleText5::
-	text "Comment to be"
-	line "written."
-	cont "KOGA"
+	text "Fwahahaha!"
+	
+	para "I have honed"
+	line "my skills just"
+	cont "for you, <PLAYER>!"
+	
+	para "Can you keep up?"
 	done
 
 _SilphGauntlet6FEndBattleText5::
-	text "Comment to be"
-	line "written."
-	cont "KOGA"
+	text "Indeed!"
+	line "Indeed you can!"
 	done
 
 _SilphGauntlet6FAfterBattleText5::
-	text "Comment to be"
-	line "written."
-	cont "KOGA" ; have him mention Janine, maybe?
+	text "I feel that I"
+	line "have outgrown"
+	cont "my roots."
+	
+	para "To train, I"
+	line "watch over the"
+	cont "SAFARI ZONE,"
+	cont "but I must aim"
+	cont "higher!"
+	
+	para "Perhaps it is"
+	line "time for my"
+	cont "daughter to"
+	cont "take over..."
 	done
 
 _SilphGauntlet6FBattleText6::
-	text "Comment to be"
-	line "written."
-	cont "SABRINA"
+	text "After beating"
+	line "the KARATE KING,"
+	cont "I felt nigh"
+	cont "unstoppable..."
+	
+	para "But you humbled"
+	line "me. Allow me"
+	cont "to reclaim that"
+	cont "high!"
 	done
 
 _SilphGauntlet6FEndBattleText6::
-	text "Comment to be"
-	line "written."
-	cont "SABRINA"
+	text "I wanted"
+	line "to fight fate,"
+	cont "but..."
 	done
 
 _SilphGauntlet6FAfterBattleText6::
-	text "Comment to be"
-	line "written."
-	cont "SABRINA"
+	text "It's impossible" ; This is kind of incoherent, could easily be fixed.
+	line "for me to change"
+	cont "my future."
+
+	para "Looking into my"
+	line "own, though..."
+	
+	para "A movie star?"
+	
+	para "That would be"
+	line "good..."
 	done
 	
 _SilphGauntlet6FBattleText7::
-	text "Comment to be"
-	line "written."
-	cont "BLAINE"
+	text "Back in the day,"
+	line "me and the CHIEF"
+	cont "were super close!"
+	
+	para "Some couldn't even"
+	line "tell us apart!"
+	
+	para "Now..."
+	
+	para "When I fight hard,"
+	line "I get a little hot"
+	cont "under the collar." ; Puzzle League
+	
+	para "Think you can take"
+	line "me?"
 	done
 
 _SilphGauntlet6FEndBattleText7::
-	text "Comment to be"
-	line "written."
-	cont "BLAINE"
+	text "Whoa, hey!" ; Gen 5 quote
+	line "I'm a raging"
+	cont "inferno!"
 	done
 
 _SilphGauntlet6FAfterBattleText7::
-	text "Comment to be"
-	line "written."
-	cont "BLAINE"
+	text "The war? I don't"
+	line "talk about it"
+	cont "often, but..."
+	
+	para "Frankly, I quite" ; Reference to Adrian Carton de Wiart.
+	line "enjoyed it." ; There's a lot of "British" references in RGBY, so it fits.
+	
+	para "Say, <PLAYER>."
+	
+	para "Recently, that"
+	line "volcano has been"
+	cont "quite active."
+	
+	para "I know what this"
+	line "means. I'll always"
+	cont "be ready."
 	done