Wired up the 4 trainers

m4-used-rollout · m4-used-rollout · commit 7b8128f40e60 · 2025-01-30T05:23:27.000-05:00
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
@@ -17,7 +17,7 @@
 	const EVENT_USED_MASTER_BALL ; Used to determine Chief's dialogue in the end-game.
 	const EVENT_MYSTERY_BOX_ACTIVATED
 	const_skip 3
-	const EVENT_BEAT_DREAM_RED
+	const EVENT_BEAT_DREAM_KRIS
 	const_skip 6
 	const EVENT_GOT_TOWN_MAP
 	const EVENT_ENTERED_BLUES_HOUSE
@@ -56,6 +56,8 @@
 	const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7
 	const_skip 3
 	const EVENT_GIOVANNIS_ROOM_DOOR_UNLOCKED
+	const_skip 3
+	const EVENT_BEAT_TPP_ROCKETA
 
 ; Pewter City events
 	const_next $68
@@ -569,6 +571,7 @@
 	const EVENT_57E ; Jessie & James related.
 	const EVENT_GOT_DOME_FOSSIL
 	const EVENT_GOT_HELIX_FOSSIL
+	const EVENT_BEAT_TPP_CCC
 
 ; S.S. Anne events
 	const_next $5C0
@@ -614,7 +617,9 @@
 	const_skip 4
 	const EVENT_BEAT_ZAPDOSG
 	const_skip 7
-	const EVENT_BEAT_DRAGONITE 
+	const EVENT_BEAT_DRAGONITE
+	const_skip 7
+	const EVENT_BEAT_TPP_BBBBBa
 
 ; Celadon University, Salesman
 	const_next $650
@@ -783,6 +788,8 @@
 	const_next $8C0
 	const_skip
 	const EVENT_BEAT_MEWTWO
+	const_skip 7
+	const EVENT_BEAT_TPP_KAY
 
 ; Indigo Plateau events
 	const_next $8E0
diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
@@ -52,11 +52,11 @@
 	const SPRITE_FISHER                  ; $2f
 	const SPRITE_KOGA                    ; $30
 	const SPRITE_GUARD                   ; $31
-	const SPRITE_UNUSED_RED_2            ; $32
+	const SPRITE_GREEN                   ; $32
 	const SPRITE_MOM                     ; $33
 	const SPRITE_BALDING_GUY             ; $34
 	const SPRITE_LITTLE_BOY              ; $35
-	const SPRITE_UNUSED_RED_3            ; $36
+	const SPRITE_TEAL                    ; $36
 	const SPRITE_GAMEBOY_KID             ; $37
 	const SPRITE_FAIRY                   ; $38
 	const SPRITE_AGATHA                  ; $39
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
@@ -120,7 +120,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw NoHS
-	dw NoHS
+	dw FarawayIslandOutsideHS
 	dw FarawayIslandInsideHS
 	dw PokemonMansionB2FHS
 	dw MtMoonCraterHS
@@ -257,7 +257,7 @@ MapHSPointers:
 	dw NoHS 
 	dw NoHS
 	dw BrunswickGladeHS
-	dw NoHS
+	dw MtSilverHS
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 
@@ -353,6 +353,7 @@ CeruleanCaveHS:
 	db CERULEAN_CAVE_1F, $01, SHOW            ; HS_CERULEAN_CAVE_1F_ITEM_1
 	db CERULEAN_CAVE_1F, $02, SHOW            ; HS_CERULEAN_CAVE_1F_ITEM_2
 	db CERULEAN_CAVE_1F, $03, SHOW            ; HS_CERULEAN_CAVE_1F_ITEM_3
+	db CERULEAN_CAVE_1F, $04, HIDE            ; HS_TPP_KAY
 CelesteHillHS:
 	db CELESTE_HILL, $01, SHOW                ; HS_MOLTRES_G
 PokemonTower2FHS:
@@ -564,6 +565,8 @@ SeafoamIslandsB4FHS:
 	db SEAFOAM_ISLANDS_B4F, $03, SHOW         ; HS_ARTICUNO
 FarawayIslandInsideHS:
 	db FARAWAY_ISLAND_INSIDE, $01, SHOW       ; HS_MEW
+FarawayIslandOutsideHS:
+	db FARAWAY_ISLAND_OUTSIDE, $01, HIDE      ; HS_TPP_BBBBBa
 PokemonMansionB2FHS:
 	db POKEMON_MANSION_B2F, $03, SHOW         ; HS_POKEMON_MANSION_B2F_ITEM_1
 	db POKEMON_MANSION_B2F, $04, SHOW         ; HS_POKEMON_MANSION_B2F_ITEM_2
@@ -572,9 +575,11 @@ MtMoonCraterHS:
 	db MT_MOON_CRATER, $02, SHOW              ; HS_MT_MOON_CRATER_ITEM_2
 	db MT_MOON_CRATER, $03, SHOW              ; HS_MT_MOON_CRATER_ITEM_3
 	db MT_MOON_CRATER, $04, SHOW              ; HS_MT_MOON_CRATER_ITEM_4
+	db MT_MOON_CRATER, $05, HIDE              ; HS_TPP_CCC
 GiovannisRoomHS:
 	db GIOVANNIS_ROOM, $05, SHOW              ; HS_GIOVANNIS_ROOM_ITEM_1
 	db GIOVANNIS_ROOM, $06, SHOW              ; HS_GIOVANNIS_ROOM_ITEM_2
+	db GIOVANNIS_ROOM, $07, HIDE              ; HS_TPP_ROCKETA
 RockTunnelB1FHS:
 	db ROCK_TUNNEL_B1F, $0A, SHOW             ; HS_ROCK_TUNNEL_B1F_DOME
 	db ROCK_TUNNEL_B1F, $0B, SHOW             ; HS_ROCK_TUNNEL_B1F_HELIX
@@ -595,5 +600,5 @@ BrunswickGladeHS:
 CinnabarVolcanoFloorsHS:
 	db CINNABAR_VOLCANO_FLOORS, $05, SHOW
 MtSilverHS:
-	db MT_SILVER, $01, SHOW					 ; HS_TPP_RED
+	db MT_SILVER, $01, HIDE					 ; HS_TPP_KRIS
 	assert_table_length NUM_HS_OBJECTS
diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm
@@ -18,5 +18,6 @@ CeruleanCave1F_Object:
 	object_event  7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE
 	object_event 19,  3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER
 	object_event  5,  0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
+	object_event 24,  2, SPRITE_RED, STAY, DOWN, 4, OPP_KAY, 1
 
 	def_warps_to CERULEAN_CAVE_1F
diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm
@@ -9,6 +9,6 @@ CeruleanCaveB1F_Object:
 	def_object_events
 	object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70 | OW_POKEMON
 	object_event 16,  9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
-	object_event 18,  1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
+	object_event 20,  7, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
 
 	def_warps_to CERULEAN_CAVE_B1F
diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm
@@ -11,5 +11,6 @@ FarawayIslandOutside_Object:
 	bg_event  4, 29, 1 ; Sign
 
 	def_object_events
+	object_event  3, 29, SPRITE_GREEN, STAY, RIGHT,  2, OPP_BBBBBa, 1
 
 	def_warps_to FARAWAY_ISLAND_OUTSIDE
diff --git a/data/maps/objects/GiovannisRoom.asm b/data/maps/objects/GiovannisRoom.asm
@@ -14,5 +14,6 @@ GiovannisRoom_Object:
 	object_event 14, 24, SPRITE_PAPER, STAY, RIGHT, 4
 	object_event 18,  4, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
 	object_event  5, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR
+	object_event 18,  8, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKETA, 1
 
 	def_warps_to GIOVANNIS_ROOM
diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm
@@ -11,5 +11,6 @@ MtMoonCrater_Object:
 	object_event 32, 32, SPRITE_FOSSIL, STAY, NONE, 2, WING_FOSSIL
 	object_event 33, 16, SPRITE_FOSSIL, STAY, NONE, 3, HELIX_FOSSIL
 	object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 4, MAX_ETHER
+	object_event 20, 41, SPRITE_RED, STAY, UP, 5, OPP_CCC, 1
 
 	def_warps_to MT_MOON_CRATER
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
@@ -57,11 +57,11 @@ SpriteSheetPointerTable:
 	overworld_sprite FisherSprite, 12           ; SPRITE_FISHER
 	overworld_sprite KogaSprite, 12             ; SPRITE_KOGA
 	overworld_sprite GuardSprite, 12            ; SPRITE_GUARD
-	overworld_sprite RedSprite, 12              ; SPRITE_UNUSED_RED_2
+	overworld_sprite GreenSprite, 12            ; SPRITE_GREEN
 	overworld_sprite MomSprite, 12              ; SPRITE_MOM
 	overworld_sprite BaldingGuySprite, 12       ; SPRITE_BALDING_GUY
 	overworld_sprite LittleBoySprite, 12        ; SPRITE_LITTLE_BOY
-	overworld_sprite RedSprite, 12              ; SPRITE_UNUSED_RED_3
+	overworld_sprite TealSprite, 12             ; SPRITE_TEAL
 	overworld_sprite GameboyKidSprite, 12       ; SPRITE_GAMEBOY_KID
 	overworld_sprite FairySprite, 12            ; SPRITE_FAIRY
 	overworld_sprite AgathaSprite, 12           ; SPRITE_AGATHA
diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm
@@ -63,6 +63,6 @@ TrainerPicAndMoneyPointers::
 	pic_money KrisPic,         9900
 	pic_money RedPicFront,     9900
 	pic_money RedPicFront,     9900
-	pic_money RedPicFront,     9900
+	pic_money GreenPicFront,   9900
 	pic_money RocketPic,       9900
 	assert_table_length NUM_TRAINERS
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
@@ -7146,9 +7146,14 @@ _LoadTrainerPic:
 	and a
 	jr nz, .useRed
 	ld a, [wTrainerClass]
+	cp ROCKETA ; After Lance, but uses a normal Rocket pic
+	jr z, .normalBank
+	cp CCC ; This and the next two use player pics
+	jr nc, .useRed
 	cp LANCE ; first trainer class in "Pics 10" - Rangi's code to load more trainer pics
 	ld a, Bank("Pics 10")
 	jr nc, .loadSprite
+.normalBank
 	ld a, Bank("Pics 6")
 	jr .loadSprite
 .useRed
diff --git a/engine/events/hidden_objects/reds_room.asm b/engine/events/hidden_objects/reds_room.asm
@@ -14,11 +14,12 @@ RedBedroomPCText::
 	script_players_pc
 
 RedsBed:
-	CheckEvent EVENT_POST_GAME_ATTAINED
+ ;	CheckEvent EVENT_POST_GAME_ATTAINED
+	CheckEvent EVENT_BEAT_TPP_ROCKETA
 	ret z
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	CheckEvent EVENT_BEAT_DREAM_RED
+	CheckEvent EVENT_BEAT_DREAM_KRIS
 	jr z, .warpToMtSilver
 	tx_pre_jump RedsBedDreamText ; "Was it just a dream?"
 
@@ -44,6 +45,10 @@ RedsBed:
 	call DelayFrames
 	call GBPalNormal
 
+	ld a, HS_TPP_KRIS
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+
 	tx_pre RedsBedMtSilverText ; "Later that night..."
 	ld a, MT_SILVER
 	ld [wd72d], a
diff --git a/gfx/pics.asm b/gfx/pics.asm
@@ -347,7 +347,7 @@ BirdKeeperPic::    INCBIN "gfx/trainers/birdkeeper.pic"
 BlackbeltPic::     INCBIN "gfx/trainers/blackbelt.pic"
 Rival1Pic::        INCBIN "gfx/trainers/rival1.pic"
 ProfOakPic::       INCBIN "gfx/trainers/prof.oak.pic"
-ChiefPic::	   INCBIN "gfx/trainers/chief.pic"
+ChiefPic::	       INCBIN "gfx/trainers/chief.pic"
 ScientistPic::     INCBIN "gfx/trainers/scientist.pic"
 GiovanniPic::      INCBIN "gfx/trainers/giovanni.pic"
 RocketPic::        INCBIN "gfx/trainers/rocket.pic"
@@ -596,4 +596,4 @@ KoichiPic::	  	    INCBIN "gfx/trainers/koichi.pic"
 JackPic::		    INCBIN "gfx/trainers/jack.pic"
 JessieJamesPic::	INCBIN "gfx/trainers/jessiejames.pic"
 GiovanniPic2::	    INCBIN "gfx/trainers/giovanni2.pic"
-KrisPic::           INCBIN "gfx/trainers/kris.pic"
+KrisPic::           INCBIN "gfx/trainers/kris.pic"
diff --git a/gfx/sprites.asm b/gfx/sprites.asm
@@ -35,10 +35,10 @@ SECTION "NPC Sprites 2", ROMX
 
 RedBikeSprite::          INCBIN "gfx/sprites/red_bike.2bpp"
 RedSprite::              INCBIN "gfx/sprites/red.2bpp"
-GreenBikeSprite::          INCBIN "gfx/sprites/green_bike.2bpp"
-GreenSprite::              INCBIN "gfx/sprites/green.2bpp"
-TealBikeSprite::          INCBIN "gfx/sprites/teal_bike.2bpp"
-TealSprite::              INCBIN "gfx/sprites/teal.2bpp"
+GreenBikeSprite::        INCBIN "gfx/sprites/green_bike.2bpp"
+GreenSprite::            INCBIN "gfx/sprites/green.2bpp"
+TealBikeSprite::         INCBIN "gfx/sprites/teal_bike.2bpp"
+TealSprite::             INCBIN "gfx/sprites/teal.2bpp"
 BlueSprite::             INCBIN "gfx/sprites/blue.2bpp"
 OakSprite::              INCBIN "gfx/sprites/oak.2bpp"
 YoungsterSprite::        INCBIN "gfx/sprites/youngster.2bpp"
diff --git a/maps/CeruleanCave1F.blk b/maps/CeruleanCave1F.blk
@@ -1,2 +1,2 @@
- "||b	-}f}N_vvvvvvvv#vvvvr}|qvv,-Xv=,vtfvvvfvf+}_ "vv-
+ "||b	-}}N_vvvvvvvv#vvvvr}|qvv,-Xv=,vtfvvvfvf+}_ "vv-
 } "$
diff --git a/ram/wram.asm b/ram/wram.asm
@@ -2128,7 +2128,9 @@ wSeafoamIslandsB4FCurScript:: db
 wRoute18Gate1FCurScript:: db
 wBattleTentCurScript:: db
 wGiovannisRoomCurScript:: db
-	ds 4
+wCeruleanCave1FCurScript:: db
+wFarawayIslandOutsideCurScript:: db
+	ds 2
 wGameProgressFlagsEnd::
 
 UNION
diff --git a/scripts/CeruleanCave1F.asm b/scripts/CeruleanCave1F.asm
@@ -1,7 +1,64 @@
 CeruleanCave1F_Script:
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ld hl, CeruleanCave1F_TrainerHeaders
+	ld de, CeruleanCave1F_ScriptPointers
+	ld a, [wCeruleanCave1FCurScript]
+	call ExecuteCurMapScriptInTable
+	ld [wCeruleanCave1FCurScript], a
+	ret
 
+CeruleanCave1F_ScriptPointers:
+	dw CheckFightingMapTrainers
+	dw DisplayEnemyTrainerTextAndStartBattle
+	dw BeatTPPKAY
+
+CeruleanCave1F_TrainerHeaders:
+	def_trainers
+KAYTrainerHeader:
+	trainer EVENT_BEAT_TPP_KAY, 0, KAYIntroText, KAYOutroText, KAYIntroText	
+	db -1 ; end
+	
 CeruleanCave1F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
+	dw TPPKAYText
+
+TPPKAYText:
+	text_asm
+	ld hl, KAYTrainerHeader
+	call TalkToTrainer
+	jp TextScriptEnd
+
+BeatTPPKAY:
+	call EndTrainerBattle
+	ld a, [wIsInBattle]
+	cp $ff
+	jp z, ResetButtonPressedAndMapScript
+	call UpdateSprites
+	ld a, $f0
+	ld [wJoyIgnore], a
+	call GBFadeOutToBlack
+	ld a, HS_TPP_KAY
+	ld [wMissableObjectIndex], a
+	predef HideObject
+	ld a, HS_TPP_BBBBBa
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	ResetEvent EVENT_BEAT_TPP_BBBBBa
+	call UpdateSprites
+	ld c, 30
+	call DelayFrames
+	call GBFadeInFromBlack
+	xor a
+	ld [wJoyIgnore], a
+	jp PlayDefaultMusicFadeOutCurrent
+
+KAYOutroText:
+	text "B"
+	prompt
+
+KAYIntroText:
+	text "…"
+	line "…"
+	done
diff --git a/scripts/FarawayIslandOutside.asm b/scripts/FarawayIslandOutside.asm
@@ -1,10 +1,68 @@
 FarawayIslandOutside_Script:
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ld hl, FarawayIslandOutsideTrainerHeaders
+	ld de, FarawayIslandOutside_ScriptPointers
+	ld a, [wFarawayIslandOutsideCurScript]
+	call ExecuteCurMapScriptInTable
+	ld [wFarawayIslandOutsideCurScript], a
+	ret
+
+FarawayIslandOutside_ScriptPointers:
+	dw CheckFightingMapTrainers
+	dw DisplayEnemyTrainerTextAndStartBattle
+	dw BeatTPPBBBBBa
 
 FarawayIslandOutside_TextPointers:
 	dw FarawayIslandSign
+	dw TPPBBBBBaText
 
 FarawayIslandSign:
 	text_far _FarawayIslandSign
 
 	text_end ; unused
+
+FarawayIslandOutsideTrainerHeaders:
+	def_trainers
+BBBBBaTrainerHeader:
+	trainer EVENT_BEAT_TPP_BBBBBa, 0, BBBBBaIntroText, BBBBBaOutroText, BBBBBaIntroText
+	db -1 ; end
+
+TPPBBBBBaText:
+	text_asm
+	ld hl, BBBBBaTrainerHeader
+	call TalkToTrainer
+	jp TextScriptEnd
+
+BeatTPPBBBBBa:
+	call EndTrainerBattle
+	ld a, [wIsInBattle]
+	cp $ff
+	jp z, ResetButtonPressedAndMapScript
+	call UpdateSprites
+	ld a, $f0
+	ld [wJoyIgnore], a
+	call GBFadeOutToBlack
+	ld a, HS_TPP_BBBBBa
+	ld [wMissableObjectIndex], a
+	predef HideObject
+	ld a, HS_TPP_ROCKETA
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	ResetEvent EVENT_BEAT_TPP_ROCKETA
+	call UpdateSprites
+	ld c, 30
+	call DelayFrames
+	call GBFadeInFromBlack
+	xor a
+	ld [wJoyIgnore], a
+	jp PlayDefaultMusicFadeOutCurrent
+
+BBBBBaOutroText:
+	text "B B B B B"
+	line "A"
+	prompt
+
+BBBBBaIntroText:
+	text "START"
+	line "…"
+	done
diff --git a/scripts/GiovannisRoom.asm b/scripts/GiovannisRoom.asm
diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm
diff --git a/scripts/MtMoonCrater.asm b/scripts/MtMoonCrater.asm
diff --git a/scripts/MtSilver.asm b/scripts/MtSilver.asm
