1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Commit graph

8 commits

Author SHA1 Message Date
cadmic
1b0e35c89a
Extract NTSC assets for gc-us (#1973)
* Extract NTSC assets for gc-us

* Extract kanji

https://github.com/zeldaret/mm/pull/1536

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

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-06-26 06:22:26 -04:00
cadmic
9def6f4d0d
Set up multiversion assets with ZAPD and match gc-eu (#1967)
* Add ZAPD hack to deal with extracted/VERSION/ in include paths

* Extract assets to extracted/VERSION

* Add ZAPD flags to override virtual address / start offset / end offset

* Configure offsets for code and overlay assets

* Reorganize ZAPD configs

* Match gc-eu-mq

* Match gc-eu

* Remove old asset dirs during distclean

* Revert "Remove old asset dirs during distclean"

This reverts commit fc8027a75f.

* make zapd addresses globals int64_t so they can store uint32_t addresses and -1

* slight cleanup extract_assets.py

* git subrepo pull --force tools/ZAPD

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

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-24 15:22:39 +02:00
Tom Overton
a2c8eabbc5
Document everything in ovl_Boss_Ganon2.xml (#1377)
* Document everything in ovl_Boss_Ganon2.xml

* Add translation I forgot to do

* Remove leading zeroes
2022-10-02 16:47:27 -04:00
Roman971
b0bfa9eb69
Fix asset file includes to always start with assets/ (#1260)
* Fix asset includes to consistently start with assets/

* Fix header paths in asset xmls to start with assets/

* Remove -Iassets from compiler options
2022-06-06 15:37:25 -04:00
louist103
71be03da7c
Asset header split (#1023)
* merge master

* gi objects

* Some more and fix dungeon keep and field keep

* the rest of them

* fix field keep

* Remove extra underscore
2022-01-17 17:38:32 -05:00
EllipticEllipsis
fd512f02e9
link_animetion xml, and ExternalFile config (#1011)
* Automatic XML for link_animetion

* Make sure tutorial images are not gitignored

* OK

* Correct ovl_Boss_Sst RangeEnd

* ExternalFiles

* Remove Segment="128"

* Remove segments from place_title_cards

* format, newlines, remove previous xml
2021-11-07 18:13:44 +01:00
EllipticEllipsis
8e19b91e80
Fix ovl_Boss_Ganon2 xml (#911) 2021-08-18 20:27:13 -04:00
Sirius902
bc9ca97086
ovl_Boss_Ganon2 (2 nonmatching) (#874)
* Match a few

* Remove cast

* BossGanon2_Destroy

* Some struct layout

* Missed one

* Work on BossGanon2_Update

* Oops missed another

* Work on update more

* Get it to compile

* Work a bit on update

* func_808FD27C

* Cleanup a bit

* Fix incompatible pointer type

* Work more on update

* Multiply

* Fix janky cast regalloc

* Remove some casts

* Move switch case to right spot

* Tiny regalloc

* Fix stack

* Try to fix jump table

* Migrate bss

* Make data match

* Fix minor formatting

* Another minor formatting

* Replace hex with symbols

* Do display lists

* Vertices

* jnt items init

* Split gfx into separate file

* func_808FCF40

* func_808FCF5C

* func_808FD080

* func_808FD4D4

* func_808FF898

* func_808FFA24

* func_808FFAC8

* func_808FFBBC

* func_808FFC84

* use unk_313 as a bool

* func_808FFCFC

* func_808FFDB0

* Add commented static

* func_808FFEBC

* func_808FFFE0

* func_809000A0

* Remove useless cast in func_809000A0

* Remove useless temp

* Fix wrong branch

* BossGanon2_Update

* Fix implicit function declarations

* Type D_8090EB2C to zelda pointer

* Reorder include because why not

* Deduplicate undefined syms

* Add more to struct

* Work on func_808FD5F4

* Major work on func_808FD5F4

* Get func_808FD5F4 to compile

* Make unk_398 unsigned

* Work on func_808FD5F4

* Progress

* func_808FD210

* BossGanon2_Draw

* Make it compile

* Fix compiler warnings

* Fix branches func_808FD5F4

* re-nonmatching func_808FD5F4

* stuff

* fix math functions

* clang format

* more progress

* Replace bit stuff with type

* Merge master

* Add possibly janky things and fix while loop

* Why does this help

* Chained assignment

* Remove dubious thing

* Reorder thing

* Add possibly fake notices

* Use true and false

* Make func_808FD5F4 equivalent

* Massage stack a little

* func_80906AB0

* Correct texture params

* Whitespace is good

* Use decimal line numbers

* func_809069F8

* Work on func_809060E8

* Make funny loop less funny

* Float stuff

* Remove useless cast

* Merge upstream

* Fix compiler error in nonmatchings

* func_809060E8

* Change tex alloc to be full integer

* Add unk_234

* Correct size of unk_2F4

* Make textures u64[]

* Type textures to u64[]

* func_80905DA8

* func_80905674

* Replace some pi

* BossGanon2_PostLimbDraw2

* func_8090523C

* func_80904FC8

* func_80904D88

* BossGanon2_PostLimbDraw

* BossGanon2_OverrideLimbDraw

* func_8090464C

* func_80903F38

* Match func_80900890

* Move func_80906538 prototype

* Work on func_80902348

* Match func_80902348

* Add fake warning to array thing

* Work on func_8090120C

* Remove useless var from func_8090120C

* Work more on func_8090120C

* Move case probably into place func_8090120C

* Work on func_8090120C until 4914

* Add break to switch

* Pass player to startPlayerCutscene

* Work more on func_8090120C

* Work on func_80902524

* Move function prototype

* Match func_80902524

* Clean up sfx ids in func_808FD5F4

* Correct SFX_FLAG in func_8090120C

* Match func_8090120C

* Match func_80904340

* Change tex to u8[]

* Cleanup func_808FD5F4 a bit

* Clean up another inequality func_808FD5F4

* Match func_80904108

* Cleanup for PR

* Cleanup for PR part 2

* Cleanup data a bit and start on func_80906538

* Basically match func_80906538

* Match func_80906538

* Rename tex to shadowTexture

* Work on func_809034E4 a bit

* replace 255 with 0xFF for texture

* Correct NON_MATCHING guard

* Make func_809034E4 equivalent and not ugly!

* Reuse i in func_809034E4

* Minor cleanup in func_809034E4

* Remove unused asm

* Static all the data

* Switch to using assets xml for overlay graphics :)

* Remove now unused undefined syms

* Rename pad to D_809071FC

* Some cleanup

* Cleanup and name more stuff

* Name BossGanon2_DrawShadowTexture

* Rename to sZelda

* Correct array in func_809034E4.s

* Start using proper symbols for assets

* Add morre undefined syms comments

* Cleanup a bit

* Cleanup a bit more

* Use THIS in limb functions

* Update comments

* Use define for actor id

* Remove unnecessary padding in struct

* Rename rand_float to randFloat

* Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c

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

* Various minor suggestions

* Replace shadowTexture with void* wherever possible

* Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c

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

* Do multiply

* Name some variables from debug prints

* Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c

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

* Use ARRAY_COUNT(sParticles) everywhere

* Put data and bss in _data.c

* Remove unecessary @bug s

* Minor suggestions

* Why are there so many timers

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-06 20:30:31 +02:00