mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Add Giovanni's Hideout
This is part of the removal of the Rocket Hideout. Floor 1 is repurposed to be a lore-centric room for Giovanni's character, located in Viridian Gym. I plan to have the Protector and TM Earthquake moved here. The TM26 item pickup doesn't work for some reason. Otherwise, it's complete.
This commit is contained in:
May Evans
parent
243c4a5a0f
commit
fcf6e26692
7 changed files with 160 additions and 225 deletions
|
|
@ -1,156 +1,74 @@
|
|||
RocketHideoutB1F_Script:
|
||||
call RocketHideout1Script_44be0
|
||||
RocketHideoutB1F_Script: ;all trainer references are commented out.
|
||||
;call RocketHideout1Script_44be0
|
||||
call EnableAutoTextBoxDrawing
|
||||
ld hl, RocketHideout1TrainerHeaders
|
||||
ld de, RocketHideoutB1F_ScriptPointers
|
||||
ld a, [wRocketHideoutB1FCurScript]
|
||||
call ExecuteCurMapScriptInTable
|
||||
ld [wRocketHideoutB1FCurScript], a
|
||||
;ld hl, RocketHideout1TrainerHeaders
|
||||
;ld de, RocketHideoutB1F_ScriptPointers
|
||||
;ld a, [wRocketHideoutB1FCurScript]
|
||||
;call ExecuteCurMapScriptInTable
|
||||
;ld [wRocketHideoutB1FCurScript], a
|
||||
ret
|
||||
|
||||
RocketHideout1Script_44be0:
|
||||
ld hl, wCurrentMapScriptFlags
|
||||
bit 5, [hl]
|
||||
res 5, [hl]
|
||||
ret z
|
||||
CheckEvent EVENT_677
|
||||
jr nz, .asm_44c01
|
||||
CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
|
||||
jr nz, .asm_44bf7
|
||||
ld a, $54
|
||||
jr .asm_44c03
|
||||
.asm_44bf7
|
||||
ld a, SFX_GO_INSIDE
|
||||
call PlaySound
|
||||
CheckEventHL EVENT_677
|
||||
.asm_44c01
|
||||
ld a, $e
|
||||
.asm_44c03
|
||||
ld [wNewTileBlockID], a
|
||||
lb bc, 8, 12
|
||||
predef_jump ReplaceTileBlock
|
||||
;RocketHideout1Script_44be0:
|
||||
; ld hl, wCurrentMapScriptFlags
|
||||
; bit 5, [hl]
|
||||
; res 5, [hl]
|
||||
; ret z
|
||||
; CheckEvent EVENT_677
|
||||
; jr nz, .asm_44c01
|
||||
; CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
|
||||
; jr nz, .asm_44bf7
|
||||
; ld a, $54
|
||||
; jr .asm_44c03
|
||||
;.asm_44bf7
|
||||
; ld a, SFX_GO_INSIDE
|
||||
; call PlaySound
|
||||
; CheckEventHL EVENT_677
|
||||
;.asm_44c01
|
||||
; ld a, $e
|
||||
;.asm_44c03
|
||||
; ld [wNewTileBlockID], a
|
||||
; lb bc, 8, 12
|
||||
; predef_jump ReplaceTileBlock
|
||||
|
||||
RocketHideoutB1F_ScriptPointers:
|
||||
dw CheckFightingMapTrainers
|
||||
dw DisplayEnemyTrainerTextAndStartBattle
|
||||
dw EndTrainerBattle
|
||||
;RocketHideoutB1F_ScriptPointers:
|
||||
;dw CheckFightingMapTrainers
|
||||
;dw DisplayEnemyTrainerTextAndStartBattle
|
||||
;dw EndTrainerBattle
|
||||
|
||||
RocketHideoutB1F_TextPointers:
|
||||
dw RocketHideout1Text1
|
||||
dw RocketHideout1Text2
|
||||
dw RocketHideout1Text3
|
||||
dw RocketHideout1Text4
|
||||
dw RocketHideout1Text5
|
||||
dw PickUpItemText
|
||||
dw PickUpItemText
|
||||
|
||||
RocketHideout1TrainerHeaders:
|
||||
def_trainers
|
||||
RocketHideout1TrainerHeader0:
|
||||
trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2
|
||||
RocketHideout1TrainerHeader1:
|
||||
trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideout1BattleText3, RocketHideout1EndBattleText3, RocketHideout1AfterBattleTxt3
|
||||
RocketHideout1TrainerHeader2:
|
||||
trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideout1BattleText4, RocketHideout1EndBattleText4, RocketHideout1AfterBattleTxt4
|
||||
RocketHideout1TrainerHeader3:
|
||||
trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideout1BattleText5, RocketHideout1EndBattleText5, RocketHideout1AfterBattleTxt5
|
||||
RocketHideout1TrainerHeader4:
|
||||
trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideout1BattleText6, RocketHideout1EndBattleText6, RocketHideout1AfterBattleTxt6
|
||||
;RocketHideout1TrainerHeaders:
|
||||
; def_trainers
|
||||
;RocketHideout1TrainerHeader0:
|
||||
; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2
|
||||
;RocketHideout1TrainerHeader1:
|
||||
; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideout1BattleText3, RocketHideout1EndBattleText3, RocketHideout1AfterBattleTxt3
|
||||
;RocketHideout1TrainerHeader2:
|
||||
; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideout1BattleText4, RocketHideout1EndBattleText4, RocketHideout1AfterBattleTxt4
|
||||
;RocketHideout1TrainerHeader3:
|
||||
; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideout1BattleText5, RocketHideout1EndBattleText5, RocketHideout1AfterBattleTxt5
|
||||
;RocketHideout1TrainerHeader4:
|
||||
; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideout1BattleText6, RocketHideout1EndBattleText6, RocketHideout1AfterBattleTxt6
|
||||
db -1 ; end
|
||||
|
||||
RocketHideout1Text1:
|
||||
text_asm
|
||||
ld hl, RocketHideout1TrainerHeader0
|
||||
call TalkToTrainer
|
||||
jp TextScriptEnd
|
||||
text_far _RocketHideout1Text1
|
||||
text_end
|
||||
|
||||
RocketHideout1Text2:
|
||||
text_asm
|
||||
ld hl, RocketHideout1TrainerHeader1
|
||||
call TalkToTrainer
|
||||
jp TextScriptEnd
|
||||
text_far _RocketHideout1Text2
|
||||
text_end
|
||||
|
||||
RocketHideout1Text3:
|
||||
text_asm
|
||||
ld hl, RocketHideout1TrainerHeader2
|
||||
call TalkToTrainer
|
||||
jp TextScriptEnd
|
||||
text_far _RocketHideout1Text3
|
||||
text_end
|
||||
|
||||
RocketHideout1Text4:
|
||||
text_asm
|
||||
ld hl, RocketHideout1TrainerHeader3
|
||||
call TalkToTrainer
|
||||
jp TextScriptEnd
|
||||
|
||||
RocketHideout1Text5:
|
||||
text_asm
|
||||
ld hl, RocketHideout1TrainerHeader4
|
||||
call TalkToTrainer
|
||||
jp TextScriptEnd
|
||||
|
||||
RocketHideout1EndBattleText6:
|
||||
text_far _RocketHideout1EndBattleText6
|
||||
text_asm
|
||||
SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
|
||||
ld hl, RocketHideout1Text_44c9f
|
||||
ret
|
||||
|
||||
RocketHideout1Text_44c9f:
|
||||
text_promptbutton
|
||||
text_end
|
||||
|
||||
RocketHideout1BattleText2:
|
||||
text_far _RocketHideout1BattleText2
|
||||
text_end
|
||||
|
||||
RocketHideout1EndBattleText2:
|
||||
text_far _RocketHideout1EndBattleText2
|
||||
text_end
|
||||
|
||||
RocketHideout1AfterBattleTxt2:
|
||||
text_far _RocketHideout1AfterBattleTxt2
|
||||
text_end
|
||||
|
||||
RocketHideout1BattleText3:
|
||||
text_far _RocketHideout1BattleText3
|
||||
text_end
|
||||
|
||||
RocketHideout1EndBattleText3:
|
||||
text_far _RocketHideout1EndBattleText3
|
||||
text_end
|
||||
|
||||
RocketHideout1AfterBattleTxt3:
|
||||
text_far _RocketHideout1AfterBattleTxt3
|
||||
text_end
|
||||
|
||||
RocketHideout1BattleText4:
|
||||
text_far _RocketHideout1BattleText4
|
||||
text_end
|
||||
|
||||
RocketHideout1EndBattleText4:
|
||||
text_far _RocketHideout1EndBattleText4
|
||||
text_end
|
||||
|
||||
RocketHideout1AfterBattleTxt4:
|
||||
text_far _RocketHideout1AfterBattleTxt4
|
||||
text_end
|
||||
|
||||
RocketHideout1BattleText5:
|
||||
text_far _RocketHideout1BattleText5
|
||||
text_end
|
||||
|
||||
RocketHideout1EndBattleText5:
|
||||
text_far _RocketHideout1EndBattleText5
|
||||
text_end
|
||||
|
||||
RocketHideout1AfterBattleTxt5:
|
||||
text_far _RocketHideout1AfterBattleTxt5
|
||||
text_end
|
||||
|
||||
RocketHideout1BattleText6:
|
||||
text_far _RocketHideout1BattleText6
|
||||
text_end
|
||||
|
||||
RocketHideout1AfterBattleTxt6:
|
||||
text_far _RocketHideout1AfterBattleTxt6
|
||||
text_end
|
||||
text_far _RocketHideout1Text4
|
||||
text_end
|
||||
Loading…
Add table
Add a link
Reference in a new issue