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
EllipticEllipsisandGitHub 15dfaf0862 ABI FPR names (#767) 
* Add o32 to disassembler and update macro.inc

* Add a variable for asm processor to makefile
and improve objdump flags

* Update diff settings

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

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

* Remove * import and implement option

* Fix some stuff in the makefile

* Update asm-processor

* Review

* Fix old var name
 2022-03-31 18:22:19 +01:00
Anghelo CarvajalandGitHub 54a4d1eb12 Fix actorfixer (#774) 2022-03-30 04:23:20 +01:00
ThomasandGitHub 33643b9471 Obj_Hariko (#766) 
* Initial decompilation of hariko

* Documented and touched up on ObjHariko header

* Documented Hariko assets and added review suggestions

* Added file comment, shuffled function order

* Added DL suffix to hariko dlists

* Updated hariko body out name to hariko_body
 2022-03-30 04:13:44 +01:00
MaideGitHubEllipticEllipsis
 		89ecf74189 Obj_Bigicicle (#753) 
* Obj_Bigicicle

* PR

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
 2022-03-29 22:39:06 +01:00
Tom OvertonandGitHub 6faf186a95 En_Wallmas (Wallmaster) OK and documented. object_wallmaster documented (#731) 
* EnWallmas_Init and EnWallmas_Destroy OK

* func_80874B88 OK

* func_80874BE4 OK

* func_80874D1C OK

* func_80874DE8 OK

* func_80874F14 OK

* A bunch of small functions OK

* A bunch of smaller functions OK again

* func_808752CC OK

* func_808758C8 OK

* func_80875910 and func_8087596C OK

* func_808756AC and func_8087571C OK

* EnWallmas_Update OK

* func_80875A74 OK

* func_80874A88 and func_80874B04 OK

* A bunch of functions OK

* func_808759B8 and func_80875A0C

* EnWallmas_Draw OK

* func_808760A4 and func_80876118 OK

* func_80875F04 OK

* Use object symbols

* Import data to C

* Use generated reloc

* Document object_wallmaster

* Misc cleanup

* Name the DrawDamageEffects variables

* Name draw functions

* Enum for damage values

* Port function names from OoT

* Last cleanup before PR

* Respond to Elliptic's review

* Respond to Elliptic's second review

* gWallmasterWaitAnim -> gWallmasterIdleAnim

* Change all EnWallmas to Wallmaster (except the actor's name itself)

* Respond to hensldm's review

* Fix merge conflicts
 2022-03-29 22:33:32 +01:00
MaideandGitHub b4842eb16c Mir_Ray3 (1 non-matching) (#695) 2022-03-29 22:26:56 +01:00
MaideandGitHub 7280d10404 En_Horse (2 non-matching) (#413) 
* En_Horse

* a

* Warnings

* Warnigns 2

* PR

* Formats

* Fix

* PR

* Merge

* Merge

* Merge
 2022-03-29 22:15:26 +01:00
Anghelo CarvajalGitHubEllipticEllipsis
 		72bae2b6ba z_kaleido_setup (#768) 
* KaleidoSetup_Init

* func_800F4C0C

* func_800F4A10 NON_EQUIVALENT

* fixes

* func_800F4A10

* import data

* Rename Play_InCsMode

* Name KaleidoSetup_Update

* minor cleanup

* Update src/code/z_play.c

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

* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c

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

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

* unname D_801BDB00

* format

* a

* actorfixer

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
 2022-03-29 22:04:41 +01:00
MaideandGitHub 8c7d8359fa Obj_Hamishi (#762) 2022-03-29 21:44:07 +01:00
Derek HensleyGitHubAnghelo Carvajal
 		486e7cbe83 SubS General Pathing Helpers (#760) 
* Brought code over and cleanup

* cleanup functions.h and format

* add comment

* Whitespace

* Format

* Update src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Format

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2022-03-29 21:37:58 +01:00
MaideandGitHub cabb14e4b7 Obj_Smork (#758) 
* Obj_Smork

* PR

* PR
 2022-03-29 21:29:35 +01:00
MaideandGitHub 7ea2474b71 En_Kujiya (#757) 
* En_Kujiya

* En_Kujiya

* PR
 2022-03-29 21:21:56 +01:00
MaideandGitHub 98143afb1c En_Test (#756) 
* En_Test

* PR

* PR

* PR

* Fix
 2022-03-29 21:14:29 +01:00
MaideandGitHub f5ba6986f9 Obj_Pzlblock (#755) 
* Obj_Pzlblock

* PR
 2022-03-29 21:05:33 +01:00
MaideandGitHub cdc475bea9 Bg_F40_Block (#754) 2022-03-29 20:59:59 +01:00
Derek HensleyandGitHub 036a68cb3e Effects Stick and Kakera cleanup (#752) 
* cleanup

* cleanup

* idx -> index
 2022-03-29 20:52:37 +01:00
Derek HensleyGitHubkyleburnetteAnghelo Carvajal
 		ec9909c65c Boot_800862E0 OK (#769) 
* boot_800862E0 OK

* Ran format.sh

* attempt at fixing bss reordering

* boot_800862E0 OK (for real this time)

* Run formatter

* Changes u32 pointers to uintptr_t and sizes to size_t

* Run formatter

* Fix bss reordering

* Delete baserom.mm.us.rev1.z64:Zone.Identifier

* Cleanup and some notes

* Try my best to document

* remove comments

* Remove D_80097508 from variables.h

Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2022-03-29 20:42:44 +01:00
LtPeriwinkleandGitHub afec1c56a6 EnNeoReeba OK and documented, object_rb mostly doc'd (#750) 
* match some functions

* finish decompiling

* mostly document except some dmgeffs

* Document object_rb

* update functions.txt, damagetable

* remove number comments

* suggestions

* format and fix enum names

* comment object_rb.xml
 2022-03-29 19:12:35 +01:00
Tom OvertonandGitHub 941f3e6949 Document object_aob (Mamamu Yan's object) (#749) 2022-03-29 19:06:19 +01:00
MaideandGitHub 72265fac92 Obj_Entotu (#745) 
* Obj_Entotu

* Time macro

* PR

* Merge
 2022-03-29 18:56:20 +01:00
MaideandGitHub 6132d950e3 En_Light (#744) 
* En_Light

* PR

* PR

* Format
 2022-03-29 18:48:25 +01:00
MaideandGitHub c127a5a0ca Elf_Msg6 (#743) 
* Elf_Msg6

* Elf_Msg6
 2022-03-29 18:34:18 +01:00
IsghjGitHubIsghj8
 		275f13881b EffectEnIceBlock OK, object_ice_block documented (and minor Obj_Iceblock documented) (#748) 
* EffIceBlock: OK

* object_ice_block: documented

* EffectIceBlock: matching gfxCtx in the draw function

* Iceblock: removed undefined sym

Co-authored-by: Isghj8 <isghj8@gmail.com>
 2022-03-29 18:28:19 +01:00
IsghjGitHubAnghelo CarvajalIsghj8
 		cbffe83c9b EnWarpTag OK (Warping pedestals in Goron Trial) (#747) 
* EnWarpTag: OK

* Apply suggestions from code review

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* WarpTag: move macros

* WarpTag: format

* WarpTag: fix save entrance index

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2022-03-29 18:21:36 +01:00
MaideandGitHub 9af2914992 Obj_Grass_Carry (#741) 
* Obj_Grass_Carry

* Fix?

* Fix2?

* Merge

* Test

* Merge
 2022-03-29 18:16:05 +01:00