diff options
| author | Isghj <42048411+isghj5@users.noreply.github.com> | 2021-07-01 19:20:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 22:20:34 -0400 |
| commit | abef65a6dba505cf07dbc59360af644092877a1a (patch) | |
| tree | 9bdb4c342fe0b7f1320f66a6bc842e229bc8bbb5 /linker_scripts | |
| parent | 0f1027fae18df6ba70ddd026ecd35260a56fd1d7 (diff) | |
En_Niw (Cucco) (#191)
* EnNiw: Rebase of WIP to work on collsion
init almost matches
EnNiw: WIP
EnNiw: running low, and too many not-matches for my liking
EnNiw: WIP 3
* EnNiw: update to master
* EnNiw: fix late rodata
* wtf is going on
* EnNiw: update is a thing, glad I'm doing it last
* EnNiw: likely branch mysery
* EnNiw: a horrible little draw function
* EnNiw: nope, feather draw still fucked
* EnNiw: fixing merge issues with master
* EnNiw: update is no longer non-matching
* EnNiw: cleaning/docs
* EnNiw: cleaning/docs 3
* EnNiw: more docs 4
* EnNiw: OKs again now that data was removed
* EnNiw: Docs and cleaning 5
* EnNiw: Docs and cleaning 6
* EnNiw: Docs/cleaning and changed a function and that changed a bunch ugh
* EnNiw: format and make check
* EnNiw: data re-merged, and matches
* EnNiw: forgot about these
* EnNiw: another attempt at feather draw, still not even close
* Multiple: now that we know the last paramter is a flag, change all to hex
* Player: fix wrong padding
* EnNiw
parameter name consistency
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
REG
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnNiw: Likely suggestions first
easy suggestions first, then I'll attempt the stuff I'm not sure will match
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* EnNiw: compiling again
* EnNiw: more suggestions added
* EnNiw: last of minor changes
* EnNiw: shorten overly long float
* EnNiw: feather counts as define
* EnNiw: add c file description
* EnNiw: Some Suggested Changes
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* EnNiw: more suggestions
* EnNiw: More suggestions
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* EnNiw: moved OPEN_DISPS to contentional location, still not close
* BgIcicle/EnSb: renamed func_800B78B8 to Actor_UpdateBgCheckInfo
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 8 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 05f53d2aa..0157765ac 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -1041,9 +1041,15 @@ SECTIONS ovl_En_Niw : AT(RomLocation) { build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.text) - build/asm/overlays/ovl_En_Niw_data.o(.data) + build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.data) +#ifdef NON_EQUIVALENT + build/src/overlays/actors/ovl_En_Niw_rodata_overlay.o(.ovl) +#elseif NON_MATCHING + build/src/overlays/actors/ovl_En_Niw_rodata_overlay.o(.ovl) +#else build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.rodata) build/asm/overlays/ovl_En_Niw_rodata.o(.rodata) +#endif } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index b90ccbd9e..b935b2b06 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -208,6 +208,10 @@ D_06007750 = 0x06007750; D_0600A390 = 0x0600A390; D_0600A490 = 0x0600A490; +/* en_niw */ +D_06002530 = 0x06002530; +D_060000E8 = 0x060000E8; + /* dm_char07 */ D_06000100 = 0x06000100; D_06000240 = 0x06000240; |