mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-11 22:20:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_parameter: Items & Import Data (#799)

Browse Source 
* Import Data

* More functions

* cleanup

* Add Enum

* Many changes, PR and add-ons

* Fix bss

* Better data

* Extra space

* DoubleDefense is boolean

* Missed a macro

* More enums missed

* macro -> enum

* More item cleanup...

* missing/wrong quest items

* Next PR Review

* Revert Interface_AddMagic to Parameter_AddMagic

* Remove QUEST_HEART_CONTAINER

* Fix bss

* Move Color_RGB16 up + fix incorrect numbers

* Add texture pointers

* Add comment

* EQUIP_SLOT_A

* rm redundant comment

* Fix merge

* PR Suggestions

* fix bss
This commit is contained in:
engineer124
2022-07-12 00:45:55 -04:00
committed by GitHub
parent fda5da2500
commit 8e45eb7b1f
60 changed files with 1597 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tutorial/advanced_control_flow.md
+9 -9
View File
@@ -199,7 +199,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
}
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
}
@@ -290,7 +290,7 @@ block_13:
block_15:
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
block_16:
@@ -391,7 +391,7 @@ block_11:
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
block_16:
@@ -460,7 +460,7 @@ block_11:
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
block_16:
@@ -510,7 +510,7 @@ So let us rewrite the entire second half as a switch:
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
return;
break;
@@ -542,7 +542,7 @@ There's a couple of other obvious things here:
} else {
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;
@@ -607,7 +607,7 @@ block_7:
} else {
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;
@@ -672,7 +672,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
} else {
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;
@@ -724,7 +724,7 @@ void func_809527F8(EnMs* this, PlayState* play) {
} else {
func_8019F208();
Actor_PickUp((Actor *) this, play, 0x35, 90.0f, 10.0f);
func_801159EC(-0xA);
Rupees_ChangeBy(-0xA);
this->actionFunc = func_809529AC;
}
break;