Commit Graph

5 Commits

Author SHA1 Message Date
Derek Hensley c774f880e1
ovl_en_ossan OK and documented (#223)
* Lots of progress, some came for OOT WIP

* Some small cleanup

* Fix merge conflict

* Bring over updated z_en_girla.h

* Fix merge error

* some cleanup

* fix msgcontext and add sfx ids

* func_808AAB30 is ugly but it matches

* Cleanup

* More cleanup and matched func_808AA8E8

* Matched last two functions

* Brought over data as a comment

* Figured out data, but not late rodata

* Document EnOssan

* Cleanup

* Added ShopItemIds

* Cleanup

* Switch left and right stick prompts

* Remove testing NON_MATCHING define

* Cleanup

* Add header to .c file

* Adjust header

* Rename InitCutscenes to GetCutscenes

* Cleanup

* Cleanup before merge with upstream

* More cleanup

* Lower case Shopkeeper

* More cleanup

* More general cleaning

* Found the late rodata issue

* Format

* Rename InitalUpdate

* PR suggestions except texture stuff

* Texture stuff

* Rename Texture typedef to UNK_TEXPTR

* One more rename

* Remove * from TexturePtr arrays

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

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

Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-07-26 22:27:53 -04:00
Anghelo Carvajal f3dc829456
`ovl_Eff_Dust` OK (#136)
* some easy functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* init is cursed

Signed-off-by: Angie <angheloalf95@gmail.com>

* func_80919230 is weird

Signed-off-by: Angie <angheloalf95@gmail.com>

* I'm dumb

Signed-off-by: Angie <angheloalf95@gmail.com>

* func_80919768 nonmatching

Signed-off-by: Angie <angheloalf95@gmail.com>

* everything is wrong

Signed-off-by: Angie <angheloalf95@gmail.com>

* This thing still doesn't want to match

Signed-off-by: Angie <angheloalf95@gmail.com>

* improved a bit

Signed-off-by: Angie <angheloalf95@gmail.com>

* a bit of renaming, but it still doesn't work

Signed-off-by: Angie <angheloalf95@gmail.com>

* almost matching

* func_80919768 ok

* func_809199FC ok

* init was dumb

* add enum and other minor changes

* run format
2021-05-18 23:01:48 -04:00
kyleburnette e0164dba14
Fixed ultratypes.h (#48)
* fixed ultratypes.h

* fixed ultratypes.h
2021-02-23 23:08:16 -05:00
rozlette a88337a2fd Use gbi.h from oot decomp 2019-09-30 20:55:41 -05:00
rozlette cc9baa93a8 Dump current status 2018-10-25 22:09:52 -05:00