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

Fix issues

This commit is contained in:
Lorenzo Carletti 2020-08-20 03:20:33 +02:00
parent 723a2925ad
commit fd444588ce
5 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/c/luminehall.c
View File

@ -20,7 +20,7 @@ void writeLumineHallText()
} }
//It then gets the length in arrangements. It also makes sure it's a number divisible by 8. //It then gets the length in arrangements. It also makes sure it's a number divisible by 8.
//This avoids having empty tiles showing //This avoids having empty tiles showing
length = (length & 8 == 0 ? length : (length + (8 - (length & 7)))) >> 1; length = (length & 7 == 0 ? length : (length + (8 - (length & 7)))) >> 1;
(*hallLineSize) = length; (*hallLineSize) = length;
lumineText_curr_ptr = luminetext; lumineText_curr_ptr = luminetext;
unsigned short *hallAddress = m2_get_hall_address(); unsigned short *hallAddress = m2_get_hall_address();
@ -53,10 +53,6 @@ void readLumineCharacter(byte chr, int *Tiles, unsigned short *hallAddress, int
{ {
case END: case END:
return; return;
case ENDL:
printEmptyLumineTile(Tiles, hallAddress, length, *currPos, *currLen);
(*currPos)++;
return;
case BLANK: case BLANK:
printEmptyLumineTile(Tiles, hallAddress, length, *currPos, *currLen); printEmptyLumineTile(Tiles, hallAddress, length, *currPos, *currLen);
for(int i = 1; i < 8; i++) for(int i = 1; i < 8; i++)
@ -273,8 +269,6 @@ int getCharWidth(byte chr)
{ {
case END: case END:
return 0; return 0;
case ENDL:
return ENDL_SIZE;
case BLANK: case BLANK:
return BLANK_SIZE; return BLANK_SIZE;
case PC_START: case PC_START:

6
src/c/luminehall.h
View File

@ -7,11 +7,9 @@
#define START_Y 2 #define START_Y 2
#define END 0xFF #define END 0xFF
#define ENDL 0xFE #define BLANK 0xFE
#define ENDL_SIZE 0x8
#define BLANK 0xFD
#define BLANK_SIZE 0x40 #define BLANK_SIZE 0x40
#define PC_START 0xF9 #define PC_START 0xFA
#define PC_NAME_SIZE 5 #define PC_NAME_SIZE 5
void writeLumineHallText(); void writeLumineHallText();

14
src/data/lumine-table.tbl
View File

@ -10,9 +10,7 @@
4C=\x4C 4C=\x4C
56=\x56 56=\x56
FF=\end FE=\blank
FE=\n
FD=\blank
00= 00=
01=! 01=!
02=" 02="
@ -110,8 +108,8 @@ FD=\blank
5E=~ 5E=~
5F=[AF] 5F=[AF]
F9=\cness FA=\cness
FA=\cpaula FB=\cpaula
FB=\cjeff FC=\cjeff
FC=\cpoo FD=\cpoo
/00 /FF

10
src/data/lumine-text.asm
View File

@ -1,8 +1,8 @@
.loadtable "data/lumine-table.tbl" .loadtable "data/lumine-table.tbl"
.strn "\blank" .strn "\blank"
.strn "I'm \cness....\nIt's been a long road getting here...\n" .strn "I'm \cness.... It's been a long road getting here... "
.strn "Soon, I'll be...\nSoon, I'll be...\nSoon, I'll be...\n" .strn "Soon, I'll be... Soon, I'll be... Soon, I'll be... "
.strn "What will happen to us?\nW...what's happening?\n" .strn "What will happen to us? W...what's happening? "
.strn "My thoughts are being written out on the wall...\nor are they?" .strn "My thoughts are being written out on the wall... or are they?"
.str "\blank\end" .str "\blank"

1
src/m2-hack.asm
View File

@ -1818,6 +1818,7 @@ m2_nybbles_to_bits:
m2_enemy_attributes: m2_enemy_attributes:
.incbin "data/m2-enemy-attributes.bin" .incbin "data/m2-enemy-attributes.bin"
.align 2
luminesquaretable: luminesquaretable:
.incbin "data/luminesquaretable.bin" .incbin "data/luminesquaretable.bin"