pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

world script data (#933)

Browse Source 
* nok_01 ok

* nok_01 cleanup

* nok_02 ok

* nok_02 cleanup pt 1

* nok_02 cleanup pt 2

* nok_02 cleanup pt 3

* map api data

* rooms api

* rooms cleanup

* rooms cleanup

* done rooms cleanup

* fix mixed up enemy/npc flags

* tabs

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-02-05 19:13:45 -05:00 committed by GitHub
parent a78099f909
commit 713883c750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
432 changed files with 10264 additions and 6089 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
include/enums.h
View File

@ -235,6 +235,35 @@ enum StoryProgress {
STORY_61 = 97,
};
enum KoopaKootFavors {
KOOT_FAVOR_CH1_1 = 0,
KOOT_FAVOR_CH1_2 = 1,
KOOT_FAVOR_CH2_1 = 2,
KOOT_FAVOR_CH2_2 = 3,
KOOT_FAVOR_CH2_3 = 4,
KOOT_FAVOR_CH3_1 = 5,
KOOT_FAVOR_CH3_2 = 6,
KOOT_FAVOR_CH3_3 = 7,
KOOT_FAVOR_CH4_1 = 8,
KOOT_FAVOR_CH4_2 = 9,
KOOT_FAVOR_CH4_3 = 10,
KOOT_FAVOR_CH5_1 = 11,
KOOT_FAVOR_CH5_2 = 12,
KOOT_FAVOR_CH5_3 = 13,
KOOT_FAVOR_CH6_1 = 14,
KOOT_FAVOR_CH6_2 = 15,
KOOT_FAVOR_CH6_3 = 16,
KOOT_FAVOR_CH7_1 = 17,
KOOT_FAVOR_CH7_2 = 18,
KOOT_FAVOR_CH7_3 = 19,
};
enum KoopaKootFavorStates {
KOOT_FAVOR_STATE_0 = 0,
KOOT_FAVOR_STATE_1 = 1,
KOOT_FAVOR_STATE_2 = 2,
};
enum EncounterTriggers {
ENCOUNTER_TRIGGER_NONE = 1,
ENCOUNTER_TRIGGER_JUMP = 2,
@ -451,7 +480,7 @@ enum Abilities {
ABILITY_FLOWER_FINDER = 0x0000002C,
ABILITY_DIZZY_ATTACK = 0x0000002D,
ABILITY_FINAL_GOOMPA = 0x0000002E,
ABILITY_FINAL_BOMBOMB = 0x0000002F,
ABILITY_FINAL_BOBOMB = 0x0000002F,
ABILITY_DEEP_FOCUS = 0x00000030,
ABILITY_SUPER_FOCUS = 0x00000031,
ABILITY_KAIDEN = 0x00000032,
@ -526,6 +555,7 @@ enum SoundIDs {
SOUND_36 = 0x00000036,
SOUND_37 = 0x00000037,
SOUND_38 = 0x00000038,
SOUND_39 = 0x00000039,
SOUND_3F = 0x0000003F,
SOUND_40 = 0x00000040,
SOUND_41 = 0x00000041,
@ -824,6 +854,8 @@ enum SoundIDs {
SOUND_227 = 0x00000227,
SOUND_228 = 0x00000228,
SOUND_229 = 0x00000229,
SOUND_22A = 0x0000022A,
SOUND_22B = 0x0000022B,
SOUND_22C = 0x0000022C,
SOUND_22D = 0x0000022D,
SOUND_230 = 0x00000230,
@ -1249,6 +1281,7 @@ enum SoundIDs {
SOUND_2085 = 0x00002085,
SOUND_2086 = 0x00002086,
SOUND_2087 = 0x00002087,
SOUND_2088 = 0x00002088,
SOUND_2089 = 0x00002089,
SOUND_208A = 0x0000208A,
SOUND_208B = 0x0000208B,
@ -1382,6 +1415,7 @@ enum SoundIDs {
SOUND_212D = 0x0000212D,
SOUND_212E = 0x0000212E,
SOUND_8161 = 0x00008161,
SOUND_80000000 = 0x80000000,
SOUND_80000001 = 0x80000001,
SOUND_80000002 = 0x80000002,
@ -1476,6 +1510,9 @@ enum SoundIDs {
SOUND_8000006B = 0x8000006B,
SOUND_8000006C = 0x8000006C,
SOUND_ROOM_DOOR_OPEN = 0xA0000000,
SOUND_ROOM_DOOR_CLOSE = 0xA0000001,
SOUND_FIRE_BAR_0 = 0xB0000000,
SOUND_FIRE_BAR_1 = 0xB0000001,
SOUND_FIRE_BAR_2 = 0xB0000002,
@ -1509,6 +1546,8 @@ enum SoundIDs {
};
enum SoundInstanceFlags {
SOUND_INSTANCE_FLAG_1 = 0x00000001,
SOUND_INSTANCE_FLAG_2 = 0x00000002,
SOUND_INSTANCE_FLAG_4 = 0x00000004,
};
@ -1530,9 +1569,9 @@ enum SoundSpatializationFlags {
enum SoundType {
SOUND_TYPE_SPECIAL = 0x80000000,
SOUND_TYPE_LOOPING = 0,
SOUND_TYPE_DOOR1 = 1,
SOUND_TYPE_DOOR2 = 2,
SOUND_TYPE_ALTERNATING = 3
SOUND_TYPE_EXIT_DOOR = 1, // 0x90000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_ROOM_DOOR = 2, // 0xA0000000 (with SOUND_TYPE_SPECIAL)
SOUND_TYPE_ALTERNATING = 3, // 0xB0000000 (with SOUND_TYPE_SPECIAL)
};
enum SoundIDBits {
@ -1664,39 +1703,39 @@ enum ItemIDs {
ITEM_SNOWMAN_SCARF = 0x00000032,
ITEM_RED_KEY = 0x00000033,
ITEM_BLUE_KEY = 0x00000034,
ITEM_UNUSED_LETTER01 = 0x00000035,
ITEM_LETTER01 = 0x00000036,
ITEM_LETTER02 = 0x00000037,
ITEM_LETTER03 = 0x00000038,
ITEM_LETTER04 = 0x00000039,
ITEM_UNUSED_LETTER_1 = 0x00000035,
ITEM_LETTER_TO_MERLON = 0x00000036,
ITEM_LETTER_TO_GOOMPA = 0x00000037,
ITEM_LETTER_TO_MORT_T = 0x00000038,
ITEM_LETTER_TO_RUSS_T = 0x00000039,
ITEM_LETTER_TO_MAYOR_PENGUIN = 0x0000003A,
ITEM_LETTER_TO_MERLOW = 0x0000003B,
ITEM_LETTER07 = 0x0000003C,
ITEM_LETTER08 = 0x0000003D,
ITEM_LETTER_TO_FICE_T = 0x0000003C,
ITEM_LETTER_TO_NOMADIMOUSE = 0x0000003D,
ITEM_LETTER_TO_MINHT = 0x0000003E,
ITEM_UNUSED_LETTER02 = 0x0000003F,
ITEM_LETTER10 = 0x00000040,
ITEM_UNUSED_LETTER_2 = 0x0000003F,
ITEM_LETTER_CHAIN_GOOMPAPA_1 = 0x00000040,
ITEM_LETTER_TO_IGOR = 0x00000041,
ITEM_UNUSED_LETTER03 = 0x00000042,
ITEM_UNUSED_LETTER04 = 0x00000043,
ITEM_UNUSED_LETTER05 = 0x00000044,
ITEM_LETTER_TO_FRANKY = 0x00000045,
ITEM_LETTER13 = 0x00000046,
ITEM_LETTER14 = 0x00000047,
ITEM_LETTER15 = 0x00000048,
ITEM_LETTER16 = 0x00000049,
ITEM_LETTER17 = 0x0000004A,
ITEM_LETTER18 = 0x0000004B,
ITEM_LETTER19 = 0x0000004C,
ITEM_UNUSED_LETTER06 = 0x0000004D,
ITEM_LETTER20 = 0x0000004E,
ITEM_LETTER_TO_RED_YOSHI_KID = 0x0000004F,
ITEM_LETTER_TO_DANE_T = 0x00000050,
ITEM_LETTER_TO_FROST_T = 0x00000051,
ITEM_LETTER24 = 0x00000052,
ITEM_UNUSED_LETTER_3 = 0x00000042,
ITEM_UNUSED_LETTER_4 = 0x00000043,
ITEM_UNUSED_LETTER_5 = 0x00000044,
ITEM_LETTER_CHAIN_FRANKY = 0x00000045,
ITEM_LETTER_CHAIN_MUSS_T = 0x00000046,
ITEM_LETTER_CHAIN_KOOVER_1 = 0x00000047,
ITEM_LETTER_CHAIN_FISHMAEL = 0x00000048,
ITEM_LETTER_CHAIN_KOOVER_2 = 0x00000049,
ITEM_LETTER_CHAIN_MR_E = 0x0000004A,
ITEM_LETTER_CHAIN_MISS_T = 0x0000004B,
ITEM_LETTER_CHAIN_LITTLE_MOUSER = 0x0000004C,
ITEM_UNUSED_LETTER_6 = 0x0000004D,
ITEM_LETTER_CHAIN_DANE_T_1 = 0x0000004E,
ITEM_LETTER_CHAIN_YOSHI_KID = 0x0000004F,
ITEM_LETTER_CHAIN_DANE_T_2 = 0x00000050,
ITEM_LETTER_CHAIN_FROST_T = 0x00000051,
ITEM_LETTER_CHAIN_GOOMPAPA_2 = 0x00000052,
ITEM_ARTIFACT = 0x00000053,
ITEM_LETTER_TO_KOLORADO = 0x00000054,
ITEM_UNUSED_LETTER07 = 0x00000055,
ITEM_UNUSED_LETTER_7 = 0x00000055,
ITEM_DOLLY = 0x00000056,
ITEM_WATER_STONE = 0x00000057,
ITEM_MAGICAL_BEAN = 0x00000058,
@ -2433,7 +2472,7 @@ enum AmbientSounds {
AMBIENT_RADIO = 16, // radio songs for nok
// the following 4 IDs are reserved for additional radio songs,
// and no more are expected to follow after that
// see: func_80053F80
// see: au_ambient_load
};
enum EncounterOutcomes {
@ -3049,6 +3088,12 @@ enum EntityCollisionFlags {
ENTITY_COLLISION_PLAYER_LAST_FLOOR = 0x00000100
};
enum EntityHideMode {
ENTITY_HIDE_MODE_0 = 0,
ENTITY_HIDE_MODE_1 = 1,
ENTITY_HIDE_MODE_2 = 2,
};
typedef enum PushGridOccupant {
PUSH_GRID_EMPTY = 0,
PUSH_GRID_BLOCK = 1,
@ -3067,9 +3112,9 @@ enum TriggerFlags {
TRIGGER_WALL_TOUCH = 0x00000400,
TRIGGER_FLOOR_PRESS_A = 0x00000800,
TRIGGER_WALL_HAMMER = 0x00001000,
TRIGGER_FLAG_2000 = 0x00002000,
TRIGGER_FLAG_4000 = 0x00004000,
TRIGGER_FLAG_8000 = 0x00008000,
TRIGGER_FLAG_2000 = 0x00002000,
TRIGGER_FLAG_4000 = 0x00004000,
TRIGGER_FLAG_8000 = 0x00008000,
TRIGGER_GAME_FLAG_SET = 0x00010000,
TRIGGER_AREA_FLAG_SET = 0x00020000,
TRIGGER_CEILING_TOUCH = 0x00040000,
@ -3309,13 +3354,13 @@ enum NpcPalSwapState {
};
enum NpcFlags {
NPC_FLAG_PASSIVE = 0x00000001, ///< Collision does not trigger battle
NPC_FLAG_1 = 0x00000001,
NPC_FLAG_2 = 0x00000002,
NPC_FLAG_4 = 0x00000004,
NPC_FLAG_ENABLE_HIT_SCRIPT = 0x00000008,
NPC_FLAG_8 = 0x00000008,
NPC_FLAG_HAS_SHADOW = 0x00000010, ///< Set by default and by enable_npc_shadow
NPC_FLAG_NO_AI = 0x00000020, ///< Disable movement AI and collision (idle animation plays)
NPC_FLAG_40 = 0x00000040,
NPC_FLAG_20 = 0x00000020,
NPC_FLAG_IGNORE_WORLD_COLLISION = 0x00000040,
NPC_FLAG_UPSIDE_DOWN = 0x00000080, ///< Render NPCs upside-down
NPC_FLAG_100 = 0x00000100, // TODO
NPC_FLAG_GRAVITY = 0x00000200, ///< Enables gravity. Does nothing if NPC_FLAG_JUMPING is set.
@ -3332,14 +3377,14 @@ enum NpcFlags {
NPC_FLAG_MOTION_BLUR = 0x00100000, ///< Gives motion blur effect as NPC moves. Set by enable_npc_blur
NPC_FLAG_200000 = 0x00200000,
NPC_FLAG_400000 = 0x00400000,
NPC_FLAG_NO_DROPS = 0x00800000, ///< Do not drop hearts, flowers, or coins on defeat
NPC_FLAG_HIDING = 0x00800000,
NPC_FLAG_1000000 = 0x01000000, // TODO. fails assert in set_npc_sprite
NPC_FLAG_SIMPLIFIED_PHYSICS = 0x02000000,
/// Use simpler, faster physics calculations:
/// - Perform only one lateral collision test during motion
/// - Allow falling below Y=-2000 (by default, NPC_FLAG_JUMPING is set when an NPC falls out-of-bounds)
NPC_FLAG_PARTICLE = 0x04000000,
NPC_FLAG_8000000 = 0x08000000,
NPC_FLAG_WORLD_COLLISION_DIRTY = 0x08000000,
NPC_FLAG_10000000 = 0x10000000,
NPC_FLAG_20000000 = 0x20000000,
NPC_FLAG_NO_ANIMS_LOADED = 0x40000000, ///< Npc has no animations loaded
@ -3885,7 +3930,7 @@ enum MoveIDs {
MOVE_SPEEDY_SPIN = 0x0000006D,
MOVE_REFUND = 0x0000006E,
MOVE_UNUSED_FINAL_GOOMPA = 0x0000006F,
MOVE_UNUSED_FINAL_BOMBOMB = 0x00000070,
MOVE_UNUSED_FINAL_BOBOMB = 0x00000070,
MOVE_DEEP_FOCUS = 0x00000071,
MOVE_SUPER_FOCUS = 0x00000072,
MOVE_KAIDEN = 0x00000073,
@ -4830,39 +4875,82 @@ enum ModelAnimUnit {
MDL_ANIMATOR_F = 0xF,
};
enum MapRoomFlags {
ROOM_FLAGS_VISGROUP_MASK = 0xF000,
ROOM_FLAGS_MASK = 0x0F00,
ROOM_FLAGS_DOOR_TYPE_MASK = 0x00FF,
ROOM_DOOR_RIGHT_HINGE_OPENS_OUT = 0, // left --> center (hinge on right)
ROOM_DOOR_RIGHT_HINGE_OPENS_IN = 1, // center --> left
ROOM_DOOR_LEFT_HINGE_OPENS_OUT = 2, // right --> center (hinge on left)
ROOM_DOOR_LEFT_HINGE_OPENS_IN = 3, // center --> right
ROOM_DOOR_STRAIGHT_THROUGH = 4, // center --> center
ROOM_LARGE_DOOR_RIGHT_HINGE_OPENS_OUT = 5, // deep left --> center (hinge on right)
ROOM_LARGE_DOOR_RIGHT_HINGE_OPENS_IN = 6, // center --> deep left
ROOM_LARGE_DOOR_LEFT_HINGE_OPENS_OUT = 7, // deep right --> center (hinge on left)
ROOM_FLAG_CUSTOM_ANIM_OPEN_DOOR = 0x100,
ROOM_FLAG_CUSTOM_ANIM_WALL_ROT = 0x200,
ROOM_FLAG_CUSTOM_ANIM_DROP_DOOR = 0x400,
ROOM_FLAG_EXIT_DOOR_DROPS = 0x800, // for internal use
};
enum MapRoomNotifications {
// dispatched to listener script during interactions with the room door
ROOM_UPDATE_ENTER_BEGIN = 0,
ROOM_UPDATE_ENTER_DONE = 1,
ROOM_UPDATE_EXIT_BEGIN = 2,
ROOM_UPDATE_EXIT_END = 3,
// when handling ROOM_UPDATE_ENTER_BEGIN, listener may return this to cancel the door opening. useful for locked doors.
ROOM_UPDATE_REQUEST_CANCEL = -1,
// anim move door updates
ROOM_MOVE_DOOR_ENTER_OPEN = 0,
ROOM_MOVE_DOOR_ENTER_CLOSE = 1,
ROOM_MOVE_DOOR_EXIT_OPEN = 2,
ROOM_MOVE_DOOR_EXIT_CLOSE = 3,
// anim move walls update
ROOM_MOVE_WALL_OPEN = 0,
ROOM_MOVE_WALL_1 = 1, // unused
ROOM_MOVE_WALL_2 = 2, // unused
ROOM_MOVE_WALL_CLOSE = 3,
// anim drop droor updates
ROOM_DROP_DOOR_ENTER = 0,
ROOM_DROP_DOOR_1 = 1, // unused
ROOM_DROP_DOOR_2 = 2, // unused
ROOM_DROP_DOOR_EXIT = 3,
};
enum EnemyFlags {
ENEMY_FLAG_1 = 0x00000001,
ENEMY_FLAG_2 = 0x00000002,
ENEMY_FLAG_4 = 0x00000004,
ENEMY_FLAG_8 = 0x00000008,
ENEMY_FLAG_FLED = 0x00000010,
ENEMY_FLAG_20 = 0x00000020,
ENEMY_FLAG_40 = 0x00000040,
ENEMY_FLAG_80 = 0x00000080,
ENEMY_FLAG_100 = 0x00000100,
ENEMY_FLAG_200 = 0x00000200,
ENEMY_FLAG_400 = 0x00000400,
ENEMY_FLAG_800 = 0x00000800,
ENEMY_FLAG_GRAVITY = 0x00001000,
ENEMY_FLAG_2000 = 0x00002000,
ENEMY_FLAG_4000 = 0x00004000,
ENEMY_FLAG_8000 = 0x00008000,
ENEMY_FLAG_10000 = 0x00010000,
ENEMY_FLAG_20000 = 0x00020000,
ENEMY_FLAG_40000 = 0x00040000,
ENEMY_FLAG_80000 = 0x00080000,
ENEMY_FLAG_100000 = 0x00100000,
ENEMY_FLAG_200000 = 0x00200000,
ENEMY_FLAG_400000 = 0x00400000,
ENEMY_FLAG_800000 = 0x00800000,
ENEMY_FLAG_IGNORE_TOUCH = 0x01000000,
ENEMY_FLAG_IGNORE_JUMP = 0x02000000,
ENEMY_FLAG_IGNORE_HAMMER = 0x04000000,
ENEMY_FLAG_8000000 = 0x08000000,
ENEMY_FLAG_10000000 = 0x10000000,
ENEMY_FLAG_20000000 = 0x20000000,
ENEMY_FLAG_40000000 = 0x40000000, // spawn in AI_STATE_CHASE_INIT
ENEMY_FLAG_80000000 = 0x80000000,
ENEMY_FLAG_PASSIVE = 0x00000001, ///< Collision does not trigger battle
ENEMY_FLAG_2 = 0x00000002,
ENEMY_FLAG_4 = 0x00000004,
ENEMY_FLAG_ENABLE_HIT_SCRIPT = 0x00000008,
ENEMY_FLAG_FLED = 0x00000010,
ENEMY_FLAG_DISABLE_AI = 0x00000020, ///< Disable movement AI and collision (idle animation plays)
ENEMY_FLAG_40 = 0x00000040,
ENEMY_FLAG_80 = 0x00000080,
ENEMY_FLAG_100 = 0x00000100,
ENEMY_FLAG_200 = 0x00000200,
ENEMY_FLAG_400 = 0x00000400,
ENEMY_FLAG_800 = 0x00000800,
ENEMY_FLAG_GRAVITY = 0x00001000,
ENEMY_FLAG_2000 = 0x00002000,
ENEMY_FLAG_4000 = 0x00004000,
ENEMY_FLAG_8000 = 0x00008000,
ENEMY_FLAG_10000 = 0x00010000,
ENEMY_FLAG_20000 = 0x00020000,
ENEMY_FLAG_40000 = 0x00040000,
ENEMY_FLAG_80000 = 0x00080000,
ENEMY_FLAG_100000 = 0x00100000,
ENEMY_FLAG_200000 = 0x00200000,
ENEMY_FLAG_400000 = 0x00400000,
ENEMY_FLAG_NO_DROPS = 0x00800000, ///< Do not drop hearts, flowers, or coins on defeat
ENEMY_FLAG_IGNORE_TOUCH = 0x01000000,
ENEMY_FLAG_IGNORE_JUMP = 0x02000000,
ENEMY_FLAG_IGNORE_HAMMER = 0x04000000,
ENEMY_FLAG_8000000 = 0x08000000,
ENEMY_FLAG_10000000 = 0x10000000,
ENEMY_FLAG_20000000 = 0x20000000,
ENEMY_FLAG_40000000 = 0x40000000, // spawn in AI_STATE_CHASE_INIT
ENEMY_FLAG_80000000 = 0x80000000,
};
// used with enemy->aiFlags

2
include/macros.h
View File

@ -153,7 +153,7 @@
#define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0)))
#define ITEM_VIS_GROUP(itemID, visGroupID) ((visGroupID) << 16 | (itemID))
#define VIS_GROUP_PAIR(group1, group2) ((group1) << 12 | (group2))
#define PACK_ROOM_FLAGS(itemVisGroup, roomFlags) ((itemVisGroup) << 12 | (roomFlags))
// loads integrator with standard parameter set used for falling

6
include/saved_flag_names.h
View File

@ -568,8 +568,8 @@ enum GameFlags {
GF_Unused_HOS_21 = GameFlag(0x234),
GF_Unused_HOS_22 = GameFlag(0x235),
GF_NOK01_RecoveredShellA = GameFlag(0x236),
GF_NOK01_RecoveredShellB = GameFlag(0x237),
GF_NOK01_RecoveredShellC = GameFlag(0x238),
GF_NOK01_RecoveredBlockShell = GameFlag(0x237),
GF_NOK01_RecoveredTreeShell = GameFlag(0x238),
GF_NOK02_StolenShellComplaintA = GameFlag(0x239),
GF_NOK02_RecoveredShellA = GameFlag(0x23A),
GF_NOK02_StolenShellComplaintB = GameFlag(0x23B),
@ -1007,7 +1007,7 @@ enum GameFlags {
GF_ARN02_ItemBlock_CoinB = GameFlag(0x3EB),
GF_ARN02_ItemBlock_RepelGel = GameFlag(0x3EC),
GF_ARN02_Item_DizzyDial = GameFlag(0x3ED),
GF_ARN02_Item_Letter07 = GameFlag(0x3EE),
GF_ARN02_Item_LetterFiceT = GameFlag(0x3EE),
GF_ARN03_ItemBlock_Coin = GameFlag(0x3EF),
GF_ARN04_ItemBlock_SuperShroom = GameFlag(0x3F0),
GF_ARN04_ItemBlock_Coin = GameFlag(0x3F1),

2
include/script_api/common.h
View File

@ -246,7 +246,7 @@ ApiStatus PlaySoundWithVolume(Evt* script, s32 isInitialCall);
ApiStatus PlaySoundAt(Evt* script, s32 isInitialCall);
ApiStatus StopSound(Evt* script, s32 isInitialCall);
ApiStatus UseDoorSounds(Evt* script, s32 isInitialCall);
ApiStatus UseAdvancedDoorSounds(Evt* script, s32 isInitialCall);
ApiStatus UseRoomDoorSounds(Evt* script, s32 isInitialCall);
ApiStatus PlaySoundAtF(Evt* script, s32 isInitialCall);
ApiStatus RemoveKeyItemAt(Evt* script, s32 isInitialCall);
ApiStatus RemoveItemAt(Evt* script, s32 isInitialCall);

2
include/script_api/map.h
View File

@ -11,7 +11,7 @@ ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall);
ApiStatus ResetFromLava(Evt* script, s32 isInitialCall);
ApiStatus MakeShop(Evt* script, s32 isInitialCall);
ApiStatus MakeShopOwner(Evt* script, s32 isInitialCall);
ApiStatus MakeDoorAdvanced(Evt* script, s32 isInitialCall);
ApiStatus CreateMapRoom(Evt* script, s32 isInitialCall);
ApiStatus CheckActionState(Evt* script, s32 isInitialCall);
ApiStatus CreatePushBlockGrid(Evt* script, s32 isInitialCall);
ApiStatus SetPushBlock(Evt* script, s32 isInitialCall);

4
include/variables.h
View File

@ -57,7 +57,7 @@ extern s8 D_800A0900;
extern f32 GravityParamsStartFall[];
extern s16 FootstepSoundSelector;
extern u8* gBackgroundFogModePtr;
extern u16 D_80151308;
extern u16 gCurrentRoomDoorSounds;
extern s32 gEntityHideMode;
extern s32 D_8010C92C;
@ -143,7 +143,7 @@ extern f32 gCurtainFade;
extern f32 gCurtainFadeGoal;
extern UNK_FUN_PTR(gCurtainDrawCallback);
extern u16 gCurrentDoorSoundsSet;
extern u16 gCurrentDoorSounds;
extern s32 D_800D9620;
extern UNK_TYPE D_800E92D8;

14
src/23680.c
View File

@ -147,7 +147,7 @@ void spawn_drops(Enemy* enemy) {
s32 temp = var_s1 + 1;
var_s1 = temp + rand_int(2);
}
if (enemy->flags & ENEMY_FLAG_800000) {
if (enemy->flags & ENEMY_FLAG_NO_DROPS) {
var_s1 = 0;
}
if (var_s1 != 0) {
@ -204,7 +204,7 @@ void spawn_drops(Enemy* enemy) {
s32 temp = var_s1 + 1;
var_s1 = temp + rand_int(2);
}
if (enemy->flags & ENEMY_FLAG_800000) {
if (enemy->flags & ENEMY_FLAG_NO_DROPS) {
var_s1 = 0;
}
if (var_s1 != 0) {
@ -274,7 +274,7 @@ void spawn_drops(Enemy* enemy) {
if (var_s1 > 20) {
var_s1 = 20;
}
if (enemy->flags & ENEMY_FLAG_800000) {
if (enemy->flags & ENEMY_FLAG_NO_DROPS) {
var_s1 = 0;
}
if (var_s1 * 2 > sp28) {
@ -334,7 +334,7 @@ s32 get_coin_drop_amount(Enemy* enemy) {
amt += currentEncounter->coinsEarned;
if (enemy->flags & (ENEMY_FLAG_800000 | ENEMY_FLAG_40000)) {
if (enemy->flags & (ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_40000)) {
amt = 0;
}
@ -389,7 +389,7 @@ s32 func_80048F0C(void) {
for (j = 0; j < encounter->count; j++) {
Enemy* enemy = encounter->enemy[j];
if (enemy != NULL && !(enemy->flags & ENEMY_FLAG_20)) {
if (enemy != NULL && !(enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
get_npc_unsafe(enemy->npcID);
}
}
@ -867,10 +867,10 @@ ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall) {
npc->flags &= ~NPC_FLAG_JUMPING;
if (!enemy->territory->wander.isFlying) {
npc->flags |= NPC_FLAG_GRAVITY;
npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT;
npc->flags &= ~NPC_FLAG_8;
} else {
npc->flags &= ~NPC_FLAG_GRAVITY;
npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT;
npc->flags |= NPC_FLAG_8;
}
if (enemy->aiFlags & ENEMY_AI_FLAG_4) {

2
src/38F00.c
View File

@ -64,7 +64,7 @@ EvtScript D_800939B4 = {
EVT_CALL(SetSelfVar, 0, 1)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(D_800939A4))
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY | NPC_FLAG_40000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_JUMPING, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_JUMPING, FALSE)
EVT_CALL(SetNpcAnimation, NPC_SELF, LVar2)
EVT_SET(LVar0, 0)
EVT_LOOP(30)

2
src/7E9D0.c
View File

@ -631,7 +631,7 @@ Npc* peach_make_disguise_npc(s32 peachDisguise) {
playerStatus->peachDisguise = peachDisguise;
gGameStatusPtr->peachDisguise = peachDisguise;
bpPtr->flags = NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_100 | NPC_FLAG_40000;
bpPtr->flags = NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_40000;
bpPtr->initialAnim = BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle;
bpPtr->onUpdate = NULL;
bpPtr->onRender = NULL;

4
src/80850_len_3060.c
View File

@ -1777,8 +1777,8 @@ s32 is_ability_active(s32 ability) {
ret++;
}
break;
case ABILITY_FINAL_BOMBOMB:
if (badgeMoveID == MOVE_UNUSED_FINAL_BOMBOMB) {
case ABILITY_FINAL_BOBOMB:
if (badgeMoveID == MOVE_UNUSED_FINAL_BOBOMB) {
ret++;
}
break;

8
src/a5dd0_len_114e0.c
View File

@ -1409,7 +1409,7 @@ void render_entities(void) {
if (entity != NULL) {
if (!gGameStatusPtr->isBattle) {
if (gEntityHideMode != 0 &&
if (gEntityHideMode != ENTITY_HIDE_MODE_0 &&
!(entity->flags & ENTITY_FLAG_IGNORE_DISTANCE_CULLING) &&
dist2D(gPlayerStatusPtr->position.x,
gPlayerStatusPtr->position.z,
@ -1419,11 +1419,11 @@ void render_entities(void) {
continue;
}
if (gEntityHideMode == 1) {
if (gEntityHideMode == ENTITY_HIDE_MODE_1) {
if (!(entity->flags & ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE1)) {
continue;
}
} else if (gEntityHideMode == 2) {
} else if (gEntityHideMode == ENTITY_HIDE_MODE_2) {
if (!(entity->flags & ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2)) {
continue;
}
@ -1859,7 +1859,7 @@ void clear_entity_data(s32 arg0) {
D_80151304 = 0;
if (!gGameStatusPtr->isBattle) {
gEntityHideMode = 0;
gEntityHideMode = ENTITY_HIDE_MODE_0;
}
entity_area_specific_data_is_loaded = FALSE;

4
src/audio/2e230_len_2190.c
View File

@ -642,7 +642,7 @@ BGMPlayer* func_80053F64(s32 arg0) {
#define SBN_LOOKUP(i,fmt,e) (au_fetch_SBN_file(globals->mseqFileList[AmbientSoundIDtoMSEQFileIndex[i]], fmt, &e))
AuResult func_80053F80(u32 ambSoundID) {
AuResult au_ambient_load(u32 ambSoundID) {
AuAmbienceManager* manager;
SBNFileEntry fileEntry;
AuGlobals* globals;
@ -651,7 +651,7 @@ AuResult func_80053F80(u32 ambSoundID) {
globals = gSoundGlobals;
manager = gAuAmbienceManager;
if (ambSoundID < 16) {
if (ambSoundID < AMBIENT_RADIO) {
if (manager->mseqPlayers[0].mseqName == 0 && SBN_LOOKUP(ambSoundID, AU_FMT_MSEQ, fileEntry) == AU_RESULT_OK) {
au_read_rom(fileEntry.offset, globals->dataMSEQ[0], fileEntry.data & 0xFFFFFF);
manager->mseqFiles[0] = globals->dataMSEQ[0];

28
src/audio/30450.c
View File

@ -269,8 +269,8 @@ void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan) {
au_sfx_enqueue_event(soundManager, soundID, volume, pitchShift, pan);
}
AuResult snd_ambient_80055448(s32 ambSoundID) {
return func_80053F80(ambSoundID);
AuResult snd_ambient_load(s32 ambSoundID) {
return au_ambient_load(ambSoundID);
}
AuResult snd_ambient_80055464(s32 arg0, s32 arg1) {
@ -333,7 +333,7 @@ AuResult snd_ambient_800555E4(s32 arg0) {
return func_80051050(arg0);
}
//TODO au_ambience_disable? -- sets a flag which tells the manager to mute players
//TODO sets a flag which tells the manager to mute players
AuResult snd_ambient_80055618(s32 index, s32 arg1) {
AuResult status = func_80050C30(index);
@ -344,7 +344,7 @@ AuResult snd_ambient_80055618(s32 index, s32 arg1) {
return status;
}
AuResult au_ambience_set_volume(s32 index, s32 time, s32 volume) {
AuResult snd_ambient_set_volume(s32 index, s32 time, s32 volume) {
AuResult status = func_80050C30(index);
if (status == AU_RESULT_OK) {
@ -354,7 +354,7 @@ AuResult au_ambience_set_volume(s32 index, s32 time, s32 volume) {
return status;
}
AuResult au_ambience_disable(s32 index) {
AuResult snd_ambient_disable(s32 index) {
AuResult status = func_80050C30(index);
if (status == AU_RESULT_OK) {
@ -364,7 +364,7 @@ AuResult au_ambience_disable(s32 index) {
return status;
}
AuResult au_ambience_enable(s32 index) {
AuResult snd_ambient_enable(s32 index) {
AuResult status = func_80050C30(index);
if (status == AU_RESULT_OK) {
@ -374,7 +374,8 @@ AuResult au_ambience_enable(s32 index) {
return status;
}
void snd_ambient_80055760(s32 arg0) {
// snd_ambient_init_tracks?
void snd_ambient_80055760(s32 trackIdx) {
u32 i;
s32 lim = 4;
@ -386,17 +387,17 @@ void snd_ambient_80055760(s32 arg0) {
}
}
snd_ambient_80055848(arg0);
snd_ambient_set_track(trackIdx);
}
AuResult snd_ambient_800557CC(s32 arg0) {
AuResult snd_ambient_800557CC(s32 fadeTime) {
AuResult status = AU_RESULT_OK;
s32 lim = 4;
u32 i;
for (i = 0; i < lim; i++) {
if (i == D_80078DB6) {
status = snd_ambient_slow_fade_out(i, arg0);
status = snd_ambient_slow_fade_out(i, fadeTime);
} else {
status = snd_ambient_quick_fade_out(i);
}
@ -407,8 +408,7 @@ AuResult snd_ambient_800557CC(s32 arg0) {
return status;
}
// play only
AuResult snd_ambient_80055848(s32 index) {
AuResult snd_ambient_set_track(s32 index) {
AuResult status = AU_RESULT_OK;
s32 lim = 4;
@ -417,9 +417,9 @@ AuResult snd_ambient_80055848(s32 index) {
for (i = 0; i < lim; i++) {
if (i == index) {
status = au_ambience_enable(index);
status = snd_ambient_enable(i);
} else {
status = au_ambience_disable(i); // mute
status = snd_ambient_disable(i); // mute
}
if (status != AU_RESULT_OK) {

2
src/audio/ambience.c
View File

@ -59,7 +59,7 @@ void update_ambient_sounds(void) {
}
if (ambientSoundState->soundID < 0) {
ambientSoundState->fadeState = AMBIENT_SOUND_IDLE;
} else if (snd_ambient_80055448(ambientSoundState->soundID) == AU_RESULT_OK) {
} else if (snd_ambient_load(ambientSoundState->soundID) == AU_RESULT_OK) {
if (snd_ambient_80055464(0, 0) == AU_RESULT_OK) {
ambientSoundState->fadeState = AMBIENT_SOUND_IDLE;
ambientSoundState->flags |= 1;

12
src/audio/private.h
View File

@ -56,7 +56,7 @@ void au_get_bgm_player(u32 playerIndex, BGMPlayer** outPlayer);
AuResult au_load_song_files(u32 arg0, BGMHeader* arg1, BGMPlayer* arg2);
AuResult func_80053E58(s32 arg0, BGMHeader* arg1);
BGMPlayer* func_80053F64(s32 arg0);
AuResult func_80053F80(u32 arg0);
AuResult au_ambient_load(u32 arg0);
BGMPlayer* func_80054248(u8 arg0);
void au_load_INIT(AuGlobals* arg0, s32 romAddr, ALHeap* heap);
AuResult au_fetch_SBN_file(u32 fileIdx, AuFileFormat format, SBNFileEntry* arg2);
@ -181,7 +181,7 @@ void snd_adjust_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift)
void snd_stop_sound(s32 soundID);
void func_800553F4(void);
void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan);
AuResult snd_ambient_80055448(s32 arg0);
AuResult snd_ambient_load(s32 arg0);
AuResult snd_ambient_80055464(s32 arg0, s32 arg1);
AuResult snd_ambient_quick_fade_out(s32 arg0);
AuResult snd_ambient_slow_fade_out(s32 arg0, s32 arg1);
@ -189,12 +189,12 @@ AuResult snd_ambient_8005553C(s32 arg0, s32 arg1);
AuResult snd_ambient_80055590(s32 arg0, s32 arg1);
AuResult snd_ambient_800555E4(s32 arg0);
AuResult snd_ambient_80055618(s32 arg0, s32 arg1);
AuResult au_ambience_set_volume(s32 arg0, s32 arg1, s32 arg2);
AuResult au_ambience_disable(s32 arg0);
AuResult au_ambience_enable(s32 arg0);
AuResult snd_ambient_set_volume(s32 arg0, s32 arg1, s32 arg2);
AuResult snd_ambient_disable(s32 arg0);
AuResult snd_ambient_enable(s32 arg0);
void snd_ambient_80055760(s32 arg0);
AuResult snd_ambient_800557CC(s32 arg0);
AuResult snd_ambient_80055848(s32 arg0);
AuResult snd_ambient_set_track(s32 arg0);
AuResult au_song_load(s32 songID, s32 playerIndex);
AuResult au_song_start(s32 songName);
AuResult au_song_start_variation(s32 songName, s32 variation);

10
src/audio/public.h
View File

@ -13,7 +13,7 @@ void snd_adjust_sound_with_shift(s32 soundID, u8 volume, u8 pan, s16 pitchShift)
void snd_stop_sound(s32 soundID);
void func_800553F4(void);
void snd_start_sound_raw(s32 soundID, s16 volume, s16 pitchShift, s32 pan);
AuResult snd_ambient_80055448(s32 arg0);
AuResult snd_ambient_load(s32 arg0);
AuResult snd_ambient_80055464(s32 arg0, s32 arg1);
AuResult snd_ambient_quick_fade_out(s32 arg0);
AuResult snd_ambient_slow_fade_out(s32 arg0, s32 arg1);
@ -21,12 +21,12 @@ AuResult snd_ambient_8005553C(s32 arg0, s32 arg1);
AuResult snd_ambient_80055590(s32 arg0, s32 arg1);
AuResult snd_ambient_800555E4(s32 arg0);
AuResult snd_ambient_80055618(s32 arg0, s32 arg1);
AuResult au_ambience_set_volume(s32 arg0, s32 arg1, s32 arg2);
AuResult au_ambience_disable(s32 arg0);
AuResult au_ambience_enable(s32 arg0);
AuResult snd_ambient_set_volume(s32 arg0, s32 arg1, s32 arg2);
AuResult snd_ambient_disable(s32 arg0);
AuResult snd_ambient_enable(s32 arg0);
void snd_ambient_80055760(s32 arg0);
AuResult snd_ambient_800557CC(s32 arg0);
AuResult snd_ambient_80055848(s32 arg0);
AuResult snd_ambient_set_track(s32 arg0);
AuResult au_song_load(s32 songID, s32 playerIndex);
AuResult au_song_start(s32 songName);
AuResult au_song_start_variation(s32 songName, s32 variation);

38
src/audio/sfx.c
View File

@ -293,8 +293,8 @@ void sfx_compute_spatialized_sound_params_full(f32 x, f32 y, f32 z, s16* volume,
}
void sfx_reset_door_sounds(void) {
gCurrentDoorSoundsSet = 0;
D_80151308 = 0;
gCurrentDoorSounds = 0;
gCurrentRoomDoorSounds = 0;
}
void sfx_clear_sounds(void) {
@ -318,7 +318,7 @@ void sfx_clear_env_sounds(s16 playSounds) {
s32 i;
for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) {
if (sound->flags & 1) {
if (sound->flags & SOUND_INSTANCE_FLAG_1) {
snd_start_sound_with_shift(sound->soundID, sound->volume, sound->pan, sound->pitchShift);
}
}
@ -333,9 +333,9 @@ void sfx_update_looping_sound_params(void) {
u16 pan;
s32 i;
for (i = 0; i < 10; i++, sound++) {
if (sound->flags & 1) {
if (sound->flags & 2) {
for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) {
if (sound->flags & SOUND_INSTANCE_FLAG_1) {
if (sound->flags & SOUND_INSTANCE_FLAG_2) {
sfx_get_spatialized_sound_params(sound->position.x, sound->position.y, sound->position.z, &volume, &pan, sound->sourceFlags);
sound->volume = volume;
sound->pan = pan;
@ -366,7 +366,7 @@ void sfx_stop_env_sounds(void) {
sound = D_80159AD0;
for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) {
if (sound->flags & 1) {
if (sound->flags & SOUND_INSTANCE_FLAG_1) {
snd_stop_sound(sound->soundID);
}
}
@ -377,7 +377,7 @@ SoundInstance* sfx_get_env_sound_instance(s32 soundID) {
s32 i;
for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) {
if (sound->flags & 1 && sound->soundID == soundID) {
if (sound->flags & SOUND_INSTANCE_FLAG_1 && sound->soundID == soundID) {
return sound;
}
}
@ -390,7 +390,7 @@ void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) {
s32 i;
for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) {
if (!(sound->flags & 1)) {
if (!(sound->flags & SOUND_INSTANCE_FLAG_1)) {
break;
}
}
@ -399,7 +399,7 @@ void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) {
sound->soundID = soundId;
sound->volume = volume;
sound->pitchShift = pitchShift;
sound->flags |= 1;
sound->flags |= SOUND_INSTANCE_FLAG_1;
snd_start_sound_with_shift(soundId, volume, pan, pitchShift);
}
@ -409,7 +409,7 @@ void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y
s32 i;
for (i = 0; i < MAX_SOUND_INSTANCES; i++, sound++) {
if (!(sound->flags & 1)) {
if (!(sound->flags & SOUND_INSTANCE_FLAG_1)) {
break;
}
}
@ -419,7 +419,7 @@ void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y
sound->position.y = y;
sound->position.z = z;
sound->soundID = soundID;
sound->flags |= 3;
sound->flags |= (SOUND_INSTANCE_FLAG_1 | SOUND_INSTANCE_FLAG_2);
sfx_play_sound_at_position(soundID, flags, x, y, z);
}
@ -436,7 +436,7 @@ s32 sfx_adjust_env_sound_pos(s32 soundID, s32 sourceFlags, f32 x, f32 y, f32 z)
sound->position.y = y;
sound->position.z = z;
sound->soundID = soundID;
sound->flags |= 3;
sound->flags |= (SOUND_INSTANCE_FLAG_1 | SOUND_INSTANCE_FLAG_2);
return TRUE;
}
@ -444,7 +444,7 @@ void func_80149A6C(s32 soundID, s32 keepPlaying) {
SoundInstance* sound = sfx_get_env_sound_instance(soundID);
if (sound != NULL) {
sound->flags &= -SOUND_INSTANCE_FLAG_4;
sound->flags &= -SOUND_INSTANCE_FLAG_4; //TODO use logical negate here
if (!keepPlaying) {
snd_stop_sound(sound->soundID);
}
@ -460,16 +460,16 @@ void sfx_play_sound_with_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift)
if (soundID & SOUND_TYPE_SPECIAL) {
s32 soundIndex = soundID & 0xFF;
s32 soundType = ((u32)soundID >> 0x1C) & 7;
s32 soundType = (soundID & 0x70000000) >> 0x1C;
switch (soundType) {
case SOUND_TYPE_LOOPING:
sfx_play_sound_looping(LoopingSounds[soundIndex], volume, pan, pitchShift);
return;
case SOUND_TYPE_DOOR1:
soundID = OpenCloseSounds[gCurrentDoorSoundsSet][soundIndex];
case SOUND_TYPE_EXIT_DOOR:
soundID = OpenCloseSounds[gCurrentDoorSounds][soundIndex];
break;
case SOUND_TYPE_DOOR2:
soundID = OpenCloseSounds[D_80151308][soundIndex];
case SOUND_TYPE_ROOM_DOOR:
soundID = OpenCloseSounds[gCurrentRoomDoorSounds][soundIndex];
break;
case SOUND_TYPE_ALTERNATING:
alternatingSet = &AlternatingSounds[soundIndex];

112
src/encounter.c
View File

@ -544,7 +544,7 @@ void update_encounters_neutral(void) {
}
for (i = 0; i < encounter->count; i++) {
enemy = encounter->enemy[i];
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) {
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
continue;
}
npc = get_npc_unsafe(enemy->npcID);
@ -583,7 +583,7 @@ void update_encounters_neutral(void) {
}
} else if (!(enemy->flags & ENEMY_FLAG_200000)) {
get_screen_coords(gCurrentCameraID, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ);
if ((screenX < -160 || screenX > 480 || screenY < -120 || screenY > 360 || screenZ < 0) && !(enemy->flags & ENEMY_FLAG_1)) {
if ((screenX < -160 || screenX > 480 || screenY < -120 || screenY > 360 || screenZ < 0) && !(enemy->flags & ENEMY_FLAG_PASSIVE)) {
npc->flags |= NPC_FLAG_80000000;
enemy->flags |= ENEMY_FLAG_80000000;
script = get_script_by_id(enemy->auxScriptID);
@ -622,7 +622,7 @@ void update_encounters_neutral(void) {
if (enemy->flags & ENEMY_FLAG_80000000) {
continue;
}
if (enemy->flags & ENEMY_FLAG_1) {
if (enemy->flags & ENEMY_FLAG_PASSIVE) {
if (!(enemy->flags & ENEMY_FLAG_400000)) {
if (npc == playerStatus->encounteredNPC) {
enemy->unk_E0 = npc->yaw;
@ -654,7 +654,7 @@ void update_encounters_neutral(void) {
(playerStatus->flags & PS_FLAG_ARMS_RAISED) ||
(gOverrideFlags & GLOBAL_OVERRIDES_40) ||
gPartnerActionStatus.actingPartner == PARTNER_BOW ||
(enemy->flags & ENEMY_FLAG_1) ||
(enemy->flags & ENEMY_FLAG_PASSIVE) ||
(gOverrideFlags & (GLOBAL_OVERRIDES_DISABLE_BATTLES | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_800)) ||
is_picking_up_item()) {
continue;
@ -950,10 +950,10 @@ START_BATTLE:
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) {
@ -1004,10 +1004,10 @@ START_BATTLE:
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) {
@ -1051,10 +1051,10 @@ START_BATTLE:
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) {
@ -1074,7 +1074,7 @@ START_BATTLE:
testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f);
testZ = playerStatus->position.z + ((npc->pos.z - playerStatus->position.z) * 0.5f);
fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3);
} else if (!(enemy->flags & ENEMY_FLAG_1)) {
} else if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) {
npc = get_npc_unsafe(enemy->npcID);
cond2 = TRUE;
testX = playerStatus->position.x + ((npc->pos.x - playerStatus->position.x) * 0.5f);
@ -1111,10 +1111,10 @@ START_BATTLE:
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) {
@ -1133,7 +1133,7 @@ START_BATTLE:
testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f);
testZ = playerStatus->position.z + ((npc->pos.z - playerStatus->position.z) * 0.5f);
fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3);
} else if (!(enemy->flags & ENEMY_FLAG_1)) {
} else if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) {
npc = get_npc_unsafe(enemy->npcID);
testX = playerStatus->position.x + ((npc->pos.x - playerStatus->position.x) * 0.5f);
testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f);
@ -1193,10 +1193,10 @@ START_BATTLE:
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) {
@ -1215,7 +1215,7 @@ START_BATTLE:
testY = npc->pos.y + npc->collisionHeight;
testZ = npc->pos.z;
fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3);
} else if (!(enemy->flags & ENEMY_FLAG_1)) {
} else if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) {
npc = get_npc_unsafe(enemy->npcID);
testX = npc->pos.x;
testY = npc->pos.y + npc->collisionHeight;
@ -1264,7 +1264,7 @@ void update_encounters_pre_battle(void) {
if (encounter != NULL) {
for (j = 0; j < encounter->count; j++) {
enemy = encounter->enemy[j];
if (enemy != NULL && !(enemy->flags & ENEMY_FLAG_20)) {
if (enemy != NULL && !(enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
if (enemy->aiScript != NULL) {
suspend_all_script(enemy->aiScriptID);
}
@ -1360,8 +1360,8 @@ void update_encounters_pre_battle(void) {
for (i = 0; i < encounter->count; i++) {
enemy = encounter->enemy[i];
if (enemy != NULL &&
((!(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy)) &&
!(enemy->flags & ENEMY_FLAG_20) &&
((!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy)) &&
!(enemy->flags & ENEMY_FLAG_DISABLE_AI) &&
enemy->hitScript != NULL)
{
kill_script_by_ID(enemy->hitScriptID);
@ -1411,8 +1411,8 @@ void update_encounters_pre_battle(void) {
for (i = 0; i < encounter->count; i++) {
enemy = encounter->enemy[i];
if (enemy != NULL &&
(!(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy) &&
!(enemy->flags & ENEMY_FLAG_20) &&
(!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy) &&
!(enemy->flags & ENEMY_FLAG_DISABLE_AI) &&
(enemy->hitScript != 0))
{
kill_script_by_ID(enemy->hitScriptID);
@ -1657,10 +1657,10 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if (enemy->defeatBytecode != NULL) {
@ -1704,10 +1704,10 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if (does_script_exist(enemy->defeatScriptID)) {
@ -1730,10 +1730,10 @@ void update_encounters_post_battle(void) {
if (enemy->flags & ENEMY_FLAG_4) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (!(enemy->flags & ENEMY_FLAG_1)) {
if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) {
if (!(enemy->flags & ENEMY_FLAG_FLED)) {
set_defeated(currentEncounter->mapID, encounter->encounterID + i);
}
@ -1764,7 +1764,7 @@ void update_encounters_post_battle(void) {
}
for (j = 0; j < encounter->count; j++) {
enemy = encounter->enemy[j];
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) {
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
continue;
}
if (enemy->aiScript != NULL) {
@ -1795,11 +1795,11 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
@ -1834,7 +1834,7 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if (!(enemy->flags & ENEMY_FLAG_20)) {
if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
if (does_script_exist(enemy->defeatScriptID)) {
cond = TRUE;
} else {
@ -1850,7 +1850,7 @@ void update_encounters_post_battle(void) {
}
for (j = 0; j < encounter->count; j++) {
enemy = encounter->enemy[j];
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) {
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
continue;
}
if (enemy->aiScript != NULL) {
@ -1872,10 +1872,10 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if (enemy->flags & ENEMY_FLAG_8) {
if (enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) {
continue;
}
enemy->aiPaused = 45;
@ -1929,11 +1929,11 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
@ -1967,7 +1967,7 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if (!(enemy->flags & ENEMY_FLAG_20)) {
if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
if (does_script_exist(enemy->defeatScriptID)) {
cond = TRUE;
} else {
@ -1983,7 +1983,7 @@ void update_encounters_post_battle(void) {
}
for (j = 0; j < encounter->count; j++) {
enemy = encounter->enemy[j];
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) {
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
continue;
}
if (enemy->aiScript != NULL) {
@ -2021,7 +2021,7 @@ void update_encounters_post_battle(void) {
}
for (j = 0; j < encounter->count; j++) {
enemy = encounter->enemy[j];
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) {
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
continue;
}
if (enemy->aiScript != NULL) {
@ -2047,11 +2047,11 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) {
if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->currentEnemy) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
@ -2085,7 +2085,7 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if (!(enemy->flags & ENEMY_FLAG_20)) {
if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
if (does_script_exist(enemy->defeatScriptID)) {
cond = TRUE;
} else {
@ -2101,7 +2101,7 @@ void update_encounters_post_battle(void) {
}
for (j = 0; j < encounter->count; j++) {
enemy = encounter->enemy[j];
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) {
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
continue;
}
if (enemy->aiScript != NULL) {
@ -2123,10 +2123,10 @@ void update_encounters_post_battle(void) {
if (enemy == NULL) {
continue;
}
if (enemy->flags & ENEMY_FLAG_20) {
if (enemy->flags & ENEMY_FLAG_DISABLE_AI) {
continue;
}
if (enemy->flags & ENEMY_FLAG_8) {
if (enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) {
continue;
}
enemy->aiPaused = 45;
@ -2153,7 +2153,7 @@ void update_encounters_post_battle(void) {
}
for (j = 0; j < encounter->count; j++) {
enemy = encounter->enemy[j];
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) {
if (enemy == NULL || (enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
continue;
}
@ -2294,11 +2294,11 @@ s32 check_conversation_trigger(void) {
continue;
}
if (encounterEnemy->flags & (ENEMY_FLAG_80000000 | ENEMY_FLAG_20)) {
if (encounterEnemy->flags & (ENEMY_FLAG_80000000 | ENEMY_FLAG_DISABLE_AI)) {
continue;
}
if (!(encounterEnemy->flags & ENEMY_FLAG_1)) {
if (!(encounterEnemy->flags & ENEMY_FLAG_PASSIVE)) {
continue;
}
@ -2551,7 +2551,7 @@ void create_encounters(void) {
newNpc->shadowScale = 1.0f;
}
if (enemy->flags & ENEMY_FLAG_100) {
newNpc->flags |= NPC_FLAG_40;
newNpc->flags |= NPC_FLAG_IGNORE_WORLD_COLLISION;
}
if (enemy->flags & ENEMY_FLAG_200) {
newNpc->flags |= NPC_FLAG_100;
@ -2560,19 +2560,19 @@ void create_encounters(void) {
newNpc->flags |= NPC_FLAG_8000;
}
if (enemy->flags & ENEMY_FLAG_800) {
newNpc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT;
newNpc->flags |= NPC_FLAG_8;
}
if (enemy->flags & ENEMY_FLAG_GRAVITY) {
newNpc->flags |= NPC_FLAG_GRAVITY;
}
if (!(enemy->flags & ENEMY_FLAG_1)) {
if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) {
newNpc->flags |= NPC_FLAG_100;
}
if (enemy->flags & ENEMY_FLAG_4000) {
newNpc->flags |= NPC_FLAG_1000000;
}
if (enemy->flags & ENEMY_FLAG_2000) {
newNpc->flags |= NPC_FLAG_NO_AI;
newNpc->flags |= NPC_FLAG_20;
}
if (enemy->flags & ENEMY_FLAG_8000) {
newNpc->flags |= NPC_FLAG_10000000;
@ -2584,7 +2584,7 @@ void create_encounters(void) {
newNpc->flags |= NPC_FLAG_LOCK_ANIMS;
}
enemy->scriptGroup = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01;
if (enemy->flags & ENEMY_FLAG_1) {
if (enemy->flags & ENEMY_FLAG_PASSIVE) {
enemy->scriptGroup = EVT_GROUP_08 | EVT_GROUP_02;
}
if (npcSettings->otherAI != NULL) {
@ -2687,7 +2687,7 @@ void create_encounters(void) {
if (enemy == NULL) {
continue;
}
if (!(enemy->flags & ENEMY_FLAG_20)) {
if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
if (enemy->aiBytecode != NULL) {
script = start_script(enemy->aiBytecode, EVT_PRIORITY_A, 0);
enemy->aiScript = script;
@ -2711,7 +2711,7 @@ void create_encounters(void) {
if (enemy == NULL) {
continue;
}
if (!(enemy->flags & ENEMY_FLAG_20)) {
if (!(enemy->flags & ENEMY_FLAG_DISABLE_AI)) {
if (enemy->auxBytecode != NULL) {
script = start_script(enemy->auxBytecode, EVT_PRIORITY_A, 0);
enemy->auxScript = script;

12
src/encounter_api.c
View File

@ -212,7 +212,7 @@ void start_battle(Evt* script, s32 songID) {
for (i = 0; i < encounter->count; i++) {
enemy = encounter->enemy[i];
if ((enemy != NULL && (
!(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy)
!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy)
) && enemy->hitBytecode != NULL) {
Evt* hitEvtInstance;
enemy->encountered = TRUE;
@ -280,7 +280,7 @@ ApiStatus StartBossBattle(Evt* script, s32 isInitialCall) {
for (i = 0; i < encounter->count; i++) {
enemy = encounter->enemy[i];
if ((enemy != NULL && (
!(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy)
!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->currentEnemy)
) && enemy->hitBytecode != NULL) {
enemy->encountered = TRUE;
@ -344,7 +344,7 @@ ApiStatus BindNpcAI(Evt* script, s32 isInitialCall) {
enemy = get_enemy(id);
}
if (enemy->flags & ENEMY_FLAG_1) {
if (enemy->flags & ENEMY_FLAG_PASSIVE) {
groupFlags = EVT_GROUP_08 | EVT_GROUP_02;
} else {
groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01;
@ -394,7 +394,7 @@ ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) {
enemy = get_enemy(npcID);
if (enemy->flags & ENEMY_FLAG_1) {
if (enemy->flags & ENEMY_FLAG_PASSIVE) {
groupFlags = EVT_GROUP_08 | EVT_GROUP_02;
} else {
groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01;
@ -512,7 +512,7 @@ ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) {
enemy = get_enemy(npcID);
if (enemy->flags & ENEMY_FLAG_1) {
if (enemy->flags & ENEMY_FLAG_PASSIVE) {
groupFlags = EVT_GROUP_08 | EVT_GROUP_02;
} else {
groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01;
@ -819,7 +819,7 @@ ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall) {
fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 0.0f, -20.0f, 40, &unk);
}
if ((npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING | NPC_FLAG_ENABLE_HIT_SCRIPT)) == (NPC_FLAG_JUMPING | NPC_FLAG_ENABLE_HIT_SCRIPT)) {
if ((npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING | NPC_FLAG_8)) == (NPC_FLAG_JUMPING | NPC_FLAG_8)) {
f32 x = npc->pos.x;
f32 y = npc->pos.y + npc->collisionHeight;
f32 z = npc->pos.z;

6
src/entity/HiddenPanel.c
View File

@ -80,8 +80,8 @@ void entity_HiddenPanel_idle(Entity* entity) {
Npc* npc = get_npc_by_index(npcIndex);
dist2D(entity->position.x, entity->position.z, npc->pos.x, npc->pos.z);
data->standingNpcIndex = npcIndex;
data->npcFlags = npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_ENABLE_HIT_SCRIPT);
npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT;
data->npcFlags = npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_8);
npc->flags &= ~NPC_FLAG_8;
npc->flags |= NPC_FLAG_GRAVITY;
data->riseVelocity = 0.5f;
exec_entity_commandlist(entity);
@ -237,7 +237,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) {
entity->flags &= ~ENTITY_FLAG_DISABLE_COLLISION;
if (data->standingNpcIndex >= 0) {
Npc* npc = get_npc_by_index(data->standingNpcIndex);
npc->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_ENABLE_HIT_SCRIPT);
npc->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_8);
npc->flags |= data->npcFlags;
}
}

6
src/evt/fa4c0_len_3bf0.c
View File

@ -244,14 +244,14 @@ ApiStatus func_802D62E4(Evt* script, s32 isInitialCall) {
ApiStatus UseDoorSounds(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
gCurrentDoorSoundsSet = evt_get_variable(script, *args++);
gCurrentDoorSounds = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus UseAdvancedDoorSounds(Evt* script, s32 isInitialCall) {
ApiStatus UseRoomDoorSounds(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80151308 = evt_get_variable(script, *args++);
gCurrentRoomDoorSounds = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}

2
src/evt/npc_api.c
View File

@ -888,7 +888,7 @@ ApiStatus PutPartnerAway(Evt* script, s32 isInitialCall) {
if (isInitialCall) {
if (wExtraPartnerID != 0) {
partner->flags &= ~NPC_FLAG_GRAVITY;
partner->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT;
partner->flags &= ~NPC_FLAG_8;
targetX = playerStatus->position.x;
partner->moveToPos.x = targetX;
partnerX = partner->pos.x;

28
src/npc.c
View File

@ -106,7 +106,7 @@ s32 _create_npc(NpcBlueprint* blueprint, AnimID* animList, s32 skipLoadingAnims)
gNpcCount++;
ASSERT(npc != NULL);
npc->flags = blueprint->flags | (NPC_FLAG_400000 | NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW | NPC_FLAG_PASSIVE);
npc->flags = blueprint->flags | (NPC_FLAG_400000 | NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW | NPC_FLAG_1);
if (skipLoadingAnims) {
npc->flags |= NPC_FLAG_NO_ANIMS_LOADED;
}
@ -284,11 +284,11 @@ void npc_do_world_collision(Npc* npc) {
f32 temp_y;
f32 temp_z;
if (npc->flags & NPC_FLAG_40) {
npc->flags |= NPC_FLAG_8000000;
if (npc->flags & NPC_FLAG_IGNORE_WORLD_COLLISION) {
npc->flags |= NPC_FLAG_WORLD_COLLISION_DIRTY;
} else if ((npc->pos.x != npc->colliderPos.x) || (npc->pos.y != npc->colliderPos.y)
|| (npc->pos.z != npc->colliderPos.z) || npc->flags & NPC_FLAG_8000000) {
npc->flags &= ~NPC_FLAG_8000000;
|| (npc->pos.z != npc->colliderPos.z) || npc->flags & NPC_FLAG_WORLD_COLLISION_DIRTY) {
npc->flags &= ~NPC_FLAG_WORLD_COLLISION_DIRTY;
temp_f0 = clamp_angle(npc->yaw);
temp_x = npc->pos.x;
temp_y = npc->pos.y;
@ -488,7 +488,7 @@ void npc_do_gravity(Npc* npc) {
}
s32 func_800397E8(Npc* npc, f32 arg1) {
if (!(npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_ENABLE_HIT_SCRIPT))) {
if (!(npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_8))) {
f32 x;
f32 y;
f32 z;
@ -598,7 +598,7 @@ void update_npcs(void) {
x = npc->pos.x;
y = npc->pos.y;
z = npc->pos.z;
if (!(npc->flags & NPC_FLAG_NO_AI)) {
if (!(npc->flags & NPC_FLAG_20)) {
if (
x != npc->colliderPos.x ||
y != npc->colliderPos.y ||
@ -873,19 +873,19 @@ void render_npcs(void) {
renderTaskPtr->appendGfx = appendGfx_npc;
renderTaskPtr->renderMode = npc->renderMode;
if (npc->flags & NPC_FLAG_NO_DROPS) {
if (npc->flags & NPC_FLAG_HIDING) {
u8 r, g, b, a;
get_background_color_blend(&r, &g, &b, &a);
npc->alpha2 = 0xFF - a;
npc->alpha2 = 255 - a;
} else {
npc->alpha2 = 0xFF;
npc->alpha2 = 255;
}
if (npc->alpha2 != 0) {
queue_render_task(renderTaskPtr);
}
if ((npc->flags & NPC_FLAG_MOTION_BLUR) != 0) {
if (npc->flags & NPC_FLAG_MOTION_BLUR) {
renderTaskPtr->distance = -phi_f20;
renderTaskPtr->appendGfx = appendGfx_npc_blur;
renderTaskPtr->appendGfxArg = npc;
@ -1947,7 +1947,7 @@ s32 npc_find_standing_on_entity(s32 entityIndex) {
if (npc->pos.y < y) {
continue;
}
if (npc->flags & (NPC_FLAG_8000 | NPC_FLAG_ENABLE_HIT_SCRIPT)) {
if (npc->flags & (NPC_FLAG_8000 | NPC_FLAG_8)) {
var_v1 = npc_get_collider_below(npc);
if (var_v1 != 0) {
if (idx == var_v1) {
@ -2535,8 +2535,8 @@ void kill_enemy(Enemy* enemy) {
do {
if (!(enemy->flags & ENEMY_FLAG_4)) {
if (!(enemy->flags & ENEMY_FLAG_8) || (enemy == encounterStatus->currentEnemy)) {
if (!(enemy->flags & ENEMY_FLAG_1)) {
if (!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || (enemy == encounterStatus->currentEnemy)) {
if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) {
if (!(enemy->flags & ENEMY_FLAG_FLED)) {
COPY_set_defeated(encounterStatus->mapID, encounter->encounterID + i);
}

2
src/world/area_arn/arn_02/arn_02_3_entity.c
View File

@ -3,7 +3,7 @@
EvtScript N(EVS_MakeEntities) = {
EVT_CALL(MakeItemEntity, ITEM_DIZZY_DIAL, -248, 193, 45, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_ARN02_Item_DizzyDial)
EVT_CALL(MakeItemEntity, ITEM_LETTER07, 536, 260, 227, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_ARN02_Item_Letter07)
EVT_CALL(MakeItemEntity, ITEM_LETTER_TO_FICE_T, 536, 260, 227, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_ARN02_Item_LetterFiceT)
EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -350, 172, 170, 0, ITEM_COIN, MAKE_ENTITY_END)
EVT_CALL(AssignBlockFlag, GF_ARN02_ItemBlock_CoinA)
EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 225, 265, 30, 0, ITEM_COIN, MAKE_ENTITY_END)

33
src/world/area_arn/arn_03/arn_03_3_npc.c
View File

@ -6,14 +6,7 @@
#include "world/common/complete/GiveReward.inc.c"
#include "world/common/complete/KeyItemChoice.inc.c"
EvtScript N(EVS_PlayerReact) = {
EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
EVT_WAIT(1)
EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007)
EVT_WAIT(20)
EVT_RETURN
EVT_END
};
#include "world/common/atomic/MarioSalute.inc.c"
EvtScript N(EVS_NpcInteract_Boo_01) = {
EVT_SWITCH(GB_StoryProgress)
@ -125,7 +118,7 @@ EvtScript N(EVS_NpcInteract_Boo_02) = {
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_0081)
EVT_SET(LVar0, 118)
EVT_SET(LVar1, 1)
EVT_EXEC_WAIT(N(GiveKeyReward))
EVT_EXEC_WAIT(N(GiveItemReward))
EVT_CALL(AddKeyItem, ITEM_KOOT_PACKAGE)
EVT_SET(MV_Unk_00, 0)
EVT_SET(GF_ARN03_RecievedPackage, TRUE)
@ -155,8 +148,8 @@ EvtScript N(EVS_NpcInteract_Boo_02) = {
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_007E)
EVT_END_SWITCH
EVT_IF_EQ(GF_ARN03_RecievedPackage, FALSE)
EVT_IF_EQ(GB_KootFavor_Current, 18)
EVT_EXEC_WAIT(N(EVS_PlayerReact))
EVT_IF_EQ(GB_KootFavor_Current, KOOT_FAVOR_CH7_2)
EVT_EXEC_WAIT(N(EVS_MarioSalute))
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_007F)
EVT_CALL(EndSpeech, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0)
EVT_SET(MV_Unk_00, 0)
@ -380,7 +373,7 @@ StaticNpc N(NpcData_Boo_01) = {
.settings = &N(NpcSettings_Boo_Patrol),
.pos = { 36.0f, 185.0f, 140.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_01),
.drops = BOO_DROPS,
.territory = {
@ -406,7 +399,7 @@ StaticNpc N(NpcData_Boo_02) = {
.settings = &N(NpcSettings_Boo),
.pos = { 209.0f, 185.0f, 217.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_02),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -418,7 +411,7 @@ StaticNpc N(NpcData_Boo_03) = {
.settings = &N(NpcSettings_Boo_Patrol),
.pos = { 379.0f, 186.0f, 186.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_03),
.drops = BOO_DROPS,
.territory = {
@ -444,7 +437,7 @@ StaticNpc N(NpcData_Boo_04) = {
.settings = &N(NpcSettings_Boo),
.pos = { 544.0f, 235.0f, 128.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_04),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -456,7 +449,7 @@ StaticNpc N(NpcData_Boo_05) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_05),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -520,7 +513,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 36.0f, 277.0f, 140.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_06),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -530,7 +523,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 180.0f, 285.0f, 182.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_07),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -540,7 +533,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 349.0f, 286.0f, 152.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_08),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -550,7 +543,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 490.0f, 324.0f, 128.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_09),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,

20
src/world/area_arn/arn_05/arn_05_3_npc.c
View File

@ -234,7 +234,7 @@ StaticNpc N(NpcData_Boo_01)[] = {
.settings = &N(NpcSettings_Boo_Patrol),
.pos = { 55.0f, 195.0f, 160.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Boo_01),
.drops = BOO_DROPS,
.territory = {
@ -259,7 +259,7 @@ StaticNpc N(NpcData_Boo_01)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 160.0f, 191.0f, 250.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Boo_02),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -270,7 +270,7 @@ StaticNpc N(NpcData_Boo_01)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 390.0f, 190.0f, 255.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Boo_03),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -281,7 +281,7 @@ StaticNpc N(NpcData_Boo_01)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 503.0f, 206.0f, 210.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Boo_04),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -292,7 +292,7 @@ StaticNpc N(NpcData_Boo_01)[] = {
.settings = &N(NpcSettings_Boo_Patrol),
.pos = { 350.0f, 185.0f, 197.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Boo_05),
.drops = BOO_DROPS,
.territory = {
@ -639,7 +639,7 @@ StaticNpc N(NpcData_Tubba) = {
.settings = &N(NpcSettings_TubbaBlubba),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Tubba),
.drops = TUBBA_DROPS,
.animations = TUBBA_ANIMS,
@ -704,7 +704,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 36.0f, 277.0f, 140.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_06),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -714,7 +714,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 200.0f, 275.0f, 182.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_07),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -724,7 +724,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 379.0f, 300.0f, 192.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_08),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -734,7 +734,7 @@ StaticNpc N(NpcData_Boo_06)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { 525.0f, 286.0f, 178.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_09),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,

20
src/world/area_arn/arn_07/arn_07_5_npc.c
View File

@ -575,7 +575,7 @@ StaticNpc N(NpcData_Tubba)[] = {
.settings = &N(NpcSettings_TubbasHeart),
.pos = { -10.0f, 50.0f, -170.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_TubbasHeart),
.drops = TUBBAS_HEART_DROPS,
.animations = TUBBAS_HEART_ANIMS,
@ -588,7 +588,7 @@ StaticNpc N(NpcData_Boos)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Boo),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -599,7 +599,7 @@ StaticNpc N(NpcData_Boos)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Boo),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -610,7 +610,7 @@ StaticNpc N(NpcData_Boos)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Boo),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -621,7 +621,7 @@ StaticNpc N(NpcData_Boos)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Boo),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -632,7 +632,7 @@ StaticNpc N(NpcData_Boos)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Boo),
.drops = BOO_DROPS,
.animations = NORMAL_BOO_ANIMS,
@ -643,7 +643,7 @@ StaticNpc N(NpcData_Boos)[] = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Boo),
.drops = BOO_DROPS,
.animations = NORMAL_BOO_ANIMS,
@ -656,7 +656,7 @@ StaticNpc N(NpcData_Bow) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Bow),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -688,7 +688,7 @@ StaticNpc N(NpcData_Bootler) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Bootler),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -803,7 +803,7 @@ StaticNpc N(NpcData_Skolar) = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Skolar),
.drops = SKOLAR_DROPS,
.animations = SKOLAR_ANIMS,

4
src/world/area_arn/arn_08/arn_08_6_npc.c
View File

@ -50,7 +50,7 @@ StaticNpc N(NpcData_TubbasHeart) = {
.settings = &N(NpcSettings_TubbasHeart),
.pos = { -23.0f, 75.0f, 31.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TubbasHeart),
.drops = TUBBAS_HEART_DROPS,
.animations = TUBBAS_HEART_ANIMS,
@ -61,7 +61,7 @@ StaticNpc N(NpcData_Yakkey) = {
.settings = &N(NpcSettings_Yakkey),
.pos = { 38.0f, 0.0f, 97.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Yakkey),
.drops = YAKKEY_DROPS,
.animations = YAKKEY_ANIMS,

2
src/world/area_arn/arn_09/arn_09_5_npc.c
View File

@ -50,7 +50,7 @@ StaticNpc N(NpcData_TubbasHeart) = {
.settings = &N(NpcSettings_TubbasHeart),
.pos = { 0.0f, 25.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TubbasHeart),
.drops = TUBBAS_HEART_DROPS,
.animations = TUBBAS_HEART_ANIMS,

2
src/world/area_arn/arn_10/arn_10_3_npc.c
View File

@ -64,7 +64,7 @@ StaticNpc N(NpcData_TubbasHeart) = {
.settings = &N(NpcSettings_TubbasHeart),
.pos = { 80.0f, 50.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TubbasHeart),
.drops = TUBBAS_HEART_DROPS,
.animations = TUBBAS_HEART_ANIMS,

2
src/world/area_arn/arn_11/arn_11_3_npc.c
View File

@ -154,7 +154,7 @@ StaticNpc N(NpcData_TubbasHeart) = {
.settings = &N(NpcSettings_TubbasHeart),
.pos = { 119.0f, 60.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.init = &N(EVS_NpcInit_TubbasHeart),
.drops = TUBBAS_HEART_DROPS,
.animations = TUBBAS_HEART_ANIMS,

2
src/world/area_arn/arn_12/arn_12_3_npc.c
View File

@ -65,7 +65,7 @@ StaticNpc N(NpcData_TubbasHeart) = {
.settings = &N(NpcSettings_TubbasHeart),
.pos = { 80.0f, 50.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TubbasHeart),
.drops = TUBBAS_HEART_DROPS,
.animations = TUBBAS_HEART_ANIMS,

2
src/world/area_arn/arn_13/arn_13_3_npc.c
View File

@ -65,7 +65,7 @@ StaticNpc N(NpcData_TubbasHeart) = {
.settings = &N(NpcSettings_TubbasHeart),
.pos = { 80.0f, 50.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TubbasHeart),
.drops = TUBBAS_HEART_DROPS,
.animations = TUBBAS_HEART_ANIMS,

20
src/world/area_dgb/dgb_00/dgb_00_3_npc.c
View File

@ -17,7 +17,7 @@ NpcSettings N(NpcSettings_Sentinel) = {
.level = 99,
};
EvtScript N(EVS_OpenDoors) = {
EvtScript N(EVS_SetDoorRots) = {
EVT_SET(LVar3, 0)
EVT_SUB(LVar3, LVar2)
EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliwt, COLLIDER_FLAGS_UPPER_MASK)
@ -262,7 +262,7 @@ EvtScript N(EVS_Scene_BoosApproachManor) = {
EVT_CALL(InterpPlayerYaw, 270, 1)
EVT_CALL(SetNpcPos, NPC_PARTNER, 350, 10, -150)
EVT_SET(LVar2, 1)
EVT_EXEC_WAIT(N(EVS_OpenDoors))
EVT_EXEC_WAIT(N(EVS_SetDoorRots))
EVT_RETURN
EVT_END
};
@ -445,7 +445,7 @@ StaticNpc N(NpcData_Boo_01) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Boo_01),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -457,7 +457,7 @@ StaticNpc N(NpcData_Boo_02) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_02),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -468,7 +468,7 @@ StaticNpc N(NpcData_Boo_03) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_03),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -479,7 +479,7 @@ StaticNpc N(NpcData_Boo_04) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_04),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -490,7 +490,7 @@ StaticNpc N(NpcData_Boo_05) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_05),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -501,7 +501,7 @@ StaticNpc N(NpcData_Boo_06) = {
.settings = &N(NpcSettings_Boo),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo_06),
.drops = BOO_DROPS,
.animations = GUSTY_BOO_ANIMS,
@ -534,7 +534,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = {
EVT_WAIT(20)
EVT_THREAD
EVT_SET(LVar2, 1)
EVT_EXEC(N(EVS_OpenDoors))
EVT_EXEC(N(EVS_SetDoorRots))
EVT_END_THREAD
EVT_WAIT(15)
EVT_THREAD
@ -658,7 +658,7 @@ StaticNpc N(NpcData_Sentinel) = {
.settings = &N(NpcSettings_Sentinel),
.pos = { 0.0f, 0.0f, -1000.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Sentinel),
.drops = SENTINEL_DROPS,
.animations = SENTINEL_ANIMS,

8
src/world/area_dgb/dgb_01/dgb_01_5_npc.c
View File

@ -190,7 +190,7 @@ EvtScript N(EVS_NpcInit_Tubba_Floor1) = {
EvtScript N(EVS_NpcInit_Sentinel_01) = {
EVT_SET(LVar0, GB_StoryProgress)
EVT_IF_GE(LVar0, -29)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim01)
EVT_CALL(SetNpcPos, NPC_SELF, -33, -3, 8)
@ -204,7 +204,7 @@ EvtScript N(EVS_NpcInit_Sentinel_01) = {
EvtScript N(EVS_NpcInit_Sentinel_02) = {
EVT_SET(LVar0, GB_StoryProgress)
EVT_IF_GE(LVar0, -29)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim01)
EVT_CALL(SetNpcPos, NPC_SELF, -486, 182, 28)
@ -218,7 +218,7 @@ EvtScript N(EVS_NpcInit_Sentinel_02) = {
EvtScript N(EVS_NpcInit_Sentinel_03) = {
EVT_SET(LVar0, GB_StoryProgress)
EVT_IF_GE(LVar0, -29)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim01)
EVT_CALL(SetNpcPos, NPC_SELF, -201, 0, -143)
@ -232,7 +232,7 @@ EvtScript N(EVS_NpcInit_Sentinel_03) = {
EvtScript N(EVS_NpcInit_Sentinel_04) = {
EVT_SET(LVar0, GB_StoryProgress)
EVT_IF_GE(LVar0, -29)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim01)
EVT_CALL(SetNpcPos, NPC_SELF, -305, -1, -80)

2
src/world/area_dgb/dgb_06/dgb_06_4_npc.c
View File

@ -28,7 +28,7 @@ StaticNpc N(NpcData_Boo) = {
.settings = &N(NpcSettings_Boo),
.pos = { -300.0f, 10.0f, 150.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Boo),
.drops = NPC_NO_DROPS,
.animations = GUSTY_BOO_ANIMS,

6
src/world/area_dgb/dgb_08/dgb_08_3_npc.c
View File

@ -175,7 +175,7 @@ StaticNpc N(NpcData_Tubba) = {
.settings = &N(NpcSettings_TubbaBlubba),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000,
.flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS,
.init = &N(EVS_NpcInit_Tubba),
.drops = CLUBBA_DROPS,
.territory = {
@ -399,7 +399,7 @@ StaticNpc N(NpcData_LastClubba) = {
.settings = &N(NpcSettings_LastClubba),
.pos = { 426.0f, 0.0f, 38.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_LastClubba),
.drops = NPC_NO_DROPS,
.territory = {
@ -436,7 +436,7 @@ StaticNpc N(NpcData_Clubba_Unused) = {
.settings = &N(NpcSettings_Clubba_Wander),
.pos = { -250.0f, 0.0f, 135.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_400,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400,
.init = &N(EVS_NpcInit_Clubba_Unused),
.drops = CLUBBA_DROPS,
.territory = {

2
src/world/area_dgb/dgb_15/dgb_15_3_npc.c
View File

@ -167,7 +167,7 @@ StaticNpc N(NpcData_Tubba) = {
.settings = &N(NpcSettings_TubbaBlubba),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000,
.flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS,
.init = &N(EVS_NpcInit_Tubba),
.drops = CLUBBA_DROPS,
.territory = {

4
src/world/area_dgb/dgb_18/dgb_18_3_npc.c
View File

@ -491,7 +491,7 @@ StaticNpc N(NpcData_Tubba) = {
.settings = &N(NpcSettings_TubbaBlubba),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000,
.flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS,
.init = &N(EVS_NpcInit_Tubba),
.drops = TUBBA_DROPS,
.territory = {
@ -519,7 +519,7 @@ StaticNpc N(NpcData_Yakkey) = {
.settings = &N(NpcSettings_Yakkey),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Yakkey),
.drops = NPC_NO_DROPS,
.animations = {

2
src/world/area_dro/dro_01/dro_01.h
View File

@ -43,7 +43,7 @@ extern EvtScript N(EVS_MakeEntities);
extern NpcGroupList N(DefaultNPCs);
extern NpcGroupList N(Chapter3NPCs);
extern EvtScript N(EVS_SetupBuildings);
extern EvtScript N(EVS_SetupRooms);
extern EvtScript N(EVS_SwingSign_Shop);
extern EvtScript N(EVS_OpenShopDoor);
extern EvtScript N(EVS_CloseShopDoor);

2
src/world/area_dro/dro_01/dro_01_2_main.c
View File

@ -114,7 +114,7 @@ EvtScript N(EVS_Main) = {
EVT_EXEC_WAIT(N(EVS_MakeEntities))
EVT_CALL(MakeShop, EVT_PTR(N(Shop_ItemPositions)), EVT_PTR(N(Shop_Inventory)), EVT_PTR(N(Shop_PriceList)), 0)
EVT_CALL(MakeShopOwner, EVT_PTR(N(Shop_Owner)))
EVT_EXEC_WAIT(N(EVS_SetupBuildings))
EVT_EXEC_WAIT(N(EVS_SetupRooms))
EVT_EXEC(N(EVS_SwingSign_Shop))
EVT_EXEC(N(EVS_SetupMusic))
EVT_EXEC(N(EVS_EnterMap))

30
src/world/area_dro/dro_01/dro_01_3_npc.c
View File

@ -20,14 +20,14 @@ MAP_STATIC_PAD(1,post_quizmo); // or pre_key_item?
#include "world/common/complete/LetterDelivery.inc.c"
s32 N(LetterList)[] = {
ITEM_LETTER19,
ITEM_LETTER_CHAIN_LITTLE_MOUSER,
ITEM_NONE
};
EvtScript N(EVS_LetterPrompt_ShopOwner) = {
EVT_CALL(N(LetterDelivery_Init),
NPC_Mouser_ShopOwner, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle,
ITEM_LETTER19, ITEM_LETTER_TO_FRANKY,
ITEM_LETTER_CHAIN_LITTLE_MOUSER, ITEM_LETTER_CHAIN_FRANKY,
MSG_CH2_0089, MSG_CH2_008A, MSG_CH2_008B, MSG_CH2_008C,
EVT_PTR(N(LetterList)))
EVT_EXEC_WAIT(N(EVS_DoLetterDelivery))
@ -194,7 +194,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Mouser_01,
.settings = &N(NpcSettings_Mouser),
.pos = { -332.0f, 0.0f, 188.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Mouser_01),
.yaw = 90,
.drops = MOUSER_DROPS,
@ -205,7 +205,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Dryite_01,
.settings = &N(NpcSettings_Dryite_Wander),
.pos = { -235.0f, 0.0f, 160.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Dryite_01),
.yaw = 90,
.drops = DRYITE_DROPS,
@ -228,7 +228,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Dryite_02,
.settings = &N(NpcSettings_Dryite),
.pos = { -380.0f, 0.0f, -15.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Dryite_02),
.yaw = 61,
.drops = DRYITE_DROPS,
@ -239,7 +239,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Dryite_03,
.settings = &N(NpcSettings_Dryite),
.pos = { 195.0f, 0.0f, -75.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_HintDryite),
.yaw = 74,
.drops = DRYITE_DROPS,
@ -250,7 +250,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Dryite_04,
.settings = &N(NpcSettings_Dryite),
.pos = { 225.0f, 0.0f, -83.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Dryite_04),
.yaw = 257,
.drops = DRYITE_DROPS,
@ -261,7 +261,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_ArtistToad,
.settings = &N(NpcSettings_Dryite),
.pos = { 285.0f, 0.0f, -274.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Composer),
.yaw = 271,
.drops = {
@ -293,7 +293,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Mouser_ShopOwner,
.settings = &N(NpcSettings_Mouser),
.pos = { 31.0f, 0.0f, -374.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_ShopOwner),
.yaw = 180,
.drops = MOUSER_DROPS,
@ -304,7 +304,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_ChuckQuizmo,
.settings = &N(NpcSettings_ChuckQuizmo),
.pos = { -400.0f, 0.0f, 100.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.initVarCount = 1,
.initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_01 }},
.yaw = 263,
@ -338,7 +338,7 @@ StaticNpc N(PassiveNPCs)[] = {
.settings = &N(NpcSettings_Dryite_Wander),
.pos = { -120.0f, 0.0f, 134.0f },
.yaw = 257,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_DojoGrad),
.drops = DRYITE_DROPS,
.territory = {
@ -361,7 +361,7 @@ StaticNpc N(PassiveNPCs)[] = {
.settings = &N(NpcSettings_Dryite_Patrol),
.pos = { 40.0f, 0.0f, 105.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Dryite_06),
.drops = DRYITE_DROPS,
.territory = {
@ -388,7 +388,7 @@ StaticNpc N(ThreeSisterNPCs)[] = {
.id = NPC_ThreeSisters_01,
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -141.0f, 0.0f, -18.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_ThreeSisters),
.yaw = 62,
.drops = TOADETTE_DROPS,
@ -399,7 +399,7 @@ StaticNpc N(ThreeSisterNPCs)[] = {
.id = NPC_ThreeSisters_02,
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -124.0f, 0.0f, -61.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_ThreeSisters),
.yaw = 63,
.drops = TOADETTE_DROPS,
@ -410,7 +410,7 @@ StaticNpc N(ThreeSisterNPCs)[] = {
.id = NPC_ThreeSisters_03,
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -80.0f, 0.0f, -35.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_ThreeSisters),
.yaw = 244,
.drops = TOADETTE_DROPS,

63
src/world/area_dro/dro_01/dro_01_5_building.c → src/world/area_dro/dro_01/dro_01_5_rooms.c
View File

@ -6,7 +6,7 @@ EvtScript N(EVS_SetDoorRot_LeftHouse) = {
EVT_END
};
EvtScript N(EVS_MoveWalls_LeftHouse) = {
EvtScript N(EVS_SetWallRot_LeftHouse) = {
EVT_SET(LVar1, LVar0)
EVT_DIVF(LVar1, 50)
EVT_CALL(TranslateModel, MODEL_1_m_kabe, 0, LVar1, 0)
@ -34,7 +34,7 @@ EvtScript N(EVS_SetDoorRot_Shop) = {
EVT_END
};
EvtScript N(EVS_MoveWalls_Shop) = {
EvtScript N(EVS_SetWallRot_Shop) = {
EVT_SET(LVar1, LVar0)
EVT_DIVF(LVar1, 50)
EVT_CALL(TranslateModel, MODEL_m_m_kabe, 0, LVar1, 0)
@ -65,7 +65,7 @@ EvtScript N(EVS_DropDoor_RightHouse) = {
EVT_END
};
EvtScript N(EVS_MoveWalls_RightHouse) = {
EvtScript N(EVS_SetWallRot_RightHouse) = {
EVT_IF_EQ(LVar0, 90)
EVT_CALL(EnableModel, MODEL_nuno, FALSE)
EVT_ELSE
@ -88,20 +88,20 @@ EvtScript N(EVS_MoveWalls_RightHouse) = {
EVT_END
};
EvtScript N(EVS_ToggleVis_LeftHouse) = {
EvtScript N(EVS_RoomListener_LeftHouse) = {
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN)
EVT_CALL(SetGroupEnabled, MODEL_ie_naka, TRUE)
EVT_CASE_EQ(3)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_END)
EVT_CALL(SetGroupEnabled, MODEL_ie_naka, FALSE)
EVT_END_SWITCH
EVT_RETURN
EVT_END
};
EvtScript N(EVS_ToggleVis_Shop) = {
EvtScript N(EVS_RoomListener_Shop) = {
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN)
EVT_SWITCH(GB_StoryProgress)
EVT_CASE_LT(STORY_CH2_SPOKE_WITH_SHEEK)
EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017B, 160, 40)
@ -112,13 +112,13 @@ EvtScript N(EVS_ToggleVis_Shop) = {
EVT_RETURN
EVT_END_SWITCH
EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 1)
EVT_CASE_EQ(2)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN)
EVT_THREAD
EVT_WAIT(45)
EVT_CALL(SetNpcPos, NPC_Mouser_ShopOwner, 33, 0, -375)
EVT_CALL(SetNpcYaw, NPC_Mouser_ShopOwner, 180)
EVT_END_THREAD
EVT_CASE_EQ(3)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_END)
EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 0)
EVT_SET(AB_DRO_SHOP_PREV1, 0)
EVT_SET(AB_DRO_SHOP_PREV2, 0)
@ -127,12 +127,13 @@ EvtScript N(EVS_ToggleVis_Shop) = {
EVT_END
};
EvtScript N(EVS_ToggleVis_RightHouse) = {
EvtScript N(EVS_RoomListener_RightHouse) = {
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN)
EVT_CALL(SetGroupEnabled, MODEL_ie2_naka, 1)
EVT_CASE_EQ(2)
EVT_CASE_EQ(3)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN)
// do nothing
EVT_CASE_EQ(ROOM_UPDATE_EXIT_END)
EVT_CALL(SetGroupEnabled, MODEL_ie2_naka, 0)
EVT_END_SWITCH
EVT_RETURN
@ -154,41 +155,41 @@ s32 N(InteriorNPCs_RightHouse)[] = {
-1
};
EvtScript N(EVS_SetupBuildings) = {
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_5),
EvtScript N(EVS_SetupRooms) = {
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_LARGE_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_LeftHouse)),
EVT_PTR(N(EVS_MoveWalls_LeftHouse)),
EVT_PTR(N(EVS_SetWallRot_LeftHouse)),
EVT_PTR(N(EVS_DropDoor_LeftHouse)),
EVT_PTR(N(EVS_ToggleVis_LeftHouse)),
EVT_PTR(N(EVS_RoomListener_LeftHouse)),
COLLIDER_ei1_1,
COLLIDER_ei1_2,
MODEL_k_i1,
EVT_PTR(N(InteriorNPCs_LeftHouse)))
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_5),
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_LARGE_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_Shop)),
EVT_PTR(N(EVS_MoveWalls_Shop)),
EVT_PTR(N(EVS_SetWallRot_Shop)),
NULL,
EVT_PTR(N(EVS_ToggleVis_Shop)),
EVT_PTR(N(EVS_RoomListener_Shop)),
COLLIDER_em_1,
COLLIDER_em_2,
MODEL_k_m1,
EVT_PTR(N(InteriorNPCs_Shop)))
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_5),
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_LARGE_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_RightHouse)),
EVT_PTR(N(EVS_MoveWalls_RightHouse)),
EVT_PTR(N(EVS_SetWallRot_RightHouse)),
EVT_PTR(N(EVS_DropDoor_RightHouse)),
EVT_PTR(N(EVS_ToggleVis_RightHouse)),
EVT_PTR(N(EVS_RoomListener_RightHouse)),
COLLIDER_ei2_1,
COLLIDER_ei_2,
MODEL_k_i2,
EVT_PTR(N(InteriorNPCs_RightHouse)))
EVT_SET(LVar0, 3)
EVT_EXEC(N(EVS_ToggleVis_LeftHouse))
EVT_EXEC(N(EVS_ToggleVis_Shop))
EVT_EXEC(N(EVS_ToggleVis_RightHouse))
EVT_SET(LVar0, ROOM_UPDATE_EXIT_END)
EVT_EXEC(N(EVS_RoomListener_LeftHouse))
EVT_EXEC(N(EVS_RoomListener_Shop))
EVT_EXEC(N(EVS_RoomListener_RightHouse))
EVT_RETURN
EVT_END
};

2
src/world/area_dro/dro_02/dro_02.h
View File

@ -48,7 +48,7 @@ extern EvtScript N(EVS_SetupMusic);
extern EvtScript N(EVS_PlayRestMusic);
extern EvtScript N(EVS_PlayMoustafaMusic);
extern EvtScript N(EVS_SetupBuildings);
extern EvtScript N(EVS_SetupRooms);
extern EvtScript N(8024D434);
#endif

2
src/world/area_dro/dro_02/dro_02_2_entity.c
View File

@ -2,7 +2,7 @@
#include "entity.h"
EvtScript N(EVS_MakeEntities) = {
EVT_CALL(MakeItemEntity, ITEM_LETTER08, -135, 160, -245, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_DRO02_Item_Letter08)
EVT_CALL(MakeItemEntity, ITEM_LETTER_TO_NOMADIMOUSE, -135, 160, -245, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_DRO02_Item_Letter08)
EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 180, 173, -200, 0, MODEL_1_yane, MAKE_ENTITY_END)
EVT_CALL(AssignPanelFlag, GF_DRO02_HiddenPanel)
EVT_RETURN

2
src/world/area_dro/dro_02/dro_02_3_main.c
View File

@ -54,7 +54,7 @@ EvtScript N(EVS_Main) = {
EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs)))
EVT_CALL(InitVirtualEntityList)
EVT_EXEC_WAIT(N(EVS_MakeEntities))
EVT_EXEC_WAIT(N(EVS_SetupBuildings))
EVT_EXEC_WAIT(N(EVS_SetupRooms))
EVT_EXEC(N(EVS_SetupMusic))
EVT_CALL(GetEntryID, LVar0)
EVT_SWITCH(LVar0)

50
src/world/area_dro/dro_02/dro_02_4_building.c → src/world/area_dro/dro_02/dro_02_4_rooms.c
View File

@ -31,14 +31,14 @@ EvtScript N(EVS_UnusedDoorSetup) = {
EVT_END
};
EvtScript N(EVS_OpenDoor_Hideout) = {
EvtScript N(EVS_SetDoorRot_Hideout) = {
EVT_CALL(RotateModel, MODEL_o769, LVar0, 0, -1, 0)
EVT_CALL(RotateModel, MODEL_o770, LVar0, 0, 1, 0)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_MoveWalls_Hideout) = {
EvtScript N(EVS_SetWallRot_Hideout) = {
EVT_SET(LVar1, LVar0)
EVT_DIVF(LVar1, 50)
EVT_CALL(TranslateModel, MODEL_6_kabe, 0, LVar1, 0)
@ -62,13 +62,13 @@ EvtScript N(EVS_DropDoor_Hideout) = {
EVT_END
};
EvtScript N(EVS_OpenDoor_ToadHouse) = {
EvtScript N(EVS_SetDoorRot_ToadHouse) = {
EVT_CALL(RotateModel, MODEL_4_doa, LVar0, 0, 1, 0)
EVT_RETURN
EVT_END
};
EvtScript N(EVS_MoveWalls_ToadHouse) = {
EvtScript N(EVS_SetWallRot_ToadHouse) = {
EVT_SET(LVar1, LVar0)
EVT_DIVF(LVar1, 50)
EVT_CALL(RotateGroup, MODEL_mobe, LVar0, 0, 0, -1)
@ -87,12 +87,12 @@ EvtScript N(EVS_SetupCamSpeed) = {
EVT_END
};
EvtScript N(EVS_ToggleVis_ToadHouse) = {
EvtScript N(EVS_RoomListener_ToadHouse) = {
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN)
EVT_CALL(SetGroupEnabled, MODEL_ie4_naka, 1)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
EVT_CASE_EQ(3)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_END)
EVT_CALL(SetGroupEnabled, MODEL_ie4_naka, 0)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334))
EVT_END_SWITCH
@ -100,9 +100,9 @@ EvtScript N(EVS_ToggleVis_ToadHouse) = {
EVT_END
};
EvtScript N(EVS_ToggleVis_Hideout) = {
EvtScript N(EVS_RoomListener_Hideout) = {
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN)
EVT_CALL(SetGroupEnabled, MODEL_ie5_naka, 1)
EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE)
EVT_CALL(SetCamDistance, CAM_DEFAULT, 260)
@ -113,13 +113,13 @@ EvtScript N(EVS_ToggleVis_Hideout) = {
EVT_CALL(SetPanTarget, CAM_DEFAULT, -395, 140, -150)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CASE_EQ(2)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN)
EVT_CALL(SetPanTarget, CAM_DEFAULT, -365, 140, -145)
EVT_CALL(SetCamPitch, CAM_DEFAULT, 20, -7)
EVT_CALL(SetCamDistance, CAM_DEFAULT, 400)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0))
EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0))
EVT_CASE_EQ(3)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_END)
EVT_CALL(SetGroupEnabled, MODEL_ie5_naka, 0)
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334))
@ -207,19 +207,19 @@ s32 N(InsideNPCs_ToadHouse)[] = {
-1
};
EvtScript N(EVS_SetupBuildings) = {
EvtScript N(EVS_SetupRooms) = {
EVT_EXEC(N(EVS_SwingToadHouseSign))
EVT_CALL(ParentColliderToModel, COLLIDER_o1287, MODEL_1_doa)
EVT_IF_GE(GB_StoryProgress, STORY_CH2_BOUGHT_SECRET_ITEMS)
EVT_CALL(RotateModel, MODEL_1_doa, 18, 0, 1, 0)
EVT_CALL(UpdateColliderTransform, COLLIDER_o1287)
EVT_END_IF
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_4),
EVT_PTR(N(EVS_OpenDoor_Hideout)),
EVT_PTR(N(EVS_MoveWalls_Hideout)),
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_STRAIGHT_THROUGH),
EVT_PTR(N(EVS_SetDoorRot_Hideout)),
EVT_PTR(N(EVS_SetWallRot_Hideout)),
EVT_PTR(N(EVS_DropDoor_Hideout)),
EVT_PTR(N(EVS_ToggleVis_Hideout)),
EVT_PTR(N(EVS_RoomListener_Hideout)),
COLLIDER_o1252,
COLLIDER_o1253,
MODEL_k_i5,
@ -228,20 +228,20 @@ EvtScript N(EVS_SetupBuildings) = {
EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenSecretDoor_FromOutside)), TRIGGER_WALL_PRESS_A, COLLIDER_o1287, 1, 0)
EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenSecretDoor_FromInside)), TRIGGER_WALL_PRESS_A, COLLIDER_o1289, 1, 0)
EVT_END_IF
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_1, VIS_GROUP_5),
EVT_PTR(N(EVS_OpenDoor_ToadHouse)),
EVT_PTR(N(EVS_MoveWalls_ToadHouse)),
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_1, ROOM_LARGE_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_ToadHouse)),
EVT_PTR(N(EVS_SetWallRot_ToadHouse)),
NULL,
EVT_PTR(N(EVS_ToggleVis_ToadHouse)),
EVT_PTR(N(EVS_RoomListener_ToadHouse)),
COLLIDER_o1204,
COLLIDER_o1261,
MODEL_k_i4,
EVT_PTR(N(InsideNPCs_ToadHouse)))
EVT_SET(LVar0, 3)
EVT_EXEC(N(EVS_ToggleVis_Hideout))
EVT_SET(LVar0, ROOM_UPDATE_EXIT_END)
EVT_EXEC(N(EVS_RoomListener_Hideout))
EVT_EXEC(N(EVS_SetupCamSpeed))
EVT_EXEC(N(EVS_ToggleVis_ToadHouse))
EVT_EXEC(N(EVS_RoomListener_ToadHouse))
EVT_RETURN
EVT_END
};

28
src/world/area_dro/dro_02/dro_02_5_npc.c
View File

@ -62,14 +62,14 @@ MAP_STATIC_PAD(1,key_item);
#include "world/common/complete/LetterDelivery.inc.c"
s32 N(LetterList)[] = {
ITEM_LETTER17,
ITEM_LETTER_CHAIN_MR_E,
ITEM_NONE
};
EvtScript N(EVS_LetterPrompt_MrE) = {
EVT_CALL(N(LetterDelivery_Init),
NPC_Dryite_01, ANIM_Dryite_Blue_Talk, ANIM_Dryite_Blue_Idle,
ITEM_LETTER17, ITEM_LETTER18,
ITEM_LETTER_CHAIN_MR_E, ITEM_LETTER_CHAIN_MISS_T,
MSG_CH2_0095, MSG_CH2_0096, MSG_CH2_0097, MSG_CH2_0098,
EVT_PTR(N(LetterList)))
EVT_EXEC_WAIT(N(EVS_DoLetterDelivery))
@ -359,7 +359,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Archeologist,
.settings = &N(NpcSettings_Archeologist),
.pos = { -320.0f, 0.0f, -14.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Archeologist),
.yaw = 90,
.drops = {
@ -392,7 +392,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Dryite_01,
.settings = &N(NpcSettings_Dryite_Wander),
.pos = { -20.0f, 0.0f, 40.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_MrE),
.yaw = 270,
.drops = DRYITE_DROPS,
@ -404,7 +404,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_DisguisedMoustafa,
.settings = &N(NpcSettings_Mouser),
.pos = { 245.0f, 0.0f, -35.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_DisguisedMoustafa),
.yaw = 90,
.drops = MOUSER_DROPS,
@ -415,7 +415,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Toad,
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -143.0f, 0.0f, -170.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_ToadHouseKeeper),
.yaw = 180,
.drops = TOAD_DROPS,
@ -426,7 +426,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Merlee,
.settings = &N(NpcSettings_Merlee),
.pos = { -130.0f, 0.0f, -400.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcAuxAI_Merlee),
.yaw = 180,
.drops = {
@ -458,7 +458,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Moustafa,
.settings = &N(NpcSettings_Mouser),
.pos = { NPC_DISPOSE_LOCATION },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Moustafa),
.yaw = 0,
.drops = MOUSER_DROPS,
@ -469,7 +469,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Dryite_02,
.settings = &N(NpcSettings_Dryite),
.pos = { 25.0f, 0.0f, -38.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Dryite_02),
.yaw = 270,
.drops = DRYITE_DROPS,
@ -480,7 +480,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Dryite_03,
.settings = &N(NpcSettings_Dryite),
.pos = { -375.0f, 0.0f, -10.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Dryite_03),
.yaw = 270,
.drops = DRYITE_DROPS,
@ -491,7 +491,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Mouser_01,
.settings = &N(NpcSettings_Mouser),
.pos = { -50.0f, 0.0f, -470.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Mouser_01),
.yaw = 180,
.drops = {
@ -506,7 +506,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Mouser_02,
.settings = &N(NpcSettings_Mouser),
.pos = { -270.0f, 0.0f, 91.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Mouser_02),
.yaw = 270,
.drops = MOUSER_DROPS,
@ -517,7 +517,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_Mouser_03,
.settings = &N(NpcSettings_Mouser),
.pos = { 210.0f, 0.0f, -35.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Mouser_03),
.yaw = 90,
.drops = MOUSER_DROPS,
@ -527,7 +527,7 @@ StaticNpc N(PassiveNPCs)[] = {
.id = NPC_ChuckQuizmo,
.settings = &N(NpcSettings_ChuckQuizmo),
.pos = { -335.0f, 0.0f, 90.0f },
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.initVarCount = 1,
.initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_02 } },
.yaw = 270,

8
src/world/area_dro/dro_02/npc_merlee.c
View File

@ -119,7 +119,7 @@ API_CALLABLE(N(DarkenWorld)) {
for (i = 0; i < MAX_NPCS; i++) {
Npc* npc = get_npc_by_index(i);
if (npc != 0 && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_Merlee) {
npc->flags |= NPC_FLAG_NO_DROPS;
npc->flags |= NPC_FLAG_HIDING;
}
}
script->functionTemp[0] = 0;
@ -157,7 +157,7 @@ API_CALLABLE(N(UndarkenWorld)) {
Npc* npc = get_npc_by_index(i);
if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != NPC_Merlee) {
npc->flags &= ~NPC_FLAG_NO_DROPS;
npc->flags &= ~NPC_FLAG_HIDING;
}
}
return ApiStatus_DONE2;
@ -763,7 +763,7 @@ EvtScript N(EVS_NpcInteract_Merlee) = {
EVT_CALL(func_802D2C14, 1)
EVT_EXEC_WAIT(N(EVS_BeginMerleeCamera))
EVT_SET(LVar0, 0)
EVT_IF_EQ(GB_KootFavor_Current, 8)
EVT_IF_EQ(GB_KootFavor_Current, KOOT_FAVOR_CH4_1)
EVT_ADD(LVar0, 1)
EVT_END_IF
EVT_IF_EQ(GF_HOS06_MerluvleeRequestedCrystalBall, 1)
@ -776,7 +776,7 @@ EvtScript N(EVS_NpcInteract_Merlee) = {
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMerlee_Talk, ANIM_WorldMerlee_Idle, 0, MSG_CH2_00DC)
EVT_SET(LVar0, ITEM_CRYSTAL_BALL)
EVT_SET(LVar1, 1)
EVT_EXEC_WAIT(N(GiveKeyReward))
EVT_EXEC_WAIT(N(GiveItemReward))
EVT_CALL(AddKeyItem, ITEM_CRYSTAL_BALL)
EVT_SET(GF_DRO01_Gift_CrystalBall, 1)
EVT_WAIT(20)

8
src/world/area_end/end_00/end_00_5_koopas.c
View File

@ -105,7 +105,7 @@ EvtScript N(EVS_KoopaBros_Green) = {
};
EvtScript N(EVS_Bobomb1) = {
EVT_CALL(SetNpcFlagBits, NPC_Bobomb1, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_Bobomb1, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_WAIT(180)
EVT_CALL(NpcMoveTo, NPC_Bobomb1, -1900, 43, 70)
EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim0B)
@ -127,7 +127,7 @@ EvtScript N(EVS_Bobomb1) = {
};
EvtScript N(EVS_Bobomb2) = {
EVT_CALL(SetNpcFlagBits, NPC_Bobomb2, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_Bobomb2, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_WAIT(180)
EVT_CALL(NpcMoveTo, NPC_Bobomb2, -1870, 43, 70)
EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim0B)
@ -149,7 +149,7 @@ EvtScript N(EVS_Bobomb2) = {
};
EvtScript N(EVS_Bobomb3) = {
EVT_CALL(SetNpcFlagBits, NPC_Bobomb3, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_Bobomb3, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_WAIT(180)
EVT_CALL(NpcMoveTo, NPC_Bobomb3, -1840, 43, 70)
EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim0B)
@ -171,7 +171,7 @@ EvtScript N(EVS_Bobomb3) = {
};
EvtScript N(EVS_Bobomb4) = {
EVT_CALL(SetNpcFlagBits, NPC_Bobomb4, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_Bobomb4, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_WAIT(180)
EVT_CALL(NpcMoveTo, NPC_Bobomb4, -1810, 43, 70)
EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim0B)

2
src/world/area_end/end_01/end_01_4_opera_float.c
View File

@ -308,7 +308,7 @@ EvtScript N(EVS_ParadePhase_Opera) = {
EVT_SET(LVar0, 1)
EVT_EXEC_GET_TID(N(EVS_TexPan_OperaFloat_MainStageLights), LVarA)
EVT_EXEC_GET_TID(N(EVS_UpdateLightshow), LVarC)
EVT_CALL(SetNpcFlagBits, NPC_Singer, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_Singer, NPC_FLAG_8, TRUE)
EVT_CALL(MakeLerp, 0, 55, 90, EASING_LINEAR)
EVT_LOOP(0)
EVT_CALL(UpdateLerp)

16
src/world/area_flo/flo_00/flo_00_3_npc.c
View File

@ -623,7 +623,7 @@ StaticNpc N(NpcData_Wisterwood) = {
.settings = &N(NpcSettings_Dummy),
.pos = { -72.0f, 60.0f, -100.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Wisterwood),
.drops = BUBULB_DROPS,
.animations = BUBULB_PINK_ANIMS,
@ -635,7 +635,7 @@ StaticNpc N(NpcData_Bubulbs)[] = {
.settings = &N(NpcSettings_Bubulb_Patrol),
.pos = { -59.0f, 0.0f, -40.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Bubulb_01),
.drops = BUBULB_DROPS,
.territory = {
@ -660,7 +660,7 @@ StaticNpc N(NpcData_Bubulbs)[] = {
.settings = &N(NpcSettings_Bubulb_Patrol),
.pos = { 67.0f, 0.0f, 85.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Bubulb_02),
.drops = BUBULB_DROPS,
.territory = {
@ -685,7 +685,7 @@ StaticNpc N(NpcData_Bubulbs)[] = {
.settings = &N(NpcSettings_Bubulb_Patrol),
.pos = { 90.0f, 0.0f, 410.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Bubulb_03),
.drops = BUBULB_DROPS,
.territory = {
@ -710,7 +710,7 @@ StaticNpc N(NpcData_Bubulbs)[] = {
.settings = &N(NpcSettings_Bubulb_Patrol),
.pos = { 200.0f, 0.0f, 430.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.init = &N(EVS_NpcInit_Bubulb_04),
.drops = BUBULB_DROPS,
.territory = {
@ -737,7 +737,7 @@ StaticNpc N(NpcData_Tolielup) = {
.settings = &N(NpcSettings_Tolielup),
.pos = { -400.0f, 0.0f, 190.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Tolielup),
.drops = TOLIELUP_DROPS,
.animations = TOLIELUP_ANIMS,
@ -749,7 +749,7 @@ StaticNpc N(NpcData_Klevar) = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Klevar),
.drops = KLEVAR_DROPS,
.animations = KLEVAR_ANIMS,
@ -760,7 +760,7 @@ StaticNpc N(NpcData_Lakilulu) = {
.settings = &N(NpcSettings_Dummy),
.pos = { 198.0f, 0.0f, 363.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Lakilulu),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,

6
src/world/area_flo/flo_00/flo_00_4_epilogue.c
View File

@ -81,7 +81,7 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = {
.settings = &N(NpcSettings_Lakilester_Epilogue),
.pos = { 144.0f, 0.0f, 374.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Lakilester_Epilogue),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -112,7 +112,7 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = {
.settings = &N(NpcSettings_Lakilester_Epilogue),
.pos = { 198.0f, 0.0f, 363.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Lakilulu_Epilogue),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -143,7 +143,7 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = {
.settings = &N(NpcSettings_Parakarry),
.pos = { 266.0f, 0.0f, 322.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Parakarry_Epilogue),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,

48
src/world/area_flo/flo_03/flo_03_3_npc.c
View File

@ -232,11 +232,11 @@ EvtScript N(EVS_NpcInteract_Petunia) = {
EVT_SET(LVar4, EVT_FLOAT(90.0))
EVT_EXEC_WAIT(N(EVS_FocusCamBetween))
EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0057)
EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, 0)
EVT_CALL(BindNpcAI, NPC_Dayzee, EVT_PTR(N(EVS_NpcAI_Dayzee)))
EVT_SET(MV_PauseBurrowing, FALSE)
EVT_SET(MV_NextBurrowTriggerRadius, 60)
@ -296,7 +296,7 @@ EvtScript N(EVS_NpcInit_Dayzee) = {
EVT_CALL(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION)
EVT_CASE_DEFAULT
EVT_IF_EQ(GF_FLO03_Defeated_Dayzee, FALSE)
EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, 0)
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Dayzee)))
EVT_ELSE
EVT_CALL(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION)
@ -390,7 +390,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = {
EVT_END_IF
EVT_IF_EQ(LV_ShouldBurrow, TRUE)
EVT_IF_EQ(AF_FLO_IsUnderground_Mole_01, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1)
EVT_WAIT(1)
EVT_SET(AF_FLO_IsUnderground_Mole_01, TRUE)
@ -424,7 +424,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = {
EVT_END_LOOP
EVT_CALL(SetNpcPos, NPC_MontyMole_01, LVar1, LVar2, LVar3)
EVT_END_IF
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_01, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_SET(AF_FLO_IsUnderground_Mole_01, FALSE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_01, 1)
EVT_WAIT(1)
@ -469,7 +469,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = {
EVT_END_IF
EVT_IF_EQ(LV_ShouldBurrow, TRUE)
EVT_IF_EQ(AF_FLO_IsUnderground_Mole_02, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1)
EVT_WAIT(1)
EVT_SET(AF_FLO_IsUnderground_Mole_02, TRUE)
@ -503,7 +503,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = {
EVT_END_LOOP
EVT_CALL(SetNpcPos, NPC_MontyMole_02, LVar1, LVar2, LVar3)
EVT_END_IF
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_02, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_SET(AF_FLO_IsUnderground_Mole_02, FALSE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_02, 1)
EVT_WAIT(1)
@ -548,7 +548,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = {
EVT_END_IF
EVT_IF_EQ(LV_ShouldBurrow, TRUE)
EVT_IF_EQ(AF_FLO_IsUnderground_Mole_03, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1)
EVT_WAIT(1)
EVT_SET(AF_FLO_IsUnderground_Mole_03, TRUE)
@ -582,7 +582,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = {
EVT_END_LOOP
EVT_CALL(SetNpcPos, NPC_MontyMole_03, LVar1, LVar2, LVar3)
EVT_END_IF
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_03, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_SET(AF_FLO_IsUnderground_Mole_03, FALSE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_03, 1)
EVT_WAIT(1)
@ -627,7 +627,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = {
EVT_END_IF
EVT_IF_EQ(LV_ShouldBurrow, TRUE)
EVT_IF_EQ(AF_FLO_IsUnderground_Mole_04, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1)
EVT_WAIT(1)
EVT_SET(AF_FLO_IsUnderground_Mole_04, TRUE)
@ -661,7 +661,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = {
EVT_END_LOOP
EVT_CALL(SetNpcPos, NPC_MontyMole_04, LVar1, LVar2, LVar3)
EVT_END_IF
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_MontyMole_04, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_SET(AF_FLO_IsUnderground_Mole_04, FALSE)
EVT_CALL(NpcFacePlayer, NPC_MontyMole_04, 1)
EVT_WAIT(1)
@ -696,7 +696,7 @@ EvtScript N(EVS_NpcInit_MontyMole_01) = {
EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleA, FALSE)
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_01)))
EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, 0)
EVT_ELSE
EVT_CALL(SetNpcPos, NPC_MontyMole_01, NPC_DISPOSE_LOCATION)
EVT_END_IF
@ -719,7 +719,7 @@ EvtScript N(EVS_NpcInit_MontyMole_02) = {
EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleB, FALSE)
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_02)))
EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, 0)
EVT_ELSE
EVT_CALL(SetNpcPos, NPC_MontyMole_02, NPC_DISPOSE_LOCATION)
EVT_END_IF
@ -742,7 +742,7 @@ EvtScript N(EVS_NpcInit_MontyMole_03) = {
EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleC, FALSE)
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_03)))
EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, 0)
EVT_ELSE
EVT_CALL(SetNpcPos, NPC_MontyMole_03, NPC_DISPOSE_LOCATION)
EVT_END_IF
@ -765,7 +765,7 @@ EvtScript N(EVS_NpcInit_MontyMole_04) = {
EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleD, FALSE)
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_04)))
EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_1, 0)
EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, 0)
EVT_ELSE
EVT_CALL(SetNpcPos, NPC_MontyMole_04, NPC_DISPOSE_LOCATION)
EVT_END_IF
@ -781,7 +781,7 @@ StaticNpc N(NpcData_Petunia) = {
.settings = &N(NpcSettings_Petunia),
.pos = { -30.0f, 0.0f, 100.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Petunia),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -814,7 +814,7 @@ StaticNpc N(NpcData_Dayzee) = {
.settings = &N(NpcSettings_Dayzee),
.pos = { -233.0f, 0.0f, -217.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Dayzee),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -846,7 +846,7 @@ StaticNpc N(NpcData_MontyMole_01) = {
.settings = &N(NpcSettings_Dayzee),
.pos = { -100.0f, 0.0f, 210.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_MontyMole_01),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -878,7 +878,7 @@ StaticNpc N(NpcData_MontyMole_02) = {
.settings = &N(NpcSettings_Dayzee),
.pos = { -130.0f, 0.0f, 0.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_MontyMole_02),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -910,7 +910,7 @@ StaticNpc N(NpcData_MontyMole_03) = {
.settings = &N(NpcSettings_Dayzee),
.pos = { 75.0f, 0.0f, 20.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_MontyMole_03),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -942,7 +942,7 @@ StaticNpc N(NpcData_MontyMole_04) = {
.settings = &N(NpcSettings_Dayzee),
.pos = { 71.0f, 0.0f, 200.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_MontyMole_04),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,

4
src/world/area_flo/flo_07/flo_07_3_npc.c
View File

@ -66,7 +66,7 @@ EvtScript N(EVS_MakeCrystalBerry) = {
EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE)
EVT_END_IF
EVT_CALL(PlaySound, SOUND_7BC)
EVT_CALL(func_802D62E4, 956)
EVT_CALL(func_802D62E4, SOUND_3BC)
EVT_SET(AF_FLO_MadeCrystalBerry, TRUE)
EVT_WAIT(20)
EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_006A)
@ -236,7 +236,7 @@ StaticNpc N(NpcData_Posie) = {
.settings = &N(NpcSettings_Posie),
.pos = { -260.0f, 0.0f, 0.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Posie),
.drops = POSIE_DROPS,
.animations = POSIE_ANIMS,

2
src/world/area_flo/flo_08/flo_08_4_npc.c
View File

@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = {
.settings = &N(NpcSettings_GateFlower),
.pos = { -695.0f, 0.0f, -30.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_GateFlower),
.drops = GATE_FLOWER_DROPS,
.animations = GATE_FLOWER_YELLOW_ANIMS,

2
src/world/area_flo/flo_10/flo_10_5_npc.c
View File

@ -203,7 +203,7 @@ StaticNpc N(NpcData_Lily) = {
.settings = &N(NpcSettings_Lily),
.pos = { 80.0f, -60.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Lily),
.drops = LILY_DROPS,
.animations = LILY_ANIMS,

4
src/world/area_flo/flo_11/flo_11_3_npc.c
View File

@ -374,7 +374,7 @@ StaticNpc N(NpcData_Lakitus)[] = {
.settings = &N(NpcSettings_Lakitu),
.pos = { 553.0f, 60.0f, 52.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.init = &N(EVS_NpcInit_Lakitu_01),
.drops = LAKITU_DROPS,
.animations = LAKITU_ANIMS,
@ -384,7 +384,7 @@ StaticNpc N(NpcData_Lakitus)[] = {
.settings = &N(NpcSettings_Lakitu),
.pos = { 553.0f, 60.0f, 52.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.init = &N(EVS_NpcInit_Lakitu_02),
.drops = LAKITU_DROPS,
.animations = LAKITU_ANIMS,

4
src/world/area_flo/flo_12/flo_12_3_npc.c
View File

@ -194,7 +194,7 @@ StaticNpc N(NpcData_Rosie)[] = {
.settings = &N(NpcSettings_Rosie),
.pos = { -70.0f, 0.0f, 20.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Rosie),
.drops = ROSIE_DROPS,
.animations = ROSIE_ANIMS,
@ -205,7 +205,7 @@ StaticNpc N(NpcData_Rosie)[] = {
.settings = &N(NpcSettings_Dummy),
.pos = { -70.0f, 0.0f, 20.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200,
.drops = ROSIE_DROPS,
.animations = ROSIE_ANIMS,
},

6
src/world/area_flo/flo_13/flo_13_4_npc.c
View File

@ -597,7 +597,7 @@ StaticNpc N(NpcData_Lakilester) = {
.settings = &N(NpcSettings_Lakilester),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.init = &N(EVS_NpcInit_Lakilester),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -629,7 +629,7 @@ StaticNpc N(NpcData_Lakilulu) = {
.settings = &N(NpcSettings_Lakilester),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Lakilulu),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -662,7 +662,7 @@ StaticNpc N(NpcData_Lakilulu_Spiny) = {
.settings = &N(NpcSettings_Lakilester),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Lakilulu_Spiny),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,

2
src/world/area_flo/flo_14/flo_14_4_npc.c
View File

@ -83,7 +83,7 @@ StaticNpc N(NpcData_BubbleFlower) = {
.settings = &N(NpcSettings_BubbleFlower),
.pos = { 617.0f, 0.0f, 108.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000,
.init = &N(EVS_NpcInit_BubbleFlower),
.drops = BUBULB_DROPS,
.animations = BUBULB_PINK_ANIMS,

4
src/world/area_flo/flo_15/flo_15_3_npc.c
View File

@ -203,7 +203,7 @@ StaticNpc N(NpcData_Sun)[] = {
.settings = &N(NpcSettings_Sun),
.pos = { 0.0f, 250.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Sun_01),
.drops = SUN_DROPS,
.animations = SUN_ANIMS,
@ -214,7 +214,7 @@ StaticNpc N(NpcData_Sun)[] = {
.settings = &N(NpcSettings_Sun),
.pos = { 0.0f, 250.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000,
.init = &N(EVS_NpcInit_Sun_02),
.drops = SUN_DROPS,
.animations = SUN_ANIMS,

10
src/world/area_flo/flo_18/flo_18_4_npc.c
View File

@ -603,7 +603,7 @@ StaticNpc N(NpcData_MachineGang)[] = {
.settings = &N(NpcSettings_Lakitu),
.pos = { 0.0f, 15.0f, 60.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Lakitu_01),
.drops = LAKITU_DROPS,
.animations = LAKITU_ANIMS,
@ -614,7 +614,7 @@ StaticNpc N(NpcData_MachineGang)[] = {
.settings = &N(NpcSettings_Lakitu),
.pos = { 65.0f, 15.0f, 60.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Lakitu_02),
.drops = LAKITU_DROPS,
.animations = LAKITU_ANIMS,
@ -625,7 +625,7 @@ StaticNpc N(NpcData_MachineGang)[] = {
.settings = &N(NpcSettings_Lakitu),
.pos = { 135.0f, 15.0f, 35.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Lakitu_03),
.drops = LAKITU_DROPS,
.animations = LAKITU_ANIMS,
@ -636,7 +636,7 @@ StaticNpc N(NpcData_MachineGang)[] = {
.settings = &N(NpcSettings_Magikoopa),
.pos = { -60.0f, 0.0f, 50.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Magikoopa),
.drops = MAGIKOOPA_DROPS,
.animations = MAGIKOOPA_YELLOW_ANIMS,
@ -647,7 +647,7 @@ StaticNpc N(NpcData_MachineGang)[] = {
.settings = &N(NpcSettings_Magikoopa),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_FlyingMagikoopa),
.drops = MAGIKOOPA_DROPS,
.animations = FLYING_MAGIKOOPA_YELLOW_ANIMS,

36
src/world/area_flo/flo_21/flo_21_4_npc.c
View File

@ -592,7 +592,7 @@ StaticNpc N(NpcData_HuffNPuff)[] = {
.settings = &N(NpcSettings_HuffNPuff),
.pos = { 650.0f, NPC_DISPOSE_POS_Y, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.init = &N(EVS_NpcInit_HuffNPuff_Face),
.drops = HUFF_N_PUFF_NO_DROPS,
.animations = HUFF_N_PUFF_ANIMS,
@ -603,7 +603,7 @@ StaticNpc N(NpcData_HuffNPuff)[] = {
.settings = &N(NpcSettings_HuffNPuff),
.pos = { 650.0f, 100.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.init = &N(EVS_NpcInit_HuffNPuff_Body),
.drops = HUFF_N_PUFF_NO_DROPS,
.animations = HUFF_N_PUFF_ANIMS,
@ -614,7 +614,7 @@ StaticNpc N(NpcData_HuffNPuff)[] = {
.settings = &N(NpcSettings_HuffNPuff),
.pos = { 650.0f, NPC_DISPOSE_POS_Y, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000,
.init = &N(EVS_NpcInit_HuffNPuff_Arms),
.drops = HUFF_N_PUFF_NO_DROPS,
.animations = HUFF_N_PUFF_ANIMS,
@ -633,7 +633,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -644,7 +644,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -655,7 +655,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -666,7 +666,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -677,7 +677,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -688,7 +688,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -699,7 +699,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -710,7 +710,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -721,7 +721,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -732,7 +732,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -743,7 +743,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -754,7 +754,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -765,7 +765,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -776,7 +776,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,
@ -787,7 +787,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = {
.settings = &N(NpcSettings_TuffPuff),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_TuffPuff),
.drops = TUFF_PUFF_NO_DROPS,
.animations = TUFF_PUFF_ANIMS,

2
src/world/area_flo/flo_23/flo_23_3_npc.c
View File

@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = {
.settings = &N(NpcSettings_GateFlower),
.pos = { 385.0f, 0.0f, -35.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_GateFlower),
.drops = GATE_FLOWER_DROPS,
.animations = GATE_FLOWER_BLUE_ANIMS,

2
src/world/area_flo/flo_25/flo_25_3_npc.c
View File

@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = {
.settings = &N(NpcSettings_GateFlower),
.pos = { 505.0f, 0.0f, -25.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_GateFlower),
.drops = GATE_FLOWER_DROPS,
.animations = GATE_FLOWER_RED_ANIMS,

8
src/world/area_hos/hos_00/hos_00_4_npc.c
View File

@ -128,7 +128,7 @@ StaticNpc N(NpcData_Twink) = {
.settings = &N(NpcSettings_Twink),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Twink),
.drops = NPC_NO_DROPS,
.animations = TWINK_ANIMS,
@ -139,7 +139,7 @@ StaticNpc N(NpcData_FlyingMagikoopa) = {
.settings = &N(NpcSettings_FlyingMagikoopa),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS,
.init = &N(EVS_NpcInit_FlyingMagikoopa),
.drops = NPC_NO_DROPS,
.animations = FLYING_MAGIKOOPA_ANIMS,
@ -151,7 +151,7 @@ StaticNpc N(NpcData_Wishing)[] = {
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { 280.0f, -10.0f, -50.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1,
.flags = ENEMY_FLAG_PASSIVE,
.drops = NPC_NO_DROPS,
.animations = TOADETTE_PINK_ANIMS,
},
@ -160,7 +160,7 @@ StaticNpc N(NpcData_Wishing)[] = {
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { 330.0f, -10.0f, -40.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1,
.flags = ENEMY_FLAG_PASSIVE,
.drops = NPC_NO_DROPS,
.animations = TOAD_KID_RED_ANIMS,
},

14
src/world/area_hos/hos_01/hos_01_4_npc.c
View File

@ -445,7 +445,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { -30.0f, 260.0f, -170.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Eldstar),
.drops = NPC_NO_DROPS,
.animations = ELDSTAR_ANIMS,
@ -456,7 +456,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { 100.0f, 260.0f, -215.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = NPC_NO_DROPS,
.animations = MAMAR_ANIMS,
},
@ -465,7 +465,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { -145.0f, 260.0f, -225.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = NPC_NO_DROPS,
.animations = SKOLAR_ANIMS,
},
@ -474,7 +474,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { 20.0f, 260.0f, -45.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = NPC_NO_DROPS,
.animations = MUSKULAR_ANIMS,
},
@ -483,7 +483,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { -155.0f, 260.0f, -125.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = NPC_NO_DROPS,
.animations = MISSTAR_ANIMS,
},
@ -492,7 +492,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { 90.0f, 260.0f, -110.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = NPC_NO_DROPS,
.animations = KLEVAR_ANIMS,
},
@ -501,7 +501,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { -75.0f, 260.0f, -290.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = NPC_NO_DROPS,
.animations = KALMAR_ANIMS,
},

2
src/world/area_hos/hos_01/hos_01_6_star_way.c
View File

@ -92,7 +92,7 @@ EvtScript N(EVS_AscendStarBeam) = {
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_CALL(SetMusicTrack, 0, SONG_STAR_WAY_OPENS, 1, 8)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0))
EVT_CALL(NpcJump0, NPC_PARTNER, -30, 250, -170, 15)
EVT_THREAD

2
src/world/area_hos/hos_02/hos_02_6_descent.c
View File

@ -6,7 +6,7 @@ EvtScript N(EVS_DescendStarBeam) = {
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0))
EVT_CALL(PlayerMoveTo, -1105, 230, 0)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5))
EVT_CALL(NpcJump0, NPC_PARTNER, -1105, -171, 220, 5)
EVT_THREAD

2
src/world/area_hos/hos_03/hos_03_2_main.c
View File

@ -71,7 +71,7 @@ EvtScript N(EVS_Main) = {
EVT_WAIT(1)
EVT_END_IF
EVT_EXEC(N(EVS_SetupAurora))
EVT_CALL(UseAdvancedDoorSounds, DOOR_SOUNDS_UNUSED)
EVT_CALL(UseRoomDoorSounds, DOOR_SOUNDS_UNUSED)
EVT_EXEC(N(EVS_SetupMusic))
EVT_CALL(PlaySound, SOUND_80000063)
EVT_EXEC(N(EVS_SetupRooms))

24
src/world/area_hos/hos_03/hos_03_4_rooms.c
View File

@ -6,7 +6,7 @@ EvtScript N(EVS_SetDoorRot_House) = {
EVT_END
};
EvtScript N(EVS_MoveWalls_House) = {
EvtScript N(EVS_SetWallRot_House) = {
EVT_SET(LVar1, LVar0)
EVT_MULF(LVar1, EVT_FLOAT(-1.0))
EVT_CALL(RotateGroup, MODEL_g71, LVar1, 0, 0, 1)
@ -32,7 +32,7 @@ EvtScript N(EVS_SetDoorRot_Shop) = {
EVT_END
};
EvtScript N(EVS_MoveWalls_Shop) = {
EvtScript N(EVS_SetWallRot_Shop) = {
EVT_SET(LVar1, LVar0)
EVT_MULF(LVar1, EVT_FLOAT(-1.0))
EVT_CALL(RotateGroup, MODEL_g64, LVar1, 0, 0, 1)
@ -57,7 +57,7 @@ EvtScript N(EVS_SetDoorRot_ToadHouse) = {
EVT_END
};
EvtScript N(EVS_MoveWalls_ToadHouse) = {
EvtScript N(EVS_SetWallRot_ToadHouse) = {
EVT_SET(LVar1, LVar0)
EVT_MULF(LVar1, EVT_FLOAT(-1.0))
EVT_CALL(RotateGroup, MODEL_g58, LVar1, 0, 0, 1)
@ -84,10 +84,10 @@ s32 N(InteriorNPCs_ToadHouse)[] = {
EvtScript N(EVS_SetupRooms) = {
// house
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_0),
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_House)),
EVT_PTR(N(EVS_MoveWalls_House)),
EVT_PTR(N(EVS_SetWallRot_House)),
EVT_PTR(N(EVS_DropDoor_House)),
NULL,
COLLIDER_o99,
@ -95,10 +95,10 @@ EvtScript N(EVS_SetupRooms) = {
MODEL_o76,
NULL)
// shop
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_0),
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_Shop)),
EVT_PTR(N(EVS_MoveWalls_Shop)),
EVT_PTR(N(EVS_SetWallRot_Shop)),
NULL,
NULL,
COLLIDER_o72,
@ -106,10 +106,10 @@ EvtScript N(EVS_SetupRooms) = {
MODEL_o76,
EVT_PTR(N(InteriorNPCs_Shop)))
// toad house
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_0),
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_ToadHouse)),
EVT_PTR(N(EVS_MoveWalls_ToadHouse)),
EVT_PTR(N(EVS_SetWallRot_ToadHouse)),
NULL,
NULL,
COLLIDER_o100,

16
src/world/area_hos/hos_03/hos_03_6_npc.c
View File

@ -149,7 +149,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_StarMan),
.pos = { -463.0f, 10.0f, 400.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarKid_01),
.drops = STAR_MAN_DROPS,
.animations = STAR_MAN_ANIMS,
@ -160,7 +160,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_StarMan),
.pos = { -325.0f, 10.0f, 600.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarKid_02),
.drops = STAR_MAN_DROPS,
.animations = STAR_MAN_ANIMS,
@ -171,7 +171,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_StarMan_Wander),
.pos = { 0.0f, 10.0f, 300.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarKid_03),
.drops = STAR_MAN_DROPS,
.territory = {
@ -194,7 +194,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_StarMan_Wander),
.pos = { 250.0f, 10.0f, 500.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarKid_04),
.drops = STAR_MAN_DROPS,
.territory = {
@ -217,7 +217,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_StarMan),
.pos = { -485.0f, 335.0f, -100.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarKid_05),
.drops = STAR_MAN_DROPS,
.animations = STAR_MAN_ANIMS,
@ -228,7 +228,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_StarMan),
.pos = { 458.0f, 35.0f, 233.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_ToadHouseKeeper),
.drops = STAR_MAN_DROPS,
.animations = STAR_MAN_ANIMS,
@ -239,7 +239,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_StarMan),
.pos = { 140.0f, 285.0f, -315.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_ShopOwner),
.drops = STAR_MAN_DROPS,
.animations = STAR_MAN_ANIMS,
@ -250,7 +250,7 @@ StaticNpc N(NpcData_Townsfolk)[] = {
.settings = &N(NpcSettings_ChuckQuizmo),
.pos = { -200.0f, 0.0f, 400.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000,
.initVarCount = 1,
.initVar = { .bytes = { 0, QUIZ_AREA_HOS, QUIZ_COUNT_HOS, QUIZ_MAP_HOS_03 }},
.drops = QUIZMO_DROPS,

2
src/world/area_hos/hos_04/hos_04_6_intro.c
View File

@ -210,7 +210,7 @@ StaticNpc N(NpcData_Twink) = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Twink),
.drops = NPC_NO_DROPS,
.animations = TWINK_ANIMS,

22
src/world/area_hos/hos_05/hos_05_4_npc.c
View File

@ -408,7 +408,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { 220.0f, 220.0f, -170.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarSpirit),
.drops = NPC_NO_DROPS,
.animations = MAMAR_ANIMS,
@ -419,7 +419,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { -275.0f, 220.0f, 60.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarSpirit),
.drops = NPC_NO_DROPS,
.animations = SKOLAR_ANIMS,
@ -430,7 +430,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { 125.0f, 220.0f, 250.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarSpirit),
.drops = NPC_NO_DROPS,
.animations = MUSKULAR_ANIMS,
@ -441,7 +441,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { -125.0f, 220.0f, 250.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarSpirit),
.drops = NPC_NO_DROPS,
.animations = MISSTAR_ANIMS,
@ -452,7 +452,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { 275.0f, 220.0f, 60.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarSpirit),
.drops = NPC_NO_DROPS,
.animations = KLEVAR_ANIMS,
@ -463,7 +463,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { -220.0f, 220.0f, -170.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarSpirit),
.drops = NPC_NO_DROPS,
.animations = KALMAR_ANIMS,
@ -474,7 +474,7 @@ StaticNpc N(NpcData_StarSpirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { 0.0f, 220.0f, -275.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_StarSpirit),
.drops = NPC_NO_DROPS,
.animations = ELDSTAR_ANIMS,
@ -513,7 +513,7 @@ StaticNpc N(NpcData_Thieves)[] = {
.settings = &N(NpcSettings_Bowser),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -544,7 +544,7 @@ StaticNpc N(NpcData_Thieves)[] = {
.settings = &N(NpcSettings_Bowser),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -575,7 +575,7 @@ StaticNpc N(NpcData_Thieves)[] = {
.settings = &N(NpcSettings_Kammy),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -606,7 +606,7 @@ StaticNpc N(NpcData_Thieves)[] = {
.settings = &N(NpcSettings_StarRod),
.pos = { 0.0f, 174.0f, 0.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_200 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,

8
src/world/area_hos/hos_05/hos_05_8_star_ship.c
View File

@ -46,7 +46,7 @@ EvtScript N(EVS_Starship_Depart) = {
EVT_END_IF
EVT_CALL(DisablePlayerInput, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_EXEC_GET_TID(N(EVS_UpdatePassengers), LVar9)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(GetModelCenter, MODEL_o637)
@ -82,7 +82,7 @@ EvtScript N(EVS_Starship_Depart) = {
EVT_CALL(NpcJump0, NPC_PARTNER, 45, 162, 25, 10)
EVT_END_IF
EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(EnablePartnerAI)
EVT_END_THREAD
EVT_CALL(SetPlayerJumpscale, 1)
@ -131,7 +131,7 @@ EvtScript N(EVS_EnterStarship) = {
EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(HidePlayerShadow, TRUE)
EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE)
EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 180, -5)
@ -189,7 +189,7 @@ EvtScript N(EVS_EnterStarship) = {
EVT_CALL(NpcJump0, NPC_PARTNER, 45, 162, 25, 10)
EVT_END_SWITCH
EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(EnablePartnerAI)
EVT_END_THREAD
EVT_CALL(DisablePlayerPhysics, FALSE)

4
src/world/area_hos/hos_06/hos_06_3_merlow.c
View File

@ -258,7 +258,7 @@ StaticNpc N(NpcData_Merluvlee)[] = {
.settings = &N(NpcSettings_Merluvlee),
.pos = { 62.0f, 20.0f, 7.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Merluvlee_Passthrough),
.drops = NPC_NO_DROPS,
.animations = {
@ -271,7 +271,7 @@ StaticNpc N(NpcData_Merluvlee)[] = {
.settings = &N(NpcSettings_Merlow),
.pos = { -150.0f, 160.0f, -25.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Merlow),
.drops = NPC_NO_DROPS,
.animations = {

31
src/world/area_hos/hos_06/hos_06_4_rooms.c
View File

@ -12,7 +12,7 @@ EvtScript N(EVS_SetDoorRot_House) = {
EVT_END
};
EvtScript N(EVS_MoveWalls_House) = {
EvtScript N(EVS_SetWallRot_House) = {
EVT_SET(LVar1, LVar0)
EVT_MULF(LVar1, EVT_FLOAT(2.0))
EVT_CALL(RotateGroup, MODEL_g12, LVar1, 0, 0, 1)
@ -44,19 +44,19 @@ EvtScript N(EVS_DropDoor_House) = {
EVT_END
};
EvtScript N(EVS_ToggleVis_House) = {
EvtScript N(EVS_RoomListener_House) = {
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN)
EVT_CALL(SetGroupEnabled, MODEL_g29, 1)
EVT_CALL(SetGroupEnabled, MODEL_g81, 1)
EVT_CALL(SetGroupEnabled, MODEL_g51, 1)
EVT_CASE_EQ(1)
EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE)
EVT_CALL(SetGroupEnabled, MODEL_g1, 0)
EVT_CALL(SetGroupEnabled, MODEL_g35, 0)
EVT_CASE_EQ(2)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN)
EVT_CALL(SetGroupEnabled, MODEL_g1, 1)
EVT_CALL(SetGroupEnabled, MODEL_g35, 1)
EVT_CASE_EQ(3)
EVT_CASE_EQ(ROOM_UPDATE_EXIT_END)
EVT_CALL(SetGroupEnabled, MODEL_g29, 0)
EVT_CALL(SetGroupEnabled, MODEL_g81, 0)
EVT_CALL(SetGroupEnabled, MODEL_g31, 0)
@ -97,18 +97,20 @@ EvtScript N(EVS_SetupRooms) = {
EVT_CALL(SetGroupEnabled, MODEL_g31, 0)
EVT_CALL(SetGroupEnabled, MODEL_g51, 0)
EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ManageUpstairsVisibility)), TRIGGER_FLOOR_TOUCH, COLLIDER_o92, 0, 0, 1)
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_0),
// front door
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_House)),
EVT_PTR(N(EVS_MoveWalls_House)),
EVT_PTR(N(EVS_SetWallRot_House)),
EVT_PTR(N(EVS_DropDoor_House)),
EVT_PTR(N(EVS_ToggleVis_House)),
EVT_PTR(N(EVS_RoomListener_House)),
COLLIDER_o158,
COLLIDER_o159,
MODEL_g2,
NULL)
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_0),
// staircase
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_OUT),
EVT_PTR(N(EVS_SetDoorRot_Downstairs)),
NULL,
NULL,
@ -117,8 +119,9 @@ EvtScript N(EVS_SetupRooms) = {
COLLIDER_o160,
MODEL_o1,
NULL)
EVT_CALL(MakeDoorAdvanced,
VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_1),
// loft
EVT_CALL(CreateMapRoom,
PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_IN),
EVT_PTR(N(EVS_SetDoorRot_Upstairs)),
NULL,
NULL,

2
src/world/area_hos/hos_06/hos_06_5_merluvlee.c
View File

@ -653,7 +653,7 @@ EvtScript N(EVS_NpcInit_Merluvlee) = {
};
EvtScript N(EVS_KootRequestBall_Merluvlee) = {
EVT_IF_EQ(GB_KootFavor_Current, 8)
EVT_IF_EQ(GB_KootFavor_Current, KOOT_FAVOR_CH4_1)
EVT_IF_EQ(GF_HOS06_MerluvleeRequestedCrystalBall, FALSE)
EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002)
EVT_WAIT(1)

18
src/world/area_hos/hos_10/hos_10_2_npc1.c
View File

@ -129,7 +129,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_Dummy),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000,
.init = &N(EVS_NpcInit_Peach),
.drops = NPC_NO_DROPS,
.animations = {
@ -157,7 +157,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_Dummy),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Twink),
.drops = NPC_NO_DROPS,
.animations = TWINK_ANIMS,
@ -168,7 +168,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Eldstar),
.drops = NPC_NO_DROPS,
.animations = ELDSTAR_ANIMS,
@ -179,7 +179,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Mamar),
.drops = NPC_NO_DROPS,
.animations = MAMAR_ANIMS,
@ -190,7 +190,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Skolar),
.drops = NPC_NO_DROPS,
.animations = SKOLAR_ANIMS,
@ -201,7 +201,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Muskular),
.drops = NPC_NO_DROPS,
.animations = MUSKULAR_ANIMS,
@ -212,7 +212,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Misstar),
.drops = NPC_NO_DROPS,
.animations = MISSTAR_ANIMS,
@ -223,7 +223,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Klevar),
.drops = NPC_NO_DROPS,
.animations = KLEVAR_ANIMS,
@ -234,7 +234,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Kalmar),
.drops = NPC_NO_DROPS,
.animations = KALMAR_ANIMS,

16
src/world/area_hos/hos_10/hos_10_3_npc2.c
View File

@ -115,7 +115,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_Dummy),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Twink),
.drops = NPC_NO_DROPS,
.animations = TWINK_ANIMS,
@ -126,7 +126,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Eldstar),
.drops = NPC_NO_DROPS,
.animations = ELDSTAR_ANIMS,
@ -137,7 +137,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Mamar),
.drops = NPC_NO_DROPS,
.animations = MAMAR_ANIMS,
@ -148,7 +148,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Skolar),
.drops = NPC_NO_DROPS,
.animations = SKOLAR_ANIMS,
@ -159,7 +159,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Muskular),
.drops = NPC_NO_DROPS,
.animations = MUSKULAR_ANIMS,
@ -170,7 +170,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Misstar),
.drops = NPC_NO_DROPS,
.animations = MISSTAR_ANIMS,
@ -181,7 +181,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Klevar),
.drops = NPC_NO_DROPS,
.animations = KLEVAR_ANIMS,
@ -192,7 +192,7 @@ StaticNpc N(NpcData_Spirits)[] = {
.settings = &N(NpcSettings_StarSpirit),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Kalmar),
.drops = NPC_NO_DROPS,
.animations = KALMAR_ANIMS,

12
src/world/area_isk/isk_02/isk_02_5_npc.c
View File

@ -11,10 +11,10 @@ EvtScript N(EVS_NpcIdle_Pokey_01) = {
EVT_GOTO(1)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0)
EVT_CALL(NpcMoveTo, NPC_SELF, -315, 455, 10)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy)))
EVT_RETURN
@ -30,10 +30,10 @@ EvtScript N(EVS_NpcIdle_Pokey_02) = {
EVT_GOTO(1)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0)
EVT_CALL(NpcMoveTo, NPC_SELF, -145, 535, 10)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy)))
EVT_RETURN
@ -49,10 +49,10 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = {
EVT_GOTO(1)
EVT_END_IF
EVT_WAIT(15)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0)
EVT_CALL(NpcMoveTo, NPC_SELF, 50, 550, 10)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy)))
EVT_RETURN

1
src/world/area_isk/isk_04/isk_04_6_demo.c
View File

@ -110,7 +110,6 @@ EvtScript N(EVS_MonitorDemoState) = {
s32 N(DemoInitState) = 0;
// duplicate of SetupDemoScene from trd_09
API_CALLABLE(N(SetupDemoScene)) {
PlayerStatus* playerStatus = &gPlayerStatus;

4
src/world/area_isk/isk_05/isk_05_3_npc.c
View File

@ -155,14 +155,14 @@ API_CALLABLE(N(func_80241E24_97F8F4)) {
}
EvtScript N(EVS_NpcIdle_StoneChomp) = {
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 1)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1)
EVT_LABEL(100)
EVT_IF_EQ(GF_ISK05_Hammer2Block, FALSE)
EVT_WAIT(1)
EVT_GOTO(100)
EVT_END_IF
EVT_CALL(PlaySound, SOUND_A)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 0)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0)
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_266, 0)

18
src/world/area_isk/isk_07/isk_07_3_npc.c
View File

@ -88,10 +88,10 @@ EvtScript N(EVS_NpcIdle_Pokey_01) = {
EVT_END_IF
EVT_CALL(SetNpcYaw, NPC_SELF, 105)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0)
EVT_CALL(NpcMoveTo, NPC_SELF, -140, 528, 10)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy)))
EVT_RETURN
@ -108,10 +108,10 @@ EvtScript N(EVS_NpcIdle_Pokey_02) = {
EVT_END_IF
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE)
EVT_WAIT(15)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0)
EVT_CALL(NpcMoveTo, NPC_SELF, 47, 543, 10)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy)))
EVT_RETURN
@ -128,10 +128,10 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = {
EVT_END_IF
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE)
EVT_WAIT(15)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0)
EVT_CALL(NpcMoveTo, NPC_SELF, 227, 489, 10)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1)
EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy)))
EVT_RETURN
@ -140,7 +140,7 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = {
EvtScript N(EVS_NpcInit_Pokey_01) = {
EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE)
EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_800000)
EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_NO_DROPS)
EVT_END_IF
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_01)))
EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01)))
@ -152,7 +152,7 @@ EvtScript N(EVS_NpcInit_Pokey_01) = {
EvtScript N(EVS_NpcInit_Pokey_02) = {
EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE)
EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_800000)
EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_NO_DROPS)
EVT_END_IF
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_02)))
EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01)))
@ -163,7 +163,7 @@ EvtScript N(EVS_NpcInit_Pokey_02) = {
EvtScript N(EVS_NpcInit_Pokey_03) = {
EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE)
EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_800000)
EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_NO_DROPS)
EVT_END_IF
EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_03)))
EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01)))

6
src/world/area_isk/isk_16/isk_16_2_npc.c
View File

@ -69,7 +69,7 @@ StaticNpc N(NpcData_Tutankoopa)[] = {
.settings = &N(NpcSettings_Tutankoopa_01),
.pos = { 457.0f, -1300.0f, 316.0f },
.yaw = 230,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Tutankoopa_01),
.initVarCount = 1,
.initVar = { .value = 0 },
@ -102,7 +102,7 @@ StaticNpc N(NpcData_Tutankoopa)[] = {
.settings = &N(NpcSettings_Tutankoopa_02),
.pos = { 500.0f, -1300.0f, 316.0f },
.yaw = 230,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -134,7 +134,7 @@ StaticNpc N(NpcData_ChainChomp) = {
.settings = &N(NpcSettings_ChainChomp),
.pos = { 457.0f, -1300.0f, 316.0f },
.yaw = 230,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_ChainChomp),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,

4
src/world/area_isk/isk_16/isk_16_3_boss.c
View File

@ -24,13 +24,13 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = {
EVT_CALL(SetNpcYaw, NPC_PARTNER, 45)
EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER)
EVT_THREAD
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_WAIT(10)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK)
EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(2.5))
EVT_CALL(NpcMoveTo, NPC_PARTNER, 311, 487, 0)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_END_THREAD
EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0))
EVT_CALL(PlayerMoveTo, 343, 460, 0)

8
src/world/area_iwa/iwa_00/iwa_00_3_npc.c
View File

@ -71,7 +71,7 @@ StaticNpc N(NpcData_MontyMole_GroundAmbush)[] = {
.settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole),
.pos = { 880.0f, 70.0f, 67.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -121,7 +121,7 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = {
.settings = &N(NpcSettings_MontyMole_WallAmbush_Hole),
.pos = { 1220.0f, -30.0f, 70.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -348,7 +348,7 @@ StaticNpc N(NpcData_Whacka)[] = {
.settings = &N(NpcSettings_Whacka),
.pos = { 725.0f, -30.0f, 225.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Whacka_01),
.drops = WHACKA_DROPS,
.animations = WHACKA_ANIMS,
@ -359,7 +359,7 @@ StaticNpc N(NpcData_Whacka)[] = {
.settings = &N(NpcSettings_Whacka),
.pos = { 725.0f, -30.0f, 225.0f },
.yaw = 90,
.flags = ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
.flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP,
.init = &N(EVS_NpcInit_Whacka_02),
.drops = WHACKA_DROPS,
.animations = WHACKA_ANIMS,

2
src/world/area_iwa/iwa_01/iwa_01_2_entity.c
View File

@ -6,7 +6,7 @@ EvtScript N(EVS_MakeEntities) = {
EVT_CALL(MakeEntity, EVT_PTR(Entity_ArrowSign), -503, 63, 225, 0, 90, MAKE_ENTITY_END)
EVT_CALL(MakeEntity, EVT_PTR(Entity_ArrowSign), 825, 170, 115, 0, 90, MAKE_ENTITY_END)
EVT_CALL(MakeItemEntity, ITEM_QUAKE_HAMMER, 160, 125, 125, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_IWA01_Item_QuakeHammer)
EVT_CALL(MakeItemEntity, ITEM_LETTER01, 410, 140, 135, ITEM_SPAWN_MODE_KEY, GF_IWA01_Item_Letter01)
EVT_CALL(MakeItemEntity, ITEM_LETTER_TO_MERLON, 410, 140, 135, ITEM_SPAWN_MODE_KEY, GF_IWA01_Item_Letter01)
EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 45, 10, 60, 0, MODEL_cam2b, MAKE_ENTITY_END)
EVT_CALL(AssignPanelFlag, GF_IWA01_HiddenPanel)
EVT_RETURN

2
src/world/area_iwa/iwa_01/iwa_01_4_npc.c
View File

@ -33,7 +33,7 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = {
.settings = &N(NpcSettings_MontyMole_WallAmbush_Hole),
.pos = { 340.0f, 70.0f, 101.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,

4
src/world/area_iwa/iwa_02/iwa_02_3_npc.c
View File

@ -104,7 +104,7 @@ StaticNpc N(NpcData_MontyMole_01)[] = {
.settings = &N(NpcSettings_MontyMole_WallAmbush_Hole),
.pos = { 867.0f, 0.0f, 101.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -189,7 +189,7 @@ StaticNpc N(NpcData_Bubulb) = {
.settings = &N(NpcSettings_Bubulb),
.pos = { 1075.0f, 50.0f, 230.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_800,
.init = &N(EVS_NpcInit_Bubulb),
.drops = BUBULB_DROPS,
.animations = BUBULB_PURPLE_ANIMS,

2
src/world/area_iwa/iwa_03/iwa_03_3_npc.c
View File

@ -100,7 +100,7 @@ StaticNpc N(NpcData_MontyMole)[] = {
.settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole),
.pos = { -1000.0f, 23.0f, 60.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DISABLE_AI | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,

2
src/world/area_iwa/iwa_04/iwa_04_3_entity.c
View File

@ -58,7 +58,7 @@ EvtScript N(EVS_MakeEntities) = {
EVT_CALL(MakeEntity, EVT_PTR(Entity_ArrowSign), 600, 0, 200, 0, 270, MAKE_ENTITY_END)
EVT_CALL(MakeEntity, EVT_PTR(Entity_ArrowSign), 336, -140, 203, 0, 70, MAKE_ENTITY_END)
EVT_CALL(MakeEntity, EVT_PTR(Entity_ArrowSign), 730, -250, -95, 0, 90, MAKE_ENTITY_END)
EVT_CALL(MakeItemEntity, ITEM_LETTER10, -275, -250, 150, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_IWA04_Item_Letter10)
EVT_CALL(MakeItemEntity, ITEM_LETTER_CHAIN_GOOMPAPA_1, -275, -250, 150, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_IWA04_Item_Letter10)
EVT_RETURN
EVT_END
};

2
src/world/area_iwa/iwa_04/iwa_04_4_npc.c
View File

@ -305,7 +305,7 @@ StaticNpc N(NpcData_Buzzar) = {
.settings = &N(NpcSettings_Buzzar),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 270,
.flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000,
.flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_NO_DROPS,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = STANDARD_HEART_DROPS(3),

16
src/world/area_iwa/iwa_10/iwa_10_3_npc.c
View File

@ -128,7 +128,7 @@ StaticNpc N(NpcData_TrainToad)[] = {
.settings = &N(NpcSettings_TrainToad),
.pos = { -440.0f, 20.0f, 110.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_TrainToad_01),
.drops = TRAIN_CONDUCTOR_DROPS,
.animations = TRAIN_TOAD_WHITE_ANIMS,
@ -139,7 +139,7 @@ StaticNpc N(NpcData_TrainToad)[] = {
.settings = &N(NpcSettings_TrainToad),
.pos = { -425.0f, 70.0f, -20.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_TrainToad_02),
.drops = TRAIN_CONDUCTOR_DROPS,
.animations = TRAIN_CONDUCTOR_ANIMS,
@ -151,7 +151,7 @@ StaticNpc N(NpcData_Toad) = {
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -254.0f, 20.0f, 165.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Toad),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -168,7 +168,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = {
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -562.0f, 0.0f, 384.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_ThreeSisters_02),
.drops = TOADETTE_DROPS,
.animations = TOADETTE_PINK_ANIMS,
@ -179,7 +179,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = {
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -582.0f, 0.0f, 406.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_ThreeSisters_02),
.drops = TOADETTE_DROPS,
.animations = TOADETTE_PINK_ANIMS,
@ -190,7 +190,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = {
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -524.0f, 0.0f, 411.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_ThreeSisters_02),
.drops = TOADETTE_DROPS,
.animations = TOADETTE_PINK_ANIMS,
@ -204,7 +204,7 @@ StaticNpc N(NpcData_Dryite)[] = {
.settings = &N(NpcSettings_Dryite),
.pos = { -344.0f, 0.0f, 379.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Dryite),
.drops = DRYITE_DROPS,
.animations = DRYITE_GREEN_ANIMS,
@ -215,7 +215,7 @@ StaticNpc N(NpcData_Dryite)[] = {
.settings = &N(NpcSettings_Toad_Stationary),
.pos = { -760.0f, 0.0f, 160.0f },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_ThreeSisters_01),
.drops = TOADETTE_DROPS,
.animations = TOADETTE_GREEN_ANIMS,

6
src/world/area_iwa/iwa_10/iwa_10_4_train.c
View File

@ -392,7 +392,7 @@ EvtScript N(EVS_ArriveFromToadTown) = {
EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP)
EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15)
EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0))
EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK)
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@ -429,7 +429,7 @@ EvtScript N(EVS_ArriveFromToadTown) = {
EVT_SET(MF_TrainArrivePlayerDisembark, TRUE)
EVT_WAIT(20)
EVT_CALL(SpeakToPlayer, NPC_TrainToad_01, ANIM_TrainToad_White_Talk, ANIM_TrainToad_White_Idle, 0, MSG_CH2_0000)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE)
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0)
EVT_CALL(DisablePlayerInput, FALSE)
EVT_RETURN
@ -461,7 +461,7 @@ EvtScript N(EVS_DepartForToadTown) = {
EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15)
EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0))
EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK)
EVT_CALL(NpcMoveTo, NPC_PARTNER, -425, 70, 0)

12
src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c
View File

@ -34,7 +34,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = {
EVT_END_THREAD
EVT_WAIT(20)
EVT_CALL(SetNpcPos, NPC_Parakarry, -400, 215, -510)
EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_40, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE)
EVT_THREAD
EVT_CALL(SetNpcRotation, NPC_Parakarry, 0, 0, 15)
EVT_CALL(InterpNpcYaw, NPC_Parakarry, 270, 0)
@ -157,9 +157,9 @@ EvtScript N(EVS_Scene_MeetParakarry) = {
};
s32 N(LetterList)[] = {
ITEM_LETTER01,
ITEM_LETTER_TO_MERLON,
ITEM_LETTER_TO_KOLORADO,
ITEM_LETTER10,
ITEM_LETTER_CHAIN_GOOMPAPA_1,
ITEM_NONE
};
@ -254,9 +254,9 @@ EvtScript N(EVS_NpcInteract_Parakarry) = {
EVT_EXEC(N(EVS_PopSong))
EVT_WAIT(10)
EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_001E)
EVT_CALL(AddKeyItem, ITEM_LETTER01)
EVT_CALL(AddKeyItem, ITEM_LETTER_TO_MERLON)
EVT_CALL(AddKeyItem, ITEM_LETTER_TO_KOLORADO)
EVT_CALL(AddKeyItem, ITEM_LETTER10)
EVT_CALL(AddKeyItem, ITEM_LETTER_CHAIN_GOOMPAPA_1)
EVT_END_IF
EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0))
EVT_CALL(EnablePartnerAI)
@ -310,7 +310,7 @@ StaticNpc N(NpcData_Parakarry) = {
.settings = &N(NpcSettings_Parakarry),
.pos = { -610.0f, 230.0f, -485.0f },
.yaw = 0,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000,
.init = &N(EVS_NpcInit_Parakarry),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,

2
src/world/area_iwa/iwa_11/iwa_11_5_npc.c
View File

@ -23,7 +23,7 @@ StaticNpc N(NpcData_TrainToad) = {
.settings = &N(NpcSettings_TrainToad),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_TrainToad),
.drops = TRAIN_CONDUCTOR_DROPS,
.animations = TRAIN_CONDUCTOR_ANIMS,

20
src/world/area_jan/jan_00/jan_00_2_npc.c
View File

@ -477,7 +477,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_01) = {
EVT_SET(LVar0, 0)
EVT_EXEC(N(D_80242DB0_B232F0))
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5)
@ -563,7 +563,7 @@ EvtScript N(EVS_NpcInit_Kolorado_01) = {
EVT_CALL(DisablePlayerPhysics, TRUE)
EVT_CALL(InterpPlayerYaw, 90, 0)
EVT_CALL(DisablePartnerAI, 0)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_8 | NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8000, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE)
EVT_CALL(SetNpcYaw, NPC_PARTNER, 90)
EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE)
@ -701,7 +701,7 @@ StaticNpc N(D_8024488C_B24DCC)[] = {
.settings = &N(NpcSettings_Kolorado_01),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Kolorado_01),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -733,7 +733,7 @@ StaticNpc N(D_8024488C_B24DCC)[] = {
.settings = &N(NpcSettings_Kolorado_02),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_Kolorado_02),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -765,7 +765,7 @@ StaticNpc N(D_8024488C_B24DCC)[] = {
.settings = &N(NpcSettings_JrTroopa),
.pos = { NPC_DISPOSE_LOCATION },
.yaw = 90,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000,
.init = &N(EVS_NpcInit_JrTroopa),
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
@ -798,7 +798,7 @@ StaticNpc N(D_80244E5C_B2539C) = {
.settings = &N(NpcSettings_HeartPlant_01),
.pos = { 455.0f, 0.0f, 115.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -830,7 +830,7 @@ StaticNpc N(D_8024504C_B2558C) = {
.settings = &N(NpcSettings_HeartPlant_01),
.pos = { 167.0f, 0.0f, 404.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -862,7 +862,7 @@ StaticNpc N(D_8024523C_B2577C) = {
.settings = &N(NpcSettings_HeartPlant_01),
.pos = { 90.0f, 0.0f, 316.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -894,7 +894,7 @@ StaticNpc N(D_8024542C_B2596C) = {
.settings = &N(NpcSettings_HeartPlant_01),
.pos = { 424.0f, 0.0f, 182.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,
@ -926,7 +926,7 @@ StaticNpc N(D_8024561C_B25B5C) = {
.settings = &N(NpcSettings_HeartPlant_01),
.pos = { 143.0f, 0.0f, 260.0f },
.yaw = 270,
.flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000,
.drops = {
.dropFlags = NPC_DROP_FLAG_80,
.heartDrops = NO_DROPS,

6
src/world/area_jan/jan_01/jan_01_3_npc.c
View File

@ -18,7 +18,7 @@ EvtScript N(EVS_PlayerWatchKolorado) = {
EvtScript N(EVS_Kolorado_RunToVillage) = {
EVT_EXEC_GET_TID(N(EVS_PlayerWatchKolorado), LVar9)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40 | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run)
EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5))
EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2)
@ -237,7 +237,7 @@ EvtScript N(EVS_NpcDefeat_Fuzzy_01) = {
EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0))
EVT_CALL(N(SetCamera0Flag1000))
EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1)
EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_40 | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcFlagBits, NPC_Kolorado, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE)
EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run)
EVT_CALL(SetNpcSpeed, NPC_Kolorado, EVT_FLOAT(3.0))
EVT_IF_LT(LVar2, -45)
@ -286,7 +286,7 @@ StaticNpc N(NpcData_Fuzzy_01) = {
.settings = &N(NpcSettings_Fuzzy),
.pos = { -30.0f, 0.0f, 90.0f },
.yaw = 270,
.flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000,
.flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS,
.init = &N(EVS_NpcInit_Fuzzy_01),
.drops = NPC_NO_DROPS,
.animations = JUNGLE_FUZZY_ANIMS,

Some files were not shown because too many files have changed in this diff Show More