mirrors
/
Mother2GbaTranslation
mirror of https://github.com/jeffman/Mother2GbaTranslation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Complete changes for nine sprites

This commit is contained in:
jeffman 2019-09-29 15:20:19 -04:00
parent cc9d70cead
commit 501dca7586
4 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/c/title.c
View File

@ -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];

10
src/c/title.h
View File

@ -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;

BIN
src/data/m2-title-text-constants.bin
View File

Binary file not shown.

39
src/m2-hack.asm
View File

@ -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"