mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 06:54:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl en sob1 OK and Documented (#224)

Browse Source 
* All but two match

* format

* Matched the last two functions

* Merge updates

* Bring data over as a comment

* Brought data over

* Cleanup and start documenting

* Documented

* Removed NON_MATCHING define

* Actually save the .h file

* Format and add items comment

* Add comment

* Add header to .c file

* Cleanup

* Rename EnSob1_GetGoodbyeBombShop

* Update items comment

* Final cleanup

* Rename InitialUpdate

* PR suggestions except enum for objIndices

* Add todo about objIndices index enum

* Change char to UNK_TYPE1 for padding

* Textures and convert weekEvents to hex

* PR suggestions

* Format

* Cleanup function declaration and add cutscene state enum

* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
This commit is contained in:
Derek Hensley
2021-07-28 19:26:40 -07:00
committed by GitHub
parent b292647ea2
commit 8e2f2b4cdb
8 changed files with 1877 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linker_scripts/code_script.txt
+2 -3
View File
@@ -4142,10 +4142,9 @@ SECTIONS
ovl_En_Sob1 : AT(RomLocation)
{
build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.text)
build/asm/overlays/ovl_En_Sob1_data.o(.data)
build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.data)
build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.rodata)
build/asm/overlays/ovl_En_Sob1_rodata.o(.rodata)
build/asm/overlays/ovl_En_Sob1_late_rodata.o(.rodata)
build/src/overlays/actors/ovl_En_Sob1/z_en_sob1_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;
linker_scripts/object_script.txt
+15
View File
@@ -640,6 +640,21 @@ D_06002C8C = 0x06002C8C;
D_060000B4 = 0x060000B4;
D_06002BF0 = 0x06002BF0;
/* z_en_sob1 */
D_06008268 = 0x06008268;
D_0600D208 = 0x0600D208;
D_0600078C = 0x0600078C;
D_06011AC8 = 0x06011AC8;
D_060000FC = 0x060000FC;
D_06000970 = 0x06000970;
D_060087BC = 0x060087BC;
D_060050A0 = 0x060050A0;
D_060058A0 = 0x060058A0;
D_060060A0 = 0x060060A0;
D_06010438 = 0x06010438;
D_06010C38 = 0x06010C38;
D_06011038 = 0x06011038;
/* z_en_suttari */
D_0600C240 = 0x0600C240;
D_0600071C = 0x0600071C;