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
petrie911 9b5864da9d merge master 2021-09-27 20:59:19 -05:00
petrie911 62ddc37c0e more matches 2021-09-27 20:58:01 -05:00
EllipticEllipsisandGitHub 14ad66b4ed ovl_title OK (#311) 
* OK, asset XML made and symbols imported

* Missed a GLOBAL_ASM

* Remove data from spec

* engineer's review

* Correct arg

* Un-format functions.h

* Hopefully fix it
 2021-09-27 21:29:30 -04:00
EllipticEllipsisandGitHub a6d26c82f2 afterprenmi.c OK (#297) 2021-09-27 21:00:55 -04:00
emilybrooksandGitHub de4cf63f63 obj_aqua OK (#321) 
* setup

* almost done

* only 3 floating point registers swapped

* forgot newline

* Audio_PlaySoundAtPosition

* review suggestions

* missed a hex number

* matched func_80ACBDFC
 2021-09-27 20:21:08 -04:00
EllipticEllipsisGitHubAnghelo Carvajalengineer124
 		f642ed6eef boot_0x80086760 OK and documented (#288) 
* boot_80086760 OK, added fp header, resplit data

* Some more documentation, data imported with unions

* Sweep data under the rug

* Move the fp header properly

* Format

* include/fp.h header guards

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

* Engineer's review

* Fix typo

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

* Rename header

* while (true)

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2021-09-27 21:07:09 -03:00
ryliebandGitHub 1362615cc6 Add ctags "tags" files to .gitignore for vim users (#328) 2021-09-27 17:41:36 -04:00
EllipticEllipsisandGitHub c72b5788a3 sys_math, cosf OK and documented, sinf, coss, sins documented (#289) 
* OK, data imported, document

* spec

* Match cosf, document sinf and cosf

* Some more documentation, switch fu back

* Format

* Little more documentation

* Document coss too

* Move macros

* Review, add some .s

* Fix headers, review
 2021-09-27 17:41:07 -04:00
MaideandGitHub 039fc4623e En_Syateki_Man (#269) 
* En_Syateki_Man

* a
 2021-09-25 13:22:51 -03:00
Anghelo CarvajalandGitHub 456cf789ac Add -I. (#323) 
* Add `-I.`

* IINC
 2021-09-25 12:47:18 -03:00
Elliptic Ellipsis d21d72848b Merge remote-tracking branch 'upstream/master' into voice 2021-09-25 15:37:19 +01:00
Elliptic Ellipsis 1921997a60 Add Tharo's documentation comments 2021-09-25 15:03:48 +01:00
ryliebGitHubengineer124
 		bc5c3866d5 Obj_Syokudai (Torch) OK and mostly documented (#306) 
* Started uncommenting statics, but then realized this actor has BSS, lol.

* Import .data and .bss. Run format.sh.

* ObjSyokudai_Init OK and mostly documented.

* ObjSyokudai_Destroy OK and fully documented.

* ObjSyokudai_Draw OK and partially documented.

* Good progress on ObjSyokudai_Update, but NOT OK.

* Instruction match, but needs regalloc and stack.

* Stack is closer now.

* Obj_Syokudai OK, no new warnings, ran formatter.

* Documented .data and .bss variables.

* Final documentation pass before PR.

* Add header, fix build errors.

* Use COLTYPE_METAL and COLTYPE_WOOD macros.

* Apply suggestions from code review

engineer124's suggestions.

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

* Apply suggestions from code review

engineer124: WaterBox* instead of UNK_PTR

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

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

engineer124: AC_HARD -> AC_HIT so Jenkins stops complaining

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

* Hopefully fix Jenkins via z_bg_lotus WaterBox*.

* Rename sp2C to waterBox in BgLotus.

* Run format.sh.

* Update include/functions.h

Change func_800F22C4 param_1 from s8 to s16.

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

* Change func_801A5CFC param_1 to sfxId in prototype

* Document interactions.

* Run formatter.

* Clarify that posDiff is relative to stick *tip*.

* Changed interaction comparisons to better fit enum

* snuffTimer enum

* Added more #defines.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2021-09-25 09:53:53 -04:00
EllipticEllipsisandGitHub f77cfb9020 Remove .mdebug sections by default (#313) 
* Add RM_MDEBUG to makefile

* Add to diff settings to allow use of --source
 2021-09-25 09:36:15 -04:00
EllipticEllipsisandGitHub 9e4d51fb9f printutils OK, add va_end to variadic functions (#294) 
* printutils OK

* Add va_end to every variadic function
 2021-09-23 20:14:12 -03:00
Anghelo CarvajalGitHubTharo
 		2ff7320409 ovl_daytelop OK (#277) 
* eeeee

* nonequivalents

* draw

* Import data

* Match Daytelop_LoadGraphics

* draw kinda better

* extract daytelops and gameover

* SEGMENT_ROM macros

* Use extracted symbols for daytelop

* match Daytelop_Draw

* Fix bss

* draw cleanup

* Daytelop_Update from non equivalent to non matching

* Some renames and spec

* Run formatter

* enum

* sfx

* Use SEGMENT_ROM_START macros everywhere

* more macros

* run formatter

* Add description

* update variables.txt

* Remove extra stuff in gbi.h

* Would this fix it?

* and again

* whoops

* Apply suggestions from code review

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

* Tharo's suggestions

* match Daytelop_Update

* run formatter

* fix merge issues

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2021-09-22 21:50:35 -04:00
emilybrooksandGitHub a59943bc4a ovl_obj_lightblock OK (#282) 
* initial commit

* review suggestions

* changed opacity to alpha

* changed to multiple of 10
 2021-09-22 20:46:26 -04:00
EllipticEllipsisandGitHub 01a6dea813 Update subrepos (#281) 
* git subrepo pull tools/ZAPD --force

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

* git subrepo pull tools/decomp-permuter --force

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "86b1975e"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "86b1975e"
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:   "eb25be94"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "eb25be94"
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:   "98ef0ac2"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "98ef0ac2"
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:   "45cb0d6b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "45cb0d6b"
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:   "48e675ff"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "48e675ff"
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:   "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.git"
  commit:   "2f68596"

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

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

* Declare required textures

* Name texture, add decomp.me permuter settings

* git subrepo pull tools/ZAPD --force

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "913810fc"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "913810fc"
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:   "97197f2a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "97197f2a"
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:   "623d779f"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "623d779f"
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:   "55bba23a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "55bba23a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/decomp-permuter --force

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "a20bac94"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "a20bac94"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2021-09-21 20:13:03 -04:00
EllipticEllipsisandGitHub 0ebd082592 position OK (#296) 
* position OK

* Actually remove the function pragmas
 2021-09-21 19:54:15 -04:00
EllipticEllipsisandGitHub 367e500d02 Two minor fixes (#287) 
* Change to -funsigned-char in makefile

* Change ROM/RAM to VROM/VRAM in sym_info.py

* Format

* Make the EnBigPo vectors shorter by removing `,`s
 2021-09-21 18:09:14 -04:00
MaideandGitHub 5b9a825cad Bg_Hakugin_Post (#258) 
* Bg_Hakugin_Post

* PR

* a

* PR

* a
 2021-09-21 18:08:09 -04:00
MaideandGitHub 4796e6f61d En_Railgibud (#268) 
* En_Railgibud

* Match func_80BA57F8 (thanks Petrie, Simon, Anghelo)

* Match func_80BA5E18, thanks to engineer

* a

* PR
 2021-09-19 22:46:56 -03:00
MaideandGitHub 9312fe4d11 En_Sellnuts (#264) 
* En_Sellnuts

* a
 2021-09-19 10:39:39 -04:00
MaideandGitHub 3c779d7fd5 En_Skb (#262) 
* En_Skb

* a

* a

* a

* Func namesW
 2021-09-19 10:05:21 -04:00
Tom OvertonandGitHub b65d363cec Fix some misformatted files in current master (#315) 
* Run ./format.sh on current master

* Format something in bigpo better by deleting commas + running format again
 2021-09-19 08:56:05 -04:00