Skip to content
Permalink
Browse files

Change starter pokemon

- Mew
- Pikachu
- Snorlax

Note: Final rival battle starter pokemon has `Hyper Beam`
  • Loading branch information...
eddmann committed Feb 23, 2019
1 parent e614592 commit 5d86068da8ef0a8967caa7c2fd654b54518e7f31
Showing with 44 additions and 86 deletions.
  1. +3 −3 constants/starter_mons.asm
  2. +24 −24 data/trainer_parties.asm
  3. +1 −10 engine/battle/read_trainer_party.asm
  4. +13 −33 scripts/OaksLab.asm
  5. +3 −16 text/maps/OaksLab.asm
@@ -1,3 +1,3 @@
STARTER1 EQU CHARMANDER
STARTER2 EQU SQUIRTLE
STARTER3 EQU BULBASAUR
STARTER1 EQU MEW
STARTER2 EQU PIKACHU
STARTER3 EQU SNORLAX
@@ -459,17 +459,17 @@ BlackbeltData:
; Victory Road 2F
db 43,MACHOKE,MACHOP,MACHOKE,0
Green1Data:
db 5,SQUIRTLE,0
db 5,BULBASAUR,0
db 5,CHARMANDER,0
db 5,STARTER2,0
db 5,STARTER3,0
db 5,STARTER1,0
; Route 22
db $FF,9,PIDGEY,8,SQUIRTLE,0
db $FF,9,PIDGEY,8,BULBASAUR,0
db $FF,9,PIDGEY,8,CHARMANDER,0
db $FF,9,PIDGEY,8,STARTER2,0
db $FF,9,PIDGEY,8,STARTER3,0
db $FF,9,PIDGEY,8,STARTER1,0
; Cerulean City
db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0
db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0
db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0
db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,STARTER2,0
db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,STARTER3,0
db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,STARTER1,0
ProfOakData:
; Unused
db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0
@@ -631,25 +631,25 @@ GentlemanData:
db 17,GROWLITHE,PONYTA,0
Green2Data:
; SS Anne 2F
db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0
db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0
db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0
db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,STARTER2,0
db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,STARTER3,0
db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,STARTER1,0
; Pokémon Tower 2F
db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0
db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0
db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0
db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,STARTER2,0
db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,STARTER3,0
db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,STARTER1,0
; Silph Co. 7F
db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0
db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0
db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0
db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,STARTER2,0
db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,STARTER3,0
db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,STARTER1,0
; Route 22
db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0
db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0
db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0
db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,STARTER2,0
db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,STARTER3,0
db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,STARTER1,0
Green3Data:
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,STARTER2,0
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,STARTER3,0
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,STARTER1,0
LoreleiData:
db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
ChannelerData:
@@ -130,16 +130,7 @@ ReadTrainer:
ld [wEnemyMon1Moves + 2], a

; starter
ld a, [wRivalStarter]
cp STARTER3
ld b, MEGA_DRAIN
jr z, .GiveStarterMove
cp STARTER1
ld b, FIRE_BLAST
jr z, .GiveStarterMove
ld b, BLIZZARD ; must be squirtle
.GiveStarterMove
ld a, b
ld a, HYPER_BEAM
ld [wEnemyMon6Moves + 2], a
.FinishUp
; clear wAmountMoneyWon addresses
@@ -193,11 +193,11 @@ OaksLabScript7:
OaksLabScript8:
ld a, [wPlayerStarter]
cp STARTER1
jr z, .Charmander
jr z, .Starter1
cp STARTER2
jr z, .Squirtle
jr .Bulbasaur
.Charmander
jr z, .Starter2
jr .Starter3
.Starter1
ld de, .MiddleBallMovement1
ld a, [wYCoord]
cp $4 ; is the player standing below the table?
@@ -221,7 +221,7 @@ OaksLabScript8:
db NPC_MOVEMENT_RIGHT
db $FF

.Squirtle
.Starter2
ld de, .RightBallMovement1
ld a, [wYCoord]
cp $4 ; is the player standing below the table?
@@ -247,7 +247,7 @@ OaksLabScript8:
db NPC_MOVEMENT_RIGHT
db $FF

.Bulbasaur
.Starter3
ld de, .LeftBallMovement1
ld a, [wXCoord]
cp $9 ; is the player standing to the right of the table?
@@ -385,15 +385,15 @@ OaksLabScript11:
ld [wCurOpponent], a
ld a, [wRivalStarter]
cp STARTER2
jr nz, .NotSquirtle
jr nz, .NotStarter2
ld a, $1
jr .done
.NotSquirtle
.NotStarter2
cp STARTER3
jr nz, .Charmander
jr nz, .Starter1
ld a, $2
jr .done
.Charmander
.Starter1
ld a, $3
.done
ld [wTrainerNo], a
@@ -860,31 +860,11 @@ OaksLabScript_1d157:
ld c, 10
call DelayFrames
ld a, [wSpriteIndex]
cp $2
jr z, OaksLabLookAtCharmander
cp $3
jr z, OaksLabLookAtSquirtle
jr OaksLabLookAtBulbasaur

OaksLabLookAtCharmander:
ld hl, OaksLabCharmanderText
jr OaksLabMonChoiceMenu
OaksLabCharmanderText:
TX_FAR _OaksLabCharmanderText
db "@"

OaksLabLookAtSquirtle:
ld hl, OaksLabSquirtleText
ld hl, OaksLabStarterText
jr OaksLabMonChoiceMenu
OaksLabSquirtleText:
TX_FAR _OaksLabSquirtleText
db "@"

OaksLabLookAtBulbasaur:
ld hl, OaksLabBulbasaurText
jr OaksLabMonChoiceMenu
OaksLabBulbasaurText:
TX_FAR _OaksLabBulbasaurText
OaksLabStarterText:
TX_FAR _OaksLabStarterText
db "@"

OaksLabMonChoiceMenu:
@@ -25,22 +25,9 @@ _OaksLabText39::
cont "contain #MON!"
done

_OaksLabCharmanderText::
text "So! You want the"
line "fire #MON,"
cont "CHARMANDER?"
done

_OaksLabSquirtleText::
text "So! You want the"
line "water #MON,"
cont "SQUIRTLE?"
done

_OaksLabBulbasaurText::
text "So! You want the"
line "plant #MON,"
cont "BULBASAUR?"
_OaksLabStarterText::
text "So! You want this"
line "#MON?"
done

_OaksLabMonEnergeticText::

0 comments on commit 5d86068

Please sign in to comment.
You can’t perform that action at this time.