diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index b69a1261..24369e79 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -157,6 +157,10 @@ DEF SHOW EQU $15 const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 93 const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 94 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_2 ; 97 const HS_SILPH_CO_3F_ITEM ; 98 X diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 08d0ecd4..ad4f9717 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -470,6 +470,10 @@ RocketHideoutB4FHS: db ROCKET_HIDEOUT_B4F, $09, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_5 GarnetCavernB1FHS: 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: db SILPH_CO_3F, $02, SHOW ; HS_SILPH_CO_3F_1 db SILPH_CO_3F, $03, SHOW ; HS_SILPH_CO_3F_2 diff --git a/data/maps/objects/GarnetCavernB1F.asm b/data/maps/objects/GarnetCavernB1F.asm index f310c1d2..976a9ada 100644 --- a/data/maps/objects/GarnetCavernB1F.asm +++ b/data/maps/objects/GarnetCavernB1F.asm @@ -8,5 +8,9 @@ GarnetCavernB1F_Object: def_object_events 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 diff --git a/scripts/GarnetCavernB1F.asm b/scripts/GarnetCavernB1F.asm index d2a76dd0..29518e51 100644 --- a/scripts/GarnetCavernB1F.asm +++ b/scripts/GarnetCavernB1F.asm @@ -14,8 +14,10 @@ GarnetCavernB1F_ScriptPointers: GarnetCavernB1F_TextPointers: dw ArticunoGText - ;dw PickUpItemText soon - ;dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw ArticunoGCopy1 + dw ArticunoGCopy2 GarnetCavernB1FTrainerHeaders: def_trainers @@ -24,16 +26,74 @@ ArticunoGTrainerHeader: db -1 ; end 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 ld hl, ArticunoGTrainerHeader call TalkToTrainer jp TextScriptEnd ArticunoGBattleText: - text_far _ArticunoGBattleText + text_far _BirdBattleText text_asm ld a, ARTICUNO_G call PlayCry call WaitForSoundToFinish 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 diff --git a/text.asm b/text.asm index 5b45c1eb..597a5119 100644 --- a/text.asm +++ b/text.asm @@ -290,7 +290,6 @@ INCLUDE "text/SilphGauntlet7F.asm" INCLUDE "text/CitrinePokecenter.asm" INCLUDE "text/CitrineMart.asm" INCLUDE "text/GarnetCavern1F.asm" -INCLUDE "text/GarnetCavernB1F.asm" INCLUDE "text/GarnetCavern2F.asm" INCLUDE "text/GiovannisRoom.asm" INCLUDE "text/CitrineCity.asm" diff --git a/text/GarnetCavernB1F.asm b/text/GarnetCavernB1F.asm deleted file mode 100644 index 78092da6..00000000 --- a/text/GarnetCavernB1F.asm +++ /dev/null @@ -1,3 +0,0 @@ -_ArticunoGBattleText:: - text "Gyaoo!" - prompt