Next Thing

Graphics/Rhythm_Games/Marching_Orders/Marcher1.asm

@@ -7,16 +7,16 @@
 .import Graphics/Rhythm_Games/Marching_Orders/8B0800_assembly0.bin
 .org 0x088B0808
 .import Graphics/Rhythm_Games/Marching_Orders/8B0808_assembly1.bin
-.org 0x088B081C
+.org 0x088B09C4
-.import Graphics/Rhythm_Games/Marching_Orders/8B081C_assembly2.bin
+.dw X8B081C_assembly2
-.org 0x088B083C
+.org 0x088B09CC
-.import Graphics/Rhythm_Games/Marching_Orders/8B083C_assembly3.bin
+.dw X8B083C_assembly3
-.org 0x088B0874
+.org 0x088B09D4
-.import Graphics/Rhythm_Games/Marching_Orders/8B0874_assembly4.bin
+.dw X8B0874_assembly4
-.org 0x088B08B8
+.org 0x088B09DC
-.import Graphics/Rhythm_Games/Marching_Orders/8B08B8_assembly5.bin
+.dw X8B08B8_assembly5
-.org 0x088B08FC
+.org 0x088B09E4
-.import Graphics/Rhythm_Games/Marching_Orders/8B08FC_assembly6.bin
+.dw X8B08FC_assembly6
-.org 0x088B094C
+.org 0x088B09EC
-.import Graphics/Rhythm_Games/Marching_Orders/8B094C_assembly7.bin
+.dw X8B094C_assembly7
 ;eof

compile.asm

@@ -3,7 +3,7 @@
 
 _skipwarningscreen equ 0
 _skiprhythmtest equ 0
-_debug equ 
+_debug equ 0
 _debugmenu equ 0
 _nocashmessages equ 1
 _luaconsolemessages equ 1

mysym.sym

@@ -568,12 +568,12 @@
 08C6C658 .dbl:0004
 088B0800 .byt:0008
 088B0808 .byt:000E
-088B081C .byt:001A
+088B09C4 .dbl:0004
-088B083C .byt:0026
+088B09CC .dbl:0004
-088B0874 .byt:0032
+088B09D4 .dbl:0004
-088B08B8 .byt:003E
+088B09DC .dbl:0004
-088B08FC .byt:0050
+088B09E4 .dbl:0004
-088B094C .byt:005C
+088B09EC .dbl:0004
 08CCCA5C .dbl:0004
 08CCCA60 .dbl:0004
 08CCCA64 .dbl:0004
@@ -1045,32 +1045,12 @@
 080B4DD8 @@notlz77compressed
 080B4DDC @@exitcompressioncheck
 080B4DDE lz77compressedchecker
-080B4DF8 .byt:0004
+080B4DEE @@lz77compressed
-080B4DFC .asc:000C
+080B4DF0 .pool
-080B4E08 @@debug_msg_00000000
+080B4DF0 .dbl:0000
-080B4E08 @@notcompressed
+080B4DF0 spriteluaconsolemessagehook
-080B4E28 @@addentry
+080B4E04 @@addentry
-080B4E36 @@notcompressed2
+080B4E0E @@skipadding
-080B4E46 @@lz77compressed
+080B4E18 .pool
-080B4E48 .pool
+080B4E18 .dbl:0004
-080B4E48 .dbl:0004
-080B4E4C spriteluaconsolemessagehook
-080B4E60 @@addentry
-080B4E6A @@skipadding
-080B4E74 .pool
-080B4E74 .dbl:0004
-080B4E78 debug_unlockallstages
-080B4E84 @@fillstart
-080B4E8C .pool
-080B4E8C .dbl:0004
-080B4E90 debug_unlockallmail
-080B4E9E @@fillstart
-080B4EA8 .pool
-080B4EA8 .dbl:0008
-080B4EB0 debug_99medals
-080B4EC0 .pool
-080B4EC0 .dbl:0008
-080B4EC8 debug_unlockallstages_hook
-080B4ED4 debug_unlockallmail_hook
-080B4EE0 debug_99medals_hook
 

script_fix.txt

@@ -4978,7 +4978,7 @@ I can't sell this![;
 // --- Literal
 //Marcher[;
 // --- Edited
-Marcher[;
+Marching Orders[;
 #WRITE(RtPtr, $9CE60C)
 // 0x805360c
 //行進をするのだ。[l
@@ -4995,10 +4995,10 @@ Marcher[;
 //One man's mistake[l
 //will hurt the whole[l
 //team. Do your best.[;
-Time to march! ...But[l
+Following orders as a[l
-I wish the commander[l
+unit builds a sense[l
-wouldn't speak in[l
+of camaraderie.[l
-Japanese.[;
+Also, rhythm.[;
 #WRITE(RtPtr, $A11C38)
 // 0x805c8c4
 //れんしゅうを　はじめる！[;