diff options
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 6 | ||||
| -rwxr-xr-x | scripts/victoryroad2.asm | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 00d29a22..b99b30dd 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -194,7 +194,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route18GateUpstairs_h) db BANK(SeafoamIslands1_h) db BANK(Route22Gate_h) - db $14 ; db BANK(VictoryRoad2_h) + db BANK(VictoryRoad2_h) db $12 ; db BANK(Route12GateUpstairs_h) db $06 ; db BANK(VermilionHouse3_h) db $18 ; db BANK(DiglettsCave_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 63b135da..6313b16b 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -194,7 +194,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route18GateUpstairs_h dw SeafoamIslands1_h dw Route22Gate_h - dw $57cc ; dw VictoryRoad2_h + dw VictoryRoad2_h dw $54eb ; dw Route12GateUpstairs_h dw $5d05 ; dw VermilionHouse3_h dw $5f79 ; dw DiglettsCave_h @@ -1193,8 +1193,10 @@ INCLUDE "scripts/route23.asm" INCLUDE "scripts/route24.asm" INCLUDE "scripts/route25.asm" -; victoryroad2 - dr $517cc,$51a78 +INCLUDE "data/mapHeaders/victoryroad2.asm" +INCLUDE "scripts/victoryroad2.asm" +INCLUDE "data/mapObjects/victoryroad2.asm" +VictoryRoad2Blocks: INCBIN "maps/victoryroad2.blk" INCLUDE "data/mapHeaders/mtmoon2.asm" INCLUDE "scripts/mtmoon2.asm" diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index cb956b1c..87635c2e 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -17,7 +17,6 @@ VictoryRoad2Script: ; 5179d (14:579d) VictoryRoad2Script_517c4: ; 517c4 (14:57c4) ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - VictoryRoad2Script_517c9: ; 517c9 (14:57c9) CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 jr z, .asm_517da @@ -31,7 +30,6 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) ret z ld a, $1d lb bc, 7, 11 - VictoryRoad2Script_517e2: ; 517e2 (14:57e2) ld [wNewTileBlockID], a predef ReplaceTileBlock @@ -46,6 +44,9 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) ld hl, CoordsData_51816 call CheckBoulderCoords jp nc, CheckFightingMapTrainers + ld a, [hSpriteIndexOrTextID] + cp $f + jp z, CheckFightingMapTrainers EventFlagAddress hl, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 ld a, [wCoordIndex] cp $2 |