diff options
Diffstat (limited to 'scripts/silphco4.asm')
| -rwxr-xr-x | scripts/silphco4.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 12e04f69..a0682c8d 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -1,4 +1,4 @@ -SilphCo4Script: ; 19d0b (6:5d0b) +SilphCo4Script: call SilphCo4Script_19d21 call EnableAutoTextBoxDrawing ld hl, SilphCo4TrainerHeaders @@ -8,7 +8,7 @@ SilphCo4Script: ; 19d0b (6:5d0b) ld [wSilphCo4CurScript], a ret -SilphCo4Script_19d21: ; 19d21 (6:5d21) +SilphCo4Script_19d21: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -32,12 +32,12 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) lb bc, 4, 6 predef_jump ReplaceTileBlock -SilphCo4GateCoords: ; 19d58 (6:5d58) +SilphCo4GateCoords: db $06,$02 db $04,$06 db $FF -SilphCo4Script_19d5d: ; 19d5d (6:5d5d) +SilphCo4Script_19d5d: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -73,7 +73,7 @@ SilphCo4Script_19d5d: ; 19d5d (6:5d5d) ld [$ffe0], a ret -SilphCo4Script_19d89: ; 19d89 (6:5d89) +SilphCo4Script_19d89: EventFlagAddress hl, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -86,12 +86,12 @@ SilphCo4Script_19d89: ; 19d89 (6:5d89) SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret -SilphCo4ScriptPointers: ; 19d9a (6:5d9a) +SilphCo4ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo4TextPointers: ; 19da0 (6:5da0) +SilphCo4TextPointers: dw SilphCo4Text1 dw SilphCo4Text2 dw SilphCo4Text3 @@ -100,8 +100,8 @@ SilphCo4TextPointers: ; 19da0 (6:5da0) dw PickUpItemText dw PickUpItemText -SilphCo4TrainerHeaders: ; 19dae (6:5dae) -SilphCo4TrainerHeader0: ; 19dae (6:5dae) +SilphCo4TrainerHeaders: +SilphCo4TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_0 @@ -110,7 +110,7 @@ SilphCo4TrainerHeader0: ; 19dae (6:5dae) dw SilphCo4EndBattleText2 ; TextEndBattle dw SilphCo4EndBattleText2 ; TextEndBattle -SilphCo4TrainerHeader2: ; 19dba (6:5dba) +SilphCo4TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 @@ -119,7 +119,7 @@ SilphCo4TrainerHeader2: ; 19dba (6:5dba) dw SilphCo4EndBattleText3 ; TextEndBattle dw SilphCo4EndBattleText3 ; TextEndBattle -SilphCo4TrainerHeader3: ; 19dc6 (6:5dc6) +SilphCo4TrainerHeader3: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_3 @@ -130,71 +130,71 @@ SilphCo4TrainerHeader3: ; 19dc6 (6:5dc6) db $ff -SilphCo4Text1: ; 19dd3 (6:5dd3) +SilphCo4Text1: TX_ASM ld hl, SilphCo4Text_19de0 ld de, SilphCo4Text_19de5 call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo4Text_19de0: ; 19de0 (6:5de0) +SilphCo4Text_19de0: TX_FAR _SilphCo4Text_19de0 db "@" -SilphCo4Text_19de5: ; 19de5 (6:5de5) +SilphCo4Text_19de5: TX_FAR _SilphCo4Text_19de5 db "@" -SilphCo4Text2: ; 19dea (6:5dea) +SilphCo4Text2: TX_ASM ld hl, SilphCo4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText2: ; 19df4 (6:5df4) +SilphCo4BattleText2: TX_FAR _SilphCo4BattleText2 db "@" -SilphCo4EndBattleText2: ; 19df9 (6:5df9) +SilphCo4EndBattleText2: TX_FAR _SilphCo4EndBattleText2 db "@" -SilphCo4AfterBattleText2: ; 19dfe (6:5dfe) +SilphCo4AfterBattleText2: TX_FAR _SilphCo4AfterBattleText2 db "@" -SilphCo4Text3: ; 19e03 (6:5e03) +SilphCo4Text3: TX_ASM ld hl, SilphCo4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText3: ; 19e0d (6:5e0d) +SilphCo4BattleText3: TX_FAR _SilphCo4BattleText3 db "@" -SilphCo4EndBattleText3: ; 19e12 (6:5e12) +SilphCo4EndBattleText3: TX_FAR _SilphCo4EndBattleText3 db "@" -SilphCo4AfterBattleText3: ; 19e17 (6:5e17) +SilphCo4AfterBattleText3: TX_FAR _SilphCo4AfterBattleText3 db "@" -SilphCo4Text4: ; 19e1c (6:5e1c) +SilphCo4Text4: TX_ASM ld hl, SilphCo4TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText4: ; 19e26 (6:5e26) +SilphCo4BattleText4: TX_FAR _SilphCo4BattleText4 db "@" -SilphCo4EndBattleText4: ; 19e2b (6:5e2b) +SilphCo4EndBattleText4: TX_FAR _SilphCo4EndBattleText4 db "@" -SilphCo4AfterBattleText4: ; 19e30 (6:5e30) +SilphCo4AfterBattleText4: TX_FAR _SilphCo4AfterBattleText4 db "@" |