diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-09-23 17:43:47 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-23 17:43:47 -0500 |
| commit | 32e3eb665715ae6bf6d633873526715dd140fe91 (patch) | |
| tree | eb0f165a52b2721f666804d39737a1446b2427af | |
| parent | 9df87851bac473d72f8c061af719e2b0a0116dec (diff) | |
| download | kamek-32e3eb665715ae6bf6d633873526715dd140fe91.tar.gz kamek-32e3eb665715ae6bf6d633873526715dd140fe91.zip | |
shy guy fixes
Diffstat (limited to '')
| -rw-r--r-- | shyguy.yaml | 4 | ||||
| -rw-r--r-- | src/shyguy.cpp | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/shyguy.yaml b/shyguy.yaml index 3f4ec44..c75c690 100644 --- a/shyguy.yaml +++ b/shyguy.yaml @@ -10,10 +10,10 @@ hooks: - name: UpdateShyGuySpriteInfo type: patch - addr_pal: 0x8030DA3C #0x8030DA18 + addr_pal: 0x8030DA1C #0x8030DA18 # [204] ( 16, 48) ( 0, -24 16: 24) 64? 64? 0? 0? | [8:Environment?] # 00CC 0000 00000010 00000030 00000000 FFFFFFE8 00000010 00000018 0040 0040 0000 0000 0008 0000 - data: '0000 0000' + data: '00000010 00000030 00000000 FFFFFFC0 00000010 00000040 0040 0040 0000 0000 0000 0000' - name: ShyGuySpriteFileInfo type: add_func_pointer diff --git a/src/shyguy.cpp b/src/shyguy.cpp index 174b075..f0ae63a 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -114,6 +114,7 @@ class daShyGuy : public dEn_c { void _vf148(); void _vf14C(); + bool CreateIceActors(); USING_STATES(daShyGuy); DECLARE_STATE(Walk); @@ -354,6 +355,22 @@ daShyGuy *daShyGuy::build() { doStateChange(&StateID_Die); } + DoSomethingCool my_struct; + + extern "C" void sub_80024C20(void); + extern "C" void __destroy_arr(void*, void(*)(void), int, int); + //extern "C" __destroy_arr(struct DoSomethingCool, void(*)(void), int cnt, int bar); + + bool daShyGuy::CreateIceActors() + { + struct DoSomethingCool my_struct = { 0, this->pos, {1.0, 1.5, 1.5}, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; + this->frzMgr.Create_ICEACTORs( (void*)&my_struct, 1 ); + __destroy_arr( (void*)&my_struct, sub_80024C20, 0x3C, 1 ); + return true; + } + + + void daShyGuy::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { doStateChange(&StateID_Die); } |