Refactoring stuff

2024-11-08 12:02:30 +01:00 · 2020-08-12 21:56:23 -04:00 · 2020-08-12 21:56:23 -04:00 · 0782fa07a3
commit 0782fa07a3
parent b57252efde
3400 changed files with 11 additions and 11 deletions
--- a/papermario/.clang-format
+++ b/papermario/.clang-format
--- a/papermario/.clang-tidy
+++ b/papermario/.clang-tidy
--- a/.gitignore
+++ b/.gitignore
@ -3,13 +3,13 @@ n64split
 *.bin
 *.FS
 *.bgm
-papermario/ctx.c
+ctx.c
-papermario/Map_Assets.FS
+Map_Assets.FS
-papermario/bgm
+bgm/
-papermario/bin
+bin/
-papermario/build/
+build/
-papermario/yay0
+yay0/
-papermario/expected
+expected/
 .vscode/
 .idea/
 .DS_Store
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
 [submodule "n64splitter"]
-	path = n64splitter
+	path = tools/n64splitter
 	url = https://github.com/ethteck/sm64tools.git
--- a/papermario/Makefile
+++ b/papermario/Makefile
--- a/papermario/asm/boot.s
+++ b/papermario/asm/boot.s
--- a/papermario/asm/header.s
+++ b/papermario/asm/header.s
--- a/papermario/asm/nonmatchings/code_1000_len_60/entry_point.s
+++ b/papermario/asm/nonmatchings/code_1000_len_60/entry_point.s
--- a/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s
+++ b/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s
--- a/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s
+++ b/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s
--- a/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s
+++ b/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s
--- a/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s
+++ b/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s
--- a/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s
+++ b/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s
--- a/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s
+++ b/papermario/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s
--- a/papermario/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s
+++ b/papermario/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s
--- a/papermario/asm/nonmatchings/code_102610_len_2330/func_802E0D90.s
+++ b/papermario/asm/nonmatchings/code_102610_len_2330/func_802E0D90.s
--- a/papermario/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s
+++ b/papermario/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s
--- a/papermario/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s
+++ b/papermario/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s
--- a/papermario/asm/nonmatchings/code_102610_len_2330/func_802E153C.s
+++ b/papermario/asm/nonmatchings/code_102610_len_2330/func_802E153C.s
--- a/papermario/asm/nonmatchings/code_102610_len_2330/func_802E234C.s
+++ b/papermario/asm/nonmatchings/code_102610_len_2330/func_802E234C.s
--- a/papermario/asm/nonmatchings/code_102610_len_2330/func_802E246C.s
+++ b/papermario/asm/nonmatchings/code_102610_len_2330/func_802E246C.s
--- a/papermario/asm/nonmatchings/code_102610_len_2330/save_game_at_player_position.s
+++ b/papermario/asm/nonmatchings/code_102610_len_2330/save_game_at_player_position.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_80035000_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_80035000_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_80035058_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_80035058_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_800351C8_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_800351C8_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_800354EC_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_800354EC_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_800355C4_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_800355C4_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_800355CC_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_800355CC_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_800355D4_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_800355D4_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_80035660_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_80035660_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_80035704.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_80035704.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_80035B40_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_80035B40_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_80035D18_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_80035D18_2.s
--- a/papermario/asm/nonmatchings/code_10400_len_d30/func_80035D20_2.s
+++ b/papermario/asm/nonmatchings/code_10400_len_d30/func_80035D20_2.s
--- a/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s
+++ b/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s
--- a/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s
+++ b/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s
--- a/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s
+++ b/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s
--- a/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E36E4.s
+++ b/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E36E4.s
--- a/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s
+++ b/papermario/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E464C.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E464C.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4710.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4710.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4730.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4730.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4B10.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4B10.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E5324.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E5324.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E55A8.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E55A8.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E5670.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E5670.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E578C.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E578C.s
--- a/papermario/asm/nonmatchings/code_105700_len_2130/func_802E581C.s
+++ b/papermario/asm/nonmatchings/code_105700_len_2130/func_802E581C.s
--- a/papermario/asm/nonmatchings/code_1060_len_310/func_80025C60.s
+++ b/papermario/asm/nonmatchings/code_1060_len_310/func_80025C60.s
--- a/papermario/asm/nonmatchings/code_1060_len_310/func_80025CFC.s
+++ b/papermario/asm/nonmatchings/code_1060_len_310/func_80025CFC.s
--- a/papermario/asm/nonmatchings/code_1060_len_310/func_80025D38.s
+++ b/papermario/asm/nonmatchings/code_1060_len_310/func_80025D38.s
--- a/papermario/asm/nonmatchings/code_1060_len_310/func_80025D74.s
+++ b/papermario/asm/nonmatchings/code_1060_len_310/func_80025D74.s
--- a/papermario/asm/nonmatchings/code_1060_len_310/func_80025F44.s
+++ b/papermario/asm/nonmatchings/code_1060_len_310/func_80025F44.s
--- a/papermario/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s
+++ b/papermario/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s
--- a/papermario/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s
+++ b/papermario/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s
--- a/papermario/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s
+++ b/papermario/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s
--- a/papermario/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s
+++ b/papermario/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s
--- a/papermario/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s
+++ b/papermario/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s
--- a/papermario/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s
+++ b/papermario/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s
--- a/papermario/asm/nonmatchings/code_109660_len_1270/func_802E7F6C.s
+++ b/papermario/asm/nonmatchings/code_109660_len_1270/func_802E7F6C.s
--- a/papermario/asm/nonmatchings/code_109660_len_1270/player_enter_blue_pipe.s
+++ b/papermario/asm/nonmatchings/code_109660_len_1270/player_enter_blue_pipe.s
--- a/papermario/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s
+++ b/papermario/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s
--- a/papermario/asm/nonmatchings/code_111f0_len_860/func_80035E00.s
+++ b/papermario/asm/nonmatchings/code_111f0_len_860/func_80035E00.s
--- a/papermario/asm/nonmatchings/code_111f0_len_860/func_80035E24.s
+++ b/papermario/asm/nonmatchings/code_111f0_len_860/func_80035E24.s
--- a/papermario/asm/nonmatchings/code_111f0_len_860/func_80035E54.s
+++ b/papermario/asm/nonmatchings/code_111f0_len_860/func_80035E54.s
--- a/papermario/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s
+++ b/papermario/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s
--- a/papermario/asm/nonmatchings/code_111f0_len_860/func_8003617C.s
+++ b/papermario/asm/nonmatchings/code_111f0_len_860/func_8003617C.s
--- a/papermario/asm/nonmatchings/code_111f0_len_860/func_8003646C.s
+++ b/papermario/asm/nonmatchings/code_111f0_len_860/func_8003646C.s
--- a/papermario/asm/nonmatchings/code_111f0_len_860/func_80036640.s
+++ b/papermario/asm/nonmatchings/code_111f0_len_860/func_80036640.s
--- a/papermario/asm/nonmatchings/code_11a50_len_7a0/func_80036650.s
+++ b/papermario/asm/nonmatchings/code_11a50_len_7a0/func_80036650.s
--- a/papermario/asm/nonmatchings/code_121f0_len_1290/func_80036DF0.s
+++ b/papermario/asm/nonmatchings/code_121f0_len_1290/func_80036DF0.s
--- a/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037960.s
+++ b/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037960.s
--- a/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037968.s
+++ b/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037968.s
--- a/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037994.s
+++ b/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037994.s
--- a/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s
+++ b/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s
--- a/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s
+++ b/papermario/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s
--- a/papermario/asm/nonmatchings/code_13480_len_3f0/init_demo_data.s
+++ b/papermario/asm/nonmatchings/code_13480_len_3f0/init_demo_data.s
--- a/papermario/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s
+++ b/papermario/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242BA0_2.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242BA0_2.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242BAC.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242BAC.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242C2C.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242C2C.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242C34.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242C34.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242CE8.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242CE8.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242CF8.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242CF8.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242D04.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242D04.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242D20.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242D20.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242D54.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242D54.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242E6C.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242E6C.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80242F48.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80242F48.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80243418.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80243418.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_8024346C.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_8024346C.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_802434DC.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_802434DC.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80243B00.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80243B00.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80243B14.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80243B14.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80243BA4.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80243BA4.s
--- a/papermario/asm/nonmatchings/code_135EE0/func_80243D8C.s
+++ b/papermario/asm/nonmatchings/code_135EE0/func_80243D8C.s
--- a/Show More
+++ b/Show More