From 83da3648c82bffae6587fd872eb381a58d4f7265 Mon Sep 17 00:00:00 2001
From: Lorenzo Carletti <lollo.lollo.rbiz@gmail.com>
Date: Sat, 2 Oct 2021 16:12:55 +0200
Subject: [PATCH] Properly load the letters in the quick title

---
 src/data/m2-title-quick-text-coords-x.bin | Bin 0 -> 36 bytes
 src/data/m2-title-quick-text-coords-y.bin | Bin 0 -> 36 bytes
 src/m2-hack.asm                           |  26 ++++++++++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 src/data/m2-title-quick-text-coords-x.bin
 create mode 100644 src/data/m2-title-quick-text-coords-y.bin

diff --git a/src/data/m2-title-quick-text-coords-x.bin b/src/data/m2-title-quick-text-coords-x.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a7b612a7e3d4d3556c024ba7cdb14d39706db384
GIT binary patch
literal 36
fcmd;MU|>)JVhbSl0^%4T?g8QjK)e-*PXRFiGpqx;

literal 0
HcmV?d00001

diff --git a/src/data/m2-title-quick-text-coords-y.bin b/src/data/m2-title-quick-text-coords-y.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d441ddc8dc18a12d67ef31eff51da0af8bcf3039
GIT binary patch
literal 36
Ncmb1TU|^6XfB_VU0R{j7

literal 0
HcmV?d00001

diff --git a/src/m2-hack.asm b/src/m2-hack.asm
index bee9805..8e657ff 100644
--- a/src/m2-hack.asm
+++ b/src/m2-hack.asm
@@ -1969,10 +1969,24 @@ nop
     .org 0x82D6BE8 :: dw title_initializer + 1
 
 // Setup hacks:
+
     // Remove the M2's shines
-    
     .org 0x8011D9C :: nop :: mov r0,#1
     .org 0x8011DD2 :: nop :: mov r0,#1
+    
+    // Change the amount of loaded letters
+    .org 0x8011C86 :: cmp r6,#8
+    .org 0x8011E14 :: mov r6,#8
+    
+    // Change how the letters coords are loaded
+    .org 0x8011C04 :: add sp,#-0x48
+    .org 0x8011E2E :: add sp,#0x48
+    .org 0x8011C12 :: ldmia [r0]!,r2-r4 :: stmia [r1]!,r2-r4
+    .org 0x8011C16 :: add r4,sp,#0x24
+    .org 0x8011C26 :: ldmia [r0]!,r2-r4 :: stmia [r1]!,r2-r4
+    
+    // Change the location of the coords
+    .org 0x8011C8C :: dw m2_title_quick_text_coords_y :: dw m2_title_quick_text_coords_x
 
 .org 0x801170C :: dw m2_title_text_constants
 .org 0x8011710 :: dw m2_title_text_constants + 12
@@ -2259,6 +2273,14 @@ m2_title_quick_background_pal:
 m2_title_quick_foreground_pal:
 .incbin "data/m2-title-quick-foreground-pal.c.bin"
 
+.align 4
+m2_title_quick_text_coords_x:
+.incbin "data/m2-title-quick-text-coords-x.bin"
+
+.align 4
+m2_title_quick_text_coords_y:
+.incbin "data/m2-title-quick-text-coords-y.bin"
+
 .align 4
 m2_title_background_pal_copyright:
 dw 0x100 :: .incbin "data/m2-title-background-pal-copyright.c.bin"
@@ -2339,7 +2361,7 @@ disclaimer_map:
 .definelabel m2_insert_default_name ,0x8005708
 .definelabel m2_malloc              ,0x8005B9C
 .definelabel m2_get_hall_address    ,0x800D7BC
-.definelabel m2_title_quick         ,0x8011BFC
+.definelabel m2_title_quick_setup   ,0x8011BFC
 .definelabel m12_dim_palette        ,0x80137DC
 .definelabel m2_enable_script       ,0x80A1F6C
 .definelabel m2_sub_a334c           ,0x80A334C