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
Tom OvertonandGitHub 0e6662aafd Document objects used with En_Fall (fall, fall2, lodmoon, moonston) (#558) 
* Document lodmoon

* Document moonston

* Document the open-mouth moon part of fall2

* Document object_fall

* Move flags to .c

* palette -> tlut

* File header comment

* OPEN_DISPS/CLOSE_DISPS spacing

* Lots more spacing

* Add spaces after breaks

* Better describe the subtypes

* More fixes

* Be a little more specific in fireball comments

* Respond to Elliptic's second review

* I need to stop forgetting to run ./format.sh

* Single line comment styling

* Preserve ordering
 2022-01-30 17:19:41 -03:00
MaideandGitHub 5eb1b417de En_Hint_Skb (#554) 
* En_Hint_Skb

* Merge

* Actorfixer fail

* Merge

* PR
 2022-01-30 17:13:46 -03:00
Tom OvertonandGitHub 5f425bf73c Document object_boss03 (#559) 
* Document object_boss03

* Actually run ./format.sh

* Preserve ordering

* Move Tanron3 limb enum to object

* Don't name the limb enum after the actor
 2022-01-30 17:07:22 -03:00
MaideandGitHub 06a14e73ea En_Scopenuts (#560) 
* En_Scopenuts

* Merge

* PR

* Fix

* PR
 2022-01-30 17:00:19 -03:00
MaideandGitHub b8c33ffa54 En_Rg (1 non-matching) (#565) 
* En_Rg

* UNK

* PR

* PR

* Merge

* Merge

* PR

* textures
 2022-01-30 16:53:54 -03:00
MaideandGitHub a00601671d En_Zos (#609) 
* En_Zos

* Merge
 2022-01-30 16:48:40 -03:00
EllipticEllipsisandGitHub f5740dab41 contramwrite OK (#578) 2022-01-30 16:43:03 -03:00
LtPeriwinkleandGitHub af26d4edac EnBigokuta OK and documented + object_bigokuta documented (#563) 
* EnBigokuta like half matched

* match all but 2 functions

* match all the functions

* import data

* name object stuff

* use new object symbols, do some documenting

* fix name of headUndersideTex

* name some struct members

* finish documenting

* Address comments

spacing, unkFunc comments, temp names, remove parens, reorder pads,
data formatting, limb enum

* address comments

* move empty line

* change the ARRAY_COUNT
 2022-01-30 16:37:39 -03:00
EllipticEllipsisandGitHub 7879b49785 contramread OK (#577) 
* contramread OK

* Review
 2022-01-30 15:52:19 -03:00
MaideandGitHub e4010be70c Obj_Oshihiki (#636) 2022-01-29 20:00:43 -05:00
EllipticEllipsisandGitHub e442808dfc Extract nes_font_static (#555) 2022-01-29 19:22:03 -05:00
MaideandGitHub c840e04c27 En_Trt2 (#448) 
* Trt2

* Whoops

* PR

* PR

* PR

* Merge

* Merge

* Merge

* bgcheck

* I got trolled >:
 2022-01-29 18:45:32 -05:00
Lucas ShawGitHubAnghelo Carvajal
 		850823c2ee ovl_Obj_Kzsaku OK (#506) 
* ovl_Obj_Kzsaku OK

* add packing macro

* made suggested changes

* switch pad order

* made some suggested changes. still don't know completely about naming

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2022-01-23 09:40:47 -03:00
Anghelo CarvajalandGitHub 5e4c8e0506 scene_textures (#550) 
* scene texture xml generator

* Create XMLs for every scene_texture except 3 and 7

* Manually add blobs

* add XMLs for not used ones

* update spec

* Add scene_texture as external files to every scene that uses them

* add gsDPLoadTextureBlock_4b

* gsDPLoadMultiBlock

* gsDPLoadTLUT_pal16

* gsDPLoadMultiBlock_4b

* Add back the blob I removed...

* address review

* Fix tluts

* delete script
 2022-01-22 17:49:35 -03:00
MaideandGitHub 7ed396f09e Cleanup object syms (#546) 
* First

* Part2

* Save now or forever hold your peace

* Part3

* Building

* OK

* Cleanup

* Merge

* PR

* PR

* Merge

* PR

* PR

* Use oyu

* Use names

* TexturePtr
 2022-01-22 13:30:32 -05:00
Anghelo CarvajalandGitHub 2a913635a4 ZAPD hotfix (#629) 
* git subrepo pull tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "be71e26d9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "be71e26d9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "119a6883e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "119a6883e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2022-01-21 04:40:12 +00:00
Derek HensleyandGitHub 1531f5b56f General Cleanup (#600) 
* Remove excess prevent_bss_reordering.h

* Cleanup THIS and globalCtx2

* Iceblock relocs

* Format

* PR plus more this

* door spiral

* THIS and globalCtx2 swap, along with sSetupDL in firefly

* Revert ObjMure change

* door_spiral and unused in en_test5

* PR comments
 2022-01-19 12:03:05 -03:00
Tom OvertonandGitHub 97b47fa14b Fix some more dummy label matches (#619) 
* Fix some more dummy label matches

* Add missing space

* Add a space to force Jenkins to run again

* Remove the previous space
 2022-01-19 10:37:18 -03:00
MaideandGitHub 6d52cee5fe En_Bom (#537) 
* Broken

* En_Bom

* PR

* PR

* Merge

* PR
 2022-01-18 22:19:15 -05:00
Anghelo CarvajalandGitHub 399f5a1b33 Split rsp files (#602) 2022-01-17 15:45:20 -05:00
engineer124 90a5abfb83 Merge branch 'master' into parameter 2022-01-17 14:33:56 +11:00
engineer124 7dbe188ecf Merge branch 'master' into voice 2022-01-17 14:25:10 +11:00
EllipticEllipsisandGitHub 0da2ed135b git subrepo pull (merge) --force tools/ZAPD (#618) 
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0ba781304"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0ba781304"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2022-01-17 01:05:00 +00:00
Derek HensleyandGitHub aa90d1ee2b SubS Skelanime functions (#572) 
* Bring code over

* Change ActorDraw typedefs from actor to thisx

* Rename functions

* Format

* Rename and clean up limb draws

* Some more limb draw cleanup

* Some more cleanup

* Function comments

* Last bit of cleanup

* update tutorial

* More tutorial and format

* Remove extra newlines form actorfixer

* Missed one

* Remove some unnecessary casts

* Fix SkelAnime transform functions in functions.h

* Remove bug comments, and add note

* Remove some more unneeded casts and rename one variable

* format

* Fix merge

* Format
 2022-01-16 20:14:34 +00:00
Tom OvertonandGitHub a9c2449c11 Bring merged assets up to current standards (#570) 
* Bring merged assets up to current standards

* Clarify bigslime
 2022-01-16 18:36:19 +00:00