diff options
| author | Isghj <42048411+isghj5@users.noreply.github.com> | 2021-06-11 05:15:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 08:15:09 -0400 |
| commit | bb7247875b3d78ee1ec31399a1335afc4a05d2ac (patch) | |
| tree | 5eff54b0a40a3bd18b5f59c4f763323e5243005f /linker_scripts/code_script.txt | |
| parent | 70b67402cb6285c8f3f6c565ceea7b634c720c27 (diff) | |
En_Weather_Tag (#178)
* EnWeatherTag: Start
* EnWeatherTag: matching function, but suspicious
* EnWeatherTag: two non-matching functions, rest match
* EnWeatherTag: cleaning and docs
* EnWeatherTag: more docs
* WeatherTag: more docs
* WeatherTag: cleaning
* WeatherTag: pad renamed to unk to match
* Update include/z64save.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update include/z64.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* WeatherTag: requested changes
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'linker_scripts/code_script.txt')
| -rw-r--r-- | linker_scripts/code_script.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 20eb6af01..16c8b245b 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -2625,9 +2625,13 @@ SECTIONS ovl_En_Weather_Tag : AT(RomLocation) { build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.text) - build/asm/overlays/ovl_En_Weather_Tag_data.o(.data) + build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.data) build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.rodata) +#ifdef NON_MATCHING + build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag_overlay.o(.ovl) +#else build/asm/overlays/ovl_En_Weather_Tag_rodata.o(.rodata) +#endif } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; |