diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 09:09:36 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 09:09:36 -0400 |
| commit | 02dc94721b85443d5cf61b811f1ea0050ae219ef (patch) | |
| tree | f8789bf5fd9ca42482363f119a56dd3220587429 | |
| parent | 0a2b8a28eb46a7595cb4f3794ab4187bafd331b4 (diff) | |
Victory Road 3F
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 13 | ||||
| -rwxr-xr-x | scripts/victoryroad3.asm | 3 |
4 files changed, 18 insertions, 6 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 92808e01..532c9c85 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -197,8 +197,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(VictoryRoad2_h) db BANK(Route12GateUpstairs_h) db BANK(VermilionHouse3_h) - db $18 ; db BANK(DiglettsCave_h) - db $11 ; db BANK(VictoryRoad3_h) + db BANK(DiglettsCave_h) + db BANK(VictoryRoad3_h) db $11 ; db BANK(RocketHideout1_h) db $11 ; db BANK(RocketHideout2_h) db $11 ; db BANK(RocketHideout3_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 887ee9d6..23b17f2f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -197,8 +197,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw VictoryRoad2_h dw Route12GateUpstairs_h dw VermilionHouse3_h - dw $5f79 ; dw DiglettsCave_h - dw $4a0d ; dw VictoryRoad3_h + dw DiglettsCave_h + dw VictoryRoad3_h dw $4c5e ; dw RocketHideout1_h dw $4ebb ; dw RocketHideout2_h ;200 dw $52b9 ; dw RocketHideout3_h @@ -874,7 +874,12 @@ INCLUDE "data/mapHeaders/ssanne3.asm" INCLUDE "scripts/ssanne3.asm" INCLUDE "data/mapObjects/ssanne3.asm" SSAnne3Blocks: INCBIN "maps/ssanne3.blk" - dr $44a0d,$45077 + +INCLUDE "data/mapHeaders/victoryroad3.asm" +INCLUDE "scripts/victoryroad3.asm" +INCLUDE "data/mapObjects/victoryroad3.asm" +VictoryRoad3Blocks: INCBIN "maps/victoryroad3.blk" + dr $44c5e,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) dr $45077,$46578 @@ -1643,8 +1648,12 @@ INCLUDE "data/mapHeaders/undergroundpathwe.asm" INCLUDE "scripts/undergroundpathwe.asm" INCLUDE "data/mapObjects/undergroundpathwe.asm" +INCLUDE "data/mapHeaders/diglettscave.asm" +INCLUDE "scripts/diglettscave.asm" +INCLUDE "data/mapObjects/diglettscave.asm" +DiglettsCaveBlocks: INCBIN "maps/diglettscave.blk" + dr $62105,$625e8 - dr $61f79,$625e8 INCLUDE "engine/hidden_object_functions18.asm" SECTION "bank19",ROMX,BANK[$19] diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 22e6813a..72e13775 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -36,6 +36,9 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld a, [wCoordIndex] cp $1 jr nz, .asm_449dc + ld a, [hSpriteIndexOrTextID] + cp $f ; Pikachu + jp z, .asm_449fe ld hl, wd126 set 5, [hl] SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 |