Skip to content

Pr 13#2184

Open
stephenjayakar wants to merge 33 commits intodoldecomp:masterfrom
stephenjayakar:pr-13
Open

Pr 13#2184
stephenjayakar wants to merge 33 commits intodoldecomp:masterfrom
stephenjayakar:pr-13

Conversation

@stephenjayakar
Copy link
Contributor

No description provided.

Decompile the following functions:
- fn_800DC014 (ftCo_Attack100.c) - 12 instructions
- fn_80169550 (gm_1601.c) - 9 instructions
- gm_8017E5C8 (gm_17C0.c) - 13 instructions
- gm_80182554 (gm_17C0.c) - 9 instructions
- grCorneria_801E2598 (grcorneria.c) - 11 instructions
- grIceMt_801F8364 (gricemt.c) - 13 instructions
- grOldKongo_8020F4E8 (groldkongo.c) - 15 instructions
- grOldPupupu_802109D8 (groldpupupu.c) - 17 instructions
- it_802B1FE8 (itpikachuthunder.c) - 17 instructions
- it_802F1344 (itcrazyhandbomb.c) - 16 instructions

Also fixes function signatures in headers and expands
itPikachuthunder_ItemVars and itPikachuthunderAttributes structs
with proper field layouts.
Decompile the following stub functions:
- grCorneria_801E2738 (gr/grcorneria.c)
- grIceMt_801F85C4 (gr/gricemt.c)
- fn_801F91A8 / grIceMt_801F929C (gr/gricemt.c)
- grPushOn_80219204 (gr/grpushon.c)
- grZakoGenerator_801CAEB0 (gr/grzakogenerator.c)
- grZebesRoute_8020B3C0 (gr/grzebesroute.c)
- fn_80169574 (gm/gm_1601.c)
- fn_80171B64 (gm/gm_16F1.c)
- gm_8017ECD4 (gm/gm_17C0.c)
- gm_8017ED08 (gm/gm_17C0.c)

Also fixes grCorneria_801E25C4 signature (grcorneria.h) and
updates call site in grvenom.c.
Decompile the following stub functions:
- fn_800DB8A4 (ft/chara/ftCommon/ftCo_Attack100.c)
- ftCh_Slap_Phys (ft/chara/ftCrazyHand/ftCh_Init.c)
- fn_801587B0 (ft/chara/ftCrazyHand/ftCh_Init.c)
- lbMthp_8001F578 (lb/lbmthp.c)
- CreateNameAtIndex (mn/mnname.c)
- itBombhei_UnkMotion6_Coll (it/items/itbombhei.c)
- itBombhei_UnkMotion10_Coll (it/items/itbombhei.c)
- it_3F14_Logic42_DmgDealt (it/items/itevyoshiegg.c)
- it_3F14_Logic42_Clanked (it/items/itevyoshiegg.c)
- it_3F14_Logic42_HitShield (it/items/itevyoshiegg.c)
- it_3F14_Logic42_Reflected (it/items/itevyoshiegg.c)

Also updates InitializePersistentNameData signature in gmmain_lib.h
and lbmthp struct layout in lbmthp.static.h.
Decompile the following stub functions:
- it_8028EC98 (it/items/itfreeze.c)
- itGamewatchchef_UnkMotion0_Phys (it/items/itgamewatchchef.c)
- it_802D4510 (it/items/ithitodeman.c)
- it_802D2668 (it/items/ithouou.c)
- it_802ECFE0 (it/items/itkyasarin.c)
- it_802DABC0 (it/items/itlikelike.c)
- it_802D1580 (it/items/itlugia.c)
- fn_802C5E18 (it/items/itmewtwoshadowball.c)
- it_2725_Logic59_EvtUnk (it/items/itnessyoyo.c)
- itOldkuri_UnkMotion3_Coll (it/items/itoldkuri.c)
- itOldkuri_UnkMotion4_Coll (it/items/itoldkuri.c)

Also adds/updates shared item type definitions:
- itMewtwoShadowball_ItemVars, itOldkuri_ItemVars (itCommonItems.h)
- itGamewatchchef_ItemVars, itTools_ItemVars (itCharItems.h)
- itLugiaAttributes, itFreeze_ItemVars layout (itCommonItems.h)
- it/types.h Item union members
Matched functions:
- grHomeRun_8021DEF0, grHomeRun_8021E074, grHomeRun_8021E1F8, grHomeRun_8021E37C (grhomerun.c)
- grIceMt_801F815C (gricemt.c)
- grMuteCity_801F044C (grmutecity.c)
- grOnett_801E5140 (gronett.c)
- fn_802130D0 (grpura.c)
- ft_80089824 (ft_0892.c)
- ftKb_SpecialN_800F15D8 (ftKb_Init.c)
- fn_800F64C8 (ftKb_SpecialN.c)
Matched functions:
- it_3F14_Logic17_Spawned, it_8028F434, itFreeze_UnkMotion4_Phys, it_8028F7C8, itFreeze_UnkMotion5_Coll, it_8028F8E4, it_8028F968 (itfreeze.c)
- it_802C875C, it_2725_Logic112_Clanked, it_2725_Logic112_HitShield (itgamewatchchef.c)
Matched functions:
- it_802B2080 (itpikachuthunder.c)
- it_2725_Logic106_Destroyed, itPikachutjoltground_UnkMotion1_Anim, itPikachutjoltground_UnkMotion0_Phys, itPikachutjoltground_UnkMotion0_Coll, itPikachutjoltground_UnkMotion1_Coll, it_2725_Logic106_DmgDealt, it_2725_Logic106_Clanked, it_2725_Logic106_Absorbed, it_2725_Logic106_HitShield (itpikachutjoltground.c)
Matched functions:
- it_8028D4E4, it_3F14_Logic15_Spawned, it_8028D62C, it_3F14_Logic15_Thrown, itRshell_UnkMotion3_Anim, itRshell_UnkMotion4_Anim, itRshell_UnkMotion6_Anim (itrshell.c)
- it_802E0F1C, it_2725_Logic4_Dropped, it_2725_Logic4_Thrown (itpatapata.c)
Matched functions:
- it_80294364, it_80294430, it_802944AC, it_802946B0, it_3F14_Logic29_PickedUp, it_802947CC, itWstar_UnkMotion5_Anim (itwstar.c)
- it_802881B4, it_802881FC (ittaru.c)
- it_3F14_Logic5_Dropped, it_80296EA8 (ittarucann.c)
Matched functions:
- it_802BCED4, it_802BCF2C (itseakchain.c)
- it_802E436C, it_2725_Logic9_Thrown (itwhitebea.c)
- it_2725_Logic23_DmgDealt, it_2725_Logic23_Clanked (itnesspkfire.c)
- itSamuschargeshot_UnkMotion8_Phys (itsamuschargeshot.c)
- it_802F1030 (itcrazyhandbomb.c)
- it_802EB268 (itgreatfoxlaser.c)
- it_802D290C (ithouou.c)
Matched functions:
- it_802C9E8C (itkabigon.c)
- it_802ED0D0 (itkyasarin.c)
- it_802D9DDC (itlikelike.c)
- it_2725_Logic0_Thrown (itoldkuri.c)
- itTools_UnkMotion4_Phys (ittools.c)
- itUnknown_UnkMotion0_Phys (itunknown.c)
Decompile the following stub functions:
- fn_800DB8A4 (ft/chara/ftCommon/ftCo_Attack100.c)
- ftCh_Slap_Phys (ft/chara/ftCrazyHand/ftCh_Init.c)
- fn_801587B0 (ft/chara/ftCrazyHand/ftCh_Init.c)
- lbMthp_8001F578 (lb/lbmthp.c)
- CreateNameAtIndex (mn/mnname.c)
- itBombhei_UnkMotion6_Coll (it/items/itbombhei.c)
- itBombhei_UnkMotion10_Coll (it/items/itbombhei.c)
- it_3F14_Logic42_DmgDealt (it/items/itevyoshiegg.c)
- it_3F14_Logic42_Clanked (it/items/itevyoshiegg.c)
- it_3F14_Logic42_HitShield (it/items/itevyoshiegg.c)
- it_3F14_Logic42_Reflected (it/items/itevyoshiegg.c)

Also updates InitializePersistentNameData signature in gmmain_lib.h
and lbmthp struct layout in lbmthp.static.h.
Decompile the following stub functions:
- it_8028EC98 (it/items/itfreeze.c)
- itGamewatchchef_UnkMotion0_Phys (it/items/itgamewatchchef.c)
- it_802D4510 (it/items/ithitodeman.c)
- it_802D2668 (it/items/ithouou.c)
- it_802ECFE0 (it/items/itkyasarin.c)
- it_802DABC0 (it/items/itlikelike.c)
- it_802D1580 (it/items/itlugia.c)
- fn_802C5E18 (it/items/itmewtwoshadowball.c)
- it_2725_Logic59_EvtUnk (it/items/itnessyoyo.c)
- itOldkuri_UnkMotion3_Coll (it/items/itoldkuri.c)
- itOldkuri_UnkMotion4_Coll (it/items/itoldkuri.c)

Also adds/updates shared item type definitions:
- itMewtwoShadowball_ItemVars, itOldkuri_ItemVars (itCommonItems.h)
- itGamewatchchef_ItemVars, itTools_ItemVars (itCharItems.h)
- itLugiaAttributes, itFreeze_ItemVars layout (itCommonItems.h)
- it/types.h Item union members
Matched functions:
- grHomeRun_8021DEF0, grHomeRun_8021E074, grHomeRun_8021E1F8, grHomeRun_8021E37C (grhomerun.c)
- grIceMt_801F815C (gricemt.c)
- grMuteCity_801F044C (grmutecity.c)
- grOnett_801E5140 (gronett.c)
- fn_802130D0 (grpura.c)
- ft_80089824 (ft_0892.c)
- ftKb_SpecialN_800F15D8 (ftKb_Init.c)
- fn_800F64C8 (ftKb_SpecialN.c)
Matched functions:
- it_3F14_Logic17_Spawned, it_8028F434, itFreeze_UnkMotion4_Phys, it_8028F7C8, itFreeze_UnkMotion5_Coll, it_8028F8E4, it_8028F968 (itfreeze.c)
- it_802C875C, it_2725_Logic112_Clanked, it_2725_Logic112_HitShield (itgamewatchchef.c)
Matched functions:
- it_802B2080 (itpikachuthunder.c)
- it_2725_Logic106_Destroyed, itPikachutjoltground_UnkMotion1_Anim, itPikachutjoltground_UnkMotion0_Phys, itPikachutjoltground_UnkMotion0_Coll, itPikachutjoltground_UnkMotion1_Coll, it_2725_Logic106_DmgDealt, it_2725_Logic106_Clanked, it_2725_Logic106_Absorbed, it_2725_Logic106_HitShield (itpikachutjoltground.c)
Matched functions:
- it_8028D4E4, it_3F14_Logic15_Spawned, it_8028D62C, it_3F14_Logic15_Thrown, itRshell_UnkMotion3_Anim, itRshell_UnkMotion4_Anim, itRshell_UnkMotion6_Anim (itrshell.c)
- it_802E0F1C, it_2725_Logic4_Dropped, it_2725_Logic4_Thrown (itpatapata.c)
Matched functions:
- it_80294364, it_80294430, it_802944AC, it_802946B0, it_3F14_Logic29_PickedUp, it_802947CC, itWstar_UnkMotion5_Anim (itwstar.c)
- it_802881B4, it_802881FC (ittaru.c)
- it_3F14_Logic5_Dropped, it_80296EA8 (ittarucann.c)
Matched functions:
- it_802BCED4, it_802BCF2C (itseakchain.c)
- it_802E436C, it_2725_Logic9_Thrown (itwhitebea.c)
- it_2725_Logic23_DmgDealt, it_2725_Logic23_Clanked (itnesspkfire.c)
- itSamuschargeshot_UnkMotion8_Phys (itsamuschargeshot.c)
- it_802F1030 (itcrazyhandbomb.c)
- it_802EB268 (itgreatfoxlaser.c)
- it_802D290C (ithouou.c)
Matched functions:
- it_802C9E8C (itkabigon.c)
- it_802ED0D0 (itkyasarin.c)
- it_802D9DDC (itlikelike.c)
- it_2725_Logic0_Thrown (itoldkuri.c)
- itTools_UnkMotion4_Phys (ittools.c)
- itUnknown_UnkMotion0_Phys (itunknown.c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant