kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

progress defining core2 .data section

Browse Source
This commit is contained in:
Banjo Kazooie
2022-11-28 16:45:46 -06:00
parent 065c01d3dc
commit c796f32f8e
46 changed files with 627 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/CCW/code_5540.c
View File

@@ -36,7 +36,7 @@ void __chnabnut_setState_method(ActorMarker* marker, s32 next_state) {
void chnabnut_setState(Actor *this, s32 next_state) {
if (next_state == NABNUT_STATE_1_SAD) {
func_80335924(this->unk148, ASSET_22C_ANIM_NAMBUT_CRY, 0.2f, 10.6f);
func_80335924(this->unk148, ASSET_22C_ANIM_NABNUT_CRY, 0.2f, 10.6f);
}
if (next_state == NABNUT_STATE_2_WAIT) {
@@ -45,7 +45,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
if (next_state == NABNUT_STATE_3_BACKFLIP) {
this->marker->propPtr->unk8_3 = FALSE;
func_80335924(this->unk148, ASSET_22D_ANIM_NAMBUT_BACKFLIP, 0.2f, 3.13f);
func_80335924(this->unk148, ASSET_22D_ANIM_NABNUT_BACKFLIP, 0.2f, 3.13f);
func_80335A8C(this->unk148, 2);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0xB);
@@ -53,14 +53,14 @@ void chnabnut_setState(Actor *this, s32 next_state) {
}
if (next_state == NABNUT_STATE_4_THANK_PLAYER) {
func_80335924(this->unk148, ASSET_22E_ANIM_NAMBUT_STAND, 0.2f, 3.53f);
func_80335924(this->unk148, ASSET_22E_ANIM_NABNUT_STAND, 0.2f, 3.53f);
func_80335A8C(this->unk148, 1);
func_802C8F70(this->yaw - 40.0f);
jiggySpawn(JIGGY_4A_CCW_NABNUT, this->position);
}
if (next_state == NABNUT_STATE_5_EXIT) {
func_80335924(this->unk148, ASSET_22F_ANIM_NAMBUT_RUN, 0.2f, 0.34f);
func_80335924(this->unk148, ASSET_22F_ANIM_NABNUT_RUN, 0.2f, 0.34f);
}
if (next_state == NABNUT_STATE_6_DESPAWN) {