diff options
Diffstat (limited to 'scripts/route12.asm')
-rwxr-xr-x | scripts/route12.asm | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/scripts/route12.asm b/scripts/route12.asm index 882e687a..e61f41c0 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -1,4 +1,4 @@ -Route12Script: ; 595f3 (16:55f3) +Route12Script: call EnableAutoTextBoxDrawing ld hl, Route12TrainerHeaders ld de, Route12ScriptPointers @@ -7,20 +7,20 @@ Route12Script: ; 595f3 (16:55f3) ld [wRoute12CurScript], a ret -Route12Script_59606: ; 59606 (16:5606) +Route12Script_59606: xor a ld [wJoyIgnore], a ld [wRoute12CurScript], a ld [wCurMapScript], a ret -Route12ScriptPointers: ; 59611 (16:5611) +Route12ScriptPointers: dw Route12Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw Route12Script3 -Route12Script0: ; 59619 (16:5619) +Route12Script0: CheckEventHL EVENT_BEAT_ROUTE12_SNORLAX jp nz, CheckFightingMapTrainers CheckEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX @@ -41,7 +41,7 @@ Route12Script0: ; 59619 (16:5619) ld [wCurMapScript], a ret -Route12Script3: ; 5964c (16:564c) +Route12Script3: ld a, [wIsInBattle] cp $ff jr z, Route12Script_59606 @@ -60,7 +60,7 @@ Route12Script3: ; 5964c (16:564c) ld [wCurMapScript], a ret -Route12TextPointers: ; 59675 (16:5675) +Route12TextPointers: dw Route12Text1 dw Route12Text2 dw Route12Text3 @@ -76,8 +76,8 @@ Route12TextPointers: ; 59675 (16:5675) dw Route12Text13 dw Route12Text14 -Route12TrainerHeaders: ; 59691 (16:5691) -Route12TrainerHeader0: ; 59691 (16:5691) +Route12TrainerHeaders: +Route12TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_0 @@ -86,7 +86,7 @@ Route12TrainerHeader0: ; 59691 (16:5691) dw Route12EndBattleText1 ; TextEndBattle dw Route12EndBattleText1 ; TextEndBattle -Route12TrainerHeader1: ; 5969d (16:569d) +Route12TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_1 @@ -95,7 +95,7 @@ Route12TrainerHeader1: ; 5969d (16:569d) dw Route12EndBattleText2 ; TextEndBattle dw Route12EndBattleText2 ; TextEndBattle -Route12TrainerHeader2: ; 596a9 (16:56a9) +Route12TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_2 @@ -104,7 +104,7 @@ Route12TrainerHeader2: ; 596a9 (16:56a9) dw Route12EndBattleText3 ; TextEndBattle dw Route12EndBattleText3 ; TextEndBattle -Route12TrainerHeader3: ; 596b5 (16:56b5) +Route12TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_3 @@ -113,7 +113,7 @@ Route12TrainerHeader3: ; 596b5 (16:56b5) dw Route12EndBattleText4 ; TextEndBattle dw Route12EndBattleText4 ; TextEndBattle -Route12TrainerHeader4: ; 596c1 (16:56c1) +Route12TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_4 @@ -122,7 +122,7 @@ Route12TrainerHeader4: ; 596c1 (16:56c1) dw Route12EndBattleText5 ; TextEndBattle dw Route12EndBattleText5 ; TextEndBattle -Route12TrainerHeader5: ; 596cd (16:56cd) +Route12TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_5 @@ -131,7 +131,7 @@ Route12TrainerHeader5: ; 596cd (16:56cd) dw Route12EndBattleText6 ; TextEndBattle dw Route12EndBattleText6 ; TextEndBattle -Route12TrainerHeader6: ; 596d9 (16:56d9) +Route12TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_6, 1 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_6, 1 @@ -142,148 +142,148 @@ Route12TrainerHeader6: ; 596d9 (16:56d9) db $ff -Route12Text1: ; 596e6 (16:56e6) +Route12Text1: TX_FAR _Route12Text1 db "@" -Route12Text13: ; 596eb (16:56eb) +Route12Text13: TX_FAR _Route12Text13 db "@" -Route12Text14: ; 596f0 (16:56f0) +Route12Text14: TX_FAR _Route12Text14 db "@" -Route12Text2: ; 596f5 (16:56f5) +Route12Text2: TX_ASM ld hl, Route12TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route12BattleText1: ; 596ff (16:56ff) +Route12BattleText1: TX_FAR _Route12BattleText1 db "@" -Route12EndBattleText1: ; 59704 (16:5704) +Route12EndBattleText1: TX_FAR _Route12EndBattleText1 db "@" -Route12AfterBattleText1: ; 59709 (16:5709) +Route12AfterBattleText1: TX_FAR _Route12AfterBattleText1 db "@" -Route12Text3: ; 5970e (16:570e) +Route12Text3: TX_ASM ld hl, Route12TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route12BattleText2: ; 59718 (16:5718) +Route12BattleText2: TX_FAR _Route12BattleText2 db "@" -Route12EndBattleText2: ; 5971d (16:571d) +Route12EndBattleText2: TX_FAR _Route12EndBattleText2 db "@" -Route12AfterBattleText2: ; 59722 (16:5722) +Route12AfterBattleText2: TX_FAR _Route12AfterBattleText2 db "@" -Route12Text4: ; 59727 (16:5727) +Route12Text4: TX_ASM ld hl, Route12TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route12BattleText3: ; 59731 (16:5731) +Route12BattleText3: TX_FAR _Route12BattleText3 db "@" -Route12EndBattleText3: ; 59736 (16:5736) +Route12EndBattleText3: TX_FAR _Route12EndBattleText3 db "@" -Route12AfterBattleText3: ; 5973b (16:573b) +Route12AfterBattleText3: TX_FAR _Route12AfterBattleText3 db "@" -Route12Text5: ; 59740 (16:5740) +Route12Text5: TX_ASM ld hl, Route12TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route12BattleText4: ; 5974a (16:574a) +Route12BattleText4: TX_FAR _Route12BattleText4 db "@" -Route12EndBattleText4: ; 5974f (16:574f) +Route12EndBattleText4: TX_FAR _Route12EndBattleText4 db "@" -Route12AfterBattleText4: ; 59754 (16:5754) +Route12AfterBattleText4: TX_FAR _Route12AfterBattleText4 db "@" -Route12Text6: ; 59759 (16:5759) +Route12Text6: TX_ASM ld hl, Route12TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route12BattleText5: ; 59763 (16:5763) +Route12BattleText5: TX_FAR _Route12BattleText5 db "@" -Route12EndBattleText5: ; 59768 (16:5768) +Route12EndBattleText5: TX_FAR _Route12EndBattleText5 db "@" -Route12AfterBattleText5: ; 5976d (16:576d) +Route12AfterBattleText5: TX_FAR _Route12AfterBattleText5 db "@" -Route12Text7: ; 59772 (16:5772) +Route12Text7: TX_ASM ld hl, Route12TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route12BattleText6: ; 5977c (16:577c) +Route12BattleText6: TX_FAR _Route12BattleText6 db "@" -Route12EndBattleText6: ; 59781 (16:5781) +Route12EndBattleText6: TX_FAR _Route12EndBattleText6 db "@" -Route12AfterBattleText6: ; 59786 (16:5786) +Route12AfterBattleText6: TX_FAR _Route12AfterBattleText6 db "@" -Route12Text8: ; 5978b (16:578b) +Route12Text8: TX_ASM ld hl, Route12TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route12BattleText7: ; 59795 (16:5795) +Route12BattleText7: TX_FAR _Route12BattleText7 db "@" -Route12EndBattleText7: ; 5979a (16:579a) +Route12EndBattleText7: TX_FAR _Route12EndBattleText7 db "@" -Route12AfterBattleText7: ; 5979f (16:579f) +Route12AfterBattleText7: TX_FAR _Route12AfterBattleText7 db "@" -Route12Text11: ; 597a4 (16:57a4) +Route12Text11: TX_FAR _Route12Text11 db "@" -Route12Text12: ; 597a9 (16:57a9) +Route12Text12: TX_FAR _Route12Text12 db "@" |