diff options
author | YamaArashi <shadow962@live.com> | 2016-06-11 17:24:04 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-06-11 17:24:04 -0700 |
commit | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (patch) | |
tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/ssanne10.asm | |
parent | cee4d559f999312837da7d69e2c6704e85c159d4 (diff) |
remove address comments
Diffstat (limited to 'scripts/ssanne10.asm')
-rwxr-xr-x | scripts/ssanne10.asm | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index d39b902f..45c8dba5 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -1,4 +1,4 @@ -SSAnne10Script: ; 61d55 (18:5d55) +SSAnne10Script: call EnableAutoTextBoxDrawing ld hl, SSAnne10TrainerHeaders ld de, SSAnne10ScriptPointers @@ -7,12 +7,12 @@ SSAnne10Script: ; 61d55 (18:5d55) ld [wSSAnne10CurScript], a ret -SSAnne10ScriptPointers: ; 61d68 (18:5d68) +SSAnne10ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne10TextPointers: ; 61d6e (18:5d6e) +SSAnne10TextPointers: dw SSAnne10Text1 dw SSAnne10Text2 dw SSAnne10Text3 @@ -25,8 +25,8 @@ SSAnne10TextPointers: ; 61d6e (18:5d6e) dw PickUpItemText dw PickUpItemText -SSAnne10TrainerHeaders: ; 61d84 (18:5d84) -SSAnne10TrainerHeader0: ; 61d84 (18:5d84) +SSAnne10TrainerHeaders: +SSAnne10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0 @@ -35,7 +35,7 @@ SSAnne10TrainerHeader0: ; 61d84 (18:5d84) dw SSAnne10EndBattleText1 ; TextEndBattle dw SSAnne10EndBattleText1 ; TextEndBattle -SSAnne10TrainerHeader1: ; 61d90 (18:5d90) +SSAnne10TrainerHeader1: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1 @@ -44,7 +44,7 @@ SSAnne10TrainerHeader1: ; 61d90 (18:5d90) dw SSAnne10EndBattleText2 ; TextEndBattle dw SSAnne10EndBattleText2 ; TextEndBattle -SSAnne10TrainerHeader2: ; 61d9c (18:5d9c) +SSAnne10TrainerHeader2: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2 @@ -53,7 +53,7 @@ SSAnne10TrainerHeader2: ; 61d9c (18:5d9c) dw SSAnne10EndBattleText3 ; TextEndBattle dw SSAnne10EndBattleText3 ; TextEndBattle -SSAnne10TrainerHeader3: ; 61da8 (18:5da8) +SSAnne10TrainerHeader3: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3 @@ -62,7 +62,7 @@ SSAnne10TrainerHeader3: ; 61da8 (18:5da8) dw SSAnne10EndBattleText4 ; TextEndBattle dw SSAnne10EndBattleText4 ; TextEndBattle -SSAnne10TrainerHeader4: ; 61db4 (18:5db4) +SSAnne10TrainerHeader4: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4 @@ -71,7 +71,7 @@ SSAnne10TrainerHeader4: ; 61db4 (18:5db4) dw SSAnne10EndBattleText5 ; TextEndBattle dw SSAnne10EndBattleText5 ; TextEndBattle -SSAnne10TrainerHeader5: ; 61dc0 (18:5dc0) +SSAnne10TrainerHeader5: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5 @@ -82,121 +82,121 @@ SSAnne10TrainerHeader5: ; 61dc0 (18:5dc0) db $ff -SSAnne10Text1: ; 61dcd (18:5dcd) +SSAnne10Text1: TX_ASM ld hl, SSAnne10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne10Text2: ; 61dd7 (18:5dd7) +SSAnne10Text2: TX_ASM ld hl, SSAnne10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne10Text3: ; 61de1 (18:5de1) +SSAnne10Text3: TX_ASM ld hl, SSAnne10TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SSAnne10Text4: ; 61deb (18:5deb) +SSAnne10Text4: TX_ASM ld hl, SSAnne10TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SSAnne10Text5: ; 61df5 (18:5df5) +SSAnne10Text5: TX_ASM ld hl, SSAnne10TrainerHeader4 call TalkToTrainer jp TextScriptEnd -SSAnne10Text6: ; 61dff (18:5dff) +SSAnne10Text6: TX_ASM ld hl, SSAnne10TrainerHeader5 call TalkToTrainer jp TextScriptEnd -SSAnne10Text8: ; 61e09 (18:5e09) +SSAnne10Text8: TX_FAR _SSAnne10Text8 TX_ASM ld a, MACHOKE call PlayCry jp TextScriptEnd -SSAnne10BattleText1: ; 61e16 (18:5e16) +SSAnne10BattleText1: TX_FAR _SSAnne10BattleText1 db "@" -SSAnne10EndBattleText1: ; 61e1b (18:5e1b) +SSAnne10EndBattleText1: TX_FAR _SSAnne10EndBattleText1 db "@" -SSAnne10AfterBattleText1: ; 61e20 (18:5e20) +SSAnne10AfterBattleText1: TX_FAR _SSAnne10AfterBattleText1 db "@" -SSAnne10BattleText2: ; 61e25 (18:5e25) +SSAnne10BattleText2: TX_FAR _SSAnne10BattleText2 db "@" -SSAnne10EndBattleText2: ; 61e2a (18:5e2a) +SSAnne10EndBattleText2: TX_FAR _SSAnne10EndBattleText2 db "@" -SSAnne10AfterBattleText2: ; 61e2f (18:5e2f) +SSAnne10AfterBattleText2: TX_FAR _SSAnne10AfterBattleText2 db "@" -SSAnne10BattleText3: ; 61e34 (18:5e34) +SSAnne10BattleText3: TX_FAR _SSAnne10BattleText3 db "@" -SSAnne10EndBattleText3: ; 61e39 (18:5e39) +SSAnne10EndBattleText3: TX_FAR _SSAnne10EndBattleText3 db "@" -SSAnne10AfterBattleText3: ; 61e3e (18:5e3e) +SSAnne10AfterBattleText3: TX_FAR _SSAnne10AfterBattleText3 db "@" -SSAnne10BattleText4: ; 61e43 (18:5e43) +SSAnne10BattleText4: TX_FAR _SSAnne10BattleText4 db "@" -SSAnne10EndBattleText4: ; 61e48 (18:5e48) +SSAnne10EndBattleText4: TX_FAR _SSAnne10EndBattleText4 db "@" -SSAnne10AfterBattleText4: ; 61e4d (18:5e4d) +SSAnne10AfterBattleText4: TX_FAR _SSAnne10AfterBattleText4 db "@" -SSAnne10BattleText5: ; 61e52 (18:5e52) +SSAnne10BattleText5: TX_FAR _SSAnne10BattleText5 db "@" -SSAnne10EndBattleText5: ; 61e57 (18:5e57) +SSAnne10EndBattleText5: TX_FAR _SSAnne10EndBattleText5 db "@" -SSAnne10AfterBattleText5: ; 61e5c (18:5e5c) +SSAnne10AfterBattleText5: TX_FAR _SSAnne10AfterBattleText5 db "@" -SSAnne10BattleText6: ; 61e61 (18:5e61) +SSAnne10BattleText6: TX_FAR _SSAnne10BattleText6 db "@" -SSAnne10EndBattleText6: ; 61e66 (18:5e66) +SSAnne10EndBattleText6: TX_FAR _SSAnne10EndBattleText6 db "@" -SSAnne10AfterBattleText6: ; 61e6b (18:5e6b) +SSAnne10AfterBattleText6: TX_FAR _SSAnne10AfterBattleText6 db "@" -SSAnne10Text7: ; 61e70 (18:5e70) +SSAnne10Text7: TX_FAR _SSAnne10Text7 db "@" |