Pikachu/Eevee Mode Part 2

Thanks to Frrf for helping me fix the broken code I initially sent in. This commit refines the mode so that the Oak Lab cutscene is finished and the party picking process is all concrete.

Also, given Surge is a fight, the S.S. Anne Pikachu rival can have Raichu, surely...

Also, the UnusedNames files were, in fact, needed...otherwise, the item names get all corrupted. Probably left some code behind.

So we officially have a new funky mode!
This commit is contained in:
May Evans 2023-03-28 19:07:51 +01:00
parent 73784d619a
commit eb46fbdaf6
14 changed files with 104 additions and 79 deletions

View file

@ -143,7 +143,7 @@ CeruleanCityScript1:
; select which team to use during the encounter
ld a, [wRivalStarter]
cp STARTER1
cp STARTER2
jr nz, .NotSquirtle
ld a, $11
jr .done
@ -153,17 +153,17 @@ CeruleanCityScript1:
ld a, $12
jr .done
.Charmander
cp STARTER2 ; changes start here
cp STARTER1 ; changes start here
ld a, $13
jr nz, .Pikachu
jr .done
.Pikachu ;
cp STARTER4
jr nz, .Eevee
ld a, $14
ld a, $15
jr .done
.Eevee
ld a, $15
ld a, $14
jr .done
.done
ld [wTrainerNo], a