From 9bffde95d3a081ce80186702bcd5a57e58138a87 Mon Sep 17 00:00:00 2001 From: John-Enigma Date: Thu, 29 Aug 2019 21:17:44 -0400 Subject: [PATCH 1/2] Added Lorenzooone as a contributor to the project. Surprised no one has added him yet. --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 38c9144..cf2bb99 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -3,6 +3,7 @@ Hacking, script tool, script compiler/decompiler: Text conversion: JeffMan + Lorenzooone ItsIggy TheZunar123 EBrent From 71dcdfadf2d00f2568e8620fac37daf92e9ca3dd Mon Sep 17 00:00:00 2001 From: PhoenixBound Date: Sat, 7 Sep 2019 16:11:21 -0500 Subject: [PATCH 2/2] Localize sfx in Pokey's house + a few text changes --- src/m2-hack.asm | 15 ++++++++++----- working/m12-itemnames.json | 16 ++++++++-------- working/m12-strings-english.txt | 8 ++++---- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/m2-hack.asm b/src/m2-hack.asm index 46b5c91..0aaadfb 100644 --- a/src/m2-hack.asm +++ b/src/m2-hack.asm @@ -789,11 +789,6 @@ lsl r0,r1,4 nop nop -//--------------------------------------------------------- -// Carpainter's timing fix -//--------------------------------------------------------- -.org 0x802A75F :: db 0x30 //Add 8 extra frames before the game can start reading again. - //--------------------------------------------------------- // Fix windows printing too many tiles due to not going off of pixels, but off of characters //--------------------------------------------------------- @@ -983,6 +978,16 @@ nop //.org 0x80BD9F6 :: mov r2,#0x16 //Jeff //.org 0x80BDA02 :: mov r2,#0x1B //Poo +//--------------------------------------------------------- +// Movement code hacks +//--------------------------------------------------------- +// Censor the spanking sound in Pokey's house +.org 0x8027BCB :: db 70 // Add 30 extra frames before the sound plays +.org 0x8027BD1 :: dh 84 // Replace sound effect + +// Carpainter's timing fix +.org 0x802A75F :: db 0x30 //Add 8 extra frames before the game can start reading again. + //============================================================================== // Data files diff --git a/working/m12-itemnames.json b/working/m12-itemnames.json index 9d861bd..9c8cd61 100644 --- a/working/m12-itemnames.json +++ b/working/m12-itemnames.json @@ -238,14 +238,14 @@ "OffsetLocation": 11644956, "OldPointer": 11642833, "Old": "デスビーム[00 FF]", - "New": "Baddest beam[00 FF]" + "New": "Death ray[00 FF]" }, { "Index": 34, "OffsetLocation": 11644960, "OldPointer": 11642840, "Old": "さいあくビーム[00 FF]", - "New": "Death ray[00 FF]" + "New": "Baddest beam[00 FF]" }, { "Index": 35, @@ -686,7 +686,7 @@ "OffsetLocation": 11645212, "OldPointer": 11643425, "Old": "うみたてたまご[00 FF]", - "New": "Fresh egg[00 FF]" + "New": "Fresh Egg[00 FF]" }, { "Index": 98, @@ -721,7 +721,7 @@ "OffsetLocation": 11645232, "OldPointer": 11643472, "Old": "アーモンドもなか[00 FF]", - "New": "Peanut cheese bar[00 FF]" + "New": "Peanut cheese`bar[00 FF]" }, { "Index": 103, @@ -931,7 +931,7 @@ "OffsetLocation": 11645352, "OldPointer": 11643731, "Old": "チョコチップ[00 FF]", - "New": "Tin of cocoa[00 FF]" + "New": "Tin of Cocoa[00 FF]" }, { "Index": 133, @@ -1309,7 +1309,7 @@ "OffsetLocation": 11645568, "OldPointer": 11644222, "Old": "はえみつ[00 FF]", - "New": "Jar of fly honey[00 FF]" + "New": "Jar of Fly Honey[00 FF]" }, { "Index": 187, @@ -1400,7 +1400,7 @@ "OffsetLocation": 11645620, "OldPointer": 11644332, "Old": "ペテネラのくつした[00 FF]", - "New": "Pair of dirty socks[00 FF]" + "New": "Pair`of dirty socks[00 FF]" }, { "Index": 200, @@ -1435,7 +1435,7 @@ "OffsetLocation": 11645640, "OldPointer": 11644375, "Old": "ペンシルロケット20[00 FF]", - "New": "Multi bottle rocket[00 FF]" + "New": "Multi`bottle rocket[00 FF]" }, { "Index": 205, diff --git a/working/m12-strings-english.txt b/working/m12-strings-english.txt index 0285142..9894eec 100644 --- a/working/m12-strings-english.txt +++ b/working/m12-strings-english.txt @@ -2585,8 +2585,8 @@ ^L2728^@Just imagine... when we wake[01 FF] up tomorrow morning...[02 FF]@Ugh! *shiver* It'll be really[01 FF] gross.[1D FF][00 FF] ^L2729^@We should try Zombie Paper or[01 FF] some kind of trap.[1B FF 14 00] We have to[01 FF] do something![1D FF][00 FF] ^L2730^@It became really quite peaceful[01 FF] compared to before.[1D FF][00 FF] -^L2731^@Hey! Stupid zombies![1B FF 14 00] Come[01 FF] out, come out wherever you[01 FF] are![02 FF]@The suspense is killing me...[00 FF] -^L2732^@Maybe a good idea would be[01 FF] to try to get all the zombies[01 FF] into a single spot.[1D FF][00 FF] +^L2731^@Hey! Stupid zombies![1B FF 14 00] Come[01 FF] out, come out wherever you[01 FF] are![02 FF]@The suspense is killing me...[1D FF][00 FF] +^L2732^@Maybe a good idea would be to[01 FF] try to get all the zombies into a[01 FF] single spot.[1D FF][00 FF] ^L2733^@Actually, I'm kind of glad I got[01 FF] to see real zombies.[1D FF][00 FF] ^L2734^@Now you can go through the[01 FF] tunnel anytime you want![1D FF][00 FF] ^L2735^@Here, zombie, zombie, zombie...[01 FF] I have a nice bone for you...[1D FF][00 FF] @@ -3231,8 +3231,8 @@ ^L3547^[86 FF _L3549_][00 FF] ^L3548^@If you are not feeling well, you[01 FF] should not ride a bicycle.[1D FF][00 FF] ^L3549^@There is only one seat,[1B FF 0F 00] so you[01 FF] can't ride the bike now.[1D FF][00 FF] -^L3550^@[9F FF][C1 FF][87 FF] used [90 FF 00][1A FF 02 00]![02 FF]@Now, [86 FF _userpersonal_] can figure out the length of[01 FF] things easily.[02 FF][00 FF] -^L3551^@[9F FF][C1 FF][87 FF] used the [90 FF 00][1A FF 02 00]![02 FF]@Now, he can fairly easily figure out the[01 FF] angle of various things.[02 FF][00 FF] +^L3550^@[9F FF][C1 FF][87 FF] used [90 FF 00][1A FF 02 00]![02 FF]@Now, [86 FF _userpersonal_] can figure out the[01 FF] length of things easily.[02 FF][00 FF] +^L3551^@[9F FF][C1 FF][87 FF] used the [90 FF 00][1A FF 02 00]![02 FF]@Now, he can fairly easily figure[01 FF] out the angle of various things.[02 FF][00 FF] ^L3552^@(The Exit Mouse cannot do its[01 FF] job[02 FF]@unless it is in a hole, cave, or[01 FF] some place with an exit!)[1D FF][00 FF] ^L3553^@(At this point in time, the[01 FF] mouse is fast asleep.)[1D FF][00 FF] ^L3554^@You shouldn't let the mouse go[01 FF] until the pizza has arrived.[1D FF][00 FF]