mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-17 02:40:50 +12:00
Groundwork for Galarcuno in Garnet Cavern
This sets up most of the content necessary for Galarian Articuno's event. In SwSh, it has 2 copies, so I'm doing that here too. Right now, the fight doesn't work properly and the copies don't hide properly. Otherwise, it's roughly how we want it to be.
This commit is contained in:
parent
f1c8a3bdbb
commit
8979403c5d
|
@ -157,6 +157,10 @@ DEF SHOW EQU $15
|
||||||
const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 93
|
const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 93
|
||||||
const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 94
|
const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 94
|
||||||
const HS_GARNET_ARTICUNO_G ; 95
|
const HS_GARNET_ARTICUNO_G ; 95
|
||||||
|
const HS_GARNET_ITEM_1
|
||||||
|
const HS_GARNET_ITEM_2
|
||||||
|
const HS_ARTICUNO_G_COPY_1
|
||||||
|
const HS_ARTICUNO_G_COPY_2
|
||||||
const HS_SILPH_CO_3F_1 ; 96
|
const HS_SILPH_CO_3F_1 ; 96
|
||||||
const HS_SILPH_CO_3F_2 ; 97
|
const HS_SILPH_CO_3F_2 ; 97
|
||||||
const HS_SILPH_CO_3F_ITEM ; 98 X
|
const HS_SILPH_CO_3F_ITEM ; 98 X
|
||||||
|
|
|
@ -470,6 +470,10 @@ RocketHideoutB4FHS:
|
||||||
db ROCKET_HIDEOUT_B4F, $09, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_5
|
db ROCKET_HIDEOUT_B4F, $09, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_5
|
||||||
GarnetCavernB1FHS:
|
GarnetCavernB1FHS:
|
||||||
db GARNET_CAVERN_B1F, $01, SHOW ; HS_GARNET_ARTICUNO_G, SHOW for testing reasons
|
db GARNET_CAVERN_B1F, $01, SHOW ; HS_GARNET_ARTICUNO_G, SHOW for testing reasons
|
||||||
|
db GARNET_CAVERN_B1F, $02, SHOW ; HS_GARNET_ITEM_1
|
||||||
|
db GARNET_CAVERN_B1F, $03, SHOW ; HS_GARNET_ITEM_2
|
||||||
|
db GARNET_CAVERN_B1F, $04, SHOW ; HS_ARTICUNO_G_COPY_1
|
||||||
|
db GARNET_CAVERN_B1F, $05, SHOW ; HS_ARTICUNO_G_COPY_1
|
||||||
SilphCo3FHS:
|
SilphCo3FHS:
|
||||||
db SILPH_CO_3F, $02, SHOW ; HS_SILPH_CO_3F_1
|
db SILPH_CO_3F, $02, SHOW ; HS_SILPH_CO_3F_1
|
||||||
db SILPH_CO_3F, $03, SHOW ; HS_SILPH_CO_3F_2
|
db SILPH_CO_3F, $03, SHOW ; HS_SILPH_CO_3F_2
|
||||||
|
|
|
@ -8,5 +8,9 @@ GarnetCavernB1F_Object:
|
||||||
|
|
||||||
def_object_events
|
def_object_events
|
||||||
object_event 5, 11, SPRITE_BIRD, STAY, DOWN, 1, ARTICUNO_G, 70 | OW_POKEMON ; person
|
object_event 5, 11, SPRITE_BIRD, STAY, DOWN, 1, ARTICUNO_G, 70 | OW_POKEMON ; person
|
||||||
|
object_event 24, 1, SPRITE_POKE_BALL, STAY, DOWN, 2, MAX_REVIVE
|
||||||
|
object_event 19, 2, SPRITE_POKE_BALL, STAY, DOWN, 3, ESCAPE_ROPE
|
||||||
|
object_event 22, 10, SPRITE_BIRD, STAY, DOWN, 4 ; cuno copy 1
|
||||||
|
object_event 14, 1, SPRITE_BIRD, STAY, DOWN, 5 ; cuno copy 2
|
||||||
|
|
||||||
def_warps_to GARNET_CAVERN_B1F
|
def_warps_to GARNET_CAVERN_B1F
|
||||||
|
|
|
@ -14,8 +14,10 @@ GarnetCavernB1F_ScriptPointers:
|
||||||
|
|
||||||
GarnetCavernB1F_TextPointers:
|
GarnetCavernB1F_TextPointers:
|
||||||
dw ArticunoGText
|
dw ArticunoGText
|
||||||
;dw PickUpItemText soon
|
dw PickUpItemText
|
||||||
;dw PickUpItemText
|
dw PickUpItemText
|
||||||
|
dw ArticunoGCopy1
|
||||||
|
dw ArticunoGCopy2
|
||||||
|
|
||||||
GarnetCavernB1FTrainerHeaders:
|
GarnetCavernB1FTrainerHeaders:
|
||||||
def_trainers
|
def_trainers
|
||||||
|
@ -24,16 +26,74 @@ ArticunoGTrainerHeader:
|
||||||
db -1 ; end
|
db -1 ; end
|
||||||
|
|
||||||
ArticunoGText:
|
ArticunoGText:
|
||||||
|
ld a, HS_ARTICUNO_G_COPY_1
|
||||||
|
ld [wMissableObjectIndex], a
|
||||||
|
predef HideObject
|
||||||
|
ld a, HS_ARTICUNO_G_COPY_2
|
||||||
|
ld [wMissableObjectIndex], a
|
||||||
|
predef HideObject
|
||||||
text_asm
|
text_asm
|
||||||
ld hl, ArticunoGTrainerHeader
|
ld hl, ArticunoGTrainerHeader
|
||||||
call TalkToTrainer
|
call TalkToTrainer
|
||||||
jp TextScriptEnd
|
jp TextScriptEnd
|
||||||
|
|
||||||
ArticunoGBattleText:
|
ArticunoGBattleText:
|
||||||
text_far _ArticunoGBattleText
|
text_far _BirdBattleText
|
||||||
text_asm
|
text_asm
|
||||||
ld a, ARTICUNO_G
|
ld a, ARTICUNO_G
|
||||||
call PlayCry
|
call PlayCry
|
||||||
call WaitForSoundToFinish
|
call WaitForSoundToFinish
|
||||||
jp TextScriptEnd
|
jp TextScriptEnd
|
||||||
|
|
||||||
|
ArticunoGCopy1:
|
||||||
|
text_far _BirdBattleText
|
||||||
|
text_asm
|
||||||
|
ld a, ARTICUNO_G
|
||||||
|
call PlayCry
|
||||||
|
call WaitForSoundToFinish
|
||||||
|
|
||||||
|
ld a, $ff
|
||||||
|
ld [wJoyIgnore], a
|
||||||
|
call GBFadeOutToBlack
|
||||||
|
ld a, SFX_TELEPORT_ENTER_1
|
||||||
|
call PlaySound
|
||||||
|
ld a, HS_ARTICUNO_G_COPY_1
|
||||||
|
ld [wMissableObjectIndex], a
|
||||||
|
predef HideObject
|
||||||
|
call UpdateSprites
|
||||||
|
call Delay3
|
||||||
|
call GBFadeInFromBlack
|
||||||
|
ld a, 0
|
||||||
|
ld [wJoyIgnore], a
|
||||||
|
ld hl, ArticunoGCopyText
|
||||||
|
call PrintText
|
||||||
|
jp TextScriptEnd
|
||||||
|
|
||||||
|
ArticunoGCopy2:
|
||||||
|
text_far _BirdBattleText
|
||||||
|
text_asm
|
||||||
|
ld a, ARTICUNO_G
|
||||||
|
call PlayCry
|
||||||
|
call WaitForSoundToFinish
|
||||||
|
|
||||||
|
ld a, $ff
|
||||||
|
ld [wJoyIgnore], a
|
||||||
|
call GBFadeOutToBlack
|
||||||
|
ld a, SFX_TELEPORT_ENTER_1
|
||||||
|
call PlaySound
|
||||||
|
ld a, HS_ARTICUNO_G_COPY_2
|
||||||
|
ld [wMissableObjectIndex], a
|
||||||
|
predef HideObject
|
||||||
|
call UpdateSprites
|
||||||
|
call Delay3
|
||||||
|
call GBFadeInFromBlack
|
||||||
|
ld a, 0
|
||||||
|
ld [wJoyIgnore], a
|
||||||
|
ld hl, ArticunoGCopyText
|
||||||
|
call PrintText
|
||||||
|
jp TextScriptEnd
|
||||||
|
|
||||||
|
ArticunoGCopyText:
|
||||||
|
text "It was a copy!"
|
||||||
|
done
|
||||||
|
text_end
|
||||||
|
|
1
text.asm
1
text.asm
|
@ -290,7 +290,6 @@ INCLUDE "text/SilphGauntlet7F.asm"
|
||||||
INCLUDE "text/CitrinePokecenter.asm"
|
INCLUDE "text/CitrinePokecenter.asm"
|
||||||
INCLUDE "text/CitrineMart.asm"
|
INCLUDE "text/CitrineMart.asm"
|
||||||
INCLUDE "text/GarnetCavern1F.asm"
|
INCLUDE "text/GarnetCavern1F.asm"
|
||||||
INCLUDE "text/GarnetCavernB1F.asm"
|
|
||||||
INCLUDE "text/GarnetCavern2F.asm"
|
INCLUDE "text/GarnetCavern2F.asm"
|
||||||
INCLUDE "text/GiovannisRoom.asm"
|
INCLUDE "text/GiovannisRoom.asm"
|
||||||
INCLUDE "text/CitrineCity.asm"
|
INCLUDE "text/CitrineCity.asm"
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
_ArticunoGBattleText::
|
|
||||||
text "Gyaoo!"
|
|
||||||
prompt
|
|
Loading…
Reference in a new issue