From 6d5e57949d2ef7cb80ff1b117ae73d7a4cc10721 Mon Sep 17 00:00:00 2001 From: PhoenixBound Date: Sat, 28 Sep 2019 17:14:03 -0500 Subject: [PATCH 1/4] Bus fixes and bugfixes --- working/m12-strings-english.txt | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/working/m12-strings-english.txt b/working/m12-strings-english.txt index cad506f..93b4ff6 100644 --- a/working/m12-strings-english.txt +++ b/working/m12-strings-english.txt @@ -1217,7 +1217,7 @@ ^L1219^@(Do you want to see the Debug[01 FF] Menu?)[03 FF 00 00][04 FF _L3661_][05 FF _useatmcard_]^useatmcard^@To use this, go to a cash[01 FF] machine and insert the card.[02 FF][00 FF] ^L1220^@[9F FF][C1 FF][87 FF] placed the[01 FF] [90 FF 00][1A FF 02 00] on the floor.[D4 FF 73 00][1B FF 01 00][02 FF][08 FF 7C 00][6D FF FF 00 A6 00][00 FF] ^L1221^@[9F FF][C1 FF][87 FF] used the [90 FF 00][1A FF 02 00]![D4 FF 95 00][1B FF 01 00][1D FF][C6 FF][1B FF 01 00][6D FF FF 00 A9 00][08 FF 20 01][86 FF _L3546_][08 FF FC 01][00 FF] -^L1222^[8D FF 02 00][81 FF _L3547_][8D FF 01 00][92 FF 00 02 02][81 FF _L3548_]@[9F FF] rode a bicycle.[7D FF][00 FF] +^L1222^[8D FF 02 00][81 FF _L3547_][8D FF 01 00][92 FF 00 02 02][81 FF _L3548_]@[9F FF] rode a bicycle.[1B FF 1E 00][7D FF][00 FF] ^L1223^[D4 FF 19 00]@[9F FF] emitted[01 FF] a glorious light![02 FF][00 FF] ^L1224^[D4 FF 19 00]@[9F FF] used an[01 FF] electrical shock attack![02 FF][00 FF] ^L1225^[D4 FF 19 00]@[9F FF] scattered[01 FF] its pollen around![D4 FF 52 00][02 FF][1B FF 01 00][00 FF] @@ -1625,9 +1625,9 @@ ^L1629^[CA FF][14 FF 2A 00][A0 FF 5F 01 48 01 FF 00][C9 FF 5F 01][00 FF] ^L1630^[CA FF][14 FF 2B 00][A0 FF 5F 01 49 01 FF 00][C9 FF 5F 01][00 FF] ^L1631^[CA FF][14 FF 2C 00][A0 FF 5F 01 4A 01 FF 00][C9 FF 5F 01][00 FF] -^L1632^[A0 FF BB 00 F1 00 01 00][BB FF 02][87 FF]@This bus goes to Fourside.[02 FF]@I can't let you on if you don't[01 FF] pay $[B8 FF 00][1A FF 04 00] for the[01 FF] fare.[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4095_][05 FF _L4081_][80 FF _L4081_] -^L1633^[CA FF][14 FF 31 00][A0 FF 5F 01 54 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 32 00][A0 FF 5F 01 55 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 33 00][A0 FF 5F 01 56 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 34 00][A0 FF 5F 01 57 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][AA FF 5F 01][A0 FF BB 00 F0 00 01 00]@This bus continues on to[01 FF] Twoson.[02 FF]@Do you want to get off here?[22 FF][03 FF 00 00][04 FF _L4105_][05 FF _L4106_]^L4106^[C6 FF][A5 FF BB 00 06 00][80 FF _L4107_]^L4105^[C6 FF][A5 FF BB 00 06 00][09 FF 16 02][C5 FF][A0 FF D0 07 4B 01 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][CC FF FF 00 01 00][9E FF][CA FF][EA FF FF 00][A9 FF 5F 01][9E FF][09 FF 0B 00][FC FF 06 00][A0 FF D3 07 05 03 01 00][00 FF] -^L1634^[A0 FF BB 00 F0 00 01 00][BB FF 02][87 FF]@To Threed, it's going to cost[01 FF] $[BB FF 02][87 FF].[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4093_][05 FF _L4089_][80 FF _L4089_] +^L1632^[A0 FF BB 00 F1 00 01 00][BB FF 02][87 FF]@This bus goes to Fourside.[02 FF]@I can't let you on if you don't[01 FF] pay $[B8 FF 00][1A FF 04 00] for the fare.[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4095_][05 FF _L4081_][80 FF _L4081_] +^L1633^[CA FF][14 FF 31 00][A0 FF 5F 01 54 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 32 00][A0 FF 5F 01 55 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 33 00][A0 FF 5F 01 56 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 34 00][A0 FF 5F 01 57 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][AA FF 5F 01][A0 FF BB 00 F0 00 01 00]@This bus continues on to[01 FF] Twoson.[02 FF]@Do you want to get off here?[03 FF 00 00][04 FF _L4105_][05 FF _L4106_]^L4106^[C6 FF][A5 FF BB 00 06 00][80 FF _L4107_]^L4105^[C6 FF][A5 FF BB 00 06 00][09 FF 16 02][C5 FF][A0 FF D0 07 4B 01 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][CC FF FF 00 01 00][9E FF][CA FF][EA FF FF 00][A9 FF 5F 01][9E FF][09 FF 0B 00][FC FF 06 00][A0 FF D3 07 05 03 01 00][00 FF] +^L1634^[A0 FF BB 00 F0 00 01 00][BB FF 02][87 FF]@To Threed, it's going to cost[01 FF] $[B8 FF 00][1A FF 04 00][86 FF _forthelotofyou_].[02 FF]@Do you want to go?[BB FF 02][87 FF][86 FF _L2492_][04 FF _L4093_][05 FF _L4089_][80 FF _L4089_] ^L1635^[FC FF 33 00][08 FF 0B 00][C4 FF 00 55][1B FF 78 00][A3 FF 1B 03][9E FF][C5 FF][A1 FF 02 03 80 01][9E FF][A4 FF 02 03][80 FF _L542_] ^L1636^[CA FF][14 FF 2E 00][A0 FF 62 01 D1 01 FF 00][C9 FF 62 01][00 FF] ^L1637^[CA FF][14 FF 2F 00][A0 FF 62 01 D2 01 FF 00][C9 FF 62 01][00 FF] @@ -1635,7 +1635,7 @@ ^L1639^[CA FF][14 FF 31 00][A0 FF 62 01 D4 01 FF 00][C9 FF 62 01][00 FF] ^L1640^[A3 FF 04 03][9E FF][EB FF FF 00][1B FF 01 00][85 FF 04 03 06 00][84 FF 05 03 0C 00 01 00][09 FF 66 02][08 FF 67 02][1B FF 01 00][DB FF 05 03 01 00 FF 00][CE FF 05 03 00 00][00 FF] ^L1641^[A0 FF D0 07 4B 01 01 00][1B FF 01 00][C9 FF D0 07][CC FF FF 00 01 00][EB FF FF 00][9E FF][09 FF 16 02][C5 FF][CA FF][EA FF FF 00][A9 FF 5F 01][9E FF][86 FF _L1914_][09 FF 0B 00][FC FF 06 00][A0 FF D3 07 05 03 01 00][08 FF D6 00][09 FF 4E 02][00 FF] -^L1642^[A0 FF BB 00 F0 00 01 00]@This bus goes to Twoson via[01 FF] Threed.[02 FF][BB FF 02][87 FF]@It is going to cost[01 FF] $[B8 FF 00][1A FF 04 00].[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4101_][05 FF _L4089_][80 FF _L4089_] +^L1642^[A0 FF BB 00 F0 00 01 00]@This bus goes to Twoson via Threed.[02 FF][BB FF 02][87 FF]@It is going to cost[01 FF] $[B8 FF 00][1A FF 04 00][86 FF _forthelotofyou_].[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4101_][05 FF _L4089_][80 FF _L4089_] ^L1643^[A9 FF 01 01][A6 FF 3B 00 6B 01][A6 FF 38 00 6D 01][A6 FF 39 00 6D 01][A6 FF 3A 00 6D 01][A6 FF BF 00 6D 01][1B FF 0A 00][C4 FF 00 4E][EB FF FF 00][A6 FF 3B 00 6C 01][1B FF 1E 00][A6 FF 38 00 6C 01][1B FF 1E 00][A6 FF 39 00 6C 01][1B FF 1E 00][A6 FF 3A 00 6C 01][1B FF 1E 00][A6 FF 36 00 6E 01][A0 FF 36 00 70 01 01 00][A6 FF 37 00 6F 01][A0 FF 37 00 71 01 01 00][9E FF][A0 FF 36 00 72 01 01 00][9E FF][A0 FF 37 00 77 01 01 00][9E FF][B1 FF 36 00 CC 00][1B FF 1E 00][B4 FF 36 00][9E FF][A6 FF 3A 00 7C 01][9E FF][A0 FF 37 00 78 01 01 00][A0 FF 36 00 73 01 01 00][9E FF][A0 FF 37 00 79 01 01 00][A0 FF 36 00 74 01 01 00][9E FF][A0 FF 37 00 7A 01 01 00][A0 FF 36 00 75 01 01 00][9E FF][A0 FF 37 00 7B 01 01 00][A0 FF 36 00 76 01 01 00][9E FF][A6 FF 3B 00 9B 01][A6 FF 38 00 9B 01][A6 FF 39 00 9B 01][A6 FF BF 00 9B 01][1B FF 1E 00][A6 FF 01 01 7D 01][C5 FF][00 FF] ^L1644^[CA FF][A5 FF D0 07 06 00][A5 FF 3B 00 06 00][A5 FF 38 00 06 00][A5 FF 39 00 06 00][A5 FF 3A 00 06 00][A5 FF BF 00 06 00][A5 FF 36 00 06 00][A5 FF 37 00 06 00][A5 FF BE 00 06 00][1B FF 01 00][A5 FF BE 00 06 00][A0 FF D0 07 05 03 01 00][00 FF] ^L1645^[A9 FF 01 01][EB FF FF 00][1B FF 3C 00]@It's going to be a great show![01 FF][1B FF 14 00] We're so good it makes me...[02 FF]@think that those kids by the exit[01 FF] will wet their pants![02 FF]@Those kids are hip,[1B FF 0F 00] baby![1D FF][C6 FF][1B FF 1E 00][C4 FF 00 4C][A6 FF 3B 00 8D 01][A6 FF 38 00 8E 01][A6 FF 39 00 8F 01][A6 FF 3A 00 90 01][A6 FF BF 00 91 01][1B FF 50 00][A0 FF 36 00 92 01 01 00][A0 FF 37 00 93 01 01 00][9E FF][A0 FF 36 00 94 01 01 00][A0 FF 37 00 95 01 01 00][9E FF][A0 FF 36 00 97 01 01 00][A0 FF 37 00 96 01 01 00][9E FF][A0 FF 36 00 99 01 01 00][A0 FF 37 00 98 01 01 00][9E FF][A0 FF A7 00 9A 01 01 00][1B FF 5A 00][A6 FF 3B 00 9B 01][A6 FF 38 00 9B 01][A6 FF 39 00 9B 01][A6 FF 3A 00 9B 01][A6 FF BF 00 9B 01][9E FF][A6 FF 3B 00 9C 01][A6 FF 38 00 9C 01][A6 FF 39 00 9C 01][A6 FF 3A 00 9C 01][A6 FF BF 00 9C 01][A0 FF 36 00 9D 01 01 00][A0 FF 37 00 9E 01 01 00][9E FF][A0 FF 37 00 9F 01 01 00][9E FF][A0 FF 37 00 A0 01 01 00][9E FF][A0 FF 36 00 A1 01 01 00][A0 FF 37 00 A2 01 01 00][9E FF][A0 FF 36 00 A3 01 01 00][9E FF][A0 FF 36 00 A4 01 01 00][A0 FF 37 00 A5 01 01 00][9E FF][A0 FF 36 00 A8 01 01 00][A0 FF 37 00 A5 01 01 00][9E FF][A0 FF 62 01 A6 01 01 00][9E FF][A0 FF 37 00 A7 01 01 00][9E FF][A0 FF 36 00 A9 01 01 00][9E FF][A6 FF 3B 00 9B 01][A6 FF 38 00 9B 01][A6 FF 39 00 9B 01][A6 FF 3A 00 9B 01][A6 FF BF 00 9B 01][A6 FF 01 01 7D 01][C5 FF][00 FF] @@ -3680,30 +3680,26 @@ ^L4072^[8D FF 01 00][C3 FF 00 02 44 02][86 FF _L4074_][00 FF] ^L4073^[87 FF][88 FF][9A FF 01 00][81 FF _L2197_][89 FF][9A FF 02 00][81 FF _L2197_][89 FF][9A FF 08 00][81 FF _L2197_][89 FF][9A FF 03 00][81 FF _L2197_][89 FF][9A FF 07 00][81 FF _L2197_][00 FF] ^L4074^[87 FF][88 FF][9A FF 04 00][81 FF _L2197_][89 FF][9A FF 05 00][81 FF _L2197_][89 FF][9A FF 06 00][81 FF _L2197_][89 FF][9A FF 03 00][81 FF _L2197_][89 FF][9A FF 07 00][81 FF _L2197_][00 FF] -^L4075^[BB FF 02][87 FF]@...This bus goes to Fourside via[01 FF] Threed.[02 FF]@If you don't pay $[B8 FF 00][1A FF 04 00] for the[01 FF] fare, I can't take you there.[02 FF]@...Do you want to go?[03 FF 00 00][04 FF _L4080_][05 FF _L4081_]^L4081^@...If you don't have any money,[1B FF 0F 00][01 FF] you should stroll around.[02 FF]@Besides, walking is good for[01 FF] you...[1D FF][C6 FF][A5 FF BB 00 06 00][00 FF]^L4080^[99 FF 00 00 00 00][81 FF _L4082_][D4 FF 76 00][9B FF 00 00 00 00][9C FF]@...Well,[1B FF 0F 00] hop aboard then![1D FF][C6 FF][A5 FF BB 00 06 00][80 FF _L4079_] +^L4075^[BB FF 02][87 FF]@...This bus goes to Fourside via[01 FF] Threed.[02 FF]@If you don't pay $[B8 FF 00][1A FF 04 00] for the[01 FF] fare, I can't take you there.[02 FF]@...Do you want to go?[9C FF][03 FF 00 00][04 FF _L4080_][05 FF _L4081_]^L4081^@...If you don't have any money,[1B FF 0F 00][01 FF] you should stroll around.[02 FF]@Besides, walking is good for[01 FF] you...[1D FF][C6 FF][A5 FF BB 00 06 00][00 FF]^L4080^[99 FF 00 00 00 00][81 FF _L4082_][D4 FF 76 00][9B FF 00 00 00 00][9C FF]@...Well,[1B FF 0F 00] hop aboard then![1D FF][C6 FF][A5 FF BB 00 06 00][80 FF _L4079_] ^L4078^@...I can't let you on if you don't[01 FF] pay.[1D FF][C6 FF][A5 FF BB 00 06 00][00 FF] ^L4079^[08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF][A6 FF 5F 01 F3 00][CB FF FF 00 06 00][08 FF 16 02][C5 FF][C9 FF 5F 01][00 FF] ^L4082^@...If you don't have any money,[1B FF 0F 00][01 FF] you should stroll around.[02 FF]@Besides,[1B FF 0F 00] walking is good for[01 FF] you...[1D FF][C6 FF][A5 FF BB 00 06 00][00 FF] -^L4088^[99 FF 00 00 00 00][81 FF _L4090_][9B FF 00 00 00 00][9C FF][D4 FF 76 00][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00]@Ok, we're off![02 FF][C6 FF][A5 FF BB 00 06 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF][00 FF] +^L4088^[99 FF 00 00 00 00][81 FF _L4090_][9B FF 00 00 00 00][9C FF][D4 FF 76 00][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00]@Ok, we're off![02 FF][C6 FF][A5 FF BB 00 06 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF]^L4107^[C9 FF 5F 01][A6 FF 5F 01 3D 01][CB FF FF 00 06 00][08 FF 16 02][C5 FF][00 FF] ^L4089^@Oh...[1B FF 05 00] okay...[1B FF 0F 00] see you![1D FF][C6 FF][A5 FF BB 00 06 00][00 FF] ^L4090^@I can't do much for you if you[01 FF] don't have any money...[1D FF][C6 FF][A5 FF BB 00 06 00][00 FF] ^L4091^@(Due to traffic jams,[1B FF 0F 00] bus[01 FF] service has been temporarily[01 FF] suspended.)[1D FF][00 FF] ^L4092^[8D FF 01 00][C3 FF 00 02 16 03][86 FF _L4073_][00 FF] -^L4093^[99 FF 00 00 00 00][81 FF _L4090_][9B FF 00 00 00 00][D4 FF 76 00][9C FF][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00]@Okay,[1B FF 0F 00] we're off![02 FF][C6 FF][A5 FF BB 00 06 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF][00 FF] +^L4093^[99 FF 00 00 00 00][81 FF _L4090_][9B FF 00 00 00 00][D4 FF 76 00][9C FF][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00]@Okay,[1B FF 0F 00] we're off![02 FF][C6 FF][A5 FF BB 00 06 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF]^L4104^[A6 FF 5F 01 53 01][CB FF FF 00 06 00][08 FF 16 02][C5 FF][C9 FF 5F 01][00 FF] ^L4094^[8D FF 01 00][C3 FF 00 02 17 03][86 FF _L4074_][00 FF] -^L4095^[99 FF 00 00 00 00][81 FF _L4082_][9B FF 00 00 00 00][9C FF][D4 FF 76 00][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00]@Ok,[1B FF 0F 00] we're off![02 FF][C6 FF][A5 FF BB 00 06 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF][00 FF] +^L4095^[99 FF 00 00 00 00][81 FF _L4082_][9B FF 00 00 00 00][9C FF][D4 FF 76 00][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00]@Ok,[1B FF 0F 00] we're off![02 FF][C6 FF][A5 FF BB 00 06 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF]^L4099^[A6 FF 5F 01 46 01][CB FF FF 00 06 00][08 FF 16 02][C5 FF][C9 FF 5F 01][00 FF] ^L4096^[99 FF 00 00 00 00][81 FF _L4082_][9B FF 00 00 00 00][9C FF][D4 FF 76 00]@Ok,[1B FF 0F 00] we're off![02 FF][C6 FF][A5 FF BB 00 06 00][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF][09 FF 47 00][FC FF 32 00][A6 FF 5F 01 F9 00][CB FF FF 00 06 00][08 FF 16 02][C5 FF][C9 FF 5F 01][00 FF] -^L4099^[A6 FF 5F 01 46 01][CB FF FF 00 06 00][08 FF 16 02][C5 FF][C9 FF 5F 01][00 FF] ^L4100^[8D FF 01 00][C3 FF 00 02 CC 03][86 FF _L4073_][00 FF] ^L4101^[99 FF 00 00 00 00][81 FF _L4090_][9B FF 00 00 00 00][9C FF][D4 FF 76 00]@Ok,[1B FF 0F 00] we're off![02 FF][C6 FF][A5 FF BB 00 06 00][08 FF 0B 00][FC FF 05 00][A0 FF D3 07 04 03 01 00][A0 FF D0 07 F2 00 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][9E FF][08 FF 16 02][C5 FF][A6 FF 5F 01 4E 01][CB FF FF 00 06 00][C9 FF 5F 01][9E FF][CA FF][EA FF FF 00][14 FF 2D 00][A0 FF 5F 01 4F 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 2E 00][A0 FF 5F 01 50 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 2F 00][A0 FF 5F 01 51 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][CA FF][EA FF FF 00][14 FF 30 00][A0 FF 5F 01 52 01 FF 00][C9 FF 5F 01][EB FF FF 00][9E FF][AA FF 5F 01][A0 FF BB 00 F0 00 01 00]@This bus continues on to[01 FF] Twoson.[02 FF]@Do you want to get off here?[03 FF 00 00][04 FF _L4102_][05 FF _L4103_]^L4103^[C6 FF][A5 FF BB 00 06 00][80 FF _L4104_]^L4102^[C6 FF][A5 FF BB 00 06 00][09 FF 16 02][C5 FF][A0 FF D0 07 4B 01 01 00][1B FF 01 00][C9 FF D0 07][EB FF FF 00][CC FF FF 00 01 00][9E FF][CA FF][EA FF FF 00][A9 FF 5F 01][9E FF][09 FF 0B 00][FC FF 06 00][A0 FF D3 07 05 03 01 00][00 FF] -^L4104^[A6 FF 5F 01 53 01][CB FF FF 00 06 00][08 FF 16 02][C5 FF][C9 FF 5F 01][00 FF] -^L4107^[C9 FF 5F 01][A6 FF 5F 01 3D 01][CB FF FF 00 06 00][08 FF 16 02][C5 FF][00 FF] ^L4108^[99 FF 00 00 00 00][81 FF _L4110_][9B FF 00 00 00 00][9C FF]@Ok,[1B FF 0F 00] we're off![1D FF][C6 FF][A5 FF BB 00 06 00][00 FF] -^L4109^@Oh...[1B FF 0F 00] okay...[1B FF 0F 00] see you! +@It is going to cost[01 FF] $[B8 FF 00][1A FF 04 00][86 FF _forthelotofyou_].[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4108_][05 FF _L4109_]^L4109^@Oh...[1B FF 0F 00] okay...[1B FF 0F 00] see you!^L4111^[1D FF][BC FF 01 00][A8 FF 01][87 FF][C6 FF][A5 FF BB 00 06 00][00 FF] ^L4110^@I can't let you on if you don't[01 FF] pay.[80 FF _L4111_] -^L4111^[1D FF][BC FF 01 00][A8 FF 01][87 FF][C6 FF][A5 FF BB 00 06 00][00 FF] ^L4112^[99 FF 00 00 00 00][81 FF _L4113_][9B FF 00 00 00 00][9C FF][D4 FF 76 00]@Okay,[1B FF 0F 00] let's give it a shot![1D FF][C6 FF][A5 FF BB 00 06 00][BC FF 00 00][A8 FF 01][87 FF][00 FF] -@I can't let you on if you don't[01 FF] pay $[B8 FF 00][1A FF 04 00] for the fare.[02 FF]@Do you want to go?[01 FF][86 FF _L2492_][04 FF _L4112_][05 FF _L4113_]^L4113^@If you don't have any money,[01 FF] you should just stroll around.[02 FF]@Besides,[1B FF 0F 00] walking is good for[01 FF] you.[BC FF 01 00][A8 FF 01][87 FF][1D FF][C6 FF][A5 FF BB 00 06 00][00 FF] +@I can't let you on if you don't[01 FF] pay $[B8 FF 00][1A FF 04 00] for the fare.[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4112_][05 FF _L4113_]^L4113^@If you don't have any money,[01 FF] you should just stroll around.[02 FF]@Besides,[1B FF 0F 00] walking is good for[01 FF] you.[BC FF 01 00][A8 FF 01][87 FF][1D FF][C6 FF][A5 FF BB 00 06 00][00 FF] ^L4114^[D4 FF 60 00][FC FF 36 00][14 FF 1F 00][A0 FF D0 07 E7 00 01 00][C9 FF D0 07][EB FF FF 00][9E FF][CA FF][09 FF 38 01][00 FF] ^L4115^[8D FF 01 00][A8 FF 00]@[90 FF 00][1A FF 01 00] used the Pencil[01 FF] Eraser.[02 FF]@For some weird reason, the iron[01 FF] pencil statue[01 FF] was erased![02 FF][D4 FF 21 00][00 FF] ^L4116^@Yeah![1B FF 14 00] That's right![02 FF]@Tonight,[1B FF 0F 00] you got the Chaos[01 FF] Theater's Soul Men comin' at[01 FF] ya![02 FF]@Rockin' and rollin' live on this[01 FF] here stage for a limited time[01 FF] only![02 FF]@The world's greatest Bluesmen,[02 FF]@the Runaway Five![1B FF 14 00] And here[01 FF] they come![1B FF 0F 00] Oh yeah![1B FF 0A 00] Baby![02 FF][C6 FF][00 FF] @@ -4625,7 +4621,7 @@ ^L5153^@[0D FF]? It's your dad.[02 FF][83 FF 74 01][BD FF 01 _L5155_]^L5154^[E0 FF 01 00][82 FF _L5156_][87 FF]@I deposited $[B8 FF 00][1A FF 04 00][01 FF] into your bank account.[02 FF]@Taking away what you've[01 FF] spent, you should now have[02 FF] $[23 FF] in the bank.[02 FF][E0 FF 02 00]^L5156^[BC FF 01 00]@Well, exp to get to the next[01 FF] level,[01 FF]^L5159^[A8 FF 01][96 FF 00][81 FF _L5157_][8D FF 00 00][82 FF _L5157_][A8 FF 00][E1 FF 00 00][82 FF _L5158_]@[90 FF 00][1A FF 01 00]...[87 FF][B8 FF 00][1A FF 04 00].[02 FF]^L5160^[C0 FF][80 FF _L5159_] ^L5155^@Who is this?! [0D FF]?![01 FF] Do you have a cold or[01 FF] something?[02 FF]@Your voice sounds kind of[01 FF] funny.[02 FF]@Oh, well. That's OK.[02 FF][00 FF] ^L5158^@[90 FF 00][1A FF 01 00]...[01 FF] has already reached [87 FF][86 FF _hisher_][01 FF] maximum level.[02 FF]@That's just fine, but...[22 FF][01 FF][22 FF][01 FF][22 FF][01 FF][80 FF _L5160_] -^L5164^@I hope you get over your cold[01 FF] soon.[92 FF 01 06 02][81 FF _L5168_][00 FF] +^L5164^[01 FF]@I hope you get over your cold[01 FF] soon.[92 FF 01 06 02][81 FF _L5168_][00 FF] ^L5168^[EE FF 01 00 06 00 01 00][D4 FF 25 00][00 FF] ^L5169^@Hello! This is Escargo Express.[02 FF]@Tracy doesn't work here[01 FF] anymore. Yeah, she used to[01 FF] work here, part-time.[02 FF]@Hunh? This is [0D FF]?[01 FF] Tracy's big brother?[02 FF]@I've heard about the great work[01 FF] you're doing.[02 FF]@It's an honor to talk to you, sir![02 FF]@Oh, you're calling for a[01 FF] delivery?[01 FF] I'm very sorry.[02 FF]@My wife is out on maternity[01 FF] leave, so I'm taking care of my[01 FF] other kid.[02 FF]@I decided to take some time off[01 FF] from the delivery business.[02 FF]@It's right next to the fridge![01 FF] Put it into the microwave...[01 FF] ...that's it.[02 FF]@...Sorry about that.[02 FF]@I'm a little busy right now, as[01 FF] you heard.[02 FF]@I really would like to hear some[01 FF] of your stories.[02 FF]@Zoicks! That was the dog's[01 FF] food![02 FF]@*Crash!* Hey, hey! Now look[01 FF] what you've done![02 FF]@...I'm sorry.[01 FF] I have to go. Good bye.[01 FF][D4 FF 0B 00] (Click!)[1D FF][08 FF 02 03][00 FF] ^L5170^[86 FF _L5195_][86 FF _L5178_][00 FF] From 1bee01ab73f1a0045f5e6520143b6e64e7ef599a Mon Sep 17 00:00:00 2001 From: PhoenixBound Date: Sun, 29 Sep 2019 12:22:59 -0500 Subject: [PATCH 2/4] Clean up flyover data, add buggy coffee and tea stuff --- src/data/flyover-coffee.asm | 92 +++++++++++++++++++++++ src/data/flyover-table.tbl | 118 ++++++++++++++++++++++++++++++ src/data/flyover-tea.asm | 71 ++++++++++++++++++ src/data/flyover-text-dalaam.asm | 5 ++ src/data/flyover-text-later.asm | 5 ++ src/data/flyover-text-ness.asm | 5 ++ src/data/flyover-text-onett.asm | 7 ++ src/data/flyover-text-poo.asm | 10 +++ src/data/flyover-text-snow.asm | 5 ++ src/data/flyover-text-winters.asm | 5 ++ src/data/flyover-text-year.asm | 5 ++ src/data/flyovertextDalaam.bin | Bin 52 -> 0 bytes src/data/flyovertextLater.bin | Bin 44 -> 0 bytes src/data/flyovertextNess.bin | Bin 24 -> 0 bytes src/data/flyovertextOnett.bin | Bin 70 -> 0 bytes src/data/flyovertextPoo.bin | Bin 72 -> 0 bytes src/data/flyovertextSnow.bin | Bin 54 -> 0 bytes src/data/flyovertextWinters.bin | Bin 80 -> 0 bytes src/data/flyovertextYear.bin | Bin 38 -> 0 bytes src/m2-hack.asm | 32 +++++--- 20 files changed, 350 insertions(+), 10 deletions(-) create mode 100644 src/data/flyover-coffee.asm create mode 100644 src/data/flyover-table.tbl create mode 100644 src/data/flyover-tea.asm create mode 100644 src/data/flyover-text-dalaam.asm create mode 100644 src/data/flyover-text-later.asm create mode 100644 src/data/flyover-text-ness.asm create mode 100644 src/data/flyover-text-onett.asm create mode 100644 src/data/flyover-text-poo.asm create mode 100644 src/data/flyover-text-snow.asm create mode 100644 src/data/flyover-text-winters.asm create mode 100644 src/data/flyover-text-year.asm delete mode 100644 src/data/flyovertextDalaam.bin delete mode 100644 src/data/flyovertextLater.bin delete mode 100644 src/data/flyovertextNess.bin delete mode 100644 src/data/flyovertextOnett.bin delete mode 100644 src/data/flyovertextPoo.bin delete mode 100644 src/data/flyovertextSnow.bin delete mode 100644 src/data/flyovertextWinters.bin delete mode 100644 src/data/flyovertextYear.bin diff --git a/src/data/flyover-coffee.asm b/src/data/flyover-coffee.asm new file mode 100644 index 0000000..40c5eae --- /dev/null +++ b/src/data/flyover-coffee.asm @@ -0,0 +1,92 @@ +.loadtable "data/flyover-table.tbl" + +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "You've traveled very far from\n" +.strn 01h, 1Ch, "home...\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "Do you remember how your long\n" +.strn 01h, 1Ch, "and winding journey began with\n" +.strn 01h, 1Ch, "someone pounding at your door?\n" +.strn 01h, 1Ch, "It was Pokey, the worst person in\n" +.strn 01h, 1Ch, "your neighborhood, who knocked\n" +.strn 01h, 1Ch, "on the door that fateful night.\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "On your way, you have walked,\n" +.strn 01h, 1Ch, "thought and fought. Yet through\n" +.strn 01h, 1Ch, "all this, you have never lost your\n" +.strn 01h, 1Ch, "courage. You have grown steadily\n" +.strn 01h, 1Ch, "stronger, though you have\n" +.strn 01h, 1Ch, "experienced the pain of battle\n" +.strn 01h, 1Ch, "many times.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "You are no longer alone in your\n" +.strn 01h, 1Ch, "adventure, \cpaula who is\n" +.strn 01h, 1Ch, "steadfast, kind and even pretty,\n" +.strn 01h, 1Ch, "is always at your side.\n" +.strn 01h, 1Ch, "\cjeff is with you as well.\n" +.strn 01h, 1Ch, "Though he is timid, he came from\n" +.strn 01h, 1Ch, "a distant land to help you.\n" +.strn 01h, 1Ch, "\cness, as you certainly\n" +.strn 01h, 1Ch, "know by now, you are not a\n" +.strn 01h, 1Ch, "regular young man... You have\n" +.strn 01h, 1Ch, "an awesome destiny to fulfill.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "The journey from this point will\n" +.strn 01h, 1Ch, "be long, and it will be more\n" +.strn 01h, 1Ch, "difficult than anything you have\n" +.strn 01h, 1Ch, "undergone to this point. Yet, I\n" +.strn 01h, 1Ch, "know you will be all right. When\n" +.strn 01h, 1Ch, "good battles evil, which side do\n" +.strn 01h, 1Ch, "you believe wins? Do you have\n" +.strn 01h, 1Ch, "faith that good is triumphant?\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "One thing you must never lose is\n" +.strn 01h, 1Ch, "courage. If you believe in the\n" +.strn 01h, 1Ch, "goal you are striving for, you will\n" +.strn 01h, 1Ch, "be courageous. There are many\n" +.strn 01h, 1Ch, "difficult times ahead, but you\n" +.strn 01h, 1Ch, "must keep your sense of humor,\n" +.strn 01h, 1Ch, "work through the tough\n" +.strn 01h, 1Ch, "situations and enjoy yourself.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "When you have finished this cup\n" +.strn 01h, 1Ch, "of coffee, your adventure will\n" +.strn 01h, 1Ch, "begin again. Next, you must pass\n" +.strn 01h, 1Ch, "through a vast desert and\n" +.strn 01h, 1Ch, "proceed to the big city of\n" +.strn 01h, 1Ch, "Fourside.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "\cness...\n" +.strn 01h, 1Ch, " \cpaula...\n" +.strn 01h, 1Ch, " \cjeff...\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "I wish you luck...\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.str "\n" diff --git a/src/data/flyover-table.tbl b/src/data/flyover-table.tbl new file mode 100644 index 0000000..2bac261 --- /dev/null +++ b/src/data/flyover-table.tbl @@ -0,0 +1,118 @@ +00=\x00 +01=\x01 +17=\x17 +1C=\x1C +26=\x26 +30=\x30 +3E=\x3E +44=\x44 +4A=\x4A +4C=\x4C +56=\x56 + +00=\end +01=\setx +02=\sety +09=\n +8000= +8001=! +8002=" +8003=# +8004=$ +8005=% +8006=& +8007=' +8008=( +8009=) +800A=* +800B=+ +800C=, +800D=- +800E=. +800F=/ +8010=0 +8011=1 +8012=2 +8013=3 +8014=4 +8015=5 +8016=6 +8017=7 +8018=8 +8019=9 +801A=: +801B=; +801C=< +801D== +801E=> +801F=? +8020=@ +8021=A +8022=B +8023=C +8024=D +8025=E +8026=F +8022=G +8028=H +8029=I +802A=J +802B=K +802C=L +802D=M +802E=N +802F=O +8030=P +8031=Q +8032=R +8033=S +8034=T +8035=U +8036=V +8037=W +8038=X +8039=Y +803A=Z +803B=[8B] +803C=[8C] +803D=[8D] +803E=[8E] +803F=[8F] +8040=` +8041=a +8042=b +8043=c +8044=d +8045=e +8046=f +8047=g +8048=h +8049=i +804A=j +804B=k +804C=l +804D=m +804E=n +804F=o +8050=p +8051=q +8052=r +8053=s +8054=t +8055=u +8056=v +8057=w +8058=x +8059=y +805A=z +805B={ +805C=| +805D=} +805E=~ +805F=[AF] + +80FC=\cness +80FD=\cpaula +80FE=\cjeff +80FF=\cpoo +/00 \ No newline at end of file diff --git a/src/data/flyover-tea.asm b/src/data/flyover-tea.asm new file mode 100644 index 0000000..7111ef7 --- /dev/null +++ b/src/data/flyover-tea.asm @@ -0,0 +1,71 @@ +.loadtable "data/flyover-table.tbl" + +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "Like a great tapestry, vertical and\n" +.strn 01h, 1Ch, "horizontal threads have met and\n" +.strn 01h, 1Ch, "become intertwined, creating a\n" +.strn 01h, 1Ch, "huge, beautiful image.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "You may have cursed this never-\n" +.strn 01h, 1Ch, "ending journey. You have known\n" +.strn 01h, 1Ch, "injury and defeat, but you have\n" +.strn 01h, 1Ch, "struggled on to reach this place.\n" +.strn 01h, 1Ch, "Your in-born intelligence and\n" +.strn 01h, 1Ch, "courage have helped bring you\n" +.strn 01h, 1Ch, "here. You have believed in your\n" +.strn 01h, 1Ch, "friends, and as a group, you have\n" +.strn 01h, 1Ch, "supported each other. Have you\n" +.strn 01h, 1Ch, "ever stopped to consider how\n" +.strn 01h, 1Ch, "much your power has grown?\n" +.strn 01h, 1Ch, "Now, you could fell enemies in\n" +.strn 01h, 1Ch, "Onett and Twoson with one\n" +.strn 01h, 1Ch, "blow. As you certainly know,\n" +.strn 01h, 1Ch, "you cannot turn back. Giygas,\n" +.strn 01h, 1Ch, "the arch fiend of the universe, is\n" +.strn 01h, 1Ch, "growing frightened of you and\n" +.strn 01h, 1Ch, "your power. He is searching for\n" +.strn 01h, 1Ch, "ways to end your journey.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "From here, the challenge grows\n" +.strn 01h, 1Ch, "and your adventure will take you\n" +.strn 01h, 1Ch, "beyond anything you ever\n" +.strn 01h, 1Ch, "imagined. You are drawing near\n" +.strn 01h, 1Ch, "to Giygas. Remember, when you\n" +.strn 01h, 1Ch, "are suffering hardships, your\n" +.strn 01h, 1Ch, "enemy is also struggling.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "By the way, do you know where\n" +.strn 01h, 1Ch, "Pokey went? When this cup of\n" +.strn 01h, 1Ch, "tea is finished, your adventure will\n" +.strn 01h, 1Ch, "continue. Your destiny pulls you\n" +.strn 01h, 1Ch, "in the right direction. Believe in\n" +.strn 01h, 1Ch, "yourself and press forward.\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn 01h, 12h, "\cness!\n" +.strn 01h, 12h, " \cpaula!\n" +.strn 01h, 12h, " \cjeff!\n" +.strn 01h, 12h, " \cpoo!\n" +.strn "\n" +.strn "\n" +.strn 01h, 1Ch, "I wish you luck...\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.strn "\n" +.str "\n" diff --git a/src/data/flyover-text-dalaam.asm b/src/data/flyover-text-dalaam.asm new file mode 100644 index 0000000..c7dbbec --- /dev/null +++ b/src/data/flyover-text-dalaam.asm @@ -0,0 +1,5 @@ +.loadtable "data/flyover-table.tbl" + +db 02h, 01h +db 01h, 3Eh +.str "Dalaam, in the Far East\n" \ No newline at end of file diff --git a/src/data/flyover-text-later.asm b/src/data/flyover-text-later.asm new file mode 100644 index 0000000..ea682d0 --- /dev/null +++ b/src/data/flyover-text-later.asm @@ -0,0 +1,5 @@ +.loadtable "data/flyover-table.tbl" + +db 02h, 01h +db 01h, 4Ah +.str "Later that night...\n" \ No newline at end of file diff --git a/src/data/flyover-text-ness.asm b/src/data/flyover-text-ness.asm new file mode 100644 index 0000000..1a20011 --- /dev/null +++ b/src/data/flyover-text-ness.asm @@ -0,0 +1,5 @@ +.loadtable "data/flyover-table.tbl" + +db 02h, 01h +db 01h, 56h +.str "\cness's house\n" \ No newline at end of file diff --git a/src/data/flyover-text-onett.asm b/src/data/flyover-text-onett.asm new file mode 100644 index 0000000..b196caf --- /dev/null +++ b/src/data/flyover-text-onett.asm @@ -0,0 +1,7 @@ +.loadtable "data/flyover-table.tbl" + +// Should this be 02 01? +db 02h, 02h +db 01h, 26h + +.str "Onett, a small town in Eagleland\n" \ No newline at end of file diff --git a/src/data/flyover-text-poo.asm b/src/data/flyover-text-poo.asm new file mode 100644 index 0000000..eaa24eb --- /dev/null +++ b/src/data/flyover-text-poo.asm @@ -0,0 +1,10 @@ +.loadtable "data/flyover-table.tbl" + +// Does 09 work for linebreaks? Existing bin used the system here + +db 02h, 00h +db 01h, 44h +.strn "The palace of \cpoo" +db 02h, 04h +db 01h, 50h +.str "The Crown Prince\n" \ No newline at end of file diff --git a/src/data/flyover-text-snow.asm b/src/data/flyover-text-snow.asm new file mode 100644 index 0000000..e01c7ed --- /dev/null +++ b/src/data/flyover-text-snow.asm @@ -0,0 +1,5 @@ +.loadtable "data/flyover-table.tbl" + +db 02h, 01h +db 01h, 30h +.str "Snow Wood Boarding House\n" \ No newline at end of file diff --git a/src/data/flyover-text-winters.asm b/src/data/flyover-text-winters.asm new file mode 100644 index 0000000..8ba275e --- /dev/null +++ b/src/data/flyover-text-winters.asm @@ -0,0 +1,5 @@ +.loadtable "data/flyover-table.tbl" + +db 02h, 01h +db 01h, 17h +.str "Winters, a small country to the north\n" \ No newline at end of file diff --git a/src/data/flyover-text-year.asm b/src/data/flyover-text-year.asm new file mode 100644 index 0000000..330412d --- /dev/null +++ b/src/data/flyover-text-year.asm @@ -0,0 +1,5 @@ +.loadtable "data/flyover-table.tbl" + +db 02h, 01h +db 01h, 4Ch +.str "The year is 199X\n" \ No newline at end of file diff --git a/src/data/flyovertextDalaam.bin b/src/data/flyovertextDalaam.bin deleted file mode 100644 index 8505481cb9f06e402554c4105f9c71119a33e186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmZQ#WVCBgX>e@t0b<7n-v*urh6c|DKOh;>;L+d;q}71pK|op+NC!8Ba54Y@t`ZQI diff --git a/src/data/flyovertextLater.bin b/src/data/flyovertextLater.bin deleted file mode 100644 index 98ce7bf6d052d0d31c65307afb7b85bc284dffa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44 qcmZQ#Wb|s#X>e=^X>e@_YG44;9$+3rgI|MZgFBEH(!d9ToD2Xw$qoeo diff --git a/src/data/flyovertextNess.bin b/src/data/flyovertextNess.bin deleted file mode 100644 index c7badd6cc5fef75fbf35cc00c73b091153335952..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 ecmZQ#WDINg)4<*k+`!P_(cs?@3S_x*G5`QzJqNx3 diff --git a/src/data/flyovertextOnett.bin b/src/data/flyovertextOnett.bin deleted file mode 100644 index 7e380ec1e7e97e5e71f1445bb6df9ff41e87e01d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70 zcmZQ#VpMC;Z}4kyZ3qEEo(6^nM<5Pv@CDL7K*#_T^=}9Vs$gjF1e2;j8F!$JD-b&Z IMO-);05EA6p#T5? diff --git a/src/data/flyovertextPoo.bin b/src/data/flyovertextPoo.bin deleted file mode 100644 index 4b7fd50360e564b90b312b1c8d58f3772b10b8fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmZQ#V039PY4B)pZD42!XmD)s0b*w`&%eP9DE6O;g)soGLb)NR!M`EA!4D{70Azat JSwPjC3;)&(3r+?A->3^? diff --git a/src/m2-hack.asm b/src/m2-hack.asm index 8393dba..d9cb6c0 100644 --- a/src/m2-hack.asm +++ b/src/m2-hack.asm @@ -980,10 +980,13 @@ nop //--------------------------------------------------------- //Notes -//Flyover entries are made of 16 bits codes. Codes with the first byte between 0 and 9 are special cases. +//Flyover entries are made of 8-bit codes with arguments. +//Codes with the first byte between 0 and 9 are special cases. +//00 = End //01 XX = Position at X tile XX (Changed to Position at X pixel XX) //02 XX = Position at Y tile XX -//09 00 = END +//08 XX = Print PC name (for this hack, use 80 FC-FF instead) +//09 = line break //80 XX = Print character XX //Flyover pointer remapping @@ -996,6 +999,9 @@ nop .org 0x8731144 :: dw flyovertextPoo //The palace of Poo\nThe Crown Prince .org 0x8731148 :: dw flyovertextLater //Later that night... +.org 0x80B3A80 :: dw flyover_tea +.org 0x80B3AA4 :: dw flyover_coffee + //Flyover remapping .org 0x80B3482 :: bl largevwf :: b 0x80B348E @@ -1434,28 +1440,34 @@ m2_enemy_attributes: .incbin "data/m2-enemy-attributes.bin" flyovertextYear: -.incbin "data/flyovertextYear.bin" +.include "data/flyover-text-year.asm" flyovertextOnett: -.incbin "data/flyovertextOnett.bin" +.include "data/flyover-text-onett.asm" flyovertextNess: -.incbin "data/flyovertextNess.bin" +.include "data/flyover-text-ness.asm" flyovertextWinters: -.incbin "data/flyovertextWinters.bin" +.include "data/flyover-text-winters.asm" flyovertextSnow: -.incbin "data/flyovertextSnow.bin" +.include "data/flyover-text-snow.asm" flyovertextDalaam: -.incbin "data/flyovertextDalaam.bin" +.include "data/flyover-text-dalaam.asm" flyovertextPoo: -.incbin "data/flyovertextPoo.bin" +.include "data/flyover-text-poo.asm" flyovertextLater: -.incbin "data/flyovertextLater.bin" +.include "data/flyover-text-later.asm" + +flyover_tea: +.include "data/flyover-tea.asm" + +flyover_coffee: +.include "data/flyover-coffee.asm" m2_coord_table_file: .incbin "data/m2-coord-table-file-select.bin" From 6ab083ceddc2aca8bbbb3be7b4a9982e22974b2b Mon Sep 17 00:00:00 2001 From: PhoenixBound Date: Sun, 29 Sep 2019 16:17:55 -0500 Subject: [PATCH 3/4] Fix file screen issues --- src/m2-hack.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/m2-hack.asm b/src/m2-hack.asm index d9cb6c0..d0cbeaa 100644 --- a/src/m2-hack.asm +++ b/src/m2-hack.asm @@ -1469,6 +1469,7 @@ flyover_tea: flyover_coffee: .include "data/flyover-coffee.asm" +.align 2 m2_coord_table_file: .incbin "data/m2-coord-table-file-select.bin" From ca3a61a32be9e3cb2dd8b0a4e765ee47dd455cdd Mon Sep 17 00:00:00 2001 From: PhoenixBound Date: Sun, 29 Sep 2019 18:18:30 -0500 Subject: [PATCH 4/4] Dang it --- working/m12-strings-english.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/working/m12-strings-english.txt b/working/m12-strings-english.txt index b806e22..ba5aed1 100644 --- a/working/m12-strings-english.txt +++ b/working/m12-strings-english.txt @@ -1635,7 +1635,7 @@ ^L1639^[CA FF][14 FF 31 00][A0 FF 62 01 D4 01 FF 00][C9 FF 62 01][00 FF] ^L1640^[A3 FF 04 03][9E FF][EB FF FF 00][1B FF 01 00][85 FF 04 03 06 00][84 FF 05 03 0C 00 01 00][09 FF 66 02][08 FF 67 02][1B FF 01 00][DB FF 05 03 01 00 FF 00][CE FF 05 03 00 00][00 FF] ^L1641^[A0 FF D0 07 4B 01 01 00][1B FF 01 00][C9 FF D0 07][CC FF FF 00 01 00][EB FF FF 00][9E FF][09 FF 16 02][C5 FF][CA FF][EA FF FF 00][A9 FF 5F 01][9E FF][86 FF _L1914_][09 FF 0B 00][FC FF 06 00][A0 FF D3 07 05 03 01 00][08 FF D6 00][09 FF 4E 02][00 FF] -^L1642^[A0 FF BB 00 F0 00 01 00]@This bus goes to Twoson via Threed.[02 FF][BB FF 02][87 FF]@It is going to cost[01 FF] $[B8 FF 00][1A FF 04 00][86 FF _forthelotofyou_].[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4101_][05 FF _L4089_][80 FF _L4089_] +^L1642^[A0 FF BB 00 F0 00 01 00]@This bus goes to Twoson via[01 FF] Threed.[02 FF][BB FF 02][87 FF]@It is going to cost[01 FF] $[B8 FF 00][1A FF 04 00][86 FF _forthelotofyou_].[02 FF]@Do you want to go?[86 FF _L2492_][04 FF _L4101_][05 FF _L4089_][80 FF _L4089_] ^L1643^[A9 FF 01 01][A6 FF 3B 00 6B 01][A6 FF 38 00 6D 01][A6 FF 39 00 6D 01][A6 FF 3A 00 6D 01][A6 FF BF 00 6D 01][1B FF 0A 00][C4 FF 00 4E][EB FF FF 00][A6 FF 3B 00 6C 01][1B FF 1E 00][A6 FF 38 00 6C 01][1B FF 1E 00][A6 FF 39 00 6C 01][1B FF 1E 00][A6 FF 3A 00 6C 01][1B FF 1E 00][A6 FF 36 00 6E 01][A0 FF 36 00 70 01 01 00][A6 FF 37 00 6F 01][A0 FF 37 00 71 01 01 00][9E FF][A0 FF 36 00 72 01 01 00][9E FF][A0 FF 37 00 77 01 01 00][9E FF][B1 FF 36 00 CC 00][1B FF 1E 00][B4 FF 36 00][9E FF][A6 FF 3A 00 7C 01][9E FF][A0 FF 37 00 78 01 01 00][A0 FF 36 00 73 01 01 00][9E FF][A0 FF 37 00 79 01 01 00][A0 FF 36 00 74 01 01 00][9E FF][A0 FF 37 00 7A 01 01 00][A0 FF 36 00 75 01 01 00][9E FF][A0 FF 37 00 7B 01 01 00][A0 FF 36 00 76 01 01 00][9E FF][A6 FF 3B 00 9B 01][A6 FF 38 00 9B 01][A6 FF 39 00 9B 01][A6 FF BF 00 9B 01][1B FF 1E 00][A6 FF 01 01 7D 01][C5 FF][00 FF] ^L1644^[CA FF][A5 FF D0 07 06 00][A5 FF 3B 00 06 00][A5 FF 38 00 06 00][A5 FF 39 00 06 00][A5 FF 3A 00 06 00][A5 FF BF 00 06 00][A5 FF 36 00 06 00][A5 FF 37 00 06 00][A5 FF BE 00 06 00][1B FF 01 00][A5 FF BE 00 06 00][A0 FF D0 07 05 03 01 00][00 FF] ^L1645^[A9 FF 01 01][EB FF FF 00][1B FF 3C 00]@It's going to be a great show![01 FF][1B FF 14 00] We're so good it makes me...[02 FF]@think that those kids by the exit[01 FF] will wet their pants![02 FF]@Those kids are hip,[1B FF 0F 00] baby![1D FF][C6 FF][1B FF 1E 00][C4 FF 00 4C][A6 FF 3B 00 8D 01][A6 FF 38 00 8E 01][A6 FF 39 00 8F 01][A6 FF 3A 00 90 01][A6 FF BF 00 91 01][1B FF 50 00][A0 FF 36 00 92 01 01 00][A0 FF 37 00 93 01 01 00][9E FF][A0 FF 36 00 94 01 01 00][A0 FF 37 00 95 01 01 00][9E FF][A0 FF 36 00 97 01 01 00][A0 FF 37 00 96 01 01 00][9E FF][A0 FF 36 00 99 01 01 00][A0 FF 37 00 98 01 01 00][9E FF][A0 FF A7 00 9A 01 01 00][1B FF 5A 00][A6 FF 3B 00 9B 01][A6 FF 38 00 9B 01][A6 FF 39 00 9B 01][A6 FF 3A 00 9B 01][A6 FF BF 00 9B 01][9E FF][A6 FF 3B 00 9C 01][A6 FF 38 00 9C 01][A6 FF 39 00 9C 01][A6 FF 3A 00 9C 01][A6 FF BF 00 9C 01][A0 FF 36 00 9D 01 01 00][A0 FF 37 00 9E 01 01 00][9E FF][A0 FF 37 00 9F 01 01 00][9E FF][A0 FF 37 00 A0 01 01 00][9E FF][A0 FF 36 00 A1 01 01 00][A0 FF 37 00 A2 01 01 00][9E FF][A0 FF 36 00 A3 01 01 00][9E FF][A0 FF 36 00 A4 01 01 00][A0 FF 37 00 A5 01 01 00][9E FF][A0 FF 36 00 A8 01 01 00][A0 FF 37 00 A5 01 01 00][9E FF][A0 FF 62 01 A6 01 01 00][9E FF][A0 FF 37 00 A7 01 01 00][9E FF][A0 FF 36 00 A9 01 01 00][9E FF][A6 FF 3B 00 9B 01][A6 FF 38 00 9B 01][A6 FF 39 00 9B 01][A6 FF 3A 00 9B 01][A6 FF BF 00 9B 01][A6 FF 01 01 7D 01][C5 FF][00 FF]