From cfd0e92cffbb610a47098919baeac54c06a60ade Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Wed, 2 Dec 2020 22:26:08 +0000 Subject: [PATCH] tidy up splat --- .gitignore | 1 + Makefile | 13 +++++++------ requirements.txt | 1 + requirements_extra.txt | 1 - sources.mk | 2 +- tools/n64splat | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3301686d06..2e726e1323 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ __pycache__/ venv/ .lark_cache* +.splat_cache # Misc .idea/ diff --git a/Makefile b/Makefile index 94da958f3c..f821929767 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,9 @@ clean: clean-code: rm -rf $(BUILD_DIR)/src +clean-split: + rm -rf bin msg img sprite .splat_cache + tools: make -C tools @@ -106,15 +109,13 @@ submodules: git submodule update --init --recursive split: - rm -rf bin msg img sprite - $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS PaperMarioMessages img PaperMarioNpcSprites + $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS PaperMarioMessages img PaperMarioNpcSprites --new split-%: - $(SPLAT) --modes ld $* --verbose + $(SPLAT) --modes ld $* --verbose --new split-all: - rm -rf bin msg img sprite - $(SPLAT) --modes all + $(SPLAT) --modes all --new test: $(ROM) $(EMULATOR) $< @@ -218,7 +219,7 @@ $(MSG_BIN:.bin=.o): $(MSG_BIN) $(LD) -r -b binary -o $@ $< # Sprites -$(foreach npc, $(NPC_SPRITES), $(eval $(BUILD_DIR)/sprite/npc/$(npc):: $(shell find sprite/npc/$(npc) -type f))) # dependencies +$(foreach npc, $(NPC_SPRITES), $(eval $(BUILD_DIR)/sprite/npc/$(npc):: $(shell find sprite/npc/$(npc) -type f 2> /dev/null))) # dependencies NPC_DIRS := $(foreach npc, $(NPC_SPRITES), sprite/npc/$(npc)) NPC_YAY0 := $(foreach npc, $(NPC_SPRITES), $(BUILD_DIR)/sprite/npc/$(npc).Yay0) $(BUILD_DIR)/sprite/npc/%:: sprite/npc/% tools/compile_npc_sprite.py diff --git a/requirements.txt b/requirements.txt index 779222e276..60c34e5e77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ PyYAML lark-parser python-ranges pypng +colorama diff --git a/requirements_extra.txt b/requirements_extra.txt index 607b823d62..bed63f8773 100644 --- a/requirements_extra.txt +++ b/requirements_extra.txt @@ -1,5 +1,4 @@ ansiwrap -colorama cxxfilt python-Levenshtein stringcase diff --git a/sources.mk b/sources.mk index 488dd9a935..b60510fd72 100644 --- a/sources.mk +++ b/sources.mk @@ -56,7 +56,7 @@ ASSETS := \ title_data \ party_kurio party_kameki party_pinki party_pareta party_resa party_akari party_opuku party_pokopi -MESSAGES := $(shell find msg -type f -name "*.msg") +MESSAGES := $(shell find msg -type f -name "*.msg" 2> /dev/null) NPC_SPRITES := world_goombario world_kooper world_bombette world_parakarry world_bow world_watt world_sushi world_lakilester battle_goombario battle_kooper battle_bombette battle_parakarry battle_bow battle_watt battle_sushi battle_lakilester kooper_without_shell world_eldstar world_mamar world_skolar world_muskular world_misstar world_klevar world_kalmar battle_eldstar battle_mamar battle_skolar battle_muskular battle_misstar battle_klevar battle_kalmar twink jr_troopa spiked_jr_troopa spiked_para_jr_troopa mage_jr_troopa para_jr_troopa goomba spiked_goomba paragoomba koopa_troopa para_troopa fuzzy bob_omb bullet_bill bill_blaster monty_mole cleft pokey battle_bandit buzzy_beetle swooper stone_chomp putrid_piranha piranha_plant sentinel world_clubba battle_clubba shy_guy groove_guy sky_guy pyro_guy spy_guy medi_guy fuzzipede jungle_guy heart_plant hurt_plant m_bush bubble kent_c_koopa dayzee lakitu spiny bzzap ruff_puff spike_top duplighost albino_dino blooper baby_blooper gulpit dry_bones thrown_bone bony_beetle magikoopa flying_magikoopa world_koopatrol koopatrol hammer_bros bush_basic bush_blocky bush_dry bush_leafy bush_matted world_kammy battle_kammy goomba_bros goomba_king spiky_goomnut dark_toad koopa_bros buzzar tutankoopa chain_chomp world_tubba battle_tubba tubbas_heart big_lantern_ghost shy_squad_guy marshal_guy stilt_guy stilt_guy_unfold shy_stack_guy shy_stack_unfold shy_stack_damage shy_stack_rock general_guy general_guy_bomb tank_guy lava_piranha_head petit_piranha lava_bud huff_n_puff tuff_puff monstar crystal_king world_bowser battle_bowser luigi toad three_sisters vanna_t toad_kid toad_guard harry_t toad_minister postmaster conductor_toad train_station_toad fishmael artist_toad koopa koopa_without_shell world_bob_omb whacka dryite mouser boo yoshi yoshi_kid raven bubulb penguin shiver_toad world_bandit goompapa goombaria goomama goompa goomma the_master chan lee merlon chet_rippo rowf minh_t russ_t tayce_t fice_t bartender chanterelle rip_cheato chuck_quizmo merluvlee merlar merlow star_kid kolorado_wife koopa_koot kolorado battle_kolorado archeologist nomadimouse world_merlee battle_merlee disguised_moustafa moustafa oaklie bootler yakkey gourmet_guy village_leader leaders_friend rafael_raven tolielup gate_flower petunia posie lily rosie sun lakilulu ninji mayor_penguin mayor_penguin_wife penguin_patrol herringway merle star_rod fire coin parade_peach parade_koopas parade_burnt_bowser parade_luigi parade_partners parade_yoshis parada_kolorados parade_chicks parade_ice_show parade_toads parade_batons parade_drums parade_flags parade_horns parade_tubba_balloon parade_wizards parade_mario parade_shy_guys parade_twink leaf diff --git a/tools/n64splat b/tools/n64splat index a515a468e1..e6ed31570a 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit a515a468e1bf9abec6472293d75ee8a1d6615efc +Subproject commit e6ed31570a4008bbbefca2afc61b936d3796886c