diff options
Diffstat (limited to 'scripts/silphco6.asm')
| -rwxr-xr-x | scripts/silphco6.asm | 170 |
1 files changed, 83 insertions, 87 deletions
diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 137e31be..240b6793 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -1,47 +1,45 @@ -SilphCo6Script: ; 1a1a9 (6:61a9) +SilphCo6Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing - ld hl, SilphCo6TrainerHeaders + ld hl, SilphCo6TrainerHeader0 ld de, SilphCo6ScriptPointers - ld a, [W_SILPHCO6CURSCRIPT] + ld a, [wSilphCo6CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO6CURSCRIPT], a + ld [wSilphCo6CurScript], a ret -SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) - ld hl, wd126 +SilphCo6Script_1a1bf: + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld hl, SilphCo6Coords1 + ld hl, SilphCo6GateCoords call SilphCo4Script_19d5d call SilphCo6Script_1a1e6 - ld a, [wd82e] - bit 7, a + CheckEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret nz ld a, $5f - ld [wd09f], a - ld bc, $0602 + ld [wNewTileBlockID], a + lb bc, 6, 2 predef_jump ReplaceTileBlock -SilphCo6Coords1: ; 1a1e3 (6:61e3) - db $06, $02 - db $ff +SilphCo6GateCoords: + db $06,$02 + db $FF -SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6) +SilphCo6Script_1a1e6: ld a, [$ffe0] and a ret z - ld hl, wd82e - set 7, [hl] + SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret -SilphCo6ScriptPointers: ; 1a1f0 (6:61f0) +SilphCo6ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo6TextPointers: ; 1a1f6 (6:61f6) +SilphCo6TextPointers: dw SilphCo6Text1 dw SilphCo6Text2 dw SilphCo6Text3 @@ -50,175 +48,173 @@ SilphCo6TextPointers: ; 1a1f6 (6:61f6) dw SilphCo6Text6 dw SilphCo6Text7 dw SilphCo6Text8 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText -SilphCo6TrainerHeaders: ; 1a20a (6:620a) -SilphCo6TrainerHeader0: ; 1a20a (6:620a) - db $6 ; flag's bit +SilphCo6TrainerHeader0: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 db ($2 << 4) ; trainer's view range - dw wd82d ; flag's byte - dw SilphCo6BattleText2 ; 0x62ba TextBeforeBattle - dw SilphCo6AfterBattleText2 ; 0x62c4 TextAfterBattle - dw SilphCo6EndBattleText2 ; 0x62bf TextEndBattle - dw SilphCo6EndBattleText2 ; 0x62bf TextEndBattle - -SilphCo6TrainerHeader2: ; 1a216 (6:6216) - db $7 ; flag's bit + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_0 + dw SilphCo6BattleText2 ; TextBeforeBattle + dw SilphCo6AfterBattleText2 ; TextAfterBattle + dw SilphCo6EndBattleText2 ; TextEndBattle + dw SilphCo6EndBattleText2 ; TextEndBattle + +SilphCo6TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1 db ($3 << 4) ; trainer's view range - dw wd82d ; flag's byte - dw SilphCo6BattleText3 ; 0x62d3 TextBeforeBattle - dw SilphCo6AfterBattleText3 ; 0x62dd TextAfterBattle - dw SilphCo6EndBattleText3 ; 0x62d8 TextEndBattle - dw SilphCo6EndBattleText3 ; 0x62d8 TextEndBattle - -SilphCo6TrainerHeader3: ; 1a222 (6:6222) - db $8 ; flag's bit + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1 + dw SilphCo6BattleText3 ; TextBeforeBattle + dw SilphCo6AfterBattleText3 ; TextAfterBattle + dw SilphCo6EndBattleText3 ; TextEndBattle + dw SilphCo6EndBattleText3 ; TextEndBattle + +SilphCo6TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 db ($2 << 4) ; trainer's view range - dw wd82d ; flag's byte - dw SilphCo6BattleText4 ; 0x62ec TextBeforeBattle - dw SilphCo6AfterBattleText4 ; 0x62f6 TextAfterBattle - dw SilphCo6EndBattleText4 ; 0x62f1 TextEndBattle - dw SilphCo6EndBattleText4 ; 0x62f1 TextEndBattle + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 + dw SilphCo6BattleText4 ; TextBeforeBattle + dw SilphCo6AfterBattleText4 ; TextAfterBattle + dw SilphCo6EndBattleText4 ; TextEndBattle + dw SilphCo6EndBattleText4 ; TextEndBattle db $ff -SilphCo6Script_1a22f: ; 1a22f (6:622f) - ld a, [wd838] - bit 7, a - jr nz, .asm_1a238 ; 0x1a234 $2 - jr .asm_1a23a ; 0x1a236 $2 +SilphCo6Script_1a22f: + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .asm_1a238 + jr .asm_1a23a .asm_1a238 ld h, d ld l, e .asm_1a23a jp PrintText -SilphCo6Text1: ; 1a23d (6:623d) - db $08 ; asm +SilphCo6Text1: + TX_ASM ld hl, SilphCo6Text_1a24a ld de, SilphCo6Text_1a24f call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a24a: ; 1a24a (6:624a) +SilphCo6Text_1a24a: TX_FAR _SilphCo6Text_1a24a db "@" -SilphCo6Text_1a24f: ; 1a24f (6:624f) +SilphCo6Text_1a24f: TX_FAR _SilphCo6Text_1a24f db "@" -SilphCo6Text2: ; 1a254 (6:6254) - db $08 ; asm +SilphCo6Text2: + TX_ASM ld hl, SilphCo6Text_1a261 ld de, SilphCo6Text_1a266 call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a261: ; 1a261 (6:6261) +SilphCo6Text_1a261: TX_FAR _SilphCo6Text_1a261 db "@" -SilphCo6Text_1a266: ; 1a266 (6:6266) +SilphCo6Text_1a266: TX_FAR _SilphCo6Text_1a266 db "@" -SilphCo6Text3: ; 1a26b (6:626b) - db $08 ; asm +SilphCo6Text3: + TX_ASM ld hl, SilphCo6Text_1a278 ld de, SilphCo6Text_1a27d call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a278: ; 1a278 (6:6278) +SilphCo6Text_1a278: TX_FAR _SilphCo6Text_1a278 db "@" -SilphCo6Text_1a27d: ; 1a27d (6:627d) +SilphCo6Text_1a27d: TX_FAR _SilphCo6Text_1a27d db "@" -SilphCo6Text4: ; 1a282 (6:6282) - db $08 ; asm +SilphCo6Text4: + TX_ASM ld hl, SilphCo6Text_1a28f ld de, SilphCo6Text_1a294 call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a28f: ; 1a28f (6:628f) +SilphCo6Text_1a28f: TX_FAR _SilphCo6Text_1a28f db "@" -SilphCo6Text_1a294: ; 1a294 (6:6294) +SilphCo6Text_1a294: TX_FAR _SilphCo6Text_1a294 db "@" -SilphCo6Text5: ; 1a299 (6:6299) - db $08 ; asm +SilphCo6Text5: + TX_ASM ld hl, SilphCo6Text_1a2a6 ld de, SilphCo6Text_1a2ab call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a2a6: ; 1a2a6 (6:62a6) +SilphCo6Text_1a2a6: TX_FAR _SilphCo6Text_1a2a6 db "@" -SilphCo6Text_1a2ab: ; 1a2ab (6:62ab) +SilphCo6Text_1a2ab: TX_FAR _SilphCo6Text_1a2ab db "@" -SilphCo6Text6: ; 1a2b0 (6:62b0) - db $08 ; asm +SilphCo6Text6: + TX_ASM ld hl, SilphCo6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText2: ; 1a2ba (6:62ba) +SilphCo6BattleText2: TX_FAR _SilphCo6BattleText2 db "@" -SilphCo6EndBattleText2: ; 1a2bf (6:62bf) +SilphCo6EndBattleText2: TX_FAR _SilphCo6EndBattleText2 db "@" -SilphCo6AfterBattleText2: ; 1a2c4 (6:62c4) +SilphCo6AfterBattleText2: TX_FAR _SilphCo6AfterBattleText2 db "@" -SilphCo6Text7: ; 1a2c9 (6:62c9) - db $08 ; asm - ld hl, SilphCo6TrainerHeader2 +SilphCo6Text7: + TX_ASM + ld hl, SilphCo6TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText3: ; 1a2d3 (6:62d3) +SilphCo6BattleText3: TX_FAR _SilphCo6BattleText3 db "@" -SilphCo6EndBattleText3: ; 1a2d8 (6:62d8) +SilphCo6EndBattleText3: TX_FAR _SilphCo6EndBattleText3 db "@" -SilphCo6AfterBattleText3: ; 1a2dd (6:62dd) +SilphCo6AfterBattleText3: TX_FAR _SilphCo6AfterBattleText3 db "@" -SilphCo6Text8: ; 1a2e2 (6:62e2) - db $08 ; asm - ld hl, SilphCo6TrainerHeader3 +SilphCo6Text8: + TX_ASM + ld hl, SilphCo6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText4: ; 1a2ec (6:62ec) +SilphCo6BattleText4: TX_FAR _SilphCo6BattleText4 db "@" -SilphCo6EndBattleText4: ; 1a2f1 (6:62f1) +SilphCo6EndBattleText4: TX_FAR _SilphCo6EndBattleText4 db "@" -SilphCo6AfterBattleText4: ; 1a2f6 (6:62f6) +SilphCo6AfterBattleText4: TX_FAR _SilphCo6AfterBattleText4 db "@" |