thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Giovanni uses his unused theme, and more!

Browse source 
This update does a good few things. Giovanni now uses his unused encounter theme in all pre-fights, which is followed by the regular evil trainer theme when you're about to fight him. This feels very correct. His team has also been minorly altered.

I backported LGPE's pre-fight monologue for Giovanni in Rocket Hideout B4F. Adapted for RB's story, of course, no Cubones here. The original text is very awkward and abrupt, and it also makes the encounter theme feel much more effective in delivery. I think a lot of people can appreciate this.

I also backported Jessie and James for Rocket Hideout B4F while I was at it. I had to change their event script quite a bit for it to fit, and their walking seems...awkward. Regardless, it's functional. The rest will be done with time.

To make future dev door testing easier, I'm keeping all warps I've previously used in comments.
This commit is contained in:
Llinos Evans 2023-05-05 04:48:58 +01:00
parent 48bf1bfe45
commit 16e3c69ee8
14 changed files with 407 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio.asm
View file

@ -371,7 +371,7 @@ SECTION "RBY Songs 4", ROMX
INCLUDE "crysaudio/music/RBY/yellowintro.asm"
INCLUDE "crysaudio/music/RBY/surfingpikachu.asm"
INCLUDE "crysaudio/music/RBY/yellowunusedsong.asm"
INCLUDE "crysaudio/music/RBY/sakaki.asm"
INCLUDE "crysaudio/music/RBY/meetjessiejames.asm"
INCLUDE "crysaudio/music/RBY/digda01.asm"
INCLUDE "crysaudio/music/RBY/field06.asm"

4
constants/event_constants.asm
View file

@ -685,7 +685,9 @@
const_skip 15
const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0
const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1
const_skip 15
const_skip 13
const EVENT_6A0
const_skip
const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2

2
constants/hide_show_constants.asm
View file

@ -150,6 +150,8 @@ DEF SHOW EQU $15
const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 8A X
const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 8B X
const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 8C
const HS_ROCKET_HIDEOUT_B4F_JAMES ; uhhh 86
const HS_ROCKET_HIDEOUT_B4F_JESSIE ; uhhh87
const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 8D X
const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 8E X
const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 8F X

1
constants/music_constants.asm
View file

@ -59,6 +59,7 @@
const MUSIC_FIELD06
const MUSIC_MEET_JESSIE_JAMES
const MUSIC_MTMOONSQUARE
const MUSIC_SAKAKI
const NUM_SONGS

34
crysaudio/music/RBY/yellowunusedsong.asm → crysaudio/music/RBY/sakaki.asm
View file

@ -1,11 +1,11 @@
Music_YellowUnusedSong::
Music_Sakaki::
channel_count 4
channel 1, Music_YellowUnusedSong_Ch1
channel 2, Music_YellowUnusedSong_Ch2
channel 3, Music_YellowUnusedSong_Ch3
channel 4, Music_YellowUnusedSong_Ch4
channel 1, Music_Sakaki_Ch1
channel 2, Music_Sakaki_Ch2
channel 3, Music_Sakaki_Ch3
channel 4, Music_Sakaki_Ch4
Music_YellowUnusedSong_Ch1::
Music_Sakaki_Ch1::
tempo 140
volume 7, 7
duty_cycle 3
@ -32,7 +32,7 @@ Music_YellowUnusedSong_Ch1::
note G_, 6
note A_, 12
Music_YellowUnusedSong_branch_82fde::
Music_Sakaki_branch_82fde::
note A_, 6
note A_, 2
note A_, 2
@ -79,10 +79,10 @@ Music_YellowUnusedSong_branch_82fde::
note A_, 6
note G_, 6
note A_, 12
sound_loop 0, Music_YellowUnusedSong_branch_82fde
sound_loop 0, Music_Sakaki_branch_82fde
Music_YellowUnusedSong_Ch2::
Music_Sakaki_Ch2::
duty_cycle 2
note_type 8, 12, 2
octave 4
@ -108,7 +108,7 @@ Music_YellowUnusedSong_Ch2::
note A#, 6
note A_, 12
Music_YellowUnusedSong_branch_8302a::
Music_Sakaki_branch_8302a::
note D_, 6
note D_, 2
note D_, 2
@ -165,10 +165,10 @@ Music_YellowUnusedSong_branch_8302a::
note D_, 6
note A#, 6
note A_, 12
sound_loop 0, Music_YellowUnusedSong_branch_8302a
sound_loop 0, Music_Sakaki_branch_8302a
Music_YellowUnusedSong_Ch3::
Music_Sakaki_Ch3::
note_type 12, 1, 0
vibrato 2, 1, 5
rest 16
@ -180,7 +180,7 @@ Music_YellowUnusedSong_Ch3::
note G_, 8
note A#, 8
Music_YellowUnusedSong_branch_83075::
Music_Sakaki_branch_83075::
note A_, 8
note A#, 8
note G_, 8
@ -206,10 +206,10 @@ Music_YellowUnusedSong_branch_83075::
note D#, 8
note G_, 8
note A#, 8
sound_loop 0, Music_YellowUnusedSong_branch_83075
sound_loop 0, Music_Sakaki_branch_83075
Music_YellowUnusedSong_Ch4::
Music_Sakaki_Ch4::
toggle_noise 0
drum_speed 12
drum_note 3, 4
@ -239,7 +239,7 @@ Music_YellowUnusedSong_Ch4::
drum_note 3, 4
drum_note 3, 4
Music_YellowUnusedSong_branch_830c3::
Music_Sakaki_branch_830c3::
drum_note 3, 4
drum_speed 8
drum_note 3, 2
@ -331,4 +331,4 @@ Music_YellowUnusedSong_branch_830c3::
drum_note 3, 2
drum_note 3, 4
drum_note 3, 4
sound_loop 0, Music_YellowUnusedSong_branch_830c3
sound_loop 0, Music_Sakaki_branch_830c3

1
crysaudio/music_pointers_red.asm
View file

@ -53,3 +53,4 @@ Music:
dba Music_Field06
dba Music_MeetJessieJames
dba Music_MtMoonSquare
dba Music_Sakaki

2
data/maps/hide_show_data.asm
View file

@ -455,6 +455,8 @@ RocketHideoutB3FHS:
db ROCKET_HIDEOUT_B3F, $04, SHOW ; HS_ROCKET_HIDEOUT_B3F_ITEM_2
RocketHideoutB4FHS:
db ROCKET_HIDEOUT_B4F, $01, SHOW ; HS_ROCKET_HIDEOUT_B4F_GIOVANNI
db ROCKET_HIDEOUT_B4F, $02, SHOW ; HS_ROCKET_HIDEOUT_B4F_JAMES
db ROCKET_HIDEOUT_B4F, $03, SHOW ; HS_ROCKET_HIDEOUT_B4F_JESSIE
db ROCKET_HIDEOUT_B4F, $05, SHOW ; HS_ROCKET_HIDEOUT_B4F_ITEM_1
db ROCKET_HIDEOUT_B4F, $06, SHOW ; HS_ROCKET_HIDEOUT_B4F_ITEM_2
db ROCKET_HIDEOUT_B4F, $07, SHOW ; HS_ROCKET_HIDEOUT_B4F_ITEM_3

4
data/maps/objects/RedsHouse2F.asm
View file

@ -3,7 +3,9 @@ RedsHouse2F_Object:
def_warp_events
warp_event 7, 1, REDS_HOUSE_1F, 3
warp_event 5, 1, SILPH_GAUNTLET_7F, 1
;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
;warp_event 5, 1, SILPH_CO_11F, 1 ; - Test Omega & Giovanni
warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
def_bg_events

4
data/maps/objects/RocketHideoutB4F.asm
View file

@ -10,8 +10,8 @@ RocketHideoutB4F_Object:
def_object_events
object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1
object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 16
object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 17
object_event 25, 10, SPRITE_JAMES, STAY, DOWN, 2
object_event 24, 10, SPRITE_JESSIE, STAY, DOWN, 3
object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18
object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, 5, HP_UP
object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND

4
data/trainers/scaled_parties.asm
View file

@ -77,8 +77,8 @@ SabrinaData:
db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, RAPIDASH_G, 67, ALAKAZAM, 70, ARTICUNO_G, 0 ; 8 (postgame)
GiovanniData: ; is not scaled as he is always fought last
; Rocket Hideout B4F - should be changed to Lavender Tower
db $FF, 27, RHYHORN, 26, BEEDRILL, 31, KANGASKHAN, 31, PERSIAN, 0
; Rocket Hideout B4F
db $FF, 29, BEEDRILL, 32, RHYHORN, 31, KANGASKHAN, 37, PERSIAN, 0
; Silph Co. 11F
db $FF, 37, KANGASKHAN, 36, NIDOKING, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 0
; Viridian Gym

397
scripts/RocketHideoutB4F.asm
View file

@ -1,5 +1,4 @@
RocketHideoutB4F_Script:
call RocketHideout4Script_45473
call EnableAutoTextBoxDrawing
ld hl, RocketHideout4TrainerHeaders
ld de, RocketHideoutB4F_ScriptPointers
@ -8,47 +7,44 @@ RocketHideoutB4F_Script:
ld [wRocketHideoutB4FCurScript], a
ret
RocketHideout4Script_45473:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
ret z
CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
jr nz, .asm_45496
CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1
jr z, .asm_4548c
ld a, $2d
jr .asm_45498
.asm_4548c
ld a, SFX_GO_INSIDE
call PlaySound
SetEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
.asm_45496
ld a, $e
.asm_45498
ld [wNewTileBlockID], a
lb bc, 5, 12
predef_jump ReplaceTileBlock
RocketHideout4Script_454a3:
RocketHideout4Script_45510:
CheckAndResetEvent EVENT_6A0
call nz, RocketHideout4Script_45525
xor a
ld [wJoyIgnore], a
RocketHideout4Script_4551e:
ld [wRocketHideoutB4FCurScript], a
ld [wCurMapScript], a
ret
RocketHideout4Script_45525:
ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
call RocketHideout4Script_45756
ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
call RocketHideout4Script_45756
ret
RocketHideoutB4F_ScriptPointers:
dw CheckFightingMapTrainers
dw RocketHideout4Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw RocketHideout4Script3
dw RocketHideout4Script4
dw RocketHideout4Script5
dw RocketHideout4Script6
dw RocketHideout4Script7
dw RocketHideout4Script8
dw RocketHideout4Script9
dw RocketHideout4Script10
dw RocketHideout4Script11
dw RocketHideout4Script12
dw RocketHideout4Script13
RocketHideout4Script3:
ld a, [wIsInBattle]
cp $ff
jp z, RocketHideout4Script_454a3
call UpdateSprites
ld a, $f0
jp z, RocketHideout4Script_45510
ld a, $fc
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
ld a, $a
@ -72,39 +68,297 @@ RocketHideout4Script3:
ld [wCurMapScript], a
ret
RocketHideout4Script0:
IF DEF(_DEBUG)
call DebugPressedOrHeldB
ret nz
ENDC
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
call z, RocketHideout4Script_455a5
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
call z, CheckFightingMapTrainers
ret
RocketHideout4Script_455a5:
ld a, [wYCoord]
cp $e
ret nz
ResetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
ld a, [wXCoord]
cp $18
jr z, .asm_455c2
ld a, [wXCoord]
cp $19
ret nz
SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
.asm_455c2
xor a
ldh [hJoyHeld], a
ld a, $fc
ld [wJoyIgnore], a
call StopMusic
ld c, 0 ; BANK(Music_MeetJessieJames)
ld a, MUSIC_MEET_JESSIE_JAMES
call PlayMusic
call UpdateSprites
call Delay3
call UpdateSprites
call Delay3
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $b
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $ff
ld [wJoyIgnore], a
ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
call RocketHideout4Script_45747
ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
call RocketHideout4Script_45747
ld a, $4
call RocketHideout4Script_4551e
ret
RocketHideout4JessieJamesMovementData_45605:
db $4
RocketHideout4JessieJamesMovementData_45606:
db $4
db $4
db $4
db $ff
RocketHideout4Script4:
ld de, RocketHideout4JessieJamesMovementData_45605
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
jr z, .asm_45617
ld de, RocketHideout4JessieJamesMovementData_45606
.asm_45617
ld a, $2
ldh [hSpriteIndexOrTextID], a
call MoveSprite
ld a, $ff
ld [wJoyIgnore], a
ld a, $5
call RocketHideout4Script_4551e
ret
RocketHideout4Script5:
ld a, $ff
ld [wJoyIgnore], a
ld a, [wd730]
bit 0, a
ret nz
RocketHideout4Script6:
ld a, $2
ld [wSprite02StateData1MovementStatus], a
ld a, SPRITE_FACING_LEFT
ld [wSprite02StateData1FacingDirection], a
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
jr z, .asm_4564a
ld a, SPRITE_FACING_DOWN
ld [wSprite02StateData1FacingDirection], a
.asm_4564a
call Delay3
ld a, $fc
ld [wJoyIgnore], a
RocketHideout4Script7:
ld de, RocketHideout4JessieJamesMovementData_45606
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
jr z, .asm_4565f
ld de, RocketHideout4JessieJamesMovementData_45605
.asm_4565f
ld a, $3
ldh [hSpriteIndexOrTextID], a
call MoveSprite
ld a, $ff
ld [wJoyIgnore], a
ld a, $8
call RocketHideout4Script_4551e
ret
RocketHideout4Script8:
ld a, $ff
ld [wJoyIgnore], a
ld a, [wd730]
bit 0, a
ret nz
ld a, $fc
ld [wJoyIgnore], a
RocketHideout4Script9:
ld a, $2
ld [wSprite03StateData1MovementStatus], a
ld a, SPRITE_FACING_DOWN
ld [wSprite03StateData1FacingDirection], a
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
jr z, .asm_45697
ld a, SPRITE_FACING_RIGHT
ld [wSprite03StateData1FacingDirection], a
.asm_45697
call Delay3
ld a, $c
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
RocketHideout4Script10:
ld hl, wd72d
set 6, [hl]
set 7, [hl]
call Delay3
ld hl, RocketHideout4JessieJamesEndBattleText
ld de, RocketHideout4JessieJamesEndBattleText
call SaveEndBattleTextPointers
ld a, OPP_JESSIE_JAMES
ld [wCurOpponent], a
ld a, 2
ld [wTrainerNo], a
ld [wIsTrainerBattle], a
xor a
ldh [hJoyHeld], a
ld [wJoyIgnore], a
SetEvent EVENT_6A0
ld a, $b
call RocketHideout4Script_4551e
ret
RocketHideout4Script11:
ld a, $ff
ld [wJoyIgnore], a
ld a, [wIsInBattle]
cp $ff
jp z, RocketHideout4Script_45510
ld a, $2
ld [wSprite02StateData1MovementStatus], a
ld [wSprite03StateData1MovementStatus], a
xor a
ld [wSprite02StateData1FacingDirection], a
ld [wSprite03StateData1FacingDirection], a
ld a, $fc
ld [wJoyIgnore], a
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $d
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
call StopMusic
ld c, BANK(Music_MeetJessieJames)
ld a, MUSIC_MEET_JESSIE_JAMES
call PlayMusic
ld a, $ff
ld [wJoyIgnore], a
ld a, $c
call RocketHideout4Script_4551e
ret
RocketHideout4Script12:
ld a, $ff
ld [wJoyIgnore], a
call GBFadeOutToBlack
ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
call RocketHideout4Script_45756
ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
call RocketHideout4Script_45756
call UpdateSprites
call Delay3
call GBFadeInFromBlack
ld a, $d
call RocketHideout4Script_4551e
ret
RocketHideout4Script13:
call PlayDefaultMusic
xor a
ldh [hJoyHeld], a
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
ld a, $0
call RocketHideout4Script_4551e
ret
RocketHideout4Script_45747:
ld [wMissableObjectIndex], a
predef ShowObject
call UpdateSprites
call Delay3
ret
RocketHideout4Script_45756:
ld [wMissableObjectIndex], a
predef HideObject
ret
RocketHideoutB4F_TextPointers:
dw RocketHideout4Text0
dw RocketHideout4Text1
dw RocketHideout4Text2
dw RocketHideout4Text3
dw RocketHideout4Text4
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw RocketHideout4Text9
dw RocketHideout4Text10
dw RocketHideout4Text11
dw RocketHideout4Text12
RocketHideout4TrainerHeaders:
def_trainers 2
def_trainers 4
RocketHideout4TrainerHeader0:
trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideout4BattleText2, RocketHideout4EndBattleText2, RocketHideout4AfterBattleText2
RocketHideout4TrainerHeader1:
trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideout4BattleText3, RocketHideout4EndBattleText3, RocketHideout4AfterBattleText3
RocketHideout4TrainerHeader2:
trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideout4BattleText4, RocketHideout4EndBattleText4, RocketHideout4AfterBattleText4
trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideout4Trainer0BeforeText, RocketHideout4Trainer0EndBattleText, RocketHideout4Trainer0AfterText
db -1 ; end
RocketHideout4Text1:
RocketHideout4Text2:
text_end
RocketHideout4Text10:
text_far _RocketHideoutJessieJamesText1
text_asm
ld c, 10
call DelayFrames
ld a, $8
ld [wPlayerMovingDirection], a
ld a, $0
ld [wEmotionBubbleSpriteIndex], a
ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld c, 20
call DelayFrames
jp TextScriptEnd
RocketHideout4Text11:
text_far _RocketHideoutJessieJamesText2
text_end
RocketHideout4JessieJamesEndBattleText:
text_far _RocketHideoutJessieJamesText3
text_end
RocketHideout4Text12:
text_far _RocketHideoutJessieJamesText4
text_asm
ld c, 64
call DelayFrames
jp TextScriptEnd
RocketHideout4Text0:
text_asm
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
jp nz, .asm_545571
ld hl, RocketHideout4Text_4557a
jp nz, .asm_457fb
ld c, 0 ; BANK(Music_Sakaki)
ld a, MUSIC_SAKAKI
call PlayMusic
ld hl, RocketHideout4Text_45804
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, RocketHideout4Text_4557f
ld de, RocketHideout4Text_4557f
ld hl, RocketHideout4Text_45809
ld de, RocketHideout4Text_45809
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -115,72 +369,37 @@ RocketHideout4Text1:
ld a, $3
ld [wRocketHideoutB4FCurScript], a
ld [wCurMapScript], a
jr .asm_209f0
.asm_545571
ld hl, RocketHideout4Text10
jr .asm_45801
.asm_457fb
ld hl, RocketHideout4Text9
call PrintText
.asm_209f0
.asm_45801
jp TextScriptEnd
RocketHideout4Text_4557a:
RocketHideout4Text_45804:
text_far _RocketHideout4Text_4557a
text_end
RocketHideout4Text_4557f:
RocketHideout4Text_45809:
text_far _RocketHideout4Text_4557f
text_end
RocketHideout4Text10:
RocketHideout4Text9:
text_far _RocketHideout4Text_45584
text_end
RocketHideout4Text2:
RocketHideout4Text3:
text_asm
ld hl, RocketHideout4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
RocketHideout4BattleText2:
text_far _RocketHideout4BattleText2
text_end
RocketHideout4EndBattleText2:
text_far _RocketHideout4EndBattleText2
text_end
RocketHideout4AfterBattleText2:
text_far _RocketHide4AfterBattleText2
text_end
RocketHideout4Text3:
text_asm
ld hl, RocketHideout4TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
RocketHideout4BattleText3:
text_far _RocketHideout4BattleText3
text_end
RocketHideout4EndBattleText3:
text_far _RocketHideout4EndBattleText3
text_end
RocketHideout4AfterBattleText3:
text_far _RocketHide4AfterBattleText3
text_end
RocketHideout4Text4:
text_asm
ld hl, RocketHideout4TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
RocketHideout4BattleText4:
RocketHideout4Trainer0BeforeText:
text_far _RocketHideout4BattleText4
text_end
RocketHideout4EndBattleText4:
RocketHideout4Trainer0EndBattleText:
text_far _RocketHideout4EndBattleText4
text_promptbutton
text_asm
@ -190,12 +409,12 @@ RocketHideout4EndBattleText4:
predef ShowObject
jp TextScriptEnd
RocketHideout4AfterBattleText4:
RocketHideout4Trainer0AfterText:
text_asm
ld hl, RocketHideout4Text_455ec
ld hl, RocketHideout4Text_45844
call PrintText
jp TextScriptEnd
RocketHideout4Text_455ec:
RocketHideout4Text_45844:
text_far _RocketHideout4Text_455ec
text_end
text_end

3
scripts/SilphCo11F.asm
View file

@ -250,6 +250,9 @@ SilphCo11Script0:
ld a, $f0
ld [wJoyIgnore], a
ld a, $3
ld c, 0 ; BANK(Music_Sakaki)
ld a, MUSIC_SAKAKI
call PlayMusic
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3

3
scripts/ViridianGym.asm
View file

@ -220,6 +220,9 @@ GiovanniText:
call GBFadeInFromBlack
jr .done
.beforeBeat
ld c, 0 ; BANK(Music_Sakaki)
ld a, MUSIC_SAKAKI
call PlayMusic
ld hl, GiovanniPreBattleText
call PrintText
ld hl, wd72d

59
text/RocketHideoutB4F.asm
View file

@ -2,6 +2,39 @@ _RocketHideout4Text_4557a::
text "So! I must say, I"
line "am impressed you"
cont "got here!"
para "TEAM ROCKET"
line "captures #MON"
cont "from around the"
cont "world."
para "They're important"
line "tools for keeping"
cont "our criminal"
cont "enterprise"
cont "running."
para "And I am the"
line "leader of this"
cont "enterprise..."
cont "GIOVANNI!"
para "What? You want"
line "the SILPH SCOPE?"
para "Fwahahaha!"
para "You came barging"
line "into our HIDEOUT"
cont "just for that?"
para "What an amusing"
line "child. For that"
cont "insolence..."
para "You will feel a"
line "world of pain!"
done
_RocketHideout4Text_4557f::
@ -72,3 +105,29 @@ _RocketHideout4Text_455ec::
text "Oh no! I dropped"
line "the LIFT KEY!"
done
_RocketHideoutJessieJamesText1::
text "Not another step,"
line "brat!@"
text_end
_RocketHideoutJessieJamesText2::
text "How dare you"
line "humiliate us at"
cont "MT.MOON!"
para "It's payback time,"
line "you brat!"
done
_RocketHideoutJessieJamesText3::
text "Such"
line "a dreadful twerp!"
prompt
_RocketHideoutJessieJamesText4::
text "Looks like TEAM"
line "ROCKET's blasting"
cont "off again!@"
text_end