From dbc209ee4f7e7e24c871daaca6952430f4502840 Mon Sep 17 00:00:00 2001 From: PhoenixBound Date: Thu, 26 Dec 2019 15:05:45 -0600 Subject: [PATCH 1/3] Some strings edits I don't remember --- working/m12-strings-english.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/working/m12-strings-english.txt b/working/m12-strings-english.txt index ba5aed1..3644b00 100644 --- a/working/m12-strings-english.txt +++ b/working/m12-strings-english.txt @@ -1649,9 +1649,9 @@ ^L1653^[A4 FF F3 04][8D FF 01 00][A8 FF 00]@(You enjoyed the hot springs[01 FF] immensely.[86 FF _L2940_][1B FF 14 00] It made you feel[01 FF] reborn.)[1D FF][86 FF _L2941_][C6 FF][A3 FF F3 04][00 FF] ^L1654^[A6 FF 47 01 B8 02][A9 FF D0 07][9E FF][FC FF 17 00][9E FF][80 FF _L4034_] ^L1655^[B0 FF 03 05 CC 00][1B FF 3C 00][B3 FF 03 05][A3 FF 03 05][9E FF][A4 FF 03 05]@You guys smell really good![1B FF 0F 00][01 FF] *sniff, sniff, sniff*[02 FF]@Who am I?[1B FF 14 00] I'm a Tenda![1D FF][C7 FF][1B FF 0A 00][A1 FF 04 05 40 02][9E FF][A4 FF 04 05]@Hey![1B FF 14 00] What are you doing inside[01 FF] our dinosaur cage?[02 FF]@I'm going to open the door, and[01 FF] you get out of there right now![02 FF]@I'm the boss,[1B FF 0F 00] so I will let you[01 FF] out.[1D FF][C7 FF][A3 FF 04 05][9E FF][A4 FF 04 05][85 FF 13 05 06 00][08 FF 8B 02]@Thank you for the Tendakraut.[02 FF][D4 FF 76 00][6D FF FF 00 92 00][08 FF 68 02][8D FF 01 00][A8 FF 00]@([90 FF 00][1A FF 01 00]'s Tendakraut[01 FF] was stolen.)[02 FF]@(The awful smell surrounding[01 FF] the group is now gone.)[02 FF][C6 FF][00 FF] -^L1656^[86 FF _L4243_][83 FF 0E 02][82 FF _L4244_][A0 FF D0 07 FD 02 01 00][86 FF _L4040_][CB FF FF 00 06 00][A3 FF 17 05][86 FF _L4245_][A4 FF 17 05][1B FF 01 00]@(The hot spring energizes you[01 FF] completely.)[1D FF][C6 FF][86 FF _L2185_][A3 FF 17 05][EB FF FF 00][00 FF] -^L1657^[86 FF _L4243_][83 FF 0F 02][82 FF _L4246_][A0 FF D0 07 FE 02 01 00][86 FF _L4040_][CB FF FF 00 06 00][A3 FF 18 05][86 FF _L4245_][A4 FF 18 05][1B FF 01 00]@(The hot spring energizes you[01 FF] completely.)[1D FF][C6 FF][86 FF _L2941_][A3 FF 18 05][EB FF FF 00][86 FF _L2941_][00 FF] -^L1658^[86 FF _L4243_][83 FF 10 02][82 FF _L4247_][A0 FF D0 07 FF 02 01 00][86 FF _L4040_][CB FF FF 00 06 00][A3 FF 19 05][86 FF _L4245_][A4 FF 19 05][1B FF 01 00]@(The hot spring cured you[01 FF] completely.)[1D FF][C6 FF][86 FF _L2185_][A3 FF 19 05][EB FF FF 00][00 FF] +^L1656^[86 FF _L4243_][83 FF 0E 02][82 FF _L4244_][A0 FF D0 07 FD 02 01 00][86 FF _L4040_][CB FF FF 00 06 00][A3 FF 17 05][86 FF _L4245_][A4 FF 17 05][1B FF 01 00]@(The hot spring energized you[01 FF] completely.)[1D FF][C6 FF][86 FF _L2185_][A3 FF 17 05][EB FF FF 00][00 FF] +^L1657^[86 FF _L4243_][83 FF 0F 02][82 FF _L4246_][A0 FF D0 07 FE 02 01 00][86 FF _L4040_][CB FF FF 00 06 00][A3 FF 18 05][86 FF _L4245_][A4 FF 18 05][1B FF 01 00]@(The hot spring cured you[01 FF] completely.)[1D FF][C6 FF][86 FF _L2941_][A3 FF 18 05][EB FF FF 00][86 FF _L2941_][00 FF] +^L1658^[86 FF _L4243_][83 FF 10 02][82 FF _L4247_][A0 FF D0 07 FF 02 01 00][86 FF _L4040_][CB FF FF 00 06 00][A3 FF 19 05][86 FF _L4245_][A4 FF 19 05][1B FF 01 00]@(The hot spring energizes you[01 FF] completely.)[1D FF][C6 FF][86 FF _L2185_][A3 FF 19 05][EB FF FF 00][00 FF] ^L1659^[09 FF DF 01][E2 FF 01 00][86 FF _L3995_][08 FF BA 02][00 FF] ^L1660^[09 FF E0 01][E2 FF 02 00][86 FF _L3995_][08 FF BB 02][00 FF] ^L1661^[09 FF E1 01][E2 FF 03 00][86 FF _L3995_][08 FF BC 02][00 FF] @@ -3786,7 +3786,7 @@ ^L4217^@It depends on [10 FF]'s[01 FF] efforts. That will determine[01 FF] the reuniting of the group.[02 FF]@Be faithful, and wait until the[01 FF] time comes![1D FF][C6 FF][00 FF] ^L4219^@A submarine?[02 FF]@I believe...[1B FF 0F 00] that I have one in my[01 FF] old vehicle collection.[02 FF]@Please enter...[1D FF][C6 FF][1B FF 01 00]^L4218^[14 FF 55 00][86 FF _L3310_][00 FF] ^L4224^@My... power...[1B FF 14 00] awe-inspiring![1D FF][00 FF] -^L4225^@Powerful...[1B FF 14 00] I...[02 FF]@so... show...[1B FF 1E 00] everyone...[02 FF][C6 FF][CE FF EA 04 03 00][A1 FF EF 04 3E 02][9E FF][A4 FF EF 04]@Hu[1B FF 0F 00]u[1B FF 05 00]u[1B FF 01 00]up![1B FF 0F 00] I got it![1B FF 0F 00][01 FF] I got it! Eeeee yeah!!![02 FF][C6 FF][A3 FF EF 04][9E FF][85 FF EF 04 06 00][D4 FF 79 00][08 FF 99 00][00 FF] +^L4225^@Powerful...[1B FF 14 00] I...[02 FF]@so... show...[1B FF 1E 00] everyone...[02 FF][C6 FF][CE FF EA 04 03 00][A1 FF EF 04 3E 02][9E FF][A4 FF EF 04]@Hu[1B FF 0F 00]u[1B FF 05 00]u[1B FF 01 00]up![1B FF 0F 00] I got it![1B FF 0F 00] I got it![01 FF] Eeeee yeah!!![02 FF][C6 FF][A3 FF EF 04][9E FF][85 FF EF 04 06 00][D4 FF 79 00][08 FF 99 00][00 FF] ^L4226^[86 FF _L3541_][81 FF _L2773_][C4 FF 00 73][1B FF 3C 00][1D FF][74 FF][D4 FF 0B 00]@Hello, this is Apple Kid.[02 FF]@I just wanted to let you know[01 FF] that I finished a pretty unique[01 FF] invention.[02 FF]@I'm not sure if it will help you or[01 FF] not...[02 FF]@It's called and[01 FF] it can be used to trap zombies.[02 FF]@It works kind of like fly paper...[02 FF]@All you need to do is place the[01 FF] paper on the floor of a tent or[01 FF] something...[02 FF]@You've seen at least one tent[01 FF] around, right?....[02 FF]@and then the zombies get stuck[01 FF] to the paper[02 FF]@when they move around inside[01 FF] the tent.[02 FF]@You can catch a lot of zombies[01 FF] this way... In fact,[02 FF]@I bet you could get rid of all the[01 FF] zombies[02 FF]@that are terrorizing the area[01 FF] with this paper![02 FF][1B FF 3C 00][01 FF]@Anyway, I just asked the Mach[01 FF] Pizza delivery man[02 FF]@to deliver the Zombie Paper to[01 FF] you, [0D FF].[02 FF]@You should get it pretty soon.[02 FF]@I've never actually seen a[01 FF] zombie, but if there really are[01 FF] any,[02 FF]@Zombie Paper would be very[01 FF] useful...[02 FF]@I'll be calling you if I come up[01 FF] with anything else...[02 FF]@*Click!* Beeeeep![1D FF][D4 FF 0B 00][C6 FF][C5 FF][CF FF 08 00][08 FF A3 02][08 FF F2 02][00 FF] ^L4227^@You have too much stuff, so I[01 FF] can't give this to you...[02 FF]@Why don't you get rid of[01 FF] something?[03 FF 00 00][04 FF _L4228_][05 FF _L4229_]^L4229^@Look, this is really important![02 FF]@You've got to dump something!![03 FF 00 00][04 FF _L4228_][05 FF _L4230_][80 FF _L4230_]^L4228^[86 FF _L2489_][82 FF _L4229_][88 FF][AB FF 00 00][B7 FF 00][82 FF _L4231_][89 FF][B9 FF 00 00 00 00][80 FF _L4232_] ^L4230^@All righty, I'm just going to[01 FF] hang out around here, then.[02 FF]@Ya gotta have some space for[01 FF] this thing by the time I come[01 FF] back, okay?[02 FF][C6 FF][86 FF _L4023_][09 FF F2 02][00 FF] @@ -3938,7 +3938,7 @@ ^L4413^@If you've already got what you[01 FF] need, great![02 FF]@But if you don't, well, that[01 FF] would be a real shame.[02 FF]@Take a good look at my menu[01 FF] and decide.[02 FF]@Is there anything listed that you[01 FF] might want?[00 FF] ^L4414^@Hello there! Welcome to my[01 FF] humble shop![02 FF]@How about some of our famous[01 FF] Scaraba delicacies?[02 FF][00 FF] ^L4415^@I sell water to those who are[01 FF] thirsty.[02 FF][00 FF] -^L4416^@Since I'm dealing in some pretty[01 FF] rough stuff,[02 FF]@I can't run my business in town.[02 FF][00 FF] +^L4416^@Since I'm dealing in some pretty[01 FF] rough stuff,[02 FF]@I can't run my business in town.[22 FF][00 FF] ^L4417^@Let's play store. My friend[01 FF] Ay-go loves this game. So...[02 FF]@Hi! May I help you?[00 FF] ^L4418^@Hi! This shop specializes in[01 FF] puddings and pendants![02 FF]@You'd like to buy some,[01 FF] wouldn't you?[00 FF] ^L4419^@Hi, how are you doing? From[01 FF] the look of things,[02 FF]@I would say, not so good.[02 FF][00 FF] @@ -4861,7 +4861,7 @@ ^L5493^[86 FF _L5497_][8F FF][00 FF] ^L5494^[86 FF _L5496_][93 FF 00 00][D4 FF 74 00][00 FF] ^L5495^@[90 FF 00][1A FF 01 00] takes it.[87 FF][1D FF][00 FF] -^L5496^[8D FF 01 00][87 FF]@[90 FF 00][1A FF 01 00] added the[89 FF][01 FF] [90 FF 00][1A FF 01 00] [01 FF] to [87 FF][90 FF 00][1A FF 02 00]'s stuff.[87 FF][1D FF][00 FF] +^L5496^[8D FF 01 00][87 FF]@[90 FF 00][1A FF 01 00] added the[01 FF][89 FF] [90 FF 00][1A FF 02 00] [01 FF] to [87 FF][90 FF 00][1A FF 01 00]'s stuff.[87 FF][1D FF][00 FF] ^L5497^[8D FF 01 00]@But, [86 FF _heshe_] has got too much[01 FF] stuff already.[1D FF][00 FF] ^L5498^[88 FF]@[86 FF _L11000_][89 FF] got[01 FF] $[B8 FF 00][1A FF 04 00] dollars.[1D FF][00 FF] ^L5499^[1C FF E2 00 _L5508_][1C FF E3 00 _L5509_][1C FF E4 00 _L5510_][1C FF E5 00 _L5511_][00 FF] From 6a4622a07a1b71249541d3a6066452ddc81d6f5c Mon Sep 17 00:00:00 2001 From: PhoenixBound Date: Sat, 28 Dec 2019 16:44:59 -0600 Subject: [PATCH 2/3] Add Lumine Hall font graphics in preparation for VWF --- src/data/lumine-char-tilemap.bin | Bin 0 -> 16384 bytes src/m2-hack.asm | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 src/data/lumine-char-tilemap.bin diff --git a/src/data/lumine-char-tilemap.bin b/src/data/lumine-char-tilemap.bin new file mode 100644 index 0000000000000000000000000000000000000000..ac15881529f5208d1dc23efbabb8545300c863a2 GIT binary patch literal 16384 zcmds-TXN$#3`LWVe57i!|1FFYuglrS;NtR-5-3^9*FKK>T=gZ61bM|NqJ-t1eN5nls>Lnj&?BGLJJd&e7 zo}Mj;<0{2tWGsp2_-xslKlD1ky@Ak1;vOM+PzQ)zrQw4|a`Z->SbQ%M_Xzj0zz#Wd z#UnZT==~HD_Xx=cJ?Q_1FSj-q|Ce>V17Ckp*IA^0zP3K9{;I4-*M&AB*BTw47x!ja zxQ}0-K-Xq@aIGI&+y3VG&Y;`LUQyEj!e8@?{n@(FqmO6}<&*2~<2Cz>do-)A(em3% z$n2k9xBfaFNdKg+v#5QAVqCQTrhnH%T=B)Z zwAJ}N#sz(JnnhS=e(`rve|U{vuDml2HuxPh`yl6m2juii)vNpK<6Fi-kG_7kZuHWB ztD9IJhqljJMNu?8O-BV=-PGT(jY{Nsjad>`jKY?kC9b?e#S;Rqb_GMXnRn}f4LH1t5V_gb=vS2@j|3SBXRrl}sJ>FtJB}vOJv>gYm`=49vIHXIRuAaQ!J70B5 zNBzlp`-B92Y2#q2?9l`58F}6RSU>(wcGw#)?VKFl(0SzF5ij`J9}?s4t$kmB-@5-v z%NTd+*SKrM=&kT&U+NF75w}0jk`Hlt&b|KZ;>5vEXdl#%pRm}hUwvPB(f_Nz+W)<) zTht$YSbe$H?|%O9K)>&OoIXuoZ_no%-%Dg3+1DeVq{v!yJI^=1Y4z;JZ~oX%4u76U zw<9(J*h(pW9|x<`J5%)6?`_*ecOU7z=!-Vwj%v#d+D zmB!zauY35v9hY_8tH0K{X9pj|4tfvK`zhSZqw?o`yxyXR9J(SaNaa@=KU>&(SX=4i zo%G695I&u4bk5c>SNb*n9<5Hi&dF~g`pBRwdKDY*Rh2{IXGZrijiXn3pQp8=HM*fr z&9Y{v0n+KPHxl;<6=SSD^1rU%r_}xWsOKmSdNZ<8l0O+RF45s4D^cXxI$|3y^y3_y z(hlGRy?4`V0$ zwa4=(WQUmwMsVKKL8)l9%ZINnK}A`wM;35x)au-*r^y@7O+( zNzORv1Sr}_^~yy2k+=1AV!yuG!cW2vA1`94Vfo@+XtbMiKF?uI}5S;%81EI-Ot&rN>^A3wnh@9?Fkek~e1Wae2u zGzQHMVy$m0@}#b_NEY9Y`Aj29#Wo6G75{AA=zUe(KgADqoy9*T@2|>(y7AX(%{%5^ z%(>2Q^UwViE2Gy}cxw$PFy7bn4h>@caa>0~Yd`982AzJ2>hpSw&gJj?CDVRJzV$n} zV+`~O#&q~vgk2;;NR%6TUE%!~qVLwH@B`y6}zq@}~5>H&q#q&phSNybJ?|+n` zGOqPUesTFbZ|bLCfm&x(hiSe^_Gk<~a@T1}cJ9N{(`EhE`#YU{{~q4su(~t;>v+*Y z(z8%^vEJuNmV9zd7Uw`kkZjZ+e#0_&tNO8DBG0dnN7k~=XQ|&RZS^j@@<-}t9K*(* znm=fDed)OWFXKzU_J94ZBW>!BE~y>dRDbs4?B{%AKG5-?O-VoF$!68Zoptu+1>bb* z|Czu2v7cP}Q@-pwbmtKn{onN1OOT)QvEHcHQfS`(TkQ5Vb2>j_e&k}_RU5`X;+*oQ z=f~xdgZdcOd}>{t&UrsZq4RqdAB+2^YS+3tUFv5x``4t!dy;c>(Ab06LGK~oUZPK& z@ixUg)_c-F{{AcX%AF@UdIL4~mA{uq<&y_|=W~5gbmwB^+c@|m?~uovDH?P>));*J zI9K?Jq&U`=Z0!%Z>cg+|8ub%bh#q-T*I8`wv;O$soblUYWY#d^E@)Av<9$snajY%A zxHDgJhzYFI& z?sI-ub;sG>uXdImd;DD*bA|UgzpJ|AZ0}b)OOHMNE{(au`<(Bq&T(h|4{gPrC0m^P z+0VX?^s9U;=I40p2(vHAXYL+n?QN#2-K=q+Q|&)X*J!gpY0TUsPW202?ckrqYX5n9 z8F|Z_Ry7sq!Pb+JBy2M%?ly`4;~k zZ|QS=KU=NkN7QWpdCrKr Date: Mon, 30 Dec 2019 22:51:30 -0600 Subject: [PATCH 3/3] Probably fix geyser crash --- working/m12-movements.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/working/m12-movements.json b/working/m12-movements.json index 873abbe..6635d8b 100644 --- a/working/m12-movements.json +++ b/working/m12-movements.json @@ -521,12 +521,6 @@ "OldPointer": 484798, "Label": "L1656" }, - { - "Index": 218, - "PointerLocation": 205815, - "OldPointer": 393728, - "Label": "L1574" - }, { "Index": 223, "PointerLocation": 205946,