mirrors
/
Mother2GbaTranslation
mirror of https://github.com/jeffman/Mother2GbaTranslation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue with flickering when exiting stored goods' inventory selection in Tracy's room

This commit is contained in:
Lorenzo Carletti 2020-08-15 03:19:45 +02:00
parent 5ae644c9e9
commit 6921f0ce47
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/m2-customcodes.asm
View File

@ -181,7 +181,7 @@ b @@end
//--------------------------------
// 5A FF: Restore the dialogue window
cmp r4,#0x5A
bne @@end
bne @@next7
ldr r0,=#0x3005230
ldr r0,[r0,#8]
mov r1,#0
@ -190,6 +190,18 @@ strh r1,[r0,#0x2C]
strb r1,[r0,#3]
bl m2_drawwindow
mov r3,#2
b @@end
@@next7:
//--------------------------------
// 59 FF: Set stored goods window's data so it prints the header from scratch
cmp r4,#0x59
bne @@end
ldr r0,=#0x3005230
ldr r0,[r0,#0x10]
mov r1,#0xFF //Set pixel_x as 0xFF
strb r1,[r0,#2]
mov r3,#2
//--------------------------------
@@end:

8
src/m2-vwf-entries.asm
View File

@ -1583,7 +1583,15 @@ pop {pc}
//Routine which calls the header clearer and changes the position of Stored Goods in the arrangement
c6570_clean_print_change_pos:
push {lr}
ldrb r0,[r6,#2] //Load pixel_x
cmp r0,#0xFF
bne @@after_header
mov r0,#0
strb r0,[r6,#2]
mov r0,r7
bl _0x10_clean_print
@@after_header:
ldr r2,=#0x230 //Change starting position
mov r0,r2 //Clobbered code
ldrh r3,[r4,#0]

8
working/m12-strings-english.txt
View File

@ -4629,7 +4629,7 @@
^L5172^@This is about the delivery of the[01 FF] <[90 FF A9][1A FF 02 00]>?[03 FF 00 00][04 FF _L5259_][05 FF _L5260_]^L5260^@Oh, that's not what you want?[02 FF][80 FF _L5258_]^L5259^@We'll send someone right away.[02 FF][86 FF _L5178_][08 FF B7 02][CF FF 0A 00][08 FF F2 02][00 FF]
^L5173^@Hello! This is Escargo Express.[02 FF][BC FF 01 00][86 FF _L2177_][81 FF _L5196_]@Oh, is that you, [0D FF]?[01 FF] Big Bro![02 FF]@It's me, Tracy.[02 FF]@I'm working part-time for[01 FF] Escargo Express.[02 FF]^L5196^[00 FF]
^L5174^[1C FF 49 00 _L5197_]@What can I do for you?[00 FF]
^L5176^[BC FF 01 00][F5 FF][82 FF _L5183_][86 FF _L5184_]^L5194^[F1 FF][82 FF _L5866_][87 FF][88 FF][7A FF 00 00][87 FF][5B FF][5A FF]@[90 FF 00][1A FF 02 00]?[01 FF] Do you need anything else?[89 FF][79 FF FF 00 00 00][86 FF _L2485_][04 FF _L5185_][05 FF _L5186_][80 FF _L5186_]
^L5176^[BC FF 01 00][F5 FF][82 FF _L5183_][86 FF _L5184_]^L5194^[59 FF][F1 FF][82 FF _L5866_][87 FF][88 FF][7A FF 00 00][87 FF][5B FF][5A FF]@[90 FF 00][1A FF 02 00]?[01 FF] Do you need anything else?[89 FF][79 FF FF 00 00 00][86 FF _L2485_][04 FF _L5185_][05 FF _L5186_][80 FF _L5186_]
^L5177^[1C FF 49 00 _L5198_][BC FF 01 00][86 FF _L2177_][81 FF _L5199_]@Come again.[02 FF][00 FF]
^L5178^[D4 FF 0B 00]@(Click!)[1D FF][00 FF]
^L5179^[86 FF _L5181_][80 FF _L5182_]
@ -4637,8 +4637,8 @@
^L5181^[1C FF 49 00 _L5201_]@I'm very sorry.[01 FF] Our storage lockers are all full[01 FF] right now.[02 FF][00 FF]
^L5183^[86 FF _L5193_][80 FF _L5182_]
^L5184^[1C FF 49 00 _L5202_]@You would like us to deliver[01 FF] something? We can deliver up[01 FF] to three things.[02 FF]@Please select the goods you[01 FF] want.[02 FF][00 FF]
^L5185^[BC FF 01 00][F5 FF][82 FF _L5187_]@Select an item.[02 FF][F1 FF][82 FF _L5867_][87 FF][88 FF][7A FF 00 00][87 FF][5B FF][5A FF]@[90 FF 00][1A FF 02 00]?[01 FF][89 FF][79 FF FF 00 00 00] Do you need anything else?[86 FF _L2485_][04 FF _L5188_][05 FF _L5186_][80 FF _L5186_]
^L5188^[BC FF 01 00][F5 FF][82 FF _L5187_]@Select an item.[02 FF][F1 FF][82 FF _L5867_][87 FF][88 FF][7A FF 00 00][87 FF][5B FF][5A FF]@[90 FF 00][1A FF 02 00]?[02 FF][89 FF][79 FF FF 00 00 00]^L5186^@Just to confirm, you're[01 FF] expecting delivery of the[02 FF][78 FF 01 00 00 00]@[90 FF 00][1A FF 02 00][78 FF 02 00 00 00][82 FF _L5189_][01 FF] [90 FF 00][1A FF 02 00][78 FF 03 00 00 00][82 FF _L5189_][01 FF] and [90 FF 00][1A FF 02 00].^L5189^[02 FF]@Is that correct?[86 FF _L2485_][04 FF _L5190_][05 FF _L5191_][80 FF _L5191_]^L5867^[5B FF][5A FF][80 FF _L5186_]
^L5185^[BC FF 01 00][F5 FF][82 FF _L5187_]@Select an item.[02 FF][59 FF][F1 FF][82 FF _L5867_][87 FF][88 FF][7A FF 00 00][87 FF][5B FF][5A FF]@[90 FF 00][1A FF 02 00]?[01 FF][89 FF][79 FF FF 00 00 00] Do you need anything else?[86 FF _L2485_][04 FF _L5188_][05 FF _L5186_][80 FF _L5186_]
^L5188^[BC FF 01 00][F5 FF][82 FF _L5187_]@Select an item.[02 FF][59 FF][F1 FF][82 FF _L5867_][87 FF][88 FF][7A FF 00 00][87 FF][5B FF][5A FF]@[90 FF 00][1A FF 02 00]?[02 FF][89 FF][79 FF FF 00 00 00]^L5186^@Just to confirm, you're[01 FF] expecting delivery of the[02 FF][78 FF 01 00 00 00]@[90 FF 00][1A FF 02 00][78 FF 02 00 00 00][82 FF _L5189_][01 FF] [90 FF 00][1A FF 02 00][78 FF 03 00 00 00][82 FF _L5189_][01 FF] and [90 FF 00][1A FF 02 00].^L5189^[02 FF]@Is that correct?[86 FF _L2485_][04 FF _L5190_][05 FF _L5191_][80 FF _L5191_]^L5867^[5B FF][5A FF][80 FF _L5186_]
^L5187^[8D FF 01 00][87 FF]@We're not storing any of[01 FF] [90 FF 00][1A FF 01 00]'s stuff right now.[02 FF][80 FF _L5186_]
^L5190^[86 FF _L5192_][08 FF B5 00][CF FF 02 00][86 FF _L5178_][08 FF F2 02][00 FF]
^L5191^[86 FF _L4002_]@Well, please start over again.[02 FF][80 FF _L5194_]
@ -4676,7 +4676,7 @@
^L5238^@I don't think you can carry[01 FF] everything.[02 FF][78 FF 01 00 01 00]@Well, I'll leave just[01 FF] the [90 FF 00][1A FF 02 00].[02 FF][86 FF _L5240_][78 FF 02 00 01 00][77 FF 00 00][78 FF 03 00 01 00][82 FF _L5241_][77 FF 00 00]^L5241^[00 FF]
^L5239^@I don't think you can carry[01 FF] everything.[02 FF][78 FF 01 00 01 00]@Well, I'll leave just[01 FF] the [90 FF 00][1A FF 02 00][01 FF] and[78 FF 02 00 01 00] the [90 FF 00][1A FF 02 00].[02 FF][86 FF _L5240_][78 FF 03 00 01 00][77 FF 00 00][00 FF]
^L5240^[83 FF 49 00][BD FF 01 _L5223_][9C FF][D4 FF 76 00]@OK, here we are.[01 FF] Thank you![1D FF][C6 FF][86 FF _L4023_][86 FF _L4910_][00 FF]
^L5244^[BC FF 01 00][F5 FF][82 FF _L5251_][91 FF FF][82 FF _L5252_]@What would you like[01 FF] returned?[02 FF][69 FF]^L5254^[F1 FF][82 FF _L5865_][87 FF][88 FF][86 FF _L5048_][82 FF _L5253_][8A FF][8B FF][D4 FF 74 00][F2 FF 00 00 00 00][AB FF 00 00]@The [90 FF 00][1A FF 02 00]?[01 FF] Take good care of it.[02 FF]@Is there anything else you want[01 FF] returned?[03 FF 00 00][04 FF _L5244_][05 FF _L5248_][80 FF _L5248_]^L5253^[87 FF][69 FF][80 FF _L5254_]
^L5244^[BC FF 01 00][F5 FF][82 FF _L5251_][91 FF FF][82 FF _L5252_]@What would you like[01 FF] returned?[02 FF][69 FF][59 FF]^L5254^[F1 FF][82 FF _L5865_][87 FF][88 FF][86 FF _L5048_][82 FF _L5253_][8A FF][8B FF][D4 FF 74 00][F2 FF 00 00 00 00][AB FF 00 00]@The [90 FF 00][1A FF 02 00]?[01 FF] Take good care of it.[02 FF]@Is there anything else you want[01 FF] returned?[03 FF 00 00][04 FF _L5244_][05 FF _L5248_][80 FF _L5248_]^L5253^[87 FF][69 FF][80 FF _L5254_]
^L5246^@I don't think you have anything[01 FF] to store.[02 FF][80 FF _L5248_]
^L5865^[5B FF][5A FF]^L5248^@Do you need anything else from[01 FF] me?[80 FF _L5255_]
^L5249^[5A FF]@I think you should hang on to[01 FF] that.[02 FF][80 FF _L5250_]