From 3c4ad43e71b564c843633aaba8072b43e6a1ce26 Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Sun, 6 Jul 2025 23:25:03 -0700
Subject: [PATCH] add belra arm bug fix

---
 .../BugFixes/BugFixes.3__0.patch.s            | 24 +++++++++++++++++++
 system/client-functions/notes.txt             |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/system/client-functions/BugFixes/BugFixes.3__0.patch.s b/system/client-functions/BugFixes/BugFixes.3__0.patch.s
index cd53b240..11f50e80 100644
--- a/system/client-functions/BugFixes/BugFixes.3__0.patch.s
+++ b/system/client-functions/BugFixes/BugFixes.3__0.patch.s
@@ -562,5 +562,29 @@ start:
   .data     0x00000004
   .data     0x43480000
 
+  # Belra arm bug fix (this part by fuzziqersoftware)
+  .data     <VERS 0x800959B0 0x800959B0 0x80095724>
+  .data     0x00000004
+  .address  <VERS 0x800959B0 0x800959B0 0x80095724>
+  bl        belra_bugfix_hook1
+  .data     <VERS 0x800959C0 0x800959C0 0x80095734>
+  .data     0x00000004
+  .address  <VERS 0x800959C0 0x800959C0 0x80095734>
+  bl        belra_bugfix_hook2
+
+  .data     0x8000B06C
+  .deltaof  belra_bugfix_hook1, belra_bugfix_end
+  .address  0x8000B06C
+belra_bugfix_hook1:
+  li        r0, 1
+  stw       [r13 - <VERS 0x2E30 0x2E30 0x2E48>], r0  # Anchor: 80039388 @ 3OE1
+  b         [<VERS 803D4410 803D4468 803D3140>]
+belra_bugfix_hook2:
+  li        r4, 0
+  stw       [r13 - <VERS 0x2E30 0x2E30 0x2E48>], r4
+  lwz       r4, [r28 + 0x04]
+  blr
+belra_bugfix_end:
+
   .data     0x00000000
   .data     0x00000000
diff --git a/system/client-functions/notes.txt b/system/client-functions/notes.txt
index 0aaf344f..6c8a0a9b 100644
--- a/system/client-functions/notes.txt
+++ b/system/client-functions/notes.txt
@@ -2,6 +2,8 @@ Used regions in PSO GC:
 80004000-80004194 (0194) ExtendedItemInfo (AR code uses 80005000 due to conflict with q8853x)
 800041A0-800041B8 (0018) UnsellableRares
 800041C0-???????? (TODO) EnemyDamageSync
+
+8000B06C-8000B088 (001C) BugFixes
 8000B088-8000B0E0 (0058) BugFixes
 8000B0E0-8000B254 (0174) q8853x send_function_call handler
 8000B5C8-8000B5DC (0014) BugFixes