mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-11 22:20:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

en_nnh OK (#42)

Browse Source 
* Matching (last thing to figure out is ColliderInit)

* nnh work

* Working on collider

* formatting

* Fixing en_nnh

* Fixed build error. The issue was a collider init, not sure what made me think it was OK before

* Removed overlay helper stuff

* Removed weird qemu file

* Fixed collider once and for all.

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
This commit is contained in:
kyleburnette
2021-02-12 15:25:48 -08:00
committed by GitHub
parent ee0ab1cbc9
commit 08e964972f
5 changed files with 79 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linker_scripts/code_script.txt
+3 -2
View File
@@ -8236,8 +8236,9 @@ SECTIONS
ovl_En_Nnh : AT(RomLocation)
{
build/src/overlays/actors/ovl_En_Nnh/z_en_nnh.o(.text)
build/asm/ovl_En_Nnh_data.o(.data)
build/asm/ovl_En_Nnh_rodata.o(.rodata)
build/src/overlays/actors/ovl_En_Nnh/z_en_nnh.o(.data)
build/src/overlays/actors/ovl_En_Nnh/z_en_nnh.o(.rodata)
build/src/overlays/actors/ovl_En_Nnh/z_en_nnh_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;
linker_scripts/object_script.txt
+5
View File
@@ -14,6 +14,11 @@ D_0E000140 = 0x0E000140;
D_0E0001C8 = 0x0E0001C8;
D_0E0002C8 = 0x0E0002C8;
D_06000500 = 0x06000500;
/* z_en_nnh */
D_06001510 = 0x06001510;
/* bg_haka_curtain */
D_06001410 = 0x06001410;
D_06001588 = 0x06001588;