Citrine Rocket House

This map is pretty much finished, save for the map sprites for Jessie, James, and the unused Cat (aka Meowth) being imported, as well as an & symbol. This adds everything else - the marts, the Rocket Trio fight, the meeting music, the tileset, the trainer class for Jessie/James, I could go on. A ton of work well-done.
This commit is contained in:
Llinos Evans 2023-04-22 20:49:19 +01:00
parent 437602bf21
commit 78d3ed63f2
37 changed files with 287 additions and 28 deletions

View file

@ -29,7 +29,7 @@ CeladonUniversityOutsideText1: ; Starter girl
ld hl, CeladonUniversityOutsideBattleText1
call PrintText
ld c, BANK(Music_MeetFemaleTrainer)
ld c, 0 ; BANK(Music_MeetFemaleTrainer)
ld a, MUSIC_MEET_FEMALE_TRAINER
call PlayMusic
@ -69,7 +69,7 @@ CeladonUniversityOutsideText2: ; Porygon guy
ld hl, CeladonUniversityOutsideBattleText2
call PrintText
ld c, BANK(Music_MeetMaleTrainer)
ld c, 0 ; BANK(Music_MeetMaleTrainer)
ld a, MUSIC_MEET_MALE_TRAINER
call PlayMusic
@ -109,7 +109,7 @@ CeladonUniversityOutsideText3: ; Golem guy
ld hl, CeladonUniversityOutsideBattleText3
call PrintText
ld c, BANK(Music_MeetMaleTrainer)
ld c, 0; BANK(Music_MeetMaleTrainer)
ld a, MUSIC_MEET_MALE_TRAINER
call PlayMusic
@ -149,7 +149,7 @@ CeladonUniversityOutsideText4: ; Mt Moon guy
ld hl, CeladonUniversityOutsideBattleText4
call PrintText
ld c, BANK(Music_MeetMaleTrainer)
ld c, 0 ;BANK(Music_MeetMaleTrainer)
ld a, MUSIC_MEET_MALE_TRAINER
call PlayMusic

View file

@ -0,0 +1,106 @@
CitrineRocketHouse_Script:
jp EnableAutoTextBoxDrawing
CitrineRocketHouse_TextPointers:
dw MartGuy1Text
dw MartGuy2Text
dw RocketText1
dw RocketText2
dw MeowthText
dw JamesText
dw JessieFight
MartGuy1Text:
script_mart TM_SWORDS_DANCE, TM_TOXIC, TM_BODY_SLAM, TM_DOUBLE_EDGE, TM_BUBBLEBEAM, TM_ICE_BEAM, TM_BLIZZARD, TM_PAY_DAY, TM_COUNTER, TM_SEISMIC_TOSS, TM_MEGA_DRAIN, TM_THUNDERBOLT, TM_EARTHQUAKE, TM_DIG,
MartGuy2Text:
script_mart TM_PSYCHIC_M, TM_FIRE_BLAST, TM_THUNDER_WAVE, TM_EXPLOSION, TM_ROCK_SLIDE, PROTECTOR, UP_GRADE, DUBIOUS_DISC, METAL_COAT, BLK_AUGURITE, DOME_FOSSIL, HELIX_FOSSIL, WING_FOSSIL, OLD_AMBER
RocketText1:
text_far _RocketText1
text_end
RocketText2:
text_far _RocketText2
text_end
MeowthText:
text_far _MeowthText
text_asm
ld a, MEOWTH
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
JamesText:
text_far _JamesText
text_end
JessieText1:
text_far _JessieText1
text_end
JessieFight:
text_asm
ld c, 0 ; BANK(Music_MeetJessieJames)
ld a, MUSIC_MEET_JESSIE_JAMES
call PlayMusic
ld hl, JessieText1
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .refused
ld hl, JessieFightText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
call Delay3
ld a, OPP_JESSIE_JAMES
ld [wCurOpponent], a
ld a, 5
ld [wTrainerNo], a
ld [wIsTrainerBattle], a
ld a, $5
ld [wCitrineRocketHouseCurScript], a
ld hl, JessieWinText
ld de, JessieLoseText
call SaveEndBattleTextPointers
jp TextScriptEnd
jr .done
.refused
ld hl, JessieText2
jr .done
.done
ld hl, JessieAfterBattleText
call PrintText
ld c, 0 ; BANK(Music_Dungeon2)
ld a, MUSIC_DUNGEON1
call PlayMusic
jp TextScriptEnd
JessieFightText:
text_far _JessieFightText
text_end
JessieWinText:
text_far _JessieWinText
text_end
JessieLoseText:
text_far _JessieWinText
text_end
JessieText2:
text_far _JessieText2
text_end
JessieAfterBattleText:
text_far _JessieAfterBattleText
text_end
text_end ; unused