diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 14:17:20 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 14:17:20 -0400 |
| commit | 39d56456103403d9a224908eafb2ecb08c1f2b9f (patch) | |
| tree | f205457fdf8fd9972a3c14a27b5e593b13c8e1f1 | |
| parent | 9298c87bc6d689e23f910ca97991760984dbd4f9 (diff) | |
Victory Road 1F
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 7 | ||||
| -rwxr-xr-x | scripts/victoryroad1.asm | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index bbc3034e..2e75a0f1 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -108,7 +108,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $1d ; unused db $1d ; unused db $1d ; unused - db $17 ; db BANK(VictoryRoad1_h) + db BANK(VictoryRoad1_h) db $1d ; unused db $1d ; unused db $1d ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 8037ba29..8997bdb4 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -108,7 +108,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $623d ; dw Lance_h ; unused dw $623d ; dw Lance_h ; unused dw $623d ; dw Lance_h ; unused - dw $5909 ; dw VictoryRoad1_h + dw VictoryRoad1_h dw $623d ; dw Lance_h ; unused dw $623d ; dw Lance_h ; unused ;id=110 dw $623d ; dw Lance_h ; unused @@ -248,4 +248,4 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $59ef ; dw Lorelei_h dw $5b4a ; dw Bruno_h dw $5ca1 ; dw Agatha_h ;247 - dw $620e ; dw BeachHouse_h + dw BeachHouse_h @@ -1341,8 +1341,13 @@ INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" INCLUDE "scripts/undergroundpathentranceroute7copy.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" + dr $5d6ba,$5d909 - dr $5d6ba,$5da70 +INCLUDE "data/mapHeaders/victoryroad1.asm" +INCLUDE "scripts/victoryroad1.asm" +INCLUDE "data/mapObjects/victoryroad1.asm" +VictoryRoad1Blocks: +INCBIN "maps/victoryroad1.blk" INCLUDE "engine/evolution.asm" diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 11f5d5db..ee88d393 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -29,6 +29,9 @@ VictoryRoad1Script0: ; 5da40 (17:5a40) ld hl, CoordsData_5da5c call CheckBoulderCoords jp nc, CheckFightingMapTrainers + ld a, [H_SPRITEINDEX] + cp $f + jp z, CheckFightingMapTrainers ld hl, wd126 set 5, [hl] SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH |