Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update install instructions for Gen 3 repo Makefile changes #70

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Update install instructions for Gen 3 repo Makefile changes #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
991fd50
Update install instructions for Gen 3 repo Makefile changes
ravepossum Sep 18, 2024
8e59cdb
Install instructions - match diff spacing with most recent emerald file
ravepossum Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ It's also a good idea to add `tools/poryscript` to your `.gitignore` before your

2. Update the Makefile with these changes (Note, don't add the `+` symbol at the start of the lines. That's just to show the line is being added.):
```diff
FIX := tools/gbafix/gbafix$(EXE)
MAPJSON := tools/mapjson/mapjson$(EXE)
JSONPROC := tools/jsonproc/jsonproc$(EXE)
+ SCRIPT := tools/poryscript/poryscript$(EXE)
FIX := $(TOOLS_DIR)/gbafix/gbafix$(EXE)
MAPJSON := $(TOOLS_DIR)/mapjson/mapjson$(EXE)
JSONPROC := $(TOOLS_DIR)/jsonproc/jsonproc$(EXE)
+ SCRIPT := $(TOOLS_DIR)/poryscript/poryscript$(EXE)
```
```diff
mostlyclean: tidynonmodern tidymodern
clean-assets:
...
rm -f $(AUTO_GEN_TARGETS)
@$(MAKE) clean -C libagbsyscall
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
+ rm -f $(patsubst %.pory,%.inc,$(shell find data/ -type f -name '*.pory'))
```
```diff
Expand All @@ -112,7 +112,7 @@ mostlyclean: tidynonmodern tidymodern
+ %.pory: ;
```
```diff
sound/%.bin: sound/%.aif ; $(AIF) $< $@
%.rl: % ; $(GFX) $< $@
+ data/%.inc: data/%.pory; $(SCRIPT) -i $< -o $@ -fc tools/poryscript/font_config.json -cc tools/poryscript/command_config.json
```

Expand Down