Cleanup project root

lhsazevedo · Apr 11, 2024 · 3eee054 · 3eee054
1 parent fcfd8c3
commit 3eee054
Show file tree

Hide file tree

Showing 22 changed files with 540 additions and 496 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,4 +47,4 @@ jobs:
           echo "HLNK_LIBRARY3=$(winepath -w $DC_SDK/shc/lib/sh4nlfzn.lib)" >> "$GITHUB_ENV"
 
       - name: Build
-        run: bash build.sh
+        run: bash scripts/build.sh
diff --git a/.github/workflows/build_matching.yml b/.github/workflows/build_matching.yml
@@ -44,4 +44,4 @@ jobs:
           echo "SHC_INC=$(winepath -w $DC_SDK/shc/include),$(winepath -w $DC_SDK/shinobi/include)" >> "$GITHUB_ENV"
 
       - name: Build
-        run: bash build_matching.sh
+        run: bash scripts/build_matching.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,4 +46,4 @@ jobs:
           echo "SHC_INC=$(winepath -w $DC_SDK/shc/include),$(winepath -w $DC_SDK/shinobi/include)" >> "$GITHUB_ENV"
 
       - name: Test
-        run: bash run_tests.sh
+        run: bash scripts/run_tests.sh
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
-/build
+/build/output
 /diskroot
 
 # Ignore game binary
 1ST_READ.BIN
 
-set_kt.sh
-lnk.sub
+scripts/set_kt.sh
+build/lnk.sub
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -0,0 +1,7 @@
+# Development
+
+You can either use the provided Docker container, or setup your environment
+manually.
+
+## Developing with Docker
+
diff --git a/asmsh.sub b/asmsh.sub
diff --git a/lnk_matching.sub → build/lnk_matching.sub b/lnk_matching.sub → build/lnk_matching.sub
@@ -2,7 +2,7 @@ align_section
 udfcheck 
 ; debug 
 elf 
-output build\tbg.elf
+output build\output\tbg.elf
 
 define _ADXT_Init(8C04F7A2)
 define _ADXT_Create(8C04F8C0)
@@ -182,87 +182,87 @@ define _njPrint(8C079DB0)
 define __BSG_END(8C0E7FCC)
 
 ; USER OBJS
-input build\010000.obj
-input build\010080_main.obj
-input build\0100bc_sound.obj
-input build\010e90.obj
-input build\010fe8_unused.obj
-input build\011120_asset_queues.obj
-input build\012324.obj
-input build\012504.obj
-input build\0129cc.obj
-input build\012f44.obj
-input build\_012101_data.obj
-input build\013ae8.obj
-input build\014934.obj
-input build\0149b0_sbinit.obj
-input build\014a9c_tasks.obj
-input build\014b8c_backup.obj
-input build\014f54.obj
-input build\015ab8_title.obj
-input build\016108.obj
-input build\01614c.obj
-input build\016bf4.obj
-input build\016c58.obj
-input build\016d2c.obj
-input build\018644.obj
-input build\018784.obj
-input build\0193c8.obj
-input build\019e98.obj
-input build\01a148.obj
-input build\01b19c.obj
-input build\01bb48.obj
-input build\01c980.obj
-input build\01d290.obj
-input build\01d7fc.obj
-input build\01e27c.obj
-input build\01f3c0.obj
-input build\01fa78.obj
-input build\020214.obj
-input build\020528.obj
-input build\020594.obj
-input build\0206f0.obj
-input build\0207d4.obj
-input build\02081c.obj
-input build\020914.obj
-input build\020b6c.obj
-input build\02171c.obj
-input build\021b9c.obj
-input build\0222dc.obj
-input build\022464.obj
-input build\022bdc.obj
-input build\023310.obj
-input build\023938.obj
-input build\02412c.obj
-input build\024280.obj
-input build\024b4c.obj
-input build\025870.obj
-input build\025b98.obj
-input build\026710.obj
-input build\02786c.obj
-input build\027958.obj
-input build\028258.obj
-input build\02af78.obj
-input build\02b2f0.obj
-input build\02b464.obj
-input build\02c884.obj
-input build\02d06c.obj
-input build\02d19c.obj
-input build\02d968.obj
-input build\02df3c.obj
-input build\02e2dc.obj
-input build\02e400.obj
-input build\02e51c.obj
-input build\02f0c8.obj
-input build\02f320.obj
-input build\02fb50_sh4nlfzn.obj
-input build\03327c_strt1_sectionC.obj
-input build\0332a4_sectionC.obj
-input build\03bd80_sectionD.obj
-input build\04f6c0_SDK.obj
-input build\0fcd20_sectionB.obj
+input build\output\010000.obj
+input build\output\010080_main.obj
+input build\output\0100bc_sound.obj
+input build\output\010e90.obj
+input build\output\010fe8_unused.obj
+input build\output\011120_asset_queues.obj
+input build\output\012324.obj
+input build\output\012504.obj
+input build\output\0129cc.obj
+input build\output\012f44.obj
+input build\output\_012101_data.obj
+input build\output\013ae8.obj
+input build\output\014934.obj
+input build\output\0149b0_sbinit.obj
+input build\output\014a9c_tasks.obj
+input build\output\014b8c_backup.obj
+input build\output\014f54.obj
+input build\output\015ab8_title.obj
+input build\output\016108.obj
+input build\output\01614c.obj
+input build\output\016bf4.obj
+input build\output\016c58.obj
+input build\output\016d2c.obj
+input build\output\018644.obj
+input build\output\018784.obj
+input build\output\0193c8.obj
+input build\output\019e98.obj
+input build\output\01a148.obj
+input build\output\01b19c.obj
+input build\output\01bb48.obj
+input build\output\01c980.obj
+input build\output\01d290.obj
+input build\output\01d7fc.obj
+input build\output\01e27c.obj
+input build\output\01f3c0.obj
+input build\output\01fa78.obj
+input build\output\020214.obj
+input build\output\020528.obj
+input build\output\020594.obj
+input build\output\0206f0.obj
+input build\output\0207d4.obj
+input build\output\02081c.obj
+input build\output\020914.obj
+input build\output\020b6c.obj
+input build\output\02171c.obj
+input build\output\021b9c.obj
+input build\output\0222dc.obj
+input build\output\022464.obj
+input build\output\022bdc.obj
+input build\output\023310.obj
+input build\output\023938.obj
+input build\output\02412c.obj
+input build\output\024280.obj
+input build\output\024b4c.obj
+input build\output\025870.obj
+input build\output\025b98.obj
+input build\output\026710.obj
+input build\output\02786c.obj
+input build\output\027958.obj
+input build\output\028258.obj
+input build\output\02af78.obj
+input build\output\02b2f0.obj
+input build\output\02b464.obj
+input build\output\02c884.obj
+input build\output\02d06c.obj
+input build\output\02d19c.obj
+input build\output\02d968.obj
+input build\output\02df3c.obj
+input build\output\02e2dc.obj
+input build\output\02e400.obj
+input build\output\02e51c.obj
+input build\output\02f0c8.obj
+input build\output\02f320.obj
+input build\output\02fb50_sh4nlfzn.obj
+input build\output\03327c_strt1_sectionC.obj
+input build\output\0332a4_sectionC.obj
+input build\output\03bd80_sectionD.obj
+input build\output\04f6c0_SDK.obj
+input build\output\0fcd20_sectionB.obj
 
-print build\tbg.map
+print build\output\tbg.map
 form a
 start P,C,D,SDK(8C010000)
 exit 
diff --git a/lnk_matching_sdk.sub → build/lnk_matching_sdk.sub b/lnk_matching_sdk.sub → build/lnk_matching_sdk.sub
@@ -2,7 +2,7 @@ align_section
 udfcheck 
 ; debug 
 elf 
-output build\tbg.elf
+output build\output\tbg.elf
 
 define _ADXT_Init(8C04F7A2)
 define _ADXT_Create(8C04F8C0)
@@ -202,80 +202,80 @@ define __BSG_END(8C0E7FCC)
 ; input E:\dc_sdk\155j\shinobi\lib\zero.obj
 
 ; USER OBJS
-input build\010000.obj
-input build\010080_main.obj
-input build\0100bc_sound.obj
-input build\010e90.obj
-input build\010fe8_unused.obj
-input build\011120.obj
-input build\_005168_8c011430.obj
-input build\_008160_8c011fe0.obj
-input build\014934.obj
-input build\0149b0_sbinit.obj
-input build\014a9c_tasks.obj
-input build\014b8c_backup.obj
-input build\014f54.obj
-input build\015ab8_title.obj
-input build\016108.obj
-input build\01614c.obj
-input build\01614c.obj
-input build\016bf4.obj
-input build\016c58.obj
-input build\016d2c.obj
-input build\018644.obj
-input build\018784.obj
-input build\0193c8.obj
-input build\019e98.obj
-input build\01a148.obj
-input build\01b19c.obj
-input build\01bb48.obj
-input build\01c980.obj
-input build\01d290.obj
-input build\01d7fc.obj
-input build\01e27c.obj
-input build\01f3c0.obj
-input build\01fa78.obj
-input build\020214.obj
-input build\020528.obj
-input build\020594.obj
-input build\0206f0.obj
-input build\0207d4.obj
-input build\02081c.obj
-input build\020914.obj
-input build\020b6c.obj
-input build\02171c.obj
-input build\021b9c.obj
-input build\0222dc.obj
-input build\022464.obj
-input build\022bdc.obj
-input build\023310.obj
-input build\023938.obj
-input build\02412c.obj
-input build\024280.obj
-input build\024b4c.obj
-input build\025870.obj
-input build\025b98.obj
-input build\026710.obj
-input build\02786c.obj
-input build\027958.obj
-input build\028258.obj
-input build\02af78.obj
-input build\02b2f0.obj
-input build\02b464.obj
-input build\02c884.obj
-input build\02d06c.obj
-input build\02d19c.obj
-input build\02d968.obj
-input build\02df3c.obj
-input build\02e2dc.obj
-input build\02e400.obj
-input build\02e51c.obj
-input build\02f0c8.obj
-input build\02f320.obj
-input build\02fb50_sh4nlfzn.obj
-input build\03327c_strt1_sectionC.obj
-input build\0332a4_sectionC.obj
-input build\03bd80_sectionD.obj
+input build\output\010000.obj
+input build\output\010080_main.obj
+input build\output\0100bc_sound.obj
+input build\output\010e90.obj
+input build\output\010fe8_unused.obj
+input build\output\011120.obj
+input build\output\_005168_8c011430.obj
+input build\output\_008160_8c011fe0.obj
+input build\output\014934.obj
+input build\output\0149b0_sbinit.obj
+input build\output\014a9c_tasks.obj
+input build\output\014b8c_backup.obj
+input build\output\014f54.obj
+input build\output\015ab8_title.obj
+input build\output\016108.obj
+input build\output\01614c.obj
+input build\output\01614c.obj
+input build\output\016bf4.obj
+input build\output\016c58.obj
+input build\output\016d2c.obj
+input build\output\018644.obj
+input build\output\018784.obj
+input build\output\0193c8.obj
+input build\output\019e98.obj
+input build\output\01a148.obj
+input build\output\01b19c.obj
+input build\output\01bb48.obj
+input build\output\01c980.obj
+input build\output\01d290.obj
+input build\output\01d7fc.obj
+input build\output\01e27c.obj
+input build\output\01f3c0.obj
+input build\output\01fa78.obj
+input build\output\020214.obj
+input build\output\020528.obj
+input build\output\020594.obj
+input build\output\0206f0.obj
+input build\output\0207d4.obj
+input build\output\02081c.obj
+input build\output\020914.obj
+input build\output\020b6c.obj
+input build\output\02171c.obj
+input build\output\021b9c.obj
+input build\output\0222dc.obj
+input build\output\022464.obj
+input build\output\022bdc.obj
+input build\output\023310.obj
+input build\output\023938.obj
+input build\output\02412c.obj
+input build\output\024280.obj
+input build\output\024b4c.obj
+input build\output\025870.obj
+input build\output\025b98.obj
+input build\output\026710.obj
+input build\output\02786c.obj
+input build\output\027958.obj
+input build\output\028258.obj
+input build\output\02af78.obj
+input build\output\02b2f0.obj
+input build\output\02b464.obj
+input build\output\02c884.obj
+input build\output\02d06c.obj
+input build\output\02d19c.obj
+input build\output\02d968.obj
+input build\output\02df3c.obj
+input build\output\02e2dc.obj
+input build\output\02e400.obj
+input build\output\02e51c.obj
+input build\output\02f0c8.obj
+input build\output\02f320.obj
+input build\output\02fb50_sh4nlfzn.obj
+input build\output\03327c_strt1_sectionC.obj
+input build\output\0332a4_sectionC.obj
+input build\output\03bd80_sectionD.obj
 
 input sdk_obj\adx_inis.obj
 input sdk_obj\adx_tlk.obj
@@ -1352,12 +1352,12 @@ input sdk_obj\mpsmp_.obj
 input sdk_obj\adx_qtbl.obj
 input sdk_obj\_0sbver_.obj
 
-; input build\04f6c0_SDK.obj
-input build\0fcd20_sectionB.obj
+; input build\output\04f6c0_SDK.obj
+input build\output\0fcd20_sectionB.obj
 
 library E:\dc_sdk\155j\shc\lib\sh4nlfzn.lib
 
-print build\tbg.map
+print build\output\tbg.map
 form a
 entry SG_SEC
 start IP(8C008000),DSGLH(8C010000)