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
3,145 Commits 2 Branches 11 Tags
android
Commit Graph
3145 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek HensleyandGitHub cbe2d5a24a Fixed (#184) 2021-06-15 19:04:58 -04:00
Anghelo CarvajalandGitHub 1961d5d771 Add CutsceneData (#187) 2021-06-15 18:59:01 -04:00
kyleburnetteandGitHub ad3f2b525e bg_iknin_susceil OK (#186) 
* 6 functions left

* All but one function matched

* all functions decomped

* Formatted files

* Added switch flag define

* Made all suggested changes
 2021-06-15 18:43:01 -04:00
kyleburnetteGitHubengineer124
 		80752e1107 iknv_obj ok (#183) 
* iknv_obj ok

* Documented a few more functions and updated type enum

* Added engineer's changes

* Changed negations at engineer's request (casts required)

* Changed negations at engineer's request (casts required)

* Got rid of extra parentheses

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

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2021-06-15 18:32:59 -04:00
Derek HensleyandGitHub 74e418f24f ovl_En_GirlA OK and documented (#182) 
* EnGirlA Matches

* Convert func to boolean

* Cleanup

* missed a little cleanup

* Update with new MACRO

* revert z_en_item00.c macro, and add one more macro

* Documented

* Format macros.h

* Fix VTX format

* rename isBought to isOutOfStock

* PR suggestions

* Document a bug

* PR comments
 2021-06-15 08:45:19 -04:00
engineer124andGitHub c203b9b606 Importing Sound Effects from MM3D (#179) 
* Add sfx & update Audio_PlayActorSound2

* more sfx

* Match Enemies sfxId

* Update with PR

* Update sfx for new pr

* Fix commit
 2021-06-11 21:08:47 -04:00
ZelllllGitHubDerek HensleyZach Banks
 		54aef44a9e z_bg_tobira01 OK (#168) 
* data merge

* two funcs

* one left

* actor OK

* file done

* fix warnings with jenkins

* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update z_bg_tobira01.c

* Update z_en_encount2.h

* Update z_obj_bell.c

* Update z_en_pametfrog.c

* Update z_en_minifrog.c

* Update include/functions.h

Co-authored-by: Zach Banks <zjbanks@gmail.com>

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Zach Banks <zjbanks@gmail.com>
 2021-06-11 18:03:45 -04:00
IsghjGitHubisghj8Derek Hensley
 		bb7247875b En_Weather_Tag (#178) 
* EnWeatherTag: Start

* EnWeatherTag: matching function, but suspicious

* EnWeatherTag: two non-matching functions, rest match

* EnWeatherTag: cleaning and docs

* EnWeatherTag: more docs

* WeatherTag: more docs

* WeatherTag: cleaning

* WeatherTag: pad renamed to unk to match

* Update include/z64save.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update include/z64.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* WeatherTag: requested changes

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2021-06-11 08:15:09 -04:00
Derek HensleyandGitHub 70b67402cb ovl_en_in OK (#173) 
* First pass, 5 still non matching

* data

* cleanup

* Progress on func_808F33B8

* func_808F33B8 is ugly but it matches

* func_808F5728 ugly but matches

* cleanup

* More cleanup/doc a possible inifite loop bug

* Cleanup of the switch

* Readd functions returns

* More progress on THE switch

* Everything matches but the MACROS

* OK

* Add new global Animaion struct

* fix arg name

* PR suggestions pt 1

* PR suggestions pt 2

* Fix up a few things

* Add comment about walking flag

* update functions.txt

* Update 7 to more explicit bits

* More PR cleanup
 2021-06-10 23:08:25 -04:00
engineer124andGitHub 059c9075ca effect_soft_sprite matching! (#177) 2021-06-10 18:05:40 -04:00
kyleburnetteandGitHub d7fc053441 Added data_parser.py to assist in moving data over to c files more easily (#174) 
* Added data_parser.py to assist in moving data over to c files more easily.

* Update data_parser.py

Added UNK_TYPE to extern
Added newline at end of file
 2021-06-10 17:35:46 -04:00
engineer124GitHubengineer124
 		ae2073e119 Ovl_En_Pametfrog OK with partial documentation (#165) 
* Init, 14 of 70 decompiled

* En_Pametfrog 26/70 functions decompiled

* 35/70 funcs

* Fully Matching!

* Documentation

* Fix merge from master

* PR suggestions

* minor improvements

* Fix functions.h

* Oopsie

* Oopsie Part 2

* Remove Pametfrog from split_asm.py rodata_excluded

* Better use of MACROS + animation docs

Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
 2021-06-10 17:34:57 -04:00
engineer124andGitHub e9eb4d4e0a Match z_effect.c (#176) 2021-06-10 08:13:43 -04:00
Parker BurnettandGitHub aae3c6f895 Obj_ghaka OK (#171) 
* getting ghaka started

* two more matching funcs

* functions all match, but no OK...yet....

* some clean up stuff

* uhhh lets try this?

* fixing save context stuff

* z_obj_ghaka OK

* fixing small changes

* adding in new suggestions

* fixing error
 2021-06-10 07:55:21 -04:00
engineer124GitHubengineer124
 		9102481fc2 Ovl_En_Minifrog OK with partial documentation (#166) 
* En_Minifrog first few funcs decompiled

* more matching

* En_Minifrog 3 non_matching functions left

* two functions left

* Start Documentation

* Fully Matching!

* Documentation

* Fix merge with master

* minor pr changes

* Minor improvements

* PR Suggestions + Minor docs

* Fix bool

* PR suggestions

Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
 2021-06-09 21:03:42 -04:00
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