diff options
author | YamaArashi <shadow962@live.com> | 2016-06-11 17:30:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 17:30:20 -0700 |
commit | 7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch) | |
tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /scripts/rockethideout1.asm | |
parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/rockethideout1.asm')
-rwxr-xr-x | scripts/rockethideout1.asm | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index d821434d..35c9026a 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -1,4 +1,4 @@ -RocketHideout1Script: ; 44bca (11:4bca) +RocketHideout1Script: call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders @@ -8,7 +8,7 @@ RocketHideout1Script: ; 44bca (11:4bca) ld [wRocketHideout1CurScript], a ret -RocketHideout1Script_44be0: ; 44be0 (11:4be0) +RocketHideout1Script_44be0: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -30,12 +30,12 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0) lb bc, 8, 12 predef_jump ReplaceTileBlock -RocketHideout1ScriptPointers: ; 44c0e (11:4c0e) +RocketHideout1ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RocketHideout1TextPointers: ; 44c14 (11:4c14) +RocketHideout1TextPointers: dw RocketHideout1Text1 dw RocketHideout1Text2 dw RocketHideout1Text3 @@ -44,8 +44,8 @@ RocketHideout1TextPointers: ; 44c14 (11:4c14) dw PickUpItemText dw PickUpItemText -RocketHideout1TrainerHeaders: ; 44c22 (11:4c22) -RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) +RocketHideout1TrainerHeaders: +RocketHideout1TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 @@ -54,7 +54,7 @@ RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) dw RocketHideout1EndBattleText2 ; TextEndBattle dw RocketHideout1EndBattleText2 ; TextEndBattle -RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e) +RocketHideout1TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 @@ -63,7 +63,7 @@ RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e) dw RocketHideout1EndBattleText3 ; TextEndBattle dw RocketHideout1EndBattleText3 ; TextEndBattle -RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a) +RocketHideout1TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 @@ -72,7 +72,7 @@ RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a) dw RocketHideout1EndBattleText4 ; TextEndBattle dw RocketHideout1EndBattleText4 ; TextEndBattle -RocketHideout1TrainerHeader4: ; 44c46 (11:4c46) +RocketHideout1TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 @@ -81,7 +81,7 @@ RocketHideout1TrainerHeader4: ; 44c46 (11:4c46) dw RocketHideout1EndBattleText5 ; TextEndBattle dw RocketHideout1EndBattleText5 ; TextEndBattle -RocketHideout1TrainerHeader5: ; 44c52 (11:4c52) +RocketHideout1TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 @@ -92,98 +92,98 @@ RocketHideout1TrainerHeader5: ; 44c52 (11:4c52) db $ff -RocketHideout1Text1: ; 44c5f (11:4c5f) +RocketHideout1Text1: TX_ASM ld hl, RocketHideout1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text2: ; 44c69 (11:4c69) +RocketHideout1Text2: TX_ASM ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text3: ; 44c73 (11:4c73) +RocketHideout1Text3: TX_ASM ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text4: ; 44c7d (11:4c7d) +RocketHideout1Text4: TX_ASM ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text5: ; 44c87 (11:4c87) +RocketHideout1Text5: TX_ASM ld hl, RocketHideout1TrainerHeader5 call TalkToTrainer jp TextScriptEnd -RocketHideout1EndBattleText6: ; 44c91 (11:4c91) +RocketHideout1EndBattleText6: TX_FAR _RocketHideout1EndBattleText6 TX_ASM SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 ld hl, RocketHideout1Text_44c9f ret -RocketHideout1Text_44c9f: ; 44c9f (11:4c9f) +RocketHideout1Text_44c9f: db $6, "@" -RocketHideout1BattleText2: ; 44ca1 (11:4ca1) +RocketHideout1BattleText2: TX_FAR _RocketHideout1BattleText2 db "@" -RocketHideout1EndBattleText2: ; 44ca6 (11:4ca6) +RocketHideout1EndBattleText2: TX_FAR _RocketHideout1EndBattleText2 db "@" -RocketHideout1AfterBattleTxt2: ; 44cab (11:4cab) +RocketHideout1AfterBattleTxt2: TX_FAR _RocketHideout1AfterBattleTxt2 db "@" -RocketHideout1BattleText3: ; 44cb0 (11:4cb0) +RocketHideout1BattleText3: TX_FAR _RocketHideout1BattleText3 db "@" -RocketHideout1EndBattleText3: ; 44cb5 (11:4cb5) +RocketHideout1EndBattleText3: TX_FAR _RocketHideout1EndBattleText3 db "@" -RocketHideout1AfterBattleTxt3: ; 44cba (11:4cba) +RocketHideout1AfterBattleTxt3: TX_FAR _RocketHideout1AfterBattleTxt3 db "@" -RocketHideout1BattleText4: ; 44cbf (11:4cbf) +RocketHideout1BattleText4: TX_FAR _RocketHideout1BattleText4 db "@" -RocketHideout1EndBattleText4: ; 44cc4 (11:4cc4) +RocketHideout1EndBattleText4: TX_FAR _RocketHideout1EndBattleText4 db "@" -RocketHideout1AfterBattleTxt4: ; 44cc9 (11:4cc9) +RocketHideout1AfterBattleTxt4: TX_FAR _RocketHideout1AfterBattleTxt4 db "@" -RocketHideout1BattleText5: ; 44cce (11:4cce) +RocketHideout1BattleText5: TX_FAR _RocketHideout1BattleText5 db "@" -RocketHideout1EndBattleText5: ; 44cd3 (11:4cd3) +RocketHideout1EndBattleText5: TX_FAR _RocketHideout1EndBattleText5 db "@" -RocketHideout1AfterBattleTxt5: ; 44cd8 (11:4cd8) +RocketHideout1AfterBattleTxt5: TX_FAR _RocketHideout1AfterBattleTxt5 db "@" -RocketHideout1BattleText6: ; 44cdd (11:4cdd) +RocketHideout1BattleText6: TX_FAR _RocketHideout1BattleText6 db "@" -RocketHideout1AfterBattleTxt6: ; 44ce2 (11:4ce2) +RocketHideout1AfterBattleTxt6: TX_FAR _RocketHideout1AfterBattleTxt6 db "@" |