diff options
| author | cadmic <cadmic24@gmail.com> | 2024-01-05 14:27:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-05 23:27:19 +0100 |
| commit | 25ff0a27de771f631369721ce1e8ca7ad7be8cfd (patch) | |
| tree | 54b901ce526e95d5c8d4af9e14032713cb89ee53 /docs/tutorial/data.md | |
| parent | 1f9c28f370d73268981fd8a42f9c6ac15b560a1a (diff) | |
Create separate build directories based on version (#1591)
* Create separate build directories based on version
* Fix find_unused_asm.sh
* Remove find_unused_asm.sh from Jenkinsfile
* Revert diff.py
* Clarify that gc-eu-mq is not "supported" yet
* Revert xmlcreate.py (to be deleted)
* Remove gc-eu-mq for now
* Add version flags to diff_settings.py and sym_info.py
* --version -> --oot-version
* Fix --oot-version
* Revert adding version flags to tools
* Delete find_unused_asm.sh
* Revert changes to first_diff.py output in tutorial
* Factor out sed usages for spec
Diffstat (limited to 'docs/tutorial/data.md')
| -rw-r--r-- | docs/tutorial/data.md | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index 69b04c782..421bc0fe6 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -118,18 +118,18 @@ Now, open the file called `spec` in the base directory, find the section corresp ``` beginseg name "ovl_En_Tg" - include "build/src/overlays/actors/ovl_En_Tg/z_en_tg.o" - include "build/data/overlays/actors/z_en_tg.data.o" - include "build/data/overlays/actors/z_en_tg.reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tg/z_en_tg.o" + include "$(BUILD_DIR)/data/overlays/actors/z_en_tg.data.o" + include "$(BUILD_DIR)/data/overlays/actors/z_en_tg.reloc.o" endseg ``` and comment out the .data line, ``` beginseg name "ovl_En_Tg" - include "build/src/overlays/actors/ovl_En_Tg/z_en_tg.o" - //include "build/data/overlays/actors/z_en_tg.data.o" - include "build/data/overlays/actors/z_en_tg.reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Tg/z_en_tg.o" + //include "$(BUILD_DIR)/data/overlays/actors/z_en_tg.data.o" + include "$(BUILD_DIR)/data/overlays/actors/z_en_tg.reloc.o" endseg ``` to tell the compiler not to look for the data in that file any more. Now run `make -j`, and if you did both steps correctly, you should get `OK`. @@ -262,18 +262,18 @@ First, we tell the compiler to ignore the original data file. To do this, open t ``` beginseg name "ovl_En_Jj" - include "build/src/overlays/actors/ovl_En_Jj/z_en_jj.o" - include "build/data/overlays/actors/z_en_jj.data.o" - include "build/data/overlays/actors/z_en_jj.reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jj/z_en_jj.o" + include "$(BUILD_DIR)/data/overlays/actors/z_en_jj.data.o" + include "$(BUILD_DIR)/data/overlays/actors/z_en_jj.reloc.o" endseg ``` We will eventually remove both of the bottom two lines and replace them with our own reloc file, but for now, just comment out the data line: ``` beginseg name "ovl_En_Jj" - include "build/src/overlays/actors/ovl_En_Jj/z_en_jj.o" - //include "build/data/overlays/actors/z_en_jj.data.o" - include "build/data/overlays/actors/z_en_jj.reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jj/z_en_jj.o" + //include "$(BUILD_DIR)/data/overlays/actors/z_en_jj.data.o" + include "$(BUILD_DIR)/data/overlays/actors/z_en_jj.reloc.o" endseg ``` @@ -557,7 +557,7 @@ Ignore the first line: `gDmaDataTable` is always different if the ROM is shifted To fix this, we use a binary diff program. A suitable one is `vbindiff`: run it on the baserom and the zelda_whatever one the compiler generates: ``` -vbindiff baserom.z64 zelda_ocarina_mq_dbg.z64 +vbindiff baserom.z64 oot-gc-eu-mq-dbg.z64 ``` In this, press `g` to open up goto position, and paste in the address `0xE3ED10` from the first important line of the `first_diff` output. This gives us the following: @@ -623,7 +623,7 @@ static ColliderCylinderInit sCylinderInit = Running `make -j` again, ``` -zelda_ocarina_mq_dbg.z64: OK +oot-gc-eu-mq-dbg.z64: OK ``` Hooray, we won! |