izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07: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
tools/sizes/code_functions.csv
+17 -17
View File
@@ -1623,31 +1623,31 @@ asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34
asm/non_matchings/code/z_parameter/func_801129E4.s,func_801129E4,0x801129E4,0x44
asm/non_matchings/code/z_parameter/func_80112AF4.s,func_80112AF4,0x80112AF4,0x2
asm/non_matchings/code/z_parameter/func_80112AFC.s,func_80112AFC,0x80112AFC,0x11
asm/non_matchings/code/z_parameter/func_80112B40.s,func_80112B40,0x80112B40,0x29
asm/non_matchings/code/z_parameter/func_80112BE4.s,func_80112BE4,0x80112BE4,0xA
asm/non_matchings/code/z_parameter/Interface_LoadItemIconImpl.s,Interface_LoadItemIconImpl,0x80112B40,0x29
asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s,Interface_LoadItemIcon,0x80112BE4,0xA
asm/non_matchings/code/z_parameter/func_80112C0C.s,func_80112C0C,0x80112C0C,0x9D
asm/non_matchings/code/z_parameter/Item_Give.s,Item_Give,0x80112E80,0x553
asm/non_matchings/code/z_parameter/func_801143CC.s,func_801143CC,0x801143CC,0x16B
asm/non_matchings/code/z_parameter/func_80114978.s,func_80114978,0x80114978,0xA
asm/non_matchings/code/z_parameter/func_801149A0.s,func_801149A0,0x801149A0,0x3F
asm/non_matchings/code/z_parameter/func_80114A9C.s,func_80114A9C,0x80114A9C,0x3A
asm/non_matchings/code/z_parameter/func_80114B84.s,func_80114B84,0x80114B84,0x47
asm/non_matchings/code/z_parameter/func_80114CA0.s,func_80114CA0,0x80114CA0,0x7C
asm/non_matchings/code/z_parameter/Interface_HasEmptyBottle.s,Interface_HasEmptyBottle,0x80114E90,0x27
asm/non_matchings/code/z_parameter/Interface_HasItemInBottle.s,Interface_HasItemInBottle,0x80114F2C,0x29
asm/non_matchings/code/z_parameter/func_80114FD0.s,func_80114FD0,0x80114FD0,0x58
asm/non_matchings/code/z_parameter/func_80115130.s,func_80115130,0x80115130,0x62
asm/non_matchings/code/z_parameter/func_801152B8.s,func_801152B8,0x801152B8,0x44
asm/non_matchings/code/z_parameter/Item_CheckObtainabilityImpl.s,Item_CheckObtainabilityImpl,0x801143CC,0x16B
asm/non_matchings/code/z_parameter/Item_CheckObtainability.s,Item_CheckObtainability,0x80114978,0xA
asm/non_matchings/code/z_parameter/Inventory_DeleteItem.s,Inventory_DeleteItem,0x801149A0,0x3F
asm/non_matchings/code/z_parameter/Inventory_UnequipItem.s,Inventory_UnequipItem,0x80114A9C,0x3A
asm/non_matchings/code/z_parameter/Inventory_ReplaceItem.s,Inventory_ReplaceItem,0x80114B84,0x47
asm/non_matchings/code/z_parameter/Inventory_UpdateDeitySwordEquip.s,Inventory_UpdateDeitySwordEquip,0x80114CA0,0x7C
asm/non_matchings/code/z_parameter/Inventory_HasEmptyBottle.s,Inventory_HasEmptyBottle,0x80114E90,0x27
asm/non_matchings/code/z_parameter/Inventory_HasItemInBottle.s,Inventory_HasItemInBottle,0x80114F2C,0x29
asm/non_matchings/code/z_parameter/Inventory_UpdateBottleItem.s,Inventory_UpdateBottleItem,0x80114FD0,0x58
asm/non_matchings/code/z_parameter/Inventory_ConsumeFairy.s,Inventory_ConsumeFairy,0x80115130,0x62
asm/non_matchings/code/z_parameter/Inventory_UpdateItem.s,Inventory_UpdateItem,0x801152B8,0x44
asm/non_matchings/code/z_parameter/func_801153C8.s,func_801153C8,0x801153C8,0x18
asm/non_matchings/code/z_parameter/func_80115428.s,func_80115428,0x80115428,0x41
asm/non_matchings/code/z_parameter/func_8011552C.s,func_8011552C,0x8011552C,0x22
asm/non_matchings/code/z_parameter/func_801155B4.s,func_801155B4,0x801155B4,0x6C
asm/non_matchings/code/z_parameter/func_80115764.s,func_80115764,0x80115764,0x38
asm/non_matchings/code/z_parameter/func_80115844.s,func_80115844,0x80115844,0x31
asm/non_matchings/code/z_parameter/func_80115908.s,func_80115908,0x80115908,0x2E
asm/non_matchings/code/z_parameter/func_801159c0.s,func_801159c0,0x801159C0,0xB
asm/non_matchings/code/z_parameter/func_801159EC.s,func_801159EC,0x801159EC,0xA
asm/non_matchings/code/z_parameter/func_80115A14.s,func_80115A14,0x80115A14,0xC0
asm/non_matchings/code/z_parameter/Health_ChangeBy.s,Health_ChangeBy,0x80115908,0x2E
asm/non_matchings/code/z_parameter/Health_GiveHearts.s,Health_GiveHearts,0x801159C0,0xB
asm/non_matchings/code/z_parameter/Rupees_ChangeBy.s,Rupees_ChangeBy,0x801159EC,0xA
asm/non_matchings/code/z_parameter/Inventory_ChangeAmmo.s,Inventory_ChangeAmmo,0x80115A14,0xC0
asm/non_matchings/code/z_parameter/Parameter_AddMagic.s,Parameter_AddMagic,0x80115D14,0x12
asm/non_matchings/code/z_parameter/func_80115D5C.s,func_80115D5C,0x80115D5C,0x16
asm/non_matchings/code/z_parameter/func_80115DB4.s,func_80115DB4,0x80115DB4,0xB5
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1623 asm/non_matchings/code/z_parameter/func_801129E4.s func_801129E4 0x801129E4 0x44
1624 asm/non_matchings/code/z_parameter/func_80112AF4.s func_80112AF4 0x80112AF4 0x2
1625 asm/non_matchings/code/z_parameter/func_80112AFC.s func_80112AFC 0x80112AFC 0x11
1626 asm/non_matchings/code/z_parameter/func_80112B40.s asm/non_matchings/code/z_parameter/Interface_LoadItemIconImpl.s func_80112B40 Interface_LoadItemIconImpl 0x80112B40 0x29
1627 asm/non_matchings/code/z_parameter/func_80112BE4.s asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s func_80112BE4 Interface_LoadItemIcon 0x80112BE4 0xA
1628 asm/non_matchings/code/z_parameter/func_80112C0C.s func_80112C0C 0x80112C0C 0x9D
1629 asm/non_matchings/code/z_parameter/Item_Give.s Item_Give 0x80112E80 0x553
1630 asm/non_matchings/code/z_parameter/func_801143CC.s asm/non_matchings/code/z_parameter/Item_CheckObtainabilityImpl.s func_801143CC Item_CheckObtainabilityImpl 0x801143CC 0x16B
1631 asm/non_matchings/code/z_parameter/func_80114978.s asm/non_matchings/code/z_parameter/Item_CheckObtainability.s func_80114978 Item_CheckObtainability 0x80114978 0xA
1632 asm/non_matchings/code/z_parameter/func_801149A0.s asm/non_matchings/code/z_parameter/Inventory_DeleteItem.s func_801149A0 Inventory_DeleteItem 0x801149A0 0x3F
1633 asm/non_matchings/code/z_parameter/func_80114A9C.s asm/non_matchings/code/z_parameter/Inventory_UnequipItem.s func_80114A9C Inventory_UnequipItem 0x80114A9C 0x3A
1634 asm/non_matchings/code/z_parameter/func_80114B84.s asm/non_matchings/code/z_parameter/Inventory_ReplaceItem.s func_80114B84 Inventory_ReplaceItem 0x80114B84 0x47
1635 asm/non_matchings/code/z_parameter/func_80114CA0.s asm/non_matchings/code/z_parameter/Inventory_UpdateDeitySwordEquip.s func_80114CA0 Inventory_UpdateDeitySwordEquip 0x80114CA0 0x7C
1636 asm/non_matchings/code/z_parameter/Interface_HasEmptyBottle.s asm/non_matchings/code/z_parameter/Inventory_HasEmptyBottle.s Interface_HasEmptyBottle Inventory_HasEmptyBottle 0x80114E90 0x27
1637 asm/non_matchings/code/z_parameter/Interface_HasItemInBottle.s asm/non_matchings/code/z_parameter/Inventory_HasItemInBottle.s Interface_HasItemInBottle Inventory_HasItemInBottle 0x80114F2C 0x29
1638 asm/non_matchings/code/z_parameter/func_80114FD0.s asm/non_matchings/code/z_parameter/Inventory_UpdateBottleItem.s func_80114FD0 Inventory_UpdateBottleItem 0x80114FD0 0x58
1639 asm/non_matchings/code/z_parameter/func_80115130.s asm/non_matchings/code/z_parameter/Inventory_ConsumeFairy.s func_80115130 Inventory_ConsumeFairy 0x80115130 0x62
1640 asm/non_matchings/code/z_parameter/func_801152B8.s asm/non_matchings/code/z_parameter/Inventory_UpdateItem.s func_801152B8 Inventory_UpdateItem 0x801152B8 0x44
1641 asm/non_matchings/code/z_parameter/func_801153C8.s func_801153C8 0x801153C8 0x18
1642 asm/non_matchings/code/z_parameter/func_80115428.s func_80115428 0x80115428 0x41
1643 asm/non_matchings/code/z_parameter/func_8011552C.s func_8011552C 0x8011552C 0x22
1644 asm/non_matchings/code/z_parameter/func_801155B4.s func_801155B4 0x801155B4 0x6C
1645 asm/non_matchings/code/z_parameter/func_80115764.s func_80115764 0x80115764 0x38
1646 asm/non_matchings/code/z_parameter/func_80115844.s func_80115844 0x80115844 0x31
1647 asm/non_matchings/code/z_parameter/func_80115908.s asm/non_matchings/code/z_parameter/Health_ChangeBy.s func_80115908 Health_ChangeBy 0x80115908 0x2E
1648 asm/non_matchings/code/z_parameter/func_801159c0.s asm/non_matchings/code/z_parameter/Health_GiveHearts.s func_801159c0 Health_GiveHearts 0x801159C0 0xB
1649 asm/non_matchings/code/z_parameter/func_801159EC.s asm/non_matchings/code/z_parameter/Rupees_ChangeBy.s func_801159EC Rupees_ChangeBy 0x801159EC 0xA
1650 asm/non_matchings/code/z_parameter/func_80115A14.s asm/non_matchings/code/z_parameter/Inventory_ChangeAmmo.s func_80115A14 Inventory_ChangeAmmo 0x80115A14 0xC0
1651 asm/non_matchings/code/z_parameter/Parameter_AddMagic.s Parameter_AddMagic 0x80115D14 0x12
1652 asm/non_matchings/code/z_parameter/func_80115D5C.s func_80115D5C 0x80115D5C 0x16
1653 asm/non_matchings/code/z_parameter/func_80115DB4.s func_80115DB4 0x80115DB4 0xB5