mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-23 06:54:14 -04:00
Derek Hensley
c774f880e1
* 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>