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/Route24.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/Route24.asm (renamed from scripts/route24.asm) | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/scripts/route24.asm b/scripts/Route24.asm index d2872ccc..58f71981 100755 --- a/scripts/route24.asm +++ b/scripts/Route24.asm @@ -1,7 +1,7 @@ -Route24Script: +Route24_Script: call EnableAutoTextBoxDrawing - ld hl, Route24TrainerHeaders - ld de, Route24ScriptPointers + ld hl, Route24TrainerHeader0 + ld de, Route24_ScriptPointers ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable ld [wRoute24CurScript], a @@ -14,7 +14,7 @@ Route24Script_513c0: ld [wCurMapScript], a ret -Route24ScriptPointers: +Route24_ScriptPointers: dw Route24Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -75,7 +75,7 @@ Route24Script3: ld [wCurMapScript], a ret -Route24TextPointers: +Route24_TextPointers: dw Route24Text1 dw Route24Text2 dw Route24Text3 @@ -86,7 +86,6 @@ Route24TextPointers: dw PickUpItemText dw Route24Text8 -Route24TrainerHeaders: Route24TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -96,46 +95,46 @@ Route24TrainerHeader0: dw Route24EndBattleText1 ; TextEndBattle dw Route24EndBattleText1 ; TextEndBattle -Route24TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 +Route24TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1 dw Route24BattleText2 ; TextBeforeBattle dw Route24AfterBattleText2 ; TextAfterBattle dw Route24EndBattleText2 ; TextEndBattle dw Route24EndBattleText2 ; TextEndBattle -Route24TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 +Route24TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 dw Route24BattleText3 ; TextBeforeBattle dw Route24AfterBattleText3 ; TextAfterBattle dw Route24EndBattleText3 ; TextEndBattle dw Route24EndBattleText3 ; TextEndBattle -Route24TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 +Route24TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 dw Route24BattleText4 ; TextBeforeBattle dw Route24AfterBattleText4 ; TextAfterBattle dw Route24EndBattleText4 ; TextEndBattle dw Route24EndBattleText4 ; TextEndBattle -Route24TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 +Route24TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 dw Route24BattleText5 ; TextBeforeBattle dw Route24AfterBattleText5 ; TextAfterBattle dw Route24EndBattleText5 ; TextEndBattle dw Route24EndBattleText5 ; TextEndBattle -Route24TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6 +Route24TrainerHeader5: + dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 dw Route24BattleText6 ; TextBeforeBattle dw Route24AfterBattleText6 ; TextAfterBattle dw Route24EndBattleText6 ; TextEndBattle @@ -186,14 +185,14 @@ Route24Text1: Route24Text_51510: TX_FAR _Route24Text_51510 - db $0B + TX_SFX_ITEM_1 TX_FAR _Route24Text_51515 db "@" Route24Text_5151a: TX_FAR _Route24Text_5151a TX_SFX_KEY_ITEM - TX_BUTTON_SOUND + TX_BLINK db "@" Route24Text_51521: @@ -220,31 +219,31 @@ Route24Text2: Route24Text3: TX_ASM - ld hl, Route24TrainerHeader2 + ld hl, Route24TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route24Text4: TX_ASM - ld hl, Route24TrainerHeader3 + ld hl, Route24TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route24Text5: TX_ASM - ld hl, Route24TrainerHeader4 + ld hl, Route24TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route24Text6: TX_ASM - ld hl, Route24TrainerHeader5 + ld hl, Route24TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route24Text7: TX_ASM - ld hl, Route24TrainerHeader6 + ld hl, Route24TrainerHeader5 call TalkToTrainer jp TextScriptEnd |