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
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
Anghelo CarvajalandGitHub 194c99d80b Subrepos update (#613) 
* a

* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "6f8f80b71"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ"
  branch:   "main"
  commit:   "6f8f80b71"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/z64compress --force

subrepo:
  subdir:   "tools/z64compress"
  merged:   "9e7a6dbfa"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "9e7a6dbfa"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

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

* Revert "git subrepo pull tools/z64compress --force"

This reverts commit a7cc87394ed4afb5ebe1f2318526545b6bbe205d.
 2022-01-16 18:30:31 +00:00
engineer124andGitHub 9e6a6eee4c Audio_Effects OK and Documented (#549) 
* Audio_Effects OK

* Remove duplicate

* PR Suggestion

* Small cleanup

* Small Touchup
 2022-01-16 18:24:58 +00:00
MaideandGitHub 332c71c9b1 Update (#608) 2022-01-16 18:20:03 +00:00
ZoeyZolotovaandGitHub 94a2e5a3d7 Update and fix a few comments for the banker. (#598) 
* Update and fix a few comments for the banker.

* Change 'Link' to 'the player' and remove some actual message quotes.
 2022-01-16 18:14:09 +00:00
EllipticEllipsisandGitHub b2a42dcf8b Two small xmls for parameter-related asset files (#548) 2022-01-16 18:07:19 +00:00
EllipticEllipsisandGitHub 924fa9aadf EnMag OK and documented (#547) 
* Name textures in object_mag

* Corrections

* tabs -> spaces

* OK, data imported

* Remove obsolete comment

* Start documentation

* Defines for most texture sizes

* Name most static variables, add state enum

* Macros, name all the statics

* Couple of minor tweaks to other files

* Name some more effect stuff

* Fix kanfont data

* Name everything else, move macros

* Format

* Review
 2022-01-16 17:55:03 +00:00
MaideandGitHub b47941968d En_Ig (#533) 
* En_Ig

* UNK_TYPE1

* Remove syms

* PR

* PR

* Merge

* Merge
 2022-01-16 17:46:08 +00:00
Parker BurnettandGitHub 7aa3766d67 En_hgOK (#394) 
* en_hgo OK

* Formatting changed somehow?...hopefully this fixes

* who would win, Cammoguy or one letter?

* format

* addressing review comments

* fixing PR comments

* fixing and merging master

* forgot to format

* fixes warnings?

* minor documentation...don't have tools to do more

* Fixing things, hopefully OK

* formatting...

* clean-up undefined syms
 2022-01-16 09:37:21 -05:00
MaideandGitHub 816971d98c En_Kanban (1 non-matching) (#419) 
* En_Kanban

* PR

* PR

* Object

* undef

* PR

* Merge

* Merge

* Merge
 2022-01-12 15:37:26 +00:00
Anghelo CarvajalGitHubEllipticEllipsisTharoDerek Hensley
 		c44e26a143 __osMalloc.c OK (#395) 
* __osRealloc

* match __osCheckArena

* cleanup

* Import bss, unreferenced strings and cleanup

* format

* Reviews

* Move convert.h to ultra64/

* Make the os_malloc.h header

* potato

* renames and fixes

* format

* small doc pass
}

* format

* minor changes

* Introduce system_malloc.h

* Docs pass

* fix

* format

* stuff

* Apply suggestions from code review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* review

* format

* remove repeated sentence

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* include headers

* review

* Rename __osMallocAddHeap

* remove @brief

* Update src/boot_O2/__osMalloc.c

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

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2022-01-11 23:25:14 +00:00