diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oakslab2.asm | 28 | ||||
| -rwxr-xr-x | scripts/school2.asm | 17 | ||||
| -rwxr-xr-x | scripts/viridianforest.asm | 102 | ||||
| -rwxr-xr-x | scripts/viridianforest2.asm | 45 |
4 files changed, 172 insertions, 20 deletions
diff --git a/scripts/oakslab2.asm b/scripts/oakslab2.asm new file mode 100755 index 00000000..fef72470 --- /dev/null +++ b/scripts/oakslab2.asm @@ -0,0 +1,28 @@ +Func_f1be0: + ld a, [wYCoord] + cp 3 + jr z, .asm_f1bf0 + ld b, SPRITE_FACING_DOWN + ld hl, Data_f1bf9 + call Func_f0a82 + ret + +.asm_f1bf0 + ld b, SPRITE_FACING_LEFT + ld hl, Data_f1bfe + call Func_f0a82 + ret + +Data_f1bf9: + db $00 + db $1f + db $1e + db $38 + db $3f + +Data_f1bfe: + db $00 + db $1d + db $20 + db $36 + db $3f diff --git a/scripts/school2.asm b/scripts/school2.asm new file mode 100755 index 00000000..677a43ec --- /dev/null +++ b/scripts/school2.asm @@ -0,0 +1,17 @@ +Func_f1c03: + ld hl, SchoolText_f1c0a + call PrintText + ret + +SchoolText_f1c0a: + TX_FAR _SchoolText3 + db "@" + +Func_f1c0f: + ld hl, SchoolText_f1c16 + call PrintText + ret + +SchoolText_f1c16: + TX_FAR _SchoolText2 + db "@" diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 892eeef2..8ac0d8a8 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -17,16 +17,18 @@ ViridianForestTextPointers: ; 61126 (18:5126) dw ViridianForestText2 dw ViridianForestText3 dw ViridianForestText4 + dw ViridianForestText5 + dw ViridianForestText6 dw PickUpItemText dw PickUpItemText dw PickUpItemText - dw ViridianForestText8 - dw ViridianForestText9 dw ViridianForestText10 dw ViridianForestText11 dw ViridianForestText12 dw ViridianForestText13 dw ViridianForestText14 + dw ViridianForestText15 + dw ViridianForestText16 ViridianForestTrainerHeaders: ; 61142 (18:5142) ViridianForestTrainerHeader0: ; 61142 (18:5142) @@ -56,6 +58,24 @@ ViridianForestTrainerHeader2: ; 6115a (18:515a) dw ViridianForestEndBattleText3 ; TextEndBattle dw ViridianForestEndBattleText3 ; TextEndBattle +ViridianForestTrainerHeader3: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3 + db ($0 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3 + dw ViridianForestBattleText4 ; TextBeforeBattle + dw ViridianForestAfterBattleText4 ; TextAfterBattle + dw ViridianForestEndBattleText4 ; TextEndBattle + dw ViridianForestEndBattleText4 ; TextEndBattle + +ViridianForestTrainerHeader4: + dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4 + db ($4 << 4) ; trainer's view range + dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4 + dw ViridianForestBattleText5 ; TextBeforeBattle + dw ViridianForestAfterBattleText5 ; TextAfterBattle + dw ViridianForestEndBattleText5 ; TextEndBattle + dw ViridianForestEndBattleText5 ; TextEndBattle + db $ff ViridianForestText1: ; 61167 (18:5167) @@ -65,18 +85,27 @@ ViridianForestText1: ; 61167 (18:5167) ViridianForestText2: ; 6116c (18:516c) TX_ASM ld hl, ViridianForestTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd + jr ViridianForestTalkToTrainer ViridianForestText3: ; 61176 (18:5176) TX_ASM ld hl, ViridianForestTrainerHeader1 - call TalkToTrainer - jp TextScriptEnd + jr ViridianForestTalkToTrainer ViridianForestText4: ; 61180 (18:5180) TX_ASM ld hl, ViridianForestTrainerHeader2 + jr ViridianForestTalkToTrainer + +ViridianForestText5: + TX_ASM + ld hl, ViridianForestTrainerHeader3 + jr ViridianForestTalkToTrainer + +ViridianForestText6: + TX_ASM + ld hl, ViridianForestTrainerHeader4 +ViridianForestTalkToTrainer: call TalkToTrainer jp TextScriptEnd @@ -116,30 +145,63 @@ ViridianForestAfterBattleText3: ; 611b2 (18:51b2) TX_FAR _ViridianFrstAfterBattleText3 db "@" -ViridianForestText8: ; 611b7 (18:51b7) - TX_FAR _ViridianForestText8 +ViridianForestBattleText4: ; 611a8 (18:51a8) + TX_FAR _ViridianForestBattleTextPikaGirl db "@" -ViridianForestText9: ; 611bc (18:51bc) - TX_FAR _ViridianForestText9 +ViridianForestEndBattleText4: ; 611ad (18:51ad) + TX_FAR _ViridianForestEndBattleTextPikaGirl db "@" -ViridianForestText10: ; 611c1 (18:51c1) - TX_FAR _ViridianForestText10 +ViridianForestAfterBattleText4: ; 611b2 (18:51b2) + TX_FAR _ViridianForestAfterBattleTextPikaGirl db "@" -ViridianForestText11: ; 611c6 (18:51c6) - TX_FAR _ViridianForestText11 +ViridianForestBattleText5: ; 611a8 (18:51a8) + TX_FAR _ViridianForestBattleTextSamurai db "@" -ViridianForestText12: ; 611cb (18:51cb) - TX_FAR _ViridianForestText12 +ViridianForestEndBattleText5: ; 611ad (18:51ad) + TX_FAR _ViridianForestEndBattleTextSamurai db "@" -ViridianForestText13: ; 611d0 (18:51d0) - TX_FAR _ViridianForestText13 +ViridianForestAfterBattleText5: ; 611b2 (18:51b2) + TX_FAR _ViridianForestAfterBattleTextSamurai db "@" -ViridianForestText14: ; 611d5 (18:51d5) - TX_FAR _ViridianForestText14 +ViridianForestText10: ; 611b7 (18:51b7) + TX_FAR _ViridianForestText8 db "@" + +ViridianForestText11: ; 611bc (18:51bc) + TX_ASM + ld hl, Func_f2528 + jp ViridianForestScript_6120d + +ViridianForestText12: ; 611c1 (18:51c1) + TX_ASM + ld hl, Func_f2534 + jp ViridianForestScript_6120d + +ViridianForestText13: ; 611c6 (18:51c6) + TX_ASM + ld hl, Func_f2540 + jp ViridianForestScript_6120d + +ViridianForestText14: ; 611cb (18:51cb) + TX_ASM + ld hl, Func_f254c + jp ViridianForestScript_6120d + +ViridianForestText15: ; 611d0 (18:51d0) + TX_ASM + ld hl, Func_f2558 + jp ViridianForestScript_6120d + +ViridianForestText16: ; 611d5 (18:51d5) + TX_ASM + ld hl, Func_f2528 +ViridianForestScript_6120d + ld b, BANK(Func_f2528) + call Bankswitch + jp TextScriptEnd diff --git a/scripts/viridianforest2.asm b/scripts/viridianforest2.asm new file mode 100755 index 00000000..41c81218 --- /dev/null +++ b/scripts/viridianforest2.asm @@ -0,0 +1,45 @@ +Func_f2528: + ld hl, Text_f252f + call PrintText + ret + +Text_f252f: + TX_FAR _ViridianForestText9 + db "@" + +Func_f2534: + ld hl, Text_f253b + call PrintText + ret + +Text_f253b: + TX_FAR _ViridianForestText10 + db "@" + +Func_f2540: + ld hl, Text_f254a + call PrintText + ret + +Text_f254a: + TX_FAR _ViridianForestText11 + db "@" + +Func_f254c: + ld hl, Text_f2553 + call PrintText + ret + +Text_f2553: + TX_FAR _ViridianForestText12 + db "@" + +Func_f2558: + ld hl, Text_f255f + call PrintText + ret + +Text_f255f: + TX_FAR _ViridianForestText13 + db "@" + |