mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 03:44:34 +00:00
Code Issues Projects Releases Wiki Activity

En_Elf Decompiled (#432)

Browse source 
* init matched

* everything but navi OK

* progress

* 4 left

* remove asm

* progress

* progress

* asm and spec

* remove comment

* suggestion

* review1

* use type enum

* name func

* overridelimbdraw

* review 2

* forgot one

* merge master

* format
This commit is contained in:
fig02 2020-10-28 13:02:35 -04:00 • committed by GitHub
parent 3ba022128c
commit 6e000fcc54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 1637 additions and 4303 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/z_parameter.c
View file

@ -1685,7 +1685,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
return item;
} else if (item == ITEM_MAGIC_SMALL) {
if (gSaveContext.unk_13F0 != 10) {
func_80087680(globalCtx);
Magic_Fill(globalCtx);
}
func_80087708(globalCtx, 12, 5);
@ -1698,7 +1698,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
return item;
} else if (item == ITEM_MAGIC_LARGE) {
if (gSaveContext.unk_13F0 != 10) {
func_80087680(globalCtx);
Magic_Fill(globalCtx);
}
func_80087708(globalCtx, 24, 5);
@ -2256,7 +2256,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
osSyncPrintf("合計 = (%d)\n", AMMO(item));
}
void func_80087680(GlobalContext* globalCtx) {
void Magic_Fill(GlobalContext* globalCtx) {
if (gSaveContext.magicAcquired) {
gSaveContext.unk_13F2 = gSaveContext.unk_13F0;
gSaveContext.unk_13F6 = (gSaveContext.doubleMagic * 0x30) + 0x30;