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

@ -34,10 +34,10 @@ DEF SHOW EQU $15
const HS_SAFFRON_CITY_D ; 16
const HS_SAFFRON_CITY_E ; 17
const HS_SAFFRON_CITY_F ; 18
const HS_ROUTE_2_ITEM_1 ; 19
const HS_ROUTE_2_ITEM_2 ; 1A
;const HS_POKEDEX_1 ; 1B
;const HS_POKEDEX_2 ; 1C
const HS_ROUTE_2_ITEM_1 ; 19 X
const HS_ROUTE_2_ITEM_2 ; 1A X
const HS_ROUTE_4_ITEM ; 1B X
const HS_ROUTE_9_ITEM ; 1C X
const HS_ROUTE_12_SNORLAX ; 1D
const HS_ROUTE_12_ITEM_1 ; 1E X
const HS_ROUTE_12_ITEM_2 ; 1F X
@ -56,8 +56,8 @@ DEF SHOW EQU $15
const HS_STARTER_BALL_2 ; 2C
const HS_STARTER_BALL_3 ; 2D
const HS_OAKS_LAB_OAK_1 ; 2E
const HS_STARTER_BALL_4 ; 2F, Pikachu, was HS_POKEDEX_1
const HS_STARTER_BALL_5 ; 30, Eevee, was HS_POKEDEX_2
const HS_STARTER_BALL_4 ; 2F, was dex, pikachu
const HS_STARTER_BALL_5 ; 30, was dex, eevee
const HS_OAKS_LAB_OAK_2 ; 31
const HS_VIRIDIAN_GYM_GIOVANNI ; 32
const HS_VIRIDIAN_GYM_ITEM ; 33 X