From 501dca758615e522eeb9d1048367aaf96cf334f0 Mon Sep 17 00:00:00 2001
From: jeffman <jefferbrecht@gmail.com>
Date: Sun, 29 Sep 2019 15:20:19 -0400
Subject: [PATCH] Complete changes for nine sprites

---
 src/c/title.c                        |   2 +-
 src/c/title.h                        |  10 +++----
 src/data/m2-title-text-constants.bin | Bin 140 -> 156 bytes
 src/m2-hack.asm                      |  39 ++++++++++++++++++++++++---
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/c/title.c b/src/c/title.c
index 458c4bf..d4058e2 100644
--- a/src/c/title.c
+++ b/src/c/title.c
@@ -17,7 +17,7 @@ void title_text_sequence(
         return;
     }
 
-    for (int i = 0; i < 8; i++)
+    for (int i = 0; i < 9; i++)
     {
         int x_start = coords->x_start[i];
         int x_end = coords->x_end[i];
diff --git a/src/c/title.h b/src/c/title.h
index e54ecef..fc87f3c 100644
--- a/src/c/title.h
+++ b/src/c/title.h
@@ -5,10 +5,10 @@
 
 typedef struct TITLE_COORD_TABLE {
     int unknown_a[3];
-    int y_end[8];
-    int y_start[8];
-    int x_end[8];
-    int x_start[8];
+    int y_end[9];
+    int y_start[9];
+    int x_end[9];
+    int x_start[9];
 } TITLE_COORD_TABLE;
 
 typedef struct TITLE_SPRITE {
@@ -26,7 +26,7 @@ typedef struct TITLE_EXTENDED {
     unsigned short *pal_buffer[5];
     byte unknown_a[0x70];
     int sequence;
-    TITLE_SPRITE sprites[8];
+    TITLE_SPRITE sprites[9];
     int unknown[0x16];
 } TITLE_EXTENDED;
 
diff --git a/src/data/m2-title-text-constants.bin b/src/data/m2-title-text-constants.bin
index 01c927ab37579e4b6873f321a25833c8728fb907..db2000eb8c788b08f409d20d9942c3d8cf181344 100644
GIT binary patch
delta 22
dcmeBSoWnT5XQBefL>~plQxh|lSyY)B7ywUQ1<?Qi

delta 12
TcmbQk*uyx%XJUxL#0muf8_5JU

diff --git a/src/m2-hack.asm b/src/m2-hack.asm
index 66799e1..6d78502 100644
--- a/src/m2-hack.asm
+++ b/src/m2-hack.asm
@@ -1599,11 +1599,42 @@ nop
     .org 0x80116F0 :: bl title_setup_clamp
 
     // Show all eight text sprites from the start
-    .org 0x8011B94 :: mov r6,7
+    .org 0x8011B94 :: mov r6,8
     .org 0x8011BAC :: b 0x8011BDC
 
     // Allocate space for nine sprites
     .org 0x80113F8 :: mov r0,0xC8
+    .org 0x80115B2 :: add sp,-0xA4
+    .org 0x8011BE6 :: add sp,0xA4
+
+    .org 0x80115CC
+    ldmia   [r0]!,r2,r4,r7
+    stmia   [r1]!,r2,r4,r7
+    add     r6,sp,0x30
+
+    .org 0x80115DE
+    ldmia   [r0]!,r2,r4,r7
+    stmia   [r1]!,r2,r4,r7
+    add     r5,sp,0x54
+
+    .org 0x80115F0
+    ldmia   [r0]!,r2,r4,r7
+    stmia   [r1]!,r2,r4,r7
+    add     r4,sp,0x78
+
+    .org 0x8011602
+    ldmia   [r0]!,r2,r3,r7
+    stmia   [r1]!,r2,r3,r7
+
+    .org 0x8011646 :: ldr r1,[sp,0x5C]
+    .org 0x801166A :: add r1,0x60 :: str r1,[sp,0x9C]
+    .org 0x8011670 :: add r2,0x84 :: str r2,[sp,0xA0]
+    .org 0x8011686 :: ldr r0,[sp,0xA0]
+    .org 0x801168A :: str r0,[sp,0xA0] :: ldr r2,[sp,0x9C]
+    .org 0x8011690 :: str r2,[sp,0x9C]
+    .org 0x80116CC :: add r7,sp,0x30
+    .org 0x80116D0 :: add r7,sp,0x78
+    .org 0x8011704 :: cmp r6,8
 
     // Relocate stuff from after the sprite data
     .org 0x8011634 :: mov r1,0xB2
@@ -1627,9 +1658,9 @@ nop
 
 .org 0x801170C :: dw m2_title_text_constants
 .org 0x8011710 :: dw m2_title_text_constants + 12
-.org 0x8011714 :: dw m2_title_text_constants + 12 + 32
-.org 0x8011718 :: dw m2_title_text_constants + 12 + 32 + 32
-.org 0x801171C :: dw m2_title_text_constants + 12 + 32 + 32 + 32
+.org 0x8011714 :: dw m2_title_text_constants + 12 + 36
+.org 0x8011718 :: dw m2_title_text_constants + 12 + 36 + 36
+.org 0x801171C :: dw m2_title_text_constants + 12 + 36 + 36 + 36
 .org 0x870F580 :: .incbin "data/m2-title-background.bin"
 .org 0x8711280 :: .incbin "data/m2-title-text.bin"
 .org 0x87126CC :: .incbin "data/m2-title-background-pal-empty.bin"