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/VictoryRoad3F.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/VictoryRoad3F.asm (renamed from scripts/victoryroad3.asm) | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/scripts/victoryroad3.asm b/scripts/VictoryRoad3F.asm index 31e06053..dc7a2aac 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/VictoryRoad3F.asm @@ -1,11 +1,11 @@ -VictoryRoad3Script: +VictoryRoad3F_Script: call VictoryRoad3Script_44996 call EnableAutoTextBoxDrawing - ld hl, VictoryRoad3TrainerHeaders - ld de, VictoryRoad3ScriptPointers - ld a, [wVictoryRoad3CurScript] + ld hl, VictoryRoad3TrainerHeader0 + ld de, VictoryRoad3F_ScriptPointers + ld a, [wVictoryRoad3FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad3CurScript], a + ld [wVictoryRoad3FCurScript], a ret VictoryRoad3Script_44996: @@ -20,7 +20,7 @@ VictoryRoad3Script_44996: lb bc, 5, 3 predef_jump ReplaceTileBlock -VictoryRoad3ScriptPointers: +VictoryRoad3F_ScriptPointers: dw VictoryRoad3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -46,10 +46,10 @@ VictoryRoad3Script0: .asm_449dc CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 jr nz, .asm_449fe - ld a, HS_VICTORY_ROAD_3_BOULDER + ld a, HS_VICTORY_ROAD_3F_BOULDER ld [wMissableObjectIndex], a predef HideObject - ld a, HS_VICTORY_ROAD_2_BOULDER + ld a, HS_VICTORY_ROAD_2F_BOULDER ld [wMissableObjectIndex], a predef_jump ShowObject @@ -59,7 +59,7 @@ VictoryRoad3Script0: db $FF .asm_449fe - ld a, VICTORY_ROAD_2 + ld a, VICTORY_ROAD_2F ld [wDungeonWarpDestinationMap], a ld hl, .coordsData_449f9 call IsPlayerOnDungeonWarp @@ -77,7 +77,7 @@ VictoryRoad3Script0: jp z, CheckFightingMapTrainers ret -VictoryRoad3TextPointers: +VictoryRoad3F_TextPointers: dw VictoryRoad3Text1 dw VictoryRoad3Text2 dw VictoryRoad3Text3 @@ -89,7 +89,6 @@ VictoryRoad3TextPointers: dw BoulderText dw BoulderText -VictoryRoad3TrainerHeaders: VictoryRoad3TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 db ($1 << 4) ; trainer's view range @@ -99,28 +98,28 @@ VictoryRoad3TrainerHeader0: dw VictoryRoad3EndBattleText2 ; TextEndBattle dw VictoryRoad3EndBattleText2 ; TextEndBattle -VictoryRoad3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 +VictoryRoad3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 dw VictoryRoad3BattleText3 ; TextBeforeBattle dw VictoryRoad3AfterBattleText3 ; TextAfterBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle -VictoryRoad3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 +VictoryRoad3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 dw VictoryRoad3BattleText4 ; TextBeforeBattle dw VictoryRoad3AfterBattleText4 ; TextAfterBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle -VictoryRoad3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 +VictoryRoad3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 dw VictoryRoad3BattleText5 ; TextBeforeBattle dw VictoryRoad3AfterBattleText5 ; TextAfterBattle dw VictoryRoad3EndBattleText5 ; TextEndBattle @@ -136,19 +135,19 @@ VictoryRoad3Text1: VictoryRoad3Text2: TX_ASM - ld hl, VictoryRoad3TrainerHeader2 + ld hl, VictoryRoad3TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text3: TX_ASM - ld hl, VictoryRoad3TrainerHeader3 + ld hl, VictoryRoad3TrainerHeader2 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text4: TX_ASM - ld hl, VictoryRoad3TrainerHeader4 + ld hl, VictoryRoad3TrainerHeader3 call TalkToTrainer jp TextScriptEnd |