From 5f729c22b5b8bafc520f4f23f8577bcb18a8a452 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 15:16:58 -0400 Subject: Add missing file; route 7/8 gates and route 8 path entrance --- data/mapObjects/route7gate.asm | 2 +- data/mapObjects/route8gate.asm | 4 +-- data/map_header_banks.asm | 6 ++-- data/map_header_pointers.asm | 6 ++-- main.asm | 18 ++++++++++- scripts/pewterpokecenter2.asm | 72 ++++++++++++++++++++++++++++++++++++++++++ scripts/route8gate.asm | 2 +- 7 files changed, 99 insertions(+), 11 deletions(-) create mode 100755 scripts/pewterpokecenter2.asm diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 8c618fc1..9e80ca39 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -4,7 +4,7 @@ Route7GateObject: ; 0x1e185 (size=42) db $4 ; warps db $3, $0, $3, $ff db $4, $0, $3, $ff - db $3, $5, $0, $ff + db $3, $5, $1, $ff db $4, $5, $1, $ff db $0 ; signs diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 8c3fb54f..61d70dfc 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -2,9 +2,9 @@ Route8GateObject: ; 0x1e247 (size=42) db $a ; border block db $4 ; warps - db $3, $0, $0, $ff + db $3, $0, $1, $ff db $4, $0, $1, $ff - db $3, $5, $2, $ff + db $3, $5, $3, $ff db $4, $5, $3, $ff db $0 ; signs diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 47b49442..074b5982 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -76,11 +76,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route6Gate_h) db BANK(UndergroundPathEntranceRoute6_h) db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE - db $07 ; db BANK(Route7Gate_h) + db BANK(Route7Gate_h) db BANK(UndergroundPathEntranceRoute7_h) db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE - db $07 ; db BANK(Route8Gate_h) - db $07 ; db BANK(UndergroundPathEntranceRoute8_h) + db BANK(Route8Gate_h) + db BANK(UndergroundPathEntranceRoute8_h) db $12 ; db BANK(RockTunnelPokecenter_h) db $11 ; db BANK(RockTunnel1_h) db $07 ; db BANK(PowerPlant_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index be1bda24..a736462b 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -76,11 +76,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route6Gate_h dw UndergroundPathEntranceRoute6_h dw UndergroundPathEntranceRoute6_h ; unused - dw $59fe ; dw Route7Gate_h + dw Route7Gate_h dw UndergroundPathEntranceRoute7_h dw UndergroundPathEntranceRoute7Copy_h - dw $5ac5 ; dw Route8Gate_h - dw $5b87 ; dw UndergroundPathEntranceRoute8_h ;id=80 + dw Route8Gate_h + dw UndergroundPathEntranceRoute8_h ;id=80 dw $5330 ; dw RockTunnelPokecenter_h dw $4571 ; dw RockTunnel1_h dw $5bc4 ; dw PowerPlant_h diff --git a/main.asm b/main.asm index 93fec92c..2b8b5017 100755 --- a/main.asm +++ b/main.asm @@ -379,7 +379,23 @@ INCLUDE "data/mapObjects/route6gate.asm" Route6GateBlocks: ; 1d9f2 INCBIN "maps/route6gate.blk" - dr $1d9fe,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/route7gate.asm" +INCLUDE "scripts/route7gate.asm" +INCLUDE "data/mapObjects/route7gate.asm" +Route7GateBlocks: ; 1dab9 +INCBIN "maps/route7gate.blk" + +INCLUDE "data/mapHeaders/route8gate.asm" +INCLUDE "scripts/route8gate.asm" +INCLUDE "data/mapObjects/route8gate.asm" +Route8GateBlocks: ; 1dab9 +INCBIN "maps/route8gate.blk" + +INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" +INCLUDE "scripts/undergroundpathentranceroute8.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm" + + dr $1dbc4,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" diff --git a/scripts/pewterpokecenter2.asm b/scripts/pewterpokecenter2.asm new file mode 100755 index 00000000..1aae37d1 --- /dev/null +++ b/scripts/pewterpokecenter2.asm @@ -0,0 +1,72 @@ +Func_f1d98: + ld hl, PewterPokecenterText_f1d9f + call PrintText + ret + +PewterPokecenterText_f1d9f: + TX_FAR _PewterPokecenterText2 + db "@" + +Func_f1da4: + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, PewterPokecenterText_f1e19 + call PrintText + call StopAllMusic + ld c, 32 + call DelayFrames + ld hl, JigglypuffSpinData + ld de, wJigglypuffFacingDirections + ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData + call CopyData + ld a, [wSpriteStateData1 + 3 * $10 + 2] + ld hl, wJigglypuffFacingDirections +.asm_f1dc9 + cp [hl] + inc hl + jr nz, .asm_f1dc9 + dec hl + push hl + ld c, BANK(Music_JigglypuffSong) + ld a, MUSIC_JIGGLYPUFF_SONG + call PlayMusic + pop hl +.asm_f1dd7 + ld a, [hl] + ld [wSpriteStateData1 + 3 * $10 + 2], a + push hl + ld hl, wJigglypuffFacingDirections + ld de, wJigglypuffFacingDirections2 + ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData + call CopyData + ld a, [wJigglypuffFacingDirections2] + ld [wcd42], a + pop hl + ld c, 24 + call DelayFrames + ld a, [wChannelSoundIDs] + ld b, a + ld a, [wChannelSoundIDs + 1] + or b + jr nz, .asm_f1dd7 + ld c, 48 + call DelayFrames + call PlayDefaultMusic + ld a, [wd472] + bit 7, a + ret z + callab Func_fce73 + ret c + call SetPikachuAsleep + ret + +PewterPokecenterText_f1e19: + TX_FAR _PewterPokecenterText5 + db "@" + +JigglypuffSpinData: + db $40 | SPRITE_FACING_DOWN + db $40 | SPRITE_FACING_LEFT + db $40 | SPRITE_FACING_UP + db $40 | SPRITE_FACING_RIGHT +JigglypuffSpinDataEnd: diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index fe2e3c3c..5a26b424 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -27,7 +27,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) ld hl, CoordsData_1e22c call ArePlayerCoordsInArray ret nc - ld a, PLAYER_DIR_LEFT + ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a xor a ld [hJoyHeld], a -- cgit v1.2.3