Skip to content

Commit

Permalink
Merge pull request #1 from denoflionsx/models
Browse files Browse the repository at this point in the history
Fix hierarchy and pointers
  • Loading branch information
cjohnson57 authored Feb 22, 2022
2 parents 96999a3 + 2336d1c commit fe84538
Showing 1 changed file with 146 additions and 146 deletions.
292 changes: 146 additions & 146 deletions Models.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def patch_model(rom, settings, log):

writer.SetBase('Code')
writer.GoTo(0xE65A0)
writer.WriteModelData(0x06005830)
writer.WriteModelData(0x06005380)

# Write child Link data
writer.GoTo(0xE671C)
Expand Down Expand Up @@ -349,7 +349,7 @@ def patch_model(rom, settings, log):

writer.SetBase('Code')
writer.GoTo(0xE65A4)
writer.WriteModelData(0x06005830)
writer.WriteModelData(0x060053A8)

# Write zobj to adult object (will separate child and adult later)
file = open('data/Models/' + model, "rb")
Expand All @@ -363,147 +363,147 @@ def patch_model(rom, settings, log):


class Offsets(IntEnum):
ADULT_LINK_LUT_DL_WAIST = 0x5090
ADULT_LINK_LUT_DL_RTHIGH = 0x5098
ADULT_LINK_LUT_DL_RSHIN = 0x50A0
ADULT_LINK_LUT_DL_RFOOT = 0x50A8
ADULT_LINK_LUT_DL_LTHIGH = 0x50B0
ADULT_LINK_LUT_DL_LSHIN = 0x50B8
ADULT_LINK_LUT_DL_LFOOT = 0x50C0
ADULT_LINK_LUT_DL_HEAD = 0x50C8
ADULT_LINK_LUT_DL_HAT = 0x50D0
ADULT_LINK_LUT_DL_COLLAR = 0x50D8
ADULT_LINK_LUT_DL_LSHOULDER = 0x50E0
ADULT_LINK_LUT_DL_LFOREARM = 0x50E8
ADULT_LINK_LUT_DL_RSHOULDER = 0x50F0
ADULT_LINK_LUT_DL_RFOREARM = 0x50F8
ADULT_LINK_LUT_DL_TORSO = 0x5100
ADULT_LINK_LUT_DL_LHAND = 0x5108
ADULT_LINK_LUT_DL_LFIST = 0x5110
ADULT_LINK_LUT_DL_LHAND_BOTTLE = 0x5118
ADULT_LINK_LUT_DL_RHAND = 0x5120
ADULT_LINK_LUT_DL_RFIST = 0x5128
ADULT_LINK_LUT_DL_SWORD_SHEATH = 0x5130
ADULT_LINK_LUT_DL_SWORD_HILT = 0x5138
ADULT_LINK_LUT_DL_SWORD_BLADE = 0x5140
ADULT_LINK_LUT_DL_LONGSWORD_HILT = 0x5148
ADULT_LINK_LUT_DL_LONGSWORD_BLADE = 0x5150
ADULT_LINK_LUT_DL_LONGSWORD_BROKEN = 0x5158
ADULT_LINK_LUT_DL_SHIELD_HYLIAN = 0x5160
ADULT_LINK_LUT_DL_SHIELD_MIRROR = 0x5168
ADULT_LINK_LUT_DL_HAMMER = 0x5170
ADULT_LINK_LUT_DL_BOTTLE = 0x5178
ADULT_LINK_LUT_DL_BOW = 0x5180
ADULT_LINK_LUT_DL_OCARINA_TIME = 0x5188
ADULT_LINK_LUT_DL_HOOKSHOT = 0x5190
ADULT_LINK_LUT_DL_UPGRADE_LFOREARM = 0x5198
ADULT_LINK_LUT_DL_UPGRADE_LHAND = 0x51A0
ADULT_LINK_LUT_DL_UPGRADE_LFIST = 0x51A8
ADULT_LINK_LUT_DL_UPGRADE_RFOREARM = 0x51B0
ADULT_LINK_LUT_DL_UPGRADE_RHAND = 0x51B8
ADULT_LINK_LUT_DL_UPGRADE_RFIST = 0x51C0
ADULT_LINK_LUT_DL_BOOT_LIRON = 0x51C8
ADULT_LINK_LUT_DL_BOOT_RIRON = 0x51D0
ADULT_LINK_LUT_DL_BOOT_LHOVER = 0x51D8
ADULT_LINK_LUT_DL_BOOT_RHOVER = 0x51E0
ADULT_LINK_LUT_DL_FPS_LFOREARM = 0x51E8
ADULT_LINK_LUT_DL_FPS_LHAND = 0x51F0
ADULT_LINK_LUT_DL_FPS_RFOREARM = 0x51F8
ADULT_LINK_LUT_DL_FPS_RHAND = 0x5200
ADULT_LINK_LUT_DL_FPS_HOOKSHOT = 0x5208
ADULT_LINK_LUT_DL_HOOKSHOT_CHAIN = 0x5210
ADULT_LINK_LUT_DL_HOOKSHOT_HOOK = 0x5218
ADULT_LINK_LUT_DL_HOOKSHOT_AIM = 0x5220
ADULT_LINK_LUT_DL_BOW_STRING = 0x5228
ADULT_LINK_LUT_DL_BLADEBREAK = 0x5230
ADULT_LINK_LUT_DL_SWORD_SHEATHED = 0x5238
ADULT_LINK_LUT_DL_SHIELD_HYLIAN_BACK = 0x5258
ADULT_LINK_LUT_DL_SHIELD_MIRROR_BACK = 0x5268
ADULT_LINK_LUT_DL_SWORD_SHIELD_HYLIAN = 0x5278
ADULT_LINK_LUT_DL_SWORD_SHIELD_MIRROR = 0x5288
ADULT_LINK_LUT_DL_SHEATH0_HYLIAN = 0x5298
ADULT_LINK_LUT_DL_SHEATH0_MIRROR = 0x52A8
ADULT_LINK_LUT_DL_LFIST_SWORD = 0x52B8
ADULT_LINK_LUT_DL_LFIST_LONGSWORD = 0x52D0
ADULT_LINK_LUT_DL_LFIST_LONGSWORD_BROKEN = 0x52E8
ADULT_LINK_LUT_DL_LFIST_HAMMER = 0x5300
ADULT_LINK_LUT_DL_RFIST_SHIELD_HYLIAN = 0x5310
ADULT_LINK_LUT_DL_RFIST_SHIELD_MIRROR = 0x5320
ADULT_LINK_LUT_DL_RFIST_BOW = 0x5330
ADULT_LINK_LUT_DL_RFIST_HOOKSHOT = 0x5340
ADULT_LINK_LUT_DL_RHAND_OCARINA_TIME = 0x5350
ADULT_LINK_LUT_DL_FPS_RHAND_BOW = 0x5360
ADULT_LINK_LUT_DL_FPS_LHAND_HOOKSHOT = 0x5370

CHILD_LINK_LUT_DL_SHIELD_DEKU = 0x50D0
CHILD_LINK_LUT_DL_WAIST = 0x50D8
CHILD_LINK_LUT_DL_RTHIGH = 0x50E0
CHILD_LINK_LUT_DL_RSHIN = 0x50E8
CHILD_LINK_LUT_DL_RFOOT = 0x50F0
CHILD_LINK_LUT_DL_LTHIGH = 0x50F8
CHILD_LINK_LUT_DL_LSHIN = 0x5100
CHILD_LINK_LUT_DL_LFOOT = 0x5108
CHILD_LINK_LUT_DL_HEAD = 0x5110
CHILD_LINK_LUT_DL_HAT = 0x5118
CHILD_LINK_LUT_DL_COLLAR = 0x5120
CHILD_LINK_LUT_DL_LSHOULDER = 0x5128
CHILD_LINK_LUT_DL_LFOREARM = 0x5130
CHILD_LINK_LUT_DL_RSHOULDER = 0x5138
CHILD_LINK_LUT_DL_RFOREARM = 0x5140
CHILD_LINK_LUT_DL_TORSO = 0x5148
CHILD_LINK_LUT_DL_LHAND = 0x5150
CHILD_LINK_LUT_DL_LFIST = 0x5158
CHILD_LINK_LUT_DL_LHAND_BOTTLE = 0x5160
CHILD_LINK_LUT_DL_RHAND = 0x5168
CHILD_LINK_LUT_DL_RFIST = 0x5170
CHILD_LINK_LUT_DL_SWORD_SHEATH = 0x5178
CHILD_LINK_LUT_DL_SWORD_HILT = 0x5180
CHILD_LINK_LUT_DL_SWORD_BLADE = 0x5188
CHILD_LINK_LUT_DL_SLINGSHOT = 0x5190
CHILD_LINK_LUT_DL_OCARINA_FAIRY = 0x5198
CHILD_LINK_LUT_DL_OCARINA_TIME = 0x51A0
CHILD_LINK_LUT_DL_DEKU_STICK = 0x51A8
CHILD_LINK_LUT_DL_BOOMERANG = 0x51B0
CHILD_LINK_LUT_DL_SHIELD_HYLIAN_BACK = 0x51B8
CHILD_LINK_LUT_DL_BOTTLE = 0x51C0
CHILD_LINK_LUT_DL_MASTER_SWORD = 0x51C8
CHILD_LINK_LUT_DL_GORON_BRACELET = 0x51D0
CHILD_LINK_LUT_DL_FPS_RIGHT_ARM = 0x51D8
CHILD_LINK_LUT_DL_SLINGSHOT_STRING = 0x51E0
CHILD_LINK_LUT_DL_MASK_BUNNY = 0x51E8
CHILD_LINK_LUT_DL_MASK_GERUDO = 0x51F0
CHILD_LINK_LUT_DL_MASK_GORON = 0x51F8
CHILD_LINK_LUT_DL_MASK_KEATON = 0x5200
CHILD_LINK_LUT_DL_MASK_SPOOKY = 0x5208
CHILD_LINK_LUT_DL_MASK_TRUTH = 0x5210
CHILD_LINK_LUT_DL_MASK_ZORA = 0x5218
CHILD_LINK_LUT_DL_MASK_SKULL = 0x5220
CHILD_LINK_DL_SWORD_SHEATHED = 0x5228
CHILD_LINK_LUT_DL_SWORD_SHEATHED = 0x5248
CHILD_LINK_DL_SHIELD_DEKU_ODD = 0x5250
CHILD_LINK_LUT_DL_SHIELD_DEKU_ODD = 0x5260
CHILD_LINK_DL_SHIELD_DEKU_BACK = 0x5268
CHILD_LINK_LUT_DL_SHIELD_DEKU_BACK = 0x5278
CHILD_LINK_DL_SWORD_SHIELD_HYLIAN = 0x5280
CHILD_LINK_LUT_DL_SWORD_SHIELD_HYLIAN = 0x5290
CHILD_LINK_DL_SWORD_SHIELD_DEKU = 0x5298
CHILD_LINK_LUT_DL_SWORD_SHIELD_DEKU = 0x52A8
CHILD_LINK_DL_SHEATH0_HYLIAN = 0x52B0
CHILD_LINK_LUT_DL_SHEATH0_HYLIAN = 0x52C0
CHILD_LINK_DL_SHEATH0_DEKU = 0x52C8
CHILD_LINK_LUT_DL_SHEATH0_DEKU = 0x52D8
CHILD_LINK_DL_LFIST_SWORD = 0x52E0
CHILD_LINK_LUT_DL_LFIST_SWORD = 0x52F8
CHILD_LINK_DL_LHAND_PEDESTALSWORD = 0x5300
CHILD_LINK_LUT_DL_LHAND_PEDESTALSWORD = 0x5310
CHILD_LINK_DL_LFIST_BOOMERANG = 0x5318
CHILD_LINK_LUT_DL_LFIST_BOOMERANG = 0x5328
CHILD_LINK_DL_RFIST_SHIELD_DEKU = 0x5330
CHILD_LINK_LUT_DL_RFIST_SHIELD_DEKU = 0x5340
CHILD_LINK_DL_RFIST_SLINGSHOT = 0x5348
CHILD_LINK_LUT_DL_RFIST_SLINGSHOT = 0x5358
CHILD_LINK_DL_RHAND_OCARINA_FAIRY = 0x5360
CHILD_LINK_LUT_DL_RHAND_OCARINA_FAIRY = 0x5370
CHILD_LINK_DL_RHAND_OCARINA_TIME = 0x5378
CHILD_LINK_LUT_DL_RHAND_OCARINA_TIME = 0x5388
CHILD_LINK_DL_FPS_RARM_SLINGSHOT = 0x5390
ADULT_LINK_LUT_DL_WAIST = 0x06005090
ADULT_LINK_LUT_DL_RTHIGH = 0x06005098
ADULT_LINK_LUT_DL_RSHIN = 0x060050A0
ADULT_LINK_LUT_DL_RFOOT = 0x060050A8
ADULT_LINK_LUT_DL_LTHIGH = 0x060050B0
ADULT_LINK_LUT_DL_LSHIN = 0x060050B8
ADULT_LINK_LUT_DL_LFOOT = 0x060050C0
ADULT_LINK_LUT_DL_HEAD = 0x060050C8
ADULT_LINK_LUT_DL_HAT = 0x060050D0
ADULT_LINK_LUT_DL_COLLAR = 0x060050D8
ADULT_LINK_LUT_DL_LSHOULDER = 0x060050E0
ADULT_LINK_LUT_DL_LFOREARM = 0x060050E8
ADULT_LINK_LUT_DL_RSHOULDER = 0x060050F0
ADULT_LINK_LUT_DL_RFOREARM = 0x060050F8
ADULT_LINK_LUT_DL_TORSO = 0x06005100
ADULT_LINK_LUT_DL_LHAND = 0x06005108
ADULT_LINK_LUT_DL_LFIST = 0x06005110
ADULT_LINK_LUT_DL_LHAND_BOTTLE = 0x06005118
ADULT_LINK_LUT_DL_RHAND = 0x06005120
ADULT_LINK_LUT_DL_RFIST = 0x06005128
ADULT_LINK_LUT_DL_SWORD_SHEATH = 0x06005130
ADULT_LINK_LUT_DL_SWORD_HILT = 0x06005138
ADULT_LINK_LUT_DL_SWORD_BLADE = 0x06005140
ADULT_LINK_LUT_DL_LONGSWORD_HILT = 0x06005148
ADULT_LINK_LUT_DL_LONGSWORD_BLADE = 0x06005150
ADULT_LINK_LUT_DL_LONGSWORD_BROKEN = 0x06005158
ADULT_LINK_LUT_DL_SHIELD_HYLIAN = 0x06005160
ADULT_LINK_LUT_DL_SHIELD_MIRROR = 0x06005168
ADULT_LINK_LUT_DL_HAMMER = 0x06005170
ADULT_LINK_LUT_DL_BOTTLE = 0x06005178
ADULT_LINK_LUT_DL_BOW = 0x06005180
ADULT_LINK_LUT_DL_OCARINA_TIME = 0x06005188
ADULT_LINK_LUT_DL_HOOKSHOT = 0x06005190
ADULT_LINK_LUT_DL_UPGRADE_LFOREARM = 0x06005198
ADULT_LINK_LUT_DL_UPGRADE_LHAND = 0x060051A0
ADULT_LINK_LUT_DL_UPGRADE_LFIST = 0x506001A8
ADULT_LINK_LUT_DL_UPGRADE_RFOREARM = 0x060051B0
ADULT_LINK_LUT_DL_UPGRADE_RHAND = 0x060051B8
ADULT_LINK_LUT_DL_UPGRADE_RFIST = 0x060051C0
ADULT_LINK_LUT_DL_BOOT_LIRON = 0x060051C8
ADULT_LINK_LUT_DL_BOOT_RIRON = 0x060051D0
ADULT_LINK_LUT_DL_BOOT_LHOVER = 0x060051D8
ADULT_LINK_LUT_DL_BOOT_RHOVER = 0x060051E0
ADULT_LINK_LUT_DL_FPS_LFOREARM = 0x060051E8
ADULT_LINK_LUT_DL_FPS_LHAND = 0x060051F0
ADULT_LINK_LUT_DL_FPS_RFOREARM = 0x060051F8
ADULT_LINK_LUT_DL_FPS_RHAND = 0x06005200
ADULT_LINK_LUT_DL_FPS_HOOKSHOT = 0x06005208
ADULT_LINK_LUT_DL_HOOKSHOT_CHAIN = 0x06005210
ADULT_LINK_LUT_DL_HOOKSHOT_HOOK = 0x06005218
ADULT_LINK_LUT_DL_HOOKSHOT_AIM = 0x06005220
ADULT_LINK_LUT_DL_BOW_STRING = 0x06005228
ADULT_LINK_LUT_DL_BLADEBREAK = 0x06005230
ADULT_LINK_LUT_DL_SWORD_SHEATHED = 0x06005238
ADULT_LINK_LUT_DL_SHIELD_HYLIAN_BACK = 0x06005258
ADULT_LINK_LUT_DL_SHIELD_MIRROR_BACK = 0x06005268
ADULT_LINK_LUT_DL_SWORD_SHIELD_HYLIAN = 0x06005278
ADULT_LINK_LUT_DL_SWORD_SHIELD_MIRROR = 0x06005288
ADULT_LINK_LUT_DL_SHEATH0_HYLIAN = 0x06005298
ADULT_LINK_LUT_DL_SHEATH0_MIRROR = 0x060052A8
ADULT_LINK_LUT_DL_LFIST_SWORD = 0x060052B8
ADULT_LINK_LUT_DL_LFIST_LONGSWORD = 0x060052D0
ADULT_LINK_LUT_DL_LFIST_LONGSWORD_BROKEN = 0x060052E8
ADULT_LINK_LUT_DL_LFIST_HAMMER = 0x06005300
ADULT_LINK_LUT_DL_RFIST_SHIELD_HYLIAN = 0x06005310
ADULT_LINK_LUT_DL_RFIST_SHIELD_MIRROR = 0x06005320
ADULT_LINK_LUT_DL_RFIST_BOW = 0x06005330
ADULT_LINK_LUT_DL_RFIST_HOOKSHOT = 0x06005340
ADULT_LINK_LUT_DL_RHAND_OCARINA_TIME = 0x06005350
ADULT_LINK_LUT_DL_FPS_RHAND_BOW = 0x06005360
ADULT_LINK_LUT_DL_FPS_LHAND_HOOKSHOT = 0x06005370

CHILD_LINK_LUT_DL_SHIELD_DEKU = 0x060050D0
CHILD_LINK_LUT_DL_WAIST = 0x060050D8
CHILD_LINK_LUT_DL_RTHIGH = 0x060050E0
CHILD_LINK_LUT_DL_RSHIN = 0x060050E8
CHILD_LINK_LUT_DL_RFOOT = 0x060050F0
CHILD_LINK_LUT_DL_LTHIGH = 0x060050F8
CHILD_LINK_LUT_DL_LSHIN = 0x06005100
CHILD_LINK_LUT_DL_LFOOT = 0x06005108
CHILD_LINK_LUT_DL_HEAD = 0x06005110
CHILD_LINK_LUT_DL_HAT = 0x06005118
CHILD_LINK_LUT_DL_COLLAR = 0x06005120
CHILD_LINK_LUT_DL_LSHOULDER = 0x06005128
CHILD_LINK_LUT_DL_LFOREARM = 0x06005130
CHILD_LINK_LUT_DL_RSHOULDER = 0x06005138
CHILD_LINK_LUT_DL_RFOREARM = 0x06005140
CHILD_LINK_LUT_DL_TORSO = 0x06005148
CHILD_LINK_LUT_DL_LHAND = 0x06005150
CHILD_LINK_LUT_DL_LFIST = 0x06005158
CHILD_LINK_LUT_DL_LHAND_BOTTLE = 0x06005160
CHILD_LINK_LUT_DL_RHAND = 0x06005168
CHILD_LINK_LUT_DL_RFIST = 0x06005170
CHILD_LINK_LUT_DL_SWORD_SHEATH = 0x06005178
CHILD_LINK_LUT_DL_SWORD_HILT = 0x06005180
CHILD_LINK_LUT_DL_SWORD_BLADE = 0x06005188
CHILD_LINK_LUT_DL_SLINGSHOT = 0x06005190
CHILD_LINK_LUT_DL_OCARINA_FAIRY = 0x06005198
CHILD_LINK_LUT_DL_OCARINA_TIME = 0x060051A0
CHILD_LINK_LUT_DL_DEKU_STICK = 0x060051A8
CHILD_LINK_LUT_DL_BOOMERANG = 0x060051B0
CHILD_LINK_LUT_DL_SHIELD_HYLIAN_BACK = 0x060051B8
CHILD_LINK_LUT_DL_BOTTLE = 0x060051C0
CHILD_LINK_LUT_DL_MASTER_SWORD = 0x060051C8
CHILD_LINK_LUT_DL_GORON_BRACELET = 0x060051D0
CHILD_LINK_LUT_DL_FPS_RIGHT_ARM = 0x060051D8
CHILD_LINK_LUT_DL_SLINGSHOT_STRING = 0x060051E0
CHILD_LINK_LUT_DL_MASK_BUNNY = 0x060051E8
CHILD_LINK_LUT_DL_MASK_GERUDO = 0x060051F0
CHILD_LINK_LUT_DL_MASK_GORON = 0x060051F8
CHILD_LINK_LUT_DL_MASK_KEATON = 0x06005200
CHILD_LINK_LUT_DL_MASK_SPOOKY = 0x06005208
CHILD_LINK_LUT_DL_MASK_TRUTH = 0x06005210
CHILD_LINK_LUT_DL_MASK_ZORA = 0x06005218
CHILD_LINK_LUT_DL_MASK_SKULL = 0x06005220
CHILD_LINK_DL_SWORD_SHEATHED = 0x06005228
CHILD_LINK_LUT_DL_SWORD_SHEATHED = 0x06005248
CHILD_LINK_DL_SHIELD_DEKU_ODD = 0x06005250
CHILD_LINK_LUT_DL_SHIELD_DEKU_ODD = 0x06005260
CHILD_LINK_DL_SHIELD_DEKU_BACK = 0x06005268
CHILD_LINK_LUT_DL_SHIELD_DEKU_BACK = 0x06005278
CHILD_LINK_DL_SWORD_SHIELD_HYLIAN = 0x06005280
CHILD_LINK_LUT_DL_SWORD_SHIELD_HYLIAN = 0x06005290
CHILD_LINK_DL_SWORD_SHIELD_DEKU = 0x06005298
CHILD_LINK_LUT_DL_SWORD_SHIELD_DEKU = 0x060052A8
CHILD_LINK_DL_SHEATH0_HYLIAN = 0x060052B0
CHILD_LINK_LUT_DL_SHEATH0_HYLIAN = 0x060052C0
CHILD_LINK_DL_SHEATH0_DEKU = 0x060052C8
CHILD_LINK_LUT_DL_SHEATH0_DEKU = 0x060052D8
CHILD_LINK_DL_LFIST_SWORD = 0x060052E0
CHILD_LINK_LUT_DL_LFIST_SWORD = 0x060052F8
CHILD_LINK_DL_LHAND_PEDESTALSWORD = 0x06005300
CHILD_LINK_LUT_DL_LHAND_PEDESTALSWORD = 0x06005310
CHILD_LINK_DL_LFIST_BOOMERANG = 0x06005318
CHILD_LINK_LUT_DL_LFIST_BOOMERANG = 0x06005328
CHILD_LINK_DL_RFIST_SHIELD_DEKU = 0x06005330
CHILD_LINK_LUT_DL_RFIST_SHIELD_DEKU = 0x06005340
CHILD_LINK_DL_RFIST_SLINGSHOT = 0x06005348
CHILD_LINK_LUT_DL_RFIST_SLINGSHOT = 0x06005358
CHILD_LINK_DL_RHAND_OCARINA_FAIRY = 0x06005360
CHILD_LINK_LUT_DL_RHAND_OCARINA_FAIRY = 0x06005370
CHILD_LINK_DL_RHAND_OCARINA_TIME = 0x06005378
CHILD_LINK_LUT_DL_RHAND_OCARINA_TIME = 0x06005388
CHILD_LINK_DL_FPS_RARM_SLINGSHOT = 0x06005390

0 comments on commit fe84538

Please sign in to comment.