Skip to content

Commit

Permalink
Merge pull request #107 from Lorenzooone/target_overworld_dialogue
Browse files Browse the repository at this point in the history 
Put buffer in overworld target window
  • Loading branch information
@jeffman
jeffman committed Feb 15, 2020
2 parents 989e391 + 3f74b43 commit 87987ab
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
6 changes: 6 additions & 0 deletions src/m2-hack.asm
View file
Expand Up @@ -279,6 +279,12 @@ mov r3,6
.org 0x80BBDF0 :: mov r2,#0x54 :: mov r3,#0x13 :: bl printNumberEquip //Change second defense number's position - Defensive Equipment
.org 0x80BBE20 :: mov r2,#0x54 :: mov r3,#3 :: bl bb1aa_printnumberequip_store //Change second offense number's position - Defensive Equipment

//---------------------------------------------------------
// Target dialogue window hacks
//---------------------------------------------------------

.org 0x80BD496 :: bl ba8ac_load_targets_print

//---------------------------------------------------------
// Goods window hacks
//---------------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions working/m12-strings-english.txt
View file
Expand Up @@ -3308,7 +3308,7 @@
^L3647^[BE FF FF 00 BB 00][81 FF _L2879_]@You have defeated me...[02 FF]@Allow me to eat some Fly[01 FF] Honey for the last time...[02 FF]@Master Belch hates people like[01 FF] you.[02 FF]@...You see, those who don't[01 FF] have <Fly Honey> are our mortal[01 FF] enemies...[02 FF][C6 FF][00 FF]
^L3648^@Option chosen: <Party Setup>[02 FF]@What to do?[03 FF 02 00][04 FF _L3662_][05 FF _L3663_][80 FF _L3661_]
^L3649^@Option chosen: <Goods Setup>[02 FF]@Goods shall be configured.[01 FF] (Valid options: 1 through 7)[01 FF][C8 FF 01 00][95 FF 07 _L3669_ _L3670_ _L3671_ _L3672_ _L3673_ _L3674_ _L3675_][80 FF _L3661_]
^L3650^@Option chosen: <Status[01 FF] Conditions>[02 FF]@Who should receive it?[02 FF][EC FF][82 FF _L3721_][88 FF]@Which one? (Valid options: 1[01 FF] through 14)[01 FF][C8 FF 02 00][95 FF 0D _L3722_ _L3723_ _L3724_ _L3725_ _L3726_ _L3727_ _L3728_ _L3729_ _L3730_ _L3731_ _L3732_ _L3733_ _L3734_][80 FF _L3650_]
^L3650^@Option chosen: <Status[01 FF] Conditions>[02 FF]@Who should receive it?[02 FF][5C FF][EC FF][5B FF][5A FF][82 FF _L3721_][88 FF]@Which one? (Valid options: 1[01 FF] through 14)[01 FF][C8 FF 02 00][95 FF 0D _L3722_ _L3723_ _L3724_ _L3725_ _L3726_ _L3727_ _L3728_ _L3729_ _L3730_ _L3731_ _L3732_ _L3733_ _L3734_][80 FF _L3650_]
^L3651^@Option chosen: <Move>[02 FF]@Where to move? (Valid[01 FF] options: 1 through 20)[01 FF][C8 FF 02 00][95 FF 14 _L3735_ _L3736_ _L3737_ _L3738_ _L3739_ _L3740_ _L3741_ _L3742_ _L3743_ _L3744_ _L3745_ _L3746_ _L3747_ _L3748_ _L3749_ _L3750_ _L3751_ _L3752_ _L3753_ _L3754_][80 FF _L3661_]
^L3652^@Option chosen: <Money Setup>[02 FF]@Starting money operations.[01 FF] (Valid options: 1 through 4)[01 FF][69 FF][9C FF][C8 FF 01 00][95 FF 04 _L3760_ _L3761_ _L3762_ _L3763_][80 FF _L3661_]
^L3653^@Option chosen: <Give Exp>[02 FF]@(This option is slightly different[01 FF] from EarthBound's debug menu[01 FF] out of necessity.[02 FF]@It will push the selected[01 FF] character to level 99, with the[01 FF] stat gains listed.[02 FF]@Sorry in advance for this[01 FF] inconvenience.)[02 FF]@Give exp to whom?[03 FF 05 00][04 FF _L3755_][05 FF _L3756_][80 FF _L3661_]
Expand Down Expand Up @@ -4548,8 +4548,8 @@
^L5046^[00 FF]
^L5047^[8B FF][00 FF]^L5864^[8B FF][5B FF][5A FF][00 FF]
^L5048^[87 FF][62 FF][87 FF][8A FF][82 FF _L5047_][87 FF][91 FF 00][81 FF _L5864_][8B FF][87 FF][89 FF][80 FF _L5048_]
^L5049^[A8 FF 01][88 FF]@I can examine one of you for[01 FF] $[B8 FF 00][1A FF 04 00].[9C FF][69 FF][03 FF 15 00][86 FF _L4957_][95 FF 02 _L5354_ _L5355_]^L5355^@You really don't need any[01 FF] treatment?[01 FF] All right.^L5367^[86 FF _L5356_][1D FF][00 FF]^L5354^[99 FF 00 00 00 00][81 FF _L5357_][96 FF 02][81 FF _L5358_]@Who is sick?[69 FF][EC FF][01 FF][82 FF _L5355_]^L5366^[88 FF][ED FF 00 00 01 00][95 FF 08 _L5359_ _L5360_ _L5361_ _L5361_ _L5362_ _L5363_ _L5364_ _L5365_]^L5358^[8D FF 01 00][80 FF _L5366_]
^L5051^[A8 FF 01][86 FF _L5371_][82 FF _L5372_]@Who do you want to see?[69 FF][EC FF][01 FF][82 FF _L5373_][88 FF][92 FF 00 01 02][82 FF _L5374_][89 FF][87 FF]@[90 FF 00][1A FF 01 00] was just brought[01 FF] in, and is still unconscious.[02 FF][87 FF]@Please pay $[B8 FF 00][1A FF 04 00] for[01 FF] the doctor's fee.[03 FF 00 00][86 FF _L4957_][95 FF 02 _L5375_ _L5376_]^L5376^@Your friend, right?... It's very[01 FF] serious.[1D FF][00 FF]^L5375^[99 FF 00 00 00 00][81 FF _L5377_][9B FF 00 00 00 00][9C FF][89 FF][EE FF 00 00 01 00 01 00][89 FF][EE FF 00 00 02 00 01 00][89 FF][EE FF 00 00 06 00 01 00][89 FF][87 FF][F7 FF 00 00 64 00][F8 FF 00 00 64 00][D4 FF 25 00][1B FF 32 00]@I'm so glad that you recovered,[01 FF] [90 FF 00][1A FF 01 00].[02 FF]@Come back any time you need.[1D FF][00 FF]
^L5049^[A8 FF 01][88 FF]@I can examine one of you for[01 FF] $[B8 FF 00][1A FF 04 00].[9C FF][69 FF][03 FF 15 00][86 FF _L4957_][95 FF 02 _L5354_ _L5355_]^L5355^@You really don't need any[01 FF] treatment?[01 FF] All right.^L5367^[86 FF _L5356_][1D FF][00 FF]^L5354^[99 FF 00 00 00 00][81 FF _L5357_][96 FF 02][81 FF _L5358_]@Who is sick?[02 FF][69 FF][5C FF][EC FF][5B FF][5A FF][82 FF _L5355_]^L5366^[88 FF][ED FF 00 00 01 00][95 FF 08 _L5359_ _L5360_ _L5361_ _L5361_ _L5362_ _L5363_ _L5364_ _L5365_]^L5358^[8D FF 01 00][80 FF _L5366_]
^L5051^[A8 FF 01][86 FF _L5371_][82 FF _L5372_]@Who do you want to see?[02 FF][69 FF][5C FF][EC FF][5B FF][5A FF][82 FF _L5373_][88 FF][92 FF 00 01 02][82 FF _L5374_][89 FF][87 FF]@[90 FF 00][1A FF 01 00] was just brought[01 FF] in, and is still unconscious.[02 FF][87 FF]@Please pay $[B8 FF 00][1A FF 04 00] for[01 FF] the doctor's fee.[03 FF 00 00][86 FF _L4957_][95 FF 02 _L5375_ _L5376_]^L5376^@Your friend, right?... It's very[01 FF] serious.[1D FF][00 FF]^L5375^[99 FF 00 00 00 00][81 FF _L5377_][9B FF 00 00 00 00][9C FF][89 FF][EE FF 00 00 01 00 01 00][89 FF][EE FF 00 00 02 00 01 00][89 FF][EE FF 00 00 06 00 01 00][89 FF][87 FF][F7 FF 00 00 64 00][F8 FF 00 00 64 00][D4 FF 25 00][1B FF 32 00]@I'm so glad that you recovered,[01 FF] [90 FF 00][1A FF 01 00].[02 FF]@Come back any time you need.[1D FF][00 FF]
^L5053^[BF FF][BC FF 01 00]^L5447^[A8 FF 01][96 FF 00][81 FF _L5445_][8D FF 00 00][82 FF _L5446_][92 FF 00 02 02][81 FF _L5446_][C0 FF][80 FF _L5447_]
^L5054^@I'm going to collect a ton![1D FF][00 FF]
^L5055^[86 FF _L5057_]@Thank you.[01 FF] Such a great mushroom.[01 FF] I'm so happy I got it.[1D FF][00 FF]
Expand Down Expand Up @@ -4812,16 +4812,16 @@
^L5426^[99 FF 00 00 00 00][81 FF _L5429_][96 FF 02][82 FF _L5430_][8D FF 01 00][80 FF _L5431_]
^L5428^[09 FF B0 00][09 FF B2 00][09 FF B1 00][00 FF]
^L5429^@If you don't have any money,[01 FF] you'll just have to keep going[01 FF] on in your current state.[1D FF][86 FF _L5428_][00 FF]
^L5430^@Who needs healing?^L5442^[EC FF][82 FF _L5432_][01 FF]^L5431^[88 FF][1C FF B1 00 _L5433_][1C FF B2 00 _L5434_][1C FF B0 00 _L5435_][00 FF]
^L5432^[01 FF][80 FF _L5427_]
^L5430^@Who needs healing?[02 FF]^L5442^[5C FF][EC FF][5B FF][5A FF][82 FF _L5432_]^L5431^[88 FF][1C FF B1 00 _L5433_][1C FF B2 00 _L5434_][1C FF B0 00 _L5435_][00 FF]
^L5432^[80 FF _L5427_]
^L5433^[92 FF 00 02 03][82 FF _L5439_][89 FF][EE FF 00 00 02 00 01 00][86 FF _L5437_][00 FF]
^L5434^[92 FF 00 01 04][82 FF _L5438_][89 FF][EE FF 00 00 01 00 01 00][86 FF _L5437_][00 FF]
^L5435^[92 FF 00 01 03][82 FF _L5436_][89 FF][EE FF 00 00 01 00 01 00][86 FF _L5437_][00 FF]
^L5436^[89 FF][87 FF]@[90 FF 00][1A FF 01 00] isn't hard like a[01 FF] diamond.[80 FF _L5440_]
^L5437^[9B FF 00 00 00 00][9C FF][89 FF][D4 FF 25 00][1B FF 1E 00][87 FF]@There! You're already healed![01 FF] Can I do my job well, or what![1D FF][86 FF _L5428_][00 FF]
^L5438^[89 FF][87 FF]@[90 FF 00][1A FF 01 00] isn't numb.[80 FF _L5440_]
^L5439^[89 FF][87 FF]@[90 FF 00][1A FF 01 00] isn't possessed.[80 FF _L5440_]
^L5440^[87 FF][96 FF 02][81 FF _L5441_][01 FF] Who needs to be healed?[80 FF _L5442_]
^L5440^[87 FF][96 FF 02][81 FF _L5441_][01 FF] Who needs to be healed?[02 FF][80 FF _L5442_]
^L5441^[1D FF][86 FF _L5428_][00 FF]
^L5443^@Do you need some help?[00 FF]
^L5445^[9A FF 00 00][00 FF]
Expand Down

0 comments on commit 87987ab

Please sign in to comment.