From 7ca056d692f45910727a77107ec460b46951ac18 Mon Sep 17 00:00:00 2001
From: Lorenzo Carletti <lollo.lollo.rbiz@gmail.com>
Date: Fri, 8 Oct 2021 14:54:05 +0200
Subject: [PATCH] Fixes flickering when "Not Enough PP!" appears in the
 overworld

Also makes it so the game doesn't constantly print the PSI window if the cursor is not in the (0,0) position
---
 src/m2-hack.asm        |  3 +++
 src/m2-vwf-entries.asm | 19 +++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/m2-hack.asm b/src/m2-hack.asm
index 2e95681..2956f3a 100644
--- a/src/m2-hack.asm
+++ b/src/m2-hack.asm
@@ -151,6 +151,9 @@ mov     r3,6
 .org 0x80B8D22 :: bl psiWindow_buffer
 .org 0x80B8E44 :: bl initWindow_buffer
 .org 0x80B8E62 :: bl baec6_psi_window_print_buffer
+.org 0x80B8F3E :: bl initWindow_buffer
+.org 0x80B8F4E :: bl initWindow_buffer
+.org 0x80B8F62 :: bl psiWindow_buffer
 .org 0x80B9222 :: bl initWindow_buffer
 .org 0x80B922E :: bl psiTargetWindow_buffer
 .org 0x80B916E :: bl initWindow_buffer
diff --git a/src/m2-vwf-entries.asm b/src/m2-vwf-entries.asm
index 95ca699..27e2778 100644
--- a/src/m2-vwf-entries.asm
+++ b/src/m2-vwf-entries.asm
@@ -2385,21 +2385,21 @@ pop     {pc}
 //==============================================================================
 //It sets things up to make it so the target window is only printed once
 b8db4_psi_inner_window:
-push    {lr}
-ldrb    r1,[r0,#3]
+push    {r4,lr}
+mov     r4,r0
+ldrb    r1,[r4,#3]
 push    {r1}
-ldrh    r1,[r0,#0x36] //Stores the cursor's Y of the window
+ldrh    r1,[r4,#0x36] //Stores the cursor's Y of the window
 push    {r1}
-ldrh    r1,[r0,#0x34] //Stores the cursor's X of the window
+ldrh    r1,[r4,#0x34] //Stores the cursor's X of the window
 push    {r1}
 bl      PSITargetWindowInput //Input management, target printing and header printing function. Now the function takes the cursor's Y and X as arguments too in the stack
 pop     {r2}
-ldr     r3,[r4,0x24] //Target window
-ldrh    r1,[r3,#0x34] //Stores the cursor's X of the window
+ldrh    r1,[r4,#0x34] //Stores the cursor's X of the window
 cmp     r1,r2
 bne     @@store_buffer_first
 pop     {r2}
-ldrh    r1,[r3,#0x36] //Stores the cursor's Y of the window
+ldrh    r1,[r4,#0x36] //Stores the cursor's Y of the window
 cmp     r1,r2
 bne     @@store_buffer_second
 pop     {r2}
@@ -2423,11 +2423,10 @@ cmp     r0,#0
 beq     @@ending
 
 mov     r2,#0 //Sets vwf_skip to false since the window is changed
-ldr     r1,[r4,0x24] //Target window
-strb    r2,[r1,#3]
+strb    r2,[r4,#3]
 
 @@ending:
-pop     {pc}
+pop     {r4,pc}
 
 .pool