mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-29 08:42:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_en_ossan OK and documented (#223)

Browse Source 
* Lots of progress, some came for OOT WIP

* Some small cleanup

* Fix merge conflict

* Bring over updated z_en_girla.h

* Fix merge error

* some cleanup

* fix msgcontext and add sfx ids

* func_808AAB30 is ugly but it matches

* Cleanup

* More cleanup and matched func_808AA8E8

* Matched last two functions

* Brought over data as a comment

* Figured out data, but not late rodata

* Document EnOssan

* Cleanup

* Added ShopItemIds

* Cleanup

* Switch left and right stick prompts

* Remove testing NON_MATCHING define

* Cleanup

* Add header to .c file

* Adjust header

* Rename InitCutscenes to GetCutscenes

* Cleanup

* Cleanup before merge with upstream

* More cleanup

* Lower case Shopkeeper

* More cleanup

* More general cleaning

* Found the late rodata issue

* Format

* Rename InitalUpdate

* PR suggestions except texture stuff

* Texture stuff

* Rename Texture typedef to UNK_TEXPTR

* One more rename

* Remove * from TexturePtr arrays

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Derek Hensley
2021-07-26 19:27:53 -07:00
committed by GitHub
parent 930d605c5c
commit c774f880e1
9 changed files with 1877 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linker_scripts/code_script.txt
+2 -3
View File
@@ -1269,10 +1269,9 @@ SECTIONS
ovl_En_Ossan : AT(RomLocation)
{
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.text)
build/asm/overlays/ovl_En_Ossan_data.o(.data)
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.data)
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.rodata)
build/asm/overlays/ovl_En_Ossan_rodata.o(.rodata)
build/asm/overlays/ovl_En_Ossan_late_rodata.o(.rodata)
build/src/overlays/actors/ovl_En_Ossan/z_en_ossan_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;