Fix one-person case not printing offense/defense numbers

This commit is contained in:
Lorenzooone 2019-09-17 01:02:12 +02:00
parent ffe72262e9
commit abe261a51f
2 changed files with 45 additions and 1 deletions

View File

@ -180,10 +180,11 @@ mov r3,6
.org 0x80B8138 :: bl initWindow_buffer
.org 0x80B813E :: bl print_window_with_buffer
.org 0x80B814A :: bl equipPrint
.org 0x80B8152 :: bl innerEquipInput
.org 0x80B81A2 :: bl initWindow_buffer
.org 0x80B81A8 :: bl print_window_with_buffer
.org 0x80B81BC :: bl equipPrint
.org 0x80B81CC :: bl store_pixels_overworld
.org 0x80B81CC :: bl print_equip_base_numbers
.org 0x80BAF96 :: bl initWindow_buffer //Go to inner window from outer window
.org 0x80BAF9C :: bl baf9c_print_window_store_buffer
.org 0x80BAFE6 :: mov r2,#0x37 :: mov r3,#3 :: bl printNumberEquip //Offense Number

View File

@ -225,6 +225,49 @@ pop {r7,pc}
.pool
//==============================================================================
//Print numbers in the numbers window at the beginning - Used in order to make sure the one-person version prints the numbers
print_equip_base_numbers:
push {lr}
add sp,#-4
bl 0x80BC034
lsl r0,r0,#0x18
lsr r0,r0,#0x18
mov r1,r8
mov r2,#3
bl m2_formatnumber
mov r5,#0
mov r0,r10
strb r5,[r0,#0x15]
mov r0,#0xFF
mov r1,r10
strb r0,[r1,#0x16]
ldr r0,[r4,#0x14]
str r5,[sp]
mov r1,r8
mov r2,#0x37
mov r3,#3
bl printnumberequip //Prints Offense number
bl 0x80BC0CC
lsl r0,r0,#0x18
lsr r0,r0,#0x18
mov r1,r8
mov r2,#3
bl m2_formatnumber
mov r0,r10
strb r5,[r0,#0x15]
mov r0,#0xFF
mov r1,r10
strb r0,[r1,#0x16]
ldr r0,[r4,#0x14]
str r5,[sp]
mov r1,r8
mov r2,#0x37
mov r3,#0x13
bl printnumberequip //Prints Defense number
bl store_pixels_overworld
add sp,#4
pop {pc}
//==============================================================================
// Clears the equipment portion of the equip window
// r0 = window pointer