diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 00:01:37 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 00:01:37 -0400 |
| commit | 2d68444e202df625d8026b2c705271e66619abad (patch) | |
| tree | 1ced5de9af124133286e154c120b8079b67372dc /scripts | |
| parent | 8455e51b86c1e5d33e3290e30b48bde663038226 (diff) | |
Victory Road 2F
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/victoryroad2.asm | 5 |
1 files changed, 3 insertions, 2 deletions
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 |
