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/silphco9.asm | |
parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'scripts/silphco9.asm')
-rwxr-xr-x | scripts/silphco9.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 589a086e..6757eb49 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -1,4 +1,4 @@ -SilphCo9Script: ; 5d7bb (17:57bb) +SilphCo9Script: call SilphCo9Script_5d7d1 call EnableAutoTextBoxDrawing ld hl, SilphCo9TrainerHeaders @@ -8,7 +8,7 @@ SilphCo9Script: ; 5d7bb (17:57bb) ld [wSilphCo9CurScript], a ret -SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) +SilphCo9Script_5d7d1: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -50,14 +50,14 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) lb bc, 6, 5 predef_jump ReplaceTileBlock -SilphCo9GateCoords: ; 5d82e (17:582e) +SilphCo9GateCoords: db $04,$01 db $02,$09 db $05,$09 db $06,$05 db $FF -SilphCo9Script_5d837: ; 5d837 (17:5837) +SilphCo9Script_5d837: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -93,7 +93,7 @@ SilphCo9Script_5d837: ; 5d837 (17:5837) ld [$ffe0], a ret -SilphCo9Script_5d863: ; 5d863 (17:5863) +SilphCo9Script_5d863: EventFlagAddress hl, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -118,19 +118,19 @@ SilphCo9Script_5d863: ; 5d863 (17:5863) SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -SilphCo9ScriptPointers: ; 5d885 (17:5885) +SilphCo9ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo9TextPointers: ; 5d88b (17:588b) +SilphCo9TextPointers: dw SilphCo9Text1 dw SilphCo9Text2 dw SilphCo9Text3 dw SilphCo9Text4 -SilphCo9TrainerHeaders: ; 5d893 (17:5893) -SilphCo9TrainerHeader0: ; 5d893 (17:5893) +SilphCo9TrainerHeaders: +SilphCo9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_0 @@ -139,7 +139,7 @@ SilphCo9TrainerHeader0: ; 5d893 (17:5893) dw SilphCo9EndBattleText1 ; TextEndBattle dw SilphCo9EndBattleText1 ; TextEndBattle -SilphCo9TrainerHeader1: ; 5d89f (17:589f) +SilphCo9TrainerHeader1: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_1 @@ -148,7 +148,7 @@ SilphCo9TrainerHeader1: ; 5d89f (17:589f) dw SilphCo9EndBattleText2 ; TextEndBattle dw SilphCo9EndBattleText2 ; TextEndBattle -SilphCo9TrainerHeader2: ; 5d8ab (17:58ab) +SilphCo9TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_2 @@ -159,7 +159,7 @@ SilphCo9TrainerHeader2: ; 5d8ab (17:58ab) db $ff -SilphCo9Text1: ; 5d8b8 (17:58b8) +SilphCo9Text1: TX_ASM CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .asm_5d8dc @@ -178,68 +178,68 @@ SilphCo9Text1: ; 5d8b8 (17:58b8) .asm_5d8e2 jp TextScriptEnd -SilphCo9Text_5d8e5: ; 5d8e5 (17:58e5) +SilphCo9Text_5d8e5: TX_FAR _SilphCo9Text_5d8e5 db "@" -SilphCo9Text_5d8ea: ; 5d8ea (17:58ea) +SilphCo9Text_5d8ea: TX_FAR _SilphCo9Text_5d8ea db "@" -SilphCo9Text_5d8ef: ; 5d8ef (17:58ef) +SilphCo9Text_5d8ef: TX_FAR _SilphCo9Text_5d8ef db "@" -SilphCo9Text2: ; 5d8f4 (17:58f4) +SilphCo9Text2: TX_ASM ld hl, SilphCo9TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo9Text3: ; 5d8fe (17:58fe) +SilphCo9Text3: TX_ASM ld hl, SilphCo9TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo9Text4: ; 5d908 (17:5908) +SilphCo9Text4: TX_ASM ld hl, SilphCo9TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo9BattleText1: ; 5d912 (17:5912) +SilphCo9BattleText1: TX_FAR _SilphCo9BattleText1 db "@" -SilphCo9EndBattleText1: ; 5d917 (17:5917) +SilphCo9EndBattleText1: TX_FAR _SilphCo9EndBattleText1 db "@" -SilphCo9AfterBattleText1: ; 5d91c (17:591c) +SilphCo9AfterBattleText1: TX_FAR _SilphCo9AfterBattleText1 db "@" -SilphCo9BattleText2: ; 5d921 (17:5921) +SilphCo9BattleText2: TX_FAR _SilphCo9BattleText2 db "@" -SilphCo9EndBattleText2: ; 5d926 (17:5926) +SilphCo9EndBattleText2: TX_FAR _SilphCo9EndBattleText2 db "@" -SilphCo9AfterBattleText2: ; 5d92b (17:592b) +SilphCo9AfterBattleText2: TX_FAR _SilphCo9AfterBattleText2 db "@" -SilphCo9BattleText3: ; 5d930 (17:5930) +SilphCo9BattleText3: TX_FAR _SilphCo9BattleText3 db "@" -SilphCo9EndBattleText3: ; 5d935 (17:5935) +SilphCo9EndBattleText3: TX_FAR _SilphCo9EndBattleText3 db "@" -SilphCo9AfterBattleText3: ; 5d93a (17:593a) +SilphCo9AfterBattleText3: TX_FAR _SilphCo9AfterBattleText3 db "@" |