mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-03 20:10:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
f5cbbc3268d96af455e2ccfe46bbcc145452eb8d
mm/tools/filelists/mm.us.rev1/scene.csv
T
Tharo 7743e5a2c4 Overhaul the build system (#234) 
* wip

* fix

* add disassembler

* Disasm builds OK

* Variable addends

* More wip

* Rodata migration implemented

* Cleanup old tools

* Try fix submodule -> subrepo merge

* git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "602e609"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "602e609"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Builds again but assets are totally broken

* git subrepo pull --force tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "1ffdb08a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-processor.git"
  branch:   "master"
  commit:   "1ffdb08a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables

* rm z64compress in preparation for subrepo

* git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "eb11085c"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "eb11085c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Fix asset extraction

* Fix diff-init make rule

* Split code bss

* Split assumed linker bug padding from assembly files

* add filelists for mm.us.rev1

* Maybe working, but I'm not sure

* add overlays to spec

* Add rodata to actos

* Everything compiles

* Make a lot of C files for code

* Add almost every file in code to spec

* whoops

* 3 code files left

* add scenes to spec

* More progress on progress.py

* Fix skelanime in spec

* audio files!

* Fix merge issues

* Fix some C files in code

* Fix remaining code files

* Use existing O1 C files in spec

* reorder boot order in spec

* update spec

* fault.c

* Convert relocs on completed actors, fixbaserom uses current rom name

* more boot files

* Add VT macros and script

* finish already existing boot files

* most of  libultra

* fix 64bits libultra files

* Use C files for libultra, wrap some functions in NON_MATCHING

* Remove duplicate of OS_CLOCK_RATE from fault.c

* C files for fbdemos

* delete dumb files

* bootstrap C files, still need to add them to the spec

* update fixbaserom

* boot OK?

* I forgot to commit the spec

* C for gamestates

* C for kaleido

* Change all includes to ""

* copy actor sizes script from oot

* I forgot to delete those files

* Basic C files for effects

* Add effects initvars names

* Remove mislabelled boot functions from header/txt

* Begin porting bootstrap_fx, some sizes

* Fix <>

* Fix enum

* Fix diff.py

* fix libultra stuff

* update regconvert

* update setup warnings

* add some missing ;

* Fix some makefile stuff and other fixes on some non_matching functions

* add executable flag in extract_baserom and fixbaserom

* fix relative path

* copy assist from oot

* fix map path

* another assist path fix

* Delete C files for handwritten files

* add code_801A51F0 to spec

* add gfxbuffers to spec

* Move rodata to top of each file when possible

* UNK_TYPEs for func_801A51F0

* Remove kaleido rodata from spec

* Update spec and undefined_syms for recent merge

* GCC warnings and fix errors in nonmatchings,

* round percentage numbers

* progress script: format changes

* progress: error on non-existing files

* fix warning in z_scene_table

* Match 2 nonmatchings in z_actor

* Warnings in lightswitch and invadepoh

* Fix warning in z_actor_dlftbls

* I though I fixed this one

* whoops

* Comment out CC_CHECK

* Removed redundant ultra64.h includes

* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms

* Completed gamestates bootstrap

* Split kaleido_scope

* Remove section.h and segment.h, move keep object externs to a common location in variables.h

* Completed effects bootstrap

* Segmented address externs for effects, fbdemos, gamestates and kaleido

* Move actor data externs out of the if 0

* Segmented address externs for actors

* Prepare actionfunc detection

* fix script, how did it even work before

* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler

* Automated actionFunc detection in actors

* Segmented addresses from player .text

* rm old segment addrs script and fix build

* Move sizes folder to tools

* Make build.py executable

* New Jenkinsfile Prayge

* Remove numpy dependencies

* Add warnings_disasm_current.txt

* my bad

* Update spec and undefined_syms

* Add z_eff_ss_hahen to pametfrog

* git subrepo pull (merge) --force tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "163ca2af"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "163ca2af"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Make z64compress print to stdout

* sneeky commit to update warnings tooling

* test

* Another test

* Mark fixing overlay reloc generating as a TODO

* Update warnings stuff

* Communicate the return code from running z64compress back to the Makefile through the wrapper

* Run formatter, remove extra commented copy of function

* Re-fix some includes

* Convert atan to hex to conform to decided style

* Some tidying up, remove c for fp and the other two handwritten code files

* BSS in z_collision_check & z_scene_proc

* add static back in

* Fix timerintr bss, add file to spec, some cleanup

* Remove externs

* Newline

* Readd enums

* Typo

* Colours

* Comments for hitmark enum values

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Improvements and suggestions

* Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-03 23:21:31 -04:00

402 lines
8.9 KiB
CSV
Raw Blame History

1137,Z2_20SICHITAI2
1138,Z2_20SICHITAI2_room_00
1139,Z2_20SICHITAI2_room_01
1140,Z2_20SICHITAI2_room_02
1141,Z2_WITCH_SHOP
1142,Z2_WITCH_SHOP_room_00
1143,Z2_LAST_BS
1144,Z2_LAST_BS_room_00
1145,Z2_HAKASHITA
1146,Z2_HAKASHITA_room_00
1147,Z2_HAKASHITA_room_01
1148,Z2_HAKASHITA_room_02
1149,Z2_HAKASHITA_room_03
1150,Z2_HAKASHITA_room_04
1151,Z2_AYASHIISHOP
1152,Z2_AYASHIISHOP_room_00
1153,Z2_AYASHIISHOP_room_01
1154,Z2_OMOYA
1155,Z2_OMOYA_room_00
1156,Z2_OMOYA_room_01
1157,Z2_OMOYA_room_02
1158,Z2_BOWLING
1159,Z2_BOWLING_room_00
1160,Z2_SONCHONOIE
1161,Z2_SONCHONOIE_room_00
1162,Z2_SONCHONOIE_room_01
1163,Z2_SONCHONOIE_room_02
1164,Z2_SONCHONOIE_room_03
1165,Z2_IKANA
1166,Z2_IKANA_room_00
1167,Z2_IKANA_room_01
1168,Z2_IKANA_room_02
1169,Z2_IKANA_room_03
1170,Z2_IKANA_room_04
1171,Z2_KAIZOKU
1172,Z2_KAIZOKU_room_00
1173,Z2_MILK_BAR
1174,Z2_MILK_BAR_room_00
1175,Z2_INISIE_N
1176,Z2_INISIE_N_room_00
1177,Z2_INISIE_N_room_01
1178,Z2_INISIE_N_room_02
1179,Z2_INISIE_N_room_03
1180,Z2_INISIE_N_room_04
1181,Z2_INISIE_N_room_05
1182,Z2_INISIE_N_room_06
1183,Z2_INISIE_N_room_07
1184,Z2_INISIE_N_room_08
1185,Z2_INISIE_N_room_09
1186,Z2_INISIE_N_room_10
1187,Z2_INISIE_N_room_11
1188,Z2_TAKARAYA
1189,Z2_TAKARAYA_room_00
1190,Z2_INISIE_R
1191,Z2_INISIE_R_room_00
1192,Z2_INISIE_R_room_01
1193,Z2_INISIE_R_room_02
1194,Z2_INISIE_R_room_03
1195,Z2_INISIE_R_room_04
1196,Z2_INISIE_R_room_05
1197,Z2_INISIE_R_room_06
1198,Z2_INISIE_R_room_07
1199,Z2_INISIE_R_room_08
1200,Z2_INISIE_R_room_09
1201,Z2_INISIE_R_room_10
1202,Z2_INISIE_R_room_11
1203,Z2_OKUJOU
1204,Z2_OKUJOU_room_00
1205,Z2_OPENINGDAN
1206,Z2_OPENINGDAN_room_00
1207,Z2_OPENINGDAN_room_01
1208,Z2_MITURIN
1209,Z2_MITURIN_room_00
1210,Z2_MITURIN_room_01
1211,Z2_MITURIN_room_02
1212,Z2_MITURIN_room_03
1213,Z2_MITURIN_room_04
1214,Z2_MITURIN_room_05
1215,Z2_MITURIN_room_06
1216,Z2_MITURIN_room_07
1217,Z2_MITURIN_room_08
1218,Z2_MITURIN_room_09
1219,Z2_MITURIN_room_10
1220,Z2_MITURIN_room_11
1221,Z2_MITURIN_room_12
1222,Z2_13HUBUKINOMITI
1223,Z2_13HUBUKINOMITI_room_00
1224,Z2_CASTLE
1225,Z2_CASTLE_room_00
1226,Z2_CASTLE_room_01
1227,Z2_CASTLE_room_02
1228,Z2_CASTLE_room_03
1229,Z2_CASTLE_room_04
1230,Z2_CASTLE_room_05
1231,Z2_CASTLE_room_06
1232,Z2_CASTLE_room_07
1233,Z2_CASTLE_room_08
1234,Z2_CASTLE_room_09
1235,Z2_DEKUTES
1236,Z2_DEKUTES_room_00
1237,Z2_MITURIN_BS
1238,Z2_MITURIN_BS_room_00
1239,Z2_SYATEKI_MIZU
1240,Z2_SYATEKI_MIZU_room_00
1241,Z2_HAKUGIN
1242,Z2_HAKUGIN_room_00
1243,Z2_HAKUGIN_room_01
1244,Z2_HAKUGIN_room_02
1245,Z2_HAKUGIN_room_03
1246,Z2_HAKUGIN_room_04
1247,Z2_HAKUGIN_room_05
1248,Z2_HAKUGIN_room_06
1249,Z2_HAKUGIN_room_07
1250,Z2_HAKUGIN_room_08
1251,Z2_HAKUGIN_room_09
1252,Z2_HAKUGIN_room_10
1253,Z2_HAKUGIN_room_11
1254,Z2_HAKUGIN_room_12
1255,Z2_HAKUGIN_room_13
1256,Z2_ROMANYMAE
1257,Z2_ROMANYMAE_room_00
1258,Z2_PIRATE
1259,Z2_PIRATE_room_00
1260,Z2_PIRATE_room_01
1261,Z2_PIRATE_room_02
1262,Z2_PIRATE_room_03
1263,Z2_PIRATE_room_04
1264,Z2_PIRATE_room_05
1265,Z2_PIRATE_room_06
1266,Z2_PIRATE_room_07
1267,Z2_PIRATE_room_08
1268,Z2_PIRATE_room_09
1269,Z2_PIRATE_room_10
1270,Z2_PIRATE_room_11
1271,Z2_PIRATE_room_12
1272,Z2_PIRATE_room_13
1273,Z2_PIRATE_room_14
1274,Z2_SYATEKI_MORI
1275,Z2_SYATEKI_MORI_room_00
1276,Z2_SINKAI
1277,Z2_SINKAI_room_00
1278,Z2_YOUSEI_IZUMI
1279,Z2_YOUSEI_IZUMI_room_00
1280,Z2_YOUSEI_IZUMI_room_01
1281,Z2_YOUSEI_IZUMI_room_02
1282,Z2_YOUSEI_IZUMI_room_03
1283,Z2_YOUSEI_IZUMI_room_04
1284,Z2_KINSTA1
1285,Z2_KINSTA1_room_00
1286,Z2_KINSTA1_room_01
1287,Z2_KINSTA1_room_02
1288,Z2_KINSTA1_room_03
1289,Z2_KINSTA1_room_04
1290,Z2_KINSTA1_room_05
1291,Z2_KINDAN2
1292,Z2_KINDAN2_room_00
1293,Z2_KINDAN2_room_01
1294,Z2_KINDAN2_room_02
1295,Z2_KINDAN2_room_03
1296,Z2_KINDAN2_room_04
1297,Z2_KINDAN2_room_05
1298,Z2_TENMON_DAI
1299,Z2_TENMON_DAI_room_00
1300,Z2_TENMON_DAI_room_01
1301,Z2_LAST_DEKU
1302,Z2_LAST_DEKU_room_00
1303,Z2_LAST_DEKU_room_01
1304,Z2_22DEKUCITY
1305,Z2_22DEKUCITY_room_00
1306,Z2_22DEKUCITY_room_01
1307,Z2_22DEKUCITY_room_02
1308,Z2_KAJIYA
1309,Z2_KAJIYA_room_00
1310,Z2_00KEIKOKU
1311,Z2_00KEIKOKU_room_00
1312,Z2_POSTHOUSE
1313,Z2_POSTHOUSE_room_00
1314,Z2_LABO
1315,Z2_LABO_room_00
1316,Z2_DANPEI2TEST
1317,Z2_DANPEI2TEST_room_00
1318,Z2_DANPEI2TEST_room_01
1319,Z2_16GORON_HOUSE
1320,Z2_16GORON_HOUSE_room_00
1321,Z2_16GORON_HOUSE_room_01
1322,Z2_33ZORACITY
1323,Z2_33ZORACITY_room_00
1324,Z2_8ITEMSHOP
1325,Z2_8ITEMSHOP_room_00
1326,Z2_F01
1327,Z2_F01_room_00
1328,Z2_INISIE_BS
1329,Z2_INISIE_BS_room_00
1330,Z2_30GYOSON
1331,Z2_30GYOSON_room_00
1332,Z2_31MISAKI
1333,Z2_31MISAKI_room_00
1334,Z2_TAKARAKUJI
1335,Z2_TAKARAKUJI_room_00
1336,Z2_TORIDE
1337,Z2_TORIDE_room_00
1338,Z2_FISHERMAN
1339,Z2_FISHERMAN_room_00
1340,Z2_GORONSHOP
1341,Z2_GORONSHOP_room_00
1342,Z2_DEKU_KING
1343,Z2_DEKU_KING_room_00
1344,Z2_LAST_GORON
1345,Z2_LAST_GORON_room_00
1346,Z2_LAST_GORON_room_01
1347,Z2_24KEMONOMITI
1348,Z2_24KEMONOMITI_room_00
1349,Z2_F01_B
1350,Z2_F01_B_room_00
1351,Z2_F01C
1352,Z2_F01C_room_00
1353,Z2_BOTI
1354,Z2_BOTI_room_00
1355,Z2_BOTI_room_01
1356,Z2_HAKUGIN_BS
1357,Z2_HAKUGIN_BS_room_00
1358,Z2_20SICHITAI
1359,Z2_20SICHITAI_room_00
1360,Z2_20SICHITAI_room_01
1361,Z2_20SICHITAI_room_02
1362,Z2_21MITURINMAE
1363,Z2_21MITURINMAE_room_00
1364,Z2_LAST_ZORA
1365,Z2_LAST_ZORA_room_00
1366,Z2_11GORONNOSATO2
1367,Z2_11GORONNOSATO2_room_00
1368,Z2_11GORONNOSATO2_room_01
1369,Z2_SEA
1370,Z2_SEA_room_00
1371,Z2_SEA_room_01
1372,Z2_SEA_room_02
1373,Z2_SEA_room_03
1374,Z2_SEA_room_04
1375,Z2_SEA_room_05
1376,Z2_SEA_room_06
1377,Z2_SEA_room_07
1378,Z2_SEA_room_08
1379,Z2_SEA_room_09
1380,Z2_SEA_room_10
1381,Z2_SEA_room_11
1382,Z2_SEA_room_12
1383,Z2_SEA_room_13
1384,Z2_SEA_room_14
1385,Z2_SEA_room_15
1386,Z2_35TAKI
1387,Z2_35TAKI_room_00
1388,Z2_REDEAD
1389,Z2_REDEAD_room_00
1390,Z2_REDEAD_room_01
1391,Z2_REDEAD_room_02
1392,Z2_REDEAD_room_03
1393,Z2_REDEAD_room_04
1394,Z2_REDEAD_room_05
1395,Z2_REDEAD_room_06
1396,Z2_REDEAD_room_07
1397,Z2_REDEAD_room_08
1398,Z2_REDEAD_room_09
1399,Z2_REDEAD_room_10
1400,Z2_REDEAD_room_11
1401,Z2_REDEAD_room_12
1402,Z2_REDEAD_room_13
1403,Z2_BANDROOM
1404,Z2_BANDROOM_room_00
1405,Z2_BANDROOM_room_01
1406,Z2_BANDROOM_room_02
1407,Z2_BANDROOM_room_03
1408,Z2_BANDROOM_room_04
1409,Z2_11GORONNOSATO
1410,Z2_11GORONNOSATO_room_00
1411,Z2_11GORONNOSATO_room_01
1412,Z2_GORON_HAKA
1413,Z2_GORON_HAKA_room_00
1414,Z2_SECOM
1415,Z2_SECOM_room_00
1416,Z2_SECOM_room_01
1417,Z2_10YUKIYAMANOMURA
1418,Z2_10YUKIYAMANOMURA_room_00
1419,Z2_TOUGITES
1420,Z2_TOUGITES_room_00
1421,Z2_DANPEI
1422,Z2_DANPEI_room_00
1423,Z2_DANPEI_room_01
1424,Z2_DANPEI_room_02
1425,Z2_DANPEI_room_03
1426,Z2_DANPEI_room_04
1427,Z2_DANPEI_room_05
1428,Z2_DANPEI_room_06
1429,Z2_DANPEI_room_07
1430,Z2_DANPEI_room_08
1431,Z2_IKANAMAE
1432,Z2_IKANAMAE_room_00
1433,Z2_DOUJOU
1434,Z2_DOUJOU_room_00
1435,Z2_MUSICHOUSE
1436,Z2_MUSICHOUSE_room_00
1437,Z2_IKNINSIDE
1438,Z2_IKNINSIDE_room_00
1439,Z2_IKNINSIDE_room_01
1440,Z2_MAP_SHOP
1441,Z2_MAP_SHOP_room_00
1442,Z2_F40
1443,Z2_F40_room_00
1444,Z2_F41
1445,Z2_F41_room_00
1446,Z2_10YUKIYAMANOMURA2
1447,Z2_10YUKIYAMANOMURA2_room_00
1448,Z2_10YUKIYAMANOMURA2_room_01
1449,Z2_14YUKIDAMANOMITI
1450,Z2_14YUKIDAMANOMITI_room_00
1451,Z2_12HAKUGINMAE
1452,Z2_12HAKUGINMAE_room_00
1453,Z2_17SETUGEN
1454,Z2_17SETUGEN_room_00
1455,Z2_17SETUGEN2
1456,Z2_17SETUGEN2_room_00
1457,Z2_SEA_BS
1458,Z2_SEA_BS_room_00
1459,Z2_RANDOM
1460,Z2_RANDOM_room_00
1461,Z2_RANDOM_room_01
1462,Z2_RANDOM_room_02
1463,Z2_RANDOM_room_03
1464,Z2_RANDOM_room_04
1465,Z2_RANDOM_room_05
1466,Z2_YADOYA
1467,Z2_YADOYA_room_00
1468,Z2_YADOYA_room_01
1469,Z2_YADOYA_room_02
1470,Z2_YADOYA_room_03
1471,Z2_YADOYA_room_04
1472,Z2_KONPEKI_ENT
1473,Z2_KONPEKI_ENT_room_00
1474,Z2_INSIDETOWER
1475,Z2_INSIDETOWER_room_00
1476,Z2_INSIDETOWER_room_01
1477,Z2_26SARUNOMORI
1478,Z2_26SARUNOMORI_room_00
1479,Z2_26SARUNOMORI_room_01
1480,Z2_26SARUNOMORI_room_02
1481,Z2_26SARUNOMORI_room_03
1482,Z2_26SARUNOMORI_room_04
1483,Z2_26SARUNOMORI_room_05
1484,Z2_26SARUNOMORI_room_06
1485,Z2_26SARUNOMORI_room_07
1486,Z2_26SARUNOMORI_room_08
1487,Z2_LOST_WOODS
1488,Z2_LOST_WOODS_room_00
1489,Z2_LOST_WOODS_room_01
1490,Z2_LOST_WOODS_room_02
1491,Z2_LAST_LINK
1492,Z2_LAST_LINK_room_00
1493,Z2_LAST_LINK_room_01
1494,Z2_LAST_LINK_room_02
1495,Z2_LAST_LINK_room_03
1496,Z2_LAST_LINK_room_04
1497,Z2_LAST_LINK_room_05
1498,Z2_LAST_LINK_room_06
1499,Z2_LAST_LINK_room_07
1500,Z2_SOUGEN
1501,Z2_SOUGEN_room_00
1502,Z2_BOMYA
1503,Z2_BOMYA_room_00
1504,Z2_KYOJINNOMA
1505,Z2_KYOJINNOMA_room_00
1506,Z2_KOEPONARACE
1507,Z2_KOEPONARACE_room_00
1508,Z2_GORONRACE
1509,Z2_GORONRACE_room_00
1510,Z2_TOWN
1511,Z2_TOWN_room_00
1512,Z2_ICHIBA
1513,Z2_ICHIBA_room_00
1514,Z2_BACKTOWN
1515,Z2_BACKTOWN_room_00
1516,Z2_CLOCKTOWER
1517,Z2_CLOCKTOWER_room_00
1518,Z2_ALLEY
1519,Z2_ALLEY_room_00
1520,SPOT00
1521,SPOT00_room_00
1522,KAKUSIANA
1523,KAKUSIANA_room_00
1524,KAKUSIANA_room_01
1525,KAKUSIANA_room_02
1526,KAKUSIANA_room_03
1527,KAKUSIANA_room_04
1528,KAKUSIANA_room_05
1529,KAKUSIANA_room_06
1530,KAKUSIANA_room_07
1531,KAKUSIANA_room_08
1532,KAKUSIANA_room_09
1533,KAKUSIANA_room_10
1534,KAKUSIANA_room_11
1535,KAKUSIANA_room_12
1536,KAKUSIANA_room_13
1537,KAKUSIANA_room_14
Reference in New Issue View Git Blame Copy Permalink