Fix issues

src/c/luminehall.c

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

src/c/luminehall.h

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

src/data/lumine-table.tbl

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

src/data/lumine-text.asm

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

src/m2-hack.asm

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