Leahnaya/pokered
1
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2026-04-26 01:11:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Connected up to Rocket hideout

Browse Source
This commit is contained in:
thecodingbob 2025-12-13 16:23:31 +01:00
parent b4f12d5e3e
commit a2e3a32350
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/maps/objects/RocketHideoutB4F.asm
View File

@ -13,15 +13,14 @@ RocketHideoutB4F_Object:
db $2e ; border block
def_warp_events
warp_event 19, 10, ROCKET_HIDEOUT_B3F, 2
warp_event 24, 15, ROCKET_HIDEOUT_ELEVATOR, 1
warp_event 25, 15, ROCKET_HIDEOUT_ELEVATOR, 2
warp_event 24, 15, VERMILION_GYM, 3
warp_event 25, 15, VERMILION_GYM, 4
def_bg_events
def_object_events
object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_GIOVANNI, OPP_GIOVANNI, 1
object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET1, OPP_ROCKET, 16
object_event 23, 11, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET1, OPP_ROCKET, 16
object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET2, OPP_ROCKET, 17
object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET3, OPP_ROCKET, 18
object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_HP_UP, HP_UP

1
data/maps/objects/SSAnne2F.asm
View File

@ -8,6 +8,7 @@ SSAnne2F_Object:
def_warp_events
warp_event 36, 13, CERULEAN_GYM, 3
warp_event 37, 13, CERULEAN_GYM, 4
warp_event 36, 4, VERMILION_GYM, 1
def_bg_events

6
data/maps/objects/VermilionGym.asm
View File

@ -9,8 +9,10 @@ VermilionGym_Object:
db $3 ; border block
def_warp_events
warp_event 4, 17, LAST_MAP, 4
warp_event 5, 17, LAST_MAP, 4
warp_event 4, 17, SS_ANNE_2F, 3
warp_event 5, 17, SS_ANNE_2F, 3
warp_event 4, 0, ROCKET_HIDEOUT_B4F, 1
warp_event 5, 0, ROCKET_HIDEOUT_B4F, 2
def_bg_events

BIN
maps/RocketHideoutB4F.blk
View File

Binary file not shown.

BIN
maps/VermilionGym.blk
View File

Binary file not shown.

8
scripts/RocketHideoutB4F.asm
View File

@ -15,9 +15,9 @@ RocketHideoutB4FDoorCallbackScript:
ret z
CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
jr nz, .door_already_unlocked
CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 1
jr z, .unlock_door
ld a, $2d ; Door block
CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
jr nz, .unlock_door
ld a, $31 ; Stones
jr .set_block
.unlock_door
ld a, SFX_GO_INSIDE
@ -27,7 +27,7 @@ RocketHideoutB4FDoorCallbackScript:
ld a, $e ; Floor block
.set_block
ld [wNewTileBlockID], a
lb bc, 5, 12
lb bc, 2, 10
predef_jump ReplaceTileBlock
RocketHideoutB4FSetDefaultScript:

3
scripts/VermilionGym.asm
View File

@ -7,7 +7,7 @@ VermilionGym_Script:
pop hl
bit BIT_CUR_MAP_LOADED_2, [hl]
res BIT_CUR_MAP_LOADED_2, [hl]
call nz, VermilionGymSetDoorTile
; call nz, VermilionGymSetDoorTile ; TODO: replace with next-battle door closing
call EnableAutoTextBoxDrawing
ld hl, VermilionGymTrainerHeaders
ld de, VermilionGym_ScriptPointers
@ -28,6 +28,7 @@ VermilionGym_Script:
db "LT.SURGE@"
VermilionGymSetDoorTile:
; TODO: replace with next-battle door closing
CheckEvent EVENT_2ND_LOCK_OPENED
jr nz, .doorsOpen
ld a, $24 ; double door tile ID