Changed Layout, but better layout.

Feedback?

Compile/ASM/asm.asm

@@ -1,5 +1,5 @@
-.include lz77hack.asm
-.include debug.asm
+.include Compile/ASM/lz77hack.asm
+.include Compile/ASM/debug.asm
 .if _skipwarningscreen==1
 .org 0x08000454
 .dw 0x089DD47C

Compile/ASM/asm_relocate.asm

@@ -84,8 +84,8 @@ push r14
 bl EndlessGamesPlural
 bl 0x0801d388
 pop r15
-.include lz77hack_relocate.asm
-.include debug_relocate.asm
+.include Compile/ASM/lz77hack_relocate.asm
+.include Compile/ASM/debug_relocate.asm
 .endarea
 
 ;eof

Compile/ASM/compile.asm

@@ -0,0 +1,76 @@
+.gba
+.open "ROM/rh-atlus.gba","ROM/rh-eng.gba", 0x08000000
+
+_skipwarningscreen equ 0
+_skiprhythmtest equ 0
+_debug equ 0
+_debugmenu equ 1
+_nocashmessages equ 1
+_luaconsolemessages equ 1
+_spriteluaconsolemessages equ 1
+
+.include Compile/ASM/relocate.asm
+
+.include EN_SourceCode/Graphics/TitleScreen/TitleScreen.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Karate_Man/KarateMan1.asm
+.include EN_SourceCode/Graphics/Mainmenu/mainmenu.asm
+.include EN_SourceCode/Graphics/Tutorial/tutorial.asm
+.include EN_SourceCode/Graphics/EmailSelectScreen/email.asm
+.include EN_SourceCode/Graphics/MusicSelect/musictest.asm
+.include EN_SourceCode/Graphics/Drums/drums.asm
+.include EN_SourceCode/Graphics/Options/options.asm
+.include EN_SourceCode/Graphics/ToysMenu/toymenu.asm
+.include EN_SourceCode/Graphics/EndlessMenu/endless.asm
+.include EN_SourceCode/Graphics/Drums/drums.asm
+.include EN_SourceCode/Graphics/RhythemGameSelect/gameselect.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Results_Screen/Results.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Spaceball/spaceball1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Rhythm_Tweezers/Veggie1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Marching_Orders/Marcher1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/MiscGraphics/miscgraphics.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/The_Clappy_Trio/clappy1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_1/mix1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Sneaky_Spirits/spirit1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Samurai_Slice/samurai.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Cheese_Heist/cheese.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Sick_Beats/SickBeats.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/TheBon_Odori/odori1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_2/mix2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Death_Waltz/wizard.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Showtime/showtime.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Bunny_Hop/bunny.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Tram_Pauline/tram.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Space_Dance/space1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_3/remix3.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Quiz_Show/quiz.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Night_Walk/night1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Power_Calligraphy/calig.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Polyrhythm/built1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Rap_Men/rapmen.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_4/remix4.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Bouncy_Road/hop1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Ninja_Bodyguard/ninja1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Toss_Boys/toss1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Fireworks/fworks.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Tap_Trial/tap1.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_5/remix5.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/The_Snappy_Trio/clappy2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/TheBon_Dance/bon2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Cosmic_Dance/cosmo2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Rap_Women/rapwom.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Turbo_Tap_Trial/tap2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_6/remix6.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Ninja_Bodyguard_2/ninja2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Marching_Orders_2/march2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_7/remix7.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Toss_Boys_2/toss2.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_8/remix8.asm
+.include EN_SourceCode/Graphics/ToysMenu/Toys/toys.asm
+.include EN_SourceCode/Graphics/EndlessMenu/games/games.asm
+.include EN_SourceCode/Graphics/Warning_Screen/warningscreen.asm
+
+.include Compile/ASM/asm_relocate.asm
+.include Compile/ASM/asm.asm
+
+.close
+;eof 

Compile/ASM/relocate.asm

@@ -0,0 +1,58 @@
+.org 0x08D34940
+.include EN_SourceCode/Graphics/TitleScreen/TitleScreen_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Karate_Man/KarateMan1_relocate.asm
+.include EN_SourceCode/Graphics/MainMenu/mainmenu_relocate.asm
+.include EN_SourceCode/Graphics/Tutorial/tutorial_relocate.asm
+.include EN_SourceCode/Graphics/EmailSelectScreen/email_relocate.asm
+.include EN_SourceCode/Graphics/MusicSelect/musictest_relocate.asm
+.include EN_SourceCode/Graphics/ToysMenu/toymenu_relocate.asm
+.include EN_SourceCode/Graphics/Drums/drums_relocate.asm
+.include EN_SourceCode/Graphics/Options/options_relocate.asm
+.include EN_SourceCode/Graphics/EndlessMenu/endless_relocate.asm
+.include EN_SourceCode/Graphics/RhythemGameSelect/gameselect_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Results_Screen/Results_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Spaceball/spaceball1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Rhythm_Tweezers/Veggie1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Marching_Orders/Marcher1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/The_Clappy_Trio/clappy1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_1/mix1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/MiscGraphics/miscgraphics_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Sneaky_Spirits/spirit1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Samurai_Slice/samurai_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Cheese_Heist/cheese_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Sick_Beats/SickBeats_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/TheBon_Odori/odori1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_2/mix2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Death_Waltz/wizard_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Showtime/showtime_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Bunny_Hop/bunny_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Tram_Pauline/tram_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Space_Dance/space1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_3/remix3_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Quiz_Show/quiz_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Night_Walk/night1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Power_Calligraphy/calig_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Polyrhythm/built1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Rap_Men/rapmen_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_4/remix4_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Bouncy_Road/hop1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Ninja_Bodyguard/ninja1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Toss_Boys/toss1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Fireworks/fworks_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Tap_Trial/tap1_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_5/remix5_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/The_Snappy_Trio/clappy2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/TheBon_Dance/bon2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Cosmic_Dance/cosmo2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Rap_Women/rapwom_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Turbo_Tap_Trial/tap2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_6/remix6_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Ninja_Bodyguard_2/ninja2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Marching_Orders_2/march2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_7/remix7_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Toss_Boys_2/toss2_relocate.asm
+.include EN_SourceCode/Graphics/Rhythm_Games/Remix_8/remix8_relocate.asm
+.include EN_SourceCode/Graphics/ToysMenu/Toys/toys_relocate.asm
+.include EN_SourceCode/Graphics/EndlessMenu/games/games_relocate.asm
+.include EN_SourceCode/Graphics/Warning_Screen/warningscreen_relocate.asm
+;eof

EN_SourceCode/Graphics/Drums/drums.asm

@@ -12,16 +12,16 @@
 .dh cc6ccc_drums_menu1_rleend-cc6ccc_drums_menu1_rle
 //Yes
 .org 0x088C53FC
-.import Graphics/Drums/8C53FC_assembly0.bin
+.import EN_SourceCode/Graphics/Drums/8C53FC_assembly0.bin
 .org 0x088C5422
-.import Graphics/Drums/8C5422_assembly1.bin
+.import EN_SourceCode/Graphics/Drums/8C5422_assembly1.bin
 .org 0x088C5448
-.import Graphics/Drums/8C5448_assembly2.bin
+.import EN_SourceCode/Graphics/Drums/8C5448_assembly2.bin
 //No
 .org 0x088C546E
-.import Graphics/Drums/8C546E_assembly0.bin
+.import EN_SourceCode/Graphics/Drums/8C546E_assembly0.bin
 .org 0x088C5494
-.import Graphics/Drums/8C5494_assembly1.bin
+.import EN_SourceCode/Graphics/Drums/8C5494_assembly1.bin
 .org 0x088C54BA
-.import Graphics/Drums/8C54BA_assembly2.bin
+.import EN_SourceCode/Graphics/Drums/8C54BA_assembly2.bin
 ;eof

EN_SourceCode/Graphics/Drums/drums_relocate.asm

@@ -0,0 +1,18 @@
+.align 4
+cc6914_drums_menu1:
+.import EN_SourceCode/Graphics/Drums/cc6914_drums_menu1.cdat
+.align 4
+c4efe4_drums_game4:
+.import EN_SourceCode/Graphics/Drums/c4efe4_drums_game4.cdat
+.align 4
+c4fc44_drums_game1:
+.import EN_SourceCode/Graphics/Drums/c4fc44_drums_game1.cdat
+.align 4
+cc6ccc_drums_menu1_dat:
+.import EN_SourceCode/Graphics/Drums/cc6ccc_drums_map.dat
+.align 4
+cc6ccc_drums_menu1_rle:
+.import EN_SourceCode/Graphics/Drums/cc6ccc_drums_map.rle
+.align 4
+cc6ccc_drums_menu1_rleend:
+;eof

EN_SourceCode/Graphics/EmailSelectScreen/email_relocate.asm

@@ -0,0 +1,4 @@
+.align 4
+CC77A4_email_select_tiles:
+.import EN_SourceCode/Graphics/EmailSelectScreen/CC77A4_email_select_tiles.cdat
+;eof

EN_SourceCode/Graphics/EndlessMenu/endless.asm

@@ -13,11 +13,11 @@
 .dw X90041C_assembly0
 //Dr Bacteria
 .org 0x089003FC
-.import Graphics/EndlessMenu/9003FC_assembly0.bin
+.import EN_SourceCode/Graphics/EndlessMenu/9003FC_assembly0.bin
 //Head Spinner
 .org 0x089003DC
-.import Graphics/EndlessMenu/9003DC_assembly0.bin
+.import EN_SourceCode/Graphics/EndlessMenu/9003DC_assembly0.bin
 //Quiz
 .org 0x08900424
-.import Graphics/EndlessMenu/900424_assembly0.bin
+.import EN_SourceCode/Graphics/EndlessMenu/900424_assembly0.bin
 ;eof

EN_SourceCode/Graphics/EndlessMenu/endless_relocate.asm

@@ -0,0 +1,18 @@
+.align 4
+cc3b7c_endless_tile2:
+.import EN_SourceCode/Graphics/EndlessMenu/cc3b7c_endless_tile2.cdat
+.align 4
+cc4670_endless_tile1:
+.import EN_SourceCode/Graphics/EndlessMenu/cc4670_endless_tile1.cdat
+.align 4
+cc4a00_endless_tilemap_data:
+.import EN_SourceCode/Graphics/EndlessMenu/cc4a00_endless_tilemap.dat
+.align 4
+cc4a00_endless_tilemap_rle:
+.import EN_SourceCode/Graphics/EndlessMenu/cc4a00_endless_tilemap.rle
+cc4a00_endless_tilemap_rle_end:
+//Mr Upbeat
+.align 2
+X90041C_assembly0:
+.import EN_SourceCode/Graphics/EndlessMenu/90041C_assembly0.bin
+;eof

EN_SourceCode/Graphics/EndlessMenu/games/games_relocate.asm

@@ -0,0 +1,7 @@
+.align 4
+c702d0_upbeat_tile1:
+.import EN_SourceCode/Graphics/EndlessMenu/games/c702d0_upbeat_tile1.cdat
+.align 4
+c34478_head_tile1:
+.import EN_SourceCode/Graphics/EndlessMenu/games/c34478_head_tile1.cdat
+;eof

EN_SourceCode/Graphics/MainMenu/mainmenu_relocate.asm

@@ -0,0 +1,53 @@
+.align 4
+CCB298_mainmenu_oam_tiles:
+.import EN_SourceCode/Graphics/MainMenu/CCB298_mainmenu_oam_tiles.cdat
+;unselected menu items
+X90a2ce_menu_options_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/90a2ce_menu_options_arrangement.bin
+X90a122_menu_studio_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/90a122_menu_studio_arrangement.bin
+X909CD2_menu_rhythmgames_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909CD2_menu_rhythmgames_arrangement.bin
+X909E2A_menu_rhythmtest_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909E2A_menu_rhythmtest_arrangement.bin
+X909f46_menu_email_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909f46_menu_email_arrangement.bin
+
+;selected menu items
+;Rhythm Games selected
+X909B88_menu_rhythmgames_selected1_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909B88_menu_rhythmgames_selected1_arrangement.bin
+X909BF6_menu_rhythmgames_selected2_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909BF6_menu_rhythmgames_selected2_arrangement.bin
+X909C64_menu_rhythmgames_selected3_arrangement:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909C64_menu_rhythmgames_selected3_arrangement.bin
+;Rhythm Test selected
+X909D04_menu_rhythmtest_selected1:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909D04_menu_rhythmtest_selected1.bin
+X909D66_menu_rhythmtest_selected2:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909D66_menu_rhythmtest_selected2.bin
+X909DC8_menu_rhythmtest_selected3:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909DC8_menu_rhythmtest_selected3.bin
+;Email Selected
+X909E68_menu_email_selected1:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909E68_menu_email_selected1.bin
+X909EB2_menu_email_selected2:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909EB2_menu_email_selected2.bin
+X909EFC_menu_email_selected3:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909EFC_menu_email_selected3.bin
+;Studio Selected
+X909F6C_menu_studio_selected1:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/909F6C_menu_studio_selected1.bin
+X90A016_menu_studio_selected2:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/90A016_menu_studio_selected2.bin
+X90A0A8_menu_studio_selected3:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/90A0A8_menu_studio_selected3.bin
+;Options Selected
+X90A160_menu_options_selected1:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/90A160_menu_options_selected1.bin
+X90A1DA_menu_options_selected2:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/90A1DA_menu_options_selected2.bin
+X90A1DA_menu_options_selected3:
+.import EN_SourceCode/Graphics/MainMenu/Arrangements/90A1DA_menu_options_selected3.bin
+
+;eof