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
Anghelo CarvajalandGitHub 656fd08ee8 Gamestate table (#1354) 
* gamestate_table.h

* move macros

* bss

* format
 2023-08-12 11:44:35 -04:00
Tom OvertonandGitHub 138dd55662 Document object_tl (Snapper) (#1349) 
* Document object_tl (Snapper)

* Rename skelAnimes/jointTables/morphTables
 2023-08-12 17:31:46 +10:00
IsghjandGitHub 93dbe1a02a Tools: add assets/xml folder to rename_sym.sh directories 2023-08-12 15:37:04 +10:00
MegaIDKandGitHub c4c7ca9f61 document object_dinofos (#1343) 
* initial commit of object_dinofos documentation

* forgot to format

* dinolfoslimb

* eye texturs

* desc position and eye tex name change

* forgor the rest

* removed object .h from .c #includes
 2023-08-12 13:35:43 +10:00
engineer124andGitHub 2f1996a526 Animation Cleanup: En_E* (#1331) 
* begin E

* more cleanup

* limb index

* small cleanup

* format

* PR Review

* sLimbToBodyParts

* more bodypart cleanup
 2023-08-10 21:26:29 -04:00
Derek HensleyandGitHub e1e30586c9 Fix first_diff and sym_info for older and new ld (#1342) 
* Fix map parsing for ld >= 2.40

* mapfile_parser

* Paths

* mapfile_parser requirement

* Move tools back

* Comment

* Add ability to decode instructions for first_diff

* import error for mapfile_parser

* PR comments from OOT

* ,s
 2023-08-10 20:58:20 -04:00
Synray 2ae90ab393 Cleanup 2023-08-10 16:34:09 -07:00
Synray 018b9b7c63 Bg_Danpei_Movebg OK 2023-08-09 22:27:31 -07:00
MegaIDKandGitHub b65577de4e document object_fr (#1339) 
* initial commit of object_fr documentation

* fixed unused texture height

* format and slight limb name changes

* froglimb

* removed object .h from actor .c #includes

* change eye textur

* sIsInitialized

* named anim enum values
 2023-08-09 22:33:08 -04:00
Anghelo CarvajalandGitHub d107b6c2a9 z64vi*.h and sys_cfb.h headers (#1259) 
* z64vimode.h

* z64viscvg.h

* z64vis*.h

* VisCvg

* sys_cfb.h

* a bit of naming

* review

* Renames

* bss

* fix

* bss

* bss

* bss

* messed up the merge

* bss is borken

* reordering 2

* remove prevent header from fault.c
 2023-08-09 19:44:31 -04:00
engineer124andGitHub 17b774effe Animation Cleanup: En_F* (#1332) 
* Anim F Cleanup

* minifrog

* cleanup

* more cleanup

* cleanup fishing limb

* format

* spacing

* PR Review
 2023-08-06 10:02:37 -04:00
engineer124andGitHub 4ae00e909e Fix Cutscene Bss (#1305) 
* demo bss

* fix bss

* sPad

* also matching

* static bss pad

* ultratypes

* spacing

* cleanup
 2023-08-04 16:36:03 -04:00
Tom OvertonandGitHub 27ccadc77e Document the function that handles the Giant's Mask cutscene in Boss02 (#1345) 
* Document the function that handles the Giant's Mask cutscene in Boss02

* Remove newline between fallthrough and next case
 2023-08-04 13:06:36 +10:00
IsghjandGitHub 5625603b56 ShotSun: some docs (#1348) 2023-08-04 12:35:59 +10:00
engineer124andGitHub 253209d722 Bottle Params (#1328) 
* bottle param docs

* none to any

* reorder

* macro use

* PR Review

* brackets
 2023-08-02 11:27:03 +10:00
engineer124andGitHub fa30dea28d namefixer.py hotfix (#1347) 
* namefixer hotfix

* Actor_OfferTalkExchangeEquiCylinder
 2023-08-01 09:55:14 -04:00
Derek HensleyandGitHub 410d412d0a Talk Exchange System Docs (#1312) 
* Fix typo

* PLAYER_IA_HELD

* Actor offer exchange item functions

* SubS_OfferExchangeItemCustom

* SubS_OfferItem + enum

* Actors that use Subs_OfferItem

* SubS_OfferExchangeItemFacing

* Comments

* Format

* Better comment

* EnRg

* function names and comments

* Split enum

* exchangeItemId -> exchangeItemAction

* namefixer

* PR comments

* Missed a comment

* Max -> Mask

* SubS_SetOfferMode

* Some more comments updating

* rg comment

* PLAYER_IA_CONTINUE

* Revert back to PLAYER_IA_MINUS1

* Comment typos/grammar

* Verify functions

* yawRange

* Actor_OfferTalkNearby

* Actor_OfferTalkExchangeEquiCylinder

* format

* Actor_OfferTalkNearColChkInfoCylinder

* OfferTalk comments

* Actor_OfferTalkExchange comment enum

* format
 2023-08-01 09:40:12 +10:00
Tom OvertonandGitHub 70a54256b7 Remove plural "Limbs" from object decomp example (#1344) 
* Remove plural "Limbs" from object decomp example

* Missed one
 2023-07-29 09:44:02 -04:00
Tom OvertonandGitHub bbfbc4073e Update ZAPD subrepo (#1338) 
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "cb0342425"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "cb0342425"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "505024b33"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "505024b33"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Disable Wno-hardcoded-pointer for `make assets`
 2023-07-28 18:20:12 -04:00
MegaIDKGitHubMegaIDK
 		6f7d6cc47e initial commit of rock object_ishi documentation (#1340) 
Co-authored-by: MegaIDK <pc@DESKTOP-37QIOUU.localdomain>
 2023-07-27 20:16:46 -04:00
Derek HensleyandGitHub eb6b837d65 Clang-Format 14 (#1321) 
* format

* Update dockerfile and other documentation

* Update mac instructions
 2023-07-27 12:15:40 -04:00
Derek HensleyGitHubTom Overton
 		9e85f5545a Shopkeeper weekeventregs (#1325) 
* Ossan

* sob1 talked

* fsn weekeventregs

* Curiosity shop 3rd day item to special item

* Kotake

* Format

* Kotake bottle

* PR suggestions

* Koume Kiosk -> Kiosk Koume

* Update include/z64save.h

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
 2023-07-18 14:51:56 -04:00
Tom OvertonandGitHub 76e02120a0 Add original asset names to all object_h* files (#1330) 
* Add original asset names to all `object_h*` files

* Soften language used in `object_hunsui`, because we can't say for sure that we know the names of the collision files, even if it feels pretty clear

* Switch from "is" to "might be" on the DLs too
 2023-07-18 14:25:25 -04:00
engineer124GitHubIsghjTom Overton
 		b3f4b8a9cb Animation Cleanup: En_B* Actors (#1326) 
* En_B

* more cleanup

* another if (1) fixed

* more cleanup

* more cleanup

* rot

* PR Suggestions

* fix vtx

* rm more Draw

* Update assets/xml/objects/object_yb.xml

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Update assets/xml/objects/object_bigpo.xml

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

---------

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
 2023-07-14 16:33:58 -04:00
engineer124andGitHub 6d94e0ce9b ClearTag Params Cleanup (#1308) 
* clearTag params

* header ordering

* brackets

* cleanup

* add note
 2023-07-14 14:56:08 -04:00