diff options
| author | megazig <megazig@megazig-laptop.lightning.home> | 2012-01-12 19:39:28 -0600 |
|---|---|---|
| committer | megazig <megazig@megazig-laptop.lightning.home> | 2012-01-12 19:39:28 -0600 |
| commit | 1cac64b9ff7384af650fed2bef25fa27069fd589 (patch) | |
| tree | fdbb65c847aa5183ceb2cf6ae1118b03f2a96a36 /kamek_pal.x | |
| parent | 81edb47b7f677ba37e81f896645ecdc023f4adb9 (diff) | |
| download | kamek-1cac64b9ff7384af650fed2bef25fa27069fd589.tar.gz kamek-1cac64b9ff7384af650fed2bef25fa27069fd589.zip | |
fixes for using class functions instead of extern'd calls
updated full daEnDosun_c definition
half working daEnMegaDosun_c
Diffstat (limited to '')
| -rw-r--r-- | kamek_pal.x | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/kamek_pal.x b/kamek_pal.x index a036ddd..c46bb81 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -147,11 +147,13 @@ SECTIONS { /* collisionMgr_c */ __ct__14collisionMgr_c = 0x8006cf40; __dt__14collisionMgr_c = 0x8006cf40; - Clear1__14collisionMgr_c = 0x8006cfe0; - Clear2__14collisionMgr_c = 0x8006d000; + Clear1__14collisionMgr_cFv = 0x8006cfe0; + Clear2__14collisionMgr_cFv = 0x8006d000; Init__14collisionMgr_cFP13dStageActor_cPUcPUcPUc = 0x8006d090; - Clear3__14collisionMgr_c = 0x8006d440; + Clear3__14collisionMgr_cFv = 0x8006d440; CollidedWithTile__14collisionMgr_c = 0x80070cb0; + SomethingSemiImportant__14collisionMgr_cFi = 0x8006ef40; + s_80072BC0__14collisionMgr_cFv = 0x80072bc0; /* freezeMgr_c */ __ct_11freezeMgr_c = 0x800b8490; @@ -172,12 +174,19 @@ SECTIONS { doSomethingCool7__11freezeMgr_c = 0x800b8d40; CheckCountdownTimer__11freezeMgr_c = 0x800b8f30; + __vt__7fBase_c = 0x80329758; + onCreate__7fBase_cFv = 0x80161ec0; + onDelete__7fBase_cFv = 0x80161f70; + onExecute__7fBase_cFv = 0x80162210; willBeDeleted__7fBase_cFv = 0x80162410; moreHeapShit__7fBase_cFUiPv = 0x80162730; createHeap__7fBase_cFUiPv = 0x80162930; heapCreated__7fBase_cFv = 0x801629F0; Delete__7fBase_cFv = 0x80162650; hasUninitialisedProcesses__7fBase_cFv = 0x80162B60; + onDraw__7fBase_cFv = 0x80162310; + _Z15fBase_c__DeletePv = 0x80162650; + fBase_c__Delete__FPv = 0x80162650; GetExplanationString__7dBase_cFv = 0x8006C660; @@ -351,6 +360,9 @@ SECTIONS { StateID_DieGoal__5dEn_c = 0x80358034; StateID_DieOther__5dEn_c = 0x80358074; + doSpriteMovement__5dEn_cFv = 0x800955F0; + CheckIfPlayerBelow__5dEn_cFff = 0x800978C0; + _vfD8__18dActorMultiState_cFv = 0x80067590; _vfDC__18dActorMultiState_cFv = 0x800675B0; _vfE0__18dActorMultiState_cFv = 0x800675A0; @@ -389,8 +401,10 @@ SECTIONS { _vfC0__13dStageActor_cFv = 0x80065B60; _vfC4__13dStageActor_cFv = 0x80065B70; _vfC8__13dStageActor_cFP7Point2d = 0x80065CC0; + outOfZone__13dStageActor_cF7Point3dPfUc = 0x80064da0; checkZoneBoundaries__13dStageActor_cFUi = 0x80064F50; create__13dStageActor_cF6ActorsUiP7Point3dP6S16VecUc = 0x80064610; + Delete__13dStageActor_cFUc = 0x80064d10; __ct__8dScene_cFv = 0x800E1AA0; __dt__8dScene_cFv = 0x800E1B10; @@ -405,6 +419,9 @@ SECTIONS { __ct__8dActor_cFv = 0x8006C6D0; __dt__8dActor_cFv = 0x8006C7F0; + UpdateObjectPosBasedOnSpeedValuesReal__8dActor_cFv = 0x8006CD40; + HandleXSpeed__8dActor_cFv = 0x8006CD90; + HandleYSpeed__8dActor_cFv = 0x8006CDE0; __ct__7dBase_cFv = 0x8006C420; __dt__7dBase_cFv = 0x8006C490; @@ -417,7 +434,6 @@ SECTIONS { beforeDraw__7dBase_cFv = 0x8006C610; afterDraw__7dBase_cFi = 0x8006C650; - onDraw__7fBase_cFv = 0x80162310; specialDraw1__8dActor_cFv = 0x8006CA50; specialDraw2__8dActor_cFv = 0x8006CA60; @@ -1114,8 +1130,6 @@ SECTIONS { __ashldi3 = 0x802DD4DC; - _Z15fBase_c__DeletePv = 0x80162650; - fBase_c__Delete__FPv = 0x80162650; _Z13FindActorByIDj = 0x80162E40; FindActorByID__FUi = 0x80162E40; @@ -1234,10 +1248,14 @@ SECTIONS { DoStuffAndMarkDead = 0x80097170; SmoothRotation = 0x8015f630; ClassAt1EC_Init = 0x8006D090; + HandlesOverallScale = 0x8009ea50; + s_800b56e0 = 0x800b5730; + unk_8042A008 = 0x8042a2e8; + UnknownBullshit = 0x800d8d50; /* daEnemy_c */ /*FIXME bad vtable address :( */ - __vt__9daEnemy_c = 0x80ae8268; + //__vt__9daEnemy_c = 0x80ae8268; _vf58__9daEnemy_cFv = 0x809a54a0; _vf5C__9daEnemy_cFv = 0x809a5490; _vf68__9daEnemy_cFv = 0x809a54e0; |