izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
248 Commits 2 Branches 11 Tags
fb1ed529ad9cfeb13158edbe716deb5aace4f272
Commit Graph
248 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ZelllllandGitHub fb1ed529ad Add OoT actor structs and enums (#55) 
* add oot structs

* revert formatting

* fix comment thing

* fix accidental renames

* slight fix

* naviEnemyId -> hintId

* fix headers
 2021-02-28 22:52:12 -05:00
Kenix3andGitHub 5c761c33f0 Updates asm-differ (#53) 2021-02-25 19:36:55 -05:00
Kenix3GitHubMMDecomp
 		7ef48e193b Make defaults to uncompressed (#52) 
* PoC automatic rodata split Total split: 585 Failed / Troublesome: 61 (10,42735042735043%) Successfull rodata split: 524 (89,57264957264957%) Failed due to Script issues: 51 Failed due to object boundary issues or unreferenced .rodata: 10 Build OK?: :feelsokman:

rom_uncompressed.z64: OK
2a0a8acb61538235bc1094d297fb6556  rom.z64
rom.z64: OK

List Of Troublesome (mostly simliar edge cases, some are strings that we dont catch right / data without references):
 -    ovl_Arrow_Ice
 -    ovl_Arrow_Light
 -    ovl_Bg_Dkjail_Ivy
 -    ovl_Bg_Ikana_Mirror
 -    ovl_Boss_02
 -    ovl_Boss_07
 -    ovl_Boss_Hakugin
 -    ovl_Elf_Msg
 -    ovl_Elf_Msg2
 -    ovl_Elf_Msg3
 -    ovl_Elf_Msg4
 -    ovl_Elf_Msg5
 -    ovl_En_Az
 -    ovl_En_Bigokuta
 -    ovl_En_Bigpamet
 -    ovl_En_Bigpo
 -    ovl_En_Bigslime
 -    ovl_En_Box
 -    ovl_En_Butte
 -    ovl_En_Col_Man
 -    ovl_En_Crow
 -    ovl_En_Death
 -    ovl_En_Elf
 -    ovl_En_Elforg
 -    ovl_En_Encount3
 -    ovl_En_Encount4
 -    ovl_En_Fish
 -    ovl_En_Fish2
 -    ovl_En_Fsn
 -    ovl_En_Honotrap
 -    ovl_En_Horse
 -    ovl_En_Horse_Game
 -    ovl_En_Invadepoh
 -    ovl_En_Ishi
 -    ovl_En_Kame
 -    ovl_En_Kanban
 -    ovl_En_Kusa2
 -    ovl_En_M_Thunder
 -    ovl_En_Maruta
 -    ovl_En_Mushi2
 -    ovl_En_Okuta
 -    ovl_En_Ossan
 -    ovl_En_Pametfrog
 -    ovl_En_Peehat
 -    ovl_En_Rg
 -    ovl_En_Ruppecrow
 -    ovl_En_Slime
 -    ovl_En_Sob1
 -    ovl_En_Syateki_Man
 -    ovl_En_Test7
 -    ovl_En_Trt
 -    ovl_En_Wiz_Fire
 -    ovl_Mir_Ray
 -    ovl_Obj_Bombiwa
 -    ovl_Obj_Driftice
 -    ovl_Obj_Hariko
 -    ovl_Obj_Iceblock
 -    ovl_Obj_Mure
 -    ovl_Obj_Snowball2
 -    ovl_Obj_Toudai
 -    ovl_select

* Make now defaults to only build the uncompressed rom. This fixes permuter import errors, and makes building quicker since most of the time people only need to test one rom. Uncompressed was chosen because it's easier to debug with the first_diff script.

Co-authored-by: MMDecomp <MMDecomp@anon.tld>
 2021-02-25 19:12:48 -05:00
Kenix3GitHubMMDecomp
 		7955a59194 PoC automatic rodata split Total split: 585 Failed / Troublesome: 61 (10,42735042735043%) Successfull rodata split: 524 (89,57264957264957%) Failed due to Script issues: 51 Failed due to object boundary issues or unreferenced .rodata: 10 Build OK?: :feelsokman: (#51) 
rom_uncompressed.z64: OK
2a0a8acb61538235bc1094d297fb6556  rom.z64
rom.z64: OK

List Of Troublesome (mostly simliar edge cases, some are strings that we dont catch right / data without references):
 -    ovl_Arrow_Ice
 -    ovl_Arrow_Light
 -    ovl_Bg_Dkjail_Ivy
 -    ovl_Bg_Ikana_Mirror
 -    ovl_Boss_02
 -    ovl_Boss_07
 -    ovl_Boss_Hakugin
 -    ovl_Elf_Msg
 -    ovl_Elf_Msg2
 -    ovl_Elf_Msg3
 -    ovl_Elf_Msg4
 -    ovl_Elf_Msg5
 -    ovl_En_Az
 -    ovl_En_Bigokuta
 -    ovl_En_Bigpamet
 -    ovl_En_Bigpo
 -    ovl_En_Bigslime
 -    ovl_En_Box
 -    ovl_En_Butte
 -    ovl_En_Col_Man
 -    ovl_En_Crow
 -    ovl_En_Death
 -    ovl_En_Elf
 -    ovl_En_Elforg
 -    ovl_En_Encount3
 -    ovl_En_Encount4
 -    ovl_En_Fish
 -    ovl_En_Fish2
 -    ovl_En_Fsn
 -    ovl_En_Honotrap
 -    ovl_En_Horse
 -    ovl_En_Horse_Game
 -    ovl_En_Invadepoh
 -    ovl_En_Ishi
 -    ovl_En_Kame
 -    ovl_En_Kanban
 -    ovl_En_Kusa2
 -    ovl_En_M_Thunder
 -    ovl_En_Maruta
 -    ovl_En_Mushi2
 -    ovl_En_Okuta
 -    ovl_En_Ossan
 -    ovl_En_Pametfrog
 -    ovl_En_Peehat
 -    ovl_En_Rg
 -    ovl_En_Ruppecrow
 -    ovl_En_Slime
 -    ovl_En_Sob1
 -    ovl_En_Syateki_Man
 -    ovl_En_Test7
 -    ovl_En_Trt
 -    ovl_En_Wiz_Fire
 -    ovl_Mir_Ray
 -    ovl_Obj_Bombiwa
 -    ovl_Obj_Driftice
 -    ovl_Obj_Hariko
 -    ovl_Obj_Iceblock
 -    ovl_Obj_Mure
 -    ovl_Obj_Snowball2
 -    ovl_Obj_Toudai
 -    ovl_select

Co-authored-by: MMDecomp <MMDecomp@anon.tld>
 2021-02-25 19:05:33 -05:00
Kenix3andGitHub 73eed5a0b3 Fixes IDO recomp and allows git to detect binary files. (#50) 2021-02-25 18:21:51 -05:00
Kenix3 48aa632eb6 Flags ido_recomp as binary. 2021-02-24 01:06:20 -05:00
louist103GitHubKenix3
 		36557611ce Added IDO recomp support (#45) 
* Added recomp

* Fix .exes not being included maybe

* Fixed now?

* OK this should add IDO

* Re recompile in -O2

* Updates asm-processor to point to current HEAD.

* Uses the exact same ido_recomp binaries as OOT.

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
 2021-02-24 00:50:57 -05:00
TharoandGitHub c55e9eeee5 pragma variant for GLOBAL_ASM (#49) 
* pragma GLOBAL_ASM

* Revert split_asm.py arg description change
 2021-02-23 23:15:58 -05:00
kyleburnetteandGitHub e0164dba14 Fixed ultratypes.h (#48) 
* fixed ultratypes.h

* fixed ultratypes.h
 2021-02-23 23:08:16 -05:00
kyleburnetteandGitHub 0481c23e75 en_okarina_effect OK (#47) 
* en_okarina_effect OK

* Changed setupaction name
 2021-02-23 22:46:35 -05:00
kyleburnetteGitHubfullgrowngaming
 		55c558852f en_rsn OK (#41) 
* en_rsn OK

* Fixed build error caused by collisioncheck

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
 2021-02-12 18:26:05 -05:00
kyleburnetteGitHubfullgrowngaming
 		08e964972f en_nnh OK (#42) 
* 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>
 2021-02-12 18:25:48 -05:00
kyleburnetteGitHubfullgrowngaming
 		ee0ab1cbc9 en_hs2 OK (#46) 
* en_hs2 OK

* Formatted files

* Renamed the DoNothing func.

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
 2021-02-11 22:12:54 -05:00
Kenix3GitHubMMDecomp
 		6ac8ea373c Decompile ovl_TG_Sw (#44) 
Co-authored-by: MMDecomp <MMDecomp@anon.tld>
 2020-12-09 19:35:40 -05:00
fullgrowngamingandGitHub 96f680d1d1 en_ending_hero OK (#36) 
* Initial work

* en_ending_hero OK

* Converted array of UNKPTRs to symbols

* Moved texture arrays back outside function
 2020-10-26 19:01:01 -04:00
fullgrowngamingandGitHub a9138a7c0f ending_hero5 OK (#40) 
* ending_hero5 OK

* Formatting

* Fixed formatting and changed colors to decimal
 2020-10-26 19:00:02 -04:00
fullgrowngamingGitHubRozelette
 		c4f4dcebc7 en_ending_hero4 OK (#39) 
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
 2020-10-12 22:33:42 -05:00
fullgrowngamingGitHubRozelette
 		98992c25b4 ending_hero3 OK (#38) 
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
 2020-10-12 22:33:02 -05:00
fullgrowngamingGitHubRozelette
 		f3fbb6474c ending_hero2 OK (#37) 
* ending_hero2 OK

* Formatting

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
 2020-10-12 22:32:19 -05:00
fullgrowngamingandGitHub e997a0b67f en_dy_extra OK (#35) 
* dy_extra decomped, but not ok

* Formatting

* Fixed data, en_dy_extra now OK

* Formatting

* Removed unnecessary color struct

* added newlines
 2020-10-12 22:30:22 -05:00
fullgrowngamingandGitHub f927730418 Arms_Hook OK (#33) 
* All but 2 functions matched

* More work on hookshot

* hookshot work

* 2 functions left (and one is almost done)

* sp issues with draw, but matching otherwise

* hookshot matching

* Changed rodata inclusion for armshook

* Hookshot OK

* Resolve script conflicts

* Rename unk variables to match MM standard

* Made requested changes
 2020-10-11 18:30:22 -05:00
fullgrowngamingandGitHub 1c4a3047de z_skelanime OK (#34) 
* initial skelanime commit

* Skelanime OK

* Forgot to add z64animation.h and skelanime.c
 2020-10-11 13:31:06 -04:00
fullgrowngamingandGitHub 96d05d4e7d en_tanron6 OK (#27) 
* en_tanron6 OK

* Fixed name of SetupDoNothing

* Fixed initvars name

* Fixed initvars name

* Fixed initvars name
 2020-09-28 19:27:21 -04:00
fullgrowngamingandGitHub 378684152c bg_market_step OK (#21) 
* bg_market_step OK

* Ran formatting script

* Converted arrays to Gfx* arrays and formatted init vars properly

* Propery formed display lists and arrays
 2020-09-28 19:26:33 -04:00
Rozelette 31a5f1e4ba Use MAKE in Makefile 2020-09-28 17:42:16 -05:00