diff --git a/include/common_structs.h b/include/common_structs.h index 693bfd3ec2..c2591d80c6 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1703,7 +1703,7 @@ typedef struct CollisionStatus { /* 0x04 */ s16 lastTouchedFloor; /* valid after jump */ /* 0x06 */ s16 floorBelow; /* 0x08 */ s16 currentCeiling; /* valid on touching with head */ - /* 0x0A */ s16 unk_0A; /* associated with TRIGGER_WALL_PRESS_A */ + /* 0x0A */ s16 currentInspect; /* associated with TRIGGER_WALL_PRESS_A */ /* 0x0C */ s16 unk_0C; /* associated with TRIGGER_FLAGS_2000 */ /* 0x0E */ s16 unk_0E; /* associated with TRIGGER_FLAGS_4000 */ /* 0x10 */ s16 unk_10; /* associated with TRIGGER_FLAGS_8000 */ @@ -2315,10 +2315,10 @@ typedef struct TweesterPhysics { } TweesterPhysics; // size = 0x1C typedef struct PartnerActionStatus { - /* 0x000 */ union { - /* */ s32 i; - /* */ s8 b[4]; - } actionState; + /* 0x000 */ s8 partnerActionState; + /* 0x001 */ s8 partnerAction_unk_1; + /* 0x002 */ s8 partnerAction_unk_2; + /* 0x003 */ s8 actingPartner; /* 0x004 */ s16 stickX; /* 0x006 */ s16 stickY; /* 0x008 */ s32 currentButtons; diff --git a/include/enums.h b/include/enums.h index 05c12c4c38..5e5751a441 100644 --- a/include/enums.h +++ b/include/enums.h @@ -586,6 +586,7 @@ enum SoundIDs { SOUND_DAYZEE_SONG = 0x000002D7, SOUND_POWER_UP = 0x000002D8, SOUND_2F1 = 0x000002F1, + SOUND_2F4 = 0x000002F4, SOUND_2F6 = 0x000002F6, SOUND_2F7 = 0x000002F7, SOUND_CLOSE_SHELL = 0x000002FF, @@ -1868,6 +1869,18 @@ enum PartnerIDs { PARTNER_TWINK = 0x0000000B, }; +enum PartnerActions { + PARTNER_ACTION_NONE = 0, // genetic state + PARTNER_ACTION_USE = 1, // generic state + PARTNER_ACTION_KOOPER_1 = 1, + PARTNER_ACTION_KOOPER_2 = 2, + PARTNER_ACTION_BOMBETTE_1 = 1, + PARTNER_ACTION_BOMBETTE_2 = 2, + PARTNER_ACTION_PARAKARRY_HOVER = 1, + PARTNER_ACTION_WATT_SHINE = 1, + PARTNER_ACTION_LAKILESTER_1 = 1, +}; + /// @see gAreas enum Areas { AREA_KMR, @@ -1908,7 +1921,6 @@ enum NpcPalSwapState { }; enum NpcFlags { - NPC_FLAG_0 = 0x00000000, NPC_FLAG_PASSIVE = 0x00000001, ///< Collision does not trigger battle NPC_FLAG_2 = 0x00000002, NPC_FLAG_4 = 0x00000004, @@ -2729,6 +2741,18 @@ enum EnemyFlags { ENEMY_FLAGS_80000000 = 0x80000000, }; +// used with enemy->unk_B0 +enum EnemyAIFlags { + ENEMY_AI_FLAGS_1 = 0x00000001, + ENEMY_AI_FLAGS_2 = 0x00000002, + ENEMY_AI_FLAGS_4 = 0x00000004, + ENEMY_AI_FLAGS_8 = 0x00000008, + ENEMY_AI_FLAGS_10 = 0x00000010, + ENEMY_AI_FLAGS_20 = 0x00000020, + ENEMY_AI_FLAGS_40 = 0x00000040, + ENEMY_AI_FLAGS_80 = 0x00000080, +}; + enum MusicSettingsFlags { MUSIC_SETTINGS_FLAGS_1 = 0x00000001, MUSIC_SETTINGS_FLAGS_2 = 0x00000002, @@ -2869,6 +2893,12 @@ enum CameraFlags { CAMERA_FLAGS_80000000 = 0x80000000, }; +enum CameraMoveFlags { + CAMERA_MOVE_FLAGS_1 = 0x00000001, + CAMERA_MOVE_FLAGS_2 = 0x00000002, + CAMERA_MOVE_FLAGS_4 = 0x00000004 +}; + enum CameraSettingsType { CAMERA_SETTINGS_TYPE_0 = 0, CAMERA_SETTINGS_TYPE_1 = 1, diff --git a/include/evt.h b/include/evt.h index c917031d99..f963d5f033 100644 --- a/include/evt.h +++ b/include/evt.h @@ -139,11 +139,30 @@ typedef s32 ApiStatus; #define ApiStatus_REPEAT 3 /* Call again immediately */ #define ApiStatus_FINISH 255 /* Corresponds to EVT_FINISH */ -typedef enum EventGroup { - EVT_GROUP_0 = 0x00, - EVT_GROUP_B = 0x0B, - EVT_GROUP_1B = 0x1B, - EVT_GROUP_EF = 0xEF -} EventGroup; +enum EventGroupFlags { + EVT_GROUP_00 = 0x00, + EVT_GROUP_0B = 0x0B, // 8 | 4 | 1 + EVT_GROUP_1B = 0x1B, // 10 | 8 | 4 | 1 + EVT_GROUP_EF = 0xEF, // ~10 + EVT_GROUP_01 = 0x01, + EVT_GROUP_02 = 0x02, + EVT_GROUP_04 = 0x04, + EVT_GROUP_08 = 0x08, + EVT_GROUP_10 = 0x10, +}; + +enum EventPriority { + EVT_PRIORITY_0 = 0x00, // map main script + EVT_PRIORITY_1 = 0x01, + EVT_PRIORITY_A = 0x0A, + EVT_PRIORITY_14 = 0x14, +}; + +enum EventStateFlags { + EVT_FLAG_01 = 0x01, + EVT_FLAG_10 = 0x10, // has child? + EVT_FLAG_20 = 0x20, // add to global script list + EVT_FLAG_40 = 0x40, // thread? +}; #endif diff --git a/include/npc.h b/include/npc.h index 0a67155ba5..b4994832b5 100644 --- a/include/npc.h +++ b/include/npc.h @@ -230,6 +230,9 @@ typedef union { char PADDING[0xC0]; } EnemyTerritory; // size = 0xC0 +// function signature used for state handlers in AI main functions +typedef void AIStateHandler(Evt* script, NpcAISettings* settings, EnemyTerritoryThing* territory); + typedef struct Enemy { /* 0x00 */ s32 flags; /* 0x04 */ s8 encounterIndex; @@ -268,7 +271,7 @@ typedef struct Enemy { /* */ }; /* 0xAC */ u8 unk_AC; /* 0xAD */ char unk_AD[3]; - /* 0xB0 */ s32 unk_B0; + /* 0xB0 */ u32 unk_B0; /* 0xB4 */ s8 unk_B4; /* 0xB5 */ s8 unk_B5; /* 0xB6 */ char unk_B6[2]; diff --git a/src/165490.c b/src/165490.c index cfd3861e0e..e180b5b6c1 100644 --- a/src/165490.c +++ b/src/165490.c @@ -734,7 +734,7 @@ void filemenu_main_handle_input(MenuPanel* menu) { } } - if (filemenu_pressedButtons & 0x4000) { + if (filemenu_pressedButtons & BUTTON_B) { switch (menu->page) { case 0: filemenu_set_selected(menu, 2, 2); diff --git a/src/16F740.c b/src/16F740.c index beff1f6f4d..4a5cb87233 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -252,7 +252,7 @@ void btl_state_update_victory(void) { D_8029F254 = 1; } battleStatus->battlePhase = PHASE_ENEMY_BEGIN; - script = start_script(partner->onTurnChanceScriptSource, 0xA, 0); + script = start_script(partner->onTurnChanceScriptSource, EVT_PRIORITY_A, 0); partner->onTurnChangeScript = script; partner->onTurnChangeID = script->id; script->owner1.enemyID = 0x100; @@ -378,7 +378,7 @@ void btl_state_update_victory(void) { playerData->merleeCastsLeft++; } else { battleStatus->battlePhase = PHASE_MERLEE_EXP_BONUS; - script = start_script(PlayerScriptDispatcher, 0xA, 0); + script = start_script(PlayerScriptDispatcher, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnID = script->id; script->owner1.enemyID = 0; @@ -449,7 +449,7 @@ void btl_state_update_defend(void) { case BATTLE_STATE2_UNK_0: gBattleStatus.unk_8C = 0; gBattleStatus.battlePhase = PHASE_USE_DEFEND; - player->takeTurnScript = script = start_script(PlayerScriptDispatcher, 10, 0); + player->takeTurnScript = script = start_script(PlayerScriptDispatcher, EVT_PRIORITY_A, 0); player->takeTurnID = script->id; gBattleState2 = BATTLE_STATE2_UNK_1; script->owner1.enemyID = 0; @@ -503,13 +503,13 @@ void btl_state_update_defeat(void) { func_8024E40C(0x19); btl_cam_target_actor(0); battleStatus->battlePhase = PHASE_RUN_AWAY_RESET; - script = start_script(PlayerScriptDispatcher, 0xA, 0); + script = start_script(PlayerScriptDispatcher, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnID = script->id; script->owner1.enemyID = 0; if (partner != NULL) { - script = start_script(partner->takeTurnScriptSource, 0xA, 0); + script = start_script(partner->takeTurnScriptSource, EVT_PRIORITY_A, 0); partner->takeTurnScript = script; partner->takeTurnID = script->id; script->owner1.enemyID = 0x100; @@ -520,7 +520,7 @@ void btl_state_update_defeat(void) { if (!does_script_exist(player->takeTurnID) && battleStatus->unk_8C == 0) { if (find_item(ITEM_LIFE_SHROOM) >= 0) { battleStatus->battlePhase = PHASE_USE_LIFE_SHROOM; - script = start_script(PlayerScriptDispatcher, 0xA, 0); + script = start_script(PlayerScriptDispatcher, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnID = script->id; script->owner1.enemyID = 0; @@ -599,7 +599,7 @@ void btl_state_update_change_partner(void) { break; } deduct_current_move_fp(); - script = start_script(BtlPutPartnerAway, 0xA, 0); + script = start_script(BtlPutPartnerAway, EVT_PRIORITY_A, 0); battleStatus->controlScript = script; battleStatus->controlScriptID = script->id; script->owner1.enemyID = 0x100; @@ -636,7 +636,7 @@ void btl_state_update_change_partner(void) { } } - script = start_script(BtlBringPartnerOut, 0xA, 0); + script = start_script(BtlBringPartnerOut, EVT_PRIORITY_A, 0); battleStatus->controlScript = script; battleStatus->controlScriptID = script->id; script->owner1.enemyID = 0x100; @@ -648,7 +648,7 @@ void btl_state_update_change_partner(void) { if (partner != NULL) { if (partner->onTurnChanceScriptSource != NULL) { battleStatus->battlePhase = PHASE_PLAYER_BEGIN; - script = start_script(partner->onTurnChanceScriptSource, 0xA, 0); + script = start_script(partner->onTurnChanceScriptSource, EVT_PRIORITY_A, 0); partner->onTurnChangeScript = script; partner->onTurnChangeID = script->id; script->owner1.enemyID = 0x100; @@ -756,7 +756,7 @@ void btl_state_update_partner_move(void) { reset_actor_turn_info(); reset_all_actor_sounds(partner); battleStatus->battlePhase = PHASE_EXECUTE_ACTION; - script = start_script(partner->takeTurnScriptSource, 0xA, 0); + script = start_script(partner->takeTurnScriptSource, EVT_PRIORITY_A, 0); partner->takeTurnScript = script; partner->takeTurnID = script->id; script->owner1.enemyID = 0x100; @@ -813,7 +813,7 @@ void btl_state_update_partner_move(void) { break; } decrement_status_menu_disabled(); - if (playerData->currentPartner == 1 && battleStatus->moveCategory == 5 + if (playerData->currentPartner == PARTNER_GOOMBARIO && battleStatus->moveCategory == 5 && battleStatus->selectedMoveID != MOVE_CHARGE) { partner->isGlowing = 0; gBattleStatus.flags1 &= ~BS_FLAGS1_40000000; diff --git a/src/16c8e0.c b/src/16c8e0.c index c2a1ef8cd3..d5e944ff9e 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -419,7 +419,7 @@ void btl_update(void) { set_screen_overlay_color(1, 0, 0, 0); if (partner == NULL) { set_screen_overlay_params_back(0, 215.0f); - } else if (playerData->currentPartner == 6) { + } else if (playerData->currentPartner == PARTNER_WATT) { paramAmount -= 10.0f; if (paramAmount < 0.0f) { paramAmount = 0.0f; diff --git a/src/1776B0.c b/src/1776B0.c index 5eb77cf937..91bf6f96c8 100644 --- a/src/1776B0.c +++ b/src/1776B0.c @@ -1324,7 +1324,7 @@ void btl_cam_use_preset(s32 id) { } BattleCam_ControlScript = preset; - newScript = start_script(preset, 0xA, 0x20); + newScript = start_script(preset, EVT_PRIORITY_A, EVT_FLAG_20); BattleCam_DoneMoving = FALSE; battleStatus->camMovementScript = newScript; battleStatus->camMovementScriptID = newScript->id; diff --git a/src/17FEB0.c b/src/17FEB0.c index aaff734957..5aa848b9cd 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -456,42 +456,42 @@ s32 calc_item_damage_enemy(void) { } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP) && wasStatusInflicted) { - script = start_script(DoSleepHit, 0xA, 0); + script = start_script(DoSleepHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY) && wasStatusInflicted) { - script = start_script(DoDizzyHit, 0xA, 0); + script = start_script(DoDizzyHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE) && wasStatusInflicted) { - script = start_script(DoParalyzeHit, 0xA, 0); + script = start_script(DoParalyzeHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_POISON) && wasStatusInflicted) { - script = start_script(DoPoisonHit, 0xA, 0); + script = start_script(DoPoisonHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_STOP) && wasStatusInflicted) { - script = start_script(DoStopHit, 0xA, 0); + script = start_script(DoStopHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN) && wasStatusInflicted) { - script = start_script(DoFreezeHit, 0xA, 0); + script = start_script(DoFreezeHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; @@ -499,7 +499,7 @@ s32 calc_item_damage_enemy(void) { sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && wasStatusInflicted) { - script = start_script(DoShrinkHit, 0xA, 0); + script = start_script(DoShrinkHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; diff --git a/src/18C790.c b/src/18C790.c index f937194397..699ebd4a84 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -184,7 +184,7 @@ void btl_state_update_celebration(void) { D_8029FB4C--; } else if (func_8024E584() != 0) { dma_copy(_7A89A0_ROM_START, _7A89A0_ROM_END, _7A89A0_VRAM); - script = start_script(&D_802842B0, 0xA, 0); + script = start_script(&D_802842B0, EVT_PRIORITY_A, 0); D_8029FB78 = 0; D_8029FB54 = 20; D_8029FB70 = D_8029FB6C / D_8029FB54; @@ -230,12 +230,12 @@ void btl_state_update_celebration(void) { partner->flags &= ~(ACTOR_FLAG_4000000 | ACTOR_FLAG_8000000); } battleStatus->battlePhase = 5; - script = start_script(&PlayerScriptDispatcher, 0xA, 0); + script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnID = script->id; script->owner1.actorID = ACTOR_PLAYER; if (partner != NULL) { - script = start_script(partner->takeTurnScriptSource, 0xA, 0); + script = start_script(partner->takeTurnScriptSource, EVT_PRIORITY_A, 0); partner->takeTurnScript = script; partner->takeTurnID = script->id; script->owner1.actorID = ACTOR_PARTNER; @@ -273,7 +273,7 @@ void btl_state_update_celebration(void) { } break; case BATTLE_STATE2_UNK_5: - D_8029FB7C = start_script(&D_80284880, 0xA, 0); + D_8029FB7C = start_script(&D_80284880, EVT_PRIORITY_A, 0); D_8029FB4C = 25; gBattleState2 = BATTLE_STATE2_UNK_6; D_8029FB80 = D_8029FB7C->id; @@ -700,7 +700,7 @@ void btl_state_update_celebration(void) { set_animation(0, 0, 0x30009); if (partner != NULL) { - script = start_script(partner->takeTurnScriptSource, 0xA, 0); + script = start_script(partner->takeTurnScriptSource, EVT_PRIORITY_A, 0); partner->takeTurnScript = script; partner->takeTurnID = script->id; script->owner1.actorID = ACTOR_PARTNER; diff --git a/src/190B20.c b/src/190B20.c index 3079d6de00..43902226a4 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -2321,7 +2321,7 @@ void load_partner_actor(void) { partnerActor->debuffIcon = fx_disable_x(0, -142.0f, 34.0f, 1.0f, 0); partnerActor->unk_228 = NULL; - takeTurnScript = start_script(partnerActor->takeTurnScriptSource, 10, 0); + takeTurnScript = start_script(partnerActor->takeTurnScriptSource, EVT_PRIORITY_A, 0); partnerActor->takeTurnID = takeTurnScript->id; takeTurnScript->owner1.actorID = ACTOR_PARTNER; } @@ -2584,7 +2584,7 @@ Actor* create_actor(Formation formation) { actor->hpFraction = 25; actor->actorID = actor->enemyIndex | 0x200; - takeTurnScript = start_script(actor->takeTurnScriptSource, 0xA, 0); + takeTurnScript = start_script(actor->takeTurnScriptSource, EVT_PRIORITY_A, 0); actor->takeTurnID = takeTurnScript->id; takeTurnScript->owner1.enemyID = actor->enemyIndex | 0x200; actor->shadow.id = create_shadow_type(0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); @@ -3663,29 +3663,29 @@ void start_rumble_type(u32 arg0) { case 0: break; case 1: - D_802939C0 = start_script(&D_802939C4, 0xA, 0x20)->id; + D_802939C0 = start_script(&D_802939C4, EVT_PRIORITY_A, EVT_FLAG_20)->id; break; case 2: - D_802939C0 = start_script(&D_80293A10, 0xA, 0x20)->id; + D_802939C0 = start_script(&D_80293A10, EVT_PRIORITY_A, EVT_FLAG_20)->id; break; case 3: - D_802939C0 = start_script(&D_80293A34, 0xA, 0x20)->id; + D_802939C0 = start_script(&D_80293A34, EVT_PRIORITY_A, EVT_FLAG_20)->id; break; case 4: - D_802939C0 = start_script(&D_80293A58, 0xA, 0x20)->id; + D_802939C0 = start_script(&D_80293A58, EVT_PRIORITY_A, EVT_FLAG_20)->id; break; case 5: - D_802939C0 = start_script(&D_80293A7C, 0xA, 0x20)->id; + D_802939C0 = start_script(&D_80293A7C, EVT_PRIORITY_A, EVT_FLAG_20)->id; break; case 6: - D_802939C0 = start_script(&D_80293AA0, 0xA, 0x20)->id; + D_802939C0 = start_script(&D_80293AA0, EVT_PRIORITY_A, EVT_FLAG_20)->id; break; case 7: case 8: case 9: case 10: case 11: - D_802939C0 = start_script(&D_80293AC4, 0xA, 0x20)->id; + D_802939C0 = start_script(&D_80293AC4, EVT_PRIORITY_A, EVT_FLAG_20)->id; break; } } diff --git a/src/19FAF0.c b/src/19FAF0.c index b9a5fd19aa..77aed87b45 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -137,7 +137,7 @@ void dispatch_event_player(s32 eventType) { oldOnHitScript = player->onHitScript; oldOnHitID = player->onHitID; - eventScript = start_script(&HandleEvent_Player, 10, 0x20); + eventScript = start_script(&HandleEvent_Player, EVT_PRIORITY_A, EVT_FLAG_20); player->onHitScript = eventScript; player->onHitID = eventScript->id; eventScript->owner1.actor = NULL; @@ -163,7 +163,7 @@ void dispatch_event_player_continue_turn(s32 eventType) { oldOnHitScript = player->onHitScript; oldOnHitID = player->onHitID; - eventScript = start_script(&HandleEvent_Player, 10, 0x20); + eventScript = start_script(&HandleEvent_Player, EVT_PRIORITY_A, EVT_FLAG_20); player->onHitScript = eventScript; player->onHitID = eventScript->id; eventScript->owner1.actor = NULL; diff --git a/src/1A5830.c b/src/1A5830.c index 3df175bb93..ccbc7ea824 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -110,7 +110,7 @@ void dispatch_event_actor(Actor* actor, s32 event) { Evt* newScript; actor->lastEventType = event; - newScript = start_script(actor->onHitScriptSource, 0xA, 0x20); + newScript = start_script(actor->onHitScriptSource, EVT_PRIORITY_A, EVT_FLAG_20); actor->onHitScript = newScript; actor->onHitID = newScript->id; newScript->owner1.actorID = actor->actorID; @@ -719,42 +719,42 @@ s32 calc_enemy_damage_target(Actor* attacker) { } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SLEEP) && statusInflicted) { - script = start_script(&DoSleepHit, 10, 0); + script = start_script(&DoSleepHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_SLEEP, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_DIZZY) && statusInflicted) { - script = start_script(&DoDizzyHit, 10, 0); + script = start_script(&DoDizzyHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_PARALYZE) && statusInflicted) { - script = start_script(&DoParalyzeHit, 10, 0); + script = start_script(&DoParalyzeHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_POISON) && statusInflicted) { - script = start_script(&DoPoisonHit, 10, 0); + script = start_script(&DoPoisonHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_STOP) && statusInflicted) { - script = start_script(&DoStopHit, 10, 0); + script = start_script(&DoStopHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; sfx_play_sound_at_position(SOUND_INFLICT_STATUS, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_FROZEN) && statusInflicted) { - script = start_script(&DoFreezeHit, 10, 0); + script = start_script(&DoFreezeHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; @@ -762,7 +762,7 @@ s32 calc_enemy_damage_target(Actor* attacker) { sfx_play_sound_at_position(SOUND_HIT_ICE, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if ((battleStatus->currentAttackStatus & STATUS_FLAG_SHRINK) && statusInflicted) { - script = start_script(&DoShrinkHit, 10, 0); + script = start_script(&DoShrinkHit, EVT_PRIORITY_A, 0); script->varTable[0] = state->goalPos.x; script->varTable[1] = state->goalPos.y; script->varTable[2] = state->goalPos.z; @@ -939,7 +939,7 @@ ApiStatus BindIdle(Evt* script, s32 isInitialCall) { } actor->idleScriptSource = idleCode; - newScriptContext = start_script(idleCode, 10, 0); + newScriptContext = start_script(idleCode, EVT_PRIORITY_A, 0); actor->idleScript = newScriptContext; actor->idleScriptID = newScriptContext->id; newScriptContext->owner1.actorID = actorID; diff --git a/src/1AC760.c b/src/1AC760.c index ad5faae74a..a363256962 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -10,7 +10,7 @@ void dispatch_event_partner(s32 lastEventType) { Evt* script; partnerActor->lastEventType = lastEventType; - script = start_script(partnerActor->onHitScriptSource, 10, 0x20); + script = start_script(partnerActor->onHitScriptSource, EVT_PRIORITY_A, EVT_FLAG_20); partnerActor->onHitScript = script; partnerActor->onHitID = script->id; script->owner1.actorID = ACTOR_PARTNER; @@ -33,7 +33,7 @@ void dispatch_event_partner_continue_turn(s8 lastEventType) { Evt* script; partnerActor->lastEventType = lastEventType; - script = start_script(partnerActor->onHitScriptSource, 10, 0x20); + script = start_script(partnerActor->onHitScriptSource, EVT_PRIORITY_A, EVT_FLAG_20); partnerActor->onHitScript = script; partnerActor->onHitID = script->id; script->owner1.actorID = ACTOR_PARTNER; diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index 760990e7c3..ccc520fb11 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -705,7 +705,7 @@ s32 check_conversation_trigger(void) { playerY = playerStatus->position.y; playerZ = playerStatus->position.z; - if (gPartnerActionStatus.actionState.b[0] != 0) { + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { return FALSE; } diff --git a/src/23680.c b/src/23680.c index 704abda9af..d78e77f489 100644 --- a/src/23680.c +++ b/src/23680.c @@ -65,7 +65,7 @@ void func_80048E34(Enemy* enemy, s32 arg1, s32 arg2) { if (enemy->aiBytecode != NULL) { enemy->unk_C8 = arg2; - newScript = start_script(enemy->aiBytecode, 10, 0x20); + newScript = start_script(enemy->aiBytecode, EVT_PRIORITY_A, EVT_FLAG_20); enemy->aiScript = newScript; enemy->aiScriptID = newScript->id; newScript->owner2.npcID = enemy->npcID; @@ -74,7 +74,7 @@ void func_80048E34(Enemy* enemy, s32 arg1, s32 arg2) { if (enemy->unk_B8 != NULL) { enemy->unk_C4 = arg1; - newScript = start_script(enemy->unk_B8, 10, 0x20); + newScript = start_script(enemy->unk_B8, EVT_PRIORITY_A, EVT_FLAG_20); enemy->unk_BC = newScript; enemy->unk_C0 = newScript->id; newScript->owner2.npcID = enemy->npcID; @@ -121,25 +121,24 @@ s32 is_point_within_region(s32 shape, f32 pointX, f32 pointY, f32 centerX, f32 c } } -s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 chaseSpeed, f32 arg3, s8 arg4) { +s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 radius, f32 moveSpeed, s8 arg4) { Npc* npc = get_npc_unsafe(enemy->npcID); PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus; f32 x, y, z; f32 dist; s32 phi_v0; - f32 phi_a3; - if (enemy->unk_B0 & 2) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_2) { return FALSE; } partnerActionStatus = &gPartnerActionStatus; - if (partnerActionStatus->actionState.b[3] == 9 && partnerActionStatus->actionState.b[0] && !(territory->unk_1C & 1)) { + if (partnerActionStatus->actingPartner == PARTNER_BOW && partnerActionStatus->partnerActionState && !(territory->unk_1C & 1)) { return FALSE; } - if (partnerActionStatus->actionState.b[3] == 7 && partnerActionStatus->actionState.b[0] && !(territory->unk_1C & 1)) { + if (partnerActionStatus->actingPartner == PARTNER_SUSHIE && partnerActionStatus->partnerActionState && !(territory->unk_1C & 1)) { return FALSE; } @@ -155,7 +154,7 @@ s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 chaseSpeed, return FALSE; } - if ((playerStatus->actionState == 0x1D)) { + if ((playerStatus->actionState == ACTION_STATE_USE_SPINNING_FLOWER)) { return FALSE; } @@ -177,22 +176,20 @@ s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 chaseSpeed, if (phi_v0 == 0) { if (enemy->unk_AC & 2) { - if (playerStatus->actionState == 1) { - chaseSpeed = chaseSpeed * 1.15; - } else if (playerStatus->actionState == 2) { - chaseSpeed = chaseSpeed * 1.3; + if (playerStatus->actionState == ACTION_STATE_WALK) { + radius *= 1.15; + } else if (playerStatus->actionState == ACTION_STATE_RUN) { + radius *= 1.3; } } x = npc->pos.x; z = npc->pos.z; if (arg4 & 0xFF) { - phi_a3 = npc->yaw; - add_vec2D_polar(&x, &z, arg3, phi_a3); + add_vec2D_polar(&x, &z, moveSpeed, npc->yaw); } else { - phi_a3 = 270.0f - npc->renderYaw; - add_vec2D_polar(&x, &z, arg3, phi_a3); + add_vec2D_polar(&x, &z, moveSpeed, 270.0f - npc->renderYaw); } - if (dist2D(x, z, playerStatus->position.x, playerStatus->position.z) <= chaseSpeed) { + if (dist2D(x, z, playerStatus->position.x, playerStatus->position.z) <= radius) { return TRUE; } } @@ -267,8 +264,8 @@ void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThin npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; } - enemy->unk_B0 &= ~0x40; - enemy->unk_B0 &= ~0x20; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_20; script->functionTemp[0] = 1; } @@ -290,10 +287,10 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionRadius)) { npc->yaw = yaw; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp34); - enemy->unk_B0 &= ~0x40; - enemy->unk_B0 &= ~0x20; + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp34); + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_20; if (enemy->npcSettings->unk_2A & 1) { script->functionTemp[0] = 10; @@ -315,13 +312,13 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ) && npc->moveSpeed < dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z)) { - if (!(enemy->unk_B0 & 0x20)) { - enemy->unk_B0 |= 0x60; + if (!(enemy->unk_B0 & ENEMY_AI_FLAGS_20)) { + enemy->unk_B0 |= (ENEMY_AI_FLAGS_20 | ENEMY_AI_FLAGS_40); } - if (enemy->unk_B0 & 0x40) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_40) { npc->yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z)); - enemy->unk_B0 &= ~0x40; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; } x = npc->pos.x; @@ -329,14 +326,14 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* z = npc->pos.z; if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 2.0 * npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z)); - enemy->unk_B0 &= ~0x40; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; func_8004A784(npc, 5.0f, &yaw, NULL, NULL, NULL); npc->yaw = yaw; } phi_s5 = 1; - } else if (enemy->unk_B0 & 0x20) { - enemy->unk_B0 &= ~0x20; - enemy->unk_B0 &= ~0x40; + } else if (enemy->unk_B0 & ENEMY_AI_FLAGS_20) { + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_20; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; } if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s5) { @@ -377,7 +374,7 @@ void func_80049C04(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionRadius)) { npc->yaw = yaw; ai_enemy_play_sound(npc, 0x2F4, 0x200000); - fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &sp34); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &sp34); if (enemy->npcSettings->unk_2A & 1) { script->functionTemp[0] = 10; } else { @@ -479,7 +476,7 @@ void func_8004A124(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* f32 x, y, z; if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(2, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); + fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); npc->currentAnim.w = enemy->animList[0]; npc->duration = 20; script->functionTemp[0] = 14; @@ -492,7 +489,7 @@ void func_8004A124(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* y = npc->pos.y; z = npc->pos.z; if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { - fx_emote(2, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &sp28); + fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &sp28); npc->currentAnim.w = enemy->animList[0]; npc->duration = 15; script->functionTemp[0] = 14; @@ -545,7 +542,7 @@ ApiStatus DoBasicAI(Evt* script, s32 isInitialCall) { territory.unk_1C = 0; - if (isInitialCall || enemy->unk_B0 & 4) { + if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 0; npc->duration = 0; @@ -560,14 +557,14 @@ ApiStatus DoBasicAI(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; enemy->flags &= ~ENEMY_FLAGS_40000000; } diff --git a/src/3251D0.c b/src/3251D0.c index 68fb84b08c..8d2c4e9a75 100644 --- a/src/3251D0.c +++ b/src/3251D0.c @@ -107,7 +107,7 @@ ApiStatus func_802C03E8(Evt* script, s32 isInitialCall) { } EvtScript D_802C0410 = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetPlayerAnimation, ANIM_GOT_ITEM) EVT_CALL(GetPlayerPos, LW(0), LW(1), LW(2)) EVT_ADD(LW(1), 45) @@ -149,7 +149,7 @@ EvtScript D_802C0560 = { }; EvtScript D_802C05CC_32579C = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetCurrentPartner, LW(0)) EVT_IF_NE(LW(0), 0) diff --git a/src/77480.c b/src/77480.c index c24494384b..56965a92c7 100644 --- a/src/77480.c +++ b/src/77480.c @@ -615,7 +615,7 @@ void update_player(void) { collisionStatus->currentWall = -1; collisionStatus->lastWallHammered = -1; - collisionStatus->unk_0A = -1; + collisionStatus->currentInspect = -1; collisionStatus->floorBelow = 1; update_player_input(); @@ -776,38 +776,38 @@ void player_reset_data(void) { } s32 func_800DFCF4(void) { - if (gPartnerActionStatus.actionState.b[0] == 1 && - (gPartnerActionStatus.actionState.b[3] == 6 || gPartnerActionStatus.actionState.b[3] == 9 || - gPartnerActionStatus.actionState.b[3] == 7 || gPartnerActionStatus.actionState.b[3] == 4 || - gPartnerActionStatus.actionState.b[3] == 8)) { - return 0; + if (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_USE && + (gPartnerActionStatus.actingPartner == PARTNER_WATT + || gPartnerActionStatus.actingPartner == PARTNER_BOW + || gPartnerActionStatus.actingPartner == PARTNER_SUSHIE + || gPartnerActionStatus.actingPartner == PARTNER_PARAKARRY + || gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER)) { + return FALSE; } - return 1; + return TRUE; } s32 get_overriding_player_anim(s32 anim) { PlayerStatus* playerStatus = &gPlayerStatus; - PartnerActionStatus* actionStatus = &gPartnerActionStatus; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; if (playerStatus->actionState == ACTION_STATE_USE_SPINNING_FLOWER && anim != ANIM_1002B && anim != ANIM_MIDAIR_STILL) { return -1; } - if (actionStatus->actionState.b[0] != 0) { - if (actionStatus->actionState.b[3] == 8 && anim == ANIM_10002) { + if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE) { + if (partnerActionStatus->actingPartner == PARTNER_LAKILESTER && anim == ANIM_10002) { anim = ANIM_8000E; } - if (actionStatus->actionState.b[0] != 0) { - if (actionStatus->actionState.b[3] == 9) { - if (anim != ANIM_CROUCH && anim != ANIM_10002) { - return -1; - } + if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && partnerActionStatus->actingPartner == PARTNER_BOW) { + if (anim != ANIM_CROUCH && anim != ANIM_10002) { + return -1; } } } - if (anim == ANIM_THUMBS_UP && actionStatus->actionState.b[0] == 1) { + if (anim == ANIM_THUMBS_UP && partnerActionStatus->partnerActionState == PARTNER_ACTION_USE) { return -1; } @@ -871,8 +871,8 @@ void update_player_blink(void) { u8 phi_v1; u8* alpha; - if (gPartnerActionStatus.actionState.b[3] == 9) { - phi_a2 = gPartnerActionStatus.actionState.b[0] != 0; + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { + phi_a2 = gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE; } if (playerStatus->blinkTimer > 0) { @@ -968,7 +968,7 @@ s32 func_800E0208(void) { if (gGameStatusPtr->disableScripts && (gGameStatusPtr->currentButtons & PLAYER_STATUS_FLAGS_10)) { - if (gPartnerActionStatus.actionState.b[0] == 0) { + if (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE) { set_action_state(ACTION_STATE_IDLE); } ret = TRUE; diff --git a/src/7E9D0.c b/src/7E9D0.c index deb38589fb..bc817cbaa3 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -146,14 +146,14 @@ s32 phys_adjust_cam_on_landing(void) { if (ret == 1) { if ((get_collider_type_by_id(gCollisionStatus.currentFloor) & 0xFF) == 3) { ret = 0; - gCameras[0].moveFlags |= 0x1; + gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_1; } else { - gCameras[0].moveFlags &= ~0x1; + gCameras[0].moveFlags &= ~CAMERA_MOVE_FLAGS_1; } - } else if (partnerActionStatus->actionState.b[0] != 0 && partnerActionStatus->actionState.b[3] == 4) { - gCameras[0].moveFlags |= 0x2; + } else if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && partnerActionStatus->actingPartner == PARTNER_PARAKARRY) { + gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_2; } else { - gCameras[0].moveFlags &= ~0x2; + gCameras[0].moveFlags &= ~CAMERA_MOVE_FLAGS_2; } return ret; @@ -255,8 +255,8 @@ void phys_update_action_state(void) { cond = FALSE; } - if ((partnerActionStatus->actionState.b[0] == 0) && !(playerStatus->flags & 0x20) && cond) { - set_action_state(0xC); + if ((partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) && !(playerStatus->flags & PLAYER_STATUS_FLAGS_20) && cond) { + set_action_state(ACTION_STATE_TALK); } check_input_spin(); } @@ -354,8 +354,8 @@ void set_action_state(s32 actionState) { partner = playerData->currentPartner; if (partner == PARTNER_SUSHIE || partner == PARTNER_LAKILESTER || partner == PARTNER_PARAKARRY) { - if (gPartnerActionStatus.actionState.b[0] != 0) { - playerStatus->animFlags |= 0x4; + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; playerStatus->flags |= PLAYER_STATUS_FLAGS_800; return; } @@ -374,7 +374,7 @@ void set_action_state(s32 actionState) { } if (actionState == ACTION_STATE_ENEMY_FIRST_STRIKE) { - playerStatus->animFlags |= 4; + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; } playerStatus->actionState = actionState; playerStatus->flags |= PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; @@ -448,7 +448,7 @@ s32 check_input_hammer(void) { return FALSE; } - if (gPartnerActionStatus.actionState.b[0] == 1 && playerData->currentPartner == PARTNER_WATT) { + if (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_USE && playerData->currentPartner == PARTNER_WATT) { return FALSE; } @@ -481,8 +481,8 @@ s32 check_input_jump(void) { return FALSE; } - if ((collisionStatus->unk_0A != -1) && (collisionStatus->unk_0A & 0x4000)) { - Entity* entity = get_entity_by_index(collisionStatus->unk_0A); + if ((collisionStatus->currentInspect != -1) && (collisionStatus->currentInspect & COLLISION_WITH_ENTITY_BIT)) { + Entity* entity = get_entity_by_index(collisionStatus->currentInspect); if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { if ((entity->boundScriptBytecode == 0) || (entity->flags & ENTITY_FLAGS_4000)) { diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index 2ffafa1455..933f7ae45a 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -33,17 +33,17 @@ s32 can_trigger_loading_zone(void) { if (actionState == ACTION_STATE_RIDE) { if (playerData->currentPartner == PARTNER_LAKILESTER || playerData->currentPartner == PARTNER_BOW) { - if (partnerActionStatus->actionState.b[0] != 0) { + if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE) { return TRUE; } else { gPlayerStatusPtr->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; return FALSE; } } else { - if (partnerActionStatus->actionState.b[3] == 6 || partnerActionStatus->actionState.b[3] == 7) { - return partnerActionStatus->actionState.b[0] != 0; + if (partnerActionStatus->actingPartner == PARTNER_WATT || partnerActionStatus->actingPartner == PARTNER_SUSHIE) { + return partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE; } - if (partnerActionStatus->actionState.b[3] == 4) { + if (partnerActionStatus->actingPartner == PARTNER_PARAKARRY) { gPlayerStatusPtr->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; return FALSE; } @@ -98,7 +98,7 @@ s32 collision_main_above(void) { { if (sp2C <= fabsf(new_var + playerStatus->gravityIntegrator[0])) { do { - if ((hitResult & 0x4000) && get_entity_type(hitResult) == ENTITY_TYPE_BRICK_BLOCK) { + if ((hitResult & COLLISION_WITH_ENTITY_BIT) && get_entity_type(hitResult) == ENTITY_TYPE_BRICK_BLOCK) { return hitResult; } } while (0); @@ -353,7 +353,7 @@ void func_800E315C(s32 colliderID) { set_action_state(ACTION_STATE_LAND); break; case 3: - if ((partnerActionStatus->actionState.i & 0xFF0000FF) != 0x01000009) { + if ((*(s32*)(&partnerActionStatus->partnerActionState) & 0xFF0000FF) != 0x01000009) { if (playerStatus->blinkTimer == 0) { if (playerStatus->actionState != ACTION_STATE_HIT_LAVA) { playerStatus->unk_BF = 1; @@ -365,7 +365,7 @@ void func_800E315C(s32 colliderID) { } break; case 2: - if ((partnerActionStatus->actionState.i & 0xFF0000FF) != 0x01000009) { + if ((*(s32*)(&partnerActionStatus->partnerActionState) & 0xFF0000FF) != 0x01000009) { if (playerStatus->blinkTimer == 0) { if (playerStatus->actionState != ACTION_STATE_HIT_FIRE) { playerStatus->unk_BF = 2; @@ -396,12 +396,12 @@ void phys_player_land(void) { playerStatus->landPos.z = playerStatus->position.z; playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_FLYING | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING); sfx_play_sound_at_player(SOUND_SOFT_LAND, 0); - if (!(collisionStatus->currentFloor & 0x4000)) { + if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); } collisionStatus->lastTouchedFloor = -1; - if (collisionStatus->currentFloor & 0x4000) { + if (collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT) { s32 entityType = get_entity_type(collisionStatus->currentFloor); if (entityType <= ACTION_STATE_FALLING) { @@ -901,7 +901,7 @@ void phys_main_collision_below(void) { if (result >= 0) { switch (get_collider_type_by_id(result) & 0xFF) { case 2: - if (partnerActionStatus->actionState.b[0] == 0 || partnerActionStatus->actionState.b[3] != 9) { + if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE || partnerActionStatus->actingPartner != PARTNER_BOW) { if (playerStatus->blinkTimer == 0) { if (playerStatus->actionState != ACTION_STATE_HIT_LAVA) { playerStatus->unk_BF = 2; @@ -913,7 +913,7 @@ void phys_main_collision_below(void) { } break; case 3: - if (partnerActionStatus->actionState.b[0] == 0 || partnerActionStatus->actionState.b[3] != 9) { + if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE || partnerActionStatus->actingPartner != PARTNER_BOW) { if (playerStatus->blinkTimer == 0) { if (playerStatus->actionState != ACTION_STATE_HIT_LAVA) { playerStatus->unk_BF = 1; @@ -926,7 +926,7 @@ void phys_main_collision_below(void) { break; default: cond = FALSE; - if (collisionStatus->currentFloor & 0x4000) { + if (collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT) { cond = get_entity_type(collisionStatus->currentFloor) == ENTITY_TYPE_HIDDEN_PANEL; } @@ -1109,7 +1109,7 @@ void try_player_footstep_sounds(s32 arg0) { } void phys_update_interact_collider(void) { - gCollisionStatus.unk_0A = phys_check_interactable_collision(); + gCollisionStatus.currentInspect = phys_check_interactable_collision(); } s32 phys_check_interactable_collision(void) { @@ -1145,9 +1145,9 @@ s32 phys_can_player_interact(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 ret = TRUE; - if (gPartnerActionStatus.actionState.b[0] != 0) { - if (gPartnerActionStatus.actionState.b[3] == 3) { - if (gPartnerActionStatus.actionState.b[0] < 3) { + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOMBETTE) { + if (gPartnerActionStatus.partnerActionState <= PARTNER_ACTION_BOMBETTE_2) { ret = FALSE; } } else { diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index ea7f49afe5..ede5ca6cd6 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -15,7 +15,7 @@ extern s16 D_8010CCFE; void func_800E6860(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (gPartnerActionStatus.actionState.b[0] != 0 && gPartnerActionStatus.actionState.b[3] == 9) { + if (gPartnerActionStatus.partnerActionState != 0 && gPartnerActionStatus.actingPartner == PARTNER_BOW) { Npc* partner = get_npc_unsafe(NPC_PARTNER); func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->alpha1, 0); @@ -33,20 +33,20 @@ s32 func_800E6904(void) { return FALSE; } - if (partnerActionStatus->actionState.b[0] == 0) { + if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) { if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_1000) && (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN)) { return TRUE; } } else if (partner_player_can_pause()) { - if (partnerActionStatus->actionState.b[3] == 6) { + if (partnerActionStatus->actingPartner == PARTNER_WATT) { return TRUE; - } else if (partnerActionStatus->actionState.b[3] == 9) { + } else if (partnerActionStatus->actingPartner == PARTNER_BOW) { if (actionState == ACTION_STATE_RIDE) { return TRUE; } - } else if (partnerActionStatus->actionState.b[3] == 8) { + } else if (partnerActionStatus->actingPartner == PARTNER_LAKILESTER) { if (actionState == ACTION_STATE_RIDE) { return TRUE; } @@ -69,7 +69,7 @@ s32 can_pause(s32 currentButtons, s32 pressedButtons) { !is_picking_up_item()) { if (!(gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO)) { - if (partnerActionStatus->actionState.b[0] == 0) { + if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) { if (!(gPlayerStatus.flags & PLAYER_STATUS_FLAGS_1000)) { if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || @@ -79,23 +79,23 @@ s32 can_pause(s32 currentButtons, s32 pressedButtons) { } } } else if (partner_player_can_pause()) { - if (partnerActionStatus->actionState.b[3] == 6) { + if (partnerActionStatus->actingPartner == PARTNER_WATT) { return actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN; - } else if (partnerActionStatus->actionState.b[3] == 9) { + } else if (partnerActionStatus->actingPartner == PARTNER_BOW) { if (actionState == ACTION_STATE_RIDE) { gPlayerStatus.alpha2 = 0; return TRUE; } - } else if (partnerActionStatus->actionState.b[3] == 8) { + } else if (partnerActionStatus->actingPartner == PARTNER_LAKILESTER) { if (actionState == ACTION_STATE_RIDE) { if (func_802BD7DC()) { return TRUE; } sfx_play_sound(SOUND_MENU_ERROR); } - } else if (partnerActionStatus->actionState.b[3] == 7) { + } else if (partnerActionStatus->actingPartner == PARTNER_SUSHIE) { sfx_play_sound(SOUND_MENU_ERROR); } } diff --git a/src/891b0_len_fb0.c b/src/891b0_len_fb0.c index bd7cc535a7..c043632657 100644 --- a/src/891b0_len_fb0.c +++ b/src/891b0_len_fb0.c @@ -35,7 +35,7 @@ void func_800EFD08(void) { colliderType = D_80109480; } - if (playerStatus->actionState == ACTION_STATE_LAND && playerStatus->flags < 0) { + if (playerStatus->actionState == ACTION_STATE_LAND && playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { D_8010CFF4 = D_8010CFF0; } diff --git a/src/B0E0.c b/src/B0E0.c index 26b31da5ed..e69e73f73a 100644 --- a/src/B0E0.c +++ b/src/B0E0.c @@ -109,7 +109,7 @@ void update_camera_mode_5(Camera* camera) { camera->auxPos.y = camera->targetPos.y + camera->currentYOffset; camera->auxPos.z = camera->targetPos.z; func_8003034C(camera); - if (!(camera->moveFlags & 1)) { + if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_1)) { func_80030210(camera, temp_f20, temp_f22, 0); } else { lookXDelta = temp_f22; // needed to match @@ -264,7 +264,7 @@ void update_camera_zone_interp(Camera* camera) { camera->linearInterpScale = 1.0f; } temp = targetX; - if (camera->moveFlags & 1) { + if (camera->moveFlags & CAMERA_MOVE_FLAGS_1) { camera->unk_498 = 0.0f; } else if (camera->unk_494 != targetY) { camera->unk_494 = targetY; @@ -282,14 +282,14 @@ void update_camera_zone_interp(Camera* camera) { camera->unk_498 = 1.0f; } - if (camera->moveFlags & 4) { + if (camera->moveFlags & CAMERA_MOVE_FLAGS_4) { camera->unk_498 += 0.3; if (camera->unk_498 >= 1.0) { camera->unk_498 = 1.0f; } } - if (!(camera->moveFlags & 2)) { + if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { camera->savedTargetY += (camera->unk_494 - camera->savedTargetY) * camera->unk_498; } @@ -522,7 +522,7 @@ void update_camera_zone_interp(Camera* camera) { cosViewPitch = cos_deg(blendedCamSettings.boomPitch + D_800A08DC); sinViewPitch = sin_deg(blendedCamSettings.boomPitch + D_800A08DC); - if (!(camera->moveFlags & 2)) { + if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { camera->lookAt_eye.y = blendedCamSettings.position.y + (blendedCamSettings.boomLength * sinViewPitch); } @@ -538,7 +538,7 @@ void update_camera_zone_interp(Camera* camera) { } temp_f8_2 = blendedCamSettings.position.y - camera->lookAt_eye.y; - if (!(camera->moveFlags & 2)) { + if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinViewPitch) + (temp_f8_2 * cosViewPitch)); } temp_f4_4 = (dist * cosViewPitch) - (temp_f8_2 * sinViewPitch); diff --git a/src/E21870.c b/src/E21870.c index d4ea13d59d..5effadf2c4 100644 --- a/src/E21870.c +++ b/src/E21870.c @@ -5,7 +5,9 @@ s32 func_802B7000_2(void) { s8 actionState = gPlayerActionState; if (actionState != ACTION_STATE_USE_TWEESTER) { - if (partnerActionStatus->actionState.b[0] != 1 || (partnerActionStatus->actionState.b[3] != 9 && partnerActionStatus->actionState.b[3] != 4)) { + if (partnerActionStatus->partnerActionState != PARTNER_ACTION_USE || + (partnerActionStatus->actingPartner != PARTNER_BOW + && partnerActionStatus->actingPartner != PARTNER_PARAKARRY)) { return 0; } } diff --git a/src/E225B0.c b/src/E225B0.c index b2ae5db7b5..0e4f38e437 100644 --- a/src/E225B0.c +++ b/src/E225B0.c @@ -134,7 +134,7 @@ void func_802B735C_E2290C(void) { switch (temp_v1) { case 0: - if (partnerActionStatus->actionState.b[0] && partnerActionStatus->actionState.b[3] == 8) { + if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && partnerActionStatus->actingPartner == PARTNER_LAKILESTER) { phi_v0 = gGameStatusPtr->keepUsingPartnerOnMapChange; } else { phi_v0 = playerStatus->flags & 0x3000; diff --git a/src/EA0C10.c b/src/EA0C10.c index 516138fad5..394b7418b2 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -21,7 +21,7 @@ void func_80240DC4_EA16C4(Evt* script, NpcAISettings* aiSettings, EnemyTerritory #include "world/common/UnkNpcAIFunc5.inc.c" -//Basically UnkNpcAIFunc26.inc.c, but gPartnerActionStatus.actionState.b[0] access 0, instead of 3 +//Basically UnkNpcAIFunc26.inc.c, but gPartnerActionStatus.partnerActionState access 0, instead of 3 s32 N(UnkNpcAIFunc26)(Evt* script) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -49,11 +49,11 @@ s32 N(UnkNpcAIFunc26)(Evt* script) { ret = FALSE; } - if (gPartnerActionStatus.actionState.b[0] == 9) { + if (gPartnerActionStatus.partnerActionState == PARTNER_BOW) { ret = FALSE; } - if (gPartnerActionStatus.actionState.b[0] == 7) { + if (gPartnerActionStatus.partnerActionState == PARTNER_SUSHIE) { ret = FALSE; } @@ -74,7 +74,7 @@ ApiStatus func_802406CC_EA0FCC(Evt* script, s32 isInitialCall) { enemy->unk_114 = 0.0001f; enemy->unk_118 = 0.0001f; - if (isInitialCall || enemy->unk_B0 & 4) { + if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->flags |= NPC_FLAG_2 | NPC_FLAG_100; @@ -82,8 +82,8 @@ ApiStatus func_802406CC_EA0FCC(Evt* script, s32 isInitialCall) { npc->pos.x = 0.0f; npc->pos.y = -1000.0f; npc->pos.z = 0.0f; - if (enemy->unk_B0 & 4) { - enemy->unk_B0 &= ~4; + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } @@ -165,7 +165,7 @@ ApiStatus func_8024097C_EA127C(Evt* script, s32 isInitialCall) { enemy->unk_114 = 0.0001f; enemy->unk_118 = 0.0001f; - if (isInitialCall || enemy->unk_B0 & 4) { + if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -175,10 +175,10 @@ ApiStatus func_8024097C_EA127C(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~NPC_FLAG_GRAVITY) | NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } @@ -278,16 +278,16 @@ ApiStatus func_80241AE0_EA23E0(Evt* script, s32 isInitialCall) { enemy->unk_118 = 0.7f; } - if (isInitialCall || enemy->unk_B0 & 4) { + if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; enemy->varTable[0] = 0; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } diff --git a/src/ECAA80.c b/src/ECAA80.c index 26828a1eeb..0a4b1ae632 100644 --- a/src/ECAA80.c +++ b/src/ECAA80.c @@ -159,7 +159,7 @@ ApiStatus func_8024150C_ECB20C(Evt* script, s32 isInitialCall) { enemy->unk_114 = 0.01f; enemy->unk_118 = 0.01f; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -169,10 +169,10 @@ ApiStatus func_8024150C_ECB20C(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~NPC_FLAG_GRAVITY) | NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } diff --git a/src/EDEA00.c b/src/EDEA00.c index 4f42061fe7..cc0711866f 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -56,7 +56,7 @@ void func_80241730_EE00F0(Evt* script, NpcAISettings* aiSettings, EnemyTerritory if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); x = npc->pos.x; y = npc->pos.y; @@ -135,7 +135,7 @@ void func_80241B94_EE0554(Evt* script, NpcAISettings* aiSettings, EnemyTerritory npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 12; return; diff --git a/src/EF2680.c b/src/EF2680.c index 4b3e14d633..0bcd95ee89 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -52,7 +52,7 @@ void func_802415DC_EF3BEC(Evt* script, NpcAISettings* aiSettings, EnemyTerritory if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); x = npc->pos.x; y = npc->pos.y; @@ -131,7 +131,7 @@ void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyTerritory npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 12; return; @@ -154,236 +154,4 @@ INCLUDE_ASM(s32, "EF2680", func_80241C90_EF42A0); #include "world/common/DeadUnkNpcAIMainFunc5.inc.c" -// This should be roughly like this and is a copy from CD7350 (UnkNpcAIMainFunc6), but with the little extra block -// at the beginning. I have to assume that is has to roughly look like below, but I can't get it to match. -#ifdef NON_EQUIVALENT -ApiStatus func_8024299C_EF4FAC(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - s32 var; - u32 x, y, z; - f32 x2, y2, z2, w2; - Npc* npc2; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - // God knows what happens here ---------------- - enemy->territory->patrol.points[4].x = npc->pos.x; - enemy->territory->patrol.points[4].y = npc->pos.y; - enemy->territory->patrol.points[5].x = 0.0001f; - enemy->territory->patrol.points[5].y = 0.0001f; - enemy->territory->patrol.points[4].z = npc->pos.z; - // -------------------------------------------- - - if (isInitialCall) { - enemy->varTable[6] = npc->collisionHeight; - enemy->unk_B0 |= 8; - } - - if (isInitialCall || (enemy->varTable[10] == 100)) { - script->functionTemp[0] = 100; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - enemy->flags |= ENEMY_FLAGS_200000; - npc->flags = (npc->flags & ~0x200) | 8; - enemy->varTable[10] = 0; - enemy->varTable[11] = -1; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - } - - if (enemy->unk_B0 & 4) { - npc->duration = 0; - npc->collisionHeight = enemy->varTable[6]; - enemy->unk_B0 &= ~4; - if (npc->flags & 0x800) { - npc->currentAnim.w = 0x4A0018; - npc->moveSpeed = 0.0f; - npc->jumpVelocity = 0.0f; - npc->jumpScale = 1.0f; - script->functionTemp[0] = 102; - } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &var); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = 0; - script->functionTemp[0] = 200; - } - } - get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z); - if ((script->functionTemp[0] < 100) && ((x + 50) >= 421)) { - script->functionTemp[0] = 110; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - if (enemy->varTable[13] != 0) { - if (npc->pos.y <= 0.0) { - npc->flags = (npc->flags & ~0x200) | 8; - } else { - npc->flags = (npc->flags | 0x200) & ~8; - } - } - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 1: - func_800496B8(script, aiSettings, territoryPtr); - break; - - case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); - - case 3: - func_80049C04(script, aiSettings, territoryPtr); - break; - - case 12: - N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); - - case 13: - N(UnkDistFunc)(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - break; - - case 14: - N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); - break; - - case 15: - N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); - break; - - case 100: - if (enemy->varTable[10] != 2) { - break; - } - npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID); - if (npc2->yaw < 180.0) { - npc->pos.x = npc2->pos.x + 12.0; - } else { - npc->pos.x = npc2->pos.x - 12.0; - } - npc->pos.y = npc2->pos.y + 25.0; - npc->pos.z = npc2->pos.z + 1.0; - npc->rotation.y = 0.0f; - npc->flags |= 8; - npc->flags &= ~2; - npc->flags &= ~0x200; - npc->renderYaw = 0.0f; - npc->currentAnim.w = 0x4A0018; - script->functionTemp[0] = 101; - - case 101: - if (enemy->varTable[10] != 3) { - break; - } - enemy->varTable[10] = 4; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->moveSpeed = 2.5f; - npc->jumpVelocity = 8.0f; - npc->jumpScale = 0.8f; - npc->flags |= 0x800; - script->functionTemp[0] = 102; - - case 102: - if (npc->moveSpeed > 0.0) { - x2 = npc->pos.x; - y2 = npc->pos.y; - z2 = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->unk_80, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight, - npc->collisionRadius) == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - npc->moveSpeed = 0.0f; - } - } - - - if (npc->jumpVelocity < 0.0) { - x2 = npc->pos.x; - y2 = npc->pos.y + 13.0; - z2 = npc->pos.z; - w2 = fabsf(npc->jumpVelocity) + 16.0; - if ((npc_raycast_down_sides(npc->unk_80, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) { - npc->pos.y = y2; - enemy->territory->wander.point.x = npc->pos.x; - enemy->territory->wander.point.y = npc->pos.y; - enemy->territory->wander.point.z = npc->pos.z; - enemy->territory->wander.detect.x = npc->pos.x; - enemy->territory->wander.detect.y = npc->pos.y; - enemy->territory->wander.detect.z = npc->pos.z; - enemy->varTable[10] = 5; - if (enemy->varTable[13] != 0) { - if (npc->pos.y <= 0.0) { - npc->flags = (npc->flags & ~0x200) | 8; - } else { - npc->flags = (npc->flags | 0x200) & ~8; - } - } else if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - npc->flags = (npc->flags | 0x40000) & ~0x800; - npc->jumpVelocity = 0.0f; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->currentAnim.w = 0x4A001A; - npc->duration = 3; - script->functionTemp[0] = 103; - break; - } - } - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - break; - - case 103: - npc->duration--; - if (npc->duration <= 0) { - npc->flags &= 0xFFFBFFFF; - npc->currentAnim.w = 0x4A0001; - script->functionTemp[0] = 0; - } - break; - - case 110: - npc->duration = 30; - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - npc->pos.y = -1000.0f; - npc->flags = (npc->flags | 0xA) & ~0x200; - script->functionTemp[0] = 111; - - case 111: - npc->duration--; - if (npc->duration <= 0) { - enemy->varTable[10] = 0; - script->functionTemp[0] = 100; - } - break; - - case 200: - func_8004A73C(script); - break; - - } - return ApiStatus_BLOCK; -} -#else -INCLUDE_ASM(s32, "EF2680", func_8024299C_EF4FAC); -#endif +#include "world/common/DeadUnkNpcAIMainFunc6.inc.c" diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index bcae350915..dd87ec5b67 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1059,7 +1059,7 @@ void update_entities(void) { if (!(entity->flags & ENTITY_FLAGS_8000)) { entity->flags |= ENTITY_FLAGS_2000000; } - entity->boundScript = start_script(entity->boundScriptBytecode, 0xA, 0x20); + entity->boundScript = start_script(entity->boundScriptBytecode, EVT_PRIORITY_A, EVT_FLAG_20); } if (entity->flags & ENTITY_FLAGS_2000000) { diff --git a/src/battle/area_trd_part_2/actor/fake_bowser.c b/src/battle/area_trd_part_2/actor/fake_bowser.c index 983d0ebdcc..e7a9bdf68d 100644 --- a/src/battle/area_trd_part_2/actor/fake_bowser.c +++ b/src/battle/area_trd_part_2/actor/fake_bowser.c @@ -403,7 +403,7 @@ EvtScript N(8021B0E4) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(N(StartRumbleWithParams), 256, 30) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 20, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_100000, 1) @@ -429,35 +429,35 @@ EvtScript N(8021B0E4) = { EVT_WAIT_FRAMES(30) EVT_CALL(PlaySoundAtModel, 15, 482, 0) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT_FRAMES(20) EVT_CALL(PlaySoundAtModel, 11, 482, 0) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 20) EVT_WAIT_FRAMES(30) EVT_CALL(PlaySoundAtModel, 9, 482, 0) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT_FRAMES(30) EVT_CALL(PlaySoundAtModel, 31, 482, 0) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 70, 20) EVT_WAIT_FRAMES(20) EVT_CALL(PlaySoundAtModel, 25, 482, 0) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) @@ -465,12 +465,12 @@ EvtScript N(8021B0E4) = { EVT_CALL(PlaySoundAtModel, 43, 482, 0) EVT_CALL(N(StartRumbleWithParams), 60, 20) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.6)) EVT_END_THREAD EVT_WAIT_FRAMES(20) EVT_THREAD - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 30, 20) diff --git a/src/collision.c b/src/collision.c index e070d425ec..bbbb244129 100644 --- a/src/collision.c +++ b/src/collision.c @@ -461,7 +461,7 @@ void update_collider_transform(s16 colliderID) { } s32 get_collider_type_by_id(s32 colliderID) { - if (colliderID & 0x4000) { + if (colliderID & COLLISION_WITH_ENTITY_BIT) { return 0; } else { return gCollisionData.colliderList[colliderID].flags; @@ -1026,7 +1026,7 @@ ApiStatus func_8005DB00(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 1; break; case 1: - if (partnerStatus->actionState.b[3] != 9) { + if (partnerStatus->actingPartner != PARTNER_BOW) { if (npc->duration != 0 && npc->duration != script->functionTemp[0]) return ApiStatus_BLOCK; diff --git a/src/encounter_api.c b/src/encounter_api.c index aaf9b05ef3..8f271ed3ad 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -170,7 +170,7 @@ ApiStatus DoNpcDefeat(Evt* script, s32 isInitialCall) { kill_script(script); npc->currentAnim.w = owner->animList[6]; - newScript = start_script(&SCRIPT_NpcDefeat, 10, 0); + newScript = start_script(&SCRIPT_NpcDefeat, EVT_PRIORITY_A, 0); owner->defeatScript = newScript; owner->defeatScriptID = newScript->id; newScript->owner1.enemy = owner; @@ -217,7 +217,7 @@ void start_battle(Evt* script, s32 songID) { Evt* hitEvtInstance; enemy->encountered = TRUE; - hitEvtInstance = start_script(enemy->hitBytecode, 10, 0); + hitEvtInstance = start_script(enemy->hitBytecode, EVT_PRIORITY_A, 0); enemy->hitScript = hitEvtInstance; enemy->hitScriptID = hitEvtInstance->id; @@ -284,7 +284,7 @@ ApiStatus StartBossBattle(Evt* script, s32 isInitialCall) { ) && enemy->hitBytecode != NULL) { enemy->encountered = TRUE; - script = start_script(enemy->hitBytecode, 10, 0); + script = start_script(enemy->hitBytecode, EVT_PRIORITY_A, 0); enemy->hitScript = script; enemy->hitScriptID = script->id; @@ -356,10 +356,10 @@ ApiStatus BindNpcAI(Evt* script, s32 isInitialCall) { enemy->unk_C8 = 100; enemy->aiBytecode = newScriptSource; - scriptTemp = start_script(newScriptSource, 10, 0); + scriptTemp = start_script(newScriptSource, EVT_PRIORITY_A, 0); enemy->aiScript = scriptTemp; enemy->aiScriptID = scriptTemp->id; - scriptTemp->owner1.enemyID = (s32)enemy; + scriptTemp->owner1.enemy = enemy; scriptTemp->owner2.npcID = id; scriptTemp->groupFlags = phi_s1; return ret; @@ -405,7 +405,7 @@ ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) { } npc->unk_C8 = 100; - newScript = start_script(npc->aiBytecode, 10, 0); + newScript = start_script(npc->aiBytecode, EVT_PRIORITY_A, 0); npc->aiScript = newScript; npc->aiScriptID = newScript->id; newScript->owner1.enemy = npc; @@ -473,10 +473,10 @@ ApiStatus SetNpcAux(Evt* script, s32 isInitialCall) { if (newScriptSource != NULL) { enemy->auxBytecode = newScriptSource; - scriptTemp = start_script(newScriptSource, 10, 0); + scriptTemp = start_script(newScriptSource, EVT_PRIORITY_A, 0); enemy->auxScript = scriptTemp; enemy->auxScriptID = scriptTemp->id; - scriptTemp->owner1.enemyID = (s32)enemy; + scriptTemp->owner1.enemy = enemy; scriptTemp->owner2.npcID = id; scriptTemp->groupFlags = script->groupFlags; } @@ -501,31 +501,31 @@ ApiStatus BindNpcAux(Evt* script, s32 isInitialCall) { ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Enemy* npc = script->owner1.enemy; + Enemy* enemy = script->owner1.enemy; s32 npcID = evt_get_variable(script, *args++); Evt* newScript; s32 groupFlags; if (npcID == NPC_SELF) { - npcID = npc->npcID; + npcID = enemy->npcID; } - npc = get_enemy(npcID); + enemy = get_enemy(npcID); - if (npc->flags & 1) { + if (enemy->flags & 1) { groupFlags = 10; } else { groupFlags = 11; } - if (npc->auxScript != NULL) { - kill_script_by_ID(npc->auxScriptID); + if (enemy->auxScript != NULL) { + kill_script_by_ID(enemy->auxScriptID); } - newScript = start_script(npc->auxBytecode, 10, 0); - npc->auxScript = newScript; - npc->auxScriptID = newScript->id; - newScript->owner1.enemy = npc; + newScript = start_script(enemy->auxBytecode, EVT_PRIORITY_A, 0); + enemy->auxScript = newScript; + enemy->auxScriptID = newScript->id; + newScript->owner1.enemy = enemy; newScript->owner2.npcID = npcID; newScript->groupFlags = groupFlags; @@ -806,17 +806,17 @@ ApiStatus func_80045900(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); s32 var0 = evt_get_variable(script, *script->ptrReadPos); - enemy->unk_B0 |= 4; + enemy->unk_B0 |= ENEMY_AI_FLAGS_4; if (var0 == 0) { s32 unk; - if (!(enemy->unk_B0 & 0x10)) { + if (!(enemy->unk_B0 & ENEMY_AI_FLAGS_10)) { npc->currentAnim.w = *enemy->animList; } - if (!(enemy->unk_B0 & 0x8)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 0.0f, -20.0f, 40, &unk); + if (!(enemy->unk_B0 & ENEMY_AI_FLAGS_8)) { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 0.0f, -20.0f, 40, &unk); } if ((npc->flags & 0xA08) == 0x808) { diff --git a/src/entity/Switch.c b/src/entity/Switch.c index ebb219715f..5371f98804 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -105,7 +105,7 @@ void entity_small_switch_idle(Entity* entity) { return; } - if (partnerActionStatus->actionState.b[3] == 4 && partnerActionStatus->actionState.b[0] != 0) { + if (partnerActionStatus->actingPartner == PARTNER_PARAKARRY && partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE) { return; } diff --git a/src/entity/jan_iwa/E2D730.c b/src/entity/jan_iwa/E2D730.c index efe56de131..78c8174bc3 100644 --- a/src/entity/jan_iwa/E2D730.c +++ b/src/entity/jan_iwa/E2D730.c @@ -162,7 +162,7 @@ void func_802BB9E0_E2E310(Entity* entity) { case 0: if (entity->collisionFlags & 1) { data->unk_01 = 0; - if (partnerActionStatus->actionState.b[3] != 0) { + if (partnerActionStatus->actingPartner != 0) { playerStatus->animFlags |= 4; } func_800EF300(partnerActionStatus); @@ -222,7 +222,7 @@ void func_802BB9E0_E2E310(Entity* entity) { } break; case 6: - if (!(entity->collisionFlags & 1) && (partnerActionStatus->actionState.b[0] == 0)) { + if (!(entity->collisionFlags & 1) && (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE)) { data->unk_00 = 0; enable_partner_ai(); phys_adjust_cam_on_landing(); diff --git a/src/entity/sbk_omo/E307C0.c b/src/entity/sbk_omo/E307C0.c index 07c074d52c..5dfc1632ec 100644 --- a/src/entity/sbk_omo/E307C0.c +++ b/src/entity/sbk_omo/E307C0.c @@ -25,7 +25,7 @@ void func_802BC2BC_E30C0C(Entity* entity) { f32 x,y,z,sp2C; s32 result = 0; - if ((currentFloor & 0x4000) && ((currentFloor & 0xFF) == entity->listIndex) && (actionState == ACTION_STATE_HAMMER)) { + if ((currentFloor & COLLISION_WITH_ENTITY_BIT) && ((currentFloor & 0xFF) == entity->listIndex) && (actionState == ACTION_STATE_HAMMER)) { x = playerStatus->position.x; y = playerStatus->position.y + 5.0f; z = playerStatus->position.z; @@ -33,8 +33,8 @@ void func_802BC2BC_E30C0C(Entity* entity) { add_vec2D_polar(&x, &z, 10.0f, func_800E5348()); if (npc_raycast_down_sides(0x10000, &x, &y, &z, &sp2C) != 0) { - if (D_8010C978 & 0x4000) { - result = get_entity_type(D_8010C978) == 0x31; + if (D_8010C978 & COLLISION_WITH_ENTITY_BIT) { + result = get_entity_type(D_8010C978) == ENTITY_TYPE_STAR_BOX_LAUCHER; } } } else if ((entity->collisionFlags & 1) && ((actionState == ACTION_STATE_GROUND_POUND) || (actionState == ACTION_STATE_ULTRA_POUND))) { diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 43cf5bb7b3..87ff0fc7cf 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -2,14 +2,14 @@ #include "camera.h" EvtScript ShakeCam1 = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_FIXED(1.0)) EVT_RETURN EVT_END }; EvtScript ShakeCamX = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(ShakeCam, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) EVT_RETURN EVT_END @@ -265,7 +265,7 @@ ApiStatus ShakeCam(Evt* script, s32 isInitialCall) { void exec_ShakeCam1(s32 camID, s32 mode, s32 duration) { Evt* script; - script = start_script_in_group(&ShakeCam1, 1, 0, 4); + script = start_script_in_group(&ShakeCam1, EVT_PRIORITY_1, 0, EVT_GROUP_04); script->varTable[0] = camID; script->varTable[1] = mode; script->varTable[2] = duration; @@ -274,7 +274,7 @@ void exec_ShakeCam1(s32 camID, s32 mode, s32 duration) { void exec_ShakeCamX(s32 camID, s32 mode, s32 duration, f32 magnitude) { Evt* script; - script = start_script_in_group(&ShakeCamX, 1, 0, 4); + script = start_script_in_group(&ShakeCamX, EVT_PRIORITY_1, 0, EVT_GROUP_04); evt_set_variable(script, EVT_VAR(0), camID); evt_set_variable(script, EVT_VAR(1), mode); evt_set_variable(script, EVT_VAR(2), duration); diff --git a/src/evt/evt.c b/src/evt/evt.c index 2ac515737c..43c4fef971 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -974,7 +974,7 @@ s32 evt_trigger_on_activate_exec_script(Trigger* trigger) { return 0; } - script = start_script((EvtScript*)scriptStart, trigger->priority, 0x20); + script = start_script(scriptStart, trigger->priority, EVT_FLAG_20); trigger->runningScript = script; trigger->runningScriptID = script->id; script->varTable[0] = trigger->varTable[0]; @@ -1094,7 +1094,7 @@ ApiStatus evt_handle_does_script_exist(Evt* script) { s32 evt_trigger_on_activate_lock(Trigger* trigger) { if (trigger->runningScript == NULL) { - Evt* newScript = start_script(trigger->onTriggerEvt, trigger->priority, 0x20); + Evt* newScript = start_script(trigger->onTriggerEvt, trigger->priority, EVT_FLAG_20); trigger->runningScript = newScript; trigger->runningScriptID = newScript->id; newScript->varTable[0] = trigger->varTable[0]; @@ -1155,7 +1155,7 @@ ApiStatus evt_handle_thread(Evt* script) { } while (opcode != EVT_OP_END_THREAD); script->ptrNextLine = endLine; - newScript = start_script_in_group((EvtScript*)startLine, script->priority, 0x60, script->groupFlags); + newScript = start_script_in_group((EvtScript*)startLine, script->priority, (EVT_FLAG_20 | EVT_FLAG_40), script->groupFlags); newScript->owner1.enemyID = script->owner1.enemyID; newScript->owner2.npcID = script->owner2.npcID; newScript->array = script->array; @@ -1192,7 +1192,7 @@ ApiStatus evt_handle_child_thread(Evt* script) { } while (opcode != EVT_OP_END_CHILD_THREAD); script->ptrNextLine = endLine; - newScript = func_802C39F8(script, startLine, 0x60); + newScript = func_802C39F8(script, startLine, (EVT_FLAG_20 | EVT_FLAG_40)); newScript->owner1.enemyID = script->owner1.enemyID; newScript->owner2.npcID = script->owner2.npcID; newScript->groupFlags = script->groupFlags; diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index a34060cd48..7db1966313 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -26,7 +26,7 @@ ApiStatus func_802D5C70(Evt* script) { D_802DB800[i] = 0; } - start_script(&D_802D9D34, 1, 0); + start_script(&D_802D9D34, EVT_PRIORITY_1, 0); return ApiStatus_DONE2; } diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index e21db256cb..a9b382a924 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -111,7 +111,7 @@ ApiStatus Spawn802D9D50(Evt* script, s32 isInitialCall) { s32 var5 = evt_get_variable(script, *args++); s32 var6 = evt_get_variable(script, *args++); - Evt* newScript = start_script(&D_802D9D50, 1, 0); + Evt* newScript = start_script(&D_802D9D50, EVT_PRIORITY_1, 0); newScript->varTable[0] = var0; newScript->varTable[1] = var1; newScript->varTable[2] = var2; diff --git a/src/evt/map_api.c b/src/evt/map_api.c index b843184e81..0c0fbf83eb 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -529,7 +529,7 @@ ApiStatus ResetFromLava(Evt* script, s32 isInitialCall) { D_802DADA4 = -1; } - if (!(collisionStatus->currentFloor & 0x4000)) { + if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { collider = &gCollisionData.colliderList[collisionStatus->currentFloor]; if (collider->flags & 0x100) { D_802DADA4 = collisionStatus->currentFloor; diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index ec173df690..35d57c673a 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -33,7 +33,7 @@ ApiStatus CreateNpc(Evt* script, s32 isInitialCall) { NpcBlueprint blueprint; Npc *npc; - blueprint.flags = NPC_FLAG_0; + blueprint.flags = 0; blueprint.initialAnim = initialAnim; blueprint.onUpdate = NULL; blueprint.onRender = NULL; diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 1fbcd4224e..6f7842edd0 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -757,7 +757,7 @@ ApiStatus GetCurrentPartner(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; s32 currentPartner = 0; - if (gPartnerActionStatus.actionState.b[0] != 0) { + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { currentPartner = playerData->currentPartner; } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 673dba9636..506782b862 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -171,7 +171,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { gNumScripts++; ASSERT(newScript != NULL); - newScript->state = initialState | 1; + newScript->state = initialState | EVT_FLAG_01; newScript->currentOpcode = 0; newScript->priority = priority; newScript->ptrNextLine = (Bytecode*)source; @@ -186,7 +186,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { newScript->owner2.npcID = -1; newScript->loopDepth = -1; newScript->switchDepth = -1; - newScript->groupFlags = ~0x10; + newScript->groupFlags = ~EVT_GROUP_10; newScript->ptrSavedPosition = NULL; newScript->frameCounter = 0.0f; newScript->unk_158 = 0; @@ -204,7 +204,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { find_script_labels(newScript); - if (gIsUpdatingScripts && (newScript->state & 0x20)) { + if (gIsUpdatingScripts && (newScript->state & EVT_FLAG_20)) { scriptListCount = gScriptListCount++; gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIdList[scriptListCount] = newScript->id; @@ -243,7 +243,7 @@ Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 g // Some of this function is surely macros. I think we'll learn more as we do others in this file. -Ethan do { - newScript->state = initialState | 1; + newScript->state = initialState | EVT_FLAG_01; newScript->currentOpcode = 0; newScript->priority = priority; newScript->id = gStaticScriptCounter++; @@ -274,7 +274,7 @@ Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 g find_script_labels(newScript); - if (gIsUpdatingScripts && (newScript->state & 0x20)) { + if (gIsUpdatingScripts && (newScript->state & EVT_FLAG_20)) { scriptListCount = gScriptListCount++; gScriptIndexList[scriptListCount] = curScriptIndex; gScriptIdList[scriptListCount] = newScript->id; @@ -311,8 +311,8 @@ Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 initialState) ASSERT(child != NULL); parentScript->childScript = child; - parentScript->state |= 0x10; - child->state = initialState | 1; + parentScript->state |= EVT_FLAG_10; + child->state = initialState | EVT_FLAG_01; child->ptrCurrentLine = child->ptrFirstLine = child->ptrNextLine = (Bytecode*)source; @@ -380,7 +380,7 @@ Evt* func_802C39F8(Evt* parentScript, Bytecode* nextLine, s32 newState) { gNumScripts++; ASSERT(child != NULL); - child->state = newState | 1; + child->state = newState | EVT_FLAG_01; child->ptrNextLine = nextLine; child->ptrFirstLine = nextLine; child->ptrCurrentLine = nextLine; diff --git a/src/npc.c b/src/npc.c index 9821d6b9d8..0e0fd0f5e8 100644 --- a/src/npc.c +++ b/src/npc.c @@ -394,8 +394,8 @@ void npc_do_other_npc_collision(Npc* npc) { if (!(thisBuf + otherBuf <= dist)) { collision = FALSE; if (npc->flags & NPC_FLAG_PARTICLE) { - collision = gPartnerActionStatus.actionState.b[0] == 0; - } else if (!(otherNpc->flags & NPC_FLAG_PARTICLE) || gPartnerActionStatus.actionState.b[0] == 0) { + collision = gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE; + } else if (!(otherNpc->flags & NPC_FLAG_PARTICLE) || gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE) { collision = TRUE; } @@ -1480,7 +1480,7 @@ s32 npc_find_standing_on_entity(s32 arg0) { } else { floorID = npc->currentFloor; - if (!(floorID & 0x4000)) { + if (!(floorID & COLLISION_WITH_ENTITY_BIT)) { continue; } } @@ -1616,7 +1616,7 @@ void func_8003D660(Npc* npc, s32 arg1) { func_8003DC38(npc, arg1); return; case 8: - if ((temp->actionState.b[0] == 0) || (temp->actionState.b[3] != 8)) { + if ((temp->partnerActionState == PARTNER_ACTION_NONE) || (temp->actingPartner != PARTNER_LAKILESTER)) { func_8003DFA0(npc, arg1); return; } @@ -2038,7 +2038,7 @@ s32 bind_enemy_ai(Enemy* enemy, EvtScript* aiScriptBytecode) { kill_script_by_ID(enemy->aiScript->id); } enemy->aiBytecode = aiScriptBytecode; - aiScript = enemy->aiScript = start_script(aiScriptBytecode, 0xA, 0); + aiScript = enemy->aiScript = start_script(aiScriptBytecode, EVT_PRIORITY_A, 0); id = enemy->aiScriptID = aiScript->id; aiScript->owner1.enemy = enemy; return id; @@ -2052,7 +2052,7 @@ s32 bind_enemy_aux(Enemy* enemy, EvtScript* auxScriptBytecode) { kill_script_by_ID(enemy->auxScript->id); } enemy->auxBytecode = auxScriptBytecode; - auxScript = enemy->auxScript = start_script(auxScriptBytecode, 0xA, 0); + auxScript = enemy->auxScript = start_script(auxScriptBytecode, EVT_PRIORITY_A, 0); id = enemy->auxScriptID = auxScript->id; auxScript->owner1.enemy = enemy; return id; @@ -2066,7 +2066,7 @@ s32 bind_enemy_interact(Enemy* enemy, EvtScript* interactScriptBytecode) { kill_script_by_ID(enemy->interactScript->id); } enemy->interactBytecode = interactScriptBytecode; - interactScript = enemy->interactScript = start_script(interactScriptBytecode, 0xA, 0); + interactScript = enemy->interactScript = start_script(interactScriptBytecode, EVT_PRIORITY_A, 0); id = enemy->interactScriptID = interactScript->id; interactScript->owner1.enemy = enemy; return id; diff --git a/src/trigger.c b/src/trigger.c index 5c7adffedd..b151efd3e7 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -23,7 +23,7 @@ void clear_trigger_data(void) { collisionStatus->currentFloor = -1; collisionStatus->lastTouchedFloor = -1; collisionStatus->currentCeiling = -1; - collisionStatus->unk_0A = -1; + collisionStatus->currentInspect = -1; collisionStatus->unk_0C = -1; collisionStatus->unk_0E = -1; collisionStatus->unk_10 = -1; @@ -130,7 +130,7 @@ void update_triggers(void) { if (listTrigger->location.colliderID == collisionStatus->currentWall) { collisionStatus->touchingWallTrigger = 1; } - if ((listTrigger->location.colliderID != collisionStatus->unk_0A) || !phys_can_player_interact()) { + if ((listTrigger->location.colliderID != collisionStatus->currentInspect) || !phys_can_player_interact()) { continue; } } diff --git a/src/world/action/16.c b/src/world/action/16.c index 2da7dfad59..8462bd4a96 100644 --- a/src/world/action/16.c +++ b/src/world/action/16.c @@ -20,7 +20,7 @@ void func_802B6000_E287F0(void) { playerStatus->gravityIntegrator[2] = 0.8059f; playerStatus->gravityIntegrator[3] = -0.0987f; - gCameras[CAM_DEFAULT].moveFlags |= 1; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; D_802B6240 = atan2(playerStatus->position.x, playerStatus->position.z, playerStatus->lastGoodPosition.x, playerStatus->lastGoodPosition.z); diff --git a/src/world/action/18.c b/src/world/action/18.c index 36be40c186..263d76c969 100644 --- a/src/world/action/18.c +++ b/src/world/action/18.c @@ -30,8 +30,8 @@ void func_802B6000_E245D0(void) { f32 sinTheta; s32 colliderID; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; phys_adjust_cam_on_landing(); if (!(playerStatus->animFlags & 0x1000)) { s32 temp; @@ -90,8 +90,8 @@ void func_802B6198_E24768(void) { void func_802B6230_E24800(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; suggest_player_anim_clearUnkFlag(0xA0005); playerStatus->currentStateTime = 8; } diff --git a/src/world/action/encounter.c b/src/world/action/encounter.c index 5269a602c3..d264bad101 100644 --- a/src/world/action/encounter.c +++ b/src/world/action/encounter.c @@ -9,7 +9,7 @@ void func_802B6000_E28A30(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 oldFlags = playerStatus->flags; - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { playerStatus->flags &= ~( PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_80000 | PLAYER_STATUS_FLAGS_8 | PLAYER_STATUS_FLAGS_FALLING | PLAYER_STATUS_FLAGS_JUMPING @@ -23,7 +23,7 @@ void func_802B6000_E28A30(void) { } if (playerStatus->animFlags & 0x400000) { - switch (gPartnerActionStatus.actionState.b[3]) { + switch (gPartnerActionStatus.actingPartner) { case 8: func_802BD100_317020(oldFlags); break; @@ -63,7 +63,7 @@ void func_802B609C_E28ACC(void) { f32 zDelta; f32 phi_f20; - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { playerStatus->flags &= ~(0x80080000 | 0x80000 | 0x8 | 0x4 | 0x2); playerStatus->fallState = 0; playerStatus->framesOnGround = 0; @@ -138,7 +138,7 @@ INCLUDE_ASM(s32, "world/action/encounter", func_802B609C_E28ACC); void func_802B6350_E28D80(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { playerStatus->flags &= ~(0x80000000 | 0x80000 | 0x8 | 0x4 | 0x2); playerStatus->fallState = 0; playerStatus->currentStateTime = 0; @@ -162,7 +162,7 @@ void func_802B6350_E28D80(void) { void func_802B63D4_E28E04(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { playerStatus->flags &= ~(0x80000000 | 0x8 | 0x4 | 0x2); playerStatus->fallState = 0; playerStatus->decorationList = 0; @@ -183,7 +183,7 @@ void func_802B63D4_E28E04(void) { void func_802B6478_E28EA8(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { playerStatus->flags &= ~0x80000000; playerStatus->flags |= 0x80000; playerStatus->currentStateTime = 0; @@ -202,7 +202,7 @@ void func_802B6478_E28EA8(void) { void func_802B6508_E28F38(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { f32 angle; f32 magnitude; @@ -234,8 +234,8 @@ void func_802B6508_E28F38(void) { void func_802B6638_E29068(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; playerStatus->currentSpeed = 0.0f; playerStatus->unk_60 = 0; diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 54232e032a..521b9a6c80 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -170,7 +170,7 @@ s32 func_802B62A4_E25174(void) { } } - if (ret >= 0 && (ret & 0x4000)) { + if (ret >= 0 && (ret & COLLISION_WITH_ENTITY_BIT)) { s32 hammerLevel = gPlayerData.hammerLevel; switch (get_entity_type(ret)) { @@ -313,7 +313,7 @@ void func_802B6820_E256F0(void) { if (HammerHit->unk_14 == 0) { collisionStatus->lastWallHammered = result; if (result >= 0) { - if (result & 0x4000) { + if (result & COLLISION_WITH_ENTITY_BIT) { get_entity_by_index(result)->unk_07 = 0; } } @@ -344,7 +344,7 @@ void func_802B6820_E256F0(void) { if (HammerHit->unk_14 == 0) { collisionStatus->lastWallHammered = result; if (result >= 0) { - if (result & 0x4000) { + if (result & COLLISION_WITH_ENTITY_BIT) { get_entity_by_index(result)->unk_07 = 0; } } @@ -369,7 +369,7 @@ void func_802B6820_E256F0(void) { action_hammer_play_hit_fx(HammerHit->hitID); - if (collisionStatus->lastWallHammered >= 0 && (collisionStatus->lastWallHammered & 0x4000)) { + if (collisionStatus->lastWallHammered >= 0 && (collisionStatus->lastWallHammered & COLLISION_WITH_ENTITY_BIT)) { get_entity_by_index(collisionStatus->lastWallHammered)->unk_07 = 0; playerStatus->flags |= PLAYER_STATUS_FLAGS_1000000; } else if (HammerHit->hitID < 0) { diff --git a/src/world/action/hit_fire.c b/src/world/action/hit_fire.c index c7ea34c397..1fd03322a1 100644 --- a/src/world/action/hit_fire.c +++ b/src/world/action/hit_fire.c @@ -18,7 +18,7 @@ void func_802B6000_E27C90(void) { playerStatus->gravityIntegrator[1] = -3.738f; playerStatus->gravityIntegrator[2] = 0.8059f; playerStatus->gravityIntegrator[3] = -0.0987f; - gCameras->moveFlags |= 1; + gCameras->moveFlags |= CAMERA_MOVE_FLAGS_1; D_802B62B0 = atan2(playerStatus->position.x, playerStatus->position.z, playerStatus->lastGoodPosition.x, playerStatus->lastGoodPosition.z); playerStatus->currentSpeed = get_xz_dist_to_player(playerStatus->lastGoodPosition.x, playerStatus->lastGoodPosition.z) / 18.0f; subtract_hp(1); diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index 13877d0384..73564d35cd 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -33,7 +33,7 @@ void func_802B6000_E27F40(void) { playerStatus->currentSpeed = 0.0f; D_802B68B0 = 0.0f; - gCameras[CAM_DEFAULT].moveFlags |= 3; + gCameras[CAM_DEFAULT].moveFlags |= (CAMERA_MOVE_FLAGS_1 | CAMERA_MOVE_FLAGS_2); D_802B68B4 = 90.0f; subtract_hp(1); open_status_menu_long(); @@ -164,7 +164,7 @@ void func_802B6000_E27F40(void) { exec_ShakeCamX(0, 2, 1, 0.8f); start_rumble(0x100, 0x32); phys_adjust_cam_on_landing(); - gCameras[CAM_DEFAULT].moveFlags &= ~2; + gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAGS_2; sfx_play_sound_at_player(0x3FB, 0); suggest_player_anim_setUnkFlag(0x8001A); playerStatus->flags &= ~0x800; diff --git a/src/world/action/jump.c b/src/world/action/jump.c index 8e4fe9d5bd..bdcfb88bf5 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -37,7 +37,7 @@ void func_802B6000_E24040(void) { void func_802B60B4_E240F4(void) { PlayerStatus* playerStatus = &gPlayerStatus; - s32 phi_a0; + s32 anim; if (playerStatus->flags < 0) { playerStatus->flags &= ~0x80000000; @@ -46,7 +46,7 @@ void func_802B60B4_E240F4(void) { if (playerStatus->actionState == ACTION_STATE_LAUNCH) { phys_adjust_cam_on_landing(); } else { - gCameras[CAM_DEFAULT].moveFlags |= 1; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; } if (playerStatus->actionState == ACTION_STATE_JUMP) { @@ -60,13 +60,13 @@ void func_802B60B4_E240F4(void) { } if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { - phi_a0 = 0x90005; + anim = 0x90005; } else if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { - phi_a0 = 0x10007; + anim = 0x10007; } else { - phi_a0 = 0x60009; + anim = 0x60009; } - suggest_player_anim_clearUnkFlag(phi_a0); + suggest_player_anim_clearUnkFlag(anim); playerStatus->decorationList++; } @@ -74,12 +74,9 @@ void func_802B60B4_E240F4(void) { void func_802B6198_E241D8(void) { PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus = &gCollisionStatus; - s32 temp_s1; - s32 phi_a0; + s32 anim; - temp_s1 = 0x80000000; // weirdness with this - fake match - - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { Entity* entity = get_entity_by_index(collisionStatus->currentFloor); D_8010C960 = entity->position.x; @@ -95,20 +92,19 @@ void func_802B6198_E241D8(void) { return; } - if (playerStatus->flags & 0x80000000) { - playerStatus->flags &= ~0x8000000A; - playerStatus->flags |= 4; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_JUMPING | PLAYER_STATUS_FLAGS_FLYING); + playerStatus->flags |= PLAYER_STATUS_FLAGS_FALLING; if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) { - phi_a0 = 0x10008; + anim = 0x10008; } else { - phi_a0 = 0x6000A; + anim = 0x6000A; } - temp_s1 = phi_a0; - suggest_player_anim_clearUnkFlag(temp_s1); - gCameras[CAM_DEFAULT].moveFlags |= 1; + suggest_player_anim_clearUnkFlag(anim); + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; } playerStatus->fallState++; @@ -122,11 +118,11 @@ void func_802B6294_E242D4(void) { return; } - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { s32 phi_a0; - playerStatus->flags &= ~0x8000000A; - playerStatus->flags |= 4; + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_JUMPING | PLAYER_STATUS_FLAGS_FLYING); + playerStatus->flags |= PLAYER_STATUS_FLAGS_FALLING; if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) { phi_a0 = 0x90005; @@ -136,7 +132,7 @@ void func_802B6294_E242D4(void) { phi_a0 = 0x6000A; } suggest_player_anim_clearUnkFlag(phi_a0); - gCameras[CAM_DEFAULT].moveFlags |= 1; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; } playerStatus->decorationList++; } @@ -157,10 +153,10 @@ void func_802B6348_E24388(void) { return; } - if (playerStatus->flags < 0) { - playerStatus->flags &= 0x7FFFFFF5; - playerStatus->flags |= 4; - gCameras[CAM_DEFAULT].moveFlags |= 1; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_JUMPING | PLAYER_STATUS_FLAGS_FLYING); + playerStatus->flags |= PLAYER_STATUS_FLAGS_FALLING; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; } playerStatus->decorationList++; @@ -183,10 +179,10 @@ void func_802B647C_E244BC(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 temp_v1; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; - playerStatus->flags &= ~0xA; - playerStatus->flags |= 4; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_JUMPING | PLAYER_STATUS_FLAGS_FLYING); + playerStatus->flags |= PLAYER_STATUS_FLAGS_FALLING; if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) { temp_v1 = 0x10008; @@ -195,7 +191,7 @@ void func_802B647C_E244BC(void) { } suggest_player_anim_clearUnkFlag(temp_v1); - gCameras[CAM_DEFAULT].moveFlags |= 1; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; } playerStatus->decorationList++; } @@ -203,11 +199,11 @@ void func_802B647C_E244BC(void) { void func_802B6508_E24548(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; - playerStatus->flags &= ~0xA; - playerStatus->flags |= 4; - gCameras[CAM_DEFAULT].moveFlags |= 1; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_JUMPING | PLAYER_STATUS_FLAGS_FLYING); + playerStatus->flags |= PLAYER_STATUS_FLAGS_FALLING; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) { suggest_player_anim_clearUnkFlag(0xA0006); diff --git a/src/world/action/land.c b/src/world/action/land.c index 0b3064dd81..b3593a5dbe 100644 --- a/src/world/action/land.c +++ b/src/world/action/land.c @@ -44,13 +44,13 @@ void func_802B6000_E24920(void) { sfx_play_sound_at_player(0x8161, 0); sfx_play_sound_at_player(0x148, 0); - if (!(collisionStatus->currentFloor & 0x4000)) { + if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); } collisionStatus->lastTouchedFloor = -1; playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_40000; - camera->moveFlags &= ~0x4; + camera->moveFlags &= ~CAMERA_MOVE_FLAGS_4; } playerStatus->fallState++; playerStatus->currentSpeed *= 0.6f; @@ -96,7 +96,7 @@ void func_802B61C0_E24AE0(void) { playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; - if (!(collisionStatus->currentFloor & 0x4000)) { + if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); } @@ -133,7 +133,7 @@ void func_802B62CC_E24BEC(void) { sfx_play_sound_at_player(SOUND_SOFT_LAND, 0); - if (!(collisionStatus->currentFloor & 0x4000)) { + if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); } @@ -175,7 +175,7 @@ void func_802B644C_E24D6C(void) { playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; - if (!(collisionStatus->currentFloor & 0x4000)) { + if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); } collisionStatus->lastTouchedFloor = -1; diff --git a/src/world/action/slide.c b/src/world/action/slide.c index e13db437a0..73ecdeaf67 100644 --- a/src/world/action/slide.c +++ b/src/world/action/slide.c @@ -53,7 +53,7 @@ void func_802B6060_E27570(void) { D_802B679C = 0; suggest_player_anim_clearUnkFlag(0x1000A); sfx_play_sound_at_player(SOUND_167, 0); - gCameras[CAM_DEFAULT].moveFlags |= 1; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; } tempCurrentSpeed = playerStatus->currentSpeed; sp28 = playerStatus->position.x; diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index 96440f2dfa..a3b5fcc57e 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -63,8 +63,8 @@ void func_802B6120_E2A7D0(void) { f32 phi_f20; f32 phi_f22; - if (playerStatus->flags < 0) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; mem_clear(&D_802B6E80, sizeof(D_802B6E80)); disable_player_static_collisions(); tempUnk_1C = ¶solStruct->unk_1C; diff --git a/src/world/action/super_boots.c b/src/world/action/super_boots.c index d7983850a7..8c81dd9745 100644 --- a/src/world/action/super_boots.c +++ b/src/world/action/super_boots.c @@ -15,17 +15,18 @@ void func_802B6000_E26DE0(void) { u32 entityType; u8 colliderType; - if (playerStatus->flags & (1 << 31)) { - playerStatus->flags &= ~0x80000006; - playerStatus->flags |= 0xA; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_JUMPING | PLAYER_STATUS_FLAGS_FALLING); + playerStatus->flags |= (PLAYER_STATUS_FLAGS_JUMPING | PLAYER_STATUS_FLAGS_FLYING); + playerStatus->fallState = 0; playerStatus->currentSpeed = 0.0f; D_802B6730 = 0.0f; playerStatus->gravityIntegrator[0] = 5.2f; suggest_player_anim_clearUnkFlag(0x1000A); disable_player_input(); - playerStatus->flags |= 0x200; - gCameras[CAM_DEFAULT].moveFlags |= 1; + playerStatus->flags |= PLAYER_STATUS_FLAGS_200; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; sfx_play_sound_at_player(0x146, 0); } @@ -41,7 +42,7 @@ void func_802B6000_E26DE0(void) { playerStatus->gravityIntegrator[0] -= 0.54; if (collisionStatus->currentCeiling < 0) { playerStatus->position.y += playerStatus->gravityIntegrator[0]; - } else if (collisionStatus->currentCeiling & 0x4000) { + } else if (collisionStatus->currentCeiling & COLLISION_WITH_ENTITY_BIT) { entity = get_entity_by_index(collisionStatus->currentCeiling); if (entity != NULL) { playerStatus->position.y = entity->position.y - (playerStatus->colliderHeight * 0.5); @@ -92,8 +93,8 @@ void func_802B6000_E26DE0(void) { playerStatus->gravityIntegrator[0] = -100.0f; } if (sp10 >= 0) { - if (collisionStatus->currentFloor & 0x4000 && (entityType = get_entity_type(collisionStatus->currentFloor), - entityType == 8 || entityType == 7)) { + if (collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT && (entityType = get_entity_type(collisionStatus->currentFloor), + entityType == ENTITY_TYPE_RED_SWITCH || entityType == ENTITY_TYPE_BLUE_SWITCH)) { get_entity_by_index(collisionStatus->currentFloor)->collisionFlags |= 1; playerStatus->fallState = 0xB; playerStatus->flags &= ~0x8; diff --git a/src/world/action/ultra_boots.c b/src/world/action/ultra_boots.c index ecc6a68723..4c810b196d 100644 --- a/src/world/action/ultra_boots.c +++ b/src/world/action/ultra_boots.c @@ -16,8 +16,8 @@ void func_802B6000_E26710(void) { s32 sp10; u32 entityType; - if (playerStatus->flags & (1 << 31)) { - playerStatus->flags &= ~0x80000000; + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; playerStatus->flags |= 0x2000A; phys_clear_spin_history(); playerStatus->fallState = 0; @@ -29,7 +29,7 @@ void func_802B6000_E26710(void) { suggest_player_anim_setUnkFlag(0x80000); disable_player_input(); playerStatus->flags |= 0x200; - gCameras[CAM_DEFAULT].moveFlags |= 1; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_1; temp_f0 = clamp_angle(playerStatus->targetYaw - gCameras[gCurrentCameraID].currentYaw); phi_f4 = -60.0f; if (temp_f0 <= 180.0f) { @@ -64,7 +64,7 @@ void func_802B6000_E26710(void) { case 0: temp_f20 = integrate_gravity(); playerStatus->position.y = player_check_collision_below(temp_f20, &sp10); - if (sp10 >= 0 && collisionStatus->currentFloor & 0x4000 ) { + if (sp10 >= 0 && collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT ) { entityType = get_entity_type(collisionStatus->currentFloor); if(entityType == 7 || entityType == 8) { get_entity_by_index(collisionStatus->currentFloor)->collisionFlags |= 1; @@ -100,13 +100,13 @@ void func_802B6000_E26710(void) { playerStatus->gravityIntegrator[0] = -100.0f; } if (sp10 >= 0) { - if (collisionStatus->currentFloor & 0x4000) { + if (collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT) { entityType = get_entity_type(collisionStatus->currentFloor); - if (entityType == 0x2E || entityType == 0x2F) { + if (entityType == ENTITY_TYPE_SIMPLE_SPRING || entityType == ENTITY_TYPE_SCRIPT_SPRING) { playerStatus->flags &= ~0x00020008; set_action_state(ACTION_STATE_LAND); return; - } else if (entityType == 7 || entityType == 8) { + } else if (entityType == ENTITY_TYPE_BLUE_SWITCH || entityType == ENTITY_TYPE_RED_SWITCH) { playerStatus->flags &= ~0x00020008; phys_player_land(); exec_ShakeCam1(0, 0, 4); diff --git a/src/world/action/use_spinning_flower.c b/src/world/action/use_spinning_flower.c index f12f54d41c..d493b1c878 100644 --- a/src/world/action/use_spinning_flower.c +++ b/src/world/action/use_spinning_flower.c @@ -61,7 +61,7 @@ void func_802B60A4_E29514(void) { TempPointer = &D_802B6ED0; if (sp20 >= 0){ - if(!(sp20 & 0x4000)) { + if(!(sp20 & COLLISION_WITH_ENTITY_BIT)) { D_802B6ED0 = -1; } else { D_802B6ED0 = sp20 & 0x3FF; @@ -114,7 +114,7 @@ void func_802B60A4_E29514(void) { gCameras->targetPos.y = playerStatus->position.y; gCameras->targetPos.z = playerStatus->position.z; sp20 = func_802B6000_E29470(); - if (sp20 < 0 || !(sp20 & 0x4000)) { + if (sp20 < 0 || !(sp20 & COLLISION_WITH_ENTITY_BIT)) { playerStatus->currentStateTime = 20; D_802B6EE8 = 0.0f; D_802B6EF4 = playerStatus->position.y; diff --git a/src/world/action/walk.c b/src/world/action/walk.c index 7ea2303158..259d60b636 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -46,7 +46,7 @@ void action_run_update(void) { return; } - if (playerStatus->flags < 0) { + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { playerStatus->flags &= ~0x80880000; D_8010C980 = 0; playerStatus->unk_60 = 0; diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index 06f450ddbc..e165990b3a 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -235,7 +235,7 @@ s32 N(func_80240000_BDD1B0)(Evt* script, NpcAISettings* aiSettings, EnemyTerrito if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { ret = FALSE; } - if (gPartnerActionStatus.actionState.b[3] == 9) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { ret = FALSE; } return ret; @@ -252,7 +252,7 @@ void N(func_802401D4_BDD384)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim.w = enemy->animList[9]; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->duration = 12; script->functionTemp[0] = 2; @@ -353,11 +353,11 @@ s32 N(func_80240C90_BDDE40)(Evt* script, s32 isInitialCall) { } } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if ((u32)script->functionTemp[0] - 12 < 3 && N(func_80240000_BDD1B0)(script, npcAISettings, territoryPtr)) { diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index a4f40c42df..b3ea8c744d 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -316,7 +316,7 @@ s32 N(func_80242388_BE5B38)(Evt* script, NpcAISettings* aiSettings, EnemyTerrito if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { ret = FALSE; } - if (gPartnerActionStatus.actionState.b[3] == 9) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { ret = FALSE; } return ret; @@ -333,7 +333,7 @@ void N(func_8024255C_BE5D0C)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim.w = enemy->animList[9]; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->duration = 12; script->functionTemp[0] = 2; @@ -438,11 +438,11 @@ ApiStatus N(func_80243018_BE67C8)(Evt* script, s32 isInitialCall) { } } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if ((u32)script->functionTemp[0] - 12 < 3 && N(func_80242388_BE5B38)(script, aiSettings, territoryPtr)) { diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index adf4813f8a..c4b271bfad 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -51,7 +51,7 @@ EvtScript N(802437AC) = { }; EvtScript N(802439B0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 420bb59f19..5797dfd910 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -434,7 +434,7 @@ EvtScript N(802449C4) = { }; EvtScript N(80244AD0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) @@ -610,7 +610,7 @@ void N(func_80241954_BFF1D4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -654,7 +654,7 @@ void N(func_80241CA8_BFF528)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (!(npc->pos.y < (posY + temp_f20))) { npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); npc->pos.y = posY + temp_f20; - fx_emote(2, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); npc->duration = 10; script->functionTemp[0] = 18; } @@ -676,7 +676,7 @@ void N(func_80241E70_BFF6F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->duration++; if (npc->duration >= 3) { - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { @@ -723,7 +723,7 @@ void N(func_80241F98_BFF818)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->moveToPos.y = npc->pos.y; script->functionTemp[0] = 12; @@ -841,7 +841,7 @@ EvtScript N(npcAI_80244D54) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index e74cae8445..3148b3e092 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -453,7 +453,7 @@ ApiStatus N(func_8024061C_C2F1BC)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -463,10 +463,10 @@ ApiStatus N(func_8024061C_C2F1BC)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } @@ -555,15 +555,15 @@ void N(func_80240958_C2F4F8)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit phi_s2 = TRUE; } - if (playerData->currentPartner == 2) { - if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { + if (playerData->currentPartner == PARTNER_KOOPER) { + if (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_KOOPER_2) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || - ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { + if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || + ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); @@ -576,7 +576,7 @@ void N(func_80240958_C2F4F8)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit ai_enemy_play_sound(npc, 0xB000000E, 0); npc->currentAnim.w = enemy->animList[11]; npc->duration = 10; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 2; } @@ -716,7 +716,7 @@ ApiStatus N(func_802410D4_C2FC74)(Evt* script, s32 isInitialCall) { territory.unk_18 = 40.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 30; npc->currentAnim.w = enemy->animList[10]; @@ -727,12 +727,12 @@ ApiStatus N(func_802410D4_C2FC74)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 40; npc->currentAnim.w = enemy->animList[0]; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index c562905f49..3bf7342951 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -212,7 +212,7 @@ static s32 N(pad_30D8)[] = { }; EvtScript N(802430E0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_LOOP(20) EVT_CALL(GetCurrentPartner, EVT_VAR(10)) EVT_IF_NE(EVT_VAR(10), 0) @@ -345,7 +345,7 @@ static s32 N(pad_3738)[] = { }; EvtScript N(80243740) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) @@ -794,7 +794,7 @@ ApiStatus N(func_8024086C_C31D4C)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -804,10 +804,10 @@ ApiStatus N(func_8024086C_C31D4C)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } @@ -881,7 +881,7 @@ ApiStatus N(func_802419B0_C32E90)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -891,10 +891,10 @@ ApiStatus N(func_802419B0_C32E90)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } @@ -986,15 +986,15 @@ void N(func_80241D04_C331E4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit phi_s2 = TRUE; } - if (playerData->currentPartner == 2) { - if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { + if (playerData->currentPartner == PARTNER_KOOPER) { + if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || - ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { + if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || + ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); @@ -1007,7 +1007,7 @@ void N(func_80241D04_C331E4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit ai_enemy_play_sound(npc, 0xB000000E, 0); npc->currentAnim.w = enemy->animList[11]; npc->duration = 10; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 2; } @@ -1147,7 +1147,7 @@ ApiStatus N(func_80242480_C33960)(Evt* script, s32 isInitialCall) { territory.unk_18 = 40.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 30; npc->currentAnim.w = enemy->animList[10]; @@ -1158,12 +1158,12 @@ ApiStatus N(func_80242480_C33960)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 40; npc->currentAnim.w = enemy->animList[0]; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 0abf522878..637ce5f08e 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -157,7 +157,7 @@ EvtScript N(npcAI_802435E4) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) @@ -378,7 +378,7 @@ void N(func_802417F8_C37D28)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -422,7 +422,7 @@ void N(func_80241B4C_C3807C)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (!(npc->pos.y < (posY + temp_f20))) { npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); npc->pos.y = posY + temp_f20; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); npc->duration = 10; script->functionTemp[0] = 18; } @@ -444,7 +444,7 @@ void N(func_80241D14_C38244)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->duration++; if (npc->duration >= 3) { - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { @@ -491,7 +491,7 @@ void N(func_80241E3C_C3836C)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->moveToPos.y = npc->pos.y; script->functionTemp[0] = 12; diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 85591e2989..5716432411 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -404,15 +404,15 @@ void N(func_80240704_C3B114)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit phi_s2 = TRUE; } - if (playerData->currentPartner == 2) { - if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { + if (playerData->currentPartner == PARTNER_KOOPER) { + if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || - ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { + if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || + ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); @@ -425,7 +425,7 @@ void N(func_80240704_C3B114)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit ai_enemy_play_sound(npc, 0xB000000E, 0); npc->currentAnim.w = enemy->animList[11]; npc->duration = 10; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 2; } @@ -565,7 +565,7 @@ ApiStatus N(func_80240E80_C3B890)(Evt* script, s32 isInitialCall) { territory.unk_18 = 40.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 30; npc->currentAnim.w = enemy->animList[10]; @@ -576,12 +576,12 @@ ApiStatus N(func_80240E80_C3B890)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 40; npc->currentAnim.w = enemy->animList[0]; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { @@ -669,7 +669,7 @@ ApiStatus N(func_802411D0_C3BBE0)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -679,10 +679,10 @@ ApiStatus N(func_802411D0_C3BBE0)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 355f6581bf..bd6d782741 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -89,7 +89,7 @@ static s32** N(varStash) = NULL; #include "world/common/StashVars.inc.c" EvtScript N(80240624) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) EVT_CALL(ShowGotItem, EVT_VAR(0), 0, 0) diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 4f6540df22..1d18a4d053 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -311,15 +311,15 @@ void N(func_802406A4_C3E294)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit phi_s2 = TRUE; } - if (playerData->currentPartner == 2) { - if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { + if (playerData->currentPartner == PARTNER_KOOPER) { + if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || - ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { + if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || + ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); @@ -332,7 +332,7 @@ void N(func_802406A4_C3E294)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit ai_enemy_play_sound(npc, 0xB000000E, 0); npc->currentAnim.w = enemy->animList[11]; npc->duration = 10; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 2; } @@ -472,7 +472,7 @@ ApiStatus N(func_80240E20_C3EA10)(Evt* script, s32 isInitialCall) { territory.unk_18 = 40.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 30; npc->currentAnim.w = enemy->animList[10]; @@ -483,12 +483,12 @@ ApiStatus N(func_80240E20_C3EA10)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 40; npc->currentAnim.w = enemy->animList[0]; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { @@ -576,7 +576,7 @@ ApiStatus N(func_80241170_C3ED60)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -586,10 +586,10 @@ ApiStatus N(func_80241170_C3ED60)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 2ca2b20632..232d1cd7e4 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -308,7 +308,7 @@ EvtScript N(npcAI_802444E4) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) @@ -1019,7 +1019,7 @@ ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -1029,10 +1029,10 @@ ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } @@ -1195,7 +1195,7 @@ void N(func_80242F94_C42D44)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -1239,7 +1239,7 @@ void N(func_802432E8_C43098)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (!(npc->pos.y < (posY + temp_f20))) { npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); npc->pos.y = posY + temp_f20; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); npc->duration = 10; script->functionTemp[0] = 18; } @@ -1261,7 +1261,7 @@ void N(func_802434B0_C43260)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->duration++; if (npc->duration >= 3) { - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { @@ -1308,7 +1308,7 @@ void N(func_802435D8_C43388)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->moveToPos.y = npc->pos.y; script->functionTemp[0] = 12; diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 8659c40ae4..14bce9e973 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -360,7 +360,7 @@ EvtScript N(npcAI_802443DC) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(func_802D2B6C) EVT_CALL(DisablePartnerAI, 0) - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) @@ -651,7 +651,7 @@ ApiStatus N(func_8024061C_C471FC)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -661,10 +661,10 @@ ApiStatus N(func_8024061C_C471FC)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } @@ -753,15 +753,15 @@ void N(func_80240958_C47538)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit phi_s2 = TRUE; } - if (playerData->currentPartner == 2) { - if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { + if (playerData->currentPartner == PARTNER_KOOPER) { + if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || - ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { + if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || + ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); @@ -774,7 +774,7 @@ void N(func_80240958_C47538)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit ai_enemy_play_sound(npc, 0xB000000E, 0); npc->currentAnim.w = enemy->animList[11]; npc->duration = 10; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 2; } @@ -914,7 +914,7 @@ ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) { territory.unk_18 = 40.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 30; npc->currentAnim.w = enemy->animList[10]; @@ -925,12 +925,12 @@ ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 40; npc->currentAnim.w = enemy->animList[0]; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { @@ -1101,7 +1101,7 @@ void N(func_80242C1C_C497FC)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit } else { npc->rotation.y = 0.0f; npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { disable_player_input(); partner_disable_input(); npc->duration = 0; @@ -1145,7 +1145,7 @@ void N(func_80242F70_C49B50)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (!(npc->pos.y < (posY + temp_f20))) { npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); npc->pos.y = posY + temp_f20; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); npc->duration = 10; script->functionTemp[0] = 18; } @@ -1167,7 +1167,7 @@ void N(func_80243138_C49D18)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->duration++; if (npc->duration >= 3) { - if (gPartnerActionStatus.actionState.b[3] != 9) { + if (gPartnerActionStatus.actingPartner != 9) { npc->duration = 0; script->functionTemp[0] = 100; } else { @@ -1214,7 +1214,7 @@ void N(func_80243260_C49E40)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->moveToPos.y = npc->pos.y; script->functionTemp[0] = 12; diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 91ff1e336d..6380574555 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -134,7 +134,7 @@ static s32** N(varStash) = NULL; #include "world/common/StashVars.inc.c" EvtScript N(80240874) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) EVT_CALL(ShowGotItem, EVT_VAR(0), 0, 0) diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 6fcede79b2..66e70b5294 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -420,7 +420,7 @@ static s32 N(pad_2AC8)[] = { }; EvtScript N(80242AD0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) EVT_IF_EQ(EVT_VAR(0), 0) @@ -493,7 +493,7 @@ ApiStatus N(func_8024061C_C4FB2C)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -503,10 +503,10 @@ ApiStatus N(func_8024061C_C4FB2C)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 86d9ffc2d1..45f4072a7c 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -668,15 +668,15 @@ void N(func_802406A4_C52BE4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit phi_s2 = TRUE; } - if (playerData->currentPartner == 2) { - if (gPartnerActionStatus.actionState.b[0] == playerData->currentPartner) { + if (playerData->currentPartner == PARTNER_KOOPER) { + if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { phi_s2 = TRUE; } } } - if (((playerData->currentPartner == 1) && (gPartnerActionStatus.actionState.b[0] != 0)) || - ((playerData->currentPartner == 3) && (gPartnerActionStatus.actionState.b[0] == 2))) { + if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || + ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { posX = npc->pos.x; posZ = npc->pos.z; add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); @@ -689,7 +689,7 @@ void N(func_802406A4_C52BE4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit ai_enemy_play_sound(npc, 0xB000000E, 0); npc->currentAnim.w = enemy->animList[11]; npc->duration = 10; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 2; } @@ -829,7 +829,7 @@ ApiStatus N(func_80240E20_C53360)(Evt* script, s32 isInitialCall) { territory.unk_18 = 40.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 30; npc->currentAnim.w = enemy->animList[10]; @@ -840,12 +840,12 @@ ApiStatus N(func_80240E20_C53360)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 40; npc->currentAnim.w = enemy->animList[0]; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { @@ -933,7 +933,7 @@ ApiStatus N(func_80241170_C536B0)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -943,10 +943,10 @@ ApiStatus N(func_80241170_C536B0)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index c05fae18f6..9294a458f6 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -386,7 +386,7 @@ EvtScript N(idle_80242494) = { }; EvtScript N(npcAI_802426B0) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0) EVT_CALL(ShowSleepBubble, 0, 0, 50, 2, 552, 111, 128, 30, EVT_VAR(0)) EVT_WAIT_FRAMES(360) @@ -411,7 +411,7 @@ EvtScript N(npcAI_802426B0) = { }; EvtScript N(npcAI_80242834) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_world_tubba_Palette_00_Anim_D) EVT_THREAD EVT_LOOP(0) @@ -654,7 +654,7 @@ static s32 N(pad_36D8)[] = { s32** N(varStash) = NULL; // StashVars.inc.c data EvtScript N(802436E4) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) EVT_CALL(ShowGotItem, EVT_VAR(0), 0, 0) diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index f61ad210bd..ffe8090ddb 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -2190,7 +2190,7 @@ void N(func_802430C8_95E2C8)(Unk_Struct_1* ptr, s32 arg1) { if (ptr->unk_1C >= 6) { if (fabsf(get_clamped_angle_diff(atan2(125.0f, -42.0f, 152.0f, -61.0f), atan2(125.0f, -42.0f, playerStatus->position.x, playerStatus->position.z))) < 30.0f) { - start_script(&N(80248504), 1, 0); + start_script(&N(80248504), EVT_PRIORITY_1, 0); ptr->unk_20 = 4; } } diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 2be5aeb752..fe306688a5 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -364,7 +364,7 @@ EvtScript N(toggleVis_8024468C) = { }; EvtScript N(8024486C) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, 10, 20) @@ -398,7 +398,7 @@ EvtScript N(8024486C) = { }; EvtScript N(80244A68) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) EVT_CALL(PlayerMoveTo, 230, -70, 20) diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 933f83c2ba..ee455f0af2 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -72,7 +72,7 @@ EvtScript N(80240814) = { }; EvtScript N(80240880) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index c062ae1340..bbe1069e30 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -55,7 +55,7 @@ static s32 N(pad_8CC) = { }; EvtScript N(updateTexturePan_802408D0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) @@ -72,7 +72,7 @@ EvtScript N(updateTexturePan_802408D0) = { }; EvtScript N(8024096C) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index e72194b942..39bf831775 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -58,7 +58,7 @@ EvtScript N(makeEntities) = { }; EvtScript N(80242680) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -942,7 +942,7 @@ void N(func_80241364_CB00A4)(Evt* script, NpcAISettings* npcAISettings, EnemyTer s32 var; if (func_800490B4(territory, enemy, npcAISettings->chaseRadius, npcAISettings->unk_28.f, 1) == 0) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->currentAnim.w = enemy->animList[0]; npc->duration = 25; script->functionTemp[0] = 14; @@ -991,7 +991,7 @@ ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall) { territory.unk_18 = 100.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -1001,10 +1001,10 @@ ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } @@ -1098,7 +1098,7 @@ static s32 N(pad_598C) = { }; EvtScript N(80245990) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index fb34cbdc9d..bad3790619 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -35,7 +35,7 @@ EvtScript N(80241880) = { }; EvtScript N(802418F0) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -149,7 +149,7 @@ static s32 N(pad_2004)[] = { }; EvtScript N(80242010) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index c82f009a38..5617e411c6 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -38,7 +38,7 @@ EvtScript N(802403E0) = { }; EvtScript N(80240450) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 55a26cf985..9a1c1b594f 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -57,7 +57,7 @@ static s32 N(pad_86C) = { }; EvtScript N(80240870) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index ec3057718c..3fb3c1a433 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -118,7 +118,7 @@ static s32 N(pad_3A3C) = { }; EvtScript N(80243A40) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -1268,7 +1268,7 @@ void N(func_80241704_CC4F14)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); x = npc->pos.x; y = npc->pos.y; @@ -1347,7 +1347,7 @@ void N(func_80241B68_CC5378)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 12; return; @@ -1391,11 +1391,11 @@ ApiStatus N(func_80241DB8_CC55C8)(Evt* script, s32 isInitialCall) { } npc->unk_AB = -3; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index dc8d39f918..815b77d100 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -26,7 +26,7 @@ EvtScript N(802423F0) = { }; EvtScript N(updateTexturePan_80242460) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) @@ -150,7 +150,7 @@ static s32 N(pad_2BF4)[] = { }; EvtScript N(80242C00) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -417,7 +417,7 @@ s32 N(D_80243B18_CCEE28) = { }; EvtScript N(80243B1C) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_SET(EVT_VAR(15), EVT_VAR(0)) EVT_LABEL(0) EVT_IF_EQ(EVT_AREA_FLAG(35), 1) diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 1a6c022a54..b5d45dcbcd 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -95,7 +95,7 @@ EvtScript N(main) = { }; EvtScript N(80242EA0) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index ced9cc2519..3000ef09e9 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -37,7 +37,7 @@ EvtScript N(80243280) = { }; EvtScript N(802432F0) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -672,7 +672,7 @@ void N(func_802415B0_CD8890)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); x = npc->pos.x; y = npc->pos.y; @@ -751,7 +751,7 @@ void N(func_80241A14_CD8CF4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 12; return; @@ -795,11 +795,11 @@ ApiStatus N(func_80241C64_CD8F44)(Evt* script, s32 isInitialCall) { } npc->unk_AB = -3; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 74281986fa..f4af762f1a 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -43,7 +43,7 @@ static s32 N(pad_8B8)[] = { }; EvtScript N(updateTexturePan_802408C0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) @@ -152,7 +152,7 @@ static s32 N(pad_E88)[] = { }; EvtScript N(80240E90) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_LOOP(0) EVT_CALL(PlayEffect, 0x5E, 0, EVT_FIXED(-16.0), EVT_FIXED(102.0), EVT_FIXED(-4.1), EVT_FIXED(80.9), EVT_FIXED(102.0), EVT_FIXED(-4.1), EVT_FIXED(0.5), 6, 0, 0, 0, 0) EVT_CALL(N(func_80240340_CDC9E0)) diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index a20db7e05a..53bbbe475d 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -78,7 +78,7 @@ static s32 N(pad_AF4)[] = { }; EvtScript N(updateTexturePan_80240B00) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 56a8ce8acf..b00e0827d2 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -49,7 +49,7 @@ EvtScript N(80240D40) = { #include "world/common/StarSpiritEffectFunc.inc.c" EvtScript N(80240DA0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index cf9af549cf..a932e6bbb0 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -39,7 +39,7 @@ EvtScript N(80240D30) = { }; EvtScript N(80240DA0) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c index 4a4058cbd6..36f97062d5 100644 --- a/src/world/area_flo/flo_24/CF0980.c +++ b/src/world/area_flo/flo_24/CF0980.c @@ -29,7 +29,7 @@ EvtScript N(80240600) = { }; EvtScript N(80240690) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -182,7 +182,7 @@ EvtScript N(80241728) = { }; EvtScript N(updateTexturePan_802417A0) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 71e5b072a6..4da88cd5b4 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -39,7 +39,7 @@ EvtScript N(80242330) = { }; EvtScript N(802423A0) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_flo/flo_25/CF4BC0.c b/src/world/area_flo/flo_25/CF4BC0.c index e2bd31fad0..8e3e00fcf7 100644 --- a/src/world/area_flo/flo_25/CF4BC0.c +++ b/src/world/area_flo/flo_25/CF4BC0.c @@ -53,7 +53,7 @@ static s32 N(pad_4734)[] = { }; EvtScript N(80244740) = { - EVT_SET_GROUP(EVT_GROUP_B) + EVT_SET_GROUP(EVT_GROUP_0B) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index c1beb20d37..071b9ab7dc 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -14,27 +14,9 @@ #include "world/common/UnkFunc54.inc.c" -#include "world/common/UnkFunc55.inc.c" +#include "world/common/UnkFunc55.inc.c" // AI for projectile -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241414_910AC4); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802415E0_910C90); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802416F0_910DA0); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_8024192C_910FDC); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802419C0_911070); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241A4C_9110FC); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241B74_911224); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241C78_911328); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241CF0_9113A0); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241D70_911420); +#include "world/common/atomic/enemy/MontyMoleAI.inc.c" #include "world/common/UnkNpcAIMainFunc7.inc.c" diff --git a/src/world/area_kgr/kgr_02/8AAB80.c b/src/world/area_kgr/kgr_02/8AAB80.c index 6ecb80b4bf..a0520c1119 100644 --- a/src/world/area_kgr/kgr_02/8AAB80.c +++ b/src/world/area_kgr/kgr_02/8AAB80.c @@ -1,7 +1,7 @@ #include "kgr_02.h" ApiStatus func_80240730_8AAB80(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actionState.b[3] == 6) { + if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { return ApiStatus_DONE2; } else { return ApiStatus_BLOCK; @@ -9,7 +9,7 @@ ApiStatus func_80240730_8AAB80(Evt* script, s32 isInitialCall) { } ApiStatus func_80240748_8AAB98(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actionState.b[3] != 6) { + if (gPartnerActionStatus.actingPartner != PARTNER_WATT) { return ApiStatus_DONE2; } else { return ApiStatus_BLOCK; diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index 9d93f3da02..ea19878476 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -61,7 +61,7 @@ NpcSettings N(goombaNpcSettings) = { /// @bug Never returns EvtScript N(ReadWestSign) = { - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) // "Eat a Mushroom to regain your energy!" EVT_SUSPEND_GROUP(1) @@ -208,7 +208,7 @@ EvtScript N(ReadEastSign) = { EVT_IF_EQ(LW(0), 1) EVT_RETURN EVT_END_IF - EVT_SET_GROUP(EVT_GROUP_0) + EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_kmr_12_sign_to_fortress, 160, 40) diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 7427fa6fc7..62486994e9 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -44,16 +44,16 @@ ApiStatus func_80241C54_B95094(Evt* script, s32 isInitialCall) { territory.unk_18 = 200.0f; territory.unk_1C = 0; - if (isInitialCall || enemy->unk_B0 & 4) { + if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; enemy->varTable[0] = 0; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } diff --git a/src/world/area_nok/nok_04/9EDBF0.c b/src/world/area_nok/nok_04/9EDBF0.c index 051bcb1ac9..c9b308523f 100644 --- a/src/world/area_nok/nok_04/9EDBF0.c +++ b/src/world/area_nok/nok_04/9EDBF0.c @@ -203,7 +203,7 @@ ApiStatus func_802406C4_9EE2B4(Evt* script, s32 isInitialCall) { break; } - script2 = start_script(phi_a0, 1, 0); + script2 = start_script(phi_a0, EVT_PRIORITY_1, 0); script->varTable[temp_s1_2 + 6] = script2->id; switch(temp_s1_2) { diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index e11330c8e0..41af7d249c 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -35,7 +35,7 @@ ApiStatus func_802423CC_D8F61C(Evt *script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -47,10 +47,10 @@ ApiStatus func_802423CC_D8F61C(Evt *script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } diff --git a/src/world/common/DeadUnkNpcAIMainFunc.inc.c b/src/world/common/DeadUnkNpcAIMainFunc.inc.c index 706667e4d5..f2ddf66c34 100644 --- a/src/world/common/DeadUnkNpcAIMainFunc.inc.c +++ b/src/world/common/DeadUnkNpcAIMainFunc.inc.c @@ -26,7 +26,7 @@ ApiStatus N(DeadUnkNpcAIMainFunc)(Evt* script, s32 isInitialCall) { enemy->unk_114 = 0.0001f; enemy->unk_118 = 0.0001f; - if (isInitialCall || enemy->unk_B0 & 4) { + if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -37,10 +37,10 @@ ApiStatus N(DeadUnkNpcAIMainFunc)(Evt* script, s32 isInitialCall) { npc->flags = (npc->flags & ~0x200) | 8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; diff --git a/src/world/common/DeadUnkNpcAIMainFunc10.inc.c b/src/world/common/DeadUnkNpcAIMainFunc10.inc.c index 9aaf6f9179..fe127cfc40 100644 --- a/src/world/common/DeadUnkNpcAIMainFunc10.inc.c +++ b/src/world/common/DeadUnkNpcAIMainFunc10.inc.c @@ -32,11 +32,11 @@ ApiStatus N(DeadUnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall) { } npc->unk_AB = -2; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } switch (script->functionTemp[0]) { diff --git a/src/world/common/DeadUnkNpcAIMainFunc5.inc.c b/src/world/common/DeadUnkNpcAIMainFunc5.inc.c index 5e218da3be..efa675df35 100644 --- a/src/world/common/DeadUnkNpcAIMainFunc5.inc.c +++ b/src/world/common/DeadUnkNpcAIMainFunc5.inc.c @@ -32,10 +32,10 @@ ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { enemy->varTable[6] = npc->collisionHeight; enemy->varTable[8] = 0; enemy->unk_B5 = 0; - enemy->unk_B0 |= 8; + enemy->unk_B0 |= ENEMY_AI_FLAGS_8; } - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; enemy->unk_07 = 0; @@ -52,13 +52,13 @@ ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { s32 emoteTemp; script->functionTemp[0] = 99; script->functionTemp[1] = 0; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); - enemy->unk_B0 &= ~4; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; diff --git a/src/world/common/DeadUnkNpcAIMainFunc6.inc.c b/src/world/common/DeadUnkNpcAIMainFunc6.inc.c new file mode 100644 index 0000000000..dd243f8a78 --- /dev/null +++ b/src/world/common/DeadUnkNpcAIMainFunc6.inc.c @@ -0,0 +1,225 @@ +#include "dead.h" +#include "common.h" +#include "npc.h" +#include "effects.h" +#include "dead_structs.h" +#include "sprite/npc/bony_beetle.h" + +ApiStatus N(DeadUnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); + u32 x, y, z; + f32 x2, y2, z2, w2; + Npc* npc2; + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_18 = 65.0f; + territory.unk_1C = 0; + + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + + if (isInitialCall) { + enemy->varTable[6] = npc->collisionHeight; + enemy->unk_B0 |= ENEMY_AI_FLAGS_8; + } + + if (isInitialCall || (enemy->varTable[10] == 100)) { + script->functionTemp[0] = 100; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[0]; + npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + enemy->flags |= ENEMY_FLAGS_200000; + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + enemy->varTable[10] = 0; + enemy->varTable[11] = -1; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + } + + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + npc->duration = 0; + npc->collisionHeight = enemy->varTable[6]; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { + npc->currentAnim.w = 0x4A0018; + npc->moveSpeed = 0.0f; + npc->jumpVelocity = 0.0f; + npc->jumpScale = 1.0f; + script->functionTemp[0] = 102; + } else { + s32 emoteTemp; + + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); + npc->currentAnim.w = enemy->animList[0]; + script->functionTemp[1] = 0; + script->functionTemp[0] = 200; + } + } + get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z); + if (script->functionTemp[0] < 100 && x + 50 >= 421) { + script->functionTemp[0] = 110; + } + + switch (script->functionTemp[0]) { + case 0: + func_800495A0(script, aiSettings, territoryPtr); + npc->collisionHeight = enemy->varTable[6]; + if (enemy->varTable[13] != 0) { + if (npc->pos.y <= 0.0) { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } + } + func_800496B8(script, aiSettings, territoryPtr); + break; + case 1: + func_800496B8(script, aiSettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + case 3: + func_80049C04(script, aiSettings, territoryPtr); + break; + case 12: + N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); + case 13: + N(UnkDistFunc)(script, aiSettings, territoryPtr); + npc->collisionHeight = enemy->varTable[6]; + break; + case 14: + N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); + break; + case 15: + N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); + break; + case 100: + if (enemy->varTable[10] != 2) { + break; + } + npc2 = get_npc_unsafe(get_enemy(enemy->varTable[11])->npcID); + if (npc2->yaw < 180.0) { + npc->pos.x = npc2->pos.x + 12.0; + } else { + npc->pos.x = npc2->pos.x - 12.0; + } + npc->pos.y = npc2->pos.y + 25.0; + npc->pos.z = npc2->pos.z + 1.0; + npc->rotation.y = 0.0f; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + npc->flags &= ~NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->renderYaw = 0.0f; + npc->currentAnim.w = 0x4A0018; + script->functionTemp[0] = 101; + case 101: + if (enemy->varTable[10] != 3) { + break; + } + enemy->varTable[10] = 4; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->moveSpeed = 2.5f; + npc->jumpVelocity = 8.0f; + npc->jumpScale = 0.8f; + npc->flags |= NPC_FLAG_NO_Y_MOVEMENT; + script->functionTemp[0] = 102; + case 102: + if (npc->moveSpeed > 0.0) { + x2 = npc->pos.x; + y2 = npc->pos.y; + z2 = npc->pos.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x2, &y2, &z2, npc->moveSpeed, npc->yaw, npc->collisionHeight, + npc->collisionRadius) == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + npc->moveSpeed = 0.0f; + } + } + if (npc->jumpVelocity < 0.0) { + x2 = npc->pos.x; + y2 = npc->pos.y + 13.0; + z2 = npc->pos.z; + w2 = fabsf(npc->jumpVelocity) + 16.0; + if ((npc_raycast_down_sides(npc->collisionChannel, &x2, &y2, &z2, &w2) != 0) && (w2 <= (fabsf(npc->jumpVelocity) + 13.0))) { + npc->pos.y = y2; + enemy->territory->wander.point.x = npc->pos.x; + enemy->territory->wander.point.y = npc->pos.y; + enemy->territory->wander.point.z = npc->pos.z; + enemy->territory->wander.detect.x = npc->pos.x; + enemy->territory->wander.detect.y = npc->pos.y; + enemy->territory->wander.detect.z = npc->pos.z; + enemy->varTable[10] = 5; + if (enemy->varTable[13] != 0) { + if (npc->pos.y <= 0.0) { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } + } else if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + npc->flags |= NPC_FLAG_40000; + npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->jumpVelocity = 0.0f; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->currentAnim.w = 0x4A001A; + npc->duration = 3; + script->functionTemp[0] = 103; + break; + } + } + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + break; + case 103: + npc->duration--; + if (npc->duration <= 0) { + npc->flags &= ~NPC_FLAG_40000; + npc->currentAnim.w = 0x4A0001; + script->functionTemp[0] = 0; + } + break; + case 110: + npc->duration = 30; + npc->pos.x = 0.0f; + npc->pos.z = 0.0f; + npc->pos.y = -1000.0f; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_GRAVITY; + script->functionTemp[0] = 111; + case 111: + npc->duration--; + if (npc->duration <= 0) { + enemy->varTable[10] = 0; + script->functionTemp[0] = 100; + } + break; + case 200: + func_8004A73C(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/DeadUnkNpcAIMainFunc9.inc.c b/src/world/common/DeadUnkNpcAIMainFunc9.inc.c index 4088aac6c6..af01b1b557 100644 --- a/src/world/common/DeadUnkNpcAIMainFunc9.inc.c +++ b/src/world/common/DeadUnkNpcAIMainFunc9.inc.c @@ -31,11 +31,11 @@ ApiStatus N(DeadUnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall) { npc->unk_AB = -2; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } switch (script->functionTemp[0]) { case 0: diff --git a/src/world/common/SetCamera0MoveFlag1.inc.c b/src/world/common/SetCamera0MoveFlag1.inc.c index 1b183774cb..2e6cc2c78f 100644 --- a/src/world/common/SetCamera0MoveFlag1.inc.c +++ b/src/world/common/SetCamera0MoveFlag1.inc.c @@ -4,6 +4,6 @@ ApiStatus N(SetCamera0MoveFlag1)(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; - camera->moveFlags |= 1; + camera->moveFlags |= CAMERA_MOVE_FLAGS_1; return ApiStatus_DONE2; } diff --git a/src/world/common/UnkFunc13.inc.c b/src/world/common/UnkFunc13.inc.c index 9207abc66e..a5dd77ef4c 100644 --- a/src/world/common/UnkFunc13.inc.c +++ b/src/world/common/UnkFunc13.inc.c @@ -12,7 +12,7 @@ void N(UnkFunc13)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* t if (script->functionTemp[1] <= 0) { script->functionTemp[1] = aiSettings->unk_14; if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { script->functionTemp[0] = 10; diff --git a/src/world/common/UnkFunc14.inc.c b/src/world/common/UnkFunc14.inc.c index 6a488f8e7e..5baa70d73f 100644 --- a/src/world/common/UnkFunc14.inc.c +++ b/src/world/common/UnkFunc14.inc.c @@ -7,7 +7,7 @@ void N(UnkFunc14)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* t s32 var; if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); ai_enemy_play_sound(npc, 0x2F4, 0x200000); if (!(enemy->npcSettings->unk_2A & 1)) { diff --git a/src/world/common/UnkFunc15.inc.c b/src/world/common/UnkFunc15.inc.c index 72e200a954..bdabf79fc2 100644 --- a/src/world/common/UnkFunc15.inc.c +++ b/src/world/common/UnkFunc15.inc.c @@ -7,7 +7,7 @@ ApiStatus N(UnkFunc15)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi s32 var; if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim.w = enemy->animList[0]; npc->duration = 25; script->functionTemp[0] = 14; diff --git a/src/world/common/UnkFunc4.inc.c b/src/world/common/UnkFunc4.inc.c index 3fea84e661..5234497821 100644 --- a/src/world/common/UnkFunc4.inc.c +++ b/src/world/common/UnkFunc4.inc.c @@ -41,7 +41,7 @@ void N(UnkFunc4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* te if (enemy->varTable[9] <= 0) { if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; ai_enemy_play_sound(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { diff --git a/src/world/common/UnkFunc5.inc.c b/src/world/common/UnkFunc5.inc.c index 49781dc863..98f93c3373 100644 --- a/src/world/common/UnkFunc5.inc.c +++ b/src/world/common/UnkFunc5.inc.c @@ -27,5 +27,5 @@ void N(UnkFunc5)(Npc* npc, Enemy* enemy, Evt* script, NpcAISettings* aiSettings) enemy->varTable[3] = ((posW * 100.0) + 0.5); enemy->varTable[7] = ((posY * 100.0) + 0.5); script->functionTemp[1] = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; + enemy->unk_B0 |= ENEMY_AI_FLAGS_10; } diff --git a/src/world/common/UnkFunc54.inc.c b/src/world/common/UnkFunc54.inc.c index 5415fa5baf..8b85a37c99 100644 --- a/src/world/common/UnkFunc54.inc.c +++ b/src/world/common/UnkFunc54.inc.c @@ -29,7 +29,7 @@ ApiStatus N(UnkFunc54)(Evt* script, s32 isInitialCall) { npc->unk_AB = npc->collisionHeight / 2; } - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; @@ -39,8 +39,8 @@ ApiStatus N(UnkFunc54)(Evt* script, s32 isInitialCall) { enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_200000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_40; - if (enemy->unk_B0 & 4) { - enemy->unk_B0 &= ~4; + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } diff --git a/src/world/common/UnkFunc57.inc.c b/src/world/common/UnkFunc57.inc.c index 9a6728826e..96a1133b5e 100644 --- a/src/world/common/UnkFunc57.inc.c +++ b/src/world/common/UnkFunc57.inc.c @@ -11,7 +11,7 @@ ApiStatus N(UnkFunc57)(Evt* script, s32 isInitialCall) { f32 t1; f32 t2; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc1->duration = 0; npc1->flags |= NPC_FLAG_200000 | NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; @@ -19,8 +19,8 @@ ApiStatus N(UnkFunc57)(Evt* script, s32 isInitialCall) { ENEMY_FLAGS_200000 | ENEMY_FLAGS_40; npc1->scale.x = 0.4f; npc1->scale.y = 0.4f; - if (enemy->unk_B0 & 4) { - enemy->unk_B0 &= ~4; + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } diff --git a/src/world/common/UnkFunc61.inc.c b/src/world/common/UnkFunc61.inc.c index 724d380c8b..54e7d819e6 100644 --- a/src/world/common/UnkFunc61.inc.c +++ b/src/world/common/UnkFunc61.inc.c @@ -24,10 +24,10 @@ s32 N(UnkFunc61)(Evt* script) { if (fabsf(t1) > 75.0 || (2.0 * npc->collisionHeight <= fabsf(npc->pos.y - gPlayerStatusPtr->position.y))) { return -1; } - if (gPartnerActionStatus.actionState.b[3] == 9) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { return -1; } - if (gPartnerActionStatus.actionState.b[3] == 7) { + if (gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { return -1; } diff --git a/src/world/common/UnkFunc7.inc.c b/src/world/common/UnkFunc7.inc.c index e42cabfaf8..c8b1e409b4 100644 --- a/src/world/common/UnkFunc7.inc.c +++ b/src/world/common/UnkFunc7.inc.c @@ -9,7 +9,7 @@ ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall) { f32 posX, posZ; s32 func; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->flags |= 0x102; @@ -17,8 +17,8 @@ ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall) { npc->pos.x = 0.0f; npc->pos.y = -1000.0f; npc->pos.z = 0.0f; - if (enemy->unk_B0 & 4) { - enemy->unk_B0 &= ~4; + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } } diff --git a/src/world/common/UnkFunc8.inc.c b/src/world/common/UnkFunc8.inc.c index ff0c8be8f1..65501a6712 100644 --- a/src/world/common/UnkFunc8.inc.c +++ b/src/world/common/UnkFunc8.inc.c @@ -18,7 +18,7 @@ void N(UnkFunc8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* te npc->yaw = clamp_angle(npc->yaw + 180.0f); npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->duration = 15; script->functionTemp[0] = 0x28; } diff --git a/src/world/common/UnkNpcAIFunc11.inc.c b/src/world/common/UnkNpcAIFunc11.inc.c index 405d504099..a05147d3d8 100644 --- a/src/world/common/UnkNpcAIFunc11.inc.c +++ b/src/world/common/UnkNpcAIFunc11.inc.c @@ -9,7 +9,7 @@ void N(UnkNpcAIFunc11)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (func_800490B4(arg2, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 1) == 0) { s32 something; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &something); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &something); npc->currentAnim.w = enemy->animList[0]; npc->duration = 25; script->functionTemp[0] = 14; diff --git a/src/world/common/UnkNpcAIFunc26.inc.c b/src/world/common/UnkNpcAIFunc26.inc.c index d2a3e1d0d8..b4d1760ae2 100644 --- a/src/world/common/UnkNpcAIFunc26.inc.c +++ b/src/world/common/UnkNpcAIFunc26.inc.c @@ -28,11 +28,11 @@ s32 N(UnkNpcAIFunc26)(Evt* script) { ret = FALSE; } - if (gPartnerActionStatus.actionState.b[3] == 9) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { ret = FALSE; } - if (gPartnerActionStatus.actionState.b[3] == 7) { + if (gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { ret = FALSE; } diff --git a/src/world/common/UnkNpcAIFunc27.inc.c b/src/world/common/UnkNpcAIFunc27.inc.c index 96a5b15c0d..c91ed9d4f4 100644 --- a/src/world/common/UnkNpcAIFunc27.inc.c +++ b/src/world/common/UnkNpcAIFunc27.inc.c @@ -18,7 +18,7 @@ ApiStatus N(UnkNpcAIFunc27)(Evt *script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -28,10 +28,10 @@ ApiStatus N(UnkNpcAIFunc27)(Evt *script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } diff --git a/src/world/common/UnkNpcAIFunc28.inc.c b/src/world/common/UnkNpcAIFunc28.inc.c index fab48f4e33..fe603bf4b0 100644 --- a/src/world/common/UnkNpcAIFunc28.inc.c +++ b/src/world/common/UnkNpcAIFunc28.inc.c @@ -18,7 +18,7 @@ ApiStatus N(UnkNpcAIFunc28)(Evt *script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -28,10 +28,10 @@ ApiStatus N(UnkNpcAIFunc28)(Evt *script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~0x200) | 0x8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } diff --git a/src/world/common/UnkNpcAIFunc30.inc.c b/src/world/common/UnkNpcAIFunc30.inc.c index 9d29551e45..29f6a2d7f1 100644 --- a/src/world/common/UnkNpcAIFunc30.inc.c +++ b/src/world/common/UnkNpcAIFunc30.inc.c @@ -10,7 +10,7 @@ void N(UnkNpcAIFunc30)(Evt *script, NpcAISettings* aiSettings, EnemyTerritoryThi npc->duration--; if (npc->duration == 0) { if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) == 0) { - fx_emote(2, npc, 0, npc->collisionHeight, 1, 2, -20, 15, &retVal); + fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1, 2, -20, 15, &retVal); } npc->duration = 0; script->functionTemp[0] = 0; diff --git a/src/world/common/UnkNpcAIFunc32.inc.c b/src/world/common/UnkNpcAIFunc32.inc.c index 516b28cd8b..48b925b08d 100644 --- a/src/world/common/UnkNpcAIFunc32.inc.c +++ b/src/world/common/UnkNpcAIFunc32.inc.c @@ -9,7 +9,7 @@ void N(UnkNpcAIFunc32)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { ai_enemy_play_sound(npc, 802, 0); - fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); ai_enemy_play_sound(npc, 756, 0x200000); npc->currentAnim.w = enemy->animList[8]; npc->duration = enemy->varTable[8]; diff --git a/src/world/common/UnkNpcAIFunc33.inc.c b/src/world/common/UnkNpcAIFunc33.inc.c index dc69da3760..1777b0d48c 100644 --- a/src/world/common/UnkNpcAIFunc33.inc.c +++ b/src/world/common/UnkNpcAIFunc33.inc.c @@ -18,7 +18,7 @@ void N(UnkNpcAIFunc33)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi enemy->varTable[0] = 4; npc->duration = 8; npc->currentAnim.w = enemy->animList[0]; - fx_emote(3, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); + fx_emote(EMOTE_FRUSTRATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); script->functionTemp[0] = 13; } } diff --git a/src/world/common/UnkNpcAIFunc34.inc.c b/src/world/common/UnkNpcAIFunc34.inc.c index b68133fc20..41c603be13 100644 --- a/src/world/common/UnkNpcAIFunc34.inc.c +++ b/src/world/common/UnkNpcAIFunc34.inc.c @@ -11,7 +11,7 @@ void N(UnkNpcAIFunc34)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi f32 temp_f6; if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->currentAnim.w = enemy->animList[0]; npc->duration = 30; script->functionTemp[0] = 20; diff --git a/src/world/common/UnkNpcAIFunc35.inc.c b/src/world/common/UnkNpcAIFunc35.inc.c index 92de0f1492..855253e386 100644 --- a/src/world/common/UnkNpcAIFunc35.inc.c +++ b/src/world/common/UnkNpcAIFunc35.inc.c @@ -97,7 +97,7 @@ void N(UnkNpcAIFunc35)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi { s32 emoteTemp; - fx_emote(0, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &emoteTemp); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &emoteTemp); npc->moveToPos.y = npc->pos.y; ai_enemy_play_sound(npc, 0x2F4, 0x200000); diff --git a/src/world/common/UnkNpcAIFunc37.inc.c b/src/world/common/UnkNpcAIFunc37.inc.c index 6e8f548d6e..223748dd72 100644 --- a/src/world/common/UnkNpcAIFunc37.inc.c +++ b/src/world/common/UnkNpcAIFunc37.inc.c @@ -14,7 +14,7 @@ void N(UnkNpcAIFunc37)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { s32 emoteTemp; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); script->functionTemp[0] = 12; diff --git a/src/world/common/UnkNpcAIFunc38.inc.c b/src/world/common/UnkNpcAIFunc38.inc.c index 6ada4579b8..78bbfbc1a9 100644 --- a/src/world/common/UnkNpcAIFunc38.inc.c +++ b/src/world/common/UnkNpcAIFunc38.inc.c @@ -9,7 +9,7 @@ void N(UnkNpcAIFunc38)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (aiSettings->unk_14 >= 0 && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0) != 0) { s32 emoteTemp; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); script->functionTemp[0] = 12; diff --git a/src/world/common/UnkNpcAIFunc39.inc.c b/src/world/common/UnkNpcAIFunc39.inc.c index 292d13d1dd..f92f42c0a1 100644 --- a/src/world/common/UnkNpcAIFunc39.inc.c +++ b/src/world/common/UnkNpcAIFunc39.inc.c @@ -42,7 +42,7 @@ void N(UnkNpcAIFunc39)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) { s32 emoteTemp; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); npc->duration = 25; script->functionTemp[0] = 14; } diff --git a/src/world/common/UnkNpcAIFunc44.inc.c b/src/world/common/UnkNpcAIFunc44.inc.c index 3dc733ab3c..47f25f778c 100644 --- a/src/world/common/UnkNpcAIFunc44.inc.c +++ b/src/world/common/UnkNpcAIFunc44.inc.c @@ -9,7 +9,7 @@ void N(UnkNpcAIFunc44)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (aiSettings->waitTime >= 0 && (func_800490B4(territory, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 0) != 0)) { s32 emoteTemp; - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); diff --git a/src/world/common/UnkNpcAIFunc45.inc.c b/src/world/common/UnkNpcAIFunc45.inc.c index f87212fecd..6aca37e712 100644 --- a/src/world/common/UnkNpcAIFunc45.inc.c +++ b/src/world/common/UnkNpcAIFunc45.inc.c @@ -12,7 +12,7 @@ void N(UnkNpcAIFunc45)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (func_800490B4(territory, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 0) != 0) { s32 emoteTemp; - fx_emote(0, npc, 0.0f, (f32) npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, (f32) npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); ai_enemy_play_sound(npc, 0x2F4, 0x200000); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); if (enemy->npcSettings->unk_2A & 1) { diff --git a/src/world/common/UnkNpcAIFunc47.inc.c b/src/world/common/UnkNpcAIFunc47.inc.c index 742d641c68..73e9387ce1 100644 --- a/src/world/common/UnkNpcAIFunc47.inc.c +++ b/src/world/common/UnkNpcAIFunc47.inc.c @@ -27,7 +27,7 @@ s32 N(UnkNpcAIFunc47)(Evt* script, f32 arg1, f32 arg2, EnemyTerritoryThing* terr return -1; } - if (gPartnerActionStatus.actionState.b[3] == 9 || gPartnerActionStatus.actionState.b[3] == 7) { + if (gPartnerActionStatus.actingPartner == PARTNER_BOW || gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { return -1; } diff --git a/src/world/common/UnkNpcAIFunc48.inc.c b/src/world/common/UnkNpcAIFunc48.inc.c index c6b51abcd3..b906563225 100644 --- a/src/world/common/UnkNpcAIFunc48.inc.c +++ b/src/world/common/UnkNpcAIFunc48.inc.c @@ -9,7 +9,7 @@ void N(UnkNpcAIFunc48)(Evt* script, f32 arg1, f32 arg2, EnemyTerritoryThing* ter if (func_800490B4(territory, enemy, arg1, arg2, 1) == 0) { s32 sp28; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); npc->currentAnim.w = enemy->animList[0]; npc->duration = 20; script->functionTemp[0] = 33; diff --git a/src/world/common/UnkNpcAIFunc49.inc.c b/src/world/common/UnkNpcAIFunc49.inc.c index a6efd71a97..80233a2d32 100644 --- a/src/world/common/UnkNpcAIFunc49.inc.c +++ b/src/world/common/UnkNpcAIFunc49.inc.c @@ -13,7 +13,7 @@ void N(UnkNpcAIFunc49)(Evt* script) { if (npcID < 0) { s32 sp28; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); npc->currentAnim.w = enemy->animList[0]; } else { Enemy* enemy2; diff --git a/src/world/common/UnkNpcAIFunc8.inc.c b/src/world/common/UnkNpcAIFunc8.inc.c index ca36190a39..127cb577d6 100644 --- a/src/world/common/UnkNpcAIFunc8.inc.c +++ b/src/world/common/UnkNpcAIFunc8.inc.c @@ -14,7 +14,7 @@ void N(UnkNpcAIFunc8)(Evt* script) { if (enemy->varTable[3] >= 8) { s32 something; - fx_emote(3, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, enemy->varTable[3] - 1, &something); + fx_emote(EMOTE_FRUSTRATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, enemy->varTable[3] - 1, &something); } script->functionTemp[0] = 33; } diff --git a/src/world/common/UnkNpcAIMainFunc.inc.c b/src/world/common/UnkNpcAIMainFunc.inc.c index d0700ce273..cc1701eab1 100644 --- a/src/world/common/UnkNpcAIMainFunc.inc.c +++ b/src/world/common/UnkNpcAIMainFunc.inc.c @@ -19,7 +19,7 @@ ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || enemy->unk_B0 & 4) { + if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -30,10 +30,10 @@ ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall) { npc->flags = (npc->flags & ~0x200) | 8; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; diff --git a/src/world/common/UnkNpcAIMainFunc10.inc.c b/src/world/common/UnkNpcAIMainFunc10.inc.c index 409e588671..e58da2f8bf 100644 --- a/src/world/common/UnkNpcAIMainFunc10.inc.c +++ b/src/world/common/UnkNpcAIMainFunc10.inc.c @@ -25,11 +25,11 @@ ApiStatus N(UnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall) { } npc->unk_AB = -2; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } switch (script->functionTemp[0]) { diff --git a/src/world/common/UnkNpcAIMainFunc2.inc.c b/src/world/common/UnkNpcAIMainFunc2.inc.c index c058cebebb..66a170b308 100644 --- a/src/world/common/UnkNpcAIMainFunc2.inc.c +++ b/src/world/common/UnkNpcAIMainFunc2.inc.c @@ -28,18 +28,18 @@ ApiStatus N(UnkNpcAIMainFunc2)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; - enemy->unk_B0 |= 0x18; + enemy->unk_B0 |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; } } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } switch (script->functionTemp[0]) { diff --git a/src/world/common/UnkNpcAIMainFunc4.inc.c b/src/world/common/UnkNpcAIMainFunc4.inc.c index afe7768a5f..db16d0903d 100644 --- a/src/world/common/UnkNpcAIMainFunc4.inc.c +++ b/src/world/common/UnkNpcAIMainFunc4.inc.c @@ -18,7 +18,7 @@ ApiStatus N(UnkNpcAIMainFunc4)(Evt* script, s32 isInitialCall) { territory.unk_18 = 65.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; enemy->varTable[0] = npc->yaw; @@ -33,10 +33,10 @@ ApiStatus N(UnkNpcAIMainFunc4)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 15; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; diff --git a/src/world/common/UnkNpcAIMainFunc5.inc.c b/src/world/common/UnkNpcAIMainFunc5.inc.c index 849aa9bfda..07f955ea7f 100644 --- a/src/world/common/UnkNpcAIMainFunc5.inc.c +++ b/src/world/common/UnkNpcAIMainFunc5.inc.c @@ -23,10 +23,10 @@ ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { enemy->varTable[6] = npc->collisionHeight; enemy->varTable[8] = 0; enemy->unk_B5 = 0; - enemy->unk_B0 |= 8; + enemy->unk_B0 |= ENEMY_AI_FLAGS_8; } - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; enemy->unk_07 = 0; @@ -43,13 +43,13 @@ ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { s32 emoteTemp; script->functionTemp[0] = 99; script->functionTemp[1] = 0; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->unk_B0 &= ~4; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; diff --git a/src/world/common/UnkNpcAIMainFunc6.inc.c b/src/world/common/UnkNpcAIMainFunc6.inc.c index c9e3974219..b60f3861f7 100644 --- a/src/world/common/UnkNpcAIMainFunc6.inc.c +++ b/src/world/common/UnkNpcAIMainFunc6.inc.c @@ -24,7 +24,7 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { if (isInitialCall) { enemy->varTable[6] = npc->collisionHeight; - enemy->unk_B0 |= 8; + enemy->unk_B0 |= ENEMY_AI_FLAGS_8; } if (isInitialCall || (enemy->varTable[10] == 100)) { @@ -42,10 +42,10 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { npc->pos.z = 0.0f; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { npc->duration = 0; npc->collisionHeight = enemy->varTable[6]; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { npc->currentAnim.w = 0x4A0018; npc->moveSpeed = 0.0f; @@ -55,7 +55,7 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { } else { s32 emoteTemp; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); npc->currentAnim.w = enemy->animList[0]; script->functionTemp[1] = 0; script->functionTemp[0] = 200; diff --git a/src/world/common/UnkNpcAIMainFunc7.inc.c b/src/world/common/UnkNpcAIMainFunc7.inc.c index 19c77022e3..95ffa01add 100644 --- a/src/world/common/UnkNpcAIMainFunc7.inc.c +++ b/src/world/common/UnkNpcAIMainFunc7.inc.c @@ -20,7 +20,7 @@ ApiStatus N(UnkNpcAIMainFunc7)(Evt* script, s32 isInitialCall) { territory.unk_18 = 40.0f; territory.unk_1C = 0; - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim.w = enemy->animList[0]; @@ -34,14 +34,14 @@ ApiStatus N(UnkNpcAIMainFunc7)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; enemy->flags &= ~ENEMY_FLAGS_40000000; } diff --git a/src/world/common/UnkNpcAIMainFunc8.inc.c b/src/world/common/UnkNpcAIMainFunc8.inc.c index 16d6929e30..3e126ece81 100644 --- a/src/world/common/UnkNpcAIMainFunc8.inc.c +++ b/src/world/common/UnkNpcAIMainFunc8.inc.c @@ -21,10 +21,10 @@ ApiStatus N(UnkNpcAIMainFunc8)(Evt* script, s32 isInitialCall) { if (isInitialCall) { enemy->varTable[6] = npc->collisionHeight; - enemy->unk_B0 |= 8; + enemy->unk_B0 |= ENEMY_AI_FLAGS_8; } - if (isInitialCall || (enemy->unk_B0 & 4)) { + if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { npc->duration = 0; script->functionTemp[0] = 0; enemy->unk_07 = 0; @@ -42,13 +42,13 @@ ApiStatus N(UnkNpcAIMainFunc8)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { s32 emoteTemp; script->functionTemp[0] = 99; script->functionTemp[1] = 0; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->unk_B0 &= ~4; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; diff --git a/src/world/common/UnkNpcAIMainFunc9.inc.c b/src/world/common/UnkNpcAIMainFunc9.inc.c index d0909638af..e936ad0d00 100644 --- a/src/world/common/UnkNpcAIMainFunc9.inc.c +++ b/src/world/common/UnkNpcAIMainFunc9.inc.c @@ -25,11 +25,11 @@ ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall) { npc->unk_AB = -2; - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return ApiStatus_BLOCK; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } switch (script->functionTemp[0]) { diff --git a/src/world/common/UnkNpcDurationFlagFunc.inc.c b/src/world/common/UnkNpcDurationFlagFunc.inc.c index fd7c63f525..6d7adb579f 100644 --- a/src/world/common/UnkNpcDurationFlagFunc.inc.c +++ b/src/world/common/UnkNpcDurationFlagFunc.inc.c @@ -7,7 +7,7 @@ void N(UnkNpcDurationFlagFunc)(Evt* script, NpcAISettings* aiSettings, EnemyTerr npc->duration--; if (npc->duration == 0) { - if (enemy->unk_B0 & 0x80) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_80) { script->functionTemp[0] = 15; } else { script->functionTemp[0] = 0; diff --git a/src/world/common/UnsetCamera0MoveFlag1.inc.c b/src/world/common/UnsetCamera0MoveFlag1.inc.c index a2bfffadf0..a3cc161b0e 100644 --- a/src/world/common/UnsetCamera0MoveFlag1.inc.c +++ b/src/world/common/UnsetCamera0MoveFlag1.inc.c @@ -4,6 +4,6 @@ ApiStatus N(UnsetCamera0MoveFlag1)(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; - camera->moveFlags &= ~1; + camera->moveFlags &= ~CAMERA_MOVE_FLAGS_1; return ApiStatus_DONE2; } diff --git a/src/world/common/WaitForPlayerToLand.inc.c b/src/world/common/WaitForPlayerToLand.inc.c index dbd5618095..457a8e68c8 100644 --- a/src/world/common/WaitForPlayerToLand.inc.c +++ b/src/world/common/WaitForPlayerToLand.inc.c @@ -3,7 +3,7 @@ ApiStatus N(WaitForPlayerToLand)(Evt* script, s32 isInitialCall) { script->varTable[0] = 0; - if ((gPartnerActionStatus.actionState.b[0] != 0) && (gPartnerActionStatus.actionState.b[3] == 3)) { + if ((gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) && (gPartnerActionStatus.actingPartner == PARTNER_BOMBETTE)) { script->varTable[0] = 1; } return ApiStatus_DONE2; diff --git a/src/world/common/atomic/DarkRoom.inc.c b/src/world/common/atomic/DarkRoom.inc.c index 5fd2c07e41..af0b1e2f84 100644 --- a/src/world/common/atomic/DarkRoom.inc.c +++ b/src/world/common/atomic/DarkRoom.inc.c @@ -11,7 +11,7 @@ ApiStatus N(DarkRoomUpdate)(Evt* script, s32 isInitialCall) { set_screen_overlay_center_worldpos(1, 1, playerStatus->position.x, playerStatus->position.y + 8.0f, playerStatus->position.z); - if (gPartnerActionStatus.actionState.b[0] != 0) { + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { if (playerData->currentPartner == PARTNER_WATT) { if (script->functionTemp[1] == 0) { script->functionTemp[1] = 1; diff --git a/src/world/common/atomic/SuperBlock.inc.c b/src/world/common/atomic/SuperBlock.inc.c index 750b47013f..c0f2eedee8 100644 --- a/src/world/common/atomic/SuperBlock.inc.c +++ b/src/world/common/atomic/SuperBlock.inc.c @@ -380,7 +380,7 @@ ApiStatus N(SuperBlock_PartnerSparkles4)(Evt* script, s32 isInitialCall) { ApiStatus N(SuperBlock_WaitForPlayerToLand)(Evt* script, s32 isInitialCall) { script->varTable[0] = FALSE; - if ((gPartnerActionStatus.actionState.b[0] != 0) && (gPartnerActionStatus.actionState.b[3] == 3)) { + if ((gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) && (gPartnerActionStatus.actingPartner == PARTNER_BOMBETTE)) { script->varTable[0] = TRUE; } return ApiStatus_DONE2; diff --git a/src/world/common/atomic/enemy/BulletBill.inc.c b/src/world/common/atomic/enemy/BulletBill.inc.c index c9dd44f3b1..a31e327afc 100644 --- a/src/world/common/atomic/enemy/BulletBill.inc.c +++ b/src/world/common/atomic/enemy/BulletBill.inc.c @@ -16,18 +16,18 @@ ApiStatus N(BulletBill_Think)(Evt* script, s32 isInitialCall) { if (isInitialCall || enemy->varTable[0] == 0x64) { script->functionTemp[0] = 0; npc->duration = 0; - enemy->unk_B0 |= 8; + enemy->unk_B0 |= ENEMY_AI_FLAGS_8; enemy->flags |= 0x200000; npc->flags |= 0x40000; enemy->varTable[0] = 0; enemy->varTable[1] = -1; } - if (enemy->unk_B0 & 4) { + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { if (enemy->unk_B4 != 0) { return 0; } - enemy->unk_B0 &= ~4; + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; } switch (script->functionTemp[0]) { diff --git a/src/world/common/atomic/enemy/MontyMoleAI.inc.c b/src/world/common/atomic/enemy/MontyMoleAI.inc.c new file mode 100644 index 0000000000..700bec37d5 --- /dev/null +++ b/src/world/common/atomic/enemy/MontyMoleAI.inc.c @@ -0,0 +1,288 @@ +#include "common.h" +#include "npc.h" +#include "sprite/npc/monty_mole.h" + +// ensure state handlers conform to expected signature +static AIStateHandler N(MontyMoleAI_Init); +static AIStateHandler N(MontyMoleAI_Wander); +static AIStateHandler N(MontyMoleAI_PreSurface); +static AIStateHandler N(MontyMoleAI_Surface); +static AIStateHandler N(MontyMoleAI_DrawRock); +static AIStateHandler N(MontyMoleAI_ThrowRock); +static AIStateHandler N(MontyMoleAI_PreBurrow); +static AIStateHandler N(MontyMoleAI_Burrow); + +enum AiStateMontyMole { + AI_STATE_MOLE_INIT = 0, // choose random heading and duration for next state + AI_STATE_MOLE_WANDER = 1, // wander around 'underground' + AI_STATE_MOLE_PRE_SURFACE = 12, // delay before emerging from underground + AI_STATE_MOLE_SURFACE = 13, // emerge from underground + AI_STATE_MOLE_DRAW_ROCK = 14, // pull out a rock, can either attack or cancel + AI_STATE_MOLE_THROW_ROCK = 15, // throw the rock + AI_STATE_MOLE_UNUSED = 16, + AI_STATE_MOLE_PRE_BURROW = 20, // delay before burrowing back underground + AI_STATE_MOLE_BURROW = 21, // burrow underground +}; + +#define MONTY_MOLE_UNK_NPC_FLAGS 0x1F100000 + +static s32 N(MontyMoleAI_CanAttack)(Evt* script, EnemyTerritoryThing* territory, f32 radius, f32 arg3) { + Camera* cam; + Enemy* enemy; + Npc* npc; + f32 angle; + s32 retVal; + + enemy = script->owner1.enemy; + npc = get_npc_unsafe(enemy->npcID); + cam = &gCameras[gCurrentCamID]; + retVal = func_800490B4(territory, enemy, radius * 1.1, arg3, 0) != 0; + // check npc facing angle for sight of player + angle = 270.0f; + if (clamp_angle(get_clamped_angle_diff(cam->currentYaw, npc->yaw)) < 180.0) { + angle = 90.0f; + } + if (fabsf(get_clamped_angle_diff(angle, atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z))) > 60.0) { + retVal = FALSE; + } + // check for overlap with player + if (get_xz_dist_to_player(npc->pos.x, npc->pos.z) < gPlayerStatusPtr->colliderDiameter + npc->collisionRadius) { + retVal = FALSE; + } + // check player elevation difference + if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { + retVal = FALSE; + } + // check for bow hiding + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { + retVal = FALSE; + } + return retVal; +} + +static void N(MontyMoleAI_Init)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->moveTime / 2) + rand_int((aiSettings->moveTime / 2) + 1); + npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); + if (enemy->territory->wander.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } + enemy->flags |= MONTY_MOLE_UNK_NPC_FLAGS; + npc->flags |= NPC_FLAG_2; + script->functionTemp[1] = 0; + script->functionTemp[0] = AI_STATE_MOLE_WANDER; +} + +static void N(MontyMoleAI_Wander)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Npc dummyNpc; + f32 hitDepth; + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + } + dummyNpc.pos.x = npc->pos.x; + dummyNpc.pos.y = npc->pos.y + 1.0f; + dummyNpc.pos.z = npc->pos.z; + npc_move_heading(&dummyNpc, npc->moveSpeed + npc->collisionRadius, npc->yaw); + hitDepth = 1000.0f; + if (npc_raycast_down_sides(0, &dummyNpc.pos.x, &dummyNpc.pos.y, &dummyNpc.pos.z, &hitDepth) && (hitDepth < 5.0f)) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + if (npc->flags & NPC_FLAG_4000) { + script->functionTemp[0] = AI_STATE_MOLE_INIT; + } + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->unk_14; + if (N(MontyMoleAI_CanAttack)(script, territory, aiSettings->alertRadius, aiSettings->unk_10.f)) { + npc->duration = 0; + script->functionTemp[0] = AI_STATE_MOLE_PRE_SURFACE; + return; + } + } + script->functionTemp[1]--; + } + if (!(npc->flags & (NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_1000))) { + npc->homePos.x = npc->pos.x; + npc->homePos.z = npc->pos.z; + } + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[0] = AI_STATE_MOLE_INIT; + } +} + +static void N(MontyMoleAI_PreSurface)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); + ai_enemy_play_sound(npc, SOUND_MOLE_SURFACE, 0); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_10; // emerge from ground + npc->duration = 10; + script->functionTemp[0] = AI_STATE_MOLE_SURFACE; +} + +static void N(MontyMoleAI_Surface)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 2) { + enemy->flags &= ~MONTY_MOLE_UNK_NPC_FLAGS; + } + if (npc->duration <= 0) { + npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_18; // get and throw rock + npc->duration = 10; + script->functionTemp[0] = AI_STATE_MOLE_DRAW_ROCK; + } +} + +static void N(MontyMoleAI_DrawRock)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Npc* npc; + s32 emoteOut; + + npc = get_npc_unsafe(script->owner1.enemy->npcID); + npc->duration--; + if ((npc->duration) <= 0) { + if (!N(MontyMoleAI_CanAttack)(script, territory, aiSettings->alertRadius * 1.1, aiSettings->unk_10.f)) { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteOut); + npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_1; // cancel attack + npc->duration = 30; + script->functionTemp[0] = AI_STATE_MOLE_PRE_BURROW; + } else { + npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_1B; // throw rock + npc->duration = 15; + script->functionTemp[0] = AI_STATE_MOLE_THROW_ROCK; + } + } +} + +static void N(MontyMoleAI_ThrowRock)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* moleEnemy; + Enemy* rockEnemy; + Npc* moleNpc; + + moleEnemy = script->owner1.enemy; + moleNpc = get_npc_unsafe(moleEnemy->npcID); + moleNpc->duration--; + if (moleNpc->duration == 13) { + rockEnemy = get_enemy(moleEnemy->npcID + 1); + rockEnemy->varTable[4] = moleEnemy->npcID; + rockEnemy->varTable[0] = 1; + } + if (moleNpc->duration < 8) { + if (dist2D(moleNpc->pos.x, moleNpc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) > 100.0) { + moleNpc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_15; // clap + } + } + if (moleNpc->duration <= 0) { + if (moleNpc->currentAnim.w != NPC_ANIM_monty_mole_Palette_00_Anim_15) { + moleNpc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_1; + } + moleNpc->duration = 15; + script->functionTemp[0] = AI_STATE_MOLE_PRE_BURROW; + } +} + +static void N(MontyMoleAI_PreBurrow)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + ai_enemy_play_sound(npc, SOUND_MOLE_DIG, 0); + npc->duration = 11; + npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_11; // retreat into ground + script->functionTemp[0] = AI_STATE_MOLE_BURROW; + } +} + +static void N(MontyMoleAI_Burrow)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 3) { + enemy->flags |= MONTY_MOLE_UNK_NPC_FLAGS; + } + if (npc->duration <= 0) { + npc->flags |= NPC_FLAG_2; + script->functionTemp[0] = AI_STATE_MOLE_INIT; + } +} + +ApiStatus N(MontyMoleAI_Main)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing tempTerritory; + EnemyTerritoryThing* territory = &tempTerritory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory->unk_00 = 0; + territory->shape = enemy->territory->wander.detectShape; + territory->pointX = enemy->territory->wander.detect.x; + territory->pointZ = enemy->territory->wander.detect.z; + territory->sizeX = enemy->territory->wander.detectSizeX; + territory->sizeZ = enemy->territory->wander.detectSizeZ; + territory->unk_18 = 65.0f; + territory->unk_1C = 0; + + if (isInitialCall) { + script->functionTemp[0] = AI_STATE_MOLE_INIT; + npc->duration = 0; + npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT); + enemy->unk_B0 |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); + } + + if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + if (enemy->unk_B4 == 0) { + enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + } else { + return ApiStatus_BLOCK; + } + } + + switch (script->functionTemp[0]) { + case AI_STATE_MOLE_INIT: + N(MontyMoleAI_Init)(script, aiSettings, territory); + // fallthrough + case AI_STATE_MOLE_WANDER: + N(MontyMoleAI_Wander)(script, aiSettings, territory); + return ApiStatus_BLOCK; + case AI_STATE_MOLE_PRE_SURFACE: + N(MontyMoleAI_PreSurface)(script, aiSettings, territory); + // fallthrough + case AI_STATE_MOLE_SURFACE: + N(MontyMoleAI_Surface)(script, aiSettings, territory); + if (script->functionTemp[0] != AI_STATE_MOLE_DRAW_ROCK) { + return ApiStatus_BLOCK; + } // else fallthrough + case AI_STATE_MOLE_DRAW_ROCK: + N(MontyMoleAI_DrawRock)(script, aiSettings, territory); + if (script->functionTemp[0] != AI_STATE_MOLE_THROW_ROCK) { + return ApiStatus_BLOCK; + } // else fallthrough + case AI_STATE_MOLE_THROW_ROCK: + N(MontyMoleAI_ThrowRock)(script, aiSettings, territory); + if (script->functionTemp[0] != AI_STATE_MOLE_UNUSED) { + return ApiStatus_BLOCK; + } // else fallthrough + case AI_STATE_MOLE_PRE_BURROW: + N(MontyMoleAI_PreBurrow)(script, aiSettings, territory); + return ApiStatus_BLOCK; + case AI_STATE_MOLE_BURROW: + N(MontyMoleAI_Burrow)(script, aiSettings, territory); + return ApiStatus_BLOCK; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c b/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c index 2359aa6657..76e5f7554a 100644 --- a/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c +++ b/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c @@ -1,3 +1,6 @@ + +// used with UnkAI 5, 6, and 8 +// all functions only used here #include "world/common/set_script_owner_npc_anim.inc.c" #include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index 31ca9bc39f..f3c9272a51 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -45,13 +45,13 @@ void func_802BD100_317E50(Npc* npc) { } if (!(angle >= 360.0f)) { - if (D_8010C978 >= 0 && (D_8010C978 & 0x4000) != 0) { - entity_interacts_with_current_partner(D_8010C978 & ~0x4000); + if (D_8010C978 >= 0 && (D_8010C978 & COLLISION_WITH_ENTITY_BIT) != 0) { + entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); } } } else { - if (D_8010C978 >= 0 && (D_8010C978 & 0x4000) != 0) { - entity_interacts_with_current_partner(D_8010C978 & ~0x4000); + if (D_8010C978 >= 0 && (D_8010C978 & COLLISION_WITH_ENTITY_BIT) != 0) { + entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); } } } @@ -181,7 +181,7 @@ void func_802BD6DC_31842C(Npc* npc) { } s32 world_bombette_can_use_ability(void) { - if (gPartnerActionStatus.actionState.b[0] != 0) { + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { D_802BE934 = 1; return FALSE; } @@ -189,7 +189,7 @@ s32 world_bombette_can_use_ability(void) { } s32 world_bombette_can_player_pause(void) { - return gPartnerActionStatus.actionState.b[0] == 0; + return gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE; } ApiStatus func_802BD758_3184A8(Evt* evt, s32 isInitialCall); @@ -270,7 +270,7 @@ void world_bombette_pre_battle(Npc* bombette) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* bombetteActionStatus = &gPartnerActionStatus; - if (bombetteActionStatus->actionState.b[0] != 0) { + if (bombetteActionStatus->partnerActionState != PARTNER_ACTION_NONE) { if (D_802BE92C) { enable_player_input(); } @@ -283,8 +283,8 @@ void world_bombette_pre_battle(Npc* bombette) { set_action_state(ACTION_STATE_IDLE); partner_clear_player_tracking(bombette); - bombetteActionStatus->actionState.b[0] = 0; - bombetteActionStatus->actionState.b[3] = 0; + bombetteActionStatus->partnerActionState = 0; + bombetteActionStatus->actingPartner = 0; bombette->pos.x = playerStatus->position.x; bombette->pos.y = playerStatus->position.y; diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 0f1d2f1e9b..8b5dc7c7a1 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -240,8 +240,8 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { D_802BE0C0 = TRUE; bow->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_GRAVITY); - partnerActionStatus->actionState.b[0] = 1; - partnerActionStatus->actionState.b[3] = 9; + partnerActionStatus->partnerActionState = 1; + partnerActionStatus->actingPartner = 9; playerStatus->flags |= PLAYER_STATUS_FLAGS_8000; func_800EF4E0(); bow->moveToPos.x = playerStatus->position.x; @@ -373,8 +373,8 @@ void func_802BDDF0_324740(Npc* bow) { } set_action_state(actionState); - partnerActionStatus->actionState.b[0] = 0; - partnerActionStatus->actionState.b[3] = 0; + partnerActionStatus->partnerActionState = 0; + partnerActionStatus->actingPartner = 0; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100; partner_clear_player_tracking(bow); D_802BE0C0 = FALSE; @@ -407,8 +407,8 @@ void world_bow_pre_battle(Npc* bow) { enable_player_input(); set_action_state(ACTION_STATE_IDLE); partner_clear_player_tracking(bow); - partnerActionStatus->actionState.b[0] = 0; - partnerActionStatus->actionState.b[3] = 0; + partnerActionStatus->partnerActionState = 0; + partnerActionStatus->actingPartner = 0; D_802BE0C0 = FALSE; bow->flags &= ~NPC_FLAG_2; } diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 7dd29ee376..fbac57f680 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -164,7 +164,7 @@ s32 world_goombario_can_pause(Npc* goombario) { PartnerActionStatus* goombarioActionStatus = &gPartnerActionStatus; s32 new_var; - if (goombarioActionStatus->actionState.b[0] != 0) { + if (goombarioActionStatus->partnerActionState != PARTNER_ACTION_NONE) { return FALSE; } @@ -191,8 +191,8 @@ ApiStatus func_802BDB30_317A50(Evt* script, s32 isInitialCall) { enable_player_input(); } - goombarioActionStatus->actionState.b[0] = 0; - goombarioActionStatus->actionState.b[3] = 0; + goombarioActionStatus->partnerActionState = PARTNER_ACTION_NONE; + goombarioActionStatus->actingPartner = PARTNER_NONE; return ApiStatus_DONE2; } @@ -234,15 +234,15 @@ EvtScript world_goombario_put_away = { void world_goombario_pre_battle(Npc* goombario) { PartnerActionStatus* goombarioActionStatus = &gPartnerActionStatus; - if (goombarioActionStatus->actionState.b[0] != 0) { + if (goombarioActionStatus->partnerActionState != PARTNER_ACTION_NONE) { set_time_freeze_mode(TIME_FREEZE_NORMAL); enable_player_input(); cancel_current_message(); partner_clear_player_tracking(goombario); - goombarioActionStatus->actionState.b[0] = 0; - goombarioActionStatus->actionState.b[3] = 0; + goombarioActionStatus->partnerActionState = PARTNER_ACTION_NONE; + goombarioActionStatus->actingPartner = PARTNER_NONE; disable_npc_blur(goombario); } - goombarioActionStatus->actionState.b[3] = 1; + goombarioActionStatus->actingPartner = PARTNER_GOOMBARIO; } diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 0d2aac3639..242c86a699 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -30,16 +30,16 @@ s32 func_802BD100_31B120(Npc* npc) { return 0; } - if (!(D_8010C978 & 0x4000)) { + if (!(D_8010C978 & COLLISION_WITH_ENTITY_BIT)) { return 0; } - return entity_interacts_with_current_partner(D_8010C978 & ~0x4000); + return entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); } void func_802BD144_31B164(Npc* kooper) { - if (D_8010C978 >= 0 && D_8010C978 & 0x4000) { - entity_interacts_with_current_partner(D_8010C978 & ~0x4000); + if (D_8010C978 >= 0 && D_8010C978 & COLLISION_WITH_ENTITY_BIT) { + entity_interacts_with_current_partner(D_8010C978 & ~COLLISION_WITH_ENTITY_BIT); } } @@ -206,17 +206,14 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { if (D_802BEC54 == 0) { tempVar = playerStatus->actionState; - if (tempVar == 0 || tempVar == 1 || tempVar == 2) { + if (tempVar == ACTION_STATE_IDLE || tempVar == ACTION_STATE_WALK || tempVar == ACTION_STATE_RUN) { script->functionTemp[0] = 20; } else { return ApiStatus_DONE2; } - - } - - else if (partnerActionStatus->actionState.b[0] == 0) { - partnerActionStatus->actionState.b[0] = 1; - partnerActionStatus->actionState.b[3] = 2; + } else if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) { + partnerActionStatus->partnerActionState = PARTNER_ACTION_KOOPER_1; + partnerActionStatus->actingPartner = PARTNER_KOOPER; script->functionTemp[0] = 5; kooper->currentAnim.w = 0x20009; D_802BEC50 = 30; @@ -235,8 +232,8 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { D_802BEC6C = 0; kooper->flags &= ~0xA08; kooper->flags |= 0x140; - partnerActionStatus->actionState.b[3] = 2; - partnerActionStatus->actionState.b[0] = 1; + partnerActionStatus->actingPartner = PARTNER_KOOPER; + partnerActionStatus->partnerActionState = PARTNER_ACTION_KOOPER_1; D_802BEC58 = func_800EF4E0(); enable_npc_blur(kooper); kooper->duration = 4; @@ -308,9 +305,9 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { } case 2: - if ((u8)playerStatus->actionState == 0x15 || - (u8)playerStatus->actionState == 0x16 || - (u8)playerStatus->actionState == 0x17) { + if ((u8)playerStatus->actionState == ACTION_STATE_HIT_FIRE || + (u8)playerStatus->actionState == ACTION_STATE_KNOCKBACK || + (u8)playerStatus->actionState == ACTION_STATE_HIT_LAVA) { script->functionTemp[0] = 0; } else { kooper->jumpVelocity -= kooper->jumpScale; @@ -337,8 +334,8 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { if (!(kooper->jumpVelocity > 0.0f) && (playerStatus->position.y < kooper->moveToPos.z)) { D_802BEC5C = 0; kooper->flags &= ~ACTOR_FLAG_100; - partnerActionStatus->actionState.b[3] = 2; - partnerActionStatus->actionState.b[0] = 2; + partnerActionStatus->actingPartner = PARTNER_KOOPER; + partnerActionStatus->partnerActionState = PARTNER_ACTION_KOOPER_2; kooper->rotation.z = 0.0f; kooper->planarFlyDist = 0.0f; kooper->moveSpeed = 8.0f; @@ -576,8 +573,8 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { D_802BEB40_31CB60 = 0; kooper->flags |= NPC_FLAG_100; kooper->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40); - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; kooper->jumpVelocity = 0.0f; kooper->collisionHeight = 24; kooper->currentAnim.w = 0x20000 | 4; @@ -685,8 +682,8 @@ void world_kooper_pre_battle(Npc* kooper) { PartnerActionStatus* kooperActionStatus = &gPartnerActionStatus; D_802BEC54 = 0; - if (kooperActionStatus->actionState.b[0] != 0) { - if (kooperActionStatus->actionState.b[0] == 2) { + if (kooperActionStatus->partnerActionState != PARTNER_ACTION_NONE) { + if (kooperActionStatus->partnerActionState == PARTNER_ACTION_KOOPER_2) { D_802BEC54 = 1; } @@ -707,8 +704,8 @@ void world_kooper_pre_battle(Npc* kooper) { partner_clear_player_tracking(kooper); disable_npc_blur(kooper); - kooperActionStatus->actionState.b[3] = 0; - kooperActionStatus->actionState.b[0] = 0; + kooperActionStatus->actingPartner = PARTNER_NONE; + kooperActionStatus->partnerActionState = PARTNER_ACTION_NONE; } } diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index b31caeb4b1..c9716fce79 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -224,7 +224,7 @@ s32 func_802BD7DC(void) { //TODO find better match if (outLength <= 16.0f && colliderTypeID >= 0) { - if (!(colliderTypeID & 0x4000) || !(get_entity_type(colliderTypeID) - 0x2E < 2)){ + if (!(colliderTypeID & COLLISION_WITH_ENTITY_BIT) || !(get_entity_type(colliderTypeID) - 0x2E < 2)){ colliderTypeID = get_collider_type_by_id(colliderTypeID) & 0xFF; if (colliderTypeID - 1 >= 3U) { ret = FALSE; @@ -389,7 +389,7 @@ void func_802BDDD8_321928(Npc* npc) { if (npc_test_move_taller_with_slipping(npc->collisionChannel, &x, &y, &z, npc->collisionRadius, npc->yaw, npc->collisionHeight, npc->collisionRadius) != 0) { - collisionStatus->unk_0A = (partnerActionStatus->pressedButtons & 0x8000) ? D_8010C97A : -1; + collisionStatus->currentInspect = (partnerActionStatus->pressedButtons & 0x8000) ? D_8010C97A : -1; } if (moveSpeed != 0.0f) { @@ -563,7 +563,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { D_802BFF14 = 40; } - if (partnerActionStatus->actionState.b[1] == 0) { + if (partnerActionStatus->partnerAction_unk_1 == 0) { if (gGameStatusPtr->keepUsingPartnerOnMapChange == FALSE) { if (playerStatus->actionState == ACTION_STATE_RIDE || playerStatus->actionState == ACTION_STATE_IDLE || @@ -577,7 +577,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } } } else { - partnerActionStatus->actionState.b[1] = 0; + partnerActionStatus->partnerAction_unk_1 = 0; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100; npc->flags &= ~(NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT); npc->flags |= NPC_FLAG_100; @@ -587,8 +587,8 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { D_802BFF0C = 1; npc->flags &= ~(NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT); npc->flags |= (NPC_FLAG_100 | NPC_FLAG_400000); - partnerActionStatus->actionState.b[3] = 8; - partnerActionStatus->actionState.b[0] = 1; + partnerActionStatus->actingPartner = PARTNER_LAKILESTER; + partnerActionStatus->partnerActionState = PARTNER_ACTION_LAKILESTER_1; gGameStatusPtr->keepUsingPartnerOnMapChange = 0; npc->pos.x = playerStatus->position.x; npc->pos.y = npc->moveToPos.y; @@ -742,8 +742,8 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { set_action_state(ACTION_STATE_RIDE); suggest_player_anim_setUnkFlag(0x8000E); disable_player_shadow(); - partnerActionStatus->actionState.b[3] = 8; - partnerActionStatus->actionState.b[0] = 1; + partnerActionStatus->actingPartner = PARTNER_LAKILESTER; + partnerActionStatus->partnerActionState = PARTNER_ACTION_LAKILESTER_1; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100; gGameStatusPtr->keepUsingPartnerOnMapChange = 0; D_802BFF18 = 0; @@ -835,7 +835,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { D_802BFF14++; /* fallthrough */ case 5: - gCameras[0].moveFlags |= 1; + gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_1; playerStatus->position.y += npc->jumpVelocity; sp2C = playerStatus->colliderHeight * 0.5f; @@ -878,8 +878,8 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { gGameStatusPtr->keepUsingPartnerOnMapChange = 0; if (playerStatus->flags & PLAYER_STATUS_FLAGS_800) { - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; if (D_802BFF04 != 0) { D_802BFF04 = 0; @@ -900,8 +900,8 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { if (D_802BFF14 == 11) { npc->flags &= ~(NPC_FLAG_40 | NPC_FLAG_400000 | NPC_FLAG_ENABLE_HIT_SCRIPT); - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100; if (D_802BFF04 != 0) { D_802BFF04 = 0; @@ -1009,8 +1009,8 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { enable_player_shadow(); if (playerStatus->flags & PLAYER_STATUS_FLAGS_800) { - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; if (D_802BFF04) { D_802BFF04 = FALSE; enable_player_input(); @@ -1033,8 +1033,8 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { D_802BFF00++; break; case 4: - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100; if (D_802BFF04) { @@ -1066,27 +1066,27 @@ void world_lakilester_pre_battle(Npc* npc) { if (D_802BFF0C) { partnerActionStatus->npc = *npc; - partnerActionStatus->actionState.b[1] = 1; + partnerActionStatus->partnerAction_unk_1 = 1; enable_player_static_collisions(); enable_player_input(); set_action_state(ACTION_STATE_IDLE); partner_clear_player_tracking(npc); } - partnerActionStatus->actionState.b[3] = 8; + partnerActionStatus->actingPartner = PARTNER_LAKILESTER; D_802BFF18 = 0; } void world_lakilester_post_battle(Npc* npc) { PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; - if (partnerActionStatus->actionState.b[1] != 0) { + if (partnerActionStatus->partnerAction_unk_1 != 0) { if (D_802BFF0C) { *npc = partnerActionStatus->npc; gGameStatusPtr->keepUsingPartnerOnMapChange = 1; set_action_state(ACTION_STATE_RIDE); - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; disable_player_input(); partner_use_ability(); } @@ -1173,10 +1173,10 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) { if (script->functionTemp[1] == 0) { if (script->varTable[12] != 0) { - partnerActionStatus->actionState.b[1] = tempVar; + partnerActionStatus->partnerAction_unk_1 = tempVar; set_action_state(ACTION_STATE_RIDE); - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; partner_use_ability(); enable_player_static_collisions(); enable_player_input(); diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 93e077feb7..304c753bad 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -178,7 +178,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { if (isInitialCall) { func_802BD514_319A84(parakarry); if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_100000)) { - if (partnerActionStatus->actionState.b[1] == 0) { + if (partnerActionStatus->partnerAction_unk_1 == 0) { if (func_800EA52C(4) == 0) { return ApiStatus_DONE2; } @@ -186,14 +186,14 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { parakarry->flags &= ~NPC_FLAG_4000; parakarry->flags |= NPC_FLAG_NO_PROJECT_SHADOW; } else { - partnerActionStatus->actionState.b[1] = 0; + partnerActionStatus->partnerAction_unk_1 = 0; set_action_state(ACTION_STATE_RIDE); parakarry->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_GRAVITY); D_802BEBB0 = 1; - gCameras[0].moveFlags |= 1; + gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_1; parakarry->currentAnim.w = 0x40009; - partnerActionStatus->actionState.b[3] = 4; - partnerActionStatus->actionState.b[0] = 1; + partnerActionStatus->actingPartner = PARTNER_PARAKARRY; + partnerActionStatus->partnerActionState = PARTNER_ACTION_PARAKARRY_HOVER; parakarry->flags &= ~NPC_FLAG_4000; parakarry->flags |= NPC_FLAG_NO_PROJECT_SHADOW; } @@ -234,11 +234,11 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { D_802BEBB4 = 1; D_802BEBB8 = 1; D_802BEBB0 = 1; - gCameras[0].moveFlags |= 1; + gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_1; parakarry->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_GRAVITY); parakarry->flags |= NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; - partnerActionStatus->actionState.b[3] = 4; - partnerActionStatus->actionState.b[0] = 1; + partnerActionStatus->actingPartner = PARTNER_PARAKARRY; + partnerActionStatus->partnerActionState = PARTNER_ACTION_PARAKARRY_HOVER; D_802BEBBC = func_800EF4E0(); enable_npc_blur(parakarry); parakarry->yaw = atan2(parakarry->pos.x, parakarry->pos.z, playerStatus->position.x, playerStatus->position.z); @@ -489,7 +489,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { func_8003D660(parakarry, 0), parakarry->pos.y = y, (!tempConditional))) { if (!phys_adjust_cam_on_landing()) { - gCameras[0].moveFlags &= ~0x2; + gCameras[0].moveFlags &= ~CAMERA_MOVE_FLAGS_2; } gCameras->targetPos.x = playerStatus->position.x; gCameras->targetPos.y = playerStatus->position.y; @@ -539,8 +539,8 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { parakarry->flags &= ~ACTOR_FLAG_HP_OFFSET_BELOW; parakarry->animationSpeed = 1.0f; partner_clear_player_tracking(parakarry); - partnerActionStatus->actionState.b[3] = 0; - partnerActionStatus->actionState.b[0] = 0; + partnerActionStatus->actingPartner = PARTNER_NONE; + partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; enable_partner_ai(); sfx_stop_sound(SOUND_2009); if (D_802BEBB4 != 0) { @@ -605,17 +605,17 @@ void world_parakarry_pre_battle(Npc* parakarry) { set_action_state(ACTION_STATE_IDLE); parakarryActionStatus->npc = *parakarry; - parakarryActionStatus->actionState.b[1] = 1; + parakarryActionStatus->partnerAction_unk_1 = 1; partner_clear_player_tracking(parakarry); } - parakarryActionStatus->actionState.b[3] = 4; + parakarryActionStatus->actingPartner = PARTNER_PARAKARRY; } void world_parakarry_post_battle(Npc* parakarry) { PartnerActionStatus* parakarryActionStatus = &gPartnerActionStatus; - if (parakarryActionStatus->actionState.b[1] != 0) { + if (parakarryActionStatus->partnerAction_unk_1 != 0) { if (D_802BEBB8) { disable_player_static_collisions(); } @@ -625,8 +625,8 @@ void world_parakarry_post_battle(Npc* parakarry) { set_action_state(ACTION_STATE_RIDE); *parakarry = parakarryActionStatus->npc; - parakarryActionStatus->actionState.b[3] = 0; - parakarryActionStatus->actionState.b[0] = 0; + parakarryActionStatus->actingPartner = PARTNER_NONE; + parakarryActionStatus->partnerActionState = PARTNER_ACTION_NONE; partner_clear_player_tracking(parakarry); partner_use_ability(); } diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index ff61f3641c..fef1c09ec9 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -265,20 +265,20 @@ void world_sushie_pre_battle(Npc* sushie) { if (D_802BFEEC) { sushieActionStatus->npc = *sushie; - sushieActionStatus->actionState.b[1] = 1; + sushieActionStatus->partnerAction_unk_1 = 1; enable_player_static_collisions(); enable_player_input(); set_action_state(ACTION_STATE_IDLE); partner_clear_player_tracking(sushie); } - sushieActionStatus->actionState.b[3] = 7; + sushieActionStatus->actingPartner = PARTNER_SUSHIE; } void world_sushie_post_battle(Npc* sushie) { PartnerActionStatus* sushieActionStatus = &gPartnerActionStatus; - if (sushieActionStatus->actionState.b[1] != 0) { + if (sushieActionStatus->partnerAction_unk_1 != 0) { *sushie = sushieActionStatus->npc; partner_use_ability(); } diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c index 2a223cb582..4b988e8fbe 100644 --- a/src/world/partner/watt.c +++ b/src/world/partner/watt.c @@ -97,7 +97,7 @@ ApiStatus WattUpdate(Evt* script, s32 isInitialCall) { f32 sinAngle, cosAngle, liftoffVelocity; Entity* entity; - if (gPartnerActionStatus.actionState.b[1] == 0) { + if (gPartnerActionStatus.partnerAction_unk_1 == 0) { if (isInitialCall) { partner_flying_enable(watt, 1); mem_clear(WattTweesterPhysicsPtr, sizeof(TweesterPhysics)); @@ -232,8 +232,8 @@ s32 WattPutAway(Evt* script, s32 isInitialCall) { func_802BD180_31CCF0(); partner_init_put_away(watt); force_player_anim(0x10002); - wattActionStatus->actionState.b[3] = 0; - wattActionStatus->actionState.b[0] = 0; + wattActionStatus->actingPartner = PARTNER_NONE; + wattActionStatus->partnerActionState = PARTNER_ACTION_NONE; playerStatus->animFlags &= ~(PLAYER_STATUS_ANIM_FLAGS_2 | PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT); gGameStatusPtr->keepUsingPartnerOnMapChange = 0; } @@ -256,7 +256,7 @@ void world_watt_pre_battle(Npc* watt) { if (D_802BE30C != 0) { wattActionStatus->npc = *watt; - wattActionStatus->actionState.b[1] = 1; + wattActionStatus->partnerAction_unk_1 = 1; partner_clear_player_tracking(watt); } @@ -266,7 +266,7 @@ void world_watt_pre_battle(Npc* watt) { void world_watt_post_battle(Npc* watt) { PartnerActionStatus* wattActionStatus = &gPartnerActionStatus; - if (wattActionStatus->actionState.b[1]) { + if (wattActionStatus->partnerAction_unk_1) { *watt = wattActionStatus->npc; partner_use_ability(); func_802BD100_31CC70(watt); @@ -301,8 +301,8 @@ ApiStatus func_802BDE88_31D9F8(Evt* script, s32 isInitialCall) { watt->flags |= NPC_FLAG_100; playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_2 | PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT; gGameStatusPtr->keepUsingPartnerOnMapChange = 1; - wattActionStatus->actionState.b[0] = 1; - wattActionStatus->actionState.b[3] = 6; + wattActionStatus->partnerActionState = PARTNER_ACTION_WATT_SHINE; + wattActionStatus->actingPartner = PARTNER_WATT; D_802BE308 = 0; script->functionTemp[0] += 1; break; @@ -345,7 +345,7 @@ void func_802BE070_31DBE0(void) { f32 spriteFacingAngle; s32 phi_v1; - if (gPartnerActionStatus.actionState.b[0] != 0) { + if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { spriteFacingAngle = gPlayerStatusPtr->spriteFacingAngle; if ((spriteFacingAngle < 90.0f) || (spriteFacingAngle > 270.0f)) { if (!(gPlayerStatusPtr->trueAnimation & NPC_FLAG_1000000)) { diff --git a/src/world/partners.c b/src/world/partners.c index 831ae7eebf..a5b7d605c7 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -351,7 +351,7 @@ s32 use_consumable(s32 invSlot) { D_8010CD20 = invSlot; invSlot = gPlayerData.invItems[invSlot]; dma_copy(UseItemDmaArgs[0], UseItemDmaArgs[1], _3251D0_VRAM); - script = start_script(UseItemDmaArgs[2], 1, 0); + script = start_script(UseItemDmaArgs[2], EVT_PRIORITY_1, 0); script->varTable[10] = invSlot; return script->id; } @@ -365,7 +365,7 @@ s32 func_800EA4B0(s32 collisionID) { s32 ret = TRUE; if (collisionID >= 0) { - if (collisionID & 0x4000) { + if (collisionID & COLLISION_WITH_ENTITY_BIT) { switch (get_entity_type(collisionID)) { case ENTITY_TYPE_BLUE_SWITCH: case ENTITY_TYPE_RED_SWITCH: @@ -394,7 +394,7 @@ s32 func_800EA4B0(s32 collisionID) { } s32 partner_is_idle(Npc* partner) { - return gPartnerActionStatus.actionState.b[0] == 0; + return gPartnerActionStatus.partnerActionState == PARTNER_ACTION_NONE; } s32 world_partner_can_player_pause_default(Npc* partner) { @@ -512,8 +512,8 @@ void partner_init_after_battle(s32 arg0) { if (D_8010CFD8 != arg0) { D_8010CFE0 = 1; D_8010CFE4 = arg0; - actionStatus->actionState.b[0] = 0; - actionStatus->actionState.b[1] = 0; + actionStatus->partnerActionState = 0; + actionStatus->partnerAction_unk_1 = 0; if (D_8010CFD8 != 0 && arg0 != 0) { D_8010CFE8 = 2; @@ -587,7 +587,7 @@ void partner_reset_data(void) { D_8010CFD8 = currentPartner; if (gGameStatusPtr->keepUsingPartnerOnMapChange != 0) { - gPartnerActionStatus.actionState.b[0] = 1; + gPartnerActionStatus.partnerActionState = 1; gGameStatusPtr->keepUsingPartnerOnMapChange = 0; } @@ -614,12 +614,12 @@ void partner_initialize_data(void) { D_8010CFE0 = 0; D_8010CFE8 = 0; D_8010CFC4 = 0; - actionStatus->actionState.b[3] = 0; + actionStatus->actingPartner = 0; actionStatus->inputDisabled = 0; - actionStatus->actionState.b[1] = 0; - actionStatus->actionState.b[0] = 0; + actionStatus->partnerAction_unk_1 = 0; + actionStatus->partnerActionState = 0; actionStatus->unk_358 = 0; - actionStatus->actionState.b[2] = 0; + actionStatus->partnerAction_unk_2 = 0; wPartner = NULL; wSavedPartnerPosX = 0; wSavedPartnerPosY = 0; @@ -665,17 +665,17 @@ void partner_handle_after_battle(void) { kill_script_by_ID(wPartnerCurrentScriptID); } - wPartnerCurrentScript = start_script(wPartner->update, 20, 0x20); + wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_20); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = 0xA; + wPartnerCurrentScript->groupFlags = (EVT_GROUP_02 | EVT_GROUP_08); D_8010CFE8 = 1; - if (playerData->currentPartner != PARTNER_WATT && actionStatus->actionState.b[3] == 6) { - gPlayerStatusPtr->animFlags &= ~1; - gPlayerStatusPtr->animFlags &= ~2; - actionStatus->actionState.b[3] = 0; + if (playerData->currentPartner != PARTNER_WATT && actionStatus->actingPartner == PARTNER_WATT) { + gPlayerStatusPtr->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT; + gPlayerStatusPtr->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_2; + actionStatus->actingPartner = PARTNER_NONE; } if (wPartner->postBattle != NULL) { @@ -787,12 +787,12 @@ void partner_walking_update_motion(Npc* partner) { PartnerActionStatus* actionStatus = &gPartnerActionStatus; if (gGameStatusPtr->unk_81 == 0 || playerStatus->flags & (PLAYER_STATUS_FLAGS_INPUT_DISABLED | PLAYER_STATUS_FLAGS_1000) - || actionStatus->inputDisabled != 0 || actionStatus->actionState.b[2] != 0) { + || actionStatus->inputDisabled != 0 || actionStatus->partnerAction_unk_2 != 0) { if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_800)) { partner_walking_follow_player(partner); } if (actionStatus->pressedButtons & (BUTTON_Z | BUTTON_B | BUTTON_C_LEFT | BUTTON_C_DOWN)) { - actionStatus->actionState.b[2] = 0; + actionStatus->partnerAction_unk_2 = 0; } } diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 97cdff1854..2d3bfbee26 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -81,7 +81,7 @@ EvtScript D_80284054_7E4ED4 = { s32 shop_owner_begin_speech(s32 messageIndex) { Shop* shop = gGameStatusPtr->mapShop; s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex]; - Evt* script = start_script(&ShopBeginSpeech, 1, 0); + Evt* script = start_script(&ShopBeginSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; @@ -111,7 +111,7 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo set_message_msg(phi_a0, 2); } - script = start_script(&ShopBeginSpeech, 1, 0); + script = start_script(&ShopBeginSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; script->varTable[2] = shop->owner->talkAnim; @@ -123,7 +123,7 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo s32 shop_owner_continue_speech(s32 messageIndex) { Shop* shop = gGameStatusPtr->mapShop; s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex]; - Evt* script = start_script(&ShopContinueSpeech, 1, 0); + Evt* script = start_script(&ShopContinueSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; @@ -149,7 +149,7 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) { set_message_msg(phi_a0, 1); - script = start_script(&ShopContinueSpeech, 1, 0); + script = start_script(&ShopContinueSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; script->varTable[2] = shop->owner->talkAnim; @@ -161,7 +161,7 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) { s32 shop_owner_reset_speech(s32 messageIndex) { Shop* shop = gGameStatusPtr->mapShop; s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex]; - Evt* script = start_script(&ShopResetSpeech, 1, 0); + Evt* script = start_script(&ShopResetSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; @@ -173,7 +173,7 @@ s32 shop_owner_reset_speech(s32 messageIndex) { s32 shop_owner_end_speech(void) { Shop* shop = gGameStatusPtr->mapShop; - Evt* script = start_script(&ShopEndSpeech, 1, 0); + Evt* script = start_script(&ShopEndSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shop->owner->npcID; script->varTable[1] = shop->owner->talkAnim; @@ -220,7 +220,7 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { disable_player_input(); disable_player_static_collisions(); - childScript = start_script(&BadgeShopInteract, 1, 0); + childScript = start_script(&BadgeShopInteract, EVT_PRIORITY_1, 0); childScript->varTable[0] = currentItemSlot; D_80286520 = childScript; D_80286524 = childScript->id; @@ -337,7 +337,7 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { if (shopOwner != NULL) { shopOwnerScriptSource = shopOwner->onBuyEvt; if (shopOwnerScriptSource != NULL) { - shopOwnerScript = start_script(shopOwnerScriptSource, 1, 0); + shopOwnerScript = start_script(shopOwnerScriptSource, EVT_PRIORITY_1, 0); D_8028652C = shopOwnerScript; shopOwnerScript->varTable[2] = shopItemSlot; shopOwnerScript->varTable[0] = D_80286534; @@ -729,7 +729,7 @@ ApiStatus ShowShopOwnerDialog(Evt* script, s32 isInitialCall) { case 10: if (shop->owner != NULL) { if (shop->owner->onTalkEvt != 0) { - start_script(shop->owner->onTalkEvt, 1, 0); + start_script(shop->owner->onTalkEvt, EVT_PRIORITY_1, 0); } } open_status_menu_short(); diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c index 9ce27b7b8d..9e31bc922f 100644 --- a/src/world/script_api/7E4690.c +++ b/src/world/script_api/7E4690.c @@ -6,7 +6,7 @@ ApiStatus CheckRideScriptForEnterExit(Evt* script, s32 isInitialCall) { script->varTable[10] = 0; if (partner_get_ride_script() != NULL) { - if (gPartnerActionStatus.actionState.b[0] == ACTION_STATE_IDLE) { + if (gPartnerActionStatus.partnerActionState == ACTION_STATE_IDLE) { script->varTable[10] = 0; } else { script->varTable[10] = 1; diff --git a/src/world/world.c b/src/world/world.c index 3db087d36a..6912d94687 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -185,7 +185,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { initialize_status_menu(); gGameStatusPtr->unk_90 = 1000; gGameStatusPtr->unk_92 = 1000; - gGameStatusPtr->mainScriptID = start_script_in_group(mapConfig->main, 0, 0, 0)->id; + gGameStatusPtr->mainScriptID = start_script_in_group(mapConfig->main, EVT_PRIORITY_0, 0, 0)->id; } s32 get_current_map_config(void) { diff --git a/ver/us/asm/data/EF58E0.data.s b/ver/us/asm/data/EF58E0.data.s index b5f83b90ab..ac21b32598 100644 --- a/ver/us/asm/data/EF58E0.data.s +++ b/ver/us/asm/data/EF58E0.data.s @@ -48,7 +48,7 @@ dlabel D_802445A0_EF6BB0 .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_802445D0_EF6BE0 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x00000043, 0x00000002, func_8024299C_EF4FAC, D_802445A0_EF6BB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x00000043, 0x00000002, EF2680_DeadUnkNpcAIMainFunc6, D_802445A0_EF6BB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244640_EF6C50 .word 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x00000064, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x800499B0, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s b/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s index 77f4be1a19..8998c264ae 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s @@ -9,7 +9,7 @@ dlabel D_80243FF0_9136A0 .word 0x3FD9999A, 0x0000005A, 0x00000000, 0x42DC0000, 0x00000000, 0x00000002, 0x40F00000, 0x00000000, 0x00000000, 0x42DC0000, 0x00000000, 0x00000001 dlabel D_80244020_9136D0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00200002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000000F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000002, func_80241D70_911420, D_80243FF0_9136A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00200002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000000F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000002, iwa_01_MontyMoleAI_Main, D_80243FF0_9136A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802440A8_913758 .word 0x00000000, 0x00140018, 0x00000000, 0x00000000, D_80244020_9136D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080008 diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s index f4948817aa..fb5f18fa3a 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s @@ -12,7 +12,7 @@ dlabel D_80241B18_AF9468 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CAC_AF95FC -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_915A68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E30_AF9780 .word 0x0000005D, 0x0000005E, 0x0000005F, 0x00000061, 0x00000060, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066 diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s b/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s deleted file mode 100644 index 1cf11e0ae1..0000000000 --- a/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s +++ /dev/null @@ -1,637 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245468_EF7A78 -.double 180.0 - -.section .text - -glabel func_8024299C_EF4FAC -/* EF4FAC 8024299C 27BDFF68 */ addiu $sp, $sp, -0x98 -/* EF4FB0 802429A0 AFB5007C */ sw $s5, 0x7c($sp) -/* EF4FB4 802429A4 0080A82D */ daddu $s5, $a0, $zero -/* EF4FB8 802429A8 AFBF0080 */ sw $ra, 0x80($sp) -/* EF4FBC 802429AC AFB40078 */ sw $s4, 0x78($sp) -/* EF4FC0 802429B0 AFB30074 */ sw $s3, 0x74($sp) -/* EF4FC4 802429B4 AFB20070 */ sw $s2, 0x70($sp) -/* EF4FC8 802429B8 AFB1006C */ sw $s1, 0x6c($sp) -/* EF4FCC 802429BC AFB00068 */ sw $s0, 0x68($sp) -/* EF4FD0 802429C0 F7B60090 */ sdc1 $f22, 0x90($sp) -/* EF4FD4 802429C4 F7B40088 */ sdc1 $f20, 0x88($sp) -/* EF4FD8 802429C8 8EB20148 */ lw $s2, 0x148($s5) -/* EF4FDC 802429CC 86440008 */ lh $a0, 8($s2) -/* EF4FE0 802429D0 0C00F92F */ jal dead_get_npc_unsafe -/* EF4FE4 802429D4 00A0802D */ daddu $s0, $a1, $zero -/* EF4FE8 802429D8 8EA3000C */ lw $v1, 0xc($s5) -/* EF4FEC 802429DC 02A0202D */ daddu $a0, $s5, $zero -/* EF4FF0 802429E0 8C650000 */ lw $a1, ($v1) -/* EF4FF4 802429E4 0C0B53A3 */ jal dead_evt_get_variable -/* EF4FF8 802429E8 0040882D */ daddu $s1, $v0, $zero -/* EF4FFC 802429EC AFA00028 */ sw $zero, 0x28($sp) -/* EF5000 802429F0 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF5004 802429F4 8C630030 */ lw $v1, 0x30($v1) -/* EF5008 802429F8 AFA3002C */ sw $v1, 0x2c($sp) -/* EF500C 802429FC 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF5010 80242A00 8C63001C */ lw $v1, 0x1c($v1) -/* EF5014 80242A04 AFA30030 */ sw $v1, 0x30($sp) -/* EF5018 80242A08 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF501C 80242A0C 8C630024 */ lw $v1, 0x24($v1) -/* EF5020 80242A10 AFA30034 */ sw $v1, 0x34($sp) -/* EF5024 80242A14 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF5028 80242A18 8C630028 */ lw $v1, 0x28($v1) -/* EF502C 80242A1C AFA30038 */ sw $v1, 0x38($sp) -/* EF5030 80242A20 8E4300D0 */ lw $v1, 0xd0($s2) -/* EF5034 80242A24 3C014282 */ lui $at, 0x4282 -/* EF5038 80242A28 44810000 */ mtc1 $at, $f0 -/* EF503C 80242A2C 8C63002C */ lw $v1, 0x2c($v1) -/* EF5040 80242A30 E7A00040 */ swc1 $f0, 0x40($sp) -/* EF5044 80242A34 A7A00044 */ sh $zero, 0x44($sp) -/* EF5048 80242A38 AFA3003C */ sw $v1, 0x3c($sp) -/* EF504C 80242A3C C6200038 */ lwc1 $f0, 0x38($s1) -/* EF5050 80242A40 E6400108 */ swc1 $f0, 0x108($s2) -/* EF5054 80242A44 C620003C */ lwc1 $f0, 0x3c($s1) -/* EF5058 80242A48 27B40028 */ addiu $s4, $sp, 0x28 -/* EF505C 80242A4C E640010C */ swc1 $f0, 0x10c($s2) -/* EF5060 80242A50 3C0138D1 */ lui $at, 0x38d1 -/* EF5064 80242A54 3421B717 */ ori $at, $at, 0xb717 -/* EF5068 80242A58 44810000 */ mtc1 $at, $f0 -/* EF506C 80242A5C C6220040 */ lwc1 $f2, 0x40($s1) -/* EF5070 80242A60 0040982D */ daddu $s3, $v0, $zero -/* EF5074 80242A64 E6400114 */ swc1 $f0, 0x114($s2) -/* EF5078 80242A68 E6400118 */ swc1 $f0, 0x118($s2) -/* EF507C 80242A6C 12000007 */ beqz $s0, .L80242A8C -/* EF5080 80242A70 E6420110 */ swc1 $f2, 0x110($s2) -/* EF5084 80242A74 8E4200B0 */ lw $v0, 0xb0($s2) -/* EF5088 80242A78 862300A8 */ lh $v1, 0xa8($s1) -/* EF508C 80242A7C 34420008 */ ori $v0, $v0, 8 -/* EF5090 80242A80 AE430084 */ sw $v1, 0x84($s2) -/* EF5094 80242A84 08090AA7 */ j .L80242A9C -/* EF5098 80242A88 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242A8C: -/* EF509C 80242A8C 8E430094 */ lw $v1, 0x94($s2) -/* EF50A0 80242A90 24020064 */ addiu $v0, $zero, 0x64 -/* EF50A4 80242A94 1462001C */ bne $v1, $v0, .L80242B08 -/* EF50A8 80242A98 00000000 */ nop -.L80242A9C: -/* EF50AC 80242A9C 24020064 */ addiu $v0, $zero, 0x64 -/* EF50B0 80242AA0 2404F7FF */ addiu $a0, $zero, -0x801 -/* EF50B4 80242AA4 AEA20070 */ sw $v0, 0x70($s5) -/* EF50B8 80242AA8 A620008E */ sh $zero, 0x8e($s1) -/* EF50BC 80242AAC 8E4300CC */ lw $v1, 0xcc($s2) -/* EF50C0 80242AB0 8E220000 */ lw $v0, ($s1) -/* EF50C4 80242AB4 3C01C47A */ lui $at, 0xc47a -/* EF50C8 80242AB8 44810000 */ mtc1 $at, $f0 -/* EF50CC 80242ABC 8C630000 */ lw $v1, ($v1) -/* EF50D0 80242AC0 00441024 */ and $v0, $v0, $a0 -/* EF50D4 80242AC4 AE220000 */ sw $v0, ($s1) -/* EF50D8 80242AC8 AE230028 */ sw $v1, 0x28($s1) -/* EF50DC 80242ACC 8E420000 */ lw $v0, ($s2) -/* EF50E0 80242AD0 3C030020 */ lui $v1, 0x20 -/* EF50E4 80242AD4 00431025 */ or $v0, $v0, $v1 -/* EF50E8 80242AD8 AE420000 */ sw $v0, ($s2) -/* EF50EC 80242ADC 8E220000 */ lw $v0, ($s1) -/* EF50F0 80242AE0 2403FDFF */ addiu $v1, $zero, -0x201 -/* EF50F4 80242AE4 00431024 */ and $v0, $v0, $v1 -/* EF50F8 80242AE8 34420008 */ ori $v0, $v0, 8 -/* EF50FC 80242AEC AE220000 */ sw $v0, ($s1) -/* EF5100 80242AF0 2402FFFF */ addiu $v0, $zero, -1 -/* EF5104 80242AF4 AE400094 */ sw $zero, 0x94($s2) -/* EF5108 80242AF8 AE420098 */ sw $v0, 0x98($s2) -/* EF510C 80242AFC AE200038 */ sw $zero, 0x38($s1) -/* EF5110 80242B00 E620003C */ swc1 $f0, 0x3c($s1) -/* EF5114 80242B04 AE200040 */ sw $zero, 0x40($s1) -.L80242B08: -/* EF5118 80242B08 8E4200B0 */ lw $v0, 0xb0($s2) -/* EF511C 80242B0C 30420004 */ andi $v0, $v0, 4 -/* EF5120 80242B10 10400030 */ beqz $v0, .L80242BD4 -/* EF5124 80242B14 2403FFFB */ addiu $v1, $zero, -5 -/* EF5128 80242B18 A620008E */ sh $zero, 0x8e($s1) -/* EF512C 80242B1C 96420086 */ lhu $v0, 0x86($s2) -/* EF5130 80242B20 A62200A8 */ sh $v0, 0xa8($s1) -/* EF5134 80242B24 8E4200B0 */ lw $v0, 0xb0($s2) -/* EF5138 80242B28 00431024 */ and $v0, $v0, $v1 -/* EF513C 80242B2C AE4200B0 */ sw $v0, 0xb0($s2) -/* EF5140 80242B30 8E220000 */ lw $v0, ($s1) -/* EF5144 80242B34 30420800 */ andi $v0, $v0, 0x800 -/* EF5148 80242B38 1040000A */ beqz $v0, .L80242B64 -/* EF514C 80242B3C 3C02004A */ lui $v0, 0x4a -/* EF5150 80242B40 3C013F80 */ lui $at, 0x3f80 -/* EF5154 80242B44 44810000 */ mtc1 $at, $f0 -/* EF5158 80242B48 34420018 */ ori $v0, $v0, 0x18 -/* EF515C 80242B4C AE220028 */ sw $v0, 0x28($s1) -/* EF5160 80242B50 24020066 */ addiu $v0, $zero, 0x66 -/* EF5164 80242B54 AE200018 */ sw $zero, 0x18($s1) -/* EF5168 80242B58 AE20001C */ sw $zero, 0x1c($s1) -/* EF516C 80242B5C 08090AF4 */ j .L80242BD0 -/* EF5170 80242B60 E6200014 */ swc1 $f0, 0x14($s1) -.L80242B64: -/* EF5174 80242B64 24040002 */ addiu $a0, $zero, 2 -/* EF5178 80242B68 0220282D */ daddu $a1, $s1, $zero -/* EF517C 80242B6C 0000302D */ daddu $a2, $zero, $zero -/* EF5180 80242B70 862300A8 */ lh $v1, 0xa8($s1) -/* EF5184 80242B74 3C013F80 */ lui $at, 0x3f80 -/* EF5188 80242B78 44810000 */ mtc1 $at, $f0 -/* EF518C 80242B7C 3C014000 */ lui $at, 0x4000 -/* EF5190 80242B80 44811000 */ mtc1 $at, $f2 -/* EF5194 80242B84 3C01C1A0 */ lui $at, 0xc1a0 -/* EF5198 80242B88 44812000 */ mtc1 $at, $f4 -/* EF519C 80242B8C 24020028 */ addiu $v0, $zero, 0x28 -/* EF51A0 80242B90 AFA2001C */ sw $v0, 0x1c($sp) -/* EF51A4 80242B94 44834000 */ mtc1 $v1, $f8 -/* EF51A8 80242B98 00000000 */ nop -/* EF51AC 80242B9C 46804220 */ cvt.s.w $f8, $f8 -/* EF51B0 80242BA0 44074000 */ mfc1 $a3, $f8 -/* EF51B4 80242BA4 27A20048 */ addiu $v0, $sp, 0x48 -/* EF51B8 80242BA8 AFA20020 */ sw $v0, 0x20($sp) -/* EF51BC 80242BAC E7A00010 */ swc1 $f0, 0x10($sp) -/* EF51C0 80242BB0 E7A20014 */ swc1 $f2, 0x14($sp) -/* EF51C4 80242BB4 0C01D444 */ jal dead_fx_emote -/* EF51C8 80242BB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* EF51CC 80242BBC 8E4200CC */ lw $v0, 0xcc($s2) -/* EF51D0 80242BC0 8C420000 */ lw $v0, ($v0) -/* EF51D4 80242BC4 AE220028 */ sw $v0, 0x28($s1) -/* EF51D8 80242BC8 240200C8 */ addiu $v0, $zero, 0xc8 -/* EF51DC 80242BCC AEA00074 */ sw $zero, 0x74($s5) -.L80242BD0: -/* EF51E0 80242BD0 AEA20070 */ sw $v0, 0x70($s5) -.L80242BD4: -/* EF51E4 80242BD4 27A2004C */ addiu $v0, $sp, 0x4c -/* EF51E8 80242BD8 AFA20010 */ sw $v0, 0x10($sp) -/* EF51EC 80242BDC 27A20050 */ addiu $v0, $sp, 0x50 -/* EF51F0 80242BE0 AFA20014 */ sw $v0, 0x14($sp) -/* EF51F4 80242BE4 27A20054 */ addiu $v0, $sp, 0x54 -/* EF51F8 80242BE8 AFA20018 */ sw $v0, 0x18($sp) -/* EF51FC 80242BEC 8E250038 */ lw $a1, 0x38($s1) -/* EF5200 80242BF0 8E26003C */ lw $a2, 0x3c($s1) -/* EF5204 80242BF4 8E270040 */ lw $a3, 0x40($s1) -/* EF5208 80242BF8 0C00BF2F */ jal dead_get_screen_coords -/* EF520C 80242BFC 0000202D */ daddu $a0, $zero, $zero -/* EF5210 80242C00 8EA20070 */ lw $v0, 0x70($s5) -/* EF5214 80242C04 28420064 */ slti $v0, $v0, 0x64 -/* EF5218 80242C08 10400007 */ beqz $v0, .L80242C28 -/* EF521C 80242C0C 00000000 */ nop -/* EF5220 80242C10 8FA2004C */ lw $v0, 0x4c($sp) -/* EF5224 80242C14 24420032 */ addiu $v0, $v0, 0x32 -/* EF5228 80242C18 2C4201A5 */ sltiu $v0, $v0, 0x1a5 -/* EF522C 80242C1C 14400002 */ bnez $v0, .L80242C28 -/* EF5230 80242C20 2402006E */ addiu $v0, $zero, 0x6e -/* EF5234 80242C24 AEA20070 */ sw $v0, 0x70($s5) -.L80242C28: -/* EF5238 80242C28 8EA30070 */ lw $v1, 0x70($s5) -/* EF523C 80242C2C 2402000F */ addiu $v0, $zero, 0xf -/* EF5240 80242C30 1062006B */ beq $v1, $v0, .L80242DE0 -/* EF5244 80242C34 28620010 */ slti $v0, $v1, 0x10 -/* EF5248 80242C38 10400016 */ beqz $v0, .L80242C94 -/* EF524C 80242C3C 24020003 */ addiu $v0, $zero, 3 -/* EF5250 80242C40 10620051 */ beq $v1, $v0, .L80242D88 -/* EF5254 80242C44 28620004 */ slti $v0, $v1, 4 -/* EF5258 80242C48 10400009 */ beqz $v0, .L80242C70 -/* EF525C 80242C4C 24020001 */ addiu $v0, $zero, 1 -/* EF5260 80242C50 10620044 */ beq $v1, $v0, .L80242D64 -/* EF5264 80242C54 28620002 */ slti $v0, $v1, 2 -/* EF5268 80242C58 50400048 */ beql $v0, $zero, .L80242D7C -/* EF526C 80242C5C 02A0202D */ daddu $a0, $s5, $zero -/* EF5270 80242C60 50600027 */ beql $v1, $zero, .L80242D00 -/* EF5274 80242C64 02A0202D */ daddu $a0, $s5, $zero -/* EF5278 80242C68 08090CA5 */ j .L80243294 -/* EF527C 80242C6C 00000000 */ nop -.L80242C70: -/* EF5280 80242C70 2402000D */ addiu $v0, $zero, 0xd -/* EF5284 80242C74 1062004D */ beq $v1, $v0, .L80242DAC -/* EF5288 80242C78 2862000E */ slti $v0, $v1, 0xe -/* EF528C 80242C7C 10400052 */ beqz $v0, .L80242DC8 -/* EF5290 80242C80 2402000C */ addiu $v0, $zero, 0xc -/* EF5294 80242C84 10620046 */ beq $v1, $v0, .L80242DA0 -/* EF5298 80242C88 02A0202D */ daddu $a0, $s5, $zero -/* EF529C 80242C8C 08090CA5 */ j .L80243294 -/* EF52A0 80242C90 00000000 */ nop -.L80242C94: -/* EF52A4 80242C94 24020067 */ addiu $v0, $zero, 0x67 -/* EF52A8 80242C98 10620158 */ beq $v1, $v0, .L802431FC -/* EF52AC 80242C9C 28620068 */ slti $v0, $v1, 0x68 -/* EF52B0 80242CA0 10400009 */ beqz $v0, .L80242CC8 -/* EF52B4 80242CA4 24020065 */ addiu $v0, $zero, 0x65 -/* EF52B8 80242CA8 1062008F */ beq $v1, $v0, .L80242EE8 -/* EF52BC 80242CAC 28620066 */ slti $v0, $v1, 0x66 -/* EF52C0 80242CB0 104000A9 */ beqz $v0, .L80242F58 -/* EF52C4 80242CB4 24020064 */ addiu $v0, $zero, 0x64 -/* EF52C8 80242CB8 1062004F */ beq $v1, $v0, .L80242DF8 -/* EF52CC 80242CBC 24020002 */ addiu $v0, $zero, 2 -/* EF52D0 80242CC0 08090CA5 */ j .L80243294 -/* EF52D4 80242CC4 00000000 */ nop -.L80242CC8: -/* EF52D8 80242CC8 2404006F */ addiu $a0, $zero, 0x6f -/* EF52DC 80242CCC 10640166 */ beq $v1, $a0, .L80243268 -/* EF52E0 80242CD0 28620070 */ slti $v0, $v1, 0x70 -/* EF52E4 80242CD4 10400005 */ beqz $v0, .L80242CEC -/* EF52E8 80242CD8 2402006E */ addiu $v0, $zero, 0x6e -/* EF52EC 80242CDC 10620156 */ beq $v1, $v0, .L80243238 -/* EF52F0 80242CE0 2402001E */ addiu $v0, $zero, 0x1e -/* EF52F4 80242CE4 08090CA5 */ j .L80243294 -/* EF52F8 80242CE8 00000000 */ nop -.L80242CEC: -/* EF52FC 80242CEC 240200C8 */ addiu $v0, $zero, 0xc8 -/* EF5300 80242CF0 10620166 */ beq $v1, $v0, .L8024328C -/* EF5304 80242CF4 00000000 */ nop -/* EF5308 80242CF8 08090CA5 */ j .L80243294 -/* EF530C 80242CFC 00000000 */ nop -.L80242D00: -/* EF5310 80242D00 0260282D */ daddu $a1, $s3, $zero -/* EF5314 80242D04 0C013670 */ jal func_8004D9C0 -/* EF5318 80242D08 0280302D */ daddu $a2, $s4, $zero -/* EF531C 80242D0C 96420086 */ lhu $v0, 0x86($s2) -/* EF5320 80242D10 A62200A8 */ sh $v0, 0xa8($s1) -/* EF5324 80242D14 8E4200A0 */ lw $v0, 0xa0($s2) -/* EF5328 80242D18 10400013 */ beqz $v0, .L80242D68 -/* EF532C 80242D1C 02A0202D */ daddu $a0, $s5, $zero -/* EF5330 80242D20 C620003C */ lwc1 $f0, 0x3c($s1) -/* EF5334 80242D24 44801000 */ mtc1 $zero, $f2 -/* EF5338 80242D28 44801800 */ mtc1 $zero, $f3 -/* EF533C 80242D2C 46000021 */ cvt.d.s $f0, $f0 -/* EF5340 80242D30 4622003E */ c.le.d $f0, $f2 -/* EF5344 80242D34 00000000 */ nop -/* EF5348 80242D38 45000005 */ bc1f .L80242D50 -/* EF534C 80242D3C 2403FDFF */ addiu $v1, $zero, -0x201 -/* EF5350 80242D40 8E220000 */ lw $v0, ($s1) -/* EF5354 80242D44 00431024 */ and $v0, $v0, $v1 -/* EF5358 80242D48 08090B58 */ j .L80242D60 -/* EF535C 80242D4C 34420008 */ ori $v0, $v0, 8 -.L80242D50: -/* EF5360 80242D50 8E220000 */ lw $v0, ($s1) -/* EF5364 80242D54 2403FFF7 */ addiu $v1, $zero, -9 -/* EF5368 80242D58 34420200 */ ori $v0, $v0, 0x200 -/* EF536C 80242D5C 00431024 */ and $v0, $v0, $v1 -.L80242D60: -/* EF5370 80242D60 AE220000 */ sw $v0, ($s1) -.L80242D64: -/* EF5374 80242D64 02A0202D */ daddu $a0, $s5, $zero -.L80242D68: -/* EF5378 80242D68 0260282D */ daddu $a1, $s3, $zero -/* EF537C 80242D6C 0C0136B6 */ jal func_8004DAD8 -/* EF5380 80242D70 0280302D */ daddu $a2, $s4, $zero -/* EF5384 80242D74 08090CA5 */ j .L80243294 -/* EF5388 80242D78 00000000 */ nop -.L80242D7C: -/* EF538C 80242D7C 0260282D */ daddu $a1, $s3, $zero -/* EF5390 80242D80 0C0137D9 */ jal func_8004DF64 -/* EF5394 80242D84 0280302D */ daddu $a2, $s4, $zero -.L80242D88: -/* EF5398 80242D88 02A0202D */ daddu $a0, $s5, $zero -/* EF539C 80242D8C 0260282D */ daddu $a1, $s3, $zero -/* EF53A0 80242D90 0C013809 */ jal func_8004E024 -/* EF53A4 80242D94 0280302D */ daddu $a2, $s4, $zero -/* EF53A8 80242D98 08090CA5 */ j .L80243294 -/* EF53AC 80242D9C 00000000 */ nop -.L80242DA0: -/* EF53B0 80242DA0 0260282D */ daddu $a1, $s3, $zero -/* EF53B4 80242DA4 0C090867 */ jal EF2680_set_script_owner_npc_anim -/* EF53B8 80242DA8 0280302D */ daddu $a2, $s4, $zero -.L80242DAC: -/* EF53BC 80242DAC 02A0202D */ daddu $a0, $s5, $zero -/* EF53C0 80242DB0 0260282D */ daddu $a1, $s3, $zero -/* EF53C4 80242DB4 0C090886 */ jal EF2680_UnkDistFunc -/* EF53C8 80242DB8 0280302D */ daddu $a2, $s4, $zero -/* EF53CC 80242DBC 96420086 */ lhu $v0, 0x86($s2) -/* EF53D0 80242DC0 08090CA5 */ j .L80243294 -/* EF53D4 80242DC4 A62200A8 */ sh $v0, 0xa8($s1) -.L80242DC8: -/* EF53D8 80242DC8 02A0202D */ daddu $a0, $s5, $zero -/* EF53DC 80242DCC 0260282D */ daddu $a1, $s3, $zero -/* EF53E0 80242DD0 0C0908D3 */ jal EF2680_UnkNpcAIFunc12 -/* EF53E4 80242DD4 0280302D */ daddu $a2, $s4, $zero -/* EF53E8 80242DD8 08090CA5 */ j .L80243294 -/* EF53EC 80242DDC 00000000 */ nop -.L80242DE0: -/* EF53F0 80242DE0 02A0202D */ daddu $a0, $s5, $zero -/* EF53F4 80242DE4 0260282D */ daddu $a1, $s3, $zero -/* EF53F8 80242DE8 0C09092C */ jal EF2680_set_script_owner_npc_col_height -/* EF53FC 80242DEC 0280302D */ daddu $a2, $s4, $zero -/* EF5400 80242DF0 08090CA5 */ j .L80243294 -/* EF5404 80242DF4 00000000 */ nop -.L80242DF8: -/* EF5408 80242DF8 8E430094 */ lw $v1, 0x94($s2) -/* EF540C 80242DFC 14620125 */ bne $v1, $v0, .L80243294 -/* EF5410 80242E00 00000000 */ nop -/* EF5414 80242E04 0C010ABD */ jal dead_get_enemy -/* EF5418 80242E08 8E440098 */ lw $a0, 0x98($s2) -/* EF541C 80242E0C 0C00F92F */ jal dead_get_npc_unsafe -/* EF5420 80242E10 84440008 */ lh $a0, 8($v0) -/* EF5424 80242E14 C440000C */ lwc1 $f0, 0xc($v0) -/* EF5428 80242E18 3C018024 */ lui $at, %hi(D_80245468_EF7A78) -/* EF542C 80242E1C D4225468 */ ldc1 $f2, %lo(D_80245468_EF7A78)($at) -/* EF5430 80242E20 46000021 */ cvt.d.s $f0, $f0 -/* EF5434 80242E24 4622003C */ c.lt.d $f0, $f2 -/* EF5438 80242E28 00000000 */ nop -/* EF543C 80242E2C 45000008 */ bc1f .L80242E50 -/* EF5440 80242E30 00000000 */ nop -/* EF5444 80242E34 C4400038 */ lwc1 $f0, 0x38($v0) -/* EF5448 80242E38 3C014028 */ lui $at, 0x4028 -/* EF544C 80242E3C 44811800 */ mtc1 $at, $f3 -/* EF5450 80242E40 44801000 */ mtc1 $zero, $f2 -/* EF5454 80242E44 46000021 */ cvt.d.s $f0, $f0 -/* EF5458 80242E48 08090B9A */ j .L80242E68 -/* EF545C 80242E4C 46220000 */ add.d $f0, $f0, $f2 -.L80242E50: -/* EF5460 80242E50 C4400038 */ lwc1 $f0, 0x38($v0) -/* EF5464 80242E54 3C014028 */ lui $at, 0x4028 -/* EF5468 80242E58 44811800 */ mtc1 $at, $f3 -/* EF546C 80242E5C 44801000 */ mtc1 $zero, $f2 -/* EF5470 80242E60 46000021 */ cvt.d.s $f0, $f0 -/* EF5474 80242E64 46220001 */ sub.d $f0, $f0, $f2 -.L80242E68: -/* EF5478 80242E68 46200020 */ cvt.s.d $f0, $f0 -/* EF547C 80242E6C E6200038 */ swc1 $f0, 0x38($s1) -/* EF5480 80242E70 3C04004A */ lui $a0, 0x4a -/* EF5484 80242E74 C440003C */ lwc1 $f0, 0x3c($v0) -/* EF5488 80242E78 3C014039 */ lui $at, 0x4039 -/* EF548C 80242E7C 44811800 */ mtc1 $at, $f3 -/* EF5490 80242E80 44801000 */ mtc1 $zero, $f2 -/* EF5494 80242E84 46000021 */ cvt.d.s $f0, $f0 -/* EF5498 80242E88 46220000 */ add.d $f0, $f0, $f2 -/* EF549C 80242E8C 34840018 */ ori $a0, $a0, 0x18 -/* EF54A0 80242E90 3C013FF0 */ lui $at, 0x3ff0 -/* EF54A4 80242E94 44811800 */ mtc1 $at, $f3 -/* EF54A8 80242E98 44801000 */ mtc1 $zero, $f2 -/* EF54AC 80242E9C 46200020 */ cvt.s.d $f0, $f0 -/* EF54B0 80242EA0 E620003C */ swc1 $f0, 0x3c($s1) -/* EF54B4 80242EA4 C4400040 */ lwc1 $f0, 0x40($v0) -/* EF54B8 80242EA8 8E220000 */ lw $v0, ($s1) -/* EF54BC 80242EAC 2403FFFD */ addiu $v1, $zero, -3 -/* EF54C0 80242EB0 AE200048 */ sw $zero, 0x48($s1) -/* EF54C4 80242EB4 AE200034 */ sw $zero, 0x34($s1) -/* EF54C8 80242EB8 AE240028 */ sw $a0, 0x28($s1) -/* EF54CC 80242EBC 34420008 */ ori $v0, $v0, 8 -/* EF54D0 80242EC0 00431024 */ and $v0, $v0, $v1 -/* EF54D4 80242EC4 2403FDFF */ addiu $v1, $zero, -0x201 -/* EF54D8 80242EC8 00431024 */ and $v0, $v0, $v1 -/* EF54DC 80242ECC 46000021 */ cvt.d.s $f0, $f0 -/* EF54E0 80242ED0 46220000 */ add.d $f0, $f0, $f2 -/* EF54E4 80242ED4 AE220000 */ sw $v0, ($s1) -/* EF54E8 80242ED8 24020065 */ addiu $v0, $zero, 0x65 -/* EF54EC 80242EDC 46200020 */ cvt.s.d $f0, $f0 -/* EF54F0 80242EE0 E6200040 */ swc1 $f0, 0x40($s1) -/* EF54F4 80242EE4 AEA20070 */ sw $v0, 0x70($s5) -.L80242EE8: -/* EF54F8 80242EE8 8E430094 */ lw $v1, 0x94($s2) -/* EF54FC 80242EEC 24020003 */ addiu $v0, $zero, 3 -/* EF5500 80242EF0 146200E8 */ bne $v1, $v0, .L80243294 -/* EF5504 80242EF4 24020004 */ addiu $v0, $zero, 4 -/* EF5508 80242EF8 AE420094 */ sw $v0, 0x94($s2) -/* EF550C 80242EFC C62C0038 */ lwc1 $f12, 0x38($s1) -/* EF5510 80242F00 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EF5514 80242F04 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EF5518 80242F08 C62E0040 */ lwc1 $f14, 0x40($s1) -/* EF551C 80242F0C 8C460028 */ lw $a2, 0x28($v0) -/* EF5520 80242F10 0C00ABDC */ jal fio_validate_header_checksums -/* EF5524 80242F14 8C470030 */ lw $a3, 0x30($v0) -/* EF5528 80242F18 3C014020 */ lui $at, 0x4020 -/* EF552C 80242F1C 44811000 */ mtc1 $at, $f2 -/* EF5530 80242F20 3C014100 */ lui $at, 0x4100 -/* EF5534 80242F24 44812000 */ mtc1 $at, $f4 -/* EF5538 80242F28 3C013F4C */ lui $at, 0x3f4c -/* EF553C 80242F2C 3421CCCD */ ori $at, $at, 0xcccd -/* EF5540 80242F30 44813000 */ mtc1 $at, $f6 -/* EF5544 80242F34 8E220000 */ lw $v0, ($s1) -/* EF5548 80242F38 E620000C */ swc1 $f0, 0xc($s1) -/* EF554C 80242F3C 34420800 */ ori $v0, $v0, 0x800 -/* EF5550 80242F40 AE220000 */ sw $v0, ($s1) -/* EF5554 80242F44 24020066 */ addiu $v0, $zero, 0x66 -/* EF5558 80242F48 E6220018 */ swc1 $f2, 0x18($s1) -/* EF555C 80242F4C E624001C */ swc1 $f4, 0x1c($s1) -/* EF5560 80242F50 E6260014 */ swc1 $f6, 0x14($s1) -/* EF5564 80242F54 AEA20070 */ sw $v0, 0x70($s5) -.L80242F58: -/* EF5568 80242F58 C6200018 */ lwc1 $f0, 0x18($s1) -/* EF556C 80242F5C 44801000 */ mtc1 $zero, $f2 -/* EF5570 80242F60 44801800 */ mtc1 $zero, $f3 -/* EF5574 80242F64 46000021 */ cvt.d.s $f0, $f0 -/* EF5578 80242F68 4620103C */ c.lt.d $f2, $f0 -/* EF557C 80242F6C 00000000 */ nop -/* EF5580 80242F70 4500001F */ bc1f .L80242FF0 -/* EF5584 80242F74 27A50058 */ addiu $a1, $sp, 0x58 -/* EF5588 80242F78 C6200038 */ lwc1 $f0, 0x38($s1) -/* EF558C 80242F7C C622003C */ lwc1 $f2, 0x3c($s1) -/* EF5590 80242F80 C6240040 */ lwc1 $f4, 0x40($s1) -/* EF5594 80242F84 C6260018 */ lwc1 $f6, 0x18($s1) -/* EF5598 80242F88 E7A00058 */ swc1 $f0, 0x58($sp) -/* EF559C 80242F8C E7A2005C */ swc1 $f2, 0x5c($sp) -/* EF55A0 80242F90 E7A40060 */ swc1 $f4, 0x60($sp) -/* EF55A4 80242F94 E7A60010 */ swc1 $f6, 0x10($sp) -/* EF55A8 80242F98 C620000C */ lwc1 $f0, 0xc($s1) -/* EF55AC 80242F9C E7A00014 */ swc1 $f0, 0x14($sp) -/* EF55B0 80242FA0 862200A8 */ lh $v0, 0xa8($s1) -/* EF55B4 80242FA4 44820000 */ mtc1 $v0, $f0 -/* EF55B8 80242FA8 00000000 */ nop -/* EF55BC 80242FAC 46800020 */ cvt.s.w $f0, $f0 -/* EF55C0 80242FB0 E7A00018 */ swc1 $f0, 0x18($sp) -/* EF55C4 80242FB4 862200A6 */ lh $v0, 0xa6($s1) -/* EF55C8 80242FB8 27A6005C */ addiu $a2, $sp, 0x5c -/* EF55CC 80242FBC 44820000 */ mtc1 $v0, $f0 -/* EF55D0 80242FC0 00000000 */ nop -/* EF55D4 80242FC4 46800020 */ cvt.s.w $f0, $f0 -/* EF55D8 80242FC8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* EF55DC 80242FCC 8E240080 */ lw $a0, 0x80($s1) -/* EF55E0 80242FD0 0C0394C1 */ jal dead_npc_test_move_simple_with_slipping -/* EF55E4 80242FD4 27A70060 */ addiu $a3, $sp, 0x60 -/* EF55E8 80242FD8 54400005 */ bnel $v0, $zero, .L80242FF0 -/* EF55EC 80242FDC AE200018 */ sw $zero, 0x18($s1) -/* EF55F0 80242FE0 8E250018 */ lw $a1, 0x18($s1) -/* EF55F4 80242FE4 8E26000C */ lw $a2, 0xc($s1) -/* EF55F8 80242FE8 0C00F909 */ jal dead_npc_move_heading -/* EF55FC 80242FEC 0220202D */ daddu $a0, $s1, $zero -.L80242FF0: -/* EF5600 80242FF0 C620001C */ lwc1 $f0, 0x1c($s1) -/* EF5604 80242FF4 4480B000 */ mtc1 $zero, $f22 -/* EF5608 80242FF8 4480B800 */ mtc1 $zero, $f23 -/* EF560C 80242FFC 46000021 */ cvt.d.s $f0, $f0 -/* EF5610 80243000 4636003C */ c.lt.d $f0, $f22 -/* EF5614 80243004 00000000 */ nop -/* EF5618 80243008 45000074 */ bc1f .L802431DC -/* EF561C 8024300C 27A50058 */ addiu $a1, $sp, 0x58 -/* EF5620 80243010 27A6005C */ addiu $a2, $sp, 0x5c -/* EF5624 80243014 27A20064 */ addiu $v0, $sp, 0x64 -/* EF5628 80243018 C622003C */ lwc1 $f2, 0x3c($s1) -/* EF562C 8024301C C6260038 */ lwc1 $f6, 0x38($s1) -/* EF5630 80243020 3C01402A */ lui $at, 0x402a -/* EF5634 80243024 4481A800 */ mtc1 $at, $f21 -/* EF5638 80243028 4480A000 */ mtc1 $zero, $f20 -/* EF563C 8024302C 460010A1 */ cvt.d.s $f2, $f2 -/* EF5640 80243030 46341080 */ add.d $f2, $f2, $f20 -/* EF5644 80243034 C620001C */ lwc1 $f0, 0x1c($s1) -/* EF5648 80243038 C6240040 */ lwc1 $f4, 0x40($s1) -/* EF564C 8024303C 46000005 */ abs.s $f0, $f0 -/* EF5650 80243040 E7A40060 */ swc1 $f4, 0x60($sp) -/* EF5654 80243044 3C014030 */ lui $at, 0x4030 -/* EF5658 80243048 44812800 */ mtc1 $at, $f5 -/* EF565C 8024304C 44802000 */ mtc1 $zero, $f4 -/* EF5660 80243050 46000021 */ cvt.d.s $f0, $f0 -/* EF5664 80243054 E7A60058 */ swc1 $f6, 0x58($sp) -/* EF5668 80243058 46240000 */ add.d $f0, $f0, $f4 -/* EF566C 8024305C 462010A0 */ cvt.s.d $f2, $f2 -/* EF5670 80243060 E7A2005C */ swc1 $f2, 0x5c($sp) -/* EF5674 80243064 46200020 */ cvt.s.d $f0, $f0 -/* EF5678 80243068 E7A00064 */ swc1 $f0, 0x64($sp) -/* EF567C 8024306C AFA20010 */ sw $v0, 0x10($sp) -/* EF5680 80243070 8E240080 */ lw $a0, 0x80($s1) -/* EF5684 80243074 0C03908F */ jal dead_npc_raycast_down_sides -/* EF5688 80243078 27A70060 */ addiu $a3, $sp, 0x60 -/* EF568C 8024307C 10400057 */ beqz $v0, .L802431DC -/* EF5690 80243080 00000000 */ nop -/* EF5694 80243084 C620001C */ lwc1 $f0, 0x1c($s1) -/* EF5698 80243088 C7A20064 */ lwc1 $f2, 0x64($sp) -/* EF569C 8024308C 46000005 */ abs.s $f0, $f0 -/* EF56A0 80243090 46000021 */ cvt.d.s $f0, $f0 -/* EF56A4 80243094 46340000 */ add.d $f0, $f0, $f20 -/* EF56A8 80243098 460010A1 */ cvt.d.s $f2, $f2 -/* EF56AC 8024309C 4620103E */ c.le.d $f2, $f0 -/* EF56B0 802430A0 00000000 */ nop -/* EF56B4 802430A4 4500004D */ bc1f .L802431DC -/* EF56B8 802430A8 00000000 */ nop -/* EF56BC 802430AC C7A0005C */ lwc1 $f0, 0x5c($sp) -/* EF56C0 802430B0 E620003C */ swc1 $f0, 0x3c($s1) -/* EF56C4 802430B4 8E4200D0 */ lw $v0, 0xd0($s2) -/* EF56C8 802430B8 C6200038 */ lwc1 $f0, 0x38($s1) -/* EF56CC 802430BC 4600020D */ trunc.w.s $f8, $f0 -/* EF56D0 802430C0 E4480000 */ swc1 $f8, ($v0) -/* EF56D4 802430C4 8E4200D0 */ lw $v0, 0xd0($s2) -/* EF56D8 802430C8 C620003C */ lwc1 $f0, 0x3c($s1) -/* EF56DC 802430CC 4600020D */ trunc.w.s $f8, $f0 -/* EF56E0 802430D0 E4480004 */ swc1 $f8, 4($v0) -/* EF56E4 802430D4 8E4200D0 */ lw $v0, 0xd0($s2) -/* EF56E8 802430D8 C6200040 */ lwc1 $f0, 0x40($s1) -/* EF56EC 802430DC 4600020D */ trunc.w.s $f8, $f0 -/* EF56F0 802430E0 E4480008 */ swc1 $f8, 8($v0) -/* EF56F4 802430E4 8E4200D0 */ lw $v0, 0xd0($s2) -/* EF56F8 802430E8 C6200038 */ lwc1 $f0, 0x38($s1) -/* EF56FC 802430EC 4600020D */ trunc.w.s $f8, $f0 -/* EF5700 802430F0 E448001C */ swc1 $f8, 0x1c($v0) -/* EF5704 802430F4 8E4200D0 */ lw $v0, 0xd0($s2) -/* EF5708 802430F8 C620003C */ lwc1 $f0, 0x3c($s1) -/* EF570C 802430FC 4600020D */ trunc.w.s $f8, $f0 -/* EF5710 80243100 E4480020 */ swc1 $f8, 0x20($v0) -/* EF5714 80243104 8E4200D0 */ lw $v0, 0xd0($s2) -/* EF5718 80243108 C6200040 */ lwc1 $f0, 0x40($s1) -/* EF571C 8024310C 4600020D */ trunc.w.s $f8, $f0 -/* EF5720 80243110 E4480024 */ swc1 $f8, 0x24($v0) -/* EF5724 80243114 8E4300A0 */ lw $v1, 0xa0($s2) -/* EF5728 80243118 24020005 */ addiu $v0, $zero, 5 -/* EF572C 8024311C 1060000B */ beqz $v1, .L8024314C -/* EF5730 80243120 AE420094 */ sw $v0, 0x94($s2) -/* EF5734 80243124 C620003C */ lwc1 $f0, 0x3c($s1) -/* EF5738 80243128 46000021 */ cvt.d.s $f0, $f0 -/* EF573C 8024312C 4636003E */ c.le.d $f0, $f22 -/* EF5740 80243130 00000000 */ nop -/* EF5744 80243134 4501000D */ bc1t .L8024316C -/* EF5748 80243138 2403FFF7 */ addiu $v1, $zero, -9 -/* EF574C 8024313C 8E220000 */ lw $v0, ($s1) -/* EF5750 80243140 34420200 */ ori $v0, $v0, 0x200 -/* EF5754 80243144 08090C5F */ j .L8024317C -/* EF5758 80243148 00431024 */ and $v0, $v0, $v1 -.L8024314C: -/* EF575C 8024314C 8E4200D0 */ lw $v0, 0xd0($s2) -/* EF5760 80243150 8C420034 */ lw $v0, 0x34($v0) -/* EF5764 80243154 14400005 */ bnez $v0, .L8024316C -/* EF5768 80243158 2403FFF7 */ addiu $v1, $zero, -9 -/* EF576C 8024315C 8E220000 */ lw $v0, ($s1) -/* EF5770 80243160 34420200 */ ori $v0, $v0, 0x200 -/* EF5774 80243164 08090C5F */ j .L8024317C -/* EF5778 80243168 00431024 */ and $v0, $v0, $v1 -.L8024316C: -/* EF577C 8024316C 8E220000 */ lw $v0, ($s1) -/* EF5780 80243170 2403FDFF */ addiu $v1, $zero, -0x201 -/* EF5784 80243174 00431024 */ and $v0, $v0, $v1 -/* EF5788 80243178 34420008 */ ori $v0, $v0, 8 -.L8024317C: -/* EF578C 8024317C AE220000 */ sw $v0, ($s1) -/* EF5790 80243180 C62C0038 */ lwc1 $f12, 0x38($s1) -/* EF5794 80243184 C62E0040 */ lwc1 $f14, 0x40($s1) -/* EF5798 80243188 8E220000 */ lw $v0, ($s1) -/* EF579C 8024318C 3C048010 */ lui $a0, %hi(dead_gPlayerStatusPtr) -/* EF57A0 80243190 8C84FC90 */ lw $a0, %lo(dead_gPlayerStatusPtr)($a0) -/* EF57A4 80243194 3C030004 */ lui $v1, 4 -/* EF57A8 80243198 AE20001C */ sw $zero, 0x1c($s1) -/* EF57AC 8024319C 00431025 */ or $v0, $v0, $v1 -/* EF57B0 802431A0 2403F7FF */ addiu $v1, $zero, -0x801 -/* EF57B4 802431A4 00431024 */ and $v0, $v0, $v1 -/* EF57B8 802431A8 AE220000 */ sw $v0, ($s1) -/* EF57BC 802431AC 8C860028 */ lw $a2, 0x28($a0) -/* EF57C0 802431B0 0C00ABDC */ jal fio_validate_header_checksums -/* EF57C4 802431B4 8C870030 */ lw $a3, 0x30($a0) -/* EF57C8 802431B8 3C02004A */ lui $v0, 0x4a -/* EF57CC 802431BC 3442001A */ ori $v0, $v0, 0x1a -/* EF57D0 802431C0 AE220028 */ sw $v0, 0x28($s1) -/* EF57D4 802431C4 24020003 */ addiu $v0, $zero, 3 -/* EF57D8 802431C8 A622008E */ sh $v0, 0x8e($s1) -/* EF57DC 802431CC 24020067 */ addiu $v0, $zero, 0x67 -/* EF57E0 802431D0 E620000C */ swc1 $f0, 0xc($s1) -/* EF57E4 802431D4 08090CA5 */ j .L80243294 -/* EF57E8 802431D8 AEA20070 */ sw $v0, 0x70($s5) -.L802431DC: -/* EF57EC 802431DC C624003C */ lwc1 $f4, 0x3c($s1) -/* EF57F0 802431E0 C620001C */ lwc1 $f0, 0x1c($s1) -/* EF57F4 802431E4 46002100 */ add.s $f4, $f4, $f0 -/* EF57F8 802431E8 C6220014 */ lwc1 $f2, 0x14($s1) -/* EF57FC 802431EC 46020001 */ sub.s $f0, $f0, $f2 -/* EF5800 802431F0 E624003C */ swc1 $f4, 0x3c($s1) -/* EF5804 802431F4 08090CA5 */ j .L80243294 -/* EF5808 802431F8 E620001C */ swc1 $f0, 0x1c($s1) -.L802431FC: -/* EF580C 802431FC 9622008E */ lhu $v0, 0x8e($s1) -/* EF5810 80243200 2442FFFF */ addiu $v0, $v0, -1 -/* EF5814 80243204 A622008E */ sh $v0, 0x8e($s1) -/* EF5818 80243208 00021400 */ sll $v0, $v0, 0x10 -/* EF581C 8024320C 1C400021 */ bgtz $v0, .L80243294 -/* EF5820 80243210 3C03004A */ lui $v1, 0x4a -/* EF5824 80243214 3C04FFFB */ lui $a0, 0xfffb -/* EF5828 80243218 3484FFFF */ ori $a0, $a0, 0xffff -/* EF582C 8024321C 8E220000 */ lw $v0, ($s1) -/* EF5830 80243220 34630001 */ ori $v1, $v1, 1 -/* EF5834 80243224 AE230028 */ sw $v1, 0x28($s1) -/* EF5838 80243228 00441024 */ and $v0, $v0, $a0 -/* EF583C 8024322C AE220000 */ sw $v0, ($s1) -/* EF5840 80243230 08090CA5 */ j .L80243294 -/* EF5844 80243234 AEA00070 */ sw $zero, 0x70($s5) -.L80243238: -/* EF5848 80243238 3C01C47A */ lui $at, 0xc47a -/* EF584C 8024323C 44810000 */ mtc1 $at, $f0 -/* EF5850 80243240 8E230000 */ lw $v1, ($s1) -/* EF5854 80243244 A622008E */ sh $v0, 0x8e($s1) -/* EF5858 80243248 2402FDFF */ addiu $v0, $zero, -0x201 -/* EF585C 8024324C AE200038 */ sw $zero, 0x38($s1) -/* EF5860 80243250 AE200040 */ sw $zero, 0x40($s1) -/* EF5864 80243254 3463000A */ ori $v1, $v1, 0xa -/* EF5868 80243258 00621824 */ and $v1, $v1, $v0 -/* EF586C 8024325C E620003C */ swc1 $f0, 0x3c($s1) -/* EF5870 80243260 AE230000 */ sw $v1, ($s1) -/* EF5874 80243264 AEA40070 */ sw $a0, 0x70($s5) -.L80243268: -/* EF5878 80243268 9622008E */ lhu $v0, 0x8e($s1) -/* EF587C 8024326C 2442FFFF */ addiu $v0, $v0, -1 -/* EF5880 80243270 A622008E */ sh $v0, 0x8e($s1) -/* EF5884 80243274 00021400 */ sll $v0, $v0, 0x10 -/* EF5888 80243278 1C400006 */ bgtz $v0, .L80243294 -/* EF588C 8024327C 24020064 */ addiu $v0, $zero, 0x64 -/* EF5890 80243280 AE400094 */ sw $zero, 0x94($s2) -/* EF5894 80243284 08090CA5 */ j .L80243294 -/* EF5898 80243288 AEA20070 */ sw $v0, 0x70($s5) -.L8024328C: -/* EF589C 8024328C 0C013AE3 */ jal func_8004EB8C -/* EF58A0 80243290 02A0202D */ daddu $a0, $s5, $zero -.L80243294: -/* EF58A4 80243294 8FBF0080 */ lw $ra, 0x80($sp) -/* EF58A8 80243298 8FB5007C */ lw $s5, 0x7c($sp) -/* EF58AC 8024329C 8FB40078 */ lw $s4, 0x78($sp) -/* EF58B0 802432A0 8FB30074 */ lw $s3, 0x74($sp) -/* EF58B4 802432A4 8FB20070 */ lw $s2, 0x70($sp) -/* EF58B8 802432A8 8FB1006C */ lw $s1, 0x6c($sp) -/* EF58BC 802432AC 8FB00068 */ lw $s0, 0x68($sp) -/* EF58C0 802432B0 D7B60090 */ ldc1 $f22, 0x90($sp) -/* EF58C4 802432B4 D7B40088 */ ldc1 $f20, 0x88($sp) -/* EF58C8 802432B8 0000102D */ daddu $v0, $zero, $zero -/* EF58CC 802432BC 03E00008 */ jr $ra -/* EF58D0 802432C0 27BD0098 */ addiu $sp, $sp, 0x98 -/* EF58D4 802432C4 00000000 */ nop -/* EF58D8 802432C8 00000000 */ nop -/* EF58DC 802432CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s deleted file mode 100644 index 58aa26124e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802463B8_915A68 -.double 1.1 - -dlabel D_802463C0_915A70 -.double 180.0 - -.section .text - -glabel func_80241414_910AC4 -/* 910AC4 80241414 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 910AC8 80241418 AFB00018 */ sw $s0, 0x18($sp) -/* 910ACC 8024141C AFBF0024 */ sw $ra, 0x24($sp) -/* 910AD0 80241420 AFB20020 */ sw $s2, 0x20($sp) -/* 910AD4 80241424 AFB1001C */ sw $s1, 0x1c($sp) -/* 910AD8 80241428 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 910ADC 8024142C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 910AE0 80241430 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 910AE4 80241434 8C910148 */ lw $s1, 0x148($a0) -/* 910AE8 80241438 4486A000 */ mtc1 $a2, $f20 -/* 910AEC 8024143C 86240008 */ lh $a0, 8($s1) -/* 910AF0 80241440 4487B000 */ mtc1 $a3, $f22 -/* 910AF4 80241444 0C00EABB */ jal get_npc_unsafe -/* 910AF8 80241448 00A0802D */ daddu $s0, $a1, $zero -/* 910AFC 8024144C 4600A521 */ cvt.d.s $f20, $f20 -/* 910B00 80241450 0200202D */ daddu $a0, $s0, $zero -/* 910B04 80241454 0040902D */ daddu $s2, $v0, $zero -/* 910B08 80241458 3C03800B */ lui $v1, %hi(gCameras) -/* 910B0C 8024145C 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 910B10 80241460 3C018024 */ lui $at, %hi(D_802463B8_915A68) -/* 910B14 80241464 D42063B8 */ ldc1 $f0, %lo(D_802463B8_915A68)($at) -/* 910B18 80241468 3C014387 */ lui $at, 0x4387 -/* 910B1C 8024146C 4481C000 */ mtc1 $at, $f24 -/* 910B20 80241470 4407B000 */ mfc1 $a3, $f22 -/* 910B24 80241474 3C02800A */ lui $v0, %hi(gCurrentCamID) -/* 910B28 80241478 8442A634 */ lh $v0, %lo(gCurrentCamID)($v0) -/* 910B2C 8024147C 0220282D */ daddu $a1, $s1, $zero -/* 910B30 80241480 AFA00010 */ sw $zero, 0x10($sp) -/* 910B34 80241484 4620A502 */ mul.d $f20, $f20, $f0 -/* 910B38 80241488 00000000 */ nop -/* 910B3C 8024148C 00028080 */ sll $s0, $v0, 2 -/* 910B40 80241490 02028021 */ addu $s0, $s0, $v0 -/* 910B44 80241494 00108080 */ sll $s0, $s0, 2 -/* 910B48 80241498 02028023 */ subu $s0, $s0, $v0 -/* 910B4C 8024149C 001010C0 */ sll $v0, $s0, 3 -/* 910B50 802414A0 02028021 */ addu $s0, $s0, $v0 -/* 910B54 802414A4 001080C0 */ sll $s0, $s0, 3 -/* 910B58 802414A8 4620A520 */ cvt.s.d $f20, $f20 -/* 910B5C 802414AC 4406A000 */ mfc1 $a2, $f20 -/* 910B60 802414B0 0C01242D */ jal func_800490B4 -/* 910B64 802414B4 02038021 */ addu $s0, $s0, $v1 -/* 910B68 802414B8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 910B6C 802414BC C64E000C */ lwc1 $f14, 0xc($s2) -/* 910B70 802414C0 0C00A70A */ jal get_clamped_angle_diff -/* 910B74 802414C4 0002802B */ sltu $s0, $zero, $v0 -/* 910B78 802414C8 0C00A6C9 */ jal clamp_angle -/* 910B7C 802414CC 46000306 */ mov.s $f12, $f0 -/* 910B80 802414D0 3C018024 */ lui $at, %hi(D_802463C0_915A70) -/* 910B84 802414D4 D42263C0 */ ldc1 $f2, %lo(D_802463C0_915A70)($at) -/* 910B88 802414D8 46000021 */ cvt.d.s $f0, $f0 -/* 910B8C 802414DC 4622003C */ c.lt.d $f0, $f2 -/* 910B90 802414E0 00000000 */ nop -/* 910B94 802414E4 45000003 */ bc1f .L802414F4 -/* 910B98 802414E8 00000000 */ nop -/* 910B9C 802414EC 3C0142B4 */ lui $at, 0x42b4 -/* 910BA0 802414F0 4481C000 */ mtc1 $at, $f24 -.L802414F4: -/* 910BA4 802414F4 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* 910BA8 802414F8 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* 910BAC 802414FC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 910BB0 80241500 8E220000 */ lw $v0, ($s1) -/* 910BB4 80241504 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 910BB8 80241508 8C460028 */ lw $a2, 0x28($v0) -/* 910BBC 8024150C 0C00A720 */ jal atan2 -/* 910BC0 80241510 8C470030 */ lw $a3, 0x30($v0) -/* 910BC4 80241514 4600C306 */ mov.s $f12, $f24 -/* 910BC8 80241518 0C00A70A */ jal get_clamped_angle_diff -/* 910BCC 8024151C 46000386 */ mov.s $f14, $f0 -/* 910BD0 80241520 46000005 */ abs.s $f0, $f0 -/* 910BD4 80241524 3C01404E */ lui $at, 0x404e -/* 910BD8 80241528 44811800 */ mtc1 $at, $f3 -/* 910BDC 8024152C 44801000 */ mtc1 $zero, $f2 -/* 910BE0 80241530 46000021 */ cvt.d.s $f0, $f0 -/* 910BE4 80241534 4620103C */ c.lt.d $f2, $f0 -/* 910BE8 80241538 00000000 */ nop -/* 910BEC 8024153C 45030001 */ bc1tl .L80241544 -/* 910BF0 80241540 0000802D */ daddu $s0, $zero, $zero -.L80241544: -/* 910BF4 80241544 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 910BF8 80241548 0C038022 */ jal get_xz_dist_to_player -/* 910BFC 8024154C C64E0040 */ lwc1 $f14, 0x40($s2) -/* 910C00 80241550 8E240000 */ lw $a0, ($s1) -/* 910C04 80241554 864300A6 */ lh $v1, 0xa6($s2) -/* 910C08 80241558 848200B2 */ lh $v0, 0xb2($a0) -/* 910C0C 8024155C 00431021 */ addu $v0, $v0, $v1 -/* 910C10 80241560 44821000 */ mtc1 $v0, $f2 -/* 910C14 80241564 00000000 */ nop -/* 910C18 80241568 468010A0 */ cvt.s.w $f2, $f2 -/* 910C1C 8024156C 4602003C */ c.lt.s $f0, $f2 -/* 910C20 80241570 00000000 */ nop -/* 910C24 80241574 45030001 */ bc1tl .L8024157C -/* 910C28 80241578 0000802D */ daddu $s0, $zero, $zero -.L8024157C: -/* 910C2C 8024157C C640003C */ lwc1 $f0, 0x3c($s2) -/* 910C30 80241580 C482002C */ lwc1 $f2, 0x2c($a0) -/* 910C34 80241584 46020001 */ sub.s $f0, $f0, $f2 -/* 910C38 80241588 3C014220 */ lui $at, 0x4220 -/* 910C3C 8024158C 44811000 */ mtc1 $at, $f2 -/* 910C40 80241590 46000005 */ abs.s $f0, $f0 -/* 910C44 80241594 4600103E */ c.le.s $f2, $f0 -/* 910C48 80241598 00000000 */ nop -/* 910C4C 8024159C 45030001 */ bc1tl .L802415A4 -/* 910C50 802415A0 0000802D */ daddu $s0, $zero, $zero -.L802415A4: -/* 910C54 802415A4 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* 910C58 802415A8 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* 910C5C 802415AC 24020009 */ addiu $v0, $zero, 9 -/* 910C60 802415B0 50620001 */ beql $v1, $v0, .L802415B8 -/* 910C64 802415B4 0000802D */ daddu $s0, $zero, $zero -.L802415B8: -/* 910C68 802415B8 0200102D */ daddu $v0, $s0, $zero -/* 910C6C 802415BC 8FBF0024 */ lw $ra, 0x24($sp) -/* 910C70 802415C0 8FB20020 */ lw $s2, 0x20($sp) -/* 910C74 802415C4 8FB1001C */ lw $s1, 0x1c($sp) -/* 910C78 802415C8 8FB00018 */ lw $s0, 0x18($sp) -/* 910C7C 802415CC D7B80038 */ ldc1 $f24, 0x38($sp) -/* 910C80 802415D0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 910C84 802415D4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 910C88 802415D8 03E00008 */ jr $ra -/* 910C8C 802415DC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s deleted file mode 100644 index e6c2f9034d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802463C8_915A78 -.double 32767.0 - -.section .text - -glabel func_802415E0_910C90 -/* 910C90 802415E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 910C94 802415E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 910C98 802415E8 0080982D */ daddu $s3, $a0, $zero -/* 910C9C 802415EC AFBF0020 */ sw $ra, 0x20($sp) -/* 910CA0 802415F0 AFB20018 */ sw $s2, 0x18($sp) -/* 910CA4 802415F4 AFB10014 */ sw $s1, 0x14($sp) -/* 910CA8 802415F8 AFB00010 */ sw $s0, 0x10($sp) -/* 910CAC 802415FC 8E710148 */ lw $s1, 0x148($s3) -/* 910CB0 80241600 86240008 */ lh $a0, 8($s1) -/* 910CB4 80241604 0C00EABB */ jal get_npc_unsafe -/* 910CB8 80241608 00A0902D */ daddu $s2, $a1, $zero -/* 910CBC 8024160C 8E440004 */ lw $a0, 4($s2) -/* 910CC0 80241610 0040802D */ daddu $s0, $v0, $zero -/* 910CC4 80241614 00041FC2 */ srl $v1, $a0, 0x1f -/* 910CC8 80241618 00832021 */ addu $a0, $a0, $v1 -/* 910CCC 8024161C 00042043 */ sra $a0, $a0, 1 -/* 910CD0 80241620 0C00A67F */ jal rand_int -/* 910CD4 80241624 24840001 */ addiu $a0, $a0, 1 -/* 910CD8 80241628 8E430004 */ lw $v1, 4($s2) -/* 910CDC 8024162C 2404003C */ addiu $a0, $zero, 0x3c -/* 910CE0 80241630 00032FC2 */ srl $a1, $v1, 0x1f -/* 910CE4 80241634 00651821 */ addu $v1, $v1, $a1 -/* 910CE8 80241638 00031843 */ sra $v1, $v1, 1 -/* 910CEC 8024163C 00621821 */ addu $v1, $v1, $v0 -/* 910CF0 80241640 0C00A67F */ jal rand_int -/* 910CF4 80241644 A603008E */ sh $v1, 0x8e($s0) -/* 910CF8 80241648 C60C000C */ lwc1 $f12, 0xc($s0) -/* 910CFC 8024164C 44820000 */ mtc1 $v0, $f0 -/* 910D00 80241650 00000000 */ nop -/* 910D04 80241654 46800020 */ cvt.s.w $f0, $f0 -/* 910D08 80241658 46006300 */ add.s $f12, $f12, $f0 -/* 910D0C 8024165C 3C0141F0 */ lui $at, 0x41f0 -/* 910D10 80241660 44810000 */ mtc1 $at, $f0 -/* 910D14 80241664 0C00A6C9 */ jal clamp_angle -/* 910D18 80241668 46006301 */ sub.s $f12, $f12, $f0 -/* 910D1C 8024166C E600000C */ swc1 $f0, 0xc($s0) -/* 910D20 80241670 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910D24 80241674 8C420014 */ lw $v0, 0x14($v0) -/* 910D28 80241678 04410004 */ bgez $v0, .L8024168C -/* 910D2C 8024167C 00000000 */ nop -/* 910D30 80241680 C6400000 */ lwc1 $f0, ($s2) -/* 910D34 80241684 080905AB */ j .L802416AC -/* 910D38 80241688 E6000018 */ swc1 $f0, 0x18($s0) -.L8024168C: -/* 910D3C 8024168C 3C018024 */ lui $at, %hi(D_802463C8_915A78) -/* 910D40 80241690 D42263C8 */ ldc1 $f2, %lo(D_802463C8_915A78)($at) -/* 910D44 80241694 44820000 */ mtc1 $v0, $f0 -/* 910D48 80241698 00000000 */ nop -/* 910D4C 8024169C 46800021 */ cvt.d.w $f0, $f0 -/* 910D50 802416A0 46220003 */ div.d $f0, $f0, $f2 -/* 910D54 802416A4 46200020 */ cvt.s.d $f0, $f0 -/* 910D58 802416A8 E6000018 */ swc1 $f0, 0x18($s0) -.L802416AC: -/* 910D5C 802416AC 8E220000 */ lw $v0, ($s1) -/* 910D60 802416B0 3C031F10 */ lui $v1, 0x1f10 -/* 910D64 802416B4 00431025 */ or $v0, $v0, $v1 -/* 910D68 802416B8 AE220000 */ sw $v0, ($s1) -/* 910D6C 802416BC 8E020000 */ lw $v0, ($s0) -/* 910D70 802416C0 34420002 */ ori $v0, $v0, 2 -/* 910D74 802416C4 AE020000 */ sw $v0, ($s0) -/* 910D78 802416C8 24020001 */ addiu $v0, $zero, 1 -/* 910D7C 802416CC AE600074 */ sw $zero, 0x74($s3) -/* 910D80 802416D0 AE620070 */ sw $v0, 0x70($s3) -/* 910D84 802416D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 910D88 802416D8 8FB3001C */ lw $s3, 0x1c($sp) -/* 910D8C 802416DC 8FB20018 */ lw $s2, 0x18($sp) -/* 910D90 802416E0 8FB10014 */ lw $s1, 0x14($sp) -/* 910D94 802416E4 8FB00010 */ lw $s0, 0x10($sp) -/* 910D98 802416E8 03E00008 */ jr $ra -/* 910D9C 802416EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s deleted file mode 100644 index 9c3154fc32..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s +++ /dev/null @@ -1,155 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0_910DA0 -/* 910DA0 802416F0 27BDFC80 */ addiu $sp, $sp, -0x380 -/* 910DA4 802416F4 AFB20370 */ sw $s2, 0x370($sp) -/* 910DA8 802416F8 0080902D */ daddu $s2, $a0, $zero -/* 910DAC 802416FC AFBF037C */ sw $ra, 0x37c($sp) -/* 910DB0 80241700 AFB40378 */ sw $s4, 0x378($sp) -/* 910DB4 80241704 AFB30374 */ sw $s3, 0x374($sp) -/* 910DB8 80241708 AFB1036C */ sw $s1, 0x36c($sp) -/* 910DBC 8024170C AFB00368 */ sw $s0, 0x368($sp) -/* 910DC0 80241710 8E510148 */ lw $s1, 0x148($s2) -/* 910DC4 80241714 00A0982D */ daddu $s3, $a1, $zero -/* 910DC8 80241718 86240008 */ lh $a0, 8($s1) -/* 910DCC 8024171C 0C00EABB */ jal get_npc_unsafe -/* 910DD0 80241720 00C0A02D */ daddu $s4, $a2, $zero -/* 910DD4 80241724 0040802D */ daddu $s0, $v0, $zero -/* 910DD8 80241728 8E2300D0 */ lw $v1, 0xd0($s1) -/* 910DDC 8024172C C6000040 */ lwc1 $f0, 0x40($s0) -/* 910DE0 80241730 C4620000 */ lwc1 $f2, ($v1) -/* 910DE4 80241734 468010A0 */ cvt.s.w $f2, $f2 -/* 910DE8 80241738 C4640008 */ lwc1 $f4, 8($v1) -/* 910DEC 8024173C 46802120 */ cvt.s.w $f4, $f4 -/* 910DF0 80241740 E7A00010 */ swc1 $f0, 0x10($sp) -/* 910DF4 80241744 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910DF8 80241748 44051000 */ mfc1 $a1, $f2 -/* 910DFC 8024174C C440000C */ lwc1 $f0, 0xc($v0) -/* 910E00 80241750 46800020 */ cvt.s.w $f0, $f0 -/* 910E04 80241754 E7A00014 */ swc1 $f0, 0x14($sp) -/* 910E08 80241758 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910E0C 8024175C 44062000 */ mfc1 $a2, $f4 -/* 910E10 80241760 C4400010 */ lwc1 $f0, 0x10($v0) -/* 910E14 80241764 46800020 */ cvt.s.w $f0, $f0 -/* 910E18 80241768 E7A00018 */ swc1 $f0, 0x18($sp) -/* 910E1C 8024176C 8C640018 */ lw $a0, 0x18($v1) -/* 910E20 80241770 0C0123F5 */ jal is_point_within_region -/* 910E24 80241774 8E070038 */ lw $a3, 0x38($s0) -/* 910E28 80241778 1040000D */ beqz $v0, .L802417B0 -/* 910E2C 8024177C 00000000 */ nop -/* 910E30 80241780 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910E34 80241784 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 910E38 80241788 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 910E3C 8024178C C4460000 */ lwc1 $f6, ($v0) -/* 910E40 80241790 468031A0 */ cvt.s.w $f6, $f6 -/* 910E44 80241794 44063000 */ mfc1 $a2, $f6 -/* 910E48 80241798 C4460008 */ lwc1 $f6, 8($v0) -/* 910E4C 8024179C 468031A0 */ cvt.s.w $f6, $f6 -/* 910E50 802417A0 44073000 */ mfc1 $a3, $f6 -/* 910E54 802417A4 0C00A720 */ jal atan2 -/* 910E58 802417A8 00000000 */ nop -/* 910E5C 802417AC E600000C */ swc1 $f0, 0xc($s0) -.L802417B0: -/* 910E60 802417B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 910E64 802417B4 3C013F80 */ lui $at, 0x3f80 -/* 910E68 802417B8 44811000 */ mtc1 $at, $f2 -/* 910E6C 802417BC E7A00058 */ swc1 $f0, 0x58($sp) -/* 910E70 802417C0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 910E74 802417C4 46020000 */ add.s $f0, $f0, $f2 -/* 910E78 802417C8 E7A0005C */ swc1 $f0, 0x5c($sp) -/* 910E7C 802417CC C6000040 */ lwc1 $f0, 0x40($s0) -/* 910E80 802417D0 E7A00060 */ swc1 $f0, 0x60($sp) -/* 910E84 802417D4 860200A6 */ lh $v0, 0xa6($s0) -/* 910E88 802417D8 C6020018 */ lwc1 $f2, 0x18($s0) -/* 910E8C 802417DC 44820000 */ mtc1 $v0, $f0 -/* 910E90 802417E0 00000000 */ nop -/* 910E94 802417E4 46800020 */ cvt.s.w $f0, $f0 -/* 910E98 802417E8 46001080 */ add.s $f2, $f2, $f0 -/* 910E9C 802417EC 8E06000C */ lw $a2, 0xc($s0) -/* 910EA0 802417F0 44051000 */ mfc1 $a1, $f2 -/* 910EA4 802417F4 0C00EA95 */ jal npc_move_heading -/* 910EA8 802417F8 27A40020 */ addiu $a0, $sp, 0x20 -/* 910EAC 802417FC 0000202D */ daddu $a0, $zero, $zero -/* 910EB0 80241800 27A50058 */ addiu $a1, $sp, 0x58 -/* 910EB4 80241804 27A6005C */ addiu $a2, $sp, 0x5c -/* 910EB8 80241808 27A70060 */ addiu $a3, $sp, 0x60 -/* 910EBC 8024180C 3C01447A */ lui $at, 0x447a -/* 910EC0 80241810 44810000 */ mtc1 $at, $f0 -/* 910EC4 80241814 27A20360 */ addiu $v0, $sp, 0x360 -/* 910EC8 80241818 E7A00360 */ swc1 $f0, 0x360($sp) -/* 910ECC 8024181C 0C0372DF */ jal npc_raycast_down_sides -/* 910ED0 80241820 AFA20010 */ sw $v0, 0x10($sp) -/* 910ED4 80241824 1040000D */ beqz $v0, .L8024185C -/* 910ED8 80241828 00000000 */ nop -/* 910EDC 8024182C C7A20360 */ lwc1 $f2, 0x360($sp) -/* 910EE0 80241830 3C0140A0 */ lui $at, 0x40a0 -/* 910EE4 80241834 44810000 */ mtc1 $at, $f0 -/* 910EE8 80241838 00000000 */ nop -/* 910EEC 8024183C 4600103C */ c.lt.s $f2, $f0 -/* 910EF0 80241840 00000000 */ nop -/* 910EF4 80241844 45000005 */ bc1f .L8024185C -/* 910EF8 80241848 00000000 */ nop -/* 910EFC 8024184C 8E050018 */ lw $a1, 0x18($s0) -/* 910F00 80241850 8E06000C */ lw $a2, 0xc($s0) -/* 910F04 80241854 0C00EA95 */ jal npc_move_heading -/* 910F08 80241858 0200202D */ daddu $a0, $s0, $zero -.L8024185C: -/* 910F0C 8024185C 8E020000 */ lw $v0, ($s0) -/* 910F10 80241860 30424000 */ andi $v0, $v0, 0x4000 -/* 910F14 80241864 54400001 */ bnel $v0, $zero, .L8024186C -/* 910F18 80241868 AE400070 */ sw $zero, 0x70($s2) -.L8024186C: -/* 910F1C 8024186C 8E630014 */ lw $v1, 0x14($s3) -/* 910F20 80241870 04600012 */ bltz $v1, .L802418BC -/* 910F24 80241874 00000000 */ nop -/* 910F28 80241878 8E420074 */ lw $v0, 0x74($s2) -/* 910F2C 8024187C 1C40000E */ bgtz $v0, .L802418B8 -/* 910F30 80241880 2442FFFF */ addiu $v0, $v0, -1 -/* 910F34 80241884 0240202D */ daddu $a0, $s2, $zero -/* 910F38 80241888 AE430074 */ sw $v1, 0x74($s2) -/* 910F3C 8024188C 8E66000C */ lw $a2, 0xc($s3) -/* 910F40 80241890 8E670010 */ lw $a3, 0x10($s3) -/* 910F44 80241894 0C090505 */ jal func_80241414_910AC4 -/* 910F48 80241898 0280282D */ daddu $a1, $s4, $zero -/* 910F4C 8024189C 10400004 */ beqz $v0, .L802418B0 -/* 910F50 802418A0 2402000C */ addiu $v0, $zero, 0xc -/* 910F54 802418A4 A600008E */ sh $zero, 0x8e($s0) -/* 910F58 802418A8 08090643 */ j .L8024190C -/* 910F5C 802418AC AE420070 */ sw $v0, 0x70($s2) -.L802418B0: -/* 910F60 802418B0 8E420074 */ lw $v0, 0x74($s2) -/* 910F64 802418B4 2442FFFF */ addiu $v0, $v0, -1 -.L802418B8: -/* 910F68 802418B8 AE420074 */ sw $v0, 0x74($s2) -.L802418BC: -/* 910F6C 802418BC 8E020000 */ lw $v0, ($s0) -/* 910F70 802418C0 30421008 */ andi $v0, $v0, 0x1008 -/* 910F74 802418C4 1440000B */ bnez $v0, .L802418F4 -/* 910F78 802418C8 00000000 */ nop -/* 910F7C 802418CC C6000038 */ lwc1 $f0, 0x38($s0) -/* 910F80 802418D0 C6020040 */ lwc1 $f2, 0x40($s0) -/* 910F84 802418D4 4600018D */ trunc.w.s $f6, $f0 -/* 910F88 802418D8 44023000 */ mfc1 $v0, $f6 -/* 910F8C 802418DC 00000000 */ nop -/* 910F90 802418E0 A6020090 */ sh $v0, 0x90($s0) -/* 910F94 802418E4 4600118D */ trunc.w.s $f6, $f2 -/* 910F98 802418E8 44023000 */ mfc1 $v0, $f6 -/* 910F9C 802418EC 00000000 */ nop -/* 910FA0 802418F0 A6020094 */ sh $v0, 0x94($s0) -.L802418F4: -/* 910FA4 802418F4 9602008E */ lhu $v0, 0x8e($s0) -/* 910FA8 802418F8 2442FFFF */ addiu $v0, $v0, -1 -/* 910FAC 802418FC A602008E */ sh $v0, 0x8e($s0) -/* 910FB0 80241900 00021400 */ sll $v0, $v0, 0x10 -/* 910FB4 80241904 50400001 */ beql $v0, $zero, .L8024190C -/* 910FB8 80241908 AE400070 */ sw $zero, 0x70($s2) -.L8024190C: -/* 910FBC 8024190C 8FBF037C */ lw $ra, 0x37c($sp) -/* 910FC0 80241910 8FB40378 */ lw $s4, 0x378($sp) -/* 910FC4 80241914 8FB30374 */ lw $s3, 0x374($sp) -/* 910FC8 80241918 8FB20370 */ lw $s2, 0x370($sp) -/* 910FCC 8024191C 8FB1036C */ lw $s1, 0x36c($sp) -/* 910FD0 80241920 8FB00368 */ lw $s0, 0x368($sp) -/* 910FD4 80241924 03E00008 */ jr $ra -/* 910FD8 80241928 27BD0380 */ addiu $sp, $sp, 0x380 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C_910FDC.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C_910FDC.s deleted file mode 100644 index 5240d0e2f9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C_910FDC.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024192C_910FDC -/* 910FDC 8024192C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 910FE0 80241930 AFB10014 */ sw $s1, 0x14($sp) -/* 910FE4 80241934 0080882D */ daddu $s1, $a0, $zero -/* 910FE8 80241938 AFBF0018 */ sw $ra, 0x18($sp) -/* 910FEC 8024193C AFB00010 */ sw $s0, 0x10($sp) -/* 910FF0 80241940 8E220148 */ lw $v0, 0x148($s1) -/* 910FF4 80241944 0C00EABB */ jal get_npc_unsafe -/* 910FF8 80241948 84440008 */ lh $a0, 8($v0) -/* 910FFC 8024194C 0040802D */ daddu $s0, $v0, $zero -/* 911000 80241950 0200202D */ daddu $a0, $s0, $zero -/* 911004 80241954 0000302D */ daddu $a2, $zero, $zero -/* 911008 80241958 2403FFFD */ addiu $v1, $zero, -3 -/* 91100C 8024195C 8E020000 */ lw $v0, ($s0) -/* 911010 80241960 24050321 */ addiu $a1, $zero, 0x321 -/* 911014 80241964 00431024 */ and $v0, $v0, $v1 -/* 911018 80241968 0C012530 */ jal ai_enemy_play_sound -/* 91101C 8024196C AE020000 */ sw $v0, ($s0) -/* 911020 80241970 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911024 80241974 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 911028 80241978 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91102C 8024197C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 911030 80241980 8C460028 */ lw $a2, 0x28($v0) -/* 911034 80241984 0C00A720 */ jal atan2 -/* 911038 80241988 8C470030 */ lw $a3, 0x30($v0) -/* 91103C 8024198C 3C02002F */ lui $v0, 0x2f -/* 911040 80241990 34420010 */ ori $v0, $v0, 0x10 -/* 911044 80241994 AE020028 */ sw $v0, 0x28($s0) -/* 911048 80241998 2402000A */ addiu $v0, $zero, 0xa -/* 91104C 8024199C A602008E */ sh $v0, 0x8e($s0) -/* 911050 802419A0 2402000D */ addiu $v0, $zero, 0xd -/* 911054 802419A4 E600000C */ swc1 $f0, 0xc($s0) -/* 911058 802419A8 AE220070 */ sw $v0, 0x70($s1) -/* 91105C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 911060 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* 911064 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* 911068 802419B8 03E00008 */ jr $ra -/* 91106C 802419BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0_911070.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0_911070.s deleted file mode 100644 index e0bfde6790..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0_911070.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C0_911070 -/* 911070 802419C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911074 802419C4 AFB10014 */ sw $s1, 0x14($sp) -/* 911078 802419C8 0080882D */ daddu $s1, $a0, $zero -/* 91107C 802419CC AFBF0018 */ sw $ra, 0x18($sp) -/* 911080 802419D0 AFB00010 */ sw $s0, 0x10($sp) -/* 911084 802419D4 8E300148 */ lw $s0, 0x148($s1) -/* 911088 802419D8 0C00EABB */ jal get_npc_unsafe -/* 91108C 802419DC 86040008 */ lh $a0, 8($s0) -/* 911090 802419E0 0040202D */ daddu $a0, $v0, $zero -/* 911094 802419E4 9482008E */ lhu $v0, 0x8e($a0) -/* 911098 802419E8 24030002 */ addiu $v1, $zero, 2 -/* 91109C 802419EC 2442FFFF */ addiu $v0, $v0, -1 -/* 9110A0 802419F0 A482008E */ sh $v0, 0x8e($a0) -/* 9110A4 802419F4 00021400 */ sll $v0, $v0, 0x10 -/* 9110A8 802419F8 00021403 */ sra $v0, $v0, 0x10 -/* 9110AC 802419FC 14430005 */ bne $v0, $v1, .L80241A14 -/* 9110B0 80241A00 3C03E0EF */ lui $v1, 0xe0ef -/* 9110B4 80241A04 8E020000 */ lw $v0, ($s0) -/* 9110B8 80241A08 3463FFFF */ ori $v1, $v1, 0xffff -/* 9110BC 80241A0C 00431024 */ and $v0, $v0, $v1 -/* 9110C0 80241A10 AE020000 */ sw $v0, ($s0) -.L80241A14: -/* 9110C4 80241A14 8482008E */ lh $v0, 0x8e($a0) -/* 9110C8 80241A18 1C400007 */ bgtz $v0, .L80241A38 -/* 9110CC 80241A1C 3C02002F */ lui $v0, 0x2f -/* 9110D0 80241A20 34420018 */ ori $v0, $v0, 0x18 -/* 9110D4 80241A24 AC820028 */ sw $v0, 0x28($a0) -/* 9110D8 80241A28 2402000A */ addiu $v0, $zero, 0xa -/* 9110DC 80241A2C A482008E */ sh $v0, 0x8e($a0) -/* 9110E0 80241A30 2402000E */ addiu $v0, $zero, 0xe -/* 9110E4 80241A34 AE220070 */ sw $v0, 0x70($s1) -.L80241A38: -/* 9110E8 80241A38 8FBF0018 */ lw $ra, 0x18($sp) -/* 9110EC 80241A3C 8FB10014 */ lw $s1, 0x14($sp) -/* 9110F0 80241A40 8FB00010 */ lw $s0, 0x10($sp) -/* 9110F4 80241A44 03E00008 */ jr $ra -/* 9110F8 80241A48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s deleted file mode 100644 index b56acef73e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802463D0_915A80 -.double 1.1 - -.section .text - -glabel func_80241A4C_9110FC -/* 9110FC 80241A4C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 911100 80241A50 AFB10034 */ sw $s1, 0x34($sp) -/* 911104 80241A54 0080882D */ daddu $s1, $a0, $zero -/* 911108 80241A58 AFBF0040 */ sw $ra, 0x40($sp) -/* 91110C 80241A5C AFB3003C */ sw $s3, 0x3c($sp) -/* 911110 80241A60 AFB20038 */ sw $s2, 0x38($sp) -/* 911114 80241A64 AFB00030 */ sw $s0, 0x30($sp) -/* 911118 80241A68 8E220148 */ lw $v0, 0x148($s1) -/* 91111C 80241A6C 00A0902D */ daddu $s2, $a1, $zero -/* 911120 80241A70 84440008 */ lh $a0, 8($v0) -/* 911124 80241A74 0C00EABB */ jal get_npc_unsafe -/* 911128 80241A78 00C0982D */ daddu $s3, $a2, $zero -/* 91112C 80241A7C 0040802D */ daddu $s0, $v0, $zero -/* 911130 80241A80 9602008E */ lhu $v0, 0x8e($s0) -/* 911134 80241A84 2442FFFF */ addiu $v0, $v0, -1 -/* 911138 80241A88 A602008E */ sh $v0, 0x8e($s0) -/* 91113C 80241A8C 00021400 */ sll $v0, $v0, 0x10 -/* 911140 80241A90 1C400031 */ bgtz $v0, .L80241B58 -/* 911144 80241A94 0220202D */ daddu $a0, $s1, $zero -/* 911148 80241A98 C640000C */ lwc1 $f0, 0xc($s2) -/* 91114C 80241A9C 3C018024 */ lui $at, %hi(D_802463D0_915A80) -/* 911150 80241AA0 D42263D0 */ ldc1 $f2, %lo(D_802463D0_915A80)($at) -/* 911154 80241AA4 46000021 */ cvt.d.s $f0, $f0 -/* 911158 80241AA8 46220002 */ mul.d $f0, $f0, $f2 -/* 91115C 80241AAC 00000000 */ nop -/* 911160 80241AB0 8E470010 */ lw $a3, 0x10($s2) -/* 911164 80241AB4 46200020 */ cvt.s.d $f0, $f0 -/* 911168 80241AB8 44060000 */ mfc1 $a2, $f0 -/* 91116C 80241ABC 0C090505 */ jal func_80241414_910AC4 -/* 911170 80241AC0 0260282D */ daddu $a1, $s3, $zero -/* 911174 80241AC4 5440001E */ bnel $v0, $zero, .L80241B40 -/* 911178 80241AC8 3C02002F */ lui $v0, 0x2f -/* 91117C 80241ACC 24040002 */ addiu $a0, $zero, 2 -/* 911180 80241AD0 0200282D */ daddu $a1, $s0, $zero -/* 911184 80241AD4 0000302D */ daddu $a2, $zero, $zero -/* 911188 80241AD8 860300A8 */ lh $v1, 0xa8($s0) -/* 91118C 80241ADC 3C013F80 */ lui $at, 0x3f80 -/* 911190 80241AE0 44810000 */ mtc1 $at, $f0 -/* 911194 80241AE4 3C014000 */ lui $at, 0x4000 -/* 911198 80241AE8 44811000 */ mtc1 $at, $f2 -/* 91119C 80241AEC 3C01C1A0 */ lui $at, 0xc1a0 -/* 9111A0 80241AF0 44812000 */ mtc1 $at, $f4 -/* 9111A4 80241AF4 2402000F */ addiu $v0, $zero, 0xf -/* 9111A8 80241AF8 AFA2001C */ sw $v0, 0x1c($sp) -/* 9111AC 80241AFC 44833000 */ mtc1 $v1, $f6 -/* 9111B0 80241B00 00000000 */ nop -/* 9111B4 80241B04 468031A0 */ cvt.s.w $f6, $f6 -/* 9111B8 80241B08 44073000 */ mfc1 $a3, $f6 -/* 9111BC 80241B0C 27A20028 */ addiu $v0, $sp, 0x28 -/* 9111C0 80241B10 AFA20020 */ sw $v0, 0x20($sp) -/* 9111C4 80241B14 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9111C8 80241B18 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9111CC 80241B1C 0C01BFA4 */ jal fx_emote -/* 9111D0 80241B20 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9111D4 80241B24 3C02002F */ lui $v0, 0x2f -/* 9111D8 80241B28 34420001 */ ori $v0, $v0, 1 -/* 9111DC 80241B2C AE020028 */ sw $v0, 0x28($s0) -/* 9111E0 80241B30 2402001E */ addiu $v0, $zero, 0x1e -/* 9111E4 80241B34 A602008E */ sh $v0, 0x8e($s0) -/* 9111E8 80241B38 080906D5 */ j .L80241B54 -/* 9111EC 80241B3C 24020014 */ addiu $v0, $zero, 0x14 -.L80241B40: -/* 9111F0 80241B40 3442001B */ ori $v0, $v0, 0x1b -/* 9111F4 80241B44 AE020028 */ sw $v0, 0x28($s0) -/* 9111F8 80241B48 2402000F */ addiu $v0, $zero, 0xf -/* 9111FC 80241B4C A602008E */ sh $v0, 0x8e($s0) -/* 911200 80241B50 2402000F */ addiu $v0, $zero, 0xf -.L80241B54: -/* 911204 80241B54 AE220070 */ sw $v0, 0x70($s1) -.L80241B58: -/* 911208 80241B58 8FBF0040 */ lw $ra, 0x40($sp) -/* 91120C 80241B5C 8FB3003C */ lw $s3, 0x3c($sp) -/* 911210 80241B60 8FB20038 */ lw $s2, 0x38($sp) -/* 911214 80241B64 8FB10034 */ lw $s1, 0x34($sp) -/* 911218 80241B68 8FB00030 */ lw $s0, 0x30($sp) -/* 91121C 80241B6C 03E00008 */ jr $ra -/* 911220 80241B70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s deleted file mode 100644 index 39f186e834..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B74_911224 -/* 911224 80241B74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911228 80241B78 AFB20018 */ sw $s2, 0x18($sp) -/* 91122C 80241B7C 0080902D */ daddu $s2, $a0, $zero -/* 911230 80241B80 AFBF001C */ sw $ra, 0x1c($sp) -/* 911234 80241B84 AFB10014 */ sw $s1, 0x14($sp) -/* 911238 80241B88 AFB00010 */ sw $s0, 0x10($sp) -/* 91123C 80241B8C 8E510148 */ lw $s1, 0x148($s2) -/* 911240 80241B90 0C00EABB */ jal get_npc_unsafe -/* 911244 80241B94 86240008 */ lh $a0, 8($s1) -/* 911248 80241B98 0040802D */ daddu $s0, $v0, $zero -/* 91124C 80241B9C 9602008E */ lhu $v0, 0x8e($s0) -/* 911250 80241BA0 2403000D */ addiu $v1, $zero, 0xd -/* 911254 80241BA4 2442FFFF */ addiu $v0, $v0, -1 -/* 911258 80241BA8 A602008E */ sh $v0, 0x8e($s0) -/* 91125C 80241BAC 00021400 */ sll $v0, $v0, 0x10 -/* 911260 80241BB0 00021403 */ sra $v0, $v0, 0x10 -/* 911264 80241BB4 14430008 */ bne $v0, $v1, .L80241BD8 -/* 911268 80241BB8 00000000 */ nop -/* 91126C 80241BBC 86240008 */ lh $a0, 8($s1) -/* 911270 80241BC0 0C00FB3A */ jal get_enemy -/* 911274 80241BC4 24840001 */ addiu $a0, $a0, 1 -/* 911278 80241BC8 86240008 */ lh $a0, 8($s1) -/* 91127C 80241BCC 24030001 */ addiu $v1, $zero, 1 -/* 911280 80241BD0 AC43006C */ sw $v1, 0x6c($v0) -/* 911284 80241BD4 AC44007C */ sw $a0, 0x7c($v0) -.L80241BD8: -/* 911288 80241BD8 8602008E */ lh $v0, 0x8e($s0) -/* 91128C 80241BDC 28420008 */ slti $v0, $v0, 8 -/* 911290 80241BE0 10400012 */ beqz $v0, .L80241C2C -/* 911294 80241BE4 00000000 */ nop -/* 911298 80241BE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91129C 80241BEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9112A0 80241BF0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9112A4 80241BF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9112A8 80241BF8 8C460028 */ lw $a2, 0x28($v0) -/* 9112AC 80241BFC 0C00A7B5 */ jal dist2D -/* 9112B0 80241C00 8C470030 */ lw $a3, 0x30($v0) -/* 9112B4 80241C04 3C014059 */ lui $at, 0x4059 -/* 9112B8 80241C08 44811800 */ mtc1 $at, $f3 -/* 9112BC 80241C0C 44801000 */ mtc1 $zero, $f2 -/* 9112C0 80241C10 46000021 */ cvt.d.s $f0, $f0 -/* 9112C4 80241C14 4620103C */ c.lt.d $f2, $f0 -/* 9112C8 80241C18 00000000 */ nop -/* 9112CC 80241C1C 45000003 */ bc1f .L80241C2C -/* 9112D0 80241C20 3C02002F */ lui $v0, 0x2f -/* 9112D4 80241C24 34420015 */ ori $v0, $v0, 0x15 -/* 9112D8 80241C28 AE020028 */ sw $v0, 0x28($s0) -.L80241C2C: -/* 9112DC 80241C2C 8602008E */ lh $v0, 0x8e($s0) -/* 9112E0 80241C30 1C40000B */ bgtz $v0, .L80241C60 -/* 9112E4 80241C34 3C03002F */ lui $v1, 0x2f -/* 9112E8 80241C38 8E020028 */ lw $v0, 0x28($s0) -/* 9112EC 80241C3C 34630015 */ ori $v1, $v1, 0x15 -/* 9112F0 80241C40 10430003 */ beq $v0, $v1, .L80241C50 -/* 9112F4 80241C44 3C02002F */ lui $v0, 0x2f -/* 9112F8 80241C48 34420001 */ ori $v0, $v0, 1 -/* 9112FC 80241C4C AE020028 */ sw $v0, 0x28($s0) -.L80241C50: -/* 911300 80241C50 2402000F */ addiu $v0, $zero, 0xf -/* 911304 80241C54 A602008E */ sh $v0, 0x8e($s0) -/* 911308 80241C58 24020014 */ addiu $v0, $zero, 0x14 -/* 91130C 80241C5C AE420070 */ sw $v0, 0x70($s2) -.L80241C60: -/* 911310 80241C60 8FBF001C */ lw $ra, 0x1c($sp) -/* 911314 80241C64 8FB20018 */ lw $s2, 0x18($sp) -/* 911318 80241C68 8FB10014 */ lw $s1, 0x14($sp) -/* 91131C 80241C6C 8FB00010 */ lw $s0, 0x10($sp) -/* 911320 80241C70 03E00008 */ jr $ra -/* 911324 80241C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241C78_911328.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241C78_911328.s deleted file mode 100644 index 3212d5bdd2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241C78_911328.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C78_911328 -/* 911328 80241C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91132C 80241C7C AFB10014 */ sw $s1, 0x14($sp) -/* 911330 80241C80 0080882D */ daddu $s1, $a0, $zero -/* 911334 80241C84 AFBF0018 */ sw $ra, 0x18($sp) -/* 911338 80241C88 AFB00010 */ sw $s0, 0x10($sp) -/* 91133C 80241C8C 8E220148 */ lw $v0, 0x148($s1) -/* 911340 80241C90 0C00EABB */ jal get_npc_unsafe -/* 911344 80241C94 84440008 */ lh $a0, 8($v0) -/* 911348 80241C98 0040802D */ daddu $s0, $v0, $zero -/* 91134C 80241C9C 9602008E */ lhu $v0, 0x8e($s0) -/* 911350 80241CA0 2442FFFF */ addiu $v0, $v0, -1 -/* 911354 80241CA4 A602008E */ sh $v0, 0x8e($s0) -/* 911358 80241CA8 00021400 */ sll $v0, $v0, 0x10 -/* 91135C 80241CAC 1C40000B */ bgtz $v0, .L80241CDC -/* 911360 80241CB0 0200202D */ daddu $a0, $s0, $zero -/* 911364 80241CB4 24050322 */ addiu $a1, $zero, 0x322 -/* 911368 80241CB8 0C012530 */ jal ai_enemy_play_sound -/* 91136C 80241CBC 0000302D */ daddu $a2, $zero, $zero -/* 911370 80241CC0 3C02002F */ lui $v0, 0x2f -/* 911374 80241CC4 34420011 */ ori $v0, $v0, 0x11 -/* 911378 80241CC8 2403000B */ addiu $v1, $zero, 0xb -/* 91137C 80241CCC AE020028 */ sw $v0, 0x28($s0) -/* 911380 80241CD0 24020015 */ addiu $v0, $zero, 0x15 -/* 911384 80241CD4 A603008E */ sh $v1, 0x8e($s0) -/* 911388 80241CD8 AE220070 */ sw $v0, 0x70($s1) -.L80241CDC: -/* 91138C 80241CDC 8FBF0018 */ lw $ra, 0x18($sp) -/* 911390 80241CE0 8FB10014 */ lw $s1, 0x14($sp) -/* 911394 80241CE4 8FB00010 */ lw $s0, 0x10($sp) -/* 911398 80241CE8 03E00008 */ jr $ra -/* 91139C 80241CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241CF0_9113A0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241CF0_9113A0.s deleted file mode 100644 index 23ee6b6bc4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241CF0_9113A0.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF0_9113A0 -/* 9113A0 80241CF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9113A4 80241CF4 AFB10014 */ sw $s1, 0x14($sp) -/* 9113A8 80241CF8 0080882D */ daddu $s1, $a0, $zero -/* 9113AC 80241CFC AFBF0018 */ sw $ra, 0x18($sp) -/* 9113B0 80241D00 AFB00010 */ sw $s0, 0x10($sp) -/* 9113B4 80241D04 8E300148 */ lw $s0, 0x148($s1) -/* 9113B8 80241D08 0C00EABB */ jal get_npc_unsafe -/* 9113BC 80241D0C 86040008 */ lh $a0, 8($s0) -/* 9113C0 80241D10 0040202D */ daddu $a0, $v0, $zero -/* 9113C4 80241D14 9482008E */ lhu $v0, 0x8e($a0) -/* 9113C8 80241D18 24030003 */ addiu $v1, $zero, 3 -/* 9113CC 80241D1C 2442FFFF */ addiu $v0, $v0, -1 -/* 9113D0 80241D20 A482008E */ sh $v0, 0x8e($a0) -/* 9113D4 80241D24 00021400 */ sll $v0, $v0, 0x10 -/* 9113D8 80241D28 00021403 */ sra $v0, $v0, 0x10 -/* 9113DC 80241D2C 14430004 */ bne $v0, $v1, .L80241D40 -/* 9113E0 80241D30 3C031F10 */ lui $v1, 0x1f10 -/* 9113E4 80241D34 8E020000 */ lw $v0, ($s0) -/* 9113E8 80241D38 00431025 */ or $v0, $v0, $v1 -/* 9113EC 80241D3C AE020000 */ sw $v0, ($s0) -.L80241D40: -/* 9113F0 80241D40 8482008E */ lh $v0, 0x8e($a0) -/* 9113F4 80241D44 1C400005 */ bgtz $v0, .L80241D5C -/* 9113F8 80241D48 00000000 */ nop -/* 9113FC 80241D4C 8C820000 */ lw $v0, ($a0) -/* 911400 80241D50 34420002 */ ori $v0, $v0, 2 -/* 911404 80241D54 AC820000 */ sw $v0, ($a0) -/* 911408 80241D58 AE200070 */ sw $zero, 0x70($s1) -.L80241D5C: -/* 91140C 80241D5C 8FBF0018 */ lw $ra, 0x18($sp) -/* 911410 80241D60 8FB10014 */ lw $s1, 0x14($sp) -/* 911414 80241D64 8FB00010 */ lw $s0, 0x10($sp) -/* 911418 80241D68 03E00008 */ jr $ra -/* 91141C 80241D6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s deleted file mode 100644 index d21daa9685..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s +++ /dev/null @@ -1,150 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802463D8_915A88 -.word .L80241E84_911534, .L80241E94_911544, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241EAC_91155C, .L80241EBC_91156C, .L80241EDC_91158C, .L80241EFC_9115AC, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F44_9115F4, .L80241F1C_9115CC, .L80241F34_9115E4 - -.section .text - -glabel func_80241D70_911420 -/* 911420 80241D70 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 911424 80241D74 AFB40040 */ sw $s4, 0x40($sp) -/* 911428 80241D78 0080A02D */ daddu $s4, $a0, $zero -/* 91142C 80241D7C AFBF0048 */ sw $ra, 0x48($sp) -/* 911430 80241D80 AFB50044 */ sw $s5, 0x44($sp) -/* 911434 80241D84 AFB3003C */ sw $s3, 0x3c($sp) -/* 911438 80241D88 AFB20038 */ sw $s2, 0x38($sp) -/* 91143C 80241D8C AFB10034 */ sw $s1, 0x34($sp) -/* 911440 80241D90 AFB00030 */ sw $s0, 0x30($sp) -/* 911444 80241D94 8E920148 */ lw $s2, 0x148($s4) -/* 911448 80241D98 86440008 */ lh $a0, 8($s2) -/* 91144C 80241D9C 8E90000C */ lw $s0, 0xc($s4) -/* 911450 80241DA0 0C00EABB */ jal get_npc_unsafe -/* 911454 80241DA4 00A0882D */ daddu $s1, $a1, $zero -/* 911458 80241DA8 0280202D */ daddu $a0, $s4, $zero -/* 91145C 80241DAC 8E050000 */ lw $a1, ($s0) -/* 911460 80241DB0 0C0B1EAF */ jal evt_get_variable -/* 911464 80241DB4 0040A82D */ daddu $s5, $v0, $zero -/* 911468 80241DB8 AFA00010 */ sw $zero, 0x10($sp) -/* 91146C 80241DBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911470 80241DC0 8C630030 */ lw $v1, 0x30($v1) -/* 911474 80241DC4 AFA30014 */ sw $v1, 0x14($sp) -/* 911478 80241DC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 91147C 80241DCC 8C63001C */ lw $v1, 0x1c($v1) -/* 911480 80241DD0 AFA30018 */ sw $v1, 0x18($sp) -/* 911484 80241DD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911488 80241DD8 8C630024 */ lw $v1, 0x24($v1) -/* 91148C 80241DDC AFA3001C */ sw $v1, 0x1c($sp) -/* 911490 80241DE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911494 80241DE4 8C630028 */ lw $v1, 0x28($v1) -/* 911498 80241DE8 27B30010 */ addiu $s3, $sp, 0x10 -/* 91149C 80241DEC AFA30020 */ sw $v1, 0x20($sp) -/* 9114A0 80241DF0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9114A4 80241DF4 3C014282 */ lui $at, 0x4282 -/* 9114A8 80241DF8 44810000 */ mtc1 $at, $f0 -/* 9114AC 80241DFC 8C63002C */ lw $v1, 0x2c($v1) -/* 9114B0 80241E00 0040802D */ daddu $s0, $v0, $zero -/* 9114B4 80241E04 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9114B8 80241E08 A7A0002C */ sh $zero, 0x2c($sp) -/* 9114BC 80241E0C 1220000A */ beqz $s1, .L80241E38 -/* 9114C0 80241E10 AFA30024 */ sw $v1, 0x24($sp) -/* 9114C4 80241E14 AE800070 */ sw $zero, 0x70($s4) -/* 9114C8 80241E18 8EA20000 */ lw $v0, ($s5) -/* 9114CC 80241E1C 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9114D0 80241E20 A6A0008E */ sh $zero, 0x8e($s5) -/* 9114D4 80241E24 00431024 */ and $v0, $v0, $v1 -/* 9114D8 80241E28 AEA20000 */ sw $v0, ($s5) -/* 9114DC 80241E2C 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9114E0 80241E30 34420018 */ ori $v0, $v0, 0x18 -/* 9114E4 80241E34 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E38: -/* 9114E8 80241E38 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9114EC 80241E3C 30620004 */ andi $v0, $v1, 4 -/* 9114F0 80241E40 10400007 */ beqz $v0, .L80241E60 -/* 9114F4 80241E44 00000000 */ nop -/* 9114F8 80241E48 824200B4 */ lb $v0, 0xb4($s2) -/* 9114FC 80241E4C 1440003E */ bnez $v0, .L80241F48 -/* 911500 80241E50 0000102D */ daddu $v0, $zero, $zero -/* 911504 80241E54 2402FFFB */ addiu $v0, $zero, -5 -/* 911508 80241E58 00621024 */ and $v0, $v1, $v0 -/* 91150C 80241E5C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E60: -/* 911510 80241E60 8E830070 */ lw $v1, 0x70($s4) -/* 911514 80241E64 2C620016 */ sltiu $v0, $v1, 0x16 -/* 911518 80241E68 10400036 */ beqz $v0, .L80241F44_9115F4 -/* 91151C 80241E6C 00031080 */ sll $v0, $v1, 2 -/* 911520 80241E70 3C018024 */ lui $at, %hi(jtbl_802463D8_915A88) -/* 911524 80241E74 00220821 */ addu $at, $at, $v0 -/* 911528 80241E78 8C2263D8 */ lw $v0, %lo(jtbl_802463D8_915A88)($at) -/* 91152C 80241E7C 00400008 */ jr $v0 -/* 911530 80241E80 00000000 */ nop -.L80241E84_911534: -/* 911534 80241E84 0280202D */ daddu $a0, $s4, $zero -/* 911538 80241E88 0200282D */ daddu $a1, $s0, $zero -/* 91153C 80241E8C 0C090578 */ jal func_802415E0_910C90 -/* 911540 80241E90 0260302D */ daddu $a2, $s3, $zero -.L80241E94_911544: -/* 911544 80241E94 0280202D */ daddu $a0, $s4, $zero -/* 911548 80241E98 0200282D */ daddu $a1, $s0, $zero -/* 91154C 80241E9C 0C0905BC */ jal func_802416F0_910DA0 -/* 911550 80241EA0 0260302D */ daddu $a2, $s3, $zero -/* 911554 80241EA4 080907D2 */ j .L80241F48 -/* 911558 80241EA8 0000102D */ daddu $v0, $zero, $zero -.L80241EAC_91155C: -/* 91155C 80241EAC 0280202D */ daddu $a0, $s4, $zero -/* 911560 80241EB0 0200282D */ daddu $a1, $s0, $zero -/* 911564 80241EB4 0C09064B */ jal func_8024192C_910FDC -/* 911568 80241EB8 0260302D */ daddu $a2, $s3, $zero -.L80241EBC_91156C: -/* 91156C 80241EBC 0280202D */ daddu $a0, $s4, $zero -/* 911570 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* 911574 80241EC4 0C090670 */ jal func_802419C0_911070 -/* 911578 80241EC8 0260302D */ daddu $a2, $s3, $zero -/* 91157C 80241ECC 8E830070 */ lw $v1, 0x70($s4) -/* 911580 80241ED0 2402000E */ addiu $v0, $zero, 0xe -/* 911584 80241ED4 1462001C */ bne $v1, $v0, .L80241F48 -/* 911588 80241ED8 0000102D */ daddu $v0, $zero, $zero -.L80241EDC_91158C: -/* 91158C 80241EDC 0280202D */ daddu $a0, $s4, $zero -/* 911590 80241EE0 0200282D */ daddu $a1, $s0, $zero -/* 911594 80241EE4 0C090693 */ jal func_80241A4C_9110FC -/* 911598 80241EE8 0260302D */ daddu $a2, $s3, $zero -/* 91159C 80241EEC 8E830070 */ lw $v1, 0x70($s4) -/* 9115A0 80241EF0 2402000F */ addiu $v0, $zero, 0xf -/* 9115A4 80241EF4 14620014 */ bne $v1, $v0, .L80241F48 -/* 9115A8 80241EF8 0000102D */ daddu $v0, $zero, $zero -.L80241EFC_9115AC: -/* 9115AC 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* 9115B0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* 9115B4 80241F04 0C0906DD */ jal func_80241B74_911224 -/* 9115B8 80241F08 0260302D */ daddu $a2, $s3, $zero -/* 9115BC 80241F0C 8E830070 */ lw $v1, 0x70($s4) -/* 9115C0 80241F10 24020010 */ addiu $v0, $zero, 0x10 -/* 9115C4 80241F14 1462000C */ bne $v1, $v0, .L80241F48 -/* 9115C8 80241F18 0000102D */ daddu $v0, $zero, $zero -.L80241F1C_9115CC: -/* 9115CC 80241F1C 0280202D */ daddu $a0, $s4, $zero -/* 9115D0 80241F20 0200282D */ daddu $a1, $s0, $zero -/* 9115D4 80241F24 0C09071E */ jal func_80241C78_911328 -/* 9115D8 80241F28 0260302D */ daddu $a2, $s3, $zero -/* 9115DC 80241F2C 080907D2 */ j .L80241F48 -/* 9115E0 80241F30 0000102D */ daddu $v0, $zero, $zero -.L80241F34_9115E4: -/* 9115E4 80241F34 0280202D */ daddu $a0, $s4, $zero -/* 9115E8 80241F38 0200282D */ daddu $a1, $s0, $zero -/* 9115EC 80241F3C 0C09073C */ jal func_80241CF0_9113A0 -/* 9115F0 80241F40 0260302D */ daddu $a2, $s3, $zero -.L80241F44_9115F4: -/* 9115F4 80241F44 0000102D */ daddu $v0, $zero, $zero -.L80241F48: -/* 9115F8 80241F48 8FBF0048 */ lw $ra, 0x48($sp) -/* 9115FC 80241F4C 8FB50044 */ lw $s5, 0x44($sp) -/* 911600 80241F50 8FB40040 */ lw $s4, 0x40($sp) -/* 911604 80241F54 8FB3003C */ lw $s3, 0x3c($sp) -/* 911608 80241F58 8FB20038 */ lw $s2, 0x38($sp) -/* 91160C 80241F5C 8FB10034 */ lw $s1, 0x34($sp) -/* 911610 80241F60 8FB00030 */ lw $s0, 0x30($sp) -/* 911614 80241F64 03E00008 */ jr $ra -/* 911618 80241F68 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s index 6806ba89ec..89948040a2 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s @@ -13,8 +13,8 @@ glabel func_80240604_AF7F54 /* AF7F74 80240624 8C620000 */ lw $v0, ($v1) /* AF7F78 80240628 5040000A */ beql $v0, $zero, .L80240654 /* AF7F7C 8024062C 00041080 */ sll $v0, $a0, 2 -/* AF7F80 80240630 3C058024 */ lui $a1, %hi(D_802463B8_915A68) -/* AF7F84 80240634 24A563B8 */ addiu $a1, $a1, %lo(D_802463B8_915A68) +/* AF7F80 80240630 3C058024 */ lui $a1, %hi(D_802463B8_kkj_19) +/* AF7F84 80240634 24A563B8 */ addiu $a1, $a1, %lo(D_802463B8_kkj_19) .L80240638: /* AF7F88 80240638 24630004 */ addiu $v1, $v1, 4 /* AF7F8C 8024063C 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_80240604_AF7F54 /* AF7F9C 8024064C 24A50004 */ addiu $a1, $a1, 4 /* AF7FA0 80240650 00041080 */ sll $v0, $a0, 2 .L80240654: -/* AF7FA4 80240654 3C018024 */ lui $at, %hi(D_802463B8_915A68) +/* AF7FA4 80240654 3C018024 */ lui $at, %hi(D_802463B8_kkj_19) /* AF7FA8 80240658 00220821 */ addu $at, $at, $v0 -/* AF7FAC 8024065C AC2063B8 */ sw $zero, %lo(D_802463B8_915A68)($at) +/* AF7FAC 8024065C AC2063B8 */ sw $zero, %lo(D_802463B8_kkj_19)($at) /* AF7FB0 80240660 080901A4 */ j .L80240690 /* AF7FB4 80240664 00000000 */ nop .L80240668: -/* AF7FB8 80240668 3C038024 */ lui $v1, %hi(D_802463B8_915A68) -/* AF7FBC 8024066C 246363B8 */ addiu $v1, $v1, %lo(D_802463B8_915A68) +/* AF7FB8 80240668 3C038024 */ lui $v1, %hi(D_802463B8_kkj_19) +/* AF7FBC 8024066C 246363B8 */ addiu $v1, $v1, %lo(D_802463B8_kkj_19) /* AF7FC0 80240670 0060282D */ daddu $a1, $v1, $zero .L80240674: /* AF7FC4 80240674 24820080 */ addiu $v0, $a0, 0x80 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 3e16fd04f3..a190f7efa7 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -13350,16 +13350,16 @@ iwa_01_UnkNpcAIFunc9 = 0x80240998; // type:func rom:0x910048 iwa_01_UnkDurationCheckNoArgs = 0x80240A38; // type:func rom:0x9100E8 iwa_01_UnkFunc54 = 0x80240A7C; // type:func rom:0x91012C iwa_01_UnkFunc55 = 0x80240FB8; // type:func rom:0x910668 -func_80241414_910AC4 = 0x80241414; // type:func rom:0x910AC4 -func_802415E0_910C90 = 0x802415E0; // type:func rom:0x910C90 -func_802416F0_910DA0 = 0x802416F0; // type:func rom:0x910DA0 -func_8024192C_910FDC = 0x8024192C; // type:func rom:0x910FDC -func_802419C0_911070 = 0x802419C0; // type:func rom:0x911070 -func_80241A4C_9110FC = 0x80241A4C; // type:func rom:0x9110FC -func_80241B74_911224 = 0x80241B74; // type:func rom:0x911224 -func_80241C78_911328 = 0x80241C78; // type:func rom:0x911328 -func_80241CF0_9113A0 = 0x80241CF0; // type:func rom:0x9113A0 -func_80241D70_911420 = 0x80241D70; // type:func rom:0x911420 +iwa_01_MontyMoleAI_CanAttack = 0x80241414; // type:func rom:0x910AC4 +iwa_01_MontyMoleAI_Init = 0x802415E0; // type:func rom:0x910C90 +iwa_01_MontyMoleAI_Wander = 0x802416F0; // type:func rom:0x910DA0 +iwa_01_MontyMoleAI_PreSurface = 0x8024192C; // type:func rom:0x910FDC +iwa_01_MontyMoleAI_Surface = 0x802419C0; // type:func rom:0x911070 +iwa_01_MontyMoleAI_DrawRock = 0x80241A4C; // type:func rom:0x9110FC +iwa_01_MontyMoleAI_ThrowRock = 0x80241B74; // type:func rom:0x911224 +iwa_01_MontyMoleAI_PreBurrow = 0x80241C78; // type:func rom:0x911328 +iwa_01_MontyMoleAI_Burrow = 0x80241CF0; // type:func rom:0x9113A0 +iwa_01_MontyMoleAI_Main = 0x80241D70; // type:func rom:0x911420 iwa_01_UnkNpcAIMainFunc7 = 0x80241F6C; // type:func rom:0x91161C iwa_01_GetEncounterEnemyIsOwner = 0x8024228C; // type:func rom:0x91193C func_802422C4_911974 = 0x802422C4; // type:func rom:0x911974 @@ -22717,7 +22717,7 @@ EF2680_UnkDistFunc = 0x80242218; // type:func rom:0xEF4828 EF2680_UnkNpcAIFunc12 = 0x8024234C; // type:func rom:0xEF495C EF2680_set_script_owner_npc_col_height = 0x802424B0; // type:func rom:0xEF4AC0 EF2680_DeadUnkNpcAIMainFunc5 = 0x80242530; // type:func rom:0xEF4B40 -func_8024299C_EF4FAC = 0x8024299C; // type:func rom:0xEF4FAC +EF2680_DeadUnkNpcAIMainFunc6 = 0x8024299C; // type:func rom:0xEF4FAC N(sixFloats) = 0x802444BC; // type:data rom:0xEF6ACC flo_14_ConsumableChoiceList = 0x802453B0; // type:data rom:0xEF79C0 D_802453B8_EF79C8 = 0x802453B8; // type:data rom:0xEF79C8 @@ -23606,7 +23606,8 @@ D_80246538 = 0x80246538; // type:data D_80246550 = 0x80246550; // type:data D_80246554 = 0x80246554; // type:data D_80246558 = 0x80246558; // type:data -D_80246558_kkj_19 = 0x80246558; // type:data +D_802463B8_kkj_19 = 0x802463B8; +D_80246558_kkj_19 = 0x80246558; D_8024655C = 0x8024655C; // type:data D_80246560 = 0x80246560; // type:data D_80246568 = 0x80246568; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index b58736453a..3cf1479a64 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1212,6 +1212,7 @@ D_80247BB8_pra_19 = 0x80247BB8; D_802312E0_battle_area_omo2 = 0x802312E0; D_802312F8_battle_area_omo2 = 0x802312F8; some_80241FBC = 0x80241FBC; +D_802463B8_kkj_19 = 0x802463B8; D_80246558_kkj_19 = 0x80246558; D_80077A40 = 0x80077A40;