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
1,339 Commits 2 Branches 11 Tags
f39d412bfe940afef4e152ad863ecc79cb2b2bd3
Commit Graph
1339 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anghelo CarvajalandGitHub f39d412bfe Actors revert cleanup (#1221) 
* Revert "ovl_Bg_Keikoku_Spr OK (#111)"

This reverts commit fed1b37da1.

* Revert "z_bg_tobira01 OK (#168)"

This reverts commit 54aef44a9e.

* Revert "Bg_Lotus OK (#86)"

This reverts commit d0af9587ba.

* Revert "Door_Spiral OK (from zel) (#87)"

This reverts commit 6e4d156ad7.

* Revert "en_invadepoh OK (#200)"

This reverts commit e1219e7351.

* Revert "ovl_Item_B_Heart OK (#110)"

This reverts commit f0cd2db055.

* Revert "ovl_Obj_Boyo OK (#112)"

This reverts commit 536a484f73.

* more reverts and fix building

* restore timeconv.py

* restore func_800BFD84
 2023-04-01 21:10:00 -03:00
Tom OvertonandGitHub d9493a5b99 Update documentation to use updated Z64Utils release + updated directions (#1223) 2023-03-31 05:11:57 +01:00
Anghelo CarvajalandGitHub d8064bb070 Effect table (#1209) 
* effect_ss_table.h

* monkaBSS

* format

* Remove InitVars extern headers

* Remove `const` from InitVars

* cleanup

* cleanup

* format

* bss

* bss

* bss
 2023-03-30 13:17:55 -03:00
krm01andGitHub 34f9fb9886 [Doc] small, names for mayor dotour's eye and eyebrow textures (#1220) 
* some naming and tlut assignments to dt eye textures

* update dotour overlays with new texture names

* critical formatting fix
 2023-03-30 20:57:26 +11:00
engineer124GitHubDerek Hensley
 		f3c811d298 z_parameter: Buttons (part 9) (#1192) 
* import button docs

* cleanup

* sync timer val

* add flag comments

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* fix merge master

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2023-03-30 20:26:35 +11:00
engineer124andGitHub 6685a4775e Audio sequence.c OK and documented (#1201) 
* import sequence docs

* cleanup

* do not need raw hex
 2023-03-30 19:53:47 +11:00
Anghelo CarvajalGitHubengineer124
 		045c3537a9 z64game_over.h (#1183) 
* z64game_over.h

* format

* Update include/z64game_over.h

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-03-24 15:29:54 -03:00
Anghelo CarvajalGitHubTharoengineer124
 		147e4fcedc THA docs (#1177) 
* THA docs

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

* format

* namefixer

* yada

* remove zero pad comment

* Update include/z64.h

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

* Update include/thga.h

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

* namefixer

* bss

* namefixer

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-03-24 14:38:04 -03:00
haydenGitHubswinginman
 		f3d2c56d1d Updated function names in ovl_En_Bom & added documentation from OoT (#1219) 
* Updated function names in ovl_En_Bom & added documentation from OoT

* Renamed BombType struct members

* Updated instances of BOMB_BODY

* Updated more instances of BombType

---------

Co-authored-by: swinginman <swinginman@DESKTOP-V7R1DTC.localdomain>
 2023-03-23 17:25:54 -03:00
engineer124andGitHub 2cb01b5b6a z_room (1 non-matching) (#1143) 
* begin room docs and decomp

* match Room_DrawImageSingle

* match Room_DrawImageMulti

* Room_AllocateAndLoad non-matching

* big improvements on Room_DrawCullable

* match Room_AllocateAndLoad

* improvement?

* cleanup

* comments

* cleanup

* small pr suggestions

* PR Suggestions

* cleanup sceneCmds

* some PR

* PR Suggestions

* more PR Suggestions

* col to collision
 2023-03-23 09:36:09 +11:00
Derek HensleyandGitHub 9bb978527f Misc Cleanup 14 (#1214) 
* bgId

* z64scene.h whitespace

* SubS_ComputeTrackPointRot casts

* Macros cleanup

* ifs

* Empty Loops

* Lights_FindBufSlot void

* SkelAnime_GetFrameData

* };

* Struct inits

* fs

* @todo

* Bug comments

* EnPofusen and ObjUm

* Trailing comma

* Revert "bgId"

This reverts commit eea073c5ac30fd41f50436eeade43a811d0f0981.

* Revert "z64scene.h whitespace"

This reverts commit 399fd57550b7536b357ab6283360042f2e3e1467.

* Revert "SubS_ComputeTrackPointRot casts"

This reverts commit dea896c8743475508a3c7391e9d19cdb6b63f6a7.

* FAKE

* Review

* Format
 2023-03-21 11:12:22 -03:00
EllipticEllipsisandGitHub 6d1bc6e34b Ignore other rom extensions (#1218) 2023-03-21 10:28:24 -03:00
Derek HensleyandGitHub 03c8d46ed2 Slowly Cleanup (#1213) 
* Add slowly.h

* Init and destroy

* File header
 2023-03-20 00:48:49 +11:00
Derek HensleyandGitHub 6ff77ab092 Recomp v0.6 (#1215) 2023-03-18 08:03:17 -03:00
Anghelo CarvajalandGitHub 58022571ba subrepo asm-processor (#1212) 
* yeet

* git subrepo clone git@github.com:simonlindholm/asm-processor.git tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "bbd86ea1f"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "bbd86ea1f"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2023-03-17 15:16:30 +11:00
engineer124andGitHub a17949e730 Document z_en_time_tag (#1140) 
* time-tag docs

* simplify enums

* PR Reviews

* PR Suggestions

* small change

* small fix

* PR Suggestions

* add extra func ref

* rm raw text from first actor I decompiled

* Stock Pot Inn

* fix master merge
 2023-03-16 13:47:38 +11:00
engineer124GitHubDerek Hensley
 		2987390a20 Audio seqplayer.c: AudioSeq_ to AudioScript_ (#1202) 
* AudioSeq_ to AudioScript_

* Update src/audio/lib/playback.c

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

* format

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2023-03-15 11:09:49 +11:00
Anghelo CarvajalandGitHub 0c3a48ef94 Subrepos update (#1208) 
* git subrepo pull tools/asm-differ --force

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

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

subrepo:
  subdir:   "tools/fado"
  merged:   "8d896ee97"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "8d896ee97"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "dab4addae"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "dab4addae"
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:   "43035d97f"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "43035d97f"
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:   "23929ec93"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "23929ec93"
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 2e487b5008c129031ab311a3a7bfd42adeb4916b.
 2023-03-15 10:51:47 +11:00
Anghelo CarvajalGitHubDragorn421Derek Hensley
 		c833969ea7 z_actor documentation pass (#1154) 
* ActorContext_unk_1F4

* a

* ACTOR_FLAG_IGNORE_QUAKE

* ACTOR_FLAG_TALK_REQUESTED and ACTOR_FLAG_CANT_LOCK_ON

* actorCtx->unkC => ctorCtx->halfDaysBit

* HALFDAYBIT defines

* actor.halfDaysBits

* format

* Actor_InitHalfDaysBit

* Name actor-killing functions

* cleanup variables.h a bit

* DAWN

* bss

* Actor_RequestRumble and Actor_GetArrowDmgFlags

* name vars of func_800BC620

* format

* fix missing PLAYER_IA

* Actor_OfferGetItem

* Actor_SetClosestSecretDistance

* freezeCategoryPlayerFlags1

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* DROPFLAG_

* a

* COLORFILTER

* format

* sCategoryFreezeMasks

* Actor_OfferCarry

* review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* change hex to dec

* COLORFILTER_INTENSITY_FLAG

* format

* review

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

* shiftedHalfDaysBit

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

* cleanup

* Undo Actor_RequestRumble

* Undo ACTOR_FLAG_IGNORE_QUAKE

* format

* Remove COLORFILTER_GET_BUFFLAG

* Undo Actor_KillAllFromUnloadedRooms

* format

* Update Actor_OfferGetItem comment

* Update Actor_OfferGetItem description

* diving

* bss

* namefixer

* format

* speed

* review

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2023-03-09 12:35:23 -05:00
Anghelo CarvajalGitHubengineer124
 		496b4928ea Rename GameInfo to RegEditor (#1178) 
* Rename RegEditor and move it to regs.h

* bring over some minor doc from oot

* add missing include

* Update tools/disasm/variables.txt

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

* update comment

* bss

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-03-08 23:53:38 -05:00
Anghelo CarvajalGitHubDerek Hensley
 		2f1e7b3de8 Stack cleanups (#1193) 
* Use STACK and STACK_TOP everywhere

* format

* remove fake variable

* bss

* review

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

* Update src/boot_O2_g3/boot_main.c

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

* review

* renames

* more renames

* and more

* whoopsie, forgot those too

* hopefully the last cleanup

* forgot some stuff

* a

* bss

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2023-03-08 15:25:51 -03:00
Derek HensleyandGitHub 9f529aaf2a HF progress script (#1200) 2023-03-08 13:54:56 -03:00
Derek HensleyGitHubengineer124
 		184f5858ff Debug mode (#1185) 
* OK

* Docs

* PR

* Format

* Update include/z64debug_display.h

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

* Update include/z64debug_display.h

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2023-03-08 00:06:49 -05:00
Derek HensleyandGitHub c917880261 Misc cleanup 13 (#1189) 
* FaultAddrConv Functions

* Invisible Ruppe macros

* skybox

* Z64 header defines

* ActorId

* remove i from KaleidoManager_FaultAddrConv

* size_t and parens
 2023-03-07 23:44:18 -05:00
Anghelo CarvajalandGitHub d7af72273d z64frameadvance.h (#1182) 2023-03-07 23:19:08 -05:00