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
ElectrkandGitHub 89829b9905 EnInvisibleRuppe OK (#508) 
* EnInvisibleRuppe OK

* Style changes as per review

* Update reloc

* Apply feedback
 2021-12-19 18:47:08 +00:00
TharoandGitHub 8662b35a69 Update z64compress (#516) 
* git subrepo pull (merge) --force tools/z64compress

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

* Update wrapper

* If building with NON_MATCHING, do not pass --matching to z64compress
 2021-12-19 18:34:50 +00:00
Anghelo CarvajalandGitHub d998e8d8c5 Fix readme badge (#515) 2021-12-19 18:27:14 +00:00
Anghelo CarvajalandGitHub a0370e38b4 Fix bug in progress.py (#518) 
* Fix autogenarted names regex

* Use sizes from map file instead of reading the asm directly

* Speed up

* Fix gameplay_object_exchange_static being in the wrong category

* Fix regex again
 2021-12-19 11:52:06 -05:00
TharoandGitHub d62fb2b689 Initial object file xmls (#312) 
* git subrepo pull --force tools/ZAPD

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

* Object xmls

* Fix bss reordering

* Setup has warnings now

* Fix object_gi_reserve01 dlist names

* rm xml -> c make rule

* git subrepo pull --force tools/ZAPD

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

* SPBranchList related warnings gone

* Remove some mis-detected animations

* git subrepo pull --force tools/ZAPD

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

* scene related setup warning gone

* Fix

* Newlines
 2021-12-18 14:37:05 -05:00
Anghelo CarvajalandGitHub d4dc34ee71 Update progress script with new assets categories and update csv output format (#510) 
* Reorganize csvs and progress.py

* Put stuff in the correct folders

* Reduce lots of repeated code

* Change csv output format

* Filter out automaticaly named variables in "Matching" progress calculation for assets

* Address Elliptic's review

* Don't count handwritten files in progress and add a way to fix files detected in the wrong section

* Add missing "total"

* More fixing

* Add two missing columns

* Update paths in Jenkinsfile

* Update progress shield in readme

* Update progress link
 2021-12-18 16:37:37 +00:00
EllipticEllipsisandGitHub d5b71bd0f5 Tutorial (#362) 
* ObjTree OK, data imported

* EnMs OK, data imported

* And the spec

* OK

* Some minor edits

* A lot of preliminary stuff

* Mostly complete beginning

* First draft of other functions doc

* Whoops, forgot the GlobalContext pad

* Draw functions (minus colour), create Data

* Data

* gitignore, some progress on documenting

* Review comments, continue documenting

* spec

* Finish off documentation

* undefined_syms

* Add a couple of todos

* One more

* At least add tools for object decomp

* Start conversion table stuff

* Document ObjTree

* Document EnMs

* Add more tables to conversions

* Maide's review

* Review

* Review

* Typos and incomplete thoughts

* Update vscode.md

* Correct function/variable names

* Review suggestions

* Format

* Missed one

* Rename functions and format

* Fix ObjTree

* Update actorfixer.py, fix some variable names

* Some review

* Review suggestions

* More review

* Hopefully fix all the thisx references

* Missed one
 2021-12-16 18:47:18 -05:00
Parker BurnettGitHubElliptic EllipsisEllipticEllipsis
 		a6cd0e4427 Adding tools.md (#344) 
* Filling in what I could

* Organise, add most of the other tools, etc.

* removing redundant file and filling in TOC

* addressing comments

* Merge branch 'master' into contributing_update_tools

* hopefully adding pngs and missing tools

* quick fix

* applying feedback

* adding clarity to the sheet section

* Update docs/tools.md

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

* Update tools.md

* Update docs/tools.md

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

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
 2021-12-16 04:56:38 +00:00
EllipticEllipsisandGitHub 9ca4ec7604 ZAPD fixes in sys_initial_check, update subrepos (#507) 
* git subrepo pull --force tools/ZAPD

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

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

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

* git subrepo pull (merge) tools/z64compress --force

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

* Use defines for texture sizes in sys_initial_check

* Update extract_assets.py

* Add null check

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "50242eca9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "50242eca9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2021-12-15 23:05:29 -05:00
Lucas ShawandGitHub ff231e093a z_vr_box_draw OK (#481) 
* z_vr_box_draw OK

* ok

* Removed z_vr_box_draw.data.s, its actually z_sram_NES.data.s

* Added enum SkyboxId
 2021-12-07 04:36:02 +00:00
engineer124andGitHub ad02db9b82 Match func_809DAB78 (#495) 2021-12-07 03:18:25 +00:00
engineer124andGitHub 6ae28a789a Macro Clean up (#454) 
* Add OS macros

* MTXMODE cleanup

* format

* More matrix mode macros missed
 2021-12-07 02:13:18 +00:00
Tom OvertonandGitHub 93d7fe080b Do another round of improvement on actor comment headers (#462) 
* Update actor descriptions as of 11/3/2021

* Fix headers for everything I messed up

* Update headers as of 11/8/2021

* Update descriptions

* Update business scrub descriptions

* Respond to engineer's feedback

* Clean up Ruto description

* Mark chikuwa as unused

* Update description of blockstop

* Responding to Elliptic's review

* bigpi -> bigpo

* Update Trt2 description to be a little more clear

* Impove mu_pict description

* Add description for horse_game_check
 2021-12-07 02:01:51 +00:00
MaideandGitHub 22c72301dc En_Rr (#458) 2021-12-07 01:45:23 +00:00
engineer124andGitHub 1ab0fb5557 Importing Audio Sfx Params (#472) 
* Import audio sfx params

* Add TODO: description for this file
 2021-12-07 00:39:51 +00:00
Tom OvertonandGitHub d218c9be23 En_Stream (unused water vortex from OoT) OK (#480) 
* En_Stream (unused water vortex from OoT) OK

* Better names in EnStream_PlayerIsInRange

* Enum for whether the player is in range
 2021-12-06 23:52:18 +00:00
retroandGitHub 64ecb146ae EnFr (#494) 
* all matching

* implement feedback

* feedback

* feedback

* cleanup param macros
 2021-12-06 22:28:48 +00:00
retroGitHubretro
 		5b7df3f1ca EnHitTag OK (#482) 
* EnHitTag all matching, data still not imported

* rename loop counter variable to i

* imported data

* use generated reloc

* cleanup

* name func_80BE20E8, document with ITEM00_RUPEE_GREEN enum, use if-return-implication in WaitForHit

* add switchflag param macro

* use previously unused pCylinder as function arguments

* use THIS macro and change switchflag macro to take actor pointer

* space between var declaration and code

* format

* rename pCylinder to cylinder

* rename cylinder to collider

* change ColliderCylinder* to pad

Co-authored-by: retro <retro@DESKTOP-KGV19SQ.localdomain>
 2021-12-06 21:50:59 +00:00
MaideandGitHub 08cf506be7 Dm_Stk (#350) 
* Dm_Stk

* PR
 2021-12-06 21:45:28 +00:00
MaideandGitHub f4dfeac4a9 En_Gm (#365) 
* En_Gm

* Format

* PR

* Warnings

* Merge
 2021-12-06 21:18:17 +00:00
Derek HensleyandGitHub b5da6b9bf9 Fault and Fault_Drawer (3 MATCHING and 1 NON_MATCHING) (#434) 
* Matched last functions except Fault_FindNextStackCall

* Bss in drawer and cleanup

* Update define and format

* PR comments

* Formating PR suggestions

* Small format

* Fault_FindNextStackCall

* Change grays to dark gray and light gray
 2021-12-06 21:03:21 +00:00
Zach BanksandGitHub b031598460 Disassembly performance improvements (speed, RAM) (#478) 
* Improve disasm.py RAM usage using `bisect`

This is based on AngheloAlf's work in PR #477, but uses the built-in
library `bisect` instead of adding an external dependency.

* Caching vrom_variables for ~25% faster disasm.py
 2021-12-06 20:21:01 +00:00
Derek HensleyandGitHub e177e99933 Elf_Message OK (#457) 
* Matched

* Rename function
 2021-12-06 14:42:17 -05:00
RozeletteandGitHub 56d76d6458 En_Cow 🐮 (#493) 
* OK

* Address feedback

* Adjust comparison
 2021-12-01 12:32:15 -05:00
mzxrulesGitHubKelebek1Kenix3engineer124
 		ce1de034df z_obj_mure.c (#364) 
* a bunch of OKs and close functions

* OK All but 1 function

* Clean up code

* Match

* implement suggestions

* OBJMURE_CHILD_STATE_DEAD

* Update src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c

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

* use enum for type tests

* add OBJMURE_TYPE_MAX

Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2021-11-30 22:18:58 -03:00