diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-26 19:27:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 22:27:53 -0400 |
| commit | c774f880e1b033c53e48fc9b438f84fa47836346 (patch) | |
| tree | 8258f15c9cf9589288a206f9fc27c3ec7e99d00c /include | |
| parent | 930d605c5ca2c9b2c753b046cb4860c6edcce586 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/PR/ultratypes.h | 1 | ||||
| -rw-r--r-- | include/functions.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/PR/ultratypes.h b/include/PR/ultratypes.h index faa5b51a6..0e6f4cf39 100644 --- a/include/PR/ultratypes.h +++ b/include/PR/ultratypes.h @@ -22,6 +22,7 @@ typedef volatile s64 vs64; typedef float f32; typedef double f64; +typedef void* TexturePtr; typedef long int Mtx_t[4][4]; typedef union { diff --git a/include/functions.h b/include/functions.h index d6c20d5d7..ec8953bb1 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1671,7 +1671,7 @@ void func_800F0568(GlobalContext* globalCtx, Vec3f* position, s32 param_3, s16 s // void func_800F0FF0(void); // void func_800F10AC(void); // void func_800F112C(void); -// void func_800F1250(void); +u16 func_800F1250(GlobalContext* globalCtx, UNK_TYPE arg1); void func_800F12D0(GlobalContext* globalCtx); void func_800F1304(GlobalContext* globalCtx, s16 param_2); void func_800F1374(s32 param_1, s16 param_2); |