Update progress script with new assets categories and update csv output format (#510)

* Reorganize csvs and progress.py

* Put stuff in the correct folders

* Reduce lots of repeated code

* Change csv output format

* Filter out automaticaly named variables in "Matching" progress calculation for assets

* Address Elliptic's review

* Don't count handwritten files in progress and add a way to fix files detected in the wrong section

* Add missing "total"

* More fixing

* Add two missing columns

* Update paths in Jenkinsfile

* Update progress shield in readme

* Update progress link

Jenkinsfile

@@ -52,9 +52,9 @@ pipeline {
             }
             steps {
                 sh 'mkdir reports'
-                sh 'python3 ./tools/progress.py csv >> reports/progress_mm.us.rev1.csv'
-                sh 'python3 ./tools/progress.py csv -m >> reports/progress_matching_mm.us.rev1.csv'
-                sh 'python3 ./tools/progress.py shield-json > reports/progress_shield_mm.us.rev1.json'
+                sh 'python3 ./tools/progress.py csv >> reports/progress-mm-nonmatching.csv'
+                sh 'python3 ./tools/progress.py csv -m >> reports/progress-mm-matching.csv'
+                sh 'python3 ./tools/progress.py shield-json > reports/progress-mm-shield.json'
                 stash includes: 'reports/*', name: 'reports'
             }
         }
@@ -67,9 +67,9 @@ pipeline {
             }
             steps {
                 unstash 'reports'
-                sh 'cat reports/progress_mm.us.rev1.csv >> /var/www/html/reports/progress_mm.us.rev1.csv'
-                sh 'cat reports/progress_matching_mm.us.rev1.csv >> /var/www/html/reports/progress_matching_mm.us.rev1.csv'
-                sh 'cat reports/progress_shield_mm.us.rev1.json > /var/www/html/reports/progress_shield_mm.us.rev1.json'
+                sh 'cat reports/progress-mm-nonmatching.csv >> /var/www/zelda64.dev/assets/csv/progress-mm-nonmatching.csv'
+                sh 'cat reports/progress-mm-matching.csv >> /var/www/zelda64.dev/assets/csv/progress-mm-matching.csv'
+                sh 'cat reports/progress-mm-shield.json > /var/www/zelda64.dev/assets/csv/progress-mm-shield.json'
             }
         }
     }

README.md

@@ -5,8 +5,8 @@
 [jenkins]: https://jenkins.deco.mp/job/MM/job/master
 [jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2FMM%2Fjob%2Fmaster
 
-[progress]: https://zelda64.dev/progress.html
-[progress-badge]: https://img.shields.io/endpoint?url=https://zelda64.dev/reports/progress_shield_mm.us.rev1.json
+[progress]: https://zelda64.dev/games/mm
+[progress-badge]: https://img.shields.io/endpoint?url=https://zelda64.dev/reports/progress-mm-shield.json
 
 [contributors]: https://github.com/zeldaret/mm/graphs/contributors
 [contributors-badge]: https://img.shields.io/github/contributors/zeldaret/mm

spec

@@ -312,7 +312,7 @@ beginseg
     name "icon_item_gameover_static"
     compress
     romalign 0x1000
-    include "build/assets/static/icon_item_gameover_static/icon_item_gameover_static.o"
+    include "build/assets/interface/icon_item_gameover_static/icon_item_gameover_static.o"
     number 12
 endseg
 
@@ -8835,7 +8835,7 @@ beginseg
     name "nintendo_rogo_static"
     compress
     romalign 0x1000
-    include "build/assets/static/nintendo_rogo_static/nintendo_rogo_static.o"
+    include "build/assets/misc/nintendo_rogo_static/nintendo_rogo_static.o"
     number 1
 endseg
 
@@ -8879,7 +8879,7 @@ beginseg
     name "daytelop_static"
     compress
     romalign 0x1000
-    include "build/assets/static/daytelop_static/daytelop_static.o"
+    include "build/assets/misc/daytelop_static/daytelop_static.o"
     number 9
 endseg
 
@@ -8887,7 +8887,7 @@ beginseg
     name "ger_daytelop_static"
     compress
     romalign 0x1000
-    include "build/assets/static/ger_daytelop_static/ger_daytelop_static.o"
+    include "build/assets/misc/ger_daytelop_static/ger_daytelop_static.o"
     number 9
 endseg
 
@@ -8895,7 +8895,7 @@ beginseg
     name "fra_daytelop_static"
     compress
     romalign 0x1000
-    include "build/assets/static/fra_daytelop_static/fra_daytelop_static.o"
+    include "build/assets/misc/fra_daytelop_static/fra_daytelop_static.o"
     number 9
 endseg
 
@@ -8903,7 +8903,7 @@ beginseg
     name "esp_daytelop_static"
     compress
     romalign 0x1000
-    include "build/assets/static/esp_daytelop_static/esp_daytelop_static.o"
+    include "build/assets/misc/esp_daytelop_static/esp_daytelop_static.o"
     number 9
 endseg
 

src/overlays/gamestates/ovl_daytelop/z_daytelop.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_daytelop.h"
-#include "static/daytelop_static/daytelop_static.h"
-#include "static/icon_item_gameover_static/icon_item_gameover_static.h"
+#include "misc/daytelop_static/daytelop_static.h"
+#include "interface/icon_item_gameover_static/icon_item_gameover_static.h"
 
 // unused
 UNK_TYPE D_808158E0[] = {

src/overlays/gamestates/ovl_title/z_title.c

@@ -6,7 +6,7 @@
 
 #include "z_title.h"
 #include "overlays/gamestates/ovl_opening/z_opening.h"
-#include "static/nintendo_rogo_static/nintendo_rogo_static.h"
+#include "misc/nintendo_rogo_static/nintendo_rogo_static.h"
 
 void Title_UpdateCounters(TitleContext* this) {
     if ((this->coverAlpha == 0) && (this->visibleDuration != 0)) {

tools/filelists/mm.us.rev1/all.csv

@@ -1537,3 +1537,16 @@
 1536,KAKUSIANA_room_13
 1537,KAKUSIANA_room_14
 1538,bump_texture_static
+1539,anime_model_1_static
+1540,anime_model_2_static
+1541,anime_model_3_static
+1542,anime_model_4_static
+1543,anime_model_5_static
+1544,anime_model_6_static
+1545,anime_texture_1_static
+1546,anime_texture_2_static
+1547,anime_texture_3_static
+1548,anime_texture_4_static
+1549,anime_texture_5_static
+1550,anime_texture_6_static
+1551,softsprite_matrix_static

tools/filelists/mm.us.rev1/archives.csv

@@ -0,0 +1,7 @@
+15,map_i_static
+16,map_grand_static
+17,item_name_static
+18,map_name_static
+19,icon_item_static_test
+20,icon_item_24_static_test
+22,schedule_dma_static_test

tools/filelists/mm.us.rev1/asm.csv

@@ -2,3 +2,5 @@
 1,boot
 2,dmadata
 31,code
+1135,elf_message_field
+1136,elf_message_ydan

tools/filelists/mm.us.rev1/deleted.csv

@@ -0,0 +1,3 @@
+8,icon_item_static_old
+9,icon_item_24_static_old
+21,schedule_dma_static_old

tools/filelists/mm.us.rev1/interface.csv

@@ -0,0 +1,11 @@
+6,kanji
+10,icon_item_field_static
+11,icon_item_dungeon_static
+12,icon_item_gameover_static
+13,icon_item_jpn_static
+14,icon_item_vtx_static
+23,schedule_static
+25,do_action_static
+26,message_static
+27,message_texture_static
+28,nes_font_static

tools/filelists/mm.us.rev1/misc.csv

@@ -1,6 +1,24 @@
 7,link_animetion
+24,story_static
+1114,scene_texture_01
+1115,scene_texture_02
+1116,scene_texture_03
+1117,scene_texture_04
+1118,scene_texture_05
+1119,scene_texture_06
+1120,scene_texture_07
+1121,scene_texture_08
 1122,nintendo_rogo_static
+1123,title_static
 1124,memerrmsg
 1125,locerrmsg
-1135,elf_message_field
-1136,elf_message_ydan
+1126,parameter_static
+1127,week_static
+1128,daytelop_static
+1129,ger_daytelop_static
+1130,fra_daytelop_static
+1131,esp_daytelop_static
+1132,d2_fine_static
+1133,d2_cloud_static
+1134,d2_fine_pal_static
+1538,bump_texture_static

tools/filelists/mm.us.rev1/segments.csv

@@ -0,0 +1,13 @@
+1539,anime_model_1_static
+1540,anime_model_2_static
+1541,anime_model_3_static
+1542,anime_model_4_static
+1543,anime_model_5_static
+1544,anime_model_6_static
+1545,anime_texture_1_static
+1546,anime_texture_2_static
+1547,anime_texture_3_static
+1548,anime_texture_4_static
+1549,anime_texture_5_static
+1550,anime_texture_6_static
+1551,softsprite_matrix_static