Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 04:59:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Decompile Karma Coin func_ptr_80170008 (#1372)

Browse Source 
The Karma Coin, surprisingly, has the largest EntityWeaponAttack of all
the weapons. For that reason, I'm targeting it next.

It has one small other entity function, so this PR decompiles that
first, prior to going ahead and decompiling the EntityWeaponAttack
itself.

Otherwise, nothing too crazy special here. I imagine decompiling the
Karma Coin will make it clear what this helper entity is.
This commit is contained in:
bismurphy 2024-07-02 15:56:30 -04:00 committed by GitHub
parent 2399ca62cb
commit f7882814b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/symbols.us.dra.txt
View File

@ -32,7 +32,6 @@ EntityAlucard = 0x8010A5BC;
SetPlayerStep = 0x8010D584; SetPlayerStep = 0x8010D584;
SetPlayerAnim = 0x8010DA48; SetPlayerAnim = 0x8010DA48;
DecelerateX = 0x8010E1EC; DecelerateX = 0x8010E1EC;
SetSpeedX = 0x8010E390;
AlucardHandleDamage = 0x8011405C; AlucardHandleDamage = 0x8011405C;
PlayerStepHellfire = 0x80116408; PlayerStepHellfire = 0x80116408;
EntityNumberMovesToHpMeter = 0x80118D0C; EntityNumberMovesToHpMeter = 0x80118D0C;

43
src/weapon/w_020.c
View File

@ -3,11 +3,52 @@
#include "weapon_private.h" #include "weapon_private.h"
#include "shared.h" #include "shared.h"
extern AnimationFrame D_90000_8017A954[];
extern AnimationFrame D_90000_8017A9D8[];
extern u16 D_90000_8017AA10[];
extern s32 D_90000_8017C238;
INCLUDE_ASM("weapon/nonmatchings/w_020", EntityWeaponAttack); INCLUDE_ASM("weapon/nonmatchings/w_020", EntityWeaponAttack);
s32 func_ptr_80170004(Entity* self) {} s32 func_ptr_80170004(Entity* self) {}
INCLUDE_ASM("weapon/nonmatchings/w_020", func_ptr_80170008); void func_ptr_80170008(Entity* self) {
if (self->ext.weapon.parent->entityId == 0) {
DestroyEntity(self);
return;
}
if (self->step == 0) {
self->animSet = self->ext.weapon.parent->animSet;
self->unk5A = self->ext.weapon.parent->unk5A;
self->flags = FLAG_UNK_08000000 | FLAG_UNK_100000;
self->zPriority = PLAYER.zPriority;
if (D_90000_8017C238 % 4 == 1) {
self->velocityX = FIX(8.0 / 128);
self->velocityY = FIX(34.0 / 128);
self->unk4C = D_90000_8017A9D8;
self->posX.i.hi = 140;
self->posY.i.hi = 100;
self->zPriority = PLAYER.zPriority - 4;
} else {
self->zPriority = PLAYER.zPriority;
self->unk4C = D_90000_8017A954;
self->animFrameIdx = rand() & 0x1F;
self->posX.i.hi = (D_90000_8017C238 % 3) * 10 + 148;
self->posY.i.hi = (D_90000_8017C238 % 3) * 10 + 76;
self->velocityX = FIX(19.0 / 256); // strange, FIX is usually /128
self->velocityY = (rand() & 0x1FFF) + FIX(0.25);
}
D_90000_8017C238++;
self->step++;
}
self->palette = D_90000_8017AA10[g_GameTimer % 3];
if (g_HandId != 0) {
self->palette += 0x18;
}
self->posX.val += self->velocityX;
self->posY.val += self->velocityY;
}
void func_ptr_8017000C(Entity* self) {} void func_ptr_8017000C(Entity* self) {}