diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/VictoryRoad1F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/VictoryRoad1F.asm (renamed from scripts/victoryroad1.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/victoryroad1.asm b/scripts/VictoryRoad1F.asm index 0f4de43e..07f203b1 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/VictoryRoad1F.asm @@ -1,14 +1,14 @@ -VictoryRoad1Script: +VictoryRoad1F_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing - ld hl, VictoryRoad1TrainerHeaders - ld de, VictoryRoad1ScriptPointers - ld a, [wVictoryRoad1CurScript] + ld hl, VictoryRoad1TrainerHeader0 + ld de, VictoryRoad1F_ScriptPointers + ld a, [wVictoryRoad1FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad1CurScript], a + ld [wVictoryRoad1FCurScript], a ret .next CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH @@ -18,7 +18,7 @@ VictoryRoad1Script: lb bc, 6, 4 predef_jump ReplaceTileBlock -VictoryRoad1ScriptPointers: +VictoryRoad1F_ScriptPointers: dw VictoryRoad1Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -40,7 +40,7 @@ VictoryRoad1Script0: CoordsData_5da5c: db $0D,$11,$FF -VictoryRoad1TextPointers: +VictoryRoad1F_TextPointers: dw VictoryRoad1Text1 dw VictoryRoad1Text2 dw PickUpItemText @@ -49,7 +49,6 @@ VictoryRoad1TextPointers: dw BoulderText dw BoulderText -VictoryRoad1TrainerHeaders: VictoryRoad1TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 db ($2 << 4) ; trainer's view range |