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
2,954 Commits 2 Branches 11 Tags
develop
Commit Graph
2954 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
NickGitHubengineer124
 		5110943377 Obj_Kibako OK (#169) 
* Clean dist.

* ovl_Obj_Kibako OK

* Run clang-format

* Suggested changes.

* Suggested Changes

* Consistency change.

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c

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

* PLAYER macro

* Suggested Changes

* Suggested Changes

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2021-06-09 18:53:36 -04:00
Derek HensleyandGitHub 3ac21daf26 ovl_dm_char07 OK (#172) 
* Dm_Char07 Ok

* Cleanup

* Documented

* Add small documentation to en_toto and run format

* Better documenting of spotlight flags

* PR suggestions
 2021-06-09 18:51:33 -04:00
engineer124andGitHub 8b21da8c34 Match Remaining EnGinkoMan Functions (EnGinkoMan OK) (#175) 
* EnGinkoMan OK

* Cleanup

* Minor PR suggestion
 2021-06-09 18:49:20 -04:00
Anghelo CarvajalGitHubengineer124Kenix3
 		83e263ab12 ovl_En_Ma_Yts OK and partially documented (#164) 
* destroy

* moar

* limbdraw

* some setups identified

* func_80B8D6F8

* func_80B8E0BC

* fix unmatching

* func_80B8D12C

* func_80B8D1E8

* func_80B8DBB8

* some renaiming

* some renaimings

* symbols

* small renaming and a few functions

* Almost every function done

* lots of renames

* Fix merge conflicts

* misc notes

* struct_800BD888_arg1

* some renamings and enum

* func_80B8D2D8

* func_80B8DA28

* import data and cleanup

* format

* minor changes

* Documentation pass

* update enum name

* Remove object XML

* run format

* Move EN_MA_YTS_PARSE_TYPE to header

* fix conflicts

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c

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

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h

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

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c

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

* move struct to z64animation

* Change PARSE_TYPE macro to accept actor param

* format

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
 2021-06-09 18:38:35 -04:00
Anghelo CarvajalandGitHub b6904aa2cc Convert every submodule into subrepo (#170) 
* remove ZAPD submodule

* git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "ca229f19"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "ca229f19"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "1e4b85a7"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "1e4b85a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Remove asm-differ

* git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "eaf72269"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "master"
  commit:   "eaf72269"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove asm-processor

* git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "85288fcd"
upstream:
  origin:   "https://github.com/simonlindholm/asm-processor.git"
  branch:   "master"
  commit:   "85288fcd"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove .gitmodules file

* Update REAMDE

* Update warnings
 2021-06-07 18:31:56 -04:00
Parker BurnettandGitHub 2bf68a5263 Z_obj_bell Matching (#167) 
* ringing in the bell

* another matching func

* stuck on func_80A357A8, needs a z_actor func...

* no luck on a fix, but got further...

* matched func_80A357A8, one left

* might be on the right track? saving progress...

* getting closer

* pushing up matching, it has warnign regarding Vecs

* all functions matching

* obj_bell OK, time for bed

* prepping for PR

* fixing suggestions
 2021-06-02 19:13:06 -04:00
Derek HensleyandGitHub 631225a626 Ovl_Obj_HsStump Ok but one function does not match (#156) 
* Everything matches but func_80BDABCC

* Better names, still stuck on func_80BDABCC

* Some cleanup

* Add param macros and document not matching

* format

* PR suggestions

* Bring over data to c file

* Retry Jenkins

* Retry Jenkins take 2

* PR suggestions for comments

* PR comments
 2021-06-02 18:57:19 -04:00
Derek HensleyandGitHub fb84cabd4a Ovl_En_Toto OK (#163) 
* Lots of progress

* OK

* Removed casts

* Run format.sh

* cleanup

* More cleanup

* Minor Doc

* More cleanup

* Format

* Add header description

* PR comments

* Convert raw pointers

* Update to new gSaveContext

* PR suggestions
 2021-06-02 18:33:16 -04:00
Anghelo CarvajalandGitHub f0bad10668 Update ZAPD to use scene macros, improve texture system and others (#129) 
* Fix segments

* add CMD_PTR macro

* macro fixes

* add PolygonDlist2

* Fix XMLs

* I hope this updates ZAPD

* Add ZAPD config files

* remove old structs

* update macro

* Add newline

* update ZAPD?

* update warnings

* update ZAPD
 2021-06-02 18:18:38 -04:00
Derek HensleyGitHubengineer124
 		7d476f7c71 Ovl_Dm_Nb OK (#162) 
* match but func_80C1DF18

* Everything matches

* Add comment about unknown pointer

* Rename vars

* Update comment

* format

* Added header description

* Remove raw pointer

* Remove unnecessary foward declarations

* Update include/functions.h

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

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2021-06-02 17:04:04 -04:00
Kenix3andGitHub f85feadc27 Adds a REVIEWING.md documentation file (#160) 
* Adds a first pass of REVIEWING.md

* Update REVIEWING.md

* Clarifies better what files can be in the header.

* More clarity on how to resolve jenkins build errors.

* Adds a link to the Code Review Guidelines to README.md

* Adds code review guidelines link to contributing.md

* Clarifies trello procedures.

* Adds warning that NON_MATCHING equivalence isn't reviewed for yet.
 2021-05-30 11:20:29 -04:00
Anghelo CarvajalandGitHub 2f239c939d ovl_Obj_Milk_Bin OK (#161) 
* First pass

* second pass

* Everything matches now

* Fix ori

* final pass

* Add description

* Fix warnings (I hope)

* move dlist to top of the file

* Fix conflicts
 2021-05-25 21:15:41 -04:00
ZelllllGitHubAnghelo Carvajal
 		6c86016603 partially finish code_0x8012EC80, document all of gSaveContext (#138) 
* not ok, why?

* OK!

* fix data

* finish data etc

* work on save context

* save finished

* first func done

* roomInf

* done for now

* add missing file

* add most og names for struct members

* fix accidental change

* Update z_en_ginko_man.c

* Update z_scene.c

* maybe fix stuff hopefully

* proto

* sasa

* Update include/z64save.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* Update z64save.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
 2021-05-25 18:49:11 -04:00
engineer124GitHubJared Colletteengineer124
 		cf3eb3b2e1 Ovl_En_Fg OK (#133) 
* En_Fg Frogs 9/18 decompiled

* En_Fg Frogs One Non-Matching

* documentation and cleanup

* final matched function

* code_script

* whitespace

* Fixed some mistakes, EnFg_UpdateDust no longer matches?

* fixed nonmatching

* Minor fixes and documentation

* PR suggestions

* Fixed genericHeader rename to common

* Fix Warnings

* PR Good Documentation Suggestions

* update names

* more pr suggestions

Co-authored-by: Jared Collette <jcollette@4000v-udp25-l.eng.unimelb.edu.au>
Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
 2021-05-22 11:36:21 -04:00
engineer124GitHubengineer124
 		f4687fbbe7 General Cleanup (#155) 
* minor fixes

* Consolidate into globalCtx

* fix error

* Fix Warnings

Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
 2021-05-20 21:24:47 -04:00
Zach BanksandGitHub 8c62c102cf CONTRIBUTING.md (#157) 
* Draft CONTRIBUTING.md

* Expand PR process; mention KZ

* More TODO

* Add notes about documenting

* Address (most) PR comments

* Finish responding to PR comments; add PR template

* Fix grammar

* Add missing periods. More actor examples. Remove ref to booleans

* Add note about `NON_EQUIVALENT`; bold asset warning

* Condense PR template

* PR feedback from Kenix; Condense PR template

* Incorporate Thar0's feedback
 2021-05-20 21:06:30 -04:00
Anghelo CarvajalandGitHub 062a813fba Misc fixes (#159) 
* Fix `extract_assets` not properly checking if scenes files were updated

* fix `first_diff.py` path due to the baserom renaming

* FlexSkeletonHeader and other stuff

* fix some SkeletonHeader instead of FlexSkeletonHeader

* Add blob compilation to makefile

* CURRENT_DAY and type swaps

* Remove extra cast

* run format

* zbanks suggestions
 2021-05-20 18:52:07 -04:00
Zach BanksandGitHub 458dd13141 ovl_Bg_Ladder: OK (Wooden Ladder) (#135) 
* ovl_Bg_Ladder: OK (Wooden Ladder)

* Change sLadderDLists type; add comment about thisx

* Add macros for BgLadder params; rename object symbols
 2021-05-20 18:06:00 -04:00
Parker BurnettandGitHub cb89346c28 Obj_moon_stone Matching (#154) 
* most all matching, just one func left

* forgot about the object script

* Moon's Tear OK

* fixing suggestions

* fixing actor pointers
 2021-05-20 17:43:27 -04:00
Derek HensleyandGitHub e17b05b8fa Ovl_Bg_Ctower_Rot Ok (#149) 
* Ovl_Bg_Ctower_Rot Ok

* Move enum to h file

* Rename D_808E2564 to bgCtowerRotDlists

* Rename D_808E2564 to bgCtowerRotDlists take 2
 2021-05-20 17:23:23 -04:00
Anghelo CarvajalandGitHub 25afa196f6 Make Jenkins check if a PR will add new warnings (#150) 
* warning count

* update warnings

* Update warnings

* Use `tee`

* Suggestions of zbanks

* I hope this will fix it
 2021-05-19 22:14:20 -04:00
Zach BanksandGitHub 43ccf66c48 ovl_En_Torch2 OK (Elegy of Emptiness Shell) (#130) 
* ovl_En_Torch2 OK (Elegy of Emptiness Statue)

* Identify dlists; address PR comments

* Rename object segment symbols
 2021-05-19 20:58:32 -04:00
Derek HensleyandGitHub 5e7e5a1d9f Ovl_Obj_Tokei_Step OK (#122) 
* Everything matches but func_80AD6508

* Changed func_80AD6508 to non_matching

* Some cleanup

* Everything matches

* Finished cleanup and documentation

* Updated BgMeshHeader to Collision Header

* Add newline

* Update functions.txt

* Better function names

* format

* Better naming
 2021-05-19 20:24:33 -04:00
Zach BanksandGitHub ad9c5565ee z_view matching (#134) 2021-05-19 17:01:22 -04:00
Anghelo CarvajalandGitHub f3dc829456 ovl_Eff_Dust OK (#136) 
* some easy functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* init is cursed

Signed-off-by: Angie <angheloalf95@gmail.com>

* func_80919230 is weird

Signed-off-by: Angie <angheloalf95@gmail.com>

* I'm dumb

Signed-off-by: Angie <angheloalf95@gmail.com>

* func_80919768 nonmatching

Signed-off-by: Angie <angheloalf95@gmail.com>

* everything is wrong

Signed-off-by: Angie <angheloalf95@gmail.com>

* This thing still doesn't want to match

Signed-off-by: Angie <angheloalf95@gmail.com>

* improved a bit

Signed-off-by: Angie <angheloalf95@gmail.com>

* a bit of renaming, but it still doesn't work

Signed-off-by: Angie <angheloalf95@gmail.com>

* almost matching

* func_80919768 ok

* func_809199FC ok

* init was dumb

* add enum and other minor changes

* run format
 2021-05-18 23:01:48 -04:00