diff --git a/include/common_structs.h b/include/common_structs.h index b78df2b317..61d197f629 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -11,7 +11,7 @@ struct Evt; typedef ApiStatus(*ApiFunc)(struct Evt*, s32); -typedef Bytecode EvtSource[0]; +typedef Bytecode EvtScript[0]; typedef struct { u8 r, g, b, a; @@ -290,22 +290,37 @@ typedef union { typedef struct Trigger { /* 0x00 */ TriggerFlags flags; - /* 0x04 */ s32 params1; - /* 0x08 */ s32 params2; - /* 0x0C */ s32 (*functionHandler)(struct Trigger*); - /* 0x10 */ EvtSource* scriptSource; + /* 0x04 */ s32 varIndex; + /* 0x08 */ union { + s32 colliderID; + Vec4f* position; + } location; + /* 0x0C */ s32 (*onActivateFunc)(struct Trigger*); + /* 0x10 */ EvtScript* onTriggerEvt; /* 0x14 */ struct Evt* runningScript; /* 0x18 */ s32 priority; /* 0x1C */ s32 scriptVars[3]; - /* 0x28 */ s32 unk_28; - /* 0x2C */ s32 unk_2C; - /* 0x30 */ u8 unk_30; + /* 0x28 */ s32 itemList; + /* 0x2C */ s32 unk_tr_2C; // related to Goombario somehow, custom tattle perhaps? + /* 0x30 */ u8 hasPlayerInteractPrompt; /* 0x31 */ char unk_31[3]; /* 0x34 */ s32 runningScriptID; } Trigger; // size = 0x38 typedef Trigger* TriggerList[MAX_TRIGGERS]; +typedef struct TriggerBlueprint { + /* 0x00 */ s32 flags; + /* 0x04 */ s16 varIndex; + /* 0x06 */ char unk_06[2]; + /* 0x08 */ s32 colliderID; + /* 0x0C */ s32 (*onActivateFunc)(struct Trigger*); + /* 0x10 */ char unk_10[4]; + /* 0x14 */ s32 unk_tr_2C; + /* 0x18 */ s32 hasPlayerInteractPrompt; + /* 0x1C */ s32 itemList; +} TriggerBlueprint; // size = 0x20 + typedef union X32 { s32 s; f32 f; @@ -364,8 +379,156 @@ typedef Evt* ScriptList[MAX_SCRIPTS]; struct Entity; +// BEGIN ENTITY-SPECIFIC STRUCTS + +typedef struct struct802E2BA4 { + /* 0x00 */ char unk_00[2]; + /* 0x02 */ u16 unk_02[24][2]; +} struct802E2BA4; + +// from 102c80, size unknown. +typedef struct struct802E1400 { + /* 0x000 */ Vec3f unk_00; + /* 0x00C */ char unk_0C[4]; + /* 0x010 */ s8 unk_10; + /* 0x011 */ s8 unk_11; + /* 0x014 */ Vec3f unk_14; + /* 0x020 */ u16 unk_20; + /* 0x022 */ s16 unk_22; + /* 0x024 */ s16 unk_24; + /* 0x028 */ struct Entity* attachedEntity; + /* 0x02C */ char unk_2C[8]; + /* 0x034 */ struct802E2BA4* unk_34; + /* 0x038 */ f32 unk_38; + /* 0x03C */ union { + /* */ s16 s; + /* */ s8 b[2]; + } unk_3C; + /* 0x03E */ char unk_3E[0x4D]; + /* 0x08B */ u8 unk_8B[24]; + /* 0x0A3 */ char unk_A3; // padding? + /* 0x0A4 */ u8 unk_A4[24]; + /* 0x0BC */ char unk_BC[4]; + /* 0x0C0 */ f32 unk_C0[24]; + /* 0x120 */ char unk_120[4]; + /* 0x124 */ f32 unk_124[24]; + /* 0x184 */ char unk_184[4]; + /* 0x188 */ f32 unk_188[24]; +} struct802E1400; + +// from 104940_len_dc0, size unknown +// appears to belong to the hammer blocks(?) +typedef struct BlockData { + /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities + /* 0x001 */ char unk_01[2]; + /* 0x003 */ s8 empty; + /* 0x004 */ s16 coinsLeft; + /* 0x006 */ s16 timeLeft; + /* 0x008 */ char unk_08[2]; + /* 0x00A */ u16 gameFlagIndex; + /* 0x00C */ char unk_0C[2]; + /* 0x00E */ s16 unk_0E; + /* 0x010 */ s16 itemEntityIndex; // for spawned item entities + /* 0x012 */ s16 childEntityIndex; // for block entities that spawn other block entities + /* 0x014 */ f32 initialY; + /* 0x018 */ f32 recoilInterpPhase; + /* 0x01C */ char unk_1C[0x10C]; + /* 0x128 */ UNK_PTR unk_128; + /* 0x12C */ UNK_PTR unk_12C; +} BlockData; + +typedef struct ItemBlockData { + /* 0x00 */ u16 unk_00; + /* 0x02 */ char unk_02[8]; + /* 0x0A */ u16 gameFlagIndex; + /* 0x0C */ char unk_C[4]; + /* 0x10 */ s16 itemID; + /* 0x12 */ s16 childEntityIndex; // for block entities that spawn other block entities +} ItemBlockData; + +typedef struct SaveBlockData { + /* 0x000 */ char unk_0[4]; + /* 0x004 */ s16 angle; +} SaveBlockData; + +// size unknown +typedef struct SuperBlockContentData { + /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities + /* 0x001 */ u8 unk_01; + /* 0x002 */ s8 unk_02; + /* 0x003 */ s8 unk_03; + /* 0x004 */ f32 unk_04; + /* 0x008 */ char unk_08; + /* 0x009 */ u8 unk_09; + /* 0x00A */ u8 unk_0A; + /* 0x00B */ char unk_0B; // padding? + /* 0x00C */ s32 unk_0C; + /* 0x010 */ s32 unk_10; + /* 0x014 */ f32 unk_14; + /* 0x018 */ f32 unk_18; + /* 0x01C */ f32 unk_1C; + /* 0x020 */ f32 unk_20; + /* 0x024 */ u16 unk_24; + /* 0x024 */ s16 unk_26; + /* 0x028 */ f32 unk_28[0xB]; + /* 0x054 */ f32 unk_54; + /* 0x058 */ char unk_58[0x78]; + /* 0x0D0 */ u16 yawBufferPos; + /* 0x0D4 */ f32 yawBuffer[20]; + /* 0x124 */ s32 unk_124; + /* 0x128 */ s32* unk_128; + /* 0x12C */ s32* unk_12C; +} SuperBlockContentData; + +// size unknown +typedef struct ChestData { + /* 0x00 */ u16 gameFlagIndex; + /* 0x02 */ s16 giveItemTimer; + /* 0x04 */ u8 state; + /* 0x04 */ s8 unk_05; + /* 0x06 */ s8 postLidAnimDelay; + /* 0x07 */ u8 unk_07; + /* 0x08 */ f32 lidAngle; + /* 0x0C */ f32 lidAnimInterpPhase; + /* 0x10 */ s32 itemID; + /* 0x14 */ s32 itemEntityIndex; + /* 0x18 */ Vec3f itemEntityPos; + /* 0x24 */ f32 giveItemRadiusInterpPhase; + /* 0x28 */ f32 giveItemHeightInterpPhase; + /* 0x2C */ f32 itemVelY; + /* 0x30 */ s8 unk_30; + /* 0x31 */ char unk_31[3]; + /* 0x34 */ struct EffectInstance* gotItemEffect; +} ChestData; + +typedef struct BlueWarpPipeData { + /* 0x00 */ s32 unk_00; // proably flags + /* 0x04 */ s32 timer; + /* 0x08 */ s32 isRaised; + /* 0x0C */ s32 entryID; + /* 0x10 */ EvtScript* onEnterPipeEvt; + /* 0x14 */ s32 flagIndex; + /* 0x18 */ f32 finalPosY; +} BlueWarpPipeData; + +// END ENTITY-SPECIFIC STRUCTS + typedef s32 (*EntityCallback)(struct Entity*); +typedef struct EntityBlueprint { + /* 0x00 */ s16 flags; + /* 0x02 */ s16 typeDataSize; + /* 0x04 */ UNK_PTR renderCommandList; + /* 0x08 */ UNK_PTR modelAnimationNodes; + /* 0x0C */ EntityCallback(fpInit); + /* 0x10 */ UNK_PTR updateEntityScript; + /* 0x14 */ EntityCallback fpHandleCollision; + /* 0x18 */ s32 dmaStart; + /* 0x1C */ s32 dmaEnd; + /* 0x20 */ u8 entityType; + /* 0x21 */ char aabbSize[3]; +} EntityBlueprint; // size = 0x24 + typedef struct Entity { /* 0x00 */ s32 flags; /* 0x04 */ u8 listIndex; @@ -387,9 +550,18 @@ typedef struct Entity { /* 0x28 */ Bytecode* boundScriptBytecode; /* 0x2C */ s32* savedReadPos; /* 0x30 */ char unk_30[0x8]; - /* 0x38 */ struct StaticEntityData* staticData; + /* 0x38 */ EntityBlueprint* blueprint; /* 0x3C */ UNK_PTR renderSetupFunc; // pointer to draw func(?) - /* 0x40 */ s32* dataBuf; + /* 0x40 */ union { + s32* any; + BlockData* block; + ItemBlockData* itemBlock; + SaveBlockData* saveBlock; + ChestData* chest; + BlueWarpPipeData* bluePipe; + SuperBlockContentData* superBlockContent; + s32* unk; + } dataBuf; /* 0x44 */ Mtx* vertexData; /* 0x48 */ Vec3f position; /* 0x54 */ Vec3f scale; @@ -403,6 +575,40 @@ typedef struct Entity { typedef Entity* EntityList[MAX_ENTITIES]; +struct Shadow; + +typedef s32 (*ShadowCallback)(struct Shadow*); + +// same as EntityBlueprint +typedef struct ShadowBlueprint { + /* 0x00 */ u16 flags; + /* 0x02 */ s16 typeDataSize; + /* 0x04 */ UNK_PTR renderCommandList; + /* 0x08 */ struct StaticAnimatorNode** animModelNode; + /* 0x0C */ ShadowCallback(onCreateCallback); + /* 0x10 */ char unk_10[0x10]; + /* 0x20 */ u8 entityType; + /* 0x21 */ char aabbSize[3]; +} ShadowBlueprint; // size = 0x24 + +typedef struct Shadow { + /* 0x00 */ s32 flags; + /* 0x04 */ u8 listIndex; + /* 0x05 */ u8 alpha; + /* 0x06 */ u8 unk_06; + /* 0x07 */ char unk_07; + /* 0x08 */ s16 entityModelID; + /* 0x0A */ s16 vertexSegment; + /* 0x0C */ Vtx_tn** vertexArray; + /* 0x10 */ Vec3f position; + /* 0x1C */ Vec3f scale; + /* 0x28 */ Vec3f rotation; + /* 0x34 */ char unk_34[0x4]; + /* 0x38 */ Mtx transformMatrix; +} Shadow; // size = 0x78 + +typedef Shadow* ShadowList[MAX_SHADOWS]; + typedef struct DynamicEntity { /* 0x00 */ s32 flags; /* 0x04 */ void (*update)(void); @@ -411,20 +617,6 @@ typedef struct DynamicEntity { typedef DynamicEntity* DynamicEntityList[MAX_DYNAMIC_ENTITIES]; -typedef struct StaticEntityData { - /* 0x00 */ s16 flags; - /* 0x02 */ s16 typeDataSize; - /* 0x04 */ UNK_PTR renderCommandList; - /* 0x08 */ UNK_PTR modelAnimationNodes; - /* 0x0C */ EntityCallback(fpInit); - /* 0x10 */ UNK_PTR updateEntityScript; - /* 0x14 */ EntityCallback fpHandleCollision; - /* 0x18 */ s32 dmaStart; - /* 0x1C */ s32 dmaEnd; - /* 0x20 */ u8 entityType; - /* 0x21 */ char aabbSize[3]; -} StaticEntityData; // size = 0x24 - typedef struct MusicSettings { /* 0x00 */ u16 flags; /* 0x02 */ s16 unk_02; @@ -813,7 +1005,7 @@ typedef struct TextureHeader { /* 0x2F */ u8 filtering; } TextureHeader; // size = 0x30 -typedef struct StaticMove { +typedef struct MoveData { /* 0x00 */ s32 moveNameID; /* 0x04 */ s32 flags; /* 0x08 */ s32 worldDescID; @@ -822,7 +1014,7 @@ typedef struct StaticMove { /* 0x11 */ s8 costFP; /* 0x12 */ s8 costBP; /* 0x13 */ u8 actionCommandID; -} StaticMove; // size = 0x14 +} MoveData; // size = 0x14 typedef struct CollisionData { /* 0x00 */ Vec3f* vertices; @@ -910,30 +1102,13 @@ typedef struct ModelAnimator { typedef ModelAnimator* AnimatedMeshList[MAX_ANIMATED_MESHES]; -typedef struct PrintHandle { - /* 0x000 */ char unk_00[16]; - /* 0x010 */ s8* printbuf; - /* 0x014 */ char unk_14[1344]; -} PrintHandle; // size = 0x554 - -typedef struct OtherPrint { - /* 0x00 */ char unk_00[16]; - /* 0x10 */ f32 msgScaleH; - /* 0x14 */ f32 msgScaleW; - /* 0x18 */ f32 characterScaleH; - /* 0x1C */ f32 characterScaleW; - /* 0x20 */ char unk_20[32]; - /* 0x40 */ s32 currentPosX; - /* 0x44 */ char unk_44[16]; -} OtherPrint; // size = 0x54 - typedef struct ColliderBoundingBox { /* 0x00 */ Vec3f min; /* 0x0C */ Vec3f max; /* 0x18 */ s32 flagsForCollider; } ColliderBoundingBox; // size = 0x1C -typedef struct StaticItem { +typedef struct ItemData { /* 0x00 */ s32 nameMsg; /* 0x04 */ s16 iconID; /* 0x06 */ s16 badgeSortPriority; @@ -947,7 +1122,7 @@ typedef struct StaticItem { /* 0x1B */ s8 potencyA; /* 0x1C */ s8 potencyB; /* 0x1D */ char unk_1D[3]; -} StaticItem; // size = 0x20 +} ItemData; // size = 0x20 typedef struct ItemEntity { /* 0x00 */ s32 flags; @@ -1144,6 +1319,33 @@ typedef struct ShopItemEntity { /* 0x04 */ Vec3f pos; } ShopItemEntity; // size = 0x10 +typedef struct ShopOwner { + /* 0x00 */ s32 npcID; + /* 0x04 */ s32 idleAnim; + /* 0x08 */ s32 talkAnim; + /* 0x0C */ EvtScript* onBuyEvt; + /* 0x10 */ EvtScript* unk_10Evt; + /* 0x14 */ EvtScript* onTalkEvt; + /* 0x18 */ s32* shopMsgIDs; +} ShopOwner; + +typedef struct ShopItemLocation { + /* 0x0 */ u16 posModelID; + /* 0x2 */ u16 triggerColliderID; +} ShopItemLocation; // size = 0x4 + +typedef struct ShopItemData { + /* 0x0 */ u32 itemID; + /* 0x4 */ s32 price; + /* 0x8 */ s32 unk_08; +} ShopItemData; // size = 0xC + +typedef struct ShopSellPriceData { + /* 0x0 */ s32 itemID; + /* 0x4 */ s32 sellPrice; + /* 0x8 */ char unk_08[0x4]; +} ShopSellPriceData; // size = 0xC + typedef struct GameStatus { /* 0x000 */ u32 currentButtons; /* 0x004 */ u32 altCurrentButtons; /* input used for batte when flag 80000 set */ @@ -1248,36 +1450,6 @@ typedef struct PartnerAnimations { /* 0x00 */ s32 anims[9]; } PartnerAnimations; // size = 0x24 -typedef struct Shadow { - /* 0x00 */ s32 flags; - /* 0x04 */ u8 listIndex; - /* 0x05 */ u8 alpha; - /* 0x06 */ u8 unk_06; - /* 0x07 */ char unk_07; - /* 0x08 */ s16 entityModelID; - /* 0x0A */ s16 vertexSegment; - /* 0x0C */ Vtx_tn** vertexArray; - /* 0x10 */ Vec3f position; - /* 0x1C */ Vec3f scale; - /* 0x28 */ Vec3f rotation; - /* 0x34 */ char unk_34[0x4]; - /* 0x38 */ Mtx transformMatrix; -} Shadow; // size = 0x78 - -typedef Shadow* ShadowList[MAX_SHADOWS]; - -// same as StaticEntityData -typedef struct StaticShadowData { - /* 0x00 */ u16 flags; - /* 0x02 */ s16 typeDataSize; - /* 0x04 */ UNK_PTR renderCommandList; - /* 0x08 */ StaticAnimatorNode** animModelNode; - /* 0x0C */ void (*onCreateCallback)(Shadow* shadow); - /* 0x10 */ char unk_10[0x10]; - /* 0x20 */ u8 entityType; - /* 0x21 */ char aabbSize[3]; -} StaticShadowData; // size = 0x24 - typedef struct PushBlockGrid { /* 0x00 */ s8* cells; /* 0x04 */ u8 numCellsX; @@ -1329,7 +1501,7 @@ typedef struct ActorPartMovement { typedef struct ActorPart { /* 0x00 */ s32 flags; /* 0x04 */ s32 targetFlags; /* initialized to 0 */ - /* 0x08 */ struct ActorPartDesc* staticData; + /* 0x08 */ struct ActorPartBlueprint* staticData; /* 0x0C */ struct ActorPart* nextPart; /* 0x10 */ struct ActorPartMovement* movement; /* 0x14 */ Vec3s partOffset; @@ -1379,24 +1551,24 @@ typedef struct ColliderTriangle { /* 0x3E */ char unk_3E[2]; } ColliderTriangle; // size = 0x40 -typedef struct StaticPartner { +typedef struct PartnerBlueprint { /* 0x00 */ s32 dmaStart; /* 0x04 */ s32 dmaEnd; /* 0x08 */ s32 dmaDest; /* 0x0C */ s32 isFlying; /* 0x10 */ UNK_FUN_PTR(fpInit); - /* 0x14 */ Bytecode* spScriptA; - /* 0x18 */ Bytecode* spScriptB; - /* 0x1C */ Bytecode* spScriptC; - /* 0x20 */ Bytecode* spScriptD; + /* 0x14 */ EvtScript* spScriptA; + /* 0x18 */ EvtScript* spScriptB; + /* 0x1C */ EvtScript* spScriptC; + /* 0x20 */ EvtScript* spScriptD; /* 0x24 */ s32 idleAnim; /* 0x28 */ UNK_FUN_PTR(fpFuncA); /* 0x2C */ UNK_FUN_PTR(fpFuncB); /* 0x30 */ UNK_FUN_PTR(fpFuncC); /* 0x34 */ UNK_FUN_PTR(fpFuncD); /* 0x38 */ UNK_FUN_PTR(fpFuncE); - /* 0x3C */ Bytecode* spScriptX; -} StaticPartner; // size = 0x40 + /* 0x3C */ EvtScript* spScriptX; +} PartnerBlueprint; // size = 0x40 typedef struct FontRasterSet { /* 0x00 */ u8 sizeX; @@ -1404,30 +1576,16 @@ typedef struct FontRasterSet { /* 0x02 */ char unk_02[10]; } FontRasterSet; // size = 0x0C -typedef s32 (*TriggerHandlerFunc)(Trigger*); - -typedef struct TriggerDefinition { - /* 0x00 */ s32 flags; - /* 0x04 */ s16 colliderIndex; - /* 0x06 */ char unk_06[2]; - /* 0x08 */ s32 flagIndex; - /* 0x0C */ TriggerHandlerFunc function; - /* 0x10 */ char unk_10[4]; - /* 0x14 */ s32 unk_14; - /* 0x18 */ s32 inputArg3; - /* 0x1C */ s32 unk_1C; -} TriggerDefinition; // size = 0x20 - typedef struct CollisionStatus { /* 0x00 */ s16 pushingAgainstWall; /* FFFF = none for all below VVV */ /* 0x02 */ s16 currentFloor; /* valid on touch */ /* 0x04 */ s16 lastTouchedFloor; /* valid after jump */ /* 0x06 */ s16 floorBelow; /* 0x08 */ s16 currentCeiling; /* valid on touching with head */ - /* 0x0A */ s16 unk_0A; - /* 0x0C */ s16 unk_0C; - /* 0x0E */ s16 unk_0E; - /* 0x10 */ s16 unk_10; + /* 0x0A */ s16 unk_0A; /* associated with TRIGGER_WALL_PRESS_A */ + /* 0x0C */ s16 unk_0C; /* associated with TRIGGER_FLAGS_2000 */ + /* 0x0E */ s16 unk_0E; /* associated with TRIGGER_FLAGS_4000 */ + /* 0x10 */ s16 unk_10; /* associated with TRIGGER_FLAGS_8000 */ /* 0x12 */ s16 currentWall; /* 0x14 */ s16 lastWallHammered; /* valid when smashing */ /* 0x16 */ s16 touchingWallTrigger; /* 0/1 */ @@ -1500,35 +1658,8 @@ typedef struct DecorationTable { /* 0x8C6 */ DecorationUnk unk_8C6[2]; } DecorationTable; // size = 0x8E8 -typedef struct ShopOwner { - /* 0x00 */ s32 npcID; - /* 0x04 */ s32 idleAnim; - /* 0x08 */ s32 talkAnim; - /* 0x0C */ Evt* unk_0C; - /* 0x10 */ Bytecode* unkScript; - /* 0x14 */ EvtSource* unk_14; - /* 0x18 */ s32* shopMsgIDs; -} ShopOwner; - -typedef struct ShopItemLocation { - /* 0x0 */ u16 posModelID; - /* 0x2 */ u16 triggerColliderID; -} ShopItemLocation; // size = 0x4 - -typedef struct StaticInventoryItem { - /* 0x0 */ u32 itemID; - /* 0x4 */ s32 price; - /* 0x8 */ s32 unk_08; -} StaticInventoryItem; // size = 0xC - -typedef struct StaticPriceItem { - /* 0x0 */ s32 itemID; - /* 0x4 */ s32 sellPrice; - /* 0x8 */ char unk_08[0x4]; -} StaticPriceItem; // size = 0xC - typedef struct PopupMenu { - /* 0x000 */ s32* ptrIcon[32]; + /* 0x000 */ struct HudScript* ptrIcon[32]; /* 0x080 */ char unk_80[0x4]; /* 0x084 */ s32 nameMsg[32]; /* 0x104 */ char unk_104[0x4]; @@ -1557,9 +1688,9 @@ typedef struct Shop { /* 0x008 */ s32 currentItemSlot; /* 0x00C */ s32 selectedStoreItemSlot; /* 0x010 */ ShopOwner* owner; - /* 0x014 */ ShopItemLocation* staticItemPositions; - /* 0x018 */ StaticInventoryItem* staticInventory; - /* 0x01C */ StaticPriceItem* staticPriceList; + /* 0x014 */ ShopItemLocation* ItemDataPositions; + /* 0x018 */ ShopItemData* staticInventory; + /* 0x01C */ ShopSellPriceData* staticPriceList; /* 0x020 */ s32 costIconID; /* 0x024 */ s32 inventoryItemFlags; /* 0x028 */ PopupMenu itemSelectMenu; @@ -1655,7 +1786,7 @@ typedef struct ActorState { // TODO: Make the first field of this an ActorMoveme typedef struct Actor { /* 0x000 */ s32 flags; /* 0x004 */ s32 flags2; - /* 0x008 */ struct ActorDesc* staticActorData; + /* 0x008 */ struct ActorBlueprint* actorBlueprint; /* 0x00C */ ActorState state; /* 0x0C8 */ ActorMovement fly; /* 0x118 */ f32 flyElapsed; @@ -1694,10 +1825,10 @@ typedef struct Actor { /* 0x1BA */ char unk_1BA[2]; /* 0x1BC */ u8 hpFraction; /* used to render HP bar */ /* 0x1BD */ char unk_1BD[3]; - /* 0x1C0 */ EvtSource* idleScriptSource; - /* 0x1C4 */ EvtSource* takeTurnScriptSource; - /* 0x1C8 */ EvtSource* onHitScriptSource; - /* 0x1CC */ EvtSource* onTurnChanceScriptSource; + /* 0x1C0 */ EvtScript* idleScriptSource; + /* 0x1C4 */ EvtScript* takeTurnScriptSource; + /* 0x1C8 */ EvtScript* onHitScriptSource; + /* 0x1CC */ EvtScript* onTurnChanceScriptSource; /* 0x1D0 */ struct Evt* idleScript; /* 0x1D4 */ struct Evt* takeTurnScript; /* 0x1D8 */ struct Evt* onHitScript; @@ -1774,7 +1905,7 @@ typedef struct FontData { } FontData; // size = 0x18 typedef struct PlayerStatus { - /* 0x000 */ s32 flags; + /* 0x000 */ s32 flags; // PlayerStatusFlags /* 0x004 */ u32 animFlags; /* 0x008 */ s16 framesOnGround; /* Number of frames since last jump landed */ /* 0x00A */ s8 unk_0A; @@ -2033,92 +2164,6 @@ typedef struct { /* 0x1D */ char unk_1D[3]; } Window; // size = 0x20 -// BEGIN ENTITY-SPECIFIC STRUCTS - -typedef struct struct802E2BA4 { - /* 0x00 */ char unk_00[2]; - /* 0x02 */ u16 unk_02[24][2]; -} struct802E2BA4; - -// from 102c80, size unknown. -typedef struct struct802E1400 { - /* 0x000 */ Vec3f unk_00; - /* 0x00C */ char unk_0C[4]; - /* 0x010 */ s8 unk_10; - /* 0x011 */ s8 unk_11; - /* 0x014 */ Vec3f unk_14; - /* 0x020 */ u16 unk_20; - /* 0x022 */ s16 unk_22; - /* 0x024 */ s16 unk_24; - /* 0x028 */ Entity* attachedEntity; - /* 0x02C */ char unk_2C[8]; - /* 0x034 */ struct802E2BA4* unk_34; - /* 0x038 */ f32 unk_38; - /* 0x03C */ union { - /* */ s16 s; - /* */ s8 b[2]; - } unk_3C; - /* 0x03E */ char unk_3E[0x4D]; - /* 0x08B */ u8 unk_8B[24]; - /* 0x0A3 */ char unk_A3; // padding? - /* 0x0A4 */ u8 unk_A4[24]; - /* 0x0BC */ char unk_BC[4]; - /* 0x0C0 */ f32 unk_C0[24]; - /* 0x120 */ char unk_120[4]; - /* 0x124 */ f32 unk_124[24]; - /* 0x184 */ char unk_184[4]; - /* 0x188 */ f32 unk_188[24]; -} struct802E1400; - -// from 104940_len_dc0, size unknown -// appears to belong to the hammer blocks(?) -typedef struct struct802E3650 { - /* 0x000 */ u8 unk_00; - /* 0x001 */ char unk_01[2]; - /* 0x003 */ s8 unk_03; - /* 0x004 */ s16 unk_04; - /* 0x006 */ s16 unk_06; - /* 0x008 */ char unk_08[2]; - /* 0x00A */ u16 unk_0A; - /* 0x00C */ char unk_0C[2]; - /* 0x00E */ s16 unk_0E; - /* 0x010 */ s16 unk_10; - /* 0x012 */ s16 unk_12; - /* 0x014 */ f32 unk_14; - /* 0x018 */ f32 unk_18; - /* 0x01C */ char unk_1C[0x10C]; - /* 0x128 */ UNK_PTR unk_128; - /* 0x12C */ UNK_PTR unk_12C; -} struct802E3650; - -// size unknown -typedef struct struct802E4B10 { - /* 0x00 */ u8 unk_00; - /* 0x01 */ u8 unk_01; - /* 0x02 */ s8 unk_02; - /* 0x03 */ s8 unk_03; - /* 0x04 */ f32 unk_04; - /* 0x08 */ char unk_08; - /* 0x09 */ u8 unk_09; - /* 0x0A */ u8 unk_0A; - /* 0x0B */ char unk_0B; // padding? - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ u16 unk_24; - /* 0x24 */ s16 unk_26; - /* 0x28 */ f32 unk_28[0xB]; - /* 0x54 */ f32 unk_54; - /* 0x58 */ char unk_58[0x78]; - /* 0xD0 */ u16 unk_D0; - /* 0xD4 */ f32 unk_D4[0]; -} struct802E4B10; - -// END ENTITY-SPECIFIC STRUCTS - typedef struct { /* 0x00000 */ LookAt lookAt; /* 0x00020 */ char unk_20[0x10]; diff --git a/include/enums.h b/include/enums.h index e09f9ed18f..cca5a0f7a4 100644 --- a/include/enums.h +++ b/include/enums.h @@ -522,6 +522,7 @@ enum SoundIDs { SOUND_HIT_BLOCK = 0x0000014E, SOUND_SEARCH_BUSH = 0x00000153, SOUND_162 = 0x00000162, + SOUND_ENTER_PIPE = 0x00000163, SOUND_SMASH_GOOMNUT_TREE = 0x00000165, SOUND_167 = 0x00000167, SOUND_172 = 0x00000172, @@ -1545,7 +1546,57 @@ enum EntityTypes { ENTITY_TYPE_MUNCHLESIA_RESET2 = 0x4A }; -enum Triggers { +// Entity +enum EntityFlags { + ENTITY_FLAGS_HIDDEN = 0x00000001, + ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 = 0x00000002, + ENTITY_FLAGS_HAS_DYNAMIC_SHADOW = 0x00000004, + ENTITY_FLAGS_HAS_ANIMATED_MODEL = 0x00000008, + ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX = 0x00000010, + ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX = 0x00000020, + ENTITY_FLAGS_CONTINUOUS_COLLISION = 0x00000040, + ENTITY_FLAGS_80 = 0x00000080, + ENTITY_FLAGS_100 = 0x00000100, + ENTITY_FLAGS_SET_SHADOW_FLAG200 = 0x00000200, + ENTITY_FLAGS_400 = 0x00000400, + ENTITY_FLAGS_SQUARE_SHADOW = 0x00000800, + ENTITY_FLAGS_SHOWS_INSPECT_PROMPT = 0x00001000, + ENTITY_FLAGS_ALWAYS_FACE_CAMERA = 0x00002000, + ENTITY_FLAGS_4000 = 0x00004000, + ENTITY_FLAGS_8000 = 0x00008000, + ENTITY_FLAGS_DETECTED_COLLISION = 0x00010000, + ENTITY_FLAGS_BLOCK_BEING_HIT = 0x00020000, + ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2 = 0x00040000, + ENTITY_FLAGS_IGNORE_DISTANCE_CULLING = 0x00080000, + ENTITY_FLAGS_100000 = 0x00100000, + ENTITY_FLAGS_200000 = 0x00200000, + ENTITY_FLAGS_400000 = 0x00400000, + ENTITY_FLAGS_800000 = 0x00800000, + ENTITY_FLAGS_BOUND_SCRIPT_DIRTY = 0x01000000, + ENTITY_FLAGS_2000000 = 0x02000000, + ENTITY_FLAGS_PENDING_FULL_DELETE = 0x04000000, + ENTITY_FLAGS_8000000 = 0x08000000, + ENTITY_FLAGS_10000000 = 0x10000000, + ENTITY_FLAGS_PENDING_INSTANCE_DELETE = 0x20000000, + ENTITY_FLAGS_SKIP_UPDATE = 0x40000000, + ENTITY_FLAGS_CREATED = 0x80000000, +}; + +enum EntityCollisionFlags { + ENTITY_COLLISION_FLAGS_1 = 0x00000001, + ENTITY_COLLISION_FLAGS_2 = 0x00000002, + ENTITY_COLLISION_FLAGS_4 = 0x00000004, + ENTITY_COLLISION_FLAGS_8 = 0x00000008, + ENTITY_COLLISION_FLAGS_10 = 0x00000010, + ENTITY_COLLISION_FLAGS_20 = 0x00000020, + ENTITY_COLLISION_FLAGS_40 = 0x00000040, + ENTITY_COLLISION_FLAGS_80 = 0x00000080 +}; + +enum TriggerFlags { + TRIGGER_ACTIVE = 0x00000001, + TRIGGER_ACTIVATED = 0x00000002, + TRIGGER_FORCE_ACTIVATE = 0x00000010, TRIGGER_WALL_PUSH = 0x00000040, TRIGGER_FLOOR_TOUCH = 0x00000080, TRIGGER_WALL_PRESS_A = 0x00000100, @@ -1553,11 +1604,15 @@ enum Triggers { TRIGGER_WALL_TOUCH = 0x00000400, TRIGGER_FLOOR_PRESS_A = 0x00000800, TRIGGER_WALL_HAMMER = 0x00001000, + TRIGGER_FLAGS_2000 = 0x00002000, + TRIGGER_FLAGS_4000 = 0x00004000, + TRIGGER_FLAGS_8000 = 0x00008000, TRIGGER_GAME_FLAG_SET = 0x00010000, TRIGGER_AREA_FLAG_SET = 0x00020000, TRIGGER_CEILING_TOUCH = 0x00040000, TRIGGER_FLOOR_ABOVE = 0x00080000, TRIGGER_POINT_BOMB = 0x00100000, + TRIGGER_SCRIPT_BOUND = 0x01000000 }; enum Buttons { @@ -1761,6 +1816,7 @@ enum PlayerStatusFlags { PLAYER_STATUS_FLAGS_8000 = 0x00008000, PLAYER_STATUS_FLAGS_20000 = 0x00020000, PLAYER_STATUS_FLAGS_40000 = 0x00040000, + PLAYER_STATUS_FLAGS_800000 = 0x00800000, PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC = 0x02000000, PLAYER_STATUS_FLAGS_CAMERA_DOESNT_FOLLOW = 0x04000000, PLAYER_STATUS_FLAGS_8000000 = 0x08000000, @@ -2375,42 +2431,6 @@ enum ModelFlags { MODEL_FLAGS_FLAG_8000 = 0x8000, }; -// DynamicEntity, Entity, ItemEntity -enum EntityFlags { - ENTITY_FLAGS_HIDDEN = 0x00000001, - ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 = 0x00000002, - ENTITY_FLAGS_HAS_DYNAMIC_SHADOW = 0x00000004, - ENTITY_FLAGS_HAS_ANIMATED_MODEL = 0x00000008, - ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX = 0x00000010, - ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX = 0x00000020, - ENTITY_FLAGS_CONTINUOUS_COLLISION = 0x00000040, - ENTITY_FLAGS_80 = 0x00000080, - ENTITY_FLAGS_100 = 0x00000100, - ENTITY_FLAGS_SET_SHADOW_FLAG200 = 0x00000200, - ENTITY_FLAGS_400 = 0x00000400, - ENTITY_FLAGS_SQUARE_SHADOW = 0x00000800, - ENTITY_FLAGS_SHOWS_INSPECT_PROMPT = 0x00001000, - ENTITY_FLAGS_ALWAYS_FACE_CAMERA = 0x00002000, - ENTITY_FLAGS_4000 = 0x00004000, - ENTITY_FLAGS_8000 = 0x00008000, - ENTITY_FLAGS_DETECTED_COLLISION = 0x00010000, - ENTITY_FLAGS_BLOCK_BEING_HIT = 0x00020000, - ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2 = 0x00040000, - ENTITY_FLAGS_IGNORE_DISTANCE_CULLING = 0x00080000, - ENTITY_FLAGS_100000 = 0x00100000, - ENTITY_FLAGS_200000 = 0x00200000, - ENTITY_FLAGS_400000 = 0x00400000, - ENTITY_FLAGS_800000 = 0x00800000, - ENTITY_FLAGS_BOUND_SCRIPT_DIRTY = 0x01000000, - ENTITY_FLAGS_2000000 = 0x02000000, - ENTITY_FLAGS_PENDING_FULL_DELETE = 0x04000000, - ENTITY_FLAGS_8000000 = 0x08000000, - ENTITY_FLAGS_10000000 = 0x10000000, - ENTITY_FLAGS_PENDING_INSTANCE_DELETE = 0x20000000, - ENTITY_FLAGS_SKIP_UPDATE = 0x40000000, - ENTITY_FLAGS_CREATED = 0x80000000, -}; - enum EnemyFlags { ENEMY_FLAGS_1 = 0x00000001, ENEMY_FLAGS_2 = 0x00000002, @@ -2663,7 +2683,7 @@ enum BtlCameraPreset { BTL_CAM_PRESET_73, }; -enum StaticMoveFlags { +enum MoveDataFlags { STATIC_MOVE_FLAGS_1 = 0x00000001, STATIC_MOVE_FLAGS_2 = 0x00000002, STATIC_MOVE_FLAGS_4 = 0x00000004, @@ -2805,41 +2825,6 @@ enum ShadowFlags { SHADOW_FLAGS_80000000 = 0x80000000, }; -enum TriggerDefinitionFlags { - TRIGGER_DEFINITION_FLAGS_1 = 0x00000001, - TRIGGER_DEFINITION_FLAGS_2 = 0x00000002, - TRIGGER_DEFINITION_FLAGS_4 = 0x00000004, - TRIGGER_DEFINITION_FLAGS_8 = 0x00000008, - TRIGGER_DEFINITION_FLAGS_10 = 0x00000010, - TRIGGER_DEFINITION_FLAGS_20 = 0x00000020, - TRIGGER_DEFINITION_FLAGS_40 = 0x00000040, - TRIGGER_DEFINITION_FLAGS_80 = 0x00000080, - TRIGGER_DEFINITION_FLAGS_100 = 0x00000100, - TRIGGER_DEFINITION_FLAGS_200 = 0x00000200, - TRIGGER_DEFINITION_FLAGS_400 = 0x00000400, - TRIGGER_DEFINITION_FLAGS_800 = 0x00000800, - TRIGGER_DEFINITION_FLAGS_1000 = 0x00001000, - TRIGGER_DEFINITION_FLAGS_2000 = 0x00002000, - TRIGGER_DEFINITION_FLAGS_4000 = 0x00004000, - TRIGGER_DEFINITION_FLAGS_8000 = 0x00008000, - TRIGGER_DEFINITION_FLAGS_10000 = 0x00010000, - TRIGGER_DEFINITION_FLAGS_20000 = 0x00020000, - TRIGGER_DEFINITION_FLAGS_40000 = 0x00040000, - TRIGGER_DEFINITION_FLAGS_80000 = 0x00080000, - TRIGGER_DEFINITION_FLAGS_100000 = 0x00100000, - TRIGGER_DEFINITION_FLAGS_200000 = 0x00200000, - TRIGGER_DEFINITION_FLAGS_400000 = 0x00400000, - TRIGGER_DEFINITION_FLAGS_800000 = 0x00800000, - TRIGGER_DEFINITION_FLAGS_1000000 = 0x01000000, - TRIGGER_DEFINITION_FLAGS_2000000 = 0x02000000, - TRIGGER_DEFINITION_FLAGS_4000000 = 0x04000000, - TRIGGER_DEFINITION_FLAGS_8000000 = 0x08000000, - TRIGGER_DEFINITION_FLAGS_10000000 = 0x10000000, - TRIGGER_DEFINITION_FLAGS_20000000 = 0x20000000, - TRIGGER_DEFINITION_FLAGS_40000000 = 0x40000000, - TRIGGER_DEFINITION_FLAGS_80000000 = 0x80000000, -}; - enum ShopFlags { SHOP_FLAGS_0 = 0x00000000, SHOP_FLAGS_1 = 0x00000001, diff --git a/include/evt.h b/include/evt.h index acc19b244a..be17374b2b 100644 --- a/include/evt.h +++ b/include/evt.h @@ -75,17 +75,17 @@ enum { EVT_OP_BITWISE_OR, ///< Args: container, expression to bitwise OR with EVT_OP_BITWISE_OR_CONST, ///< Args: container, value to bitwise OR with EVT_OP_CALL, ///< Args: *function, ... - EVT_OP_EXEC, ///< Args: EvtSource* - EVT_OP_EXEC_GET_TID, ///< Args: EvtSource*, container - EVT_OP_EXEC_WAIT, ///< Spawns a script and waits for it to return before continuing. Args: EvtSource* - EVT_OP_BIND_TRIGGER, ///< Args: EvtSource*, trigger flags, s32 target, 1, Trigger* + EVT_OP_EXEC, ///< Args: EvtScript* + EVT_OP_EXEC_GET_TID, ///< Args: EvtScript*, container + EVT_OP_EXEC_WAIT, ///< Spawns a script and waits for it to return before continuing. Args: EvtScript* + EVT_OP_BIND_TRIGGER, ///< Args: EvtScript*, trigger flags, s32 target, 1, Trigger* EVT_OP_UNBIND, ///< Unbinds any triggers bound to this script. EVT_OP_KILL_THREAD, ///< Args: ScriptID - EVT_OP_JUMP, ///< Args: EvtSource* + EVT_OP_JUMP, ///< Args: EvtScript* EVT_OP_SET_PRIORITY, ///< Args: priority EVT_OP_SET_TIMESCALE, ///< Args: timescale EVT_OP_SET_GROUP, ///< Args: group - EVT_OP_BIND_PADLOCK, ///< Args: EvtSource*, trigger flags, s32 target, ItemList*, 0, 1 + EVT_OP_BIND_PADLOCK, ///< Args: EvtScript*, trigger flags, s32 target, ItemList*, 0, 1 EVT_OP_SUSPEND_GROUP, ///< Args: group EVT_OP_RESUME_GROUP, ///< Args: group EVT_OP_SUSPEND_OTHERS, ///< Args: group diff --git a/include/evt_funcs.h b/include/evt_funcs.h index d353091d05..c5c041d8ca 100644 --- a/include/evt_funcs.h +++ b/include/evt_funcs.h @@ -145,7 +145,7 @@ ApiStatus evt_handle_exec_wait(Evt* script); ApiStatus evt_handle_jump(Evt* script); -s32 evt_bound_script_trigger_handler(Trigger* trigger); +s32 evt_trigger_on_activate_exec_script(Trigger* trigger); ApiStatus evt_handle_bind(Evt* script); @@ -175,7 +175,7 @@ ApiStatus evt_handle_resume(Evt* script); ApiStatus evt_handle_does_script_exist(Evt* script); -void evt_standard_trigger_executor(Trigger* trigger); +void evt_trigger_on_activate_lock(Trigger* trigger); ApiStatus evt_handle_bind_lock(Evt* script); diff --git a/include/functions.h b/include/functions.h index a5d97d6397..2da947d1f9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -50,7 +50,7 @@ s32 intro_logos_fade_out(s16 addAlpha); u32 get_entity_type(s32 arg0); Entity* get_entity_by_index(s32 index); -s32 create_entity(StaticEntityData*, s32, s32, s32, s32, ...); +s32 create_entity(EntityBlueprint*, s32, s32, s32, s32, ...); void entity_shattering_idle(Entity* entity); void func_802666E4(Actor* actor, f32 x, f32 y, f32 z, s32 damage); @@ -191,9 +191,9 @@ s32 npc_test_move_simple_without_slipping(s32, f32*, f32*, f32*, f32, f32, f32, void update_collider_transform(s16 colliderID); void get_collider_center(s32 colliderID, f32* x, f32* y, f32* z); -s32 is_trigger_bound(Trigger*, EvtSource* script); -Trigger* create_trigger(TriggerDefinition* def); -s32 evt_bound_script_trigger_handler(Trigger* trigger); +s32 is_another_trigger_bound(Trigger*, EvtScript* script); +Trigger* create_trigger(TriggerBlueprint* def); +s32 evt_trigger_on_activate_exec_script(Trigger* trigger); Trigger* get_trigger_by_id(s32 triggerID); Actor* get_actor(s32 actorID); @@ -245,7 +245,7 @@ f32 get_xz_dist_to_player(f32, f32); void func_800E06C0(s32); void close_status_menu(void); Evt* func_802C39F8(Evt* parentScript, Bytecode* nextLine, s32 newState); -Evt* start_child_script(Evt* parentScript, EvtSource* source, s32 initialState); +Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 initialState); Evt* restart_script(Evt* script); void clear_virtual_entity_list(void); void reset_model_animators(void); @@ -379,8 +379,8 @@ void set_background_color_blend(u8 r, u8 g, u8 b, u8 a); void partner_set_tether_distance(f32); s32 does_script_exist(s32 id); s32 does_script_exist_by_ref(Evt* script); -Evt* start_script(EvtSource* source, s32 priority, s32 initialState); -Evt* start_script_in_group(EvtSource* source, u8 priority, u8 initialState, u8 groupFlags); +Evt* start_script(EvtScript* source, s32 priority, s32 initialState); +Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 groupFlags); f32 get_player_normal_yaw(void); void set_standard_shadow_scale(Shadow* shadow, f32 scale); void set_peach_shadow_scale(Shadow* shadow, f32 scale); @@ -425,7 +425,7 @@ void set_item_entity_flags(s32 itemEntityIndex, s32 flag); s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(void)); DynamicEntity* get_generic_entity(s32 idx); -Trigger* bind_trigger_1(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 triggerVar0, s32 triggerVar1, s32 priority); +Trigger* bind_trigger_1(EvtScript* script, s32 flags, s32 triggerFlagIndex, s32 triggerVar0, s32 triggerVar1, s32 priority); void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height); diff --git a/include/map.h b/include/map.h index 5b34953d0e..e30c740259 100644 --- a/include/map.h +++ b/include/map.h @@ -17,7 +17,7 @@ typedef struct MapConfig { /* 0x04 */ s32 hitAssetCollisionOffset; /* 0x08 */ s32 hitAssetZoneOffset; /* 0x0C */ char unk_0C[4]; - /* 0x10 */ EvtSource* main; + /* 0x10 */ EvtScript* main; /* 0x14 */ EntryList* entryList; /* 0x18 */ s32 entryCount; /* 0x1C */ char unk_1C[12]; diff --git a/include/npc.h b/include/npc.h index 9696fce3c4..d96a1988b4 100644 --- a/include/npc.h +++ b/include/npc.h @@ -90,11 +90,11 @@ typedef struct NpcSettings { /* 0x04 */ s16 height; /* 0x06 */ s16 radius; /* 0x08 */ UNK_PTR otherAI; - /* 0x0C */ EvtSource* onInteract; - /* 0x10 */ EvtSource* ai; - /* 0x14 */ EvtSource* onHit; - /* 0x18 */ EvtSource* aux; - /* 0x1C */ EvtSource* onDefeat; + /* 0x0C */ EvtScript* onInteract; + /* 0x10 */ EvtScript* ai; + /* 0x14 */ EvtScript* onHit; + /* 0x18 */ EvtScript* aux; + /* 0x1C */ EvtScript* onDefeat; /* 0x20 */ s32 flags; /* 0x24 */ char unk_24[4]; /* 0x28 */ s16 level; @@ -133,7 +133,7 @@ typedef struct StaticNpc { /* 0x004 */ NpcSettings* settings; /* 0x008 */ Vec3f pos; /* 0x014 */ s32 flags; - /* 0x018 */ EvtSource* init; + /* 0x018 */ EvtScript* init; /* 0x01C */ char unk_1C[8]; /* 0x024 */ s32 yaw; /* 0x028 */ u8 dropFlags; // TODO: use EnemyDrops (requires tons of map edits) @@ -241,12 +241,12 @@ typedef struct Enemy { /* 0x10 */ Vec3s unk_10; /* 0x16 */ char unk_16[2]; /* 0x18 */ struct NpcSettings* npcSettings; - /* 0x1C */ EvtSource* initBytecode; - /* 0x20 */ EvtSource* interactBytecode; - /* 0x24 */ EvtSource* aiBytecode; - /* 0x28 */ EvtSource* hitBytecode; - /* 0x2C */ EvtSource* auxBytecode; - /* 0x30 */ EvtSource* defeatBytecode; + /* 0x1C */ EvtScript* initBytecode; + /* 0x20 */ EvtScript* interactBytecode; + /* 0x24 */ EvtScript* aiBytecode; + /* 0x28 */ EvtScript* hitBytecode; + /* 0x2C */ EvtScript* auxBytecode; + /* 0x30 */ EvtScript* defeatBytecode; /* 0x34 */ struct Evt* initScript; /* 0x38 */ struct Evt* interactScript; /* 0x3C */ struct Evt* aiScript; @@ -267,7 +267,7 @@ typedef struct Enemy { /* 0xB4 */ s8 unk_B4; /* 0xB5 */ s8 unk_B5; /* 0xB6 */ char unk_B6[2]; - /* 0xB8 */ EvtSource* unk_B8; // some bytecode + /* 0xB8 */ EvtScript* unk_B8; // some bytecode /* 0xBC */ struct Evt* unk_BC; // some script /* 0xC0 */ s32 unk_C0; // some script ID /* 0xC4 */ s32 unk_C4; @@ -494,37 +494,37 @@ void kill_enemy(Enemy* enemy); /// /// @param enemy pointer to the enemy to bind the script to /// @param aiScriptBytecode pointer to the script to be bound. -s32 bind_enemy_ai(Enemy* enemy, EvtSource* aiScriptBytecode); +s32 bind_enemy_ai(Enemy* enemy, EvtScript* aiScriptBytecode); /// Binds the specified auxillary script to the specified enemy /// /// @param enemy pointer to the enemy to bind the script to /// @param auxScriptBytecode pointer to the script to be bound. -s32 bind_enemy_aux(Enemy* enemy, EvtSource* auxScriptBytecode); +s32 bind_enemy_aux(Enemy* enemy, EvtScript* auxScriptBytecode); /// Binds the specified interact script to the specified enemy /// /// @param enemy pointer to the enemy to bind the script to /// @param interactScriptBytecode pointer to the script to be bound. -s32 bind_enemy_interact(Enemy* enemy, EvtSource* interactScriptBytecode); +s32 bind_enemy_interact(Enemy* enemy, EvtScript* interactScriptBytecode); /// Binds the specified ai script to the npc matching the specified npcId /// /// @param npcID ID of the desired npc /// @param npcAiBytecode pointer to the script to be bound. -void bind_npc_ai(s32 npcID, EvtSource* npcAiBytecode); +void bind_npc_ai(s32 npcID, EvtScript* npcAiBytecode); /// Binds the specified auxillary script to the npc matching the specified npcId /// /// @param npcID ID of the desired npc /// @param npcAuxBytecode pointer to the script to be bound. -void bind_npc_aux(s32 npcID, EvtSource* npcAuxBytecode); +void bind_npc_aux(s32 npcID, EvtScript* npcAuxBytecode); /// Binds the specified interact script to the npc matching the specified npcId /// /// @param npcID ID of the desired npc /// @param npcInteractBytecode pointer to the script to be bound. -void bind_npc_interact(s32 npcID, EvtSource* npcInteractBytecode); +void bind_npc_interact(s32 npcID, EvtScript* npcInteractBytecode); /// Looks for an enemy matching the specified npcID. /// diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 60125d5161..0d01bb56f8 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -325,91 +325,91 @@ ApiStatus func_8026EBF8(Evt* script, s32 isInitialCall); ApiStatus SetupMashMeter(Evt* script, s32 isInitialCall); ApiStatus SetActionResult(Evt* script, s32 isInitialCall); -extern EvtSource PlayerScriptDispatcher; -extern EvtSource PeachScriptDispatcher; -extern EvtSource ExecutePlayerAction; -extern EvtSource ExecutePeachAction; -extern EvtSource HandleEvent_Player; -extern EvtSource BtlPutPartnerAway; -extern EvtSource BtlBringPartnerOut; -extern EvtSource MarioEnterStage; -extern EvtSource PeachEnterStage; -extern EvtSource PlayerFirstStrike; -extern EvtSource StartDefend; -extern EvtSource RunAwayStart; -extern EvtSource RunAwayFail; -extern EvtSource RunAwayReset; -extern EvtSource PlayEatFX; -extern EvtSource PlayDrinkFX; -extern EvtSource UseLifeShroom; -extern EvtSource MerleeRunOut; -extern EvtSource MerleeAttackBonus; -extern EvtSource MerleeDefenseBonus; -extern EvtSource MerleeExpBonus; -extern EvtSource PlayerHappy; -extern EvtSource DoDizzyAttack; -extern EvtSource RegainAbility; -extern EvtSource UseMystery; -extern EvtSource DoSleepHit; -extern EvtSource DoDizzyHit; -extern EvtSource DoParalyzeHit; -extern EvtSource DoPoisonHit; -extern EvtSource DoStopHit; -extern EvtSource DoFreezeHit; -extern EvtSource DoShrinkHit; -extern EvtSource ForceNextTarget; -extern EvtSource DoNormalHit; -extern EvtSource D_80294AFC; -extern EvtSource D_80294FE4; -extern EvtSource D_80294C68; -extern EvtSource D_80295EC4; -extern EvtSource D_80295744; -extern EvtSource D_8029621C; -extern EvtSource D_802977BC; -extern EvtSource D_80296014; -extern EvtSource D_80297814; -extern EvtSource D_802976E8; -extern EvtSource D_8029C12C; -extern EvtSource DoBurnHit; -extern EvtSource DoShockHit; -extern EvtSource D_8029A76C; -extern EvtSource D_80294720; -extern EvtSource DoImmune; -extern EvtSource DoDeath; -extern EvtSource Collapse; -extern EvtSource DoScareAway; -extern EvtSource DoSpinSmashHit; -extern EvtSource D_8029BBB4; -extern EvtSource DoJumpBack; -extern EvtSource DoReturnHome; -extern EvtSource DoRecover; -extern EvtSource D_8029C0A4; -extern EvtSource DoAirLift; -extern EvtSource DoBlowAway; -extern EvtSource Rumble_1; -extern EvtSource Rumble_2; -extern EvtSource Rumble_3; -extern EvtSource Rumble_4; -extern EvtSource Rumble_5; -extern EvtSource Rumble_6; -extern EvtSource Rumble_7; -extern EvtSource Rumble_Unused_1; -extern EvtSource Rumble_Unused_2; -extern EvtSource Rumble_Unused_3; -extern EvtSource Rumble_Unused_4; -extern EvtSource CamPreset_A; -extern EvtSource CamPreset_B; -extern EvtSource CamPreset_C; -extern EvtSource CamPreset_D; -extern EvtSource CamPreset_E; -extern EvtSource CamPreset_F; -extern EvtSource CamPreset_G; -extern EvtSource CamPreset_H; -extern EvtSource CamPreset_I; -extern EvtSource CamPreset_J; -extern EvtSource CamPreset_K; -extern EvtSource CamPreset_L; -extern EvtSource CamPreset_M; -extern EvtSource CamPreset_N; +extern EvtScript PlayerScriptDispatcher; +extern EvtScript PeachScriptDispatcher; +extern EvtScript ExecutePlayerAction; +extern EvtScript ExecutePeachAction; +extern EvtScript HandleEvent_Player; +extern EvtScript BtlPutPartnerAway; +extern EvtScript BtlBringPartnerOut; +extern EvtScript MarioEnterStage; +extern EvtScript PeachEnterStage; +extern EvtScript PlayerFirstStrike; +extern EvtScript StartDefend; +extern EvtScript RunAwayStart; +extern EvtScript RunAwayFail; +extern EvtScript RunAwayReset; +extern EvtScript PlayEatFX; +extern EvtScript PlayDrinkFX; +extern EvtScript UseLifeShroom; +extern EvtScript MerleeRunOut; +extern EvtScript MerleeAttackBonus; +extern EvtScript MerleeDefenseBonus; +extern EvtScript MerleeExpBonus; +extern EvtScript PlayerHappy; +extern EvtScript DoDizzyAttack; +extern EvtScript RegainAbility; +extern EvtScript UseMystery; +extern EvtScript DoSleepHit; +extern EvtScript DoDizzyHit; +extern EvtScript DoParalyzeHit; +extern EvtScript DoPoisonHit; +extern EvtScript DoStopHit; +extern EvtScript DoFreezeHit; +extern EvtScript DoShrinkHit; +extern EvtScript ForceNextTarget; +extern EvtScript DoNormalHit; +extern EvtScript D_80294AFC; +extern EvtScript D_80294FE4; +extern EvtScript D_80294C68; +extern EvtScript D_80295EC4; +extern EvtScript D_80295744; +extern EvtScript D_8029621C; +extern EvtScript D_802977BC; +extern EvtScript D_80296014; +extern EvtScript D_80297814; +extern EvtScript D_802976E8; +extern EvtScript D_8029C12C; +extern EvtScript DoBurnHit; +extern EvtScript DoShockHit; +extern EvtScript D_8029A76C; +extern EvtScript D_80294720; +extern EvtScript DoImmune; +extern EvtScript DoDeath; +extern EvtScript Collapse; +extern EvtScript DoScareAway; +extern EvtScript DoSpinSmashHit; +extern EvtScript D_8029BBB4; +extern EvtScript DoJumpBack; +extern EvtScript DoReturnHome; +extern EvtScript DoRecover; +extern EvtScript D_8029C0A4; +extern EvtScript DoAirLift; +extern EvtScript DoBlowAway; +extern EvtScript Rumble_1; +extern EvtScript Rumble_2; +extern EvtScript Rumble_3; +extern EvtScript Rumble_4; +extern EvtScript Rumble_5; +extern EvtScript Rumble_6; +extern EvtScript Rumble_7; +extern EvtScript Rumble_Unused_1; +extern EvtScript Rumble_Unused_2; +extern EvtScript Rumble_Unused_3; +extern EvtScript Rumble_Unused_4; +extern EvtScript CamPreset_A; +extern EvtScript CamPreset_B; +extern EvtScript CamPreset_C; +extern EvtScript CamPreset_D; +extern EvtScript CamPreset_E; +extern EvtScript CamPreset_F; +extern EvtScript CamPreset_G; +extern EvtScript CamPreset_H; +extern EvtScript CamPreset_I; +extern EvtScript CamPreset_J; +extern EvtScript CamPreset_K; +extern EvtScript CamPreset_L; +extern EvtScript CamPreset_M; +extern EvtScript CamPreset_N; #endif diff --git a/include/script_api/common.h b/include/script_api/common.h index 88b881b5a3..f5b0e7dcaa 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -47,7 +47,7 @@ ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall); ApiStatus MakeEntity(Evt* script, s32 isInitialCall); ApiStatus AssignScript(Evt* script, s32 isInitialCall); ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall); -ApiStatus AssignFlag(Evt* script, s32 isInitialCall); +ApiStatus AssignChestFlag(Evt* script, s32 isInitialCall); ApiStatus AssignBlockFlag(Evt* script, s32 isInitialCall); ApiStatus AssignPanelFlag(Evt* script, s32 isInitialCall); ApiStatus AssignCrateFlag(Evt* script, s32 isInitialCall); @@ -306,7 +306,7 @@ ApiStatus MakeTransformGroup(Evt* script, s32 isInitialCall); ApiStatus Spawn802D9D50(Evt* script, s32 isInitialCall); -extern EvtSource EnemyNpcHit; -extern EvtSource EnemyNpcDefeat; +extern EvtScript EnemyNpcHit; +extern EvtScript EnemyNpcDefeat; #endif diff --git a/include/script_api/map.h b/include/script_api/map.h index fba831fdf5..657aacfe2d 100644 --- a/include/script_api/map.h +++ b/include/script_api/map.h @@ -20,14 +20,14 @@ ApiStatus GetGridIndexFromPos(Evt* script, s32 isInitialCall); ApiStatus SetPushBlockFallEffect(Evt* script, s32 isInitialCall); ApiStatus TeleportPartnerToPlayer(Evt* script, s32 isInitialCall); -extern EvtSource EnterWalk; -extern EvtSource EnterWalkShort; -extern EvtSource EnterSavePoint; -extern EvtSource ExitWalk; -extern EvtSource ExitSingleDoor; -extern EvtSource EnterSingleDoor; -extern EvtSource ExitDoubleDoor; -extern EvtSource EnterDoubleDoor; +extern EvtScript EnterWalk; +extern EvtScript EnterWalkShort; +extern EvtScript EnterSavePoint; +extern EvtScript ExitWalk; +extern EvtScript ExitSingleDoor; +extern EvtScript EnterSingleDoor; +extern EvtScript ExitDoubleDoor; +extern EvtScript EnterDoubleDoor; #endif diff --git a/include/si_funcs.h b/include/si_funcs.h index cdeb66e076..1ebb2e76b5 100644 --- a/include/si_funcs.h +++ b/include/si_funcs.h @@ -145,7 +145,7 @@ ApiStatus evt_handle_exec_wait(Evt* script); ApiStatus evt_handle_jump(Evt* script); -s32 evt_bound_script_trigger_handler(Trigger* trigger); +s32 evt_trigger_on_activate_exec_script(Trigger* trigger); ApiStatus evt_handle_bind(Evt* script); @@ -175,7 +175,7 @@ ApiStatus evt_handle_resume(Evt* script); ApiStatus evt_handle_does_script_exist(Evt* script); -void evt_standard_trigger_executor(Trigger* trigger); +void evt_trigger_on_activate_lock(Trigger* trigger); ApiStatus evt_handle_bind_lock(Evt* script); diff --git a/include/variables.h b/include/variables.h index 7ce6ceffc6..6abec3fcca 100644 --- a/include/variables.h +++ b/include/variables.h @@ -17,9 +17,9 @@ extern CollisionStatus gCollisionStatus; extern GameStatus gGameStatus; extern GameStatus* gGameStatusPtr; extern s32 gRandSeed; -extern StaticItem gItemTable[364]; +extern ItemData gItemTable[364]; extern UNK_FUN_PTR(gCurrentUpdateFunction); -extern StaticMove gMoveTable[185]; +extern MoveData gMoveTable[185]; extern s32 gBattleState; extern BattleStatus gBattleStatus; @@ -95,17 +95,17 @@ extern MessagePrintState* gCurrentPrintContext; extern s32 D_802DB264; extern MessagePrintState* D_802DB268; -extern StaticShadowData CircularShadowA; -extern StaticShadowData CircularShadowB; -extern StaticShadowData SquareShadow; -extern s32 D_802EB390; -extern s32 D_802EB394; -extern MessagePrintState* D_802EB398; -extern MessagePrintState* D_802EB39C; +extern ShadowBlueprint CircularShadowA; +extern ShadowBlueprint CircularShadowB; +extern ShadowBlueprint SquareShadow; +extern s32 SaveBlockTutorialMessagePrinterClosed; +extern s32 SaveBlockResultMessagePrinterClosed; +extern MessagePrintState* SaveBlockTutorialMessagePrinter; +extern MessagePrintState* SaveBlockResultMessagePrinter; extern s32 D_802E99DC; extern Entity* D_802EB3A0; -extern s32 D_8015C7D0[3]; // not size 3 +extern s32 CreateEntityVarArgBuffer[3]; // not size 3 extern f32 D_800F7B70[4]; @@ -306,16 +306,15 @@ extern u8 D_800779B0; extern u32 D_80078174; extern u8 D_800A0963; -extern UNK_TYPE D_802EB3B0; +extern struct EffectInstance* TriggerBlockVanishEffect; extern UNK_TYPE D_00000094; extern UNK_TYPE D_00000094_2; // two symbols resolve to the same addr. Required for matching -extern UNK_TYPE D_802EA0A0; -extern StaticEntityData D_802EA07C; +extern EntityBlueprint Entity_InertRedBlock; +extern EntityBlueprint Entity_InertYellowBlock; extern UNK_TYPE D_802EA310; -extern StaticEntityData Entity_HitGroundedYellowBlock; -extern StaticEntityData Entity_HitFloatingYellowBlock; -extern StaticEntityData Entity_HitRedBlock; -extern s16 D_8015C7D2; +extern EntityBlueprint Entity_HitGroundedYellowBlock; +extern EntityBlueprint Entity_HitFloatingYellowBlock; +extern EntityBlueprint Entity_HitRedBlock; extern UNK_TYPE D_0A000328; extern UNK_TYPE D_0A000380; @@ -324,9 +323,9 @@ extern UNK_TYPE D_0A000800; extern UNK_TYPE D_0A000808; // Scripts -extern EvtSource SCRIPT_NpcDefeat; -extern EvtSource ShakeCam1; -extern EvtSource ShakeCamX; +extern EvtScript SCRIPT_NpcDefeat; +extern EvtScript ShakeCam1; +extern EvtScript ShakeCamX; extern s16 gMusicUnkVolume; extern s16 gMusicUnkVolume2; @@ -388,18 +387,18 @@ extern s32 bMarioDefendAnims[]; extern s32 bPeachIdleAnims[]; // TODO: name these entity symbols -extern StaticEntityData Entity_SavePoint; // entitySaveBlock -extern StaticEntityData Entity_RedSwitch; -extern StaticEntityData Entity_BlueSwitch; // entityBlueSwitch -extern StaticEntityData Entity_HugeBlueSwitch; // entityHugeBlueSwitch -extern StaticEntityData Entity_GreenStompSwitch; -extern StaticEntityData Entity_ShatteringHammer1Block; -extern StaticEntityData Entity_ShatteringHammer2Block; -extern StaticEntityData Entity_ShatteringHammer3Block; -extern StaticEntityData Entity_ShatteringHammer1BlockTiny; -extern StaticEntityData Entity_ShatteringHammer2BlockTiny; -extern StaticEntityData Entity_ShatteringHammer3BlockTiny; -extern StaticEntityData Entity_ShatteringBrickBlock; +extern EntityBlueprint Entity_SavePoint; // entitySaveBlock +extern EntityBlueprint Entity_RedSwitch; +extern EntityBlueprint Entity_BlueSwitch; // entityBlueSwitch +extern EntityBlueprint Entity_HugeBlueSwitch; // entityHugeBlueSwitch +extern EntityBlueprint Entity_GreenStompSwitch; +extern EntityBlueprint Entity_ShatteringHammer1Block; +extern EntityBlueprint Entity_ShatteringHammer2Block; +extern EntityBlueprint Entity_ShatteringHammer3Block; +extern EntityBlueprint Entity_ShatteringHammer1BlockTiny; +extern EntityBlueprint Entity_ShatteringHammer2BlockTiny; +extern EntityBlueprint Entity_ShatteringHammer3BlockTiny; +extern EntityBlueprint Entity_ShatteringBrickBlock; // Temporary dead stuff extern PartnerActionStatus dead_gPartnerActionStatus2; diff --git a/src/104730.c b/src/104730.c index f4baf44460..e6c25686c1 100644 --- a/src/104730.c +++ b/src/104730.c @@ -90,7 +90,7 @@ s32 D_802E9898[9] = { 0x00000000, }; -StaticShadowData CircularShadowA = { +ShadowBlueprint CircularShadowA = { .flags = SHADOW_FLAGS_20, .renderCommandList = D_802E9850, .animModelNode = NULL, @@ -99,7 +99,7 @@ StaticShadowData CircularShadowA = { .aabbSize = { 25, 10, 25 } }; -StaticShadowData CircularShadowB = { +ShadowBlueprint CircularShadowB = { .flags = SHADOW_FLAGS_20, .renderCommandList = D_802E9874, .animModelNode = NULL, @@ -108,7 +108,7 @@ StaticShadowData CircularShadowB = { .aabbSize = { 25, 10, 25 } }; -StaticShadowData SquareShadow = { +ShadowBlueprint SquareShadow = { .flags = SHADOW_FLAGS_20, .renderCommandList = D_802E9898, .animModelNode = NULL, @@ -142,7 +142,7 @@ s32 D_802E99FC[7] = { &D_0A003508, 0x00000002, 0x00000000, }; -StaticEntityData Entity_SavePoint = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, E4B2E0_ROM_START, E4B2E0_ROM_END, 32, {0x19, 0x19, 0x19}}; +EntityBlueprint Entity_SavePoint = { 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, E4B2E0_ROM_START, E4B2E0_ROM_END, 32, {0x19, 0x19, 0x19}}; // potential file split(?) s32 D_802E9A3C[1] = { @@ -198,10 +198,10 @@ s32 D_802E9B94[7] = { (s32) &D_0A000740, 0x00000002, 0x00000000, }; -StaticEntityData Entity_RedSwitch = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9A40, NULL, E62AC0_ROM_START, E62AC0_ROM_END, ENTITY_TYPE_RED_SWITCH, {0x16, 0x17, 0x16} }; -StaticEntityData Entity_BlueSwitch = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init, &D_802E9AC4, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_BLUE_SWITCH, {0x16, 0x17, 0x16} }; -StaticEntityData Entity_HugeBlueSwitch = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_HUGE_BLUE_SWITCH, {0x42, 0x4B, 0x42} }; -StaticEntityData Entity_GreenStompSwitch = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9B00, NULL, E62370_ROM_START, E62370_ROM_END, ENTITY_TYPE_GREEN_STOMP_SWITCH, {0x32, 0x0F, 0x32} }; +EntityBlueprint Entity_RedSwitch = { 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9A40, NULL, E62AC0_ROM_START, E62AC0_ROM_END, ENTITY_TYPE_RED_SWITCH, {0x16, 0x17, 0x16} }; +EntityBlueprint Entity_BlueSwitch = { 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init, &D_802E9AC4, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_BLUE_SWITCH, {0x16, 0x17, 0x16} }; +EntityBlueprint Entity_HugeBlueSwitch = { 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_HUGE_BLUE_SWITCH, {0x42, 0x4B, 0x42} }; +EntityBlueprint Entity_GreenStompSwitch = { 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9B00, NULL, E62370_ROM_START, E62370_ROM_END, ENTITY_TYPE_GREEN_STOMP_SWITCH, {0x32, 0x0F, 0x32} }; s32 D_802E9C40[12] = { 0x00000007, 0x00000020, 0x00000003, 0x00000000, @@ -214,20 +214,20 @@ s32 D_802E9C70[7] = { (s32) &D_802E9828, 0x00000002, 0x00000000 }; -StaticEntityData Entity_ShatteringHammer1Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK, {0x10, 0x10, 0x10}}; -StaticEntityData Entity_ShatteringHammer2Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK, {0x10, 0x10, 0x10}}; -StaticEntityData Entity_ShatteringHammer3Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK, {0x10, 0x10, 0x10}}; -StaticEntityData Entity_ShatteringHammer1BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK_TINY, {0x08, 0x08, 0x08}}; -StaticEntityData Entity_ShatteringHammer2BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK_TINY, {0x08, 0x08, 0x08}}; -StaticEntityData Entity_ShatteringHammer3BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK_TINY, {0x08, 0x08, 0x08}}; -StaticEntityData Entity_ShatteringBrickBlock = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E3E260_ROM_START, E3E260_ROM_END, ENTITY_TYPE_BRICK_BLOCK, {0x08, 0x08, 0x08}}; +EntityBlueprint Entity_ShatteringHammer1Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK, {0x10, 0x10, 0x10}}; +EntityBlueprint Entity_ShatteringHammer2Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK, {0x10, 0x10, 0x10}}; +EntityBlueprint Entity_ShatteringHammer3Block = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK, {0x10, 0x10, 0x10}}; +EntityBlueprint Entity_ShatteringHammer1BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK_TINY, {0x08, 0x08, 0x08}}; +EntityBlueprint Entity_ShatteringHammer2BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK_TINY, {0x08, 0x08, 0x08}}; +EntityBlueprint Entity_ShatteringHammer3BlockTiny = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK_TINY, {0x08, 0x08, 0x08}}; +EntityBlueprint Entity_ShatteringBrickBlock = { 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E3E260_ROM_START, E3E260_ROM_END, ENTITY_TYPE_BRICK_BLOCK, {0x08, 0x08, 0x08}}; void entity_shattering_block_init(Entity* entity) { u32 type; void* a2 = NULL; void* a1 = NULL; - ((struct802E1400*)entity->dataBuf)->unk_38 = entity->position.y; + ((struct802E1400*)entity->dataBuf.unk)->unk_38 = entity->position.y; type = get_entity_type((u8)entity->listIndex); if ((type - 24) < 3) { @@ -275,7 +275,7 @@ void entity_shattering_block_init(Entity* entity) { void entity_breakable_block_create_shattering_entity(Entity* entity) { u32 type; - StaticEntityData* addr = NULL; + EntityBlueprint* addr = NULL; type = get_entity_type(entity->listIndex); diff --git a/src/16c8e0.c b/src/16c8e0.c index acc0de5c38..0c3fcc5145 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -12,16 +12,16 @@ s16 D_802809F6 = -1; s16 D_802809F8 = 0; u16 D_802809FA = 0; -extern HudElementAnim HudScript_HPDigit0; -extern HudElementAnim HudScript_HPDigit1; -extern HudElementAnim HudScript_HPDigit2; -extern HudElementAnim HudScript_HPDigit3; -extern HudElementAnim HudScript_HPDigit4; -extern HudElementAnim HudScript_HPDigit5; -extern HudElementAnim HudScript_HPDigit6; -extern HudElementAnim HudScript_HPDigit7; -extern HudElementAnim HudScript_HPDigit8; -extern HudElementAnim HudScript_HPDigit9; +extern HudScript HudScript_HPDigit0; +extern HudScript HudScript_HPDigit1; +extern HudScript HudScript_HPDigit2; +extern HudScript HudScript_HPDigit3; +extern HudScript HudScript_HPDigit4; +extern HudScript HudScript_HPDigit5; +extern HudScript HudScript_HPDigit6; +extern HudScript HudScript_HPDigit7; +extern HudScript HudScript_HPDigit8; +extern HudScript HudScript_HPDigit9; void* bHPDigitHudScripts[] = { HudScript_HPDigit0, HudScript_HPDigit1, HudScript_HPDigit2, HudScript_HPDigit3, HudScript_HPDigit4, HudScript_HPDigit5, HudScript_HPDigit6, HudScript_HPDigit7, HudScript_HPDigit8, HudScript_HPDigit9, NULL, NULL, NULL, @@ -36,7 +36,7 @@ extern f32 D_8029EFB0; extern f32 D_8029EFB4; extern f32 D_8029EFB8; -EvtSource BtlPutPartnerAway = { +EvtScript BtlPutPartnerAway = { EVT_CALL(DispatchEvent, 256, 62) EVT_CHILD_THREAD EVT_SETF(EVT_VAR(0), EVT_FIXED(1.0)) @@ -58,7 +58,7 @@ EvtSource BtlPutPartnerAway = { EVT_END }; -EvtSource BtlBringPartnerOut = { +EvtScript BtlBringPartnerOut = { EVT_CHILD_THREAD EVT_SETF(EVT_VAR(0), EVT_FIXED(0.1)) EVT_LOOP(20) diff --git a/src/1776B0.c b/src/1776B0.c index 0fd268a322..a38421feb2 100644 --- a/src/1776B0.c +++ b/src/1776B0.c @@ -28,90 +28,90 @@ extern s8 D_8029F2A7; extern f32 D_8029F2A8; extern f32 D_8029F2AC; extern f32 D_8029F2B0; -extern EvtSource* D_8029F2B4; +extern EvtScript* D_8029F2B4; s8 D_80280CE0 = 0; s32 D_80280CE4 = -1; -EvtSource CamPreset_B = { +EvtScript CamPreset_B = { EVT_CALL(func_80248DD0) EVT_RETURN EVT_END }; -EvtSource CamPreset_F = { +EvtScript CamPreset_F = { EVT_CALL(func_80248DE4) EVT_RETURN EVT_END }; -EvtSource CamPreset_M = { +EvtScript CamPreset_M = { EVT_CALL(func_80249804) EVT_RETURN EVT_END }; -EvtSource CamPreset_G = { +EvtScript CamPreset_G = { EVT_CALL(func_8024A214) EVT_RETURN EVT_END }; -EvtSource CamPreset_I = { +EvtScript CamPreset_I = { EVT_CALL(func_8024A990) EVT_RETURN EVT_END }; -EvtSource CamPreset_H = { +EvtScript CamPreset_H = { EVT_CALL(func_8024AFE4) EVT_RETURN EVT_END }; -EvtSource CamPreset_N = { +EvtScript CamPreset_N = { EVT_CALL(func_8024B5FC) EVT_RETURN EVT_END }; -EvtSource CamPreset_C = { +EvtScript CamPreset_C = { EVT_CALL(func_8024B9A0) EVT_RETURN EVT_END }; -EvtSource CamPreset_D = { +EvtScript CamPreset_D = { EVT_CALL(func_8024BDA4) EVT_RETURN EVT_END }; -EvtSource CamPreset_E = { +EvtScript CamPreset_E = { EVT_CALL(func_8024C180) EVT_RETURN EVT_END }; -EvtSource CamPreset_J = { +EvtScript CamPreset_J = { EVT_CALL(func_8024C570) EVT_RETURN EVT_END }; -EvtSource CamPreset_K = { +EvtScript CamPreset_K = { EVT_CALL(func_8024C944) EVT_RETURN EVT_END }; -EvtSource CamPreset_L = { +EvtScript CamPreset_L = { EVT_CALL(func_8024CB68) EVT_RETURN EVT_END }; -EvtSource CamPreset_A = { +EvtScript CamPreset_A = { EVT_CALL(func_8024E9B0, 0, 15, 0) EVT_CALL(func_8024E748, 2, 550) EVT_CALL(func_8024E748, 3, 100) @@ -120,7 +120,7 @@ EvtSource CamPreset_A = { EVT_END }; -EvtSource D_80280EB8 = { +EvtScript D_80280EB8 = { EVT_CALL(SetCamPerspective, 1, 6, 25, 16, 1024) EVT_CALL(SetCamViewport, 1, 12, 20, 296, 200) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) @@ -603,7 +603,7 @@ ApiStatus func_8024CE9C(Evt* script, s32 isInitialCall) { void btl_cam_use_preset(s32 id) { BattleStatus* battleStatus = &gBattleStatus; - EvtSource* preset = NULL; + EvtScript* preset = NULL; Evt* newScript; if (D_80280CE0 == 0) { diff --git a/src/17FEB0.c b/src/17FEB0.c index 6afe858520..7eb10b7519 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -343,7 +343,7 @@ block_80: } } } - baseStatusChance = (battleStatus->statusChance * targetActor->staticActorData->baseStatusChance) / 100; // TODO a70 + baseStatusChance = (battleStatus->statusChance * targetActor->actorBlueprint->baseStatusChance) / 100; // TODO a70 if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE && battleStatus->currentAttackElement & DAMAGE_TYPE_FEAR) { //dispatchEvent = EVENT_IMMUNE; if (rand_int(99) < baseStatusChance) { diff --git a/src/18F340.c b/src/18F340.c index 13f5340cb7..38f995c089 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -2,8 +2,8 @@ #include "effects.h" #include "hud_element.h" -extern HudElementAnim HudScript_Happy[]; -extern HudElementAnim HudScript_HPDrain[]; +extern HudScript HudScript_Happy[]; +extern HudScript HudScript_HPDrain[]; extern s32 D_8029FB90; extern f32 D_8029FB94; @@ -188,7 +188,7 @@ ApiStatus func_80261164(Evt* script, s32 isInitialCall) { ApiStatus ConsumeLifeShroom(Evt *script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - StaticItem* item = &gItemTable[0x95]; + ItemData* item = &gItemTable[0x95]; playerData->curHP += item->potencyA; if (playerData->curMaxHP < playerData->curHP) { diff --git a/src/190B20.c b/src/190B20.c index cc29558e1e..1662f10290 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -11,7 +11,7 @@ typedef struct PartnerDMAData { /* 0x00 */ s32 dmaStart; /* 0x04 */ s32 dmaEnd; /* 0x08 */ s32 dmaDest; - /* 0x0C */ ActorDesc* actorDesc; + /* 0x0C */ ActorBlueprint* ActorBlueprint; /* 0x10 */ s32 y; } PartnerDMAData; // size = 0x14 @@ -994,7 +994,7 @@ s32 bPlayerStatusTable[] = { STATUS_END, }; -ActorDesc bPlayerActorDesc = { +ActorBlueprint bPlayerActorBlueprint = { .type = ACTOR_TYPE_PLAYER, .maxHP = 99, .statusTable = bPlayerStatusTable, @@ -1013,7 +1013,7 @@ ActorDesc bPlayerActorDesc = { .statusMessageOffset = { 10, 30 }, }; -ActorPartDesc bMarioParts[] = { +ActorPartBlueprint bMarioParts[] = { { .index = 1, .posOffset = { 0, 0, 0 }, @@ -1097,20 +1097,20 @@ s32 D_802838F8 = 0; extern PartnerDMAData D_80283F10[]; -extern EvtSource D_80293820; +extern EvtScript D_80293820; extern f32 D_802938A4; extern s16 D_802938A8; extern EffectInstance* gDamageCountEffects[24]; extern s32 gDamageCountTimers[24]; extern Gfx D_80293970[]; extern s32 D_802939C0; -extern EvtSource D_802939C4; -extern EvtSource D_80293A10; -extern EvtSource D_80293A34; -extern EvtSource D_80293A58; -extern EvtSource D_80293A7C; -extern EvtSource D_80293AA0; -extern EvtSource D_80293AC4; +extern EvtScript D_802939C4; +extern EvtScript D_80293A10; +extern EvtScript D_80293A34; +extern EvtScript D_80293A58; +extern EvtScript D_80293A7C; +extern EvtScript D_80293AA0; +extern EvtScript D_80293AC4; s32 func_80265CE8(u32*, s32); @@ -1186,12 +1186,12 @@ void func_80263300(void) { s16 itemID = playerData->invItems[i]; if (itemID != 0) { - StaticItem* staticItem = &gItemTable[itemID]; + ItemData* ItemData = &gItemTable[itemID]; - if (staticItem->typeFlags & 2) { + if (ItemData->typeFlags & 2) { battleStatus->moveCategory = 2; battleStatus->selectedItemID = playerData->invItems[i]; - battleStatus->currentTargetListFlags = staticItem->targetFlags; + battleStatus->currentTargetListFlags = ItemData->targetFlags; player_create_target_list(player); if (player->targetListLength != 0) { @@ -1249,7 +1249,7 @@ void btl_init_menu_boots(void) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; Actor* player = battleStatus->playerActor; - StaticMove* move; + MoveData* move; s32 i; s32 moveCount; s32 hasAnyBadgeMoves; @@ -1276,7 +1276,7 @@ void btl_init_menu_boots(void) { s16 badge = playerData->equippedBadges[i]; if (badge != ITEM_NONE) { - StaticMove* moveTable = gMoveTable; + MoveData* moveTable = gMoveTable; u8 moveID = gItemTable[badge].moveID; move = &moveTable[moveID]; @@ -1346,7 +1346,7 @@ void btl_init_menu_hammer(void) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; Actor* player = battleStatus->playerActor; - StaticMove* move; + MoveData* move; s32 i; s32 moveCount; s32 hasAnyBadgeMoves; @@ -1372,7 +1372,7 @@ void btl_init_menu_hammer(void) { for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) { s16 badge = playerData->equippedBadges[i]; if (badge != MOVE_NONE) { - StaticMove* moveTable = gMoveTable; + MoveData* moveTable = gMoveTable; u8 moveID = gItemTable[badge].moveID; move = &moveTable[moveID]; if (move->battleSubmenu == BATTLE_SUBMENU_HAMMER) { @@ -1460,13 +1460,13 @@ void btl_init_menu_partner(void) { // 4 | Unlocked after super | Charge // 5 | Unlocked after ultra | Multibonk - battleStatus->submenuMoveCount = partner->staticActorData->level + 2; + battleStatus->submenuMoveCount = partner->actorBlueprint->level + 2; // Offsets 0,1,2 battleStatus->submenuMoves[0] = playerData->currentPartner * 6 + (MOVE_HEADBONK1 - 6) - + partner->staticActorData->level; + + partner->actorBlueprint->level; // Offsets 3,4,5 for (i = 1; i < battleStatus->submenuMoveCount; i++) { @@ -1478,7 +1478,7 @@ void btl_init_menu_partner(void) { hasAnyBadgeMoves = FALSE; for (i = 0; i < battleStatus->submenuMoveCount; i++){ - StaticMove* move = &gMoveTable[battleStatus->submenuMoves[i]]; + MoveData* move = &gMoveTable[battleStatus->submenuMoves[i]]; fpCost = move->costFP; if (fpCost != 0) { @@ -1490,7 +1490,7 @@ void btl_init_menu_partner(void) { } battleStatus->moveCategory = 5; - battleStatus->selectedItemID = partner->staticActorData->level; + battleStatus->selectedItemID = partner->actorBlueprint->level; battleStatus->currentTargetListFlags = move->flags; player_create_target_list(partner); @@ -1805,8 +1805,8 @@ void load_player_actor(void) { player->unk_134 = battleStatus->unk_93++; player->footStepCounter = 0; player->flags = 0; - player->staticActorData = &bPlayerActorDesc; - player->actorType = bPlayerActorDesc.type; + player->actorBlueprint = &bPlayerActorBlueprint; + player->actorType = bPlayerActorBlueprint.type; if ((gBattleStatus.flags2 & BS_FLAGS2_40) || (gGameStatusPtr->demoFlags & 2)) { player->homePos.x = player->currentPos.x = -130.0f; @@ -1836,8 +1836,8 @@ void load_player_actor(void) { player->scaleModifier.x = 1.0f; player->scaleModifier.y = 1.0f; player->scaleModifier.z = 1.0f; - player->size.x = player->staticActorData->size.x; - player->size.y = player->staticActorData->size.y; + player->size.x = player->actorBlueprint->size.x; + player->size.y = player->actorBlueprint->size.y; player->actorID = 0; player->healthBarPosition.x = player->currentPos.x; player->healthBarPosition.y = player->currentPos.y; @@ -2009,7 +2009,7 @@ void load_partner_actor(void) { PlayerData* playerData = &gPlayerData; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor; - ActorDesc* actorDesc; + ActorBlueprint* ActorBlueprint; Evt* takeTurnScript; s32 partCount; s32 currentPartner; @@ -2026,9 +2026,9 @@ void load_partner_actor(void) { if (currentPartner != PARTNER_NONE) { partnerData = &D_80283F10[currentPartner]; - actorDesc = partnerData->actorDesc; + ActorBlueprint = partnerData->ActorBlueprint; - ASSERT(actorDesc != NULL); + ASSERT(ActorBlueprint != NULL); nuPiReadRom(partnerData->dmaStart, partnerData->dmaDest, partnerData->dmaEnd - partnerData->dmaStart); if ((gBattleStatus.flags2 & BS_FLAGS2_40) || (gGameStatusPtr->demoFlags & 2)) { @@ -2041,28 +2041,28 @@ void load_partner_actor(void) { y = partnerData->y; z = -10.0f; } - partCount = actorDesc->partCount; + partCount = ActorBlueprint->partCount; battleStatus->partnerActor = heap_malloc(sizeof(*partnerActor)); partnerActor = battleStatus->partnerActor; ASSERT(partnerActor != NULL); - actorDesc->level = playerData->partners[playerData->currentPartner].level; + ActorBlueprint->level = playerData->partners[playerData->currentPartner].level; partnerActor->unk_134 = battleStatus->unk_93++; partnerActor->footStepCounter = 0; - partnerActor->staticActorData = actorDesc; - partnerActor->actorType = actorDesc->type; - partnerActor->flags = actorDesc->flags; + partnerActor->actorBlueprint = ActorBlueprint; + partnerActor->actorType = ActorBlueprint->type; + partnerActor->flags = ActorBlueprint->flags; partnerActor->homePos.x = partnerActor->currentPos.x = x; partnerActor->homePos.y = partnerActor->currentPos.y = y; partnerActor->homePos.z = partnerActor->currentPos.z = z; partnerActor->headOffset.x = 0; partnerActor->headOffset.y = 0; partnerActor->headOffset.z = 0; - partnerActor->currentHP = actorDesc->maxHP; + partnerActor->currentHP = ActorBlueprint->maxHP; partnerActor->numParts = partCount; partnerActor->idleScriptSource = NULL; - partnerActor->takeTurnScriptSource = actorDesc->script; + partnerActor->takeTurnScriptSource = ActorBlueprint->script; partnerActor->onHitScriptSource = NULL; partnerActor->onTurnChanceScriptSource = NULL; partnerActor->idleScript = NULL; @@ -2085,8 +2085,8 @@ void load_partner_actor(void) { partnerActor->scaleModifier.y = 1.0f; partnerActor->scaleModifier.z = 1.0f; partnerActor->unk_19A = 0; - partnerActor->size.x = actorDesc->size.x; - partnerActor->size.y = actorDesc->size.y; + partnerActor->size.x = ActorBlueprint->size.x; + partnerActor->size.y = ActorBlueprint->size.y; partnerActor->healthBarPosition.x = partnerActor->homePos.x; partnerActor->healthBarPosition.y = partnerActor->homePos.y; partnerActor->healthBarPosition.z = partnerActor->homePos.z; @@ -2100,7 +2100,7 @@ void load_partner_actor(void) { partnerActor->unk_197 = 0; partnerActor->renderMode = RENDER_MODE_ALPHATEST; partnerActor->actorID = ACTOR_PARTNER; - partnerActor->statusTable = actorDesc->statusTable; + partnerActor->statusTable = ActorBlueprint->statusTable; partnerActor->debuff = 0; partnerActor->debuffDuration = 0; partnerActor->staticStatus = 0; @@ -2138,16 +2138,16 @@ void load_partner_actor(void) { ASSERT(part != NULL); for (i = 0; i < partCount; i++) { - ActorPartDesc* actorPartDesc = &actorDesc->partsData[i]; + ActorPartBlueprint* ActorPartBlueprint = &ActorBlueprint->partsData[i]; part->decorationTable = NULL; - part->staticData = actorPartDesc; + part->staticData = ActorPartBlueprint; - part->flags = actorPartDesc->flags | ACTOR_PART_FLAG_4; + part->flags = ActorPartBlueprint->flags | ACTOR_PART_FLAG_4; part->targetFlags = 0; - part->partOffsetFloat.x = part->partOffset.x = actorPartDesc->posOffset.x; - part->partOffsetFloat.y = part->partOffset.y = actorPartDesc->posOffset.y; - part->partOffsetFloat.z = part->partOffset.z = actorPartDesc->posOffset.z; + part->partOffsetFloat.x = part->partOffset.x = ActorPartBlueprint->posOffset.x; + part->partOffsetFloat.y = part->partOffset.y = ActorPartBlueprint->posOffset.y; + part->partOffsetFloat.z = part->partOffset.z = ActorPartBlueprint->posOffset.z; part->visualOffset.x = 0; part->visualOffset.y = 0; @@ -2155,16 +2155,16 @@ void load_partner_actor(void) { part->absolutePosition.x = 0.0f; part->absolutePosition.y = 0.0f; part->absolutePosition.z = 0.0f; - part->defenseTable = actorPartDesc->defenseTable; - part->idleAnimations = actorPartDesc->idleAnimations; - part->eventFlags = actorPartDesc->eventFlags; - part->partFlags3 = actorPartDesc->elementImmunityFlags; - part->opacity = actorPartDesc->opacity; + part->defenseTable = ActorPartBlueprint->defenseTable; + part->idleAnimations = ActorPartBlueprint->idleAnimations; + part->eventFlags = ActorPartBlueprint->eventFlags; + part->partFlags3 = ActorPartBlueprint->elementImmunityFlags; + part->opacity = ActorPartBlueprint->opacity; part->size.y = partnerActor->size.y; part->size.x = partnerActor->size.x; part->yaw = 0.0f; - part->targetOffset.x = actorPartDesc->targetOffset.x; - part->targetOffset.y = actorPartDesc->targetOffset.y; + part->targetOffset.x = ActorPartBlueprint->targetOffset.x; + part->targetOffset.y = ActorPartBlueprint->targetOffset.y; part->unk_70 = 0; part->rotationPivotOffset.x = 0; part->rotationPivotOffset.y = 0; diff --git a/src/19FAF0.c b/src/19FAF0.c index 3da0e25d82..30efd73495 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -33,37 +33,37 @@ INCLUDE_ASM(ApiStatus, "19FAF0", func_80271484, Evt* script, s32 isInitialCall); ApiStatus func_80271588(Evt* script, s32 isInitialCall); INCLUDE_ASM(ApiStatus, "19FAF0", func_80271588, Evt* script, s32 isInitialCall); -EvtSource DoSleepHit = { +EvtScript DoSleepHit = { EVT_CALL(func_80271210) EVT_RETURN EVT_END }; -EvtSource DoDizzyHit = { +EvtScript DoDizzyHit = { EVT_CALL(func_80271258) EVT_RETURN EVT_END }; -EvtSource DoParalyzeHit = { +EvtScript DoParalyzeHit = { EVT_CALL(func_802712A0) EVT_RETURN EVT_END }; -EvtSource DoPoisonHit = { +EvtScript DoPoisonHit = { EVT_CALL(func_80271328) EVT_RETURN EVT_END }; -EvtSource DoStopHit = { +EvtScript DoStopHit = { EVT_CALL(func_802713B0) EVT_RETURN EVT_END }; -EvtSource DoFreezeHit = { +EvtScript DoFreezeHit = { EVT_CALL(func_8027143C) EVT_WAIT_FRAMES(8) EVT_CALL(func_8027143C) @@ -73,7 +73,7 @@ EvtSource DoFreezeHit = { EVT_END }; -EvtSource DoShrinkHit = { +EvtScript DoShrinkHit = { EVT_CALL(func_80271588) EVT_RETURN EVT_END diff --git a/src/1A5830.c b/src/1A5830.c index 5cafd2aba0..260aacdb2b 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -884,13 +884,13 @@ s32 dispatch_damage_event_actor_1(Actor* actor, s32 damageAmount, s32 event) { ApiStatus BindTakeTurn(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - EvtSource* takeTurnScript; + EvtScript* takeTurnScript; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - takeTurnScript = (EvtSource*) evt_get_variable(script, *args++); + takeTurnScript = (EvtScript*) evt_get_variable(script, *args++); get_actor(actorID)->takeTurnScriptSource = takeTurnScript; return ApiStatus_DONE2; } @@ -924,7 +924,7 @@ ApiStatus ResumeTakeTurn(Evt* script, s32 isInitialCall) { ApiStatus BindIdle(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - EvtSource* idleCode; + EvtScript* idleCode; Actor* actor; Evt* newScriptContext; @@ -932,7 +932,7 @@ ApiStatus BindIdle(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - idleCode = (EvtSource*) evt_get_variable(script, *args++); + idleCode = (EvtScript*) evt_get_variable(script, *args++); actor = get_actor(actorID); if (actor->idleScript != 0) { @@ -982,13 +982,13 @@ ApiStatus EnableIdleScript(Evt* script, s32 isInitialCall) { ApiStatus BindHandleEvent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - EvtSource* var1; + EvtScript* var1; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - var1 = (EvtSource*) evt_get_variable(script, *args++); + var1 = (EvtScript*) evt_get_variable(script, *args++); get_actor(actorID)->onHitScriptSource = var1; return ApiStatus_DONE2; } @@ -996,13 +996,13 @@ ApiStatus BindHandleEvent(Evt* script, s32 isInitialCall) { ApiStatus BindNextTurn(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - EvtSource* var1; + EvtScript* var1; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - var1 = (EvtSource*) evt_get_variable(script, *args++); + var1 = (EvtScript*) evt_get_variable(script, *args++); get_actor(actorID)->onTurnChanceScriptSource = var1; return ApiStatus_DONE2; } @@ -1200,7 +1200,7 @@ ApiStatus RemoveActor(Evt* script, s32 isInitialCall) { } currentEncounter->coinsEarned += actor->extraCoinBonus; - currentEncounter->coinsEarned += actor->staticActorData->coinReward; + currentEncounter->coinsEarned += actor->actorBlueprint->coinReward; btl_delete_actor(actor); battleStatus->enemyActors[(u8)actorID] = NULL; @@ -1227,8 +1227,8 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) { } dropper = get_actor(actorID); - enemyLevel = dropper->staticActorData->level; - if (dropper->staticActorData->level == 0.0f) { + enemyLevel = dropper->actorBlueprint->level; + if (dropper->actorBlueprint->level == 0.0f) { enemyLevel = 1.0f; } @@ -1809,7 +1809,7 @@ ApiStatus GetOriginalActorType(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - evt_set_variable(script, outVar, get_actor(actorID)->staticActorData->type); + evt_set_variable(script, outVar, get_actor(actorID)->actorBlueprint->type); return ApiStatus_DONE2; } diff --git a/src/1AC760.c b/src/1AC760.c index 8cb2b5d62c..feed1faa80 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -284,7 +284,7 @@ ApiStatus GetActorLevel(Evt* script, s32 isInitialCall) { } outVar = *args++; - evt_set_variable(script, outVar, get_actor(actorID)->staticActorData->level); + evt_set_variable(script, outVar, get_actor(actorID)->actorBlueprint->level); return ApiStatus_DONE2; } diff --git a/src/1AF120.c b/src/1AF120.c index 27ea88f39e..af01f62bf7 100644 --- a/src/1AF120.c +++ b/src/1AF120.c @@ -3,10 +3,10 @@ #include "battle/battle.h" #include "script_api/battle.h" -extern EvtSource D_80299828; -extern EvtSource D_8029AF08; -extern EvtSource D_8029A76C; -extern EvtSource D_8029B818; +extern EvtScript D_80299828; +extern EvtScript D_8029AF08; +extern EvtScript D_8029A76C; +extern EvtScript D_8029B818; ApiStatus GetDamageIntensity(Evt* script, s32 isInitialCall) { if (gBattleStatus.lastAttackDamage < 4) { @@ -32,7 +32,7 @@ ApiStatus AddEffectOffset(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource D_80294720 = { +EvtScript D_80294720 = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_LOOP(2) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) @@ -87,7 +87,7 @@ EvtSource D_80294720 = { EVT_END }; -EvtSource D_80294AFC = { +EvtScript D_80294AFC = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) @@ -107,7 +107,7 @@ EvtSource D_80294AFC = { EVT_END }; -EvtSource D_80294C68 = { +EvtScript D_80294C68 = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -154,7 +154,7 @@ EvtSource D_80294C68 = { EVT_END }; -EvtSource D_80294FE4 = { +EvtScript D_80294FE4 = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -200,7 +200,7 @@ EvtSource D_80294FE4 = { EVT_END }; -EvtSource D_80295350 = { +EvtScript D_80295350 = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -253,7 +253,7 @@ EvtSource D_80295350 = { EVT_END }; -EvtSource D_80295744 = { +EvtScript D_80295744 = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -300,7 +300,7 @@ EvtSource D_80295744 = { EVT_END }; -EvtSource D_80295AC0 = { +EvtScript D_80295AC0 = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -354,7 +354,7 @@ EvtSource D_80295AC0 = { EVT_END }; -EvtSource D_80295EC4 = { +EvtScript D_80295EC4 = { EVT_SET(LW(6), LW(3)) EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.80078125)) EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(7), LW(8), LW(9)) @@ -374,7 +374,7 @@ EvtSource D_80295EC4 = { EVT_END }; -EvtSource D_80296014 = { +EvtScript D_80296014 = { EVT_SET(LW(10), LW(1)) EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) EVT_IF_EQ(LW(1), 0) @@ -400,7 +400,7 @@ EvtSource D_80296014 = { EVT_END }; -EvtSource D_8029621C = { +EvtScript D_8029621C = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LW(1)) EVT_CHILD_THREAD EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(5), LW(6), LW(7)) @@ -548,7 +548,7 @@ EvtSource D_8029621C = { EVT_END }; -EvtSource D_80296C8C = { +EvtScript D_80296C8C = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LW(1)) EVT_CALL(GetDamageIntensity) EVT_SWITCH(LW(0)) @@ -683,7 +683,7 @@ EvtSource D_80296C8C = { EVT_END }; -EvtSource D_802975C8 = { +EvtScript D_802975C8 = { EVT_CALL(StartRumble, 6) EVT_SETF(LW(0), EVT_FLOAT(1.0)) EVT_SETF(LW(1), EVT_FLOAT(1.0)) @@ -705,7 +705,7 @@ EvtSource D_802975C8 = { EVT_END }; -EvtSource D_802976E8 = { +EvtScript D_802976E8 = { EVT_CALL(func_80269E80, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(0) @@ -726,7 +726,7 @@ EvtSource D_802976E8 = { EVT_END }; -EvtSource D_802977BC = { +EvtScript D_802977BC = { EVT_EXEC_WAIT(D_80296C8C) EVT_IF_NE(LW(2), 000000) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, LW(2)) @@ -736,7 +736,7 @@ EvtSource D_802977BC = { EVT_END }; -EvtSource D_80297814 = { +EvtScript D_80297814 = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(AddActorPos, -127, -2, 0, 0) @@ -767,7 +767,7 @@ EvtSource D_80297814 = { EVT_END }; -EvtSource D_80297A38 = { +EvtScript D_80297A38 = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LW(1)) EVT_CALL(GetDamageIntensity) EVT_SWITCH(LW(0)) @@ -902,7 +902,7 @@ EvtSource D_80297A38 = { EVT_END }; -EvtSource D_80298374 = { +EvtScript D_80298374 = { EVT_CALL(StartRumble, 6) EVT_SETF(LW(0), EVT_FLOAT(1.0)) EVT_SETF(LW(1), EVT_FLOAT(1.0)) @@ -924,7 +924,7 @@ EvtSource D_80298374 = { EVT_END }; -EvtSource D_80298494 = { +EvtScript D_80298494 = { EVT_CHILD_THREAD EVT_SET(LW(0), 0) EVT_LOOP(10) @@ -939,7 +939,7 @@ EvtSource D_80298494 = { EVT_END }; -EvtSource D_80298520 = { +EvtScript D_80298520 = { EVT_CHILD_THREAD EVT_SET(LW(0), 0) EVT_LOOP(10) @@ -954,7 +954,7 @@ EvtSource D_80298520 = { EVT_END }; -EvtSource D_802985AC = { +EvtScript D_802985AC = { EVT_CHILD_THREAD EVT_CALL(MakeLerp, 0, 2160, 60, 10) EVT_LABEL(1) @@ -972,7 +972,7 @@ EvtSource D_802985AC = { EVT_END }; -EvtSource D_80298668 = { +EvtScript D_80298668 = { EVT_CHILD_THREAD EVT_CALL(MakeLerp, 2160, 0, 60, 10) EVT_LABEL(1) @@ -990,7 +990,7 @@ EvtSource D_80298668 = { EVT_END }; -EvtSource D_80298724 = { +EvtScript D_80298724 = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(func_80269E80, LW(0)) EVT_SWITCH(LW(0)) @@ -1029,7 +1029,7 @@ EvtSource D_80298724 = { EVT_END }; -EvtSource D_802988F0 = { +EvtScript D_802988F0 = { EVT_EXEC_WAIT(D_80297A38) EVT_IF_NE(LW(2), 000000) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LW(2)) @@ -1039,7 +1039,7 @@ EvtSource D_802988F0 = { EVT_END }; -EvtSource D_80298948 = { +EvtScript D_80298948 = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LW(0)) @@ -1079,7 +1079,7 @@ EvtSource D_80298948 = { EVT_END }; -EvtSource ForceNextTarget = { +EvtScript ForceNextTarget = { EVT_CALL(GetOwnerID, LW(10)) EVT_CALL(EnemyCreateTargetList, 32770) EVT_CALL(InitTargetIterator) @@ -1122,7 +1122,7 @@ EvtSource ForceNextTarget = { EVT_END }; -EvtSource D_80298E20 = { +EvtScript D_80298E20 = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2022) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorSize, ACTOR_SELF, LW(3), LW(4)) @@ -1159,7 +1159,7 @@ EvtSource D_80298E20 = { EVT_END }; -EvtSource DoNormalHit = { +EvtScript DoNormalHit = { EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(func_80269E80, LW(2)) EVT_SWITCH(LW(2)) @@ -1301,7 +1301,7 @@ EvtSource DoNormalHit = { EVT_END }; -EvtSource D_80299828 = { +EvtScript D_80299828 = { EVT_SWITCH(LW(0)) EVT_CASE_EQ(0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 1, 0) @@ -1426,7 +1426,7 @@ EvtSource D_80299828 = { EVT_END }; -EvtSource DoBurnHit = { +EvtScript DoBurnHit = { EVT_CALL(GetLastEvent, ACTOR_SELF, LW(3)) EVT_IF_EQ(LW(3), EVENT_BURN_DEATH) EVT_CALL(EnableActorGlow, -127, 0) @@ -1521,7 +1521,7 @@ EvtSource DoBurnHit = { EVT_END }; -EvtSource DoShockHit = { +EvtScript DoShockHit = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -1530,7 +1530,7 @@ EvtSource DoShockHit = { EVT_END }; -EvtSource D_8029A76C = { +EvtScript D_8029A76C = { EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorSize, ACTOR_SELF, LW(3), LW(4)) @@ -1594,7 +1594,7 @@ EvtSource D_8029A76C = { EVT_END }; -EvtSource DoImmune = { +EvtScript DoImmune = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(2)) EVT_IF_NOT_FLAG(LW(2), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) @@ -1628,7 +1628,7 @@ EvtSource DoImmune = { EVT_END }; -EvtSource DoDeath = { +EvtScript DoDeath = { EVT_EXEC_WAIT(D_8029AF08) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_EXEC_WAIT(ForceNextTarget) @@ -1637,7 +1637,7 @@ EvtSource DoDeath = { EVT_END }; -EvtSource D_8029AF08 = { +EvtScript D_8029AF08 = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableActorGlow, -127, 0) @@ -1694,7 +1694,7 @@ EvtSource D_8029AF08 = { EVT_END }; -EvtSource DoScareAway = { +EvtScript DoScareAway = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(2)) @@ -1731,7 +1731,7 @@ EvtSource DoScareAway = { EVT_END }; -EvtSource D_8029B494 = { +EvtScript D_8029B494 = { EVT_CALL(PlayerCreateTargetList, 65540) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -1790,7 +1790,7 @@ EvtSource D_8029B494 = { EVT_END }; -EvtSource D_8029B818 = { +EvtScript D_8029B818 = { EVT_SET(LW(0), 0) EVT_LABEL(0) EVT_SUB(LW(0), 30) @@ -1804,7 +1804,7 @@ EvtSource D_8029B818 = { EVT_END }; -EvtSource D_8029B8A8 = { +EvtScript D_8029B8A8 = { EVT_CALL(GetActorSize, ACTOR_SELF, LW(0), LW(1)) EVT_MUL(LW(0), LW(1)) EVT_SWITCH(LW(0)) @@ -1825,7 +1825,7 @@ EvtSource D_8029B8A8 = { EVT_END }; -EvtSource DoSpinSmashHit = { +EvtScript DoSpinSmashHit = { EVT_EXEC_GET_TID(D_8029B818, LW(14)) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(GetPartEventFlags, -127, LW(0), LW(10)) @@ -1857,7 +1857,7 @@ EvtSource DoSpinSmashHit = { EVT_END }; -EvtSource D_8029BBB4 = { +EvtScript D_8029BBB4 = { EVT_SET(LW(10), LW(0)) EVT_SET(LW(11), LW(1)) EVT_SET(LW(12), LW(2)) @@ -1886,7 +1886,7 @@ EvtSource D_8029BBB4 = { EVT_END }; -EvtSource DoJumpBack = { +EvtScript DoJumpBack = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -1903,7 +1903,7 @@ EvtSource DoJumpBack = { EVT_END }; -EvtSource DoReturnHome = { +EvtScript DoReturnHome = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(10), LW(11), LW(12)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(13), LW(14), LW(15)) @@ -1918,7 +1918,7 @@ EvtSource DoReturnHome = { EVT_END }; -EvtSource DoRecover = { +EvtScript DoRecover = { EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.80078125)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(7), LW(8), LW(9)) @@ -1934,7 +1934,7 @@ EvtSource DoRecover = { EVT_END }; -EvtSource D_8029C0A4 = { +EvtScript D_8029C0A4 = { EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -1945,7 +1945,7 @@ EvtSource D_8029C0A4 = { EVT_END }; -EvtSource D_8029C12C = { +EvtScript D_8029C12C = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) EVT_LABEL(0) EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) @@ -1982,7 +1982,7 @@ EvtSource D_8029C12C = { EVT_END }; -EvtSource DoAirLift = { +EvtScript DoAirLift = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(2)) EVT_IF_NOT_FLAG(LW(2), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) @@ -2000,7 +2000,7 @@ EvtSource DoAirLift = { EVT_END }; -EvtSource DoBlowAway = { +EvtScript DoBlowAway = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5)) EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) diff --git a/src/1AF230.c b/src/1AF230.c index e392932ee2..89b8947e6b 100644 --- a/src/1AF230.c +++ b/src/1AF230.c @@ -29,18 +29,18 @@ typedef struct StarPowerDesc { extern StarPowerDesc D_8008F071[]; -extern EvtSource battle_star_focus_usePower; -extern EvtSource battle_star_refresh_usePower; -extern EvtSource battle_star_lullaby_usePower; -extern EvtSource battle_star_star_storm_usePower; -extern EvtSource battle_star_chill_out_usePower; -extern EvtSource battle_star_smooch_usePower; -extern EvtSource battle_star_time_out_usePower; -extern EvtSource battle_star_up_and_away_usePower; -extern EvtSource battle_star_star_beam_usePower; -extern EvtSource battle_star_peach_beam_usePower; -extern EvtSource battle_star_peach_focus_usePower; -extern EvtSource battle_star_peach_dash_usePower; +extern EvtScript battle_star_focus_usePower; +extern EvtScript battle_star_refresh_usePower; +extern EvtScript battle_star_lullaby_usePower; +extern EvtScript battle_star_star_storm_usePower; +extern EvtScript battle_star_chill_out_usePower; +extern EvtScript battle_star_smooch_usePower; +extern EvtScript battle_star_time_out_usePower; +extern EvtScript battle_star_up_and_away_usePower; +extern EvtScript battle_star_star_beam_usePower; +extern EvtScript battle_star_peach_beam_usePower; +extern EvtScript battle_star_peach_focus_usePower; +extern EvtScript battle_star_peach_dash_usePower; StarPowerEntry D_8029C7D0[] = { { battle_star_focus_ROM_START, battle_star_focus_ROM_END, battle_star_focus_VRAM, battle_star_focus_usePower, }, diff --git a/src/3251D0.c b/src/3251D0.c index dcbcb64898..9bacb4acc0 100644 --- a/src/3251D0.c +++ b/src/3251D0.c @@ -106,7 +106,7 @@ ApiStatus func_802C03E8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource D_802C0410 = { +EvtScript D_802C0410 = { EVT_SET_GROUP(0) EVT_CALL(SetPlayerAnimation, ANIM_GOT_ITEM) EVT_CALL(GetPlayerPos, LW(0), LW(1), LW(2)) @@ -122,7 +122,7 @@ EvtSource D_802C0410 = { EVT_END }; -EvtSource D_802C04F4 = { +EvtScript D_802C04F4 = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySound, SOUND_2095) @@ -135,7 +135,7 @@ EvtSource D_802C04F4 = { EVT_END }; -EvtSource D_802C0560 = { +EvtScript D_802C0560 = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySound, SOUND_2095) @@ -148,7 +148,7 @@ EvtSource D_802C0560 = { EVT_END }; -EvtSource D_802C05CC_32579C = { +EvtScript D_802C05CC_32579C = { EVT_SET_GROUP(0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetCurrentPartner, LW(0)) diff --git a/src/415D90.c b/src/415D90.c index 7f04fb6090..2efe39d9f3 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -1,87 +1,87 @@ #include "common.h" #include "hud_element.h" -extern HudElementAnim HudScript_YellowArrow[]; +extern HudScript HudScript_YellowArrow[]; -extern HudElementAnim HudScript_MenuFlee[]; -extern HudElementAnim HudScript_MenuFleeDisabled[]; -extern HudElementAnim HudScript_MenuDefend[]; -extern HudElementAnim HudScript_MenuDefendDisabled[]; -extern HudElementAnim HudScript_MenuStrategies[]; -extern HudElementAnim HudScript_MenuStrategiesDisabled[]; -extern HudElementAnim HudScript_MenuPouch[]; -extern HudElementAnim HudScript_MenuPouchDisabled[]; -extern HudElementAnim HudScript_MenuDoNothing[]; -extern HudElementAnim HudScript_MenuDoNothingDisabled[]; +extern HudScript HudScript_MenuFlee[]; +extern HudScript HudScript_MenuFleeDisabled[]; +extern HudScript HudScript_MenuDefend[]; +extern HudScript HudScript_MenuDefendDisabled[]; +extern HudScript HudScript_MenuStrategies[]; +extern HudScript HudScript_MenuStrategiesDisabled[]; +extern HudScript HudScript_MenuPouch[]; +extern HudScript HudScript_MenuPouchDisabled[]; +extern HudScript HudScript_MenuDoNothing[]; +extern HudScript HudScript_MenuDoNothingDisabled[]; -extern HudElementAnim HudScript_Kooper[]; -extern HudElementAnim HudScript_Bombette[]; -extern HudElementAnim HudScript_Partner0[]; -extern HudElementAnim HudScript_Partner0Disabled[]; -extern HudElementAnim HudScript_Goombario[]; -extern HudElementAnim HudScript_GoombarioDisabled[]; -extern HudElementAnim HudScript_KooperDisabled[]; -extern HudElementAnim HudScript_BombetteDisabled[]; -extern HudElementAnim HudScript_Parakarry[]; -extern HudElementAnim HudScript_ParakarryDisabled[]; -extern HudElementAnim HudScript_Bow[]; -extern HudElementAnim HudScript_BowDisabled[]; -extern HudElementAnim HudScript_Watt[]; -extern HudElementAnim HudScript_WattDisabled[]; -extern HudElementAnim HudScript_Sushie[]; -extern HudElementAnim HudScript_SushieDisabled[]; -extern HudElementAnim HudScript_Lakilester[]; -extern HudElementAnim HudScript_LakilesterDisabled[]; -extern HudElementAnim HudScript_PartnerA[]; -extern HudElementAnim HudScript_PartnerADisabled[]; +extern HudScript HudScript_Kooper[]; +extern HudScript HudScript_Bombette[]; +extern HudScript HudScript_Partner0[]; +extern HudScript HudScript_Partner0Disabled[]; +extern HudScript HudScript_Goombario[]; +extern HudScript HudScript_GoombarioDisabled[]; +extern HudScript HudScript_KooperDisabled[]; +extern HudScript HudScript_BombetteDisabled[]; +extern HudScript HudScript_Parakarry[]; +extern HudScript HudScript_ParakarryDisabled[]; +extern HudScript HudScript_Bow[]; +extern HudScript HudScript_BowDisabled[]; +extern HudScript HudScript_Watt[]; +extern HudScript HudScript_WattDisabled[]; +extern HudScript HudScript_Sushie[]; +extern HudScript HudScript_SushieDisabled[]; +extern HudScript HudScript_Lakilester[]; +extern HudScript HudScript_LakilesterDisabled[]; +extern HudScript HudScript_PartnerA[]; +extern HudScript HudScript_PartnerADisabled[]; -extern HudElementAnim HudScript_MenuBoots1[]; -extern HudElementAnim HudScript_MenuBoots1Disabled[]; -extern HudElementAnim HudScript_MenuBoots2[]; -extern HudElementAnim HudScript_MenuBoots2Disabled[]; -extern HudElementAnim HudScript_MenuBoots3[]; -extern HudElementAnim HudScript_MenuBoots3Disabled[]; +extern HudScript HudScript_MenuBoots1[]; +extern HudScript HudScript_MenuBoots1Disabled[]; +extern HudScript HudScript_MenuBoots2[]; +extern HudScript HudScript_MenuBoots2Disabled[]; +extern HudScript HudScript_MenuBoots3[]; +extern HudScript HudScript_MenuBoots3Disabled[]; -extern HudElementAnim HudScript_MenuHammer1[]; -extern HudElementAnim HudScript_MenuHammer1Disabled[]; -extern HudElementAnim HudScript_MenuHammer2[]; -extern HudElementAnim HudScript_MenuHammer2Disabled[]; -extern HudElementAnim HudScript_MenuHammer3[]; -extern HudElementAnim HudScript_MenuHammer3Disabled[]; +extern HudScript HudScript_MenuHammer1[]; +extern HudScript HudScript_MenuHammer1Disabled[]; +extern HudScript HudScript_MenuHammer2[]; +extern HudScript HudScript_MenuHammer2Disabled[]; +extern HudScript HudScript_MenuHammer3[]; +extern HudScript HudScript_MenuHammer3Disabled[]; -extern HudElementAnim HudScript_MenuItem[]; -extern HudElementAnim HudScript_MenuItemDisabled[]; +extern HudScript HudScript_MenuItem[]; +extern HudScript HudScript_MenuItemDisabled[]; -extern HudElementAnim HudScript_MenuStarPower[]; -extern HudElementAnim HudScript_MenuStarPowerDisabled[]; +extern HudScript HudScript_MenuStarPower[]; +extern HudScript HudScript_MenuStarPowerDisabled[]; -extern HudElementAnim HudScript_Eldstar[]; -extern HudElementAnim HudScript_EldstarDisabled[]; -extern HudElementAnim HudScript_Mamar[]; -extern HudElementAnim HudScript_MamarDisabled[]; -extern HudElementAnim HudScript_Skolar[]; -extern HudElementAnim HudScript_SkolarDisabled[]; -extern HudElementAnim HudScript_Muskular[]; -extern HudElementAnim HudScript_MuskularDisabled[]; -extern HudElementAnim HudScript_Misstar[]; -extern HudElementAnim HudScript_MisstarDisabled[]; -extern HudElementAnim HudScript_Klevar[]; -extern HudElementAnim HudScript_KlevarDisabled[]; -extern HudElementAnim HudScript_Kalmar[]; -extern HudElementAnim HudScript_KalmarDisabled[]; -extern HudElementAnim HudScript_StarBeam[]; -extern HudElementAnim HudScript_StarBeamDisabled[]; -extern HudElementAnim HudScript_PeachBeam[]; -extern HudElementAnim HudScript_PeachBeamDisabled[]; +extern HudScript HudScript_Eldstar[]; +extern HudScript HudScript_EldstarDisabled[]; +extern HudScript HudScript_Mamar[]; +extern HudScript HudScript_MamarDisabled[]; +extern HudScript HudScript_Skolar[]; +extern HudScript HudScript_SkolarDisabled[]; +extern HudScript HudScript_Muskular[]; +extern HudScript HudScript_MuskularDisabled[]; +extern HudScript HudScript_Misstar[]; +extern HudScript HudScript_MisstarDisabled[]; +extern HudScript HudScript_Klevar[]; +extern HudScript HudScript_KlevarDisabled[]; +extern HudScript HudScript_Kalmar[]; +extern HudScript HudScript_KalmarDisabled[]; +extern HudScript HudScript_StarBeam[]; +extern HudScript HudScript_StarBeamDisabled[]; +extern HudScript HudScript_PeachBeam[]; +extern HudScript HudScript_PeachBeamDisabled[]; -extern HudElementAnim HudScript_MoveDiamond[]; -extern HudElementAnim HudScript_MoveBlueOrb[]; -extern HudElementAnim HudScript_MoveGreenOrb[]; -extern HudElementAnim HudScript_MoveRedOrb[]; -extern HudElementAnim HudScript_MoveDiamondDisabled[]; -extern HudElementAnim HudScript_MoveBlueOrbDisabled[]; -extern HudElementAnim HudScript_MoveGreenOrbDisabled[]; -extern HudElementAnim HudScript_MoveRedOrbDisabled[]; +extern HudScript HudScript_MoveDiamond[]; +extern HudScript HudScript_MoveBlueOrb[]; +extern HudScript HudScript_MoveGreenOrb[]; +extern HudScript HudScript_MoveRedOrb[]; +extern HudScript HudScript_MoveDiamondDisabled[]; +extern HudScript HudScript_MoveBlueOrbDisabled[]; +extern HudScript HudScript_MoveGreenOrbDisabled[]; +extern HudScript HudScript_MoveRedOrbDisabled[]; extern u8 D_802AD000; extern u8 D_802AD001; @@ -153,46 +153,46 @@ s16 D_802AB340[] = { 0x001C, 0x0028 }; s16 D_802AB344[] = { 0, -2 }; -HudElementAnim* battle_menu_JumpHudScripts[] = { +HudScript* battle_menu_JumpHudScripts[] = { HudScript_MenuBoots1Disabled, HudScript_MenuBoots1Disabled, HudScript_MenuBoots1,HudScript_MenuBoots1Disabled, HudScript_MenuBoots2, HudScript_MenuBoots2Disabled, HudScript_MenuBoots3, HudScript_MenuBoots3Disabled }; -HudElementAnim* battle_menu_HammerHudScripts[] = { +HudScript* battle_menu_HammerHudScripts[] = { HudScript_MenuHammer1Disabled, HudScript_MenuHammer1Disabled, HudScript_MenuHammer1, HudScript_MenuHammer1Disabled, HudScript_MenuHammer2, HudScript_MenuHammer2Disabled, HudScript_MenuHammer3, HudScript_MenuHammer3Disabled }; -HudElementAnim* battle_menu_ItemHudScripts[] = { HudScript_MenuItem, HudScript_MenuItemDisabled }; +HudScript* battle_menu_ItemHudScripts[] = { HudScript_MenuItem, HudScript_MenuItemDisabled }; -HudElementAnim* battle_menu_StarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; +HudScript* battle_menu_StarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; -HudElementAnim* battle_menu_StarPowerMovesHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled, HudScript_Eldstar, HudScript_EldstarDisabled, +HudScript* battle_menu_StarPowerMovesHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled, HudScript_Eldstar, HudScript_EldstarDisabled, HudScript_Mamar, HudScript_MamarDisabled, HudScript_Skolar, HudScript_SkolarDisabled, HudScript_Muskular, HudScript_MuskularDisabled, HudScript_Misstar, HudScript_MisstarDisabled, HudScript_Klevar, HudScript_KlevarDisabled, HudScript_Kalmar, HudScript_KalmarDisabled, HudScript_StarBeam, HudScript_StarBeamDisabled, HudScript_PeachBeam, HudScript_PeachBeamDisabled, HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled, HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; -HudElementAnim* battle_menu_PartnerHudScripts[] = { HudScript_Partner0, HudScript_Goombario, HudScript_Kooper, HudScript_Bombette, +HudScript* battle_menu_PartnerHudScripts[] = { HudScript_Partner0, HudScript_Goombario, HudScript_Kooper, HudScript_Bombette, HudScript_Parakarry, HudScript_Partner0, HudScript_Watt, HudScript_Sushie, HudScript_Lakilester, HudScript_Bow, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA }; -HudElementAnim* battle_menu_DisabledPartnerHudScripts[] = { HudScript_Partner0Disabled, HudScript_GoombarioDisabled, HudScript_KooperDisabled, HudScript_BombetteDisabled, +HudScript* battle_menu_DisabledPartnerHudScripts[] = { HudScript_Partner0Disabled, HudScript_GoombarioDisabled, HudScript_KooperDisabled, HudScript_BombetteDisabled, HudScript_ParakarryDisabled, HudScript_Partner0Disabled, HudScript_WattDisabled, HudScript_SushieDisabled, HudScript_LakilesterDisabled, HudScript_BowDisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled }; -HudElementAnim* battle_menu_StrategiesHudScript[] = { HudScript_MenuStrategies }; +HudScript* battle_menu_StrategiesHudScript[] = { HudScript_MenuStrategies }; -HudElementAnim* battle_menu_DisabledStrategiesHudScript[] = { HudScript_MenuStrategiesDisabled }; +HudScript* battle_menu_DisabledStrategiesHudScript[] = { HudScript_MenuStrategiesDisabled }; -HudElementAnim* battle_menu_DoNothingHudScripts[] = { HudScript_MenuDoNothing, HudScript_MenuDoNothingDisabled }; +HudScript* battle_menu_DoNothingHudScripts[] = { HudScript_MenuDoNothing, HudScript_MenuDoNothingDisabled }; -HudElementAnim* battle_menu_FleeHudScripts[] = { HudScript_MenuFlee, HudScript_MenuFleeDisabled }; +HudScript* battle_menu_FleeHudScripts[] = { HudScript_MenuFlee, HudScript_MenuFleeDisabled }; // Jump, Hammer, Items, RunAway, Defense s32 battle_menu_leftJustfiedMessagesA[] = { 0x001D0039, 0x001D0038, 0x001D003F, 0x001D003B, 0x001D0044 }; @@ -223,7 +223,7 @@ s32 D_802AB520[] = { 0x00000000, 0x00090012, 0x000A001A, 0x000B001C, 0x000C0017, s32 D_802AB558[] = { 0x00000000, 0x00090002, 0x000A0005, 0x000B0006, 0x000C0002, 0x009D0002, 0x000E0002, 0x000F0002, 0x00100002, 0x000D0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; -HudElementAnim* battle_menu_PartnerMoveHudScripts[] = { +HudScript* battle_menu_PartnerMoveHudScripts[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, HudScript_Goombario, HudScript_GoombarioDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, HudScript_Kooper, HudScript_KooperDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, @@ -235,12 +235,12 @@ HudElementAnim* battle_menu_PartnerMoveHudScripts[] = { HudScript_Lakilester, HudScript_LakilesterDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled, HudScript_Bow, HudScript_BowDisabled, HudScript_MoveDiamond, HudScript_MoveDiamondDisabled, HudScript_MoveBlueOrb, HudScript_MoveBlueOrbDisabled, HudScript_MoveGreenOrb, HudScript_MoveGreenOrbDisabled, HudScript_MoveRedOrb, HudScript_MoveRedOrbDisabled }; -HudElementAnim* battle_menu_PeachStarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; +HudScript* battle_menu_PeachStarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; // Focus s32 D_802AB728[] = { 0x001D0055 }; -HudElementAnim* battle_menu_TwinkStarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; +HudScript* battle_menu_TwinkStarPowerHudScripts[] = { HudScript_MenuStarPower, HudScript_MenuStarPowerDisabled }; // Dash s32 D_802AB734[] = { 0x001D0057 }; diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 121ca9c35c..9f00ebd867 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -4,15 +4,15 @@ extern s32 TimesHudScript; extern s32 DigitHudScripts[10]; -extern HudElementAnim HudScript_StatusHP[]; -extern HudElementAnim HudScript_StatusHeart[]; -extern HudElementAnim HudScript_StatusFP[]; -extern HudElementAnim HudScript_StatusFlower[]; -extern HudElementAnim HudScript_Item_CoinSparkleRandom[]; -extern HudElementAnim HudScript_StatusStarPoint[]; -extern HudElementAnim HudScript_StatusStar1[]; -extern HudElementAnim HudScript_StatusTimes[]; -extern HudElementAnim HudScript_StatusSPShine[]; +extern HudScript HudScript_StatusHP[]; +extern HudScript HudScript_StatusHeart[]; +extern HudScript HudScript_StatusFP[]; +extern HudScript HudScript_StatusFlower[]; +extern HudScript HudScript_Item_CoinSparkleRandom[]; +extern HudScript HudScript_StatusStarPoint[]; +extern HudScript HudScript_StatusStar1[]; +extern HudScript HudScript_StatusTimes[]; +extern HudScript HudScript_StatusSPShine[]; void clear_player_data(void) { PlayerData* playerData = &gPlayerData; @@ -154,7 +154,7 @@ s32 get_item_empty_count(void) { /// @returns the index of the given item in the player's inventory, or -1 if not found s32 find_item(s32 itemID) { PlayerData* playerData = &gPlayerData; - StaticItem* item = &gItemTable[itemID]; + ItemData* item = &gItemTable[itemID]; s32 i; if ((item->typeFlags & 8) != 0) { @@ -205,7 +205,7 @@ void sort_items(void) { s32 add_badge(s32 itemID) { PlayerData* playerData = &gPlayerData; - StaticItem* item = &gItemTable[itemID]; + ItemData* item = &gItemTable[itemID]; s32 i; if ((item->typeFlags & 0x40) == 0) { diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 1c059761e2..4bd53f546c 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -1,18 +1,18 @@ #include "common.h" #include "hud_element.h" -extern HudElementAnim HudScript_HandPointer[0]; -extern HudElementAnim HudScript_StatusStarPiece[0]; -extern HudElementAnim HudScript_GreenArrowDown[0]; -extern HudElementAnim HudScript_GreenArrowUp[0]; -extern HudElementAnim HudScript_EmptyBar[0]; -extern HudElementAnim HudScript_PartnerRank1A; -extern HudElementAnim HudScript_PartnerRank1B; -extern HudElementAnim HudScript_PartnerRank2A; -extern HudElementAnim HudScript_PartnerRank2B; +extern HudScript HudScript_HandPointer[0]; +extern HudScript HudScript_StatusStarPiece[0]; +extern HudScript HudScript_GreenArrowDown[0]; +extern HudScript HudScript_GreenArrowUp[0]; +extern HudScript HudScript_EmptyBar[0]; +extern HudScript HudScript_PartnerRank1A; +extern HudScript HudScript_PartnerRank1B; +extern HudScript HudScript_PartnerRank2A; +extern HudScript HudScript_PartnerRank2B; -HudElementAnim* D_80109890[] = { &HudScript_PartnerRank1A, &HudScript_PartnerRank2A }; -HudElementAnim* D_80109898[] = { &HudScript_PartnerRank1B, &HudScript_PartnerRank2B }; +HudScript* D_80109890[] = { &HudScript_PartnerRank1A, &HudScript_PartnerRank2A }; +HudScript* D_80109898[] = { &HudScript_PartnerRank1B, &HudScript_PartnerRank2B }; s16 D_801098A0[] = { 0x008C, 0x008C, 0x008D, 0x007C, 0x0086, 0x0077, 0x008D, 0x008D, 0x006C, 0x008D, 0x0084, 0x0084, 0x008D, 0x008C, }; diff --git a/src/ECAA80.c b/src/ECAA80.c index 028f1ce209..b2667397aa 100644 --- a/src/ECAA80.c +++ b/src/ECAA80.c @@ -180,7 +180,7 @@ ApiStatus func_80241AC4_ECB7C4(Evt* script, s32 isInitialCall) { ApiStatus func_80241B88_ECB888(Evt* script, s32 isInitialCall) { s32 itemId = evt_get_variable(script, *script->ptrReadPos); - StaticItem* item = &gItemTable[itemId]; + ItemData* item = &gItemTable[itemId]; if (itemId == ITEM_YUMMY_MEAL) { script->varTable[9] = 2; diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 1fe3009213..b69fd88c62 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -965,11 +965,11 @@ extern s32 D_80151324; extern s32 D_8015132C; extern s32 D_80151330; -extern s32 wStaticEntityDataSize; -extern s32 bStaticEntityDataSize; +extern s32 wEntityBlueprintSize; +extern s32 bEntityBlueprintSize; -extern StaticEntityData* wStaticEntityData[30]; -extern StaticEntityData* bStaticEntityData[4]; +extern EntityBlueprint* wEntityBlueprint[30]; +extern EntityBlueprint* bEntityBlueprint[4]; extern s32* D_801516F4; @@ -1031,7 +1031,7 @@ void delete_entity(s32 entityIndex); void delete_entity_and_unload_data(s32 entityIndex); void _delete_shadow(s32 shadowIndex); s32 entity_get_collision_flags(Entity* entity); -void entity_free_static_data(StaticEntityData* data); +void entity_free_static_data(EntityBlueprint* data); void update_entity_shadow_position(Entity* entity); s32 entity_raycast_down(f32* x, f32* y, f32* z, f32* hitYaw, f32* hitPitch, f32* hitLength); void load_model_transforms(ModelNode* model, ModelNode* parent, Matrix4f mdlTxMtx, s32 treeDepth); @@ -1084,7 +1084,7 @@ void update_entities(void) { entity->collisionFlags = entity_get_collision_flags(entity); if (entity->collisionFlags) { - EntityCallback entityCallback = entity->staticData->fpHandleCollision; + EntityCallback entityCallback = entity->blueprint->fpHandleCollision; if (entityCallback != NULL && entityCallback(entity) != 0) { entity->unk_07 = 0xA; @@ -1522,15 +1522,15 @@ u32 get_entity_type(s32 index) { if (entity == NULL) { return -1; } else { - return entity->staticData->entityType; + return entity->blueprint->entityType; } } void delete_entity(s32 entityIndex) { Entity* entity = get_entity_by_index(entityIndex); - if (entity->dataBuf != NULL) { - heap_free(entity->dataBuf); + if (entity->dataBuf.any != NULL) { + heap_free(entity->dataBuf.any); } if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { @@ -1552,8 +1552,8 @@ void delete_entity(s32 entityIndex) { void delete_entity_and_unload_data(s32 entityIndex) { Entity* entity = get_entity_by_index(entityIndex); - if (entity->dataBuf != NULL) { - heap_free(entity->dataBuf); + if (entity->dataBuf.any != NULL) { + heap_free(entity->dataBuf.any); } if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { @@ -1562,7 +1562,7 @@ void delete_entity_and_unload_data(s32 entityIndex) { delete_model_animator(get_animator_by_index(entity->virtualModelIndex)); } - entity_free_static_data(entity->staticData); + entity_free_static_data(entity->blueprint); if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); @@ -1696,7 +1696,7 @@ void func_80110E58(void) { s32 i; for (i = 0; i < 4; i++) { - bStaticEntityData[i] = 0; + bEntityBlueprint[i] = 0; } D_80151300 = &D_801A7000; gEntityHeapBase = D_80151300 + 0x3000; @@ -1709,13 +1709,13 @@ void func_80110E58(void) { INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80110F10); -void entity_anim_make_vertex_pointers(StaticEntityData* entityData, void* baseAddr, Vtx* baseVtx); +void entity_anim_make_vertex_pointers(EntityBlueprint* entityData, void* baseAddr, Vtx* baseVtx); INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_anim_make_vertex_pointers); -s32 is_entity_data_loaded(Entity* entity, StaticEntityData* entityData, s32* loadedStart, s32* loadedEnd); +s32 is_entity_data_loaded(Entity* entity, EntityBlueprint* entityData, s32* loadedStart, s32* loadedEnd); INCLUDE_ASM(s32, "a5dd0_len_114e0", is_entity_data_loaded); -void load_simple_entity_data(Entity* entity, StaticEntityData* entityData) { +void load_simple_entity_data(Entity* entity, EntityBlueprint* entityData) { s32 loadedStart; s32 loadedEnd; s32 entitySize; @@ -1724,9 +1724,9 @@ void load_simple_entity_data(Entity* entity, StaticEntityData* entityData) { entity->vertexSegment = 10; if (!gGameStatusPtr->isBattle) { - sizeTemp = wStaticEntityDataSize; + sizeTemp = wEntityBlueprintSize; } else { - sizeTemp = bStaticEntityDataSize; + sizeTemp = bEntityBlueprintSize; } if (is_entity_data_loaded(entity, entityData, &loadedStart, &loadedEnd)) { @@ -1747,9 +1747,9 @@ void load_simple_entity_data(Entity* entity, StaticEntityData* entityData) { } if (!gGameStatusPtr->isBattle) { - wStaticEntityDataSize = sizeTemp; + wEntityBlueprintSize = sizeTemp; } else { - bStaticEntityDataSize = sizeTemp; + bEntityBlueprintSize = sizeTemp; } } @@ -1761,8 +1761,8 @@ s32 func_80111790(void) { for (i = 0; i < ARRAY_COUNT(*gCurrentEntityListPtr); i++) { Entity* entity = (*gCurrentEntityListPtr)[i]; - if (entity != NULL && entity->staticData->dmaStart != NULL) { - if (entity->staticData->dmaStart == entity->staticData) { + if (entity != NULL && entity->blueprint->dmaStart != NULL) { + if (entity->blueprint->dmaStart == entity->blueprint) { return TRUE; } } @@ -1770,12 +1770,12 @@ s32 func_80111790(void) { return FALSE; } -INCLUDE_ASM(void, "a5dd0_len_114e0", entity_free_static_data, StaticEntityData* data); +INCLUDE_ASM(void, "a5dd0_len_114e0", entity_free_static_data, EntityBlueprint* data); -INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity, StaticEntityData* data, s32 x, s32 y, s32 z, s32 arg4, +INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity, EntityBlueprint* data, s32 x, s32 y, s32 z, s32 arg4, ...); -s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) { +s32 create_shadow_from_data(ShadowBlueprint* data, f32 x, f32 y, f32 z) { Shadow* shadow; s32 i; @@ -1818,7 +1818,7 @@ s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) { s32 MakeEntity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - StaticEntityData* entityData; + EntityBlueprint* entityData; s32 x, y, z; s32 flags; s32 temp_v0; @@ -1830,8 +1830,8 @@ s32 MakeEntity(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - entityData = (StaticEntityData*)evt_get_variable(script, *args++); - temp = &D_8015C7D0[2]; + entityData = (EntityBlueprint*)evt_get_variable(script, *args++); + temp = &CreateEntityVarArgBuffer[2]; t80000000 = 0x80000000; x = evt_get_variable(script, *args++); y = evt_get_variable(script, *args++); @@ -1850,7 +1850,7 @@ s32 MakeEntity(Evt* script, s32 isInitialCall) { } } while (temp_v0 != t80000000); - entityIndex = create_entity(entityData, x, y, z, flags, D_8015C7D0[0], D_8015C7D0[1], D_8015C7D0[2], t80000000); + entityIndex = create_entity(entityData, x, y, z, flags, CreateEntityVarArgBuffer[0], CreateEntityVarArgBuffer[1], CreateEntityVarArgBuffer[2], t80000000); gLastCreatedEntityIndex = entityIndex; script->varTable[0] = entityIndex; return ApiStatus_DONE2; @@ -1912,7 +1912,7 @@ ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(gLastCreatedEntityIndex); // TODO find proper struct for the dataBuf - ((s16*)(entity->dataBuf))[16] = temp_s0; + ((s16*)(entity->dataBuf.unk))[16] = temp_s0; if (get_area_flag(temp_s0) != 0) { entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; } @@ -1926,23 +1926,23 @@ ApiStatus AssignBlockFlag(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall == TRUE) { - s32 temp_s0 = evt_get_variable_index(script, *args++); - Entity* entity = get_entity_by_index(gLastCreatedEntityIndex); + s32 index = evt_get_variable_index(script, *args++); + + BlockData* data = get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.block; + data->gameFlagIndex = index; - // TODO find proper struct for the dataBuf - ((s16*)(entity->dataBuf))[5] = temp_s0; return ApiStatus_DONE2; } return ApiStatus_DONE1; } -ApiStatus AssignFlag(Evt* script, s32 isInitialCall) { +ApiStatus AssignChestFlag(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall == TRUE) { - Trigger* trigger = (Trigger*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf; - trigger->flags.bytes.genericFlagIndex = evt_get_variable_index(script, *args); + ChestData* data = get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.chest; + data->gameFlagIndex = evt_get_variable_index(script, *args); return ApiStatus_DONE2; } @@ -1955,7 +1955,7 @@ ApiStatus AssignPanelFlag(Evt* script, s32 isInitialCall) { if (isInitialCall == TRUE) { // TODO find proper struct for the dataBuf - s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf; + s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.unk; dataBuf[3] = evt_get_variable_index(script, *args++); return ApiStatus_DONE2; @@ -1969,7 +1969,7 @@ ApiStatus AssignCrateFlag(Evt* script, s32 isInitialCall) { if (isInitialCall == TRUE) { // TODO find proper struct for the dataBuf - s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf; + s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.unk; dataBuf[2] = evt_get_variable_index(script, *args++); return ApiStatus_DONE2; @@ -1979,7 +1979,7 @@ ApiStatus AssignCrateFlag(Evt* script, s32 isInitialCall) { } s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { - u16 staticFlags = entity->staticData->flags; + u16 staticFlags = entity->blueprint->flags; s32 type; s16 shadowIndex; @@ -2003,7 +2003,7 @@ s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { s32 create_shadow_type(s32 type, f32 x, f32 y, f32 z) { s32 setFlag200 = FALSE; - StaticShadowData* data = &CircularShadowA; + ShadowBlueprint* data = &CircularShadowA; s32 shadowIndex; switch (type) { diff --git a/src/actor_api.c b/src/actor_api.c index 76bae945b9..1f1f8ff699 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -1912,12 +1912,12 @@ ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - actor->healthBarPosition.x = actor->homePos.x + actor->staticActorData->hpBarOffset.x; - actor->healthBarPosition.y = actor->homePos.y + actor->staticActorData->hpBarOffset.y; + actor->healthBarPosition.x = actor->homePos.x + actor->actorBlueprint->hpBarOffset.x; + actor->healthBarPosition.y = actor->homePos.y + actor->actorBlueprint->hpBarOffset.y; actor->healthBarPosition.z = actor->homePos.z; if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { - actor->healthBarPosition.y = actor->homePos.y - actor->size.y - actor->staticActorData->hpBarOffset.y; + actor->healthBarPosition.y = actor->homePos.y - actor->size.y - actor->actorBlueprint->hpBarOffset.y; } actor->hpFraction = (actor->currentHP * 25) / actor->maxHP; @@ -1935,12 +1935,12 @@ ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - actor->healthBarPosition.x = actor->currentPos.x + actor->staticActorData->hpBarOffset.x; - actor->healthBarPosition.y = actor->currentPos.y + actor->staticActorData->hpBarOffset.y; + actor->healthBarPosition.x = actor->currentPos.x + actor->actorBlueprint->hpBarOffset.x; + actor->healthBarPosition.y = actor->currentPos.y + actor->actorBlueprint->hpBarOffset.y; actor->healthBarPosition.z = actor->currentPos.z; if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { - actor->healthBarPosition.y = actor->currentPos.y - actor->size.y - actor->staticActorData->hpBarOffset.y; + actor->healthBarPosition.y = actor->currentPos.y - actor->size.y - actor->actorBlueprint->hpBarOffset.y; } actor->hpFraction = (actor->currentHP * 25) / actor->maxHP; @@ -1978,8 +1978,8 @@ ApiStatus func_8026D940(Evt* script, s32 isInitialCall) { actor->unk_198.x = x; actor->unk_198.y = y; - actor->healthBarPosition.x = actor->homePos.x + actor->staticActorData->hpBarOffset.x + actor->unk_198.x; - actor->healthBarPosition.y = actor->homePos.y + actor->staticActorData->hpBarOffset.y + actor->unk_198.y; + actor->healthBarPosition.x = actor->homePos.x + actor->actorBlueprint->hpBarOffset.x + actor->unk_198.x; + actor->healthBarPosition.y = actor->homePos.y + actor->actorBlueprint->hpBarOffset.y + actor->unk_198.y; actor->healthBarPosition.z = actor->homePos.z; if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index a0b3a2695b..f18feeebe7 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -5,9 +5,9 @@ extern s32 D_80294280; extern s32 D_802A9620; -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_AButton; -extern HudElementAnim HudScript_RunAwayOK; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_AButton; +extern HudScript HudScript_RunAwayOK; s32 func_8024FAFC(s32); diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index eaf10fc479..c28ee2e15d 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -5,9 +5,9 @@ extern s32 D_802942E0; extern s32 HudScript_MashAButton; -extern HudElementAnim HudScript_100pct; -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_AButton; +extern HudScript HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_AButton; ApiStatus func_802A9000_4273B0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 38d21dd095..c33505f183 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -7,9 +7,9 @@ void func_80268834(s32, s32, s16, s32); -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_AButton; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_AButton; +extern HudScript HudScript_100pct; extern s32 D_80294340; BSS s32 air_lift_bss_0; diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index fa3e05435f..266df5e813 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -3,9 +3,9 @@ #define NAMESPACE action_command_air_raid -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_StickNeutral; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_StickNeutral; +extern HudScript HudScript_100pct; extern s32 D_80294360; diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index ae5abcdf21..d7f1ad83d1 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -3,10 +3,10 @@ #define NAMESPACE action_command_body_slam -extern HudElementAnim HudScript_BlueMeter[]; -extern HudElementAnim HudScript_AButton[]; -extern HudElementAnim HudScript_TimingWait[]; -extern HudElementAnim HudScript_FillGaugeResult[]; +extern HudScript HudScript_BlueMeter[]; +extern HudScript HudScript_AButton[]; +extern HudScript HudScript_TimingWait[]; +extern HudScript HudScript_FillGaugeResult[]; extern s32 D_80294320; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index 7b6fd24bd5..d673490626 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -5,12 +5,12 @@ void sfx_adjust_env_sound_params(s32, s32, s32, s32); -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_AButton; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_AButton; +extern HudScript HudScript_100pct; extern s32 D_80294300; -extern HudElementAnim HudScript_MashAButton; +extern HudScript HudScript_MashAButton; typedef struct UnkVec2s { /* 0x00 */ s16 unk_0; diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 495724c6dc..f8981890c8 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -4,10 +4,10 @@ #define NAMESPACE action_command_break_free extern s32 D_80294220; -extern HudElementAnim HudScript_AButton; -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_RunningAway; -extern HudElementAnim HudScript_RunAwayOK; +extern HudScript HudScript_AButton; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_RunningAway; +extern HudScript HudScript_RunAwayOK; ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 7836f687cd..0f1f872b12 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -4,9 +4,9 @@ #define NAMESPACE action_command_dizzy_shell extern s32 D_802942A0; -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_AButton; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_AButton; +extern HudScript HudScript_100pct; ApiStatus func_802A9000_426170(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index a15abe2862..9baa3e647e 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -4,9 +4,9 @@ #define NAMESPACE action_command_fire_shell extern s32 D_802942C0; -extern HudElementAnim HudScript_StickNeutral; -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_StickNeutral; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_100pct; ApiStatus func_802A9000_4269D0(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index a39e31fc4e..546119a3f1 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -3,14 +3,14 @@ #define NAMESPACE action_command_flee -extern HudElementAnim HudScript_BlueMeter[]; -extern HudElementAnim HudScript_AButton[]; -extern HudElementAnim HudScript_RunAwayOK[]; -extern HudElementAnim HudScript_RunningAway[]; -extern HudElementAnim HudScript_100pct[]; +extern HudScript HudScript_BlueMeter[]; +extern HudScript HudScript_AButton[]; +extern HudScript HudScript_RunAwayOK[]; +extern HudScript HudScript_RunningAway[]; +extern HudScript HudScript_100pct[]; extern s32 D_80294200; extern s32 D_802A9920; -extern HudElementAnim HudScript_MashAButton[]; +extern HudScript HudScript_MashAButton[]; ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 9fced2956e..2e4ff527c7 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -4,13 +4,13 @@ #define NAMESPACE action_command_hammer // icon indexes for hud elements -extern HudElementAnim HudScript_TimingBar1Chance[]; -extern HudElementAnim HudScript_TimingWait[]; -extern HudElementAnim HudScript_TimingCharge4a[]; -extern HudElementAnim HudScript_TimingCharge4b[]; -extern HudElementAnim HudScript_TimingCharge4c[]; -extern HudElementAnim HudScript_StickHoldLeft[]; -extern HudElementAnim HudScript_RightOn[]; +extern HudScript HudScript_TimingBar1Chance[]; +extern HudScript HudScript_TimingWait[]; +extern HudScript HudScript_TimingCharge4a[]; +extern HudScript HudScript_TimingCharge4b[]; +extern HudScript HudScript_TimingCharge4c[]; +extern HudScript HudScript_StickHoldLeft[]; +extern HudScript HudScript_RightOn[]; extern s32 D_802941E0; diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 733560e30c..047ef9dfa7 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -4,10 +4,10 @@ #define NAMESPACE action_command_hurricane extern s32 D_80294420; -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_AButton; -extern HudElementAnim HudScript_BButton; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_AButton; +extern HudScript HudScript_BButton; +extern HudScript HudScript_100pct; ApiStatus func_802A9000_42F6E0(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 40d24c93b9..c0b857b275 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -6,9 +6,9 @@ extern s32 D_802941C0; // icon IDs for hud elements -extern HudElementAnim HudScript_AButton[]; -extern HudElementAnim HudScript_RightOn[]; -extern HudElementAnim HudScript_AButtonDown[]; +extern HudScript HudScript_AButton[]; +extern HudScript HudScript_RightOn[]; +extern HudScript HudScript_AButtonDown[]; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { s32 hudElement; diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 0af2e1c8b4..58274b76f6 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -3,14 +3,14 @@ #define NAMESPACE action_command_mega_shock -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_AButton; -extern HudElementAnim HudScript_BButton; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_AButton; +extern HudScript HudScript_BButton; +extern HudScript HudScript_100pct; extern s32 D_802943C0; -extern HudElementAnim HudScript_MashAButton; -extern HudElementAnim HudScript_MashBButton1; +extern HudScript HudScript_MashAButton; +extern HudScript HudScript_MashBButton1; void sfx_adjust_env_sound_params(s32, s32, s32, s32); diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 5d622e263c..5154d3c29e 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -3,11 +3,11 @@ #define NAMESPACE action_command_power_shock -extern const HudElementAnim HudScript_BlueMeter[]; -extern const HudElementAnim HudScript_AButton[]; -extern const HudElementAnim HudScript_MashAButton[]; -extern const HudElementAnim HudScript_RunAwayOK[]; -extern const HudElementAnim HudScript_100pct[]; +extern const HudScript HudScript_BlueMeter[]; +extern const HudScript HudScript_AButton[]; +extern const HudScript HudScript_MashAButton[]; +extern const HudScript HudScript_RunAwayOK[]; +extern const HudScript HudScript_100pct[]; extern s32 D_802943A0[]; extern s16 D_802A9AA2_42D9B2[]; extern s32 D_802A9B00; diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index aa684f9fb5..933f9f98f0 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -6,10 +6,10 @@ void sfx_adjust_env_sound_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift); -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_StickNeutral; -extern HudElementAnim HudScript_100pct; -extern HudElementAnim HudScript_StickMashLeft; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_StickNeutral; +extern HudScript HudScript_100pct; +extern HudScript HudScript_StickMashLeft; extern s32 D_802943E0; typedef struct UnkVec2s { @@ -196,7 +196,7 @@ void func_802A9298_42E638(void) { battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); - switch (partnerActor->staticActorData->level) { + switch (partnerActor->actorBlueprint->level) { case 0: if (battleStatus->unk_84 >= D_802A99E4_42ED84[battleStatus->unk_85]) { battleStatus->unk_85++; diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index c3a4d0fd98..504a8d5720 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -4,9 +4,9 @@ #define NAMESPACE action_command_spiny_surge extern s32 D_80294400; -extern HudElementAnim HudScript_BlueMeter; -extern HudElementAnim HudScript_StickNeutral; -extern HudElementAnim HudScript_100pct; +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_StickNeutral; +extern HudScript HudScript_100pct; ApiStatus func_802A9000_42EE20(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 502964e0af..d649f33772 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -3,9 +3,9 @@ #define NAMESPACE action_command_spook -extern HudElementAnim HudScript_BlueMeter[]; -extern HudElementAnim HudScript_StickNeutral[]; -extern HudElementAnim HudScript_100pct[]; +extern HudScript HudScript_BlueMeter[]; +extern HudScript HudScript_StickNeutral[]; +extern HudScript HudScript_100pct[]; extern s32 D_80294440; ApiStatus func_802A9000_430020(void) { diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 2f34780d5b..766ed2f06b 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -3,8 +3,8 @@ #define NAMESPACE action_command_squirt -extern HudElementAnim HudScript_BlueMeter[]; -extern HudElementAnim HudScript_AButton[]; +extern HudScript HudScript_BlueMeter[]; +extern HudScript HudScript_AButton[]; extern s32 D_80294380; ApiStatus func_802A9000_429D20(void) { diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index bd24d55066..2fac2885e6 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -3,9 +3,9 @@ #define NAMESPACE action_command_stop_leech -extern HudElementAnim HudScript_MashAButton[]; -extern HudElementAnim HudScript_BlueMeter[]; -extern HudElementAnim HudScript_AButton[]; +extern HudScript HudScript_MashAButton[]; +extern HudScript HudScript_BlueMeter[]; +extern HudScript HudScript_AButton[]; extern s32 D_80294260; ApiStatus func_802A9000_425590(void) { diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index dfce2701e1..4cf97679e0 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -3,12 +3,12 @@ #define NAMESPACE action_command_tidal_wave -extern HudElementAnim HudScript_BlueMeter[]; -extern HudElementAnim HudScript_AButton[]; +extern HudScript HudScript_BlueMeter[]; +extern HudScript HudScript_AButton[]; extern s32 D_802944A0; -extern HudElementAnim* D_802A97C0_42CEB0[]; -extern HudElementAnim* D_802A97CC_42CEBC[]; +extern HudScript* D_802A97C0_42CEB0[]; +extern HudScript* D_802A97CC_42CEBC[]; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index afa2abaab6..d41f756d71 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -35,7 +35,7 @@ ApiStatus func_802A9398_42A888(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "battle/action_cmd/water_block", func_802A948C_42A97C); -extern HudElementAnim* D_802AB180_42C670[]; +extern HudScript* D_802AB180_42C670[]; void func_802AA014_42B504(void) { s32 hudElement; diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index fabb927a6f..2643a0252b 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -70,8 +70,8 @@ INCLUDE_ASM(s32, "battle/action_cmd/whirlwind", func_802A91E0_423E50); INCLUDE_ASM(s32, "battle/action_cmd/whirlwind", func_802A92F0_423F60); // hud element scripts -extern HudElementAnim* D_802AA888_4254F8[]; -extern HudElementAnim* D_802AA8A0_425510[]; +extern HudScript* D_802AA888_4254F8[]; +extern HudScript* D_802AA8A0_425510[]; void func_802A9744_4243B4(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/area_hos/actor/ember.c b/src/battle/area_hos/actor/ember.c index 724db71ff5..1bdbb0e818 100644 --- a/src/battle/area_hos/actor/ember.c +++ b/src/battle/area_hos/actor/ember.c @@ -41,7 +41,7 @@ s32 N(statusTable_8021ACD4)[] = { extern s32 N(idleAnimations_8021AE5C)[]; extern s32 N(idleAnimations_8021AEA8)[]; -ActorPartDesc N(partsTable_8021AD80)[] = { +ActorPartBlueprint N(partsTable_8021AD80)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -104,9 +104,9 @@ ActorPartDesc N(partsTable_8021AD80)[] = { }, }; -extern EvtSource N(init_8021AEB4); +extern EvtScript N(init_8021AEB4); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_EMBER, .level = 24, @@ -147,11 +147,11 @@ s32 N(idleAnimations_8021AEA8)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021D284); -extern EvtSource N(idle_8021B07C); -extern EvtSource N(handleEvent_8021B8BC); +extern EvtScript N(takeTurn_8021D284); +extern EvtScript N(idle_8021B07C); +extern EvtScript N(handleEvent_8021B8BC); -EvtSource N(init_8021AEB4) = { +EvtScript N(init_8021AEB4) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021D284))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021B07C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021B8BC))) @@ -176,7 +176,7 @@ EvtSource N(init_8021AEB4) = { EVT_END }; -EvtSource N(idle_8021B07C) = { +EvtScript N(idle_8021B07C) = { EVT_LABEL(0) EVT_CALL(MakeLerp, 0, 10, 25, 10) EVT_LABEL(1) @@ -223,7 +223,7 @@ EvtSource N(idle_8021B07C) = { #include "common/UnkSfxFunc.inc.c" -EvtSource N(8021B2FC) = { +EvtScript N(8021B2FC) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_bubble_Palette_01_Anim_3) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -236,7 +236,7 @@ EvtSource N(8021B2FC) = { EVT_END }; -EvtSource N(8021B398) = { +EvtScript N(8021B398) = { EVT_CALL(EnemyCreateTargetList, 32770) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -284,7 +284,7 @@ Formation N(specialFormation_8021B5A0) = { { .actor = &NAMESPACE, .home = { .vec = &N(vector3D_8021B594) }}, }; -EvtSource N(split) = { +EvtScript N(split) = { EVT_CALL(GetLastDamage, -127, LW(0)) EVT_IF_EQ(LW(0), 0) EVT_RETURN @@ -335,7 +335,7 @@ EvtSource N(split) = { EVT_END }; -EvtSource N(handleEvent_8021B8BC) = { +EvtScript N(handleEvent_8021B8BC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -443,7 +443,7 @@ EvtSource N(handleEvent_8021B8BC) = { EVT_END }; -EvtSource N(8021BE64) = { +EvtScript N(8021BE64) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -526,7 +526,7 @@ EvtSource N(8021BE64) = { EVT_END }; -EvtSource N(8021C454) = { +EvtScript N(8021C454) = { EVT_SET(LW(6), 2) EVT_LOOP(4) EVT_THREAD @@ -551,7 +551,7 @@ EvtSource N(8021C454) = { EVT_END }; -EvtSource N(8021C5F8) = { +EvtScript N(8021C5F8) = { EVT_EXEC(N(8021C454)) EVT_CALL(GetDistanceToGoal, -127, LW(0)) EVT_DIVF(LW(0), EVT_FLOAT(8.0)) @@ -561,7 +561,7 @@ EvtSource N(8021C5F8) = { EVT_END }; -EvtSource N(8021C654) = { +EvtScript N(8021C654) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) @@ -645,7 +645,7 @@ EvtSource N(8021C654) = { EVT_END }; -EvtSource N(8021CBC8) = { +EvtScript N(8021CBC8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -737,7 +737,7 @@ EvtSource N(8021CBC8) = { EVT_END }; -EvtSource N(takeTurn_8021D284) = { +EvtScript N(takeTurn_8021D284) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_CALL(GetActorVar, -127, 0, LW(0)) diff --git a/src/battle/area_hos/actor/goombario_tutor.c b/src/battle/area_hos/actor/goombario_tutor.c index 39d2f78de7..d9940cd435 100644 --- a/src/battle/area_hos/actor/goombario_tutor.c +++ b/src/battle/area_hos/actor/goombario_tutor.c @@ -49,7 +49,7 @@ s32 N(statusTable_80219068)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80219114)[] = { +ActorPartBlueprint N(partsTable_80219114)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -64,9 +64,9 @@ ActorPartDesc N(partsTable_80219114)[] = { }, }; -extern EvtSource N(init_80219160); +extern EvtScript N(init_80219160); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_40000, .type = ACTOR_TYPE_GOOMBARIO_TUTOR1, .level = 99, @@ -89,12 +89,12 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_80219444); -extern EvtSource N(idle_802191D0); -extern EvtSource N(handleEvent_802191E0); -extern EvtSource N(80219C74); +extern EvtScript N(takeTurn_80219444); +extern EvtScript N(idle_802191D0); +extern EvtScript N(handleEvent_802191E0); +extern EvtScript N(80219C74); -EvtSource N(init_80219160) = { +EvtScript N(init_80219160) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80219444))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_802191D0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_802191E0))) @@ -104,12 +104,12 @@ EvtSource N(init_80219160) = { EVT_END }; -EvtSource N(idle_802191D0) = { +EvtScript N(idle_802191D0) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_802191E0) = { +EvtScript N(handleEvent_802191E0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_THREAD EVT_CALL(func_8026BF48, 1) @@ -156,7 +156,7 @@ EvtSource N(handleEvent_802191E0) = { EVT_END }; -EvtSource N(takeTurn_80219444) = { +EvtScript N(takeTurn_80219444) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -281,7 +281,7 @@ ApiStatus func_80218000_47F0B0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(80219C74) = { +EvtScript N(80219C74) = { EVT_CALL(SetBattleFlagBits, 33554432, 1) EVT_CALL(func_802535B4, 0) EVT_CALL(WaitForState, 13) diff --git a/src/battle/area_hos/actor/magikoopa.c b/src/battle/area_hos/actor/magikoopa.c index 2be528168a..4eeeb94b85 100644 --- a/src/battle/area_hos/actor/magikoopa.c +++ b/src/battle/area_hos/actor/magikoopa.c @@ -68,7 +68,7 @@ s32 N(statusTable_8021D544)[] = { extern s32 N(idleAnimations_8021D6D0)[]; -ActorPartDesc N(partsTable_8021D5F0)[] = { +ActorPartBlueprint N(partsTable_8021D5F0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -86,7 +86,7 @@ ActorPartDesc N(partsTable_8021D5F0)[] = { extern s32 N(idleAnimations_8021D71C)[]; extern s32 N(idleAnimations_8021D768)[]; -ActorPartDesc N(partsTable_8021D614)[] = { +ActorPartBlueprint N(partsTable_8021D614)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -125,9 +125,9 @@ ActorPartDesc N(partsTable_8021D614)[] = { }, }; -extern EvtSource N(init_8021E100); +extern EvtScript N(init_8021E100); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_MAGIKOOPA_BOSS, .level = 32, @@ -150,9 +150,9 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(init_8021E2C0); +extern EvtScript N(init_8021E2C0); -ActorDesc N(flying) = { +ActorBlueprint N(flying) = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_FLYING_MAGIKOOPA_BOSS, .level = 32, @@ -206,7 +206,7 @@ s32 N(idleAnimations_8021D768)[] = { STATUS_END, }; -EvtSource N(idle_8021D774) = { +EvtScript N(idle_8021D774) = { EVT_RETURN EVT_END }; @@ -215,7 +215,7 @@ EvtSource N(idle_8021D774) = { #include "common/GetSelectedMoveID.inc.c" -EvtSource N(8021D784) = { +EvtScript N(8021D784) = { EVT_CALL(GetBattleFlags, LW(0)) EVT_IF_NOT_FLAG(LW(0), 0x80000) EVT_IF_FLAG(LW(0), 0x240) @@ -243,9 +243,9 @@ EvtSource N(8021D784) = { #include "common/StartRumbleWithParams.inc.c" -extern EvtSource N(handleEvent_8021E6D8); +extern EvtScript N(handleEvent_8021E6D8); -EvtSource N(8021D890) = { +EvtScript N(8021D890) = { EVT_CALL(GetActorVar, -127, 2, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_magikoopa_Palette_00_Anim_4) @@ -321,7 +321,7 @@ EvtSource N(8021D890) = { EVT_END }; -EvtSource N(runAway) = { +EvtScript N(runAway) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(func_8027D32C, -127) @@ -355,7 +355,7 @@ EvtSource N(runAway) = { EVT_END }; -EvtSource N(nextTurn_8021E0B0) = { +EvtScript N(nextTurn_8021E0B0) = { EVT_CALL(GetActorVar, -127, 0, LW(0)) EVT_BITWISE_AND_CONST(LW(0), -2) // TODO EVT_CALL(SetActorVar, -127, 0, LW(0)) @@ -363,9 +363,9 @@ EvtSource N(nextTurn_8021E0B0) = { EVT_END }; -extern EvtSource N(takeTurn_80223B24); +extern EvtScript N(takeTurn_80223B24); -EvtSource N(init_8021E100) = { +EvtScript N(init_8021E100) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021D774))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80223B24))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021E6D8))) @@ -390,9 +390,9 @@ EvtSource N(init_8021E100) = { EVT_END }; -extern EvtSource N(handleEvent_8021EDF0); +extern EvtScript N(handleEvent_8021EDF0); -EvtSource N(init_8021E2C0) = { +EvtScript N(init_8021E2C0) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021D774))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80223B24))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021EDF0))) @@ -416,7 +416,7 @@ EvtSource N(init_8021E2C0) = { EVT_END }; -EvtSource N(8021E46C) = { +EvtScript N(8021E46C) = { EVT_CALL(GetActorVar, -127, 1, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_RETURN @@ -457,7 +457,7 @@ EvtSource N(8021E46C) = { EVT_END }; -EvtSource N(handleEvent_8021E6D8) = { +EvtScript N(handleEvent_8021E6D8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetPartAlpha, -127, 1, 255) @@ -584,7 +584,7 @@ EvtSource N(handleEvent_8021E6D8) = { EVT_END }; -EvtSource N(handleEvent_8021EDF0) = { +EvtScript N(handleEvent_8021EDF0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetPartAlpha, -127, 2, 255) @@ -733,7 +733,7 @@ EvtSource N(handleEvent_8021EDF0) = { EVT_END }; -EvtSource N(healOne) = { +EvtScript N(healOne) = { EVT_CALL(SetActorVar, -127, 10, 0) EVT_CALL(SetActorVar, -127, 11, 0) EVT_CALL(AddActorVar, -127, 4, 1) @@ -813,7 +813,7 @@ EvtSource N(healOne) = { EVT_END }; -EvtSource N(healAll) = { +EvtScript N(healAll) = { EVT_CALL(SetActorVar, -127, 10, 0) EVT_CALL(SetActorVar, -127, 11, 1) EVT_CALL(AddActorVar, -127, 3, 1) @@ -912,7 +912,7 @@ EvtSource N(healAll) = { EVT_END }; -EvtSource N(shapeSpell) = { +EvtScript N(shapeSpell) = { EVT_CALL(SetActorVar, -127, 11, 2) EVT_SET(LF(0), 0) EVT_SET(LF(1), 0) @@ -1127,7 +1127,7 @@ EvtSource N(shapeSpell) = { EVT_END }; -EvtSource N(80221144) = { +EvtScript N(80221144) = { EVT_CALL(EnemyCreateTargetList, 32770) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -1185,19 +1185,19 @@ EvtSource N(80221144) = { EVT_END }; -EvtSource N(handleEvent_8022142C) = { +EvtScript N(handleEvent_8022142C) = { EVT_RETURN EVT_END }; -EvtSource N(init_8022143C) = { +EvtScript N(init_8022143C) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022142C))) EVT_CALL(SetActorVar, -127, 1, 1) EVT_RETURN EVT_END }; -EvtSource N(init_80221478) = { +EvtScript N(init_80221478) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022142C))) EVT_CALL(SetActorVar, -127, 1, 1) EVT_RETURN @@ -1264,7 +1264,7 @@ s32 N(statusTable_80221578)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80221624)[] = { +ActorPartBlueprint N(partsTable_80221624)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -1279,7 +1279,7 @@ ActorPartDesc N(partsTable_80221624)[] = { }, }; -ActorPartDesc N(partsTable_80221648)[] = { +ActorPartBlueprint N(partsTable_80221648)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -1294,7 +1294,7 @@ ActorPartDesc N(partsTable_80221648)[] = { }, }; -ActorDesc N(clone) = { +ActorBlueprint N(clone) = { .flags = ACTOR_FLAG_NO_ATTACK, .type = ACTOR_TYPE_MAGICLONE, .level = 26, @@ -1317,7 +1317,7 @@ ActorDesc N(clone) = { .statusMessageOffset = { 10, 32 }, }; -ActorDesc N(flying_clone) = { +ActorBlueprint N(flying_clone) = { .flags = ACTOR_FLAG_FLYING | ACTOR_FLAG_NO_ATTACK, .type = ACTOR_TYPE_FLYING_MAGICLONE, .level = 26, @@ -1350,7 +1350,7 @@ Formation N(specialFormation_802216E4) = { { .actor = &N(flying_clone), .home = { .vec = &N(vector3D_802216BC) }}, }; -EvtSource N(makeCopy) = { +EvtScript N(makeCopy) = { EVT_CALL(CountPlayerTargets, -127, 32770, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_EXEC_WAIT(N(runAway)) @@ -1447,7 +1447,7 @@ EvtSource N(makeCopy) = { #include "world/common/UnkFunc52.inc.c" -EvtSource N(boostAttack) = { +EvtScript N(boostAttack) = { EVT_SET(LF(0), 0) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, 32770) @@ -1559,7 +1559,7 @@ EvtSource N(boostAttack) = { EVT_END }; -EvtSource N(boostDefense) = { +EvtScript N(boostDefense) = { EVT_SET(LF(0), 0) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, 32770) @@ -1671,7 +1671,7 @@ EvtSource N(boostDefense) = { EVT_END }; -EvtSource N(electrify) = { +EvtScript N(electrify) = { EVT_SET(LF(0), 0) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, 32770) @@ -1788,7 +1788,7 @@ EvtSource N(electrify) = { EVT_END }; -EvtSource N(vanish) = { +EvtScript N(vanish) = { EVT_SET(LF(0), 0) EVT_LABEL(10) EVT_CALL(EnemyCreateTargetList, 32770) @@ -1900,7 +1900,7 @@ EvtSource N(vanish) = { EVT_END }; -EvtSource N(takeTurn_80223B24) = { +EvtScript N(takeTurn_80223B24) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_EXEC_WAIT(N(shapeSpell)) diff --git a/src/battle/area_hos/area.c b/src/battle/area_hos/area.c index 75ca669595..f799b44f98 100644 --- a/src/battle/area_hos/area.c +++ b/src/battle/area_hos/area.c @@ -3,9 +3,9 @@ #define NAMESPACE b_area_hos -extern ActorDesc N(goombario_tutor); -extern ActorDesc N(ember); -extern ActorDesc N(magikoopa_flying); +extern ActorBlueprint N(goombario_tutor); +extern ActorBlueprint N(ember); +extern ActorBlueprint N(magikoopa_flying); extern Stage N(hos_00); extern Stage N(hos_01); diff --git a/src/battle/area_hos/stage/hos_00.c b/src/battle/area_hos/stage/hos_00.c index 91e2fbc1f1..870f6aff5f 100644 --- a/src/battle/area_hos/stage/hos_00.c +++ b/src/battle/area_hos/stage/hos_00.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_hos_hos_00 -EvtSource N(802255E0) = { +EvtScript N(802255E0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(TranslateModel, LW(10), 0, 2, 0) @@ -22,7 +22,7 @@ EvtSource N(802255E0) = { EVT_END }; -EvtSource N(beforeBattle_802256E8) = { +EvtScript N(beforeBattle_802256E8) = { EVT_CALL(SetSpriteShading, -1) EVT_THREAD EVT_SET(LW(0), 19) @@ -59,7 +59,7 @@ EvtSource N(beforeBattle_802256E8) = { EVT_END }; -EvtSource N(afterBattle_8022589C) = { +EvtScript N(afterBattle_8022589C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_hos/stage/hos_01.c b/src/battle/area_hos/stage/hos_01.c index 7a3236b575..16a89a2a25 100644 --- a/src/battle/area_hos/stage/hos_01.c +++ b/src/battle/area_hos/stage/hos_01.c @@ -19,7 +19,7 @@ s32 D_80224BB0_48BC60[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(beforeBattle_80224BD0) = { +EvtScript N(beforeBattle_80224BD0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(MakeLocalVertexCopy, 0, 5, 1) EVT_CALL(SetCustomGfxBuilders, 1, EVT_ADDR(func_802184C0_47F570), 0) @@ -152,7 +152,7 @@ EvtSource N(beforeBattle_80224BD0) = { EVT_END }; -EvtSource N(afterBattle_80225598) = { +EvtScript N(afterBattle_80225598) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_hos/stage/hos_02.c b/src/battle/area_hos/stage/hos_02.c index 2d86ff586b..118d4394b0 100644 --- a/src/battle/area_hos/stage/hos_02.c +++ b/src/battle/area_hos/stage/hos_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_hos_hos_02 -EvtSource N(beforeBattle_802258E0) = { +EvtScript N(beforeBattle_802258E0) = { EVT_THREAD EVT_CALL(SetTexPanner, 21, 1) EVT_CALL(SetTexPanner, 22, 1) @@ -87,7 +87,7 @@ EvtSource N(beforeBattle_802258E0) = { EVT_END }; -EvtSource N(afterBattle_80225E20) = { +EvtScript N(afterBattle_80225E20) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/actor/buzzy_beetle.c b/src/battle/area_isk_part_1/actor/buzzy_beetle.c index e1fe79c5a8..fd7705b18c 100644 --- a/src/battle/area_isk_part_1/actor/buzzy_beetle.c +++ b/src/battle/area_isk_part_1/actor/buzzy_beetle.c @@ -7,12 +7,12 @@ #define NAMESPACE b_area_isk_part_1_buzzy_beetle extern s32 N(idleAnimations_8021E62C)[]; -extern EvtSource N(init_8021E6BC); -extern EvtSource N(idle_8021E88C); -extern EvtSource N(takeTurn_8021FF8C); -extern EvtSource N(handleEvent_8021ECD0); -extern EvtSource N(takeTurn_80220A44); -extern EvtSource N(handleEvent_8021F228); +extern EvtScript N(init_8021E6BC); +extern EvtScript N(idle_8021E88C); +extern EvtScript N(takeTurn_8021FF8C); +extern EvtScript N(handleEvent_8021ECD0); +extern EvtScript N(takeTurn_80220A44); +extern EvtScript N(handleEvent_8021F228); s32 N(defenseTable_8021E4C0)[] = { ELEMENT_NORMAL, 2, @@ -51,7 +51,7 @@ s32 N(statusTable_8021E4E8)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021E594)[] = { +ActorPartBlueprint N(partsTable_8021E594)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -66,7 +66,7 @@ ActorPartDesc N(partsTable_8021E594)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_HP_OFFSET_BELOW, .type = ACTOR_TYPE_BUZZY_BEETLE, .level = 10, @@ -129,7 +129,7 @@ s32 N(idleAnimations_8021E678)[] = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(init_8021E6BC) = { +EvtScript N(init_8021E6BC) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021E88C))) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(0)) EVT_IF_EQ(LW(0), 1) @@ -155,12 +155,12 @@ EvtSource N(init_8021E6BC) = { EVT_END }; -EvtSource N(idle_8021E88C) = { +EvtScript N(idle_8021E88C) = { EVT_RETURN EVT_END }; -EvtSource N(8021E89C) = { +EvtScript N(8021E89C) = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) @@ -213,7 +213,7 @@ EvtSource N(8021E89C) = { EVT_END }; -EvtSource N(handleEvent_8021ECD0) = { +EvtScript N(handleEvent_8021ECD0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -303,7 +303,7 @@ EvtSource N(handleEvent_8021ECD0) = { EVT_END }; -EvtSource N(8021F18C) = { +EvtScript N(8021F18C) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(3)) EVT_IF_EQ(LW(3), 2) EVT_SET(LW(1), LW(2)) @@ -317,7 +317,7 @@ s32 N(intTable_8021F1DC)[] = { 7, 0, 4, 7, 6, 4, 0, 2, 0, }; -EvtSource N(handleEvent_8021F228) = { +EvtScript N(handleEvent_8021F228) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -544,7 +544,7 @@ EvtSource N(handleEvent_8021F228) = { EVT_END }; -EvtSource N(takeTurn_8021FF8C) = { +EvtScript N(takeTurn_8021FF8C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -685,7 +685,7 @@ EvtSource N(takeTurn_8021FF8C) = { EVT_END }; -EvtSource N(takeTurn_80220A44) = { +EvtScript N(takeTurn_80220A44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(0)) diff --git a/src/battle/area_isk_part_1/actor/pokey_mummy.c b/src/battle/area_isk_part_1/actor/pokey_mummy.c index db7de423c7..256d1cd329 100644 --- a/src/battle/area_isk_part_1/actor/pokey_mummy.c +++ b/src/battle/area_isk_part_1/actor/pokey_mummy.c @@ -8,16 +8,16 @@ extern s32 N(idleAnimations_80218DC8)[]; extern s32 N(idleAnimations_80218EB8)[]; -extern EvtSource N(init_80218EC4); -extern EvtSource N(takeTurn_80219D88); -extern EvtSource N(idle_80219040); -extern EvtSource N(handleEvent_80219050); -extern EvtSource N(8021B998); -extern EvtSource N(8021A6C8); -extern EvtSource N(8021B088); -extern EvtSource N(8021B1B4); -extern EvtSource N(8021BDE4); -extern EvtSource N(8021C2BC); +extern EvtScript N(init_80218EC4); +extern EvtScript N(takeTurn_80219D88); +extern EvtScript N(idle_80219040); +extern EvtScript N(handleEvent_80219050); +extern EvtScript N(8021B998); +extern EvtScript N(8021A6C8); +extern EvtScript N(8021B088); +extern EvtScript N(8021B1B4); +extern EvtScript N(8021BDE4); +extern EvtScript N(8021C2BC); s32 N(defenseTable_80218C10)[] = { ELEMENT_NORMAL, 0, @@ -49,7 +49,7 @@ s32 N(statusTable_80218C1C)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80218CC8)[] = { +ActorPartBlueprint N(partsTable_80218CC8)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -124,7 +124,7 @@ ActorPartDesc N(partsTable_80218CC8)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_POKEY_MUMMY, .level = 10, @@ -198,7 +198,7 @@ s32 N(idleAnimations_80218EB8)[] = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(init_80218EC4) = { +EvtScript N(init_80218EC4) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80219D88))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80219040))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80219050))) @@ -219,12 +219,12 @@ EvtSource N(init_80218EC4) = { EVT_END }; -EvtSource N(idle_80219040) = { +EvtScript N(idle_80219040) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80219050) = { +EvtScript N(handleEvent_80219050) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -456,7 +456,7 @@ EvtSource N(handleEvent_80219050) = { EVT_END }; -EvtSource N(takeTurn_80219D88) = { +EvtScript N(takeTurn_80219D88) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(10)) EVT_IF_EQ(LW(10), 3) EVT_EXEC_WAIT(N(8021A6C8)) @@ -582,7 +582,7 @@ EvtSource N(takeTurn_80219D88) = { EVT_END }; -EvtSource N(8021A6C8) = { +EvtScript N(8021A6C8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 748, 748) @@ -717,7 +717,7 @@ EvtSource N(8021A6C8) = { EVT_END }; -EvtSource N(8021B088) = { +EvtScript N(8021B088) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(10)) EVT_IF_FLAG(LW(10), STATUS_FLAG_SHRINK) EVT_SET_CONST(LW(0), 1) @@ -742,7 +742,7 @@ EvtSource N(8021B088) = { EVT_END }; -EvtSource N(8021B1B4) = { +EvtScript N(8021B1B4) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(10)) EVT_SWITCH(LW(10)) EVT_CASE_EQ(0) @@ -799,7 +799,7 @@ EvtSource N(8021B1B4) = { EVT_END }; -EvtSource N(8021B6AC) = { +EvtScript N(8021B6AC) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_ADD(LW(1), 18) EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -842,7 +842,7 @@ EvtSource N(8021B6AC) = { EVT_END }; -EvtSource N(8021B998) = { +EvtScript N(8021B998) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LW(0), LW(1), LW(2)) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) @@ -906,7 +906,7 @@ EvtSource N(8021B998) = { EVT_END }; -EvtSource N(8021BDE4) = { +EvtScript N(8021BDE4) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -975,7 +975,7 @@ EvtSource N(8021BDE4) = { EVT_END }; -EvtSource N(8021C2BC) = { +EvtScript N(8021C2BC) = { EVT_SET_CONST(LW(0), 1) EVT_CALL(GetActorVar, ACTOR_SELF, 3, LW(1)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) diff --git a/src/battle/area_isk_part_1/actor/stone_chomp.c b/src/battle/area_isk_part_1/actor/stone_chomp.c index db24c864ad..068cae0703 100644 --- a/src/battle/area_isk_part_1/actor/stone_chomp.c +++ b/src/battle/area_isk_part_1/actor/stone_chomp.c @@ -5,12 +5,12 @@ #define NAMESPACE b_area_isk_part_1_stone_chomp -extern EvtSource N(init_80221ABC); -extern EvtSource N(takeTurn_80222ED0); -extern EvtSource N(idle_80221D00); -extern EvtSource N(handleEvent_80222364); -extern EvtSource N(8022181C); -extern EvtSource N(80222324); +extern EvtScript N(init_80221ABC); +extern EvtScript N(takeTurn_80222ED0); +extern EvtScript N(idle_80221D00); +extern EvtScript N(handleEvent_80222364); +extern EvtScript N(8022181C); +extern EvtScript N(80222324); s32 N(idleAnimations_80221450)[] = { STATUS_NORMAL, NPC_ANIM_stone_chomp_Palette_00_Anim_1, @@ -91,7 +91,7 @@ s32 N(statusTable_80221558)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80221604)[] = { +ActorPartBlueprint N(partsTable_80221604)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -214,7 +214,7 @@ ActorPartDesc N(partsTable_80221604)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_STONE_CHOMP, .level = 14, @@ -246,7 +246,7 @@ ActorDesc NAMESPACE = { ApiStatus b_area_isk_part_1_ChompChainUpdate(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/area_isk_part_1/4E29B0", b_area_isk_part_1_ChompChainUpdate); -EvtSource N(80221794) = { +EvtScript N(80221794) = { EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -257,7 +257,7 @@ EvtSource N(80221794) = { EVT_END }; -EvtSource N(8022181C) = { +EvtScript N(8022181C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) EVT_LABEL(0) EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) @@ -298,7 +298,7 @@ EvtSource N(8022181C) = { EVT_END }; -EvtSource N(init_80221ABC) = { +EvtScript N(init_80221ABC) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80222ED0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80221D00))) @@ -316,7 +316,7 @@ EvtSource N(init_80221ABC) = { EVT_END }; -EvtSource N(80221BC4) = { +EvtScript N(80221BC4) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_FLAG(LW(0), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -334,7 +334,7 @@ EvtSource N(80221BC4) = { EVT_END }; -EvtSource N(idle_80221D00) = { +EvtScript N(idle_80221D00) = { EVT_LABEL(0) EVT_LOOP(0) EVT_EXEC_WAIT(N(80221BC4)) @@ -433,7 +433,7 @@ EvtSource N(idle_80221D00) = { EVT_END }; -EvtSource N(80222324) = { +EvtScript N(80222324) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_CALL(b_area_isk_part_1_ChompChainUpdate) @@ -442,7 +442,7 @@ EvtSource N(80222324) = { EVT_END }; -EvtSource N(handleEvent_80222364) = { +EvtScript N(handleEvent_80222364) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -618,7 +618,7 @@ EvtSource N(handleEvent_80222364) = { EVT_END }; -EvtSource N(takeTurn_80222ED0) = { +EvtScript N(takeTurn_80222ED0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/area_isk_part_1/actor/swooper.c b/src/battle/area_isk_part_1/actor/swooper.c index 1ce5773e6f..8054ffd937 100644 --- a/src/battle/area_isk_part_1/actor/swooper.c +++ b/src/battle/area_isk_part_1/actor/swooper.c @@ -6,10 +6,10 @@ #define NAMESPACE b_area_isk_part_1_swooper extern s32 N(idleAnimations_8021C5B4)[]; -extern EvtSource N(init_8021C64C); -extern EvtSource N(takeTurn_8021DED4); -extern EvtSource N(idle_8021C6B0); -extern EvtSource N(handleEvent_8021D064); +extern EvtScript N(init_8021C64C); +extern EvtScript N(takeTurn_8021DED4); +extern EvtScript N(idle_8021C6B0); +extern EvtScript N(handleEvent_8021D064); s32 N(defenseTable_8021C4B0)[] = { ELEMENT_NORMAL, 0, @@ -41,7 +41,7 @@ s32 N(statusTable_8021C4BC)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021C568)[] = { +ActorPartBlueprint N(partsTable_8021C568)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -56,7 +56,7 @@ ActorPartDesc N(partsTable_8021C568)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_HP_OFFSET_BELOW, .type = ACTOR_TYPE_SWOOPER, .level = 10, @@ -107,7 +107,7 @@ s32 N(idleAnimations_8021C600)[] = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(init_8021C64C) = { +EvtScript N(init_8021C64C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021DED4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021C6B0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D064))) @@ -116,12 +116,12 @@ EvtSource N(init_8021C64C) = { EVT_END }; -EvtSource N(idle_8021C6B0) = { +EvtScript N(idle_8021C6B0) = { EVT_RETURN EVT_END }; -EvtSource N(8021C6C0) = { +EvtScript N(8021C6C0) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(0) @@ -147,7 +147,7 @@ EvtSource N(8021C6C0) = { EVT_END }; -EvtSource N(8021C880) = { +EvtScript N(8021C880) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -235,7 +235,7 @@ EvtSource N(8021C880) = { EVT_END }; -EvtSource N(8021CD04) = { +EvtScript N(8021CD04) = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(GetLastDamage, ACTOR_SELF, LW(0)) EVT_IF_LE(LW(0), 0) @@ -279,7 +279,7 @@ EvtSource N(8021CD04) = { EVT_END }; -EvtSource N(handleEvent_8021D064) = { +EvtScript N(handleEvent_8021D064) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_EXEC_WAIT(N(8021C880)) @@ -418,7 +418,7 @@ EvtSource N(handleEvent_8021D064) = { EVT_END }; -EvtSource N(8021D7E4) = { +EvtScript N(8021D7E4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -512,7 +512,7 @@ EvtSource N(8021D7E4) = { EVT_END }; -EvtSource N(takeTurn_8021DED4) = { +EvtScript N(takeTurn_8021DED4) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_EXEC_WAIT(N(8021D7E4)) diff --git a/src/battle/area_isk_part_1/area.c b/src/battle/area_isk_part_1/area.c index 257ae21ebc..8d3c7cd8b0 100644 --- a/src/battle/area_isk_part_1/area.c +++ b/src/battle/area_isk_part_1/area.c @@ -3,10 +3,10 @@ #define NAMESPACE b_area_isk_part_1 -extern ActorDesc N(pokey_mummy); -extern ActorDesc N(swooper); -extern ActorDesc N(stone_chomp); -extern ActorDesc N(buzzy_beetle); +extern ActorBlueprint N(pokey_mummy); +extern ActorBlueprint N(swooper); +extern ActorBlueprint N(stone_chomp); +extern ActorBlueprint N(buzzy_beetle); extern Stage N(isk_00); extern Stage N(isk_01); diff --git a/src/battle/area_isk_part_1/stage/isk_00.c b/src/battle/area_isk_part_1/stage/isk_00.c index 19ae985add..a7f0822370 100644 --- a/src/battle/area_isk_part_1/stage/isk_00.c +++ b/src/battle/area_isk_part_1/stage/isk_00.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_isk_part_1_isk_00 -EvtSource N(beforeBattle_802238B0) = { +EvtScript N(beforeBattle_802238B0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_802238EC) = { +EvtScript N(afterBattle_802238EC) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/stage/isk_01.c b/src/battle/area_isk_part_1/stage/isk_01.c index 9ab25fde8c..fc4440a510 100644 --- a/src/battle/area_isk_part_1/stage/isk_01.c +++ b/src/battle/area_isk_part_1/stage/isk_01.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_isk_part_1_isk_01 -EvtSource N(beforeBattle_80223930) = { +EvtScript N(beforeBattle_80223930) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_8022396C) = { +EvtScript N(afterBattle_8022396C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/stage/isk_02.c b/src/battle/area_isk_part_1/stage/isk_02.c index 85cf5f24e7..7b6a516574 100644 --- a/src/battle/area_isk_part_1/stage/isk_02.c +++ b/src/battle/area_isk_part_1/stage/isk_02.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_isk_part_1_isk_02 -EvtSource N(beforeBattle_802239B0) = { +EvtScript N(beforeBattle_802239B0) = { EVT_CALL(SetSpriteShading, 786432) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_802239EC) = { +EvtScript N(afterBattle_802239EC) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/stage/isk_02b.c b/src/battle/area_isk_part_1/stage/isk_02b.c index a42015050b..17a1efa6dc 100644 --- a/src/battle/area_isk_part_1/stage/isk_02b.c +++ b/src/battle/area_isk_part_1/stage/isk_02b.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_isk_part_1_isk_02b -EvtSource N(beforeBattle_80223D90) = { +EvtScript N(beforeBattle_80223D90) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 7, 0) @@ -16,7 +16,7 @@ EvtSource N(beforeBattle_80223D90) = { EVT_END }; -EvtSource N(afterBattle_80223E44) = { +EvtScript N(afterBattle_80223E44) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/stage/isk_02c.c b/src/battle/area_isk_part_1/stage/isk_02c.c index f9c245ed3b..1e6fa10c5d 100644 --- a/src/battle/area_isk_part_1/stage/isk_02c.c +++ b/src/battle/area_isk_part_1/stage/isk_02c.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_isk_part_1_isk_02c -EvtSource N(beforeBattle_80223E90) = { +EvtScript N(beforeBattle_80223E90) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 14, 0) @@ -12,7 +12,7 @@ EvtSource N(beforeBattle_80223E90) = { EVT_END }; -EvtSource N(afterBattle_80223EF4) = { +EvtScript N(afterBattle_80223EF4) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/stage/isk_03.c b/src/battle/area_isk_part_1/stage/isk_03.c index e2e669d027..03a0869921 100644 --- a/src/battle/area_isk_part_1/stage/isk_03.c +++ b/src/battle/area_isk_part_1/stage/isk_03.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_isk_part_1_isk_03 -EvtSource N(beforeBattle_80223A40) = { +EvtScript N(beforeBattle_80223A40) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80223A7C) = { +EvtScript N(afterBattle_80223A7C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/stage/isk_03b.c b/src/battle/area_isk_part_1/stage/isk_03b.c index 83b52e9258..03c18971ce 100644 --- a/src/battle/area_isk_part_1/stage/isk_03b.c +++ b/src/battle/area_isk_part_1/stage/isk_03b.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_isk_part_1_isk_03b -EvtSource N(beforeBattle_80223D10) = { +EvtScript N(beforeBattle_80223D10) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80223D4C) = { +EvtScript N(afterBattle_80223D4C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_isk_part_1/stage/isk_04.c b/src/battle/area_isk_part_1/stage/isk_04.c index 119b41144f..ed01f894e3 100644 --- a/src/battle/area_isk_part_1/stage/isk_04.c +++ b/src/battle/area_isk_part_1/stage/isk_04.c @@ -20,7 +20,7 @@ ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(beforeBattle_80223AC0) = { +EvtScript N(beforeBattle_80223AC0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(N(CreateTorchFX)) @@ -28,7 +28,7 @@ EvtSource N(beforeBattle_80223AC0) = { EVT_END }; -EvtSource N(afterBattle_80223B08) = { +EvtScript N(afterBattle_80223B08) = { EVT_CALL(N(DeleteTorchFX)) EVT_RETURN EVT_END diff --git a/src/battle/area_isk_part_1/stage/isk_05.c b/src/battle/area_isk_part_1/stage/isk_05.c index 4aaf641ba2..f9c6d4099e 100644 --- a/src/battle/area_isk_part_1/stage/isk_05.c +++ b/src/battle/area_isk_part_1/stage/isk_05.c @@ -20,7 +20,7 @@ ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(beforeBattle_80223B60) = { +EvtScript N(beforeBattle_80223B60) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(N(CreateTorchFX)) @@ -28,7 +28,7 @@ EvtSource N(beforeBattle_80223B60) = { EVT_END }; -EvtSource N(afterBattle_80223BA8) = { +EvtScript N(afterBattle_80223BA8) = { EVT_CALL(N(DeleteTorchFX)) EVT_RETURN EVT_END diff --git a/src/battle/area_isk_part_1/stage/isk_06.c b/src/battle/area_isk_part_1/stage/isk_06.c index 545e1662f5..39fbfb603d 100644 --- a/src/battle/area_isk_part_1/stage/isk_06.c +++ b/src/battle/area_isk_part_1/stage/isk_06.c @@ -17,7 +17,7 @@ ApiStatus func_80218A98_4E31D8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(beforeBattle_80223BF0) = { +EvtScript N(beforeBattle_80223BF0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(func_80218A50_4E3190) @@ -25,7 +25,7 @@ EvtSource N(beforeBattle_80223BF0) = { EVT_END }; -EvtSource N(afterBattle_80223C38) = { +EvtScript N(afterBattle_80223C38) = { EVT_CALL(func_80218A98_4E31D8) EVT_RETURN EVT_END diff --git a/src/battle/area_isk_part_1/stage/isk_06b.c b/src/battle/area_isk_part_1/stage/isk_06b.c index f813bdf283..0029f1137e 100644 --- a/src/battle/area_isk_part_1/stage/isk_06b.c +++ b/src/battle/area_isk_part_1/stage/isk_06b.c @@ -17,7 +17,7 @@ ApiStatus func_80218B78_4E32B8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(beforeBattle_80223F40) = { +EvtScript N(beforeBattle_80223F40) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(func_80218B30_4E3270) @@ -26,7 +26,7 @@ EvtSource N(beforeBattle_80223F40) = { EVT_END }; -EvtSource N(afterBattle_80223F9C) = { +EvtScript N(afterBattle_80223F9C) = { EVT_CALL(func_80218B78_4E32B8) EVT_RETURN EVT_END diff --git a/src/battle/area_isk_part_1/stage/isk_07.c b/src/battle/area_isk_part_1/stage/isk_07.c index 2b4caa1538..a97d24df61 100644 --- a/src/battle/area_isk_part_1/stage/isk_07.c +++ b/src/battle/area_isk_part_1/stage/isk_07.c @@ -17,7 +17,7 @@ ApiStatus func_80218B08_4E3248(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(beforeBattle_80223C80) = { +EvtScript N(beforeBattle_80223C80) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(func_80218AC0_4E3200) @@ -25,7 +25,7 @@ EvtSource N(beforeBattle_80223C80) = { EVT_END }; -EvtSource N(afterBattle_80223CC8) = { +EvtScript N(afterBattle_80223CC8) = { EVT_CALL(func_80218B08_4E3248) EVT_RETURN EVT_END diff --git a/src/battle/area_isk_part_1/stage/isk_08.c b/src/battle/area_isk_part_1/stage/isk_08.c index c1d5d032fc..f4ee3b9cda 100644 --- a/src/battle/area_isk_part_1/stage/isk_08.c +++ b/src/battle/area_isk_part_1/stage/isk_08.c @@ -17,7 +17,7 @@ ApiStatus func_80218BE8_4E3328(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(beforeBattle_80223FE0) = { +EvtScript N(beforeBattle_80223FE0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(func_80218BA0_4E32E0) @@ -25,7 +25,7 @@ EvtSource N(beforeBattle_80223FE0) = { EVT_END }; -EvtSource N(afterBattle_80224028) = { +EvtScript N(afterBattle_80224028) = { EVT_CALL(func_80218BE8_4E3328) EVT_RETURN EVT_END diff --git a/src/battle/area_iwa/actor/buzzar.c b/src/battle/area_iwa/actor/buzzar.c index 3561b59bcd..95a7197a00 100644 --- a/src/battle/area_iwa/actor/buzzar.c +++ b/src/battle/area_iwa/actor/buzzar.c @@ -8,20 +8,20 @@ #define NAMESPACE b_area_iwa_buzzar -extern EvtSource N(init_8021B7E4); -extern EvtSource N(takeTurn_8021BCD8); -extern EvtSource N(idle_8021B930); -extern EvtSource N(handleEvent_8021B940); -extern EvtSource N(nextTurn_8021B918); -extern EvtSource N(8021BEBC); -extern EvtSource N(8021CCE8); -extern EvtSource N(8021DF2C); -extern EvtSource N(8021F030); -extern EvtSource N(8021F7EC); -extern EvtSource N(8021F808); -extern EvtSource N(8021F824); -extern EvtSource N(8021FA2C); -extern EvtSource N(8021FC34); +extern EvtScript N(init_8021B7E4); +extern EvtScript N(takeTurn_8021BCD8); +extern EvtScript N(idle_8021B930); +extern EvtScript N(handleEvent_8021B940); +extern EvtScript N(nextTurn_8021B918); +extern EvtScript N(8021BEBC); +extern EvtScript N(8021CCE8); +extern EvtScript N(8021DF2C); +extern EvtScript N(8021F030); +extern EvtScript N(8021F7EC); +extern EvtScript N(8021F808); +extern EvtScript N(8021F824); +extern EvtScript N(8021FA2C); +extern EvtScript N(8021FC34); s32 N(idleAnimations_8021B600)[] = { @@ -71,7 +71,7 @@ s32 N(statusTable_8021B65C)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021B708)[] = { +ActorPartBlueprint N(partsTable_8021B708)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -134,7 +134,7 @@ ActorPartDesc N(partsTable_8021B708)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_BUZZAR, .level = 35, @@ -157,7 +157,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 1, 58 }, }; -EvtSource N(init_8021B7E4) = { +EvtScript N(init_8021B7E4) = { EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) @@ -175,18 +175,18 @@ EvtSource N(init_8021B7E4) = { EVT_END }; -EvtSource N(nextTurn_8021B918) = { +EvtScript N(nextTurn_8021B918) = { EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(idle_8021B930) = { +EvtScript N(idle_8021B930) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_8021B940) = { +EvtScript N(handleEvent_8021B940) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) EVT_SWITCH(LW(0)) @@ -256,7 +256,7 @@ EvtSource N(handleEvent_8021B940) = { EVT_END }; -EvtSource N(takeTurn_8021BCD8) = { +EvtScript N(takeTurn_8021BCD8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) @@ -292,7 +292,7 @@ EvtSource N(takeTurn_8021BCD8) = { #include "common/StartRumbleWithParams.inc.c" -EvtSource N(8021BEBC) = { +EvtScript N(8021BEBC) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) @@ -510,7 +510,7 @@ EvtSource N(8021BEBC) = { EVT_END }; -EvtSource N(8021CCE8) = { +EvtScript N(8021CCE8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -718,7 +718,7 @@ EvtSource N(8021CCE8) = { EVT_END }; -EvtSource N(8021DCB8) = { +EvtScript N(8021DCB8) = { EVT_CALL(GetAnimation, ACTOR_SELF, 1, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_OR_EQ(NPC_ANIM_buzzar_Palette_00_Anim_1) @@ -761,7 +761,7 @@ EvtSource N(8021DCB8) = { EVT_END }; -EvtSource N(8021DF2C) = { +EvtScript N(8021DF2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1010,7 +1010,7 @@ EvtSource N(8021DF2C) = { EVT_END }; -EvtSource N(8021F030) = { +EvtScript N(8021F030) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1126,19 +1126,19 @@ EvtSource N(8021F030) = { EVT_END }; -EvtSource N(8021F7EC) = { +EvtScript N(8021F7EC) = { EVT_EXEC_WAIT(N(8021F824)) EVT_RETURN EVT_END }; -EvtSource N(8021F808) = { +EvtScript N(8021F808) = { EVT_EXEC_WAIT(N(8021FA2C)) EVT_RETURN EVT_END }; -EvtSource N(8021F824) = { +EvtScript N(8021F824) = { EVT_CALL(GetAnimation, ACTOR_SELF, 1, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_OR_EQ(NPC_ANIM_buzzar_Palette_00_Anim_1) @@ -1172,7 +1172,7 @@ EvtSource N(8021F824) = { EVT_END }; -EvtSource N(8021FA2C) = { +EvtScript N(8021FA2C) = { EVT_CALL(GetAnimation, ACTOR_SELF, 1, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_OR_EQ(NPC_ANIM_buzzar_Palette_00_Anim_1) @@ -1206,7 +1206,7 @@ EvtSource N(8021FA2C) = { EVT_END }; -EvtSource N(8021FC34) = { +EvtScript N(8021FC34) = { EVT_RETURN EVT_RETURN EVT_END diff --git a/src/battle/area_iwa/actor/cleft.c b/src/battle/area_iwa/actor/cleft.c index d079670a8e..26eafb37f0 100644 --- a/src/battle/area_iwa/actor/cleft.c +++ b/src/battle/area_iwa/actor/cleft.c @@ -7,10 +7,10 @@ #define NAMESPACE b_area_iwa_cleft extern s32 N(idleAnimations_80218838)[]; -extern EvtSource N(init_802188D0); -extern EvtSource N(idle_80218934); -extern EvtSource N(takeTurn_8021A3EC); -extern EvtSource N(handleEvent_80218C3C); +extern EvtScript N(init_802188D0); +extern EvtScript N(idle_80218934); +extern EvtScript N(takeTurn_8021A3EC); +extern EvtScript N(handleEvent_80218C3C); s32 N(defenseTable_80218710)[] = { ELEMENT_NORMAL, 2, @@ -50,7 +50,7 @@ s32 N(statusTable_80218740)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_802187EC)[] = { +ActorPartBlueprint N(partsTable_802187EC)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -65,7 +65,7 @@ ActorPartDesc N(partsTable_802187EC)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_CLEFT, .level = 10, @@ -118,7 +118,7 @@ s32 N(idleAnimations_80218884)[] = { #include "common/StartRumbleWithParams.inc.c" -EvtSource N(init_802188D0) = { +EvtScript N(init_802188D0) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80218934))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021A3EC))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80218C3C))) @@ -127,12 +127,12 @@ EvtSource N(init_802188D0) = { EVT_END }; -EvtSource N(idle_80218934) = { +EvtScript N(idle_80218934) = { EVT_RETURN EVT_END }; -EvtSource N(80218944) = { +EvtScript N(80218944) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_default_run) @@ -170,7 +170,7 @@ EvtSource N(80218944) = { EVT_END }; -EvtSource N(handleEvent_80218C3C) = { +EvtScript N(handleEvent_80218C3C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -374,7 +374,7 @@ EvtSource N(handleEvent_80218C3C) = { EVT_END }; -EvtSource N(802197AC) = { +EvtScript N(802197AC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) @@ -428,7 +428,7 @@ EvtSource N(802197AC) = { EVT_END }; -EvtSource N(80219BA0) = { +EvtScript N(80219BA0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -536,7 +536,7 @@ EvtSource N(80219BA0) = { EVT_END }; -EvtSource N(takeTurn_8021A3EC) = { +EvtScript N(takeTurn_8021A3EC) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_EXEC_WAIT(N(802197AC)) diff --git a/src/battle/area_iwa/actor/monty_mole.c b/src/battle/area_iwa/actor/monty_mole.c index 31eb706476..f1c2514fb3 100644 --- a/src/battle/area_iwa/actor/monty_mole.c +++ b/src/battle/area_iwa/actor/monty_mole.c @@ -7,10 +7,10 @@ extern s32 N(idleAnimations_8021A59C)[]; extern s32 N(idleAnimations_8021A5E8)[]; -extern EvtSource N(init_8021A7B0); -extern EvtSource N(takeTurn_8021AFAC); -extern EvtSource N(idle_8021A814); -extern EvtSource N(handleEvent_8021A824); +extern EvtScript N(init_8021A7B0); +extern EvtScript N(takeTurn_8021AFAC); +extern EvtScript N(idle_8021A814); +extern EvtScript N(handleEvent_8021A824); s32 N(defenseTable_8021A450)[] = { ELEMENT_NORMAL, 0, @@ -42,7 +42,7 @@ s32 N(statusTable_8021A45C)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021A508)[] = { +ActorPartBlueprint N(partsTable_8021A508)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -81,7 +81,7 @@ ActorPartDesc N(partsTable_8021A508)[] = { }, }; -ActorDesc N(1) = { +ActorBlueprint N(1) = { .flags = 0, .type = ACTOR_TYPE_MONTY_MOLE, .level = 8, @@ -131,7 +131,7 @@ s32 N(unk_missing_8021A600)[] = { 0x00000001, 0x002F0006, 0x00000000, }; -ActorPartDesc N(partsTable_8021A60C)[] = { +ActorPartBlueprint N(partsTable_8021A60C)[] = { { .flags = ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -146,7 +146,7 @@ ActorPartDesc N(partsTable_8021A60C)[] = { }, }; -EvtSource N(init_8021A630) = { +EvtScript N(init_8021A630) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(0.400390625), EVT_FLOAT(0.400390625), EVT_FLOAT(0.400390625)) @@ -155,7 +155,7 @@ EvtSource N(init_8021A630) = { EVT_END }; -ActorDesc N(2) = { +ActorBlueprint N(2) = { .flags = ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_40000 | ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, .type = ACTOR_TYPE_MONTY_HOLE, .level = 9, @@ -188,7 +188,7 @@ Formation N(specialFormation_8021A6E0) = { { .actor = &N(2), .home = { .vec = &N(vector3D_8021A6B8) }, .var0 = 1 }, }; -EvtSource N(8021A6FC) = { +EvtScript N(8021A6FC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_FLAG(LW(0), STATUS_FLAG_SHRINK) EVT_CALL(SummonEnemy, EVT_ADDR(N(specialFormation_8021A6E0)), 0) @@ -202,7 +202,7 @@ EvtSource N(8021A6FC) = { EVT_END }; -EvtSource N(init_8021A7B0) = { +EvtScript N(init_8021A7B0) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021AFAC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021A814))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021A824))) @@ -211,12 +211,12 @@ EvtSource N(init_8021A7B0) = { EVT_END }; -EvtSource N(idle_8021A814) = { +EvtScript N(idle_8021A814) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_8021A824) = { +EvtScript N(handleEvent_8021A824) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastElement, LW(14)) @@ -344,7 +344,7 @@ EvtSource N(handleEvent_8021A824) = { EVT_END }; -EvtSource N(takeTurn_8021AFAC) = { +EvtScript N(takeTurn_8021AFAC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/area_iwa/actor/whacka.c b/src/battle/area_iwa/actor/whacka.c index b4fc43c43a..5dfc240e19 100644 --- a/src/battle/area_iwa/actor/whacka.c +++ b/src/battle/area_iwa/actor/whacka.c @@ -5,12 +5,12 @@ #define NAMESPACE b_area_iwa_whacka -extern EvtSource N(init_8021FDA0); -extern EvtSource N(takeTurn_80220634); -extern EvtSource N(idle_8021FE5C); -extern EvtSource N(handleEvent_8021FE90); -extern EvtSource N(80220684); -extern EvtSource N(80220764); +extern EvtScript N(init_8021FDA0); +extern EvtScript N(takeTurn_80220634); +extern EvtScript N(idle_8021FE5C); +extern EvtScript N(handleEvent_8021FE90); +extern EvtScript N(80220684); +extern EvtScript N(80220764); s32 N(idleAnimations_8021FC50)[] = { STATUS_NORMAL, NPC_ANIM_whacka_Palette_00_Anim_1, @@ -55,7 +55,7 @@ s32 N(statusTable_8021FCA8)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021FD54)[] = { +ActorPartBlueprint N(partsTable_8021FD54)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -70,7 +70,7 @@ ActorPartDesc N(partsTable_8021FD54)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_40000, .type = ACTOR_TYPE_WHACKA, .level = 0, @@ -95,7 +95,7 @@ ActorDesc NAMESPACE = { #include "common/IsSaveVar123.inc.c" -EvtSource N(init_8021FDA0) = { +EvtScript N(init_8021FDA0) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80220634))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021FE5C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021FE90))) @@ -109,7 +109,7 @@ EvtSource N(init_8021FDA0) = { EVT_END }; -EvtSource N(idle_8021FE5C) = { +EvtScript N(idle_8021FE5C) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_GOTO(0) @@ -117,7 +117,7 @@ EvtSource N(idle_8021FE5C) = { EVT_END }; -EvtSource N(handleEvent_8021FE90) = { +EvtScript N(handleEvent_8021FE90) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -267,7 +267,7 @@ EvtSource N(handleEvent_8021FE90) = { EVT_END }; -EvtSource N(takeTurn_80220634) = { +EvtScript N(takeTurn_80220634) = { EVT_CALL(RandInt, 100, LW(0)) EVT_IF_LE(LW(0), 100) EVT_EXEC_WAIT(N(80220764)) @@ -277,7 +277,7 @@ EvtSource N(takeTurn_80220634) = { EVT_END }; -EvtSource N(80220684) = { +EvtScript N(80220684) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2073) EVT_THREAD @@ -293,7 +293,7 @@ EvtSource N(80220684) = { EVT_END }; -EvtSource N(80220764) = { +EvtScript N(80220764) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MOLE_DIG) diff --git a/src/battle/area_iwa/area.c b/src/battle/area_iwa/area.c index 4a786369da..4a9ee163f6 100644 --- a/src/battle/area_iwa/area.c +++ b/src/battle/area_iwa/area.c @@ -3,10 +3,10 @@ #define NAMESPACE b_area_iwa -extern ActorDesc N(cleft); -extern ActorDesc N(monty_mole_1); -extern ActorDesc N(whacka); -extern ActorDesc N(buzzar); +extern ActorBlueprint N(cleft); +extern ActorBlueprint N(monty_mole_1); +extern ActorBlueprint N(whacka); +extern ActorBlueprint N(buzzar); extern Stage N(iwa_01); extern Stage N(iwa_01b); diff --git a/src/battle/area_iwa/stage/iwa_01.c b/src/battle/area_iwa/stage/iwa_01.c index a6be20776d..cabaacf7e7 100644 --- a/src/battle/area_iwa/stage/iwa_01.c +++ b/src/battle/area_iwa/stage/iwa_01.c @@ -5,23 +5,23 @@ #define NAMESPACE b_area_iwa_iwa_01 -extern ActorDesc N(whacka); +extern ActorBlueprint N(whacka); extern Formation N(specialFormation_802208E4); -extern EvtSource N(init_80220A50); -extern EvtSource N(takeTurn_802212E4); -extern EvtSource N(idle_80220B0C); -extern EvtSource N(handleEvent_80220B40); -extern EvtSource N(80221414); -extern EvtSource N(80221334); +extern EvtScript N(init_80220A50); +extern EvtScript N(takeTurn_802212E4); +extern EvtScript N(idle_80220B0C); +extern EvtScript N(handleEvent_80220B40); +extern EvtScript N(80221414); +extern EvtScript N(80221334); -EvtSource N(beforeBattle_80220860) = { +EvtScript N(beforeBattle_80220860) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetGroupEnabled, 21, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80220894) = { +EvtScript N(afterBattle_80220894) = { EVT_RETURN EVT_END }; @@ -92,7 +92,7 @@ s32 N(statusTable_80220958)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80220A04)[] = { +ActorPartBlueprint N(partsTable_80220A04)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -107,7 +107,7 @@ ActorPartDesc N(partsTable_80220A04)[] = { }, }; -ActorDesc N(whacka) = { +ActorBlueprint N(whacka) = { .flags = ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_40000, .type = ACTOR_TYPE_WHACKA, .level = 0, @@ -132,7 +132,7 @@ ActorDesc N(whacka) = { #include "common/IsSaveVar123.inc.c" -EvtSource N(init_80220A50) = { +EvtScript N(init_80220A50) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802212E4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80220B0C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80220B40))) @@ -146,7 +146,7 @@ EvtSource N(init_80220A50) = { EVT_END }; -EvtSource N(idle_80220B0C) = { +EvtScript N(idle_80220B0C) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_GOTO(0) @@ -154,7 +154,7 @@ EvtSource N(idle_80220B0C) = { EVT_END }; -EvtSource N(handleEvent_80220B40) = { +EvtScript N(handleEvent_80220B40) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -304,7 +304,7 @@ EvtSource N(handleEvent_80220B40) = { EVT_END }; -EvtSource N(takeTurn_802212E4) = { +EvtScript N(takeTurn_802212E4) = { EVT_CALL(RandInt, 100, LW(0)) EVT_IF_LE(LW(0), 100) EVT_EXEC_WAIT(N(80221414)) @@ -314,7 +314,7 @@ EvtSource N(takeTurn_802212E4) = { EVT_END }; -EvtSource N(80221334) = { +EvtScript N(80221334) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2073) EVT_THREAD @@ -330,7 +330,7 @@ EvtSource N(80221334) = { EVT_END }; -EvtSource N(80221414) = { +EvtScript N(80221414) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MOLE_DIG) diff --git a/src/battle/area_iwa/stage/iwa_01b.c b/src/battle/area_iwa/stage/iwa_01b.c index 5b6845c195..315c005e23 100644 --- a/src/battle/area_iwa/stage/iwa_01b.c +++ b/src/battle/area_iwa/stage/iwa_01b.c @@ -4,14 +4,14 @@ #define NAMESPACE b_area_iwa_iwa_01b -EvtSource N(beforeBattle_80221510) = { +EvtScript N(beforeBattle_80221510) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetGroupEnabled, 13, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80221544) = { +EvtScript N(afterBattle_80221544) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_iwa/stage/iwa_02.c b/src/battle/area_iwa/stage/iwa_02.c index bad9eee2b6..318175c7eb 100644 --- a/src/battle/area_iwa/stage/iwa_02.c +++ b/src/battle/area_iwa/stage/iwa_02.c @@ -5,21 +5,21 @@ #define NAMESPACE b_area_iwa_iwa_02 -extern ActorDesc N(whacka); -extern EvtSource N(init_8022176C); -extern EvtSource N(takeTurn_80222000); -extern EvtSource N(idle_80221828); -extern EvtSource N(handleEvent_8022185C); -extern EvtSource N(80222050); -extern EvtSource N(80222130); +extern ActorBlueprint N(whacka); +extern EvtScript N(init_8022176C); +extern EvtScript N(takeTurn_80222000); +extern EvtScript N(idle_80221828); +extern EvtScript N(handleEvent_8022185C); +extern EvtScript N(80222050); +extern EvtScript N(80222130); -EvtSource N(beforeBattle_80221590) = { +EvtScript N(beforeBattle_80221590) = { EVT_CALL(SetSpriteShading, -1) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_802215B0) = { +EvtScript N(afterBattle_802215B0) = { EVT_RETURN EVT_END }; @@ -87,7 +87,7 @@ s32 N(statusTable_80221674)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80221720)[] = { +ActorPartBlueprint N(partsTable_80221720)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -102,7 +102,7 @@ ActorPartDesc N(partsTable_80221720)[] = { }, }; -ActorDesc N(whacka) = { +ActorBlueprint N(whacka) = { .flags = ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_40000, .type = ACTOR_TYPE_WHACKA, .level = 0, @@ -127,7 +127,7 @@ ActorDesc N(whacka) = { #include "common/IsSaveVar123.inc.c" -EvtSource N(init_8022176C) = { +EvtScript N(init_8022176C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80222000))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80221828))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022185C))) @@ -141,7 +141,7 @@ EvtSource N(init_8022176C) = { EVT_END }; -EvtSource N(idle_80221828) = { +EvtScript N(idle_80221828) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_GOTO(0) @@ -149,7 +149,7 @@ EvtSource N(idle_80221828) = { EVT_END }; -EvtSource N(handleEvent_8022185C) = { +EvtScript N(handleEvent_8022185C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -299,7 +299,7 @@ EvtSource N(handleEvent_8022185C) = { EVT_END }; -EvtSource N(takeTurn_80222000) = { +EvtScript N(takeTurn_80222000) = { EVT_CALL(RandInt, 100, LW(0)) EVT_IF_LE(LW(0), 100) EVT_EXEC_WAIT(N(80222130)) @@ -309,7 +309,7 @@ EvtSource N(takeTurn_80222000) = { EVT_END }; -EvtSource N(80222050) = { +EvtScript N(80222050) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2073) EVT_THREAD @@ -325,7 +325,7 @@ EvtSource N(80222050) = { EVT_END }; -EvtSource N(80222130) = { +EvtScript N(80222130) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MOLE_DIG) diff --git a/src/battle/area_kkj/6DBDA0.c b/src/battle/area_kkj/6DBDA0.c index d8201206bb..8c7766ec6a 100644 --- a/src/battle/area_kkj/6DBDA0.c +++ b/src/battle/area_kkj/6DBDA0.c @@ -85,7 +85,7 @@ ApiStatus func_8021849C_6DC23C(Evt* script, s32 isInitialCall) { playerStatus->flags |= 0x1000000; entity->collisionFlags = 0x40; playerStatus->actionState = ACTION_STATE_HAMMER; - entity->staticData->fpHandleCollision(entity); + entity->blueprint->fpHandleCollision(entity); entity->unk_07 = 0xA; entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; collisionStatus->lastWallHammered = -1; diff --git a/src/battle/area_kmr_part_1/area.c b/src/battle/area_kmr_part_1/area.c index 543161aa97..6c59e7fed6 100644 --- a/src/battle/area_kmr_part_1/area.c +++ b/src/battle/area_kmr_part_1/area.c @@ -3,9 +3,9 @@ #define NAMESPACE b_area_kmr_part_1 -extern ActorDesc N(goomba); -extern ActorDesc N(paragoomba); -extern ActorDesc N(spiked_goomba); +extern ActorBlueprint N(goomba); +extern ActorBlueprint N(paragoomba); +extern ActorBlueprint N(spiked_goomba); extern Stage N(kmr_02); extern Stage N(kmr_03); diff --git a/src/battle/area_kmr_part_1/stage/kmr_02.c b/src/battle/area_kmr_part_1/stage/kmr_02.c index 8d7741604a..9bb723cab9 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_02.c +++ b/src/battle/area_kmr_part_1/stage/kmr_02.c @@ -3,13 +3,13 @@ #define NAMESPACE b_area_kmr_part_1_kmr_02 -EvtSource N(beforeBattle_8021FDA0) = { +EvtScript N(beforeBattle_8021FDA0) = { EVT_CALL(SetSpriteShading, -1) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_8021FDC0) = { +EvtScript N(afterBattle_8021FDC0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_1/stage/kmr_03.c b/src/battle/area_kmr_part_1/stage/kmr_03.c index 50fe45e7ca..dc30080e1f 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_03.c +++ b/src/battle/area_kmr_part_1/stage/kmr_03.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80220188) = { +EvtScript N(beforeBattle_80220188) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(EVT_VAR(0), 1) EVT_SET(EVT_VAR(2), 0) @@ -17,7 +17,7 @@ EvtSource N(beforeBattle_80220188) = { EVT_END }; -EvtSource N(afterBattle_80220200) = { +EvtScript N(afterBattle_80220200) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_1/stage/kmr_04.c b/src/battle/area_kmr_part_1/stage/kmr_04.c index 208bbc18c5..107e2facdf 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_04.c +++ b/src/battle/area_kmr_part_1/stage/kmr_04.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_802205D8) = { +EvtScript N(beforeBattle_802205D8) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(EVT_VAR(0), 1) EVT_SET(EVT_VAR(2), 0) @@ -17,7 +17,7 @@ EvtSource N(beforeBattle_802205D8) = { EVT_END }; -EvtSource N(afterBattle_80220650) = { +EvtScript N(afterBattle_80220650) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_1/stage/kmr_05.c b/src/battle/area_kmr_part_1/stage/kmr_05.c index 4c017649fb..6bb9a11e99 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_05.c +++ b/src/battle/area_kmr_part_1/stage/kmr_05.c @@ -5,14 +5,14 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80220A28) = { +EvtScript N(beforeBattle_80220A28) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(EnableModel, 27, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80220A5C) = { +EvtScript N(afterBattle_80220A5C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_1/stage/kmr_06.c b/src/battle/area_kmr_part_1/stage/kmr_06.c index 56b610b837..471bce46e4 100644 --- a/src/battle/area_kmr_part_1/stage/kmr_06.c +++ b/src/battle/area_kmr_part_1/stage/kmr_06.c @@ -6,7 +6,7 @@ #include "world/common/clouds.inc.c" #include "common/UnkFogFunc.inc.c" -EvtSource N(beforeBattle_80220E28) = { +EvtScript N(beforeBattle_80220E28) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(N(UnkFogFunc)) EVT_SET(EVT_VAR(0), 1) @@ -19,7 +19,7 @@ EvtSource N(beforeBattle_80220E28) = { EVT_END }; -EvtSource N(afterBattle_80220EAC) = { +EvtScript N(afterBattle_80220EAC) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_2/actor/blue_goomba.c b/src/battle/area_kmr_part_2/actor/blue_goomba.c index c23707a022..5af492a5d3 100644 --- a/src/battle/area_kmr_part_2/actor/blue_goomba.c +++ b/src/battle/area_kmr_part_2/actor/blue_goomba.c @@ -36,14 +36,14 @@ s32 N(statusTable_802198BC)[] = { }; extern s32 N(idleAnimations_802199B4)[]; -extern EvtSource N(init_8021B268); -extern EvtSource N(doDeath_8021B388); -extern EvtSource N(takeTurn_8021A5A0); -extern EvtSource N(idle_80219A98); -extern EvtSource N(handleEvent_80219D74); -extern EvtSource N(takeTurn_8021B2C8); +extern EvtScript N(init_8021B268); +extern EvtScript N(doDeath_8021B388); +extern EvtScript N(takeTurn_8021A5A0); +extern EvtScript N(idle_80219A98); +extern EvtScript N(handleEvent_80219D74); +extern EvtScript N(takeTurn_8021B2C8); -ActorPartDesc N(partsTable_80219968)[] = { +ActorPartBlueprint N(partsTable_80219968)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -58,7 +58,7 @@ ActorPartDesc N(partsTable_80219968)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_BLUE_GOOMBA_BOSS, .level = 20, @@ -107,7 +107,7 @@ s32 N(idleAnimations_80219A00)[] = { STATUS_END, }; -EvtSource N(init_80219A4C) = { +EvtScript N(init_80219A4C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021A5A0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80219A98))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80219D74))) @@ -115,7 +115,7 @@ EvtSource N(init_80219A4C) = { EVT_END }; -EvtSource N(idle_80219A98) = { +EvtScript N(idle_80219A98) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -165,7 +165,7 @@ EvtSource N(idle_80219A98) = { EVT_END }; -EvtSource N(handleEvent_80219D74) = { +EvtScript N(handleEvent_80219D74) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -284,7 +284,7 @@ EvtSource N(handleEvent_80219D74) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021A5A0) = { +EvtScript N(takeTurn_8021A5A0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -456,7 +456,7 @@ EvtSource N(takeTurn_8021A5A0) = { EVT_END }; -EvtSource N(init_8021B268) = { +EvtScript N(init_8021B268) = { EVT_EXEC_WAIT(N(init_80219A4C)) EVT_CALL(SetActorVar, -127, 0, 0) EVT_CALL(SetActorVar, -127, 1, 0) @@ -465,7 +465,7 @@ EvtSource N(init_8021B268) = { EVT_END }; -EvtSource N(takeTurn_8021B2C8) = { +EvtScript N(takeTurn_8021B2C8) = { EVT_CALL(GetActorVar, -127, 0, LW(0)) EVT_IF_EQ(LW(0), 0) EVT_CALL(UseBattleCamPreset, 14) @@ -480,7 +480,7 @@ EvtSource N(takeTurn_8021B2C8) = { EVT_END }; -EvtSource N(doDeath_8021B388) = { +EvtScript N(doDeath_8021B388) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_SET(LW(2), 0) diff --git a/src/battle/area_kmr_part_2/actor/blue_goomba2.c b/src/battle/area_kmr_part_2/actor/blue_goomba2.c index c43cfe4ad2..4adfb33b31 100644 --- a/src/battle/area_kmr_part_2/actor/blue_goomba2.c +++ b/src/battle/area_kmr_part_2/actor/blue_goomba2.c @@ -36,12 +36,12 @@ s32 N(statusTable_8021D40C)[] = { }; extern s32 N(idleAnimations_8021D504)[]; -extern EvtSource N(init_8021EDB8); -extern EvtSource N(takeTurn_8021E0F0); -extern EvtSource N(idle_8021D5E8); -extern EvtSource N(handleEvent_8021D8C4); +extern EvtScript N(init_8021EDB8); +extern EvtScript N(takeTurn_8021E0F0); +extern EvtScript N(idle_8021D5E8); +extern EvtScript N(handleEvent_8021D8C4); -ActorPartDesc N(partsTable_8021D4B8)[] = { +ActorPartBlueprint N(partsTable_8021D4B8)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -56,7 +56,7 @@ ActorPartDesc N(partsTable_8021D4B8)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_BLUE_GOOMBA_BOSS, .level = 20, @@ -105,7 +105,7 @@ s32 N(idleAnimations_8021D550)[] = { STATUS_END, }; -EvtSource N(init_8021D59C) = { +EvtScript N(init_8021D59C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021E0F0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021D5E8))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D8C4))) @@ -113,7 +113,7 @@ EvtSource N(init_8021D59C) = { EVT_END }; -EvtSource N(idle_8021D5E8) = { +EvtScript N(idle_8021D5E8) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -163,7 +163,7 @@ EvtSource N(idle_8021D5E8) = { EVT_END }; -EvtSource N(handleEvent_8021D8C4) = { +EvtScript N(handleEvent_8021D8C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -282,7 +282,7 @@ EvtSource N(handleEvent_8021D8C4) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021E0F0) = { +EvtScript N(takeTurn_8021E0F0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -456,7 +456,7 @@ EvtSource N(takeTurn_8021E0F0) = { #include "common/DivActorLevel4.inc.c" -EvtSource N(init_8021EDB8) = { +EvtScript N(init_8021EDB8) = { EVT_EXEC_WAIT(N(init_8021D59C)) EVT_CALL(SetEnemyHP, -127, 2) EVT_CALL(N(DivActorLevel4)) diff --git a/src/battle/area_kmr_part_2/actor/goomba_king.c b/src/battle/area_kmr_part_2/actor/goomba_king.c index f0ca0d14d7..e85eac90fc 100644 --- a/src/battle/area_kmr_part_2/actor/goomba_king.c +++ b/src/battle/area_kmr_part_2/actor/goomba_king.c @@ -84,7 +84,7 @@ s32 N(statusTable_8022091C)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_802209C8)[] = { +ActorPartBlueprint N(partsTable_802209C8)[] = { { .flags = ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -111,17 +111,17 @@ ActorPartDesc N(partsTable_802209C8)[] = { }, }; -extern EvtSource N(init_80220A38); -extern EvtSource N(takeTurn_80221530); -extern EvtSource N(idle_80220B50); -extern EvtSource N(handleEvent_80220F34); -extern EvtSource N(nextTurn_802229C4); -extern EvtSource N(80222D9C); -extern EvtSource N(80221CD4); -extern EvtSource N(80221680); -extern EvtSource N(doDeath_80222F50); +extern EvtScript N(init_80220A38); +extern EvtScript N(takeTurn_80221530); +extern EvtScript N(idle_80220B50); +extern EvtScript N(handleEvent_80220F34); +extern EvtScript N(nextTurn_802229C4); +extern EvtScript N(80222D9C); +extern EvtScript N(80221CD4); +extern EvtScript N(80221680); +extern EvtScript N(doDeath_80222F50); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_GOOMBA_KING, .level = 49, @@ -154,7 +154,7 @@ ApiStatus func_80218A60_43A4F0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(init_80220A38) = { +EvtScript N(init_80220A38) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80221530))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80220B50))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80220F34))) @@ -171,7 +171,7 @@ EvtSource N(init_80220A38) = { EVT_END }; -EvtSource N(idle_80220B50) = { +EvtScript N(idle_80220B50) = { EVT_LABEL(0) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -210,7 +210,7 @@ EvtSource N(idle_80220B50) = { EVT_END }; -EvtSource N(80220DB0) = { +EvtScript N(80220DB0) = { EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -230,7 +230,7 @@ EvtSource N(80220DB0) = { EVT_END }; -EvtSource N(handleEvent_80220F34) = { +EvtScript N(handleEvent_80220F34) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -337,7 +337,7 @@ EvtSource N(handleEvent_80220F34) = { EVT_END }; -EvtSource N(takeTurn_80221530) = { +EvtScript N(takeTurn_80221530) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -362,7 +362,7 @@ EvtSource N(takeTurn_80221530) = { EVT_END }; -EvtSource N(80221680) = { +EvtScript N(80221680) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NOT_FLAG(LW(0), 0x80000) EVT_CALL(UseBattleCamPreset, 63) @@ -458,7 +458,7 @@ EvtSource N(80221680) = { EVT_END }; -EvtSource N(80221CD4) = { +EvtScript N(80221CD4) = { EVT_CALL(UseBattleCamPreset, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 40) @@ -631,7 +631,7 @@ EvtSource N(80221CD4) = { EVT_END }; -EvtSource N(nextTurn_802229C4) = { +EvtScript N(nextTurn_802229C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -689,7 +689,7 @@ EvtSource N(nextTurn_802229C4) = { EVT_END }; -EvtSource N(80222D9C) = { +EvtScript N(80222D9C) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_CALL(GetAnimation, -127, 1, LW(0)) @@ -721,7 +721,7 @@ EvtSource N(80222D9C) = { EVT_END }; -EvtSource N(doDeath_80222F50) = { +EvtScript N(doDeath_80222F50) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_SET(LW(2), 0) diff --git a/src/battle/area_kmr_part_2/actor/goomnut_tree.c b/src/battle/area_kmr_part_2/actor/goomnut_tree.c index 7d39443965..46d351a008 100644 --- a/src/battle/area_kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area_kmr_part_2/actor/goomnut_tree.c @@ -41,14 +41,14 @@ s32 N(statusTable_802232F0)[] = { STATUS_END, }; -extern EvtSource N(init_80223488); -extern EvtSource N(takeTurn_80223804); -extern EvtSource N(idle_80223678); -extern EvtSource N(handleEvent_80223688); -extern EvtSource N(shake_goomnut_tree); -extern EvtSource N(80223DBC); +extern EvtScript N(init_80223488); +extern EvtScript N(takeTurn_80223804); +extern EvtScript N(idle_80223678); +extern EvtScript N(handleEvent_80223688); +extern EvtScript N(shake_goomnut_tree); +extern EvtScript N(80223DBC); -ActorPartDesc N(partsTable_8022339C)[] = { +ActorPartBlueprint N(partsTable_8022339C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -111,7 +111,7 @@ ActorPartDesc N(partsTable_8022339C)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_TARGET_ONLY | ACTOR_FLAG_NO_DMG_POPUP, .type = ACTOR_TYPE_GOOMNUT_TREE, .level = 1, @@ -140,7 +140,7 @@ s32 N(unk_missing_80223478)[] = { 1, 0, }; -EvtSource N(init_80223488) = { +EvtScript N(init_80223488) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80223804))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80223678))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80223688))) @@ -163,12 +163,12 @@ EvtSource N(init_80223488) = { EVT_END }; -EvtSource N(idle_80223678) = { +EvtScript N(idle_80223678) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80223688) = { +EvtScript N(handleEvent_80223688) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastElement, LW(14)) @@ -201,7 +201,7 @@ EvtSource N(handleEvent_80223688) = { EVT_END }; -EvtSource N(takeTurn_80223804) = { +EvtScript N(takeTurn_80223804) = { EVT_SWITCH(LW(0)) EVT_CASE_EQ(6) EVT_RETURN @@ -218,7 +218,7 @@ EvtSource N(takeTurn_80223804) = { #include "common/FoliageTransform.inc.c" -EvtSource N(shakeTree) = { +EvtScript N(shakeTree) = { EVT_SET_TIMESCALE(EVT_FLOAT(2.0)) EVT_USE_BUF(LW(0)) EVT_BUF_READ4(LW(1), LW(2), LW(3), LW(4)) @@ -330,14 +330,14 @@ ShakeTreeConfig N(tree) = { .vectors = &N(D_80223D60_41D7F0), }; -EvtSource N(shake_goomnut_tree) = { +EvtScript N(shake_goomnut_tree) = { EVT_SET(LW(0), EVT_ADDR(N(tree))) EVT_EXEC_WAIT(N(shakeTree)) EVT_RETURN EVT_END }; -EvtSource N(80223DBC) = { +EvtScript N(80223DBC) = { EVT_CALL(PlayEffect, 0x14, 0, -25, 120, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(GetActorVar, -127, 5, LW(0)) EVT_IF_NE(LW(0), 0) diff --git a/src/battle/area_kmr_part_2/actor/red_goomba.c b/src/battle/area_kmr_part_2/actor/red_goomba.c index 89efe03340..142d0bf03d 100644 --- a/src/battle/area_kmr_part_2/actor/red_goomba.c +++ b/src/battle/area_kmr_part_2/actor/red_goomba.c @@ -36,14 +36,14 @@ s32 N(statusTable_8021B6CC)[] = { }; extern s32 N(idleAnimations_8021B7C4)[]; -extern EvtSource N(idle_8021B8A8); -extern EvtSource N(handleEvent_8021BB84); -extern EvtSource N(takeTurn_8021C3B0); -extern EvtSource N(init_8021D078); -extern EvtSource N(doDeath_8021D0C4); +extern EvtScript N(idle_8021B8A8); +extern EvtScript N(handleEvent_8021BB84); +extern EvtScript N(takeTurn_8021C3B0); +extern EvtScript N(init_8021D078); +extern EvtScript N(doDeath_8021D0C4); -ActorPartDesc N(partsTable_8021B778)[] = { +ActorPartBlueprint N(partsTable_8021B778)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -58,7 +58,7 @@ ActorPartDesc N(partsTable_8021B778)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_RED_GOOMBA_BOSS, .level = 20, @@ -107,7 +107,7 @@ s32 N(idleAnimations_8021B810)[] = { STATUS_END, }; -EvtSource N(init_8021B85C) = { +EvtScript N(init_8021B85C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021C3B0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021B8A8))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021BB84))) @@ -115,7 +115,7 @@ EvtSource N(init_8021B85C) = { EVT_END }; -EvtSource N(idle_8021B8A8) = { +EvtScript N(idle_8021B8A8) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -165,7 +165,7 @@ EvtSource N(idle_8021B8A8) = { EVT_END }; -EvtSource N(handleEvent_8021BB84) = { +EvtScript N(handleEvent_8021BB84) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -284,7 +284,7 @@ EvtSource N(handleEvent_8021BB84) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021C3B0) = { +EvtScript N(takeTurn_8021C3B0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -456,7 +456,7 @@ EvtSource N(takeTurn_8021C3B0) = { EVT_END }; -EvtSource N(init_8021D078) = { +EvtScript N(init_8021D078) = { EVT_EXEC_WAIT(N(init_8021B85C)) EVT_CALL(SetActorVar, -127, 0, 0) EVT_CALL(SetActorVar, -127, 1, 0) @@ -464,7 +464,7 @@ EvtSource N(init_8021D078) = { EVT_END }; -EvtSource N(doDeath_8021D0C4) = { +EvtScript N(doDeath_8021D0C4) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_SET(LW(2), 0) diff --git a/src/battle/area_kmr_part_2/actor/red_goomba2.c b/src/battle/area_kmr_part_2/actor/red_goomba2.c index d0084b3355..f939b40f21 100644 --- a/src/battle/area_kmr_part_2/actor/red_goomba2.c +++ b/src/battle/area_kmr_part_2/actor/red_goomba2.c @@ -36,12 +36,12 @@ s32 N(statusTable_8021EE0C)[] = { }; extern s32 N(idleAnimations_8021EF04)[]; -extern EvtSource N(init_802207B8); -extern EvtSource N(takeTurn_8021FAF0); -extern EvtSource N(idle_8021EFE8); -extern EvtSource N(handleEvent_8021F2C4); +extern EvtScript N(init_802207B8); +extern EvtScript N(takeTurn_8021FAF0); +extern EvtScript N(idle_8021EFE8); +extern EvtScript N(handleEvent_8021F2C4); -ActorPartDesc N(partsTable_8021EEB8)[] = { +ActorPartBlueprint N(partsTable_8021EEB8)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -56,7 +56,7 @@ ActorPartDesc N(partsTable_8021EEB8)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_RED_GOOMBA_BOSS, .level = 20, @@ -105,7 +105,7 @@ s32 N(idleAnimations_8021EF50)[] = { STATUS_END, }; -EvtSource N(init_8021EF9C) = { +EvtScript N(init_8021EF9C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021FAF0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021EFE8))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021F2C4))) @@ -113,7 +113,7 @@ EvtSource N(init_8021EF9C) = { EVT_END }; -EvtSource N(idle_8021EFE8) = { +EvtScript N(idle_8021EFE8) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -163,7 +163,7 @@ EvtSource N(idle_8021EFE8) = { EVT_END }; -EvtSource N(handleEvent_8021F2C4) = { +EvtScript N(handleEvent_8021F2C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -282,7 +282,7 @@ EvtSource N(handleEvent_8021F2C4) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021FAF0) = { +EvtScript N(takeTurn_8021FAF0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -456,7 +456,7 @@ EvtSource N(takeTurn_8021FAF0) = { #include "common/DivActorLevel4.inc.c" -EvtSource N(init_802207B8) = { +EvtScript N(init_802207B8) = { EVT_EXEC_WAIT(N(init_8021EF9C)) EVT_CALL(SetEnemyHP, -127, 2) EVT_CALL(N(DivActorLevel4)) diff --git a/src/battle/area_kmr_part_2/area.c b/src/battle/area_kmr_part_2/area.c index d21f3dc872..85b1cb950c 100644 --- a/src/battle/area_kmr_part_2/area.c +++ b/src/battle/area_kmr_part_2/area.c @@ -4,12 +4,12 @@ #define NAMESPACE b_area_kmr_part_2 -extern ActorDesc N(blue_goomba); -extern ActorDesc N(red_goomba); -extern ActorDesc N(goomba_king); -extern ActorDesc N(red_goomba_2); -extern ActorDesc N(blue_goomba_2); -extern ActorDesc N(goomnut_tree); +extern ActorBlueprint N(blue_goomba); +extern ActorBlueprint N(red_goomba); +extern ActorBlueprint N(goomba_king); +extern ActorBlueprint N(red_goomba_2); +extern ActorBlueprint N(blue_goomba_2); +extern ActorBlueprint N(goomnut_tree); extern Stage N(kmr_02); extern Stage N(kmr_03); diff --git a/src/battle/area_kmr_part_2/stage/kmr_02.c b/src/battle/area_kmr_part_2/stage/kmr_02.c index 0fba745b4d..8a6d152c16 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_02.c +++ b/src/battle/area_kmr_part_2/stage/kmr_02.c @@ -3,13 +3,13 @@ #define NAMESPACE b_area_kmr_part_2_kmr_02 -EvtSource N(beforeBattle_80224700) = { +EvtScript N(beforeBattle_80224700) = { EVT_CALL(SetSpriteShading, -1) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80224720) = { +EvtScript N(afterBattle_80224720) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_2/stage/kmr_03.c b/src/battle/area_kmr_part_2/stage/kmr_03.c index c0dfa38adb..ef0aae133e 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_03.c +++ b/src/battle/area_kmr_part_2/stage/kmr_03.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80224AE8) = { +EvtScript N(beforeBattle_80224AE8) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 1) EVT_SET(LW(2), 0) @@ -17,7 +17,7 @@ EvtSource N(beforeBattle_80224AE8) = { EVT_END }; -EvtSource N(afterBattle_80224B60) = { +EvtScript N(afterBattle_80224B60) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_2/stage/kmr_04.c b/src/battle/area_kmr_part_2/stage/kmr_04.c index d6ebe2c34b..8ede9385fc 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_04.c +++ b/src/battle/area_kmr_part_2/stage/kmr_04.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80224F38) = { +EvtScript N(beforeBattle_80224F38) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 1) EVT_SET(LW(2), 0) @@ -17,7 +17,7 @@ EvtSource N(beforeBattle_80224F38) = { EVT_END }; -EvtSource N(afterBattle_80224FB0) = { +EvtScript N(afterBattle_80224FB0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_2/stage/kmr_05.c b/src/battle/area_kmr_part_2/stage/kmr_05.c index 34df3971db..00c5349389 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_05.c +++ b/src/battle/area_kmr_part_2/stage/kmr_05.c @@ -5,14 +5,14 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80225388) = { +EvtScript N(beforeBattle_80225388) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(EnableModel, 27, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_802253BC) = { +EvtScript N(afterBattle_802253BC) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_2/stage/kmr_06.c b/src/battle/area_kmr_part_2/stage/kmr_06.c index a26fbf717e..5772a8634b 100644 --- a/src/battle/area_kmr_part_2/stage/kmr_06.c +++ b/src/battle/area_kmr_part_2/stage/kmr_06.c @@ -7,7 +7,7 @@ #include "common/UnkFogFunc.inc.c" -EvtSource N(beforeBattle_80225788) = { +EvtScript N(beforeBattle_80225788) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(N(UnkFogFunc)) EVT_SET(LW(0), 1) @@ -20,7 +20,7 @@ EvtSource N(beforeBattle_80225788) = { EVT_END }; -EvtSource N(afterBattle_8022580C) = { +EvtScript N(afterBattle_8022580C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c index 31679a2cd7..ecb0456821 100644 --- a/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c @@ -63,7 +63,7 @@ s32 N(statusTable_80224418)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_802244C4)[] = { +ActorPartBlueprint N(partsTable_802244C4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -78,9 +78,9 @@ ActorPartDesc N(partsTable_802244C4)[] = { }, }; -extern EvtSource N(init_80224A94); +extern EvtScript N(init_80224A94); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_JR_TROOPA2, .level = 44, @@ -103,7 +103,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -EvtSource N(80224510) = { +EvtScript N(80224510) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(UseBattleCamPreset, 7) @@ -115,7 +115,7 @@ EvtSource N(80224510) = { EVT_END }; -EvtSource N(802245A8) = { +EvtScript N(802245A8) = { EVT_CALL(func_802535B4, 1) EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(MoveBattleCamOver, 12) @@ -123,7 +123,7 @@ EvtSource N(802245A8) = { EVT_END }; -EvtSource N(802245E8) = { +EvtScript N(802245E8) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, 55) @@ -138,7 +138,7 @@ s32 N(idleAnimations_8022464C)[] = { STATUS_END, }; -EvtSource N(80224658) = { +EvtScript N(80224658) = { EVT_SET(LW(10), LW(0)) EVT_CALL(func_8027D32C, -127) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -189,7 +189,7 @@ EvtSource N(80224658) = { EVT_END }; -EvtSource N(80224964) = { +EvtScript N(80224964) = { EVT_WAIT_FRAMES(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLOSE_SHELL) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -204,12 +204,12 @@ EvtSource N(80224964) = { EVT_END }; -extern EvtSource N(takeTurn_80225314); -extern EvtSource N(idle_80224B24); -extern EvtSource N(handleEvent_80224B58); -extern EvtSource N(nextTurn_80225B4C); +extern EvtScript N(takeTurn_80225314); +extern EvtScript N(idle_80224B24); +extern EvtScript N(handleEvent_80224B58); +extern EvtScript N(nextTurn_80225B4C); -EvtSource N(init_80224A94) = { +EvtScript N(init_80224A94) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80225314))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80224B24))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80224B58))) @@ -220,7 +220,7 @@ EvtSource N(init_80224A94) = { EVT_END }; -EvtSource N(idle_80224B24) = { +EvtScript N(idle_80224B24) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_GOTO(0) @@ -228,10 +228,10 @@ EvtSource N(idle_80224B24) = { EVT_END }; -extern EvtSource N(802250E4); -extern EvtSource N(802251CC); +extern EvtScript N(802250E4); +extern EvtScript N(802251CC); -EvtSource N(handleEvent_80224B58) = { +EvtScript N(handleEvent_80224B58) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -334,7 +334,7 @@ EvtSource N(handleEvent_80224B58) = { EVT_END }; -EvtSource N(802250E4) = { +EvtScript N(802250E4) = { EVT_CALL(GetActorVar, -127, 1, LW(0)) EVT_IF_EQ(LW(0), 0) EVT_CALL(GetLastDamage, -127, LW(1)) @@ -353,7 +353,7 @@ EvtSource N(802250E4) = { EVT_END }; -EvtSource N(802251CC) = { +EvtScript N(802251CC) = { EVT_CALL(GetActorVar, -127, 1, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) @@ -376,7 +376,7 @@ EvtSource N(802251CC) = { EVT_END }; -EvtSource N(takeTurn_80225314) = { +EvtScript N(takeTurn_80225314) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_OPEN_SHELL) @@ -487,7 +487,7 @@ EvtSource N(takeTurn_80225314) = { EVT_END }; -EvtSource N(nextTurn_80225B4C) = { +EvtScript N(nextTurn_80225B4C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) diff --git a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c b/src/battle/area_kmr_part_3/actor/final_jr_troopa.c index 1fec95d628..7ae8f69a06 100644 --- a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/final_jr_troopa.c @@ -134,7 +134,7 @@ s32 N(statusTable_8022C594)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022C640)[] = { +ActorPartBlueprint N(partsTable_8022C640)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -173,9 +173,9 @@ ActorPartDesc N(partsTable_8022C640)[] = { }, }; -extern EvtSource N(init_8022CF80); +extern EvtScript N(init_8022CF80); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_JR_TROOPA6, .level = 74, @@ -198,7 +198,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 25 }, }; -EvtSource N(8022C6D4) = { +EvtScript N(8022C6D4) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(2)) EVT_IF_FLAG(LW(2), 0x35D000) EVT_RETURN @@ -219,7 +219,7 @@ EvtSource N(8022C6D4) = { EVT_END }; -EvtSource N(8022C804) = { +EvtScript N(8022C804) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20B9) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(3)) @@ -251,7 +251,7 @@ EvtSource N(8022C804) = { EVT_END }; -EvtSource N(8022CB2C) = { +EvtScript N(8022CB2C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(UseBattleCamPreset, 7) @@ -263,7 +263,7 @@ EvtSource N(8022CB2C) = { EVT_END }; -EvtSource N(8022CBC4) = { +EvtScript N(8022CBC4) = { EVT_CALL(func_802535B4, 1) EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(MoveBattleCamOver, 12) @@ -271,7 +271,7 @@ EvtSource N(8022CBC4) = { EVT_END }; -EvtSource N(8022CC04) = { +EvtScript N(8022CC04) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, 55) @@ -286,7 +286,7 @@ s32 N(idleAnimations_8022CC68)[] = { STATUS_END, }; -EvtSource N(8022CC74) = { +EvtScript N(8022CC74) = { EVT_SET(LW(10), LW(0)) EVT_CALL(func_8027D32C, -127) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -337,12 +337,12 @@ EvtSource N(8022CC74) = { EVT_END }; -extern EvtSource N(takeTurn_8022D920); -extern EvtSource N(idle_8022D058); -extern EvtSource N(handleEvent_8022D1C4); -extern EvtSource N(nextTurn_8023147C); +extern EvtScript N(takeTurn_8022D920); +extern EvtScript N(idle_8022D058); +extern EvtScript N(handleEvent_8022D1C4); +extern EvtScript N(nextTurn_8023147C); -EvtSource N(init_8022CF80) = { +EvtScript N(init_8022CF80) = { EVT_CALL(SetActorVar, -127, 0, 0) EVT_CALL(SetActorVar, -127, 2, 0) EVT_CALL(SetActorVar, -127, 1, 0) @@ -356,7 +356,7 @@ EvtSource N(init_8022CF80) = { EVT_END }; -EvtSource N(idle_8022D058) = { +EvtScript N(idle_8022D058) = { EVT_LABEL(0) EVT_CALL(GetActorVar, -127, 3, LW(0)) EVT_SWITCH(LW(0)) @@ -380,12 +380,12 @@ EvtSource N(idle_8022D058) = { EVT_END }; -extern EvtSource N(802315F0); -extern EvtSource N(802318F8); -extern EvtSource N(80232040); -extern EvtSource N(80232170); +extern EvtScript N(802315F0); +extern EvtScript N(802318F8); +extern EvtScript N(80232040); +extern EvtScript N(80232170); -EvtSource N(handleEvent_8022D1C4) = { +EvtScript N(handleEvent_8022D1C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(10)) @@ -517,16 +517,16 @@ EvtSource N(handleEvent_8022D1C4) = { EVT_END }; -extern EvtSource N(8022DD48); -extern EvtSource N(8022DF54); -extern EvtSource N(8022ED10); -extern EvtSource N(8022F468); -extern EvtSource N(80230034); -extern EvtSource N(80230794); -extern EvtSource N(8023106C); -extern EvtSource N(8022E198); +extern EvtScript N(8022DD48); +extern EvtScript N(8022DF54); +extern EvtScript N(8022ED10); +extern EvtScript N(8022F468); +extern EvtScript N(80230034); +extern EvtScript N(80230794); +extern EvtScript N(8023106C); +extern EvtScript N(8022E198); -EvtSource N(takeTurn_8022D920) = { +EvtScript N(takeTurn_8022D920) = { EVT_CALL(GetActorVar, -127, 3, LW(0)) EVT_IF_NE(LW(0), 3) EVT_CALL(GetActorHP, -127, LW(1)) @@ -603,7 +603,7 @@ EvtSource N(takeTurn_8022D920) = { EVT_END }; -EvtSource N(8022DD48) = { +EvtScript N(8022DD48) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, 14) @@ -631,7 +631,7 @@ EvtSource N(8022DD48) = { EVT_END }; -EvtSource N(8022DF54) = { +EvtScript N(8022DF54) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, 14) @@ -662,7 +662,7 @@ EvtSource N(8022DF54) = { EVT_END }; -EvtSource N(8022E198) = { +EvtScript N(8022E198) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -808,7 +808,7 @@ EvtSource N(8022E198) = { EVT_END }; -EvtSource N(8022ED10) = { +EvtScript N(8022ED10) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -905,7 +905,7 @@ EvtSource N(8022ED10) = { ApiStatus N(AngleCalculate)(Evt* script, s32 isInitialCall); -EvtSource N(8022F468) = { +EvtScript N(8022F468) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1047,7 +1047,7 @@ EvtSource N(8022F468) = { #include "common/anglestuff.inc.c" -EvtSource N(80230034) = { +EvtScript N(80230034) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1152,7 +1152,7 @@ EvtSource N(80230034) = { #include "common/SetBackgroundAlpha.inc.c" -EvtSource N(80230794) = { +EvtScript N(80230794) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1273,7 +1273,7 @@ EvtSource N(80230794) = { EVT_END }; -EvtSource N(8023106C) = { +EvtScript N(8023106C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1331,7 +1331,7 @@ EvtSource N(8023106C) = { EVT_END }; -EvtSource N(nextTurn_8023147C) = { +EvtScript N(nextTurn_8023147C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -1357,7 +1357,7 @@ EvtSource N(nextTurn_8023147C) = { EVT_END }; -EvtSource N(802315F0) = { +EvtScript N(802315F0) = { EVT_CALL(GetActorVar, -127, 3, LW(0)) EVT_SWITCH(LW(1)) EVT_CASE_EQ(0) @@ -1422,7 +1422,7 @@ EvtSource N(802315F0) = { EVT_END }; -EvtSource N(802318F8) = { +EvtScript N(802318F8) = { EVT_CALL(GetActorVar, -127, 3, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(2) @@ -1534,7 +1534,7 @@ EvtSource N(802318F8) = { EVT_END }; -EvtSource N(80232040) = { +EvtScript N(80232040) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetActorVar, -127, 3, LW(0)) EVT_SWITCH(LW(0)) @@ -1558,7 +1558,7 @@ EvtSource N(80232040) = { EVT_END }; -EvtSource N(80232170) = { +EvtScript N(80232170) = { EVT_CALL(GetActorVar, -127, 1, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_WAIT_FRAMES(10) diff --git a/src/battle/area_kmr_part_3/actor/jr_troopa.c b/src/battle/area_kmr_part_3/actor/jr_troopa.c index 31d28b2e68..cb9a3e208d 100644 --- a/src/battle/area_kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/jr_troopa.c @@ -47,7 +47,7 @@ s32 N(statusTable_80222A38)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80222AE4)[] = { +ActorPartBlueprint N(partsTable_80222AE4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -62,9 +62,9 @@ ActorPartDesc N(partsTable_80222AE4)[] = { }, }; -extern EvtSource N(init_80223180); +extern EvtScript N(init_80223180); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_JR_TROOPA1, .level = 41, @@ -87,7 +87,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -EvtSource N(80222B30) = { +EvtScript N(80222B30) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(UseBattleCamPreset, 7) @@ -99,7 +99,7 @@ EvtSource N(80222B30) = { EVT_END }; -EvtSource N(80222BC8) = { +EvtScript N(80222BC8) = { EVT_CALL(func_802535B4, 1) EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(MoveBattleCamOver, 12) @@ -107,7 +107,7 @@ EvtSource N(80222BC8) = { EVT_END }; -EvtSource N(80222C08) = { +EvtScript N(80222C08) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, 55) @@ -122,7 +122,7 @@ s32 N(idleAnimations_80222C6C)[] = { STATUS_END, }; -EvtSource N(80222C78) = { +EvtScript N(80222C78) = { EVT_SET(LW(10), LW(0)) EVT_CALL(func_8027D32C, -127) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -203,11 +203,11 @@ EvtSource N(80222C78) = { EVT_END }; -extern EvtSource N(takeTurn_802234A4); -extern EvtSource N(handleEvent_80223290); -extern EvtSource N(nextTurn_80223D2C); +extern EvtScript N(takeTurn_802234A4); +extern EvtScript N(handleEvent_80223290); +extern EvtScript N(nextTurn_80223D2C); -EvtSource N(init_80223180) = { +EvtScript N(init_80223180) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802234A4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80223290))) EVT_CALL(BindNextTurn, -127, EVT_ADDR(N(nextTurn_80223D2C))) @@ -221,7 +221,7 @@ EvtSource N(init_80223180) = { EVT_END }; -EvtSource N(8022325C) = { +EvtScript N(8022325C) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_GOTO(0) @@ -229,7 +229,7 @@ EvtSource N(8022325C) = { EVT_END }; -EvtSource N(handleEvent_80223290) = { +EvtScript N(handleEvent_80223290) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetActorVar, -127, 2, LW(0)) @@ -270,7 +270,7 @@ EvtSource N(handleEvent_80223290) = { EVT_END }; -EvtSource N(takeTurn_802234A4) = { +EvtScript N(takeTurn_802234A4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(AddActorVar, -127, 0, 1) @@ -382,7 +382,7 @@ EvtSource N(takeTurn_802234A4) = { EVT_END }; -EvtSource N(nextTurn_80223D2C) = { +EvtScript N(nextTurn_80223D2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) diff --git a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c index c1337c57d7..eaef662649 100644 --- a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c @@ -78,7 +78,7 @@ s32 N(statusTable_8022A634)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022A6E0)[] = { +ActorPartBlueprint N(partsTable_8022A6E0)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -105,9 +105,9 @@ ActorPartDesc N(partsTable_8022A6E0)[] = { }, }; -extern EvtSource N(init_8022ACE4); +extern EvtScript N(init_8022ACE4); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_JR_TROOPA5, .level = 65, @@ -130,7 +130,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 25 }, }; -EvtSource N(8022A750) = { +EvtScript N(8022A750) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(2)) EVT_IF_FLAG(LW(2), 0x35D000) EVT_RETURN @@ -151,7 +151,7 @@ EvtSource N(8022A750) = { EVT_END }; -EvtSource N(8022A880) = { +EvtScript N(8022A880) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20B9) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(3)) @@ -183,7 +183,7 @@ EvtSource N(8022A880) = { EVT_END }; -EvtSource N(8022ABA8) = { +EvtScript N(8022ABA8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(UseBattleCamPreset, 7) @@ -195,7 +195,7 @@ EvtSource N(8022ABA8) = { EVT_END }; -EvtSource N(8022AC40) = { +EvtScript N(8022AC40) = { EVT_CALL(func_802535B4, 1) EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(MoveBattleCamOver, 12) @@ -203,7 +203,7 @@ EvtSource N(8022AC40) = { EVT_END }; -EvtSource N(8022AC80) = { +EvtScript N(8022AC80) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, 55) @@ -213,12 +213,12 @@ EvtSource N(8022AC80) = { EVT_END }; -extern EvtSource N(takeTurn_8022B4F0); -extern EvtSource N(idle_8022ADA4); -extern EvtSource N(handleEvent_8022ADD8); -extern EvtSource N(nextTurn_8022BB44); +extern EvtScript N(takeTurn_8022B4F0); +extern EvtScript N(idle_8022ADA4); +extern EvtScript N(handleEvent_8022ADD8); +extern EvtScript N(nextTurn_8022BB44); -EvtSource N(init_8022ACE4) = { +EvtScript N(init_8022ACE4) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022B4F0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8022ADA4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022ADD8))) @@ -231,7 +231,7 @@ EvtSource N(init_8022ACE4) = { EVT_END }; -EvtSource N(idle_8022ADA4) = { +EvtScript N(idle_8022ADA4) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_GOTO(0) @@ -239,10 +239,10 @@ EvtSource N(idle_8022ADA4) = { EVT_END }; -extern EvtSource N(8022C2A4); -extern EvtSource N(8022BF1C); +extern EvtScript N(8022C2A4); +extern EvtScript N(8022BF1C); -EvtSource N(handleEvent_8022ADD8) = { +EvtScript N(handleEvent_8022ADD8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -367,7 +367,7 @@ EvtSource N(handleEvent_8022ADD8) = { EVT_END }; -EvtSource N(takeTurn_8022B4F0) = { +EvtScript N(takeTurn_8022B4F0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -458,7 +458,7 @@ EvtSource N(takeTurn_8022B4F0) = { EVT_END }; -EvtSource N(nextTurn_8022BB44) = { +EvtScript N(nextTurn_8022BB44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -521,7 +521,7 @@ EvtSource N(nextTurn_8022BB44) = { EVT_END }; -EvtSource N(8022BF1C) = { +EvtScript N(8022BF1C) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(func_80269E80, LW(5)) @@ -579,7 +579,7 @@ EvtSource N(8022BF1C) = { EVT_END }; -EvtSource N(8022C2A4) = { +EvtScript N(8022C2A4) = { EVT_CALL(GetActorVar, -127, 3, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_WAIT_FRAMES(10) diff --git a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/para_jr_troopa.c index ae204a4636..12a48a8d17 100644 --- a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/para_jr_troopa.c @@ -65,7 +65,7 @@ s32 N(statusTable_80225E60)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80225F0C)[] = { +ActorPartBlueprint N(partsTable_80225F0C)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -92,9 +92,9 @@ ActorPartDesc N(partsTable_80225F0C)[] = { }, }; -extern EvtSource N(init_80226510); +extern EvtScript N(init_80226510); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_JR_TROOPA3, .level = 52, @@ -117,7 +117,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 25 }, }; -EvtSource N(80225F7C) = { +EvtScript N(80225F7C) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(2)) EVT_IF_FLAG(LW(2), 0x35D000) EVT_RETURN @@ -138,7 +138,7 @@ EvtSource N(80225F7C) = { EVT_END }; -EvtSource N(802260AC) = { +EvtScript N(802260AC) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20B9) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(3)) @@ -170,7 +170,7 @@ EvtSource N(802260AC) = { EVT_END }; -EvtSource N(802263D4) = { +EvtScript N(802263D4) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(UseBattleCamPreset, 7) @@ -182,7 +182,7 @@ EvtSource N(802263D4) = { EVT_END }; -EvtSource N(8022646C) = { +EvtScript N(8022646C) = { EVT_CALL(func_802535B4, 1) EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(MoveBattleCamOver, 12) @@ -190,7 +190,7 @@ EvtSource N(8022646C) = { EVT_END }; -EvtSource N(802264AC) = { +EvtScript N(802264AC) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, 55) @@ -200,12 +200,12 @@ EvtSource N(802264AC) = { EVT_END }; -extern EvtSource N(takeTurn_80226F58); -extern EvtSource N(idle_802265A0); -extern EvtSource N(handleEvent_802266B0); -extern EvtSource N(nextTurn_80227724); +extern EvtScript N(takeTurn_80226F58); +extern EvtScript N(idle_802265A0); +extern EvtScript N(handleEvent_802266B0); +extern EvtScript N(nextTurn_80227724); -EvtSource N(init_80226510) = { +EvtScript N(init_80226510) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80226F58))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_802265A0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_802266B0))) @@ -218,7 +218,7 @@ EvtSource N(init_80226510) = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(idle_802265A0) = { +EvtScript N(idle_802265A0) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(10)) EVT_IF_FLAG(LW(10), 0x41000) @@ -236,11 +236,11 @@ EvtSource N(idle_802265A0) = { EVT_END }; -extern EvtSource N(802279B0); -extern EvtSource N(80227D38); -extern EvtSource N(80227E1C); +extern EvtScript N(802279B0); +extern EvtScript N(80227D38); +extern EvtScript N(80227E1C); -EvtSource N(handleEvent_802266B0) = { +EvtScript N(handleEvent_802266B0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -360,7 +360,7 @@ EvtSource N(handleEvent_802266B0) = { EVT_END }; -EvtSource N(80226D4C) = { +EvtScript N(80226D4C) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_ADD(LW(0), 40) EVT_SET(LW(1), 0) @@ -387,7 +387,7 @@ EvtSource N(80226D4C) = { EVT_END }; -EvtSource N(takeTurn_80226F58) = { +EvtScript N(takeTurn_80226F58) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -491,7 +491,7 @@ EvtSource N(takeTurn_80226F58) = { EVT_END }; -EvtSource N(nextTurn_80227724) = { +EvtScript N(nextTurn_80227724) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(15)) @@ -531,7 +531,7 @@ EvtSource N(nextTurn_80227724) = { EVT_END }; -EvtSource N(802279B0) = { +EvtScript N(802279B0) = { EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_IF_EQ(LW(1), 0) @@ -581,7 +581,7 @@ EvtSource N(802279B0) = { EVT_END }; -EvtSource N(80227D38) = { +EvtScript N(80227D38) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_para_jr_troopa_default_run) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -596,7 +596,7 @@ EvtSource N(80227D38) = { EVT_END }; -EvtSource N(80227E1C) = { +EvtScript N(80227E1C) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NOT_FLAG(LW(0), 0x35D000) EVT_CALL(GetActorVar, -127, 1, LW(0)) diff --git a/src/battle/area_kmr_part_3/actor/paragoomba.c b/src/battle/area_kmr_part_3/actor/paragoomba.c index 66978f49a1..f9372b4187 100644 --- a/src/battle/area_kmr_part_3/actor/paragoomba.c +++ b/src/battle/area_kmr_part_3/actor/paragoomba.c @@ -70,12 +70,12 @@ extern s32 N(idleAnimations_8021DB9C)[]; extern s32 N(idleAnimations_8021C3D8)[]; extern s32 N(idleAnimations_8021C470)[]; extern s32 N(idleAnimations_8021C47C)[]; -extern EvtSource N(init_8021F450); -extern EvtSource N(takeTurn_8021CDFC); -extern EvtSource N(idle_8021C4D4); -extern EvtSource N(handleEvent_8021C808); +extern EvtScript N(init_8021F450); +extern EvtScript N(takeTurn_8021CDFC); +extern EvtScript N(idle_8021C4D4); +extern EvtScript N(handleEvent_8021C808); -ActorPartDesc N(partsTable)[] = { +ActorPartBlueprint N(partsTable)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -126,7 +126,7 @@ ActorPartDesc N(partsTable)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_PARAGOOMBA, .level = 6, @@ -185,7 +185,7 @@ s32 N(idleAnimations_8021C47C)[] = { STATUS_END, }; -EvtSource N(8021C488) = { +EvtScript N(8021C488) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021CDFC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021C4D4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021C808))) @@ -193,7 +193,7 @@ EvtSource N(8021C488) = { EVT_END }; -EvtSource N(idle_8021C4D4) = { +EvtScript N(idle_8021C4D4) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -241,7 +241,7 @@ EvtSource N(idle_8021C4D4) = { EVT_END }; -EvtSource N(8021C790) = { +EvtScript N(8021C790) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) @@ -251,9 +251,9 @@ EvtSource N(8021C790) = { EVT_END }; -extern EvtSource N(8021D614); +extern EvtScript N(8021D614); -EvtSource N(handleEvent_8021C808) = { +EvtScript N(handleEvent_8021C808) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -365,7 +365,7 @@ EvtSource N(handleEvent_8021C808) = { EVT_END }; -EvtSource N(takeTurn_8021CDFC) = { +EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -479,9 +479,9 @@ EvtSource N(takeTurn_8021CDFC) = { #include "common/StartRumbleWithParams.inc.c" -extern EvtSource N(8021DC34); +extern EvtScript N(8021DC34); -EvtSource N(8021D614) = { +EvtScript N(8021D614) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 131077) EVT_CALL(SetPartFlags, ACTOR_SELF, 3, 1179652) @@ -574,11 +574,11 @@ s32 N(idleAnimations_8021DBE8)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021E788); -extern EvtSource N(idle); -extern EvtSource N(handleEvent_8021DF5C); +extern EvtScript N(takeTurn_8021E788); +extern EvtScript N(idle); +extern EvtScript N(handleEvent_8021DF5C); -EvtSource N(8021DC34) = { +EvtScript N(8021DC34) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021E788))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021DF5C))) @@ -586,7 +586,7 @@ EvtSource N(8021DC34) = { EVT_END }; -EvtSource N(idle) = { +EvtScript N(idle) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -636,7 +636,7 @@ EvtSource N(idle) = { EVT_END }; -EvtSource N(handleEvent_8021DF5C) = { +EvtScript N(handleEvent_8021DF5C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -755,7 +755,7 @@ EvtSource N(handleEvent_8021DF5C) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021E788) = { +EvtScript N(takeTurn_8021E788) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -927,9 +927,9 @@ EvtSource N(takeTurn_8021E788) = { EVT_END }; -extern EvtSource N(nextTurn_8021F690); +extern EvtScript N(nextTurn_8021F690); -EvtSource N(init_8021F450) = { +EvtScript N(init_8021F450) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021CDFC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021C4D4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021C808))) @@ -938,7 +938,7 @@ EvtSource N(init_8021F450) = { EVT_END }; -EvtSource N(8021F4B0) = { +EvtScript N(8021F4B0) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT_FRAMES(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -971,7 +971,7 @@ EvtSource N(8021F4B0) = { EVT_END }; -EvtSource N(nextTurn_8021F690) = { +EvtScript N(nextTurn_8021F690) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(EnableIdleScript, ACTOR_PARTNER, 0) EVT_CALL(GetBattlePhase, LW(0)) diff --git a/src/battle/area_kmr_part_3/actor/spiked_goomba.c b/src/battle/area_kmr_part_3/actor/spiked_goomba.c index 5c1f5405e6..3aae8688d2 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_goomba.c +++ b/src/battle/area_kmr_part_3/actor/spiked_goomba.c @@ -36,12 +36,12 @@ s32 N(statusTable_8021A39C)[] = { }; extern s32 N(idleAnimations_8021A494)[]; -extern EvtSource N(init_8021BEBC); -extern EvtSource N(takeTurn_8021B19C); -extern EvtSource N(idle_8021A578); -extern EvtSource N(handleEvent_8021A854); +extern EvtScript N(init_8021BEBC); +extern EvtScript N(takeTurn_8021B19C); +extern EvtScript N(idle_8021A578); +extern EvtScript N(handleEvent_8021A854); -ActorPartDesc N(partsTable_8021A448)[] = { +ActorPartBlueprint N(partsTable_8021A448)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -56,7 +56,7 @@ ActorPartDesc N(partsTable_8021A448)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_SPIKED_GOOMBA, .level = 6, @@ -105,7 +105,7 @@ s32 N(idleAnimations_8021A4E0)[] = { STATUS_END, }; -EvtSource N(8021A52C) = { +EvtScript N(8021A52C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021B19C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021A578))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021A854))) @@ -113,7 +113,7 @@ EvtSource N(8021A52C) = { EVT_END }; -EvtSource N(idle_8021A578) = { +EvtScript N(idle_8021A578) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -163,7 +163,7 @@ EvtSource N(idle_8021A578) = { EVT_END }; -EvtSource N(handleEvent_8021A854) = { +EvtScript N(handleEvent_8021A854) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -297,7 +297,7 @@ EvtSource N(handleEvent_8021A854) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021B19C) = { +EvtScript N(takeTurn_8021B19C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -475,9 +475,9 @@ EvtSource N(takeTurn_8021B19C) = { EVT_END }; -extern EvtSource N(nextTurn_8021C0FC); +extern EvtScript N(nextTurn_8021C0FC); -EvtSource N(init_8021BEBC) = { +EvtScript N(init_8021BEBC) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021B19C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021A578))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021A854))) @@ -486,7 +486,7 @@ EvtSource N(init_8021BEBC) = { EVT_END }; -EvtSource N(8021BF1C) = { +EvtScript N(8021BF1C) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT_FRAMES(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -519,7 +519,7 @@ EvtSource N(8021BF1C) = { EVT_END }; -EvtSource N(nextTurn_8021C0FC) = { +EvtScript N(nextTurn_8021C0FC) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(EnableIdleScript, ACTOR_PARTNER, 0) EVT_CALL(GetBattlePhase, LW(0)) diff --git a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c index f01006a7f3..55706eda0e 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c @@ -59,7 +59,7 @@ s32 N(statusTable_80227F68)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80228014)[] = { +ActorPartBlueprint N(partsTable_80228014)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -86,9 +86,9 @@ ActorPartDesc N(partsTable_80228014)[] = { }, }; -extern EvtSource N(init_80228618); +extern EvtScript N(init_80228618); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_JR_TROOPA4, .level = 59, @@ -111,7 +111,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 25 }, }; -EvtSource N(80228084) = { +EvtScript N(80228084) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(2)) EVT_IF_FLAG(LW(2), 0x35D000) EVT_RETURN @@ -132,7 +132,7 @@ EvtSource N(80228084) = { EVT_END }; -EvtSource N(802281B4) = { +EvtScript N(802281B4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20B9) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(3)) @@ -164,7 +164,7 @@ EvtSource N(802281B4) = { EVT_END }; -EvtSource N(802284DC) = { +EvtScript N(802284DC) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(UseBattleCamPreset, 7) @@ -176,7 +176,7 @@ EvtSource N(802284DC) = { EVT_END }; -EvtSource N(80228574) = { +EvtScript N(80228574) = { EVT_CALL(func_802535B4, 1) EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(MoveBattleCamOver, 12) @@ -184,7 +184,7 @@ EvtSource N(80228574) = { EVT_END }; -EvtSource N(802285B4) = { +EvtScript N(802285B4) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, 55) @@ -194,12 +194,12 @@ EvtSource N(802285B4) = { EVT_END }; -extern EvtSource N(takeTurn_8022936C); -extern EvtSource N(idle_802286C0); -extern EvtSource N(handleEvent_802287D0); -extern EvtSource N(nextTurn_80229B38); +extern EvtScript N(takeTurn_8022936C); +extern EvtScript N(idle_802286C0); +extern EvtScript N(handleEvent_802287D0); +extern EvtScript N(nextTurn_80229B38); -EvtSource N(init_80228618) = { +EvtScript N(init_80228618) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022936C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_802286C0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_802287D0))) @@ -213,7 +213,7 @@ EvtSource N(init_80228618) = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(idle_802286C0) = { +EvtScript N(idle_802286C0) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(10)) EVT_IF_FLAG(LW(10), 0x41000) @@ -231,13 +231,13 @@ EvtSource N(idle_802286C0) = { EVT_END }; -extern EvtSource N(80228FE8); -extern EvtSource N(8022906C); -extern EvtSource N(8022A018); -extern EvtSource N(8022A39C); -extern EvtSource N(8022A480); +extern EvtScript N(80228FE8); +extern EvtScript N(8022906C); +extern EvtScript N(8022A018); +extern EvtScript N(8022A39C); +extern EvtScript N(8022A480); -EvtSource N(handleEvent_802287D0) = { +EvtScript N(handleEvent_802287D0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -380,7 +380,7 @@ EvtSource N(handleEvent_802287D0) = { EVT_END }; -EvtSource N(80228FE8) = { +EvtScript N(80228FE8) = { EVT_CALL(GetActorVar, -127, 1, LW(0)) EVT_IF_EQ(LW(0), 0) EVT_CALL(GetLastDamage, -127, LW(1)) @@ -392,7 +392,7 @@ EvtSource N(80228FE8) = { EVT_END }; -EvtSource N(8022906C) = { +EvtScript N(8022906C) = { EVT_CALL(GetActorVar, -127, 1, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) @@ -410,7 +410,7 @@ EvtSource N(8022906C) = { EVT_END }; -EvtSource N(80229160) = { +EvtScript N(80229160) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_ADD(LW(0), 40) EVT_SET(LW(1), 0) @@ -437,7 +437,7 @@ EvtSource N(80229160) = { EVT_END }; -EvtSource N(takeTurn_8022936C) = { +EvtScript N(takeTurn_8022936C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -557,7 +557,7 @@ ApiStatus func_802189DC_447E1C(Evt* script, s32 isInitialCall) { #include "common/FreeIcon.inc.c" -EvtSource N(nextTurn_80229B38) = { +EvtScript N(nextTurn_80229B38) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -630,7 +630,7 @@ EvtSource N(nextTurn_80229B38) = { EVT_END }; -EvtSource N(8022A018) = { +EvtScript N(8022A018) = { EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_IF_EQ(LW(1), 0) @@ -680,7 +680,7 @@ EvtSource N(8022A018) = { EVT_END }; -EvtSource N(8022A39C) = { +EvtScript N(8022A39C) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_spiked_para_jr_troopa_default_run) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -695,7 +695,7 @@ EvtSource N(8022A39C) = { EVT_END }; -EvtSource N(8022A480) = { +EvtScript N(8022A480) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NOT_FLAG(LW(0), 0x35D000) EVT_CALL(GetActorVar, -127, 2, LW(0)) diff --git a/src/battle/area_kmr_part_3/area.c b/src/battle/area_kmr_part_3/area.c index 85aee50877..b7e183f695 100644 --- a/src/battle/area_kmr_part_3/area.c +++ b/src/battle/area_kmr_part_3/area.c @@ -3,15 +3,15 @@ #define NAMESPACE b_area_kmr_part_3 -extern ActorDesc N(jr_troopa); -extern ActorDesc N(egg_jr_troopa); -extern ActorDesc N(para_jr_troopa); -extern ActorDesc N(spiked_para_jr_troopa); -extern ActorDesc N(mage_jr_troopa); -extern ActorDesc N(final_jr_troopa); -extern ActorDesc N(paragoomba1); -extern ActorDesc N(paragoomba2); -extern ActorDesc N(spiked_goomba); +extern ActorBlueprint N(jr_troopa); +extern ActorBlueprint N(egg_jr_troopa); +extern ActorBlueprint N(para_jr_troopa); +extern ActorBlueprint N(spiked_para_jr_troopa); +extern ActorBlueprint N(mage_jr_troopa); +extern ActorBlueprint N(final_jr_troopa); +extern ActorBlueprint N(paragoomba1); +extern ActorBlueprint N(paragoomba2); +extern ActorBlueprint N(spiked_goomba); extern Stage N(kmr_02); extern Stage N(kmr_03); diff --git a/src/battle/area_kmr_part_3/stage/kmr_02.c b/src/battle/area_kmr_part_3/stage/kmr_02.c index b113ba889f..867f2179f0 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_02.c +++ b/src/battle/area_kmr_part_3/stage/kmr_02.c @@ -3,13 +3,13 @@ #define NAMESPACE b_area_kmr_part_3_kmr_02 -EvtSource N(beforeBattle_802322D0) = { +EvtScript N(beforeBattle_802322D0) = { EVT_CALL(SetSpriteShading, -1) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_802322F0) = { +EvtScript N(afterBattle_802322F0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/kmr_03.c b/src/battle/area_kmr_part_3/stage/kmr_03.c index 739f369014..3712d03b56 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_03.c +++ b/src/battle/area_kmr_part_3/stage/kmr_03.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_802326B8) = { +EvtScript N(beforeBattle_802326B8) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 1) EVT_SET(LW(2), 0) @@ -17,7 +17,7 @@ EvtSource N(beforeBattle_802326B8) = { EVT_END }; -EvtSource N(afterBattle_80232730) = { +EvtScript N(afterBattle_80232730) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/kmr_04.c b/src/battle/area_kmr_part_3/stage/kmr_04.c index 15e379edde..0e26ca7799 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_04.c +++ b/src/battle/area_kmr_part_3/stage/kmr_04.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80232B08) = { +EvtScript N(beforeBattle_80232B08) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 1) EVT_SET(LW(2), 0) @@ -17,7 +17,7 @@ EvtSource N(beforeBattle_80232B08) = { EVT_END }; -EvtSource N(afterBattle_80232B80) = { +EvtScript N(afterBattle_80232B80) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/kmr_05.c b/src/battle/area_kmr_part_3/stage/kmr_05.c index 0d1d2848f5..af50035e75 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_05.c +++ b/src/battle/area_kmr_part_3/stage/kmr_05.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80232F58) = { +EvtScript N(beforeBattle_80232F58) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(EnableModel, 26, 0) EVT_CALL(EnableModel, 29, 0) @@ -13,7 +13,7 @@ EvtSource N(beforeBattle_80232F58) = { EVT_END }; -EvtSource N(afterBattle_80232FA0) = { +EvtScript N(afterBattle_80232FA0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/kmr_06.c b/src/battle/area_kmr_part_3/stage/kmr_06.c index bf47b389ed..f93c155c33 100644 --- a/src/battle/area_kmr_part_3/stage/kmr_06.c +++ b/src/battle/area_kmr_part_3/stage/kmr_06.c @@ -7,7 +7,7 @@ #include "common/UnkFogFunc.inc.c" -EvtSource N(beforeBattle_80233378) = { +EvtScript N(beforeBattle_80233378) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(N(UnkFogFunc)) EVT_SET(LW(0), 1) @@ -20,7 +20,7 @@ EvtSource N(beforeBattle_80233378) = { EVT_END }; -EvtSource N(afterBattle_802333FC) = { +EvtScript N(afterBattle_802333FC) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/kpa_01.c b/src/battle/area_kmr_part_3/stage/kpa_01.c index 103a23a504..5f39d174a6 100644 --- a/src/battle/area_kmr_part_3/stage/kpa_01.c +++ b/src/battle/area_kmr_part_3/stage/kpa_01.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_3_kpa_01 -EvtSource N(80234CB0) = { +EvtScript N(80234CB0) = { EVT_SET(LW(10), LW(0)) EVT_CALL(SetTexPanner, LW(10), 1) EVT_SET(LW(0), 0) @@ -18,14 +18,14 @@ EvtSource N(80234CB0) = { EVT_END }; -EvtSource N(beforeBattle_80234D60) = { +EvtScript N(beforeBattle_80234D60) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80234D9C) = { +EvtScript N(afterBattle_80234D9C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/mac_01.c b/src/battle/area_kmr_part_3/stage/mac_01.c index edf7cb9bce..bf66c88e05 100644 --- a/src/battle/area_kmr_part_3/stage/mac_01.c +++ b/src/battle/area_kmr_part_3/stage/mac_01.c @@ -6,7 +6,7 @@ ApiStatus func_80219D60_4491A0(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E80", func_80219D60_4491A0); -EvtSource N(80233AF0) = { +EvtScript N(80233AF0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(func_80219D60_4491A0, 0) @@ -100,7 +100,7 @@ EvtSource N(80233AF0) = { EVT_END }; -EvtSource N(80234180) = { +EvtScript N(80234180) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -157,7 +157,7 @@ s32 N(intTable_80234524)[] = { 0xFFFFFFF8, 0xFFFFFFF9, 0xFFFFFFFA, 0xFFFFFFFC, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000000, 0x000000FF, }; -EvtSource N(80234564) = { +EvtScript N(80234564) = { EVT_SET(LW(10), LW(0)) EVT_SET(LW(11), LW(1)) EVT_SET(LW(5), 5) @@ -203,7 +203,7 @@ EvtSource N(80234564) = { EVT_END }; -EvtSource N(802347D0) = { +EvtScript N(802347D0) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 0, 0, 0) @@ -255,7 +255,7 @@ EvtSource N(802347D0) = { EVT_END }; -EvtSource N(beforeBattle_80234B74) = { +EvtScript N(beforeBattle_80234B74) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_THREAD @@ -277,7 +277,7 @@ EvtSource N(beforeBattle_80234B74) = { EVT_END }; -EvtSource N(afterBattle_80234C70) = { +EvtScript N(afterBattle_80234C70) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/mim_01.c b/src/battle/area_kmr_part_3/stage/mim_01.c index 9add371f65..8bfda5d3a6 100644 --- a/src/battle/area_kmr_part_3/stage/mim_01.c +++ b/src/battle/area_kmr_part_3/stage/mim_01.c @@ -5,14 +5,14 @@ #include "common/UnkFogFunc2.inc.c" -EvtSource N(beforeBattle_80233670) = { +EvtScript N(beforeBattle_80233670) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(N(UnkFogFunc2)) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_8023369C) = { +EvtScript N(afterBattle_8023369C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/nok_01.c b/src/battle/area_kmr_part_3/stage/nok_01.c index 26904ab118..adf0bf57a5 100644 --- a/src/battle/area_kmr_part_3/stage/nok_01.c +++ b/src/battle/area_kmr_part_3/stage/nok_01.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_kmr_part_3_nok_01 -EvtSource N(80233450) = { +EvtScript N(80233450) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(TranslateModel, LW(10), 0, 2, 0) @@ -22,7 +22,7 @@ EvtSource N(80233450) = { EVT_END }; -EvtSource N(beforeBattle_80233558) = { +EvtScript N(beforeBattle_80233558) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 19) EVT_EXEC(N(80233450)) @@ -40,7 +40,7 @@ EvtSource N(beforeBattle_80233558) = { EVT_END }; -EvtSource N(afterBattle_80233620) = { +EvtScript N(afterBattle_80233620) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_kmr_part_3/stage/sam_01.c b/src/battle/area_kmr_part_3/stage/sam_01.c index 30d73bbee6..978b6ce5ff 100644 --- a/src/battle/area_kmr_part_3/stage/sam_01.c +++ b/src/battle/area_kmr_part_3/stage/sam_01.c @@ -13,7 +13,7 @@ s32 N(D_802336E0_43AB20)[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(802336F0) = { +EvtScript N(802336F0) = { EVT_CALL(N(Set80071270_0_16)) EVT_LOOP(0) EVT_WAIT_FRAMES(1) @@ -22,7 +22,7 @@ EvtSource N(802336F0) = { EVT_END }; -EvtSource N(8023372C) = { +EvtScript N(8023372C) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RandInt, 30, LW(0)) @@ -39,7 +39,7 @@ EvtSource N(8023372C) = { EVT_END }; -EvtSource N(802337F4) = { +EvtScript N(802337F4) = { EVT_SET(LW(10), LW(0)) EVT_SET(LW(11), LW(1)) EVT_EXEC(N(8023372C)) @@ -57,7 +57,7 @@ EvtSource N(802337F4) = { EVT_END }; -EvtSource N(802338D4) = { +EvtScript N(802338D4) = { EVT_SET(LW(10), LW(0)) EVT_SET(LW(7), 0) EVT_LABEL(0) @@ -73,7 +73,7 @@ EvtSource N(802338D4) = { EVT_END }; -EvtSource N(beforeBattle_80233998) = { +EvtScript N(beforeBattle_80233998) = { EVT_CALL(SetSpriteShading, -1) EVT_EXEC(N(802336F0)) EVT_THREAD @@ -97,7 +97,7 @@ EvtSource N(beforeBattle_80233998) = { EVT_END }; -EvtSource N(afterBattle_80233AA8) = { +EvtScript N(afterBattle_80233AA8) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_mac/actor/chan.c b/src/battle/area_mac/actor/chan.c index 4ae74cf58f..90a9065a5d 100644 --- a/src/battle/area_mac/actor/chan.c +++ b/src/battle/area_mac/actor/chan.c @@ -43,9 +43,9 @@ s32 N(statusTable_80219D78)[] = { }; extern s32 N(idleAnimations_80219EBC)[]; -extern EvtSource N(init_8021CCDC); +extern EvtScript N(init_8021CCDC); -ActorPartDesc N(partsTable_80219E24)[] = { +ActorPartBlueprint N(partsTable_80219E24)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -60,7 +60,7 @@ ActorPartDesc N(partsTable_80219E24)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_HP_OFFSET_BELOW, .type = ACTOR_TYPE_CHAN, .level = 0, @@ -123,13 +123,13 @@ s32 N(idleAnimations_80219F08)[] = { #include "common/UnkBattleFunc1.inc.c" -extern EvtSource N(idle_8021A11C); -extern EvtSource N(takeTurn_8021B81C); -extern EvtSource N(handleEvent_8021A560); -extern EvtSource N(takeTurn_Chan); -extern EvtSource N(handleEvent_8021AAB8); +extern EvtScript N(idle_8021A11C); +extern EvtScript N(takeTurn_8021B81C); +extern EvtScript N(handleEvent_8021A560); +extern EvtScript N(takeTurn_Chan); +extern EvtScript N(handleEvent_8021AAB8); -EvtSource N(80219F4C) = { +EvtScript N(80219F4C) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021A11C))) EVT_CALL(GetActorVar, -127, 0, LW(0)) EVT_IF_EQ(LW(0), 1) @@ -155,12 +155,12 @@ EvtSource N(80219F4C) = { EVT_END }; -EvtSource N(idle_8021A11C) = { +EvtScript N(idle_8021A11C) = { EVT_RETURN EVT_END }; -EvtSource N(8021A12C) = { +EvtScript N(8021A12C) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(SetActorVar, -127, 8, 2) EVT_CALL(SetTargetOffset, -127, 1, 0, 16) @@ -213,7 +213,7 @@ EvtSource N(8021A12C) = { EVT_END }; -EvtSource N(handleEvent_8021A560) = { +EvtScript N(handleEvent_8021A560) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -303,7 +303,7 @@ EvtSource N(handleEvent_8021A560) = { EVT_END }; -EvtSource N(8021AA1C) = { +EvtScript N(8021AA1C) = { EVT_CALL(GetActorVar, -127, 8, LW(3)) EVT_IF_EQ(LW(3), 2) EVT_SET(LW(1), LW(2)) @@ -318,7 +318,7 @@ s32 N(intTable_8021AA6C)[] = { 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_8021AAB8) = { +EvtScript N(handleEvent_8021AAB8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -545,7 +545,7 @@ EvtSource N(handleEvent_8021AAB8) = { EVT_END }; -EvtSource N(takeTurn_8021B81C) = { +EvtScript N(takeTurn_8021B81C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -686,7 +686,7 @@ EvtSource N(takeTurn_8021B81C) = { EVT_END }; -EvtSource N(takeTurn_Chan) = { +EvtScript N(takeTurn_Chan) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetActorVar, -127, 8, LW(0)) @@ -822,10 +822,10 @@ EvtSource N(takeTurn_Chan) = { EVT_END }; -extern EvtSource N(handleEvent_8021D0CC); -extern EvtSource N(nextTurn_8021CD7C); +extern EvtScript N(handleEvent_8021D0CC); +extern EvtScript N(nextTurn_8021CD7C); -EvtSource N(init_8021CCDC) = { +EvtScript N(init_8021CCDC) = { EVT_EXEC_WAIT(N(80219F4C)) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D0CC))) EVT_CALL(BindNextTurn, -127, EVT_ADDR(N(nextTurn_8021CD7C))) @@ -837,7 +837,7 @@ EvtSource N(init_8021CCDC) = { EVT_END }; -EvtSource N(nextTurn_8021CD7C) = { +EvtScript N(nextTurn_8021CD7C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -893,7 +893,7 @@ EvtSource N(nextTurn_8021CD7C) = { EVT_END }; -EvtSource N(handleEvent_8021D0CC) = { +EvtScript N(handleEvent_8021D0CC) = { EVT_EXEC_WAIT(N(handleEvent_8021AAB8)) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) EVT_SWITCH(LW(0)) diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area_mac/actor/lee.c index 85b56d0f5b..99a8116fe8 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area_mac/actor/lee.c @@ -65,7 +65,7 @@ s32 N(statusTable_8021D3D0)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021D47C)[] = { +ActorPartBlueprint N(partsTable_8021D47C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -80,9 +80,9 @@ ActorPartDesc N(partsTable_8021D47C)[] = { }, }; -extern EvtSource N(init_8021D4C8); +extern EvtScript N(init_8021D4C8); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_LEE, .level = 0, @@ -105,11 +105,11 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_80229F9C); -extern EvtSource N(idle_8021D5B4); -extern EvtSource N(handleEvent_8021D600); -extern EvtSource N(nextTurn_8022A038); -extern EvtSource N(copyPartner); +extern EvtScript N(takeTurn_80229F9C); +extern EvtScript N(idle_8021D5B4); +extern EvtScript N(handleEvent_8021D600); +extern EvtScript N(nextTurn_8022A038); +extern EvtScript N(copyPartner); extern s32 D_80232C20[]; extern s32 D_80232C50; @@ -124,7 +124,7 @@ ApiStatus func_802180D0_464560(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(init_8021D4C8) = { +EvtScript N(init_8021D4C8) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80229F9C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021D5B4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D600))) @@ -142,12 +142,12 @@ EvtSource N(init_8021D4C8) = { EVT_END }; -EvtSource N(idle_8021D5B4) = { +EvtScript N(idle_8021D5B4) = { EVT_RETURN EVT_END }; -EvtSource N(8021D5C4) = { +EvtScript N(8021D5C4) = { EVT_SET_CONST(LW(0), 0x00000001) EVT_SET_CONST(LW(1), NPC_ANIM_lee_Palette_00_Anim_4) EVT_EXEC_WAIT(DoReturnHome) @@ -155,7 +155,7 @@ EvtSource N(8021D5C4) = { EVT_END }; -EvtSource N(handleEvent_8021D600) = { +EvtScript N(handleEvent_8021D600) = { EVT_CALL(SetActorVar, -127, 0, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) @@ -253,7 +253,7 @@ EvtSource N(handleEvent_8021D600) = { EVT_END }; -EvtSource N(flyingTackle) = { +EvtScript N(flyingTackle) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorVar, -127, 8, 0) @@ -334,14 +334,14 @@ EvtSource N(flyingTackle) = { EVT_END }; -EvtSource N(8021E0E0) = { +EvtScript N(8021E0E0) = { EVT_CALL(GetActorVar, -127, 0, LW(0)) EVT_CALL(RemoveActor, LW(0)) EVT_RETURN EVT_END }; -EvtSource N(8021E118) = { +EvtScript N(8021E118) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(func_8027D32C, -127) EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) @@ -401,7 +401,7 @@ EvtSource N(8021E118) = { EVT_END }; -EvtSource N(8021E5DC) = { +EvtScript N(8021E5DC) = { EVT_CALL(func_8027D32C, -127) EVT_SET(LW(10), LW(0)) EVT_SET(LW(11), LW(1)) @@ -492,7 +492,7 @@ s32 N(statusTable_8021E9A4)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021EA50)[] = { +ActorPartBlueprint N(partsTable_8021EA50)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -507,9 +507,9 @@ ActorPartDesc N(partsTable_8021EA50)[] = { }, }; -extern EvtSource N(init_Goombario); +extern EvtScript N(init_Goombario); -ActorDesc N(goombario) = { +ActorBlueprint N(goombario) = { .flags = 0, .type = ACTOR_TYPE_LEE_GOOMBARIO, .level = 0, @@ -532,12 +532,12 @@ ActorDesc N(goombario) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_802203F4); -extern EvtSource N(idle_8021EB14); -extern EvtSource N(handleEvent_8021EB24); -extern EvtSource N(nextTurn_80220450); +extern EvtScript N(takeTurn_802203F4); +extern EvtScript N(idle_8021EB14); +extern EvtScript N(handleEvent_8021EB24); +extern EvtScript N(nextTurn_80220450); -EvtSource N(init_Goombario) = { +EvtScript N(init_Goombario) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802203F4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021EB14))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021EB24))) @@ -547,12 +547,12 @@ EvtSource N(init_Goombario) = { EVT_END }; -EvtSource N(idle_8021EB14) = { +EvtScript N(idle_8021EB14) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_8021EB24) = { +EvtScript N(handleEvent_8021EB24) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -655,7 +655,7 @@ EvtSource N(handleEvent_8021EB24) = { EVT_END }; -EvtSource N(8021F08C) = { +EvtScript N(8021F08C) = { EVT_CALL(UseBattleCamPreset, 2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_idle) EVT_THREAD @@ -715,7 +715,7 @@ EvtSource N(8021F08C) = { EVT_END }; -EvtSource N(8021F514) = { +EvtScript N(8021F514) = { EVT_CALL(UseBattleCamPreset, 63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) @@ -730,7 +730,7 @@ EvtSource N(8021F514) = { EVT_END }; -EvtSource N(8021F5F8) = { +EvtScript N(8021F5F8) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(11), LW(12), LW(13)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(12), LW(13), LW(14)) @@ -756,7 +756,7 @@ INCLUDE_ASM(s32, "battle/area_mac/actor/lee", func_80218300_464790); #include "common/ActorJumpToPos.inc.c" -EvtSource N(8021F6E0) = { +EvtScript N(8021F6E0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_EXEC_WAIT(N(8021F514)) @@ -933,7 +933,7 @@ ApiStatus func_80218E2C_4652BC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(80220100) = { +EvtScript N(80220100) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.80078125)) @@ -975,7 +975,7 @@ EvtSource N(80220100) = { EVT_END }; -EvtSource N(takeTurn_802203F4) = { +EvtScript N(takeTurn_802203F4) = { EVT_CALL(RandInt, 100, LW(0)) EVT_IF_LT(LW(0), 40) EVT_EXEC_WAIT(N(80220100)) @@ -986,7 +986,7 @@ EvtSource N(takeTurn_802203F4) = { EVT_END }; -EvtSource N(nextTurn_80220450) = { +EvtScript N(nextTurn_80220450) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -1070,7 +1070,7 @@ s32 N(statusTable_802205F0)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022069C)[] = { +ActorPartBlueprint N(partsTable_8022069C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -1085,9 +1085,9 @@ ActorPartDesc N(partsTable_8022069C)[] = { }, }; -extern EvtSource N(init_Kooper); +extern EvtScript N(init_Kooper); -ActorDesc N(kooper) = { +ActorBlueprint N(kooper) = { .flags = 0, .type = ACTOR_TYPE_LEE_KOOPER, .level = 0, @@ -1110,12 +1110,12 @@ ActorDesc N(kooper) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_80221200); -extern EvtSource N(idle_80220790); -extern EvtSource N(handleEvent_80220908); -extern EvtSource N(nextTurn_802221A0); +extern EvtScript N(takeTurn_80221200); +extern EvtScript N(idle_80220790); +extern EvtScript N(handleEvent_80220908); +extern EvtScript N(nextTurn_802221A0); -EvtSource N(init_Kooper) = { +EvtScript N(init_Kooper) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80221200))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80220790))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80220908))) @@ -1131,7 +1131,7 @@ EvtSource N(init_Kooper) = { #include "common/UnkBattleFunc1.inc.c" #define NAMESPACE b_area_mac_lee -EvtSource N(idle_80220790) = { +EvtScript N(idle_80220790) = { EVT_LABEL(0) EVT_CALL(GetActorVar, -127, 4, LW(0)) EVT_SWITCH(LW(0)) @@ -1156,7 +1156,7 @@ s32 N(intTable_802208B0)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_80220908) = { +EvtScript N(handleEvent_80220908) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -1311,7 +1311,7 @@ EvtSource N(handleEvent_80220908) = { #include "common/UnkActorPosFunc.inc.c" -EvtSource N(takeTurn_80221200) = { +EvtScript N(takeTurn_80221200) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1515,7 +1515,7 @@ EvtSource N(takeTurn_80221200) = { EVT_END }; -EvtSource N(nextTurn_802221A0) = { +EvtScript N(nextTurn_802221A0) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -1581,7 +1581,7 @@ s32 N(statusTable_802222E8)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80222394)[] = { +ActorPartBlueprint N(partsTable_80222394)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -1596,9 +1596,9 @@ ActorPartDesc N(partsTable_80222394)[] = { }, }; -extern EvtSource N(init_LeeBombette); +extern EvtScript N(init_LeeBombette); -ActorDesc N(bombette) = { +ActorBlueprint N(bombette) = { .flags = 0, .type = ACTOR_TYPE_LEE_BOMBETTE, .level = 0, @@ -1621,12 +1621,12 @@ ActorDesc N(bombette) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_802229C4); -extern EvtSource N(idle_80222458); -extern EvtSource N(handleEvent_80222468); -extern EvtSource N(nextTurn_80223298); +extern EvtScript N(takeTurn_802229C4); +extern EvtScript N(idle_80222458); +extern EvtScript N(handleEvent_80222468); +extern EvtScript N(nextTurn_80223298); -EvtSource N(init_LeeBombette) = { +EvtScript N(init_LeeBombette) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802229C4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80222458))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80222468))) @@ -1636,12 +1636,12 @@ EvtSource N(init_LeeBombette) = { EVT_END }; -EvtSource N(idle_80222458) = { +EvtScript N(idle_80222458) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80222468) = { +EvtScript N(handleEvent_80222468) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -1747,7 +1747,7 @@ EvtSource N(handleEvent_80222468) = { #include "common/UnkActorPosFunc.inc.c" #define NAMESPACE b_area_mac_lee -EvtSource N(takeTurn_802229C4) = { +EvtScript N(takeTurn_802229C4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_WAIT_FRAMES(10) @@ -1869,7 +1869,7 @@ EvtSource N(takeTurn_802229C4) = { EVT_END }; -EvtSource N(nextTurn_80223298) = { +EvtScript N(nextTurn_80223298) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -1935,7 +1935,7 @@ s32 N(statusTable_802233E0)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022348C)[] = { +ActorPartBlueprint N(partsTable_8022348C)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -1962,9 +1962,9 @@ ActorPartDesc N(partsTable_8022348C)[] = { }, }; -extern EvtSource N(init_Parakarry); +extern EvtScript N(init_Parakarry); -ActorDesc N(parakerry) = { +ActorBlueprint N(parakerry) = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_LEE_PARAKARRY, .level = 0, @@ -1987,12 +1987,12 @@ ActorDesc N(parakerry) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_80224304); -extern EvtSource N(idle_80223574); -extern EvtSource N(handleEvent_80223584); -extern EvtSource N(nextTurn_80224320); +extern EvtScript N(takeTurn_80224304); +extern EvtScript N(idle_80223574); +extern EvtScript N(handleEvent_80223584); +extern EvtScript N(nextTurn_80224320); -EvtSource N(init_Parakarry) = { +EvtScript N(init_Parakarry) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80224304))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80223574))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80223584))) @@ -2002,12 +2002,12 @@ EvtSource N(init_Parakarry) = { EVT_END }; -EvtSource N(idle_80223574) = { +EvtScript N(idle_80223574) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80223584) = { +EvtScript N(handleEvent_80223584) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -2118,7 +2118,7 @@ EvtSource N(handleEvent_80223584) = { EVT_END }; -EvtSource N(80223B74) = { +EvtScript N(80223B74) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -2225,13 +2225,13 @@ EvtSource N(80223B74) = { EVT_END }; -EvtSource N(takeTurn_80224304) = { +EvtScript N(takeTurn_80224304) = { EVT_EXEC_WAIT(N(80223B74)) EVT_RETURN EVT_END }; -EvtSource N(nextTurn_80224320) = { +EvtScript N(nextTurn_80224320) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -2297,7 +2297,7 @@ s32 N(statusTable_80224468)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80224514)[] = { +ActorPartBlueprint N(partsTable_80224514)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -2324,9 +2324,9 @@ ActorPartDesc N(partsTable_80224514)[] = { }, }; -extern EvtSource N(init_Bow); +extern EvtScript N(init_Bow); -ActorDesc N(bow) = { +ActorBlueprint N(bow) = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_LEE_BOW, .level = 0, @@ -2349,12 +2349,12 @@ ActorDesc N(bow) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_80224CA0); -extern EvtSource N(idle_802245FC); -extern EvtSource N(handleEvent_8022460C); -extern EvtSource N(nextTurn_80225884); +extern EvtScript N(takeTurn_80224CA0); +extern EvtScript N(idle_802245FC); +extern EvtScript N(handleEvent_8022460C); +extern EvtScript N(nextTurn_80225884); -EvtSource N(init_Bow) = { +EvtScript N(init_Bow) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80224CA0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_802245FC))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022460C))) @@ -2364,12 +2364,12 @@ EvtSource N(init_Bow) = { EVT_END }; -EvtSource N(idle_802245FC) = { +EvtScript N(idle_802245FC) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_8022460C) = { +EvtScript N(handleEvent_8022460C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -2492,7 +2492,7 @@ EvtSource N(handleEvent_8022460C) = { EVT_END }; -EvtSource N(takeTurn_80224CA0) = { +EvtScript N(takeTurn_80224CA0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_WAIT_FRAMES(10) @@ -2682,7 +2682,7 @@ EvtSource N(takeTurn_80224CA0) = { EVT_END }; -EvtSource N(nextTurn_80225884) = { +EvtScript N(nextTurn_80225884) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -2749,7 +2749,7 @@ s32 N(statusTable_802259D4)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80225A80)[] = { +ActorPartBlueprint N(partsTable_80225A80)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -2776,9 +2776,9 @@ ActorPartDesc N(partsTable_80225A80)[] = { }, }; -extern EvtSource N(init_Watt); +extern EvtScript N(init_Watt); -ActorDesc N(watt) = { +ActorBlueprint N(watt) = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_LEE_WATT, .level = 0, @@ -2801,12 +2801,12 @@ ActorDesc N(watt) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_80226004); -extern EvtSource N(idle_80225B68); -extern EvtSource N(handleEvent_80225B90); -extern EvtSource N(nextTurn_80226880); +extern EvtScript N(takeTurn_80226004); +extern EvtScript N(idle_80225B68); +extern EvtScript N(handleEvent_80225B90); +extern EvtScript N(nextTurn_80226880); -EvtSource N(init_Watt) = { +EvtScript N(init_Watt) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80226004))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80225B68))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80225B90))) @@ -2835,7 +2835,7 @@ ApiStatus func_80219604_465A94(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(idle_80225B68) = { +EvtScript N(idle_80225B68) = { EVT_SET_PRIORITY(99) EVT_CALL(func_80219188_465618) EVT_RETURN @@ -2866,7 +2866,7 @@ ApiStatus func_802196F0_465B80(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(handleEvent_80225B90) = { +EvtScript N(handleEvent_80225B90) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(func_80219658_465AE8, 0) EVT_CALL(func_802196A4_465B34, 1) @@ -2958,7 +2958,7 @@ EvtSource N(handleEvent_80225B90) = { #include "common/SetBackgroundAlpha.inc.c" -EvtSource N(takeTurn_80226004) = { +EvtScript N(takeTurn_80226004) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(UseBattleCamPreset, 19) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) @@ -3078,7 +3078,7 @@ EvtSource N(takeTurn_80226004) = { EVT_END }; -EvtSource N(nextTurn_80226880) = { +EvtScript N(nextTurn_80226880) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -3145,7 +3145,7 @@ s32 N(statusTable_802269D4)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80226A80)[] = { +ActorPartBlueprint N(partsTable_80226A80)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -3160,9 +3160,9 @@ ActorPartDesc N(partsTable_80226A80)[] = { }, }; -extern EvtSource N(init_Sushie); +extern EvtScript N(init_Sushie); -ActorDesc N(sushie) = { +ActorBlueprint N(sushie) = { .flags = 0, .type = ACTOR_TYPE_LEE_SUSHIE, .level = 0, @@ -3185,12 +3185,12 @@ ActorDesc N(sushie) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_802270BC); -extern EvtSource N(idle_80226B44); -extern EvtSource N(handleEvent_80226B54); -extern EvtSource N(nextTurn_8022831C); +extern EvtScript N(takeTurn_802270BC); +extern EvtScript N(idle_80226B44); +extern EvtScript N(handleEvent_80226B54); +extern EvtScript N(nextTurn_8022831C); -EvtSource N(init_Sushie) = { +EvtScript N(init_Sushie) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802270BC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80226B44))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80226B54))) @@ -3200,12 +3200,12 @@ EvtSource N(init_Sushie) = { EVT_END }; -EvtSource N(idle_80226B44) = { +EvtScript N(idle_80226B44) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80226B54) = { +EvtScript N(handleEvent_80226B54) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -3308,7 +3308,7 @@ EvtSource N(handleEvent_80226B54) = { EVT_END }; -EvtSource N(takeTurn_802270BC) = { +EvtScript N(takeTurn_802270BC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, 63) @@ -3553,7 +3553,7 @@ EvtSource N(takeTurn_802270BC) = { EVT_END }; -EvtSource N(nextTurn_8022831C) = { +EvtScript N(nextTurn_8022831C) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -3624,7 +3624,7 @@ s32 N(statusTable_80228470)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022851C)[] = { +ActorPartBlueprint N(partsTable_8022851C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -3651,9 +3651,9 @@ ActorPartDesc N(partsTable_8022851C)[] = { }, }; -extern EvtSource N(init_Lakilester); +extern EvtScript N(init_Lakilester); -ActorDesc N(lakilester) = { +ActorBlueprint N(lakilester) = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_LEE_LAKILESTER, .level = 0, @@ -3676,12 +3676,12 @@ ActorDesc N(lakilester) = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_80228B78); -extern EvtSource N(idle_80228604); -extern EvtSource N(handleEvent_80228614); -extern EvtSource N(nextTurn_80229658); +extern EvtScript N(takeTurn_80228B78); +extern EvtScript N(idle_80228604); +extern EvtScript N(handleEvent_80228614); +extern EvtScript N(nextTurn_80229658); -EvtSource N(init_Lakilester) = { +EvtScript N(init_Lakilester) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80228B78))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80228604))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80228614))) @@ -3691,12 +3691,12 @@ EvtSource N(init_Lakilester) = { EVT_END }; -EvtSource N(idle_80228604) = { +EvtScript N(idle_80228604) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80228614) = { +EvtScript N(handleEvent_80228614) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -3799,7 +3799,7 @@ EvtSource N(handleEvent_80228614) = { EVT_END }; -EvtSource N(takeTurn_80228B78) = { +EvtScript N(takeTurn_80228B78) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -3948,7 +3948,7 @@ EvtSource N(takeTurn_80228B78) = { EVT_END }; -EvtSource N(nextTurn_80229658) = { +EvtScript N(nextTurn_80229658) = { EVT_CALL(GetBattlePhase, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(12) @@ -3982,7 +3982,7 @@ ApiStatus func_802197B8_465C48(Evt* script, s32 isInitialCall) { ApiStatus func_80219824_465CB4(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/area_mac/actor/lee", func_80219824_465CB4); -EvtSource N(copyPartner) = { +EvtScript N(copyPartner) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, 14) @@ -4103,7 +4103,7 @@ EvtSource N(copyPartner) = { EVT_END }; -EvtSource N(takeTurn_80229F9C) = { +EvtScript N(takeTurn_80229F9C) = { EVT_CALL(GetActorVar, -127, 8, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(0) @@ -4118,7 +4118,7 @@ EvtSource N(takeTurn_80229F9C) = { EVT_END }; -EvtSource N(nextTurn_8022A038) = { +EvtScript N(nextTurn_8022A038) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) diff --git a/src/battle/area_mac/actor/master1.c b/src/battle/area_mac/actor/master1.c index 4c30763c0a..f6ed0ccfc4 100644 --- a/src/battle/area_mac/actor/master1.c +++ b/src/battle/area_mac/actor/master1.c @@ -48,7 +48,7 @@ s32 N(statusTable_8022A2B8)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022A364)[] = { +ActorPartBlueprint N(partsTable_8022A364)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -63,9 +63,9 @@ ActorPartDesc N(partsTable_8022A364)[] = { }, }; -extern EvtSource N(init_8022A3B0); +extern EvtScript N(init_8022A3B0); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_THE_MASTER_1, .level = 0, @@ -88,12 +88,12 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 30 }, }; -extern EvtSource N(takeTurn_8022AA54); -extern EvtSource N(idle_8022A494); -extern EvtSource N(handleEvent_8022B2CC); -extern EvtSource N(nextTurn_8022B06C); +extern EvtScript N(takeTurn_8022AA54); +extern EvtScript N(idle_8022A494); +extern EvtScript N(handleEvent_8022B2CC); +extern EvtScript N(nextTurn_8022B06C); -EvtSource N(init_8022A3B0) = { +EvtScript N(init_8022A3B0) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022AA54))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8022A494))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022B2CC))) @@ -108,12 +108,12 @@ EvtSource N(init_8022A3B0) = { EVT_END }; -EvtSource N(idle_8022A494) = { +EvtScript N(idle_8022A494) = { EVT_RETURN EVT_END }; -EvtSource N(8022A4A4) = { +EvtScript N(8022A4A4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -215,7 +215,7 @@ EvtSource N(8022A4A4) = { EVT_END }; -EvtSource N(takeTurn_8022AA54) = { +EvtScript N(takeTurn_8022AA54) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -303,7 +303,7 @@ EvtSource N(takeTurn_8022AA54) = { EVT_END }; -EvtSource N(nextTurn_8022B06C) = { +EvtScript N(nextTurn_8022B06C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -344,7 +344,7 @@ EvtSource N(nextTurn_8022B06C) = { EVT_END }; -EvtSource N(handleEvent_8022B2CC) = { +EvtScript N(handleEvent_8022B2CC) = { EVT_EXEC_WAIT(N(8022A4A4)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_FLAG(LW(0), 0x351000) diff --git a/src/battle/area_mac/actor/master2.c b/src/battle/area_mac/actor/master2.c index 5225da752a..9d10f6b2d0 100644 --- a/src/battle/area_mac/actor/master2.c +++ b/src/battle/area_mac/actor/master2.c @@ -61,7 +61,7 @@ s32 N(statusTable_8022B6E4)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022B790)[] = { +ActorPartBlueprint N(partsTable_8022B790)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -76,9 +76,9 @@ ActorPartDesc N(partsTable_8022B790)[] = { }, }; -extern EvtSource N(init_8022B7DC); +extern EvtScript N(init_8022B7DC); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_THE_MASTER_2, .level = 0, @@ -101,12 +101,12 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 30 }, }; -extern EvtSource N(takeTurn_8022CF48); -extern EvtSource N(idle_8022B8B0); -extern EvtSource N(handleEvent_8022D634); -extern EvtSource N(nextTurn_8022CFFC); +extern EvtScript N(takeTurn_8022CF48); +extern EvtScript N(idle_8022B8B0); +extern EvtScript N(handleEvent_8022D634); +extern EvtScript N(nextTurn_8022CFFC); -EvtSource N(init_8022B7DC) = { +EvtScript N(init_8022B7DC) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022CF48))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8022B8B0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022D634))) @@ -120,12 +120,12 @@ EvtSource N(init_8022B7DC) = { EVT_END }; -EvtSource N(idle_8022B8B0) = { +EvtScript N(idle_8022B8B0) = { EVT_RETURN EVT_END }; -EvtSource N(8022B8C0) = { +EvtScript N(8022B8C0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -227,7 +227,7 @@ EvtSource N(8022B8C0) = { EVT_END }; -EvtSource N(singleStrike2) = { +EvtScript N(singleStrike2) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, 63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -330,7 +330,7 @@ EvtSource N(singleStrike2) = { EVT_END }; -EvtSource N(doubleStrike2) = { +EvtScript N(doubleStrike2) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, 8) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -460,7 +460,7 @@ EvtSource N(doubleStrike2) = { EVT_END }; -EvtSource N(takeTurn_8022CF48) = { +EvtScript N(takeTurn_8022CF48) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(RandInt, 100, LW(0)) @@ -476,7 +476,7 @@ EvtSource N(takeTurn_8022CF48) = { EVT_END }; -EvtSource N(nextTurn_8022CFFC) = { +EvtScript N(nextTurn_8022CFFC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -569,7 +569,7 @@ EvtSource N(nextTurn_8022CFFC) = { EVT_END }; -EvtSource N(handleEvent_8022D634) = { +EvtScript N(handleEvent_8022D634) = { EVT_EXEC_WAIT(N(8022B8C0)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_FLAG(LW(0), 0x351000) diff --git a/src/battle/area_mac/actor/master3.c b/src/battle/area_mac/actor/master3.c index 9d47ac6c4c..db046dcb60 100644 --- a/src/battle/area_mac/actor/master3.c +++ b/src/battle/area_mac/actor/master3.c @@ -61,7 +61,7 @@ s32 N(statusTable_8022DA44)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022DAF0)[] = { +ActorPartBlueprint N(partsTable_8022DAF0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -88,9 +88,9 @@ ActorPartDesc N(partsTable_8022DAF0)[] = { }, }; -extern EvtSource N(init_8022DB60); +extern EvtScript N(init_8022DB60); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_THE_MASTER_3, .level = 0, @@ -113,12 +113,12 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 30 }, }; -extern EvtSource N(takeTurn_80230B20); -extern EvtSource N(idle_8022DC34); -extern EvtSource N(handleEvent_80231408); -extern EvtSource N(nextTurn_80230D44); +extern EvtScript N(takeTurn_80230B20); +extern EvtScript N(idle_8022DC34); +extern EvtScript N(handleEvent_80231408); +extern EvtScript N(nextTurn_80230D44); -EvtSource N(init_8022DB60) = { +EvtScript N(init_8022DB60) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80230B20))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8022DC34))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80231408))) @@ -132,12 +132,12 @@ EvtSource N(init_8022DB60) = { EVT_END }; -EvtSource N(idle_8022DC34) = { +EvtScript N(idle_8022DC34) = { EVT_RETURN EVT_END }; -EvtSource N(8022DC44) = { +EvtScript N(8022DC44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -252,7 +252,7 @@ EvtSource N(8022DC44) = { EVT_END }; -EvtSource N(singleStrike3) = { +EvtScript N(singleStrike3) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, 63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -355,7 +355,7 @@ EvtSource N(singleStrike3) = { EVT_END }; -EvtSource N(doubleStrike3) = { +EvtScript N(doubleStrike3) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, 8) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -485,7 +485,7 @@ EvtSource N(doubleStrike3) = { EVT_END }; -EvtSource N(tripleStrike3) = { +EvtScript N(tripleStrike3) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, 8) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -675,7 +675,7 @@ EvtSource N(tripleStrike3) = { EVT_END }; -EvtSource N(80230240) = { +EvtScript N(80230240) = { EVT_CALL(UseBattleCamPreset, 8) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetBattleCamZoom, 200) @@ -725,7 +725,7 @@ EvtSource N(80230240) = { EVT_END }; -EvtSource N(8023059C) = { +EvtScript N(8023059C) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, 8) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -775,7 +775,7 @@ EvtSource N(8023059C) = { EVT_END }; -EvtSource N(80230914) = { +EvtScript N(80230914) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, 8) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -808,7 +808,7 @@ EvtSource N(80230914) = { EVT_END }; -EvtSource N(takeTurn_80230B20) = { +EvtScript N(takeTurn_80230B20) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetActorVar, -127, 1, LW(0)) @@ -853,7 +853,7 @@ EvtSource N(takeTurn_80230B20) = { EVT_END }; -EvtSource N(nextTurn_80230D44) = { +EvtScript N(nextTurn_80230D44) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -952,7 +952,7 @@ EvtSource N(nextTurn_80230D44) = { EVT_END }; -EvtSource N(handleEvent_80231408) = { +EvtScript N(handleEvent_80231408) = { EVT_EXEC_WAIT(N(8022DC44)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_FLAG(LW(0), 0x351000) diff --git a/src/battle/area_mac/area.c b/src/battle/area_mac/area.c index edb833c6c2..9f956d49a1 100644 --- a/src/battle/area_mac/area.c +++ b/src/battle/area_mac/area.c @@ -5,11 +5,11 @@ #define NAMESPACE b_area_mac -extern ActorDesc N(chan); -extern ActorDesc N(lee); -extern ActorDesc N(master1); -extern ActorDesc N(master2); -extern ActorDesc N(master3); +extern ActorBlueprint N(chan); +extern ActorBlueprint N(lee); +extern ActorBlueprint N(master1); +extern ActorBlueprint N(master2); +extern ActorBlueprint N(master3); extern Stage N(mac_01); extern Stage N(mac_02); diff --git a/src/battle/area_mac/stage/mac_01.c b/src/battle/area_mac/stage/mac_01.c index 1e9304816a..1ddfb8a5bf 100644 --- a/src/battle/area_mac/stage/mac_01.c +++ b/src/battle/area_mac/stage/mac_01.c @@ -6,7 +6,7 @@ ApiStatus func_80219900_465D90(Evt*, s32); INCLUDE_ASM(s32, "battle/area_mac/465D90", func_80219900_465D90); -EvtSource N(80231770) = { +EvtScript N(80231770) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(func_80219900_465D90, 0) @@ -100,7 +100,7 @@ EvtSource N(80231770) = { EVT_END }; -EvtSource N(80231E00) = { +EvtScript N(80231E00) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -157,7 +157,7 @@ s32 N(intTable_802321A4)[] = { 0xFFFFFFF8, 0xFFFFFFF9, 0xFFFFFFFA, 0xFFFFFFFC, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000000, 0x000000FF, }; -EvtSource N(802321E4) = { +EvtScript N(802321E4) = { EVT_SET(LW(10), LW(0)) EVT_SET(LW(11), LW(1)) EVT_SET(LW(5), 5) @@ -203,7 +203,7 @@ EvtSource N(802321E4) = { EVT_END }; -EvtSource N(80232450) = { +EvtScript N(80232450) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 0, 0, 0) @@ -255,7 +255,7 @@ EvtSource N(80232450) = { EVT_END }; -EvtSource N(beforeBattle_802327F4) = { +EvtScript N(beforeBattle_802327F4) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_THREAD @@ -277,7 +277,7 @@ EvtSource N(beforeBattle_802327F4) = { EVT_END }; -EvtSource N(afterBattle_802328F0) = { +EvtScript N(afterBattle_802328F0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_mac/stage/mac_02.c b/src/battle/area_mac/stage/mac_02.c index 174261ff3f..9355c422ba 100644 --- a/src/battle/area_mac/stage/mac_02.c +++ b/src/battle/area_mac/stage/mac_02.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_mac_mac_02 -EvtSource N(beforeBattle_80232930) = { +EvtScript N(beforeBattle_80232930) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(func_802536A8, 1) @@ -12,7 +12,7 @@ EvtSource N(beforeBattle_80232930) = { EVT_END }; -EvtSource N(afterBattle_8023297C) = { +EvtScript N(afterBattle_8023297C) = { EVT_CALL(func_802536A8, 0) EVT_RETURN EVT_END diff --git a/src/battle/area_nok/actor/fuzzy.c b/src/battle/area_nok/actor/fuzzy.c index 0975becad3..10da455dda 100644 --- a/src/battle/area_nok/actor/fuzzy.c +++ b/src/battle/area_nok/actor/fuzzy.c @@ -37,7 +37,7 @@ s32 N(statusTable_8022205C)[] = { extern s32 N(idleAnimations_80222154)[]; -ActorPartDesc N(partsTable_80222108)[] = { +ActorPartBlueprint N(partsTable_80222108)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -52,9 +52,9 @@ ActorPartDesc N(partsTable_80222108)[] = { }, }; -extern EvtSource N(init_802221A0); +extern EvtScript N(init_802221A0); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_FUZZY, .level = 6, @@ -90,11 +90,11 @@ s32 N(idleAnimations_80222154)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_80222860); -extern EvtSource N(idle_802221EC); -extern EvtSource N(handleEvent_802221FC); +extern EvtScript N(takeTurn_80222860); +extern EvtScript N(idle_802221EC); +extern EvtScript N(handleEvent_802221FC); -EvtSource N(init_802221A0) = { +EvtScript N(init_802221A0) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80222860))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_802221EC))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_802221FC))) @@ -102,12 +102,12 @@ EvtSource N(init_802221A0) = { EVT_END }; -EvtSource N(idle_802221EC) = { +EvtScript N(idle_802221EC) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_802221FC) = { +EvtScript N(handleEvent_802221FC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -228,7 +228,7 @@ EvtSource N(handleEvent_802221FC) = { #include "common/UnkBattleFunc2.inc.c" -EvtSource N(takeTurn_80222860) = { +EvtScript N(takeTurn_80222860) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/area_nok/actor/kent_c_koopa.c b/src/battle/area_nok/actor/kent_c_koopa.c index d7f9997b81..3f9597d9c4 100644 --- a/src/battle/area_nok/actor/kent_c_koopa.c +++ b/src/battle/area_nok/actor/kent_c_koopa.c @@ -78,7 +78,7 @@ s32 N(statusTable_80227A08)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80227AB4)[] = { +ActorPartBlueprint N(partsTable_80227AB4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -189,9 +189,9 @@ ActorPartDesc N(partsTable_80227AB4)[] = { }, }; -extern EvtSource N(init_80227C20); +extern EvtScript N(init_80227C20); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_KENT_C_KOOPA, .level = 55, @@ -214,12 +214,12 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 2, 63 }, }; -extern EvtSource N(takeTurn_80228A7C); -extern EvtSource N(idle_80227DD4); -extern EvtSource N(handleEvent_80227E08); -extern EvtSource N(nextTurn_80227D2C); +extern EvtScript N(takeTurn_80228A7C); +extern EvtScript N(idle_80227DD4); +extern EvtScript N(handleEvent_80227E08); +extern EvtScript N(nextTurn_80227D2C); -EvtSource N(init_80227C20) = { +EvtScript N(init_80227C20) = { EVT_CALL(func_8027D434, -127, 3, 70) EVT_CALL(SetPartSize, -127, 3, 30, 30) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80228A7C))) @@ -235,7 +235,7 @@ EvtSource N(init_80227C20) = { EVT_END }; -EvtSource N(nextTurn_80227D2C) = { +EvtScript N(nextTurn_80227D2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetBattlePhase, LW(0)) @@ -249,7 +249,7 @@ EvtSource N(nextTurn_80227D2C) = { EVT_END }; -EvtSource N(idle_80227DD4) = { +EvtScript N(idle_80227DD4) = { EVT_LABEL(0) EVT_WAIT_FRAMES(1) EVT_GOTO(0) @@ -257,14 +257,14 @@ EvtSource N(idle_80227DD4) = { EVT_END }; -extern EvtSource N(8022AD84); -extern EvtSource N(8022B158); -extern EvtSource N(8022B204); -extern EvtSource N(flipOver_KentC); -extern EvtSource N(shellToss_KentC); -extern EvtSource N(tackle_KentC); +extern EvtScript N(8022AD84); +extern EvtScript N(8022B158); +extern EvtScript N(8022B204); +extern EvtScript N(flipOver_KentC); +extern EvtScript N(shellToss_KentC); +extern EvtScript N(tackle_KentC); -EvtSource N(handleEvent_80227E08) = { +EvtScript N(handleEvent_80227E08) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastElement, LW(14)) @@ -483,7 +483,7 @@ EvtSource N(handleEvent_80227E08) = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(takeTurn_80228A7C) = { +EvtScript N(takeTurn_80228A7C) = { EVT_CALL(SetActorVar, -127, 4, 2) EVT_CALL(GetActorVar, -127, 0, LW(0)) EVT_IF_EQ(LW(0), 1) @@ -584,7 +584,7 @@ EvtSource N(takeTurn_80228A7C) = { EVT_END }; -EvtSource N(shellToss_KentC) = { +EvtScript N(shellToss_KentC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -797,7 +797,7 @@ EvtSource N(shellToss_KentC) = { EVT_END }; -EvtSource N(tackle_KentC) = { +EvtScript N(tackle_KentC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -988,7 +988,7 @@ EvtSource N(tackle_KentC) = { EVT_END }; -EvtSource N(8022AD84) = { +EvtScript N(8022AD84) = { EVT_SET_CONST(LW(0), 0x00000001) EVT_SET_CONST(LW(1), NPC_ANIM_kent_c_koopa_Palette_00_Anim_4) EVT_EXEC_WAIT(DoReturnHome) @@ -996,7 +996,7 @@ EvtSource N(8022AD84) = { EVT_END }; -EvtSource N(flipOver_KentC) = { +EvtScript N(flipOver_KentC) = { EVT_CALL(SetEnemyTargetOffset, -127, 1, 0, 40) EVT_CALL(SetDefenseTable, -127, 1, EVT_ADDR(N(defenseTable_802279F0))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_802279B4))) @@ -1050,9 +1050,9 @@ EvtSource N(flipOver_KentC) = { EVT_END }; -extern EvtSource N(8022B2E8); +extern EvtScript N(8022B2E8); -EvtSource N(8022B158) = { +EvtScript N(8022B158) = { EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_SET(LW(10), 5) EVT_EXEC_WAIT(N(8022B2E8)) @@ -1067,7 +1067,7 @@ EvtSource N(8022B158) = { EVT_END }; -EvtSource N(8022B204) = { +EvtScript N(8022B204) = { EVT_CALL(SetAnimation, ACTOR_SELF, LW(0), LW(1)) EVT_SET(LW(10), 0) EVT_EXEC_WAIT(N(8022B2E8)) @@ -1086,9 +1086,9 @@ EvtSource N(8022B204) = { EVT_END }; -extern EvtSource N(8022B444); +extern EvtScript N(8022B444); -EvtSource N(8022B2E8) = { +EvtScript N(8022B2E8) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(3)) EVT_IF_FLAG(LW(3), 0x80000) EVT_RETURN @@ -1148,7 +1148,7 @@ ApiStatus func_80218DF8_48DF98(Evt* script, s32 isInitialCall) { } -EvtSource N(8022B444) = { +EvtScript N(8022B444) = { EVT_CALL(PlaySoundAtPart, -127, LW(5), 530) EVT_CALL(GetActorPos, ACTOR_SELF, LW(6), LW(7), LW(8)) EVT_CALL(SetPartPos, ACTOR_SELF, LW(5), LW(6), 35, LW(8)) diff --git a/src/battle/area_nok/area.c b/src/battle/area_nok/area.c index ef93855951..fd43c63c6f 100644 --- a/src/battle/area_nok/area.c +++ b/src/battle/area_nok/area.c @@ -4,13 +4,13 @@ #define NAMESPACE b_area_nok -extern ActorDesc N(goomba); -extern ActorDesc N(spiked_goomba); -extern ActorDesc N(paragoomba); -extern ActorDesc N(koopa_troopa); -extern ActorDesc N(paratroopa); -extern ActorDesc N(fuzzy); -extern ActorDesc N(kent_c_koopa); +extern ActorBlueprint N(goomba); +extern ActorBlueprint N(spiked_goomba); +extern ActorBlueprint N(paragoomba); +extern ActorBlueprint N(koopa_troopa); +extern ActorBlueprint N(paratroopa); +extern ActorBlueprint N(fuzzy); +extern ActorBlueprint N(kent_c_koopa); extern Stage N(nok_01); extern Stage N(nok_02); diff --git a/src/battle/area_nok/stage/nok_01.c b/src/battle/area_nok/stage/nok_01.c index 1e60bdcd9e..bfbc4dd4a9 100644 --- a/src/battle/area_nok/stage/nok_01.c +++ b/src/battle/area_nok/stage/nok_01.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_nok_nok_01 -EvtSource N(8022B5F0) = { +EvtScript N(8022B5F0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(TranslateModel, LW(10), 0, 2, 0) @@ -22,7 +22,7 @@ EvtSource N(8022B5F0) = { EVT_END }; -EvtSource N(beforeBattle_8022B6F8) = { +EvtScript N(beforeBattle_8022B6F8) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 19) EVT_EXEC(N(8022B5F0)) @@ -40,7 +40,7 @@ EvtSource N(beforeBattle_8022B6F8) = { EVT_END }; -EvtSource N(afterBattle_8022B7C0) = { +EvtScript N(afterBattle_8022B7C0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_nok/stage/nok_02.c b/src/battle/area_nok/stage/nok_02.c index d811a31a06..67d63a6d9c 100644 --- a/src/battle/area_nok/stage/nok_02.c +++ b/src/battle/area_nok/stage/nok_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_nok_nok_02 -EvtSource N(8022B810) = { +EvtScript N(8022B810) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(TranslateModel, LW(10), 0, 2, 0) @@ -22,7 +22,7 @@ EvtSource N(8022B810) = { EVT_END }; -EvtSource N(beforeBattle_8022B918) = { +EvtScript N(beforeBattle_8022B918) = { EVT_CALL(SetSpriteShading, -1) EVT_THREAD EVT_SET(LW(0), 19) @@ -59,7 +59,7 @@ EvtSource N(beforeBattle_8022B918) = { EVT_END }; -EvtSource N(afterBattle_8022BACC) = { +EvtScript N(afterBattle_8022BACC) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_nok/stage/nok_03.c b/src/battle/area_nok/stage/nok_03.c index c0a7cf5c8d..4fc782f89f 100644 --- a/src/battle/area_nok/stage/nok_03.c +++ b/src/battle/area_nok/stage/nok_03.c @@ -3,13 +3,13 @@ #define NAMESPACE b_area_nok_nok_03 -EvtSource N(beforeBattle_8022BB20) = { +EvtScript N(beforeBattle_8022BB20) = { EVT_CALL(SetSpriteShading, -1) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_8022BB40) = { +EvtScript N(afterBattle_8022BB40) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_nok/stage/nok_04.c b/src/battle/area_nok/stage/nok_04.c index 4936b282a0..c6ee5dc5a7 100644 --- a/src/battle/area_nok/stage/nok_04.c +++ b/src/battle/area_nok/stage/nok_04.c @@ -3,13 +3,13 @@ #define NAMESPACE b_area_nok_nok_04 -EvtSource N(beforeBattle_8022BB90) = { +EvtScript N(beforeBattle_8022BB90) = { EVT_CALL(SetSpriteShading, -1) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_8022BBB0) = { +EvtScript N(afterBattle_8022BBB0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_sbk/actor/bandit.c b/src/battle/area_sbk/actor/bandit.c index 65386e57ae..2e15b5c57d 100644 --- a/src/battle/area_sbk/actor/bandit.c +++ b/src/battle/area_sbk/actor/bandit.c @@ -7,11 +7,11 @@ #define NAMESPACE b_area_sbk_bandit -extern EvtSource N(init_8021D750); -extern EvtSource N(init_8021D7C4); -extern EvtSource N(takeTurn_8021E900); -extern EvtSource N(idle_8021D810); -extern EvtSource N(handleEvent_8021DF88); +extern EvtScript N(init_8021D750); +extern EvtScript N(init_8021D7C4); +extern EvtScript N(takeTurn_8021E900); +extern EvtScript N(idle_8021D810); +extern EvtScript N(handleEvent_8021DF88); BSS s32 D_80220160[]; @@ -76,7 +76,7 @@ s32 N(statusTable_8021D5C0)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021D66C)[] = { +ActorPartBlueprint N(partsTable_8021D66C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -103,7 +103,7 @@ ActorPartDesc N(partsTable_8021D66C)[] = { }, }; -ActorPartDesc N(partsTable_8021D6B4)[] = { +ActorPartBlueprint N(partsTable_8021D6B4)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 2, @@ -118,7 +118,7 @@ ActorPartDesc N(partsTable_8021D6B4)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_BANDIT, .level = 9, @@ -141,7 +141,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 25 }, }; -ActorDesc N(2) = { +ActorBlueprint N(2) = { .flags = ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, .type = ACTOR_TYPE_BANDIT, .level = 9, @@ -170,7 +170,7 @@ Formation N(specialFormation_8021D734) = { { .actor = &N(2), .home = { .vec = &N(vector3D_8021D728) }}, }; -EvtSource N(init_8021D750) = { +EvtScript N(init_8021D750) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021E900))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021D810))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021DF88))) @@ -179,12 +179,12 @@ EvtSource N(init_8021D750) = { EVT_END }; -EvtSource N(handleEvent_8021D7B4) = { +EvtScript N(handleEvent_8021D7B4) = { EVT_RETURN EVT_END }; -EvtSource N(init_8021D7C4) = { +EvtScript N(init_8021D7C4) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D7B4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D7B4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D7B4))) @@ -192,12 +192,12 @@ EvtSource N(init_8021D7C4) = { EVT_END }; -EvtSource N(idle_8021D810) = { +EvtScript N(idle_8021D810) = { EVT_RETURN EVT_END }; -EvtSource N(8021D820) = { +EvtScript N(8021D820) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(0)) EVT_SWITCH(LW(0)) EVT_CASE_EQ(0) @@ -296,7 +296,7 @@ EvtSource N(8021D820) = { EVT_END }; -EvtSource N(handleEvent_8021DF88) = { +EvtScript N(handleEvent_8021DF88) = { EVT_USE_ARRAY(D_80220160) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) @@ -483,7 +483,7 @@ EvtSource N(handleEvent_8021DF88) = { EVT_END }; -EvtSource N(takeTurn_8021E900) = { +EvtScript N(takeTurn_8021E900) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/area_sbk/actor/pokey.c b/src/battle/area_sbk/actor/pokey.c index 619c891301..7713542563 100644 --- a/src/battle/area_sbk/actor/pokey.c +++ b/src/battle/area_sbk/actor/pokey.c @@ -8,18 +8,18 @@ extern s32 N(idleAnimations_80218438)[]; extern s32 N(idleAnimations_80218528)[]; -extern EvtSource N(init_80218534); -extern EvtSource N(takeTurn_8021A018); -extern EvtSource N(idle_802186B0); -extern EvtSource N(handleEvent_802186C0); -extern EvtSource N(8021AB44); -extern EvtSource N(8021AE2C); -extern EvtSource N(8021B590); -extern EvtSource N(8021BF50); -extern EvtSource N(8021C07C); -extern EvtSource N(8021C860); -extern EvtSource N(8021CCAC); -extern EvtSource N(8021D184); +extern EvtScript N(init_80218534); +extern EvtScript N(takeTurn_8021A018); +extern EvtScript N(idle_802186B0); +extern EvtScript N(handleEvent_802186C0); +extern EvtScript N(8021AB44); +extern EvtScript N(8021AE2C); +extern EvtScript N(8021B590); +extern EvtScript N(8021BF50); +extern EvtScript N(8021C07C); +extern EvtScript N(8021C860); +extern EvtScript N(8021CCAC); +extern EvtScript N(8021D184); s32 N(defenseTable_80218280)[] = { ELEMENT_NORMAL, 0, @@ -51,7 +51,7 @@ s32 N(statusTable_8021828C)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80218338)[] = { +ActorPartBlueprint N(partsTable_80218338)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -126,7 +126,7 @@ ActorPartDesc N(partsTable_80218338)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_POKEY, .level = 9, @@ -198,7 +198,7 @@ s32 N(idleAnimations_80218528)[] = { STATUS_END, }; -EvtSource N(init_80218534) = { +EvtScript N(init_80218534) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021A018))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_802186B0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_802186C0))) @@ -219,12 +219,12 @@ EvtSource N(init_80218534) = { EVT_END }; -EvtSource N(idle_802186B0) = { +EvtScript N(idle_802186B0) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_802186C0) = { +EvtScript N(handleEvent_802186C0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -452,7 +452,7 @@ EvtSource N(handleEvent_802186C0) = { EVT_END }; -EvtSource N(802193B8) = { +EvtScript N(802193B8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -616,7 +616,7 @@ EvtSource N(802193B8) = { EVT_END }; -EvtSource N(80219EB4) = { +EvtScript N(80219EB4) = { EVT_SET(LW(9), 0) EVT_CALL(EnemyCreateTargetList, 32770) EVT_CALL(InitTargetIterator) @@ -644,7 +644,7 @@ EvtSource N(80219EB4) = { EVT_END }; -EvtSource N(takeTurn_8021A018) = { +EvtScript N(takeTurn_8021A018) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(10)) EVT_IF_EQ(LW(10), 3) EVT_EXEC_WAIT(N(8021B590)) @@ -808,7 +808,7 @@ EvtSource N(takeTurn_8021A018) = { EVT_END }; -EvtSource N(8021AB44) = { +EvtScript N(8021AB44) = { EVT_SET(LW(14), -1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_FLAG(LW(0), STATUS_FLAG_SHRINK) @@ -869,7 +869,7 @@ Formation N(specialFormation_8021AE10) = { { .actor = &NAMESPACE, .home = { .vec = &N(vector3D_8021AE04) }, .priority = 100 }, }; -EvtSource N(8021AE2C) = { +EvtScript N(8021AE2C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -983,7 +983,7 @@ EvtSource N(8021AE2C) = { EVT_END }; -EvtSource N(8021B590) = { +EvtScript N(8021B590) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 748, 748) @@ -1118,7 +1118,7 @@ EvtSource N(8021B590) = { EVT_END }; -EvtSource N(8021BF50) = { +EvtScript N(8021BF50) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(10)) EVT_IF_FLAG(LW(10), STATUS_FLAG_SHRINK) EVT_SET_CONST(LW(0), 1) @@ -1145,7 +1145,7 @@ EvtSource N(8021BF50) = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(8021C07C) = { +EvtScript N(8021C07C) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(10)) EVT_SWITCH(LW(10)) EVT_CASE_EQ(0) @@ -1202,7 +1202,7 @@ EvtSource N(8021C07C) = { EVT_END }; -EvtSource N(8021C574) = { +EvtScript N(8021C574) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_ADD(LW(1), 18) EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) @@ -1245,7 +1245,7 @@ EvtSource N(8021C574) = { EVT_END }; -EvtSource N(8021C860) = { +EvtScript N(8021C860) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LW(0), LW(1), LW(2)) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) @@ -1309,7 +1309,7 @@ EvtSource N(8021C860) = { EVT_END }; -EvtSource N(8021CCAC) = { +EvtScript N(8021CCAC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -1378,7 +1378,7 @@ EvtSource N(8021CCAC) = { EVT_END }; -EvtSource N(8021D184) = { +EvtScript N(8021D184) = { EVT_SET_CONST(LW(0), 1) EVT_CALL(GetActorVar, ACTOR_SELF, 3, LW(1)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) diff --git a/src/battle/area_sbk/area.c b/src/battle/area_sbk/area.c index 08f5c110e4..4d6610ba21 100644 --- a/src/battle/area_sbk/area.c +++ b/src/battle/area_sbk/area.c @@ -3,8 +3,8 @@ #define NAMESPACE b_area_sbk -extern ActorDesc N(pokey); -extern ActorDesc N(bandit); +extern ActorBlueprint N(pokey); +extern ActorBlueprint N(bandit); extern Stage N(sbk_02); diff --git a/src/battle/area_sbk/stage/sbk_02.c b/src/battle/area_sbk/stage/sbk_02.c index db507dd825..b57d37e8c6 100644 --- a/src/battle/area_sbk/stage/sbk_02.c +++ b/src/battle/area_sbk/stage/sbk_02.c @@ -9,7 +9,7 @@ #include "common/GetModelPos.inc.c" -EvtSource N(8021F720) = { +EvtScript N(8021F720) = { EVT_SET(LW(10), LW(0)) EVT_SET(LW(7), LW(1)) EVT_MUL(LW(7), 10) @@ -27,7 +27,7 @@ EvtSource N(8021F720) = { EVT_END }; -EvtSource N(beforeBattle_8021F800) = { +EvtScript N(beforeBattle_8021F800) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 1) EVT_SET(LW(1), 0) @@ -43,7 +43,7 @@ EvtSource N(beforeBattle_8021F800) = { EVT_END }; -EvtSource N(afterBattle_8021F8E8) = { +EvtScript N(afterBattle_8021F8E8) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/actor/bill_blaster.c b/src/battle/area_trd_part_1/actor/bill_blaster.c index f080f21929..b7d51565f6 100644 --- a/src/battle/area_trd_part_1/actor/bill_blaster.c +++ b/src/battle/area_trd_part_1/actor/bill_blaster.c @@ -39,9 +39,9 @@ s32 N(statusTable_80219D2C)[] = { }; extern s32 N(idleAnimations_80219E48)[]; -extern EvtSource N(init_80219E6C); +extern EvtScript N(init_80219E6C); -ActorPartDesc N(partsTable_80219DD8)[] = { +ActorPartBlueprint N(partsTable_80219DD8)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -68,7 +68,7 @@ ActorPartDesc N(partsTable_80219DD8)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_BILL_BLASTER, .level = 10, @@ -99,11 +99,11 @@ s32 N(idleAnimations_80219E48)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021A200); -extern EvtSource N(idle_80219ED0); -extern EvtSource N(handleEvent_80219EE0); +extern EvtScript N(takeTurn_8021A200); +extern EvtScript N(idle_80219ED0); +extern EvtScript N(handleEvent_80219EE0); -EvtSource N(init_80219E6C) = { +EvtScript N(init_80219E6C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021A200))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80219ED0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80219EE0))) @@ -112,12 +112,12 @@ EvtSource N(init_80219E6C) = { EVT_END }; -EvtSource N(idle_80219ED0) = { +EvtScript N(idle_80219ED0) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80219EE0) = { +EvtScript N(handleEvent_80219EE0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -179,10 +179,10 @@ EvtSource N(handleEvent_80219EE0) = { EVT_END }; -extern EvtSource N(8021A2BC); -extern EvtSource N(8021A470); +extern EvtScript N(8021A2BC); +extern EvtScript N(8021A470); -EvtSource N(takeTurn_8021A200) = { +EvtScript N(takeTurn_8021A200) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(0)) @@ -208,7 +208,7 @@ ApiStatus func_80218000_4A10A0(Evt* script, s32 isInitialCall) { } -EvtSource N(8021A2BC) = { +EvtScript N(8021A2BC) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_bill_blaster_Palette_00_Anim_2) EVT_WAIT_FRAMES(13) EVT_THREAD @@ -231,7 +231,7 @@ EvtSource N(8021A2BC) = { EVT_END }; -EvtSource N(8021A470) = { +EvtScript N(8021A470) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LW(0)) EVT_CALL(ActorExists, LW(0), LW(1)) EVT_IF_EQ(LW(1), FALSE) @@ -241,7 +241,7 @@ EvtSource N(8021A470) = { EVT_END }; -extern ActorDesc A(bullet_bill); +extern ActorBlueprint A(bullet_bill); Vec3i N(vector3D_8021A4DC) = { 0, -1000, 0, }; diff --git a/src/battle/area_trd_part_1/actor/bob_omb.c b/src/battle/area_trd_part_1/actor/bob_omb.c index 2eccb6e787..47edb70345 100644 --- a/src/battle/area_trd_part_1/actor/bob_omb.c +++ b/src/battle/area_trd_part_1/actor/bob_omb.c @@ -87,7 +87,7 @@ s32 N(statusTable_8021A660)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021A70C)[] = { +ActorPartBlueprint N(partsTable_8021A70C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -102,9 +102,9 @@ ActorPartDesc N(partsTable_8021A70C)[] = { }, }; -extern EvtSource N(init_8021A758); +extern EvtScript N(init_8021A758); -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_BOB_OMB, .level = 6, @@ -127,11 +127,11 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -extern EvtSource N(takeTurn_8021C89C); -extern EvtSource N(idle_8021A7D4); -extern EvtSource N(handleEvent_8021ACE8); +extern EvtScript N(takeTurn_8021C89C); +extern EvtScript N(idle_8021A7D4); +extern EvtScript N(handleEvent_8021ACE8); -EvtSource N(init_8021A758) = { +EvtScript N(init_8021A758) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021C89C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021A7D4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021ACE8))) @@ -141,14 +141,14 @@ EvtSource N(init_8021A758) = { EVT_END }; -EvtSource N(idle_8021A7D4) = { +EvtScript N(idle_8021A7D4) = { EVT_RETURN EVT_END }; -extern EvtSource N(handleEvent_8021B4A8); +extern EvtScript N(handleEvent_8021B4A8); -EvtSource N(ignite) = { +EvtScript N(ignite) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_FLAG(LW(0), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) EVT_RETURN @@ -174,7 +174,7 @@ EvtSource N(ignite) = { EVT_END }; -EvtSource N(8021A9C8) = { +EvtScript N(8021A9C8) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021ACE8))) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8021A510))) @@ -189,7 +189,7 @@ EvtSource N(8021A9C8) = { EVT_END }; -EvtSource N(8021AAE8) = { +EvtScript N(8021AAE8) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(0)) EVT_IF_EQ(LW(0), 1) EVT_CALL(StopLoopingSoundAtActor, ACTOR_SELF, 0) @@ -199,7 +199,7 @@ EvtSource N(8021AAE8) = { EVT_END }; -EvtSource N(8021AB54) = { +EvtScript N(8021AB54) = { EVT_EXEC_WAIT(N(8021AAE8)) EVT_CALL(StartRumble, 11) EVT_THREAD @@ -219,7 +219,7 @@ EvtSource N(8021AB54) = { EVT_END }; -EvtSource N(handleEvent_8021ACE8) = { +EvtScript N(handleEvent_8021ACE8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -367,7 +367,7 @@ EvtSource N(handleEvent_8021ACE8) = { EVT_END }; -EvtSource N(handleEvent_8021B4A8) = { +EvtScript N(handleEvent_8021B4A8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -499,7 +499,7 @@ EvtSource N(handleEvent_8021B4A8) = { EVT_END }; -EvtSource N(tackleAttack) = { +EvtScript N(tackleAttack) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) @@ -609,7 +609,7 @@ EvtSource N(tackleAttack) = { EVT_END }; -EvtSource N(blastAttack) = { +EvtScript N(blastAttack) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) @@ -675,7 +675,7 @@ EvtSource N(blastAttack) = { EVT_END }; -EvtSource N(takeTurn_8021C89C) = { +EvtScript N(takeTurn_8021C89C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LW(0)) diff --git a/src/battle/area_trd_part_1/actor/bullet_bill.c b/src/battle/area_trd_part_1/actor/bullet_bill.c index 1f7ce2dab5..ee9549823f 100644 --- a/src/battle/area_trd_part_1/actor/bullet_bill.c +++ b/src/battle/area_trd_part_1/actor/bullet_bill.c @@ -37,9 +37,9 @@ s32 N(statusTable_80218F6C)[] = { }; extern s32 N(idleAnimations_80219064)[]; -extern EvtSource N(init_80219088); +extern EvtScript N(init_80219088); -ActorPartDesc N(partsTable_80219018)[] = { +ActorPartBlueprint N(partsTable_80219018)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -54,7 +54,7 @@ ActorPartDesc N(partsTable_80219018)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_BULLET_BILL, .level = 5, @@ -85,11 +85,11 @@ s32 N(idleAnimations_80219064)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_802197C0); -extern EvtSource N(idle_80219380); -extern EvtSource N(handleEvent_802193E8); +extern EvtScript N(takeTurn_802197C0); +extern EvtScript N(idle_80219380); +extern EvtScript N(handleEvent_802193E8); -EvtSource N(init_80219088) = { +EvtScript N(init_80219088) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802197C0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80219380))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_802193E8))) @@ -131,14 +131,14 @@ EvtSource N(init_80219088) = { EVT_END }; -EvtSource N(idle_80219380) = { +EvtScript N(idle_80219380) = { EVT_RETURN EVT_END }; -extern EvtSource N(80219BE0); +extern EvtScript N(80219BE0); -EvtSource N(80219390) = { +EvtScript N(80219390) = { EVT_EXEC_WAIT(N(80219BE0)) EVT_SET_CONST(LW(0), 1) EVT_SET_CONST(LW(1), NPC_ANIM_bullet_bill_Palette_00_Anim_7) @@ -148,7 +148,7 @@ EvtSource N(80219390) = { EVT_END }; -EvtSource N(handleEvent_802193E8) = { +EvtScript N(handleEvent_802193E8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -228,7 +228,7 @@ EvtSource N(handleEvent_802193E8) = { EVT_END }; -EvtSource N(takeTurn_802197C0) = { +EvtScript N(takeTurn_802197C0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -288,7 +288,7 @@ EvtSource N(takeTurn_802197C0) = { EVT_END }; -EvtSource N(80219BE0) = { +EvtScript N(80219BE0) = { EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_ADD(LW(2), 2) EVT_CALL(PlayEffect, EFFECT_ID_17, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) diff --git a/src/battle/area_trd_part_1/area.c b/src/battle/area_trd_part_1/area.c index 2b454781c3..ec87ca7a2b 100644 --- a/src/battle/area_trd_part_1/area.c +++ b/src/battle/area_trd_part_1/area.c @@ -4,11 +4,11 @@ #define NAMESPACE b_area_trd_part_1 -extern ActorDesc N(koopa_troopa); -extern ActorDesc N(paratroopa); -extern ActorDesc N(bob_omb); -extern ActorDesc N(bill_blaster); -extern ActorDesc N(bullet_bill); +extern ActorBlueprint N(koopa_troopa); +extern ActorBlueprint N(paratroopa); +extern ActorBlueprint N(bob_omb); +extern ActorBlueprint N(bill_blaster); +extern ActorBlueprint N(bullet_bill); extern Stage N(trd_00); extern Stage N(trd_01); diff --git a/src/battle/area_trd_part_1/stage/trd_00.c b/src/battle/area_trd_part_1/stage/trd_00.c index 0b7471c91e..4e344d6a84 100644 --- a/src/battle/area_trd_part_1/stage/trd_00.c +++ b/src/battle/area_trd_part_1/stage/trd_00.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_trd_part_1_trd_00 -EvtSource N(beforeBattle_80224B70) = { +EvtScript N(beforeBattle_80224B70) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80224BAC) = { +EvtScript N(afterBattle_80224BAC) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_01.c b/src/battle/area_trd_part_1/stage/trd_01.c index 87b5697ed1..4dcb2c2078 100644 --- a/src/battle/area_trd_part_1/stage/trd_01.c +++ b/src/battle/area_trd_part_1/stage/trd_01.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_trd_part_1_trd_01 -EvtSource N(beforeBattle_80222AE0) = { +EvtScript N(beforeBattle_80222AE0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_80222B1C) = { +EvtScript N(afterBattle_80222B1C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_02.c b/src/battle/area_trd_part_1/stage/trd_02.c index 32231a7397..a920bed530 100644 --- a/src/battle/area_trd_part_1/stage/trd_02.c +++ b/src/battle/area_trd_part_1/stage/trd_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_02 -EvtSource N(80222B60) = { +EvtScript N(80222B60) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80222B60) = { EVT_END }; -EvtSource N(80222C78) = { +EvtScript N(80222C78) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80222C78) = { EVT_END }; -EvtSource N(beforeBattle_80223224) = { +EvtScript N(beforeBattle_80223224) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 12, 0) @@ -121,7 +121,7 @@ EvtSource N(beforeBattle_80223224) = { EVT_END }; -EvtSource N(afterBattle_80223318) = { +EvtScript N(afterBattle_80223318) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_02b.c b/src/battle/area_trd_part_1/stage/trd_02b.c index 25a45ab6e9..e8954c7ccf 100644 --- a/src/battle/area_trd_part_1/stage/trd_02b.c +++ b/src/battle/area_trd_part_1/stage/trd_02b.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_02b -EvtSource N(80223360) = { +EvtScript N(80223360) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80223360) = { EVT_END }; -EvtSource N(80223478) = { +EvtScript N(80223478) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80223478) = { EVT_END }; -EvtSource N(beforeBattle_80223A24) = { +EvtScript N(beforeBattle_80223A24) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 22, 0) @@ -123,7 +123,7 @@ EvtSource N(beforeBattle_80223A24) = { EVT_END }; -EvtSource N(afterBattle_80223B40) = { +EvtScript N(afterBattle_80223B40) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_02c.c b/src/battle/area_trd_part_1/stage/trd_02c.c index a72d47151e..3e9dfedd60 100644 --- a/src/battle/area_trd_part_1/stage/trd_02c.c +++ b/src/battle/area_trd_part_1/stage/trd_02c.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_02c -EvtSource N(beforeBattle_80224BF0) = { +EvtScript N(beforeBattle_80224BF0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 26, 0) @@ -12,7 +12,7 @@ EvtSource N(beforeBattle_80224BF0) = { EVT_END }; -EvtSource N(afterBattle_80224C54) = { +EvtScript N(afterBattle_80224C54) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_02d.c b/src/battle/area_trd_part_1/stage/trd_02d.c index d3074c7ef6..f98a963872 100644 --- a/src/battle/area_trd_part_1/stage/trd_02d.c +++ b/src/battle/area_trd_part_1/stage/trd_02d.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_02d -EvtSource N(80224CA0) = { +EvtScript N(80224CA0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80224CA0) = { EVT_END }; -EvtSource N(80224DB8) = { +EvtScript N(80224DB8) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80224DB8) = { EVT_END }; -EvtSource N(beforeBattle_80225364) = { +EvtScript N(beforeBattle_80225364) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 19, 0) @@ -113,7 +113,7 @@ EvtSource N(beforeBattle_80225364) = { EVT_END }; -EvtSource N(afterBattle_80225418) = { +EvtScript N(afterBattle_80225418) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_03.c b/src/battle/area_trd_part_1/stage/trd_03.c index 42afd228dc..06c4556018 100644 --- a/src/battle/area_trd_part_1/stage/trd_03.c +++ b/src/battle/area_trd_part_1/stage/trd_03.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80223F08) = { +EvtScript N(beforeBattle_80223F08) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 4) EVT_SET(LW(2), 0) @@ -19,7 +19,7 @@ EvtSource N(beforeBattle_80223F08) = { EVT_END }; -EvtSource N(afterBattle_80223FA0) = { +EvtScript N(afterBattle_80223FA0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_04.c b/src/battle/area_trd_part_1/stage/trd_04.c index dd0a28080e..6dc9e3a286 100644 --- a/src/battle/area_trd_part_1/stage/trd_04.c +++ b/src/battle/area_trd_part_1/stage/trd_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_04 -EvtSource N(80223FF0) = { +EvtScript N(80223FF0) = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -20,7 +20,7 @@ EvtSource N(80223FF0) = { EVT_END }; -EvtSource N(802240C0) = { +EvtScript N(802240C0) = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -38,7 +38,7 @@ EvtSource N(802240C0) = { EVT_END }; -EvtSource N(802241AC) = { +EvtScript N(802241AC) = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -56,7 +56,7 @@ EvtSource N(802241AC) = { EVT_END }; -EvtSource N(beforeBattle_80224298) = { +EvtScript N(beforeBattle_80224298) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_SET(LW(0), 13) @@ -68,7 +68,7 @@ EvtSource N(beforeBattle_80224298) = { EVT_END }; -EvtSource N(afterBattle_80224320) = { +EvtScript N(afterBattle_80224320) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_05.c b/src/battle/area_trd_part_1/stage/trd_05.c index 95ec90b0c1..e65aa83de8 100644 --- a/src/battle/area_trd_part_1/stage/trd_05.c +++ b/src/battle/area_trd_part_1/stage/trd_05.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_05 -EvtSource N(80224360) = { +EvtScript N(80224360) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80224360) = { EVT_END }; -EvtSource N(80224478) = { +EvtScript N(80224478) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80224478) = { EVT_END }; -EvtSource N(beforeBattle_80224A24) = { +EvtScript N(beforeBattle_80224A24) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_THREAD @@ -124,7 +124,7 @@ EvtSource N(beforeBattle_80224A24) = { EVT_END }; -EvtSource N(afterBattle_80224B30) = { +EvtScript N(afterBattle_80224B30) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_05b.c b/src/battle/area_trd_part_1/stage/trd_05b.c index 6545daa88e..36f175aa8e 100644 --- a/src/battle/area_trd_part_1/stage/trd_05b.c +++ b/src/battle/area_trd_part_1/stage/trd_05b.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_05b -EvtSource N(80225460) = { +EvtScript N(80225460) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80225460) = { EVT_END }; -EvtSource N(80225578) = { +EvtScript N(80225578) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80225578) = { EVT_END }; -EvtSource N(beforeBattle_80225B24) = { +EvtScript N(beforeBattle_80225B24) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 16, 0) @@ -117,7 +117,7 @@ EvtSource N(beforeBattle_80225B24) = { EVT_END }; -EvtSource N(afterBattle_80225C28) = { +EvtScript N(afterBattle_80225C28) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_05c.c b/src/battle/area_trd_part_1/stage/trd_05c.c index b2d424c248..ab474f0f21 100644 --- a/src/battle/area_trd_part_1/stage/trd_05c.c +++ b/src/battle/area_trd_part_1/stage/trd_05c.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_05c -EvtSource N(80225C60) = { +EvtScript N(80225C60) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80225C60) = { EVT_END }; -EvtSource N(80225D78) = { +EvtScript N(80225D78) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80225D78) = { EVT_END }; -EvtSource N(beforeBattle_80226324) = { +EvtScript N(beforeBattle_80226324) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 10, 0) @@ -125,7 +125,7 @@ EvtSource N(beforeBattle_80226324) = { EVT_END }; -EvtSource N(afterBattle_80226470) = { +EvtScript N(afterBattle_80226470) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_05d.c b/src/battle/area_trd_part_1/stage/trd_05d.c index c05158048f..6ed99f6268 100644 --- a/src/battle/area_trd_part_1/stage/trd_05d.c +++ b/src/battle/area_trd_part_1/stage/trd_05d.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_05d -EvtSource N(802264B0) = { +EvtScript N(802264B0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(802264B0) = { EVT_END }; -EvtSource N(802265C8) = { +EvtScript N(802265C8) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(802265C8) = { EVT_END }; -EvtSource N(beforeBattle_80226B74) = { +EvtScript N(beforeBattle_80226B74) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 10, 0) @@ -124,7 +124,7 @@ EvtSource N(beforeBattle_80226B74) = { EVT_END }; -EvtSource N(afterBattle_80226CB8) = { +EvtScript N(afterBattle_80226CB8) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_05e.c b/src/battle/area_trd_part_1/stage/trd_05e.c index 6efc83e9ea..6e6ab2eee8 100644 --- a/src/battle/area_trd_part_1/stage/trd_05e.c +++ b/src/battle/area_trd_part_1/stage/trd_05e.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_05e -EvtSource N(80226CF0) = { +EvtScript N(80226CF0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80226CF0) = { EVT_END }; -EvtSource N(80226E08) = { +EvtScript N(80226E08) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80226E08) = { EVT_END }; -EvtSource N(beforeBattle_802273B4) = { +EvtScript N(beforeBattle_802273B4) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 27, 0) @@ -115,7 +115,7 @@ EvtSource N(beforeBattle_802273B4) = { EVT_END }; -EvtSource N(afterBattle_80227490) = { +EvtScript N(afterBattle_80227490) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_1/stage/trd_05f.c b/src/battle/area_trd_part_1/stage/trd_05f.c index 5cee886f6f..042711ddd9 100644 --- a/src/battle/area_trd_part_1/stage/trd_05f.c +++ b/src/battle/area_trd_part_1/stage/trd_05f.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_1_trd_05f -EvtSource N(802274D0) = { +EvtScript N(802274D0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(802274D0) = { EVT_END }; -EvtSource N(802275E8) = { +EvtScript N(802275E8) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(802275E8) = { EVT_END }; -EvtSource N(beforeBattle_80227B94) = { +EvtScript N(beforeBattle_80227B94) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_SET(LW(0), 27) @@ -117,7 +117,7 @@ EvtSource N(beforeBattle_80227B94) = { EVT_END }; -EvtSource N(afterBattle_80227C8C) = { +EvtScript N(afterBattle_80227C8C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c index cf46b8eefb..0c8c7f38f2 100644 --- a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c @@ -7,11 +7,11 @@ #define NAMESPACE b_area_trd_part_2_blue_ninja_koopa extern s32 N(idleAnimations_8022B5B0)[]; -extern EvtSource N(init_8022DC2C); -extern EvtSource N(idle_8022DD20); -extern EvtSource N(handleEvent_8022DD88); -extern EvtSource N(nextTurn_8022E424); -extern EvtSource N(takeTurn_8022E414); +extern EvtScript N(init_8022DC2C); +extern EvtScript N(idle_8022DD20); +extern EvtScript N(handleEvent_8022DD88); +extern EvtScript N(nextTurn_8022E424); +extern EvtScript N(takeTurn_8022E414); s32 N(defenseTable_8022B4A0)[] = { ELEMENT_NORMAL, 1, @@ -48,7 +48,7 @@ s32 N(statusTable_8022B4B8)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022B564)[] = { +ActorPartBlueprint N(partsTable_8022B564)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -63,7 +63,7 @@ ActorPartDesc N(partsTable_8022B564)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_40000 | ACTOR_FLAG_NO_ATTACK, .type = ACTOR_TYPE_BLUE_NINJAKOOPA, .level = 17, @@ -159,7 +159,7 @@ INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_80219530_4B2720); #include "common/GetLastActorEventType.inc.c" -EvtSource N(8022B6E8) = { +EvtScript N(8022B6E8) = { EVT_CALL(SetOwnerID, ACTOR_ENEMY2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NE(LW(0), 0) @@ -673,7 +673,7 @@ EvtSource N(8022B6E8) = { EVT_END }; -EvtSource N(init_8022DC2C) = { +EvtScript N(init_8022DC2C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022E414))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8022DD20))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022DD88))) @@ -688,7 +688,7 @@ EvtSource N(init_8022DC2C) = { EVT_END }; -EvtSource N(idle_8022DD20) = { +EvtScript N(idle_8022DD20) = { EVT_RETURN EVT_END }; @@ -699,7 +699,7 @@ s32 N(intTable_8022DD30)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_8022DD88) = { +EvtScript N(handleEvent_8022DD88) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -810,12 +810,12 @@ EvtSource N(handleEvent_8022DD88) = { EVT_END }; -EvtSource N(takeTurn_8022E414) = { +EvtScript N(takeTurn_8022E414) = { EVT_RETURN EVT_END }; -EvtSource N(nextTurn_8022E424) = { +EvtScript N(nextTurn_8022E424) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/actor/fake_bowser.c b/src/battle/area_trd_part_2/actor/fake_bowser.c index fae0e67c11..a8766dedbc 100644 --- a/src/battle/area_trd_part_2/actor/fake_bowser.c +++ b/src/battle/area_trd_part_2/actor/fake_bowser.c @@ -6,24 +6,24 @@ #define NAMESPACE b_area_trd_part_2_fake_bowser -extern EvtSource b_area_trd_part_2_green_ninja_koopa_802257A8; -extern EvtSource b_area_trd_part_2_red_ninja_koopa_80228748; -extern EvtSource b_area_trd_part_2_blue_ninja_koopa_8022B6E8; -extern EvtSource b_area_trd_part_2_yellow_ninja_koopa_8022E688; +extern EvtScript b_area_trd_part_2_green_ninja_koopa_802257A8; +extern EvtScript b_area_trd_part_2_red_ninja_koopa_80228748; +extern EvtScript b_area_trd_part_2_blue_ninja_koopa_8022B6E8; +extern EvtScript b_area_trd_part_2_yellow_ninja_koopa_8022E688; -extern EvtSource N(init_8021A968); -extern EvtSource N(handleEvent_8021E6F0); -extern EvtSource N(handleEvent_802242FC); -extern EvtSource N(idle_8021D508); -extern EvtSource N(idle_802239BC); -extern EvtSource N(nextTurn_8021F410); -extern EvtSource N(nextTurn_80225438); -extern EvtSource N(takeTurn_8021EC98); -extern EvtSource N(takeTurn_80224D84); -extern EvtSource N(8021E3A0); -extern EvtSource N(8021F630); -extern EvtSource N(80222C44); -extern EvtSource N(80223870); +extern EvtScript N(init_8021A968); +extern EvtScript N(handleEvent_8021E6F0); +extern EvtScript N(handleEvent_802242FC); +extern EvtScript N(idle_8021D508); +extern EvtScript N(idle_802239BC); +extern EvtScript N(nextTurn_8021F410); +extern EvtScript N(nextTurn_80225438); +extern EvtScript N(takeTurn_8021EC98); +extern EvtScript N(takeTurn_80224D84); +extern EvtScript N(8021E3A0); +extern EvtScript N(8021F630); +extern EvtScript N(80222C44); +extern EvtScript N(80223870); // TODO: This pad is here due to rodata having subalign 4, while bss is 0x10 aligned as normal. BSS static char pad; @@ -76,7 +76,7 @@ s32 N(idleAnimations_8021A73C)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8021A748)[] = { +ActorPartBlueprint N(partsTable_8021A748)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -211,7 +211,7 @@ ActorPartDesc N(partsTable_8021A748)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_NO_SHADOW, .type = ACTOR_TYPE_FAKE_BOWSER, .level = 0, @@ -241,7 +241,7 @@ s32 N(D_8021A8FC_48BAEC)[] = { 0x0000002B, 0x0000002D, 0x0000FFFF, }; -EvtSource N(init_8021A968) = { +EvtScript N(init_8021A968) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021EC98))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021D508))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021E6F0))) @@ -289,7 +289,7 @@ s32 N(D_8021AAC4_48BCB4)[] = { }; -EvtSource N(8021ABE4) = { +EvtScript N(8021ABE4) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_FBUF(EVT_ADDR(N(D_8021AAC4_48BCB4))) EVT_LABEL(0) @@ -325,7 +325,7 @@ s32 N(D_8021ACCC_48BEBC)[] = { 255, 255, 255 }; -EvtSource N(8021AD68) = { +EvtScript N(8021AD68) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_FBUF(EVT_ADDR(N(D_8021ACCC_48BEBC))) EVT_LABEL(0) @@ -372,7 +372,7 @@ s32 N(D_8021AE50_48C040)[] = { 255, 255, 255 }; -EvtSource N(8021AF70) = { +EvtScript N(8021AF70) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_FBUF(EVT_ADDR(N(D_8021AE50_48C040))) EVT_LABEL(0) @@ -401,7 +401,7 @@ EvtSource N(8021AF70) = { EVT_END }; -EvtSource N(8021B0E4) = { +EvtScript N(8021B0E4) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(N(StartRumbleWithParams), 256, 30) EVT_THREAD @@ -507,7 +507,7 @@ s32 N(intTable_8021B5D0)[] = { 255, 255, 255, }; -EvtSource N(8021B6F0) = { +EvtScript N(8021B6F0) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_BUF(EVT_ADDR(N(intTable_8021B5D0))) EVT_LABEL(0) @@ -542,7 +542,7 @@ s32 N(intTable_8021B7D4)[] = { 255, 255, 255, }; -EvtSource N(8021B864) = { +EvtScript N(8021B864) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_BUF(EVT_ADDR(N(intTable_8021B7D4))) EVT_LABEL(0) @@ -589,7 +589,7 @@ s32 N(intTable_8021B948)[] = { 255, 255, 255, }; -EvtSource N(8021BA68) = { +EvtScript N(8021BA68) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_BUF(EVT_ADDR(N(intTable_8021B948))) EVT_LABEL(0) @@ -639,7 +639,7 @@ s32 N(intTable_8021BB68)[] = { 255, 255, 255, }; -EvtSource N(8021BC88) = { +EvtScript N(8021BC88) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_BUF(EVT_ADDR(N(intTable_8021BB68))) EVT_LABEL(0) @@ -659,7 +659,7 @@ EvtSource N(8021BC88) = { EVT_END }; -EvtSource N(8021BD6C) = { +EvtScript N(8021BD6C) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 3, LW(0), LW(1), LW(2)) @@ -685,7 +685,7 @@ EvtSource N(8021BD6C) = { EVT_END }; -EvtSource N(8021BF14) = { +EvtScript N(8021BF14) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 4, LW(0), LW(1), LW(2)) @@ -739,7 +739,7 @@ s32 N(intTable_8021C0CC)[] = { 255, 255, 255, }; -EvtSource N(8021C1EC) = { +EvtScript N(8021C1EC) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_BUF(EVT_ADDR(N(intTable_8021C0CC))) EVT_LABEL(0) @@ -786,7 +786,7 @@ s32 N(intTable_8021C2D4)[] = { 255, 255, 255, }; -EvtSource N(8021C3F4) = { +EvtScript N(8021C3F4) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_BUF(EVT_ADDR(N(intTable_8021C2D4))) EVT_LABEL(0) @@ -825,7 +825,7 @@ s32 N(intTable_8021C4F8)[] = { 255, 255, 255, }; -EvtSource N(8021C594) = { +EvtScript N(8021C594) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_BUF(EVT_ADDR(N(intTable_8021C4F8))) EVT_LABEL(0) @@ -845,7 +845,7 @@ EvtSource N(8021C594) = { EVT_END }; -EvtSource N(8021C67C) = { +EvtScript N(8021C67C) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 10, LW(0), LW(1), LW(2)) @@ -908,7 +908,7 @@ s32 N(D_8021C7F4_48D9E4)[] = { 255, 255, 255, }; -EvtSource N(8021C9A4) = { +EvtScript N(8021C9A4) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_FBUF(EVT_ADDR(N(D_8021C7F4_48D9E4))) EVT_SET(LW(15), 0) @@ -934,7 +934,7 @@ EvtSource N(8021C9A4) = { EVT_END }; -EvtSource N(8021CAE4) = { +EvtScript N(8021CAE4) = { EVT_CALL(GetPartRotation, ACTOR_SELF, 6, LW(2), LW(3), LW(4)) EVT_CALL(MakeLerp, LW(4), 0, 20, 0) EVT_LABEL(0) @@ -948,7 +948,7 @@ EvtSource N(8021CAE4) = { EVT_END }; -EvtSource N(8021CB98) = { +EvtScript N(8021CB98) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 6, LW(0), LW(1), LW(2)) @@ -975,7 +975,7 @@ EvtSource N(8021CB98) = { EVT_END }; -EvtSource N(8021CD50) = { +EvtScript N(8021CD50) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 11, LW(0), LW(1), LW(2)) @@ -1013,7 +1013,7 @@ s32 N(D_8021CE68_48E058)[] = { 255, 255, 255 }; -EvtSource N(8021CF4C) = { +EvtScript N(8021CF4C) = { EVT_USE_ARRAY(D_80235FC0) EVT_USE_FBUF(EVT_ADDR(N(D_8021CE68_48E058))) EVT_LABEL(0) @@ -1034,7 +1034,7 @@ EvtSource N(8021CF4C) = { EVT_END }; -EvtSource N(8021D054) = { +EvtScript N(8021D054) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 8, LW(0), LW(1), LW(2)) @@ -1058,7 +1058,7 @@ EvtSource N(8021D054) = { EVT_END }; -EvtSource N(8021D1CC) = { +EvtScript N(8021D1CC) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 9, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 9, LW(0), LW(1), LW(2)) @@ -1083,7 +1083,7 @@ EvtSource N(8021D1CC) = { EVT_END }; -EvtSource N(8021D350) = { +EvtScript N(8021D350) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_100000, 1) EVT_CALL(GetPartPos, ACTOR_SELF, 7, LW(0), LW(1), LW(2)) @@ -1110,7 +1110,7 @@ EvtSource N(8021D350) = { EVT_END }; -EvtSource N(idle_8021D508) = { +EvtScript N(idle_8021D508) = { EVT_USE_ARRAY(D_80235FC0) EVT_SET(LW(10), 0) EVT_LABEL(0) @@ -1295,7 +1295,7 @@ EvtSource N(idle_8021D508) = { EVT_END }; -EvtSource N(8021E3A0) = { +EvtScript N(8021E3A0) = { EVT_DIV(LW(10), 4) EVT_ADD(LW(10), 1) EVT_CALL(RandInt, LW(10), LW(3)) @@ -1332,7 +1332,7 @@ EvtSource N(8021E3A0) = { EVT_END }; -EvtSource N(handleEvent_8021E6F0) = { +EvtScript N(handleEvent_8021E6F0) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -1412,7 +1412,7 @@ EvtSource N(handleEvent_8021E6F0) = { EVT_END }; -EvtSource N(takeTurn_8021EC98) = { +EvtScript N(takeTurn_8021EC98) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1532,7 +1532,7 @@ EvtSource N(takeTurn_8021EC98) = { EVT_END }; -EvtSource N(nextTurn_8021F410) = { +EvtScript N(nextTurn_8021F410) = { EVT_USE_ARRAY(D_80235FC0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetBattlePhase, LW(0)) @@ -1575,7 +1575,7 @@ ApiStatus func_80218350_4B1540(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(8021F630) = { +EvtScript N(8021F630) = { EVT_CALL(UseIdleAnimation, ACTOR_ENEMY0, FALSE) EVT_CALL(EnableIdleScript, ACTOR_ENEMY0, 0) EVT_CALL(SetActorPos, ACTOR_ENEMY0, 100, 0, 10) @@ -1771,7 +1771,7 @@ ApiStatus func_8021837C_4B156C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(80220588) = { +EvtScript N(80220588) = { EVT_IF_EQ(LW(2), 0) EVT_CALL(SetActorVar, ACTOR_SELF, 5, LW(0)) EVT_END_IF @@ -2124,7 +2124,7 @@ EvtSource N(80220588) = { EVT_END }; -EvtSource N(80221DB4) = { +EvtScript N(80221DB4) = { EVT_IF_EQ(LW(2), 0) EVT_CALL(SetActorVar, ACTOR_SELF, 5, LW(0)) EVT_END_IF @@ -2342,7 +2342,7 @@ EvtSource N(80221DB4) = { EVT_END }; -EvtSource N(80222C44) = { +EvtScript N(80222C44) = { EVT_SET(LW(10), 0) EVT_CALL(PlayerCreateTargetList, 32770) EVT_CALL(InitTargetIterator) @@ -2419,7 +2419,7 @@ EvtSource N(80222C44) = { EVT_END }; -EvtSource N(802230E8) = { +EvtScript N(802230E8) = { EVT_SET(LW(10), 0) EVT_CALL(PlayerCreateTargetList, 32770) EVT_CALL(InitTargetIterator) @@ -2501,7 +2501,7 @@ EvtSource N(802230E8) = { EVT_END }; -EvtSource N(802235E0) = { +EvtScript N(802235E0) = { EVT_CALL(GetActorVar, ACTOR_SELF, 1, LW(0)) EVT_IF_EQ(LW(0), 2) EVT_RETURN @@ -2522,7 +2522,7 @@ EvtSource N(802235E0) = { EVT_END }; -EvtSource N(80223718) = { +EvtScript N(80223718) = { EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) EVT_IF_NE(LW(0), EVENT_BURN_HIT) @@ -2544,7 +2544,7 @@ EvtSource N(80223718) = { EVT_END }; -EvtSource N(80223870) = { +EvtScript N(80223870) = { EVT_CALL(ActorExists, ACTOR_ENEMY0, LW(0)) EVT_IF_EQ(LW(0), TRUE) EVT_EXEC_GET_TID(b_area_trd_part_2_green_ninja_koopa_802257A8, LW(1)) @@ -2571,7 +2571,7 @@ EvtSource N(80223870) = { EVT_END }; -EvtSource N(idle_802239BC) = { +EvtScript N(idle_802239BC) = { EVT_LABEL(0) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LW(0)) EVT_IF_NE(LW(0), 2) @@ -2726,7 +2726,7 @@ EvtSource N(idle_802239BC) = { EVT_END }; -EvtSource N(handleEvent_802242FC) = { +EvtScript N(handleEvent_802242FC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) EVT_SWITCH(LW(0)) @@ -2893,7 +2893,7 @@ EvtSource N(handleEvent_802242FC) = { EVT_END }; -EvtSource N(takeTurn_80224D84) = { +EvtScript N(takeTurn_80224D84) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LW(0)) EVT_SWITCH(LW(0)) @@ -3005,7 +3005,7 @@ EvtSource N(takeTurn_80224D84) = { EVT_END }; -EvtSource N(nextTurn_80225438) = { +EvtScript N(nextTurn_80225438) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LW(0)) EVT_CALL(SetEnemyHP, ACTOR_SELF, LW(0)) diff --git a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c index f70eb8d479..9dd1190aad 100644 --- a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c @@ -7,11 +7,11 @@ #define NAMESPACE b_area_trd_part_2_green_ninja_koopa extern s32 N(idleAnimations_80225670)[]; -extern EvtSource N(init_80227CEC); -extern EvtSource N(idle_80227DE0); -extern EvtSource N(handleEvent_80227E48); -extern EvtSource N(nextTurn_802284E4); -extern EvtSource N(takeTurn_802284D4); +extern EvtScript N(init_80227CEC); +extern EvtScript N(idle_80227DE0); +extern EvtScript N(handleEvent_80227E48); +extern EvtScript N(nextTurn_802284E4); +extern EvtScript N(takeTurn_802284D4); s32 N(defenseTable_80225560)[] = { ELEMENT_NORMAL, 1, @@ -48,7 +48,7 @@ s32 N(statusTable_80225578)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80225624)[] = { +ActorPartBlueprint N(partsTable_80225624)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -63,7 +63,7 @@ ActorPartDesc N(partsTable_80225624)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_40000 | ACTOR_FLAG_NO_ATTACK, .type = ACTOR_TYPE_GREEN_NINJAKOOPA, .level = 16, @@ -159,7 +159,7 @@ INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_802185B0_4B17A0); #include "common/GetLastActorEventType.inc.c" -EvtSource N(802257A8) = { +EvtScript N(802257A8) = { EVT_CALL(SetOwnerID, ACTOR_ENEMY0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NE(LW(0), 0) @@ -673,7 +673,7 @@ EvtSource N(802257A8) = { EVT_END }; -EvtSource N(init_80227CEC) = { +EvtScript N(init_80227CEC) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802284D4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80227DE0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80227E48))) @@ -688,7 +688,7 @@ EvtSource N(init_80227CEC) = { EVT_END }; -EvtSource N(idle_80227DE0) = { +EvtScript N(idle_80227DE0) = { EVT_RETURN EVT_END }; @@ -699,7 +699,7 @@ s32 N(intTable_80227DF0)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_80227E48) = { +EvtScript N(handleEvent_80227E48) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -810,12 +810,12 @@ EvtSource N(handleEvent_80227E48) = { EVT_END }; -EvtSource N(takeTurn_802284D4) = { +EvtScript N(takeTurn_802284D4) = { EVT_RETURN EVT_END }; -EvtSource N(nextTurn_802284E4) = { +EvtScript N(nextTurn_802284E4) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c index b5eea57480..3558f68e1f 100644 --- a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c @@ -7,11 +7,11 @@ #define NAMESPACE b_area_trd_part_2_red_ninja_koopa extern s32 N(idleAnimations_80228610)[]; -extern EvtSource N(init_8022AC8C); -extern EvtSource N(idle_8022AD80); -extern EvtSource N(handleEvent_8022ADE8); -extern EvtSource N(nextTurn_8022B484); -extern EvtSource N(takeTurn_8022B474); +extern EvtScript N(init_8022AC8C); +extern EvtScript N(idle_8022AD80); +extern EvtScript N(handleEvent_8022ADE8); +extern EvtScript N(nextTurn_8022B484); +extern EvtScript N(takeTurn_8022B474); s32 N(defenseTable_80228500)[] = { ELEMENT_NORMAL, 1, @@ -48,7 +48,7 @@ s32 N(statusTable_80228518)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_802285C4)[] = { +ActorPartBlueprint N(partsTable_802285C4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -63,7 +63,7 @@ ActorPartDesc N(partsTable_802285C4)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_40000 | ACTOR_FLAG_NO_ATTACK, .type = ACTOR_TYPE_RED_NINJAKOOPA, .level = 17, @@ -159,7 +159,7 @@ INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80218D70_4B1F60); #include "common/GetLastActorEventType.inc.c" -EvtSource N(80228748) = { +EvtScript N(80228748) = { EVT_CALL(SetOwnerID, ACTOR_ENEMY3) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NE(LW(0), 0) @@ -673,7 +673,7 @@ EvtSource N(80228748) = { EVT_END }; -EvtSource N(init_8022AC8C) = { +EvtScript N(init_8022AC8C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022B474))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8022AD80))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8022ADE8))) @@ -688,7 +688,7 @@ EvtSource N(init_8022AC8C) = { EVT_END }; -EvtSource N(idle_8022AD80) = { +EvtScript N(idle_8022AD80) = { EVT_RETURN EVT_END }; @@ -699,7 +699,7 @@ s32 N(intTable_8022AD90)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_8022ADE8) = { +EvtScript N(handleEvent_8022ADE8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -810,12 +810,12 @@ EvtSource N(handleEvent_8022ADE8) = { EVT_END }; -EvtSource N(takeTurn_8022B474) = { +EvtScript N(takeTurn_8022B474) = { EVT_RETURN EVT_END }; -EvtSource N(nextTurn_8022B484) = { +EvtScript N(nextTurn_8022B484) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c index b00602073e..867ccc5c63 100644 --- a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c @@ -7,11 +7,11 @@ #define NAMESPACE b_area_trd_part_2_yellow_ninja_koopa extern s32 N(idleAnimations_8022E550)[]; -extern EvtSource N(init_80230BCC); -extern EvtSource N(idle_80230CC0); -extern EvtSource N(handleEvent_80230D28); -extern EvtSource N(nextTurn_802313C4); -extern EvtSource N(takeTurn_802313B4); +extern EvtScript N(init_80230BCC); +extern EvtScript N(idle_80230CC0); +extern EvtScript N(handleEvent_80230D28); +extern EvtScript N(nextTurn_802313C4); +extern EvtScript N(takeTurn_802313B4); s32 N(defenseTable_8022E440)[] = { ELEMENT_NORMAL, 1, @@ -48,7 +48,7 @@ s32 N(statusTable_8022E458)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_8022E504)[] = { +ActorPartBlueprint N(partsTable_8022E504)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -63,7 +63,7 @@ ActorPartDesc N(partsTable_8022E504)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_40000 | ACTOR_FLAG_NO_ATTACK, .type = ACTOR_TYPE_YELLOW_NINJAKOOPA, .level = 16, @@ -159,7 +159,7 @@ INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_80219CF0_4B2EE0); #include "common/GetLastActorEventType.inc.c" -EvtSource N(8022E688) = { +EvtScript N(8022E688) = { EVT_CALL(SetOwnerID, ACTOR_ENEMY1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(0)) EVT_IF_NE(LW(0), 0) @@ -673,7 +673,7 @@ EvtSource N(8022E688) = { EVT_END }; -EvtSource N(init_80230BCC) = { +EvtScript N(init_80230BCC) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_802313B4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80230CC0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80230D28))) @@ -688,7 +688,7 @@ EvtSource N(init_80230BCC) = { EVT_END }; -EvtSource N(idle_80230CC0) = { +EvtScript N(idle_80230CC0) = { EVT_RETURN EVT_END }; @@ -699,7 +699,7 @@ s32 N(intTable_80230CD0)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_80230D28) = { +EvtScript N(handleEvent_80230D28) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -810,12 +810,12 @@ EvtSource N(handleEvent_80230D28) = { EVT_END }; -EvtSource N(takeTurn_802313B4) = { +EvtScript N(takeTurn_802313B4) = { EVT_RETURN EVT_END }; -EvtSource N(nextTurn_802313C4) = { +EvtScript N(nextTurn_802313C4) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/area.c b/src/battle/area_trd_part_2/area.c index ffe242b54f..9fcadf3f14 100644 --- a/src/battle/area_trd_part_2/area.c +++ b/src/battle/area_trd_part_2/area.c @@ -4,11 +4,11 @@ #define NAMESPACE b_area_trd_part_2 -extern ActorDesc N(green_ninja_koopa); -extern ActorDesc N(yellow_ninja_koopa); -extern ActorDesc N(blue_ninja_koopa); -extern ActorDesc N(red_ninja_koopa); -extern ActorDesc N(fake_bowser); +extern ActorBlueprint N(green_ninja_koopa); +extern ActorBlueprint N(yellow_ninja_koopa); +extern ActorBlueprint N(blue_ninja_koopa); +extern ActorBlueprint N(red_ninja_koopa); +extern ActorBlueprint N(fake_bowser); extern Stage N(trd_00); extern Stage N(trd_01); diff --git a/src/battle/area_trd_part_2/stage/trd_00.c b/src/battle/area_trd_part_2/stage/trd_00.c index 6030b6b28e..796ece4b9e 100644 --- a/src/battle/area_trd_part_2/stage/trd_00.c +++ b/src/battle/area_trd_part_2/stage/trd_00.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_trd_part_2_trd_00 -EvtSource N(beforeBattle_802313E0) = { +EvtScript N(beforeBattle_802313E0) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_8023141C) = { +EvtScript N(afterBattle_8023141C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_01.c b/src/battle/area_trd_part_2/stage/trd_01.c index 12da584574..0b6b4ff0ff 100644 --- a/src/battle/area_trd_part_2/stage/trd_01.c +++ b/src/battle/area_trd_part_2/stage/trd_01.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_trd_part_2_trd_01 -EvtSource N(beforeBattle_80231460) = { +EvtScript N(beforeBattle_80231460) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(afterBattle_8023149C) = { +EvtScript N(afterBattle_8023149C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_02.c b/src/battle/area_trd_part_2/stage/trd_02.c index 3bd7122f7a..31c9625d24 100644 --- a/src/battle/area_trd_part_2/stage/trd_02.c +++ b/src/battle/area_trd_part_2/stage/trd_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_02 -EvtSource N(802314E0) = { +EvtScript N(802314E0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(802314E0) = { EVT_END }; -EvtSource N(802315F8) = { +EvtScript N(802315F8) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(802315F8) = { EVT_END }; -EvtSource N(beforeBattle_80231BA4) = { +EvtScript N(beforeBattle_80231BA4) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 12, 0) @@ -121,7 +121,7 @@ EvtSource N(beforeBattle_80231BA4) = { EVT_END }; -EvtSource N(afterBattle_80231C98) = { +EvtScript N(afterBattle_80231C98) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_02b.c b/src/battle/area_trd_part_2/stage/trd_02b.c index 259f281eeb..c1a4f91052 100644 --- a/src/battle/area_trd_part_2/stage/trd_02b.c +++ b/src/battle/area_trd_part_2/stage/trd_02b.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_02b -EvtSource N(80231CE0) = { +EvtScript N(80231CE0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80231CE0) = { EVT_END }; -EvtSource N(80231DF8) = { +EvtScript N(80231DF8) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80231DF8) = { EVT_END }; -EvtSource N(beforeBattle_802323A4) = { +EvtScript N(beforeBattle_802323A4) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 22, 0) @@ -123,7 +123,7 @@ EvtSource N(beforeBattle_802323A4) = { EVT_END }; -EvtSource N(afterBattle_802324C0) = { +EvtScript N(afterBattle_802324C0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_03.c b/src/battle/area_trd_part_2/stage/trd_03.c index fd9ee3ab8d..289bb1cab9 100644 --- a/src/battle/area_trd_part_2/stage/trd_03.c +++ b/src/battle/area_trd_part_2/stage/trd_03.c @@ -5,7 +5,7 @@ #include "world/common/clouds.inc.c" -EvtSource N(beforeBattle_80232888) = { +EvtScript N(beforeBattle_80232888) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 4) EVT_SET(LW(2), 0) @@ -19,7 +19,7 @@ EvtSource N(beforeBattle_80232888) = { EVT_END }; -EvtSource N(afterBattle_80232920) = { +EvtScript N(afterBattle_80232920) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_04.c b/src/battle/area_trd_part_2/stage/trd_04.c index bf8095dbf1..2ac4e3d250 100644 --- a/src/battle/area_trd_part_2/stage/trd_04.c +++ b/src/battle/area_trd_part_2/stage/trd_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_04 -EvtSource N(80232970) = { +EvtScript N(80232970) = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -20,7 +20,7 @@ EvtSource N(80232970) = { EVT_END }; -EvtSource N(80232A40) = { +EvtScript N(80232A40) = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -38,7 +38,7 @@ EvtSource N(80232A40) = { EVT_END }; -EvtSource N(80232B2C) = { +EvtScript N(80232B2C) = { EVT_SET(LW(10), LW(1)) EVT_SET(LW(11), LW(2)) EVT_SET(LW(12), LW(3)) @@ -56,7 +56,7 @@ EvtSource N(80232B2C) = { EVT_END }; -EvtSource N(beforeBattle_80232C18) = { +EvtScript N(beforeBattle_80232C18) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_SET(LW(0), 13) @@ -68,7 +68,7 @@ EvtSource N(beforeBattle_80232C18) = { EVT_END }; -EvtSource N(afterBattle_80232CA0) = { +EvtScript N(afterBattle_80232CA0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_05.c b/src/battle/area_trd_part_2/stage/trd_05.c index 94c62ad0eb..4d2b31525a 100644 --- a/src/battle/area_trd_part_2/stage/trd_05.c +++ b/src/battle/area_trd_part_2/stage/trd_05.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_05 -EvtSource N(80232CE0) = { +EvtScript N(80232CE0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80232CE0) = { EVT_END }; -EvtSource N(80232DF8) = { +EvtScript N(80232DF8) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80232DF8) = { EVT_END }; -EvtSource N(beforeBattle_802333A4) = { +EvtScript N(beforeBattle_802333A4) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_THREAD @@ -124,7 +124,7 @@ EvtSource N(beforeBattle_802333A4) = { EVT_END }; -EvtSource N(afterBattle_802334B0) = { +EvtScript N(afterBattle_802334B0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_05b.c b/src/battle/area_trd_part_2/stage/trd_05b.c index 9c947c156d..910c96b3f6 100644 --- a/src/battle/area_trd_part_2/stage/trd_05b.c +++ b/src/battle/area_trd_part_2/stage/trd_05b.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_05b -EvtSource N(802334F0) = { +EvtScript N(802334F0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(802334F0) = { EVT_END }; -EvtSource N(80233608) = { +EvtScript N(80233608) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80233608) = { EVT_END }; -EvtSource N(beforeBattle_80233BB4) = { +EvtScript N(beforeBattle_80233BB4) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 16, 0) @@ -117,7 +117,7 @@ EvtSource N(beforeBattle_80233BB4) = { EVT_END }; -EvtSource N(afterBattle_80233CB8) = { +EvtScript N(afterBattle_80233CB8) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_05c.c b/src/battle/area_trd_part_2/stage/trd_05c.c index 02db4a36cd..3560728374 100644 --- a/src/battle/area_trd_part_2/stage/trd_05c.c +++ b/src/battle/area_trd_part_2/stage/trd_05c.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_05c -EvtSource N(80233CF0) = { +EvtScript N(80233CF0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80233CF0) = { EVT_END }; -EvtSource N(80233E08) = { +EvtScript N(80233E08) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80233E08) = { EVT_END }; -EvtSource N(beforeBattle_802343B4) = { +EvtScript N(beforeBattle_802343B4) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 10, 0) @@ -125,7 +125,7 @@ EvtSource N(beforeBattle_802343B4) = { EVT_END }; -EvtSource N(afterBattle_80234500) = { +EvtScript N(afterBattle_80234500) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_05d.c b/src/battle/area_trd_part_2/stage/trd_05d.c index 2513ee4db6..636704f2ed 100644 --- a/src/battle/area_trd_part_2/stage/trd_05d.c +++ b/src/battle/area_trd_part_2/stage/trd_05d.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_05d -EvtSource N(80234540) = { +EvtScript N(80234540) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80234540) = { EVT_END }; -EvtSource N(80234658) = { +EvtScript N(80234658) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80234658) = { EVT_END }; -EvtSource N(beforeBattle_80234C04) = { +EvtScript N(beforeBattle_80234C04) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 10, 0) @@ -124,7 +124,7 @@ EvtSource N(beforeBattle_80234C04) = { EVT_END }; -EvtSource N(afterBattle_80234D48) = { +EvtScript N(afterBattle_80234D48) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_05e.c b/src/battle/area_trd_part_2/stage/trd_05e.c index e519e1952f..d82a8a9f9e 100644 --- a/src/battle/area_trd_part_2/stage/trd_05e.c +++ b/src/battle/area_trd_part_2/stage/trd_05e.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_05e -EvtSource N(80234D80) = { +EvtScript N(80234D80) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80234D80) = { EVT_END }; -EvtSource N(80234E98) = { +EvtScript N(80234E98) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80234E98) = { EVT_END }; -EvtSource N(beforeBattle_80235444) = { +EvtScript N(beforeBattle_80235444) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_CALL(EnableModel, 27, 0) @@ -115,7 +115,7 @@ EvtSource N(beforeBattle_80235444) = { EVT_END }; -EvtSource N(afterBattle_80235520) = { +EvtScript N(afterBattle_80235520) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_2/stage/trd_05f.c b/src/battle/area_trd_part_2/stage/trd_05f.c index 793ef17db8..dedac0d66e 100644 --- a/src/battle/area_trd_part_2/stage/trd_05f.c +++ b/src/battle/area_trd_part_2/stage/trd_05f.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_2_trd_05f -EvtSource N(80235560) = { +EvtScript N(80235560) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(RotateGroup, LW(10), 2, 0, 0, 1) @@ -22,7 +22,7 @@ EvtSource N(80235560) = { EVT_END }; -EvtSource N(80235678) = { +EvtScript N(80235678) = { EVT_SET(LW(10), LW(0)) EVT_LOOP(0) EVT_CALL(TranslateModel, LW(10), 1, 0, 0) @@ -100,7 +100,7 @@ EvtSource N(80235678) = { EVT_END }; -EvtSource N(beforeBattle_80235C24) = { +EvtScript N(beforeBattle_80235C24) = { EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) EVT_SET(LW(0), 27) @@ -117,7 +117,7 @@ EvtSource N(beforeBattle_80235C24) = { EVT_END }; -EvtSource N(afterBattle_80235D1C) = { +EvtScript N(afterBattle_80235D1C) = { EVT_RETURN EVT_END }; diff --git a/src/battle/area_trd_part_3/actor/eldstar.c b/src/battle/area_trd_part_3/actor/eldstar.c index 1abd7ab00b..6c5a8e5dfb 100644 --- a/src/battle/area_trd_part_3/actor/eldstar.c +++ b/src/battle/area_trd_part_3/actor/eldstar.c @@ -6,11 +6,11 @@ #define NAMESPACE b_area_trd_part_3_eldstar -extern EvtSource N(init_80218390); -extern EvtSource N(takeTurn_80218414); -extern EvtSource N(idle_802183E8); -extern EvtSource N(handleEvent_80218404); -extern EvtSource N(80218424); +extern EvtScript N(init_80218390); +extern EvtScript N(takeTurn_80218414); +extern EvtScript N(idle_802183E8); +extern EvtScript N(handleEvent_80218404); +extern EvtScript N(80218424); extern s32 D_80219040; @@ -49,7 +49,7 @@ s32 N(statusTable_80218298)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_80218344)[] = { +ActorPartBlueprint N(partsTable_80218344)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -64,7 +64,7 @@ ActorPartDesc N(partsTable_80218344)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_40000 | ACTOR_FLAG_NO_ATTACK, .type = ACTOR_TYPE_ELDSTAR, .level = 99, @@ -87,7 +87,7 @@ ActorDesc NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -EvtSource N(init_80218390) = { +EvtScript N(init_80218390) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80218414))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_802183E8))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80218404))) @@ -185,23 +185,23 @@ ApiStatus func_802181F8_4CF3A8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(idle_802183E8) = { +EvtScript N(idle_802183E8) = { EVT_CALL(func_80218000_4CF1B0) EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80218404) = { +EvtScript N(handleEvent_80218404) = { EVT_RETURN EVT_END }; -EvtSource N(takeTurn_80218414) = { +EvtScript N(takeTurn_80218414) = { EVT_RETURN EVT_END }; -EvtSource N(80218424) = { +EvtScript N(80218424) = { EVT_CALL(SetBattleFlagBits, BS_FLAGS1_2000000, 1) EVT_CALL(func_80218158_4CF308) EVT_CALL(WaitForState, 13) diff --git a/src/battle/area_trd_part_3/area.c b/src/battle/area_trd_part_3/area.c index a76af40dc8..9223404dd1 100644 --- a/src/battle/area_trd_part_3/area.c +++ b/src/battle/area_trd_part_3/area.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_trd_part_3 -extern ActorDesc N(eldstar); +extern ActorBlueprint N(eldstar); extern Stage N(nok_01); diff --git a/src/battle/area_trd_part_3/stage/nok_01.c b/src/battle/area_trd_part_3/stage/nok_01.c index f2bd7e7e09..2cd0bf4570 100644 --- a/src/battle/area_trd_part_3/stage/nok_01.c +++ b/src/battle/area_trd_part_3/stage/nok_01.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_trd_part_3_nok_01 -EvtSource N(80218DD0) = { +EvtScript N(80218DD0) = { EVT_SET(LW(10), LW(0)) EVT_LABEL(0) EVT_CALL(TranslateModel, LW(10), 0, 2, 0) @@ -22,7 +22,7 @@ EvtSource N(80218DD0) = { EVT_END }; -EvtSource N(beforeBattle_80218ED8) = { +EvtScript N(beforeBattle_80218ED8) = { EVT_CALL(SetSpriteShading, -1) EVT_SET(LW(0), 19) EVT_EXEC(N(80218DD0)) @@ -40,7 +40,7 @@ EvtSource N(beforeBattle_80218ED8) = { EVT_END }; -EvtSource N(afterBattle_80218FA0) = { +EvtScript N(afterBattle_80218FA0) = { EVT_RETURN EVT_END }; diff --git a/src/battle/battle.h b/src/battle/battle.h index 03ec62f197..aaf71bdf0b 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -230,7 +230,7 @@ typedef enum ActorType { .dmaEnd = battle_##id##_ROM_END, \ .dmaDest = battle_##id##_VRAM -typedef struct ActorPartDesc { +typedef struct ActorPartBlueprint { /* 0x00 */ s32 flags; /* 0x04 */ s8 index; /* 0x05 */ Vec3b posOffset; @@ -242,9 +242,9 @@ typedef struct ActorPartDesc { /* 0x18 */ s32 elementImmunityFlags; /* 0x1C */ s16 unk_1C; /* 0x1E */ char unk_1E[6]; -} ActorPartDesc; // size = 0x24 +} ActorPartBlueprint; // size = 0x24 -typedef struct ActorDesc { +typedef struct ActorBlueprint { /* 0x00 */ s32 flags; /* 0x04 */ char unk_04; /* 0x05 */ u8 type; @@ -252,7 +252,7 @@ typedef struct ActorDesc { /* 0x07 */ u8 maxHP; /* 0x08 */ s16 partCount; /* 0x0A */ char unk_0A[2]; - /* 0x0C */ struct ActorPartDesc* partsData; + /* 0x0C */ struct ActorPartBlueprint* partsData; /* 0x10 */ Bytecode* script; /* 0x14 */ s32* statusTable; /* 0x18 */ u8 escapeChance; @@ -267,10 +267,10 @@ typedef struct ActorDesc { /* 0x22 */ Vec2b hpBarOffset; /* 0x24 */ Vec2b statusIconOffset; /* 0x26 */ Vec2b statusMessageOffset; -} ActorDesc; // size = 0x28 +} ActorBlueprint; // size = 0x28 typedef struct FormationRow { - /* 0x00 */ ActorDesc* actor; + /* 0x00 */ ActorBlueprint* actor; /* 0x04 */ union { s32 index; Vec3i* vec; diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index ab5b97ff87..65710ab140 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -34,9 +34,9 @@ s32 N(statusTable_8021975C)[] = { }; extern s32 N(idleAnimations_80219854)[]; -extern EvtSource N(init_802198EC); +extern EvtScript N(init_802198EC); -ActorPartDesc N(partsTable_80219808)[] = { +ActorPartBlueprint N(partsTable_80219808)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -51,7 +51,7 @@ ActorPartDesc N(partsTable_80219808)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_GOOMBA, .level = 5, @@ -100,11 +100,11 @@ s32 N(idleAnimations_802198A0)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021A440); -extern EvtSource N(idle_80219938); -extern EvtSource N(handleEvent_80219C14); +extern EvtScript N(takeTurn_8021A440); +extern EvtScript N(idle_80219938); +extern EvtScript N(handleEvent_80219C14); -EvtSource N(init_802198EC) = { +EvtScript N(init_802198EC) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021A440))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80219938))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80219C14))) @@ -112,7 +112,7 @@ EvtSource N(init_802198EC) = { EVT_END }; -EvtSource N(idle_80219938) = { +EvtScript N(idle_80219938) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -162,7 +162,7 @@ EvtSource N(idle_80219938) = { EVT_END }; -EvtSource N(handleEvent_80219C14) = { +EvtScript N(handleEvent_80219C14) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -281,7 +281,7 @@ EvtSource N(handleEvent_80219C14) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021A440) = { +EvtScript N(takeTurn_8021A440) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 5dd96a5921..41c208f633 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -44,9 +44,9 @@ s32 N(statusTable_8021C998)[] = { }; extern s32 N(idleAnimations_8021CA90)[]; -extern EvtSource N(init_8021CB74); +extern EvtScript N(init_8021CB74); -ActorPartDesc N(partsTable_8021CA44)[] = { +ActorPartBlueprint N(partsTable_8021CA44)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -61,7 +61,7 @@ ActorPartDesc N(partsTable_8021CA44)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_KOOPA_TROOPA, .level = 6, @@ -123,11 +123,11 @@ s32 N(idleAnimations_8021CB28)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021DD9C); -extern EvtSource N(idle_8021CD30); -extern EvtSource N(handleEvent_8021D218); +extern EvtScript N(takeTurn_8021DD9C); +extern EvtScript N(idle_8021CD30); +extern EvtScript N(handleEvent_8021D218); -EvtSource N(init_8021CB74) = { +EvtScript N(init_8021CB74) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021DD9C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021CD30))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021D218))) @@ -138,7 +138,7 @@ EvtSource N(init_8021CB74) = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(8021CBD8) = { +EvtScript N(8021CBD8) = { EVT_SWITCH(LW(0)) EVT_CASE_EQ(0) EVT_IF_FLAG(LW(1), 0x00041000) @@ -159,7 +159,7 @@ EvtSource N(8021CBD8) = { EVT_END }; -EvtSource N(idle_8021CD30) = { +EvtScript N(idle_8021CD30) = { EVT_LABEL(0) EVT_CALL(RandInt, 80, LW(10)) EVT_ADD(LW(10), 80) @@ -245,7 +245,7 @@ s32 N(intTable_8021D1C0)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_8021D218) = { +EvtScript N(handleEvent_8021D218) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -438,7 +438,7 @@ EvtSource N(handleEvent_8021D218) = { EVT_END }; -EvtSource N(takeTurn_8021DD9C) = { +EvtScript N(takeTurn_8021DD9C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 1a3ae261b9..796730e548 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -69,9 +69,9 @@ extern s32 N(idleAnimations_8021CAFC)[]; extern s32 N(idleAnimations_8021B338)[]; extern s32 N(idleAnimations_8021B3D0)[]; extern s32 N(idleAnimations_8021B3DC)[]; -extern EvtSource N(init_8021B3E8); +extern EvtScript N(init_8021B3E8); -ActorPartDesc N(partsTable_8021B280)[] = { +ActorPartBlueprint N(partsTable_8021B280)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -122,7 +122,7 @@ ActorPartDesc N(partsTable_8021B280)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_PARAGOOMBA, .level = 6, @@ -181,11 +181,11 @@ s32 N(idleAnimations_8021B3DC)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021BD5C); -extern EvtSource N(idle_8021B434); -extern EvtSource N(handleEvent_8021B768); +extern EvtScript N(takeTurn_8021BD5C); +extern EvtScript N(idle_8021B434); +extern EvtScript N(handleEvent_8021B768); -EvtSource N(init_8021B3E8) = { +EvtScript N(init_8021B3E8) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021BD5C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021B434))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021B768))) @@ -193,7 +193,7 @@ EvtSource N(init_8021B3E8) = { EVT_END }; -EvtSource N(idle_8021B434) = { +EvtScript N(idle_8021B434) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -241,7 +241,7 @@ EvtSource N(idle_8021B434) = { EVT_END }; -EvtSource N(8021B6F0) = { +EvtScript N(8021B6F0) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) @@ -251,9 +251,9 @@ EvtSource N(8021B6F0) = { EVT_END }; -extern EvtSource N(8021C574); +extern EvtScript N(8021C574); -EvtSource N(handleEvent_8021B768) = { +EvtScript N(handleEvent_8021B768) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -365,7 +365,7 @@ EvtSource N(handleEvent_8021B768) = { EVT_END }; -EvtSource N(takeTurn_8021BD5C) = { +EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -477,11 +477,11 @@ EvtSource N(takeTurn_8021BD5C) = { EVT_END }; -extern EvtSource N(8021CB94); +extern EvtScript N(8021CB94); #include "common/StartRumbleWithParams.inc.c" -EvtSource N(8021C574) = { +EvtScript N(8021C574) = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(SetPartFlags, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET) EVT_CALL(SetPartFlags, ACTOR_SELF, 3, ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_100000) @@ -577,11 +577,11 @@ s32 N(idleAnimations_8021CB48)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021D6E8); -extern EvtSource N(idle_8021CBE0); -extern EvtSource N(handleEvent_8021CEBC); +extern EvtScript N(takeTurn_8021D6E8); +extern EvtScript N(idle_8021CBE0); +extern EvtScript N(handleEvent_8021CEBC); -EvtSource N(8021CB94) = { +EvtScript N(8021CB94) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021D6E8))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021CBE0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021CEBC))) @@ -589,7 +589,7 @@ EvtSource N(8021CB94) = { EVT_END }; -EvtSource N(idle_8021CBE0) = { +EvtScript N(idle_8021CBE0) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -639,7 +639,7 @@ EvtSource N(idle_8021CBE0) = { EVT_END }; -EvtSource N(handleEvent_8021CEBC) = { +EvtScript N(handleEvent_8021CEBC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -758,7 +758,7 @@ EvtSource N(handleEvent_8021CEBC) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021D6E8) = { +EvtScript N(takeTurn_8021D6E8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 3ed8771198..50acd12787 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -77,9 +77,9 @@ s32 N(statusTable_8021EBC0)[] = { extern s32 N(idleAnimations_80220AA0)[]; extern s32 N(idleAnimations_8021ED00)[]; extern s32 N(idleAnimations_8021ED98)[]; -extern EvtSource N(init_8021EE0C); +extern EvtScript N(init_8021EE0C); -ActorPartDesc N(partsTable_8021EC6C)[] = { +ActorPartBlueprint N(partsTable_8021EC6C)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, @@ -118,7 +118,7 @@ ActorPartDesc N(partsTable_8021EC6C)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_PARATROOPA, .level = 6, @@ -180,17 +180,17 @@ s32 N(idleAnimations_8021ED98)[] = { STATUS_END, }; -EvtSource N(nextTurn_8021EDE4) = { +EvtScript N(nextTurn_8021EDE4) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_RETURN EVT_END }; -extern EvtSource N(takeTurn_8021FA24); -extern EvtSource N(idle_8021EF5C); -extern EvtSource N(handleEvent_8021F2EC); +extern EvtScript N(takeTurn_8021FA24); +extern EvtScript N(idle_8021EF5C); +extern EvtScript N(handleEvent_8021F2EC); -EvtSource N(init_8021EE0C) = { +EvtScript N(init_8021EE0C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021FA24))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021EF5C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021F2EC))) @@ -204,7 +204,7 @@ EvtSource N(init_8021EE0C) = { #include "common/UnkBattleFunc1.inc.c" -EvtSource N(8021EE84) = { +EvtScript N(8021EE84) = { EVT_IF_FLAG(LW(1), 0x00041000) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 0, 25) EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 3, -6) @@ -218,7 +218,7 @@ EvtSource N(8021EE84) = { EVT_END }; -EvtSource N(idle_8021EF5C) = { +EvtScript N(idle_8021EF5C) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -271,7 +271,7 @@ EvtSource N(idle_8021EF5C) = { EVT_END }; -EvtSource N(8021F26C) = { +EvtScript N(8021F26C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_para_troopa_Palette_01_Anim_3) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -281,9 +281,9 @@ EvtSource N(8021F26C) = { EVT_END }; -extern EvtSource N(802204DC); +extern EvtScript N(802204DC); -EvtSource N(handleEvent_8021F2EC) = { +EvtScript N(handleEvent_8021F2EC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LW(0)) @@ -418,7 +418,7 @@ EvtSource N(handleEvent_8021F2EC) = { EVT_END }; -EvtSource N(takeTurn_8021FA24) = { +EvtScript N(takeTurn_8021FA24) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -560,9 +560,9 @@ EvtSource N(takeTurn_8021FA24) = { EVT_END }; -extern EvtSource N(80220B84); +extern EvtScript N(80220B84); -EvtSource N(802204DC) = { +EvtScript N(802204DC) = { EVT_CALL(SetPartDispOffset, ACTOR_SELF, 2, 0, 0, 0) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(SetPartFlags, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET) @@ -678,11 +678,11 @@ s32 N(idleAnimations_80220B38)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_80221DAC); -extern EvtSource N(idle_80220D40); -extern EvtSource N(handleEvent_80221228); +extern EvtScript N(takeTurn_80221DAC); +extern EvtScript N(idle_80220D40); +extern EvtScript N(handleEvent_80221228); -EvtSource N(80220B84) = { +EvtScript N(80220B84) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_80221DAC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_80220D40))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_80221228))) @@ -691,7 +691,7 @@ EvtSource N(80220B84) = { EVT_END }; -EvtSource N(80220BE8) = { +EvtScript N(80220BE8) = { EVT_SWITCH(LW(0)) EVT_CASE_EQ(0) EVT_IF_FLAG(LW(1), 0x00041000) @@ -712,7 +712,7 @@ EvtSource N(80220BE8) = { EVT_END }; -EvtSource N(idle_80220D40) = { +EvtScript N(idle_80220D40) = { EVT_LABEL(0) EVT_CALL(RandInt, 80, LW(10)) EVT_ADD(LW(10), 80) @@ -798,7 +798,7 @@ s32 N(intTable_802211D0)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -EvtSource N(handleEvent_80221228) = { +EvtScript N(handleEvent_80221228) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -991,7 +991,7 @@ EvtSource N(handleEvent_80221228) = { EVT_END }; -EvtSource N(takeTurn_80221DAC) = { +EvtScript N(takeTurn_80221DAC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index 32880bd3cc..b12aa7f5e0 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -35,9 +35,9 @@ s32 N(statusTable_8021E3BC)[] = { }; extern s32 N(idleAnimations_8021E4B4)[]; -extern EvtSource N(init_8021E54C); +extern EvtScript N(init_8021E54C); -ActorPartDesc N(partsTable_8021E468)[] = { +ActorPartBlueprint N(partsTable_8021E468)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -52,7 +52,7 @@ ActorPartDesc N(partsTable_8021E468)[] = { }, }; -ActorDesc NAMESPACE = { +ActorBlueprint NAMESPACE = { .flags = 0, .type = ACTOR_TYPE_SPIKED_GOOMBA, .level = 6, @@ -101,11 +101,11 @@ s32 N(idleAnimations_8021E500)[] = { STATUS_END, }; -extern EvtSource N(takeTurn_8021F1BC); -extern EvtSource N(idle_8021E598); -extern EvtSource N(handleEvent_8021E874); +extern EvtScript N(takeTurn_8021F1BC); +extern EvtScript N(idle_8021E598); +extern EvtScript N(handleEvent_8021E874); -EvtSource N(init_8021E54C) = { +EvtScript N(init_8021E54C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8021F1BC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_ADDR(N(idle_8021E598))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_ADDR(N(handleEvent_8021E874))) @@ -113,7 +113,7 @@ EvtSource N(init_8021E54C) = { EVT_END }; -EvtSource N(idle_8021E598) = { +EvtScript N(idle_8021E598) = { EVT_LABEL(10) EVT_CALL(RandInt, 80, LW(0)) EVT_ADD(LW(0), 80) @@ -163,7 +163,7 @@ EvtSource N(idle_8021E598) = { EVT_END }; -EvtSource N(handleEvent_8021E874) = { +EvtScript N(handleEvent_8021E874) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -297,7 +297,7 @@ EvtSource N(handleEvent_8021E874) = { #include "common/anglestuff.inc.c" -EvtSource N(takeTurn_8021F1BC) = { +EvtScript N(takeTurn_8021F1BC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) diff --git a/src/battle/item/UseItem.inc.c b/src/battle/item/UseItem.inc.c index 87a20bfd77..e13f728be6 100644 --- a/src/battle/item/UseItem.inc.c +++ b/src/battle/item/UseItem.inc.c @@ -1,7 +1,7 @@ #include "common.h" /// Provide arg `TRUE` on `EVT_VAR(1)` to disable refunding. -EvtSource N(UseItemWithEffect) = { +EvtScript N(UseItemWithEffect) = { EVT_IF_EQ(EVT_VAR(1), 0) EVT_CALL(UseBattleCamPreset, 69) EVT_WAIT_FRAMES(10) @@ -43,7 +43,7 @@ EvtSource N(UseItemWithEffect) = { EVT_END }; -EvtSource N(UseItem) = { +EvtScript N(UseItem) = { EVT_CALL(UseBattleCamPreset, 19) EVT_CALL(SetBattleCamTarget, -85, 1, 0) EVT_CALL(SetBattleCamOffsetZ, 41) @@ -64,7 +64,7 @@ EvtSource N(UseItem) = { EVT_END }; -EvtSource N(PlayerGoHome) = { +EvtScript N(PlayerGoHome) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FIXED(8.0)) @@ -76,7 +76,7 @@ EvtSource N(PlayerGoHome) = { EVT_END }; -EvtSource N(EatItem) = { +EvtScript N(EatItem) = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) @@ -89,7 +89,7 @@ EvtSource N(EatItem) = { EVT_END }; -EvtSource N(DrinkItem) = { +EvtScript N(DrinkItem) = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) diff --git a/src/battle/item/coconut.c b/src/battle/item/coconut.c index 46bf13dc0c..9f5116c076 100644 --- a/src/battle/item/coconut.c +++ b/src/battle/item/coconut.c @@ -45,7 +45,7 @@ s32 N(modelCommandList)[] = { 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x000000AC) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, 3) diff --git a/src/battle/item/coconut.h b/src/battle/item/coconut.h index 74a28d249a..f8ab305024 100644 --- a/src/battle/item/coconut.h +++ b/src/battle/item/coconut.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_coconut -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); ApiStatus func_802A1000_72F720(Evt* script, s32 isInitialCall); ApiStatus func_802A11D4_72F8F4(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/dizzy_dial.c b/src/battle/item/dizzy_dial.c index a7c1d9216a..2715464d00 100644 --- a/src/battle/item/dizzy_dial.c +++ b/src/battle/item/dizzy_dial.c @@ -45,7 +45,7 @@ ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000009A) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, 2) diff --git a/src/battle/item/dizzy_dial.h b/src/battle/item/dizzy_dial.h index 5a5e272dab..b4a6473a5e 100644 --- a/src/battle/item/dizzy_dial.h +++ b/src/battle/item/dizzy_dial.h @@ -10,7 +10,7 @@ ApiStatus func_80252B3C(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/dried_shroom.c b/src/battle/item/dried_shroom.c index a8b67642db..432dcf8ff2 100644 --- a/src/battle/item/dried_shroom.c +++ b/src/battle/item/dried_shroom.c @@ -27,7 +27,7 @@ ApiStatus N(func_802A12FC_71CFDC)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000008D) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) diff --git a/src/battle/item/dried_shroom.h b/src/battle/item/dried_shroom.h index c9d8d1d9d4..089338ea47 100644 --- a/src/battle/item/dried_shroom.h +++ b/src/battle/item/dried_shroom.h @@ -10,8 +10,8 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12FC_71CFDC)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(EatItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(EatItem); #endif diff --git a/src/battle/item/dusty_hammer.c b/src/battle/item/dusty_hammer.c index c8c8459d34..9670dbbb30 100644 --- a/src/battle/item/dusty_hammer.c +++ b/src/battle/item/dusty_hammer.c @@ -44,7 +44,7 @@ s32 N(modelCommandList)[] = { 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000086) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, 3) diff --git a/src/battle/item/dusty_hammer.h b/src/battle/item/dusty_hammer.h index 46832529f5..f08458e9eb 100644 --- a/src/battle/item/dusty_hammer.h +++ b/src/battle/item/dusty_hammer.h @@ -7,7 +7,7 @@ #undef NAMESPACE #define NAMESPACE battle_item_dusty_hammer -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/egg_missile.c b/src/battle/item/egg_missile.c index 6418ff9847..544684cb9b 100644 --- a/src/battle/item/egg_missile.c +++ b/src/battle/item/egg_missile.c @@ -139,7 +139,7 @@ s32 N(modelCommandList)[] = { 0x00000002, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0xC8) EVT_EXEC_WAIT(battle_item_egg_missile_UseItemWithEffect) EVT_CALL(UseBattleCamPreset, 3) diff --git a/src/battle/item/egg_missile.h b/src/battle/item/egg_missile.h index 9a907f75fa..d048cb38e0 100644 --- a/src/battle/item/egg_missile.h +++ b/src/battle/item/egg_missile.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_egg_missile -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall); diff --git a/src/battle/item/electro_pop.c b/src/battle/item/electro_pop.c index 8aa76efe0a..8aa8b50f9f 100644 --- a/src/battle/item/electro_pop.c +++ b/src/battle/item/electro_pop.c @@ -39,7 +39,7 @@ ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall) { #include "common/AddHP.inc.c" ApiStatus N(func_802A1450_7309F0)(Evt* script, s32 isInitialCall) { - StaticItem* item = &gItemTable[ITEM_ELECTRO_POP]; + ItemData* item = &gItemTable[ITEM_ELECTRO_POP]; PlayerData* playerData = &gPlayerData; playerData->curHP += item->potencyA; @@ -69,7 +69,7 @@ ApiStatus N(AddFP)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_802A14F0_730A90)(Evt* script, s32 isInitialCall) { - StaticItem* item = &gItemTable[ITEM_ELECTRO_POP]; + ItemData* item = &gItemTable[ITEM_ELECTRO_POP]; PlayerData* playerData = &gPlayerData; playerData->curFP += item->potencyA; @@ -84,7 +84,7 @@ ApiStatus N(func_802A14F0_730A90)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x000000CC) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) diff --git a/src/battle/item/electro_pop.h b/src/battle/item/electro_pop.h index 2f46bcd23a..0898d71646 100644 --- a/src/battle/item/electro_pop.h +++ b/src/battle/item/electro_pop.h @@ -12,8 +12,8 @@ ApiStatus N(func_802A14F0_730A90)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall); ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(EatItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(EatItem); #endif diff --git a/src/battle/item/fire_flower.c b/src/battle/item/fire_flower.c index ad87db21ec..27ae6d6a65 100644 --- a/src/battle/item/fire_flower.c +++ b/src/battle/item/fire_flower.c @@ -34,7 +34,7 @@ ApiStatus N(func_802A1378_716FD8)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000080) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) diff --git a/src/battle/item/fire_flower.h b/src/battle/item/fire_flower.h index 7f4147b324..b0742e9d4b 100644 --- a/src/battle/item/fire_flower.h +++ b/src/battle/item/fire_flower.h @@ -11,7 +11,7 @@ ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A123C_716E9C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1378_716FD8)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/food.c b/src/battle/item/food.c index 508a34f1ca..fe76de7799 100644 --- a/src/battle/item/food.c +++ b/src/battle/item/food.c @@ -72,7 +72,7 @@ ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A15A0_733670)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 itemIdx = evt_get_variable(script, *args++); - StaticItem* item = &gItemTable[itemIdx]; + ItemData* item = &gItemTable[itemIdx]; s32 temp; script->varTable[11] = item->potencyA; @@ -95,7 +95,7 @@ ApiStatus N(func_802A15A0_733670)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(script6) = { +EvtScript N(script6) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT_FRAMES(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -173,7 +173,7 @@ EvtSource N(script6) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_VAR(14), EVT_VAR(1)) EVT_CALL(GetMenuSelection, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_SET(EVT_VAR(10), EVT_VAR(1)) diff --git a/src/battle/item/food.h b/src/battle/item/food.h index 3a4b8135b8..adbf679353 100644 --- a/src/battle/item/food.h +++ b/src/battle/item/food.h @@ -15,10 +15,10 @@ ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall); ApiStatus N(AddHP)(Evt* script, s32 isInitialCall); ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(UseItem); -extern EvtSource N(EatItem); -extern EvtSource N(DrinkItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); +extern EvtScript N(EatItem); +extern EvtScript N(DrinkItem); #endif diff --git a/src/battle/item/fright_jar.c b/src/battle/item/fright_jar.c index 929ecb9ce7..e559602527 100644 --- a/src/battle/item/fright_jar.c +++ b/src/battle/item/fright_jar.c @@ -22,7 +22,7 @@ ApiStatus N(func_802A12D4_72BBE4)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000098) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) diff --git a/src/battle/item/fright_jar.h b/src/battle/item/fright_jar.h index b33a46f6f0..e0f76d8940 100644 --- a/src/battle/item/fright_jar.h +++ b/src/battle/item/fright_jar.h @@ -11,7 +11,7 @@ ApiStatus func_80269EAC(Evt* script, s32 isInitialCall); ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12D4_72BBE4)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/hustle_drink.c b/src/battle/item/hustle_drink.c index 5084242bc9..541dad3b1a 100644 --- a/src/battle/item/hustle_drink.c +++ b/src/battle/item/hustle_drink.c @@ -36,7 +36,7 @@ ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000091) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(DrinkItem)) diff --git a/src/battle/item/hustle_drink.h b/src/battle/item/hustle_drink.h index 390db0d416..74da316c77 100644 --- a/src/battle/item/hustle_drink.h +++ b/src/battle/item/hustle_drink.h @@ -10,8 +10,8 @@ ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A123C_72619C)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(DrinkItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(DrinkItem); #endif diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c index ccc5ee0a76..5d2ab518f6 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/item/insecticide_herb.c @@ -93,7 +93,7 @@ s32 N(modelCommandList)[] = { 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, }; -EvtSource script = { +EvtScript script = { EVT_SET_CONST(EVT_VAR(10), 0x00000087) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, 3) diff --git a/src/battle/item/insecticide_herb.h b/src/battle/item/insecticide_herb.h index 0f4b0d258e..bddf710add 100644 --- a/src/battle/item/insecticide_herb.h +++ b/src/battle/item/insecticide_herb.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_insecticide_herb -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); ApiStatus N(func_802A12E0_72AA30)(Evt *script, s32 isInitialCall); ApiStatus N(func_802A123C_72A98C)(Evt *script, s32 isInitialCall); ApiStatus N(func_802A1280_72A9D0)(Evt *script, s32 isInitialCall); diff --git a/src/battle/item/life_shroom.c b/src/battle/item/life_shroom.c index eb157b426b..c77eb47a51 100644 --- a/src/battle/item/life_shroom.c +++ b/src/battle/item/life_shroom.c @@ -54,7 +54,7 @@ ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_802A1438_72E968)(Evt* script, s32 isInitialCall) { - StaticItem* item = &gItemTable[ITEM_LIFE_SHROOM]; + ItemData* item = &gItemTable[ITEM_LIFE_SHROOM]; PlayerData* playerData = &gPlayerData; playerData->curHP += item->potencyA; @@ -70,8 +70,8 @@ ApiStatus N(func_802A1438_72E968)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1484_72E9B4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 itemIdx = evt_get_variable(script, *args++); - StaticItem* itemTable = gItemTable; - StaticItem* item = &itemTable[itemIdx]; + ItemData* itemTable = gItemTable; + ItemData* item = &itemTable[itemIdx]; script->varTable[11] = item->potencyA; script->varTable[12] = item->potencyB; @@ -84,7 +84,7 @@ ApiStatus N(func_802A1484_72E9B4)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(script6) = { +EvtScript N(script6) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT_FRAMES(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -162,7 +162,7 @@ EvtSource N(script6) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_VAR(15), EVT_VAR(1)) EVT_CALL(GetMenuSelection, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_SET(EVT_VAR(10), EVT_VAR(1)) diff --git a/src/battle/item/life_shroom.h b/src/battle/item/life_shroom.h index b88fe458c3..470011f6ed 100644 --- a/src/battle/item/life_shroom.h +++ b/src/battle/item/life_shroom.h @@ -13,9 +13,9 @@ ApiStatus N(func_802A1484_72E9B4)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1438_72E968)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(UseItem); -extern EvtSource N(EatItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); +extern EvtScript N(EatItem); #endif diff --git a/src/battle/item/mushroom.c b/src/battle/item/mushroom.c index 9e28385184..c897bcab83 100644 --- a/src/battle/item/mushroom.c +++ b/src/battle/item/mushroom.c @@ -71,8 +71,8 @@ ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A15A0_715DF0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - StaticItem* itemTable = gItemTable; - StaticItem* item = &itemTable[evt_get_variable(script, *args++)]; + ItemData* itemTable = gItemTable; + ItemData* item = &itemTable[evt_get_variable(script, *args++)]; script->varTable[11] = item->potencyA; script->varTable[12] = item->potencyB; @@ -83,7 +83,7 @@ ApiStatus N(func_802A15A0_715DF0)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(script6) = { +EvtScript N(script6) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT_FRAMES(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -161,7 +161,7 @@ EvtSource N(script6) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_VAR(14), EVT_VAR(1)) EVT_CALL(GetMenuSelection, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_SET(EVT_VAR(10), EVT_VAR(1)) diff --git a/src/battle/item/mushroom.h b/src/battle/item/mushroom.h index 02dce7004c..32d02ba574 100644 --- a/src/battle/item/mushroom.h +++ b/src/battle/item/mushroom.h @@ -15,9 +15,9 @@ ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall); ApiStatus N(AddHP)(Evt* script, s32 isInitialCall); ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(UseItem); -extern EvtSource N(EatItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); +extern EvtScript N(EatItem); #endif diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 4856e81fd8..109570f525 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -72,7 +72,7 @@ ApiStatus N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { HudElement* icon; HudElement** iconPtr; struct N(tempStc)* ic; - StaticItem* itemTable; + ItemData* itemTable; D_802A25F8 = create_generic_entity_frontUI(NULL, func_802A123C_72C7EC); D_802A25EC = rand_int(18200); @@ -273,7 +273,7 @@ s32 N(D_802A229C_72D84C)[8] = { 0x0000008A, 0x0000008C, 0x00000085, 0x0000008A }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000096) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD diff --git a/src/battle/item/mystery.h b/src/battle/item/mystery.h index 64acc748e8..987894f437 100644 --- a/src/battle/item/mystery.h +++ b/src/battle/item/mystery.h @@ -17,6 +17,6 @@ typedef struct N(tempStc) { extern s32 N(D_802A227C_72D82C)[8]; extern s32 N(D_802A229C_72D84C)[8]; -extern EvtSource N(UseItemWithEffect); +extern EvtScript N(UseItemWithEffect); #endif diff --git a/src/battle/item/pebble.c b/src/battle/item/pebble.c index f5c7333ebe..884e722420 100644 --- a/src/battle/item/pebble.c +++ b/src/battle/item/pebble.c @@ -44,7 +44,7 @@ s32 N(modelCommandList)[] = { 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000085) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, 3) diff --git a/src/battle/item/pebble.h b/src/battle/item/pebble.h index 690425d97d..264cc1d921 100644 --- a/src/battle/item/pebble.h +++ b/src/battle/item/pebble.h @@ -7,7 +7,7 @@ #undef NAMESPACE #define NAMESPACE battle_item_pebble -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/please_come_back.c b/src/battle/item/please_come_back.c index bc52695493..f52f4e4148 100644 --- a/src/battle/item/please_come_back.c +++ b/src/battle/item/please_come_back.c @@ -4,7 +4,7 @@ #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000009A) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) diff --git a/src/battle/item/please_come_back.h b/src/battle/item/please_come_back.h index eac43d951b..15088f18cb 100644 --- a/src/battle/item/please_come_back.h +++ b/src/battle/item/please_come_back.h @@ -7,6 +7,6 @@ #undef NAMESPACE #define NAMESPACE battle_item_please_come_back -extern EvtSource N(UseItemWithEffect); +extern EvtScript N(UseItemWithEffect); #endif diff --git a/src/battle/item/pow_block.c b/src/battle/item/pow_block.c index b9b95a5c1a..12c6b257da 100644 --- a/src/battle/item/pow_block.c +++ b/src/battle/item/pow_block.c @@ -47,7 +47,7 @@ ApiStatus N(func_802A1318_718B68)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000090) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_WAIT_FRAMES(10) diff --git a/src/battle/item/pow_block.h b/src/battle/item/pow_block.h index 3e720c638f..d95da1b78b 100644 --- a/src/battle/item/pow_block.h +++ b/src/battle/item/pow_block.h @@ -13,7 +13,7 @@ ApiStatus N(func_802A1318_718B68)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A123C_718A8C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12E4_718B34)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/repel_gel.c b/src/battle/item/repel_gel.c index 9d9918f6c0..660fd997fb 100644 --- a/src/battle/item/repel_gel.c +++ b/src/battle/item/repel_gel.c @@ -16,7 +16,7 @@ ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000097) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_375) diff --git a/src/battle/item/repel_gel.h b/src/battle/item/repel_gel.h index 6c40725add..536e66b7ff 100644 --- a/src/battle/item/repel_gel.h +++ b/src/battle/item/repel_gel.h @@ -9,7 +9,7 @@ ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/shooting_star.c b/src/battle/item/shooting_star.c index a187e92a0c..9004a99090 100644 --- a/src/battle/item/shooting_star.c +++ b/src/battle/item/shooting_star.c @@ -93,7 +93,7 @@ ApiStatus N(func_802A14D4_71DC44)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000083) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD diff --git a/src/battle/item/shooting_star.h b/src/battle/item/shooting_star.h index 6e7875a801..9adbdda871 100644 --- a/src/battle/item/shooting_star.h +++ b/src/battle/item/shooting_star.h @@ -12,7 +12,7 @@ ApiStatus N(func_802A123C_71D9AC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A14D4_71DC44)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/sleepy_sheep.c b/src/battle/item/sleepy_sheep.c index 77e502d0ef..a30959dd28 100644 --- a/src/battle/item/sleepy_sheep.c +++ b/src/battle/item/sleepy_sheep.c @@ -335,7 +335,7 @@ s32 N(modelCommandList)[] = { 0x00000002, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000008F) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, 19) diff --git a/src/battle/item/sleepy_sheep.h b/src/battle/item/sleepy_sheep.h index 857782d01e..ed6cfa3a03 100644 --- a/src/battle/item/sleepy_sheep.h +++ b/src/battle/item/sleepy_sheep.h @@ -15,8 +15,8 @@ ApiStatus N(func_802A123C_71E88C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1740_71ED90)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1848_71EE98)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/snowman_doll.c b/src/battle/item/snowman_doll.c index 35d716163b..a1b91e86c9 100644 --- a/src/battle/item/snowman_doll.c +++ b/src/battle/item/snowman_doll.c @@ -35,7 +35,7 @@ ApiStatus N(func_802A13B8_71C1E8)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000081) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) diff --git a/src/battle/item/snowman_doll.h b/src/battle/item/snowman_doll.h index a1a184abad..e221eeaad5 100644 --- a/src/battle/item/snowman_doll.h +++ b/src/battle/item/snowman_doll.h @@ -11,8 +11,8 @@ ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A123C_71C06C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A13B8_71C1E8)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/stone_cap.c b/src/battle/item/stone_cap.c index 1ac8ab598f..68eee23d82 100644 --- a/src/battle/item/stone_cap.c +++ b/src/battle/item/stone_cap.c @@ -47,7 +47,7 @@ ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000088) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(PlaySound, SOUND_361) diff --git a/src/battle/item/stone_cap.h b/src/battle/item/stone_cap.h index 580f75cedb..0d3b4fa37c 100644 --- a/src/battle/item/stone_cap.h +++ b/src/battle/item/stone_cap.h @@ -9,8 +9,8 @@ ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/stop_watch.c b/src/battle/item/stop_watch.c index 7b61233ef2..dd13faf913 100644 --- a/src/battle/item/stop_watch.c +++ b/src/battle/item/stop_watch.c @@ -22,7 +22,7 @@ ApiStatus N(func_802A12D4_7270A4)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000092) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD diff --git a/src/battle/item/stop_watch.h b/src/battle/item/stop_watch.h index fdc2ff57cb..f1f807d403 100644 --- a/src/battle/item/stop_watch.h +++ b/src/battle/item/stop_watch.h @@ -12,8 +12,8 @@ ApiStatus func_80252B3C(Evt* script, s32 isInitialCall); ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12D4_7270A4)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index 5ac2b1019f..d53e33e19a 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -232,7 +232,7 @@ ApiStatus N(func_802A18D8_731BD8)(Evt* script, s32 isInitialCall) { #include "common/AddFP.inc.c" ApiStatus N(func_802A1A40_731D40)(Evt* script, s32 isInitialCall) { - StaticItem* item = &gItemTable[ITEM_KOOKY_COOKIE]; + ItemData* item = &gItemTable[ITEM_KOOKY_COOKIE]; PlayerData* playerData = &gPlayerData; playerData->curHP += item->potencyA; @@ -246,7 +246,7 @@ ApiStatus N(func_802A1A40_731D40)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_802A1A8C_731D8C)(Evt* script, s32 isInitialCall) { - StaticItem* item = &gItemTable[ITEM_KOOKY_COOKIE]; + ItemData* item = &gItemTable[ITEM_KOOKY_COOKIE]; PlayerData* playerData = &gPlayerData; playerData->curFP += item->potencyB; @@ -321,7 +321,7 @@ s32 N(D_802A2858_732B58)[] = { 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x000000000 }; -EvtSource N(script6) = { +EvtScript N(script6) = { EVT_CALL(GetMenuSelection, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_EQ(EVT_VAR(1), 211) EVT_SET_CONST(EVT_VAR(10), 0xD3) @@ -373,7 +373,7 @@ EvtSource N(script6) = { EVT_END }; -EvtSource N(script7) = { +EvtScript N(script7) = { EVT_CALL(SetAnimation, 0, 0, 65538) EVT_CALL(GetActorPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) @@ -386,7 +386,7 @@ EvtSource N(script7) = { EVT_END }; -EvtSource N(script8) = { +EvtScript N(script8) = { EVT_CALL(SetAnimation, 0, 0, 65538) EVT_CALL(GetActorPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 20) @@ -399,7 +399,7 @@ EvtSource N(script8) = { EVT_END }; -EvtSource N(script9) = { +EvtScript N(script9) = { EVT_CALL(SetAnimation, 0, 0, 196612) EVT_CALL(SetGoalToTarget, 0) EVT_CALL(GetGoalPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) diff --git a/src/battle/item/strange_cake.h b/src/battle/item/strange_cake.h index dd677dff04..ad659b2327 100644 --- a/src/battle/item/strange_cake.h +++ b/src/battle/item/strange_cake.h @@ -15,12 +15,12 @@ ApiStatus N(func_802A1AD8_731DD8)(Evt *script, s32 isInitialCall); ApiStatus N(func_802A1B14_731E14)(Evt *script, s32 isInitialCall); ApiStatus N(func_802A1B68_731E68)(Evt *script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(EatItem); -extern EvtSource N(script7); -extern EvtSource N(script8); -extern EvtSource N(script9); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(EatItem); +extern EvtScript N(script7); +extern EvtScript N(script8); +extern EvtScript N(script9); #endif diff --git a/src/battle/item/super_soda.c b/src/battle/item/super_soda.c index 55230eb1e5..0f0424a805 100644 --- a/src/battle/item/super_soda.c +++ b/src/battle/item/super_soda.c @@ -87,7 +87,7 @@ ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(script6) = { +EvtScript N(script6) = { EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT_FRAMES(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -165,7 +165,7 @@ EvtSource N(script6) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000009B) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(InitTargetIterator) diff --git a/src/battle/item/super_soda.h b/src/battle/item/super_soda.h index d27ba0a377..6aaf1efb97 100644 --- a/src/battle/item/super_soda.h +++ b/src/battle/item/super_soda.h @@ -13,8 +13,8 @@ ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall); ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1378_725058)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(UseItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); #endif diff --git a/src/battle/item/tasty_tonic.c b/src/battle/item/tasty_tonic.c index b73448a502..baa5d6b474 100644 --- a/src/battle/item/tasty_tonic.c +++ b/src/battle/item/tasty_tonic.c @@ -31,7 +31,7 @@ ApiStatus N(func_802A123C_72223C)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x89) EVT_EXEC_WAIT(battle_item_tasty_tonic_UseItemWithEffect) EVT_CALL(InitTargetIterator) diff --git a/src/battle/item/tasty_tonic.h b/src/battle/item/tasty_tonic.h index 400cf4ce80..0721acc61d 100644 --- a/src/battle/item/tasty_tonic.h +++ b/src/battle/item/tasty_tonic.h @@ -9,8 +9,8 @@ ApiStatus N(func_802A123C_72223C)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(DrinkItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(DrinkItem); #endif diff --git a/src/battle/item/thunder_bolt.c b/src/battle/item/thunder_bolt.c index d13ad84dc8..179faa7646 100644 --- a/src/battle/item/thunder_bolt.c +++ b/src/battle/item/thunder_bolt.c @@ -51,7 +51,7 @@ ApiStatus N(func_802A1420_722F60)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x84) EVT_EXEC_WAIT(battle_item_thunder_bolt_UseItemWithEffect) EVT_THREAD diff --git a/src/battle/item/thunder_bolt.h b/src/battle/item/thunder_bolt.h index 3c8f2d0529..9cd7938f72 100644 --- a/src/battle/item/thunder_bolt.h +++ b/src/battle/item/thunder_bolt.h @@ -11,7 +11,7 @@ ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1420_722F60)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/thunder_rage.c b/src/battle/item/thunder_rage.c index 540f396dff..40f81d6f0e 100644 --- a/src/battle/item/thunder_rage.c +++ b/src/battle/item/thunder_rage.c @@ -51,7 +51,7 @@ ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000082) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CHILD_THREAD diff --git a/src/battle/item/thunder_rage.h b/src/battle/item/thunder_rage.h index 9e1600197c..60224d249b 100644 --- a/src/battle/item/thunder_rage.h +++ b/src/battle/item/thunder_rage.h @@ -11,7 +11,7 @@ ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12D4_71B474)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); #endif diff --git a/src/battle/item/ultra_shroom.c b/src/battle/item/ultra_shroom.c index 7605b51dee..eae52bcb07 100644 --- a/src/battle/item/ultra_shroom.c +++ b/src/battle/item/ultra_shroom.c @@ -26,7 +26,7 @@ ApiStatus N(func_802A12FC_723A7C)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000008C) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(AddBattleCamZoom, 50) diff --git a/src/battle/item/ultra_shroom.h b/src/battle/item/ultra_shroom.h index 2a790a1da0..d1ead7c7f8 100644 --- a/src/battle/item/ultra_shroom.h +++ b/src/battle/item/ultra_shroom.h @@ -10,8 +10,8 @@ ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12FC_723A7C)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(EatItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(EatItem); #endif diff --git a/src/battle/item/unknown_item.c b/src/battle/item/unknown_item.c index b04def88ff..8f012be413 100644 --- a/src/battle/item/unknown_item.c +++ b/src/battle/item/unknown_item.c @@ -26,7 +26,7 @@ ApiStatus N(func_802A12FC_72453C)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000008E) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) diff --git a/src/battle/item/unknown_item.h b/src/battle/item/unknown_item.h index 16a3a2a8dc..8aa0903e76 100644 --- a/src/battle/item/unknown_item.h +++ b/src/battle/item/unknown_item.h @@ -10,8 +10,8 @@ ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802A12FC_72453C)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(EatItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(EatItem); #endif diff --git a/src/battle/item/volt_shroom.c b/src/battle/item/volt_shroom.c index 87c57c5756..c40123cb87 100644 --- a/src/battle/item/volt_shroom.c +++ b/src/battle/item/volt_shroom.c @@ -13,7 +13,7 @@ ApiStatus N(func_802A123C_71AA2C)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x0000008B) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) diff --git a/src/battle/item/volt_shroom.h b/src/battle/item/volt_shroom.h index 977efdac98..9d0e5e39d2 100644 --- a/src/battle/item/volt_shroom.h +++ b/src/battle/item/volt_shroom.h @@ -9,8 +9,8 @@ ApiStatus N(func_802A123C_71AA2C)(Evt* script, s32 isInitialCall); -extern EvtSource N(UseItemWithEffect); -extern EvtSource N(PlayerGoHome); -extern EvtSource N(EatItem); +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(EatItem); #endif diff --git a/src/battle/move/auto_jump/auto_jump.c b/src/battle/move/auto_jump/auto_jump.c index 0783d5031b..054ec04dac 100644 --- a/src/battle/move/auto_jump/auto_jump.c +++ b/src/battle/move/auto_jump/auto_jump.c @@ -4,9 +4,9 @@ #define NAMESPACE battle_move_auto_jump -extern EvtSource D_802A26BC_7672DC; -extern EvtSource D_802A2A30_767650; -extern EvtSource D_802A2D5C_76797C; +extern EvtScript D_802A26BC_7672DC; +extern EvtScript D_802A2A30_767650; +extern EvtScript D_802A2D5C_76797C; s32 N(D_802A10F0)[] = { 9, 3, 9, 3, 9, 3, 8, 3, @@ -15,7 +15,7 @@ s32 N(D_802A10F0)[] = { #include "world/common/UnkMoveFunc1.inc.c" -EvtSource N(CheckForAPress) = { +EvtScript N(CheckForAPress) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_BEFORE_JUMP) EVT_LOOP(5) EVT_CALL(CheckButtonPress, A_BUTTON, LW(0)) @@ -28,7 +28,7 @@ EvtSource N(CheckForAPress) = { EVT_END }; -EvtSource D_802A11AC_765DCC = { +EvtScript D_802A11AC_765DCC = { EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_SUB(LW(0), 40) @@ -52,7 +52,7 @@ EvtSource D_802A11AC_765DCC = { EVT_END }; -EvtSource D_802A1320_765F40 = { +EvtScript D_802A1320_765F40 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -70,7 +70,7 @@ EvtSource D_802A1320_765F40 = { EVT_END }; -EvtSource D_802A1408_766028 = { +EvtScript D_802A1408_766028 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -88,7 +88,7 @@ EvtSource D_802A1408_766028 = { EVT_END }; -EvtSource D_802A14F0_766110 = { +EvtScript D_802A14F0_766110 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -106,7 +106,7 @@ EvtSource D_802A14F0_766110 = { EVT_END }; -EvtSource D_802A15D8_7661F8 = { +EvtScript D_802A15D8_7661F8 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -135,7 +135,7 @@ EvtSource D_802A15D8_7661F8 = { EVT_END }; -EvtSource D_802A17C4 = { +EvtScript D_802A17C4 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -164,7 +164,7 @@ EvtSource D_802A17C4 = { EVT_END }; -EvtSource D_802A19B0 = { +EvtScript D_802A19B0 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) @@ -193,7 +193,7 @@ EvtSource D_802A19B0 = { EVT_END }; -EvtSource D_802A1B9C = { +EvtScript D_802A1B9C = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -222,7 +222,7 @@ EvtSource D_802A1B9C = { EVT_END }; -EvtSource D_802A1D88 = { +EvtScript D_802A1D88 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(EnablePlayerBlur, -1) @@ -258,7 +258,7 @@ EvtSource D_802A1D88 = { EVT_END }; -EvtSource D_802A1FEC_766C0C = { +EvtScript D_802A1FEC_766C0C = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, 65548) EVT_CALL(PlayerLandJump) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01000C) @@ -285,7 +285,7 @@ EvtSource D_802A1FEC_766C0C = { EVT_END }; -EvtSource D_802A2184_766DA4 = { +EvtScript D_802A2184_766DA4 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(D_802A11AC_765DCC) @@ -299,7 +299,7 @@ EvtSource D_802A2184_766DA4 = { EVT_END }; -EvtSource D_802A2230 = { +EvtScript D_802A2230 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(D_802A11AC_765DCC) @@ -325,7 +325,7 @@ EvtSource D_802A2230 = { EVT_END }; -EvtSource D_802A2384 = { +EvtScript D_802A2384 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(D_802A11AC_765DCC) @@ -367,7 +367,7 @@ EvtSource D_802A2384 = { EVT_END }; -EvtSource D_802A2600 = { +EvtScript D_802A2600 = { EVT_CALL(SetBattleFlagBits, BS_FLAGS1_1000, 1) EVT_CALL(func_802694A4, 0) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 1) @@ -384,7 +384,7 @@ EvtSource D_802A2600 = { EVT_END }; -EvtSource D_802A26BC_7672DC = { +EvtScript D_802A26BC_7672DC = { EVT_EXEC_WAIT(D_802A2184_766DA4) EVT_CALL(GetActionCommandMode, LW(0)) EVT_IF_EQ(LW(0), 2) @@ -446,7 +446,7 @@ EvtSource D_802A26BC_7672DC = { EVT_END }; -EvtSource D_802A2A30_767650 = { +EvtScript D_802A2A30_767650 = { EVT_EXEC_WAIT(D_802A2184_766DA4) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) @@ -501,7 +501,7 @@ EvtSource D_802A2A30_767650 = { EVT_END }; -EvtSource D_802A2D5C_76797C = { +EvtScript D_802A2D5C_76797C = { EVT_EXEC_WAIT(D_802A2184_766DA4) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) diff --git a/src/battle/move/auto_multibounce/auto_multibounce.c b/src/battle/move/auto_multibounce/auto_multibounce.c index 936107c6d4..70771a9164 100644 --- a/src/battle/move/auto_multibounce/auto_multibounce.c +++ b/src/battle/move/auto_multibounce/auto_multibounce.c @@ -4,9 +4,9 @@ #define NAMESPACE battle_move_auto_multibounce -extern EvtSource N(D_802A26A8); -extern EvtSource N(D_802A2EC0); -extern EvtSource N(D_802A372C); +extern EvtScript N(D_802A26A8); +extern EvtScript N(D_802A2EC0); +extern EvtScript N(D_802A372C); s32 N(D_802A10F0)[] = { 9, 3, 9, 3, 9, 3, 8, 3, @@ -15,7 +15,7 @@ s32 N(D_802A10F0)[] = { #include "world/common/UnkMoveFunc1.inc.c" -EvtSource N(CheckForAPress) = { +EvtScript N(CheckForAPress) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_BEFORE_JUMP) EVT_LOOP(5) EVT_CALL(CheckButtonPress, A_BUTTON, LW(0)) @@ -28,7 +28,7 @@ EvtSource N(CheckForAPress) = { EVT_END }; -EvtSource N(D_802A11AC) = { +EvtScript N(D_802A11AC) = { EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_SUB(LW(0), 40) @@ -52,7 +52,7 @@ EvtSource N(D_802A11AC) = { EVT_END }; -EvtSource N(D_802A1320) = { +EvtScript N(D_802A1320) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -70,7 +70,7 @@ EvtSource N(D_802A1320) = { EVT_END }; -EvtSource N(D_802A1408) = { +EvtScript N(D_802A1408) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -88,7 +88,7 @@ EvtSource N(D_802A1408) = { EVT_END }; -EvtSource N(D_802A14F0) = { +EvtScript N(D_802A14F0) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -106,7 +106,7 @@ EvtSource N(D_802A14F0) = { EVT_END }; -EvtSource N(D_802A15D8) = { +EvtScript N(D_802A15D8) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -135,7 +135,7 @@ EvtSource N(D_802A15D8) = { EVT_END }; -EvtSource N(D_802A17C4) = { +EvtScript N(D_802A17C4) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -164,7 +164,7 @@ EvtSource N(D_802A17C4) = { EVT_END }; -EvtSource N(D_802A19B0) = { +EvtScript N(D_802A19B0) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) @@ -193,7 +193,7 @@ EvtSource N(D_802A19B0) = { EVT_END }; -EvtSource N(D_802A1B9C) = { +EvtScript N(D_802A1B9C) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -222,7 +222,7 @@ EvtSource N(D_802A1B9C) = { EVT_END }; -EvtSource N(D_802A1D88) = { +EvtScript N(D_802A1D88) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(EnablePlayerBlur, -1) @@ -258,7 +258,7 @@ EvtSource N(D_802A1D88) = { EVT_END }; -EvtSource N(D_802A1FEC) = { +EvtScript N(D_802A1FEC) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_1000C) EVT_CALL(PlayerLandJump) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_1000C) @@ -285,7 +285,7 @@ EvtSource N(D_802A1FEC) = { EVT_END }; -EvtSource N(D_802A2184) = { +EvtScript N(D_802A2184) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(N(D_802A11AC)) @@ -299,7 +299,7 @@ EvtSource N(D_802A2184) = { EVT_END }; -EvtSource N(D_802A2230) = { +EvtScript N(D_802A2230) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(N(D_802A11AC)) @@ -325,7 +325,7 @@ EvtSource N(D_802A2230) = { EVT_END }; -EvtSource N(D_802A2384) = { +EvtScript N(D_802A2384) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(N(D_802A11AC)) @@ -367,7 +367,7 @@ EvtSource N(D_802A2384) = { EVT_END }; -EvtSource N(D_802A2600) = { +EvtScript N(D_802A2600) = { EVT_CALL(func_802694A4, 1) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_1000, 1) EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) @@ -383,7 +383,7 @@ EvtSource N(D_802A2600) = { EVT_END }; -EvtSource N(D_802A26A8) = { +EvtScript N(D_802A26A8) = { EVT_EXEC_WAIT(N(D_802A2184)) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) @@ -525,7 +525,7 @@ EvtSource N(D_802A26A8) = { EVT_END }; -EvtSource N(D_802A2EC0) = { +EvtScript N(D_802A2EC0) = { EVT_EXEC_WAIT(N(D_802A2184)) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) @@ -672,7 +672,7 @@ EvtSource N(D_802A2EC0) = { EVT_END }; -EvtSource N(D_802A372C) = { +EvtScript N(D_802A372C) = { EVT_EXEC_WAIT(N(D_802A2184)) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) diff --git a/src/battle/move/hammer/hammer.c b/src/battle/move/hammer/hammer.c index 83934170cb..b8ad2410fe 100644 --- a/src/battle/move/hammer/hammer.c +++ b/src/battle/move/hammer/hammer.c @@ -5,14 +5,14 @@ #define NAMESPACE battle_move_hammer -extern EvtSource D_802A3168_00736708; -extern EvtSource D_802A3C4C_007371EC; +extern EvtScript D_802A3168_00736708; +extern EvtScript D_802A3C4C_007371EC; #include "world/common/IsBerserkerEquipped.inc.c" #include "world/common/IsRightOnEquipped.inc.c" -EvtSource D_802A10B0_734650 = { +EvtScript D_802A10B0_734650 = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) @@ -27,7 +27,7 @@ EvtSource D_802A10B0_734650 = { EVT_END }; -EvtSource D_802A118C_0073472C = { +EvtScript D_802A118C_0073472C = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) @@ -37,7 +37,7 @@ EvtSource D_802A118C_0073472C = { EVT_END }; -EvtSource D_802A1204_007347A4 = { +EvtScript D_802A1204_007347A4 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LW(1), 0) @@ -68,7 +68,7 @@ EvtSource D_802A1204_007347A4 = { EVT_END }; -EvtSource D_802A1388_00734928 = { +EvtScript D_802A1388_00734928 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LW(1), 0) @@ -99,7 +99,7 @@ EvtSource D_802A1388_00734928 = { EVT_END }; -EvtSource D_802A150C_00734AAC = { +EvtScript D_802A150C_00734AAC = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LW(1), 0) @@ -130,7 +130,7 @@ EvtSource D_802A150C_00734AAC = { EVT_END }; -EvtSource D_802A1690_00734C30 = { +EvtScript D_802A1690_00734C30 = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) @@ -169,7 +169,7 @@ EvtSource D_802A1690_00734C30 = { EVT_END }; -EvtSource D_802A18AC_00734E4C = { +EvtScript D_802A18AC_00734E4C = { EVT_CALL(func_80276EFC) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) EVT_CALL(MoveBattleCamOver, 5) @@ -187,7 +187,7 @@ EvtSource D_802A18AC_00734E4C = { EVT_END }; -EvtSource D_802A1998_00734F38 = { +EvtScript D_802A1998_00734F38 = { EVT_CALL(func_80276EFC) EVT_CALL(func_802693F0) EVT_WAIT_FRAMES(20) @@ -203,7 +203,7 @@ EvtSource D_802A1998_00734F38 = { EVT_END }; -EvtSource D_802A1A64_00735004 = { +EvtScript D_802A1A64_00735004 = { EVT_CALL(func_80276EFC) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) EVT_CALL(func_802693F0) @@ -220,7 +220,7 @@ EvtSource D_802A1A64_00735004 = { EVT_END }; -EvtSource N(D_802A1B40) = { +EvtScript N(D_802A1B40) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) EVT_EXEC_WAIT(D_802A10B0_734650) @@ -306,7 +306,7 @@ EvtSource N(D_802A1B40) = { EVT_END }; -EvtSource D_802A2000_007355A0 = { +EvtScript D_802A2000_007355A0 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) EVT_EXEC_WAIT(D_802A10B0_734650) @@ -375,7 +375,7 @@ EvtSource D_802A2000_007355A0 = { EVT_END }; -EvtSource D_802A23E8_735988 = { +EvtScript D_802A23E8_735988 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) EVT_EXEC_WAIT(D_802A10B0_734650) @@ -444,7 +444,7 @@ EvtSource D_802A23E8_735988 = { EVT_END }; -EvtSource N(D_802A27D0) = { +EvtScript N(D_802A27D0) = { EVT_CALL(ChooseNextTarget, 10, LW(0)) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) @@ -502,7 +502,7 @@ EvtSource N(D_802A27D0) = { EVT_END }; -EvtSource D_802A2AFC_0073609C = { +EvtScript D_802A2AFC_0073609C = { EVT_CALL(ChooseNextTarget, 10, LW(0)) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) @@ -551,7 +551,7 @@ EvtSource D_802A2AFC_0073609C = { EVT_END }; -EvtSource D_802A2DA0_00736340 = { +EvtScript D_802A2DA0_00736340 = { EVT_CALL(ChooseNextTarget, 10, LW(0)) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) @@ -600,7 +600,7 @@ EvtSource D_802A2DA0_00736340 = { EVT_END }; -EvtSource D_802A3044_007365E4 = { +EvtScript D_802A3044_007365E4 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) @@ -624,7 +624,7 @@ EvtSource D_802A3044_007365E4 = { EVT_END }; -EvtSource D_802A3168_00736708 = { +EvtScript D_802A3168_00736708 = { EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) EVT_CASE_EQ(0) @@ -721,7 +721,7 @@ EvtSource D_802A3168_00736708 = { EVT_END }; -EvtSource D_802A369C_00736C3C = { +EvtScript D_802A369C_00736C3C = { EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) EVT_CASE_EQ(0) @@ -796,7 +796,7 @@ EvtSource D_802A369C_00736C3C = { EVT_END }; -EvtSource D_802A3B28_007370C8 = { +EvtScript D_802A3B28_007370C8 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) @@ -820,7 +820,7 @@ EvtSource D_802A3B28_007370C8 = { EVT_END }; -EvtSource D_802A3C4C_007371EC = { +EvtScript D_802A3C4C_007371EC = { EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) EVT_CASE_EQ(0) diff --git a/src/battle/move/jump/jump.c b/src/battle/move/jump/jump.c index e268c90b4d..477f55a43b 100644 --- a/src/battle/move/jump/jump.c +++ b/src/battle/move/jump/jump.c @@ -4,16 +4,16 @@ #define NAMESPACE battle_move_jump -extern EvtSource D_802A4018_740878; -extern EvtSource D_802A2720_73EF80; -extern EvtSource D_802A2ABC_73F31C; -extern EvtSource D_802A2DE8_73F648; -extern EvtSource D_802A3188_73F9E8; -extern EvtSource D_802A3378_73FBD8; -extern EvtSource D_802A34EC_73FD4C; -extern EvtSource D_802A36D8_73FF38; -extern EvtSource D_802A39C4_740224; -extern EvtSource D_802A3CF0_740550; +extern EvtScript D_802A4018_740878; +extern EvtScript D_802A2720_73EF80; +extern EvtScript D_802A2ABC_73F31C; +extern EvtScript D_802A2DE8_73F648; +extern EvtScript D_802A3188_73F9E8; +extern EvtScript D_802A3378_73FBD8; +extern EvtScript D_802A34EC_73FD4C; +extern EvtScript D_802A36D8_73FF38; +extern EvtScript D_802A39C4_740224; +extern EvtScript D_802A3CF0_740550; s32 D_802A1140_73D9A0[] = { 9, 3, 9, 3, @@ -24,7 +24,7 @@ s32 D_802A1140_73D9A0[] = { #include "world/common/UnkMoveFunc1.inc.c" -EvtSource N(CheckForAPress) = { +EvtScript N(CheckForAPress) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_BEFORE_JUMP) EVT_LOOP(5) EVT_CALL(CheckButtonPress, A_BUTTON, LW(0)) @@ -37,7 +37,7 @@ EvtSource N(CheckForAPress) = { EVT_END }; -EvtSource N(MoveToJump) = { +EvtScript N(MoveToJump) = { EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_SUB(LW(0), 40) @@ -61,7 +61,7 @@ EvtSource N(MoveToJump) = { EVT_END }; -EvtSource D_802A1370_73DBD0 = { +EvtScript D_802A1370_73DBD0 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -79,7 +79,7 @@ EvtSource D_802A1370_73DBD0 = { EVT_END }; -EvtSource D_802A1458_73DCB8 = { +EvtScript D_802A1458_73DCB8 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -97,7 +97,7 @@ EvtSource D_802A1458_73DCB8 = { EVT_END }; -EvtSource D_802A1540_73DDA0 = { +EvtScript D_802A1540_73DDA0 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(6), LW(7), LW(8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(7), LW(8), LW(9)) @@ -115,7 +115,7 @@ EvtSource D_802A1540_73DDA0 = { EVT_END }; -EvtSource D_802A1628_73DE88 = { +EvtScript D_802A1628_73DE88 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -144,7 +144,7 @@ EvtSource D_802A1628_73DE88 = { EVT_END }; -EvtSource D_802A1814_73E074 = { +EvtScript D_802A1814_73E074 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -173,7 +173,7 @@ EvtSource D_802A1814_73E074 = { EVT_END }; -EvtSource D_802A1A00_73E260 = { +EvtScript D_802A1A00_73E260 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) @@ -202,7 +202,7 @@ EvtSource D_802A1A00_73E260 = { EVT_END }; -EvtSource D_802A1BEC_73E44C = { +EvtScript D_802A1BEC_73E44C = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -231,7 +231,7 @@ EvtSource D_802A1BEC_73E44C = { EVT_END }; -EvtSource D_802A1DD8_73E638 = { +EvtScript D_802A1DD8_73E638 = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(EnablePlayerBlur, -1) @@ -267,7 +267,7 @@ EvtSource D_802A1DD8_73E638 = { EVT_END }; -EvtSource D_802A203C_73E89C = { +EvtScript D_802A203C_73E89C = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_1000C) EVT_CALL(PlayerLandJump) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_1000C) @@ -294,7 +294,7 @@ EvtSource D_802A203C_73E89C = { EVT_END }; -EvtSource D_802A21D4_73EA34 = { +EvtScript D_802A21D4_73EA34 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(N(MoveToJump)) @@ -308,7 +308,7 @@ EvtSource D_802A21D4_73EA34 = { EVT_END }; -EvtSource D_802A2280 = { +EvtScript D_802A2280 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(N(MoveToJump)) @@ -334,7 +334,7 @@ EvtSource D_802A2280 = { EVT_END }; -EvtSource D_802A23D4_73EC34 = { +EvtScript D_802A23D4_73EC34 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(N(MoveToJump)) @@ -376,7 +376,7 @@ EvtSource D_802A23D4_73EC34 = { EVT_END }; -EvtSource D_802A2650_73EEB0 = { +EvtScript D_802A2650_73EEB0 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetBattleFlags2, LW(0)) EVT_IF_FLAG(LW(0), BS_FLAGS2_200) @@ -396,7 +396,7 @@ EvtSource D_802A2650_73EEB0 = { EVT_END }; -EvtSource D_802A2720_73EF80 = { +EvtScript D_802A2720_73EF80 = { EVT_EXEC_WAIT(D_802A21D4_73EA34) EVT_CALL(GetActionCommandMode, LW(0)) EVT_IF_EQ(LW(0), 2) @@ -461,7 +461,7 @@ EvtSource D_802A2720_73EF80 = { EVT_END }; -EvtSource D_802A2ABC_73F31C = { +EvtScript D_802A2ABC_73F31C = { EVT_EXEC_WAIT(D_802A21D4_73EA34) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) @@ -516,7 +516,7 @@ EvtSource D_802A2ABC_73F31C = { EVT_END }; -EvtSource D_802A2DE8_73F648 = { +EvtScript D_802A2DE8_73F648 = { EVT_EXEC_WAIT(D_802A21D4_73EA34) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) @@ -569,7 +569,7 @@ EvtSource D_802A2DE8_73F648 = { EVT_END }; -EvtSource D_802A30F4_73F954 = { +EvtScript D_802A30F4_73F954 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) @@ -602,7 +602,7 @@ ApiStatus N(GetJumpDamage)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource D_802A3188_73F9E8 = { +EvtScript D_802A3188_73F9E8 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(3), LW(4), LW(5)) EVT_SUB(LW(3), 40) @@ -631,7 +631,7 @@ EvtSource D_802A3188_73F9E8 = { EVT_END }; -EvtSource D_802A3378_73FBD8 = { +EvtScript D_802A3378_73FBD8 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(3), LW(4), LW(5)) EVT_SUB(LW(3), 40) @@ -654,7 +654,7 @@ EvtSource D_802A3378_73FBD8 = { EVT_END }; -EvtSource D_802A34EC_73FD4C = { +EvtScript D_802A34EC_73FD4C = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LW(3), LW(4), LW(5)) EVT_SUB(LW(3), 40) @@ -675,7 +675,7 @@ EvtSource D_802A34EC_73FD4C = { EVT_END }; -EvtSource D_802A3644_73FEA4 = { +EvtScript D_802A3644_73FEA4 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) @@ -690,7 +690,7 @@ EvtSource D_802A3644_73FEA4 = { EVT_END }; -EvtSource D_802A36D8_73FF38 = { +EvtScript D_802A36D8_73FF38 = { EVT_EXEC_WAIT(D_802A21D4_73EA34) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) @@ -741,7 +741,7 @@ EvtSource D_802A36D8_73FF38 = { EVT_END }; -EvtSource D_802A39C4_740224 = { +EvtScript D_802A39C4_740224 = { EVT_EXEC_WAIT(D_802A21D4_73EA34) EVT_CALL(PlayerTestEnemy, LW(0), 128, 0, 0, 1, 0) EVT_IF_EQ(LW(0), 6) @@ -796,7 +796,7 @@ EvtSource D_802A39C4_740224 = { EVT_END }; -EvtSource D_802A3CF0_740550 = { +EvtScript D_802A3CF0_740550 = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_EXEC_WAIT(D_802A21D4_73EA34) @@ -851,7 +851,7 @@ EvtSource D_802A3CF0_740550 = { EVT_END }; -EvtSource D_802A4018_740878 = { +EvtScript D_802A4018_740878 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(N(MoveToJump)) diff --git a/src/battle/move/power_bounce/743DF0.c b/src/battle/move/power_bounce/743DF0.c index 1b830db5fc..47172f200f 100644 --- a/src/battle/move/power_bounce/743DF0.c +++ b/src/battle/move/power_bounce/743DF0.c @@ -13,7 +13,7 @@ ApiStatus func_802A10E4_743ED4(Evt* script, s32 isInitialCall) { s32 powerBounceChance; script->varTable[0] = 99; - powerBounceChance = targetActor->staticActorData->powerBounceChance; + powerBounceChance = targetActor->actorBlueprint->powerBounceChance; if (is_ability_active(ABILITY_DODGE_MASTER)) { powerBounceChance += 7; } diff --git a/src/battle/move/quake_hammer/quake_hammer.c b/src/battle/move/quake_hammer/quake_hammer.c index d366464e75..4e625a36ab 100644 --- a/src/battle/move/quake_hammer/quake_hammer.c +++ b/src/battle/move/quake_hammer/quake_hammer.c @@ -5,13 +5,13 @@ #define NAMESPACE battle_move_quake_hammer -extern EvtSource D_802A3168_0073D038; +extern EvtScript D_802A3168_0073D038; #include "world/common/IsBerserkerEquipped.inc.c" #include "world/common/IsRightOnEquipped.inc.c" -EvtSource D_802A10B0_73AF80 = { +EvtScript D_802A10B0_73AF80 = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) @@ -26,7 +26,7 @@ EvtSource D_802A10B0_73AF80 = { EVT_END }; -EvtSource D_802A118C_0073B05C = { +EvtScript D_802A118C_0073B05C = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) @@ -36,7 +36,7 @@ EvtSource D_802A118C_0073B05C = { EVT_END }; -EvtSource D_802A1204_0073B0D4 = { +EvtScript D_802A1204_0073B0D4 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LW(1), 0) @@ -67,7 +67,7 @@ EvtSource D_802A1204_0073B0D4 = { EVT_END }; -EvtSource D_802A1388_0073B258 = { +EvtScript D_802A1388_0073B258 = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LW(1), 0) @@ -98,7 +98,7 @@ EvtSource D_802A1388_0073B258 = { EVT_END }; -EvtSource D_802A150C_0073B3DC = { +EvtScript D_802A150C_0073B3DC = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LW(1), 0) @@ -129,7 +129,7 @@ EvtSource D_802A150C_0073B3DC = { EVT_END }; -EvtSource D_802A1690_0073B560 = { +EvtScript D_802A1690_0073B560 = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) @@ -168,7 +168,7 @@ EvtSource D_802A1690_0073B560 = { EVT_END }; -EvtSource D_802A18AC_0073B77C = { +EvtScript D_802A18AC_0073B77C = { EVT_CALL(func_80276EFC) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) EVT_CALL(MoveBattleCamOver, 5) @@ -186,7 +186,7 @@ EvtSource D_802A18AC_0073B77C = { EVT_END }; -EvtSource D_802A1998_0073B868 = { +EvtScript D_802A1998_0073B868 = { EVT_CALL(func_80276EFC) EVT_CALL(func_802693F0) EVT_WAIT_FRAMES(20) @@ -202,7 +202,7 @@ EvtSource D_802A1998_0073B868 = { EVT_END }; -EvtSource D_802A1A64_0073B934 = { +EvtScript D_802A1A64_0073B934 = { EVT_CALL(func_80276EFC) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) EVT_CALL(func_802693F0) @@ -219,7 +219,7 @@ EvtSource D_802A1A64_0073B934 = { EVT_END }; -EvtSource D_802A1B40 = { +EvtScript D_802A1B40 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) EVT_EXEC_WAIT(D_802A10B0_73AF80) @@ -305,7 +305,7 @@ EvtSource D_802A1B40 = { EVT_END }; -EvtSource D_802A2000_0073BED0 = { +EvtScript D_802A2000_0073BED0 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) EVT_EXEC_WAIT(D_802A10B0_73AF80) @@ -374,7 +374,7 @@ EvtSource D_802A2000_0073BED0 = { EVT_END }; -EvtSource D_802A23E8 = { +EvtScript D_802A23E8 = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) EVT_EXEC_WAIT(D_802A10B0_73AF80) @@ -443,7 +443,7 @@ EvtSource D_802A23E8 = { EVT_END }; -EvtSource D_802A27D0 = { +EvtScript D_802A27D0 = { EVT_CALL(ChooseNextTarget, 10, LW(0)) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) @@ -501,7 +501,7 @@ EvtSource D_802A27D0 = { EVT_END }; -EvtSource D_802A2AFC_0073C9CC = { +EvtScript D_802A2AFC_0073C9CC = { EVT_CALL(ChooseNextTarget, 10, LW(0)) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) @@ -550,7 +550,7 @@ EvtSource D_802A2AFC_0073C9CC = { EVT_END }; -EvtSource D_802A2DA0_0073CC70 = { +EvtScript D_802A2DA0_0073CC70 = { EVT_CALL(ChooseNextTarget, 10, LW(0)) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_CreateHudElements) @@ -599,7 +599,7 @@ EvtSource D_802A2DA0_0073CC70 = { EVT_END }; -EvtSource D_802A3044_0073CF14 = { +EvtScript D_802A3044_0073CF14 = { EVT_CALL(func_802694A4, 1) EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) @@ -623,7 +623,7 @@ EvtSource D_802A3044_0073CF14 = { EVT_END }; -EvtSource D_802A3168_0073D038 = { +EvtScript D_802A3168_0073D038 = { EVT_CALL(GetMenuSelection, LW(0), LW(1), LW(2)) EVT_SWITCH(LW(1)) EVT_CASE_EQ(0) diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 6604c6ea21..7056cf0802 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -89,7 +89,7 @@ ApiStatus func_80238358_6FB068(Evt* script, s32 isInitialCall) { s32 var0 = evt_get_variable(script, *args++); s32 var1 = 0; - switch (partnerActor->staticActorData->level) { + switch (partnerActor->actorBlueprint->level) { case 0: if (var0 < 36) { var1 = 1; @@ -150,7 +150,7 @@ ApiStatus func_8023849C_6FB1AC(Evt* script, s32 isInitialCall) { s32 var0 = evt_get_variable(script, *args++); s32 var1 = 0; - switch (partnerActor->staticActorData->level) { + switch (partnerActor->actorBlueprint->level) { case 1: if (var0 < 36) { var1 = 1; @@ -197,7 +197,7 @@ ApiStatus func_80238590_6FB2A0(Evt* script, s32 isInitialCall) { s32 var0 = evt_get_variable(script, *args++); s32 var1 = 0; - switch (partnerActor->staticActorData->level) { + switch (partnerActor->actorBlueprint->level) { case 2: if (var0 < 36) { var1 = 1; diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 04d611de49..3e6d0ba319 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -90,9 +90,9 @@ ApiStatus N(AverageTargetStatusChance)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor; - ActorDesc* targetActorDesc; + ActorBlueprint* targetActorBlueprint; ActorPart* targetActorPart; - s32 targetActorDescBaseStatusChance; + s32 targetActorBlueprintBaseStatusChance; s32 chanceTotal = 0; s32 nTargets = 0; s32 i; @@ -100,19 +100,19 @@ ApiStatus N(AverageTargetStatusChance)(Evt* script, s32 isInitialCall) { for (i = 0; i < partnerActor->targetListLength; i++) { targetActor = get_actor(partnerActor->targetData[i].actorID); targetActorPart = get_actor_part(targetActor, partnerActor->targetData[i].partID); - targetActorDesc = targetActor->staticActorData; - targetActorDescBaseStatusChance = targetActorDesc->baseStatusChance; + targetActorBlueprint = targetActor->actorBlueprint; + targetActorBlueprintBaseStatusChance = targetActorBlueprint->baseStatusChance; if (targetActor->transStatus == 14) { - targetActorDescBaseStatusChance = 0; + targetActorBlueprintBaseStatusChance = 0; } if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { - targetActorDescBaseStatusChance = 0; + targetActorBlueprintBaseStatusChance = 0; } - if (targetActorDescBaseStatusChance > 0) { - chanceTotal += targetActorDescBaseStatusChance; + if (targetActorBlueprintBaseStatusChance > 0) { + chanceTotal += targetActorBlueprintBaseStatusChance; nTargets++; } } diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 2a0c8a08d8..984aabe38f 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -13,22 +13,22 @@ extern s32 D_8023CDA4; extern s32 D_8023BB98_6ECC78; extern s32 bActorTattles[ACTOR_TYPE_COUNT]; -extern EvtSource N(init); -extern EvtSource N(80239784); -extern EvtSource N(802397E0); -extern EvtSource N(8023993C); -extern EvtSource N(8023994C); -extern EvtSource N(80239988); -extern EvtSource N(8023A754); -extern EvtSource N(8023ADC4); -extern EvtSource N(8023B45C); -extern EvtSource N(8023BB9C); -extern EvtSource N(8023C5B8); -extern EvtSource N(8023C90C); -extern EvtSource N(handleEvent_80239360); -extern EvtSource N(idle_80239350); -extern EvtSource N(nextTurn_80239A3C); -extern EvtSource N(takeTurn_802396D8); +extern EvtScript N(init); +extern EvtScript N(80239784); +extern EvtScript N(802397E0); +extern EvtScript N(8023993C); +extern EvtScript N(8023994C); +extern EvtScript N(80239988); +extern EvtScript N(8023A754); +extern EvtScript N(8023ADC4); +extern EvtScript N(8023B45C); +extern EvtScript N(8023BB9C); +extern EvtScript N(8023C5B8); +extern EvtScript N(8023C90C); +extern EvtScript N(handleEvent_80239360); +extern EvtScript N(idle_80239350); +extern EvtScript N(nextTurn_80239A3C); +extern EvtScript N(takeTurn_802396D8); ApiStatus func_802380E4_6F11C4(Evt* script, s32 isInitialCall); ApiStatus func_8023817C_6F125C(Evt* script, s32 isInitialCall); @@ -66,7 +66,7 @@ ApiStatus func_802380E4_6F11C4(Evt* script, s32 isInitialCall) { Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); script->varTable[0] = 99; - D_8023BB98_6ECC78 *= targetActor->staticActorData->powerBounceChance; + D_8023BB98_6ECC78 *= targetActor->actorBlueprint->powerBounceChance; D_8023BB98_6ECC78 /= 100; if (D_8023BB98_6ECC78 < rand_int(100)) { script->varTable[0] = 0; @@ -279,7 +279,7 @@ s32 N(statusTable_802391F8)[] = { STATUS_END, }; -ActorPartDesc N(partsTable_802392A4)[] = { +ActorPartBlueprint N(partsTable_802392A4)[] = { { .flags = 0, .index = 1, @@ -293,9 +293,9 @@ ActorPartDesc N(partsTable_802392A4)[] = { }, }; -extern EvtSource N(init_802392F0); +extern EvtScript N(init_802392F0); -ActorDesc N(goombario) = { +ActorBlueprint N(goombario) = { .flags = 0, .type = ACTOR_TYPE_GOOMBARIO, .level = 0, @@ -318,7 +318,7 @@ ActorDesc N(goombario) = { .statusMessageOffset = { 10, 20 }, }; -EvtSource N(init_802392F0) = { +EvtScript N(init_802392F0) = { EVT_CALL(BindTakeTurn, 256, EVT_PTR(battle_partner_goombario_takeTurn_802396D8)) EVT_CALL(BindIdle, 256, EVT_PTR(battle_partner_goombario_idle_80239350)) EVT_CALL(BindHandleEvent, 256, EVT_PTR(battle_partner_goombario_handleEvent_80239360)) @@ -327,12 +327,12 @@ EvtSource N(init_802392F0) = { EVT_END }; -EvtSource N(idle_80239350) = { +EvtScript N(idle_80239350) = { EVT_RETURN EVT_END }; -EvtSource N(handleEvent_80239360) = { +EvtScript N(handleEvent_80239360) = { EVT_CALL(UseIdleAnimation, 256, 0) EVT_CALL(CloseActionCommandInfo) EVT_CALL(GetLastEvent, 256, EVT_VAR(0)) @@ -400,7 +400,7 @@ EvtSource N(handleEvent_80239360) = { EVT_END }; -EvtSource N(takeTurn_802396D8) = { +EvtScript N(takeTurn_802396D8) = { EVT_CALL(GetBattlePhase, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(1) @@ -418,7 +418,7 @@ EvtSource N(takeTurn_802396D8) = { EVT_END }; -EvtSource N(80239784) = { +EvtScript N(80239784) = { EVT_SET_CONST(EVT_VAR(0), 0x1) EVT_SET_CONST(EVT_VAR(1), 0x90010) EVT_SET_CONST(EVT_VAR(2), 0x90011) @@ -428,7 +428,7 @@ EvtSource N(80239784) = { EVT_END }; -EvtSource N(802397E0) = { +EvtScript N(802397E0) = { EVT_CALL(GetMenuSelection, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(func_802694A4, 1) EVT_CALL(SetBattleFlagBits, 16384, 0) @@ -460,12 +460,12 @@ EvtSource N(802397E0) = { EVT_END }; -EvtSource N(8023993C) = { +EvtScript N(8023993C) = { EVT_RETURN EVT_END }; -EvtSource N(8023994C) = { +EvtScript N(8023994C) = { EVT_SET_CONST(EVT_VAR(0), 0x1) EVT_SET_CONST(EVT_VAR(1), 0x90003) EVT_EXEC_WAIT(D_80294AFC) @@ -473,7 +473,7 @@ EvtSource N(8023994C) = { EVT_END }; -EvtSource N(80239988) = { +EvtScript N(80239988) = { EVT_CALL(UseIdleAnimation, 256, 0) EVT_CALL(SetGoalToHome, 256) EVT_CALL(SetActorSpeed, 256, EVT_FIXED(6.0)) @@ -486,7 +486,7 @@ EvtSource N(80239988) = { EVT_END }; -EvtSource N(nextTurn_80239A3C) = { +EvtScript N(nextTurn_80239A3C) = { EVT_CALL(GetBattlePhase, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(10) @@ -529,7 +529,7 @@ EvtSource N(nextTurn_80239A3C) = { EVT_END }; -EvtSource N(80239CA8) = { +EvtScript N(80239CA8) = { EVT_CALL(func_80280818) EVT_CALL(UseBattleCamPreset, 51) EVT_CALL(SetAnimation, 256, -1, 589825) @@ -580,7 +580,7 @@ EvtSource N(80239CA8) = { EVT_END }; -EvtSource N(8023A06C) = { +EvtScript N(8023A06C) = { EVT_CALL(func_80280818) EVT_CALL(UseBattleCamPreset, 3) EVT_CALL(SetAnimation, 256, -1, 589825) @@ -646,7 +646,7 @@ EvtSource N(8023A06C) = { EVT_END }; -EvtSource N(8023A52C) = { +EvtScript N(8023A52C) = { EVT_CALL(SetGoalToFirstTarget, -127) EVT_CALL(GetGoalPos, -127, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_SUB(EVT_VAR(0), 40) @@ -667,7 +667,7 @@ EvtSource N(8023A52C) = { EVT_END }; -EvtSource N(8023A66C) = { +EvtScript N(8023A66C) = { EVT_CALL(SetGoalToTarget, 256) EVT_CALL(GetGoalPos, 256, EVT_VAR(11), EVT_VAR(7), EVT_VAR(13)) EVT_CALL(GetActorPos, 256, EVT_VAR(7), EVT_VAR(13), EVT_VAR(14)) @@ -685,7 +685,7 @@ EvtSource N(8023A66C) = { EVT_END }; -EvtSource N(8023A754) = { +EvtScript N(8023A754) = { EVT_CALL(LoadActionCommand, 1) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(battle_partner_goombario_8023A52C) @@ -790,7 +790,7 @@ EvtSource N(8023A754) = { EVT_END }; -EvtSource N(8023ADC4) = { +EvtScript N(8023ADC4) = { EVT_CALL(LoadActionCommand, 1) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(battle_partner_goombario_8023A52C) @@ -897,7 +897,7 @@ EvtSource N(8023ADC4) = { EVT_END }; -EvtSource N(8023B45C) = { +EvtScript N(8023B45C) = { EVT_CALL(LoadActionCommand, 1) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(battle_partner_goombario_8023A52C) @@ -1019,7 +1019,7 @@ s32 N(D_8023BB78_6ECC58)[] = { s32 D_8023BB98_6ECC78 = 0x000000C8; -EvtSource N(8023BB9C) = { +EvtScript N(8023BB9C) = { EVT_CALL(LoadActionCommand, 1) EVT_CALL(action_command_jump_CreateHudElements) EVT_EXEC_WAIT(battle_partner_goombario_8023A52C) @@ -1191,7 +1191,7 @@ EvtSource N(8023BB9C) = { EVT_END }; -EvtSource N(8023C5B8) = { +EvtScript N(8023C5B8) = { EVT_CALL(GetActorPos, 256, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 30) EVT_CALL(SetActorSpeed, 256, EVT_FIXED(6.0)) @@ -1238,7 +1238,7 @@ EvtSource N(8023C5B8) = { EVT_END }; -EvtSource N(8023C90C) = { +EvtScript N(8023C90C) = { EVT_CALL(UseBattleCamPreset, 55) EVT_WAIT_FRAMES(10) EVT_CALL(SetAnimation, 256, -1, 589831) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index fae63fabbd..a2bf33d138 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -44,7 +44,7 @@ ApiStatus N(AverageTargetDizzyChance)(Evt* script, s32 isInitialCall) { Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor; ActorPart* targetActorPart; - s32 targetActorDescBaseStatusChance; + s32 targetActorBlueprintBaseStatusChance; s32 chanceTotal = 0; s32 nTargets = 0; s32 i; @@ -52,18 +52,18 @@ ApiStatus N(AverageTargetDizzyChance)(Evt* script, s32 isInitialCall) { for (i = 0; i < partnerActor->targetListLength; i++) { targetActor = get_actor(partnerActor->targetData[i].actorID); targetActorPart = get_actor_part(targetActor, partnerActor->targetData[i].partID); - targetActorDescBaseStatusChance = lookup_status_chance(targetActor->statusTable, STATUS_DIZZY); + targetActorBlueprintBaseStatusChance = lookup_status_chance(targetActor->statusTable, STATUS_DIZZY); if (targetActor->transStatus == 14) { - targetActorDescBaseStatusChance = 0; + targetActorBlueprintBaseStatusChance = 0; } if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { - targetActorDescBaseStatusChance = 0; + targetActorBlueprintBaseStatusChance = 0; } - if (targetActorDescBaseStatusChance > 0) { - chanceTotal += targetActorDescBaseStatusChance; + if (targetActorBlueprintBaseStatusChance > 0) { + chanceTotal += targetActorBlueprintBaseStatusChance; nTargets++; } } diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 68288f647d..48a7ec0b83 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -7,7 +7,7 @@ ApiStatus func_80238C88_700A08(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; s32 var0 = 0; - switch (battleStatus->partnerActor->staticActorData->level) { + switch (battleStatus->partnerActor->actorBlueprint->level) { case 0: var0 = 5; break; @@ -28,7 +28,7 @@ ApiStatus func_80238CE0_700A60(Evt* script, s32 isInitialCall) { Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor = get_actor(partnerActor->targetActorID); ActorPart* targetActorPart = get_actor_part(targetActor, partnerActor->targetPartIndex); - s32 airLiftChance = targetActor->staticActorData->airLiftChance; + s32 airLiftChance = targetActor->actorBlueprint->airLiftChance; s32 temp = 100 - (targetActor->currentHP * 100) / targetActor->maxHP; if (targetActor->transStatus == 14) { diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 8a0e61f29c..ebf9233589 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -164,7 +164,7 @@ ApiStatus N(AverageTargetParalyzeChance)(Evt* script, s32 isInitialCall) { Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor; ActorPart* targetActorPart; - s32 targetActorDescBaseStatusChance; + s32 targetActorBlueprintBaseStatusChance; s32 chanceTotal = 0; s32 nTargets = 0; s32 i; @@ -172,18 +172,18 @@ ApiStatus N(AverageTargetParalyzeChance)(Evt* script, s32 isInitialCall) { for (i = 0; i < partnerActor->targetListLength; i++) { targetActor = get_actor(partnerActor->targetData[i].actorID); targetActorPart = get_actor_part(targetActor, partnerActor->targetData[i].partID); - targetActorDescBaseStatusChance = lookup_status_chance(targetActor->statusTable, STATUS_PARALYZE); + targetActorBlueprintBaseStatusChance = lookup_status_chance(targetActor->statusTable, STATUS_PARALYZE); if (targetActor->transStatus == 14) { - targetActorDescBaseStatusChance = 0; + targetActorBlueprintBaseStatusChance = 0; } if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) { - targetActorDescBaseStatusChance = 0; + targetActorBlueprintBaseStatusChance = 0; } - if (targetActorDescBaseStatusChance > 0) { - chanceTotal += targetActorDescBaseStatusChance; + if (targetActorBlueprintBaseStatusChance > 0) { + chanceTotal += targetActorBlueprintBaseStatusChance; nTargets++; } } diff --git a/src/battle/star/chill_out/7900D0.c b/src/battle/star/chill_out/7900D0.c index 24361eb96d..87fe99fd47 100644 --- a/src/battle/star/chill_out/7900D0.c +++ b/src/battle/star/chill_out/7900D0.c @@ -54,7 +54,7 @@ ApiStatus func_802A163C_79070C(Evt* script, s32 isInitialCall) { ApiStatus func_802A16F4_7907C4(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/star/chill_out/7900D0", func_802A16F4_7907C4); -EvtSource N(802A18F0) = { +EvtScript N(802A18F0) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -109,7 +109,7 @@ EvtSource N(802A18F0) = { EVT_END }; -EvtSource N(802A1C88) = { +EvtScript N(802A1C88) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -164,7 +164,7 @@ EvtSource N(802A1C88) = { EVT_END }; -EvtSource N(802A2020) = { +EvtScript N(802A2020) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -198,7 +198,7 @@ EvtSource N(802A2020) = { EVT_END }; -EvtSource N(802A222C) = { +EvtScript N(802A222C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -269,7 +269,7 @@ EvtSource N(802A222C) = { EVT_END }; -EvtSource N(802A267C) = { +EvtScript N(802A267C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -292,7 +292,7 @@ EvtSource N(802A267C) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_CALL(func_802A1518_7905E8) EVT_EXEC_WAIT(N(802A18F0)) EVT_SET_CONST(LW(0), NPC_ANIM_battle_muskular_Palette_00_Anim_1) diff --git a/src/battle/star/focus/789E60.c b/src/battle/star/focus/789E60.c index fa6c653c64..3fb52ab5ba 100644 --- a/src/battle/star/focus/789E60.c +++ b/src/battle/star/focus/789E60.c @@ -48,7 +48,7 @@ ApiStatus func_802A15B0_78A410(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(802A1630) = { +EvtScript N(802A1630) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -103,7 +103,7 @@ EvtSource N(802A1630) = { EVT_END }; -EvtSource N(802A19C8) = { +EvtScript N(802A19C8) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -158,7 +158,7 @@ EvtSource N(802A19C8) = { EVT_END }; -EvtSource N(802A1D60) = { +EvtScript N(802A1D60) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -192,7 +192,7 @@ EvtSource N(802A1D60) = { EVT_END }; -EvtSource N(802A1F6C) = { +EvtScript N(802A1F6C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -263,7 +263,7 @@ EvtSource N(802A1F6C) = { EVT_END }; -EvtSource N(802A23BC) = { +EvtScript N(802A23BC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -286,7 +286,7 @@ EvtSource N(802A23BC) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A1630)) EVT_CALL(func_802535B4, 1) EVT_CALL(GetOwnerID, LW(10)) diff --git a/src/battle/star/lullaby/78D150.c b/src/battle/star/lullaby/78D150.c index 19b448c295..352c842954 100644 --- a/src/battle/star/lullaby/78D150.c +++ b/src/battle/star/lullaby/78D150.c @@ -34,7 +34,7 @@ ApiStatus func_802A1518_78D668(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource N(802A1620) = { +EvtScript N(802A1620) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -89,7 +89,7 @@ EvtSource N(802A1620) = { EVT_END }; -EvtSource N(802A19B8) = { +EvtScript N(802A19B8) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -144,7 +144,7 @@ EvtSource N(802A19B8) = { EVT_END }; -EvtSource N(802A1D50) = { +EvtScript N(802A1D50) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -178,7 +178,7 @@ EvtSource N(802A1D50) = { EVT_END }; -EvtSource N(802A1F5C) = { +EvtScript N(802A1F5C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -249,7 +249,7 @@ EvtSource N(802A1F5C) = { EVT_END }; -EvtSource N(802A23AC) = { +EvtScript N(802A23AC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -272,7 +272,7 @@ EvtSource N(802A23AC) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A1620)) EVT_SET_CONST(LW(0), NPC_ANIM_battle_mamar_Palette_00_Anim_1) EVT_EXEC_WAIT(N(802A1D50)) diff --git a/src/battle/star/peach_beam/7997B0.c b/src/battle/star/peach_beam/7997B0.c index d187c01599..bd3621cca7 100644 --- a/src/battle/star/peach_beam/7997B0.c +++ b/src/battle/star/peach_beam/7997B0.c @@ -32,7 +32,7 @@ ApiStatus func_802A247C_79AC2C(Evt* script, s32 isInitialCall) { // this file is identical in c code to star beam // TODO: consider .inc.c? -EvtSource N(802A24F0) = { +EvtScript N(802A24F0) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -87,7 +87,7 @@ EvtSource N(802A24F0) = { EVT_END }; -EvtSource N(802A2888) = { +EvtScript N(802A2888) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -142,7 +142,7 @@ EvtSource N(802A2888) = { EVT_END }; -EvtSource N(802A2C20) = { +EvtScript N(802A2C20) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -176,7 +176,7 @@ EvtSource N(802A2C20) = { EVT_END }; -EvtSource N(802A2E2C) = { +EvtScript N(802A2E2C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -247,7 +247,7 @@ EvtSource N(802A2E2C) = { EVT_END }; -EvtSource N(802A327C) = { +EvtScript N(802A327C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -270,7 +270,7 @@ EvtSource N(802A327C) = { EVT_END }; -EvtSource N(802A33A8) = { +EvtScript N(802A33A8) = { EVT_THREAD EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) EVT_WAIT_FRAMES(5) @@ -300,7 +300,7 @@ s32 N(D_802A3554_7FCD04)[] = { 0x43340000, 0x00000000, 0xC2700000, 0x43340000, 0x00000000, 0xC36A0000, 0x421C0000, 0x00000000, }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A2888)) EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/star/peach_dash/79D8A0.c b/src/battle/star/peach_dash/79D8A0.c index f1137fb081..6b42000ae1 100644 --- a/src/battle/star/peach_dash/79D8A0.c +++ b/src/battle/star/peach_dash/79D8A0.c @@ -25,7 +25,7 @@ ApiStatus func_802A1518_79DDB8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(802A15B0) = { +EvtScript N(802A15B0) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -80,7 +80,7 @@ EvtSource N(802A15B0) = { EVT_END }; -EvtSource N(802A1948) = { +EvtScript N(802A1948) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -135,7 +135,7 @@ EvtSource N(802A1948) = { EVT_END }; -EvtSource N(802A1CE0) = { +EvtScript N(802A1CE0) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -169,7 +169,7 @@ EvtSource N(802A1CE0) = { EVT_END }; -EvtSource N(802A1EEC) = { +EvtScript N(802A1EEC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -240,7 +240,7 @@ EvtSource N(802A1EEC) = { EVT_END }; -EvtSource N(802A233C) = { +EvtScript N(802A233C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -263,7 +263,7 @@ EvtSource N(802A233C) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_CALL(UseBattleCamPreset, 69) EVT_WAIT_FRAMES(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0C0010) diff --git a/src/battle/star/peach_focus/79BFA0.c b/src/battle/star/peach_focus/79BFA0.c index 8ccb4a01be..431e8dbb75 100644 --- a/src/battle/star/peach_focus/79BFA0.c +++ b/src/battle/star/peach_focus/79BFA0.c @@ -12,7 +12,7 @@ ApiStatus func_802A1518_79C4B8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(802A1530) = { +EvtScript N(802A1530) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -67,7 +67,7 @@ EvtSource N(802A1530) = { EVT_END }; -EvtSource N(802A18C8) = { +EvtScript N(802A18C8) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -122,7 +122,7 @@ EvtSource N(802A18C8) = { EVT_END }; -EvtSource N(802A1C60) = { +EvtScript N(802A1C60) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -156,7 +156,7 @@ EvtSource N(802A1C60) = { EVT_END }; -EvtSource N(802A1E6C) = { +EvtScript N(802A1E6C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -227,7 +227,7 @@ EvtSource N(802A1E6C) = { EVT_END }; -EvtSource N(802A22BC) = { +EvtScript N(802A22BC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -250,7 +250,7 @@ EvtSource N(802A22BC) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_CALL(UseBattleCamPreset, 69) EVT_WAIT_FRAMES(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) diff --git a/src/battle/star/refresh/78B600.c b/src/battle/star/refresh/78B600.c index 425ff41b54..d198e96dc3 100644 --- a/src/battle/star/refresh/78B600.c +++ b/src/battle/star/refresh/78B600.c @@ -57,7 +57,7 @@ ApiStatus func_802A19A8_78BFA8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(802A1A70) = { +EvtScript N(802A1A70) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -112,7 +112,7 @@ EvtSource N(802A1A70) = { EVT_END }; -EvtSource N(802A1E08) = { +EvtScript N(802A1E08) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -167,7 +167,7 @@ EvtSource N(802A1E08) = { EVT_END }; -EvtSource N(802A21A0) = { +EvtScript N(802A21A0) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -201,7 +201,7 @@ EvtSource N(802A21A0) = { EVT_END }; -EvtSource N(802A23AC) = { +EvtScript N(802A23AC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -272,7 +272,7 @@ EvtSource N(802A23AC) = { EVT_END }; -EvtSource N(802A27FC) = { +EvtScript N(802A27FC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -295,7 +295,7 @@ EvtSource N(802A27FC) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A1A70)) EVT_SET_CONST(LW(0), NPC_ANIM_battle_eldstar_Palette_00_Anim_1) EVT_EXEC_WAIT(N(802A21A0)) diff --git a/src/battle/star/smooch/791D90.c b/src/battle/star/smooch/791D90.c index 6325c049d9..abd2b0f8d1 100644 --- a/src/battle/star/smooch/791D90.c +++ b/src/battle/star/smooch/791D90.c @@ -20,7 +20,7 @@ ApiStatus func_802A156C_7922FC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(802A1630) = { +EvtScript N(802A1630) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -75,7 +75,7 @@ EvtSource N(802A1630) = { EVT_END }; -EvtSource N(802A19C8) = { +EvtScript N(802A19C8) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -130,7 +130,7 @@ EvtSource N(802A19C8) = { EVT_END }; -EvtSource N(802A1D60) = { +EvtScript N(802A1D60) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -164,7 +164,7 @@ EvtSource N(802A1D60) = { EVT_END }; -EvtSource N(802A1F6C) = { +EvtScript N(802A1F6C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -235,7 +235,7 @@ EvtSource N(802A1F6C) = { EVT_END }; -EvtSource N(802A23BC) = { +EvtScript N(802A23BC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -263,7 +263,7 @@ s32 N(intTable_802A24E8)[] = { 0x00000023, 0x00000000, }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A1630)) EVT_SET_CONST(LW(0), NPC_ANIM_battle_misstar_Palette_00_Anim_0) EVT_EXEC_WAIT(N(802A1D60)) diff --git a/src/battle/star/star_beam/796FC0.c b/src/battle/star/star_beam/796FC0.c index 1ec0f172c7..ffa6747768 100644 --- a/src/battle/star/star_beam/796FC0.c +++ b/src/battle/star/star_beam/796FC0.c @@ -29,7 +29,7 @@ ApiStatus func_802A247C_79843C(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource N(802A24F0) = { +EvtScript N(802A24F0) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -84,7 +84,7 @@ EvtSource N(802A24F0) = { EVT_END }; -EvtSource N(802A2888) = { +EvtScript N(802A2888) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -139,7 +139,7 @@ EvtSource N(802A2888) = { EVT_END }; -EvtSource N(802A2C20) = { +EvtScript N(802A2C20) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -173,7 +173,7 @@ EvtSource N(802A2C20) = { EVT_END }; -EvtSource N(802A2E2C) = { +EvtScript N(802A2E2C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -244,7 +244,7 @@ EvtSource N(802A2E2C) = { EVT_END }; -EvtSource N(802A327C) = { +EvtScript N(802A327C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -267,7 +267,7 @@ EvtSource N(802A327C) = { EVT_END }; -EvtSource N(802A33A8) = { +EvtScript N(802A33A8) = { EVT_THREAD EVT_CALL(PlayEffect, 0x38, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) EVT_WAIT_FRAMES(5) @@ -298,7 +298,7 @@ s32 D_802A3554_799514[] = { 0x43340000, 0x00000000, 0xC2700000, 0x43340000, 0x00000000, 0xC36A0000, 0x421C0000, 0x00000000, }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A2888)) EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/star/star_storm/78E7D0.c b/src/battle/star/star_storm/78E7D0.c index b118f1b686..2c4064590e 100644 --- a/src/battle/star/star_storm/78E7D0.c +++ b/src/battle/star/star_storm/78E7D0.c @@ -34,7 +34,7 @@ ApiStatus func_802A1628_78EDF8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource N(802A16F0) = { +EvtScript N(802A16F0) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -89,7 +89,7 @@ EvtSource N(802A16F0) = { EVT_END }; -EvtSource N(802A1A88) = { +EvtScript N(802A1A88) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -144,7 +144,7 @@ EvtSource N(802A1A88) = { EVT_END }; -EvtSource N(802A1E20) = { +EvtScript N(802A1E20) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -178,7 +178,7 @@ EvtSource N(802A1E20) = { EVT_END }; -EvtSource N(802A202C) = { +EvtScript N(802A202C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -249,7 +249,7 @@ EvtSource N(802A202C) = { EVT_END }; -EvtSource N(802A247C) = { +EvtScript N(802A247C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -272,7 +272,7 @@ EvtSource N(802A247C) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A16F0)) EVT_SET_CONST(LW(0), NPC_ANIM_battle_skolar_Palette_00_Anim_1) EVT_EXEC_WAIT(N(802A1E20)) diff --git a/src/battle/star/time_out/793D20.c b/src/battle/star/time_out/793D20.c index a09e144364..4406e632cd 100644 --- a/src/battle/star/time_out/793D20.c +++ b/src/battle/star/time_out/793D20.c @@ -6,7 +6,7 @@ #include "common/StarPower.inc.c" -EvtSource N(802A1520) = { +EvtScript N(802A1520) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -61,7 +61,7 @@ EvtSource N(802A1520) = { EVT_END }; -EvtSource N(802A18B8) = { +EvtScript N(802A18B8) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -116,7 +116,7 @@ EvtSource N(802A18B8) = { EVT_END }; -EvtSource N(802A1C50) = { +EvtScript N(802A1C50) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -150,7 +150,7 @@ EvtSource N(802A1C50) = { EVT_END }; -EvtSource N(802A1E5C) = { +EvtScript N(802A1E5C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -221,7 +221,7 @@ EvtSource N(802A1E5C) = { EVT_END }; -EvtSource N(802A22AC) = { +EvtScript N(802A22AC) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -244,7 +244,7 @@ EvtSource N(802A22AC) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A1520)) EVT_SET_CONST(LW(0), NPC_ANIM_battle_klevar_Palette_00_Anim_1) EVT_EXEC_WAIT(N(802A1C50)) diff --git a/src/battle/star/up_and_away/7952E0.c b/src/battle/star/up_and_away/7952E0.c index e234c8caeb..ffb637cc32 100644 --- a/src/battle/star/up_and_away/7952E0.c +++ b/src/battle/star/up_and_away/7952E0.c @@ -50,7 +50,7 @@ ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall) { script->varTable[0] = 0; - if ((flags & ACTOR_FLAG_TARGET_ONLY) == NULL && (flags & ACTOR_FLAG_NO_DMG_APPLY) == NULL && (flags & ACTOR_FLAG_2000) == NULL && targetActor->staticActorData->upAndAwayChance != 0 && targetActor->staticActorData->upAndAwayChance >= rand_int(100)) { + if ((flags & ACTOR_FLAG_TARGET_ONLY) == NULL && (flags & ACTOR_FLAG_NO_DMG_APPLY) == NULL && (flags & ACTOR_FLAG_2000) == NULL && targetActor->actorBlueprint->upAndAwayChance != 0 && targetActor->actorBlueprint->upAndAwayChance >= rand_int(100)) { script->varTable[0] = 1; } @@ -61,7 +61,7 @@ ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A1628_795908); #endif -EvtSource N(802A16D0) = { +EvtScript N(802A16D0) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -116,7 +116,7 @@ EvtSource N(802A16D0) = { EVT_END }; -EvtSource N(802A1A68) = { +EvtScript N(802A1A68) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 69) @@ -171,7 +171,7 @@ EvtSource N(802A1A68) = { EVT_END }; -EvtSource N(802A1E00) = { +EvtScript N(802A1E00) = { EVT_WAIT_FRAMES(8) EVT_CALL(SetForegroundModelsVisible, 0) EVT_CALL(func_8024E664, 73) @@ -205,7 +205,7 @@ EvtSource N(802A1E00) = { EVT_END }; -EvtSource N(802A200C) = { +EvtScript N(802A200C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(UseBattleCamPreset, 2) @@ -276,7 +276,7 @@ EvtSource N(802A200C) = { EVT_END }; -EvtSource N(802A245C) = { +EvtScript N(802A245C) = { EVT_CALL(GetOwnerID, LW(10)) EVT_IF_EQ(LW(10), 0) EVT_CALL(N(UnkBackgroundFunc)) @@ -299,7 +299,7 @@ EvtSource N(802A245C) = { EVT_END }; -EvtSource N(usePower) = { +EvtScript N(usePower) = { EVT_EXEC_WAIT(N(802A16D0)) EVT_SET_CONST(LW(0), NPC_ANIM_battle_kalmar_Palette_00_Anim_1) EVT_EXEC_WAIT(N(802A1E00)) diff --git a/src/bss3.c b/src/bss3.c index e3fa24cb45..084e52449d 100644 --- a/src/bss3.c +++ b/src/bss3.c @@ -56,13 +56,13 @@ BSS char D_80151474[0x4]; BSS s8 gWorldShadowList[0xF0]; BSS s8 gBattleShadowList[0xF0]; BSS s32 gCurrentShadowListPtr; -BSS s32 wStaticEntityDataSize; -BSS s32 bStaticEntityDataSize; +BSS s32 wEntityBlueprintSize; +BSS s32 bEntityBlueprintSize; BSS char D_80151664[0x4]; -BSS s8 wStaticEntityData[0x74]; +BSS s8 wEntityBlueprint[0x74]; BSS s32 D_801516DC; BSS char D_8015DCE0[0x8]; -BSS s8 bStaticEntityData[0x14]; +BSS s8 bEntityBlueprint[0x14]; BSS s32 D_801516FC; BSS s8 gMainGameState[0x40]; BSS s8 gCurrentTileDescriptor[0x30]; @@ -278,9 +278,8 @@ BSS char D_8015A57C[0x14]; BSS s8 mdl_textureHandles[0x2200]; BSS s8 D_8015C790[0x30]; BSS s8 D_8015C7C0[0x10]; -BSS s16 D_8015C7D0; -BSS s16 D_8015C7D2; -BSS char D_8015C7D4[0x4]; -BSS s32 D_8015C7D8; -BSS char D_8015C7DC[0x4]; +BSS s32 CreateEntityVarArgBuffer; +BSS s32 CreateEntityVarArgBuffer1; +BSS s32 CreateEntityVarArgBuffer2; +BSS s32 CreateEntityVarArgBuffer3; BSS s32 D_8015C7E0; diff --git a/src/common/DivActorLevel4.inc.c b/src/common/DivActorLevel4.inc.c index 4a3e0c2a65..862398a93a 100644 --- a/src/common/DivActorLevel4.inc.c +++ b/src/common/DivActorLevel4.inc.c @@ -2,7 +2,7 @@ #include "battle/battle.h" ApiStatus N(DivActorLevel4)(Evt* script, s32 isInitialCall) { - ActorDesc* actorData = get_actor(script->owner1.actorID)->staticActorData; + ActorBlueprint* actorData = get_actor(script->owner1.actorID)->actorBlueprint; actorData->level /= 4; return ApiStatus_DONE2; diff --git a/src/common/FoliageTransform.inc.c b/src/common/FoliageTransform.inc.c index 01ab786a9d..52946bc275 100644 --- a/src/common/FoliageTransform.inc.c +++ b/src/common/FoliageTransform.inc.c @@ -27,7 +27,7 @@ typedef struct SearchBushConfig { FoliageModelList* bush; FoliageDropList* drops; FoliageVectorList* vectors; - EvtSource* callback; + EvtScript* callback; } SearchBushConfig; typedef struct ShakeTreeConfig { @@ -35,7 +35,7 @@ typedef struct ShakeTreeConfig { FoliageModelList* trunk; FoliageDropList* drops; FoliageVectorList* vectors; - EvtSource* callback; + EvtScript* callback; } ShakeTreeConfig; void N(foliage_setup_shear_mtx)(Matrix4f mtx, f32 scale, f32 xAmount, f32 zAmount) { diff --git a/src/common/SetSpinSmashable.inc.c b/src/common/SetSpinSmashable.inc.c index cb420fef43..ef748a92e6 100644 --- a/src/common/SetSpinSmashable.inc.c +++ b/src/common/SetSpinSmashable.inc.c @@ -6,9 +6,9 @@ ApiStatus N(SetSpinSmashable)(Evt* script, s32 isInitialCall) { Actor* actor = get_actor(script->owner1.actorID); if (!canSpinSmash) { - actor->staticActorData->spinSmashReq = 4; + actor->actorBlueprint->spinSmashReq = 4; } else { - actor->staticActorData->spinSmashReq = 0; + actor->actorBlueprint->spinSmashReq = 0; } return ApiStatus_DONE2; diff --git a/src/common/UnkBattleFunc1.inc.c b/src/common/UnkBattleFunc1.inc.c index e4406b04ab..4a6065b130 100644 --- a/src/common/UnkBattleFunc1.inc.c +++ b/src/common/UnkBattleFunc1.inc.c @@ -8,10 +8,10 @@ ApiStatus N(UnkBattleFunc1)(Evt* script, s32 isInitialCall) { s32 var3 = evt_get_variable(script, *args++); Actor* actor = get_actor(script->owner1.actorID); - actor->unk_194 = (s8)(var0 - actor->staticActorData->statusIconOffset.x); - actor->unk_195 = (s8)(var1 - actor->staticActorData->statusIconOffset.y); - actor->unk_196 = (s8)(var2 - actor->staticActorData->statusMessageOffset.x); - actor->unk_197 = (s8)(var3 - actor->staticActorData->statusMessageOffset.y); + actor->unk_194 = (s8)(var0 - actor->actorBlueprint->statusIconOffset.x); + actor->unk_195 = (s8)(var1 - actor->actorBlueprint->statusIconOffset.y); + actor->unk_196 = (s8)(var2 - actor->actorBlueprint->statusMessageOffset.x); + actor->unk_197 = (s8)(var3 - actor->actorBlueprint->statusMessageOffset.y); return ApiStatus_DONE2; } diff --git a/src/common/foliage.inc.c b/src/common/foliage.inc.c index d8f9d8f2ff..c56f87d5e1 100644 --- a/src/common/foliage.inc.c +++ b/src/common/foliage.inc.c @@ -2,7 +2,7 @@ #include "FoliageTransform.inc.c" -EvtSource N(searchBush) = { +EvtScript N(searchBush) = { EVT_USE_BUF(EVT_VAR(0)) EVT_BUF_READ4(EVT_VAR(1), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)) EVT_CALL(GetPlayerPos, EVT_VAR(5), EVT_VAR(15), EVT_VAR(7)) @@ -66,7 +66,7 @@ EvtSource N(searchBush) = { EVT_END }; -EvtSource N(shakeTree) = { +EvtScript N(shakeTree) = { EVT_SET_TIMESCALE(EVT_FIXED(2.0)) EVT_USE_BUF(EVT_VAR(0)) EVT_BUF_READ4(EVT_VAR(1), EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)) diff --git a/src/encounter_api.c b/src/encounter_api.c index e6cc8a117f..aaf9b05ef3 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -319,7 +319,7 @@ ApiStatus BindNpcAI(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; s32 id = evt_get_variable(script, *args++); - EvtSource* newScriptSource = (EvtSource*)evt_get_variable(script, *args++); + EvtScript* newScriptSource = (EvtScript*)evt_get_variable(script, *args++); Evt* scriptTemp = script; ApiStatus ret = ApiStatus_DONE2; Evt* aiScript; @@ -369,7 +369,7 @@ ApiStatus BindNpcIdle(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* owner = script->owner1.enemy; s32 npcID = evt_get_variable(script, *args++); - EvtSource* aiBytecode = (EvtSource*)evt_get_variable(script, *args); + EvtScript* aiBytecode = (EvtScript*)evt_get_variable(script, *args); if (npcID == NPC_SELF) { npcID = owner->npcID; @@ -442,7 +442,7 @@ ApiStatus SetNpcAux(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; s32 id = evt_get_variable(script, *args++); - EvtSource* newScriptSource = (EvtSource*)evt_get_variable(script, *args++); + EvtScript* newScriptSource = (EvtScript*)evt_get_variable(script, *args++); Evt* scriptTemp = script; ApiStatus ret = ApiStatus_DONE2; Evt* auxScript; @@ -487,7 +487,7 @@ ApiStatus BindNpcAux(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; s32 npcId = evt_get_variable(script, *args++); - EvtSource* auxBytecode = (EvtSource*)evt_get_variable(script, *args); + EvtScript* auxBytecode = (EvtScript*)evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -559,7 +559,7 @@ ApiStatus BindNpcInteract(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; s32 npcId = evt_get_variable(script, *args++); - EvtSource* interactBytecode = (EvtSource*)evt_get_variable(script, *args); + EvtScript* interactBytecode = (EvtScript*)evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -579,7 +579,7 @@ ApiStatus BindNpcHit(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; s32 npcId = evt_get_variable(script, *args++); - EvtSource* hitBytecode = (EvtSource*)evt_get_variable(script, *args); + EvtScript* hitBytecode = (EvtScript*)evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -599,7 +599,7 @@ ApiStatus BindNpcDefeat(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; s32 npcId = evt_get_variable(script, *args++); - EvtSource* defeatBytecode = (EvtSource*)evt_get_variable(script, *args); + EvtScript* defeatBytecode = (EvtScript*)evt_get_variable(script, *args); if (npcId == -1) { npcId = npc->npcID; diff --git a/src/entity/Block.c b/src/entity/Block.c index 076b2a0607..28e3bf5ecc 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -1,6 +1,8 @@ #include "common.h" #include "effects.h" +#define MULTICOIN_BLOCK_MAX_COINS 10 + void entity_base_block_setupGfx(s32 entityIndex) { Gfx* gfx = gMasterGfxPos; Entity* entity = get_entity_by_index(entityIndex); @@ -55,15 +57,15 @@ void entity_block_hit_animate_scale(Entity* entity) { INCLUDE_ASM(s32, "entity/Block", entity_base_block_update_slow_sinking); s32 entity_base_block_idle(Entity* entity) { - struct802E3650* temp = (struct802E3650*)entity->dataBuf; + BlockData* temp = entity->dataBuf.block; s32 ret = 0; if (is_block_on_ground(entity) != 0) { if (entity->flags & ENTITY_FLAGS_200000) { ret = 1; entity_base_block_update_slow_sinking(entity); - if (temp->unk_10 != -1) { - ItemEntity* itemEntity = get_item_entity(temp->unk_10); + if (temp->itemEntityIndex != -1) { + ItemEntity* itemEntity = get_item_entity(temp->itemEntityIndex); itemEntity->position.y = entity->position.y + 4.0f; } } @@ -73,83 +75,83 @@ s32 entity_base_block_idle(Entity* entity) { } void entity_base_block_init(Entity* entity) { - struct802E3650* temp = (struct802E3650*)entity->dataBuf; + BlockData* temp = entity->dataBuf.block; f32 posY; - temp->unk_10 = -1; - temp->unk_14 = entity->position.y; + temp->itemEntityIndex = -1; + temp->initialY = entity->position.y; temp->unk_0E = -1; entity->flags &= ~ENTITY_FLAGS_200000; } void entity_inactive_block_hit_init(Entity* entity) { - struct802E3650* temp = (struct802E3650*)entity->dataBuf; + BlockData* temp = entity->dataBuf.block; - temp->unk_18 = 90.0f; + temp->recoilInterpPhase = 90.0f; } void entity_inactive_block_hit_anim(Entity* entity) { f64 temp_f20; - struct802E3650* temp = (struct802E3650*)entity->dataBuf; + BlockData* temp = entity->dataBuf.block; entity_MulticoinBlock_update_timer(entity); temp_f20 = entity->position.y; - entity->position.y = temp_f20 + ((f64)sin_rad((temp->unk_18 * 6.28318f) / 360.0f) * 2); - temp->unk_18 += 60.0f; - if (temp->unk_18 > 450.0f) { - temp->unk_18 = clamp_angle(temp->unk_18); + entity->position.y = temp_f20 + ((f64)sin_rad((temp->recoilInterpPhase * 6.28318f) / 360.0f) * 2); + temp->recoilInterpPhase += 60.0f; + if (temp->recoilInterpPhase > 450.0f) { + temp->recoilInterpPhase = clamp_angle(temp->recoilInterpPhase); exec_entity_commandlist(entity); } } void entity_inactive_block_recoil_anim(Entity* entity) { - f64 temp_f20; - struct802E3650* temp = (struct802E3650*)entity->dataBuf; + f64 currentY; + BlockData* temp = entity->dataBuf.block; entity_MulticoinBlock_update_timer(entity); - temp_f20 = entity->position.y; - entity->position.y = temp_f20 + ((f64)sin_rad((temp->unk_18 * 6.28318f) / 360.0f)); - temp->unk_18 += 60.0f; - if (temp->unk_18 >= 360.0f) { - temp->unk_18 = 0.0f; - entity->position.y = temp->unk_14; + currentY = entity->position.y; + entity->position.y = currentY + ((f64)sin_rad((temp->recoilInterpPhase * 6.28318f) / 360.0f)); + temp->recoilInterpPhase += 60.0f; + if (temp->recoilInterpPhase >= 360.0f) { + temp->recoilInterpPhase = 0.0f; + entity->position.y = temp->initialY; exec_entity_commandlist(entity); } } void entity_MulticoinBlock_init(Entity* entity) { - struct802E3650* temp; + BlockData* temp; entity_base_block_init(entity); - temp = (struct802E3650*)entity->dataBuf; - temp->unk_04 = 0xA; - temp->unk_06 = 0x7B; - temp->unk_0A = 0xFFFF; + temp = entity->dataBuf.block; + temp->coinsLeft = MULTICOIN_BLOCK_MAX_COINS; + temp->timeLeft = 123; + temp->gameFlagIndex = 0xFFFF; } extern s32 D_802E9E54; -extern StaticEntityData D_802EA07C; +extern EntityBlueprint Entity_InertYellowBlock; void entity_MulticoinBlock_spawn_coin(Entity* entity) { - struct802E3650* temp = (struct802E3650*)entity->dataBuf; - s32 phi_v1; - s32 phi_v0; + BlockData* data = entity->dataBuf.block; + s32 itemSpawnMode; + s32 flagIndex; - if (temp->unk_04 > 0) { - if (temp->unk_04 == 10) { - phi_v1 = 21; - phi_v0 = temp->unk_0A; + if (data->coinsLeft > 0) { + if (data->coinsLeft == MULTICOIN_BLOCK_MAX_COINS) { + itemSpawnMode = ITEM_SPAWN_MODE_ITEM_BLOCK_COIN; + flagIndex = data->gameFlagIndex; } else { - phi_v1 = 20; - phi_v0 = 0; + itemSpawnMode = ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS; + flagIndex = 0; } - make_item_entity_nodelay(0x157, entity->position.x, entity->position.y + 28.0, entity->position.z, phi_v1, phi_v0); - temp->unk_04 -= 1; + make_item_entity_nodelay(ITEM_COIN, entity->position.x, entity->position.y + 28.0, entity->position.z, itemSpawnMode, flagIndex); + data->coinsLeft -= 1; } - if ((temp->unk_04 == 0) || (temp->unk_06 == 0)) { - temp->unk_03 = 1; - set_entity_commandlist(get_entity_by_index(create_entity(&D_802EA07C, entity->position.x, entity->position.y, + if ((data->coinsLeft == 0) || (data->timeLeft == 0)) { + data->empty = TRUE; + set_entity_commandlist(get_entity_by_index(create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000)), &D_802E9E54); entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); @@ -157,45 +159,40 @@ void entity_MulticoinBlock_spawn_coin(Entity* entity) { } void entity_MulticoinBlock_update_timer(Entity* entity) { - u16 temp_v0; - struct802E3650* temp = (struct802E3650*)entity->dataBuf; - s16 phi_return; + BlockData* data = entity->dataBuf.block; - if (entity->type == 0xE) { - if (temp->unk_04 != 0xA) { - temp->unk_06 -= 1; - if (temp->unk_06 < 0) { - temp->unk_06 = 0; - temp->unk_04 = 1; + if (entity->type == ENTITY_TYPE_MULTI_COIN_BRICK) { + if (data->coinsLeft != MULTICOIN_BLOCK_MAX_COINS) { + data->timeLeft -= 1; + if (data->timeLeft < 0) { + data->timeLeft = 0; + data->coinsLeft = 1; } } } } void entity_MulticoinBlock_idle(Entity* entity) { - s32 temp_v0; - struct802E3650* temp = (struct802E3650*)entity->dataBuf; + BlockData* data = entity->dataBuf.block; - if ((entity->collisionFlags & 0x80) != 0) { + if ((entity->collisionFlags & ENTITY_COLLISION_FLAGS_80) != 0) { exec_entity_commandlist(entity); return; } entity_MulticoinBlock_update_timer(entity); entity_base_block_idle(entity); - if (temp->unk_03 != 0) { - create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + if (data->empty) { + create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } void entity_MulticoinBlock_check_if_inactive(Entity* entity) { - s32 temp_v0; - u16 temp_v1; - struct802E3650* temp = entity->dataBuf; + BlockData* data = entity->dataBuf.block; - if (temp->unk_0A != 0xFFFF) { - if (get_global_flag(temp->unk_0A) != 0) { - create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + if (data->gameFlagIndex != 0xFFFF) { + if (get_global_flag(data->gameFlagIndex) != 0) { + create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } @@ -328,11 +325,11 @@ void entity_init_Hammer1Block_normal(Entity* entity) { s32 entity_init_HammerBlock_small(Entity* entity) { s32 temp_v0; - struct802E3650* temp = entity->dataBuf; + BlockData* data = entity->dataBuf.block; - temp->unk_10 = -1; - temp->unk_14 = entity->position.y; - temp->unk_0E = -1; + data->itemEntityIndex = -1; + data->initialY = entity->position.y; + data->unk_0E = -1; entity->flags &= ~ENTITY_FLAGS_200000; entity->scale.x = 0.5f; entity->scale.y = 0.5f; diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index 05bb842a74..3876d9814d 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -2,53 +2,43 @@ #include "npc.h" #include "sprite.h" -typedef struct struct802E89B0 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s32 unk_08; - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; - /* 0x18 */ f32 unk_18; -} struct802E89B0; - void entity_BlueWarpPipe_setupGfx(); void entity_BlueWarpPipe_check_if_active(Entity* entity) { - struct802E89B0* temp_s0; + BlueWarpPipeData* pipeData; - temp_s0 = entity->dataBuf; - if (get_global_flag(temp_s0->unk_14)) { - temp_s0->unk_04 = 0x10; + pipeData = entity->dataBuf.bluePipe; + if (get_global_flag(pipeData->flagIndex)) { + pipeData->timer = 16; exec_entity_commandlist(entity); } } void entity_BlueWarpPipe_rise_up(Entity* entity) { - struct802E89B0* temp = entity->dataBuf; + BlueWarpPipeData* pipeData = entity->dataBuf.bluePipe; - temp->unk_04--; - if ((temp->unk_04 != -1) && (temp->unk_08 == 0)) { + pipeData->timer--; + if ((pipeData->timer != -1) && (pipeData->isRaised == 0)) { entity->position.y += 2.3125; } else { - temp->unk_04 = 0; + pipeData->timer = 0; exec_entity_commandlist(entity); } } void entity_BlueWarpPipe_wait_for_player_to_get_off(Entity* entity) { - struct802E89B0* temp = entity->dataBuf; + BlueWarpPipeData* pipeData = entity->dataBuf.bluePipe; - if (temp->unk_0C == gGameStatusPtr->entryID) { - switch (temp->unk_04) { + if (pipeData->entryID == gGameStatusPtr->entryID) { + switch (pipeData->timer) { case 0: if (gCollisionStatus.currentFloor > 0) { - temp->unk_04 = 1; + pipeData->timer = 1; } break; case 1: if (gCollisionStatus.currentFloor < 0) { - temp->unk_04 = 2; + pipeData->timer = 2; } break; default: @@ -63,77 +53,77 @@ void entity_BlueWarpPipe_wait_for_player_to_get_off(Entity* entity) { void entity_BlueWarpPipe_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - if ((entity->collisionFlags & 1) != 0) { - gOverrideFlags |= 0x40; + if ((entity->collisionFlags & ENTITY_COLLISION_FLAGS_1) != 0) { + gOverrideFlags |= GLOBAL_OVERRIDES_40; - if (!(playerStatus->flags & 0x3000)) { - s32 stickAxis0 = abs(playerStatus->stickAxis[0]); - s32 stickAxis1 = playerStatus->stickAxis[1]; + if (!(playerStatus->flags & (PLAYER_STATUS_FLAGS_1000 | PLAYER_STATUS_FLAGS_INPUT_DISABLED))) { + s32 stickAxisX = abs(playerStatus->stickAxis[0]); + s32 stickAxisZ = playerStatus->stickAxis[1]; - if ((stickAxis0 != 0) || (stickAxis1 != 0)) { - if (atan2(0.0f, 0.0f, stickAxis0, stickAxis1) < 60.0f) { + if ((stickAxisX != 0) || (stickAxisZ != 0)) { + if (atan2(0.0f, 0.0f, stickAxisX, stickAxisZ) < 60.0f) { exec_entity_commandlist(entity); } } } } else { - gOverrideFlags &= ~0x40; + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; } } void entity_BlueWarpPipe_set_player_move_to_center(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - struct802E89B0* temp = entity->dataBuf; + BlueWarpPipeData* pipeData = entity->dataBuf.bluePipe; MapConfig* mapConfig = get_current_map_header(); - f32 temp_f20; + f32 angle; f32 entryX; f32 entryZ; - entryX = (*mapConfig->entryList)[temp->unk_0C].x; - entryZ = (*mapConfig->entryList)[temp->unk_0C].z; - temp->unk_04 = get_xz_dist_to_player(entryX, entryZ) / playerStatus->runSpeed; - if (temp->unk_04 == 0) { - temp->unk_04 = 1; + entryX = (*mapConfig->entryList)[pipeData->entryID].x; + entryZ = (*mapConfig->entryList)[pipeData->entryID].z; + pipeData->timer = get_xz_dist_to_player(entryX, entryZ) / playerStatus->runSpeed; + if (pipeData->timer == 0) { + pipeData->timer = 1; } - entryX = (*mapConfig->entryList)[temp->unk_0C].x; - entryZ = (*mapConfig->entryList)[temp->unk_0C].z; - temp_f20 = atan2(playerStatus->position.x, playerStatus->position.z, entryX, entryZ); + entryX = (*mapConfig->entryList)[pipeData->entryID].x; + entryZ = (*mapConfig->entryList)[pipeData->entryID].z; + angle = atan2(playerStatus->position.x, playerStatus->position.z, entryX, entryZ); disable_player_input(); disable_player_static_collisions(); - move_player(temp->unk_04, temp_f20, playerStatus->runSpeed); + move_player(pipeData->timer, angle, playerStatus->runSpeed); } void entity_BlueWarpPipe_wait_player_move_to_center(Entity* entity) { - Trigger* trigger = (Trigger*)entity->dataBuf; // TODO: is Trigger correct? + BlueWarpPipeData* pipeData = entity->dataBuf.bluePipe; - if (--trigger->params1 == -1) { + if (--pipeData->timer == -1) { exec_entity_commandlist(entity); } } void entity_BlueWarpPipe_enter_pipe_init(Entity* bluePipe) { PlayerStatus* playerStatus = &gPlayerStatus; - Trigger* pipeTrigger = (Trigger*)bluePipe->dataBuf; // TODO: is Trigger correct? + BlueWarpPipeData* pipeData = bluePipe->dataBuf.bluePipe; playerStatus->targetYaw = gCameras[gCurrentCameraID].currentYaw + 180.0f; - pipeTrigger->params1 = 0x19; - playerStatus->renderMode = 0xD; + pipeData->timer = 25; + playerStatus->renderMode = RENDER_MODE_ALPHATEST; func_802DDFF8(0x10002, 5, 2, 1, 1, 0, 0); - sfx_play_sound(0x163); + sfx_play_sound(SOUND_ENTER_PIPE); disable_player_shadow(); } void entity_BlueWarpPipe_enter_pipe_update(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - Trigger* entityTrigger = (Trigger*)entity->dataBuf; // TODO: is Trigger correct? + BlueWarpPipeData* pipeData = entity->dataBuf.bluePipe; playerStatus->position.y--; - entityTrigger->params1--; + pipeData->timer--; - if (entityTrigger->params1 == -1) { - playerStatus->renderMode = 0xD; + if (pipeData->timer == -1) { + playerStatus->renderMode = RENDER_MODE_ALPHATEST; playerStatus->position.y -= 50.0f; func_802DDFF8(0x10002, 0, 0, 0, 0, 0, 0); exec_entity_commandlist(entity); @@ -141,9 +131,9 @@ void entity_BlueWarpPipe_enter_pipe_update(Entity* entity) { } void entity_BlueWarpPipe_start_bound_script(Entity* entity) { - Bytecode* triggerScriptStart = ((Trigger*)entity->dataBuf)->scriptSource; + Bytecode* triggerScriptStart = entity->dataBuf.bluePipe->onEnterPipeEvt; - gOverrideFlags &= ~0x40; + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; entity->boundScriptBytecode = triggerScriptStart; entity_start_script(entity); } @@ -151,23 +141,23 @@ void entity_BlueWarpPipe_start_bound_script(Entity* entity) { INCLUDE_ASM(s32, "entity/BlueWarpPipe", entity_BlueWarpPipe_setupGfx); f32 entity_init_BlueWarpPipe(Entity* entity) { - struct802E89B0* temp_s0; - s32* temp = &D_8015C7D0; - s32 temp2; - s32 temp3; - s32 temp4; - f32* temp5; + BlueWarpPipeData* data; + s32* args = &CreateEntityVarArgBuffer; + s32 entryID; + s32 enterPipeEvt; + s32 flagIndex; + f32* outPosY; - temp2 = temp[0]; - temp3 = temp[1]; - temp4 = temp[2]; + entryID = args[0]; + enterPipeEvt = args[1]; + flagIndex = args[2]; entity->renderSetupFunc = &entity_BlueWarpPipe_setupGfx; - temp_s0 = entity->dataBuf; - temp5 = &entity->position.y; // required... wtf - temp_s0->unk_0C = temp2; - temp_s0->unk_10 = temp3; - temp_s0->unk_14 = temp4; - temp_s0->unk_18 = entity->position.y; - temp_s0->unk_08 = get_global_flag(temp_s0->unk_14); - *temp5 = entity->position.y - (temp_s0->unk_08 ? 15.0 : 52.0); + data = entity->dataBuf.bluePipe; + outPosY = &entity->position.y; // required... wtf + data->entryID = entryID; + data->onEnterPipeEvt = enterPipeEvt; + data->flagIndex = flagIndex; + data->finalPosY = entity->position.y; + data->isRaised = get_global_flag(data->flagIndex); + *outPosY = entity->position.y - (data->isRaised ? 15.0 : 52.0); } diff --git a/src/entity/Chest.c b/src/entity/Chest.c index 55459716c8..6225643e4f 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -3,28 +3,7 @@ void entity_Chest_open(Entity* entity); -// size unknown -typedef struct Chest { - /* 0x00 */ u16 unk_00; - /* 0x02 */ s16 unk_02; - /* 0x04 */ u8 unk_04; - /* 0x04 */ s8 unk_05; - /* 0x06 */ s8 unk_06; - /* 0x07 */ u8 unk_07; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ s8 unk_30; - /* 0x31 */ char unk_31[3]; - /* 0x34 */ s32 unk_34; -} Chest; +#define CHEST_POST_ANIM_DELAY_TIME 10 extern s32 D_802EAD7C; // requires data migration @@ -61,11 +40,11 @@ s32 entity_Chest_setupGfx(void); INCLUDE_ASM(s32, "entity/Chest", entity_Chest_setupGfx); void entity_Chest_check_opened(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; - if ((data->unk_00 != 0xFFFF) && (get_global_flag(data->unk_00) != 0)) { + ChestData* data = entity->dataBuf.chest; + if ((data->gameFlagIndex != 0xFFFF) && (get_global_flag(data->gameFlagIndex) != 0)) { entity->flags |= ENTITY_FLAGS_4000; - data->unk_10 = -1; - data->unk_08 = -28.7f; + data->itemID = -1; + data->lidAngle = -28.7f; set_entity_commandlist(entity, &D_802EAD7C); } } @@ -73,21 +52,21 @@ void entity_Chest_check_opened(Entity* entity) { void entity_Chest_idle(Entity* entity) { f32 rotation; f32 angle; // angle from the Chest to the Player - Chest* data; + ChestData* data; PlayerStatus* playerStatus = &gPlayerStatus; rotation = clamp_angle(180.0f - entity->rotation.y); angle = fabsf(rotation - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); - if ((!(playerStatus->animFlags & 1)) && - (!(entity->collisionFlags & 1)) && + if ((!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT)) && + (!(entity->collisionFlags & ENTITY_COLLISION_FLAGS_1)) && ((angle <= 40.0f) || (angle >= 320.0f))) { entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - if ((playerStatus->animFlags & 0x10) && (entity->collisionFlags & 8)) { + if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_FLAGS_8)) { exec_entity_commandlist(entity); - data = (Chest*)entity->dataBuf; - data->unk_04 = 0; + data = entity->dataBuf.chest; + data->state = 0; entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - if (data->unk_10 != 0) { + if (data->itemID != 0) { disable_player_input(); } func_800EF3E4(); @@ -98,48 +77,48 @@ void entity_Chest_idle(Entity* entity) { } void entity_Chest_begin_opening(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; - data->unk_06 = 10; - data->unk_08 = 0; + ChestData* data = entity->dataBuf.chest; + data->postLidAnimDelay = CHEST_POST_ANIM_DELAY_TIME; + data->lidAngle = 0.0f; data->unk_05 = 0; - data->unk_02 = 40; + data->giveItemTimer = 40; sfx_play_sound(467); } INCLUDE_ASM(s32, "entity/Chest", entity_Chest_open); void entity_Chest_close(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; + ChestData* data = entity->dataBuf.chest; f32 delta; - switch (data->unk_04) { + switch (data->state) { case 0: - data->unk_0C = 0.0f; - data->unk_04++; + data->lidAnimInterpPhase = 0.0f; + data->state++; // fallthrough case 1: - data->unk_0C += 5.0f; - if (data->unk_0C >= 180.0f) { - data->unk_0C = 180.0f; - data->unk_04++; + data->lidAnimInterpPhase += 5.0f; + if (data->lidAnimInterpPhase >= 180.0f) { + data->lidAnimInterpPhase = 180.0f; + data->state++; } - delta = 2.6f * sin_rad(data->unk_0C * TAU / 360.0f); - data->unk_08 += delta; + delta = 2.6f * sin_rad(data->lidAnimInterpPhase * TAU / 360.0f); + data->lidAngle += delta; break; case 2: - data->unk_0C += 1.0f; - if (data->unk_0C >= 185.0f) { - data->unk_0C = 185.0f; - data->unk_06 = 10; - data->unk_04++; + data->lidAnimInterpPhase += 1.0f; + if (data->lidAnimInterpPhase >= 185.0f) { + data->lidAnimInterpPhase = 185.0f; + data->postLidAnimDelay = CHEST_POST_ANIM_DELAY_TIME; + data->state++; } - delta = 2.0f * sin_rad(data->unk_0C * TAU / 360.0f); - data->unk_08 += delta; + delta = 2.0f * sin_rad(data->lidAnimInterpPhase * TAU / 360.0f); + data->lidAngle += delta; break; case 3: - data->unk_06--; - if (data->unk_06 == 0) { - data->unk_04++; + data->postLidAnimDelay--; + if (data->postLidAnimDelay == 0) { + data->state++; entity->flags |= ENTITY_FLAGS_4000; } break; @@ -152,104 +131,105 @@ INCLUDE_ASM(s32, "entity/Chest", entity_GiantChest_hide_effect); void entity_GiantChest_open(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - Chest* chest = (Chest*)entity->dataBuf; - f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp18; + ChestData* chest = entity->dataBuf.chest; + f32 cosFwd; + f32 sinFwd; + f32 cosRight; + f32 sinRight; f32 theta; - f32 delta; - f32 zero; - f32 temp_f4; - f32 four; + f32 giveItemLerpAlpha; + f32 horizontalOffset; + f32 dy; + f32 depthOffset; f32 intermediateTheta; - f32 phi_f22; + f32 radius; - if (chest->unk_10 != 0) { - set_item_entity_position(chest->unk_14, chest->unk_18, chest->unk_1C, chest->unk_20); + if (chest->itemID != 0) { + set_item_entity_position(chest->itemEntityIndex, chest->itemEntityPos.x, chest->itemEntityPos.y, chest->itemEntityPos.z); } entity_Chest_open(entity); - switch (chest->unk_04) { + switch (chest->state) { case 0: - chest->unk_02--; - if (chest->unk_02 == 0) { - chest->unk_24 = 0.0f; - chest->unk_04++; - chest->unk_28 = 20.0f; - chest->unk_2C = 8.0f; + chest->giveItemTimer--; + if (chest->giveItemTimer == 0) { + chest->giveItemRadiusInterpPhase = 0.0f; + chest->state++; + chest->giveItemHeightInterpPhase = 20.0f; + chest->itemVelY = 8.0f; } break; case 1: - chest->unk_1C += chest->unk_2C; - chest->unk_2C -= 0.7; - if (chest->unk_2C <= 2.0f) { - chest->unk_2C = 6.0f; - chest->unk_04++; + chest->itemEntityPos.y += chest->itemVelY; + chest->itemVelY -= 0.7; + if (chest->itemVelY <= 2.0f) { + chest->itemVelY = 6.0f; + chest->state++; } break; case 2: - if (chest->unk_28 < 140.0f) { - chest->unk_1C += cos_rad(chest->unk_28 * TAU / 360.0f) * 3.0f; + if (chest->giveItemHeightInterpPhase < 140.0f) { + chest->itemEntityPos.y += cos_rad(chest->giveItemHeightInterpPhase * TAU / 360.0f) * 3.0f; } else { - temp_f4 = (chest->unk_1C - playerStatus->position.y - 30.0f) * 0.25f; - if (temp_f4 <= 0.4) { - temp_f4 = 0.4f; + dy = (chest->itemEntityPos.y - playerStatus->position.y - 30.0f) * 0.25f; + if (dy <= 0.4) { + dy = 0.4f; } - chest->unk_1C -= temp_f4; + chest->itemEntityPos.y -= dy; } - delta = sin_rad(chest->unk_24 * TAU / 360.0f); - theta = intermediateTheta = clamp_angle(atan2(entity->position.x, entity->position.z, - playerStatus->position.x, playerStatus->position.z)); + giveItemLerpAlpha = sin_rad(chest->giveItemRadiusInterpPhase * TAU / 360.0f); + theta = intermediateTheta = clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z)); - if (gGameStatusPtr->areaID == 0x12) { - phi_f22 = 3.0f; + if (gGameStatusPtr->areaID == AREA_KZN) { + radius = 3.0f; } else { - phi_f22 = 4.0f; + radius = 4.0f; } theta *= TAU; theta = theta / 360.0f; - chest->unk_18 += (phi_f22 * sin_rad(theta) * delta); - chest->unk_20 -= (phi_f22 * cos_rad(theta) * delta); - chest->unk_24 += 8.0f; - if (chest->unk_24 >= 180.0f) { - chest->unk_24 = 180.0f; + chest->itemEntityPos.x += (radius * sin_rad(theta) * giveItemLerpAlpha); + chest->itemEntityPos.z -= (radius * cos_rad(theta) * giveItemLerpAlpha); + chest->giveItemRadiusInterpPhase += 8.0f; + if (chest->giveItemRadiusInterpPhase >= 180.0f) { + chest->giveItemRadiusInterpPhase = 180.0f; } - chest->unk_28 += 13.0f; - if (chest->unk_28 >= 180.0f){ - chest->unk_02 = 7; - chest->unk_28 = 180.0f; - chest->unk_04++; - if (chest->unk_10 != 0) { + chest->giveItemHeightInterpPhase += 13.0f; + if (chest->giveItemHeightInterpPhase >= 180.0f){ + chest->giveItemTimer = 7; + chest->giveItemHeightInterpPhase = 180.0f; + chest->state++; + if (chest->itemID != 0) { suggest_player_anim_setUnkFlag(0x6000C); - sin_cos_rad((90.0f - gCameras->currentYaw) * TAU / 360.0f, &sp18, &sp1C); - sin_cos_rad((180.0f - gCameras->currentYaw) * TAU / 360.0f, &sp20, &sp24); - zero = 0.0f; - four = 4.0f; - playFX_33(0, chest->unk_18 + zero * sp18 - sp20 * four, - chest->unk_1C + 12.0f, chest->unk_20 - sp1C * zero + sp24 * four, 1.0f, 0x64); - playFX_1B(0, chest->unk_18 + zero * sp18 - sp20 * four, - chest->unk_1C + 12.0f, chest->unk_20 - sp1C * zero + sp24 * four, 1.0f, &chest->unk_34); + sin_cos_rad((90.0f - gCameras->currentYaw) * TAU / 360.0f, &sinRight, &cosRight); + sin_cos_rad((180.0f - gCameras->currentYaw) * TAU / 360.0f, &sinFwd, &cosFwd); + horizontalOffset = 0.0f; + depthOffset = 4.0f; + //RadialFlowOut + playFX_33(0, chest->itemEntityPos.x + horizontalOffset * sinRight - depthOffset * sinFwd, + chest->itemEntityPos.y + 12.0f, chest->itemEntityPos.z - cosRight * horizontalOffset + cosFwd * depthOffset, 1.0f, 0x64); + //GotItemOutline + playFX_1B(0, chest->itemEntityPos.x + horizontalOffset * sinRight - sinFwd * depthOffset, + chest->itemEntityPos.y + 12.0f, chest->itemEntityPos.z - cosRight * horizontalOffset + cosFwd * depthOffset, 1.0f, &chest->gotItemEffect); } } break; case 3: - chest->unk_02--; - if (chest->unk_02 == 0) { + chest->giveItemTimer--; + if (chest->giveItemTimer == 0) { exec_entity_commandlist(entity); - chest->unk_04 = 0; + chest->state = 0; } break; } } void entity_GiantChest_give_equipment(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; + ChestData* data = entity->dataBuf.chest; f32 angle; s32 flag; - switch (data->unk_10) { + switch (data->itemID) { case 1: gPlayerData.bootsLevel = 0; break; @@ -270,15 +250,15 @@ void entity_GiantChest_give_equipment(Entity* entity) { break; } - if (data->unk_10 != 0) { + if (data->itemID != 0) { angle = (entity->rotation.y * TAU) / 360.0f; - data->unk_18 = entity->position.x + (sin_rad(angle) * 10.0f); - data->unk_1C = entity->position.y; - data->unk_20 = entity->position.z + (cos_rad(angle) * 10.0f); - data->unk_14 = make_item_entity_nodelay(data->unk_10, data->unk_18, data->unk_1C, data->unk_20, 1, -1); + data->itemEntityPos.x = entity->position.x + (sin_rad(angle) * 10.0f); + data->itemEntityPos.y = entity->position.y; + data->itemEntityPos.z = entity->position.z + (cos_rad(angle) * 10.0f); + data->itemEntityIndex = make_item_entity_nodelay(data->itemID, data->itemEntityPos.x, data->itemEntityPos.y, data->itemEntityPos.z, 1, -1); } - flag = data->unk_00; + flag = data->gameFlagIndex; if (flag <= EVT_SAVE_FLAG(10000000)) { flag += 130000000; } @@ -290,21 +270,21 @@ void entity_Chest_start_bound_script(Entity* entity) { } void entity_Chest_enable_player_input(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; - if (data->unk_10 != 0) { + ChestData* data = entity->dataBuf.chest; + if (data->itemID != 0) { enable_player_input(); } } void entity_GiantChest_await_got_item(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; - if (data->unk_10 != 0) { + ChestData* data = entity->dataBuf.chest; + if (data->itemID != 0) { if (data->unk_30 != 0) { exec_entity_commandlist(entity); - remove_item_entity_by_index(data->unk_14); + remove_item_entity_by_index(data->itemEntityIndex); suggest_player_anim_clearUnkFlag(0x10002); enable_player_input(); - data->unk_10 = -1; + data->itemID = -1; } return; } @@ -312,14 +292,14 @@ void entity_GiantChest_await_got_item(Entity* entity) { } void entity_Chest_clear_item_id(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; - data->unk_10 = -1; + ChestData* data = entity->dataBuf.chest; + data->itemID = -1; } void entity_Chest_readargs(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; - data->unk_10 = *D_8015C7D0; - data->unk_00 = 0xFFFF; + ChestData* data = entity->dataBuf.chest; + data->itemID = *CreateEntityVarArgBuffer; + data->gameFlagIndex = 0xFFFF; } void entity_GiantChest_init(Entity* entity) { @@ -328,7 +308,7 @@ void entity_GiantChest_init(Entity* entity) { } void entity_Chest_init(Entity* entity) { - Chest* data = (Chest*)entity->dataBuf; + ChestData* data = entity->dataBuf.chest; data->unk_07 = 1; entity_Chest_readargs(entity); entity->renderSetupFunc = &entity_Chest_setupGfx; diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index 9bc88bd1b2..0d9807e23b 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -3,11 +3,11 @@ extern u32* D_802EA728; extern u32* D_802EA760; -extern StaticEntityData D_802EA7BC; +extern EntityBlueprint Entity_HeartBlockContent; extern UNK_TYPE D_802EB3C0; extern s32 D_802EA744; // -f32 entity_HeartBlockContent_get_previous_yaw(struct802E4B10* data, s32 arg1) { +f32 entity_HeartBlockContent_get_previous_yaw(SuperBlockContentData* data, s32 arg1) { s32 temp = data->unk_24 - arg1; if (temp < 0) { temp += 10; @@ -22,8 +22,8 @@ void entity_HeartBlockContent_setupGfx(s32 entityIndex) { } void entity_HeartBlockContent_set_initial_pos(Entity* entity) { - struct802E4B10* temp = (struct802E4B10*)entity->dataBuf; - Entity* entityTemp = get_entity_by_index(temp->unk_00); + SuperBlockContentData* temp = entity->dataBuf.superBlockContent; + Entity* entityTemp = get_entity_by_index(temp->parentEntityIndex); entity->position.x = entityTemp->position.x; entity->position.y = entityTemp->position.y + 14.0f; @@ -31,26 +31,26 @@ void entity_HeartBlockContent_set_initial_pos(Entity* entity) { } void entity_HeartBlockContent__reset(Entity* entity) { - struct802E4B10* temp_s0; + SuperBlockContentData* data; Entity* someEntity; entity->renderSetupFunc = entity_HeartBlockContent_setupGfx; entity->alpha = 255; - temp_s0 = (struct802E4B10*)entity->dataBuf; + data = entity->dataBuf.superBlockContent; entity->flags |= ENTITY_FLAGS_ALWAYS_FACE_CAMERA; - someEntity = get_entity_by_index(temp_s0->unk_00); + someEntity = get_entity_by_index(data->parentEntityIndex); - if (temp_s0->unk_09 == 0) { - temp_s0->unk_09 = 1; - temp_s0->unk_01 = 2; + if (data->unk_09 == 0) { + data->unk_09 = 1; + data->unk_01 = 2; entity->scale.x = 1.0f; } else { - temp_s0->unk_01 = 0; + data->unk_01 = 0; entity->scale.x = 0.0f; } - temp_s0->unk_0C = 0; - temp_s0->unk_10 = 0; + data->unk_0C = 0; + data->unk_10 = 0; entity->rotation.x = 0.0f; entity->rotation.y = 0.0f; entity->rotation.z = 0.0f; @@ -61,14 +61,14 @@ void entity_HeartBlockContent__reset(Entity* entity) { } void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { - struct802E4B10* temp = (struct802E4B10*)entity->dataBuf; - switch (temp->unk_01) { + SuperBlockContentData* data = entity->dataBuf.superBlockContent; + switch (data->unk_01) { case 0: entity->scale.x = 0.0f; entity->scale.y = 0.0f; entity->scale.z = 0.0f; if (arg1 == 0) { - temp->unk_01++; + data->unk_01++; break; } return; @@ -76,29 +76,29 @@ void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { entity->scale.x += 0.01; if (entity->scale.x >= 1.0) { entity->scale.x = 1.0f; - temp->unk_02 = 0; - temp->unk_01++; + data->unk_02 = 0; + data->unk_01++; } entity->scale.z = entity->scale.x; entity->scale.y = entity->scale.x; break; case 2: entity_HeartBlockContent_set_initial_pos(entity); - temp->unk_01++; + data->unk_01++; // fallthrough case 3: if (gOverrideFlags == 0) { // create an effect every 50 frames - temp->unk_02--; - if (temp->unk_02 <= 0) { - temp->unk_02 = 50; - playFX_22(temp->unk_0A, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20); + data->unk_02--; + if (data->unk_02 <= 0) { + data->unk_02 = 50; + playFX_22(data->unk_0A, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20); } } break; } - if (entity_can_collide_with_jumping_player(get_entity_by_index(temp->unk_00))) { + if (entity_can_collide_with_jumping_player(get_entity_by_index(data->parentEntityIndex))) { exec_entity_commandlist(entity); disable_player_input(); gPlayerStatus.currentSpeed = 0; @@ -109,7 +109,7 @@ void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { } void func_802E4DE0(Entity* entity) { - struct802E4B10* temp = (struct802E4B10*)entity->dataBuf; + SuperBlockContentData* temp = entity->dataBuf.superBlockContent; temp->unk_01 = 0; entity->scale.x = 1.0f; @@ -120,7 +120,7 @@ void func_802E4DE0(Entity* entity) { void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { PlayerStatus* playerStatus = &gPlayerStatus; - struct802E4B10* data = (struct802E4B10*)entity->dataBuf; + SuperBlockContentData* data = entity->dataBuf.superBlockContent; f32 offsetX, offsetY, offsetZ; switch (data->unk_01) { @@ -280,16 +280,16 @@ void entity_HeartBlock_wait_for_close_tutorial(Entity* entity) { } } -s8 entity_HeartBlock_create_child_entity(Entity* entity, StaticEntityData* data) { - s32 temp_s2 = D_8015C7D0[0]; +s8 entity_HeartBlock_create_child_entity(Entity* entity, EntityBlueprint* data) { + s32 temp_s2 = CreateEntityVarArgBuffer[0]; Entity* someEntity; - struct802E4B10* temp_v1; + SuperBlockContentData* temp_v1; entity_base_block_init(entity); someEntity = get_entity_by_index(create_entity(data, entity->position.x, entity->position.y, entity->position.z, 0.0f, 0x80000000)); - temp_v1 = (struct802E4B10*)someEntity->dataBuf; - temp_v1->unk_00 = entity->listIndex; + temp_v1 = someEntity->dataBuf.superBlockContent; + temp_v1->parentEntityIndex = entity->listIndex; if (temp_s2 == 0) { temp_v1->unk_0A = 3; @@ -299,5 +299,5 @@ s8 entity_HeartBlock_create_child_entity(Entity* entity, StaticEntityData* data) } void entity_HeartBlock_init(Entity* entity) { - entity_HeartBlock_create_child_entity(entity, &D_802EA7BC); + entity_HeartBlock_create_child_entity(entity, &Entity_HeartBlockContent); } diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index a90f0b6eb5..22cd132828 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -1,14 +1,6 @@ #include "common.h" #include "effects.h" -typedef struct struct802E3F0C { - /* 0x00 */ char unk_00[10]; - /* 0x0A */ u16 unk_A; - /* 0x0C */ char unk_C[4]; - /* 0x10 */ s16 unk_10; - /* 0x12 */ s16 unk_12; -} struct802E3F0C; - void entity_ItemBlock_idle(Entity* entity) { entity_base_block_idle(entity); } @@ -40,13 +32,13 @@ void entity_TriggerBlock_start_bound_script_2(Entity* entity) { } void entity_TriggerBlock_play_vanish_effect(Entity* entity) { - D_802EB3B0 = playFX_6F(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C); + TriggerBlockVanishEffect = playFX_6F(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C); } void entity_HitItemBlock_play_anim(Entity* entity) { s32 entityType = get_entity_type(entity->listIndex); - if (entityType == 0x12 || entityType == 0x14) { + if (entityType == ENTITY_TYPE_HIDDEN_RED_BLOCK || entityType == ENTITY_TYPE_RED_BLOCK) { play_model_animation(entity->virtualModelIndex, &D_00000094); } else { play_model_animation(entity->virtualModelIndex, &D_00000094_2); @@ -54,26 +46,26 @@ void entity_HitItemBlock_play_anim(Entity* entity) { } void entity_HitItemBlock_show_inactive(Entity* entity) { - Entity* someEntity; // TODO: better var name - Shadow* someShadow; // TODO: better var name - struct802E3F0C* temp = entity->dataBuf; + Entity* inertEntity; + Shadow* inertShadow; + ItemBlockData* data = entity->dataBuf.itemBlock; - someEntity = get_entity_by_index(temp->unk_12); - someEntity->flags &= ~ENTITY_FLAGS_HIDDEN; - someShadow = get_shadow_by_index(someEntity->shadowIndex); - someShadow->flags &= ~SHADOW_FLAGS_HIDDEN; + inertEntity = get_entity_by_index(data->childEntityIndex); + inertEntity->flags &= ~ENTITY_FLAGS_HIDDEN; + inertShadow = get_shadow_by_index(inertEntity->shadowIndex); + inertShadow->flags &= ~SHADOW_FLAGS_HIDDEN; } void entity_ItemBlock_check_if_inactive(Entity* entity) { - struct802E3F0C* temp = entity->dataBuf; + ItemBlockData* data = entity->dataBuf.itemBlock; - if ((temp->unk_A != 0xFFFF) && get_global_flag(temp->unk_A)) { + if ((data->gameFlagIndex != 0xFFFF) && get_global_flag(data->gameFlagIndex)) { UNK_PTR phi_a0; - if (get_entity_type(entity->listIndex) != 0x14) { - phi_a0 = &D_802EA07C; + if (get_entity_type(entity->listIndex) != ENTITY_TYPE_RED_BLOCK) { + phi_a0 = &Entity_InertYellowBlock; } else { - phi_a0 = &D_802EA0A0; + phi_a0 = &Entity_InertRedBlock; } create_entity(phi_a0, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); set_entity_commandlist(entity, &D_802EA310); @@ -82,26 +74,29 @@ void entity_ItemBlock_check_if_inactive(Entity* entity) { } } +// when an item block is hit, it spawns two subsidiary entities: a dummy item block which performs a 'hit' animation +// followed by an inert version of the block. void entity_ItemBlock_replace_with_inactive(Entity* entity) { s32 entityType = get_entity_type(entity->listIndex); - UNK_PTR entityData = &D_802EA07C; + EntityBlueprint* entityBlueprint = &Entity_InertYellowBlock; s32 childEntityIndex; s32 isBlockOnGround; s32 parentEntityType; - struct802E3F0C* temp; + ItemBlockData* temp; Entity* childEntity; Shadow* shadow; - if (entityType < 0x15) { - entityData = &D_802EA07C; - if (entityType >= 0x12) { - entityData = &D_802EA0A0; + if (entityType < ENTITY_TYPE_HAMMER1_BLOCK) { + entityBlueprint = &Entity_InertYellowBlock; + if (entityType >= ENTITY_TYPE_HIDDEN_RED_BLOCK) { + entityBlueprint = &Entity_InertRedBlock; } } - childEntityIndex = create_entity(entityData, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); + // this child entity is the inert block + childEntityIndex = create_entity(entityBlueprint, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); childEntity = get_entity_by_index(childEntityIndex); - childEntity->flags |= 1; + childEntity->flags |= ENTITY_FLAGS_HIDDEN; if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; @@ -117,14 +112,15 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { parentEntityType = get_entity_type(entity->listIndex); if (parentEntityType == ENTITY_TYPE_HIDDEN_RED_BLOCK || parentEntityType == ENTITY_TYPE_RED_BLOCK) { - entityData = &Entity_HitRedBlock; + entityBlueprint = &Entity_HitRedBlock; } else if (isBlockOnGround != 0) { - entityData = &Entity_HitGroundedYellowBlock; + entityBlueprint = &Entity_HitGroundedYellowBlock; } else { - entityData = &Entity_HitFloatingYellowBlock; + entityBlueprint = &Entity_HitFloatingYellowBlock; } - childEntity = get_entity_by_index(create_entity(entityData, entity->position.x, entity->position.y, entity->position.z, - entity->rotation.y, 0x80000000)); + + // child entity is now the animated block which appears before it turns inert + childEntity = get_entity_by_index(create_entity(entityBlueprint, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000)); childEntity->alpha = entity->alpha; if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 0xFF)) { childEntity->alpha = 0x20; @@ -134,8 +130,8 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; } - temp = childEntity->dataBuf; - temp->unk_12 = childEntityIndex; + temp = childEntity->dataBuf.unk; + temp->childEntityIndex = childEntityIndex; if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { childEntity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; @@ -151,7 +147,7 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { void entity_HitItemBlock_hide(Entity* entity) { entity->flags |= ENTITY_FLAGS_HIDDEN; entity->flags &= ~ENTITY_FLAGS_100; - get_shadow_by_index(entity->shadowIndex)->flags |= 0x10000001; + get_shadow_by_index(entity->shadowIndex)->flags |= (SHADOW_FLAGS_HIDDEN | SHADOW_FLAGS_FADING_AWAY); } s32 entity_TriggerBlock_start_bound_script(Entity* entity) { @@ -162,11 +158,10 @@ s32 entity_TriggerBlock_start_bound_script(Entity* entity) { return FALSE; } -// TODO: new file here? void entity_TriggerBlock_disable_player_input(void) { disable_player_input(); gPlayerStatus.currentSpeed = 0.0f; - gPlayerStatus.flags |= 0x800000; + gPlayerStatus.flags |= PLAYER_STATUS_FLAGS_800000; set_action_state(8); gravity_use_fall_parms(); } @@ -194,12 +189,12 @@ void entity_ItemBlock_setupGfx(s32 entityIndex) { } void entity_ItemBlock_init(Entity* entity) { - struct802E3650* temp; + ItemBlockData* data; entity_base_block_init(entity); - temp = entity->dataBuf; - temp->unk_10 = D_8015C7D2; - temp->unk_0A = 0xFFFF; + data = entity->dataBuf.itemBlock; + data->itemID = *CreateEntityVarArgBuffer; + data->gameFlagIndex = 0xFFFF; entity->renderSetupFunc = entity_ItemBlock_setupGfx; } @@ -209,11 +204,11 @@ void entity_HiddenItemBlock_init(Entity* entity) { } void entity_ItemlessBlock_init(Entity* entity) { - ModelAnimator* animMesh; + ModelAnimator* animator; entity_base_block_init(entity); entity->renderSetupFunc = entity_ItemBlock_setupGfx; - animMesh = get_animator_by_index(entity->virtualModelIndex); - animMesh->renderMode = 0x11; - animMesh->flags |= 0x10000; + animator = get_animator_by_index(entity->virtualModelIndex); + animator->renderMode = 0x11; + animator->flags |= 0x10000; } diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index 87ebe7a1e5..4044f79b11 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -1,11 +1,6 @@ #include "common.h" #include "fio.h" -typedef struct struct802E10F4 { - char unk_0[4]; - s16 angle; -} struct802E10F4; - void entity_SaveBlock_setupGfx(); void entity_Shadow_init(Shadow* shadow) { @@ -24,10 +19,10 @@ s32 entity_can_collide_with_jumping_player(Entity* entity) { INCLUDE_ASM(s32, "entity/SaveBlock", entity_SaveBlock_setupGfx); void entity_SaveBlock_idle(Entity* entity) { - struct802E10F4* temp; + SaveBlockData* data; - temp = (struct802E10F4*)entity->dataBuf; - temp->angle = clamp_angle(temp->angle + 6); + data = entity->dataBuf.saveBlock; + data->angle = clamp_angle(data->angle + 6); entity_base_block_idle(entity); } @@ -51,8 +46,8 @@ void entity_SaveBlock_save_data(void) { void entity_SaveBlock_show_tutorial_message(Entity* entity) { if (!get_global_flag(EVT_SAVE_FLAG(95))) { - D_802EB390 = FALSE; - msg_get_printer_for_msg(0x1D0000, &D_802EB390); + SaveBlockTutorialMessagePrinterClosed = FALSE; + msg_get_printer_for_msg(0x1D0000, &SaveBlockTutorialMessagePrinterClosed); set_global_flag(EVT_SAVE_FLAG(95)); return; } @@ -62,44 +57,44 @@ void entity_SaveBlock_show_tutorial_message(Entity* entity) { } void entity_SaveBlock_wait_for_close_tutorial(Entity* entity) { - if (D_802EB390) { + if (SaveBlockTutorialMessagePrinterClosed) { exec_entity_commandlist(entity); } } void entity_SaveBlock_show_choice_message(void) { - D_802EB390 = FALSE; - D_802EB394 = FALSE; - D_802EB39C = msg_get_printer_for_msg(0x1D0004, &D_802EB394); - D_802EB398 = msg_get_printer_for_msg(0x1E000A, &D_802EB390); + SaveBlockTutorialMessagePrinterClosed = FALSE; + SaveBlockResultMessagePrinterClosed = FALSE; + SaveBlockResultMessagePrinter = msg_get_printer_for_msg(0x1D0004, &SaveBlockResultMessagePrinterClosed); + SaveBlockTutorialMessagePrinter = msg_get_printer_for_msg(0x1E000A, &SaveBlockTutorialMessagePrinterClosed); } void entity_SaveBlock_show_result_message(void) { - msg_printer_load_msg(0x1D0005, D_802EB39C); + msg_printer_load_msg(0x1D0005, SaveBlockResultMessagePrinter); sfx_play_sound(0x10); } void entity_SaveBlock_wait_for_close_result(Entity* entity) { - if (D_802EB394) { + if (SaveBlockResultMessagePrinterClosed) { exec_entity_commandlist(entity); } } void entity_SaveBlock_wait_for_close_choice(Entity* entity) { - if (D_802EB390) { - if (D_802EB398->currentOption == 1) { + if (SaveBlockTutorialMessagePrinterClosed) { + if (SaveBlockTutorialMessagePrinter->currentOption == 1) { set_entity_commandlist(entity, &D_802E99DC); } else { exec_entity_commandlist(entity); } - close_message(D_802EB39C); + close_message(SaveBlockResultMessagePrinter); } } void entity_SaveBlock_init(Entity* entity) { - struct802E3650* temp = entity->dataBuf; + SaveBlockData* data = entity->dataBuf.saveBlock; entity_base_block_init(entity); entity->renderSetupFunc = entity_SaveBlock_setupGfx; - temp->unk_04 = 8; + data->angle = 8; } diff --git a/src/entity/SimpleSpring.c b/src/entity/SimpleSpring.c index a826631d30..61c60a3491 100644 --- a/src/entity/SimpleSpring.c +++ b/src/entity/SimpleSpring.c @@ -12,7 +12,7 @@ void entity_SimpleSpring_idle(Entity* ent) { s32 isRiding; s32 isColliding; - new_var2 = ent->dataBuf; + new_var2 = ent->dataBuf.unk; new_var = gPlayerStatus.actionState != ACTION_STATE_RIDE && (ent->collisionFlags & 1) != 0; if (new_var) { if ((*new_var2) >= 0x46) { @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "entity/SimpleSpring", entity_SimpleSpring_idle); #endif void entity_SimpleSpring_set_jump_params(Entity* ent) { - s32* data = ent->dataBuf; + s32* data = ent->dataBuf.unk; set_action_state(ACTION_STATE_LAUNCH); gPlayerStatus.gravityIntegrator[1] = 0; @@ -51,7 +51,7 @@ void entity_ScriptSpring_init(void) { } void entity_SimpleSpring_init(Entity* ent) { - ent->dataBuf[0] = *D_8015C7D0; + ent->dataBuf.unk[0] = *CreateEntityVarArgBuffer; } INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_setupGfx); @@ -74,7 +74,7 @@ s32 entity_HiddenPanel_is_item_on_top(Entity* entity) { s32 *args; s32 phi_v0; - args = entity->dataBuf; + args = entity->dataBuf.unk; entityIndex = args[5]; phi_v0 = 0; if ((entityIndex >= 0) && @@ -103,13 +103,13 @@ void entity_HiddenPanel_init(Entity* ent) { s32* data; s32 phi_v0; - data = ent->dataBuf; + data = ent->dataBuf.unk; mem_clear(&D_8015A578, 0x10); ent->unk3C = &entity_HiddenPanel_setupGfx; data->unk6 = 0xFFFF; data->unk24 = (?32) ent->unk4C; - data->unk74 = (u16) D_8015C7D0.unk2; - temp_v1 = D_8015C7D0[1]; + data->unk74 = (u16) CreateEntityVarArgBuffer.unk2; + temp_v1 = CreateEntityVarArgBuffer[1]; data->unk3 = 1; data->unk14 = -1; data->unk10 = temp_v1; diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index 4e00b4300d..f6033182ee 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -1,27 +1,27 @@ #include "common.h" #include "effects.h" -extern StaticEntityData D_802EA934; +extern EntityBlueprint Entity_SuperBlockContent; -void entity_SuperBlock_HitEffect_setupGfx(); +void entity_SuperBlockContent_setupGfx(); -f32 entity_SuperBlockContent_get_previous_yaw(struct802E4B10* arg0, s32 arg1) { - s32 idx = arg0->unk_D0 - arg1; +f32 entity_SuperBlockContent_get_previous_yaw(SuperBlockContentData* data, s32 arg1) { + s32 idx = data->yawBufferPos - arg1; if (idx < 0) { idx += 20; } - return arg0->unk_D4[idx]; + return data->yawBuffer[idx]; } void entity_upgrade_block_hide_content(s32 entityIndex) { - Entity* someEntity = get_entity_by_index(entityIndex); - struct802E3650* temp = someEntity->dataBuf; + Entity* entity = get_entity_by_index(entityIndex); + BlockData* data = entity->dataBuf.block; - if (temp->unk_12 >= 0) { - Entity* someOtherEntity = get_entity_by_index(temp->unk_12); - struct802E4B10* temp2 = someOtherEntity->dataBuf; - temp2->unk_0A = 1; + if (data->childEntityIndex >= 0) { + Entity* childEntity = get_entity_by_index(data->childEntityIndex); + SuperBlockContentData* childEntityData = childEntity->dataBuf.superBlockContent; + childEntityData->unk_0A = 1; } } @@ -30,27 +30,27 @@ s32 entity_upgrade_block_idle(Entity* entity) { } void entity_upgrade_block_check_if_inactive(Entity* entity) { - struct802E3650* temp_s0 = entity->dataBuf; + BlockData* parentData = entity->dataBuf.block; - if (temp_s0->unk_0A != 0xFFFF && !get_global_flag(temp_s0->unk_0A)) { - Entity* someEntity; - struct802E3650* temp2; + if (parentData->gameFlagIndex != 0xFFFF && !get_global_flag(parentData->gameFlagIndex)) { + Entity* childEntity; + SuperBlockContentData* childData; - temp_s0->unk_12 = create_entity(&D_802EA934, entity->position.x, entity->position.y, entity->position.z, 0.0f, + parentData->childEntityIndex = create_entity(&Entity_SuperBlockContent, entity->position.x, entity->position.y, entity->position.z, 0.0f, 0x80000000); - someEntity = get_entity_by_index(temp_s0->unk_12); - temp2 = someEntity->dataBuf; - temp2->unk_00 = entity->listIndex; + childEntity = get_entity_by_index(parentData->childEntityIndex); + childData = childEntity->dataBuf.superBlockContent; + childData->parentEntityIndex = entity->listIndex; } } void entity_upgrade_block_init(Entity* entity) { - struct802E3650* temp_s1 = entity->dataBuf; + BlockData* data = entity->dataBuf.block; entity_base_block_init(entity); entity->rotation.y += 180.0f; - temp_s1->unk_0A = 0xFFFF; - temp_s1->unk_12 = -1; + data->gameFlagIndex = 0xFFFF; + data->childEntityIndex = -1; } void entity_SuperBlock_init(Entity* entity) { @@ -61,54 +61,54 @@ void entity_UltraBlock_init(Entity* entity) { entity_upgrade_block_init(entity); } -void entity_SuperBlock_HitEffect_attach_to_parent(Entity* entity) { - struct802E3650* temp = entity->dataBuf; - Entity* temp_v0 = get_entity_by_index(temp->unk_00); +void entity_SuperBlockContent_attach_to_parent(Entity* entity) { + SuperBlockContentData* data = entity->dataBuf.superBlockContent; + Entity* parentEntity = get_entity_by_index(data->parentEntityIndex); - entity->position.x = temp_v0->position.x; - entity->position.y = temp_v0->position.y + 14.0f; - entity->position.z = temp_v0->position.z; + entity->position.x = parentEntity->position.x; + entity->position.y = parentEntity->position.y + 14.0f; + entity->position.z = parentEntity->position.z; } // display list func -INCLUDE_ASM(s32, "entity/SuperBlock", entity_SuperBlock_HitEffect_setupGfx); +INCLUDE_ASM(s32, "entity/SuperBlock", entity_SuperBlockContent_setupGfx); -void entity_SuperBlock_HitEffect_idle(Entity* entity) { - struct802E4B10* temp_s0 = entity->dataBuf; +void entity_SuperBlockContent_idle(Entity* entity) { + SuperBlockContentData* data = entity->dataBuf.superBlockContent; - entity_SuperBlock_HitEffect_attach_to_parent(entity); - if (temp_s0->unk_0A != 0) { + entity_SuperBlockContent_attach_to_parent(entity); + if (data->unk_0A != 0) { entity->renderSetupFunc = NULL; } entity->rotation.y = clamp_angle(entity->rotation.y + 3.0); - temp_s0->unk_D4[temp_s0->unk_D0] = entity->rotation.y; + data->yawBuffer[data->yawBufferPos] = entity->rotation.y; - temp_s0->unk_D0++; - if (temp_s0->unk_D0 > 20) { - temp_s0->unk_D0 = 0; + data->yawBufferPos++; + if (data->yawBufferPos > ARRAY_COUNT(data->yawBuffer)) { + data->yawBufferPos = 0; } - if (temp_s0->unk_0A == 0 && gOverrideFlags == 0) { - if (--temp_s0->unk_02 <= 0) { - temp_s0->unk_02 = 50; + if (data->unk_0A == 0 && gOverrideFlags == 0) { + if (--data->unk_02 <= 0) { + data->unk_02 = 50; playFX_22(3, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20); } } } -void entity_init_SuperBlock_HitEffect1(Entity* entity) { - struct802E3650* temp = entity->dataBuf; +void entity_init_SuperBlockContent1(Entity* entity) { + SuperBlockContentData* data = entity->dataBuf.superBlockContent; - temp->unk_128 = &D_0A000328; - temp->unk_12C = &D_0A000380; - entity->renderSetupFunc = entity_SuperBlock_HitEffect_setupGfx; + data->unk_128 = &D_0A000328; + data->unk_12C = &D_0A000380; + entity->renderSetupFunc = entity_SuperBlockContent_setupGfx; } -void entity_init_SuperBlock_HitEffect2(Entity* entity) { - struct802E3650* temp = entity->dataBuf; +void entity_init_SuperBlockContent2(Entity* entity) { + SuperBlockContentData* data = entity->dataBuf.superBlockContent; - temp->unk_128 = &D_0A000800; - temp->unk_12C = &D_0A000750; - entity->renderSetupFunc = entity_SuperBlock_HitEffect_setupGfx; + data->unk_128 = &D_0A000800; + data->unk_12C = &D_0A000750; + entity->renderSetupFunc = entity_SuperBlockContent_setupGfx; } diff --git a/src/entity/Switch.c b/src/entity/Switch.c index 02766e4108..5848cd3799 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -5,7 +5,7 @@ void entity_shattering_init_pieces(Entity* entity, void* arg1, void* arg2); void entity_GreenStompSwitch_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; if (entity->collisionFlags & 1) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) @@ -17,7 +17,7 @@ void entity_GreenStompSwitch_idle(Entity* entity) { } void entity_GreenStompSwitch_retract(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; u16 temp2 = temp->unk_22--; if (temp2) { @@ -30,7 +30,7 @@ void entity_GreenStompSwitch_retract(Entity* entity) { } void entity_GreenStompSwitch_extend(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; u16 temp2 = temp->unk_22--; if (temp2) { @@ -44,7 +44,7 @@ void entity_GreenStompSwitch_extend(Entity* entity) { void entity_raycast_down(f32*, f32*, f32*, f32*, f32*, f32*); void entity_switch_fall_down(Entity* entity) { - struct802E1400* temp_s1 = (struct802E1400*) entity->dataBuf; + struct802E1400* temp_s1 = (struct802E1400*) entity->dataBuf.unk; f32 hitDepth = 10.0f; f32 x = entity->position.x; f32 y = entity->position.y; @@ -77,7 +77,7 @@ void entity_HugeBlueSwitch_idle(Entity* entity) { } void entity_small_switch_idle(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; @@ -129,7 +129,7 @@ void entity_RedSwitch_wait_and_reset(Entity* entity) { } void entity_base_switch_anim_init(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; temp->unk_00.x = 1.0f; temp->unk_00.y = 0.1f; @@ -143,7 +143,7 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { f32 temp_f2; f32 temp_f4; f32 temp_f6; - struct802E1400* temp_s0 = (struct802E1400*) entity->dataBuf; + struct802E1400* temp_s0 = (struct802E1400*) entity->dataBuf.unk; f32 phi_f4; s32 phi_s2 = 0; @@ -311,7 +311,7 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { } void entity_base_switch_start_bound_script(Entity* entity) { - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; set_area_flag(temp->unk_20); entity_start_script(entity); } @@ -320,7 +320,7 @@ void entity_base_switch_animate_scale(Entity* entity) { f32 temp_f0; f32 temp_f4; f32 temp_f6; - struct802E1400* temp_s0 = (struct802E1400*) entity->dataBuf; + struct802E1400* temp_s0 = (struct802E1400*) entity->dataBuf.unk; f32 phi_f4; s32 phi_s2 = 0; @@ -458,7 +458,7 @@ void entity_base_switch_animate_scale(Entity* entity) { void entity_base_switch_init(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; playerStatus->animFlags |= 0x1000000; temp->unk_14.x = 1.0f; @@ -468,15 +468,15 @@ void entity_base_switch_init(Entity* entity) { void entity_BlueSwitch_init(Entity* entity) { Entity* temp_v0_2; - struct802E1400* temp = (struct802E1400*) entity->dataBuf; + struct802E1400* temp = (struct802E1400*) entity->dataBuf.unk; entity_base_switch_init(entity); - if (D_8015C7D0[0] == 2) { + if (CreateEntityVarArgBuffer[0] == 2) { D_802EB3A0 = entity; return; } - if (D_8015C7D0[0] == 1) { + if (CreateEntityVarArgBuffer[0] == 1) { if (D_802EB3A0 != NULL) { temp->attachedEntity = D_802EB3A0; entity->flags |= ENTITY_FLAGS_HIDDEN; @@ -491,7 +491,7 @@ void entity_HugeBlueSwitch_init(Entity* entity) { struct802E1400* temp; entity_base_switch_init(entity); - temp = (struct802E1400*) entity->dataBuf; + temp = (struct802E1400*) entity->dataBuf.unk; entity->scale.x = 3.0f; entity->scale.y = 3.0f; entity->scale.z = 3.0f; @@ -533,7 +533,7 @@ void entity_shattering_setupGfx(s32 entityIndex) { threeSixty = 360.0f; someFloat = 0.00390625f; entity = get_entity_by_index(entityIndex); - temp_s4 = (struct802E1400*) entity->dataBuf; + temp_s4 = (struct802E1400*) entity->dataBuf.unk; x_inv = -entity->position.x; y_inv = -entity->position.y; z_inv = -entity->position.z; diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index 360f201666..0b45d8ac2a 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -30,15 +30,15 @@ typedef struct struct802E7F40 { } struct802E7F40; void entity_WoodenCrate_init(Entity* entity) { - struct802E7F40* temp = entity->dataBuf; + struct802E7F40* temp = entity->dataBuf.unk; entity->scale.y = 0.85714287f; - temp->unk_00 = D_8015C7D0[0]; + temp->unk_00 = CreateEntityVarArgBuffer[0]; temp->unk_04 = 0xFFFF; } void entity_WoodenCrate_reset_fragments(Entity* entity) { - struct802E7F40* temp = entity->dataBuf; + struct802E7F40* temp = entity->dataBuf.unk; temp->unk_0C = entity->position.y; entity_WoodenCrate_init_fragments(entity, &D_0A004350, &D_0A0026F0); @@ -72,7 +72,7 @@ s32 entity_WoodenCrate_idle(Entity* entity) { f32 player_get_camera_facing_angle(void); void entity_WoodenCrate_shatter(Entity* entity, f32 arg1) { - struct802E7F40* temp = entity->dataBuf; + struct802E7F40* temp = entity->dataBuf.unk; if (temp->unk_00 != -1) { s32 flag = FALSE; diff --git a/src/entity/jan_iwa/E2D730.c b/src/entity/jan_iwa/E2D730.c index f8534b8c17..f707765747 100644 --- a/src/entity/jan_iwa/E2D730.c +++ b/src/entity/jan_iwa/E2D730.c @@ -1,7 +1,7 @@ #include "common.h" #include "sprite.h" -extern StaticEntityData D_802BC7D0_E2F100; +extern EntityBlueprint D_802BC7D0_E2F100; extern f32 D_802BCE20; // size unknown typedef struct structE2D730 { @@ -29,7 +29,7 @@ extern u16 D_802BCE32; extern u16 D_802BCE34; void func_802BB000_E2D930(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf; + structE2D730* data = (structE2D730*)entity->dataBuf.unk; PlayerStatus* playerStatus = &gPlayerStatus; if ((entity->collisionFlags & 1) && !is_picking_up_item()) { @@ -47,7 +47,7 @@ void func_802BB000_E2D930(Entity* entity) { INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB0A0_E2D9D0); void func_802BB228_E2DB58(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf; + structE2D730* data = (structE2D730*)entity->dataBuf.unk; func_802BB000_E2D930(entity); data->unk_14 += 2.0; @@ -64,10 +64,10 @@ void func_802BB298_E2DBC8(Entity* entity) { structE2D730* data; s32 x, y, z; - data = (structE2D730*)entity->dataBuf; - x = D_8015C7D0[0]; - y = D_8015C7D0[1]; - z = D_8015C7D0[2]; + data = (structE2D730*)entity->dataBuf.unk; + x = CreateEntityVarArgBuffer[0]; + y = CreateEntityVarArgBuffer[1]; + z = CreateEntityVarArgBuffer[2]; if (!(x | y | z)) { x = entity->position.x; y = entity->position.y + 100.0f; @@ -97,12 +97,12 @@ INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB374_E2DCA4); #ifdef NON_EQUIVALENT void func_802BB648_E2DF78(Entity* entity) { structE2D730* temp_a1_2; - structE2D730* data = (structE2D730*)entity->dataBuf; + structE2D730* data = (structE2D730*)entity->dataBuf.unk; if ((gPlayerStatus.animFlags & 0x10) && (entity->collisionFlags & 0x48)) { if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - temp_a1_2 = (structE2D730*)get_entity_by_index(data->unk_04)->dataBuf; + temp_a1_2 = (structE2D730*)get_entity_by_index(data->unk_04)->dataBuf.unk; if (temp_a1_2->unk_00 == 0) { temp_a1_2->unk_00 = 1; exec_entity_commandlist(entity); @@ -116,7 +116,7 @@ INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB648_E2DF78); #endif void func_802BB6E0_E2E010(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf; + structE2D730* data = (structE2D730*)entity->dataBuf.unk; Entity* newEntity; s32 entityIndex; @@ -124,7 +124,7 @@ void func_802BB6E0_E2E010(Entity* entity) { entityIndex = create_entity(&D_802BC7D0_E2F100, entity->position.x, entity->position.y, entity->position.z, 0, 0x80000000); data->unk_04.index = entityIndex; newEntity = get_entity_by_index(entityIndex); - data = (structE2D730*)newEntity->dataBuf; + data = (structE2D730*)newEntity->dataBuf.unk; data->unk_04.index = entity->listIndex; data->unk_08 = newEntity->rotation.y; } @@ -137,13 +137,13 @@ void func_802BB778_E2E0A8(Entity* entity) { INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB78C_E2E0BC); void func_802BB8D4_E2E204(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf; + structE2D730* data = (structE2D730*)entity->dataBuf.unk; data->unk_08 = fabs(dist2D(entity->position.x - 2.0f, entity->position.z - 2.0f, gPlayerStatus.position.x, gPlayerStatus.position.z) * 0.25); data->unk_04.f = atan2(gPlayerStatus.position.x, gPlayerStatus.position.z, entity->position.x - 2.0f, entity->position.z - 2.0f); } void func_802BB98C_E2E2BC(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf; + structE2D730* data = (structE2D730*)entity->dataBuf.unk; gCameras->targetPos.x = gPlayerStatus.position.x; gCameras->targetPos.y = gPlayerStatus.position.y; gCameras->targetPos.z = gPlayerStatus.position.z; @@ -152,7 +152,7 @@ void func_802BB98C_E2E2BC(Entity* entity) { #ifdef NON_EQUIVALENT // play_model_animation weirdness, branch likely in case 0 void func_802BB9E0_E2E310(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf; + structE2D730* data = (structE2D730*)entity->dataBuf.unk; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; PlayerStatus* playerStatus = &gPlayerStatus; f32 temp_f2; diff --git a/src/entity/jan_iwa/E2E5F0.c b/src/entity/jan_iwa/E2E5F0.c index 5387301c25..f82cf5e736 100644 --- a/src/entity/jan_iwa/E2E5F0.c +++ b/src/entity/jan_iwa/E2E5F0.c @@ -1,14 +1,14 @@ #include "common.h" #include "effects.h" -extern StaticEntityData D_802BCC44_E2F574; -extern StaticEntityData D_802BCC68_E2F598; -extern StaticEntityData D_802BCC8C_E2F5BC; -extern StaticEntityData D_802BCCB0_E2F5E0; -extern StaticEntityData D_802BCCD4_E2F604; -extern StaticEntityData D_802BCCF8_E2F628; -extern StaticEntityData D_802BCD1C_E2F64C; -extern StaticEntityData D_802BCD40_E2F670; +extern EntityBlueprint D_802BCC44_E2F574; +extern EntityBlueprint D_802BCC68_E2F598; +extern EntityBlueprint D_802BCC8C_E2F5BC; +extern EntityBlueprint D_802BCCB0_E2F5E0; +extern EntityBlueprint D_802BCCD4_E2F604; +extern EntityBlueprint D_802BCCF8_E2F628; +extern EntityBlueprint D_802BCD1C_E2F64C; +extern EntityBlueprint D_802BCD40_E2F670; // size unknown typedef struct structE2E5F0 { @@ -46,7 +46,7 @@ void func_802BC050_E2E980(Entity* entity) { Entity* other; gPlayerStatus.animFlags |= 4; func_800EF300(); - other = get_entity_by_index(entity->dataBuf[0]); + other = get_entity_by_index(entity->dataBuf.unk[0]); exec_entity_commandlist(entity); exec_entity_commandlist(other); } @@ -63,13 +63,13 @@ INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC0B8_E2E9E8); #endif void func_802BC0F0_E2EA20(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf; + structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; data->unk_18 = fabs(dist2D(entity->position.x, entity->position.z, gPlayerStatus.position.x, gPlayerStatus.position.z) * 0.25); data->unk_14 = atan2(gPlayerStatus.position.x, gPlayerStatus.position.z, entity->position.x, entity->position.z); } void func_802BC17C_E2EAAC(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf; + structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; gCameras[0].targetPos.x = gPlayerStatus.position.x; gCameras[0].targetPos.y = gPlayerStatus.position.y; @@ -77,12 +77,12 @@ void func_802BC17C_E2EAAC(Entity* entity) { add_vec2D_polar(&gPlayerStatus.position.x, &gPlayerStatus.position.z, data->unk_18, data->unk_14); } -s32 func_802BC1D0_E2EB00(Entity* entity, StaticEntityData* staticEntityData) { - return create_entity(staticEntityData, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y); +s32 func_802BC1D0_E2EB00(Entity* entity, EntityBlueprint* EntityBlueprint) { + return create_entity(EntityBlueprint, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y); } void func_802BC220_E2EB50(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf; + structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; data->unk_00 = func_802BC1D0_E2EB00(entity, &D_802BCC44_E2F574); } @@ -128,13 +128,13 @@ void func_802BC3A0_E2ECD0(void) { } void func_802BC3CC_E2ECFC(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf; + structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; data->unk_0C = gPlayerStatus.position.y; data->unk_10 = 0; } void func_802BC3E4_E2ED14(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf; + structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; gPlayerStatus.position.y = data->unk_0C + (sin_rad((data->unk_10 * TAU) / 360.0f) * 3.0f); data->unk_10 += 24.0f; diff --git a/src/entity/jan_iwa/E2EDE0.c b/src/entity/jan_iwa/E2EDE0.c index fcce3cce6d..fa1113d4e6 100644 --- a/src/entity/jan_iwa/E2EDE0.c +++ b/src/entity/jan_iwa/E2EDE0.c @@ -17,8 +17,8 @@ void func_802BC628_E2EF58(void) { } void func_802BC630_E2EF60(Entity* entity) { - f32 temp_f0 = *D_8015C7D0; - structE2EDE0* data = (structE2EDE0*)entity->dataBuf; + f32 temp_f0 = *CreateEntityVarArgBuffer; + structE2EDE0* data = (structE2EDE0*)entity->dataBuf.unk; data->unk_04 = temp_f0; data->unk_08 = temp_f0; diff --git a/src/entity/sbk_omo/E2F750.c b/src/entity/sbk_omo/E2F750.c index 1ab5445d3c..c894458525 100644 --- a/src/entity/sbk_omo/E2F750.c +++ b/src/entity/sbk_omo/E2F750.c @@ -26,7 +26,7 @@ s32 func_802BB3B8_E2FD08(void); INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB3B8_E2FD08); void func_802BB704_E30054(Entity* entity) { - structE2F750* data = (structE2F750*)entity->dataBuf; + structE2F750* data = (structE2F750*)entity->dataBuf.unk; s32 i; data->unk_02--; @@ -48,7 +48,7 @@ s32 func_802BB7E0_E30130(Entity* entity); INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB7E0_E30130); void func_802BB8E4_E30234(Entity* entity) { - structE2F750* data = (structE2F750*)entity->dataBuf; + structE2F750* data = (structE2F750*)entity->dataBuf.unk; f32 temp_f20_2; f32 temp_f4 = (atan2(entity->position.x, entity->position.z, data->unk_A4, data->unk_A8) - data->unk_B8) * 0.03125f; @@ -81,9 +81,9 @@ void func_802BBDB8_E30708(Entity* entity) { } void func_802BBE14_E30764(Entity* entity) { - structE2F750* data = (structE2F750*)entity->dataBuf; + structE2F750* data = (structE2F750*)entity->dataBuf.unk; - data->unk_A0 = *D_8015C7D0; + data->unk_A0 = *CreateEntityVarArgBuffer; func_802BB7E0_E30130(entity); data->unk_03 = 0; entity->renderSetupFunc = &func_802BB3B8_E2FD08; diff --git a/src/entity/sbk_omo/E307C0.c b/src/entity/sbk_omo/E307C0.c index 52725449c0..69ea360fc1 100644 --- a/src/entity/sbk_omo/E307C0.c +++ b/src/entity/sbk_omo/E307C0.c @@ -19,7 +19,7 @@ INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BBE70_E307C0); void func_802BC2BC_E30C0C(Entity* entity) { u16 currentFloor = gCollisionStatus.currentFloor; - structE307C0* data = (structE307C0*)entity->dataBuf; + structE307C0* data = (structE307C0*)entity->dataBuf.unk; PlayerStatus* playerStatus = &gPlayerStatus; s32 actionState = playerStatus->actionState; f32 x,y,z,sp2C; @@ -58,7 +58,7 @@ void func_802BC2BC_E30C0C(Entity* entity) { } void func_802BC4B8_E30E08(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf; + structE307C0* data = (structE307C0*)entity->dataBuf.unk; s32 i; data->unk_04--; @@ -73,13 +73,13 @@ void func_802BC4B8_E30E08(Entity* entity) { } void func_802BC514_E30E64(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf; + structE307C0* data = (structE307C0*)entity->dataBuf.unk; entity->position.x = data->position.x + (data->unk_01 & 1 ? 1.0f : -1.0f); data->unk_01 -= 1; } void func_802BC558_E30EA8(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf; + structE307C0* data = (structE307C0*)entity->dataBuf.unk; entity->position.x = data->position.x; entity->position.z = data->position.y; } @@ -93,14 +93,14 @@ void func_802BC99C_E312EC(Entity* entity) { } void func_802BC9CC_E3131C(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf; + structE307C0* data = (structE307C0*)entity->dataBuf.unk; if (data->unk_02 & 1) { entity_start_script(entity); } } void func_802BC9FC_E3134C(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf; + structE307C0* data = (structE307C0*)entity->dataBuf.unk; entity->renderSetupFunc = &func_802BBE70_E307C0; data->position.x = entity->position.x; data->position.z = entity->position.y; diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 017c251e35..84bc3a7764 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -1,14 +1,14 @@ #include "common.h" #include "camera.h" -EvtSource ShakeCam1 = { +EvtScript ShakeCam1 = { EVT_SET_GROUP(0) EVT_CALL(ShakeCam, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_FIXED(1.0)) EVT_RETURN EVT_END }; -EvtSource ShakeCamX = { +EvtScript ShakeCamX = { EVT_SET_GROUP(0) EVT_CALL(ShakeCam, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) EVT_RETURN diff --git a/src/evt/evt.c b/src/evt/evt.c index 444a7e0358..e63959a9e1 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -902,7 +902,7 @@ ApiStatus evt_handle_exec1(Evt* script) { Evt* newScript; s32 i; - newScript = start_script_in_group((EvtSource*)evt_get_variable(script, *script->ptrReadPos), script->priority, 0, + newScript = start_script_in_group((EvtScript*)evt_get_variable(script, *script->ptrReadPos), script->priority, 0, script->groupFlags); newScript->owner1 = script->owner1; @@ -926,12 +926,12 @@ ApiStatus evt_handle_exec1(Evt* script) { ApiStatus evt_handle_exec1_get_id(Evt* script) { Bytecode* args = script->ptrReadPos; - EvtSource* evtSource = (EvtSource*)evt_get_variable(script, *args++); + EvtScript* newSource = (EvtScript*)evt_get_variable(script, *args++); Bytecode arg2 = *args++; Evt* newScript; s32 i; - newScript = start_script_in_group(evtSource, script->priority, 0, script->groupFlags); + newScript = start_script_in_group(newSource, script->priority, 0, script->groupFlags); newScript->owner1 = script->owner1; newScript->owner2 = script->owner2; @@ -964,17 +964,17 @@ ApiStatus evt_handle_jump(Evt* script) { return ApiStatus_DONE2; } -s32 evt_bound_script_trigger_handler(Trigger* trigger) { - EvtSource* scriptStart; +s32 evt_trigger_on_activate_exec_script(Trigger* trigger) { + EvtScript* scriptStart; Evt* script; if (trigger->runningScript == NULL) { - scriptStart = trigger->scriptSource; - if (is_trigger_bound(trigger, scriptStart)) { + scriptStart = trigger->onTriggerEvt; + if (is_another_trigger_bound(trigger, scriptStart)) { return 0; } - script = start_script((EvtSource*)scriptStart, trigger->priority, 0x20); + script = start_script((EvtScript*)scriptStart, trigger->priority, 0x20); trigger->runningScript = script; trigger->runningScriptID = script->id; script->varTable[0] = trigger->scriptVars[0]; @@ -985,31 +985,31 @@ s32 evt_bound_script_trigger_handler(Trigger* trigger) { if (!does_script_exist(trigger->runningScriptID)) { trigger->runningScript = NULL; - return 0; + return 0; // stop calling this function } - return 1; + return 1; // keep calling this function every frame } ApiStatus evt_handle_bind(Evt* script) { Bytecode* args = script->ptrReadPos; Trigger* trigger; Bytecode* triggerScript = (Bytecode*)evt_get_variable(script, *args++); - Bytecode eventType = *args++; + Bytecode triggerType = *args++; Bytecode colliderIDVar = *args++; - Bytecode a3 = *args++; + Bytecode hasInteractPrompt = *args++; Bytecode triggerOut = *args++; - TriggerDefinition def; + TriggerBlueprint bp; - def.flags = eventType | TRIGGER_DEFINITION_FLAGS_1000000; - def.flagIndex = evt_get_variable(script, colliderIDVar); - def.colliderIndex = evt_get_variable_index(script, colliderIDVar); - def.inputArg3 = a3; - def.unk_14 = 0; - def.function = evt_bound_script_trigger_handler; + bp.flags = triggerType | TRIGGER_SCRIPT_BOUND; + bp.colliderID = evt_get_variable(script, colliderIDVar); + bp.varIndex = evt_get_variable_index(script, colliderIDVar); + bp.hasPlayerInteractPrompt = hasInteractPrompt; + bp.unk_tr_2C = 0; + bp.onActivateFunc = evt_trigger_on_activate_exec_script; - trigger = create_trigger(&def); - trigger->scriptSource = (EvtSource*)triggerScript; + trigger = create_trigger(&bp); + trigger->onTriggerEvt = (EvtScript*)triggerScript; trigger->runningScript = NULL; trigger->priority = script->priority; trigger->scriptVars[0] = evt_get_variable(script, script->varTable[0]); @@ -1092,9 +1092,9 @@ ApiStatus evt_handle_does_script_exist(Evt* script) { return ApiStatus_DONE2; } -void evt_standard_trigger_executor(Trigger* trigger) { +s32 evt_trigger_on_activate_lock(Trigger* trigger) { if (trigger->runningScript == NULL) { - Evt* newScript = start_script(trigger->scriptSource, trigger->priority, 0x20); + Evt* newScript = start_script(trigger->onTriggerEvt, trigger->priority, 0x20); trigger->runningScript = newScript; trigger->runningScriptID = newScript->id; newScript->varTable[0] = trigger->scriptVars[0]; @@ -1105,7 +1105,7 @@ void evt_standard_trigger_executor(Trigger* trigger) { if (!does_script_exist(trigger->runningScriptID)) { trigger->runningScript = NULL; - trigger->flags.flags &= ~0x2; + trigger->flags.flags &= ~TRIGGER_ACTIVATED; } } @@ -1113,23 +1113,23 @@ ApiStatus evt_handle_bind_lock(Evt* script) { Bytecode* args = script->ptrReadPos; Trigger* trigger; Bytecode* triggerScript = (Bytecode*)evt_get_variable(script, *args++); - Bytecode eventType = *args++; + Bytecode triggerType = *args++; Bytecode colliderIDVar = *args++; s32* itemList = (s32*)evt_get_variable(script, *args++); Bytecode triggerOut = *args++; - s32 a5 = *args++; - TriggerDefinition def; + s32 hasInteractPrompt = *args++; + TriggerBlueprint bp; - def.flags = eventType | TRIGGER_DEFINITION_FLAGS_1000000; - def.flagIndex = evt_get_variable(script, colliderIDVar); - def.colliderIndex = evt_get_variable_index(script, colliderIDVar); - def.unk_1C = itemList; - def.function = evt_standard_trigger_executor; - def.unk_14 = triggerOut; - def.inputArg3 = a5; + bp.flags = triggerType | TRIGGER_SCRIPT_BOUND; + bp.colliderID = evt_get_variable(script, colliderIDVar); + bp.varIndex = evt_get_variable_index(script, colliderIDVar); + bp.itemList = itemList; + bp.onActivateFunc = evt_trigger_on_activate_lock; + bp.unk_tr_2C = triggerOut; + bp.hasPlayerInteractPrompt = hasInteractPrompt; - trigger = create_trigger(&def); - trigger->scriptSource = (EvtSource*)triggerScript; + trigger = create_trigger(&bp); + trigger->onTriggerEvt = (EvtScript*)triggerScript; trigger->runningScript = NULL; trigger->priority = script->priority; trigger->scriptVars[0] = evt_get_variable(script, script->varTable[0]); @@ -1155,7 +1155,7 @@ ApiStatus evt_handle_thread(Evt* script) { } while (opcode != EVT_OP_END_THREAD); script->ptrNextLine = endLine; - newScript = start_script_in_group((EvtSource*)startLine, script->priority, 0x60, script->groupFlags); + newScript = start_script_in_group((EvtScript*)startLine, script->priority, 0x60, script->groupFlags); newScript->owner1.enemyID = script->owner1.enemyID; newScript->owner2.npcID = script->owner2.npcID; newScript->array = script->array; diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index 4c3a8a6a7c..5c6ac2b6be 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -8,7 +8,7 @@ s32 func_802D5B10(); s32 D_802D9D30 = 0; -EvtSource D_802D9D34 = { +EvtScript D_802D9D34 = { EVT_CALL(func_802D5B10) EVT_RETURN EVT_END diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 459ec2c515..997b77ee5c 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -95,7 +95,7 @@ ApiStatus func_802D7BA4(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource D_802D9D50 = { +EvtScript D_802D9D50 = { EVT_CALL(func_802D7BA4) EVT_RETURN EVT_END diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 676d24f02f..51c4e71f8b 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -152,7 +152,7 @@ void suspend_frozen_scripts(Evt* script) { suspend_all_group(arg); } -Evt* start_script(EvtSource* source, s32 priority, s32 initialState) { +Evt* start_script(EvtScript* source, s32 priority, s32 initialState) { Evt* newScript; s32 curScriptIndex; s32 scriptListCount; @@ -219,7 +219,7 @@ Evt* start_script(EvtSource* source, s32 priority, s32 initialState) { return newScript; } -Evt* start_script_in_group(EvtSource* source, u8 priority, u8 initialState, u8 groupFlags) { +Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 groupFlags) { Evt* newScript; s32 scriptListCount; s32 i; @@ -291,7 +291,7 @@ Evt* start_script_in_group(EvtSource* source, u8 priority, u8 initialState, u8 g return newScript; } -Evt* start_child_script(Evt* parentScript, EvtSource* source, s32 initialState) { +Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 initialState) { s32 curScriptIndex; s32 scriptListCount; Evt* child; @@ -656,19 +656,19 @@ void set_script_group(Evt* script, s32 groupFlags) { script->groupFlags = groupFlags; } -Trigger* bind_trigger(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 triggerVar0, s32 triggerVar1, +Trigger* bind_trigger(EvtScript* script, s32 flags, s32 triggerFlagIndex, s32 triggerVar0, s32 triggerVar1, s32 priority, s32 arg6) { Trigger* trigger; - TriggerDefinition def; + TriggerBlueprint bp; - def.flags = flags | TRIGGER_DEFINITION_FLAGS_1000000; - def.flagIndex = triggerFlagIndex; - def.unk_14 = 0; - def.function = evt_bound_script_trigger_handler; - def.inputArg3 = arg6; + bp.flags = flags | TRIGGER_SCRIPT_BOUND; + bp.colliderID = triggerFlagIndex; + bp.unk_tr_2C = 0; + bp.onActivateFunc = evt_trigger_on_activate_exec_script; + bp.hasPlayerInteractPrompt = arg6; - trigger = create_trigger(&def); - trigger->scriptSource = script; + trigger = create_trigger(&bp); + trigger->onTriggerEvt = script; trigger->runningScript = NULL; trigger->priority = priority; trigger->scriptVars[0] = triggerVar0; @@ -676,7 +676,7 @@ Trigger* bind_trigger(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 tr return trigger; } -Trigger* bind_trigger_1(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 triggerVar0, s32 triggerVar1, +Trigger* bind_trigger_1(EvtScript* script, s32 flags, s32 triggerFlagIndex, s32 triggerVar0, s32 triggerVar1, s32 priority) { return bind_trigger(script, flags, triggerFlagIndex, triggerVar0, triggerVar1, priority, 1); } diff --git a/src/hud_element.c b/src/hud_element.c index 3e4ca87ad5..c3e8459c9e 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -7,7 +7,7 @@ extern HudElementList* gHudElements; s32 D_8014EFC0[] = { 0x00000000, }; s32 D_8014EFC4[] = { 0x00011000, }; -HudElementAnim hud_element_defaultAnim = { +HudScript hud_element_defaultAnim = { he_End, }; @@ -86,7 +86,7 @@ extern s32* D_80157964; extern s32* D_80158570; extern s32* D_80151314; -INCLUDE_ASM(void, "hud_element", load_hud_element, HudElement* hudElement, const HudElementAnim* anim); +INCLUDE_ASM(void, "hud_element", load_hud_element, HudElement* hudElement, const HudScript* anim); INCLUDE_ASM(void, "hud_element", draw_rect_hud_element, HudElement* hudElement, @@ -146,7 +146,7 @@ void func_801413F8(void) { gCameras[3].flags &= ~0x6; } -s32 create_hud_element(const HudElementAnim* anim) { +s32 create_hud_element(const HudScript* anim) { HudElement* hudElement; s32 id; @@ -442,7 +442,7 @@ void draw_hud_element_3(s32 id) { draw_hud_element(id, 2); } -void set_hud_element_anim(s32 id, const HudElementAnim* anim) { +void set_hud_element_anim(s32 id, const HudScript* anim) { HudElement* hudElement = (*gHudElements)[id & ~0x800]; if (anim == NULL) { @@ -467,7 +467,7 @@ void set_hud_element_anim(s32 id, const HudElementAnim* anim) { while (hud_element_update(hudElement) != 0) {} } -HudElementAnim* get_hud_element_anim(s32 id) { +HudScript* get_hud_element_anim(s32 id) { return (*gHudElements)[id & ~0x800]->anim; } diff --git a/src/hud_element.h b/src/hud_element.h index 1e60cf6911..80c212ca72 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -32,7 +32,7 @@ typedef enum { HUD_ELEMENT_OP_ClearFlags, HUD_ELEMENT_OP_PlaySound, HUD_ELEMENT_OP_op_1B, -} HudElementAnim[0]; +} HudScript[0]; enum { HUD_ELEMENT_SIZE_8x8, @@ -82,8 +82,8 @@ typedef struct HudTransform { typedef struct HudElement { /* 0x00 */ HudFlags flags; - /* 0x04 */ const HudElementAnim* readPos; - /* 0x08 */ const HudElementAnim* anim; + /* 0x04 */ const HudScript* readPos; + /* 0x08 */ const HudScript* anim; /* 0x0C */ s32* ptrPropertyList; /* 0x10 */ s32* imageAddr; /* 0x14 */ s32* paletteAddr; @@ -112,12 +112,12 @@ typedef struct HudElement { typedef HudElement* HudElementList[320]; -extern HudElementAnim HudScript_AnimatedHandPointer[]; -extern HudElementAnim HudScript_StatusCoin[]; -extern HudElementAnim HudScript_Refund[]; -extern HudElementAnim HudScript_MenuTimes[]; -extern HudElementAnim* D_8024FA30[1]; -extern HudElementAnim *gBadgeMenuElements[22]; +extern HudScript HudScript_AnimatedHandPointer[]; +extern HudScript HudScript_StatusCoin[]; +extern HudScript HudScript_Refund[]; +extern HudScript HudScript_MenuTimes[]; +extern HudScript* D_8024FA30[1]; +extern HudScript* gBadgeMenuElements[22]; extern HudElement* gItemIcons[20]; #define he_End HUD_ELEMENT_OP_End @@ -151,7 +151,7 @@ extern HudElement* gItemIcons[20]; #define he_PlaySound(arg0) HUD_ELEMENT_OP_PlaySound, arg0 #define he_op_1B(arg0, arg1) HUD_ELEMENT_OP_op_1B, arg0, arg1 -void load_hud_element(HudElement* hudElement, const HudElementAnim* anim); +void load_hud_element(HudElement* hudElement, const HudScript* anim); /// @param clamp 0 = repeat; 1 = clamp /// @param dropShadow Whether to render a drop shadow or not @@ -172,7 +172,7 @@ void clear_hud_element_cache(void); void init_hud_element_list(void); /// Creates a new HUD element and returns its ID. -s32 create_hud_element(const HudElementAnim* anim); +s32 create_hud_element(const HudScript* anim); void update_hud_elements(void); @@ -197,9 +197,9 @@ void draw_hud_element_clipped(s32 id); void draw_hud_element_2(s32 id); void draw_hud_element_3(s32 id); -void set_hud_element_anim(s32 id, const HudElementAnim* anim); +void set_hud_element_anim(s32 id, const HudScript* anim); -HudElementAnim* get_hud_element_anim(s32 id); +HudScript* get_hud_element_anim(s32 id); HudElement* get_hud_element(s32 id); diff --git a/src/load_script.c b/src/load_script.c index 57faacc539..99e38de0ca 100644 --- a/src/load_script.c +++ b/src/load_script.c @@ -15,7 +15,7 @@ ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; BattleStatus* battleStatus = &gBattleStatus; s16 itemID = battleStatus->selectedItemID; - StaticItem* item = &gItemTable[itemID]; + ItemData* item = &gItemTable[itemID]; s32 i = 0; s32* itemPtr; @@ -66,7 +66,7 @@ ApiStatus LoadItemScript(Evt* script, s32 isInitialCall) { ApiStatus LoadFreeItemScript(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Actor* actor = battleStatus->playerActor; - StaticItem* item = &gItemTable[battleStatus->selectedItemID]; + ItemData* item = &gItemTable[battleStatus->selectedItemID]; SelectableTarget* target; s32* itemPtr; s32 i; diff --git a/src/npc.c b/src/npc.c index 3097b72d3f..274a2bd9ff 100644 --- a/src/npc.c +++ b/src/npc.c @@ -1733,7 +1733,7 @@ void kill_enemy(Enemy* enemy) { INCLUDE_ASM(void, "npc", kill_enemy); #endif -s32 bind_enemy_ai(Enemy* enemy, EvtSource* aiScriptBytecode) { +s32 bind_enemy_ai(Enemy* enemy, EvtScript* aiScriptBytecode) { Evt* aiScript; s32 id; @@ -1747,7 +1747,7 @@ s32 bind_enemy_ai(Enemy* enemy, EvtSource* aiScriptBytecode) { return id; } -s32 bind_enemy_aux(Enemy* enemy, EvtSource* auxScriptBytecode) { +s32 bind_enemy_aux(Enemy* enemy, EvtScript* auxScriptBytecode) { Evt* auxScript; s32 id; @@ -1761,7 +1761,7 @@ s32 bind_enemy_aux(Enemy* enemy, EvtSource* auxScriptBytecode) { return id; } -s32 bind_enemy_interact(Enemy* enemy, EvtSource* interactScriptBytecode) { +s32 bind_enemy_interact(Enemy* enemy, EvtScript* interactScriptBytecode) { Evt* interactScript; s32 id; @@ -1775,7 +1775,7 @@ s32 bind_enemy_interact(Enemy* enemy, EvtSource* interactScriptBytecode) { return id; } -void bind_npc_ai(s32 npcID, EvtSource* npcAiBytecode) { +void bind_npc_ai(s32 npcID, EvtScript* npcAiBytecode) { EncounterStatus* currentEncounterStatus = &gCurrentEncounter; s32 i; s32 j; @@ -1794,7 +1794,7 @@ void bind_npc_ai(s32 npcID, EvtSource* npcAiBytecode) { } } -void bind_npc_aux(s32 npcID, EvtSource* npcAuxBytecode) { +void bind_npc_aux(s32 npcID, EvtScript* npcAuxBytecode) { EncounterStatus* currentEncounterStatus = &gCurrentEncounter; s32 i; s32 j; @@ -1813,7 +1813,7 @@ void bind_npc_aux(s32 npcID, EvtSource* npcAuxBytecode) { } } -void bind_npc_interact(s32 npcID, EvtSource* npcInteractBytecode) { +void bind_npc_interact(s32 npcID, EvtScript* npcInteractBytecode) { EncounterStatus* currentEncounterStatus = &gCurrentEncounter; s32 i; s32 j; diff --git a/src/pause/138CC0.c b/src/pause/138CC0.c index 9190ef43aa..351b44b055 100644 --- a/src/pause/138CC0.c +++ b/src/pause/138CC0.c @@ -8,7 +8,7 @@ typedef struct { s32 baseMsgID; } StatsEntryData; // size = 0xC -extern HudElementAnim* gStatsMenuElements[12]; +extern HudScript* gStatsMenuElements[12]; extern MenuWindowBP gStatsMenuWindowBPs[1]; extern StatsEntryData gStatsMenuEntries[11]; diff --git a/src/status_icons.c b/src/status_icons.c index 41808f3daa..8b0a25962a 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -73,41 +73,41 @@ extern s16 D_80078160[]; extern s16 D_80078164[]; extern s32 D_80078168[]; -extern HudElementAnim HudScript_Item_Present; +extern HudScript HudScript_Item_Present; extern PopupMessage D_800A0BC0[32]; extern s32 D_800A0F40; extern HudStatusIcon* D_800A0F44; -extern HudElementAnim HudScript_AsleepBegin; -extern HudElementAnim HudScript_AsleepEnd; -extern HudElementAnim HudScript_ElectrifiedBegin; -extern HudElementAnim HudScript_ElectrifiedEnd; -extern HudElementAnim HudScript_ParalyzedBegin; -extern HudElementAnim HudScript_ParalyzedEnd; -extern HudElementAnim HudScript_DizzyEnd; -extern HudElementAnim HudScript_PoisonedBegin; -extern HudElementAnim HudScript_PoisonedEnd; -extern HudElementAnim HudScript_DizzyBegin; -extern HudElementAnim HudScript_FrozenBegin; -extern HudElementAnim HudScript_FrozenEnd; -extern HudElementAnim HudScript_WeakenedLoop; -extern HudElementAnim HudScript_WeakenedBegin; -extern HudElementAnim HudScript_WeakenedEnd; -extern HudElementAnim HudScript_StoppedBegin; -extern HudElementAnim HudScript_StoppedEnd; -extern HudElementAnim HudScript_ShrunkBegin; -extern HudElementAnim HudScript_ShrunkEnd; -extern HudElementAnim HudScript_TransparentBegin; -extern HudElementAnim HudScript_TransparentEnd; -extern HudElementAnim HudScript_BoostJumpBegin; -extern HudElementAnim HudScript_BoostJumpEnd; -extern HudElementAnim HudScript_BoostHammerBegin; -extern HudElementAnim HudScript_BoostHammerEnd; -extern HudElementAnim HudScript_BoostPartner; -extern HudElementAnim HudScript_Surprise; -extern HudElementAnim HudScript_Peril; -extern HudElementAnim HudScript_Danger; +extern HudScript HudScript_AsleepBegin; +extern HudScript HudScript_AsleepEnd; +extern HudScript HudScript_ElectrifiedBegin; +extern HudScript HudScript_ElectrifiedEnd; +extern HudScript HudScript_ParalyzedBegin; +extern HudScript HudScript_ParalyzedEnd; +extern HudScript HudScript_DizzyEnd; +extern HudScript HudScript_PoisonedBegin; +extern HudScript HudScript_PoisonedEnd; +extern HudScript HudScript_DizzyBegin; +extern HudScript HudScript_FrozenBegin; +extern HudScript HudScript_FrozenEnd; +extern HudScript HudScript_WeakenedLoop; +extern HudScript HudScript_WeakenedBegin; +extern HudScript HudScript_WeakenedEnd; +extern HudScript HudScript_StoppedBegin; +extern HudScript HudScript_StoppedEnd; +extern HudScript HudScript_ShrunkBegin; +extern HudScript HudScript_ShrunkEnd; +extern HudScript HudScript_TransparentBegin; +extern HudScript HudScript_TransparentEnd; +extern HudScript HudScript_BoostJumpBegin; +extern HudScript HudScript_BoostJumpEnd; +extern HudScript HudScript_BoostHammerBegin; +extern HudScript HudScript_BoostHammerEnd; +extern HudScript HudScript_BoostPartner; +extern HudScript HudScript_Surprise; +extern HudScript HudScript_Peril; +extern HudScript HudScript_Danger; void update_merlee_message(PopupMessage* popup); diff --git a/src/trigger.c b/src/trigger.c index f7e0fa899e..5c7adffedd 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -1,7 +1,7 @@ #include "common.h" -void default_trigger_delegate(Trigger* self) { - self->flags.flags |= 2; +void default_trigger_on_activate(Trigger* self) { + self->flags.flags |= TRIGGER_ACTIVATED; } void clear_trigger_data(void) { @@ -46,8 +46,8 @@ void init_trigger_list(void) { gTriggerCount = 0; } -Trigger* create_trigger(TriggerDefinition* def) { - Trigger* ret; +Trigger* create_trigger(TriggerBlueprint* bp) { + Trigger* trigger; s32 i; for (i = 0; i < ARRAY_COUNT(*gCurrentTriggerListPtr); i++) { @@ -60,24 +60,24 @@ Trigger* create_trigger(TriggerDefinition* def) { ASSERT(i < ARRAY_COUNT(*gCurrentTriggerListPtr)); - (*gCurrentTriggerListPtr)[i] = ret = heap_malloc(sizeof(*ret)); + (*gCurrentTriggerListPtr)[i] = trigger = heap_malloc(sizeof(*trigger)); gTriggerCount++; - ASSERT(ret != NULL); + ASSERT(trigger != NULL); - ret->flags.flags = def->flags | TRIGGER_DEFINITION_FLAGS_1; - ret->params1 = def->colliderIndex; - ret->params2 = def->flagIndex; - ret->unk_28 = def->unk_1C; - ret->unk_2C = def->unk_14; - ret->unk_30 = def->inputArg3; + trigger->flags.flags = bp->flags | TRIGGER_ACTIVE; + trigger->varIndex = bp->varIndex; + trigger->location.colliderID = bp->colliderID; + trigger->itemList = bp->itemList; + trigger->unk_tr_2C = bp->unk_tr_2C; + trigger->hasPlayerInteractPrompt = bp->hasPlayerInteractPrompt; - ret->functionHandler = def->function; - if (ret->functionHandler == NULL) { - ret->functionHandler = default_trigger_delegate; + trigger->onActivateFunc = bp->onActivateFunc; + if (trigger->onActivateFunc == NULL) { + trigger->onActivateFunc = default_trigger_on_activate; } - return ret; + return trigger; } void update_triggers(void) { @@ -94,123 +94,123 @@ void update_triggers(void) { continue; } - if (!(listTrigger->flags.flags & 1)) { + if (!(listTrigger->flags.flags & TRIGGER_ACTIVE)) { continue; } - if (listTrigger->flags.flags & 0x10) { - listTrigger->flags.flags |= 2; + if (listTrigger->flags.flags & TRIGGER_FORCE_ACTIVATE) { + listTrigger->flags.flags |= TRIGGER_ACTIVATED; continue; } - if (listTrigger->flags.flags & 0x40) { - if (listTrigger->params2 == collisionStatus->currentWall) { + if (listTrigger->flags.flags & TRIGGER_WALL_PUSH) { + if (listTrigger->location.colliderID == collisionStatus->currentWall) { func_800E06C0(1); } - if (listTrigger->params2 == collisionStatus->pushingAgainstWall) { + if (listTrigger->location.colliderID == collisionStatus->pushingAgainstWall) { func_800E06C0(0); } else { continue; } } - if (listTrigger->flags.flags & 0x80) { - if (listTrigger->params2 != collisionStatus->currentFloor) { + if (listTrigger->flags.flags & TRIGGER_FLOOR_TOUCH) { + if (listTrigger->location.colliderID != collisionStatus->currentFloor) { continue; } } - if (listTrigger->flags.flags & 0x80000) { - if (listTrigger->params2 != collisionStatus->floorBelow) { + if (listTrigger->flags.flags & TRIGGER_FLOOR_ABOVE) { + if (listTrigger->location.colliderID != collisionStatus->floorBelow) { continue; } } - if (listTrigger->flags.flags & 0x100) { - if (listTrigger->params2 == collisionStatus->currentWall) { + if (listTrigger->flags.flags & TRIGGER_WALL_PRESS_A) { + if (listTrigger->location.colliderID == collisionStatus->currentWall) { collisionStatus->touchingWallTrigger = 1; } - if ((listTrigger->params2 != collisionStatus->unk_0A) || !phys_can_player_interact()) { + if ((listTrigger->location.colliderID != collisionStatus->unk_0A) || !phys_can_player_interact()) { continue; } } - if (listTrigger->flags.flags & 0x400) { - if (listTrigger->params2 != collisionStatus->currentWall) { + if (listTrigger->flags.flags & TRIGGER_WALL_TOUCH) { + if (listTrigger->location.colliderID != collisionStatus->currentWall) { continue; } } - if (listTrigger->flags.flags & 0x200) { - if (listTrigger->params2 != collisionStatus->lastTouchedFloor) { + if (listTrigger->flags.flags & TRIGGER_FLOOR_JUMP) { + if (listTrigger->location.colliderID != collisionStatus->lastTouchedFloor) { continue; } } - if (listTrigger->flags.flags & 0x800) { - if ((listTrigger->params2 != collisionStatus->currentFloor) || - !(gGameStatusPtr->pressedButtons & 0x8000) || (gPlayerStatus.flags & 0x2000)) { + if (listTrigger->flags.flags & TRIGGER_FLOOR_PRESS_A) { + if ((listTrigger->location.colliderID != collisionStatus->currentFloor) || + !(gGameStatusPtr->pressedButtons & BUTTON_A) || (gPlayerStatus.flags & PLAYER_STATUS_FLAGS_INPUT_DISABLED)) { continue; } } - if (listTrigger->flags.flags & 0x1000) { - if (listTrigger->params2 != collisionStatus->lastWallHammered) { + if (listTrigger->flags.flags & TRIGGER_WALL_HAMMER) { + if (listTrigger->location.colliderID != collisionStatus->lastWallHammered) { continue; } } - if (listTrigger->flags.flags & 0x40000) { - if (listTrigger->params2 != collisionStatus->currentCeiling) { + if (listTrigger->flags.flags & TRIGGER_CEILING_TOUCH) { + if (listTrigger->location.colliderID != collisionStatus->currentCeiling) { continue; } } - if (listTrigger->flags.flags & 0x2000) { - if (listTrigger->params2 != collisionStatus->unk_0C) { + if (listTrigger->flags.flags & TRIGGER_FLAGS_2000) { + if (listTrigger->location.colliderID != collisionStatus->unk_0C) { continue; } } - if (listTrigger->flags.flags & 0x4000) { - if (listTrigger->params2 != collisionStatus->unk_0E) { + if (listTrigger->flags.flags & TRIGGER_FLAGS_4000) { + if (listTrigger->location.colliderID != collisionStatus->unk_0E) { continue; } } - if (listTrigger->flags.flags & 0x8000) { - if (listTrigger->params2 != collisionStatus->unk_10) { + if (listTrigger->flags.flags & TRIGGER_FLAGS_8000) { + if (listTrigger->location.colliderID != collisionStatus->unk_10) { continue; } } - if (listTrigger->flags.flags & 0x100000) { - f32* floats; + if (listTrigger->flags.flags & TRIGGER_POINT_BOMB) { + Vec4f* triggerPos; f32 dist; if (collisionStatus->bombetteExploded < 0) { continue; } - floats = (f32*)listTrigger->params2; - dist = dist3D(floats[0], floats[1], floats[2], + triggerPos = listTrigger->location.position; + dist = dist3D(triggerPos->x, triggerPos->y, triggerPos->z, collisionStatus->bombetteExplosionPos.x, collisionStatus->bombetteExplosionPos.y, collisionStatus->bombetteExplosionPos.z); - if ((floats[3] * 0.5f) + 50.0f < dist) { + if ((triggerPos->yaw * 0.5f) + 50.0f < dist) { continue; } } - if (listTrigger->flags.flags & 0x10000 && get_global_flag(listTrigger->params1) == 0) { + if (listTrigger->flags.flags & TRIGGER_GAME_FLAG_SET && get_global_flag(listTrigger->varIndex) == 0) { continue; } - if (listTrigger->flags.flags & 0x20000 && get_area_flag(listTrigger->params1) == 0) { + if (listTrigger->flags.flags & TRIGGER_AREA_FLAG_SET && get_area_flag(listTrigger->varIndex) == 0) { continue; } - listTrigger->flags.flags |= 2; + listTrigger->flags.flags |= TRIGGER_ACTIVATED; } for (i = 0; i < ARRAY_COUNT(*gCurrentTriggerListPtr); i++) { @@ -220,10 +220,10 @@ void update_triggers(void) { continue; } - if (listTrigger->flags.flags & 1) { - if (listTrigger->flags.flags & 2) { - if (listTrigger->functionHandler(listTrigger) == 0) { - listTrigger->flags.flags &= ~2; + if (listTrigger->flags.flags & TRIGGER_ACTIVE) { + if (listTrigger->flags.flags & TRIGGER_ACTIVATED) { + if (listTrigger->onActivateFunc(listTrigger) == 0) { + listTrigger->flags.flags &= ~TRIGGER_ACTIVATED; } } } @@ -245,7 +245,7 @@ void delete_trigger(Trigger* toDelete) { } } -s32 is_trigger_bound(Trigger* trigger, EvtSource* script) { +s32 is_another_trigger_bound(Trigger* trigger, EvtScript* script) { s32 i; for (i = 0; i < ARRAY_COUNT(*gCurrentTriggerListPtr); i++) { @@ -255,9 +255,9 @@ s32 is_trigger_bound(Trigger* trigger, EvtSource* script) { continue; } - if (listTrigger->flags.flags & 1) { - if (listTrigger->flags.flags & 2) { - if (listTrigger->scriptSource == script) { + if (listTrigger->flags.flags & TRIGGER_ACTIVE) { + if (listTrigger->flags.flags & TRIGGER_ACTIVATED) { + if (listTrigger->onTriggerEvt == script) { return TRUE; } } @@ -283,9 +283,9 @@ s32 should_collider_allow_interact(s32 colliderID) { Trigger* trigger = (*gCurrentTriggerListPtr)[i]; if (trigger != NULL && - trigger->unk_30 != 0 && - trigger->params2 == colliderID && - trigger->flags.flags & 0x100) { + trigger->hasPlayerInteractPrompt != 0 && + trigger->location.colliderID == colliderID && + trigger->flags.flags & TRIGGER_WALL_PRESS_A) { return TRUE; } } diff --git a/src/world/area_arn/arn_02/arn_02.h b/src/world/area_arn/arn_02/arn_02.h index d47b914f7d..04bc9fef6f 100644 --- a/src/world/area_arn/arn_02/arn_02.h +++ b/src/world/area_arn/arn_02/arn_02.h @@ -10,7 +10,7 @@ s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3); ApiStatus N(func_80240C90_BDDE40)(Evt *script, s32 isInitialCall); -extern EvtSource N(main); -extern EvtSource N(80241040); +extern EvtScript N(main); +extern EvtScript N(80241040); extern NpcGroupList N(npcGroupList_80241A9C); -extern EvtSource N(makeEntities); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index 1b43644b6d..605ee74a10 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -3,18 +3,18 @@ #include "sprite/npc/goomba.h" #include "effects.h" -EvtSource N(exitWalk_802410F0) = EXIT_WALK_SCRIPT(60, 0, "arn_05", 1); +EvtScript N(exitWalk_802410F0) = EXIT_WALK_SCRIPT(60, 0, "arn_05", 1); -EvtSource N(exitWalk_8024114C) = EXIT_WALK_SCRIPT(60, 1, "arn_04", 0); +EvtScript N(exitWalk_8024114C) = EXIT_WALK_SCRIPT(60, 1, "arn_04", 0); -EvtSource N(802411A8) = { +EvtScript N(802411A8) = { EVT_BIND_TRIGGER(N(exitWalk_802410F0), TRIGGER_FLOOR_ABOVE, 1, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024114C), TRIGGER_FLOOR_ABOVE, 6, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 34) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -34,7 +34,7 @@ static s32 N(pad_12C4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_DIZZY_DIAL, -248, 193, 45, 17, EVT_SAVE_FLAG(1005)) EVT_CALL(MakeItemEntity, ITEM_LETTER07, 536, 260, 227, 17, EVT_SAVE_FLAG(1006)) EVT_CALL(MakeEntity, 0x802EA564, -350, 172, 170, 0, 343, MAKE_ENTITY_END) @@ -60,7 +60,7 @@ NpcAISettings N(npcAISettings_802413D0) = { .unk_2C = 1, }; -EvtSource N(npcAI_80241400) = { +EvtScript N(npcAI_80241400) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_802413D0))) EVT_RETURN EVT_END @@ -89,7 +89,7 @@ NpcAISettings N(npcAISettings_8024144C) = { .unk_2C = 1, }; -EvtSource N(npcAI_8024147C) = { +EvtScript N(npcAI_8024147C) = { EVT_CALL(N(func_80240C90_BDDE40), EVT_PTR(N(npcAISettings_8024144C)), 8) EVT_RETURN EVT_END diff --git a/src/world/area_arn/arn_02/header.c b/src/world/area_arn/arn_02/header.c index 7ab6f4ed4d..4d36daad4a 100644 --- a/src/world/area_arn/arn_02/header.c +++ b/src/world/area_arn/arn_02/header.c @@ -14,7 +14,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_02_tattle }, }; -EvtSource N(80241040) = { +EvtScript N(80241040) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) diff --git a/src/world/area_arn/arn_03/arn_03.h b/src/world/area_arn/arn_03/arn_03.h index d6ab0560a3..d4b86042ab 100644 --- a/src/world/area_arn/arn_03/arn_03.h +++ b/src/world/area_arn/arn_03/arn_03.h @@ -14,8 +14,8 @@ ApiStatus N(func_80241680_BE0410)(Evt* script, s32 isInitialCall); ApiStatus N(func_802415F4_BE0384)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall); -extern EvtSource N(main); -extern EvtSource N(80241780); +extern EvtScript N(main); +extern EvtScript N(80241780); extern NpcGroupList N(npcGroupList_80244740); extern NpcGroupList N(npcGroupList_80244788); -extern EvtSource N(makeEntities); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index dc797d1983..f11b7245a3 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -4,18 +4,18 @@ static s32 N(D_80244A20)[112]; -EvtSource N(exitWalk_80241830) = EXIT_WALK_SCRIPT(60, 0, "arn_07", 1); +EvtScript N(exitWalk_80241830) = EXIT_WALK_SCRIPT(60, 0, "arn_07", 1); -EvtSource N(exitWalk_8024188C) = EXIT_WALK_SCRIPT(60, 1, "arn_05", 0); +EvtScript N(exitWalk_8024188C) = EXIT_WALK_SCRIPT(60, 1, "arn_05", 0); -EvtSource N(802418E8) = { +EvtScript N(802418E8) = { EVT_BIND_TRIGGER(N(exitWalk_80241830), TRIGGER_FLOOR_ABOVE, 1, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024188C), TRIGGER_FLOOR_ABOVE, 5, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterWalk_80241930) = { +EvtScript N(enterWalk_80241930) = { EVT_CALL(GetLoadType, EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(1), 1) EVT_EXEC(EnterSavePoint) @@ -38,7 +38,7 @@ EvtSource N(enterWalk_80241930) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 34) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -80,7 +80,7 @@ NpcAISettings N(npcAISettings_80241BC0) = { .unk_2C = 1, }; -EvtSource N(npcAI_80241BF0) = { +EvtScript N(npcAI_80241BF0) = { EVT_CALL(N(func_8024113C_BDFECC), EVT_PTR(N(npcAISettings_80241BC0))) EVT_RETURN EVT_END @@ -221,14 +221,14 @@ ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall) { #include "world/common/StashVars.inc.c" -EvtSource N(80241C6C) = { +EvtScript N(80241C6C) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(80241C9C) = { +EvtScript N(80241C9C) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 16) EVT_RETURN EVT_RETURN @@ -243,7 +243,7 @@ s32 N(D_80241CD0_BE0A60) = { 0x00000000, }; -EvtSource N(80241CD4) = { +EvtScript N(80241CD4) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowKeyChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -268,7 +268,7 @@ EvtSource N(80241CD4) = { EVT_END }; -EvtSource N(80241E18) = { +EvtScript N(80241E18) = { EVT_CALL(N(func_80241680_BE0410), EVT_VAR(0)) EVT_BIND_PADLOCK(N(80241CD4), 0x10, 0, EVT_PTR(N(D_80244A20)), 0, 1) EVT_CALL(N(func_802415F4_BE0384), EVT_VAR(0)) @@ -276,7 +276,7 @@ EvtSource N(80241E18) = { EVT_END }; -EvtSource N(80241E68) = { +EvtScript N(80241E68) = { EVT_CALL(SetPlayerAnimation, ANIM_10002) EVT_WAIT_FRAMES(1) EVT_CALL(SetPlayerAnimation, ANIM_80007) @@ -285,7 +285,7 @@ EvtSource N(80241E68) = { EVT_END }; -EvtSource N(interact_80241EB0) = { +EvtScript N(interact_80241EB0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_IF_EQ(EVT_AREA_FLAG(2), 0) @@ -313,7 +313,7 @@ EvtSource N(interact_80241EB0) = { EVT_END }; -EvtSource N(idle_80242064) = { +EvtScript N(idle_80242064) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(25) EVT_THREAD @@ -379,7 +379,7 @@ EvtSource N(idle_80242064) = { EVT_END }; -EvtSource N(init_802424E0) = { +EvtScript N(init_802424E0) = { EVT_IF_LT(EVT_SAVE_VAR(0), -34) EVT_CALL(SetNpcPos, NPC_SELF, 175, 240, 145) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80242064))) @@ -389,7 +389,7 @@ EvtSource N(init_802424E0) = { EVT_END }; -EvtSource N(interact_8024254C) = { +EvtScript N(interact_8024254C) = { EVT_IF_NE(EVT_MAP_VAR(0), 0) EVT_IF_GE(EVT_MAP_VAR(0), EVT_MAP_VAR(1)) EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0081)) @@ -447,13 +447,13 @@ EvtSource N(interact_8024254C) = { EVT_END }; -EvtSource N(init_802428A8) = { +EvtScript N(init_802428A8) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024254C))) EVT_RETURN EVT_END }; -EvtSource N(802428CC) = { +EvtScript N(802428CC) = { EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_IF_GT(EVT_VAR(0), EVT_VAR(3)) @@ -471,7 +471,7 @@ EvtSource N(802428CC) = { EVT_END }; -EvtSource N(802429D4) = { +EvtScript N(802429D4) = { EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_IF_GT(EVT_VAR(0), EVT_VAR(3)) @@ -494,7 +494,7 @@ EvtSource N(802429D4) = { EVT_END }; -EvtSource N(80242B0C) = { +EvtScript N(80242B0C) = { EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_IF_GT(EVT_VAR(0), EVT_VAR(3)) @@ -518,7 +518,7 @@ EvtSource N(80242B0C) = { EVT_END }; -EvtSource N(80242C60) = { +EvtScript N(80242C60) = { EVT_EXEC_WAIT(N(802429D4)) EVT_SET(EVT_MAP_VAR(2), 0) EVT_SET(EVT_MAP_VAR(3), 0) @@ -547,7 +547,7 @@ EvtSource N(80242C60) = { EVT_END }; -EvtSource N(interact_80242DC4) = { +EvtScript N(interact_80242DC4) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_IF_EQ(EVT_AREA_FLAG(4), 0) @@ -604,13 +604,13 @@ EvtSource N(interact_80242DC4) = { EVT_END }; -EvtSource N(init_802431A4) = { +EvtScript N(init_802431A4) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80242DC4))) EVT_RETURN EVT_END }; -EvtSource N(interact_802431C8) = { +EvtScript N(interact_802431C8) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_IF_EQ(EVT_AREA_FLAG(5), 0) @@ -633,13 +633,13 @@ EvtSource N(interact_802431C8) = { EVT_END }; -EvtSource N(init_80243328) = { +EvtScript N(init_80243328) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802431C8))) EVT_RETURN EVT_END }; -EvtSource N(init_8024334C) = { +EvtScript N(init_8024334C) = { EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_RETURN EVT_END @@ -801,7 +801,7 @@ StaticNpc N(npcGroup_80243B38) = { }, }; -EvtSource N(idle_80243D28) = { +EvtScript N(idle_80243D28) = { EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_SET(EVT_VAR(3), EVT_VAR(0)) EVT_ADD(EVT_VAR(3), -60) @@ -825,28 +825,28 @@ EvtSource N(idle_80243D28) = { EVT_END }; -EvtSource N(init_80243E90) = { +EvtScript N(init_80243E90) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80243D28))) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_HAS_SHADOW)), FALSE) EVT_RETURN EVT_END }; -EvtSource N(init_80243ECC) = { +EvtScript N(init_80243ECC) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80243D28))) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_HAS_SHADOW)), FALSE) EVT_RETURN EVT_END }; -EvtSource N(init_80243F08) = { +EvtScript N(init_80243F08) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80243D28))) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_HAS_SHADOW)), FALSE) EVT_RETURN EVT_END }; -EvtSource N(init_80243F44) = { +EvtScript N(init_80243F44) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80243D28))) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_HAS_SHADOW)), FALSE) EVT_RETURN @@ -995,7 +995,7 @@ static s32 N(pad_47DC) = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA564, 300, 237, 60, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1007)) EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 250, 237, 125, 0, MAKE_ENTITY_END) diff --git a/src/world/area_arn/arn_03/header.c b/src/world/area_arn/arn_03/header.c index 7ed887501c..60000e9cf7 100644 --- a/src/world/area_arn/arn_03/header.c +++ b/src/world/area_arn/arn_03/header.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_03_tattle }, }; -EvtSource N(80241780) = { +EvtScript N(80241780) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) diff --git a/src/world/area_arn/arn_04/arn_04.h b/src/world/area_arn/arn_04/arn_04.h index 9c04a30ea8..9aa3a88180 100644 --- a/src/world/area_arn/arn_04/arn_04.h +++ b/src/world/area_arn/arn_04/arn_04.h @@ -12,7 +12,7 @@ ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024219C_BE594C)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243018_BE67C8)(Evt* script, s32 isInitialCall); -extern EvtSource N(main); -extern EvtSource N(802433D0); +extern EvtScript N(main); +extern EvtScript N(802433D0); extern NpcGroupList N(npcGroupList_80244000); -extern EvtSource N(makeEntities); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index d6bb272d9b..43c4b0dcc9 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -4,18 +4,18 @@ #include "sprite/npc/cleft.h" #include "effects.h" -EvtSource N(exitWalk_80243480) = EXIT_WALK_SCRIPT(60, 0, "arn_02", 1); +EvtScript N(exitWalk_80243480) = EXIT_WALK_SCRIPT(60, 0, "arn_02", 1); -EvtSource N(exitWalk_802434DC) = EXIT_WALK_SCRIPT(60, 1, "dgb_00", 0); +EvtScript N(exitWalk_802434DC) = EXIT_WALK_SCRIPT(60, 1, "dgb_00", 0); -EvtSource N(80243538) = { +EvtScript N(80243538) = { EVT_BIND_TRIGGER(N(exitWalk_80243480), TRIGGER_FLOOR_ABOVE, 1, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_802434DC), TRIGGER_FLOOR_ABOVE, 6, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 34) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -48,7 +48,7 @@ NpcAISettings N(npcAISettings_80243660) = { .unk_2C = 1, }; -EvtSource N(npcAI_80243690) = { +EvtScript N(npcAI_80243690) = { EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_80243660))) EVT_RETURN EVT_END @@ -81,7 +81,7 @@ NpcAISettings N(npcAISettings_802436F4) = { .unk_2C = 1, }; -EvtSource N(npcAI_80243724) = { +EvtScript N(npcAI_80243724) = { EVT_CALL(SetSelfVar, 0, 1) EVT_CALL(SetSelfVar, 5, -850) EVT_CALL(SetSelfVar, 6, 60) @@ -115,7 +115,7 @@ NpcAISettings N(npcAISettings_802437C0) = { .unk_2C = 1, }; -EvtSource N(npcAI_802437F0) = { +EvtScript N(npcAI_802437F0) = { EVT_CALL(N(func_80243018_BE67C8), EVT_PTR(N(npcAISettings_802437C0)), 8) EVT_RETURN EVT_END @@ -276,7 +276,7 @@ static s32 N(pad_403C)[] = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA564, 450, 285, 120, 0, 140, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1008)) EVT_CALL(MakeEntity, 0x802EA564, 720, 333, 75, 0, 343, MAKE_ENTITY_END) diff --git a/src/world/area_arn/arn_04/header.c b/src/world/area_arn/arn_04/header.c index c85c752e09..bb76fc76c2 100644 --- a/src/world/area_arn/arn_04/header.c +++ b/src/world/area_arn/arn_04/header.c @@ -14,7 +14,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_04_tattle }, }; -EvtSource N(802433D0) = { +EvtScript N(802433D0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) diff --git a/src/world/area_arn/arn_05/arn_05.h b/src/world/area_arn/arn_05/arn_05.h index c6943c62cb..1c3e6202cc 100644 --- a/src/world/area_arn/arn_05/arn_05.h +++ b/src/world/area_arn/arn_05/arn_05.h @@ -13,9 +13,9 @@ ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall); ApiStatus N(func_802412B0_BE8E90)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024113C_BE8D1C)(Evt* script, s32 isInitialCall); -extern EvtSource N(makeEntities); -extern EvtSource N(main); -extern EvtSource N(80241360); -extern EvtSource N(802441FC); +extern EvtScript N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(80241360); +extern EvtScript N(802441FC); extern NpcGroupList N(npcGroupList_80244FC8); extern NpcGroupList N(npcGroupList_80244FA4); diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 773fbea612..3d07020c5d 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -16,18 +16,18 @@ enum { NPC_BOO8, }; -EvtSource N(exitWalk_80241430) = EXIT_WALK_SCRIPT(60, 0, "arn_03", 1); +EvtScript N(exitWalk_80241430) = EXIT_WALK_SCRIPT(60, 0, "arn_03", 1); -EvtSource N(exitWalk_8024148C) = EXIT_WALK_SCRIPT(60, 1, "arn_02", 0); +EvtScript N(exitWalk_8024148C) = EXIT_WALK_SCRIPT(60, 1, "arn_02", 0); -EvtSource N(802414E8) = { +EvtScript N(802414E8) = { EVT_BIND_TRIGGER(N(exitWalk_80241430), TRIGGER_FLOOR_ABOVE, 1, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024148C), TRIGGER_FLOOR_ABOVE, 5, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterWalk_80241530) = { +EvtScript N(enterWalk_80241530) = { EVT_CALL(GetLoadType, EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(1), 1) EVT_EXEC(EnterSavePoint) @@ -41,7 +41,7 @@ EvtSource N(enterWalk_80241530) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 34) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -84,7 +84,7 @@ NpcAISettings N(npcAISettings_802416DC) = { .unk_2C = 1, }; -EvtSource N(npcAI_8024170C) = { +EvtScript N(npcAI_8024170C) = { EVT_CALL(N(func_8024113C_BE8D1C), EVT_PTR(N(npcAISettings_802416DC))) EVT_RETURN EVT_END @@ -103,12 +103,12 @@ NpcSettings N(npcSettings_80241758) = { .level = 99, }; -EvtSource N(idle_80241784) = { +EvtScript N(idle_80241784) = { EVT_RETURN EVT_END }; -EvtSource N(interact_80241794) = { +EvtScript N(interact_80241794) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_IF_EQ(EVT_AREA_FLAG(6), 0) @@ -131,13 +131,13 @@ EvtSource N(interact_80241794) = { EVT_END }; -EvtSource N(interact_802418F4) = { +EvtScript N(interact_802418F4) = { EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x0094)) EVT_RETURN EVT_END }; -EvtSource N(interact_80241924) = { +EvtScript N(interact_80241924) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_IF_EQ(EVT_AREA_FLAG(7), 0) @@ -160,13 +160,13 @@ EvtSource N(interact_80241924) = { EVT_END }; -EvtSource N(interact_80241A84) = { +EvtScript N(interact_80241A84) = { EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x009B)) EVT_RETURN EVT_END }; -EvtSource N(interact_80241AB4) = { +EvtScript N(interact_80241AB4) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_CASE_LT(-16) @@ -210,7 +210,7 @@ EvtSource N(interact_80241AB4) = { EVT_END }; -EvtSource N(interact_80241D88) = { +EvtScript N(interact_80241D88) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_CASE_LT(-16) @@ -224,7 +224,7 @@ EvtSource N(interact_80241D88) = { EVT_END }; -EvtSource N(interact_80241E28) = { +EvtScript N(interact_80241E28) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-26) EVT_IF_EQ(EVT_AREA_FLAG(8), 0) @@ -247,13 +247,13 @@ EvtSource N(interact_80241E28) = { EVT_END }; -EvtSource N(interact_80241F88) = { +EvtScript N(interact_80241F88) = { EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00B5)) EVT_RETURN EVT_END }; -EvtSource N(init_80241FB8) = { +EvtScript N(init_80241FB8) = { EVT_IF_LT(EVT_SAVE_VAR(0), -33) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80241784))) EVT_END_IF @@ -262,13 +262,13 @@ EvtSource N(init_80241FB8) = { EVT_END }; -EvtSource N(init_80242008) = { +EvtScript N(init_80242008) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80241924))) EVT_RETURN EVT_END }; -EvtSource N(init_8024202C) = { +EvtScript N(init_8024202C) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80241AB4))) EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-33) @@ -288,7 +288,7 @@ EvtSource N(init_8024202C) = { EVT_END }; -EvtSource N(init_8024212C) = { +EvtScript N(init_8024212C) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80241D88))) EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-33) @@ -306,7 +306,7 @@ EvtSource N(init_8024212C) = { EVT_END }; -EvtSource N(init_802421EC) = { +EvtScript N(init_802421EC) = { EVT_IF_LT(EVT_SAVE_VAR(0), -33) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80241784))) EVT_END_IF @@ -470,7 +470,7 @@ StaticNpc N(npcGroup_8024223C)[] = { }, }; -EvtSource N(80242BEC) = { +EvtScript N(80242BEC) = { EVT_LOOP(EVT_VAR(0)) EVT_CALL(PlaySoundAtNpc, 5, SOUND_20F6, 0) EVT_CALL(ShakeCam, 0, 0, 10, EVT_FIXED(0.5)) @@ -480,7 +480,7 @@ EvtSource N(80242BEC) = { EVT_END }; -EvtSource N(80242C50) = { +EvtScript N(80242C50) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(NpcFacePlayer, 2, 1) EVT_CALL(PlaySoundAtNpc, 2, SOUND_262, 0) @@ -744,7 +744,7 @@ EvtSource N(80242C50) = { EVT_END }; -EvtSource N(802441FC) = { +EvtScript N(802441FC) = { EVT_IF_LT(EVT_SAVE_VAR(0), -33) EVT_CALL(SetNpcPos, 2, 330, 184, 240) EVT_LOOP(0) @@ -772,7 +772,7 @@ EvtSource N(802441FC) = { EVT_END }; -EvtSource N(init_80244358) = { +EvtScript N(init_80244358) = { EVT_IF_GE(EVT_SAVE_VAR(0), -33) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -821,7 +821,7 @@ StaticNpc N(npcGroup_802443AC) = { .extraAnimations = N(extraAnimationList_80244390), }; -EvtSource N(idle_8024459C) = { +EvtScript N(idle_8024459C) = { EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_SET(EVT_VAR(3), EVT_VAR(0)) EVT_ADD(EVT_VAR(3), -60) @@ -845,28 +845,28 @@ EvtSource N(idle_8024459C) = { EVT_END }; -EvtSource N(init_80244704) = { +EvtScript N(init_80244704) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024459C))) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END }; -EvtSource N(init_8024473C) = { +EvtScript N(init_8024473C) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024459C))) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END }; -EvtSource N(init_80244774) = { +EvtScript N(init_80244774) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024459C))) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN EVT_END }; -EvtSource N(init_802447AC) = { +EvtScript N(init_802447AC) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024459C))) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_RETURN @@ -1009,7 +1009,7 @@ static s32 N(pad_4FF8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA7E0, 17, 238, 80, 0, MAKE_ENTITY_END) EVT_RETURN EVT_END diff --git a/src/world/area_arn/arn_05/header.c b/src/world/area_arn/arn_05/header.c index e2cc314b02..ff807eb556 100644 --- a/src/world/area_arn/arn_05/header.c +++ b/src/world/area_arn/arn_05/header.c @@ -14,7 +14,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_05_tattle }, }; -EvtSource N(80241360) = { +EvtScript N(80241360) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-33) EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index a6a8f4ddb2..36162ba9a3 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -10,7 +10,7 @@ s32 N(itemList_80242040)[] = { ITEM_NONE, }; -EvtSource N(80242048) = { +EvtScript N(80242048) = { EVT_CALL(FadeOutMusic, 0, 1000) EVT_SET(EVT_VAR(0), 0) EVT_IF_EQ(EVT_VAR(0), 0) @@ -79,7 +79,7 @@ EvtSource N(80242048) = { EVT_END }; -EvtSource N(80242498) = { +EvtScript N(80242498) = { EVT_SET(EVT_VAR(0), 1) EVT_IF_EQ(EVT_VAR(0), 0) EVT_CALL(DisablePlayerInput, TRUE) @@ -147,7 +147,7 @@ EvtSource N(80242498) = { EVT_END }; -EvtSource N(exitSingleDoor_802428D4) = { +EvtScript N(exitSingleDoor_802428D4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) @@ -162,13 +162,13 @@ EvtSource N(exitSingleDoor_802428D4) = { EVT_END }; -EvtSource N(exitWalk_80242978) = EXIT_WALK_SCRIPT(60, 1, "arn_03", 0); +EvtScript N(exitWalk_80242978) = EXIT_WALK_SCRIPT(60, 1, "arn_03", 0); -EvtSource N(exitWalk_802429D4) = EXIT_WALK_SCRIPT(60, 2, "mim_12", 1); +EvtScript N(exitWalk_802429D4) = EXIT_WALK_SCRIPT(60, 2, "mim_12", 1); static const f64 rodata_alignment = 0.0; -EvtSource N(80242A30) = { +EvtScript N(80242A30) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerPos, -28, 0, -333) @@ -305,7 +305,7 @@ EvtSource N(80242A30) = { EVT_END }; -EvtSource N(802433C8) = { +EvtScript N(802433C8) = { EVT_BIND_TRIGGER(N(exitWalk_80242978), TRIGGER_FLOOR_ABOVE, 5, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_802429D4), TRIGGER_FLOOR_ABOVE, 1, 1, 0) EVT_IF_LT(EVT_SAVE_VAR(0), -24) @@ -317,7 +317,7 @@ EvtSource N(802433C8) = { EVT_END }; -EvtSource N(enterWalk_8024346C) = { +EvtScript N(enterWalk_8024346C) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -346,7 +346,7 @@ EvtSource N(enterWalk_8024346C) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 34) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) diff --git a/src/world/area_arn/arn_07/arn_07.h b/src/world/area_arn/arn_07/arn_07.h index b2fa332b68..f01e8cf914 100644 --- a/src/world/area_arn/arn_07/arn_07.h +++ b/src/world/area_arn/arn_07/arn_07.h @@ -36,14 +36,14 @@ ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall); ApiStatus PostChapter3StatUpdate(Evt* script, s32 isInitialCall); -extern EvtSource N(exitSingleDoor_802428D4); +extern EvtScript N(exitSingleDoor_802428D4); extern NpcGroupList N(npcGroupList_8024787C); extern NpcGroupList N(npcGroupList_802478B8); extern NpcGroupList N(npcGroupList_802478E8); -extern EvtSource N(80243790); -extern EvtSource N(802437AC); -extern EvtSource N(802439B0); -extern EvtSource N(80242048); -extern EvtSource N(80241F10); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80243790); +extern EvtScript N(802437AC); +extern EvtScript N(802439B0); +extern EvtScript N(80242048); +extern EvtScript N(80241F10); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index be8697e5d3..4ade795a78 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -7,13 +7,13 @@ #include "sprite/npc/boo.h" #include "sprite/npc/bootler.h" -EvtSource N(80243790) = { +EvtScript N(80243790) = { EVT_EXEC(N(802437AC)) EVT_RETURN EVT_END }; -EvtSource N(802437AC) = { +EvtScript N(802437AC) = { EVT_SETF(EVT_VAR(0), EVT_FIXED(0.0)) EVT_SET(EVT_VAR(1), 30) EVT_CALL(PlaySoundAtModel, 23, 0x8000004A, 0) @@ -50,7 +50,7 @@ EvtSource N(802437AC) = { EVT_END }; -EvtSource N(802439B0) = { +EvtScript N(802439B0) = { EVT_SET_GROUP(0) EVT_CALL(SetTimeFreezeMode, 1) EVT_CALL(ShowKeyChoicePopup) @@ -79,13 +79,13 @@ EvtSource N(802439B0) = { EVT_END }; -EvtSource N(80243B28) = { +EvtScript N(80243B28) = { EVT_BIND_TRIGGER(N(exitSingleDoor_802428D4), TRIGGER_WALL_PRESS_A, 10, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_LT(EVT_SAVE_VAR(0), -24) EVT_CALL(MakeEntity, 0x802BCD68, 10, 30, -155, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80243B28))) @@ -113,7 +113,7 @@ NpcAISettings N(npcAISettings_80243BD8) = { .unk_2C = 1, }; -EvtSource N(npcAI_80243C08) = { +EvtScript N(npcAI_80243C08) = { EVT_CALL(SetSelfVar, 0, 1) EVT_CALL(SetSelfVar, 5, -850) EVT_CALL(SetSelfVar, 6, 60) @@ -133,12 +133,12 @@ NpcSettings N(npcSettings_80243C78) = { .unk_2A = 1, }; -EvtSource N(80243CA4) = { +EvtScript N(80243CA4) = { EVT_RETURN EVT_END }; -EvtSource N(80243CB4) = { +EvtScript N(80243CB4) = { EVT_RETURN EVT_END }; @@ -183,7 +183,7 @@ NpcSettings N(npcSettings_80243DA0) = { .level = 99, }; -EvtSource N(80243DCC) = { +EvtScript N(80243DCC) = { EVT_LOOP(0) EVT_CALL(PlaySoundAtNpc, 1, SOUND_20F6, 0) EVT_CALL(ShakeCam, 0, 0, 3, EVT_FIXED(0.8)) @@ -192,7 +192,7 @@ EvtSource N(80243DCC) = { EVT_END }; -EvtSource N(80243E24) = { +EvtScript N(80243E24) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseSettingsFrom, 0, 236, 0, -46) EVT_CALL(SetCamSpeed, 0, EVT_FIXED(90.0)) @@ -217,7 +217,7 @@ EvtSource N(80243E24) = { EVT_END }; -EvtSource N(80243FE8) = { +EvtScript N(80243FE8) = { EVT_WAIT_FRAMES(10) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_world_tubba_Palette_00_Anim_22) EVT_WAIT_FRAMES(15) @@ -407,7 +407,7 @@ EvtSource N(80243FE8) = { EVT_END }; -EvtSource N(idle_80244C54) = { +EvtScript N(idle_80244C54) = { EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 1) @@ -420,7 +420,7 @@ EvtSource N(idle_80244C54) = { EVT_END }; -EvtSource N(idle_80244CC8) = { +EvtScript N(idle_80244CC8) = { EVT_LABEL(10) EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) @@ -472,7 +472,7 @@ EvtSource N(idle_80244CC8) = { EVT_END }; -EvtSource N(defeat_80244FB8) = { +EvtScript N(defeat_80244FB8) = { EVT_CALL(SetEncounterStatusFlags, 2, 1) EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -487,7 +487,7 @@ EvtSource N(defeat_80244FB8) = { EVT_END }; -EvtSource N(init_80245058) = { +EvtScript N(init_80245058) = { EVT_IF_NE(EVT_SAVE_VAR(0), -17) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -495,7 +495,7 @@ EvtSource N(init_80245058) = { EVT_END }; -EvtSource N(init_80245090) = { +EvtScript N(init_80245090) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80244C54))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80244FB8))) @@ -506,7 +506,7 @@ EvtSource N(init_80245090) = { EVT_END }; -EvtSource N(init_80245104) = { +EvtScript N(init_80245104) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80244CC8))) EVT_IF_NE(EVT_SAVE_VAR(0), -17) @@ -516,7 +516,7 @@ EvtSource N(init_80245104) = { EVT_END }; -EvtSource N(init_80245164) = { +EvtScript N(init_80245164) = { EVT_IF_NE(EVT_SAVE_VAR(0), -17) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -524,7 +524,7 @@ EvtSource N(init_80245164) = { EVT_END }; -EvtSource N(init_8024519C) = { +EvtScript N(init_8024519C) = { EVT_IF_NE(EVT_SAVE_VAR(0), -17) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -559,7 +559,7 @@ s32 N(extraAnimationList_80245208)[] = { ANIM_END, }; -EvtSource N(idle_80245210) = { +EvtScript N(idle_80245210) = { EVT_LOOP(0) EVT_LOOP(10) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -578,7 +578,7 @@ EvtSource N(idle_80245210) = { EVT_END }; -EvtSource N(80245304) = { +EvtScript N(80245304) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(func_802CF56C, 2) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -714,7 +714,7 @@ EvtSource N(80245304) = { EVT_END }; -EvtSource N(init_80245C9C) = { +EvtScript N(init_80245C9C) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 3) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80245210))) @@ -1032,7 +1032,7 @@ StaticNpc N(npcGroup_80246E7C) = { .extraAnimations = N(extraAnimationList_80245208), }; -EvtSource N(init_8024706C) = { +EvtScript N(init_8024706C) = { EVT_IF_GE(EVT_SAVE_VAR(0), -26) EVT_IF_LT(EVT_SAVE_VAR(0), -15) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_arn/arn_07/header.c b/src/world/area_arn/arn_07/header.c index e4bd33818b..015f3f069a 100644 --- a/src/world/area_arn/arn_07/header.c +++ b/src/world/area_arn/arn_07/header.c @@ -16,7 +16,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_07_tattle }, }; -EvtSource N(80241F10) = { +EvtScript N(80241F10) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) diff --git a/src/world/area_arn/arn_08/arn_08.h b/src/world/area_arn/arn_08/arn_08.h index cb93fae1d2..157f6f9497 100644 --- a/src/world/area_arn/arn_08/arn_08.h +++ b/src/world/area_arn/arn_08/arn_08.h @@ -18,9 +18,9 @@ ApiStatus N(func_802400F4_BF4894)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024019C_BF493C)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80241828); -extern EvtSource N(80240B50); -extern EvtSource N(80240BA0); -extern EvtSource N(8024118C); -extern EvtSource N(80240300); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80240B50); +extern EvtScript N(80240BA0); +extern EvtScript N(8024118C); +extern EvtScript N(80240300); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index b516790da8..a67402d0f6 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -11,7 +11,7 @@ enum { NPC_YAKKEY, }; -EvtSource N(802403B0) = { +EvtScript N(802403B0) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ClearDefeatedEnemies) @@ -28,13 +28,13 @@ EvtSource N(802403B0) = { EVT_END }; -EvtSource N(80240470) = { +EvtScript N(80240470) = { EVT_BIND_TRIGGER(N(802403B0), TRIGGER_WALL_PRESS_A, 6, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(8024049C) = { +EvtScript N(8024049C) = { EVT_CALL(GetLoadType, EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(1), 1) EVT_EXEC(EnterSavePoint) @@ -100,7 +100,7 @@ EvtSource N(8024049C) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 35) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -132,7 +132,7 @@ static s32 N(pad_A6C) = { 0x00000000, }; -EvtSource N(80240A70) = { +EvtScript N(80240A70) = { EVT_LOOP(0) EVT_IF_NE(EVT_SAVE_VAR(0), -18) EVT_BREAK_LOOP @@ -153,7 +153,7 @@ EvtSource N(80240A70) = { EVT_END }; -EvtSource N(80240B50) = { +EvtScript N(80240B50) = { EVT_CALL(SetCamProperties, 0, EVT_FIXED(90.0), 0, 0, 0, EVT_FIXED(470.0), EVT_FIXED(17.0), EVT_FIXED(-7.0)) EVT_EXEC(N(80240A70)) EVT_RETURN @@ -164,7 +164,7 @@ static s32 N(pad_B98)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80240BA0) = { +EvtScript N(80240BA0) = { EVT_CALL(PlaySound, 0x8000004B) EVT_THREAD EVT_SET(EVT_VAR(0), 0) @@ -186,7 +186,7 @@ static s32 N(pad_CB4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80240CC0) = { +EvtScript N(80240CC0) = { EVT_CALL(N(func_802400C0_BF4860)) EVT_CALL(DemoJoystickXY, 2, 0) EVT_WAIT_FRAMES(1) @@ -255,7 +255,7 @@ EvtSource N(80240CC0) = { EVT_END }; -EvtSource N(802410AC) = { +EvtScript N(802410AC) = { EVT_WAIT_FRAMES(10) EVT_LOOP(0) EVT_CALL(GetDemoState, EVT_VAR(0)) @@ -274,7 +274,7 @@ EvtSource N(802410AC) = { EVT_END }; -EvtSource N(8024116C) = { +EvtScript N(8024116C) = { EVT_CALL(N(func_802400F4_BF4894)) EVT_RETURN EVT_END @@ -284,7 +284,7 @@ s32 N(D_80241188_BF5928) = { 0x00000000, }; -EvtSource N(8024118C) = { +EvtScript N(8024118C) = { EVT_CALL(SetCamProperties, 0, EVT_FIXED(90.0), 0, 0, 0, EVT_FIXED(470.0), EVT_FIXED(17.0), EVT_FIXED(-7.0)) EVT_CALL(N(func_8024019C_BF493C)) EVT_SET(EVT_SAVE_FLAG(9), 0) @@ -298,12 +298,12 @@ static s32 N(pad_11FC) = { 0x00000000, }; -EvtSource N(80241200) = { +EvtScript N(80241200) = { EVT_RETURN EVT_END }; -EvtSource N(80241210) = { +EvtScript N(80241210) = { EVT_RETURN EVT_END }; @@ -322,12 +322,12 @@ NpcSettings N(npcSettings_8024124C) = { .level = 13, }; -EvtSource N(idle_80241278) = { +EvtScript N(idle_80241278) = { EVT_RETURN EVT_END }; -EvtSource N(init_80241288) = { +EvtScript N(init_80241288) = { EVT_IF_NE(EVT_SAVE_VAR(0), -18) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_ELSE @@ -337,7 +337,7 @@ EvtSource N(init_80241288) = { EVT_END }; -EvtSource N(interact_802412E8) = { +EvtScript N(interact_802412E8) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(8) EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_yakkey_Palette_00_Anim_2, NPC_ANIM_yakkey_Palette_00_Anim_1, 0, MESSAGE_ID(0x0E, 0x00BA)) @@ -354,7 +354,7 @@ EvtSource N(interact_802412E8) = { EVT_END }; -EvtSource N(init_802413E8) = { +EvtScript N(init_802413E8) = { EVT_IF_LT(EVT_SAVE_VAR(0), -12) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_ELSE @@ -435,7 +435,7 @@ static s32 N(pad_184C) = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_LT(EVT_SAVE_VAR(0), -23) EVT_CALL(MakeEntity, 0x802BCE84, 0, 30, 0, 0, MAKE_ENTITY_END) EVT_END_IF diff --git a/src/world/area_arn/arn_08/header.c b/src/world/area_arn/arn_08/header.c index 76e13956d9..30097dbe11 100644 --- a/src/world/area_arn/arn_08/header.c +++ b/src/world/area_arn/arn_08/header.c @@ -14,7 +14,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_08_tattle }, }; -EvtSource N(80240300) = { +EvtScript N(80240300) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-22) EVT_CALL(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, 8) diff --git a/src/world/area_arn/arn_09/arn_09.h b/src/world/area_arn/arn_09/arn_09.h index 93bca76c94..55764a8f7d 100644 --- a/src/world/area_arn/arn_09/arn_09.h +++ b/src/world/area_arn/arn_09/arn_09.h @@ -10,9 +10,9 @@ ApiStatus func_802D2484(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_BF6060)(Evt *script, s32 isInitialCall); -extern EvtSource N(main); -extern EvtSource N(802400A0); +extern EvtScript N(main); +extern EvtScript N(802400A0); extern NpcGroupList N(npcGroupList_80240974); -extern EvtSource N(makeEntities); -extern EvtSource N(802404D0); +extern EvtScript N(makeEntities); +extern EvtScript N(802404D0); diff --git a/src/world/area_arn/arn_09/events.c b/src/world/area_arn/arn_09/events.c index e0b8d31f71..4dd322d622 100644 --- a/src/world/area_arn/arn_09/events.c +++ b/src/world/area_arn/arn_09/events.c @@ -3,7 +3,7 @@ extern s32 D_000001E4; -EvtSource N(80240140) = { +EvtScript N(80240140) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) @@ -19,13 +19,13 @@ EvtSource N(80240140) = { EVT_END }; -EvtSource N(802401F4) = { +EvtScript N(802401F4) = { EVT_BIND_TRIGGER(N(80240140), TRIGGER_WALL_PRESS_A, 5, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(80240220) = { +EvtScript N(80240220) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -41,7 +41,7 @@ EvtSource N(80240220) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 35) EVT_CALL(SetSpriteShading, 524288) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -61,7 +61,7 @@ static s32 N(pad_398)[] = { 0x00000000, 0x00000000, }; -EvtSource N(802403A0) = { +EvtScript N(802403A0) = { EVT_IF_EQ(EVT_AREA_FLAG(1), 1) EVT_RETURN EVT_END_IF @@ -80,7 +80,7 @@ EvtSource N(802403A0) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EAA30, 0, 0, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(802403A0))) EVT_RETURN @@ -91,7 +91,7 @@ static s32 N(pad_4CC)[] = { 0x00000000, }; -EvtSource N(802404D0) = { +EvtScript N(802404D0) = { EVT_IF_EQ(EVT_AREA_FLAG(1), 0) EVT_RETURN EVT_END_IF @@ -113,12 +113,12 @@ static s32 N(pad_5A8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(802405B0) = { +EvtScript N(802405B0) = { EVT_RETURN EVT_END }; -EvtSource N(802405C0) = { +EvtScript N(802405C0) = { EVT_RETURN EVT_END }; @@ -131,7 +131,7 @@ NpcSettings N(npcSettings_802405D0) = { .level = 13, }; -EvtSource N(idle_802405FC) = { +EvtScript N(idle_802405FC) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FIXED(2.5)) @@ -149,7 +149,7 @@ EvtSource N(idle_802405FC) = { EVT_END }; -EvtSource N(init_80240730) = { +EvtScript N(init_80240730) = { EVT_IF_NE(EVT_SAVE_VAR(0), -19) EVT_CALL(RemoveNpc, NPC_SELF) EVT_ELSE diff --git a/src/world/area_arn/arn_09/header.c b/src/world/area_arn/arn_09/header.c index abe9b3eda0..33290d275e 100644 --- a/src/world/area_arn/arn_09/header.c +++ b/src/world/area_arn/arn_09/header.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_09_tattle }, }; -EvtSource N(802400A0) = { +EvtScript N(802400A0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-22) EVT_CALL(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, 8) diff --git a/src/world/area_arn/arn_10/arn_10.h b/src/world/area_arn/arn_10/arn_10.h index 05af83927e..376a73fb3e 100644 --- a/src/world/area_arn/arn_10/arn_10.h +++ b/src/world/area_arn/arn_10/arn_10.h @@ -7,7 +7,7 @@ #define NAMESPACE arn_10 -extern EvtSource N(main); -extern EvtSource N(80240060); +extern EvtScript N(main); +extern EvtScript N(80240060); extern NpcGroupList N(npcGroupList_80240BB8); -extern EvtSource N(makeEntities); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_10/events.c b/src/world/area_arn/arn_10/events.c index 8a303752aa..cadbf66d2c 100644 --- a/src/world/area_arn/arn_10/events.c +++ b/src/world/area_arn/arn_10/events.c @@ -2,7 +2,7 @@ #include "sprite/npc/tubbas_heart.h" #include "sprite/npc/goomba.h" -EvtSource N(exitSingleDoor_80240100) = { +EvtScript N(exitSingleDoor_80240100) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) @@ -17,7 +17,7 @@ EvtSource N(exitSingleDoor_80240100) = { EVT_END }; -EvtSource N(exitSingleDoor_802401A4) = { +EvtScript N(exitSingleDoor_802401A4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 1) @@ -32,14 +32,14 @@ EvtSource N(exitSingleDoor_802401A4) = { EVT_END }; -EvtSource N(80240248) = { +EvtScript N(80240248) = { EVT_BIND_TRIGGER(N(exitSingleDoor_80240100), TRIGGER_WALL_PRESS_A, 6, 1, 0) EVT_BIND_TRIGGER(N(exitSingleDoor_802401A4), TRIGGER_WALL_PRESS_A, 11, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterSingleDoor_80240290) = { +EvtScript N(enterSingleDoor_80240290) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -57,7 +57,7 @@ EvtSource N(enterSingleDoor_80240290) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 35) EVT_CALL(SetSpriteShading, 524289) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -77,12 +77,12 @@ static s32 N(pad_424)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80240430) = { +EvtScript N(80240430) = { EVT_RETURN EVT_END }; -EvtSource N(80240440) = { +EvtScript N(80240440) = { EVT_RETURN EVT_END }; @@ -108,7 +108,7 @@ NpcAISettings N(npcAISettings_8024047C) = { .unk_2C = 1, }; -EvtSource N(npcAI_802404AC) = { +EvtScript N(npcAI_802404AC) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024047C))) EVT_RETURN EVT_END @@ -123,7 +123,7 @@ NpcSettings N(npcSettings_802404CC) = { .level = 12, }; -EvtSource N(idle_802404F8) = { +EvtScript N(idle_802404F8) = { EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FIXED(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -151,14 +151,14 @@ EvtSource N(idle_802404F8) = { EVT_END }; -EvtSource N(defeat_802406F4) = { +EvtScript N(defeat_802406F4) = { EVT_SET(EVT_SAVE_FLAG(1016), 1) EVT_CALL(DoNpcDefeat) EVT_RETURN EVT_END }; -EvtSource N(init_80240720) = { +EvtScript N(init_80240720) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_802404F8))) EVT_IF_NE(EVT_SAVE_VAR(0), -20) EVT_CALL(RemoveNpc, NPC_SELF) @@ -167,7 +167,7 @@ EvtSource N(init_80240720) = { EVT_END }; -EvtSource N(init_8024076C) = { +EvtScript N(init_8024076C) = { EVT_IF_LT(EVT_SAVE_VAR(0), -12) EVT_IF_EQ(EVT_SAVE_FLAG(1016), 1) EVT_CALL(RemoveNpc, NPC_SELF) @@ -253,7 +253,7 @@ static s32 N(pad_BDC)[] = { 0x00000000, }; -EvtSource N(80240BE0) = { +EvtScript N(80240BE0) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x0182), 160, 40) EVT_CALL(DisablePlayerInput, FALSE) @@ -261,7 +261,7 @@ EvtSource N(80240BE0) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EAFDC, 200, 0, -40, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240BE0))) EVT_RETURN diff --git a/src/world/area_arn/arn_10/header.c b/src/world/area_arn/arn_10/header.c index a52d40977f..c8c8bacaee 100644 --- a/src/world/area_arn/arn_10/header.c +++ b/src/world/area_arn/arn_10/header.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_10_tattle }, }; -EvtSource N(80240060) = { +EvtScript N(80240060) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-22) EVT_CALL(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, 8) diff --git a/src/world/area_arn/arn_11/arn_11.h b/src/world/area_arn/arn_11/arn_11.h index a01edc2ba9..3eaf7d61e3 100644 --- a/src/world/area_arn/arn_11/arn_11.h +++ b/src/world/area_arn/arn_11/arn_11.h @@ -7,6 +7,6 @@ #define NAMESPACE arn_11 -extern EvtSource N(main); -extern EvtSource N(80240050); +extern EvtScript N(main); +extern EvtScript N(80240050); extern NpcGroupList N(npcGroupList_802410DC); diff --git a/src/world/area_arn/arn_11/events.c b/src/world/area_arn/arn_11/events.c index 108853b26e..71de8732f1 100644 --- a/src/world/area_arn/arn_11/events.c +++ b/src/world/area_arn/arn_11/events.c @@ -5,7 +5,7 @@ enum { NPC_TUBBAS_HEART, }; -EvtSource N(802400F0) = { +EvtScript N(802400F0) = { EVT_CALL(SetCamType, 0, 6, 1) EVT_CALL(SetCamSpeed, 0, EVT_FIXED(3.0)) EVT_CALL(UseSettingsFrom, 0, 60, 30, 0) @@ -18,7 +18,7 @@ EvtSource N(802400F0) = { EVT_END }; -EvtSource N(802401BC) = { +EvtScript N(802401BC) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(30) EVT_CALL(SetPlayerSpeed, EVT_FIXED(3.0)) @@ -55,7 +55,7 @@ EvtSource N(802401BC) = { EVT_END }; -EvtSource N(exitSingleDoor_80240428) = { +EvtScript N(exitSingleDoor_80240428) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) @@ -70,13 +70,13 @@ EvtSource N(exitSingleDoor_80240428) = { EVT_END }; -EvtSource N(802404CC) = { +EvtScript N(802404CC) = { EVT_BIND_TRIGGER(N(exitSingleDoor_80240428), TRIGGER_WALL_PRESS_A, 2, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterSingleDoor_802404F8) = { +EvtScript N(enterSingleDoor_802404F8) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(2), 0) EVT_SET(EVT_VAR(3), -1) @@ -93,7 +93,7 @@ EvtSource N(enterSingleDoor_802404F8) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 35) EVT_CALL(SetSpriteShading, 524290) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -112,12 +112,12 @@ static s32 N(pad_674)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80240680) = { +EvtScript N(80240680) = { EVT_RETURN EVT_END }; -EvtSource N(80240690) = { +EvtScript N(80240690) = { EVT_RETURN EVT_END }; @@ -130,7 +130,7 @@ NpcSettings N(npcSettings_802406A0) = { .level = 13, }; -EvtSource N(idle_802406CC) = { +EvtScript N(idle_802406CC) = { EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) EVT_IF_NE(EVT_VAR(0), 0) @@ -154,7 +154,7 @@ EvtSource N(idle_802406CC) = { EVT_END }; -EvtSource N(8024081C) = { +EvtScript N(8024081C) = { EVT_WAIT_FRAMES(15) EVT_CALL(PlaySoundAtCollider, 2, 449, 0) EVT_CALL(MakeLerp, 0, 80, 10, 0) @@ -170,7 +170,7 @@ EvtSource N(8024081C) = { EVT_END }; -EvtSource N(802408D8) = { +EvtScript N(802408D8) = { EVT_CALL(MakeLerp, 80, 0, 10, 0) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -191,7 +191,7 @@ s32 N(intTable_80240988)[] = { 0x00000000, 0x00000000, 0xFFFFD8F0, 0x00000000, 0x00000000, }; -EvtSource N(defeat_802409DC) = { +EvtScript N(defeat_802409DC) = { EVT_THREAD EVT_CALL(SetCamType, 0, 6, 1) EVT_CALL(SetCamSpeed, 0, EVT_FIXED(90.0)) @@ -259,7 +259,7 @@ EvtSource N(defeat_802409DC) = { EVT_END }; -EvtSource N(init_80240E70) = { +EvtScript N(init_80240E70) = { EVT_IF_GE(EVT_SAVE_VAR(0), -22) EVT_CALL(RemoveNpc, NPC_SELF) EVT_ELSE diff --git a/src/world/area_arn/arn_11/header.c b/src/world/area_arn/arn_11/header.c index df179a86d1..28a4aaae15 100644 --- a/src/world/area_arn/arn_11/header.c +++ b/src/world/area_arn/arn_11/header.c @@ -12,7 +12,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_11_tattle }, }; -EvtSource N(80240050) = { +EvtScript N(80240050) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-23) EVT_CALL(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, 8) diff --git a/src/world/area_arn/arn_12/arn_12.h b/src/world/area_arn/arn_12/arn_12.h index 00a796723a..41f46d396d 100644 --- a/src/world/area_arn/arn_12/arn_12.h +++ b/src/world/area_arn/arn_12/arn_12.h @@ -9,7 +9,7 @@ extern s32 D_802EAFDC; -extern EvtSource N(main); -extern EvtSource N(80240060); +extern EvtScript N(main); +extern EvtScript N(80240060); extern NpcGroupList N(npcGroupList_80240BBC); -extern EvtSource N(makeEntities); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_12/events.c b/src/world/area_arn/arn_12/events.c index 23675e8a28..31a72086b1 100644 --- a/src/world/area_arn/arn_12/events.c +++ b/src/world/area_arn/arn_12/events.c @@ -2,7 +2,7 @@ #include "sprite/npc/tubbas_heart.h" #include "sprite/npc/goomba.h" -EvtSource N(exitSingleDoor_80240100) = { +EvtScript N(exitSingleDoor_80240100) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) @@ -17,7 +17,7 @@ EvtSource N(exitSingleDoor_80240100) = { EVT_END }; -EvtSource N(exitSingleDoor_802401A4) = { +EvtScript N(exitSingleDoor_802401A4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 1) @@ -32,14 +32,14 @@ EvtSource N(exitSingleDoor_802401A4) = { EVT_END }; -EvtSource N(80240248) = { +EvtScript N(80240248) = { EVT_BIND_TRIGGER(N(exitSingleDoor_80240100), TRIGGER_WALL_PRESS_A, 2, 1, 0) EVT_BIND_TRIGGER(N(exitSingleDoor_802401A4), TRIGGER_WALL_PRESS_A, 7, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterSingleDoor_80240290) = { +EvtScript N(enterSingleDoor_80240290) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -57,7 +57,7 @@ EvtSource N(enterSingleDoor_80240290) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 35) EVT_CALL(SetSpriteShading, 524291) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -76,12 +76,12 @@ static s32 N(pad_418)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80240420) = { +EvtScript N(80240420) = { EVT_RETURN EVT_END }; -EvtSource N(80240430) = { +EvtScript N(80240430) = { EVT_RETURN EVT_END }; @@ -107,7 +107,7 @@ NpcAISettings N(npcAISettings_8024046C) = { .unk_2C = 1, }; -EvtSource N(npcAI_8024049C) = { +EvtScript N(npcAI_8024049C) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024046C))) EVT_RETURN EVT_END @@ -122,7 +122,7 @@ NpcSettings N(npcSettings_802404BC) = { .level = 12, }; -EvtSource N(idle_802404E8) = { +EvtScript N(idle_802404E8) = { EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FIXED(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -150,14 +150,14 @@ EvtSource N(idle_802404E8) = { EVT_END }; -EvtSource N(defeat_802406E4) = { +EvtScript N(defeat_802406E4) = { EVT_SET(EVT_SAVE_FLAG(1017), 1) EVT_CALL(DoNpcDefeat) EVT_RETURN EVT_END }; -EvtSource N(init_80240710) = { +EvtScript N(init_80240710) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_802404E8))) EVT_IF_NE(EVT_SAVE_VAR(0), -21) EVT_CALL(RemoveNpc, NPC_SELF) @@ -166,7 +166,7 @@ EvtSource N(init_80240710) = { EVT_END }; -EvtSource N(init_8024075C) = { +EvtScript N(init_8024075C) = { EVT_IF_LT(EVT_SAVE_VAR(0), -12) EVT_IF_EQ(EVT_SAVE_FLAG(1017), 1) EVT_CALL(RemoveNpc, NPC_SELF) @@ -249,7 +249,7 @@ NpcGroupList N(npcGroupList_80240BBC) = { {}, }; -EvtSource N(80240BE0) = { +EvtScript N(80240BE0) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x0183), 160, 40) EVT_CALL(DisablePlayerInput, FALSE) @@ -257,7 +257,7 @@ EvtSource N(80240BE0) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(D_802EAFDC), 200, 0, -40, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240BE0))) EVT_RETURN diff --git a/src/world/area_arn/arn_12/header.c b/src/world/area_arn/arn_12/header.c index fd453fe792..e1fe95b0e6 100644 --- a/src/world/area_arn/arn_12/header.c +++ b/src/world/area_arn/arn_12/header.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_12_tattle }, }; -EvtSource N(80240060) = { +EvtScript N(80240060) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-22) EVT_CALL(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, 8) diff --git a/src/world/area_arn/arn_13/arn_13.h b/src/world/area_arn/arn_13/arn_13.h index 1810b20501..2573011625 100644 --- a/src/world/area_arn/arn_13/arn_13.h +++ b/src/world/area_arn/arn_13/arn_13.h @@ -9,7 +9,7 @@ extern s32 D_802EAFDC; -extern EvtSource N(main); -extern EvtSource N(80240060); +extern EvtScript N(main); +extern EvtScript N(80240060); extern NpcGroupList N(npcGroupList_80240BCC); -extern EvtSource N(makeEntities); +extern EvtScript N(makeEntities); diff --git a/src/world/area_arn/arn_13/events.c b/src/world/area_arn/arn_13/events.c index 0adb0fa73a..9e184dd0dc 100644 --- a/src/world/area_arn/arn_13/events.c +++ b/src/world/area_arn/arn_13/events.c @@ -2,7 +2,7 @@ #include "sprite/npc/goomba.h" #include "sprite/npc/tubbas_heart.h" -EvtSource N(exitSingleDoor_80240100) = { +EvtScript N(exitSingleDoor_80240100) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 0) @@ -17,7 +17,7 @@ EvtSource N(exitSingleDoor_80240100) = { EVT_END }; -EvtSource N(exitSingleDoor_802401A4) = { +EvtScript N(exitSingleDoor_802401A4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), 1) @@ -32,14 +32,14 @@ EvtSource N(exitSingleDoor_802401A4) = { EVT_END }; -EvtSource N(80240248) = { +EvtScript N(80240248) = { EVT_BIND_TRIGGER(N(exitSingleDoor_80240100), TRIGGER_WALL_PRESS_A, 2, 1, 0) EVT_BIND_TRIGGER(N(exitSingleDoor_802401A4), TRIGGER_WALL_PRESS_A, 7, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterSingleDoor_80240290) = { +EvtScript N(enterSingleDoor_80240290) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -57,7 +57,7 @@ EvtSource N(enterSingleDoor_80240290) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 35) EVT_CALL(SetSpriteShading, 524292) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -77,12 +77,12 @@ static s32 N(pad_424)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80240430) = { +EvtScript N(80240430) = { EVT_RETURN EVT_END }; -EvtSource N(80240440) = { +EvtScript N(80240440) = { EVT_RETURN EVT_END }; @@ -108,7 +108,7 @@ NpcAISettings N(npcAISettings_8024047C) = { .unk_2C = 1, }; -EvtSource N(npcAI_802404AC) = { +EvtScript N(npcAI_802404AC) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024047C))) EVT_RETURN EVT_END @@ -123,7 +123,7 @@ NpcSettings N(npcSettings_802404CC) = { .level = 12, }; -EvtSource N(idle_802404F8) = { +EvtScript N(idle_802404F8) = { EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_tubbas_heart_Palette_00_Anim_13) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FIXED(3.0)) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -151,14 +151,14 @@ EvtSource N(idle_802404F8) = { EVT_END }; -EvtSource N(defeat_802406F4) = { +EvtScript N(defeat_802406F4) = { EVT_SET(EVT_SAVE_FLAG(1018), 1) EVT_CALL(DoNpcDefeat) EVT_RETURN EVT_END }; -EvtSource N(init_80240720) = { +EvtScript N(init_80240720) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_802404F8))) EVT_IF_NE(EVT_SAVE_VAR(0), -22) EVT_CALL(RemoveNpc, NPC_SELF) @@ -167,7 +167,7 @@ EvtSource N(init_80240720) = { EVT_END }; -EvtSource N(init_8024076C) = { +EvtScript N(init_8024076C) = { EVT_IF_LT(EVT_SAVE_VAR(0), -12) EVT_IF_EQ(EVT_SAVE_FLAG(1018), 1) EVT_CALL(RemoveNpc, NPC_SELF) @@ -250,7 +250,7 @@ NpcGroupList N(npcGroupList_80240BCC) = { {}, }; -EvtSource N(80240BF0) = { +EvtScript N(80240BF0) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x0184), 160, 40) EVT_CALL(DisablePlayerInput, FALSE) @@ -258,7 +258,7 @@ EvtSource N(80240BF0) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(D_802EAFDC), 200, 0, -40, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240BF0))) EVT_RETURN diff --git a/src/world/area_arn/arn_13/header.c b/src/world/area_arn/arn_13/header.c index 52564797d3..e42b06839b 100644 --- a/src/world/area_arn/arn_13/header.c +++ b/src/world/area_arn/arn_13/header.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_arn_13_tattle }, }; -EvtSource N(80240060) = { +EvtScript N(80240060) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-22) EVT_CALL(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, 8) diff --git a/src/world/area_dgb/dgb_00/BFA0A0.c b/src/world/area_dgb/dgb_00/BFA0A0.c index fec1d3b5a4..26ea20e601 100644 --- a/src/world/area_dgb/dgb_00/BFA0A0.c +++ b/src/world/area_dgb/dgb_00/BFA0A0.c @@ -21,7 +21,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_00_tattle }, }; -EvtSource N(80240110) = { +EvtScript N(80240110) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) @@ -39,9 +39,9 @@ static s32 N(pad_1B8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitWalk_802401C0) = EXIT_WALK_SCRIPT(60, 0, "arn_04", 1); +EvtScript N(exitWalk_802401C0) = EXIT_WALK_SCRIPT(60, 0, "arn_04", 1); -EvtSource N(exitDoubleDoor_8024021C) = { +EvtScript N(exitDoubleDoor_8024021C) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -57,7 +57,7 @@ EvtSource N(exitDoubleDoor_8024021C) = { EVT_END }; -EvtSource N(802402D0) = { +EvtScript N(802402D0) = { EVT_BIND_TRIGGER(N(exitWalk_802401C0), TRIGGER_FLOOR_ABOVE, 15, 1, 0) EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-28) @@ -73,7 +73,7 @@ EvtSource N(802402D0) = { EVT_END }; -EvtSource N(enterDoubleDoor_8024038C) = { +EvtScript N(enterDoubleDoor_8024038C) = { EVT_CALL(GetLoadType, EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(1), 1) EVT_EXEC(EnterSavePoint) @@ -110,7 +110,7 @@ EvtSource N(enterDoubleDoor_8024038C) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_SET(EVT_SAVE_FLAG(1978), 1) EVT_CALL(SetSpriteShading, -1) diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index d113f34971..9faa1b2a3e 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -29,7 +29,7 @@ NpcSettings N(npcSettings_8024066C) = { .level = 99, }; -EvtSource N(80240698) = { +EvtScript N(80240698) = { EVT_SET(EVT_VAR(3), 0) EVT_SUB(EVT_VAR(3), EVT_VAR(2)) EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) @@ -47,7 +47,7 @@ EvtSource N(80240698) = { EVT_END }; -EvtSource N(8024079C) = { +EvtScript N(8024079C) = { EVT_SET(EVT_VAR(3), 0) EVT_SUB(EVT_VAR(3), EVT_VAR(2)) EVT_CALL(MakeLerp, 80, 0, 12, 0) @@ -65,7 +65,7 @@ EvtSource N(8024079C) = { EVT_END }; -EvtSource N(802408A0) = { +EvtScript N(802408A0) = { EVT_CALL(GetNpcPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 200) EVT_CALL(NpcMoveTo, 0, EVT_VAR(0), EVT_VAR(2), 46) @@ -73,7 +73,7 @@ EvtSource N(802408A0) = { EVT_END }; -EvtSource N(802408F8) = { +EvtScript N(802408F8) = { EVT_CALL(GetNpcPos, 1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 200) EVT_CALL(NpcMoveTo, 1, EVT_VAR(0), EVT_VAR(2), 50) @@ -81,7 +81,7 @@ EvtSource N(802408F8) = { EVT_END }; -EvtSource N(80240950) = { +EvtScript N(80240950) = { EVT_CALL(GetNpcPos, 2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 200) EVT_CALL(NpcMoveTo, 2, EVT_VAR(0), EVT_VAR(2), 53) @@ -89,7 +89,7 @@ EvtSource N(80240950) = { EVT_END }; -EvtSource N(802409A8) = { +EvtScript N(802409A8) = { EVT_CALL(GetNpcPos, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 200) EVT_CALL(NpcMoveTo, 3, EVT_VAR(0), EVT_VAR(2), 46) @@ -97,7 +97,7 @@ EvtSource N(802409A8) = { EVT_END }; -EvtSource N(80240A00) = { +EvtScript N(80240A00) = { EVT_CALL(GetNpcPos, 4, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 200) EVT_CALL(NpcMoveTo, 4, EVT_VAR(0), EVT_VAR(2), 50) @@ -105,7 +105,7 @@ EvtSource N(80240A00) = { EVT_END }; -EvtSource N(80240A58) = { +EvtScript N(80240A58) = { EVT_CALL(GetNpcPos, 5, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 200) EVT_CALL(NpcMoveTo, 5, EVT_VAR(0), EVT_VAR(2), 53) @@ -113,7 +113,7 @@ EvtSource N(80240A58) = { EVT_END }; -EvtSource N(80240AB0) = { +EvtScript N(80240AB0) = { EVT_EXEC(N(802408A0)) EVT_EXEC(N(802408F8)) EVT_EXEC(N(80240950)) @@ -124,7 +124,7 @@ EvtSource N(80240AB0) = { EVT_END }; -EvtSource N(80240B08) = { +EvtScript N(80240B08) = { EVT_CALL(SetNpcJumpscale, 0, EVT_FIXED(-0.2)) EVT_CALL(NpcJump0, 0, 257, 30, -90, 5) EVT_CALL(EnableNpcShadow, 0, FALSE) @@ -133,7 +133,7 @@ EvtSource N(80240B08) = { EVT_END }; -EvtSource N(80240B74) = { +EvtScript N(80240B74) = { EVT_CALL(SetNpcJumpscale, 1, EVT_FIXED(-0.3)) EVT_CALL(NpcJump0, 1, 272, 112, -81, 12) EVT_CALL(EnableNpcShadow, 1, FALSE) @@ -142,7 +142,7 @@ EvtSource N(80240B74) = { EVT_END }; -EvtSource N(80240BE0) = { +EvtScript N(80240BE0) = { EVT_CALL(SetNpcJumpscale, 2, EVT_FIXED(-0.4)) EVT_CALL(NpcJump0, 2, 237, 120, -118, 10) EVT_CALL(EnableNpcShadow, 2, FALSE) @@ -151,7 +151,7 @@ EvtSource N(80240BE0) = { EVT_END }; -EvtSource N(80240C4C) = { +EvtScript N(80240C4C) = { EVT_CALL(SetNpcJumpscale, 3, EVT_FIXED(-0.3)) EVT_CALL(NpcJump0, 3, 280, 60, -79, 8) EVT_CALL(EnableNpcShadow, 3, FALSE) @@ -160,7 +160,7 @@ EvtSource N(80240C4C) = { EVT_END }; -EvtSource N(80240CB8) = { +EvtScript N(80240CB8) = { EVT_CALL(SetNpcJumpscale, 4, EVT_FIXED(-0.4)) EVT_CALL(NpcJump0, 4, 250, 81, -97, 9) EVT_CALL(EnableNpcShadow, 4, FALSE) @@ -169,7 +169,7 @@ EvtSource N(80240CB8) = { EVT_END }; -EvtSource N(80240D24) = { +EvtScript N(80240D24) = { EVT_CALL(SetNpcJumpscale, 5, EVT_FIXED(-0.5)) EVT_CALL(NpcJump0, 5, 227, 43, -123, 15) EVT_CALL(EnableNpcShadow, 5, FALSE) @@ -178,7 +178,7 @@ EvtSource N(80240D24) = { EVT_END }; -EvtSource N(80240D90) = { +EvtScript N(80240D90) = { EVT_EXEC(N(80240B74)) EVT_EXEC(N(80240BE0)) EVT_EXEC(N(80240C4C)) @@ -188,7 +188,7 @@ EvtSource N(80240D90) = { EVT_END }; -EvtSource N(80240DDC) = { +EvtScript N(80240DDC) = { EVT_CALL(GetNpcPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_LOOP(0) EVT_CALL(RandInt, 5, EVT_VAR(10)) @@ -215,7 +215,7 @@ EvtSource N(80240DDC) = { EVT_END }; -EvtSource N(80240F50) = { +EvtScript N(80240F50) = { EVT_SET_GROUP(239) EVT_LOOP(0) EVT_CALL(RandInt, 50, EVT_VAR(0)) @@ -233,7 +233,7 @@ EvtSource N(80240F50) = { EVT_END }; -EvtSource N(8024103C) = { +EvtScript N(8024103C) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerPos, 350, 10, -150) @@ -279,7 +279,7 @@ EvtSource N(8024103C) = { EVT_END }; -EvtSource N(802413F4) = { +EvtScript N(802413F4) = { EVT_CALL(SetPlayerSpeed, EVT_FIXED(8.0)) EVT_CALL(PlayerMoveTo, 184, -44, 0) EVT_CALL(PlaySoundAtNpc, 0, SOUND_262, 0) @@ -358,7 +358,7 @@ EvtSource N(802413F4) = { EVT_END }; -EvtSource N(80241AA0) = { +EvtScript N(80241AA0) = { EVT_CALL(SetNpcPos, 0, 246, 30, -110) EVT_CALL(SetNpcPos, 1, 276, 120, -80) EVT_CALL(SetNpcPos, 2, 216, 120, -140) @@ -387,7 +387,7 @@ EvtSource N(80241AA0) = { EVT_END }; -EvtSource N(interact_80241CD8) = { +EvtScript N(interact_80241CD8) = { EVT_SET(EVT_MAP_VAR(0), 1) EVT_CALL(SpeakToPlayer, 0, NPC_ANIM_boo_Palette_01_Anim_6, NPC_ANIM_boo_Palette_01_Anim_6, 5, MESSAGE_ID(0x0E, 0x00E9)) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_boo_Palette_01_Anim_6) @@ -421,33 +421,33 @@ EvtSource N(interact_80241CD8) = { EVT_END }; -EvtSource N(init_80241F70) = { +EvtScript N(init_80241F70) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80241CD8))) EVT_RETURN EVT_END }; -EvtSource N(init_80241F94) = { +EvtScript N(init_80241F94) = { EVT_RETURN EVT_END }; -EvtSource N(init_80241FA4) = { +EvtScript N(init_80241FA4) = { EVT_RETURN EVT_END }; -EvtSource N(init_80241FB4) = { +EvtScript N(init_80241FB4) = { EVT_RETURN EVT_END }; -EvtSource N(init_80241FC4) = { +EvtScript N(init_80241FC4) = { EVT_RETURN EVT_END }; -EvtSource N(init_80241FD4) = { +EvtScript N(init_80241FD4) = { EVT_RETURN EVT_END }; @@ -633,7 +633,7 @@ StaticNpc N(npcGroup_80242994) = { }, }; -EvtSource N(80242B84) = { +EvtScript N(80242B84) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) @@ -774,7 +774,7 @@ EvtSource N(80242B84) = { EVT_END }; -EvtSource N(init_802434EC) = { +EvtScript N(init_802434EC) = { EVT_RETURN EVT_END }; @@ -828,7 +828,7 @@ static s32 N(pad_3758)[] = { 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -65, 60, -240, 0, MAKE_ENTITY_END) EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_00/dgb_00.h b/src/world/area_dgb/dgb_00/dgb_00.h index 515098cf98..d1694e6e66 100644 --- a/src/world/area_dgb/dgb_00/dgb_00.h +++ b/src/world/area_dgb/dgb_00/dgb_00.h @@ -10,10 +10,10 @@ ApiStatus N(func_80240060_BFA100)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802436EC); extern NpcGroupList N(npcGroupList_80243740); -extern EvtSource N(80240F50); -extern EvtSource N(8024103C); -extern EvtSource N(802413F4); -extern EvtSource N(80241AA0); -extern EvtSource N(80242B84); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80240F50); +extern EvtScript N(8024103C); +extern EvtScript N(802413F4); +extern EvtScript N(80241AA0); +extern EvtScript N(80242B84); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 68a86050a9..6c30884ba4 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -21,7 +21,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_01_tattle }, }; -EvtSource N(802434A0) = { +EvtScript N(802434A0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -39,7 +39,7 @@ static s32 N(pad_3548)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80243550) = { +EvtScript N(exitDoubleDoor_80243550) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -55,7 +55,7 @@ EvtSource N(exitDoubleDoor_80243550) = { EVT_END }; -EvtSource N(exitDoubleDoor_80243604) = { +EvtScript N(exitDoubleDoor_80243604) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -71,7 +71,7 @@ EvtSource N(exitDoubleDoor_80243604) = { EVT_END }; -EvtSource N(exitDoubleDoor_802436B8) = { +EvtScript N(exitDoubleDoor_802436B8) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -87,7 +87,7 @@ EvtSource N(exitDoubleDoor_802436B8) = { EVT_END }; -EvtSource N(exitDoubleDoor_8024376C) = { +EvtScript N(exitDoubleDoor_8024376C) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -103,7 +103,7 @@ EvtSource N(exitDoubleDoor_8024376C) = { EVT_END }; -EvtSource N(exitDoubleDoor_80243820) = { +EvtScript N(exitDoubleDoor_80243820) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -119,7 +119,7 @@ EvtSource N(exitDoubleDoor_80243820) = { EVT_END }; -EvtSource N(exitDoubleDoor_802438D4) = { +EvtScript N(exitDoubleDoor_802438D4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -135,7 +135,7 @@ EvtSource N(exitDoubleDoor_802438D4) = { EVT_END }; -EvtSource N(exitDoubleDoor_80243988) = { +EvtScript N(exitDoubleDoor_80243988) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -151,7 +151,7 @@ EvtSource N(exitDoubleDoor_80243988) = { EVT_END }; -EvtSource N(enterDoubleDoor_80243A3C) = { +EvtScript N(enterDoubleDoor_80243A3C) = { EVT_CALL(UseDoorSounds, 3) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -197,7 +197,7 @@ s32 N(itemList_80243C40)[] = { ITEM_NONE, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -242,7 +242,7 @@ static s32 N(pad_3EE4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80243EF0) = { +EvtScript N(80243EF0) = { EVT_LOOP(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_LT(EVT_VAR(0), 100) @@ -412,7 +412,7 @@ EvtSource N(80243EF0) = { EVT_END }; -EvtSource N(802449C4) = { +EvtScript N(802449C4) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetGroupEnabled, 210, 0) @@ -432,7 +432,7 @@ EvtSource N(802449C4) = { EVT_END }; -EvtSource N(80244AD0) = { +EvtScript N(80244AD0) = { EVT_SET_GROUP(0) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) @@ -461,13 +461,13 @@ EvtSource N(80244AD0) = { EVT_END }; -EvtSource N(80244C38) = { +EvtScript N(80244C38) = { EVT_BIND_TRIGGER(N(exitDoubleDoor_802436B8), TRIGGER_WALL_PRESS_A, 20, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1040), 0) EVT_CALL(MakeEntity, 0x802BCD68, 490, 8, 0, -80, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80244C38))) @@ -482,7 +482,7 @@ f32 N(D_80244CD0_C02550)[] = { 1.5f, 20.0f, }; -EvtSource N(80244CE8) = { +EvtScript N(80244CE8) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) EVT_RETURN @@ -906,7 +906,7 @@ ApiStatus N(func_802422B0_BFFB30)(Evt* script, s32 isInitialCall) { extern const char N(dgb_00_name_hack)[]; -EvtSource N(npcAI_80244D54) = { +EvtScript N(npcAI_80244D54) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) @@ -967,7 +967,7 @@ EvtSource N(npcAI_80244D54) = { EVT_END }; -EvtSource N(8024517C) = { +EvtScript N(8024517C) = { EVT_CALL(GetOwnerEncounterTrigger, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(1) @@ -982,7 +982,7 @@ EvtSource N(8024517C) = { EVT_END }; -EvtSource N(80245208) = { +EvtScript N(80245208) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -1015,7 +1015,7 @@ NpcAISettings N(npcAISettings_80245298) = { .unk_2C = 1, }; -EvtSource N(npcAI_802452C8) = { +EvtScript N(npcAI_802452C8) = { EVT_CALL(N(func_802430C0_C00940), EVT_PTR(N(npcAISettings_80245298))) EVT_RETURN EVT_END @@ -1044,7 +1044,7 @@ NpcSettings N(npcSettings_80245340) = { .level = 13, }; -EvtSource N(idle_8024536C) = { +EvtScript N(idle_8024536C) = { EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 1) @@ -1108,7 +1108,7 @@ EvtSource N(idle_8024536C) = { EVT_END }; -EvtSource N(init_80245784) = { +EvtScript N(init_80245784) = { EVT_CALL(SetNpcScale, NPC_SELF, EVT_FIXED(1.25), EVT_FIXED(1.25), EVT_FIXED(1.25)) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024536C))) @@ -1230,7 +1230,7 @@ ApiStatus N(func_802430C0_C00940)(Evt* script, s32 isInitialCall) { extern const char N(dgb_08_name_hack)[]; -EvtSource N(defeat_802457D8) = { +EvtScript N(defeat_802457D8) = { EVT_CALL(N(UnkFunc1)) EVT_CALL(GotoMap, EVT_PTR(N(dgb_08_name_hack)), 1) EVT_WAIT_FRAMES(100) @@ -1238,7 +1238,7 @@ EvtSource N(defeat_802457D8) = { EVT_END }; -EvtSource N(init_80245814) = { +EvtScript N(init_80245814) = { EVT_IF_NE(EVT_SAVE_VAR(203), 1) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_4)), TRUE) @@ -1264,7 +1264,7 @@ EvtSource N(init_80245814) = { EVT_END }; -EvtSource N(idle_8024598C) = { +EvtScript N(idle_8024598C) = { EVT_CALL(AwaitPlayerApproach, 0, 420, 400) EVT_SET(EVT_SAVE_VAR(203), 1) EVT_SET(EVT_SAVE_VAR(0), -26) @@ -1314,7 +1314,7 @@ EvtSource N(idle_8024598C) = { EVT_END }; -EvtSource N(defeat_80245CB4) = { +EvtScript N(defeat_80245CB4) = { EVT_CALL(N(UnkFunc1)) EVT_CALL(GotoMap, EVT_PTR(N(dgb_00_name_hack)), 1) EVT_WAIT_FRAMES(100) @@ -1322,7 +1322,7 @@ EvtSource N(defeat_80245CB4) = { EVT_END }; -EvtSource N(init_80245CF0) = { +EvtScript N(init_80245CF0) = { EVT_IF_NE(EVT_SAVE_VAR(203), 1) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024598C))) EVT_ELSE @@ -1334,7 +1334,7 @@ EvtSource N(init_80245CF0) = { EVT_END }; -EvtSource N(init_80245D80) = { +EvtScript N(init_80245D80) = { EVT_SET(EVT_VAR(0), EVT_SAVE_VAR(0)) EVT_IF_GE(EVT_VAR(0), -29) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40)), TRUE) @@ -1348,7 +1348,7 @@ EvtSource N(init_80245D80) = { EVT_END }; -EvtSource N(init_80245E44) = { +EvtScript N(init_80245E44) = { EVT_SET(EVT_VAR(0), EVT_SAVE_VAR(0)) EVT_IF_GE(EVT_VAR(0), -29) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40)), TRUE) @@ -1362,7 +1362,7 @@ EvtSource N(init_80245E44) = { EVT_END }; -EvtSource N(init_80245F08) = { +EvtScript N(init_80245F08) = { EVT_SET(EVT_VAR(0), EVT_SAVE_VAR(0)) EVT_IF_GE(EVT_VAR(0), -29) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40)), TRUE) @@ -1376,7 +1376,7 @@ EvtSource N(init_80245F08) = { EVT_END }; -EvtSource N(init_80245FCC) = { +EvtScript N(init_80245FCC) = { EVT_SET(EVT_VAR(0), EVT_SAVE_VAR(0)) EVT_IF_GE(EVT_VAR(0), -29) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40)), TRUE) diff --git a/src/world/area_dgb/dgb_01/dgb_01.h b/src/world/area_dgb/dgb_01/dgb_01.h index 443e3610c5..39dc345de5 100644 --- a/src/world/area_dgb/dgb_01/dgb_01.h +++ b/src/world/area_dgb/dgb_01/dgb_01.h @@ -25,12 +25,12 @@ ApiStatus N(UnkFunc1)(Evt* script, s32 isInitialCall); ApiStatus N(func_802422B0_BFFB30)(Evt* script, s32 isInitialCall); ApiStatus N(func_802430C0_C00940)(Evt* script, s32 isInitialCall); -extern EvtSource N(802449C4); -extern EvtSource N(80244AD0); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(802449C4); +extern EvtScript N(80244AD0); +extern EvtScript N(main); +extern EvtScript N(makeEntities); extern StaticAnimatorNode* N(D_80252F4C_C107CC)[]; -extern EvtSource N(D_802539A0_C11220); +extern EvtScript N(D_802539A0_C11220); extern NpcGroupList N(npcGroupList_80246E50); extern NpcGroupList N(npcGroupList_80246ED4); extern NpcGroupList N(npcGroupList_80246E8C); diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index eabab271e6..33d350853f 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -25,7 +25,7 @@ MapConfig N(config) = { .tattle = 0x1900C2, }; -EvtSource N(802414B0) = { +EvtScript N(802414B0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -42,7 +42,7 @@ static s32 N(pad_1548)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80241550) = { +EvtScript N(exitDoubleDoor_80241550) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -58,7 +58,7 @@ EvtSource N(exitDoubleDoor_80241550) = { EVT_END }; -EvtSource N(exitDoubleDoor_80241604) = { +EvtScript N(exitDoubleDoor_80241604) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -74,7 +74,7 @@ EvtSource N(exitDoubleDoor_80241604) = { EVT_END }; -EvtSource N(exitSingleDoor_802416B8) = { +EvtScript N(exitSingleDoor_802416B8) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -90,7 +90,7 @@ EvtSource N(exitSingleDoor_802416B8) = { EVT_END }; -EvtSource N(exitSingleDoor_8024176C) = { +EvtScript N(exitSingleDoor_8024176C) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -106,7 +106,7 @@ EvtSource N(exitSingleDoor_8024176C) = { EVT_END }; -EvtSource N(enterSingleDoor_80241820) = { +EvtScript N(enterSingleDoor_80241820) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -134,7 +134,7 @@ EvtSource N(enterSingleDoor_80241820) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -157,7 +157,7 @@ static s32 N(pad_1AA8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80241AB0) = { +EvtScript N(80241AB0) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -206,7 +206,7 @@ NpcAISettings N(npcAISettings_80241B9C) = { .unk_2C = 3, }; -EvtSource N(npcAI_80241BCC) = { +EvtScript N(npcAI_80241BCC) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) @@ -240,7 +240,7 @@ NpcAISettings N(npcAISettings_80241C68) = { .unk_2C = 1, }; -EvtSource N(npcAI_80241C98) = { +EvtScript N(npcAI_80241C98) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) @@ -259,7 +259,7 @@ NpcSettings N(npcSettings_80241D08) = { .level = 13, }; -EvtSource N(npcAI_80241D34) = { +EvtScript N(npcAI_80241D34) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) diff --git a/src/world/area_dgb/dgb_02/dgb_02.h b/src/world/area_dgb/dgb_02/dgb_02.h index 35d36d63e3..6bb36cd456 100644 --- a/src/world/area_dgb/dgb_02/dgb_02.h +++ b/src/world/area_dgb/dgb_02/dgb_02.h @@ -11,4 +11,4 @@ ApiStatus N(func_802410D4_C2FC74)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc7)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802425C8); -extern EvtSource N(main); +extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 9cda4ca343..939f97d210 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -29,7 +29,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_03_tattle }, }; -EvtSource N(80242870) = { +EvtScript N(80242870) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -46,7 +46,7 @@ static s32 N(pad_2908)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80242910) = { +EvtScript N(exitDoubleDoor_80242910) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -62,7 +62,7 @@ EvtSource N(exitDoubleDoor_80242910) = { EVT_END }; -EvtSource N(exitDoubleDoor_802429C4) = { +EvtScript N(exitDoubleDoor_802429C4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -78,7 +78,7 @@ EvtSource N(exitDoubleDoor_802429C4) = { EVT_END }; -EvtSource N(exitDoubleDoor_80242A78) = { +EvtScript N(exitDoubleDoor_80242A78) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -94,9 +94,9 @@ EvtSource N(exitDoubleDoor_80242A78) = { EVT_END }; -EvtSource N(exitWalk_80242B2C) = EXIT_WALK_SCRIPT(26, 2, "dgb_13", 0); +EvtScript N(exitWalk_80242B2C) = EXIT_WALK_SCRIPT(26, 2, "dgb_13", 0); -EvtSource N(exitSingleDoor_80242B88) = { +EvtScript N(exitSingleDoor_80242B88) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -112,7 +112,7 @@ EvtSource N(exitSingleDoor_80242B88) = { EVT_END }; -EvtSource N(exitDoubleDoor_80242C3C) = { +EvtScript N(exitDoubleDoor_80242C3C) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -128,13 +128,13 @@ EvtSource N(exitDoubleDoor_80242C3C) = { EVT_END }; -EvtSource N(80242CF0) = { +EvtScript N(80242CF0) = { EVT_BIND_TRIGGER(N(exitWalk_80242B2C), TRIGGER_FLOOR_ABOVE, 35, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterDoubleDoor_80242D1C) = { +EvtScript N(enterDoubleDoor_80242D1C) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -181,7 +181,7 @@ s32 N(itemList_80242F28)[] = { ITEM_NONE, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -211,7 +211,7 @@ static s32 N(pad_30D8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(802430E0) = { +EvtScript N(802430E0) = { EVT_SET_GROUP(0) EVT_LOOP(20) EVT_CALL(GetCurrentPartner, EVT_VAR(10)) @@ -280,7 +280,7 @@ EvtSource N(802430E0) = { EVT_END }; -EvtSource N(80243470) = { +EvtScript N(80243470) = { EVT_IF_NE(EVT_SAVE_FLAG(1044), 0) EVT_GOTO(90) EVT_END_IF @@ -299,7 +299,7 @@ EvtSource N(80243470) = { EVT_END }; -EvtSource N(8024353C) = { +EvtScript N(8024353C) = { EVT_IF_NE(EVT_SAVE_FLAG(1044), 0) EVT_GOTO(90) EVT_END_IF @@ -318,7 +318,7 @@ EvtSource N(8024353C) = { EVT_END }; -EvtSource N(80243608) = { +EvtScript N(80243608) = { EVT_CALL(ParentColliderToModel, 27, 51) EVT_CALL(ParentColliderToModel, 28, 51) EVT_CALL(ParentColliderToModel, 29, 51) @@ -344,7 +344,7 @@ static s32 N(pad_3738)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80243740) = { +EvtScript N(80243740) = { EVT_SET_GROUP(0) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) @@ -373,13 +373,13 @@ EvtSource N(80243740) = { EVT_END }; -EvtSource N(802438A8) = { +EvtScript N(802438A8) = { EVT_BIND_TRIGGER(N(exitDoubleDoor_80242C3C), TRIGGER_WALL_PRESS_A, 17, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1043), 0) EVT_CALL(MakeEntity, 0x802BCD68, -355, 218, 75, 80, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(802438A8))) @@ -394,7 +394,7 @@ static s32 N(pad_3964)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80243970) = { +EvtScript N(80243970) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -435,7 +435,7 @@ NpcAISettings N(npcAISettings_80243A5C) = { .unk_2C = 3, }; -EvtSource N(npcAI_80243A8C) = { +EvtScript N(npcAI_80243A8C) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) @@ -469,7 +469,7 @@ NpcAISettings N(npcAISettings_80243B28) = { .unk_2C = 3, }; -EvtSource N(npcAI_80243B58) = { +EvtScript N(npcAI_80243B58) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) @@ -503,7 +503,7 @@ NpcAISettings N(npcAISettings_80243BF4) = { .unk_2C = 1, }; -EvtSource N(npcAI_80243C24) = { +EvtScript N(npcAI_80243C24) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) @@ -522,7 +522,7 @@ NpcSettings N(npcSettings_80243C94) = { .level = 13, }; -EvtSource N(npcAI_80243CC0) = { +EvtScript N(npcAI_80243CC0) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) @@ -544,7 +544,7 @@ NpcSettings N(npcSettings_80243D68) = { .unk_2A = 8, }; -EvtSource N(init_80243D94) = { +EvtScript N(init_80243D94) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 3) EVT_CALL(SetNpcPos, NPC_SELF, -330, 210, -20) diff --git a/src/world/area_dgb/dgb_03/dgb_03.h b/src/world/area_dgb/dgb_03/dgb_03.h index 8a0ae08a44..d0ee36ff04 100644 --- a/src/world/area_dgb/dgb_03/dgb_03.h +++ b/src/world/area_dgb/dgb_03/dgb_03.h @@ -16,7 +16,7 @@ ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80244988); -extern EvtSource N(80243608); -extern EvtSource N(80243740); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80243608); +extern EvtScript N(80243740); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 1ee0a415c2..ea35b0b07d 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -23,7 +23,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_04_tattle }, }; -EvtSource N(80243170) = { +EvtScript N(80243170) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -40,7 +40,7 @@ static s32 N(pad_3208)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitSingleDoor_80243210) = { +EvtScript N(exitSingleDoor_80243210) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -56,7 +56,7 @@ EvtSource N(exitSingleDoor_80243210) = { EVT_END }; -EvtSource N(exitDoubleDoor_802432C4) = { +EvtScript N(exitDoubleDoor_802432C4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -72,7 +72,7 @@ EvtSource N(exitDoubleDoor_802432C4) = { EVT_END }; -EvtSource N(enterSingleDoor_80243378) = { +EvtScript N(enterSingleDoor_80243378) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -90,7 +90,7 @@ EvtSource N(enterSingleDoor_80243378) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -118,7 +118,7 @@ f32 N(D_80243560_C39A90)[] = { 1.5f, 20.0f, }; -EvtSource N(80243578) = { +EvtScript N(80243578) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) EVT_RETURN @@ -140,7 +140,7 @@ NpcAISettings N(npcAISettings_802435B4) = { extern const char N(dgb_00_name_hack)[]; -EvtSource N(npcAI_802435E4) = { +EvtScript N(npcAI_802435E4) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) @@ -201,7 +201,7 @@ EvtSource N(npcAI_802435E4) = { EVT_END }; -EvtSource N(80243A0C) = { +EvtScript N(80243A0C) = { EVT_CALL(GetOwnerEncounterTrigger, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(1) @@ -216,7 +216,7 @@ EvtSource N(80243A0C) = { EVT_END }; -EvtSource N(80243A98) = { +EvtScript N(80243A98) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -292,7 +292,7 @@ f32 N(D_80243D88_C3A2B8)[] = { 140.0f, 180.0f, 220.0f }; -EvtSource N(80243D94) = { +EvtScript N(80243D94) = { EVT_WAIT_FRAMES(10) EVT_CALL(PlaySound, 0x212D) EVT_CALL(N(UnkFunc21), EVT_MAP_VAR(0)) @@ -324,7 +324,7 @@ EvtSource N(80243D94) = { EVT_END }; -EvtSource N(80243EF8) = { +EvtScript N(80243EF8) = { EVT_IF_EQ(EVT_SAVE_FLAG(1046), 1) EVT_RETURN EVT_END_IF @@ -408,7 +408,7 @@ EvtSource N(80243EF8) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA910, 500, -360, 110, 0, MAKE_ENTITY_END) EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1046)) diff --git a/src/world/area_dgb/dgb_04/dgb_04.h b/src/world/area_dgb/dgb_04/dgb_04.h index 61bebe1f9a..fcac6ac7dc 100644 --- a/src/world/area_dgb/dgb_04/dgb_04.h +++ b/src/world/area_dgb/dgb_04/dgb_04.h @@ -26,5 +26,5 @@ ApiStatus N(func_80242F08_C39438)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc24)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80243D18); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index e461f85d57..92323f9898 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -22,7 +22,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_05_tattle }, }; -EvtSource N(802414E0) = { +EvtScript N(802414E0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -39,7 +39,7 @@ static s32 N(pad_1578)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitSingleDoor_80241580) = { +EvtScript N(exitSingleDoor_80241580) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -55,7 +55,7 @@ EvtSource N(exitSingleDoor_80241580) = { EVT_END }; -EvtSource N(enterSingleDoor_80241634) = { +EvtScript N(enterSingleDoor_80241634) = { EVT_CALL(UseDoorSounds, 0) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -68,7 +68,7 @@ EvtSource N(enterSingleDoor_80241634) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -93,7 +93,7 @@ static s32 N(pad_17E8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(802417F0) = { +EvtScript N(802417F0) = { EVT_CALL(N(func_80240000_C3AA10)) EVT_CALL(func_802CA988, 0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_CALL(N(func_80240030_C3AA40)) @@ -108,7 +108,7 @@ static s32 N(pad_1868)[] = { 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1047), 0) EVT_CALL(MakeEntity, 0x802BCE84, 510, -210, 100, 0, MAKE_ENTITY_END) EVT_END_IF @@ -120,7 +120,7 @@ static s32 N(pad_18BC) = { 0x00000000, }; -EvtSource N(802418C0) = { +EvtScript N(802418C0) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -161,7 +161,7 @@ NpcAISettings N(npcAISettings_802419AC) = { .unk_2C = 1, }; -EvtSource N(npcAI_802419DC) = { +EvtScript N(npcAI_802419DC) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) @@ -180,7 +180,7 @@ NpcSettings N(npcSettings_80241A4C) = { .level = 13, }; -EvtSource N(npcAI_80241A78) = { +EvtScript N(npcAI_80241A78) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) diff --git a/src/world/area_dgb/dgb_05/dgb_05.h b/src/world/area_dgb/dgb_05/dgb_05.h index 1ef9bda530..543f2c3c96 100644 --- a/src/world/area_dgb/dgb_05/dgb_05.h +++ b/src/world/area_dgb/dgb_05/dgb_05.h @@ -12,6 +12,6 @@ ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240E80_C3B890)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024230C); -extern EvtSource N(802417F0); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(802417F0); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index f34924cf30..9c62d1f525 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -18,7 +18,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_06_tattle }, }; -EvtSource N(80240320) = { +EvtScript N(80240320) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -35,7 +35,7 @@ static s32 N(pad_3B8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitSingleDoor_802403C0) = { +EvtScript N(exitSingleDoor_802403C0) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -51,7 +51,7 @@ EvtSource N(exitSingleDoor_802403C0) = { EVT_END }; -EvtSource N(enterSingleDoor_80240474) = { +EvtScript N(enterSingleDoor_80240474) = { EVT_CALL(UseDoorSounds, 0) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -64,7 +64,7 @@ EvtSource N(enterSingleDoor_80240474) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, 589824) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -87,7 +87,7 @@ EvtSource N(main) = { #include "world/common/StashVars.inc.c" -EvtSource N(80240624) = { +EvtScript N(80240624) = { EVT_SET_GROUP(0) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) @@ -98,7 +98,7 @@ EvtSource N(80240624) = { EVT_END }; -EvtSource N(8024068C) = { +EvtScript N(8024068C) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), EVT_VAR(10)) EVT_IF_NE(EVT_VAR(10), 0) @@ -118,7 +118,7 @@ EvtSource N(8024068C) = { EVT_END }; -EvtSource N(8024076C) = { +EvtScript N(8024076C) = { EVT_SET(EVT_VAR(10), 19) EVT_SET(EVT_VAR(11), 1) EVT_SET(EVT_SAVE_FLAG(1048), 1) @@ -127,9 +127,9 @@ EvtSource N(8024076C) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EAE30, -300, 50, -200, 0, 0, MAKE_ENTITY_END) - EVT_CALL(AssignFlag, EVT_SAVE_FLAG(1048)) + EVT_CALL(AssignChestFlag, EVT_SAVE_FLAG(1048)) EVT_CALL(AssignScript, EVT_PTR(N(8024076C))) EVT_CALL(MakeEntity, 0x802EA7E0, -125, 60, 175, 0, MAKE_ENTITY_END) EVT_RETURN @@ -146,7 +146,7 @@ NpcSettings N(npcSettings_80240840) = { .level = 99, }; -EvtSource N(interact_8024086C) = { +EvtScript N(interact_8024086C) = { EVT_IF_EQ(EVT_AREA_FLAG(4), 0) EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_boo_Palette_01_Anim_4, NPC_ANIM_boo_Palette_01_Anim_1, 0, MESSAGE_ID(0x0E, 0x00F0)) EVT_SET(EVT_AREA_FLAG(4), 1) @@ -158,7 +158,7 @@ EvtSource N(interact_8024086C) = { EVT_END }; -EvtSource N(init_802408FC) = { +EvtScript N(init_802408FC) = { EVT_IF_GE(EVT_SAVE_VAR(0), -26) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_END_IF diff --git a/src/world/area_dgb/dgb_06/dgb_06.h b/src/world/area_dgb/dgb_06/dgb_06.h index 64ba168295..405f746b59 100644 --- a/src/world/area_dgb/dgb_06/dgb_06.h +++ b/src/world/area_dgb/dgb_06/dgb_06.h @@ -7,5 +7,5 @@ #define NAMESPACE dgb_06 extern NpcGroupList N(npcGroupList_80240B44); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 0d73b0bf5d..f2f280ffa6 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -21,7 +21,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_07_tattle }, }; -EvtSource N(80241490) = { +EvtScript N(80241490) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -38,7 +38,7 @@ static s32 N(pad_1528)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitSingleDoor_80241530) = { +EvtScript N(exitSingleDoor_80241530) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -54,7 +54,7 @@ EvtSource N(exitSingleDoor_80241530) = { EVT_END }; -EvtSource N(enterSingleDoor_802415E4) = { +EvtScript N(enterSingleDoor_802415E4) = { EVT_CALL(UseDoorSounds, 0) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -67,7 +67,7 @@ EvtSource N(enterSingleDoor_802415E4) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -85,7 +85,7 @@ EvtSource N(main) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, -220, 75, -210, 17, EVT_SAVE_FLAG(1050)) EVT_CALL(MakeEntity, 0x802EAED4, -370, 0, -200, 0, -1, MAKE_ENTITY_END) EVT_CALL(MakeEntity, 0x802EAED4, -410, 0, -200, 0, -1, MAKE_ENTITY_END) @@ -97,7 +97,7 @@ static s32 N(pad_17E4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(802417F0) = { +EvtScript N(802417F0) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -146,7 +146,7 @@ NpcAISettings N(npcAISettings_802418DC) = { .unk_2C = 1, }; -EvtSource N(npcAI_8024190C) = { +EvtScript N(npcAI_8024190C) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) @@ -165,7 +165,7 @@ NpcSettings N(npcSettings_8024197C) = { .level = 13, }; -EvtSource N(npcAI_802419A8) = { +EvtScript N(npcAI_802419A8) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) diff --git a/src/world/area_dgb/dgb_07/dgb_07.h b/src/world/area_dgb/dgb_07/dgb_07.h index fdff6d38fd..b1f0c9c25d 100644 --- a/src/world/area_dgb/dgb_07/dgb_07.h +++ b/src/world/area_dgb/dgb_07/dgb_07.h @@ -10,5 +10,5 @@ ApiStatus N(func_80240E20_C3EA10)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc7)(Evt *script, s32 isInitialCall); NpcGroupList N(npcGroupList_80241E5C); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 9435081646..488b6229da 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -32,7 +32,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_08_tattle }, }; -EvtSource N(80243CF0) = { +EvtScript N(80243CF0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -49,7 +49,7 @@ static s32 N(pad_3D88)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80243D90) = { +EvtScript N(exitDoubleDoor_80243D90) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -65,7 +65,7 @@ EvtSource N(exitDoubleDoor_80243D90) = { EVT_END }; -EvtSource N(exitDoubleDoor_80243E44) = { +EvtScript N(exitDoubleDoor_80243E44) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -85,7 +85,7 @@ const s32 N(pad_XXXX)[] = { 0x00000000, 0x00000000, }; -EvtSource N(enterDoubleDoor_80243EF8) = { +EvtScript N(enterDoubleDoor_80243EF8) = { EVT_CALL(UseDoorSounds, 3) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -102,7 +102,7 @@ EvtSource N(enterDoubleDoor_80243EF8) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -142,7 +142,7 @@ NpcAISettings N(npcAI_80244100) = { .unk_2C = 1, }; -EvtSource N(80244130) = { +EvtScript N(80244130) = { EVT_CALL(N(func_80240B94_C40944), EVT_PTR(N(npcAI_80244100))) EVT_RETURN EVT_END @@ -171,7 +171,7 @@ NpcSettings N(npcSettings_802441A8) = { .level = 13, }; -EvtSource N(802441D4) = { +EvtScript N(802441D4) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -220,7 +220,7 @@ NpcAISettings N(npcAISettings_802442C0) = { .unk_2C = 3, }; -EvtSource N(npcAI_802442F0) = { +EvtScript N(npcAI_802442F0) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) @@ -239,7 +239,7 @@ NpcSettings N(npcSettings_80244360) = { .level = 13, }; -EvtSource N(npcAI_8024438C) = { +EvtScript N(npcAI_8024438C) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) @@ -266,7 +266,7 @@ f32 N(D_80244460_C44210)[] = { 1.5f, 20.0f, }; -EvtSource N(80244478) = { +EvtScript N(80244478) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) EVT_RETURN @@ -288,7 +288,7 @@ NpcAISettings N(npcAISettings_802444B4) = { extern const char N(dgb_00_name_hack)[]; -EvtSource N(npcAI_802444E4) = { +EvtScript N(npcAI_802444E4) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) @@ -349,7 +349,7 @@ EvtSource N(npcAI_802444E4) = { EVT_END }; -EvtSource N(8024490C) = { +EvtScript N(8024490C) = { EVT_CALL(GetOwnerEncounterTrigger, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(1) @@ -364,7 +364,7 @@ EvtSource N(8024490C) = { EVT_END }; -EvtSource N(80244998) = { +EvtScript N(80244998) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -390,7 +390,7 @@ NpcSettings N(npcSettings_80244A28) = { .level = 99, }; -EvtSource N(idle_80244A54) = { +EvtScript N(idle_80244A54) = { EVT_LOOP(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_GE(EVT_VAR(0), -350) @@ -435,7 +435,7 @@ EvtSource N(idle_80244A54) = { EVT_END }; -EvtSource N(80244D08) = { +EvtScript N(80244D08) = { EVT_LABEL(10) EVT_CALL(GetNpcPos, 9, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_GT(EVT_VAR(1), 0) @@ -447,7 +447,7 @@ EvtSource N(80244D08) = { EVT_END }; -EvtSource N(npcAI_80244D7C) = { +EvtScript N(npcAI_80244D7C) = { EVT_CALL(N(func_80243C10_C439C0)) EVT_EXEC(N(80244D08)) EVT_THREAD @@ -467,7 +467,7 @@ EvtSource N(npcAI_80244D7C) = { extern const char N(dgb_01_name_hack)[]; -EvtSource N(defeat_80244E58) = { +EvtScript N(defeat_80244E58) = { EVT_CALL(N(UnkFunc1)) EVT_CALL(GotoMap, EVT_PTR(N(dgb_01_name_hack)), 2) EVT_WAIT_FRAMES(100) @@ -475,7 +475,7 @@ EvtSource N(defeat_80244E58) = { EVT_END }; -EvtSource N(init_80244E94) = { +EvtScript N(init_80244E94) = { EVT_IF_LT(EVT_SAVE_VAR(0), -28) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_4)), TRUE) @@ -815,7 +815,7 @@ StaticNpc N(npcGroup_80246020) = { }, }; -EvtSource N(idle_80246210) = { +EvtScript N(idle_80246210) = { EVT_LABEL(0) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_7) EVT_WAIT_FRAMES(30) @@ -838,7 +838,7 @@ EvtSource N(idle_80246210) = { EVT_END }; -EvtSource N(interact_80246310) = { +EvtScript N(interact_80246310) = { EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_8) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2F1, 0) EVT_WAIT_FRAMES(10) @@ -866,7 +866,7 @@ EvtSource N(interact_80246310) = { EVT_END }; -EvtSource N(init_802464C4) = { +EvtScript N(init_802464C4) = { EVT_CALL(SetNpcCollisionSize, -1, 36, 30) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_world_clubba_Palette_00_Anim_7) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80246310))) @@ -908,12 +908,12 @@ StaticNpc N(npcGroup_80246528) = { .tattle = MESSAGE_ID(0x1A, 0x00B6), }; -EvtSource N(idle_80246718) = { +EvtScript N(idle_80246718) = { EVT_RETURN EVT_END }; -EvtSource N(init_80246728) = { +EvtScript N(init_80246728) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80246718))) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) EVT_RETURN @@ -983,7 +983,7 @@ static s32 N(pad_69DC) = { 0x00000000, }; -EvtSource N(802469E0) = { +EvtScript N(802469E0) = { EVT_RETURN EVT_END }; diff --git a/src/world/area_dgb/dgb_08/dgb_08.h b/src/world/area_dgb/dgb_08/dgb_08.h index d89adca22d..f6281fc384 100644 --- a/src/world/area_dgb/dgb_08/dgb_08.h +++ b/src/world/area_dgb/dgb_08/dgb_08.h @@ -18,7 +18,7 @@ ApiStatus N(func_80243C50_C43A00)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80246958); extern NpcGroupList N(npcGroupList_802469AC); extern NpcGroupList N(npcGroupList_802469C4); -extern EvtSource N(802469E0); -extern EvtSource N(main); -extern EvtSource N(npcAI_80244D7C); -extern EvtSource N(unk_80244100); +extern EvtScript N(802469E0); +extern EvtScript N(main); +extern EvtScript N(npcAI_80244D7C); +extern EvtScript N(unk_80244100); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 8976123bb7..c169da80f3 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -27,7 +27,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_09_tattle }, }; -EvtSource N(80243880) = { +EvtScript N(80243880) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -44,7 +44,7 @@ static s32 N(pad_3918)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80243920) = { +EvtScript N(exitDoubleDoor_80243920) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -60,7 +60,7 @@ EvtSource N(exitDoubleDoor_80243920) = { EVT_END }; -EvtSource N(exitDoubleDoor_802439D4) = { +EvtScript N(exitDoubleDoor_802439D4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -76,7 +76,7 @@ EvtSource N(exitDoubleDoor_802439D4) = { EVT_END }; -EvtSource N(exitSingleDoor_80243A88) = { +EvtScript N(exitSingleDoor_80243A88) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -92,15 +92,15 @@ EvtSource N(exitSingleDoor_80243A88) = { EVT_END }; -EvtSource N(exitWalk_80243B3C) = EXIT_WALK_SCRIPT(40, 3, "dgb_10", 0); +EvtScript N(exitWalk_80243B3C) = EXIT_WALK_SCRIPT(40, 3, "dgb_10", 0); -EvtSource N(80243B98) = { +EvtScript N(80243B98) = { EVT_BIND_TRIGGER(N(exitWalk_80243B3C), TRIGGER_FLOOR_ABOVE, 11, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterWalk_80243BC4) = { +EvtScript N(enterWalk_80243BC4) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -130,7 +130,7 @@ EvtSource N(enterWalk_80243BC4) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -155,7 +155,7 @@ static s32 N(pad_3E4C) = { Vec4f N(triggerCoord_80243E50) = { 300.0f, 0.0f, 88.0f, 0.0f }; -EvtSource N(80243E60) = { +EvtScript N(80243E60) = { EVT_WAIT_FRAMES(2) EVT_CALL(PlayEffect, 0x42, 1, 25, 3, 1, 10, 30, 0, 0, 0, 0, 0, 0, 0) EVT_LOOP(10) @@ -173,7 +173,7 @@ EvtSource N(80243E60) = { EVT_END }; -EvtSource N(80243F6C) = { +EvtScript N(80243F6C) = { EVT_IF_EQ(EVT_SAVE_FLAG(1051), 0) EVT_BIND_TRIGGER(N(80243E60), TRIGGER_POINT_BOMB, EVT_PTR(N(triggerCoord_80243E50)), 1, 0) EVT_CALL(EnableModel, 29, 0) @@ -189,7 +189,7 @@ static s32 N(pad_3FF8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80244000) = { +EvtScript N(80244000) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -238,7 +238,7 @@ NpcAISettings N(npcAISettings_802440EC) = { .unk_2C = 3, }; -EvtSource N(npcAI_8024411C) = { +EvtScript N(npcAI_8024411C) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) @@ -272,7 +272,7 @@ NpcAISettings N(npcAISettings_802441B8) = { .unk_2C = 1, }; -EvtSource N(npcAI_802441E8) = { +EvtScript N(npcAI_802441E8) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) @@ -291,7 +291,7 @@ NpcSettings N(npcSettings_80244258) = { .level = 13, }; -EvtSource N(npcAI_80244284) = { +EvtScript N(npcAI_80244284) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) @@ -318,7 +318,7 @@ f32 N(D_80244358_C4AF38)[] = { 1.5f, 20.0f, }; -EvtSource N(80244370) = { +EvtScript N(80244370) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) EVT_RETURN @@ -340,7 +340,7 @@ NpcAISettings N(npcAISettings_802443AC) = { extern const char N(dgb_00_name_hack)[]; -EvtSource N(npcAI_802443DC) = { +EvtScript N(npcAI_802443DC) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) @@ -401,7 +401,7 @@ EvtSource N(npcAI_802443DC) = { EVT_END }; -EvtSource N(80244804) = { +EvtScript N(80244804) = { EVT_CALL(GetOwnerEncounterTrigger, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(1) @@ -416,7 +416,7 @@ EvtSource N(80244804) = { EVT_END }; -EvtSource N(80244890) = { +EvtScript N(80244890) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -505,7 +505,7 @@ StaticNpc N(npcGroup_80244920)[] = { }, }; -EvtSource N(init_80244D00) = { +EvtScript N(init_80244D00) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 3) EVT_CALL(SetNpcPos, NPC_SELF, 240, 0, 88) diff --git a/src/world/area_dgb/dgb_09/dgb_09.h b/src/world/area_dgb/dgb_09/dgb_09.h index 6e2c080212..b3c1556c6d 100644 --- a/src/world/area_dgb/dgb_09/dgb_09.h +++ b/src/world/area_dgb/dgb_09/dgb_09.h @@ -12,5 +12,5 @@ ApiStatus N(func_80243578_C4A158)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc7)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024533C); -extern EvtSource N(80243F6C); -extern EvtSource N(main); +extern EvtScript N(80243F6C); +extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_10/C4C390.c b/src/world/area_dgb/dgb_10/C4C390.c index faa8a2dce7..594570a482 100644 --- a/src/world/area_dgb/dgb_10/C4C390.c +++ b/src/world/area_dgb/dgb_10/C4C390.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_10_tattle }, }; -EvtSource N(80240250) = { +EvtScript N(80240250) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -30,15 +30,15 @@ static s32 N(pad_2E8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitWalk_802402F0) = EXIT_WALK_SCRIPT(40, 0, "dgb_09", 3); +EvtScript N(exitWalk_802402F0) = EXIT_WALK_SCRIPT(40, 0, "dgb_09", 3); -EvtSource N(8024034C) = { +EvtScript N(8024034C) = { EVT_BIND_TRIGGER(N(exitWalk_802402F0), TRIGGER_FLOOR_ABOVE, 8, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterWalk_80240378) = { +EvtScript N(enterWalk_80240378) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -66,7 +66,7 @@ EvtSource N(enterWalk_80240378) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -92,7 +92,7 @@ static s32 N(pad_66C) = { 0x00000000, }; -EvtSource N(80240670) = { +EvtScript N(80240670) = { EVT_USE_BUF(EVT_VAR(0)) EVT_MALLOC_ARRAY(6, EVT_VAR(10)) EVT_BUF_READ1(EVT_VAR(0)) @@ -113,7 +113,7 @@ EvtSource N(80240670) = { EVT_END }; -EvtSource N(80240770) = { +EvtScript N(80240770) = { EVT_USE_ARRAY(EVT_VAR(0)) EVT_CALL(N(func_80240000_C4C390)) EVT_IF_EQ(EVT_VAR(0), 0) @@ -134,7 +134,7 @@ EvtSource N(80240770) = { EVT_END }; -EvtSource N(80240860) = { +EvtScript N(80240860) = { EVT_USE_BUF(EVT_VAR(0)) EVT_MALLOC_ARRAY(6, EVT_VAR(9)) EVT_BUF_READ1(EVT_VAR(1)) @@ -188,7 +188,7 @@ EvtSource N(80240860) = { EVT_END }; -EvtSource N(80240AF4) = { +EvtScript N(80240AF4) = { EVT_USE_ARRAY(EVT_VAR(9)) EVT_CALL(GetPlayerPos, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)) EVT_CALL(MakeLerp, 0, 5, 3, 1) @@ -219,7 +219,7 @@ EvtSource N(80240AF4) = { EVT_END }; -EvtSource N(80240CB8) = { +EvtScript N(80240CB8) = { EVT_USE_ARRAY(EVT_VAR(9)) EVT_CALL(MakeItemEntity, EVT_ARRAY(5), EVT_ARRAY(2), EVT_ARRAY(3), EVT_ARRAY(4), 3, 0) EVT_SET(EVT_VAR(2), 0) @@ -247,7 +247,7 @@ EvtSource N(80240CB8) = { EVT_END }; -EvtSource N(80240E68) = { +EvtScript N(80240E68) = { EVT_CALL(N(func_8024013C_C4C4CC)) EVT_CALL(func_802CA988, 0, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_CALL(N(func_802401C0_C4C550)) @@ -262,25 +262,25 @@ static s32 N(pad_EDC) = { 0x00000000, }; -EvtSource N(80240EE0) = { +EvtScript N(80240EE0) = { EVT_SET(EVT_SAVE_FLAG(1052), 1) EVT_RETURN EVT_END }; -EvtSource N(80240F00) = { +EvtScript N(80240F00) = { EVT_SET(EVT_SAVE_FLAG(1053), 1) EVT_RETURN EVT_END }; -EvtSource N(80240F20) = { +EvtScript N(80240F20) = { EVT_SET(EVT_SAVE_FLAG(1054), 1) EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1052), 0) EVT_CALL(MakeEntity, 0x802BCE84, 500, 0, -100, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240EE0))) diff --git a/src/world/area_dgb/dgb_10/dgb_10.h b/src/world/area_dgb/dgb_10/dgb_10.h index f3d27f4c17..fe3100b5ad 100644 --- a/src/world/area_dgb/dgb_10/dgb_10.h +++ b/src/world/area_dgb/dgb_10/dgb_10.h @@ -11,9 +11,9 @@ ApiStatus N(UnkDistFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024013C_C4C4CC)(Evt* script, s32 isInitialCall); ApiStatus N(func_802401C0_C4C550)(Evt* script, s32 isInitialCall); -extern EvtSource N(80240770); -extern EvtSource N(80240AF4); -extern EvtSource N(80240CB8); -extern EvtSource N(80240E68); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80240770); +extern EvtScript N(80240AF4); +extern EvtScript N(80240CB8); +extern EvtScript N(80240E68); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_11/C4D3E0.c b/src/world/area_dgb/dgb_11/C4D3E0.c index fed9783f35..7f3865ffe2 100644 --- a/src/world/area_dgb/dgb_11/C4D3E0.c +++ b/src/world/area_dgb/dgb_11/C4D3E0.c @@ -17,7 +17,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_11_tattle }, }; -EvtSource N(802400D0) = { +EvtScript N(802400D0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -34,7 +34,7 @@ static s32 N(pad_168)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitSingleDoor_80240170) = { +EvtScript N(exitSingleDoor_80240170) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -50,7 +50,7 @@ EvtSource N(exitSingleDoor_80240170) = { EVT_END }; -EvtSource N(enterSingleDoor_80240224) = { +EvtScript N(enterSingleDoor_80240224) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -91,7 +91,7 @@ EvtSource N(enterSingleDoor_80240224) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -110,7 +110,7 @@ static s32 N(pad_56C) = { 0x00000000, }; -EvtSource N(80240570) = { +EvtScript N(80240570) = { EVT_LABEL(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_GE(EVT_VAR(1), EVT_VAR(3)) @@ -123,13 +123,13 @@ EvtSource N(80240570) = { EVT_END }; -EvtSource N(80240600) = { +EvtScript N(80240600) = { EVT_CALL(PlayerJump, 375, 270, -250, 20) EVT_RETURN EVT_END }; -EvtSource N(8024062C) = { +EvtScript N(8024062C) = { EVT_IF_EQ(EVT_AREA_FLAG(3), 1) EVT_RETURN EVT_END_IF @@ -205,7 +205,7 @@ EvtSource N(8024062C) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_D_DOWN_JUMP, 250, 75, -100, 17, EVT_SAVE_FLAG(1055)) EVT_CALL(MakeEntity, 0x802EAA30, 375, 0, -250, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(8024062C))) diff --git a/src/world/area_dgb/dgb_11/dgb_11.h b/src/world/area_dgb/dgb_11/dgb_11.h index 72f7a36322..8b8877202c 100644 --- a/src/world/area_dgb/dgb_11/dgb_11.h +++ b/src/world/area_dgb/dgb_11/dgb_11.h @@ -8,5 +8,5 @@ ApiStatus N(func_80240000_C4D3E0)(Evt* script, s32 isInitialCall); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index d34d7b9af8..738808d1da 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_12_tattle }, }; -EvtSource N(80240310) = { +EvtScript N(80240310) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -30,7 +30,7 @@ static s32 N(pad_3A8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitSingleDoor_802403B0) = { +EvtScript N(exitSingleDoor_802403B0) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -46,7 +46,7 @@ EvtSource N(exitSingleDoor_802403B0) = { EVT_END }; -EvtSource N(enterSingleDoor_80240464) = { +EvtScript N(enterSingleDoor_80240464) = { EVT_CALL(UseDoorSounds, 0) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -59,7 +59,7 @@ EvtSource N(enterSingleDoor_80240464) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -79,7 +79,7 @@ s32 N(lavaResetList_802405C0)[] = { 0x00000005, 0xC3FB8000, 0x00000000, 0xC27C0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(802405E0) = { +EvtScript N(802405E0) = { EVT_SET_GROUP(239) EVT_CALL(ModifyColliderFlags, 3, 12, 0x00000002) EVT_CALL(ModifyColliderFlags, 3, 0, 0x00000002) @@ -132,7 +132,7 @@ static s32 N(pad_868)[] = { #include "world/common/StashVars.inc.c" -EvtSource N(80240874) = { +EvtScript N(80240874) = { EVT_SET_GROUP(0) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) @@ -143,7 +143,7 @@ EvtSource N(80240874) = { EVT_END }; -EvtSource N(802408DC) = { +EvtScript N(802408DC) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), EVT_VAR(10)) EVT_IF_NE(EVT_VAR(10), 0) @@ -163,7 +163,7 @@ EvtSource N(802408DC) = { EVT_END }; -EvtSource N(802409BC) = { +EvtScript N(802409BC) = { EVT_SET(EVT_VAR(10), 19) EVT_SET(EVT_VAR(11), 1) EVT_SET(EVT_SAVE_FLAG(1057), 1) @@ -172,9 +172,9 @@ EvtSource N(802409BC) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EAE30, -225, 0, -245, 0, 0, MAKE_ENTITY_END) - EVT_CALL(AssignFlag, EVT_SAVE_FLAG(1057)) + EVT_CALL(AssignChestFlag, EVT_SAVE_FLAG(1057)) EVT_CALL(AssignScript, EVT_PTR(N(802409BC))) EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_12/dgb_12.h b/src/world/area_dgb/dgb_12/dgb_12.h index 3be539209d..5708e16c3f 100644 --- a/src/world/area_dgb/dgb_12/dgb_12.h +++ b/src/world/area_dgb/dgb_12/dgb_12.h @@ -6,6 +6,6 @@ #define NAMESPACE dgb_12 -extern EvtSource N(802405E0); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(802405E0); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_13/C4E960.c b/src/world/area_dgb/dgb_13/C4E960.c index 0663094837..fd0a439ec0 100644 --- a/src/world/area_dgb/dgb_13/C4E960.c +++ b/src/world/area_dgb/dgb_13/C4E960.c @@ -12,7 +12,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_13_tattle }, }; -EvtSource N(80240050) = { +EvtScript N(80240050) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -29,15 +29,15 @@ static s32 N(pad_E8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitWalk_802400F0) = EXIT_WALK_SCRIPT(26, 0, "dgb_03", 5); +EvtScript N(exitWalk_802400F0) = EXIT_WALK_SCRIPT(26, 0, "dgb_03", 5); -EvtSource N(8024014C) = { +EvtScript N(8024014C) = { EVT_BIND_TRIGGER(N(exitWalk_802400F0), TRIGGER_FLOOR_ABOVE, 5, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -55,7 +55,7 @@ EvtSource N(main) = { EVT_END }; -EvtSource N(80240270) = { +EvtScript N(80240270) = { EVT_CALL(MakeItemEntity, ITEM_MEGA_RUSH, -910, 50, -206, 17, EVT_SAVE_FLAG(1058)) EVT_CALL(MakeItemEntity, ITEM_COIN, -530, 55, -190, 17, EVT_SAVE_FLAG(1059)) EVT_CALL(MakeItemEntity, ITEM_COIN, -510, 55, -175, 17, EVT_SAVE_FLAG(1060)) @@ -71,7 +71,7 @@ static s32 N(pad_37C) = { 0x00000000, }; -EvtSource N(80240380) = { +EvtScript N(80240380) = { EVT_CALL(MakeLerp, 0, 30, 15, 0) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -86,7 +86,7 @@ EvtSource N(80240380) = { EVT_END }; -EvtSource N(80240424) = { +EvtScript N(80240424) = { EVT_CALL(MakeLerp, 30, 0, 15, 0) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -101,7 +101,7 @@ EvtSource N(80240424) = { EVT_END }; -EvtSource N(802404C8) = { +EvtScript N(802404C8) = { EVT_CALL(MakeLerp, 0, 30, 15, 0) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -116,7 +116,7 @@ EvtSource N(802404C8) = { EVT_END }; -EvtSource N(8024056C) = { +EvtScript N(8024056C) = { EVT_CALL(MakeLerp, 30, 0, 15, 0) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -131,7 +131,7 @@ EvtSource N(8024056C) = { EVT_END }; -EvtSource N(80240610) = { +EvtScript N(80240610) = { EVT_IF_EQ(EVT_MAP_VAR(0), 0) EVT_EXEC_WAIT(N(80240380)) EVT_SET(EVT_MAP_VAR(0), 1) @@ -144,7 +144,7 @@ EvtSource N(80240610) = { EVT_END }; -EvtSource N(80240680) = { +EvtScript N(80240680) = { EVT_CALL(ParentColliderToModel, 13, 44) EVT_BIND_TRIGGER(N(80240610), TRIGGER_WALL_PRESS_A, 13, 1, 0) EVT_RETURN diff --git a/src/world/area_dgb/dgb_13/dgb_13.h b/src/world/area_dgb/dgb_13/dgb_13.h index b5ce63c62d..688c1ab68a 100644 --- a/src/world/area_dgb/dgb_13/dgb_13.h +++ b/src/world/area_dgb/dgb_13/dgb_13.h @@ -6,6 +6,6 @@ #define NAMESPACE dgb_13 -extern EvtSource N(80240270); -extern EvtSource N(80240680); -extern EvtSource N(main); +extern EvtScript N(80240270); +extern EvtScript N(80240680); +extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_14/C4F030.c b/src/world/area_dgb/dgb_14/C4F030.c index 82c0a2f8da..fe92381109 100644 --- a/src/world/area_dgb/dgb_14/C4F030.c +++ b/src/world/area_dgb/dgb_14/C4F030.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_14_tattle }, }; -EvtSource N(80240060) = { +EvtScript N(80240060) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -30,7 +30,7 @@ static s32 N(pad_F8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80240100) = { +EvtScript N(exitDoubleDoor_80240100) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -46,7 +46,7 @@ EvtSource N(exitDoubleDoor_80240100) = { EVT_END }; -EvtSource N(exitDoubleDoor_802401B4) = { +EvtScript N(exitDoubleDoor_802401B4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -62,7 +62,7 @@ EvtSource N(exitDoubleDoor_802401B4) = { EVT_END }; -EvtSource N(enterDoubleDoor_80240268) = { +EvtScript N(enterDoubleDoor_80240268) = { EVT_CALL(UseDoorSounds, 3) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -87,7 +87,7 @@ EvtSource N(enterDoubleDoor_80240268) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -107,7 +107,7 @@ static s32 N(pad_47C) = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA564, 500, 60, 75, 0, 163, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1065)) EVT_RETURN diff --git a/src/world/area_dgb/dgb_14/dgb_14.h b/src/world/area_dgb/dgb_14/dgb_14.h index fb24e84371..43717e72e4 100644 --- a/src/world/area_dgb/dgb_14/dgb_14.h +++ b/src/world/area_dgb/dgb_14/dgb_14.h @@ -6,5 +6,5 @@ #define NAMESPACE dgb_14 -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index fb542d0530..ba3bc2a358 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -19,7 +19,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_15_tattle }, }; -EvtSource N(802418E0) = { +EvtScript N(802418E0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_IF_EQ(EVT_SAVE_VAR(203), 15) @@ -45,7 +45,7 @@ s32 N(itemList_802419C0)[] = { ITEM_NONE, }; -EvtSource N(exitDoubleDoor_802419C8) = { +EvtScript N(exitDoubleDoor_802419C8) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -61,7 +61,7 @@ EvtSource N(exitDoubleDoor_802419C8) = { EVT_END }; -EvtSource N(exitDoubleDoor_80241A7C) = { +EvtScript N(exitDoubleDoor_80241A7C) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -77,7 +77,7 @@ EvtSource N(exitDoubleDoor_80241A7C) = { EVT_END }; -EvtSource N(exitSingleDoor_80241B30) = { +EvtScript N(exitSingleDoor_80241B30) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -95,7 +95,7 @@ EvtSource N(exitSingleDoor_80241B30) = { const s32 N(pad_XXXX)[] = { 0, 0 }; -EvtSource N(80241BE4) = { +EvtScript N(80241BE4) = { EVT_BIND_TRIGGER(N(exitDoubleDoor_802419C8), TRIGGER_WALL_PRESS_A, 19, 1, 0) EVT_BIND_TRIGGER(N(exitSingleDoor_80241B30), TRIGGER_WALL_PRESS_A, 6, 1, 0) EVT_IF_EQ(EVT_SAVE_FLAG(1066), 0) @@ -107,7 +107,7 @@ EvtSource N(80241BE4) = { EVT_END }; -EvtSource N(enterSingleDoor_80241C88) = { +EvtScript N(enterSingleDoor_80241C88) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -131,7 +131,7 @@ EvtSource N(enterSingleDoor_80241C88) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_SET(EVT_AREA_FLAG(1), 0) @@ -153,7 +153,7 @@ static s32 N(pad_1E94)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80241EA0) = { +EvtScript N(80241EA0) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -179,7 +179,7 @@ s32 N(D_80241F8C_C5149C)[] = { 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, }; -EvtSource N(80241FBC) = { +EvtScript N(80241FBC) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) @@ -194,7 +194,7 @@ s32 N(unk_missing_8024202C)[] = { 0x00000000, 0x00000000, 0x000D0000, }; -EvtSource N(80242058) = { +EvtScript N(80242058) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) @@ -225,7 +225,7 @@ s32 N(unk_missing_80242158)[] = { 0x00000000, 0x00000000, 0x000D0000, }; -EvtSource N(80242184) = { +EvtScript N(80242184) = { EVT_LOOP(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(GetNpcPos, 0, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) @@ -241,7 +241,7 @@ EvtSource N(80242184) = { EVT_END }; -EvtSource N(idle_80242238) = { +EvtScript N(idle_80242238) = { EVT_LOOP(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_GE(EVT_VAR(0), -1150) @@ -282,7 +282,7 @@ EvtSource N(idle_80242238) = { EVT_END }; -EvtSource N(802424E8) = { +EvtScript N(802424E8) = { EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(6), EVT_VAR(7), EVT_VAR(8)) EVT_LOOP(0) EVT_WAIT_FRAMES(1) @@ -335,7 +335,7 @@ NpcAISettings N(npcAISettings_8024271C) = { .unk_2C = 1, }; -EvtSource N(npcAI_8024274C) = { +EvtScript N(npcAI_8024274C) = { EVT_EXEC(N(80242184)) EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_GRAVITY)), TRUE) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_world_tubba_Palette_00_Anim_C) @@ -347,7 +347,7 @@ EvtSource N(npcAI_8024274C) = { extern const char N(dgb_14_name_hack)[]; -EvtSource N(defeat_802427B0) = { +EvtScript N(defeat_802427B0) = { EVT_CALL(N(UnkFunc1)) EVT_CALL(GotoMap, EVT_PTR(N(dgb_14_name_hack)), 1) EVT_WAIT_FRAMES(100) @@ -355,7 +355,7 @@ EvtSource N(defeat_802427B0) = { EVT_END }; -EvtSource N(init_802427EC) = { +EvtScript N(init_802427EC) = { EVT_IF_NE(EVT_SAVE_VAR(0), -32) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN @@ -419,7 +419,7 @@ static s32 N(pad_2AC8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80242AD0) = { +EvtScript N(80242AD0) = { EVT_SET_GROUP(0) EVT_SUSPEND_GROUP(1) EVT_CALL(ShowKeyChoicePopup) @@ -448,13 +448,13 @@ EvtSource N(80242AD0) = { EVT_END }; -EvtSource N(80242C38) = { +EvtScript N(80242C38) = { EVT_BIND_TRIGGER(N(exitDoubleDoor_80241A7C), TRIGGER_WALL_PRESS_A, 10, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1066), 0) EVT_CALL(MakeEntity, 0x802BCD68, 130, 8, 175, -80, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80242C38))) diff --git a/src/world/area_dgb/dgb_15/dgb_15.h b/src/world/area_dgb/dgb_15/dgb_15.h index b283f1d87a..897331f2c4 100644 --- a/src/world/area_dgb/dgb_15/dgb_15.h +++ b/src/world/area_dgb/dgb_15/dgb_15.h @@ -14,8 +14,8 @@ ApiStatus N(func_80241464_C50974)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80242AB0); -extern EvtSource N(80242AD0); -extern EvtSource N(main); -extern EvtSource N(makeEntities); -extern EvtSource N(npcAI_8024274C); -extern EvtSource N(unk_80241F8C); +extern EvtScript N(80242AD0); +extern EvtScript N(main); +extern EvtScript N(makeEntities); +extern EvtScript N(npcAI_8024274C); +extern EvtScript N(unk_80241F8C); diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 3ac6fcf92a..94cd3ce542 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -30,7 +30,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_16_tattle }, }; -EvtSource N(80241480) = { +EvtScript N(80241480) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -47,7 +47,7 @@ static s32 N(pad_1518)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitSingleDoor_80241520) = { +EvtScript N(exitSingleDoor_80241520) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 0) @@ -65,7 +65,7 @@ EvtSource N(exitSingleDoor_80241520) = { const char N(pad_XXX)[] = { 0, 0 }; -EvtSource N(enterSingleDoor_802415D4) = { +EvtScript N(enterSingleDoor_802415D4) = { EVT_CALL(UseDoorSounds, 0) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -82,7 +82,7 @@ EvtSource N(enterSingleDoor_802415D4) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -103,7 +103,7 @@ static s32 N(pad_1774)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80241780) = { +EvtScript N(80241780) = { EVT_CALL(MakeItemEntity, ITEM_TUBBA_CASTLE_KEY, -235, 25, -165, 17, EVT_SAVE_FLAG(1069)) EVT_RETURN EVT_END @@ -113,7 +113,7 @@ static s32 N(pad_17B4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(802417C0) = { +EvtScript N(802417C0) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -162,7 +162,7 @@ NpcAISettings N(npcAISettings_802418AC) = { .unk_2C = 1, }; -EvtSource N(npcAI_802418DC) = { +EvtScript N(npcAI_802418DC) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) @@ -181,7 +181,7 @@ NpcSettings N(npcSettings_8024194C) = { .level = 13, }; -EvtSource N(npcAI_80241978) = { +EvtScript N(npcAI_80241978) = { EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) EVT_CALL(SetSelfVar, 0, 4) EVT_CALL(SetSelfVar, 1, 32) diff --git a/src/world/area_dgb/dgb_16/dgb_16.h b/src/world/area_dgb/dgb_16/dgb_16.h index 639af25ef8..25490990b0 100644 --- a/src/world/area_dgb/dgb_16/dgb_16.h +++ b/src/world/area_dgb/dgb_16/dgb_16.h @@ -10,5 +10,5 @@ ApiStatus N(func_80240E20_C53360)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024318C); -extern EvtSource N(80241780); -extern EvtSource N(main); +extern EvtScript N(80241780); +extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_17/C55A60.c b/src/world/area_dgb/dgb_17/C55A60.c index 82c9990ca1..f0010ab2c1 100644 --- a/src/world/area_dgb/dgb_17/C55A60.c +++ b/src/world/area_dgb/dgb_17/C55A60.c @@ -13,7 +13,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_17_tattle }, }; -EvtSource N(80240060) = { +EvtScript N(80240060) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -30,7 +30,7 @@ static s32 N(pad_F8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80240100) = { +EvtScript N(exitDoubleDoor_80240100) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -46,7 +46,7 @@ EvtSource N(exitDoubleDoor_80240100) = { EVT_END }; -EvtSource N(exitDoubleDoor_802401B4) = { +EvtScript N(exitDoubleDoor_802401B4) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -62,14 +62,14 @@ EvtSource N(exitDoubleDoor_802401B4) = { EVT_END }; -EvtSource N(80240268) = { +EvtScript N(80240268) = { EVT_BIND_TRIGGER(N(exitDoubleDoor_80240100), TRIGGER_WALL_PRESS_A, 7, 1, 0) EVT_BIND_TRIGGER(N(exitDoubleDoor_802401B4), TRIGGER_WALL_PRESS_A, 11, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(enterDoubleDoor_802402B0) = { +EvtScript N(enterDoubleDoor_802402B0) = { EVT_CALL(GetLoadType, EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(1), 1) EVT_EXEC(EnterSavePoint) @@ -93,7 +93,7 @@ EvtSource N(enterDoubleDoor_802402B0) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -107,7 +107,7 @@ EvtSource N(main) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -300, 60, 75, 0, MAKE_ENTITY_END) EVT_CALL(MakeEntity, 0x802EA7E0, -450, 60, 75, 0, MAKE_ENTITY_END) EVT_RETURN diff --git a/src/world/area_dgb/dgb_17/dgb_17.h b/src/world/area_dgb/dgb_17/dgb_17.h index 6c503655a0..36403a4926 100644 --- a/src/world/area_dgb/dgb_17/dgb_17.h +++ b/src/world/area_dgb/dgb_17/dgb_17.h @@ -6,5 +6,5 @@ #define NAMESPACE dgb_17 -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 215b27aca7..9c234a5f21 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -24,7 +24,7 @@ MapConfig N(config) = { .tattle = { MSG_dgb_18_tattle }, }; -EvtSource N(802412C0) = { +EvtScript N(802412C0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-29) EVT_CALL(SetMusicTrack, 0, SONG_TUBBAS_MANOR, 0, 8) @@ -41,7 +41,7 @@ static s32 N(pad_1358)[] = { 0x00000000, 0x00000000, }; -EvtSource N(exitDoubleDoor_80241360) = { +EvtScript N(exitDoubleDoor_80241360) = { EVT_SET_GROUP(27) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(UseDoorSounds, 3) @@ -57,7 +57,7 @@ EvtSource N(exitDoubleDoor_80241360) = { EVT_END }; -EvtSource N(enterDoubleDoor_80241414) = { +EvtScript N(enterDoubleDoor_80241414) = { EVT_CALL(UseDoorSounds, 3) EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -70,7 +70,7 @@ EvtSource N(enterDoubleDoor_80241414) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 15) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -103,7 +103,7 @@ NpcAISettings N(npcAISettings_80241580) = { .unk_2C = 1, }; -EvtSource N(802415B0) = { +EvtScript N(802415B0) = { EVT_CALL(N(func_80240B94_C56AD4), EVT_PTR(N(npcAISettings_80241580))) EVT_RETURN EVT_END @@ -132,7 +132,7 @@ NpcSettings N(npcSettings_80241628) = { .level = 13, }; -EvtSource N(idle_80241654) = { +EvtScript N(idle_80241654) = { EVT_LABEL(10) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_WAIT_FRAMES(1) @@ -351,7 +351,7 @@ EvtSource N(idle_80241654) = { EVT_END }; -EvtSource N(idle_80242494) = { +EvtScript N(idle_80242494) = { EVT_CALL(SetNpcScale, NPC_SELF, EVT_FIXED(1.25), EVT_FIXED(1.25), EVT_FIXED(1.25)) EVT_CALL(SetNpcPos, NPC_SELF, 600, 50, 115) EVT_CALL(func_802CDE68, -1, 0) @@ -385,7 +385,7 @@ EvtSource N(idle_80242494) = { EVT_END }; -EvtSource N(npcAI_802426B0) = { +EvtScript N(npcAI_802426B0) = { EVT_SET_GROUP(11) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2039, 0) EVT_CALL(ShowSleepBubble, 0, 0, 50, 2, 552, 111, 128, 30, EVT_VAR(0)) @@ -410,7 +410,7 @@ EvtSource N(npcAI_802426B0) = { EVT_END }; -EvtSource N(npcAI_80242834) = { +EvtScript N(npcAI_80242834) = { EVT_SET_GROUP(11) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_world_tubba_Palette_00_Anim_D) EVT_THREAD @@ -428,7 +428,7 @@ EvtSource N(npcAI_80242834) = { extern const char N(dgb_01_name_hack)[]; -EvtSource N(defeat_802428E8) = { +EvtScript N(defeat_802428E8) = { EVT_CALL(N(UnkFunc1)) EVT_CALL(GotoMap, EVT_PTR(N(dgb_01_name_hack)), 6) EVT_WAIT_FRAMES(100) @@ -438,7 +438,7 @@ EvtSource N(defeat_802428E8) = { const char N(pad_XXX)[] = { 0, 0 }; -EvtSource N(init_80242924) = { +EvtScript N(init_80242924) = { EVT_CALL(SetNpcScale, NPC_SELF, EVT_FIXED(1.25), EVT_FIXED(1.25), EVT_FIXED(1.25)) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_802428E8))) EVT_SWITCH(EVT_SAVE_VAR(0)) @@ -457,7 +457,7 @@ EvtSource N(init_80242924) = { EVT_END }; -EvtSource N(idle_80242A24) = { +EvtScript N(idle_80242A24) = { EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 1) @@ -573,7 +573,7 @@ EvtSource N(idle_80242A24) = { EVT_END }; -EvtSource N(init_8024329C) = { +EvtScript N(init_8024329C) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80242A24))) EVT_RETURN @@ -653,7 +653,7 @@ static s32 N(pad_36D8)[] = { s32** N(D_802436E0_C59620) = NULL; // StashVars.inc.c data -EvtSource N(802436E4) = { +EvtScript N(802436E4) = { EVT_SET_GROUP(0) EVT_CALL(SetTimeFreezeMode, 2) EVT_WAIT_FRAMES(40) @@ -664,7 +664,7 @@ EvtSource N(802436E4) = { EVT_END }; -EvtSource N(8024374C) = { +EvtScript N(8024374C) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(EVT_VAR(0), EVT_VAR(10)) EVT_IF_NE(EVT_VAR(10), 0) @@ -684,7 +684,7 @@ EvtSource N(8024374C) = { EVT_END }; -EvtSource N(8024382C) = { +EvtScript N(8024382C) = { EVT_SET(EVT_SAVE_FLAG(1071), 1) EVT_CALL(AddKeyItem, ITEM_MYSTICAL_KEY) EVT_CALL(SetNpcVar, 1, 0, 1) @@ -692,9 +692,9 @@ EvtSource N(8024382C) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EAE30, 845, 0, 145, -35, 0, MAKE_ENTITY_END) - EVT_CALL(AssignFlag, EVT_SAVE_FLAG(1071)) + EVT_CALL(AssignChestFlag, EVT_SAVE_FLAG(1071)) EVT_CALL(AssignScript, EVT_PTR(N(8024382C))) EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_18/dgb_18.h b/src/world/area_dgb/dgb_18/dgb_18.h index dacbfb91e0..442bb8608e 100644 --- a/src/world/area_dgb/dgb_18/dgb_18.h +++ b/src/world/area_dgb/dgb_18/dgb_18.h @@ -12,6 +12,6 @@ ApiStatus N(func_80240B94_C56AD4)(Evt* script, s32 isInitialCall); extern s32** N(D_802436E0_C59620); extern NpcGroupList N(npcGroupList_802436B4); -extern EvtSource N(main); -extern EvtSource N(makeEntities); -extern EvtSource N(npcAI_80242834); +extern EvtScript N(main); +extern EvtScript N(makeEntities); +extern EvtScript N(npcAI_80242834); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 26ff787f65..4a80f42c13 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -105,7 +105,7 @@ MapConfig N(config) = { .tattle = { MSG_dro_01_tattle }, }; -EvtSource N(80243BB0) = { +EvtScript N(80243BB0) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_OR_EQ(3) @@ -119,7 +119,7 @@ EvtSource N(80243BB0) = { EVT_END }; -EvtSource N(80243C30) = { +EvtScript N(80243C30) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) @@ -175,7 +175,7 @@ EvtSource N(80243C30) = { EVT_END }; -EvtSource N(80243F84) = { +EvtScript N(80243F84) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(HidePlayerShadow, TRUE) @@ -238,7 +238,7 @@ EvtSource N(80243F84) = { EVT_END }; -EvtSource N(80244374) = { +EvtScript N(80244374) = { EVT_CALL(N(UnkFunc25)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -260,7 +260,7 @@ EvtSource N(80244374) = { EVT_END }; -EvtSource N(80244450) = { +EvtScript N(80244450) = { EVT_CALL(N(SetPlayerStatusAnimFlags100000)) EVT_SET_GROUP(27) EVT_CALL(DisablePlayerPhysics, TRUE) @@ -294,7 +294,7 @@ EvtSource N(80244450) = { EVT_END }; -EvtSource N(8024462C) = { +EvtScript N(8024462C) = { EVT_CALL(IsPlayerOnValidFloor, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -356,7 +356,7 @@ EvtSource N(8024462C) = { EVT_END }; -EvtSource N(exitWalk_80244960) = { +EvtScript N(exitWalk_80244960) = { EVT_SET_GROUP(27) EVT_SET(EVT_SAVE_FLAG(761), 0) EVT_CALL(UseExitHeading, 60, 0) @@ -367,16 +367,16 @@ EvtSource N(exitWalk_80244960) = { EVT_END }; -EvtSource N(exitWalk_802449CC) = EXIT_WALK_SCRIPT(60, 1, "dro_02", 0); +EvtScript N(exitWalk_802449CC) = EXIT_WALK_SCRIPT(60, 1, "dro_02", 0); -EvtSource N(80244A28) = { +EvtScript N(80244A28) = { EVT_BIND_TRIGGER(N(exitWalk_80244960), TRIGGER_FLOOR_ABOVE, 1, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_802449CC), TRIGGER_FLOOR_ABOVE, 5, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(80244A70) = { +EvtScript N(80244A70) = { EVT_CALL(PlaySound, 0x80000060) EVT_CALL(UseSettingsFrom, 0, 175, 0, -201) EVT_CALL(SetPanTarget, 0, 175, 0, -201) @@ -403,7 +403,7 @@ EvtSource N(80244A70) = { EVT_END }; -EvtSource N(enterWalk_80244C14) = { +EvtScript N(enterWalk_80244C14) = { EVT_CALL(GetLoadType, EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(1), 1) EVT_EXEC(EnterSavePoint) @@ -447,7 +447,7 @@ EvtSource N(enterWalk_80244C14) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 9) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -490,7 +490,7 @@ NpcAISettings N(npcAISettings_80245010) = { .unk_2C = 1, }; -EvtSource N(npcAI_80245040) = { +EvtScript N(npcAI_80245040) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80245010))) EVT_RETURN EVT_END @@ -512,7 +512,7 @@ NpcAISettings N(npcAISettings_8024508C) = { .unk_2C = 1, }; -EvtSource N(npcAI_802450BC) = { +EvtScript N(npcAI_802450BC) = { EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_8024508C))) EVT_RETURN EVT_END @@ -552,14 +552,14 @@ NpcSettings N(npcSettings_8024518C) = { s32** N(D_802451B8_9603B8) = NULL; -EvtSource N(802451BC) = { +EvtScript N(802451BC) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(802451EC) = { +EvtScript N(802451EC) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 16) EVT_RETURN EVT_RETURN @@ -585,7 +585,7 @@ QuizRequirements N(quizRequirements)[] = { { 96, 64 }, { 0, 64 }, }; -EvtSource N(802452AC) = { +EvtScript N(802452AC) = { EVT_CALL(N(GetGameStatus75)) EVT_IF_LE(EVT_VAR(0), 1) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -599,7 +599,7 @@ EvtSource N(802452AC) = { EVT_END }; -EvtSource N(8024535C) = { +EvtScript N(8024535C) = { EVT_CALL(N(GetCamVfov), 0, EVT_ARRAY(0)) EVT_CALL(N(SetCamVfov), 0, 25) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -624,7 +624,7 @@ EvtSource N(8024535C) = { EVT_END }; -EvtSource N(802454F8) = { +EvtScript N(802454F8) = { EVT_CALL(GetNpcPos, 10, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 30) EVT_CALL(SetPanTarget, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -642,14 +642,14 @@ EvtSource N(802454F8) = { EVT_END }; -EvtSource N(802455F4) = { +EvtScript N(802455F4) = { EVT_CALL(N(SetCamVfov), 0, EVT_ARRAY(0)) EVT_CALL(PanToTarget, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(80245630) = { +EvtScript N(80245630) = { EVT_WAIT_FRAMES(20) EVT_CALL(N(UnkCameraFunc), EVT_ARRAY(1), EVT_ARRAY(3), 83, EVT_VAR(0), EVT_VAR(1)) EVT_THREAD @@ -680,7 +680,7 @@ EvtSource N(80245630) = { EVT_END }; -EvtSource N(802457E0) = { +EvtScript N(802457E0) = { EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(10), EVT_VAR(11), EVT_VAR(12)) EVT_CALL(N(UnkCameraFunc), EVT_VAR(10), EVT_VAR(12), 108, EVT_VAR(0), EVT_VAR(1)) EVT_SETF(EVT_VAR(5), EVT_ARRAY(2)) @@ -702,7 +702,7 @@ EvtSource N(802457E0) = { EVT_END }; -EvtSource N(80245918) = { +EvtScript N(80245918) = { EVT_CALL(GetNpcPos, 10, EVT_VAR(10), EVT_VAR(11), EVT_VAR(12)) EVT_CALL(N(UnkCameraFunc), EVT_VAR(10), EVT_VAR(12), -70, EVT_VAR(0), EVT_VAR(1)) EVT_THREAD @@ -728,7 +728,7 @@ EvtSource N(80245918) = { EVT_END }; -EvtSource N(80245A84) = { +EvtScript N(80245A84) = { EVT_EXEC(N(80245630)) EVT_EXEC(N(802457E0)) EVT_EXEC_WAIT(N(80245918)) @@ -736,7 +736,7 @@ EvtSource N(80245A84) = { EVT_END }; -EvtSource N(80245AB8) = { +EvtScript N(80245AB8) = { EVT_LOOP(0) EVT_CALL(SetPlayerAnimation, ANIM_QUESTION) EVT_WAIT_FRAMES(20) @@ -745,7 +745,7 @@ EvtSource N(80245AB8) = { EVT_END }; -EvtSource N(80245AF8) = { +EvtScript N(80245AF8) = { EVT_CALL(SetPlayerAnimation, ANIM_THROW) EVT_WAIT_FRAMES(15) EVT_CALL(SetPlayerAnimation, ANIM_10002) @@ -753,7 +753,7 @@ EvtSource N(80245AF8) = { EVT_END }; -EvtSource N(80245B34) = { +EvtScript N(80245B34) = { EVT_LOOP(0) EVT_CALL(SetPlayerAnimation, ANIM_10002) EVT_WAIT_FRAMES(1) @@ -926,7 +926,7 @@ EvtSource N(80245B34) = { EVT_END }; -EvtSource N(8024667C) = { +EvtScript N(8024667C) = { EVT_CALL(SetPlayerAnimation, ANIM_SHOCK_STILL) EVT_LOOP(0) EVT_WAIT_FRAMES(1) @@ -935,7 +935,7 @@ EvtSource N(8024667C) = { EVT_END }; -EvtSource N(802466BC) = { +EvtScript N(802466BC) = { EVT_THREAD EVT_CALL(N(UnkCameraFunc), EVT_ARRAY(1), EVT_ARRAY(3), 25, EVT_VAR(0), EVT_VAR(1)) EVT_SETF(EVT_VAR(2), EVT_ARRAY(1)) @@ -951,7 +951,7 @@ EvtSource N(802466BC) = { EVT_END }; -EvtSource N(80246798) = { +EvtScript N(80246798) = { EVT_EXEC_GET_TID(N(80245B34), EVT_VAR(1)) EVT_WAIT_FRAMES(60) EVT_KILL_THREAD(EVT_VAR(1)) @@ -967,7 +967,7 @@ EvtSource N(80246798) = { EVT_END }; -EvtSource N(80246848) = { +EvtScript N(80246848) = { EVT_EXEC_GET_TID(N(8024667C), EVT_VAR(1)) EVT_WAIT_FRAMES(60) EVT_LOOP(5) @@ -983,7 +983,7 @@ EvtSource N(80246848) = { EVT_END }; -EvtSource N(802468F8) = { +EvtScript N(802468F8) = { EVT_IF_GT(EVT_SAVE_VAR(352), 63) EVT_SET(EVT_VAR(0), 0) EVT_RETURN @@ -1185,7 +1185,7 @@ EvtSource N(802468F8) = { EVT_END }; -EvtSource N(80247628) = { +EvtScript N(80247628) = { EVT_CALL(N(UnkQuizFunc)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -1197,7 +1197,7 @@ EvtSource N(80247628) = { EVT_END }; -EvtSource N(8024769C) = { +EvtScript N(8024769C) = { EVT_USE_ARRAY(EVT_PTR(N(pad_D_8024DFC8))) EVT_SET(EVT_SAVE_FLAG(1769), 1) EVT_CALL(DisablePlayerPhysics, TRUE) @@ -1209,7 +1209,7 @@ EvtSource N(8024769C) = { EVT_END }; -EvtSource N(8024771C) = { +EvtScript N(8024771C) = { EVT_CALL(N(GetNpcUnsafeOwner2)) EVT_RETURN EVT_END @@ -1223,7 +1223,7 @@ NpcAISettings N(npcAISettings_80247738) = { .unk_2C = 1, }; -EvtSource N(80247768) = { +EvtScript N(80247768) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80247738))) EVT_RETURN EVT_END @@ -1261,7 +1261,7 @@ s32 N(D_802477E4_9629E4) = { 0x00000000, }; -EvtSource N(802477E8) = { +EvtScript N(802477E8) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowKeyChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -1286,7 +1286,7 @@ EvtSource N(802477E8) = { EVT_END }; -EvtSource N(8024792C) = { +EvtScript N(8024792C) = { EVT_CALL(N(func_802427BC_95D9BC), EVT_VAR(0)) EVT_BIND_PADLOCK(N(802477E8), 0x10, 0, EVT_PTR(N(D_8024DFF0)), 0, 1) EVT_CALL(N(func_80242730_95D930), EVT_VAR(0)) @@ -1294,7 +1294,7 @@ EvtSource N(8024792C) = { EVT_END }; -EvtSource N(8024797C) = { +EvtScript N(8024797C) = { EVT_LOOP(0) EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_CALL(N(UnkYawFunc), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) @@ -1305,7 +1305,7 @@ EvtSource N(8024797C) = { EVT_END }; -EvtSource N(802479FC) = { +EvtScript N(802479FC) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowKeyChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -1355,7 +1355,7 @@ EvtSource N(802479FC) = { EVT_END }; -EvtSource N(80247D20) = { +EvtScript N(80247D20) = { EVT_SET(EVT_VAR(0), EVT_VAR(11)) EVT_SET(EVT_VAR(1), EVT_VAR(2)) EVT_CALL(N(func_802427BC_95D9BC), EVT_VAR(0)) @@ -1365,7 +1365,7 @@ EvtSource N(80247D20) = { EVT_END }; -EvtSource N(80247D90) = { +EvtScript N(80247D90) = { EVT_SET(EVT_VAR(12), 0) EVT_IF_LT(EVT_SAVE_VAR(0), -70) EVT_RETURN @@ -1420,14 +1420,14 @@ s32 N(D_80248088_963288)[] = { 0x0000004C, 0x00000000, }; -EvtSource N(80248090) = { +EvtScript N(80248090) = { EVT_CALL(N(SetManyVars), 6, 9699589, 9699585, 76, 69, 852105, 852106, 852107, 852108, EVT_PTR(N(D_80248088_963288))) EVT_EXEC_WAIT(N(80247D90)) EVT_RETURN EVT_END }; -EvtSource N(interact_802480E0) = { +EvtScript N(interact_802480E0) = { EVT_IF_GE(EVT_SAVE_VAR(0), -53) EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_mouser_Palette_00_Anim_5, NPC_ANIM_mouser_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x0062)) EVT_RETURN @@ -1447,13 +1447,13 @@ EvtSource N(interact_802480E0) = { EVT_END }; -EvtSource N(init_802481F8) = { +EvtScript N(init_802481F8) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802480E0))) EVT_RETURN EVT_END }; -EvtSource N(interact_8024821C) = { +EvtScript N(interact_8024821C) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-53) EVT_IF_GE(EVT_SAVE_VAR(0), -64) @@ -1481,13 +1481,13 @@ EvtSource N(interact_8024821C) = { EVT_END }; -EvtSource N(init_802483A8) = { +EvtScript N(init_802483A8) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024821C))) EVT_RETURN EVT_END }; -EvtSource N(interact_802483CC) = { +EvtScript N(interact_802483CC) = { EVT_SWITCH(EVT_AREA_VAR(2)) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_dryite_Palette_02_Anim_4, NPC_ANIM_dryite_Palette_02_Anim_1, 0, MESSAGE_ID(0x0D, 0x0068)) @@ -1506,13 +1506,13 @@ EvtSource N(interact_802483CC) = { EVT_END }; -EvtSource N(init_802484E0) = { +EvtScript N(init_802484E0) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802483CC))) EVT_RETURN EVT_END }; -EvtSource N(80248504) = { +EvtScript N(80248504) = { EVT_LOOP(0) EVT_CALL(N(GetFloorCollider), EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 8) @@ -1566,7 +1566,7 @@ Unk_Struct_2 N(D_8024884C_963A4C) = { 0x0000007D, 0x00000000, 0xFFFFFFD6, 0x0000004B, 0x0000004B, N(func_802430C8_95E2C8), }; -EvtSource N(interact_80248864) = { +EvtScript N(interact_80248864) = { EVT_IF_EQ(EVT_SAVE_FLAG(253), 1) EVT_IF_EQ(EVT_SAVE_FLAG(761), 1) EVT_CALL(N(func_802431B4_95E3B4)) @@ -1602,7 +1602,7 @@ EvtSource N(interact_80248864) = { EVT_END }; -EvtSource N(init_80248AE4) = { +EvtScript N(init_80248AE4) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_OR_EQ(3) @@ -1621,7 +1621,7 @@ EvtSource N(init_80248AE4) = { EVT_END }; -EvtSource N(interact_80248BA0) = { +EvtScript N(interact_80248BA0) = { EVT_CHILD_THREAD EVT_LOOP(0) EVT_CALL(NpcFaceNpc, 3, 4, 1) @@ -1642,7 +1642,7 @@ EvtSource N(interact_80248BA0) = { EVT_END }; -EvtSource N(init_80248CC8) = { +EvtScript N(init_80248CC8) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_OR_EQ(3) @@ -1660,7 +1660,7 @@ s32 N(D_80248D4C_963F4C)[] = { 0x00000067, 0x00000000, }; -EvtSource N(interact_80248D54) = { +EvtScript N(interact_80248D54) = { EVT_IF_EQ(EVT_SAVE_FLAG(754), 1) EVT_CALL(FindKeyItem, ITEM_MELODY, EVT_VAR(0)) EVT_IF_NE(EVT_VAR(0), -1) @@ -1729,13 +1729,13 @@ EvtSource N(interact_80248D54) = { EVT_END }; -EvtSource N(init_80249168) = { +EvtScript N(init_80249168) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80248D54))) EVT_RETURN EVT_END }; -EvtSource N(idle_8024918C) = { +EvtScript N(idle_8024918C) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-67) EVT_CALL(N(func_80243350_95E550), 16, 190, -134, -131) @@ -1809,7 +1809,7 @@ EvtSource N(idle_8024918C) = { EVT_END }; -EvtSource N(interact_80249750) = { +EvtScript N(interact_80249750) = { EVT_IF_EQ(EVT_AREA_VAR(4), 4) EVT_IF_EQ(EVT_AREA_VAR(5), 1) EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_5, NPC_ANIM_mouser_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0088)) @@ -1829,14 +1829,14 @@ EvtSource N(interact_80249750) = { EVT_END }; -EvtSource N(init_8024981C) = { +EvtScript N(init_8024981C) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024918C))) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80249750))) EVT_RETURN EVT_END }; -EvtSource N(interact_80249854) = { +EvtScript N(interact_80249854) = { EVT_CALL(SpeakToPlayer, 7, NPC_ANIM_three_sisters_Palette_01_Anim_4, NPC_ANIM_three_sisters_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x008E)) EVT_CALL(SpeakToPlayer, 8, NPC_ANIM_three_sisters_Palette_01_Anim_4, NPC_ANIM_three_sisters_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x008F)) EVT_CALL(SpeakToPlayer, 9, NPC_ANIM_three_sisters_Palette_01_Anim_4, NPC_ANIM_three_sisters_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x0090)) @@ -1844,13 +1844,13 @@ EvtSource N(interact_80249854) = { EVT_END }; -EvtSource N(init_802498C4) = { +EvtScript N(init_802498C4) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80249854))) EVT_RETURN EVT_END }; -EvtSource N(interact_802498E8) = { +EvtScript N(interact_802498E8) = { EVT_CALL(FindKeyItem, ITEM_FIRST_DEGREE_CARD, EVT_VAR(1)) EVT_CALL(FindKeyItem, ITEM_SECOND_DEGREE_CARD, EVT_VAR(2)) EVT_CALL(FindKeyItem, ITEM_THIRD_DEGREE_CARD, EVT_VAR(3)) @@ -1881,19 +1881,19 @@ EvtSource N(interact_802498E8) = { EVT_END }; -EvtSource N(init_80249ABC) = { +EvtScript N(init_80249ABC) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802498E8))) EVT_RETURN EVT_END }; -EvtSource N(interact_80249AE0) = { +EvtScript N(interact_80249AE0) = { EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_dryite_Palette_01_Anim_4, NPC_ANIM_dryite_Palette_01_Anim_1, 0, MESSAGE_ID(0x0D, 0x009F)) EVT_RETURN EVT_END }; -EvtSource N(init_80249B10) = { +EvtScript N(init_80249B10) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80249AE0))) EVT_RETURN EVT_END @@ -2341,35 +2341,35 @@ N(shopPrice) N(shopPriceList_8024B550)[] = { s32** N(D_8024B5B0_9667B0) = NULL; -EvtSource N(8024B5B4) = { +EvtScript N(8024B5B4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(8024B5E4) = { +EvtScript N(8024B5E4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 16) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(8024B614) = { +EvtScript N(8024B614) = { EVT_CALL(NpcJump0, 6, -31, 0, -283, 10) EVT_CALL(NpcJump0, 6, -30, 0, -283, 8) EVT_RETURN EVT_END }; -EvtSource N(8024B664) = { +EvtScript N(8024B664) = { EVT_CALL(NpcJump0, 6, 20, 0, -259, 10) EVT_CALL(NpcJump0, 6, 20, 0, -259, 4) EVT_RETURN EVT_END }; -EvtSource N(8024B6B4) = { +EvtScript N(8024B6B4) = { EVT_CALL(N(func_80243578_95E778)) EVT_CALL(func_802D2C14, 1) EVT_EXEC_WAIT(N(8024B614)) @@ -2389,7 +2389,7 @@ EvtSource N(8024B6B4) = { EVT_END }; -EvtSource N(8024B7B0) = { +EvtScript N(8024B7B0) = { EVT_IF_EQ(EVT_SAVE_FLAG(758), 0) EVT_CALL(N(func_80243578_95E778)) EVT_CALL(func_802D2C14, 1) @@ -2408,7 +2408,7 @@ EvtSource N(8024B7B0) = { EVT_END }; -EvtSource N(8024B894) = { +EvtScript N(8024B894) = { EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(3) EVT_CASE_EQ(4) @@ -2460,13 +2460,13 @@ s32 N(pad_BA9C) = { 0x00000000, }; -EvtSource N(openDoor_8024BAA0) = { +EvtScript N(openDoor_8024BAA0) = { EVT_CALL(RotateModel, 103, EVT_VAR(0), 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(moveWalls_8024BAD0) = { +EvtScript N(moveWalls_8024BAD0) = { EVT_SET(EVT_VAR(1), EVT_VAR(0)) EVT_DIVF(EVT_VAR(1), 50) EVT_CALL(TranslateModel, 98, 0, EVT_VAR(1), 0) @@ -2479,7 +2479,7 @@ EvtSource N(moveWalls_8024BAD0) = { EVT_END }; -EvtSource N(dropDoor_8024BBB8) = { +EvtScript N(dropDoor_8024BBB8) = { EVT_SET(EVT_VAR(1), EVT_VAR(0)) EVT_DIVF(EVT_VAR(1), 50) EVT_CALL(TranslateModel, 103, 0, EVT_VAR(1), 0) @@ -2488,13 +2488,13 @@ EvtSource N(dropDoor_8024BBB8) = { EVT_END }; -EvtSource N(openDoor_8024BC24) = { +EvtScript N(openDoor_8024BC24) = { EVT_CALL(RotateModel, 83, EVT_VAR(0), 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(moveWalls_8024BC54) = { +EvtScript N(moveWalls_8024BC54) = { EVT_SET(EVT_VAR(1), EVT_VAR(0)) EVT_DIVF(EVT_VAR(1), 50) EVT_CALL(TranslateModel, 47, 0, EVT_VAR(1), 0) @@ -2510,13 +2510,13 @@ EvtSource N(moveWalls_8024BC54) = { EVT_END }; -EvtSource N(openDoor_8024BD9C) = { +EvtScript N(openDoor_8024BD9C) = { EVT_CALL(RotateModel, 157, EVT_VAR(0), 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(dropDoor_8024BDCC) = { +EvtScript N(dropDoor_8024BDCC) = { EVT_SET(EVT_VAR(1), EVT_VAR(0)) EVT_DIV(EVT_VAR(1), 45) EVT_CALL(TranslateModel, 157, 0, EVT_VAR(1), 0) @@ -2525,7 +2525,7 @@ EvtSource N(dropDoor_8024BDCC) = { EVT_END }; -EvtSource N(moveWalls_8024BE38) = { +EvtScript N(moveWalls_8024BE38) = { EVT_IF_EQ(EVT_VAR(0), 90) EVT_CALL(EnableModel, 142, 0) EVT_ELSE @@ -2548,7 +2548,7 @@ EvtSource N(moveWalls_8024BE38) = { EVT_END }; -EvtSource N(toggleVis_8024BFDC) = { +EvtScript N(toggleVis_8024BFDC) = { EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) EVT_CALL(SetGroupEnabled, 127, 1) @@ -2559,7 +2559,7 @@ EvtSource N(toggleVis_8024BFDC) = { EVT_END }; -EvtSource N(toggleVis_8024C040) = { +EvtScript N(toggleVis_8024C040) = { EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) EVT_SWITCH(EVT_SAVE_VAR(0)) @@ -2587,7 +2587,7 @@ EvtSource N(toggleVis_8024C040) = { EVT_END }; -EvtSource N(toggleVis_8024C190) = { +EvtScript N(toggleVis_8024C190) = { EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) EVT_CALL(SetGroupEnabled, 156, 1) @@ -2611,7 +2611,7 @@ s32 N(npcList_8024C210)[] = { 0x00000005, 0xFFFFFFFF, }; -EvtSource N(8024C218) = { +EvtScript N(8024C218) = { EVT_CALL(MakeDoorAdvanced, 5, EVT_PTR(N(openDoor_8024BAA0)), EVT_PTR(N(moveWalls_8024BAD0)), EVT_PTR(N(dropDoor_8024BBB8)), EVT_PTR(N(toggleVis_8024BFDC)), 15, 16, 128, EVT_PTR(N(npcList_8024C200))) EVT_CALL(MakeDoorAdvanced, 5, EVT_PTR(N(openDoor_8024BC24)), EVT_PTR(N(moveWalls_8024BC54)), 0, EVT_PTR(N(toggleVis_8024C040)), 23, 24, 91, EVT_PTR(N(npcList_8024C208))) EVT_CALL(MakeDoorAdvanced, 5, EVT_PTR(N(openDoor_8024BD9C)), EVT_PTR(N(moveWalls_8024BE38)), EVT_PTR(N(dropDoor_8024BDCC)), EVT_PTR(N(toggleVis_8024C190)), 29, 30, 159, EVT_PTR(N(npcList_8024C210))) @@ -2623,7 +2623,7 @@ EvtSource N(8024C218) = { EVT_END }; -EvtSource N(8024C2EC) = { +EvtScript N(8024C2EC) = { EVT_LABEL(9) EVT_CALL(MakeLerp, 10, -10, 30, 10) EVT_LABEL(10) @@ -2646,7 +2646,7 @@ EvtSource N(8024C2EC) = { EVT_END }; -EvtSource N(8024C41C) = { +EvtScript N(8024C41C) = { EVT_CALL(SetGroupEnabled, 82, 1) EVT_CALL(PlaySoundAtCollider, 23, 449, 0) EVT_CALL(MakeLerp, 0, 100, 15, 4) @@ -2661,7 +2661,7 @@ EvtSource N(8024C41C) = { EVT_END }; -EvtSource N(8024C4C8) = { +EvtScript N(8024C4C8) = { EVT_CALL(MakeLerp, 100, 0, 15, 4) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -2680,7 +2680,7 @@ s32 N(pad_C574)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(8024C580) = { +EvtScript N(8024C580) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) @@ -2736,7 +2736,7 @@ EvtSource N(8024C580) = { EVT_END }; -EvtSource N(8024C8D4) = { +EvtScript N(8024C8D4) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(HidePlayerShadow, TRUE) @@ -2799,7 +2799,7 @@ EvtSource N(8024C8D4) = { EVT_END }; -EvtSource N(8024CCC4) = { +EvtScript N(8024CCC4) = { EVT_CALL(N(dup_UnkFunc25)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -2821,7 +2821,7 @@ EvtSource N(8024CCC4) = { EVT_END }; -EvtSource N(8024CDA0) = { +EvtScript N(8024CDA0) = { EVT_CALL(N(dup_SetPlayerStatusAnimFlags100000)) EVT_SET_GROUP(27) EVT_CALL(DisablePlayerPhysics, TRUE) @@ -2855,7 +2855,7 @@ EvtSource N(8024CDA0) = { EVT_END }; -EvtSource N(8024CF7C) = { +EvtScript N(8024CF7C) = { EVT_CALL(IsPlayerOnValidFloor, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -2919,7 +2919,7 @@ EvtSource N(8024CF7C) = { extern const char N(dro_01_name_hack)[]; -EvtSource N(8024D2B0) = { +EvtScript N(8024D2B0) = { EVT_SET(EVT_SAVE_FLAG(761), 0) EVT_CALL(GotoMap, EVT_PTR(N(dro_01_name_hack)), 4) EVT_WAIT_FRAMES(100) @@ -2927,7 +2927,7 @@ EvtSource N(8024D2B0) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -211, 60, -50, 30, MAKE_ENTITY_END) EVT_IF_EQ(EVT_SAVE_FLAG(1939), 0) EVT_IF_EQ(EVT_SAVE_FLAG(1933), 1) diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index ccd08dd7ef..ea42497082 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -56,7 +56,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(triggerCoord_8024DD68) = { 120.0f, 0.0f, -43.0f, 0.0f }; -EvtSource N(8024DD78) = { +EvtScript N(8024DD78) = { EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_WALL_HAMMER, 11, 1, 0) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_POINT_BOMB, EVT_PTR(N(triggerCoord_8024DD68)), 1, 0) diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index b666378118..a6e6e3c361 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -79,16 +79,16 @@ extern N(shopPrice) N(shopPriceList_8024B550)[]; extern NpcGroupList N(npcGroupList_8024B464); extern NpcGroupList N(npcGroupList_8024B47C); -extern EvtSource N(80244450); -extern EvtSource N(8024C218); -extern EvtSource N(8024C2EC); -extern EvtSource N(8024C41C); -extern EvtSource N(8024C4C8); -extern EvtSource N(8024CDA0); -extern EvtSource N(8024DD78); -extern EvtSource N(main); -extern EvtSource N(makeEntities); -extern EvtSource N(shopItemPositions_8024BA68); +extern EvtScript N(80244450); +extern EvtScript N(8024C218); +extern EvtScript N(8024C2EC); +extern EvtScript N(8024C41C); +extern EvtScript N(8024C4C8); +extern EvtScript N(8024CDA0); +extern EvtScript N(8024DD78); +extern EvtScript N(main); +extern EvtScript N(makeEntities); +extern EvtScript N(shopItemPositions_8024BA68); extern ShopOwner N(shopOwnerNPC_8024BA80); -extern EvtSource N(unk_80248088); -extern EvtSource N(unk_8024884C); +extern EvtScript N(unk_80248088); +extern EvtScript N(unk_8024884C); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 4f8cade6bb..1b6a43527e 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -91,7 +91,7 @@ MapConfig N(config) = { .tattle = { MSG_dro_02_tattle }, }; -EvtSource N(80243AF0) = { +EvtScript N(80243AF0) = { EVT_CMD(EVT_OP_CALL, EVT_PTR(GetEntryID), EVT_VAR(0)), EVT_CMD(EVT_OP_SWITCH, EVT_VAR(0)), EVT_CMD(EVT_OP_CASE_OR_EQ, 2), @@ -105,13 +105,13 @@ EvtSource N(80243AF0) = { EVT_CMD(EVT_OP_END) }; -EvtSource N(80243B70) = { +EvtScript N(80243B70) = { EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) EVT_RETURN EVT_END }; -EvtSource N(80243B9C) = { +EvtScript N(80243B9C) = { EVT_CALL(SetMusicTrack, 0, SONG_MOUSTAFA_THEME, 0, 8) EVT_RETURN EVT_END @@ -121,7 +121,7 @@ static s32 N(pad_3BC8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_LETTER08, -135, 160, -245, 17, EVT_SAVE_FLAG(757)) EVT_CALL(MakeEntity, 0x802EAB04, 180, 173, -200, 0, 32, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(756)) @@ -133,15 +133,15 @@ static s32 N(pad_3C3C) = { 0x00000000, }; -EvtSource N(exitWalk_80243C40) = EXIT_WALK_SCRIPT(60, 0, "dro_01", 1); +EvtScript N(exitWalk_80243C40) = EXIT_WALK_SCRIPT(60, 0, "dro_01", 1); -EvtSource N(80243C9C) = { +EvtScript N(80243C9C) = { EVT_BIND_TRIGGER(N(exitWalk_80243C40), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(80243CC8) = { +EvtScript N(80243CC8) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x1D, 0x017C), 160, 40) EVT_CALL(DisablePlayerInput, FALSE) @@ -149,7 +149,7 @@ EvtSource N(80243CC8) = { EVT_END }; -EvtSource N(80243D10) = { +EvtScript N(80243D10) = { EVT_CALL(PlaySound, 0x80000060) EVT_CALL(UseSettingsFrom, 0, 190, 0, -37) EVT_CALL(SetPanTarget, 0, 190, 0, -37) @@ -178,7 +178,7 @@ EvtSource N(80243D10) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 9) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -235,7 +235,7 @@ static s32 N(pad_41B4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(802441C0) = { +EvtScript N(802441C0) = { EVT_LABEL(9) EVT_CALL(MakeLerp, 10, -10, 30, 10) EVT_LABEL(10) @@ -258,7 +258,7 @@ EvtSource N(802441C0) = { EVT_END }; -EvtSource N(802442F0) = { +EvtScript N(802442F0) = { EVT_DIV(EVT_VAR(0), 2) EVT_ADD(EVT_VAR(0), 18) EVT_CALL(RotateModel, 21, EVT_VAR(0), 0, 1, 0) @@ -266,14 +266,14 @@ EvtSource N(802442F0) = { EVT_END }; -EvtSource N(openDoor_80244340) = { +EvtScript N(openDoor_80244340) = { EVT_CALL(RotateModel, 108, EVT_VAR(0), 0, -1, 0) EVT_CALL(RotateModel, 110, EVT_VAR(0), 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(moveWalls_80244390) = { +EvtScript N(moveWalls_80244390) = { EVT_SET(EVT_VAR(1), EVT_VAR(0)) EVT_DIVF(EVT_VAR(1), 50) EVT_CALL(TranslateModel, 104, 0, EVT_VAR(1), 0) @@ -286,7 +286,7 @@ EvtSource N(moveWalls_80244390) = { EVT_END }; -EvtSource N(dropDoor_80244474) = { +EvtScript N(dropDoor_80244474) = { EVT_SET(EVT_VAR(1), EVT_VAR(0)) EVT_DIVF(EVT_VAR(1), 50) EVT_CALL(TranslateModel, 108, 0, EVT_VAR(1), 0) @@ -297,13 +297,13 @@ EvtSource N(dropDoor_80244474) = { EVT_END }; -EvtSource N(openDoor_8024451C) = { +EvtScript N(openDoor_8024451C) = { EVT_CALL(RotateModel, 62, EVT_VAR(0), 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(moveWalls_8024454C) = { +EvtScript N(moveWalls_8024454C) = { EVT_SET(EVT_VAR(1), EVT_VAR(0)) EVT_DIVF(EVT_VAR(1), 50) EVT_CALL(RotateGroup, 61, EVT_VAR(0), 0, 0, -1) @@ -311,7 +311,7 @@ EvtSource N(moveWalls_8024454C) = { EVT_END }; -EvtSource N(8024459C) = { +EvtScript N(8024459C) = { EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) EVT_CALL(SetCamSpeed, 0, EVT_FIXED(3.0)) @@ -322,7 +322,7 @@ EvtSource N(8024459C) = { EVT_END }; -EvtSource N(toggleVis_80244600) = { +EvtScript N(toggleVis_80244600) = { EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) EVT_CALL(SetGroupEnabled, 87, 1) @@ -335,7 +335,7 @@ EvtSource N(toggleVis_80244600) = { EVT_END }; -EvtSource N(toggleVis_8024468C) = { +EvtScript N(toggleVis_8024468C) = { EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) EVT_CALL(SetGroupEnabled, 132, 1) @@ -363,7 +363,7 @@ EvtSource N(toggleVis_8024468C) = { EVT_END }; -EvtSource N(8024486C) = { +EvtScript N(8024486C) = { EVT_SET_GROUP(0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) @@ -397,7 +397,7 @@ EvtSource N(8024486C) = { EVT_END }; -EvtSource N(80244A68) = { +EvtScript N(80244A68) = { EVT_SET_GROUP(0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2C14, 1) @@ -439,7 +439,7 @@ s32 N(npcList_80244C70)[] = { 0x00000003, 0xFFFFFFFF, }; -EvtSource N(80244C78) = { +EvtScript N(80244C78) = { EVT_EXEC(N(802441C0)) EVT_CALL(ParentColliderToModel, 8, 21) EVT_IF_GE(EVT_SAVE_VAR(0), -64) @@ -466,14 +466,14 @@ static s32 N(pad_4DD4)[] = { s32** N(D_80244DE0_96DFA0) = NULL; -EvtSource N(80244DE4) = { +EvtScript N(80244DE4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(80244E14) = { +EvtScript N(80244E14) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 16) EVT_RETURN EVT_RETURN @@ -499,7 +499,7 @@ QuizRequirements N(quizRequirements)[] = { { 96, 64 }, { 0, 64 }, }; -EvtSource N(80244ED4) = { +EvtScript N(80244ED4) = { EVT_CALL(N(GetGameStatus75)) EVT_IF_LE(EVT_VAR(0), 1) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -513,7 +513,7 @@ EvtSource N(80244ED4) = { EVT_END }; -EvtSource N(80244F84) = { +EvtScript N(80244F84) = { EVT_CALL(N(GetCamVfov), 0, EVT_ARRAY(0)) EVT_CALL(N(SetCamVfov), 0, 25) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -538,7 +538,7 @@ EvtSource N(80244F84) = { EVT_END }; -EvtSource N(80245120) = { +EvtScript N(80245120) = { EVT_CALL(GetNpcPos, 10, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 30) EVT_CALL(SetPanTarget, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -556,14 +556,14 @@ EvtSource N(80245120) = { EVT_END }; -EvtSource N(8024521C) = { +EvtScript N(8024521C) = { EVT_CALL(N(SetCamVfov), 0, EVT_ARRAY(0)) EVT_CALL(PanToTarget, 0, 0, 0) EVT_RETURN EVT_END }; -EvtSource N(80245258) = { +EvtScript N(80245258) = { EVT_WAIT_FRAMES(20) EVT_CALL(N(UnkCameraFunc), EVT_ARRAY(1), EVT_ARRAY(3), 83, EVT_VAR(0), EVT_VAR(1)) EVT_THREAD @@ -594,7 +594,7 @@ EvtSource N(80245258) = { EVT_END }; -EvtSource N(80245408) = { +EvtScript N(80245408) = { EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(10), EVT_VAR(11), EVT_VAR(12)) EVT_CALL(N(UnkCameraFunc), EVT_VAR(10), EVT_VAR(12), 108, EVT_VAR(0), EVT_VAR(1)) EVT_SETF(EVT_VAR(5), EVT_ARRAY(2)) @@ -616,7 +616,7 @@ EvtSource N(80245408) = { EVT_END }; -EvtSource N(80245540) = { +EvtScript N(80245540) = { EVT_CALL(GetNpcPos, 10, EVT_VAR(10), EVT_VAR(11), EVT_VAR(12)) EVT_CALL(N(UnkCameraFunc), EVT_VAR(10), EVT_VAR(12), -70, EVT_VAR(0), EVT_VAR(1)) EVT_THREAD @@ -642,7 +642,7 @@ EvtSource N(80245540) = { EVT_END }; -EvtSource N(802456AC) = { +EvtScript N(802456AC) = { EVT_EXEC(N(80245258)) EVT_EXEC(N(80245408)) EVT_EXEC_WAIT(N(80245540)) @@ -650,7 +650,7 @@ EvtSource N(802456AC) = { EVT_END }; -EvtSource N(802456E0) = { +EvtScript N(802456E0) = { EVT_LOOP(0) EVT_CALL(SetPlayerAnimation, ANIM_QUESTION) EVT_WAIT_FRAMES(20) @@ -659,7 +659,7 @@ EvtSource N(802456E0) = { EVT_END }; -EvtSource N(80245720) = { +EvtScript N(80245720) = { EVT_CALL(SetPlayerAnimation, ANIM_THROW) EVT_WAIT_FRAMES(15) EVT_CALL(SetPlayerAnimation, ANIM_10002) @@ -667,7 +667,7 @@ EvtSource N(80245720) = { EVT_END }; -EvtSource N(8024575C) = { +EvtScript N(8024575C) = { EVT_LOOP(0) EVT_CALL(SetPlayerAnimation, ANIM_10002) EVT_WAIT_FRAMES(1) @@ -840,7 +840,7 @@ EvtSource N(8024575C) = { EVT_END }; -EvtSource N(802462A4) = { +EvtScript N(802462A4) = { EVT_CALL(SetPlayerAnimation, ANIM_SHOCK_STILL) EVT_LOOP(0) EVT_WAIT_FRAMES(1) @@ -849,7 +849,7 @@ EvtSource N(802462A4) = { EVT_END }; -EvtSource N(802462E4) = { +EvtScript N(802462E4) = { EVT_THREAD EVT_CALL(N(UnkCameraFunc), EVT_ARRAY(1), EVT_ARRAY(3), 25, EVT_VAR(0), EVT_VAR(1)) EVT_SETF(EVT_VAR(2), EVT_ARRAY(1)) @@ -865,7 +865,7 @@ EvtSource N(802462E4) = { EVT_END }; -EvtSource N(802463C0) = { +EvtScript N(802463C0) = { EVT_EXEC_GET_TID(N(8024575C), EVT_VAR(1)) EVT_WAIT_FRAMES(60) EVT_KILL_THREAD(EVT_VAR(1)) @@ -881,7 +881,7 @@ EvtSource N(802463C0) = { EVT_END }; -EvtSource N(80246470) = { +EvtScript N(80246470) = { EVT_EXEC_GET_TID(N(802462A4), EVT_VAR(1)) EVT_WAIT_FRAMES(60) EVT_LOOP(5) @@ -897,7 +897,7 @@ EvtSource N(80246470) = { EVT_END }; -EvtSource N(80246520) = { +EvtScript N(80246520) = { EVT_IF_GT(EVT_SAVE_VAR(352), 63) EVT_SET(EVT_VAR(0), 0) EVT_RETURN @@ -1099,7 +1099,7 @@ EvtSource N(80246520) = { EVT_END }; -EvtSource N(80247250) = { +EvtScript N(80247250) = { EVT_CALL(N(UnkQuizFunc)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -1111,7 +1111,7 @@ EvtSource N(80247250) = { EVT_END }; -EvtSource N(802472C4) = { +EvtScript N(802472C4) = { EVT_USE_ARRAY(EVT_PTR(gPauseMenuTargetPosX)) EVT_SET(EVT_SAVE_FLAG(1769), 1) EVT_CALL(DisablePlayerPhysics, TRUE) @@ -1123,7 +1123,7 @@ EvtSource N(802472C4) = { EVT_END }; -EvtSource N(80247344) = { +EvtScript N(80247344) = { EVT_CALL(N(GetNpcUnsafeOwner2)) EVT_RETURN EVT_END @@ -1137,7 +1137,7 @@ NpcAISettings N(npcAISettings_80247360) = { .unk_2C = 1, }; -EvtSource N(80247390) = { +EvtScript N(80247390) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80247360))) EVT_RETURN EVT_END @@ -1175,7 +1175,7 @@ NpcAISettings N(npcAISettings_80247408) = { .unk_2C = 1, }; -EvtSource N(npcAI_80247438) = { +EvtScript N(npcAI_80247438) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80247408))) EVT_RETURN EVT_END @@ -1204,7 +1204,7 @@ NpcAISettings N(npcAISettings_802474B0) = { .unk_2C = 1, }; -EvtSource N(npcAI_802474E0) = { +EvtScript N(npcAI_802474E0) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_802474B0))) EVT_RETURN EVT_END @@ -1349,17 +1349,17 @@ Gfx N(D_80247A38_970BF8)[] = { gsSPEndDisplayList(), }; -EvtSource N(init_80247A80) = { +EvtScript N(init_80247A80) = { EVT_RETURN EVT_END }; -EvtSource N(npcAI_80247A90) = { +EvtScript N(npcAI_80247A90) = { EVT_RETURN EVT_END }; -EvtSource N(80247AA0) = { +EvtScript N(80247AA0) = { EVT_USE_ARRAY(EVT_PTR(N(D_8024EFD0))) EVT_SET(EVT_ARRAY(9), 0) EVT_CALL(GetNpcPos, 4, EVT_ARRAY(4), EVT_ARRAY(5), EVT_ARRAY(6)) @@ -1496,7 +1496,7 @@ EvtSource N(80247AA0) = { EVT_END }; -EvtSource N(802481D8) = { +EvtScript N(802481D8) = { EVT_CALL(GetNpcPos, 4, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(UseSettingsFrom, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(SetCamDistance, 0, 200) @@ -1509,7 +1509,7 @@ EvtSource N(802481D8) = { EVT_END }; -EvtSource N(802482A8) = { +EvtScript N(802482A8) = { EVT_CALL(PanToTarget, 0, 0, 0) EVT_CALL(SetCamSpeed, 0, EVT_FIXED(3.0)) EVT_CALL(WaitForCam, 0, EVT_FIXED(1.0)) @@ -1517,7 +1517,7 @@ EvtSource N(802482A8) = { EVT_END }; -EvtSource N(802482F8) = { +EvtScript N(802482F8) = { EVT_CALL(func_802D2C14, 1) EVT_EXEC_WAIT(N(802481D8)) EVT_SET(EVT_VAR(0), 0) @@ -1608,7 +1608,7 @@ s32 N(D_80248784_971944) = { 0x00000000, }; -EvtSource N(80248788) = { +EvtScript N(80248788) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowKeyChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -1633,7 +1633,7 @@ EvtSource N(80248788) = { EVT_END }; -EvtSource N(802488CC) = { +EvtScript N(802488CC) = { EVT_CALL(N(func_8024334C_96C50C), EVT_VAR(0)) EVT_BIND_PADLOCK(N(80248788), 0x10, 0, EVT_PTR(N(D_8024F080)), 0, 1) EVT_CALL(N(func_802432C0_96C480), EVT_VAR(0)) @@ -1641,7 +1641,7 @@ EvtSource N(802488CC) = { EVT_END }; -EvtSource N(8024891C) = { +EvtScript N(8024891C) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowConsumableChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -1665,7 +1665,7 @@ EvtSource N(8024891C) = { EVT_END }; -EvtSource N(80248A50) = { +EvtScript N(80248A50) = { EVT_CALL(N(func_802433E8_96C5A8), EVT_VAR(0)) EVT_BIND_PADLOCK(N(8024891C), 0x10, 0, EVT_PTR(N(D_8024F248)), 0, 1) EVT_CALL(N(func_802432C0_96C480), EVT_VAR(0)) @@ -1908,7 +1908,7 @@ s32 N(image2)[] = { 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000, }; -EvtSource N(8024AC14) = { +EvtScript N(8024AC14) = { EVT_CALL(EnableModel, EVT_VAR(4), 0) EVT_CALL(EnableModel, EVT_VAR(5), 1) EVT_CALL(RotateModel, EVT_VAR(6), 0, 0, 0, 1) @@ -1917,7 +1917,7 @@ EvtSource N(8024AC14) = { EVT_END }; -EvtSource N(8024AC8C) = { +EvtScript N(8024AC8C) = { EVT_SET(EVT_VAR(9), EVT_VAR(7)) EVT_SET(EVT_VAR(8), EVT_VAR(6)) EVT_SET(EVT_VAR(7), EVT_VAR(5)) @@ -1942,7 +1942,7 @@ EvtSource N(8024AC8C) = { EVT_END }; -EvtSource N(interact_8024ADE4) = { +EvtScript N(interact_8024ADE4) = { EVT_CALL(N(UnkFunc35), 0, 0, 0) EVT_EXEC_WAIT(N(8024D434)) EVT_IF_EQ(EVT_VAR(0), 0) @@ -2008,7 +2008,7 @@ EvtSource N(interact_8024ADE4) = { EVT_END }; -EvtSource N(8024B18C) = { +EvtScript N(8024B18C) = { EVT_LOOP(0) EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_CALL(N(UnkYawFunc), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) @@ -2019,7 +2019,7 @@ EvtSource N(8024B18C) = { EVT_END }; -EvtSource N(8024B20C) = { +EvtScript N(8024B20C) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowKeyChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -2069,7 +2069,7 @@ EvtSource N(8024B20C) = { EVT_END }; -EvtSource N(8024B530) = { +EvtScript N(8024B530) = { EVT_SET(EVT_VAR(0), EVT_VAR(11)) EVT_SET(EVT_VAR(1), EVT_VAR(2)) EVT_CALL(N(func_8024334C_96C50C), EVT_VAR(0)) @@ -2079,7 +2079,7 @@ EvtSource N(8024B530) = { EVT_END }; -EvtSource N(8024B5A0) = { +EvtScript N(8024B5A0) = { EVT_SET(EVT_VAR(12), 0) EVT_IF_LT(EVT_SAVE_VAR(0), -70) EVT_RETURN @@ -2134,14 +2134,14 @@ s32 N(D_8024B898_974A58)[] = { 0x0000004A, 0x00000000, }; -EvtSource N(8024B8A0) = { +EvtScript N(8024B8A0) = { EVT_CALL(N(SetManyVars), 1, 9634308, 9634305, 74, 75, 852117, 852118, 852119, 852120, EVT_PTR(N(D_8024B898_974A58))) EVT_EXEC_WAIT(N(8024B5A0)) EVT_RETURN EVT_END }; -EvtSource N(interact_8024B8F0) = { +EvtScript N(interact_8024B8F0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-53) EVT_IF_EQ(EVT_SAVE_FLAG(787), 1) @@ -2166,7 +2166,7 @@ EvtSource N(interact_8024B8F0) = { EVT_END }; -EvtSource N(init_8024BA50) = { +EvtScript N(init_8024BA50) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024B8F0))) EVT_IF_GE(EVT_SAVE_VAR(0), -52) EVT_CALL(RemoveNpc, NPC_SELF) @@ -2175,7 +2175,7 @@ EvtSource N(init_8024BA50) = { EVT_END }; -EvtSource N(interact_8024BA9C) = { +EvtScript N(interact_8024BA9C) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-53) EVT_IF_EQ(EVT_SAVE_FLAG(747), 0) @@ -2196,13 +2196,13 @@ EvtSource N(interact_8024BA9C) = { EVT_END }; -EvtSource N(init_8024BBAC) = { +EvtScript N(init_8024BBAC) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BA9C))) EVT_RETURN EVT_END }; -EvtSource N(interact_8024BBD0) = { +EvtScript N(interact_8024BBD0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-53) EVT_IF_EQ(EVT_AREA_FLAG(3), 0) @@ -2221,25 +2221,25 @@ EvtSource N(interact_8024BBD0) = { EVT_END }; -EvtSource N(init_8024BCD4) = { +EvtScript N(init_8024BCD4) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BBD0))) EVT_RETURN EVT_END }; -EvtSource N(interact_8024BCF8) = { +EvtScript N(interact_8024BCF8) = { EVT_CALL(SpeakToPlayer, NPC_SELF, NPC_ANIM_dryite_Palette_00_Anim_4, NPC_ANIM_dryite_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x00A0)) EVT_RETURN EVT_END }; -EvtSource N(init_8024BD28) = { +EvtScript N(init_8024BD28) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BCF8))) EVT_RETURN EVT_END }; -EvtSource N(interact_8024BD4C) = { +EvtScript N(interact_8024BD4C) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-53) EVT_IF_EQ(EVT_AREA_FLAG(4), 0) @@ -2270,13 +2270,13 @@ EvtSource N(interact_8024BD4C) = { EVT_END }; -EvtSource N(init_8024BF10) = { +EvtScript N(init_8024BF10) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BD4C))) EVT_RETURN EVT_END }; -EvtSource N(interact_8024BF34) = { +EvtScript N(interact_8024BF34) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-53) EVT_IF_EQ(EVT_AREA_FLAG(5), 0) @@ -2295,13 +2295,13 @@ EvtSource N(interact_8024BF34) = { EVT_END }; -EvtSource N(init_8024C038) = { +EvtScript N(init_8024C038) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024BF34))) EVT_RETURN EVT_END }; -EvtSource N(8024C05C) = { +EvtScript N(8024C05C) = { EVT_LOOP(0) EVT_CALL(PlayerFaceNpc, 5, 0) EVT_CALL(NpcFaceNpc, NPC_PARTNER, 5, 0) @@ -2311,7 +2311,7 @@ EvtSource N(8024C05C) = { EVT_END }; -EvtSource N(8024C0B8) = { +EvtScript N(8024C0B8) = { EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(UseSettingsFrom, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(SetCamDistance, 0, 275) @@ -2331,7 +2331,7 @@ EvtSource N(8024C0B8) = { EVT_END }; -EvtSource N(8024C1F8) = { +EvtScript N(8024C1F8) = { EVT_CALL(PanToTarget, 0, 0, 0) EVT_CALL(SetCamSpeed, 0, EVT_FIXED(3.0)) EVT_CALL(WaitForCam, 0, EVT_FIXED(1.0)) @@ -2339,7 +2339,7 @@ EvtSource N(8024C1F8) = { EVT_END }; -EvtSource N(8024C248) = { +EvtScript N(8024C248) = { EVT_CALL(SetNpcYaw, 5, 270) EVT_CALL(SetNpcFlagBits, 2, ((NPC_FLAG_100)), TRUE) EVT_CALL(SetNpcFlagBits, 5, ((NPC_FLAG_100)), TRUE) @@ -2371,7 +2371,7 @@ EvtSource N(8024C248) = { EVT_END }; -EvtSource N(idle_8024C450) = { +EvtScript N(idle_8024C450) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(-64) EVT_CASE_LT(-63) @@ -2384,7 +2384,7 @@ EvtSource N(idle_8024C450) = { EVT_END }; -EvtSource N(interact_8024C4EC) = { +EvtScript N(interact_8024C4EC) = { EVT_IF_EQ(EVT_SAVE_FLAG(750), 1) EVT_CALL(SpeakToPlayer, 5, NPC_ANIM_moustafa_Palette_00_Anim_5, NPC_ANIM_moustafa_Palette_00_Anim_1, 0, MESSAGE_ID(0x0D, 0x00CF)) EVT_RETURN @@ -2554,7 +2554,7 @@ EvtSource N(interact_8024C4EC) = { EVT_END }; -EvtSource N(init_8024D04C) = { +EvtScript N(init_8024D04C) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_OR_EQ(2) @@ -2572,13 +2572,13 @@ EvtSource N(init_8024D04C) = { EVT_END }; -EvtSource N(init_8024D130) = { +EvtScript N(init_8024D130) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024C4EC))) EVT_RETURN EVT_END }; -EvtSource N(idle_8024D154) = { +EvtScript N(idle_8024D154) = { EVT_CALL(InterpNpcYaw, 2, 270, 0) EVT_LABEL(10) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_mouser_Palette_01_Anim_7) @@ -2618,7 +2618,7 @@ EvtSource N(idle_8024D154) = { EVT_END }; -EvtSource N(init_8024D3E8) = { +EvtScript N(init_8024D3E8) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024D154))) EVT_IF_GE(EVT_SAVE_VAR(0), -66) EVT_CALL(RemoveNpc, NPC_SELF) @@ -2627,7 +2627,7 @@ EvtSource N(init_8024D3E8) = { EVT_END }; -EvtSource N(8024D434) = { +EvtScript N(8024D434) = { EVT_SET(EVT_VAR(0), 852177) EVT_SET(EVT_VAR(8), 852178) EVT_SET(EVT_VAR(1), 852179) @@ -2637,7 +2637,7 @@ EvtSource N(8024D434) = { EVT_END }; -EvtSource N(8024D494) = { +EvtScript N(8024D494) = { EVT_EXEC(N(80243B70)) EVT_CALL(SetPlayerSpeed, EVT_FIXED(3.0)) EVT_CALL(PlayerMoveTo, -179, -198, 0) @@ -2676,7 +2676,7 @@ EvtSource N(8024D494) = { EVT_END }; -EvtSource N(8024D700) = { +EvtScript N(8024D700) = { EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(func_802D2520, ANIM_10002, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -187, 0, -240) @@ -2687,7 +2687,7 @@ EvtSource N(8024D700) = { EVT_END }; -EvtSource N(init_8024D790) = { +EvtScript N(init_8024D790) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_8024ADE4))) EVT_RETURN EVT_END diff --git a/src/world/area_dro/dro_02/dro_02.h b/src/world/area_dro/dro_02/dro_02.h index 3393f0e0ef..d74334fcb9 100644 --- a/src/world/area_dro/dro_02/dro_02.h +++ b/src/world/area_dro/dro_02/dro_02.h @@ -59,8 +59,8 @@ void N(func_8024240C_96B5CC)(Evt *script, s32 isInitialCall); void N(func_80242EAC_96C06C)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024EEF4); -extern EvtSource N(80244C78); -extern EvtSource N(8024D434); -extern EvtSource N(8024D494); -extern EvtSource N(8024D700); -extern EvtSource N(main); +extern EvtScript N(80244C78); +extern EvtScript N(8024D434); +extern EvtScript N(8024D494); +extern EvtScript N(8024D700); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 09b853f843..5d025718ae 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -41,7 +41,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_00_tattle }, }; -EvtSource N(802414D0) = SCRIPT({ +EvtScript N(802414D0) = SCRIPT({ GetEntryID(EVT_VAR(0)); match EVT_VAR(0) { == 8 { @@ -84,7 +84,7 @@ static s32 N(pad_16BC) = { 0x00000000, }; -EvtSource N(802416C0) = SCRIPT({ +EvtScript N(802416C0) = SCRIPT({ group 11; EVT_VAR(10) = EVT_VAR(0); EVT_VAR(11) = EVT_VAR(1); @@ -123,7 +123,7 @@ EvtSource N(802416C0) = SCRIPT({ goto 0; }); -EvtSource N(8024196C) = SCRIPT({ +EvtScript N(8024196C) = SCRIPT({ DisablePlayerInput(TRUE); ModifyColliderFlags(0, 2, 0x7FFFFE00); PlayerMoveTo(30, -170, 10); @@ -158,7 +158,7 @@ EvtSource N(8024196C) = SCRIPT({ sleep 100; }); -EvtSource N(80241B90) = SCRIPT({ +EvtScript N(80241B90) = SCRIPT({ DisablePlayerInput(TRUE); ModifyColliderFlags(0, 2, 0x7FFFFE00); InterpPlayerYaw(180, 0); @@ -189,21 +189,21 @@ EvtSource N(80241B90) = SCRIPT({ ModifyColliderFlags(1, 2, 0x7FFFFE00); }); -EvtSource N(exitWalk_80241D7C) = EXIT_WALK_SCRIPT(60, 1, "flo_14", 0); +EvtScript N(exitWalk_80241D7C) = EXIT_WALK_SCRIPT(60, 1, "flo_14", 0); -EvtSource N(exitWalk_80241DD8) = EXIT_WALK_SCRIPT(60, 2, "flo_23", 0); +EvtScript N(exitWalk_80241DD8) = EXIT_WALK_SCRIPT(60, 2, "flo_23", 0); -EvtSource N(exitWalk_80241E34) = EXIT_WALK_SCRIPT(60, 3, "flo_25", 0); +EvtScript N(exitWalk_80241E34) = EXIT_WALK_SCRIPT(60, 3, "flo_25", 0); -EvtSource N(exitWalk_80241E90) = EXIT_WALK_SCRIPT(60, 4, "flo_16", 0); +EvtScript N(exitWalk_80241E90) = EXIT_WALK_SCRIPT(60, 4, "flo_16", 0); -EvtSource N(exitWalk_80241EEC) = EXIT_WALK_SCRIPT(60, 5, "flo_09", 0); +EvtScript N(exitWalk_80241EEC) = EXIT_WALK_SCRIPT(60, 5, "flo_09", 0); -EvtSource N(exitWalk_80241F48) = EXIT_WALK_SCRIPT(60, 6, "flo_08", 0); +EvtScript N(exitWalk_80241F48) = EXIT_WALK_SCRIPT(60, 6, "flo_08", 0); const s32 N(pad_XXXX)[] = { 0, 0}; -EvtSource N(80241FA4) = SCRIPT({ +EvtScript N(80241FA4) = SCRIPT({ bind N(exitWalk_80241D7C) TRIGGER_FLOOR_ABOVE 5; bind N(exitWalk_80241DD8) TRIGGER_FLOOR_ABOVE 9; bind N(exitWalk_80241E34) TRIGGER_FLOOR_ABOVE 13; @@ -212,7 +212,7 @@ EvtSource N(80241FA4) = SCRIPT({ bind N(exitWalk_80241F48) TRIGGER_FLOOR_ABOVE 25; }); -EvtSource N(enterWalk_8024205C) = SCRIPT({ +EvtScript N(enterWalk_8024205C) = SCRIPT({ GetLoadType(EVT_VAR(1)); if (EVT_VAR(1) == 1) { spawn EnterSavePoint; @@ -261,7 +261,7 @@ EvtSource N(enterWalk_8024205C) = SCRIPT({ bind N(80242FCC) TRIGGER_WALL_PRESS_A 2; }); -EvtSource N(main) = SCRIPT({ +EvtScript N(main) = SCRIPT({ EVT_WORLD_LOCATION = LOCATION_FLOWER_FIELDS; SetSpriteShading(-1); SetCamLeadPlayer(0, 0); @@ -370,7 +370,7 @@ NpcAISettings N(npcAISettings_8024286C) = { .unk_2C = 1, }; -EvtSource N(npcAI_8024289C) = SCRIPT({ +EvtScript N(npcAI_8024289C) = SCRIPT({ N(UnkNpcAIMainFunc)(N(npcAISettings_8024286C)); }); @@ -407,7 +407,7 @@ NpcSettings N(npcSettings_8024296C) = { extern const char N(flo_07_name_hack)[]; -EvtSource N(80242998) = SCRIPT({ +EvtScript N(80242998) = SCRIPT({ DisablePlayerInput(TRUE); DisablePlayerPhysics(TRUE); UseSettingsFrom(0, 50, 0, -200); @@ -426,7 +426,7 @@ EvtSource N(80242998) = SCRIPT({ sleep 100; }); -EvtSource N(80242AF0) = SCRIPT({ +EvtScript N(80242AF0) = SCRIPT({ DisablePlayerInput(TRUE); UseSettingsFrom(0, 0, 0, -170); SetPanTarget(0, 0, 0, -170); @@ -490,7 +490,7 @@ EvtSource N(80242AF0) = SCRIPT({ DisablePlayerInput(FALSE); }); -EvtSource N(80242FCC) = SCRIPT({ +EvtScript N(80242FCC) = SCRIPT({ DisablePlayerInput(TRUE); sleep 2; GetPlayerActionState(EVT_VAR(3)); @@ -573,7 +573,7 @@ EvtSource N(80242FCC) = SCRIPT({ DisablePlayerInput(FALSE); }); -EvtSource N(80243368) = SCRIPT({ +EvtScript N(80243368) = SCRIPT({ AdjustCam(0, 90.0, 0, 600, 21.0, -12.0); sleep 20; ShowMessageAtWorldPos(MESSAGE_ID(0x11, 0x000B), 0, 50, -200); @@ -587,7 +587,7 @@ EvtSource N(80243368) = SCRIPT({ ResetCam(0, 90.0); }); -EvtSource N(init_80243474) = SCRIPT({ +EvtScript N(init_80243474) = SCRIPT({ EnableGroup(121, 0); EnableGroup(80, 0); EnableGroup(132, 0); @@ -599,7 +599,7 @@ EvtSource N(init_80243474) = SCRIPT({ } }); -EvtSource N(interact_8024352C) = SCRIPT({ +EvtScript N(interact_8024352C) = SCRIPT({ match EVT_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_00_Anim_3, NPC_ANIM_bubulb_Palette_00_Anim_2, 0, MESSAGE_ID(0x11, 0x0016)); @@ -631,7 +631,7 @@ EvtSource N(interact_8024352C) = SCRIPT({ } }); -EvtSource N(interact_802436C0) = SCRIPT({ +EvtScript N(interact_802436C0) = SCRIPT({ match EVT_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_01_Anim_3, NPC_ANIM_bubulb_Palette_01_Anim_2, 0, MESSAGE_ID(0x11, 0x001D)); @@ -663,7 +663,7 @@ EvtSource N(interact_802436C0) = SCRIPT({ } }); -EvtSource N(interact_80243854) = SCRIPT({ +EvtScript N(interact_80243854) = SCRIPT({ match EVT_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_02_Anim_3, NPC_ANIM_bubulb_Palette_02_Anim_2, 0, MESSAGE_ID(0x11, 0x0024)); @@ -695,7 +695,7 @@ EvtSource N(interact_80243854) = SCRIPT({ } }); -EvtSource N(interact_802439E8) = SCRIPT({ +EvtScript N(interact_802439E8) = SCRIPT({ match EVT_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { SpeakToPlayer(NPC_SELF, NPC_ANIM_bubulb_Palette_03_Anim_3, NPC_ANIM_bubulb_Palette_03_Anim_2, 0, MESSAGE_ID(0x11, 0x002B)); @@ -727,27 +727,27 @@ EvtSource N(interact_802439E8) = SCRIPT({ } }); -EvtSource N(init_80243B7C) = SCRIPT({ +EvtScript N(init_80243B7C) = SCRIPT({ EVT_AREA_FLAG(18) = 0; BindNpcInteract(NPC_SELF, N(interact_8024352C)); }); -EvtSource N(init_80243BB0) = SCRIPT({ +EvtScript N(init_80243BB0) = SCRIPT({ EVT_AREA_FLAG(19) = 0; BindNpcInteract(NPC_SELF, N(interact_802436C0)); }); -EvtSource N(init_80243BE4) = SCRIPT({ +EvtScript N(init_80243BE4) = SCRIPT({ EVT_AREA_FLAG(20) = 0; BindNpcInteract(NPC_SELF, N(interact_80243854)); }); -EvtSource N(init_80243C18) = SCRIPT({ +EvtScript N(init_80243C18) = SCRIPT({ EVT_AREA_FLAG(21) = 0; BindNpcInteract(NPC_SELF, N(interact_802439E8)); }); -EvtSource N(interact_80243C4C) = SCRIPT({ +EvtScript N(interact_80243C4C) = SCRIPT({ if (EVT_SAVE_FLAG(1373) == 0) { AdjustCam(0, 4.0, -30, 300, 20.0, -9.5); EVT_SAVE_FLAG(1373) = 1; @@ -831,12 +831,12 @@ EvtSource N(interact_80243C4C) = SCRIPT({ ResetCam(0, 4.0); }); -EvtSource N(init_8024414C) = SCRIPT({ +EvtScript N(init_8024414C) = SCRIPT({ BindNpcInteract(NPC_SELF, N(interact_80243C4C)); SetNpcCollisionSize(-1, 65, 50); }); -EvtSource N(idle_80244188) = SCRIPT({ +EvtScript N(idle_80244188) = SCRIPT({ loop { loop 10 { GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)); @@ -853,7 +853,7 @@ EvtSource N(idle_80244188) = SCRIPT({ } }); -EvtSource N(8024427C) = SCRIPT({ +EvtScript N(8024427C) = SCRIPT({ DisablePartnerAI(0); func_802CF56C(2); GetPlayerPos(EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)); @@ -985,7 +985,7 @@ EvtSource N(8024427C) = SCRIPT({ DisablePlayerInput(FALSE); }); -EvtSource N(init_80244BF4) = SCRIPT({ +EvtScript N(init_80244BF4) = SCRIPT({ GetLoadType(EVT_VAR(1)); if (EVT_VAR(1) != 1) { GetEntryID(EVT_VAR(0)); @@ -998,7 +998,7 @@ EvtSource N(init_80244BF4) = SCRIPT({ } }); -EvtSource N(interact_80244C98) = SCRIPT({ +EvtScript N(interact_80244C98) = SCRIPT({ if (EVT_STORY_PROGRESS <= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) { SpeakToPlayer(NPC_LAKILULU, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0032)); @@ -1020,7 +1020,7 @@ EvtSource N(interact_80244C98) = SCRIPT({ } }); -EvtSource N(init_80244DD0) = SCRIPT({ +EvtScript N(init_80244DD0) = SCRIPT({ if (EVT_STORY_PROGRESS >= STORY_CH6_BEGAN_PEACH_MISSION) { BindNpcInteract(NPC_SELF, N(interact_80244C98)); SetNpcCollisionSize(-1, 36, 28); @@ -1313,7 +1313,7 @@ f32 N(D_80245E88_CA3DA8)[] = { extern const char N(sam_11_name_hack)[]; -EvtSource N(80245EB8) = SCRIPT({ +EvtScript N(80245EB8) = SCRIPT({ SetPlayerPos(-400, 0, 200); SetNpcPos(NPC_PARTNER, -380, 0, 200); func_802CF56C(2); @@ -1350,19 +1350,19 @@ EvtSource N(80245EB8) = SCRIPT({ sleep 100; }); -EvtSource N(init_80246170) = SCRIPT({ +EvtScript N(init_80246170) = SCRIPT({ SetPlayerPos(-400, 0, 200); SetNpcPos(NPC_PARTNER, -380, 0, 200); SetNpcPos(NPC_BUBULB0, 196, 20, 354); SetNpcYaw(NPC_BUBULB0, 270); }); -EvtSource N(init_802461E4) = SCRIPT({ +EvtScript N(init_802461E4) = SCRIPT({ SetNpcPos(NPC_BUBULB1, 163, 20, 370); SetNpcYaw(NPC_BUBULB1, 90); }); -EvtSource N(init_80246224) = SCRIPT({ +EvtScript N(init_80246224) = SCRIPT({ SetNpcPos(NPC_BUBULB2, 266, 20, 322); SetNpcYaw(NPC_BUBULB2, 270); }); @@ -1466,7 +1466,7 @@ static s32 N(pad_684C) = { 0x00000000, }; -EvtSource N(80246850) = SCRIPT({ +EvtScript N(80246850) = SCRIPT({ EVT_VAR(1) = (float) EVT_VAR(0); EVT_VAR(1) -= -700.0; EVT_VAR(1) /= 100.0; @@ -1586,7 +1586,7 @@ EvtSource N(80246850) = SCRIPT({ TranslateModel(119, 13.0029296875, -631.15234375, -0.9462890625); }); -EvtSource N(80247488) = SCRIPT({ +EvtScript N(80247488) = SCRIPT({ EVT_VAR(1) = (float) EVT_VAR(0); EVT_VAR(1) -= -700.0; EVT_VAR(1) /= 100.0; @@ -1602,7 +1602,7 @@ EvtSource N(80247488) = SCRIPT({ RotateGroup(79, EVT_VAR(1), 0, 1, 0); }); -EvtSource N(80247588) = SCRIPT({ +EvtScript N(80247588) = SCRIPT({ TranslateModel(83, 9.5, 12.0, 15.0); TranslateModel(85, -9.5, 12.0, 15.0); TranslateModel(87, 0.0, 0.0, 17.0); @@ -1618,7 +1618,7 @@ EvtSource N(80247588) = SCRIPT({ ScaleModel(87, EVT_VAR(0), EVT_VAR(0), EVT_VAR(0)); }); -EvtSource N(802476F4) = SCRIPT({ +EvtScript N(802476F4) = SCRIPT({ ScaleModel(81, EVT_VAR(0), EVT_VAR(0), EVT_VAR(0)); EVT_VAR(1) = (float) EVT_VAR(0); EVT_VAR(1) *= 90.0; @@ -1626,7 +1626,7 @@ EvtSource N(802476F4) = SCRIPT({ RotateModel(81, EVT_VAR(1), 1, 0, 0); }); -EvtSource N(80247770) = SCRIPT({ +EvtScript N(80247770) = SCRIPT({ EVT_VAR(1) = (float) EVT_VAR(0); EVT_VAR(1) *= -3.0; TranslateModel(81, -0.259765625, EVT_VAR(0), 1.4775390625); @@ -1636,7 +1636,7 @@ EvtSource N(80247770) = SCRIPT({ extern const char N(flo_19_name_hack)[]; -EvtSource N(802477EC) = SCRIPT({ +EvtScript N(802477EC) = SCRIPT({ if (EVT_AREA_FLAG(44) == 0) { DisablePlayerInput(TRUE); func_802D2B6C(); @@ -1701,7 +1701,7 @@ EvtSource N(802477EC) = SCRIPT({ } }); -EvtSource N(80247BCC) = SCRIPT({ +EvtScript N(80247BCC) = SCRIPT({ DisablePlayerInput(TRUE); SetPlayerActionState(10); ModifyColliderFlags(0, 47, 0x7FFFFE00); @@ -1762,7 +1762,7 @@ EvtSource N(80247BCC) = SCRIPT({ DisablePlayerInput(FALSE); }); -EvtSource N(80247FAC) = SCRIPT({ +EvtScript N(80247FAC) = SCRIPT({ PlaySoundAtCollider(47, 411, 0); EVT_VAR(15) = 0; loop 100 { @@ -1822,7 +1822,7 @@ EvtSource N(80247FAC) = SCRIPT({ sleep 100; }); -EvtSource N(8024834C) = SCRIPT({ +EvtScript N(8024834C) = SCRIPT({ DisablePlayerInput(TRUE); InterpPlayerYaw(200, 0); SetPlayerPos(-60, 0, 30); @@ -1860,7 +1860,7 @@ s32 N(itemList_80248598)[] = { ITEM_NONE, }; -EvtSource N(802485A8) = SCRIPT({ +EvtScript N(802485A8) = SCRIPT({ DisablePlayerInput(TRUE); func_802D2884(-85, 85, 0); func_802CF56C(2); @@ -1994,7 +1994,7 @@ EvtSource N(802485A8) = SCRIPT({ } }); -EvtSource N(80248D3C) = SCRIPT({ +EvtScript N(80248D3C) = SCRIPT({ 0: IsPlayerWithin(-85, 85, 20, EVT_VAR(0)); if (EVT_VAR(0) == 0) { @@ -2015,7 +2015,7 @@ EvtSource N(80248D3C) = SCRIPT({ N(func_802413BC_C9F2DC)(); }); -EvtSource N(80248E30) = SCRIPT({ +EvtScript N(80248E30) = SCRIPT({ if (EVT_STORY_PROGRESS < STORY_CH6_GREW_MAGIC_BEANSTALK) { loop { sleep 1; @@ -2035,7 +2035,7 @@ EvtSource N(80248E30) = SCRIPT({ } }); -EvtSource N(80248F48) = SCRIPT({ +EvtScript N(80248F48) = SCRIPT({ bind N(802477EC) TRIGGER_FLOOR_TOUCH 46; EnableGroup(121, 1); EnableGroup(80, 1); @@ -2074,7 +2074,7 @@ static s32 N(pad_9128)[] = { 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = SCRIPT({ +EvtScript N(makeEntities) = SCRIPT({ if (EVT_STORY_PROGRESS < STORY_EPILOGUE) { MakeEntity(0x802E9A18, 110, 60, -100, 0, MAKE_ENTITY_END); } diff --git a/src/world/area_flo/flo_00/flo_00.h b/src/world/area_flo/flo_00/flo_00.h index 4f23d1bb77..a6b11b81a1 100644 --- a/src/world/area_flo/flo_00/flo_00.h +++ b/src/world/area_flo/flo_00/flo_00.h @@ -22,12 +22,12 @@ ApiStatus N(func_802413BC_C9F2DC)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80245DE4); extern NpcGroupList N(npcGroupList_80246834); -extern EvtSource N(80242998); -extern EvtSource N(80242FCC); -extern EvtSource N(80245EB8); -extern EvtSource N(80247BCC); -extern EvtSource N(8024834C); -extern EvtSource N(80248E30); -extern EvtSource N(80248F48); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80242998); +extern EvtScript N(80242FCC); +extern EvtScript N(80245EB8); +extern EvtScript N(80247BCC); +extern EvtScript N(8024834C); +extern EvtScript N(80248E30); +extern EvtScript N(80248F48); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index d485b1214c..6b0b9b4e5f 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -27,7 +27,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_03_tattle }, }; -EvtSource N(802406A0) = { +EvtScript N(802406A0) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 2) EVT_CALL(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, 8) @@ -49,7 +49,7 @@ EvtSource N(802406A0) = { EVT_END }; -EvtSource N(802407C0) = { +EvtScript N(802407C0) = { EVT_IF_GE(EVT_SAVE_VAR(0), 44) EVT_IF_EQ(EVT_SAVE_FLAG(1411), 1) EVT_CALL(PushSong, 137, 0) @@ -59,7 +59,7 @@ EvtSource N(802407C0) = { EVT_END }; -EvtSource N(80240814) = { +EvtScript N(80240814) = { EVT_IF_GE(EVT_SAVE_VAR(0), 44) EVT_IF_EQ(EVT_SAVE_FLAG(1411), 1) EVT_CALL(FadeOutMusic, 0, 250) @@ -71,7 +71,7 @@ EvtSource N(80240814) = { EVT_END }; -EvtSource N(80240880) = { +EvtScript N(80240880) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -112,18 +112,18 @@ EvtSource N(80240880) = { EVT_END }; -EvtSource N(exitWalk_80240B2C) = EXIT_WALK_SCRIPT(60, 0, "flo_09", 1); +EvtScript N(exitWalk_80240B2C) = EXIT_WALK_SCRIPT(60, 0, "flo_09", 1); -EvtSource N(exitWalk_80240B88) = EXIT_WALK_SCRIPT(60, 1, "flo_22", 0); +EvtScript N(exitWalk_80240B88) = EXIT_WALK_SCRIPT(60, 1, "flo_22", 0); -EvtSource N(80240BE4) = { +EvtScript N(80240BE4) = { EVT_BIND_TRIGGER(N(exitWalk_80240B2C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_80240B88), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -185,14 +185,14 @@ NpcSettings N(npcSettings_80240EDC) = { s32** N(D_80240F08_CA81A8) = NULL; -EvtSource N(80240F0C) = { +EvtScript N(80240F0C) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(80240F3C) = { +EvtScript N(80240F3C) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 16) EVT_RETURN EVT_RETURN @@ -219,7 +219,7 @@ s32 N(intTable_80240FD8)[] = { 0x0000008C, }; -EvtSource N(80240FFC) = { +EvtScript N(80240FFC) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetNpcYaw, 0, 90) @@ -243,13 +243,13 @@ EvtSource N(80240FFC) = { EVT_END }; -EvtSource N(npcAI_8024119C) = { +EvtScript N(npcAI_8024119C) = { EVT_CALL(N(func_80240158_CA73F8)) EVT_RETURN EVT_END }; -EvtSource N(defeat_802411B8) = { +EvtScript N(defeat_802411B8) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -262,7 +262,7 @@ EvtSource N(defeat_802411B8) = { EVT_END }; -EvtSource N(8024122C) = { +EvtScript N(8024122C) = { EVT_CALL(GetPlayerPos, EVT_VAR(3), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), EVT_VAR(3)) @@ -272,7 +272,7 @@ EvtSource N(8024122C) = { EVT_END }; -EvtSource N(interact_802412BC) = { +EvtScript N(interact_802412BC) = { EVT_EXEC_WAIT(N(802407C0)) EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(44) @@ -408,7 +408,7 @@ EvtSource N(interact_802412BC) = { EVT_END }; -EvtSource N(init_80241DA4) = { +EvtScript N(init_80241DA4) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802412BC))) EVT_IF_EQ(EVT_SAVE_FLAG(1411), 0) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_petunia_Palette_00_Anim_6) @@ -419,7 +419,7 @@ EvtSource N(init_80241DA4) = { EVT_END }; -EvtSource N(init_80241E10) = { +EvtScript N(init_80241E10) = { EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_802411B8))) EVT_CALL(EnableNpcShadow, 1, FALSE) EVT_SWITCH(EVT_SAVE_VAR(0)) @@ -437,7 +437,7 @@ EvtSource N(init_80241E10) = { EVT_END }; -EvtSource N(80241EF4) = { +EvtScript N(80241EF4) = { EVT_SET(EVT_MAP_VAR(14), 0) EVT_SET(EVT_MAP_VAR(10), 0) EVT_SET(EVT_MAP_VAR(11), 0) @@ -448,7 +448,7 @@ EvtSource N(80241EF4) = { EVT_END }; -EvtSource N(defeat_80241F64) = { +EvtScript N(defeat_80241F64) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -485,7 +485,7 @@ EvtSource N(defeat_80241F64) = { EVT_END }; -EvtSource N(hit_80242138) = { +EvtScript N(hit_80242138) = { EVT_IF_EQ(EVT_SAVE_VAR(0), 44) EVT_CALL(GetOwnerEncounterTrigger, EVT_VAR(0)) EVT_IF_NE(EVT_VAR(0), 1) @@ -496,7 +496,7 @@ EvtSource N(hit_80242138) = { EVT_END }; -EvtSource N(idle_8024219C) = { +EvtScript N(idle_8024219C) = { EVT_LOOP(0) EVT_IF_EQ(EVT_MAP_VAR(10), 0) EVT_IF_EQ(EVT_AREA_FLAG(23), 1) @@ -574,7 +574,7 @@ EvtSource N(idle_8024219C) = { EVT_END }; -EvtSource N(idle_80242618) = { +EvtScript N(idle_80242618) = { EVT_LOOP(0) EVT_IF_EQ(EVT_MAP_VAR(11), 0) EVT_IF_EQ(EVT_AREA_FLAG(24), 1) @@ -652,7 +652,7 @@ EvtSource N(idle_80242618) = { EVT_END }; -EvtSource N(idle_80242A94) = { +EvtScript N(idle_80242A94) = { EVT_LOOP(0) EVT_IF_EQ(EVT_MAP_VAR(12), 0) EVT_IF_EQ(EVT_AREA_FLAG(25), 1) @@ -730,7 +730,7 @@ EvtSource N(idle_80242A94) = { EVT_END }; -EvtSource N(idle_80242F10) = { +EvtScript N(idle_80242F10) = { EVT_LOOP(0) EVT_IF_EQ(EVT_MAP_VAR(13), 0) EVT_IF_EQ(EVT_AREA_FLAG(26), 1) @@ -808,7 +808,7 @@ EvtSource N(idle_80242F10) = { EVT_END }; -EvtSource N(init_8024338C) = { +EvtScript N(init_8024338C) = { EVT_CALL(BindNpcHit, -1, EVT_PTR(N(hit_80242138))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80241F64))) EVT_CALL(EnableNpcShadow, 2, FALSE) @@ -831,7 +831,7 @@ EvtSource N(init_8024338C) = { EVT_END }; -EvtSource N(init_802434CC) = { +EvtScript N(init_802434CC) = { EVT_CALL(BindNpcHit, -1, EVT_PTR(N(hit_80242138))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80241F64))) EVT_CALL(EnableNpcShadow, 3, FALSE) @@ -854,7 +854,7 @@ EvtSource N(init_802434CC) = { EVT_END }; -EvtSource N(init_8024360C) = { +EvtScript N(init_8024360C) = { EVT_CALL(BindNpcHit, -1, EVT_PTR(N(hit_80242138))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80241F64))) EVT_CALL(EnableNpcShadow, 4, FALSE) @@ -877,7 +877,7 @@ EvtSource N(init_8024360C) = { EVT_END }; -EvtSource N(init_8024374C) = { +EvtScript N(init_8024374C) = { EVT_CALL(BindNpcHit, -1, EVT_PTR(N(hit_80242138))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80241F64))) EVT_CALL(EnableNpcShadow, 5, FALSE) @@ -1202,7 +1202,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(triggerCoord_80244E44) = { -208.0f, 0.0f, -182.0f, 0.0f }; -EvtSource N(80244E54) = { +EvtScript N(80244E54) = { EVT_SET(EVT_AREA_FLAG(27), 0) EVT_SET(EVT_AREA_FLAG(28), 0) EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) @@ -1216,12 +1216,12 @@ static s32 N(pad_4ECC) = { 0x00000000, }; -EvtSource N(80244ED0) = { +EvtScript N(80244ED0) = { EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EAB04, -175, 0, 150, 0, 8, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(1404)) EVT_RETURN diff --git a/src/world/area_flo/flo_03/flo_03.h b/src/world/area_flo/flo_03/flo_03.h index f75d08edd5..576609a6b3 100644 --- a/src/world/area_flo/flo_03/flo_03.h +++ b/src/world/area_flo/flo_03/flo_03.h @@ -12,9 +12,9 @@ ApiStatus N(func_80240158_CA73F8)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240460_CA7700)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024442C); -extern EvtSource N(80240FFC); -extern EvtSource N(80241EF4); -extern EvtSource N(80244E54); -extern EvtSource N(80244ED0); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80240FFC); +extern EvtScript N(80241EF4); +extern EvtScript N(80244E54); +extern EvtScript N(80244ED0); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index b1e7e8b01f..e12b63dc91 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -19,7 +19,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_07_tattle }, }; -EvtSource N(802407A0) = { +EvtScript N(802407A0) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 1) EVT_CALL(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, 8) @@ -36,13 +36,13 @@ EvtSource N(802407A0) = { EVT_END }; -EvtSource N(8024086C) = { +EvtScript N(8024086C) = { EVT_CALL(PushSong, 137, 1) EVT_RETURN EVT_END }; -EvtSource N(80240890) = { +EvtScript N(80240890) = { EVT_CALL(FadeOutMusic, 0, 250) EVT_WAIT_FRAMES(10) EVT_CALL(PopSong) @@ -54,7 +54,7 @@ static s32 N(pad_8CC) = { 0x00000000, }; -EvtSource N(updateTexturePan_802408D0) = { +EvtScript N(updateTexturePan_802408D0) = { EVT_SET_GROUP(0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) @@ -71,7 +71,7 @@ EvtSource N(updateTexturePan_802408D0) = { EVT_END }; -EvtSource N(8024096C) = { +EvtScript N(8024096C) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -112,15 +112,15 @@ EvtSource N(8024096C) = { EVT_END }; -EvtSource N(exitWalk_80240C18) = EXIT_WALK_SCRIPT(60, 0, "flo_25", 1); +EvtScript N(exitWalk_80240C18) = EXIT_WALK_SCRIPT(60, 0, "flo_25", 1); -EvtSource N(80240C74) = { +EvtScript N(80240C74) = { EVT_BIND_TRIGGER(N(exitWalk_80240C18), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -228,21 +228,21 @@ NpcSettings N(npcSettings_80241220) = { s32** N(D_80241BB0_CADDA0) = NULL; -EvtSource N(80241BB4) = { +EvtScript N(80241BB4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(80241BE4) = { +EvtScript N(80241BE4) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 16) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(80241C14) = { +EvtScript N(80241C14) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(GetNpcPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -263,7 +263,7 @@ EvtSource N(80241C14) = { EVT_END }; -EvtSource N(80241D6C) = { +EvtScript N(80241D6C) = { EVT_LABEL(0) EVT_CALL(ShakeCam, 0, 0, 1, EVT_FIXED(1.0)) EVT_WAIT_FRAMES(1) @@ -272,7 +272,7 @@ EvtSource N(80241D6C) = { EVT_END }; -EvtSource N(80241DBC) = { +EvtScript N(80241DBC) = { EVT_IF_EQ(EVT_AREA_FLAG(6), 1) EVT_RETURN EVT_END_IF @@ -311,7 +311,7 @@ EvtSource N(80241DBC) = { EVT_END }; -EvtSource N(interact_80242044) = { +EvtScript N(interact_80242044) = { EVT_EXEC_WAIT(N(8024086C)) EVT_CALL(NpcFacePlayer, NPC_SELF, 1) EVT_SWITCH(EVT_SAVE_VAR(0)) @@ -371,7 +371,7 @@ EvtSource N(interact_80242044) = { EVT_END }; -EvtSource N(init_80242428) = { +EvtScript N(init_80242428) = { EVT_IF_EQ(EVT_SAVE_VAR(0), 47) EVT_IF_EQ(EVT_SAVE_FLAG(1374), 0) EVT_IF_EQ(EVT_SAVE_FLAG(1396), 0) @@ -387,7 +387,7 @@ EvtSource N(init_80242428) = { EVT_END }; -EvtSource N(802424F4) = { +EvtScript N(802424F4) = { EVT_IF_NE(EVT_AREA_VAR(3), 0) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(10) @@ -408,7 +408,7 @@ EvtSource N(802424F4) = { extern const char N(flo_25_name_hack)[]; -EvtSource N(tree1_Callback) = { +EvtScript N(tree1_Callback) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_IF_LT(EVT_SAVE_VAR(0), 47) EVT_CALL(NpcFacePlayer, 0, 1) @@ -468,7 +468,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(triggerCoord_802428B4) = { -309.0f, 0.0f, 31.0f, 0.0f }; -EvtSource N(802428C4) = { +EvtScript N(802428C4) = { EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_WALL_HAMMER, 4, 1, 0) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_POINT_BOMB, EVT_PTR(N(triggerCoord_802428B4)), 1, 0) diff --git a/src/world/area_flo/flo_07/flo_07.h b/src/world/area_flo/flo_07/flo_07.h index ff5dfbd5fa..53765a4351 100644 --- a/src/world/area_flo/flo_07/flo_07.h +++ b/src/world/area_flo/flo_07/flo_07.h @@ -13,7 +13,7 @@ ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240344_CAC534)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80242B0C); -extern EvtSource N(80241C14); -extern EvtSource N(802424F4); -extern EvtSource N(802428C4); -extern EvtSource N(main); +extern EvtScript N(80241C14); +extern EvtScript N(802424F4); +extern EvtScript N(802428C4); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index a628aac8ec..db62713888 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -36,7 +36,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_08_tattle }, }; -EvtSource N(80241F40) = { +EvtScript N(80241F40) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -67,7 +67,7 @@ f32 N(D_80242008_CB0D48)[3] = { 140.0f, 180.0f, 220.0f }; -EvtSource N(80242014) = { +EvtScript N(80242014) = { EVT_WAIT_FRAMES(10) EVT_CALL(PlaySound, 0x212D) EVT_CALL(N(UnkFunc21), EVT_MAP_VAR(0)) @@ -99,7 +99,7 @@ EvtSource N(80242014) = { EVT_END }; -EvtSource N(80242178) = { +EvtScript N(80242178) = { EVT_IF_EQ(EVT_SAVE_FLAG(1402), 1) EVT_RETURN EVT_END_IF @@ -183,7 +183,7 @@ EvtSource N(80242178) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA910, -780, 120, -110, 0, MAKE_ENTITY_END) EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1402)) @@ -193,7 +193,7 @@ EvtSource N(makeEntities) = { EVT_END }; -EvtSource N(80242680) = { +EvtScript N(80242680) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -234,11 +234,11 @@ EvtSource N(80242680) = { EVT_END }; -EvtSource N(exitWalk_8024292C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 6); +EvtScript N(exitWalk_8024292C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 6); -EvtSource N(exitWalk_80242988) = EXIT_WALK_SCRIPT(60, 1, "flo_24", 0); +EvtScript N(exitWalk_80242988) = EXIT_WALK_SCRIPT(60, 1, "flo_24", 0); -EvtSource N(802429E4) = { +EvtScript N(802429E4) = { EVT_BIND_TRIGGER(N(exitWalk_8024292C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_80242988), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN @@ -250,7 +250,7 @@ s32 N(lavaResetList_80242A2C)[] = { 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -338,13 +338,13 @@ NpcAISettings N(npcAISettings_80242EB0) = { .unk_2C = 1, }; -EvtSource N(npcAI_80242EE0) = { +EvtScript N(npcAI_80242EE0) = { EVT_CALL(N(func_8024150C_CB024C), EVT_PTR(N(npcAISettings_80242EB0))) EVT_RETURN EVT_END }; -EvtSource N(80242F00) = { +EvtScript N(80242F00) = { EVT_LABEL(0) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(1), 30) @@ -387,7 +387,7 @@ NpcAISettings N(npcAISettings_8024300C) = { .unk_2C = 1, }; -EvtSource N(npcAI_8024303C) = { +EvtScript N(npcAI_8024303C) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024300C))) EVT_RETURN EVT_END @@ -408,7 +408,7 @@ s32 N(D_8024308C_CB1DCC) = { 0x00000000, }; -EvtSource N(80243090) = { +EvtScript N(80243090) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowConsumableChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -432,7 +432,7 @@ EvtSource N(80243090) = { EVT_END }; -EvtSource N(802431C4) = { +EvtScript N(802431C4) = { EVT_CALL(N(func_802419FC_CB073C), EVT_VAR(0)) EVT_BIND_PADLOCK(N(80243090), 0x10, 0, EVT_PTR(D_802462C0_B4AA30), 0, 1) EVT_CALL(N(func_80241970_CB06B0), EVT_VAR(0)) @@ -440,7 +440,7 @@ EvtSource N(802431C4) = { EVT_END }; -EvtSource N(interact_80243214) = { +EvtScript N(interact_80243214) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_IF_EQ(EVT_SAVE_FLAG(1364), 0) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -574,7 +574,7 @@ EvtSource N(interact_80243214) = { EVT_END }; -EvtSource N(init_80243B20) = { +EvtScript N(init_80243B20) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80243214))) EVT_IF_EQ(EVT_SAVE_FLAG(1364), 1) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_gate_flower_Palette_02_Anim_5) @@ -880,7 +880,7 @@ StaticNpc N(npcGroup_802449D8) = { .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, }; -EvtSource N(init_80244BC8) = { +EvtScript N(init_80244BC8) = { EVT_THREAD EVT_WAIT_FRAMES(2) EVT_CALL(GetNpcPointer, 2, EVT_VAR(0)) @@ -1239,7 +1239,7 @@ ApiStatus N(func_80241A98_CB07D8)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80241B5C_CB089C)(Evt* script, s32 isInitialCall) { s32 itemId = evt_get_variable(script, *script->ptrReadPos); - StaticItem* item = &gItemTable[itemId]; + ItemData* item = &gItemTable[itemId]; if (itemId == ITEM_YUMMY_MEAL) { script->varTable[9] = 2; @@ -1301,7 +1301,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(triggerCoord_80245904) = { 391.0f, 0.0f, -102.0f, 0.0f }; -EvtSource N(80245914) = { +EvtScript N(80245914) = { EVT_SET(EVT_AREA_FLAG(29), 0) EVT_SET(EVT_AREA_FLAG(30), 0) EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) @@ -1315,7 +1315,7 @@ static s32 N(pad_598C) = { 0x00000000, }; -EvtSource N(80245990) = { +EvtScript N(80245990) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -1356,7 +1356,7 @@ EvtSource N(80245990) = { EVT_END }; -EvtSource N(80245C3C) = { +EvtScript N(80245C3C) = { EVT_SET(EVT_VAR(9), EVT_VAR(6)) EVT_SET(EVT_VAR(8), EVT_VAR(5)) EVT_SET(EVT_VAR(7), EVT_VAR(4)) @@ -1408,7 +1408,7 @@ EvtSource N(80245C3C) = { EVT_END }; -EvtSource N(80245F5C) = { +EvtScript N(80245F5C) = { EVT_CALL(GetModelCenter, 60) EVT_SET(EVT_VAR(3), 60) EVT_SET(EVT_VAR(4), 61) diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h index 529c2ef28d..d9f11c58f3 100644 --- a/src/world/area_flo/flo_08/flo_08.h +++ b/src/world/area_flo/flo_08/flo_08.h @@ -36,9 +36,9 @@ ApiStatus N(func_80241BCC_CB090C)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80244EC4); -extern EvtSource N(80245914); -extern EvtSource N(80245F5C); -extern EvtSource N(main); +extern EvtScript N(80245914); +extern EvtScript N(80245F5C); +extern EvtScript N(main); extern s32 N(D_80241FB0_CB0CF0)[]; extern s16 N(D_80241FB8_CB0CF8)[]; extern s32 N(D_80241FC8_CB0D08)[8][2]; diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index 22a18526dd..ba2c5cef5c 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -23,7 +23,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_09_tattle }, }; -EvtSource N(80241880) = { +EvtScript N(80241880) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -34,7 +34,7 @@ EvtSource N(80241880) = { EVT_END }; -EvtSource N(802418F0) = { +EvtScript N(802418F0) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -75,18 +75,18 @@ EvtSource N(802418F0) = { EVT_END }; -EvtSource N(exitWalk_80241B9C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 5); +EvtScript N(exitWalk_80241B9C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 5); -EvtSource N(exitWalk_80241BF8) = EXIT_WALK_SCRIPT(60, 1, "flo_03", 0); +EvtScript N(exitWalk_80241BF8) = EXIT_WALK_SCRIPT(60, 1, "flo_03", 0); -EvtSource N(80241C54) = { +EvtScript N(80241C54) = { EVT_BIND_TRIGGER(N(exitWalk_80241B9C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_80241BF8), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -148,7 +148,7 @@ static s32 N(pad_2004)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80242010) = { +EvtScript N(80242010) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -189,7 +189,7 @@ EvtSource N(80242010) = { EVT_END }; -EvtSource N(802422BC) = { +EvtScript N(802422BC) = { EVT_SET(EVT_VAR(9), EVT_VAR(6)) EVT_SET(EVT_VAR(8), EVT_VAR(5)) EVT_SET(EVT_VAR(7), EVT_VAR(4)) @@ -241,7 +241,7 @@ EvtSource N(802422BC) = { EVT_END }; -EvtSource N(802425DC) = { +EvtScript N(802425DC) = { EVT_CALL(GetModelCenter, 69) EVT_SET(EVT_VAR(3), 69) EVT_SET(EVT_VAR(4), 70) @@ -294,7 +294,7 @@ static s32 N(pad_2874)[] = { #include "common/foliage.inc.c" -EvtSource N(802431E4) = { +EvtScript N(802431E4) = { EVT_CALL(GetNpcPos, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_LT(EVT_VAR(1), 0) EVT_CALL(GetModelCenter, EVT_VAR(9)) @@ -305,7 +305,7 @@ EvtSource N(802431E4) = { EVT_END }; -EvtSource N(tree1_Callback) = { +EvtScript N(tree1_Callback) = { EVT_IF_EQ(EVT_SAVE_FLAG(1382), 0) EVT_IF_EQ(EVT_AREA_VAR(5), 1) EVT_CALL(MakeItemEntity, ITEM_HAPPY_FLOWER_B, -250, 100, 0, 13, EVT_SAVE_FLAG(1382)) @@ -320,7 +320,7 @@ EvtSource N(tree1_Callback) = { EVT_END }; -EvtSource N(tree2_Callback) = { +EvtScript N(tree2_Callback) = { EVT_IF_EQ(EVT_SAVE_FLAG(1382), 0) EVT_SET(EVT_AREA_VAR(4), 1) EVT_SET(EVT_AREA_VAR(5), 0) @@ -329,7 +329,7 @@ EvtSource N(tree2_Callback) = { EVT_END }; -EvtSource N(tree3_Callback) = { +EvtScript N(tree3_Callback) = { EVT_IF_EQ(EVT_SAVE_FLAG(1382), 0) EVT_IF_EQ(EVT_AREA_VAR(4), 1) EVT_IF_EQ(EVT_AREA_VAR(5), 0) @@ -400,7 +400,7 @@ ShakeTreeConfig N(tree3) = { Vec4f N(triggerCoord_80243498) = { 200.0f, 0.0f, 1.0f, 0.0f }; -EvtSource N(802434A8) = { +EvtScript N(802434A8) = { EVT_SET(EVT_AREA_VAR(4), 0) EVT_SET(EVT_AREA_VAR(5), 0) EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) @@ -431,7 +431,7 @@ NpcAISettings N(npcAISettings_802435B0) = { .unk_2C = 1, }; -EvtSource N(npcAI_802435E0) = { +EvtScript N(npcAI_802435E0) = { EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_802435B0))) EVT_RETURN EVT_END @@ -466,7 +466,7 @@ NpcAISettings N(npcAISettings_80243644) = { .unk_2C = 1, }; -EvtSource N(npcAI_80243674) = { +EvtScript N(npcAI_80243674) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -630) EVT_CALL(SetSelfVar, 6, 50) @@ -491,7 +491,7 @@ NpcSettings N(npcSettings_80243710) = { .level = 99, }; -EvtSource N(npcAI_8024373C) = { +EvtScript N(npcAI_8024373C) = { EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -518,7 +518,7 @@ EvtSource N(npcAI_8024373C) = { EVT_END }; -EvtSource N(defeat_802438C8) = { +EvtScript N(defeat_802438C8) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -532,7 +532,7 @@ EvtSource N(defeat_802438C8) = { EVT_END }; -EvtSource N(init_80243954) = { +EvtScript N(init_80243954) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(npcAI_8024373C))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_802438C8))) EVT_RETURN diff --git a/src/world/area_flo/flo_09/flo_09.h b/src/world/area_flo/flo_09/flo_09.h index 3b18958134..8f8bd5e8d7 100644 --- a/src/world/area_flo/flo_09/flo_09.h +++ b/src/world/area_flo/flo_09/flo_09.h @@ -13,6 +13,6 @@ ApiStatus N(func_8024162C_CB662C)(Evt* script, s32 isInitialCall); extern f32 N(D_8024362C_CB862C)[]; extern NpcGroupList N(npcGroupList_8024414C); -extern EvtSource N(802425DC); -extern EvtSource N(802434A8); -extern EvtSource N(main); +extern EvtScript N(802425DC); +extern EvtScript N(802434A8); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 467f1689ee..68cbfd4bdb 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -20,7 +20,7 @@ MapConfig N(config) = { .tattle = { .get = N(func_80240000_CB9200) }, }; -EvtSource N(802414E0) = SCRIPT({ +EvtScript N(802414E0) = SCRIPT({ GetEntryID(EVT_VAR(0)); if (EVT_VAR(0) == 1) { SetMusicTrack(0, SONG_SUNSHINE_RETURNS, 0, 8); @@ -38,11 +38,11 @@ EvtSource N(802414E0) = SCRIPT({ } }); -EvtSource N(802415C4) = SCRIPT({ +EvtScript N(802415C4) = SCRIPT({ PushSong(137, 2); }); -EvtSource N(802415E8) = SCRIPT({ +EvtScript N(802415E8) = SCRIPT({ FadeOutMusic(0, 250); sleep 10; PopSong(); @@ -52,7 +52,7 @@ static s32 N(pad_1624)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80241630) = SCRIPT({ +EvtScript N(80241630) = SCRIPT({ if (EVT_STORY_PROGRESS >= STORY_CH6_FILLED_SPRING_WITH_WATER) { MakeItemEntity(ITEM_WATER_STONE, 0, -60, 6, 1, 0); } @@ -62,7 +62,7 @@ static s32 N(pad_167C) = { 0x00000000, }; -EvtSource N(80241680) = SCRIPT({ +EvtScript N(80241680) = SCRIPT({ group 11; EVT_VAR(10) = EVT_VAR(0); EVT_VAR(11) = EVT_VAR(1); @@ -101,13 +101,13 @@ EvtSource N(80241680) = SCRIPT({ goto 0; }); -EvtSource N(exitWalk_8024192C) = EXIT_WALK_SCRIPT(60, 0, "flo_24", 1); +EvtScript N(exitWalk_8024192C) = EXIT_WALK_SCRIPT(60, 0, "flo_24", 1); -EvtSource N(80241988) = SCRIPT({ +EvtScript N(80241988) = SCRIPT({ bind N(exitWalk_8024192C) TRIGGER_FLOOR_ABOVE 0; }); -EvtSource N(main) = SCRIPT({ +EvtScript N(main) = SCRIPT({ EVT_WORLD_LOCATION = LOCATION_FLOWER_FIELDS; SetSpriteShading(-1); SetCamLeadPlayer(0, 0); @@ -166,17 +166,17 @@ static s32 N(pad_1CA8)[] = { s32** N(D_80241CB0_CBAEB0) = NULL; -EvtSource N(80241CB4) = SCRIPT({ +EvtScript N(80241CB4) = SCRIPT({ ShowGotItem(EVT_VAR(0), 1, 0); return; }); -EvtSource N(80241CE4) = SCRIPT({ +EvtScript N(80241CE4) = SCRIPT({ ShowGotItem(EVT_VAR(0), 1, 16); return; }); -EvtSource N(updateTexturePan_80241D14) = SCRIPT({ +EvtScript N(updateTexturePan_80241D14) = SCRIPT({ group 0; if (EVT_VAR(5) == 1) { if (EVT_VAR(6) == 1) { @@ -191,7 +191,7 @@ EvtSource N(updateTexturePan_80241D14) = SCRIPT({ N(UnkTexturePanFunc2)(); }); -EvtSource N(80241DB0) = SCRIPT({ +EvtScript N(80241DB0) = SCRIPT({ MakeLerp(-50, 170, 385, 0); 1: UpdateLerp(); @@ -202,7 +202,7 @@ EvtSource N(80241DB0) = SCRIPT({ } }); -EvtSource N(80241E40) = SCRIPT({ +EvtScript N(80241E40) = SCRIPT({ MakeLerp(0, 100, 90, 1); 1: UpdateLerp(); @@ -218,7 +218,7 @@ EvtSource N(80241E40) = SCRIPT({ } }); -EvtSource N(80241F20) = SCRIPT({ +EvtScript N(80241F20) = SCRIPT({ EnableTexPanning(53, 1); spawn { EVT_VAR(0) = 10; @@ -238,13 +238,13 @@ EvtSource N(80241F20) = SCRIPT({ } }); -EvtSource N(80242030) = SCRIPT({ +EvtScript N(80242030) = SCRIPT({ sleep 60; EnableModel(53, 1); spawn N(80241F20); }); -EvtSource N(8024206C) = SCRIPT({ +EvtScript N(8024206C) = SCRIPT({ sleep 80; EnableNpcShadow(NPC_LILY, FALSE); GetNpcPos(NPC_LILY, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)); @@ -263,7 +263,7 @@ EvtSource N(8024206C) = SCRIPT({ } }); -EvtSource N(80242188) = SCRIPT({ +EvtScript N(80242188) = SCRIPT({ DisablePlayerPhysics(TRUE); sleep 40; SetPlayerAnimation(0x80024); @@ -291,7 +291,7 @@ EvtSource N(80242188) = SCRIPT({ DisablePlayerPhysics(FALSE); }); -EvtSource N(8024230C) = SCRIPT({ +EvtScript N(8024230C) = SCRIPT({ sleep 80; GetPlayerPos(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)); UseSettingsFrom(0, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)); @@ -303,7 +303,7 @@ EvtSource N(8024230C) = SCRIPT({ WaitForCam(0, 1.0); }); -EvtSource N(802423E4) = SCRIPT({ +EvtScript N(802423E4) = SCRIPT({ DisablePartnerAI(0); spawn N(80241DB0); spawn N(80241E40); @@ -313,7 +313,7 @@ EvtSource N(802423E4) = SCRIPT({ spawn N(8024230C); }); -EvtSource N(8024244C) = SCRIPT({ +EvtScript N(8024244C) = SCRIPT({ MakeLerp(170, 75, 150, 0); 1: UpdateLerp(); @@ -324,7 +324,7 @@ EvtSource N(8024244C) = SCRIPT({ } }); -EvtSource N(802424DC) = SCRIPT({ +EvtScript N(802424DC) = SCRIPT({ MakeLerp(100, 15, 150, 1); 1: UpdateLerp(); @@ -340,14 +340,14 @@ EvtSource N(802424DC) = SCRIPT({ } }); -EvtSource N(802425BC) = SCRIPT({ +EvtScript N(802425BC) = SCRIPT({ spawn N(8024244C); spawn N(802424DC); }); extern const char N(flo_24_name_hack)[]; -EvtSource N(802425E4) = SCRIPT({ +EvtScript N(802425E4) = SCRIPT({ sleep 20; SetPlayerAnimation(ANIM_STAND_STILL); GetPlayerPos(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)); @@ -376,7 +376,7 @@ EvtSource N(802425E4) = SCRIPT({ sleep 100; }); -EvtSource N(802427EC) = SCRIPT({ +EvtScript N(802427EC) = SCRIPT({ DisablePlayerInput(TRUE); DisablePlayerPhysics(TRUE); SetPlayerPos(-100, -10, -172); @@ -418,7 +418,7 @@ EvtSource N(802427EC) = SCRIPT({ DisablePlayerInput(FALSE); }); -EvtSource N(80242AE8) = SCRIPT({ +EvtScript N(80242AE8) = SCRIPT({ if (EVT_STORY_PROGRESS < STORY_CH6_FILLED_SPRING_WITH_WATER) { EnableGroup(52, 0); EnableGroup(61, 0); @@ -551,7 +551,7 @@ NpcSettings N(npcSettings_80243220) = { const char N(flo_24_name_hack)[] = "flo_24"; -EvtSource N(8024324C) = SCRIPT({ +EvtScript N(8024324C) = SCRIPT({ DisablePlayerInput(TRUE); DisablePlayerPhysics(TRUE); SetNpcPos(NPC_LILY, 60, 0, 55); @@ -574,7 +574,7 @@ s32 N(itemList_80243394)[] = { ITEM_NONE, }; -EvtSource N(8024339C) = SCRIPT({ +EvtScript N(8024339C) = SCRIPT({ if (EVT_SAVE_FLAG(1376) == 1) { GetCurrentPartner(EVT_VAR(10)); if (EVT_VAR(10) != 0) { @@ -614,11 +614,11 @@ EvtSource N(8024339C) = SCRIPT({ } }); -EvtSource N(802435F8) = SCRIPT({ +EvtScript N(802435F8) = SCRIPT({ bind_padlock N(8024339C) TRIGGER_FLOOR_TOUCH 15 N(itemList_80243394); }); -EvtSource N(80243628) = SCRIPT({ +EvtScript N(80243628) = SCRIPT({ sleep 10; GetNpcPos(NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)); GetPlayerPos(EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)); @@ -648,7 +648,7 @@ EvtSource N(80243628) = SCRIPT({ } }); -EvtSource N(interact_802437C8) = SCRIPT({ +EvtScript N(interact_802437C8) = SCRIPT({ await N(802415C4); match EVT_STORY_PROGRESS { < STORY_CH6_GOT_MAGICAL_BEAN { @@ -734,7 +734,7 @@ EvtSource N(interact_802437C8) = SCRIPT({ await N(802415E8); }); -EvtSource N(init_80243D78) = SCRIPT({ +EvtScript N(init_80243D78) = SCRIPT({ BindNpcInteract(NPC_SELF, N(interact_802437C8)); match EVT_STORY_PROGRESS { < STORY_CH6_GOT_WATER_STONE { @@ -797,7 +797,7 @@ s32 N(D_80244070_CBD270) = { 0x00000000, }; -EvtSource N(80244074) = SCRIPT({ +EvtScript N(80244074) = SCRIPT({ }); diff --git a/src/world/area_flo/flo_10/CBA430.c b/src/world/area_flo/flo_10/CBA430.c index d16e3d40b0..d658658f46 100644 --- a/src/world/area_flo/flo_10/CBA430.c +++ b/src/world/area_flo/flo_10/CBA430.c @@ -32,7 +32,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(triggerCoord_80244A40) = { 137.0f, 0.0f, -283.0f, 0.0f }; -EvtSource N(80244A50) = { +EvtScript N(80244A50) = { EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_WALL_HAMMER, 9, 1, 0) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_POINT_BOMB, EVT_PTR(N(triggerCoord_80244A40)), 1, 0) diff --git a/src/world/area_flo/flo_10/flo_10.h b/src/world/area_flo/flo_10/flo_10.h index 2c17e73f1d..2bbd538a1a 100644 --- a/src/world/area_flo/flo_10/flo_10.h +++ b/src/world/area_flo/flo_10/flo_10.h @@ -15,10 +15,10 @@ ApiStatus N(func_80240040_CB9240)(Evt* script, s32 isInitialCall); extern s32 N(D_80244070_CBD270); extern s32** N(D_80241CB0_CBAEB0); extern NpcGroupList N(npcGroupList_80244054); -extern EvtSource N(802427EC); -extern EvtSource N(80242AE8); -extern EvtSource N(8024324C); -extern EvtSource N(802435F8); -extern EvtSource N(80244074); -extern EvtSource N(80244A50); -extern EvtSource N(main); +extern EvtScript N(802427EC); +extern EvtScript N(80242AE8); +extern EvtScript N(8024324C); +extern EvtScript N(802435F8); +extern EvtScript N(80244074); +extern EvtScript N(80244A50); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index a5cafc23a4..ddacfde3ae 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -26,7 +26,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_11_tattle }, }; -EvtSource N(802403E0) = { +EvtScript N(802403E0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -37,7 +37,7 @@ EvtSource N(802403E0) = { EVT_END }; -EvtSource N(80240450) = { +EvtScript N(80240450) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -78,7 +78,7 @@ EvtSource N(80240450) = { EVT_END }; -EvtSource N(802406FC) = { +EvtScript N(802406FC) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) @@ -134,7 +134,7 @@ EvtSource N(802406FC) = { EVT_END }; -EvtSource N(80240A50) = { +EvtScript N(80240A50) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(HidePlayerShadow, TRUE) @@ -197,7 +197,7 @@ EvtSource N(80240A50) = { EVT_END }; -EvtSource N(80240E40) = { +EvtScript N(80240E40) = { EVT_CALL(N(UnkFunc25)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -219,7 +219,7 @@ EvtSource N(80240E40) = { EVT_END }; -EvtSource N(80240F1C) = { +EvtScript N(80240F1C) = { EVT_CALL(N(SetPlayerStatusAnimFlags100000)) EVT_SET_GROUP(27) EVT_CALL(DisablePlayerPhysics, TRUE) @@ -253,7 +253,7 @@ EvtSource N(80240F1C) = { EVT_END }; -EvtSource N(802410F8) = { +EvtScript N(802410F8) = { EVT_CALL(IsPlayerOnValidFloor, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -315,11 +315,11 @@ EvtSource N(802410F8) = { EVT_END }; -EvtSource N(exitWalk_8024142C) = EXIT_WALK_SCRIPT(60, 0, "flo_23", 1); +EvtScript N(exitWalk_8024142C) = EXIT_WALK_SCRIPT(60, 0, "flo_23", 1); -EvtSource N(exitWalk_80241488) = EXIT_WALK_SCRIPT(60, 1, "flo_12", 0); +EvtScript N(exitWalk_80241488) = EXIT_WALK_SCRIPT(60, 1, "flo_12", 0); -EvtSource N(802414E4) = { +EvtScript N(802414E4) = { EVT_SET_GROUP(27) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 5) EVT_WAIT_FRAMES(100) @@ -327,7 +327,7 @@ EvtSource N(802414E4) = { EVT_END }; -EvtSource N(80241520) = { +EvtScript N(80241520) = { EVT_SET_GROUP(27) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 6) EVT_WAIT_FRAMES(100) @@ -335,7 +335,7 @@ EvtSource N(80241520) = { EVT_END }; -EvtSource N(8024155C) = { +EvtScript N(8024155C) = { EVT_SET_GROUP(27) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 7) EVT_WAIT_FRAMES(100) @@ -343,7 +343,7 @@ EvtSource N(8024155C) = { EVT_END }; -EvtSource N(80241598) = { +EvtScript N(80241598) = { EVT_SET_GROUP(27) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 2) EVT_WAIT_FRAMES(100) @@ -351,7 +351,7 @@ EvtSource N(80241598) = { EVT_END }; -EvtSource N(802415D4) = { +EvtScript N(802415D4) = { EVT_SET_GROUP(27) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 3) EVT_WAIT_FRAMES(100) @@ -359,7 +359,7 @@ EvtSource N(802415D4) = { EVT_END }; -EvtSource N(80241610) = { +EvtScript N(80241610) = { EVT_SET_GROUP(27) EVT_CALL(GotoMap, EVT_PTR("flo_11"), 4) EVT_WAIT_FRAMES(100) @@ -367,7 +367,7 @@ EvtSource N(80241610) = { EVT_END }; -EvtSource N(8024164C) = { +EvtScript N(8024164C) = { EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) EVT_SET(EVT_VAR(12), EVT_VAR(2)) @@ -376,7 +376,7 @@ EvtSource N(8024164C) = { EVT_END }; -EvtSource N(80241698) = { +EvtScript N(80241698) = { EVT_BIND_TRIGGER(N(exitWalk_80241488), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024142C), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_SET(EVT_VAR(0), 2) @@ -407,7 +407,7 @@ EvtSource N(80241698) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -496,7 +496,7 @@ s32 N(vectorList_80241C84)[] = { 0x42200000, 0x42C80000, 0x43AF0000, 0x42200000, }; -EvtSource N(80241CB4) = { +EvtScript N(80241CB4) = { EVT_LOOP(0) EVT_CALL(PlaySound, SOUND_295) EVT_WAIT_FRAMES(EVT_VAR(0)) @@ -505,7 +505,7 @@ EvtSource N(80241CB4) = { EVT_END }; -EvtSource N(80241CF4) = { +EvtScript N(80241CF4) = { EVT_SET(EVT_VAR(0), 5) EVT_EXEC_GET_TID(N(80241CB4), EVT_MAP_VAR(11)) EVT_THREAD @@ -533,7 +533,7 @@ EvtSource N(80241CF4) = { EVT_END }; -EvtSource N(80241E4C) = { +EvtScript N(80241E4C) = { EVT_THREAD EVT_CALL(LoadPath, 30, EVT_PTR(N(vectorList_80241BAC)), 4, 0) EVT_LOOP(0) @@ -559,7 +559,7 @@ EvtSource N(80241E4C) = { EVT_END }; -EvtSource N(80241F80) = { +EvtScript N(80241F80) = { EVT_SET(EVT_VAR(0), 4) EVT_EXEC_GET_TID(N(80241CB4), EVT_MAP_VAR(11)) EVT_THREAD @@ -586,7 +586,7 @@ EvtSource N(80241F80) = { EVT_END }; -EvtSource N(802420C8) = { +EvtScript N(802420C8) = { EVT_THREAD EVT_CALL(LoadPath, 40, EVT_PTR(N(vectorList_80241C54)), 4, 0) EVT_LOOP(0) @@ -615,7 +615,7 @@ EvtSource N(802420C8) = { EVT_END }; -EvtSource N(80242240) = { +EvtScript N(80242240) = { EVT_IF_EQ(EVT_SAVE_FLAG(1377), 1) EVT_RETURN EVT_END_IF @@ -697,7 +697,7 @@ EvtSource N(80242240) = { EVT_END }; -EvtSource N(idle_80242810) = { +EvtScript N(idle_80242810) = { EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) EVT_IF_NE(EVT_VAR(0), 0) @@ -713,7 +713,7 @@ EvtSource N(idle_80242810) = { EVT_END }; -EvtSource N(defeat_802428B8) = { +EvtScript N(defeat_802428B8) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -744,7 +744,7 @@ EvtSource N(defeat_802428B8) = { EVT_END }; -EvtSource N(defeat_80242AC4) = { +EvtScript N(defeat_80242AC4) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -760,7 +760,7 @@ EvtSource N(defeat_80242AC4) = { EVT_END }; -EvtSource N(init_80242B58) = { +EvtScript N(init_80242B58) = { EVT_CALL(SetNpcPos, 0, 0, -1000, 0) EVT_IF_EQ(EVT_SAVE_FLAG(1377), 0) EVT_IF_GE(EVT_SAVE_VAR(0), 45) @@ -777,7 +777,7 @@ EvtSource N(init_80242B58) = { EVT_END }; -EvtSource N(init_80242C38) = { +EvtScript N(init_80242C38) = { EVT_CALL(SetNpcPos, 1, 0, -1000, 0) EVT_IF_EQ(EVT_SAVE_FLAG(1377), 0) EVT_IF_GE(EVT_SAVE_VAR(0), 45) @@ -878,7 +878,7 @@ static s32 N(pad_30EC) = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA0E8, -220, 60, -75, 0, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1384)) EVT_RETURN diff --git a/src/world/area_flo/flo_11/flo_11.h b/src/world/area_flo/flo_11/flo_11.h index 5ae967f328..791206ed89 100644 --- a/src/world/area_flo/flo_11/flo_11.h +++ b/src/world/area_flo/flo_11/flo_11.h @@ -15,7 +15,7 @@ ApiStatus N(UnkFunc25)(Evt* script, s32 isInitialCall); ApiStatus N(func_802402E0_CBDFB0)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802430D4); -extern EvtSource N(80240F1C); -extern EvtSource N(80242240); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80240F1C); +extern EvtScript N(80242240); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index f4f72f9b9f..d75d957abe 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -22,7 +22,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_12_tattle }, }; -EvtSource N(80240750) = { +EvtScript N(80240750) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 1) EVT_CALL(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, 8) @@ -38,13 +38,13 @@ EvtSource N(80240750) = { EVT_END }; -EvtSource N(8024080C) = { +EvtScript N(8024080C) = { EVT_CALL(PushSong, 137, 3) EVT_RETURN EVT_END }; -EvtSource N(80240830) = { +EvtScript N(80240830) = { EVT_CALL(FadeOutMusic, 0, 250) EVT_WAIT_FRAMES(10) EVT_CALL(PopSong) @@ -56,7 +56,7 @@ static s32 N(pad_86C) = { 0x00000000, }; -EvtSource N(80240870) = { +EvtScript N(80240870) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -97,15 +97,15 @@ EvtSource N(80240870) = { EVT_END }; -EvtSource N(exitWalk_80240B1C) = EXIT_WALK_SCRIPT(60, 0, "flo_11", 1); +EvtScript N(exitWalk_80240B1C) = EXIT_WALK_SCRIPT(60, 0, "flo_11", 1); -EvtSource N(80240B78) = { +EvtScript N(80240B78) = { EVT_BIND_TRIGGER(N(exitWalk_80240B1C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -169,14 +169,14 @@ NpcSettings N(npcSettings_80240E5C) = { s32** N(D_802417EC_CC261C) = NULL; -EvtSource N(802417F0) = { +EvtScript N(802417F0) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 0) EVT_RETURN EVT_RETURN EVT_END }; -EvtSource N(80241820) = { +EvtScript N(80241820) = { EVT_CALL(ShowGotItem, EVT_VAR(0), 1, 16) EVT_RETURN EVT_RETURN @@ -191,7 +191,7 @@ s32 N(D_80241854_CC2684) = { 0x00000000, }; -EvtSource N(80241858) = { +EvtScript N(80241858) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowKeyChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -216,7 +216,7 @@ EvtSource N(80241858) = { EVT_END }; -EvtSource N(8024199C) = { +EvtScript N(8024199C) = { EVT_CALL(N(func_8024064C_CC147C), EVT_VAR(0)) EVT_BIND_PADLOCK(N(80241858), 0x10, 0, EVT_PTR(N(D_802429E0)), 0, 1) EVT_CALL(N(func_802405C0_CC13F0), EVT_VAR(0)) @@ -228,7 +228,7 @@ s32 N(D_802419EC_CC281C)[] = { 0x0000001E, 0x00000000, }; -EvtSource N(802419F4) = { +EvtScript N(802419F4) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(GetNpcPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -250,7 +250,7 @@ EvtSource N(802419F4) = { EVT_END }; -EvtSource N(80241B6C) = { +EvtScript N(80241B6C) = { EVT_WAIT_FRAMES(10) EVT_CALL(SetNpcFlagBits, 0, ((NPC_FLAG_100)), TRUE) EVT_CALL(PlayerMoveTo, -5, 20, 20) @@ -260,7 +260,7 @@ EvtSource N(80241B6C) = { EVT_END }; -EvtSource N(80241BE4) = { +EvtScript N(80241BE4) = { EVT_WAIT_FRAMES(10) EVT_CALL(SetNpcFlagBits, 0, ((NPC_FLAG_100)), TRUE) EVT_CALL(SetNpcFlagBits, 1, ((NPC_FLAG_100)), TRUE) @@ -272,7 +272,7 @@ EvtSource N(80241BE4) = { EVT_END }; -EvtSource N(interact_80241C8C) = { +EvtScript N(interact_80241C8C) = { EVT_EXEC_WAIT(N(8024080C)) EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(47) @@ -378,7 +378,7 @@ EvtSource N(interact_80241C8C) = { EVT_END }; -EvtSource N(init_802423D0) = { +EvtScript N(init_802423D0) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80241C8C))) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_ADD(EVT_VAR(0), 35) diff --git a/src/world/area_flo/flo_12/flo_12.h b/src/world/area_flo/flo_12/flo_12.h index 22999771f7..537d816eb3 100644 --- a/src/world/area_flo/flo_12/flo_12.h +++ b/src/world/area_flo/flo_12/flo_12.h @@ -14,5 +14,5 @@ ApiStatus N(func_80240614_CC1444)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024064C_CC147C)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802429B8); -extern EvtSource N(802419F4); -extern EvtSource N(main); +extern EvtScript N(802419F4); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 65db57fcef..775f80ba37 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -32,7 +32,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_13_tattle }, }; -EvtSource N(802436D0) = { +EvtScript N(802436D0) = { EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_LT(EVT_VAR(0), -500) EVT_GOTO(10) @@ -70,19 +70,19 @@ EvtSource N(802436D0) = { EVT_END }; -EvtSource N(802438B0) = { +EvtScript N(802438B0) = { EVT_EXEC(N(802436D0)) EVT_RETURN EVT_END }; -EvtSource N(802438CC) = { +EvtScript N(802438CC) = { EVT_CALL(SetMusicTrack, 0, SONG_NEW_PARTNER, 0, 8) EVT_RETURN EVT_END }; -EvtSource N(802438F8) = { +EvtScript N(802438F8) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_WAIT_FRAMES(15) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -94,13 +94,13 @@ static s32 N(pad_3944)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80243950) = { +EvtScript N(80243950) = { EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_MEGA_SMASH, -61, 60, -85, 17, EVT_SAVE_FLAG(1385)) EVT_CALL(MakeItemEntity, ITEM_SHOOTING_STAR, 128, 0, 157, 17, EVT_SAVE_FLAG(1386)) EVT_IF_EQ(EVT_SAVE_FLAG(1385), 0) @@ -117,7 +117,7 @@ static s32 N(pad_3A3C) = { 0x00000000, }; -EvtSource N(80243A40) = { +EvtScript N(80243A40) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -158,18 +158,18 @@ EvtSource N(80243A40) = { EVT_END }; -EvtSource N(exitWalk_80243CEC) = EXIT_WALK_SCRIPT(60, 0, "flo_14", 1); +EvtScript N(exitWalk_80243CEC) = EXIT_WALK_SCRIPT(60, 0, "flo_14", 1); -EvtSource N(exitWalk_80243D48) = EXIT_WALK_SCRIPT(60, 1, "flo_15", 0); +EvtScript N(exitWalk_80243D48) = EXIT_WALK_SCRIPT(60, 1, "flo_15", 0); -EvtSource N(80243DA4) = { +EvtScript N(80243DA4) = { EVT_BIND_TRIGGER(N(exitWalk_80243D48), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_80243CEC), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -249,7 +249,7 @@ NpcAISettings N(npcAISettings_80244144) = { .unk_2C = 1, }; -EvtSource N(npcAI_80244174) = { +EvtScript N(npcAI_80244174) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) @@ -281,7 +281,7 @@ NpcAISettings N(npcAISettings_80244210) = { .unk_2C = 3, }; -EvtSource N(npcAI_80244240) = { +EvtScript N(npcAI_80244240) = { EVT_CALL(SetSelfVar, 2, 3) EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) @@ -291,7 +291,7 @@ EvtSource N(npcAI_80244240) = { EVT_END }; -EvtSource N(802442B0) = { +EvtScript N(802442B0) = { EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -335,7 +335,7 @@ Vec3f N(vectorList_80244420)[] = { { -390.0, 300.0, 45.0 }, }; -EvtSource N(8024445C) = { +EvtScript N(8024445C) = { EVT_CALL(GetNpcPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_LABEL(0) EVT_CALL(GetNpcPos, 0, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) @@ -353,7 +353,7 @@ EvtSource N(8024445C) = { EVT_END }; -EvtSource N(80244560) = { +EvtScript N(80244560) = { EVT_CALL(GetNpcPos, 1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_LABEL(0) EVT_CALL(GetNpcPos, 1, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) @@ -375,7 +375,7 @@ EvtSource N(80244560) = { EVT_END }; -EvtSource N(802446AC) = { +EvtScript N(802446AC) = { EVT_SET(EVT_MAP_VAR(10), 0) EVT_LOOP(0) EVT_LOOP(2) @@ -407,7 +407,7 @@ EvtSource N(802446AC) = { EVT_END }; -EvtSource N(80244888) = { +EvtScript N(80244888) = { EVT_EXEC(N(802446AC)) EVT_CALL(SetNpcAnimation, 1, NPC_ANIM_lakilulu_Palette_00_Anim_C) EVT_CALL(GetNpcPos, 1, EVT_VAR(1), EVT_VAR(2), EVT_VAR(3)) @@ -465,7 +465,7 @@ EvtSource N(80244888) = { EVT_END }; -EvtSource N(idle_80244BF8) = { +EvtScript N(idle_80244BF8) = { EVT_IF_NE(EVT_SAVE_VAR(0), 50) EVT_RETURN EVT_END_IF @@ -529,7 +529,7 @@ EvtSource N(idle_80244BF8) = { EVT_END }; -EvtSource N(80245014) = { +EvtScript N(80245014) = { EVT_CALL(GetNpcPos, 1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(AwaitPlayerLeave, EVT_VAR(0), EVT_VAR(2), 120) EVT_CALL(DisablePlayerInput, TRUE) @@ -588,7 +588,7 @@ EvtSource N(80245014) = { EVT_END }; -EvtSource N(80245444) = { +EvtScript N(80245444) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(30) EVT_CALL(SpeakToPlayer, 0, NPC_ANIM_world_lakilester_Palette_00_Anim_A, NPC_ANIM_world_lakilester_Palette_00_Anim_4, 0, MESSAGE_ID(0x11, 0x00A2)) @@ -748,7 +748,7 @@ EvtSource N(80245444) = { EVT_END }; -EvtSource N(defeat_80246038) = { +EvtScript N(defeat_80246038) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -773,7 +773,7 @@ EvtSource N(defeat_80246038) = { EVT_END }; -EvtSource N(interact_802461C0) = { +EvtScript N(interact_802461C0) = { EVT_IF_LE(EVT_SAVE_VAR(0), 53) EVT_CALL(SpeakToPlayer, 1, NPC_ANIM_lakilulu_Palette_00_Anim_4, NPC_ANIM_lakilulu_Palette_00_Anim_1, 0, MESSAGE_ID(0x11, 0x0032)) EVT_ELSE @@ -788,7 +788,7 @@ EvtSource N(interact_802461C0) = { EVT_END }; -EvtSource N(init_80246280) = { +EvtScript N(init_80246280) = { EVT_IF_LT(EVT_SAVE_VAR(0), 51) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80244BF8))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80246038))) @@ -797,7 +797,7 @@ EvtSource N(init_80246280) = { EVT_END }; -EvtSource N(init_802462D0) = { +EvtScript N(init_802462D0) = { EVT_IF_LT(EVT_SAVE_VAR(0), 58) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802461C0))) EVT_CALL(SetNpcCollisionSize, -1, 36, 28) @@ -811,14 +811,14 @@ EvtSource N(init_802462D0) = { EVT_END }; -EvtSource N(init_80246370) = { +EvtScript N(init_80246370) = { EVT_CALL(SetNpcPos, 2, 0, -1000, 0) EVT_CALL(SetNpcAnimation, 2, NPC_ANIM_lakilulu_Palette_00_Anim_B) EVT_RETURN EVT_END }; -EvtSource N(init_802463B0) = { +EvtScript N(init_802463B0) = { EVT_IF_EQ(EVT_SAVE_VAR(0), 50) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -826,7 +826,7 @@ EvtSource N(init_802463B0) = { EVT_END }; -EvtSource N(init_802463E8) = { +EvtScript N(init_802463E8) = { EVT_IF_EQ(EVT_SAVE_VAR(0), 50) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF diff --git a/src/world/area_flo/flo_13/flo_13.h b/src/world/area_flo/flo_13/flo_13.h index 0b30897cdb..6faaef6695 100644 --- a/src/world/area_flo/flo_13/flo_13.h +++ b/src/world/area_flo/flo_13/flo_13.h @@ -16,4 +16,4 @@ ApiStatus N(func_802434D4_CC6CE4)(Evt* script, s32 isInitialCall); ApiStatus N(LoadPartyImage)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80247984); -extern EvtSource N(main); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index be78fe1456..ad8a404e1d 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -14,7 +14,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_14_tattle }, }; -EvtSource N(802423F0) = { +EvtScript N(802423F0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -25,7 +25,7 @@ EvtSource N(802423F0) = { EVT_END }; -EvtSource N(updateTexturePan_80242460) = { +EvtScript N(updateTexturePan_80242460) = { EVT_SET_GROUP(0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) @@ -42,11 +42,11 @@ EvtSource N(updateTexturePan_80242460) = { EVT_END }; -EvtSource N(exitWalk_802424FC) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 1); +EvtScript N(exitWalk_802424FC) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 1); -EvtSource N(exitWalk_80242558) = EXIT_WALK_SCRIPT(60, 1, "flo_13", 0); +EvtScript N(exitWalk_80242558) = EXIT_WALK_SCRIPT(60, 1, "flo_13", 0); -EvtSource N(802425B4) = { +EvtScript N(802425B4) = { EVT_BIND_TRIGGER(N(exitWalk_80242558), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_802424FC), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN @@ -62,7 +62,7 @@ s32 N(lavaResetList_802425FC)[] = { 0x00000023, 0xC2480000, 0x00000000, 0x42DC0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -149,7 +149,7 @@ static s32 N(pad_2BF4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80242C00) = { +EvtScript N(80242C00) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -190,7 +190,7 @@ EvtSource N(80242C00) = { EVT_END }; -EvtSource N(80242EAC) = { +EvtScript N(80242EAC) = { EVT_SET(EVT_VAR(9), EVT_VAR(6)) EVT_SET(EVT_VAR(8), EVT_VAR(5)) EVT_SET(EVT_VAR(7), EVT_VAR(4)) @@ -246,7 +246,7 @@ s32 N(D_802431CC_CCE4DC) = { 0x00000000, }; -EvtSource N(802431D0) = { +EvtScript N(802431D0) = { EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(MakeLerp, EVT_VAR(1), 48, 15, 0) EVT_LOOP(0) @@ -267,7 +267,7 @@ EvtSource N(802431D0) = { EVT_END }; -EvtSource N(802432E8) = { +EvtScript N(802432E8) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, ((NPC_FLAG_GRAVITY)), FALSE) EVT_LOOP(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -290,7 +290,7 @@ Vec3f N(vectorList_80243384)[] = { { -69.0, 75.0, 81.0 }, }; -EvtSource N(80243420) = { +EvtScript N(80243420) = { EVT_WAIT_FRAMES(20) EVT_CALL(PlaySound, 0x80000023) EVT_CALL(LoadPath, 165, EVT_PTR(N(vectorList_80243384)), 13, 10) @@ -310,7 +310,7 @@ EvtSource N(80243420) = { EVT_END }; -EvtSource N(8024352C) = { +EvtScript N(8024352C) = { EVT_CALL(IsPlayerWithin, 531, 81, 30, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -365,7 +365,7 @@ EvtSource N(8024352C) = { EVT_END }; -EvtSource N(80243870) = { +EvtScript N(80243870) = { EVT_CALL(PlaySoundAt, 0x193, 0, 591, 55, 121) EVT_CALL(EnableModel, 123, 1) EVT_SETF(EVT_VAR(2), EVT_FIXED(1.0)) @@ -416,7 +416,7 @@ s32 N(D_80243B18_CCEE28) = { 0x0000005A, }; -EvtSource N(80243B1C) = { +EvtScript N(80243B1C) = { EVT_SET_GROUP(0) EVT_SET(EVT_VAR(15), EVT_VAR(0)) EVT_LABEL(0) @@ -476,7 +476,7 @@ EvtSource N(80243B1C) = { }; -EvtSource N(80243E78) = { +EvtScript N(80243E78) = { EVT_CALL(ModifyColliderFlags, 3, 31, 0x00000006) EVT_CALL(ModifyColliderFlags, 3, 32, 0x00000006) EVT_CALL(ModifyColliderFlags, 3, 33, 0x00000006) diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 005f447279..e176350d26 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -29,7 +29,7 @@ NpcAISettings N(npcAISettings_802444D8) = { .unk_2C = 1, }; -EvtSource N(npcAI_80244508) = { +EvtScript N(npcAI_80244508) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -630) EVT_CALL(SetSelfVar, 6, 50) @@ -68,7 +68,7 @@ s32 N(D_80244600_CCF910) = { 0x00000000, }; -EvtSource N(80244604) = { +EvtScript N(80244604) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowConsumableChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -92,7 +92,7 @@ EvtSource N(80244604) = { EVT_END }; -EvtSource N(80244738) = { +EvtScript N(80244738) = { EVT_CALL(N(func_802422C0_CCD5D0), EVT_VAR(0)) EVT_BIND_PADLOCK(N(80244604), 0x10, 0, EVT_PTR(N(D_802453B0_EF79C0)), 0, 1) EVT_CALL(N(func_80242234_CCD544), EVT_VAR(0)) @@ -105,7 +105,7 @@ s32 N(D_80244788_CCFA98)[] = { 0x000000A1, 0x00000000, }; -EvtSource N(interact_80244790) = { +EvtScript N(interact_80244790) = { EVT_IF_EQ(EVT_AREA_FLAG(37), 1) EVT_SET(EVT_AREA_FLAG(35), 1) EVT_CALL(SpeakToPlayer, NPC_SELF, -1, -1, 0, MESSAGE_ID(0x11, 0x0063)) @@ -157,7 +157,7 @@ EvtSource N(interact_80244790) = { EVT_END }; -EvtSource N(init_80244ADC) = { +EvtScript N(init_80244ADC) = { EVT_SET(EVT_AREA_FLAG(36), 0) EVT_SET(EVT_AREA_FLAG(37), 0) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80244790))) @@ -244,7 +244,7 @@ static s32 N(pad_4F24)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80244F30) = { +EvtScript N(80244F30) = { EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 675, 60, -100, 17, EVT_SAVE_FLAG(1387)) EVT_RETURN EVT_END @@ -254,7 +254,7 @@ static s32 N(pad_4F64)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80244F70) = { +EvtScript N(80244F70) = { EVT_LOOP(0) EVT_CALL(N(func_80242360_CCD670), EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), EVT_VAR(4)) @@ -304,7 +304,7 @@ EvtSource N(80244F70) = { EVT_END }; -EvtSource N(80245224) = { +EvtScript N(80245224) = { EVT_SET(EVT_VAR(4), 21) EVT_SET(EVT_VAR(5), 21) EVT_SET(EVT_VAR(6), 20) diff --git a/src/world/area_flo/flo_14/flo_14.h b/src/world/area_flo/flo_14/flo_14.h index 425b40477d..65a5981155 100644 --- a/src/world/area_flo/flo_14/flo_14.h +++ b/src/world/area_flo/flo_14/flo_14.h @@ -23,10 +23,10 @@ ApiStatus N(func_80242288_CCD598)(Evt* script, s32 isInitialCall); ApiStatus N(func_802422C0_CCD5D0)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80244F00); -extern EvtSource N(80243E78); -extern EvtSource N(8024352C); -extern EvtSource N(80243870); -extern EvtSource N(80244F30); -extern EvtSource N(80245224); -extern EvtSource N(d_80242360); -extern EvtSource N(main); +extern EvtScript N(80243E78); +extern EvtScript N(8024352C); +extern EvtScript N(80243870); +extern EvtScript N(80244F30); +extern EvtScript N(80245224); +extern EvtScript N(d_80242360); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_15/CD06C0.c b/src/world/area_flo/flo_15/CD06C0.c index bf6e7c5ba3..dbeb65dd87 100644 --- a/src/world/area_flo/flo_15/CD06C0.c +++ b/src/world/area_flo/flo_15/CD06C0.c @@ -20,7 +20,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_15_tattle }, }; -EvtSource N(80240060) = { +EvtScript N(80240060) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 1) EVT_CALL(SetMusicTrack, 0, SONG_SUNSHINE_RETURNS, 0, 8) @@ -40,15 +40,15 @@ static s32 N(pad_11C) = { 0x00000000, }; -EvtSource N(exitWalk_80240120) = EXIT_WALK_SCRIPT(60, 0, "flo_13", 1); +EvtScript N(exitWalk_80240120) = EXIT_WALK_SCRIPT(60, 0, "flo_13", 1); -EvtSource N(8024017C) = { +EvtScript N(8024017C) = { EVT_BIND_TRIGGER(N(exitWalk_80240120), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -82,7 +82,7 @@ NpcSettings N(npcSettings_80240300) = { .level = 99, }; -EvtSource N(8024032C) = { +EvtScript N(8024032C) = { EVT_IF_LT(EVT_SAVE_VAR(0), 53) EVT_SET(EVT_VAR(3), 7) EVT_SET(EVT_VAR(4), 5) @@ -112,7 +112,7 @@ EvtSource N(8024032C) = { EVT_END }; -EvtSource N(802404D8) = { +EvtScript N(802404D8) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetNpcPos, 10, 0, 270, 0) @@ -150,7 +150,7 @@ EvtSource N(802404D8) = { EVT_END }; -EvtSource N(aux_8024079C) = { +EvtScript N(aux_8024079C) = { EVT_CALL(func_802CDE68, 11, 48) EVT_LOOP(0) EVT_CALL(MakeLerp, -30, 30, 20, 11) @@ -180,7 +180,7 @@ EvtSource N(aux_8024079C) = { EVT_END }; -EvtSource N(8024094C) = { +EvtScript N(8024094C) = { EVT_LOOP(0) EVT_WAIT_FRAMES(1) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -215,7 +215,7 @@ EvtSource N(8024094C) = { EVT_END }; -EvtSource N(interact_80240B28) = { +EvtScript N(interact_80240B28) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(50) EVT_CALL(SpeakToPlayer, 10, NPC_ANIM_sun_Palette_00_Anim_7, NPC_ANIM_sun_Palette_00_Anim_1, 517, MESSAGE_ID(0x11, 0x009A)) @@ -243,7 +243,7 @@ EvtSource N(interact_80240B28) = { EVT_END }; -EvtSource N(init_80240CD0) = { +EvtScript N(init_80240CD0) = { EVT_CALL(SetNpcCollisionSize, 10, 64, 40) EVT_CALL(EnableNpcShadow, 10, FALSE) EVT_IF_LT(EVT_SAVE_VAR(0), 53) @@ -260,7 +260,7 @@ EvtSource N(init_80240CD0) = { EVT_END }; -EvtSource N(init_80240DB4) = { +EvtScript N(init_80240DB4) = { EVT_CALL(EnableNpcShadow, 11, FALSE) EVT_CALL(SetNpcAnimation, 11, NPC_ANIM_sun_Palette_00_Anim_2) EVT_CALL(SetNpcPaletteSwapMode, 10, 3) @@ -349,13 +349,13 @@ static s32 N(pad_12D8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(802412E0) = { +EvtScript N(802412E0) = { EVT_SET(EVT_SAVE_FLAG(1401), 1) EVT_RETURN EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1401), 0) EVT_CALL(MakeEntity, 0x802BCF00, -180, 0, -18, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(802412E0))) @@ -374,7 +374,7 @@ s32 N(intTable_80241360)[] = { 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, }; -EvtSource N(802413B0) = { +EvtScript N(802413B0) = { EVT_IF_EQ(EVT_SAVE_FLAG(1401), 0) EVT_LABEL(0) EVT_IF_EQ(EVT_SAVE_FLAG(1401), 0) diff --git a/src/world/area_flo/flo_15/flo_15.h b/src/world/area_flo/flo_15/flo_15.h index d5f7a55910..b5e2b8b963 100644 --- a/src/world/area_flo/flo_15/flo_15.h +++ b/src/world/area_flo/flo_15/flo_15.h @@ -7,7 +7,7 @@ #define NAMESPACE flo_15 extern NpcGroupList N(npcGroupList_802412C0); -extern EvtSource N(802404D8); -extern EvtSource N(802413B0); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(802404D8); +extern EvtScript N(802413B0); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 88d43d9e24..7d1d1b4638 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -18,7 +18,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_16_tattle }, }; -EvtSource N(802429D0) = { +EvtScript N(802429D0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -29,11 +29,11 @@ EvtSource N(802429D0) = { EVT_END }; -EvtSource N(exitWalk_80242A40) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 4); +EvtScript N(exitWalk_80242A40) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 4); -EvtSource N(exitWalk_80242A9C) = EXIT_WALK_SCRIPT(60, 1, "flo_17", 0); +EvtScript N(exitWalk_80242A9C) = EXIT_WALK_SCRIPT(60, 1, "flo_17", 0); -EvtSource N(80242AF8) = { +EvtScript N(80242AF8) = { EVT_BIND_TRIGGER(N(exitWalk_80242A40), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_80242A9C), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN @@ -45,7 +45,7 @@ s32 N(lavaResetList_80242B40)[] = { 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -98,7 +98,7 @@ EvtSource N(main) = { EVT_END }; -EvtSource N(80242EA0) = { +EvtScript N(80242EA0) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -139,7 +139,7 @@ EvtSource N(80242EA0) = { EVT_END }; -EvtSource N(8024314C) = { +EvtScript N(8024314C) = { EVT_SET(EVT_VAR(9), EVT_VAR(6)) EVT_SET(EVT_VAR(8), EVT_VAR(5)) EVT_SET(EVT_VAR(7), EVT_VAR(4)) @@ -191,7 +191,7 @@ EvtSource N(8024314C) = { EVT_END }; -EvtSource N(8024346C) = { +EvtScript N(8024346C) = { EVT_CALL(ModifyColliderFlags, 3, 20, 0x00000006) EVT_SET(EVT_VAR(0), -740) EVT_SET(EVT_VAR(1), -140) @@ -261,7 +261,7 @@ f32 N(D_80243758_CD5588)[] = { 140.0f, 180.0f, 220.0f, }; -EvtSource N(80243764) = { +EvtScript N(80243764) = { EVT_WAIT_FRAMES(10) EVT_CALL(PlaySound, 0x212D) EVT_CALL(N(UnkFunc21), EVT_MAP_VAR(0)) @@ -293,7 +293,7 @@ EvtSource N(80243764) = { EVT_END }; -EvtSource N(802438C8) = { +EvtScript N(802438C8) = { EVT_IF_EQ(EVT_SAVE_FLAG(1403), 1) EVT_RETURN EVT_END_IF @@ -377,7 +377,7 @@ EvtSource N(802438C8) = { EVT_END }; -EvtSource N(80243D48) = { +EvtScript N(80243D48) = { EVT_LABEL(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(SetCamTarget, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -387,7 +387,7 @@ EvtSource N(80243D48) = { EVT_END }; -EvtSource N(80243DB0) = { +EvtScript N(80243DB0) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerActionState, 6) @@ -403,7 +403,7 @@ EvtSource N(80243DB0) = { EVT_END }; -EvtSource N(80243E80) = { +EvtScript N(80243E80) = { EVT_IF_EQ(EVT_AREA_FLAG(39), 0) EVT_CALL(N(UnkFunc44)) EVT_IF_EQ(EVT_VAR(0), 0) @@ -420,7 +420,7 @@ EvtSource N(80243E80) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_SET(EVT_AREA_FLAG(39), 0) EVT_BIND_TRIGGER(N(80243E80), TRIGGER_FLOOR_TOUCH, 20, 1, 0) EVT_CALL(MakeEntity, 0x802EA910, 350, 240, -100, 0, MAKE_ENTITY_END) diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index c0326a1d15..8363c92699 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -26,7 +26,7 @@ NpcAISettings N(npcAISettings_80244028) = { .unk_2C = 1, }; -EvtSource N(npcAI_80244058) = { +EvtScript N(npcAI_80244058) = { EVT_CALL(SetSelfVar, 0, 1) EVT_CALL(SetSelfVar, 5, 0) EVT_CALL(SetSelfVar, 6, 0) @@ -127,7 +127,7 @@ static s32 N(pad_44F8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80244500) = { +EvtScript N(80244500) = { EVT_CALL(N(func_80242940_CD4770)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -190,7 +190,7 @@ EvtSource N(80244500) = { EVT_END }; -EvtSource N(802448FC) = { +EvtScript N(802448FC) = { EVT_CALL(N(func_80242940_CD4770)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -261,7 +261,7 @@ EvtSource N(802448FC) = { EVT_END }; -EvtSource N(80244DC8) = { +EvtScript N(80244DC8) = { EVT_CALL(N(func_80242940_CD4770)) EVT_IF_EQ(EVT_VAR(0), 0) EVT_RETURN @@ -324,7 +324,7 @@ EvtSource N(80244DC8) = { EVT_END }; -EvtSource N(802451C4) = { +EvtScript N(802451C4) = { EVT_SET(EVT_AREA_FLAG(41), 0) EVT_SET(EVT_AREA_FLAG(42), 0) EVT_SET(EVT_AREA_FLAG(43), 0) diff --git a/src/world/area_flo/flo_16/flo_16.h b/src/world/area_flo/flo_16/flo_16.h index a8356abdc5..57f699f38a 100644 --- a/src/world/area_flo/flo_16/flo_16.h +++ b/src/world/area_flo/flo_16/flo_16.h @@ -30,8 +30,8 @@ ApiStatus N(func_80242754_CD4584)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242940_CD4770)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802444D4); -extern EvtSource N(8024346C); -extern EvtSource N(802451C4); -extern EvtSource N(main); -extern EvtSource N(makeEntities); -extern EvtSource N(unkFunc23); +extern EvtScript N(8024346C); +extern EvtScript N(802451C4); +extern EvtScript N(main); +extern EvtScript N(makeEntities); +extern EvtScript N(unkFunc23); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 812dc1acd7..6930f21dc7 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -25,7 +25,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_17_tattle }, }; -EvtSource N(80243280) = { +EvtScript N(80243280) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -36,7 +36,7 @@ EvtSource N(80243280) = { EVT_END }; -EvtSource N(802432F0) = { +EvtScript N(802432F0) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -77,11 +77,11 @@ EvtSource N(802432F0) = { EVT_END }; -EvtSource N(exitWalk_8024359C) = EXIT_WALK_SCRIPT(60, 0, "flo_16", 1); +EvtScript N(exitWalk_8024359C) = EXIT_WALK_SCRIPT(60, 0, "flo_16", 1); -EvtSource N(exitWalk_802435F8) = EXIT_WALK_SCRIPT(60, 1, "flo_18", 0); +EvtScript N(exitWalk_802435F8) = EXIT_WALK_SCRIPT(60, 1, "flo_18", 0); -EvtSource N(80243654) = { +EvtScript N(80243654) = { EVT_BIND_TRIGGER(N(exitWalk_8024359C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_802435F8), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN @@ -101,7 +101,7 @@ s32 N(lavaResetList_8024369C)[] = { 0x00000020, 0x44034000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -225,7 +225,7 @@ static s32 N(pad_3FCC) = { 0x00000000, }; -EvtSource N(80243FD0) = { +EvtScript N(80243FD0) = { EVT_LOOP(0) EVT_CALL(N(func_80240040_CD7320), EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), EVT_VAR(4)) @@ -275,7 +275,7 @@ EvtSource N(80243FD0) = { EVT_END }; -EvtSource N(80244284) = { +EvtScript N(80244284) = { EVT_SET(EVT_VAR(4), 35) EVT_SET(EVT_VAR(5), 14) EVT_SET(EVT_VAR(6), 15) @@ -329,7 +329,7 @@ NpcAISettings N(npcAISettings_80244424) = { .unk_2C = 1, }; -EvtSource N(npcAI_80244454) = { +EvtScript N(npcAI_80244454) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) @@ -361,7 +361,7 @@ NpcAISettings N(npcAISettings_802444F0) = { .unk_2C = 3, }; -EvtSource N(npcAI_80244520) = { +EvtScript N(npcAI_80244520) = { EVT_CALL(SetSelfVar, 2, 3) EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) @@ -371,7 +371,7 @@ EvtSource N(npcAI_80244520) = { EVT_END }; -EvtSource N(80244590) = { +EvtScript N(80244590) = { EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) @@ -617,7 +617,7 @@ static s32 N(pad_527C) = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA588, 660, 60, -115, 0, 130, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1390)) EVT_CALL(MakeItemEntity, ITEM_LETTER09, -245, 0, 105, 17, EVT_SAVE_FLAG(1389)) diff --git a/src/world/area_flo/flo_17/flo_17.h b/src/world/area_flo/flo_17/flo_17.h index 9c7385aab3..04b3505974 100644 --- a/src/world/area_flo/flo_17/flo_17.h +++ b/src/world/area_flo/flo_17/flo_17.h @@ -12,6 +12,6 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240040_CD7320)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80245228); -extern EvtSource N(80244284); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80244284); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index b07f4e984e..eec8da6082 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -26,7 +26,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_18_tattle }, }; -EvtSource N(80240830) = { +EvtScript N(80240830) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_PUFF_PUFF_MACHINE, 0, 8) @@ -42,7 +42,7 @@ static s32 N(pad_8B8)[] = { 0x00000000, 0x00000000, }; -EvtSource N(updateTexturePan_802408C0) = { +EvtScript N(updateTexturePan_802408C0) = { EVT_SET_GROUP(0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) @@ -59,9 +59,9 @@ EvtSource N(updateTexturePan_802408C0) = { EVT_END }; -EvtSource N(exitWalk_8024095C) = EXIT_WALK_SCRIPT(60, 0, "flo_17", 1); +EvtScript N(exitWalk_8024095C) = EXIT_WALK_SCRIPT(60, 0, "flo_17", 1); -EvtSource N(802409B8) = { +EvtScript N(802409B8) = { EVT_BIND_TRIGGER(N(exitWalk_8024095C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_RETURN EVT_END @@ -72,7 +72,7 @@ s32 N(lavaResetList_802409E4)[] = { 0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -151,7 +151,7 @@ static s32 N(pad_E88)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80240E90) = { +EvtScript N(80240E90) = { EVT_SET_GROUP(11) EVT_LOOP(0) EVT_CALL(PlayEffect, 0x5E, 0, EVT_FIXED(-16.0), EVT_FIXED(102.0), EVT_FIXED(-4.1), EVT_FIXED(80.9), EVT_FIXED(102.0), EVT_FIXED(-4.1), EVT_FIXED(0.5), 6, 0, 0, 0, 0) @@ -179,7 +179,7 @@ EvtSource N(80240E90) = { EVT_END }; -EvtSource N(80241094) = { +EvtScript N(80241094) = { EVT_CALL(EnableModel, EVT_VAR(15), 1) EVT_SET(EVT_VAR(14), 159) EVT_LOOP(EVT_VAR(14)) @@ -209,7 +209,7 @@ EvtSource N(80241094) = { EVT_END }; -EvtSource N(80241284) = { +EvtScript N(80241284) = { EVT_SET(EVT_VAR(14), 0) EVT_LABEL(0) EVT_IF_GE(EVT_SAVE_VAR(253), 3) @@ -238,7 +238,7 @@ EvtSource N(80241284) = { EVT_END }; -EvtSource N(802413F0) = { +EvtScript N(802413F0) = { EVT_IF_EQ(EVT_MAP_FLAG(2), 1) EVT_RETURN EVT_END_IF @@ -373,7 +373,7 @@ EvtSource N(802413F0) = { }; #ifdef NON_EQUIVALENT -EvtSource N(80241ED4) = { +EvtScript N(80241ED4) = { EVT_SETF(EVT_VAR(0), 0) EVT_SETF(EVT_VAR(1), 0) EVT_SETF(EVT_VAR(2), 0) @@ -416,7 +416,7 @@ EVT_RETURN EVT_END }; #else -EvtSource N(80241ED4) = { +EvtScript N(80241ED4) = { EVT_CMD(EVT_OP_SETF, EVT_VAR(0), 0), EVT_CMD(EVT_OP_SETF, EVT_VAR(1), 0), EVT_CMD(EVT_OP_SETF, EVT_VAR(2), 0), @@ -460,7 +460,7 @@ EVT_CMD(EVT_OP_END) }; #endif -EvtSource N(80242174) = { +EvtScript N(80242174) = { EVT_SETF(EVT_VAR(0), 0) EVT_SETF(EVT_VAR(1), 0) EVT_SETF(EVT_VAR(2), 0) @@ -508,7 +508,7 @@ EvtSource N(80242174) = { EVT_END }; -EvtSource N(80242474) = { +EvtScript N(80242474) = { EVT_SETF(EVT_VAR(2), 0) EVT_SETF(EVT_VAR(1), 0) EVT_SETF(EVT_VAR(0), 0) @@ -539,7 +539,7 @@ EvtSource N(80242474) = { EVT_END }; -EvtSource N(80242620) = { +EvtScript N(80242620) = { EVT_SETF(EVT_VAR(2), 0) EVT_SETF(EVT_VAR(1), 0) EVT_SETF(EVT_VAR(0), 0) @@ -582,7 +582,7 @@ EvtSource N(80242620) = { }; #ifdef NON_EQUIVALENT -EvtSource N(80242910) = { +EvtScript N(80242910) = { EVT_SETF(EVT_VAR(0), 0) EVT_SETF(EVT_VAR(1), 0) EVT_SETF(EVT_VAR(2), 0) @@ -619,7 +619,7 @@ EVT_RETURN EVT_END }; #else -EvtSource N(80242910) = { +EvtScript N(80242910) = { EVT_CMD(EVT_OP_SETF, EVT_VAR(0), 0), EVT_CMD(EVT_OP_SETF, EVT_VAR(1), 0), EVT_CMD(EVT_OP_SETF, EVT_VAR(2), 0), @@ -657,7 +657,7 @@ EVT_CMD(EVT_OP_END) }; #endif -EvtSource N(80242B18) = { +EvtScript N(80242B18) = { EVT_CALL(ModifyColliderFlags, 0, 18, 0x7FFFFE00) EVT_SETF(EVT_VAR(0), 0) EVT_SETF(EVT_VAR(1), 0) @@ -707,7 +707,7 @@ s32 N(intTable_80242DC8)[] = { 0x00000000, 0x0000001B, 0x00000055, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, }; -EvtSource N(80242E28) = { +EvtScript N(80242E28) = { EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_IF_LT(EVT_VAR(0), -210) @@ -835,7 +835,7 @@ Vec4f N(triggerCoord_8024369C) = { 50.0f, 0.0f, -10.0, 0.0f }; Vec4f N(triggerCoord_802436AC) = { 105.0f, 0.0f, -10.0, 0.0f }; -EvtSource N(802436BC) = { +EvtScript N(802436BC) = { EVT_IF_GE(EVT_SAVE_VAR(0), 53) EVT_CALL(EnableModel, 49, 0) EVT_CALL(ModifyColliderFlags, 0, 19, 0x7FFFFE00) @@ -998,7 +998,7 @@ Vec3f N(vectorList_8024401C)[] = { { -280.0, 315.0, 30.0 }, }; -EvtSource N(80244058) = { +EvtScript N(80244058) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerPos, 30, 0, 50) @@ -1031,7 +1031,7 @@ EvtSource N(80244058) = { EVT_END }; -EvtSource N(80244270) = { +EvtScript N(80244270) = { EVT_THREAD EVT_CALL(PlaySoundAtNpc, 4, 0x19E, 0) EVT_CALL(SetNpcFlagBits, 4, ((NPC_FLAG_100)), TRUE) @@ -1090,7 +1090,7 @@ EvtSource N(80244270) = { EVT_END }; -EvtSource N(802445D4) = { +EvtScript N(802445D4) = { EVT_WAIT_FRAMES(5) EVT_CALL(IsPlayerWithin, 40, 0, 200, EVT_VAR(0)) EVT_IF_EQ(EVT_VAR(0), 0) @@ -1120,7 +1120,7 @@ EvtSource N(802445D4) = { EVT_END }; -EvtSource N(80244774) = { +EvtScript N(80244774) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -1175,7 +1175,7 @@ EvtSource N(80244774) = { EVT_END }; -EvtSource N(idle_80244B3C) = { +EvtScript N(idle_80244B3C) = { EVT_LOOP(0) EVT_CALL(GetSelfVar, 0, EVT_VAR(0)) EVT_IF_NE(EVT_VAR(0), 0) @@ -1198,7 +1198,7 @@ EvtSource N(idle_80244B3C) = { EVT_END }; -EvtSource N(defeat_80244C84) = { +EvtScript N(defeat_80244C84) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -1225,7 +1225,7 @@ EvtSource N(defeat_80244C84) = { EVT_END }; -EvtSource N(80244E2C) = { +EvtScript N(80244E2C) = { EVT_SWITCH(EVT_MAP_VAR(10)) EVT_CASE_EQ(0) EVT_CALL(NpcFacePlayer, 3, 1) @@ -1240,7 +1240,7 @@ EvtSource N(80244E2C) = { EVT_END }; -EvtSource N(80244ED0) = { +EvtScript N(80244ED0) = { EVT_SWITCH(EVT_MAP_VAR(10)) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, 3, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 16, MESSAGE_ID(0x11, 0x00B9)) @@ -1259,7 +1259,7 @@ EvtSource N(80244ED0) = { EVT_END }; -EvtSource N(80245004) = { +EvtScript N(80245004) = { EVT_SWITCH(EVT_MAP_VAR(10)) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, 3, NPC_ANIM_magikoopa_Palette_02_Anim_2, NPC_ANIM_magikoopa_Palette_02_Anim_1, 16, MESSAGE_ID(0x11, 0x00BA)) @@ -1277,7 +1277,7 @@ EvtSource N(80245004) = { EVT_END }; -EvtSource N(80245108) = { +EvtScript N(80245108) = { EVT_IF_GE(EVT_SAVE_VAR(0), 52) EVT_RETURN EVT_END_IF @@ -1300,7 +1300,7 @@ EvtSource N(80245108) = { EVT_END }; -EvtSource N(80245228) = { +EvtScript N(80245228) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 0) EVT_EXEC_WAIT(N(80245108)) @@ -1310,7 +1310,7 @@ EvtSource N(80245228) = { EVT_END }; -EvtSource N(8024527C) = { +EvtScript N(8024527C) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 1) EVT_EXEC_WAIT(N(80245108)) @@ -1320,7 +1320,7 @@ EvtSource N(8024527C) = { EVT_END }; -EvtSource N(802452D0) = { +EvtScript N(802452D0) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 2) EVT_EXEC_WAIT(N(80245108)) @@ -1330,7 +1330,7 @@ EvtSource N(802452D0) = { EVT_END }; -EvtSource N(80245324) = { +EvtScript N(80245324) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 3) EVT_EXEC_WAIT(N(80245108)) @@ -1340,7 +1340,7 @@ EvtSource N(80245324) = { EVT_END }; -EvtSource N(80245378) = { +EvtScript N(80245378) = { EVT_IF_GE(EVT_SAVE_VAR(0), 52) EVT_RETURN EVT_END_IF @@ -1365,7 +1365,7 @@ EvtSource N(80245378) = { EVT_END }; -EvtSource N(802454D4) = { +EvtScript N(802454D4) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 0) EVT_CALL(GetNpcPos, 3, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -1376,7 +1376,7 @@ EvtSource N(802454D4) = { EVT_END }; -EvtSource N(80245544) = { +EvtScript N(80245544) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 1) EVT_CALL(GetNpcPos, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -1387,7 +1387,7 @@ EvtSource N(80245544) = { EVT_END }; -EvtSource N(802455B4) = { +EvtScript N(802455B4) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 2) EVT_CALL(GetNpcPos, 1, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -1398,7 +1398,7 @@ EvtSource N(802455B4) = { EVT_END }; -EvtSource N(80245624) = { +EvtScript N(80245624) = { EVT_IF_EQ(EVT_MAP_VAR(10), -1) EVT_SET(EVT_MAP_VAR(10), 3) EVT_CALL(GetNpcPos, 2, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -1417,7 +1417,7 @@ Vec4f N(triggerCoord_802456B4) = { 50.0f, 0.0f, -10.0, 0.0f }; Vec4f N(triggerCoord_802456C4) = { 105.0f, 0.0f, -10.0, 0.0f }; -EvtSource N(802456D4) = { +EvtScript N(802456D4) = { EVT_SET(EVT_MAP_VAR(10), -1) EVT_BIND_TRIGGER(N(80245228), TRIGGER_WALL_HAMMER, 23, 1, 0) EVT_BIND_TRIGGER(N(80245228), TRIGGER_WALL_HAMMER, 19, 1, 0) @@ -1431,7 +1431,7 @@ EvtSource N(802456D4) = { EVT_END }; -EvtSource N(interact_802457D4) = { +EvtScript N(interact_802457D4) = { EVT_SWITCH(EVT_AREA_VAR(6)) EVT_CASE_EQ(0) EVT_CALL(GetSelfNpcID, EVT_VAR(0)) @@ -1475,7 +1475,7 @@ EvtSource N(interact_802457D4) = { EVT_END }; -EvtSource N(init_80245AA8) = { +EvtScript N(init_80245AA8) = { EVT_IF_LT(EVT_SAVE_VAR(0), 52) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80244B3C))) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802457D4))) @@ -1487,7 +1487,7 @@ EvtSource N(init_80245AA8) = { EVT_END }; -EvtSource N(init_80245B30) = { +EvtScript N(init_80245B30) = { EVT_IF_LT(EVT_SAVE_VAR(0), 52) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80244C84))) EVT_ELSE @@ -1497,7 +1497,7 @@ EvtSource N(init_80245B30) = { EVT_END }; -EvtSource N(init_80245B90) = { +EvtScript N(init_80245B90) = { EVT_IF_LT(EVT_SAVE_VAR(0), 52) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802457D4))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80244C84))) @@ -1508,7 +1508,7 @@ EvtSource N(init_80245B90) = { EVT_END }; -EvtSource N(init_80245C04) = { +EvtScript N(init_80245C04) = { EVT_IF_LT(EVT_SAVE_VAR(0), 52) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802457D4))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80244C84))) @@ -1519,7 +1519,7 @@ EvtSource N(init_80245C04) = { EVT_END }; -EvtSource N(init_80245C78) = { +EvtScript N(init_80245C78) = { EVT_IF_LT(EVT_SAVE_VAR(0), 52) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_802457D4))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80244C84))) diff --git a/src/world/area_flo/flo_18/CDCC30.c b/src/world/area_flo/flo_18/CDCC30.c index 87c79f8c00..3f35c35c71 100644 --- a/src/world/area_flo/flo_18/CDCC30.c +++ b/src/world/area_flo/flo_18/CDCC30.c @@ -2,7 +2,7 @@ #include "common/foliage.inc.c" -EvtSource N(80247024) = { +EvtScript N(80247024) = { EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_18/flo_18.h b/src/world/area_flo/flo_18/flo_18.h index 8d6f2bc678..7b2b17fe96 100644 --- a/src/world/area_flo/flo_18/flo_18.h +++ b/src/world/area_flo/flo_18/flo_18.h @@ -14,9 +14,9 @@ ApiStatus N(func_8024030C_CDC9AC)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240340_CDC9E0)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024669C); -extern EvtSource N(802436BC); -extern EvtSource N(80244058); -extern EvtSource N(802456D4); -extern EvtSource N(80247024); -extern EvtSource N(main); -extern EvtSource N(unkFloatFunc); +extern EvtScript N(802436BC); +extern EvtScript N(80244058); +extern EvtScript N(802456D4); +extern EvtScript N(80247024); +extern EvtScript N(main); +extern EvtScript N(unkFloatFunc); diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index 71a26734d1..b9a420352a 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -18,7 +18,7 @@ MapConfig N(config) = { // Extraneous END_CASE_MULTI #ifdef NON_EQUIVALENT -EvtSource N(802409C0) = { +EvtScript N(802409C0) = { EVT_CALL(GetEntryID, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_OR_EQ(0) @@ -40,7 +40,7 @@ EvtSource N(802409C0) = { EVT_END }; #else -EvtSource N(802409C0) = { +EvtScript N(802409C0) = { EVT_CMD(EVT_OP_CALL, EVT_PTR(GetEntryID), EVT_VAR(0)), EVT_CMD(EVT_OP_SWITCH, EVT_VAR(0)), EVT_CMD(EVT_OP_CASE_OR_EQ, 0), @@ -67,7 +67,7 @@ static s32 N(pad_ABC) = { 0x00000000, }; -EvtSource N(80240AC0) = { +EvtScript N(80240AC0) = { EVT_CALL(MakeItemEntity, ITEM_S_JUMP_CHG, -200, 160, -213, 17, EVT_SAVE_FLAG(1391)) EVT_RETURN EVT_END @@ -77,7 +77,7 @@ static s32 N(pad_AF4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(updateTexturePan_80240B00) = { +EvtScript N(updateTexturePan_80240B00) = { EVT_SET_GROUP(0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) @@ -94,15 +94,15 @@ EvtSource N(updateTexturePan_80240B00) = { EVT_END }; -EvtSource N(exitWalk_80240B9C) = EXIT_WALK_SCRIPT(60, 1, "flo_21", 0); +EvtScript N(exitWalk_80240B9C) = EXIT_WALK_SCRIPT(60, 1, "flo_21", 0); -EvtSource N(80240BF8) = { +EvtScript N(80240BF8) = { EVT_BIND_TRIGGER(N(exitWalk_80240B9C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 39) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -180,7 +180,7 @@ static s32 N(pad_1044)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80241050) = { +EvtScript N(80241050) = { EVT_SET_GROUP(239) EVT_SET(EVT_VAR(15), 0) EVT_LABEL(0) @@ -268,7 +268,7 @@ EvtSource N(80241050) = { EVT_END }; -EvtSource N(80241650) = { +EvtScript N(80241650) = { EVT_THREAD EVT_ADDF(EVT_MAP_VAR(12), EVT_FIXED(-1.5)) EVT_WAIT_FRAMES(1) @@ -278,7 +278,7 @@ EvtSource N(80241650) = { EVT_END }; -EvtSource N(8024169C) = { +EvtScript N(8024169C) = { EVT_THREAD EVT_ADDF(EVT_MAP_VAR(13), EVT_FIXED(-1.5)) EVT_WAIT_FRAMES(1) @@ -288,7 +288,7 @@ EvtSource N(8024169C) = { EVT_END }; -EvtSource N(802416E8) = { +EvtScript N(802416E8) = { EVT_THREAD EVT_ADDF(EVT_MAP_VAR(14), EVT_FIXED(-1.5)) EVT_WAIT_FRAMES(1) @@ -298,7 +298,7 @@ EvtSource N(802416E8) = { EVT_END }; -EvtSource N(80241734) = { +EvtScript N(80241734) = { EVT_THREAD EVT_ADDF(EVT_MAP_VAR(15), EVT_FIXED(-1.5)) EVT_WAIT_FRAMES(1) @@ -308,7 +308,7 @@ EvtSource N(80241734) = { EVT_END }; -EvtSource N(80241780) = { +EvtScript N(80241780) = { EVT_CALL(ParentColliderToModel, 8, 28) EVT_CALL(ParentColliderToModel, 9, 32) EVT_CALL(ParentColliderToModel, 7, 36) @@ -350,7 +350,7 @@ static s32 N(pad_1A68)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80241A70) = { +EvtScript N(80241A70) = { EVT_SET(EVT_VAR(0), 0) EVT_LABEL(10) EVT_CALL(N(func_80240784_CE3E74)) @@ -366,7 +366,7 @@ EvtSource N(80241A70) = { EVT_END }; -EvtSource N(80241B10) = { +EvtScript N(80241B10) = { EVT_SET(EVT_VAR(0), 255) EVT_LABEL(10) EVT_CALL(N(func_80240784_CE3E74)) @@ -382,7 +382,7 @@ EvtSource N(80241B10) = { EVT_END }; -EvtSource N(80241BB0) = { +EvtScript N(80241BB0) = { EVT_CALL(TranslateGroup, 79, 0, EVT_VAR(0), 0) EVT_CALL(TranslateGroup, 92, 0, EVT_VAR(0), 0) EVT_SETF(EVT_VAR(1), EVT_VAR(0)) @@ -393,7 +393,7 @@ EvtSource N(80241BB0) = { EVT_END }; -EvtSource N(80241C58) = { +EvtScript N(80241C58) = { EVT_CALL(TranslateGroup, 84, 0, EVT_VAR(0), 0) EVT_SETF(EVT_VAR(1), EVT_VAR(0)) EVT_MULF(EVT_VAR(1), EVT_FIXED(-12.0)) @@ -402,7 +402,7 @@ EvtSource N(80241C58) = { EVT_END }; -EvtSource N(80241CC4) = { +EvtScript N(80241CC4) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetPlayerActionState, 10) EVT_CALL(DisablePartnerAI, 0) @@ -509,7 +509,7 @@ EvtSource N(80241CC4) = { EVT_END }; -EvtSource N(802423F8) = { +EvtScript N(802423F8) = { EVT_IF_EQ(EVT_AREA_FLAG(44), 0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(func_802D2B6C) @@ -607,7 +607,7 @@ EvtSource N(802423F8) = { EVT_END }; -EvtSource N(80242A2C) = { +EvtScript N(80242A2C) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerActionState, 10) @@ -685,7 +685,7 @@ EvtSource N(80242A2C) = { EVT_END }; -EvtSource N(80242FD0) = { +EvtScript N(80242FD0) = { EVT_BIND_TRIGGER(N(802423F8), TRIGGER_FLOOR_TOUCH, 12, 1, 0) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_19/flo_19.h b/src/world/area_flo/flo_19/flo_19.h index 058decd3b9..a0c6df7300 100644 --- a/src/world/area_flo/flo_19/flo_19.h +++ b/src/world/area_flo/flo_19/flo_19.h @@ -16,8 +16,8 @@ ApiStatus N(func_80240540_CE3C30)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240660_CE3D50)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240784_CE3E74)(Evt* script, s32 isInitialCall); -extern EvtSource N(80241780); -extern EvtSource N(80241CC4); -extern EvtSource N(80242A2C); -extern EvtSource N(80242FD0); -extern EvtSource N(main); +extern EvtScript N(80241780); +extern EvtScript N(80241CC4); +extern EvtScript N(80242A2C); +extern EvtScript N(80242FD0); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 6b5c14c4fc..9d70579b6f 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -37,7 +37,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_21_tattle }, }; -EvtSource N(80240D40) = { +EvtScript N(80240D40) = { EVT_IF_EQ(EVT_SAVE_VAR(0), 56) EVT_CALL(FadeOutMusic, 0, 500) EVT_ELSE @@ -49,7 +49,7 @@ EvtSource N(80240D40) = { #include "world/common/StarSpiritEffectFunc.inc.c" -EvtSource N(80240DA0) = { +EvtScript N(80240DA0) = { EVT_SET_GROUP(0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) @@ -66,7 +66,7 @@ EvtSource N(80240DA0) = { EVT_END }; -EvtSource N(80240E3C) = { +EvtScript N(80240E3C) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_EQ(55) EVT_SET(EVT_VAR(0), 0) @@ -145,15 +145,15 @@ EvtSource N(80240E3C) = { EVT_END }; -EvtSource N(exitWalk_802412F4) = EXIT_WALK_SCRIPT(60, 0, "flo_19", 1); +EvtScript N(exitWalk_802412F4) = EXIT_WALK_SCRIPT(60, 0, "flo_19", 1); -EvtSource N(80241350) = { +EvtScript N(80241350) = { EVT_BIND_TRIGGER(N(exitWalk_802412F4), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 39) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -191,37 +191,37 @@ s32 N(D_802414FC_CE7BFC)[] = { EVT_FIXED(0.900390625), EVT_FIXED(0.900390625), EVT_FIXED(0.900390625), }; -EvtSource N(80241560) = { +EvtScript N(80241560) = { EVT_ADDF(EVT_MAP_VAR(0), EVT_FIXED(-1.5)) EVT_RETURN EVT_END }; -EvtSource N(80241580) = { +EvtScript N(80241580) = { EVT_ADDF(EVT_MAP_VAR(1), EVT_FIXED(-1.5)) EVT_RETURN EVT_END }; -EvtSource N(802415A0) = { +EvtScript N(802415A0) = { EVT_ADDF(EVT_MAP_VAR(2), EVT_FIXED(-1.5)) EVT_RETURN EVT_END }; -EvtSource N(802415C0) = { +EvtScript N(802415C0) = { EVT_ADDF(EVT_MAP_VAR(3), EVT_FIXED(-1.5)) EVT_RETURN EVT_END }; -EvtSource N(802415E0) = { +EvtScript N(802415E0) = { EVT_ADDF(EVT_MAP_VAR(4), EVT_FIXED(-1.5)) EVT_RETURN EVT_END }; -EvtSource N(80241600) = { +EvtScript N(80241600) = { EVT_THREAD EVT_SET(EVT_VAR(15), 0) EVT_LABEL(0) @@ -287,7 +287,7 @@ Vec3f N(vectorList_8024189C)[] = { { 550.0, 104.0, 0.0 }, }; -EvtSource N(802418C0) = { +EvtScript N(802418C0) = { EVT_LABEL(0) EVT_CALL(PlaySound, 0x20B6) EVT_CALL(ShakeCam, 0, 0, 15, EVT_FIXED(1.0)) @@ -297,7 +297,7 @@ EvtSource N(802418C0) = { EVT_END }; -EvtSource N(80241920) = { +EvtScript N(80241920) = { EVT_CALL(PlaySoundAtNpc, 0, 0x3C0, 0) EVT_CALL(PlayEffect, 0x25, 3, 650, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_WAIT_FRAMES(15) @@ -334,7 +334,7 @@ EvtSource N(80241920) = { EVT_END }; -EvtSource N(80241B98) = { +EvtScript N(80241B98) = { EVT_IF_GE(EVT_SAVE_VAR(0), 56) EVT_RETURN EVT_END_IF @@ -437,7 +437,7 @@ EvtSource N(80241B98) = { EVT_END }; -EvtSource N(80242290) = { +EvtScript N(80242290) = { EVT_SETF(EVT_VAR(0), EVT_FIXED(0.95)) EVT_SETF(EVT_VAR(1), EVT_FIXED(1.1)) EVT_LABEL(0) @@ -505,7 +505,7 @@ s32 N(intTable_8024262C)[] = { 0x0000000A, 0x00000006, 0x00000006, 0x0000000A, }; -EvtSource N(8024263C) = { +EvtScript N(8024263C) = { EVT_SETF(EVT_VAR(0), 10) EVT_SETF(EVT_VAR(1), 1) EVT_CHILD_THREAD @@ -552,7 +552,7 @@ EvtSource N(8024263C) = { EVT_END }; -EvtSource N(80242918) = { +EvtScript N(80242918) = { EVT_SETF(EVT_MAP_VAR(11), EVT_FIXED(1.0)) EVT_SETF(EVT_MAP_VAR(12), EVT_FIXED(1.0)) EVT_CHILD_THREAD @@ -633,7 +633,7 @@ EvtSource N(80242918) = { EVT_END }; -EvtSource N(80242D34) = { +EvtScript N(80242D34) = { EVT_CHILD_THREAD EVT_SET(EVT_VAR(1), 0) EVT_LOOP(0) @@ -678,7 +678,7 @@ EvtSource N(80242D34) = { EVT_END }; -EvtSource N(80243010) = { +EvtScript N(80243010) = { EVT_CALL(SetNpcAnimation, 1, NPC_ANIM_huff_n_puff_Palette_00_Anim_4) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_huff_n_puff_Palette_00_Anim_5) EVT_CALL(SetNpcAnimation, 2, NPC_ANIM_huff_n_puff_Palette_00_Anim_6) @@ -729,7 +729,7 @@ EvtSource N(80243010) = { EVT_END }; -EvtSource N(idle_80243428) = { +EvtScript N(idle_80243428) = { EVT_LABEL(0) EVT_CALL(SetSelfVar, 0, 0) EVT_LOOP(0) @@ -746,7 +746,7 @@ EvtSource N(idle_80243428) = { EVT_END }; -EvtSource N(defeat_802434D8) = { +EvtScript N(defeat_802434D8) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -765,12 +765,12 @@ EvtSource N(defeat_802434D8) = { EVT_END }; -EvtSource N(defeat_802435D4) = { +EvtScript N(defeat_802435D4) = { EVT_RETURN EVT_END }; -EvtSource N(init_802435E4) = { +EvtScript N(init_802435E4) = { EVT_IF_LT(EVT_SAVE_VAR(0), 56) EVT_CALL(SetEnemyFlagBits, -1, 4194304, 1) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80243428))) @@ -783,7 +783,7 @@ EvtSource N(init_802435E4) = { EVT_END }; -EvtSource N(init_80243684) = { +EvtScript N(init_80243684) = { EVT_IF_LT(EVT_SAVE_VAR(0), 56) EVT_CALL(SetEnemyFlagBits, -1, 4194304, 1) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_802435D4))) @@ -796,7 +796,7 @@ EvtSource N(init_80243684) = { EVT_END }; -EvtSource N(init_8024371C) = { +EvtScript N(init_8024371C) = { EVT_IF_LT(EVT_SAVE_VAR(0), 56) EVT_CALL(SetEnemyFlagBits, -1, 4194304, 1) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_802435D4))) @@ -808,7 +808,7 @@ EvtSource N(init_8024371C) = { EVT_END }; -EvtSource N(init_802437A8) = { +EvtScript N(init_802437A8) = { EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_tuff_puff_Palette_00_Anim_B) EVT_CALL(SetNpcJumpscale, NPC_SELF, 0) EVT_RETURN diff --git a/src/world/area_flo/flo_21/flo_21.h b/src/world/area_flo/flo_21/flo_21.h index 66be387907..ec7ae142af 100644 --- a/src/world/area_flo/flo_21/flo_21.h +++ b/src/world/area_flo/flo_21/flo_21.h @@ -18,6 +18,6 @@ ApiStatus N(flo_21_StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240B00_CE7200)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80245AEC); -extern EvtSource N(80241600); -extern EvtSource N(80241B98); -extern EvtSource N(main); +extern EvtScript N(80241600); +extern EvtScript N(80241B98); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c index 01ea8e8d73..2b9e6b1f2f 100644 --- a/src/world/area_flo/flo_22/CEC240.c +++ b/src/world/area_flo/flo_22/CEC240.c @@ -20,7 +20,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_22_tattle }, }; -EvtSource N(802402E0) = { +EvtScript N(802402E0) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -31,15 +31,15 @@ EvtSource N(802402E0) = { EVT_END }; -EvtSource N(exitWalk_80240350) = EXIT_WALK_SCRIPT(60, 0, "flo_03", 1); +EvtScript N(exitWalk_80240350) = EXIT_WALK_SCRIPT(60, 0, "flo_03", 1); -EvtSource N(802403AC) = { +EvtScript N(802403AC) = { EVT_BIND_TRIGGER(N(exitWalk_80240350), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -72,7 +72,7 @@ NpcSettings N(npcSettings_80240520) = { .level = 99, }; -EvtSource N(idle_8024054C) = { +EvtScript N(idle_8024054C) = { EVT_SET(EVT_MAP_VAR(10), 0) EVT_LOOP(0) EVT_SWITCH(EVT_MAP_VAR(10)) @@ -88,7 +88,7 @@ EvtSource N(idle_8024054C) = { EVT_END }; -EvtSource N(defeat_802405E4) = { +EvtScript N(defeat_802405E4) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -112,14 +112,14 @@ EvtSource N(defeat_802405E4) = { EVT_END }; -EvtSource N(init_80240740) = { +EvtScript N(init_80240740) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_8024054C))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_802405E4))) EVT_RETURN EVT_END }; -EvtSource N(idle_80240778) = { +EvtScript N(idle_80240778) = { EVT_SET(EVT_MAP_VAR(11), 0) EVT_LOOP(0) EVT_SWITCH(EVT_MAP_VAR(11)) @@ -135,7 +135,7 @@ EvtSource N(idle_80240778) = { EVT_END }; -EvtSource N(defeat_80240810) = { +EvtScript N(defeat_80240810) = { EVT_CALL(GetBattleOutcome, EVT_VAR(0)) EVT_SWITCH(EVT_VAR(0)) EVT_CASE_EQ(0) @@ -164,7 +164,7 @@ EvtSource N(defeat_80240810) = { EVT_END }; -EvtSource N(init_802409CC) = { +EvtScript N(init_802409CC) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(idle_80240778))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(defeat_80240810))) EVT_RETURN @@ -256,7 +256,7 @@ s32 N(itemList_80240E10)[] = { ITEM_NONE, }; -EvtSource N(80240E24) = { +EvtScript N(80240E24) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(20) EVT_CALL(ShowMessageAtScreenPos, MESSAGE_ID(0x11, 0x00DB), 300, 120) @@ -266,7 +266,7 @@ EvtSource N(80240E24) = { EVT_END }; -EvtSource N(80240E84) = { +EvtScript N(80240E84) = { EVT_CALL(SetPlayerAnimation, 393230) EVT_THREAD EVT_CALL(GetPlayerPos, EVT_VAR(2), EVT_VAR(3), EVT_VAR(4)) @@ -296,7 +296,7 @@ EvtSource N(80240E84) = { EVT_END }; -EvtSource N(80241028) = { +EvtScript N(80241028) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(ShowConsumableChoicePopup) @@ -368,7 +368,7 @@ EvtSource N(80241028) = { EVT_END }; -EvtSource N(80241528) = { +EvtScript N(80241528) = { EVT_BIND_PADLOCK(N(80241028), TRIGGER_WALL_PRESS_A, 9, EVT_PTR(N(itemList_80240E10)), 0, 1) EVT_IF_EQ(EVT_SAVE_FLAG(1395), 1) EVT_CALL(MakeItemEntity, ITEM_FLOWER_SAVER_B, -83, 0, 0, 0, EVT_SAVE_FLAG(1392)) diff --git a/src/world/area_flo/flo_22/CEC290.c b/src/world/area_flo/flo_22/CEC290.c index f31e3b863a..dbf2f90124 100644 --- a/src/world/area_flo/flo_22/CEC290.c +++ b/src/world/area_flo/flo_22/CEC290.c @@ -24,7 +24,7 @@ ShakeTreeConfig N(tree2) = { Vec4f N(triggerCoord_80241F5C) = { 150.0f, 0.0f, 135.0f, 0.0f }; -EvtSource N(80241F6C) = { +EvtScript N(80241F6C) = { EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_WALL_HAMMER, 14, 1, 0) EVT_BIND_TRIGGER(N(shakeTree), TRIGGER_POINT_BOMB, EVT_PTR(N(triggerCoord_80241F28)), 1, 0) diff --git a/src/world/area_flo/flo_22/flo_22.h b/src/world/area_flo/flo_22/flo_22.h index 31f5ecb6ec..48943fe54b 100644 --- a/src/world/area_flo/flo_22/flo_22.h +++ b/src/world/area_flo/flo_22/flo_22.h @@ -10,7 +10,7 @@ ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CEC240)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80240DE4); -extern EvtSource N(80240E24); -extern EvtSource N(80241528); -extern EvtSource N(80241F6C); -extern EvtSource N(main); +extern EvtScript N(80240E24); +extern EvtScript N(80241528); +extern EvtScript N(80241F6C); +extern EvtScript N(main); diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 69be3fa38d..0d78631560 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -28,7 +28,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_23_tattle }, }; -EvtSource N(80240D30) = { +EvtScript N(80240D30) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -39,7 +39,7 @@ EvtSource N(80240D30) = { EVT_END }; -EvtSource N(80240DA0) = { +EvtScript N(80240DA0) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -80,18 +80,18 @@ EvtSource N(80240DA0) = { EVT_END }; -EvtSource N(exitWalk_8024104C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 2); +EvtScript N(exitWalk_8024104C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 2); -EvtSource N(exitWalk_802410A8) = EXIT_WALK_SCRIPT(60, 1, "flo_11", 0); +EvtScript N(exitWalk_802410A8) = EXIT_WALK_SCRIPT(60, 1, "flo_11", 0); -EvtSource N(80241104) = { +EvtScript N(80241104) = { EVT_BIND_TRIGGER(N(exitWalk_802410A8), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024104C), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -136,7 +136,7 @@ s32 N(D_80241310_CEF570) = { 0x00000000, }; -EvtSource N(80241314) = { +EvtScript N(80241314) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowConsumableChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -160,7 +160,7 @@ EvtSource N(80241314) = { EVT_END }; -EvtSource N(80241448) = { +EvtScript N(80241448) = { EVT_CALL(N(func_802402F8_CEE558), EVT_VAR(0)) EVT_BIND_PADLOCK(N(80241314), 0x10, 0, EVT_PTR(N(D_802426E0)), 0, 1) EVT_CALL(N(func_8024026C_CEE4CC), EVT_VAR(0)) @@ -181,7 +181,7 @@ NpcAISettings N(npcAISettings_80241498) = { .unk_2C = 3, }; -EvtSource N(npcAI_802414C8) = { +EvtScript N(npcAI_802414C8) = { EVT_CALL(SetSelfVar, 2, 3) EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) @@ -200,7 +200,7 @@ NpcSettings N(npcSettings_80241538) = { .level = 19, }; -EvtSource N(interact_80241564) = { +EvtScript N(interact_80241564) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_IF_EQ(EVT_SAVE_FLAG(1365), 0) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -334,7 +334,7 @@ EvtSource N(interact_80241564) = { EVT_END }; -EvtSource N(init_80241E70) = { +EvtScript N(init_80241E70) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80241564))) EVT_IF_EQ(EVT_SAVE_FLAG(1365), 1) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_gate_flower_Palette_00_Anim_5) @@ -454,7 +454,7 @@ static s32 N(pad_2598)[] = { 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(D_802EA0C4), 100, 60, 5, 0, MAKE_ENTITY_END) EVT_CALL(MakeEntity, 0x802EA588, 100, 145, 0, 0, 131, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1409)) @@ -539,7 +539,7 @@ ApiStatus N(func_80240B68_CEEDC8)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80240C2C_CEEE8C)(Evt* script, s32 isInitialCall) { s32 itemId = evt_get_variable(script, *script->ptrReadPos); - StaticItem* item = &gItemTable[itemId]; + ItemData* item = &gItemTable[itemId]; if (itemId == ITEM_YUMMY_MEAL) { script->varTable[9] = 2; diff --git a/src/world/area_flo/flo_23/flo_23.h b/src/world/area_flo/flo_23/flo_23.h index adc33843cc..1b7aa7d34c 100644 --- a/src/world/area_flo/flo_23/flo_23.h +++ b/src/world/area_flo/flo_23/flo_23.h @@ -19,5 +19,5 @@ ApiStatus N(func_80240C2C_CEEE8C)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240C9C_CEEEFC)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80242568); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c index 6d7e294bb3..055362a646 100644 --- a/src/world/area_flo/flo_24/CF0980.c +++ b/src/world/area_flo/flo_24/CF0980.c @@ -15,7 +15,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_24_tattle }, }; -EvtSource N(80240600) = { +EvtScript N(80240600) = { EVT_IF_LT(EVT_SAVE_VAR(0), 53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) EVT_ELSE @@ -28,7 +28,7 @@ EvtSource N(80240600) = { EVT_END }; -EvtSource N(80240690) = { +EvtScript N(80240690) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -69,18 +69,18 @@ EvtSource N(80240690) = { EVT_END }; -EvtSource N(exitWalk_8024093C) = EXIT_WALK_SCRIPT(60, 0, "flo_08", 1); +EvtScript N(exitWalk_8024093C) = EXIT_WALK_SCRIPT(60, 0, "flo_08", 1); -EvtSource N(exitWalk_80240998) = EXIT_WALK_SCRIPT(60, 1, "flo_10", 0); +EvtScript N(exitWalk_80240998) = EXIT_WALK_SCRIPT(60, 1, "flo_10", 0); -EvtSource N(802409F4) = { +EvtScript N(802409F4) = { EVT_BIND_TRIGGER(N(exitWalk_8024093C), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_80240998), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -171,7 +171,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(triggerCoord_80241718) = { 1.0f, 0.0f, -192.0f, 0.0f }; -EvtSource N(80241728) = { +EvtScript N(80241728) = { EVT_SET(EVT_AREA_FLAG(31), 0) EVT_SET(EVT_AREA_FLAG(32), 0) EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) @@ -181,7 +181,7 @@ EvtSource N(80241728) = { EVT_END }; -EvtSource N(updateTexturePan_802417A0) = { +EvtScript N(updateTexturePan_802417A0) = { EVT_SET_GROUP(0) EVT_IF_EQ(EVT_VAR(5), 1) EVT_IF_EQ(EVT_VAR(6), 1) @@ -202,7 +202,7 @@ extern const char N(flo_10_name_hack)[]; // BUG: missing END_SPAWN_THREADs #ifdef NON_EQUIVALENT -EvtSource N(8024183C) = { +EvtScript N(8024183C) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(TranslateGroup, 100, 0, 45, 0) EVT_CALL(UseSettingsFrom, 0, 170, 0, 160) @@ -242,7 +242,7 @@ EvtSource N(8024183C) = { EVT_END }; #else -EvtSource N(8024183C) = { +EvtScript N(8024183C) = { EVT_CMD(EVT_OP_CALL, EVT_PTR(DisablePlayerInput), 1), EVT_CMD(EVT_OP_CALL, EVT_PTR(TranslateGroup), 100, 0, 45, 0), EVT_CMD(EVT_OP_CALL, EVT_PTR(UseSettingsFrom), 0, 170, 0, 160), @@ -283,7 +283,7 @@ EvtSource N(8024183C) = { }; #endif -EvtSource N(80241ABC) = { +EvtScript N(80241ABC) = { EVT_IF_LT(EVT_SAVE_VAR(0), 49) EVT_CALL(EnableGroup, 94, 0) EVT_CALL(ModifyColliderFlags, 0, 30, 0x7FFFFE00) @@ -407,7 +407,7 @@ static s32 N(pad_21A4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA564, -325, 60, -140, 0, 154, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1393)) EVT_CALL(MakeEntity, 0x802EA588, 325, 60, -140, 0, 163, MAKE_ENTITY_END) diff --git a/src/world/area_flo/flo_24/flo_24.h b/src/world/area_flo/flo_24/flo_24.h index a6195e06c1..bfd0a89878 100644 --- a/src/world/area_flo/flo_24/flo_24.h +++ b/src/world/area_flo/flo_24/flo_24.h @@ -11,8 +11,8 @@ ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CF0940)(Evt* script, s32 isInitialCall); -extern EvtSource N(80241728); -extern EvtSource N(8024183C); -extern EvtSource N(80241ABC); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(80241728); +extern EvtScript N(8024183C); +extern EvtScript N(80241ABC); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index dffec0341e..b212b66836 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -28,7 +28,7 @@ MapConfig N(config) = { .tattle = { MSG_flo_25_tattle }, }; -EvtSource N(80242330) = { +EvtScript N(80242330) = { EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_LT(53) EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_CLOUDY, 0, 8) @@ -39,7 +39,7 @@ EvtSource N(80242330) = { EVT_END }; -EvtSource N(802423A0) = { +EvtScript N(802423A0) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -80,18 +80,18 @@ EvtSource N(802423A0) = { EVT_END }; -EvtSource N(exitWalk_8024264C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 3); +EvtScript N(exitWalk_8024264C) = EXIT_WALK_SCRIPT(60, 0, "flo_00", 3); -EvtSource N(exitWalk_802426A8) = EXIT_WALK_SCRIPT(60, 1, "flo_07", 0); +EvtScript N(exitWalk_802426A8) = EXIT_WALK_SCRIPT(60, 1, "flo_07", 0); -EvtSource N(80242704) = { +EvtScript N(80242704) = { EVT_BIND_TRIGGER(N(exitWalk_802426A8), TRIGGER_FLOOR_ABOVE, 0, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024264C), TRIGGER_FLOOR_ABOVE, 4, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 38) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamLeadPlayer, 0, 0) @@ -144,7 +144,7 @@ NpcAISettings N(npcAISettings_80242934) = { .unk_2C = 1, }; -EvtSource N(npcAI_80242964) = { +EvtScript N(npcAI_80242964) = { EVT_CALL(SetSelfVar, 0, 1) EVT_CALL(SetSelfVar, 5, 0) EVT_CALL(SetSelfVar, 6, 0) @@ -178,7 +178,7 @@ NpcAISettings N(npcAISettings_80242A00) = { .unk_2C = 1, }; -EvtSource N(npcAI_80242A30) = { +EvtScript N(npcAI_80242A30) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetSelfVar, 5, -630) EVT_CALL(SetSelfVar, 6, 50) @@ -205,7 +205,7 @@ s32 N(D_80242AD0_CF56A0) = { 0x00000000, }; -EvtSource N(80242AD4) = { +EvtScript N(80242AD4) = { EVT_SET(EVT_VAR(9), EVT_VAR(1)) EVT_CALL(ShowConsumableChoicePopup) EVT_SET(EVT_VAR(10), EVT_VAR(0)) @@ -229,7 +229,7 @@ EvtSource N(80242AD4) = { EVT_END }; -EvtSource N(80242C08) = { +EvtScript N(80242C08) = { EVT_CALL(N(func_80241DE4_CF49B4), EVT_VAR(0)) EVT_BIND_PADLOCK(N(80242AD4), 0x10, 0, EVT_PTR(N(D_80244A20)), 0, 1) EVT_CALL(N(func_80241D58_CF4928), EVT_VAR(0)) @@ -237,7 +237,7 @@ EvtSource N(80242C08) = { EVT_END }; -EvtSource N(interact_80242C58) = { +EvtScript N(interact_80242C58) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_IF_EQ(EVT_SAVE_FLAG(1363), 0) EVT_CALL(GetNpcPos, NPC_SELF, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -371,7 +371,7 @@ EvtSource N(interact_80242C58) = { EVT_END }; -EvtSource N(init_80243564) = { +EvtScript N(init_80243564) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(interact_80242C58))) EVT_IF_EQ(EVT_SAVE_FLAG(1363), 1) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_gate_flower_Palette_01_Anim_5) @@ -503,7 +503,7 @@ static s32 N(pad_3C8C) = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EAB04, -390, 0, 0, 0, 8, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(1407)) EVT_RETURN @@ -733,7 +733,7 @@ ApiStatus N(func_80241E80_CF4A50)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80241F44_CF4B14)(Evt* script, s32 isInitialCall) { s32 itemId = evt_get_variable(script, *script->ptrReadPos); - StaticItem* item = &gItemTable[itemId]; + ItemData* item = &gItemTable[itemId]; if (itemId == ITEM_YUMMY_MEAL) { script->varTable[9] = 2; diff --git a/src/world/area_flo/flo_25/CF4BC0.c b/src/world/area_flo/flo_25/CF4BC0.c index 70823f397f..812096c81a 100644 --- a/src/world/area_flo/flo_25/CF4BC0.c +++ b/src/world/area_flo/flo_25/CF4BC0.c @@ -38,7 +38,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(triggerCoord_802446AC) = { -388.0f, 0.0f, -92.0f, 0.0f }; -EvtSource N(802446BC) = { +EvtScript N(802446BC) = { EVT_SET(EVT_AREA_FLAG(33), 0) EVT_SET(EVT_AREA_FLAG(34), 0) EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) @@ -52,7 +52,7 @@ static s32 N(pad_4734)[] = { 0x00000000, 0x00000000, 0x00000000, }; -EvtSource N(80244740) = { +EvtScript N(80244740) = { EVT_SET_GROUP(11) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(1)) @@ -93,7 +93,7 @@ EvtSource N(80244740) = { EVT_END }; -EvtSource N(802449EC) = { +EvtScript N(802449EC) = { EVT_SET(EVT_VAR(9), EVT_VAR(6)) EVT_SET(EVT_VAR(8), EVT_VAR(5)) EVT_SET(EVT_VAR(7), EVT_VAR(4)) @@ -145,7 +145,7 @@ EvtSource N(802449EC) = { EVT_END }; -EvtSource N(80244D0C) = { +EvtScript N(80244D0C) = { EVT_CALL(GetModelCenter, 57) EVT_SET(EVT_VAR(3), 57) EVT_SET(EVT_VAR(4), 58) diff --git a/src/world/area_flo/flo_25/flo_25.h b/src/world/area_flo/flo_25/flo_25.h index fc29915f82..a5878425ba 100644 --- a/src/world/area_flo/flo_25/flo_25.h +++ b/src/world/area_flo/flo_25/flo_25.h @@ -20,7 +20,7 @@ ApiStatus N(func_80241F44_CF4B14)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241FB4_CF4B84)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80243C5C); -extern EvtSource N(802446BC); -extern EvtSource N(80244D0C); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(802446BC); +extern EvtScript N(80244D0C); +extern EvtScript N(main); +extern EvtScript N(makeEntities); diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index e815dd3e7e..d2dc8bce11 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -20,7 +20,7 @@ MapConfig N(config) = { .tattle = { MSG_kmr_03_tattle }, }; -EvtSource N(802406C0) = { +EvtScript N(802406C0) = { EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index fdc660c02b..ebb6c5931e 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -14,18 +14,18 @@ ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall) { #include "world/common/UnkPositionFunc.inc.c" -EvtSource N(exitWalk_802406F0) = EXIT_WALK_SCRIPT(60, 0, "kmr_04", 0); +EvtScript N(exitWalk_802406F0) = EXIT_WALK_SCRIPT(60, 0, "kmr_04", 0); -EvtSource N(exitWalk_8024074C) = EXIT_WALK_SCRIPT(60, 1, "kmr_05", 0); +EvtScript N(exitWalk_8024074C) = EXIT_WALK_SCRIPT(60, 1, "kmr_05", 0); -EvtSource N(802407A8) = { +EvtScript N(802407A8) = { EVT_BIND_TRIGGER(N(exitWalk_802406F0), TRIGGER_FLOOR_ABOVE, 3, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024074C), TRIGGER_FLOOR_ABOVE, 5, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 30) EVT_CALL(SetSpriteShading, -1) EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) @@ -62,7 +62,7 @@ NpcSettings N(npcSettings_80240950) = { .unk_2A = 16, }; -EvtSource N(8024097C) = { +EvtScript N(8024097C) = { EVT_LABEL(1) EVT_IF_EQ(EVT_AREA_FLAG(8), 1) EVT_LABEL(100) @@ -93,7 +93,7 @@ EvtSource N(8024097C) = { EVT_END }; -EvtSource N(npcAI_80240B50) = { +EvtScript N(npcAI_80240B50) = { EVT_LABEL(1) EVT_SWITCH(EVT_SAVE_VAR(0)) EVT_CASE_EQ(-122) @@ -151,7 +151,7 @@ EvtSource N(npcAI_80240B50) = { EVT_END }; -EvtSource N(hit_80240F64) = { +EvtScript N(hit_80240F64) = { EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_goompa_Palette_00_Anim_7) EVT_WAIT_FRAMES(10) EVT_CALL(SetNpcAnimation, NPC_SELF, NPC_ANIM_goompa_Palette_00_Anim_1) @@ -191,7 +191,7 @@ EvtSource N(hit_80240F64) = { EVT_END }; -EvtSource N(init_802411A8) = { +EvtScript N(init_802411A8) = { EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(npcAI_80240B50))) EVT_CALL(BindNpcAux, -1, EVT_PTR(N(8024097C))) EVT_CALL(BindNpcHit, -1, EVT_PTR(N(hit_80240F64))) @@ -245,20 +245,20 @@ static s32 N(pad_1468)[] = { 0x00000000, 0x00000000, }; -EvtSource N(80241470) = { +EvtScript N(80241470) = { EVT_CALL(ModifyColliderFlags, 0, 9, 0x7FFFFE00) EVT_SET(EVT_SAVE_VAR(0), -117) EVT_RETURN EVT_END }; -EvtSource N(802414A8) = { +EvtScript N(802414A8) = { EVT_SET(EVT_SAVE_FLAG(54), 1) EVT_RETURN EVT_END }; -EvtSource N(802414C8) = { +EvtScript N(802414C8) = { EVT_LABEL(0) EVT_CALL(GetPlayerPos, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) EVT_CALL(SetCamTarget, 0, EVT_VAR(0), EVT_VAR(1), EVT_VAR(2)) @@ -268,7 +268,7 @@ EvtSource N(802414C8) = { EVT_END }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_IF_LT(EVT_SAVE_VAR(0), -117) EVT_CALL(MakeEntity, 0x802EA10C, 45, 0, 70, 15, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80241470))) diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c index 6649281296..bed68cd241 100644 --- a/src/world/area_kmr/kmr_03/8C83A0.c +++ b/src/world/area_kmr/kmr_03/8C83A0.c @@ -37,7 +37,7 @@ FoliageVectorList N(treeEffectVectors_Tree1) = { }, }; -EvtSource N(tree1_Callback) = { +EvtScript N(tree1_Callback) = { EVT_IF_EQ(EVT_SAVE_FLAG(53), 1) EVT_RETURN EVT_END_IF @@ -65,7 +65,7 @@ ShakeTreeConfig N(tree1) = { Vec4f N(tree1Point) = { -42.0f, 0.0f, -13.0f, 0.0f }; -EvtSource N(802422B8) = { +EvtScript N(802422B8) = { EVT_SET(EVT_VAR(0), EVT_PTR(N(bush1))) EVT_BIND_TRIGGER(N(searchBush), TRIGGER_WALL_PRESS_A, 53, 1, 0) EVT_SET(EVT_VAR(0), EVT_PTR(N(tree1))) diff --git a/src/world/area_kmr/kmr_03/8C85E0.c b/src/world/area_kmr/kmr_03/8C85E0.c index 74caee8e9f..0232a38e67 100644 --- a/src/world/area_kmr/kmr_03/8C85E0.c +++ b/src/world/area_kmr/kmr_03/8C85E0.c @@ -1,6 +1,6 @@ #include "kmr_03.h" -EvtSource N(80242340) = { +EvtScript N(80242340) = { EVT_CALL(UseSettingsFrom, 0, -270, 20, -80) EVT_CALL(SetPanTarget, 0, -270, 20, -80) EVT_CALL(SetCamDistance, 0, EVT_FIXED(700.0)) diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 61f115ba10..225290da3c 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -12,10 +12,10 @@ ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall); ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80241450); -extern EvtSource N(802422B8); -extern EvtSource N(80242340); -extern EvtSource N(802406C0); -extern EvtSource N(main); -extern EvtSource N(makeEntities); +extern EvtScript N(802422B8); +extern EvtScript N(80242340); +extern EvtScript N(802406C0); +extern EvtScript N(main); +extern EvtScript N(makeEntities); extern s32 D_802EA0C4; diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index bad63998f2..adf77f4476 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -2,15 +2,15 @@ #include "message_ids.h" #include "sprite/npc/goomba.h" -EvtSource N(ExitWest) = EXIT_WALK_SCRIPT(60, 0, "kmr_07", 1); -EvtSource N(ExitEast) = EXIT_WALK_SCRIPT(60, 1, "kmr_11", 0); +EvtScript N(ExitWest) = EXIT_WALK_SCRIPT(60, 0, "kmr_07", 1); +EvtScript N(ExitEast) = EXIT_WALK_SCRIPT(60, 1, "kmr_11", 0); -EvtSource N(BindExits) = SCRIPT({ +EvtScript N(BindExits) = SCRIPT({ bind N(ExitWest) TRIGGER_FLOOR_ABOVE 0; // deili1 bind N(ExitEast) TRIGGER_FLOOR_ABOVE 3; // deili2 }); -EvtSource N(main) = SCRIPT({ +EvtScript N(main) = SCRIPT({ EVT_WORLD_LOCATION = LOCATION_GOOMBA_ROAD; SetSpriteShading(-1); SetCamPerspective(0, 3, 25, 16, 4096); @@ -40,7 +40,7 @@ NpcAISettings N(goombaAISettings) = { .unk_2C = TRUE, }; -EvtSource N(GoombaAI) = SCRIPT({ +EvtScript N(GoombaAI) = SCRIPT({ DoBasicAI(N(goombaAISettings)); }); @@ -54,7 +54,7 @@ NpcSettings N(goombaNpcSettings) = { }; /// @bug Never returns -EvtSource N(ReadWestSign) = SCRIPT({ +EvtScript N(ReadWestSign) = SCRIPT({ group 0; // "Eat a Mushroom to regain your energy!" @@ -83,7 +83,7 @@ EvtSource N(ReadWestSign) = SCRIPT({ return; }); -EvtSource N(GoombaIdle) = SCRIPT({ +EvtScript N(GoombaIdle) = SCRIPT({ sleep 1; SetSelfVar(0, FALSE); @@ -139,7 +139,7 @@ EvtSource N(GoombaIdle) = SCRIPT({ BindNpcAI(NPC_SELF, N(GoombaAI)); }); -EvtSource N(GoombaInit) = SCRIPT({ +EvtScript N(GoombaInit) = SCRIPT({ BindNpcIdle(NPC_SELF, N(GoombaIdle)); }); @@ -194,7 +194,7 @@ NpcGroupList N(npcGroupList) = { {}, }; -EvtSource N(ReadEastSign) = SCRIPT({ +EvtScript N(ReadEastSign) = SCRIPT({ IsStartingConversation($a); if ($a == 1) { return; @@ -209,7 +209,7 @@ EvtSource N(ReadEastSign) = SCRIPT({ SetTimeFreezeMode(0); }); -EvtSource N(MakeEntities) = SCRIPT({ +EvtScript N(MakeEntities) = SCRIPT({ MakeEntity(0x802EAFDC, 436, 0, -42, 0, MAKE_ENTITY_END); AssignScript(N(ReadEastSign)); }); diff --git a/src/world/area_kmr/kmr_12/header.c b/src/world/area_kmr/kmr_12/header.c index c4d3a04e83..e8307ab367 100644 --- a/src/world/area_kmr/kmr_12/header.c +++ b/src/world/area_kmr/kmr_12/header.c @@ -14,7 +14,7 @@ MapConfig N(config) = { .tattle = { MSG_kmr_12_tattle }, }; -EvtSource N(PlayMusic) = { +EvtScript N(PlayMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h index 8277697fcf..9df4116e73 100644 --- a/src/world/area_kmr/kmr_12/kmr_12.h +++ b/src/world/area_kmr/kmr_12/kmr_12.h @@ -13,10 +13,10 @@ ApiStatus GetGoomba(Evt* script, s32 isInitialCall); extern MapConfig N(config); -extern EvtSource N(main); -extern EvtSource N(PlayMusic); -extern EvtSource N(MakeEntities); -extern EvtSource N(ReadWestSign); +extern EvtScript N(main); +extern EvtScript N(PlayMusic); +extern EvtScript N(MakeEntities); +extern EvtScript N(ReadWestSign); extern NpcGroupList N(npcGroupList); extern s32 D_802EAFDC; diff --git a/src/world/area_nok/nok_04/9EDBF0.c b/src/world/area_nok/nok_04/9EDBF0.c index e56b743e2c..1ea916e403 100644 --- a/src/world/area_nok/nok_04/9EDBF0.c +++ b/src/world/area_nok/nok_04/9EDBF0.c @@ -46,8 +46,8 @@ extern s32 D_80241440_9EF030[12]; extern s32 D_80241438_9EF028; extern s32 D_8024143C_9EF02C; extern s32 D_80243254_9F0E44; -extern EvtSource D_80241470_9EF060; -extern EvtSource D_8024161C_9EF20C; +extern EvtScript D_80241470_9EF060; +extern EvtScript D_8024161C_9EF20C; extern s32 D_80241768_9EF358; extern s32 D_80241748_9EF338; @@ -180,7 +180,7 @@ ApiStatus func_802406C4_9EE2B4(Evt* script, s32 isInitialCall) { s32 temp_s1_2 = evt_get_variable(script, *args++); s32 temp_s2 = evt_get_variable(script, *args++); Evt* script2; - EvtSource* phi_a0; + EvtScript* phi_a0; temp_s1_2 %= 6; diff --git a/src/world/area_sbk/sbk_00/929270.c b/src/world/area_sbk/sbk_00/929270.c index 0584a3541a..4a1205ea5f 100644 --- a/src/world/area_sbk/sbk_00/929270.c +++ b/src/world/area_sbk/sbk_00/929270.c @@ -18,18 +18,18 @@ MapConfig N(config) = { .tattle = { MSG_sbk_00_tattle }, }; -EvtSource N(exitWalk_802400E0) = EXIT_WALK_SCRIPT(60, 1, "sbk_01", 0); +EvtScript N(exitWalk_802400E0) = EXIT_WALK_SCRIPT(60, 1, "sbk_01", 0); -EvtSource N(exitWalk_8024013C) = EXIT_WALK_SCRIPT(60, 3, "sbk_10", 2); +EvtScript N(exitWalk_8024013C) = EXIT_WALK_SCRIPT(60, 3, "sbk_10", 2); -EvtSource N(80240198) = { +EvtScript N(80240198) = { EVT_BIND_TRIGGER(N(exitWalk_802400E0), TRIGGER_FLOOR_ABOVE, 3, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024013C), TRIGGER_FLOOR_ABOVE, 6, 1, 0) EVT_RETURN EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 10) EVT_CALL(SetSpriteShading, -1) EVT_IF_EQ(EVT_SAVE_VAR(0), -63) diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index 9c9703bf8f..4c39ddd9de 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -16,7 +16,7 @@ NpcAISettings N(npcAISettings_80240300) = { .unk_2C = 1, }; -EvtSource N(npcAI_80240330) = { +EvtScript N(npcAI_80240330) = { EVT_CALL(N(SetNpcB5_3)) EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80240300))) EVT_RETURN @@ -116,7 +116,7 @@ static s32 N(pad_78C) = { 0x00000000, }; -EvtSource N(makeEntities) = { +EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, 0x802EA564, -230, 0, 155, 0, 152, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(797)) EVT_CALL(MakeEntity, 0x802EA564, 160, 0, 205, 0, 343, MAKE_ENTITY_END) diff --git a/src/world/area_sbk/sbk_00/sbk_00.h b/src/world/area_sbk/sbk_00/sbk_00.h index 21b692383c..1c94f996b0 100644 --- a/src/world/area_sbk/sbk_00/sbk_00.h +++ b/src/world/area_sbk/sbk_00/sbk_00.h @@ -6,6 +6,6 @@ #define NAMESPACE sbk_00 -extern EvtSource N(main); +extern EvtScript N(main); extern NpcGroupList N(npcGroupList_80240768); -extern EvtSource N(makeEntities); +extern EvtScript N(makeEntities); diff --git a/src/world/area_sbk/sbk_01/929A90.c b/src/world/area_sbk/sbk_01/929A90.c index 7955ffdb26..e70e63c756 100644 --- a/src/world/area_sbk/sbk_01/929A90.c +++ b/src/world/area_sbk/sbk_01/929A90.c @@ -3,7 +3,7 @@ #include "world/common/SpawnSunEffect.inc.c" -extern EvtSource N(main); +extern EvtScript N(main); extern NpcGroupList N(npcGroupList_802407D8); EntryList N(entryList) = { @@ -21,13 +21,13 @@ MapConfig N(config) = { .tattle = { MSG_sbk_01_tattle }, }; -EvtSource N(exitWalk_802400E0) = EXIT_WALK_SCRIPT(60, 0, "sbk_00", 1); +EvtScript N(exitWalk_802400E0) = EXIT_WALK_SCRIPT(60, 0, "sbk_00", 1); -EvtSource N(exitWalk_8024013C) = EXIT_WALK_SCRIPT(60, 1, "sbk_02", 0); +EvtScript N(exitWalk_8024013C) = EXIT_WALK_SCRIPT(60, 1, "sbk_02", 0); -EvtSource N(exitWalk_80240198) = EXIT_WALK_SCRIPT(60, 3, "sbk_11", 2); +EvtScript N(exitWalk_80240198) = EXIT_WALK_SCRIPT(60, 3, "sbk_11", 2); -EvtSource N(802401F4) = { +EvtScript N(802401F4) = { EVT_BIND_TRIGGER(N(exitWalk_802400E0), TRIGGER_FLOOR_ABOVE, 7, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_8024013C), TRIGGER_FLOOR_ABOVE, 3, 1, 0) EVT_BIND_TRIGGER(N(exitWalk_80240198), TRIGGER_FLOOR_ABOVE, 5, 1, 0) @@ -35,7 +35,7 @@ EvtSource N(802401F4) = { EVT_END }; -EvtSource N(main) = { +EvtScript N(main) = { EVT_SET(EVT_SAVE_VAR(425), 10) EVT_CALL(SetSpriteShading, -1) EVT_IF_EQ(EVT_SAVE_VAR(0), -63) diff --git a/src/world/area_sbk/sbk_01/929AD0.c b/src/world/area_sbk/sbk_01/929AD0.c index 065ba960dc..4218b11134 100644 --- a/src/world/area_sbk/sbk_01/929AD0.c +++ b/src/world/area_sbk/sbk_01/929AD0.c @@ -16,7 +16,7 @@ NpcAISettings N(npcAISettings_80240370) = { .unk_2C = 1, }; -EvtSource N(npcAI_802403A0) = { +EvtScript N(npcAI_802403A0) = { EVT_CALL(N(SetNpcB5_3)) EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80240370))) EVT_RETURN diff --git a/src/world/area_sbk/sbk_01/sbk_01.h b/src/world/area_sbk/sbk_01/sbk_01.h index 2a25302e5d..94e9504994 100644 --- a/src/world/area_sbk/sbk_01/sbk_01.h +++ b/src/world/area_sbk/sbk_01/sbk_01.h @@ -6,5 +6,5 @@ #define NAMESPACE sbk_01 -extern EvtSource N(main); +extern EvtScript N(main); extern NpcGroupList N(npcGroupList_802407D8); diff --git a/src/world/common/UnkFunc35.inc.c b/src/world/common/UnkFunc35.inc.c index 3ce4101e19..d9fc99a114 100644 --- a/src/world/common/UnkFunc35.inc.c +++ b/src/world/common/UnkFunc35.inc.c @@ -3,10 +3,10 @@ ApiStatus N(UnkFunc35)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); + s32 R = evt_get_variable(script, *args++); + s32 G = evt_get_variable(script, *args++); + s32 B = evt_get_variable(script, *args++); - set_screen_overlay_color(0, var1, var2, var3); + set_screen_overlay_color(0, R, G, B); return ApiStatus_DONE2; } diff --git a/src/world/common/clouds.inc.c b/src/world/common/clouds.inc.c index 5aa77587bb..725663bc7c 100644 --- a/src/world/common/clouds.inc.c +++ b/src/world/common/clouds.inc.c @@ -1,6 +1,6 @@ #include "common/UnkAngleFunc2.inc.c" -EvtSource N(clouds1) = { +EvtScript N(clouds1) = { EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(7), EVT_VAR(2)) EVT_MUL(EVT_VAR(7), 10) @@ -18,7 +18,7 @@ EvtSource N(clouds1) = { EVT_END }; -EvtSource N(clouds2) = { +EvtScript N(clouds2) = { EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(3)) EVT_SET(EVT_VAR(12), EVT_VAR(4)) @@ -40,7 +40,7 @@ EvtSource N(clouds2) = { EVT_END }; -EvtSource N(clouds3) = { +EvtScript N(clouds3) = { EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_SET(EVT_VAR(11), EVT_VAR(3)) EVT_SET(EVT_VAR(12), EVT_VAR(4)) diff --git a/src/world/common/reflection.inc.c b/src/world/common/reflection.inc.c index 49c27e057a..9ca401eb8e 100644 --- a/src/world/common/reflection.inc.c +++ b/src/world/common/reflection.inc.c @@ -406,7 +406,7 @@ void N(SetPartnerFlags20000)(void) { // Requires most of area_pra to have its data decomped. /* -#new:EvtSource $Script_802415D0 +#new:EvtScript $Script_802415D0 { 0: NewArray 00000010 *VarA 10: If *Var1 == 00000000 diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index 13c149bfd6..72a7c39554 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -73,7 +73,7 @@ ApiStatus func_802BD300_318050(Evt* script, s32 isInitialCall) { return partner_get_out(bombette) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_bombette_take_out = { +EvtScript world_bombette_take_out = { EVT_CALL(func_802BD300_318050) EVT_RETURN EVT_END @@ -165,7 +165,7 @@ ApiStatus func_802BD338_318088(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_bombette_update = { +EvtScript world_bombette_update = { EVT_CALL(func_802BD338_318088) EVT_RETURN EVT_END @@ -195,7 +195,7 @@ s32 world_bombette_can_player_pause(void) { ApiStatus func_802BD758_3184A8(Evt* evt, s32 isInitialCall); INCLUDE_ASM(s32, "world/partner/bombette", func_802BD758_3184A8); -EvtSource world_bombette_use_ability = { +EvtScript world_bombette_use_ability = { EVT_CALL(func_802BD758_3184A8) EVT_RETURN EVT_END @@ -211,7 +211,7 @@ ApiStatus func_802BE4E8_319238(Evt* script, s32 isInitialCall) { return partner_put_away(bombette) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_bombette_put_away = { +EvtScript world_bombette_put_away = { EVT_CALL(func_802BE4E8_319238) EVT_RETURN EVT_END diff --git a/src/world/partner/bombette.h b/src/world/partner/bombette.h index 81d1bc6f35..ebe357aa37 100644 --- a/src/world/partner/bombette.h +++ b/src/world/partner/bombette.h @@ -10,9 +10,9 @@ void world_bombette_can_use_ability(void); s32 world_bombette_can_player_pause(void); void world_bombette_pre_battle(Npc*); -extern EvtSource world_bombette_take_out; -extern EvtSource world_bombette_update; -extern EvtSource world_bombette_use_ability; -extern EvtSource world_bombette_put_away; +extern EvtScript world_bombette_take_out; +extern EvtScript world_bombette_update; +extern EvtScript world_bombette_use_ability; +extern EvtScript world_bombette_put_away; #endif diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 3d0437cd62..1eda21005b 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -30,7 +30,7 @@ ApiStatus func_802BD130_323A80(Evt* script, s32 isInitialCall) { return partner_get_out(bow) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_bow_take_out = { +EvtScript world_bow_take_out = { EVT_CALL(func_802BD130_323A80) EVT_RETURN EVT_END @@ -117,7 +117,7 @@ ApiStatus func_802BD168_323AB8(Evt* script, s32 isInitialCall) { return 0; } -EvtSource world_bow_update = { +EvtScript world_bow_update = { EVT_CALL(func_802BD168_323AB8) EVT_RETURN EVT_END @@ -343,7 +343,7 @@ ApiStatus func_802BD694_323FE4(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_bow_use_ability = { +EvtScript world_bow_use_ability = { EVT_CALL(func_802BD694_323FE4) EVT_RETURN EVT_END @@ -394,7 +394,7 @@ ApiStatus func_802BDF08_324858(Evt* script, s32 isInitialCall) { return partner_put_away(bow) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_bow_put_away = { +EvtScript world_bow_put_away = { EVT_CALL(func_802BDF08_324858) EVT_RETURN EVT_END diff --git a/src/world/partner/bow.h b/src/world/partner/bow.h index 92b8c83877..e538219b54 100644 --- a/src/world/partner/bow.h +++ b/src/world/partner/bow.h @@ -7,9 +7,9 @@ void world_bow_init(Npc*); void world_bow_pre_battle(Npc*); -extern EvtSource world_bow_take_out; -extern EvtSource world_bow_update; -extern EvtSource world_bow_use_ability; -extern EvtSource world_bow_put_away; +extern EvtScript world_bow_take_out; +extern EvtScript world_bow_update; +extern EvtScript world_bow_use_ability; +extern EvtScript world_bow_put_away; #endif diff --git a/src/world/partner/goombaria.c b/src/world/partner/goombaria.c index c2e1586b80..66e643c592 100644 --- a/src/world/partner/goombaria.c +++ b/src/world/partner/goombaria.c @@ -46,25 +46,25 @@ ApiStatus GoombariaPutAway(Evt* script, s32 isInitialCall) { return partner_put_away(goombaria) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_goombaria_take_out = { +EvtScript world_goombaria_take_out = { EVT_CALL(GoombariaTakeOut) EVT_RETURN EVT_END }; -EvtSource world_goombaria_update = { +EvtScript world_goombaria_update = { EVT_CALL(GoombariaUpdate) EVT_RETURN EVT_END }; -EvtSource world_goombaria_use_ability = { +EvtScript world_goombaria_use_ability = { EVT_CALL(GoombariaUseAbility) EVT_RETURN EVT_END }; -EvtSource world_goombaria_put_away = { +EvtScript world_goombaria_put_away = { EVT_CALL(GoombariaPutAway) EVT_RETURN EVT_END diff --git a/src/world/partner/goombaria.h b/src/world/partner/goombaria.h index 36fe910f48..010a0d6334 100644 --- a/src/world/partner/goombaria.h +++ b/src/world/partner/goombaria.h @@ -6,9 +6,9 @@ void world_goombaria_init(Npc* partner); -extern EvtSource world_goombaria_take_out; -extern EvtSource world_goombaria_update; -extern EvtSource world_goombaria_use_ability; -extern EvtSource world_goombaria_put_away; +extern EvtScript world_goombaria_take_out; +extern EvtScript world_goombaria_update; +extern EvtScript world_goombaria_use_ability; +extern EvtScript world_goombaria_put_away; #endif diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index fc5e3c1997..284fb301d7 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -31,8 +31,8 @@ s32 func_802BD100_317020(s32 arg0) { for (i = 0; i < 0x40; i++) { Trigger* trigger = get_trigger_by_id(i); - if (trigger != NULL && trigger->flags.flags & TRIGGER_WALL_PRESS_A && trigger->params2 == arg0) { - return trigger->unk_2C; + if (trigger != NULL && trigger->flags.flags & TRIGGER_WALL_PRESS_A && trigger->location.colliderID == arg0) { + return trigger->unk_tr_2C; } } return 0; @@ -54,7 +54,7 @@ ApiStatus func_802BD188_3170A8(Evt* script, s32 isInitialCall) { return partner_get_out(goombario) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_goombario_take_out = { +EvtScript world_goombario_take_out = { EVT_CALL(func_802BD188_3170A8) EVT_RETURN EVT_END @@ -145,7 +145,7 @@ s32 func_802BD1D0_3170F0(Evt* script, s32 isInitialCall) { return 0; } -EvtSource world_goombario_update = { +EvtScript world_goombario_update = { EVT_CALL(func_802BD1D0_3170F0) EVT_RETURN EVT_END @@ -196,7 +196,7 @@ ApiStatus func_802BDB30_317A50(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource world_goombario_use_ability = { +EvtScript world_goombario_use_ability = { EVT_CALL(func_802BD5D8_3174F8) EVT_IF_EQ(EVT_VAR(0), -1) EVT_RETURN @@ -225,7 +225,7 @@ ApiStatus func_802BDB84(Evt* script, s32 isInitialCall) { return partner_put_away(goombario) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_goombario_put_away = { +EvtScript world_goombario_put_away = { EVT_CALL(func_802BDB84) EVT_RETURN EVT_END diff --git a/src/world/partner/goombario.h b/src/world/partner/goombario.h index 376db4a9d5..86223102ac 100644 --- a/src/world/partner/goombario.h +++ b/src/world/partner/goombario.h @@ -9,9 +9,9 @@ s32 world_goombario_can_pause(Npc* partner); ApiStatus func_802BDB84(Evt* script, s32 isInitialCall); void world_goombario_pre_battle(Npc* partner); -extern EvtSource world_goombario_take_out; -extern EvtSource world_goombario_update; -extern EvtSource world_goombario_use_ability; -extern EvtSource world_goombario_put_away; +extern EvtScript world_goombario_take_out; +extern EvtScript world_goombario_update; +extern EvtScript world_goombario_use_ability; +extern EvtScript world_goombario_put_away; #endif diff --git a/src/world/partner/goompa.c b/src/world/partner/goompa.c index 9934de2428..027a57687a 100644 --- a/src/world/partner/goompa.c +++ b/src/world/partner/goompa.c @@ -19,7 +19,7 @@ ApiStatus GoompaTakeOut(Evt* script, s32 isInitialCall) { return partner_get_out(goompa) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_goompa_take_out = { +EvtScript world_goompa_take_out = { EVT_CALL(GoompaTakeOut) EVT_RETURN EVT_END @@ -111,7 +111,7 @@ ApiStatus func_802BD14C_324A5C(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_goompa_update = { +EvtScript world_goompa_update = { EVT_CALL(func_802BD14C_324A5C) EVT_RETURN EVT_END @@ -130,7 +130,7 @@ ApiStatus GoompaUseAbility(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -EvtSource world_goompa_use_ability = { +EvtScript world_goompa_use_ability = { EVT_CALL(GoompaUseAbility) EVT_RETURN EVT_END @@ -146,7 +146,7 @@ ApiStatus GoompaPutAway(Evt* script, s32 isInitialCall) { return partner_put_away(goompa) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_goompa_put_away = { +EvtScript world_goompa_put_away = { EVT_CALL(GoompaPutAway) EVT_RETURN EVT_END diff --git a/src/world/partner/goompa.h b/src/world/partner/goompa.h index 6f492da6fb..6d0e05a385 100644 --- a/src/world/partner/goompa.h +++ b/src/world/partner/goompa.h @@ -6,9 +6,9 @@ void world_goompa_init(Npc* partner); -extern EvtSource world_goompa_take_out; -extern EvtSource world_goompa_update; -extern EvtSource world_goompa_use_ability; -extern EvtSource world_goompa_put_away; +extern EvtScript world_goompa_take_out; +extern EvtScript world_goompa_update; +extern EvtScript world_goompa_use_ability; +extern EvtScript world_goompa_put_away; #endif diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index dfedb1f1a9..6f92e29616 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -74,7 +74,7 @@ ApiStatus func_802BD228_31B248(Evt* script, s32 isInitialCall) { return partner_get_out(kooper) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_kooper_take_out = { +EvtScript world_kooper_take_out = { EVT_CALL(func_802BD228_31B248) EVT_RETURN EVT_END @@ -167,7 +167,7 @@ ApiStatus func_802BD260_31B280(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_kooper_update = { +EvtScript world_kooper_update = { EVT_CALL(func_802BD260_31B280) EVT_RETURN EVT_END @@ -614,7 +614,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/partner/kooper", func_802BD638_31B658); #endif -EvtSource world_kooper_use_ability = { +EvtScript world_kooper_use_ability = { EVT_CALL(func_802BD638_31B658) EVT_RETURN EVT_END @@ -630,7 +630,7 @@ ApiStatus func_802BE7E0_31C800(Evt* script, s32 isInitialCall) { return partner_put_away(kooper) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_kooper_put_away = { +EvtScript world_kooper_put_away = { EVT_CALL(func_802BE7E0_31C800) EVT_RETURN EVT_END diff --git a/src/world/partner/kooper.h b/src/world/partner/kooper.h index 2719e15925..4cf139aa25 100644 --- a/src/world/partner/kooper.h +++ b/src/world/partner/kooper.h @@ -9,9 +9,9 @@ void world_kooper_test_first_strike(Npc*); void world_kooper_pre_battle(Npc*); void world_kooper_post_battle(Npc*); -extern EvtSource world_kooper_take_out; -extern EvtSource world_kooper_update; -extern EvtSource world_kooper_use_ability; -extern EvtSource world_kooper_put_away; +extern EvtScript world_kooper_take_out; +extern EvtScript world_kooper_update; +extern EvtScript world_kooper_use_ability; +extern EvtScript world_kooper_put_away; #endif diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 24d54e94ad..7aaf872a84 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -75,7 +75,7 @@ ApiStatus func_802BD29C_320DEC(Evt* script, s32 isInitialCall) { return partner_get_out(lakilester) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_lakilester_take_out = { +EvtScript world_lakilester_take_out = { EVT_CALL(func_802BD29C_320DEC) EVT_RETURN EVT_END @@ -167,7 +167,7 @@ ApiStatus func_802BD2D4_320E24(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_lakilester_update = { +EvtScript world_lakilester_update = { EVT_CALL(func_802BD2D4_320E24) EVT_RETURN EVT_END @@ -549,7 +549,7 @@ s32 func_802BE6A0_3221F0(f32* arg0) { ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "world/partner/lakilester", func_802BE724_322274); -EvtSource world_lakilester_use_ability = { +EvtScript world_lakilester_use_ability = { EVT_CALL(func_802BE724_322274) EVT_RETURN EVT_END @@ -687,7 +687,7 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_lakilester_put_away = { +EvtScript world_lakilester_put_away = { EVT_CALL(func_802BF4F0_323040) EVT_RETURN EVT_END @@ -820,7 +820,7 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_lakilester_while_riding = { +EvtScript world_lakilester_while_riding = { EVT_CALL(func_802BFBA0_3236F0) EVT_RETURN EVT_END diff --git a/src/world/partner/lakilester.h b/src/world/partner/lakilester.h index e16cdb83e5..456020f000 100644 --- a/src/world/partner/lakilester.h +++ b/src/world/partner/lakilester.h @@ -8,10 +8,10 @@ void world_lakilester_init(Npc*); void world_lakilester_pre_battle(Npc*); void world_lakilester_post_battle(Npc*); -extern EvtSource world_lakilester_take_out; -extern EvtSource world_lakilester_update; -extern EvtSource world_lakilester_use_ability; -extern EvtSource world_lakilester_put_away; -extern EvtSource world_lakilester_while_riding; +extern EvtScript world_lakilester_take_out; +extern EvtScript world_lakilester_update; +extern EvtScript world_lakilester_use_ability; +extern EvtScript world_lakilester_put_away; +extern EvtScript world_lakilester_while_riding; #endif diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index d25ea56c47..dea25711bf 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -30,7 +30,7 @@ ApiStatus func_802BD148_3196B8(Evt* script, s32 isInitialCall) { return partner_get_out(parakarry) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_parakarry_take_out = { +EvtScript world_parakarry_take_out = { EVT_CALL(func_802BD148_3196B8) EVT_RETURN EVT_END @@ -121,7 +121,7 @@ ApiStatus func_802BD180_3196F0(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_parakarry_update = { +EvtScript world_parakarry_update = { EVT_CALL(func_802BD180_3196F0) EVT_RETURN EVT_END @@ -161,7 +161,7 @@ s32 func_802BD558_319AC8(void) { s32 func_802BD660_319BD0(void); INCLUDE_ASM(s32, "world/partner/parakarry", func_802BD660_319BD0); -EvtSource world_parakarry_use_ability = { +EvtScript world_parakarry_use_ability = { EVT_CALL(func_802BD660_319BD0) EVT_RETURN EVT_END @@ -177,7 +177,7 @@ ApiStatus func_802BE8D4_31AE44(Evt* script, s32 isInitialCall) { return partner_put_away(parakarry) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_parakarry_put_away = { +EvtScript world_parakarry_put_away = { EVT_CALL(func_802BE8D4_31AE44) EVT_RETURN EVT_END diff --git a/src/world/partner/parakarry.h b/src/world/partner/parakarry.h index 7dad5be0af..c4b9ebd4a6 100644 --- a/src/world/partner/parakarry.h +++ b/src/world/partner/parakarry.h @@ -8,9 +8,9 @@ void world_parakarry_init(Npc*); void world_parakarry_pre_battle(Npc*); void world_parakarry_post_battle(Npc*); -extern EvtSource world_parakarry_take_out; -extern EvtSource world_parakarry_update; -extern EvtSource world_parakarry_use_ability; -extern EvtSource world_parakarry_put_away; +extern EvtScript world_parakarry_take_out; +extern EvtScript world_parakarry_update; +extern EvtScript world_parakarry_use_ability; +extern EvtScript world_parakarry_put_away; #endif diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index 9a66e36ca9..adb9756b13 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -112,7 +112,7 @@ s32 func_802BE280_31EFF0(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f3 void func_802BE3A4_31F114(Npc*); INCLUDE_ASM(s32, "world/partner/sushie", func_802BE3A4_31F114); -EvtSource world_sushie_use_ability = { +EvtScript world_sushie_use_ability = { EVT_CALL(func_802BE3A4_31F114) EVT_RETURN EVT_END @@ -139,7 +139,7 @@ s32 func_802BF568_3202D8(Evt* script, s32 isInitialCall) { return partner_get_out(sushie) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_sushie_take_out = { +EvtScript world_sushie_take_out = { EVT_CALL(func_802BF568_3202D8) EVT_RETURN EVT_END @@ -228,7 +228,7 @@ ApiStatus func_802BF5A0_320310(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_sushie_update = { +EvtScript world_sushie_update = { EVT_CALL(func_802BF5A0_320310) EVT_RETURN EVT_END @@ -254,7 +254,7 @@ s32 func_802BF964_3206D4(Evt* script, s32 isInitialCall) { return partner_put_away(sushie) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_sushie_put_away = { +EvtScript world_sushie_put_away = { EVT_CALL(func_802BF964_3206D4) EVT_RETURN EVT_END @@ -362,7 +362,7 @@ s32 func_802BFAB8_320828(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -EvtSource world_sushie_while_riding = { +EvtScript world_sushie_while_riding = { EVT_CALL(func_802BFAB8_320828) EVT_RETURN EVT_END diff --git a/src/world/partner/sushie.h b/src/world/partner/sushie.h index 18aaf060f1..ea44bddebc 100644 --- a/src/world/partner/sushie.h +++ b/src/world/partner/sushie.h @@ -8,10 +8,10 @@ void world_sushie_init(Npc*); void world_sushie_pre_battle(Npc*); void world_sushie_post_battle(Npc*); -extern EvtSource world_sushie_take_out; -extern EvtSource world_sushie_update; -extern EvtSource world_sushie_use_ability; -extern EvtSource world_sushie_put_away; -extern EvtSource world_sushie_while_riding; +extern EvtScript world_sushie_take_out; +extern EvtScript world_sushie_update; +extern EvtScript world_sushie_use_ability; +extern EvtScript world_sushie_put_away; +extern EvtScript world_sushie_while_riding; #endif diff --git a/src/world/partner/twink.c b/src/world/partner/twink.c index fa615d22c5..d145f901bb 100644 --- a/src/world/partner/twink.c +++ b/src/world/partner/twink.c @@ -46,25 +46,25 @@ ApiStatus TwinkPutAway(Evt* script, s32 isInitialCall) { return partner_put_away(twink) ? ApiStatus_DONE1 : ApiStatus_BLOCK; } -EvtSource world_twink_take_out = { +EvtScript world_twink_take_out = { EVT_CALL(TwinkTakeOut) EVT_RETURN EVT_END }; -EvtSource world_twink_update = { +EvtScript world_twink_update = { EVT_CALL(TwinkUpdate) EVT_RETURN EVT_END }; -EvtSource world_twink_use_ability = { +EvtScript world_twink_use_ability = { EVT_CALL(TwinkUseAbility) EVT_RETURN EVT_END }; -EvtSource world_twink_put_away = { +EvtScript world_twink_put_away = { EVT_CALL(TwinkPutAway) EVT_RETURN EVT_END diff --git a/src/world/partner/twink.h b/src/world/partner/twink.h index 6f8f6659cb..54665da80d 100644 --- a/src/world/partner/twink.h +++ b/src/world/partner/twink.h @@ -6,9 +6,9 @@ void world_twink_init(Npc* partner); -extern EvtSource world_twink_take_out; -extern EvtSource world_twink_update; -extern EvtSource world_twink_use_ability; -extern EvtSource world_twink_put_away; +extern EvtScript world_twink_take_out; +extern EvtScript world_twink_update; +extern EvtScript world_twink_use_ability; +extern EvtScript world_twink_put_away; #endif diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c index 1d735db3a1..63faece2b2 100644 --- a/src/world/partner/watt.c +++ b/src/world/partner/watt.c @@ -81,7 +81,7 @@ ApiStatus func_802BD27C_31CDEC(Evt* script, s32 isInitialCall) { } } -EvtSource world_watt_take_out = { +EvtScript world_watt_take_out = { EVT_CALL(func_802BD27C_31CDEC) EVT_RETURN EVT_END @@ -203,7 +203,7 @@ ApiStatus func_802BD2B4_31CE24(Evt* script, s32 isInitialCall) { return 0; } -EvtSource world_watt_update = { +EvtScript world_watt_update = { EVT_CALL(func_802BD2B4_31CE24) EVT_RETURN EVT_END @@ -221,7 +221,7 @@ void func_802BD710_31D280(Npc* watt) { s32 func_802BD754_31D2C4(void); INCLUDE_ASM(s32, "world/partner/watt", func_802BD754_31D2C4); -EvtSource world_watt_use_ability = { +EvtScript world_watt_use_ability = { EVT_CALL(func_802BD754_31D2C4) EVT_RETURN EVT_END @@ -249,7 +249,7 @@ s32 func_802BDD0C_31D87C(Evt* script, s32 isInitialCall) { } } -EvtSource world_watt_put_away = { +EvtScript world_watt_put_away = { EVT_CALL(func_802BDD0C_31D87C) EVT_RETURN EVT_END @@ -385,7 +385,7 @@ void func_802BE070_31DBE0(void) { } } -EvtSource world_watt_while_riding = { +EvtScript world_watt_while_riding = { EVT_CALL(func_802BDE88_31D9F8) EVT_RETURN EVT_END diff --git a/src/world/partner/watt.h b/src/world/partner/watt.h index 9e76b967d7..670d96d632 100644 --- a/src/world/partner/watt.h +++ b/src/world/partner/watt.h @@ -8,10 +8,10 @@ void world_watt_init(Npc*); void world_watt_pre_battle(Npc*); void world_watt_post_battle(Npc*); -extern EvtSource world_watt_take_out; -extern EvtSource world_watt_update; -extern EvtSource world_watt_use_ability; -extern EvtSource world_watt_put_away; -extern EvtSource world_watt_while_riding; +extern EvtScript world_watt_take_out; +extern EvtScript world_watt_update; +extern EvtScript world_watt_use_ability; +extern EvtScript world_watt_put_away; +extern EvtScript world_watt_while_riding; #endif diff --git a/src/world/partners.c b/src/world/partners.c index 5090735711..4a2d68ed5d 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -37,55 +37,55 @@ #include "partner/twink.h" #include "sprite/npc/twink.h" -extern HudElementAnim HudScript_Partner0[]; -extern HudElementAnim HudScript_Goombario[]; -extern HudElementAnim HudScript_Kooper[]; -extern HudElementAnim HudScript_Bombette[]; -extern HudElementAnim HudScript_Parakarry[]; -extern HudElementAnim HudScript_Watt[]; -extern HudElementAnim HudScript_Sushie[]; -extern HudElementAnim HudScript_Lakilester[]; -extern HudElementAnim HudScript_Bow[]; -extern HudElementAnim HudScript_PartnerA[]; -extern HudElementAnim HudScript_Partner0Disabled[]; -extern HudElementAnim HudScript_GoombarioDisabled[]; -extern HudElementAnim HudScript_KooperDisabled[]; -extern HudElementAnim HudScript_BombetteDisabled[]; -extern HudElementAnim HudScript_ParakarryDisabled[]; -extern HudElementAnim HudScript_WattDisabled[]; -extern HudElementAnim HudScript_SushieDisabled[]; -extern HudElementAnim HudScript_LakilesterDisabled[]; -extern HudElementAnim HudScript_BowDisabled[]; -extern HudElementAnim HudScript_PartnerADisabled[]; +extern HudScript HudScript_Partner0[]; +extern HudScript HudScript_Goombario[]; +extern HudScript HudScript_Kooper[]; +extern HudScript HudScript_Bombette[]; +extern HudScript HudScript_Parakarry[]; +extern HudScript HudScript_Watt[]; +extern HudScript HudScript_Sushie[]; +extern HudScript HudScript_Lakilester[]; +extern HudScript HudScript_Bow[]; +extern HudScript HudScript_PartnerA[]; +extern HudScript HudScript_Partner0Disabled[]; +extern HudScript HudScript_GoombarioDisabled[]; +extern HudScript HudScript_KooperDisabled[]; +extern HudScript HudScript_BombetteDisabled[]; +extern HudScript HudScript_ParakarryDisabled[]; +extern HudScript HudScript_WattDisabled[]; +extern HudScript HudScript_SushieDisabled[]; +extern HudScript HudScript_LakilesterDisabled[]; +extern HudScript HudScript_BowDisabled[]; +extern HudScript HudScript_PartnerADisabled[]; -extern HudElementAnim HudScript_StatusDigit0[]; -extern HudElementAnim HudScript_StatusDigit1[]; -extern HudElementAnim HudScript_StatusDigit2[]; -extern HudElementAnim HudScript_StatusDigit3[]; -extern HudElementAnim HudScript_StatusDigit4[]; -extern HudElementAnim HudScript_StatusDigit5[]; -extern HudElementAnim HudScript_StatusDigit6[]; -extern HudElementAnim HudScript_StatusDigit7[]; -extern HudElementAnim HudScript_StatusDigit8[]; -extern HudElementAnim HudScript_StatusDigit9[]; -extern HudElementAnim HudScript_StatusTimes[]; -extern HudElementAnim HudScript_StatusSlash[]; +extern HudScript HudScript_StatusDigit0[]; +extern HudScript HudScript_StatusDigit1[]; +extern HudScript HudScript_StatusDigit2[]; +extern HudScript HudScript_StatusDigit3[]; +extern HudScript HudScript_StatusDigit4[]; +extern HudScript HudScript_StatusDigit5[]; +extern HudScript HudScript_StatusDigit6[]; +extern HudScript HudScript_StatusDigit7[]; +extern HudScript HudScript_StatusDigit8[]; +extern HudScript HudScript_StatusDigit9[]; +extern HudScript HudScript_StatusTimes[]; +extern HudScript HudScript_StatusSlash[]; -extern HudElementAnim HudScript_StatusStar1[]; -extern HudElementAnim HudScript_StatusStar2[]; -extern HudElementAnim HudScript_StatusStar3[]; -extern HudElementAnim HudScript_StatusStar4[]; -extern HudElementAnim HudScript_StatusStar5[]; -extern HudElementAnim HudScript_StatusStar6[]; -extern HudElementAnim HudScript_StatusStar7[]; +extern HudScript HudScript_StatusStar1[]; +extern HudScript HudScript_StatusStar2[]; +extern HudScript HudScript_StatusStar3[]; +extern HudScript HudScript_StatusStar4[]; +extern HudScript HudScript_StatusStar5[]; +extern HudScript HudScript_StatusStar6[]; +extern HudScript HudScript_StatusStar7[]; -extern HudElementAnim HudScript_StatusSPIncrement1[]; -extern HudElementAnim HudScript_StatusSPIncrement2[]; -extern HudElementAnim HudScript_StatusSPIncrement3[]; -extern HudElementAnim HudScript_StatusSPIncrement4[]; -extern HudElementAnim HudScript_StatusSPIncrement5[]; -extern HudElementAnim HudScript_StatusSPIncrement6[]; -extern HudElementAnim HudScript_StatusSPIncrement7[]; +extern HudScript HudScript_StatusSPIncrement1[]; +extern HudScript HudScript_StatusSPIncrement2[]; +extern HudScript HudScript_StatusSPIncrement3[]; +extern HudScript HudScript_StatusSPIncrement4[]; +extern HudScript HudScript_StatusSPIncrement5[]; +extern HudScript HudScript_StatusSPIncrement6[]; +extern HudScript HudScript_StatusSPIncrement7[]; extern f32 wPartnerTetherDistance; extern s16 D_8010CFC8; @@ -97,7 +97,7 @@ extern s32 D_8010CFBC; extern s32 D_8010CFCC; extern struct player_path_element PlayerMoveHistory[40]; -extern EvtSource D_802C05CC_32579C; +extern EvtScript D_802C05CC_32579C; typedef struct player_path_element{ /* 0x00 */ s8 isJumping; @@ -110,27 +110,27 @@ s32 world_partner_can_player_pause_default(Npc* partner); void _use_partner_ability(void); // Partner icons -HudElementAnim* wPartnerHudScripts[] = { +HudScript* wPartnerHudScripts[] = { HudScript_Partner0, HudScript_Goombario, HudScript_Kooper, HudScript_Bombette, HudScript_Parakarry, HudScript_Partner0, HudScript_Watt, HudScript_Sushie, HudScript_Lakilester, HudScript_Bow, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, HudScript_PartnerA, }; -HudElementAnim* wDisabledPartnerHudScripts[] = { +HudScript* wDisabledPartnerHudScripts[] = { HudScript_Partner0Disabled, HudScript_GoombarioDisabled, HudScript_KooperDisabled, HudScript_BombetteDisabled, HudScript_ParakarryDisabled, HudScript_Partner0Disabled, HudScript_WattDisabled, HudScript_SushieDisabled, HudScript_LakilesterDisabled, HudScript_BowDisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, HudScript_PartnerADisabled, }; -HudElementAnim* DigitHudScripts[] = { +HudScript* DigitHudScripts[] = { HudScript_StatusDigit0, HudScript_StatusDigit1, HudScript_StatusDigit2, HudScript_StatusDigit3, HudScript_StatusDigit4, HudScript_StatusDigit5, HudScript_StatusDigit6, HudScript_StatusDigit7, HudScript_StatusDigit8, HudScript_StatusDigit9, }; -HudElementAnim* TimesHudScript = HudScript_StatusTimes; -HudElementAnim* SlashHudScript = HudScript_StatusSlash; -HudElementAnim* SPIncrementHudScripts[] = { HudScript_StatusSPIncrement1, HudScript_StatusSPIncrement3, HudScript_StatusSPIncrement2, +HudScript* TimesHudScript = HudScript_StatusTimes; +HudScript* SlashHudScript = HudScript_StatusSlash; +HudScript* SPIncrementHudScripts[] = { HudScript_StatusSPIncrement1, HudScript_StatusSPIncrement3, HudScript_StatusSPIncrement2, HudScript_StatusSPIncrement4, HudScript_StatusSPIncrement5, HudScript_StatusSPIncrement6, HudScript_StatusSPIncrement7 }; -HudElementAnim* SPStarHudScripts[] = { HudScript_StatusStar1, HudScript_StatusStar3, HudScript_StatusStar2, HudScript_StatusStar4, +HudScript* SPStarHudScripts[] = { HudScript_StatusStar1, HudScript_StatusStar3, HudScript_StatusStar2, HudScript_StatusStar4, HudScript_StatusStar5, HudScript_StatusStar6, HudScript_StatusStar7 }; s32 D_800F7FE8 = -1; diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 6606d4cb96..2a9f1cb7a8 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -12,7 +12,7 @@ extern s32 D_80286524; extern s32 D_80286530; extern s32 D_80286534; extern Evt* D_8028652C; -extern HudElementAnim* HudScript_Item_Coin; +extern HudScript* HudScript_Item_Coin; extern s32 D_8014F150[64]; ApiStatus func_802803C8(Evt* script, s32 isInitialCall); @@ -20,32 +20,32 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall); ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall); ApiStatus ShowShopOwnerDialog(Evt* script, s32 isInitialCall); -EvtSource ShopBeginSpeech = { +EvtScript ShopBeginSpeech = { EVT_CALL(SpeakToPlayer, LW(1), LW(2), LW(3), 0, LW(0)) EVT_RETURN EVT_END }; -EvtSource ShopContinueSpeech = { +EvtScript ShopContinueSpeech = { EVT_CALL(ContinueSpeech, LW(1), LW(2), LW(3), 0, LW(0)) EVT_RETURN EVT_END }; -EvtSource ShopResetSpeech = { +EvtScript ShopResetSpeech = { EVT_CALL(EndSpeech, LW(1), LW(2), LW(3), 0) EVT_CALL(SpeakToPlayer, LW(1), LW(2), LW(3), 0, LW(0)) EVT_RETURN EVT_END }; -EvtSource ShopEndSpeech = { +EvtScript ShopEndSpeech = { EVT_CALL(EndSpeech, LW(0), LW(1), LW(2), 0) EVT_RETURN EVT_END }; -EvtSource D_80283F58_7E4DD8 = { +EvtScript D_80283F58_7E4DD8 = { EVT_CALL(GetCurrentPartner, LW(1)) EVT_IF_EQ(LW(1), 0) EVT_GOTO(10) @@ -67,13 +67,13 @@ EvtSource D_80283F58_7E4DD8 = { EVT_END }; -EvtSource BadgeShopInteract = { +EvtScript BadgeShopInteract = { EVT_CALL(ShowShopPurchaseDialog, LW(0)) EVT_RETURN EVT_END }; -EvtSource D_80284054_7E4ED4 = { +EvtScript D_80284054_7E4ED4 = { EVT_CALL(ShowShopOwnerDialog) EVT_RETURN EVT_END @@ -245,11 +245,11 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { GameStatus* gameStatus = gGameStatusPtr; s32 shopItemSlot = script->varTable[0]; Shop* shop = gameStatus->mapShop; - StaticInventoryItem* shopInventory = &shop->staticInventory[shopItemSlot]; - StaticItem* shopItem = &gItemTable[shopInventory->itemID]; + ShopItemData* shopInventory = &shop->staticInventory[shopItemSlot]; + ItemData* shopItem = &gItemTable[shopInventory->itemID]; ShopOwner* shopOwner; Evt* shopOwnerScript; - EvtSource* shopOwnerScriptSource; + EvtScript* shopOwnerScriptSource; s32 bpCost; s32 args; @@ -336,7 +336,7 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { shopOwner = shop->owner; D_8028652C = NULL; if (shopOwner != NULL) { - shopOwnerScriptSource = shopOwner->unk_0C; + shopOwnerScriptSource = shopOwner->onBuyEvt; if (shopOwnerScriptSource != NULL) { shopOwnerScript = start_script(shopOwnerScriptSource, 1, 0); D_8028652C = shopOwnerScript; @@ -361,7 +361,7 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { //dumb stuff #ifdef NON_EQUIVALENT -extern s32 gItemHudScripts[337][2]; +extern HudScriptAnim* gItemHudScripts[337][2]; void shop_open_item_select_popup(s32 mode) { Shop* shop = gGameStatusPtr->mapShop; @@ -451,7 +451,7 @@ void shop_close_item_select_popup(void) { s32 shop_get_sell_price(s32 itemID) { Shop* shop = gGameStatusPtr->mapShop; s32 numItems = shop->numSpecialPrices; - StaticPriceItem* items = shop->staticPriceList; + ShopSellPriceData* items = shop->staticPriceList; s32 i; if (shop) { @@ -472,7 +472,7 @@ ApiStatus ShowShopOwnerDialog(Evt* script, s32 isInitialCall) { GameStatus* gameStatus = gGameStatusPtr; PlayerData* playerData = &gPlayerData; Shop* shop = gameStatus->mapShop; - StaticItem* item; + ItemData* item; s32 temp_v1_2; if (isInitialCall) { @@ -730,8 +730,8 @@ ApiStatus ShowShopOwnerDialog(Evt* script, s32 isInitialCall) { break; case 10: if (shop->owner != NULL) { - if (shop->owner->unk_14 != 0) { - start_script(shop->owner->unk_14, 1, 0); + if (shop->owner->onTalkEvt != 0) { + start_script(shop->owner->onTalkEvt, 1, 0); } } open_status_menu_short(); @@ -742,15 +742,15 @@ ApiStatus ShowShopOwnerDialog(Evt* script, s32 isInitialCall) { void shop_draw_item_name(s32 arg0, s32 posX, s32 posY) { Shop* shop = gGameStatusPtr->mapShop; - StaticInventoryItem* siItem = &shop->staticInventory[shop->currentItemSlot]; - StaticItem* shopItem = &gItemTable[siItem->itemID]; + ShopItemData* siItem = &shop->staticInventory[shop->currentItemSlot]; + ItemData* shopItem = &gItemTable[siItem->itemID]; draw_msg(shopItem->nameMsg, posX + 60 - (get_msg_width(shopItem->nameMsg, 0) >> 1), posY + 6, 255, 0, 0); } void shop_draw_item_desc(s32 arg0, s32 posX, s32 posY) { Shop* shop = gGameStatusPtr->mapShop; - StaticInventoryItem* shopItem = &shop->staticInventory[shop->currentItemSlot]; + ShopItemData* shopItem = &shop->staticInventory[shop->currentItemSlot]; draw_msg(shopItem->unk_08, posX + 8, posY, 255, 0xA, 0); } @@ -760,7 +760,7 @@ extern void draw_shop_items(void); #ifdef NON_EQUIVALENT void draw_shop_items(void) { Shop* shop = gGameStatusPtr->mapShop; - StaticInventoryItem* staticItems; + ShopItemData* ItemDatas; Camera* camera; s32 i; s32 xTemp; @@ -780,7 +780,7 @@ void draw_shop_items(void) { if (shop->flags & SHOP_FLAGS_1) { camera = &gCameras[gCurrentCameraID]; - staticItems = shop->staticInventory; + ItemDatas = shop->staticInventory; shopItemEntities = gGameStatusPtr->shopItemEntities; for (i = 0; i < shop->numItems; i++) { @@ -800,14 +800,14 @@ void draw_shop_items(void) { xTemp = (((x * camera->viewportW) + camera->viewportW) * 0.5) + camera->viewportStartX; yTemp = (((y * camera->viewportH) + camera->viewportH) * 0.5) + camera->viewportStartY; - if (staticItems[i].price < 100) { + if (ItemDatas[i].price < 100) { xOffset = -4; } else { xOffset = 0; } if (!(get_item_entity(shopItemEntities[i].index)->flags & 0x40)) { - draw_number(staticItems[i].price, xTemp + xOffset, yTemp, 1, 0, 255, 0); + draw_number(ItemDatas[i].price, xTemp + xOffset, yTemp, 1, 0, 255, 0); } if (i == shop->currentItemSlot) { @@ -835,9 +835,9 @@ INCLUDE_ASM(s32, "world/script_api/7E0E80", draw_shop_items); #ifdef NON_MATCHING s32 MakeShop(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ShopItemLocation* staticItemPositions = evt_get_variable(script, *args++); - StaticInventoryItem* inventory = evt_get_variable(script, *args++); - StaticPriceItem* prices = evt_get_variable(script, *args++); + ShopItemLocation* ItemDataPositions = evt_get_variable(script, *args++); + ShopItemData* inventory = evt_get_variable(script, *args++); + ShopSellPriceData* prices = evt_get_variable(script, *args++); s32 inventoryItemFlags = evt_get_variable(script, *args++); Shop* shop = heap_malloc(sizeof(Shop)); Model* model; @@ -851,7 +851,7 @@ s32 MakeShop(Evt* script, s32 isInitialCall) { s32 items; gGameStatusPtr->mapShop = shop; - shop->staticItemPositions = staticItemPositions; + shop->ItemDataPositions = ItemDataPositions; shop->staticInventory = inventory; shop->staticPriceList = prices; shop->inventoryItemFlags = inventoryItemFlags; @@ -881,21 +881,21 @@ s32 MakeShop(Evt* script, s32 isInitialCall) { } inventory = shop->staticInventory; - staticItemPositions = shop->staticItemPositions; + ItemDataPositions = shop->ItemDataPositions; numShopItems = 0; while (inventory->itemID != 0) { - get_model_center_and_size(staticItemPositions->posModelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + get_model_center_and_size(ItemDataPositions->posModelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); centerY += 6; gGameStatusPtr->shopItemEntities[numShopItems].pos.x = centerX; gGameStatusPtr->shopItemEntities[numShopItems].pos.y = centerY; gGameStatusPtr->shopItemEntities[numShopItems].pos.z = centerZ; - model = get_model_from_list_index(get_model_list_index_from_tree_index(staticItemPositions->posModelID)); + model = get_model_from_list_index(get_model_list_index_from_tree_index(ItemDataPositions->posModelID)); model->flags |= MODEL_FLAGS_FLAG_4; gGameStatusPtr->shopItemEntities[numShopItems].index = make_item_entity_nodelay(inventory->itemID | shop->inventoryItemFlags, centerX, centerY, centerZ, 1, 0); set_item_entity_flags(gGameStatusPtr->shopItemEntities[numShopItems].index, 0x4000); - bind_trigger_1(D_80283F58_7E4DD8, 0x80, staticItemPositions->triggerColliderID, numShopItems, 0, 3); - bind_trigger_1(D_80283F58_7E4DD8, 0x800, staticItemPositions->triggerColliderID, numShopItems, 0, 3); - staticItemPositions++; + bind_trigger_1(D_80283F58_7E4DD8, 0x80, ItemDataPositions->triggerColliderID, numShopItems, 0, 3); + bind_trigger_1(D_80283F58_7E4DD8, 0x800, ItemDataPositions->triggerColliderID, numShopItems, 0, 3); + ItemDataPositions++; inventory++; numShopItems++; } diff --git a/tools/disasm_hud_element_animation.py b/tools/disasm_hud_element_animation.py index ca314600a4..38568fdb65 100755 --- a/tools/disasm_hud_element_animation.py +++ b/tools/disasm_hud_element_animation.py @@ -71,7 +71,7 @@ class HudElementScript(): indent = " " op = 99 - print(f"HudElementAnim {self.symbol} = {{") + print(f"HudScript {self.symbol} = {{") while op: op = next(buf, -1) diff --git a/tools/disasm_script.py b/tools/disasm_script.py index 1a6ca97ab7..36828f3bb4 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -722,7 +722,7 @@ class ScriptDisassembler: elif name.startswith("N(npcGroupList_"): prefix = "NpcGroupList " elif name.startswith("N("): - prefix = "EvtSource " + prefix = "EvtScript " else: toReplace = False @@ -767,10 +767,10 @@ class ScriptDisassembler: if self.prelude: try: - self.prefix_line(f"EvtSource D_{self.script_name - info[0] + info[2]:08X}_{self.script_name:08X} = {{") + self.prefix_line(f"EvtScript D_{self.script_name - info[0] + info[2]:08X}_{self.script_name:08X} = {{") self.write_line("};") except: - self.prefix_line(f"EvtSource {self.script_name} = {{") + self.prefix_line(f"EvtScript {self.script_name} = {{") self.write_line("};") self.done = True elif opcode == 0x02: self.write_line(f"EVT_RETURN") @@ -1062,11 +1062,11 @@ if __name__ == "__main__": print(f"========== 0x{gap_size:X} byte gap ({potential_count} {potential_struct}?) 0x{gap_start:X} - 0x{offset:X} ==========") print() gap = False - #print(f"EvtSource read from 0x{script.start_pos:X} to 0x{script.end_pos:X} " + #print(f"EvtScript read from 0x{script.start_pos:X} to 0x{script.end_pos:X} " # f"(0x{script.end_pos - script.start_pos:X} bytes, {script.instructions} instructions)") #print() vram = f"{args.vram:X}_" if vram_base > 0 else f"" - script_text = script_text.replace("EvtSource script = SCRIPT({", f"EvtSource N(D_{vram}{offset:X}) = " + "SCRIPT({") + script_text = script_text.replace("EvtScript script = SCRIPT({", f"EvtScript N(D_{vram}{offset:X}) = " + "SCRIPT({") print(script_text, end="") print() #print(f"Valid script found at 0x{offset:X}") @@ -1101,7 +1101,7 @@ if __name__ == "__main__": try: script_text = script.disassemble() - # print(f"EvtSource read from 0x{script.start_pos:X} to 0x{script.end_pos:X} " + # print(f"EvtScript read from 0x{script.start_pos:X} to 0x{script.end_pos:X} " # f"(0x{script.end_pos - script.start_pos:X} bytes, {script.instructions} instructions)") print() print(script_text, end="") diff --git a/tools/old/make_npc_structs.py b/tools/old/make_npc_structs.py index 53482e39f3..aeded3429c 100644 --- a/tools/old/make_npc_structs.py +++ b/tools/old/make_npc_structs.py @@ -659,7 +659,7 @@ offset, out = output_type2(fd, args.count, args.offset, STRUCTS[args.type]) for i,entry in enumerate(out): out[i] = "\n".join(entry) -print(f"EvtSource range 0x{args.offset:08X} - 0x{offset:08X}") +print(f"EvtScript range 0x{args.offset:08X} - 0x{offset:08X}") print() if args.type.lower() == "staticnpc": diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index dd831a94ff..ecfe519dcb 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -161,12 +161,12 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace if struct["type"].startswith("Script"): if struct["type"] == "Script_Main": name = "N(main)" - INCLUDES_NEEDED["forward"].append(f"EvtSource " + name + ";") + INCLUDES_NEEDED["forward"].append(f"EvtScript " + name + ";") main_script_name = name # For PlayMusic script if using a separate header file #if afterHeader: - # INCLUDES_NEEDED["forward"].append(f"EvtSource " + name + ";") + # INCLUDES_NEEDED["forward"].append(f"EvtScript " + name + ";") # afterHeader = False disasm_script.LOCAL_WORDS = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] script_text = disasm_script.ScriptDisassembler( @@ -192,7 +192,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace if "GotoMap" in script_text[4]: map_, entryIdx = script_text[4].split("(",1)[1].split(")",1)[0].split(",") if walkDistance and exitIdx and map_ and entryIdx: - out += f"EvtSource {name} = EXIT_WALK_SCRIPT({walkDistance}, {exitIdx}, {map_}, {entryIdx});\n" + out += f"EvtScript {name} = EXIT_WALK_SCRIPT({walkDistance}, {exitIdx}, {map_}, {entryIdx});\n" else: print(f"Unable to macro replace exit script {name}") out += "\n".join(script_text) + "\n" @@ -715,7 +715,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace if actor in symbol_map: out += f".actor = &{symbol_map[actor][0][1]}, " - s = f"ActorDesc {symbol_map[actor][0][1]};" + s = f"ActorBlueprint {symbol_map[actor][0][1]};" if s not in INCLUDES_NEEDED["forward"]: INCLUDES_NEEDED["forward"].append(s) else: @@ -843,7 +843,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace out += f"}};\n" elif struct["type"] == "PartsTable": - out += f"ActorPartDesc {struct['name']}[] = {{\n" + out += f"ActorPartBlueprint {struct['name']}[] = {{\n" for _ in range(0, struct["length"] // 36): d = unpack(">IbbbbbbhIIIIhxxxxxx", bytes.read(36)) @@ -863,7 +863,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace out += f"}};\n" elif struct["type"] == "Actor": - out += f"ActorDesc NAMESPACE = {{\n" + out += f"ActorBlueprint NAMESPACE = {{\n" d = unpack(">IxBBBhxxIIIBBBBBBBBbbbbbbbb", bytes.read(struct["length"])) diff --git a/ver/us/asm/data/10B610.data.s b/ver/us/asm/data/10B610.data.s index 996447f36d..bf238935f4 100644 --- a/ver/us/asm/data/10B610.data.s +++ b/ver/us/asm/data/10B610.data.s @@ -53,10 +53,10 @@ dlabel D_802EA044 dlabel D_802EA060 .word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000CC8, 0x00000002, 0x00000000 -dlabel D_802EA07C +dlabel Entity_InertYellowBlock .word 0x42000020, D_802E9F80, 0x00000000, entity_init_Hammer1Block_normal, D_802E9E0C, entity_block_handle_collision, 0x00E42240, 0x00E42740, 0x0B191919 -dlabel D_802EA0A0 +dlabel Entity_InertRedBlock .word 0x42000020, D_802E9F9C, 0x00000000, entity_init_Hammer1Block_normal, D_802E9E0C, entity_block_handle_collision, 0x00E42740, 0x00E431F0, 0x13191919 dlabel D_802EA0C4 @@ -128,7 +128,7 @@ dlabel D_802EA760 dlabel D_802EA77C .word 0x00000004, 0x00000022, 0x00000001, 0x0000003C, 0x0A000918, 0x00000002, 0x00000000, 0x42000020, D_802EA77C, 0x00000000, entity_base_block_init, D_802E9E0C, entity_block_handle_collision, 0x00E431F0, 0x00E43B20, 0x1F191919 -dlabel D_802EA7BC +dlabel Entity_HeartBlockContent .word 0x002000D8, D_802EA728, 0x00000000, entity_HeartBlockContent_init, D_802EA690, 0x00000000, 0x00E49E40, 0x00E4A6A0, 0x3F120612, 0x42000020, D_802EA77C, 0x00000000, entity_HeartBlock_init, D_802EA6EC, entity_block_handle_collision, 0x00E431F0, 0x00E43B20, 0x1B191919, 0x00000000, 0x00000000, 0x00000000 dlabel D_802EA810 @@ -144,10 +144,10 @@ dlabel D_802EA871 .byte 0x00, 0x02, 0x01, 0x02, 0x02, 0x14, 0x03, 0x02, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x00, 0x00 dlabel D_802EA880 -.word 0x00000003, 0x00000000, entity_SuperBlock_HitEffect_idle, 0x00000000 +.word 0x00000003, 0x00000000, entity_SuperBlockContent_idle, 0x00000000 dlabel D_802EA890 -.word 0x00000003, 0x00000000, entity_SuperBlock_HitEffect_idle, 0x00000000 +.word 0x00000003, 0x00000000, entity_SuperBlockContent_idle, 0x00000000 dlabel D_802EA8A0 .word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, 0x0A0008F8, 0x00000002, 0x00000000 @@ -161,8 +161,8 @@ dlabel D_802EA8D8 dlabel D_802EA8F4 .word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000, 0x42000020, D_802EA8A0, 0x00000000, entity_SuperBlock_init, D_802EA810, entity_block_handle_collision, 0x00E44800, 0x00E45110, 0x22191919 -dlabel D_802EA934 -.word 0x00200130, D_802EA8BC, 0x00000000, entity_init_SuperBlock_HitEffect1, D_802EA880, 0x00000000, 0x00E4A6A0, 0x00E4AA80, 0x41120612, 0x42000020, D_802EA8D8, 0x00000000, entity_UltraBlock_init, D_802EA810, entity_block_handle_collision, 0x00E45110, 0x00E459F0, 0x23191919, 0x00200130, D_802EA8F4, 0x00000000, entity_init_SuperBlock_HitEffect2, D_802EA890, 0x00000000, 0x00E4AA80, 0x00E4B2E0, 0x42120612 +dlabel Entity_SuperBlockContent +.word 0x00200130, D_802EA8BC, 0x00000000, entity_init_SuperBlockContent1, D_802EA880, 0x00000000, 0x00E4A6A0, 0x00E4AA80, 0x41120612, 0x42000020, D_802EA8D8, 0x00000000, entity_UltraBlock_init, D_802EA810, entity_block_handle_collision, 0x00E45110, 0x00E459F0, 0x23191919, 0x00200130, D_802EA8F4, 0x00000000, entity_init_SuperBlockContent2, D_802EA890, 0x00000000, 0x00E4AA80, 0x00E4B2E0, 0x42120612 dlabel D_802EA9A0 .word 0x00000003, 0x00000000, entity_ScriptSpring_idle, 0x00000003, 0x0000000A, 0x00000000, 0x00000004, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s b/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s index ff6074a862..41748aa2f5 100644 --- a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s @@ -24,4 +24,4 @@ dlabel D_80240A5C_986F3C .word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405F05, 0x00000001, 0x00000046, 0x00000001, D_8024075C_986C3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240AA8_986F88 -.word 0x00000024, 0x00000002, 0xF8405F00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFF62, 0xFFFFFE9A, 0xFFFFFDCE, 0x0000011B, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405F04, 0x00000044, 0x00000001, D_802408BC_986D9C, 0x0000000A, 0x00000002, 0xF8405F00, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA19C, 0xFFFFFEEE, 0xFFFFFE7A, 0xFFFFFDFB, 0x00000073, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240AA8_986F88, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000032, 0xFFFFFF10, 0xFFFFFDE9, 0x000000DE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405F05, 0x00000043, 0x00000002, AssignScript, D_80240A5C_986F3C, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFEBD, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFEBD, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFEBD, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFEBD, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFEBD, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFEBD, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFF3F, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFF3F, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFF3F, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFF3F, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFF3F, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFF3F, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFFC1, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFFC1, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFFC1, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFFC1, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFFC1, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFFC1, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405F00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFF62, 0xFFFFFE9A, 0xFFFFFDCE, 0x0000011B, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F04, 0x00000044, 0x00000001, D_802408BC_986D9C, 0x0000000A, 0x00000002, 0xF8405F00, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA19C, 0xFFFFFEEE, 0xFFFFFE7A, 0xFFFFFDFB, 0x00000073, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240AA8_986F88, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000032, 0xFFFFFF10, 0xFFFFFDE9, 0x000000DE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F05, 0x00000043, 0x00000002, AssignScript, D_80240A5C_986F3C, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFEBD, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFEBD, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFEBD, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFEBD, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFEBD, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFEBD, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFF3F, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFF3F, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFF3F, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFF3F, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFF3F, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFF3F, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFFC1, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFFC1, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFFC1, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFFC1, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFFC1, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFFC1, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s b/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s index 87db15f9fc..dc33a28e84 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s @@ -33,4 +33,4 @@ dlabel D_802417F0_91A3A0 .word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000013A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E31, 0x00000001, 0x00000046, 0x00000001, D_8024159C_91A14C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024183C_91A3EC -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802402BC_918E6C, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFF9D4, 0x00000017, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416E0_91A290, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFF911, 0x00000198, 0xFFFFFF88, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3E, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFD94, 0xFFFFFFF1, 0xFFFFFFBB, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3F, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFBBE, 0x00000198, 0xFFFFFF7E, 0x00000000, 0x000000A4, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E40, 0x00000043, 0x00000007, MakeItemEntity, 0x00000054, 0xFFFFFFEC, 0x0000005F, 0xFFFFFFAB, 0x00000011, 0xF8405E42, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFF8B7, 0x00000017, 0x00000014, 0x00000011, 0xF8405E30, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8E9, 0x00000017, 0x00000014, 0x00000011, 0xF8405E38, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF885, 0x00000017, 0x00000014, 0x00000011, 0xF8405E39, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3A, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3B, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x00000000, 0x00000011, 0xF8405E36, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x0000003C, 0x00000011, 0xF8405E37, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFF94B, 0x0000005D, 0xFFFFFF81, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405E31, 0x00000043, 0x00000002, AssignScript, D_802417F0_91A3A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802402BC_918E6C, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFF9D4, 0x00000017, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416E0_91A290, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFF911, 0x00000198, 0xFFFFFF88, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3E, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFD94, 0xFFFFFFF1, 0xFFFFFFBB, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3F, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFBBE, 0x00000198, 0xFFFFFF7E, 0x00000000, 0x000000A4, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E40, 0x00000043, 0x00000007, MakeItemEntity, 0x00000054, 0xFFFFFFEC, 0x0000005F, 0xFFFFFFAB, 0x00000011, 0xF8405E42, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFF8B7, 0x00000017, 0x00000014, 0x00000011, 0xF8405E30, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8E9, 0x00000017, 0x00000014, 0x00000011, 0xF8405E38, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF885, 0x00000017, 0x00000014, 0x00000011, 0xF8405E39, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3A, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3B, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x00000000, 0x00000011, 0xF8405E36, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x0000003C, 0x00000011, 0xF8405E37, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFF94B, 0x0000005D, 0xFFFFFF81, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E31, 0x00000043, 0x00000002, AssignScript, D_802417F0_91A3A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s index c8ed4ba2ac..08b9d67855 100644 --- a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s +++ b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s @@ -27,4 +27,4 @@ dlabel D_8024194C_B460BC .word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF840604C, 0x00000001, 0x00000046, 0x00000001, D_8024186C_B45FDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241998_B46108 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000026, 0x0000005F, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF840604C, 0x00000043, 0x00000002, AssignScript, D_8024194C_B460BC, 0x00000023, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000012C, 0x00000000, 0xFFFFFF1F, 0x00000011, 0xF840604D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000026, 0x0000005F, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840604C, 0x00000043, 0x00000002, AssignScript, D_8024194C_B460BC, 0x00000023, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000012C, 0x00000000, 0xFFFFFF1F, 0x00000011, 0xF840604D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s index 3febaaf659..4657dcb4b3 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s @@ -9,4 +9,4 @@ dlabel D_80240884_AFE3C4 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80240884_AFE3C4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802409CC_AFE50C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000111, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000046, 0x00000001, D_80240884_AFE3C4, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D67, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405D67, 0x00000043, 0x00000002, AssignScript, D_802409CC_AFE50C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000111, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000046, 0x00000001, D_80240884_AFE3C4, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D67, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D67, 0x00000043, 0x00000002, AssignScript, D_802409CC_AFE50C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s index 2306f693f2..ffd85c71bd 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s @@ -21,7 +21,7 @@ dlabel D_80240F84_8D9454 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000045, 0x00000002, D_80240F1C_8D93EC, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7F4D, 0x00000043, 0x00000005, PlayerJump, 0x000001C8, 0x0000008E, 0x00000063, 0x0000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024103C_8D950C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000107, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405BD4, 0x00000001, 0x00000046, 0x00000001, D_80240C8C_8D915C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF42, 0x0000004B, 0x000000DC, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD5, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000279, 0x0000008E, 0x00000077, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405BD4, 0x00000043, 0x00000002, AssignScript, D_8024103C_8D950C, 0x0000000A, 0x00000002, 0xF8405BEE, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x00000172, 0x00000073, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x00000172, 0x0000000A, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000107, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405BD4, 0x00000001, 0x00000046, 0x00000001, D_80240C8C_8D915C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF42, 0x0000004B, 0x000000DC, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD5, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000279, 0x0000008E, 0x00000077, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405BD4, 0x00000043, 0x00000002, AssignScript, D_8024103C_8D950C, 0x0000000A, 0x00000002, 0xF8405BEE, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x00000172, 0x00000073, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x00000172, 0x0000000A, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411B0_8D9680 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s b/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s index 178c707d24..7f39ae4521 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s @@ -12,4 +12,4 @@ dlabel D_80240B0C_A59E9C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80240AA4_A59E34, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BEC_A59F7C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406193, 0x00000001, 0x00000046, 0x00000001, D_80240B0C_A59E9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000DC, 0x0000001E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8406193, 0x00000043, 0x00000002, AssignScript, D_80240BEC_A59F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406193, 0x00000001, 0x00000046, 0x00000001, D_80240B0C_A59E9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000DC, 0x0000001E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406193, 0x00000043, 0x00000002, AssignScript, D_80240BEC_A59F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s b/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s index 00a4f4f074..815d24d31b 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s @@ -9,4 +9,4 @@ dlabel D_802429A0_C70CD0 .word 0x0000000A, 0x00000002, 0xF84060A3, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF84060A3, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8024239C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0186, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_802407F4_C6EB24, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000001C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A50_C70D80 -.word 0x00000024, 0x00000002, 0xF84060A2, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x00000000, 0x0000002D, 0xFFFFFEDE, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF84060A3, 0x00000044, 0x00000001, D_802429A0_C70CD0, 0x0000000A, 0x00000002, 0xF84060A2, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA274, 0x000000AF, 0x00000023, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A50_C70D80, 0x00000013, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000F, 0x00000005, 0xFFFFFFC2, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetPushBlockFallEffect, 0x00000000, func_80240720_C6EA50, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000B, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF84060A2, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x00000000, 0x0000002D, 0xFFFFFEDE, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF84060A3, 0x00000044, 0x00000001, D_802429A0_C70CD0, 0x0000000A, 0x00000002, 0xF84060A2, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA274, 0x000000AF, 0x00000023, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A50_C70D80, 0x00000013, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000F, 0x00000005, 0xFFFFFFC2, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetPushBlockFallEffect, 0x00000000, func_80240720_C6EA50, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000B, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s index 1a9afbde24..38fe42dfe7 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s @@ -12,7 +12,7 @@ dlabel D_80244C1C_C7609C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80244BB4_C76034, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244CFC_C7617C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000EF, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF84060AC, 0x00000001, 0x00000046, 0x00000001, D_80244C1C_C7609C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000078, 0x00000064, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF84060AC, 0x00000043, 0x00000002, AssignScript, D_80244CFC_C7617C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000EF, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF84060AC, 0x00000001, 0x00000046, 0x00000001, D_80244C1C_C7609C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000078, 0x00000064, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF84060AC, 0x00000043, 0x00000002, AssignScript, D_80244CFC_C7617C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244DA0_C76220 .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 diff --git a/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s b/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s index dbd3a9099d..d8307cc4fe 100644 --- a/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s +++ b/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s @@ -6,4 +6,4 @@ dlabel D_802414D0_BC3F60 .word 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000212A, 0x00000000, 0x00000004, 0x0000001A, 0xFFFFFFF4, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFB0, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000032, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000212B, 0x00000000, 0x00000004, 0x0000001A, 0xFFFFFFF4, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8080, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000212C, 0x00000000, 0x00000004, 0x0000001A, 0xFFFFFFF4, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFB0, 0x00000000, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000032, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001F, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF8405F42, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416FC_BC418C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802414D0_BC3F60, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405F43, 0x00000043, 0x00000002, AssignScript, D_802416FC_BC418C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802414D0_BC3F60, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F43, 0x00000043, 0x00000002, AssignScript, D_802416FC_BC418C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s b/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s index 67857077bc..948141a6cb 100644 --- a/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s @@ -6,4 +6,4 @@ dlabel D_80240F80_BC8DE0 .word 0x00000024, 0x00000002, 0xF8405F48, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405F49, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FC0_BC8E20 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405F47, 0x00000001, 0x00000044, 0x00000001, 0x802441AC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x000000B4, 0x00000000, 0xFFFFFF51, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405F47, 0x00000043, 0x00000002, AssignScript, D_80240FC0_BC8E20, 0x00000043, 0x00000007, MakeItemEntity, 0x0000016A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240000_BC7E60, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xF8405F48, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F80_BC8DE0, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFC4, 0x00000000, 0xFFFFFF42, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F4A, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFC4, 0x0000001E, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFEC, 0x00000000, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF51, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405F47, 0x00000001, 0x00000044, 0x00000001, 0x802441AC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x000000B4, 0x00000000, 0xFFFFFF51, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F47, 0x00000043, 0x00000002, AssignScript, D_80240FC0_BC8E20, 0x00000043, 0x00000007, MakeItemEntity, 0x0000016A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240000_BC7E60, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xF8405F48, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F80_BC8DE0, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFC4, 0x00000000, 0xFFFFFF42, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F4A, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFC4, 0x0000001E, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFEC, 0x00000000, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF51, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s b/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s index 838ede3eba..cc8826b978 100644 --- a/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s @@ -12,4 +12,4 @@ dlabel D_8024201C_BD0C0C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241FB4_BD0BA4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420FC_BD0CEC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD6, 0x00000024, 0x00000002, 0xF8405F52, 0x00000001, 0x00000046, 0x00000001, D_8024201C_BD0C0C, 0x00000046, 0x00000001, 0x8024493C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000AA, 0x00000000, 0xFFFFFF60, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405F52, 0x00000043, 0x00000002, AssignScript, D_802420FC_BD0CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD6, 0x00000024, 0x00000002, 0xF8405F52, 0x00000001, 0x00000046, 0x00000001, D_8024201C_BD0C0C, 0x00000046, 0x00000001, 0x8024493C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000AA, 0x00000000, 0xFFFFFF60, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F52, 0x00000043, 0x00000002, AssignScript, D_802420FC_BD0CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s index a2a33a1ed2..7e2f7a7c75 100644 --- a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s @@ -60,7 +60,7 @@ dlabel D_80242AF0_DAFEF0 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000046, 0x00000001, D_802428B0_DAFCB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B1C_DAFF1C -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000047E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FDF, 0x00000043, 0x00000002, AssignScript, D_8024277C_DAFB7C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFC84, 0x00000000, 0xFFFFFF83, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E8_DAFDE8, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFCB1, 0x00000000, 0x00000062, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A14_DAFE14, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD2E, 0x00000000, 0xFFFFFFB8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A40_DAFE40, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD79, 0x00000050, 0x0000003E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A6C_DAFE6C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFDA1, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A98_DAFE98, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFE2D, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC4_DAFEC4, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0x000002C8, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AF0_DAFEF0, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000023F, 0x0000003C, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE0, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000002F9, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE1, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000375, 0x0000008C, 0xFFFFFF92, 0x00000000, 0x00000084, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE2, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x0000006E, 0xFFFFFF84, 0x00000011, 0xF8405FE3, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000082, 0xFFFFFF84, 0x00000011, 0xF8405FE4, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000096, 0xFFFFFF84, 0x00000011, 0xF8405FE5, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD83, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FE6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD9A, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDAE, 0x000000DC, 0x0000003E, 0x00000011, 0xF8405FE8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDC2, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDD6, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FEA, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000078, 0x000000B4, 0xFFFFFFB0, 0x00000011, 0xF8405FEC, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFFA6, 0x00000000, 0xFFFFFF83, 0x00000011, 0xF8405FED, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000047E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FDF, 0x00000043, 0x00000002, AssignScript, D_8024277C_DAFB7C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFC84, 0x00000000, 0xFFFFFF83, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E8_DAFDE8, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFCB1, 0x00000000, 0x00000062, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A14_DAFE14, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD2E, 0x00000000, 0xFFFFFFB8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A40_DAFE40, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD79, 0x00000050, 0x0000003E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A6C_DAFE6C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFDA1, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A98_DAFE98, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFE2D, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC4_DAFEC4, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0x000002C8, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AF0_DAFEF0, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000023F, 0x0000003C, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE0, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000002F9, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE1, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000375, 0x0000008C, 0xFFFFFF92, 0x00000000, 0x00000084, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE2, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x0000006E, 0xFFFFFF84, 0x00000011, 0xF8405FE3, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000082, 0xFFFFFF84, 0x00000011, 0xF8405FE4, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000096, 0xFFFFFF84, 0x00000011, 0xF8405FE5, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD83, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FE6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD9A, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDAE, 0x000000DC, 0x0000003E, 0x00000011, 0xF8405FE8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDC2, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDD6, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FEA, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000078, 0x000000B4, 0xFFFFFFB0, 0x00000011, 0xF8405FEC, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFFA6, 0x00000000, 0xFFFFFF83, 0x00000011, 0xF8405FED, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242EF0_DB02F0 .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s index 881f5f8d57..975d57f056 100644 --- a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s @@ -12,4 +12,4 @@ dlabel D_8024572C_DBD03C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802456C4_DBCFD4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024580C_DBD11C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000069, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF2, 0x00000001, 0x00000046, 0x00000001, D_8024572C_DBD03C, 0x00000024, 0x00000002, 0xF8405C8D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFEE8, 0x0000003C, 0xFFFFFEDE, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF3, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000190, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FF2, 0x00000043, 0x00000002, AssignScript, D_8024580C_DBD11C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0x00000000, 0x00000190, 0x00000000, 0x00000028, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406027, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000069, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF2, 0x00000001, 0x00000046, 0x00000001, D_8024572C_DBD03C, 0x00000024, 0x00000002, 0xF8405C8D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFEE8, 0x0000003C, 0xFFFFFEDE, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF3, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000190, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF2, 0x00000043, 0x00000002, AssignScript, D_8024580C_DBD11C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0x00000000, 0x00000190, 0x00000000, 0x00000028, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406027, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s b/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s index 251415ef90..b91854ae14 100644 --- a/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s @@ -36,4 +36,4 @@ dlabel D_80246268_DC3518 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000046, 0x00000001, D_802460CC_DC337C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246294_DC3544 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000046, 0x00000001, D_802460CC_DC337C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000046A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FF6, 0x00000043, 0x00000002, AssignScript, D_80245F4C_DC31FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFC72, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FF7, 0x00000043, 0x00000002, AssignScript, D_80245FA8_DC3258, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000002EE, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FF8, 0x00000043, 0x00000002, AssignScript, D_80245FF4_DC32A4, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000028A, 0x0000003C, 0xFFFFFFE2, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF5, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFEB6, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024623C_DC34EC, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFEFC, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246268_DC3518, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFF40, 0x00000050, 0xFFFFFF7C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246294_DC3544, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000046, 0x00000001, D_802460CC_DC337C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000046A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF6, 0x00000043, 0x00000002, AssignScript, D_80245F4C_DC31FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFC72, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF7, 0x00000043, 0x00000002, AssignScript, D_80245FA8_DC3258, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000002EE, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF8, 0x00000043, 0x00000002, AssignScript, D_80245FF4_DC32A4, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000028A, 0x0000003C, 0xFFFFFFE2, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF5, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFEB6, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024623C_DC34EC, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFEFC, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246268_DC3518, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFF40, 0x00000050, 0xFFFFFF7C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246294_DC3544, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s index 778f915b66..5b5d2d268e 100644 --- a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s +++ b/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s @@ -27,4 +27,4 @@ dlabel D_8024707C_DD3D4C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80247014_DD3CE4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024715C_DD3E2C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000024, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFB, 0x00000001, 0x00000046, 0x00000001, D_8024707C_DD3D4C, 0x00000024, 0x00000002, 0xF8405C73, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD08, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFE, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD44, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFF, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000000A, 0x00000000, 0x00000011, 0xF8406000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE48, 0x0000000A, 0x00000064, 0x00000011, 0xF8406001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE84, 0x0000000A, 0x00000064, 0x00000011, 0xF8406002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFEC0, 0x0000000A, 0x00000064, 0x00000011, 0xF8406003, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000708, 0x00000019, 0x00000000, 0x00000011, 0xF8406016, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406008, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406009, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006D6, 0x00000019, 0x00000000, 0x00000011, 0xF840600D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000073A, 0x00000019, 0x00000000, 0x00000011, 0xF840600E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0x00000032, 0x00000011, 0xF8406012, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0x00000032, 0x00000011, 0xF8406013, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000505, 0x000000E6, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406017, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000079E, 0x00000096, 0xFFFFFFE1, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405FFB, 0x00000043, 0x00000002, AssignScript, D_8024715C_DD3E2C, 0x0000000A, 0x00000002, 0xF8405FFC, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FFD, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000025, 0x0000008E, 0x0000000A, 0xFFFFFFA0, 0x00000011, 0xF8405FFD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000024, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFB, 0x00000001, 0x00000046, 0x00000001, D_8024707C_DD3D4C, 0x00000024, 0x00000002, 0xF8405C73, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD08, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFE, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD44, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFF, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000000A, 0x00000000, 0x00000011, 0xF8406000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE48, 0x0000000A, 0x00000064, 0x00000011, 0xF8406001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE84, 0x0000000A, 0x00000064, 0x00000011, 0xF8406002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFEC0, 0x0000000A, 0x00000064, 0x00000011, 0xF8406003, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000708, 0x00000019, 0x00000000, 0x00000011, 0xF8406016, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406008, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406009, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006D6, 0x00000019, 0x00000000, 0x00000011, 0xF840600D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000073A, 0x00000019, 0x00000000, 0x00000011, 0xF840600E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0x00000032, 0x00000011, 0xF8406012, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0x00000032, 0x00000011, 0xF8406013, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000505, 0x000000E6, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406017, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000079E, 0x00000096, 0xFFFFFFE1, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FFB, 0x00000043, 0x00000002, AssignScript, D_8024715C_DD3E2C, 0x0000000A, 0x00000002, 0xF8405FFC, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FFD, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000025, 0x0000008E, 0x0000000A, 0xFFFFFFA0, 0x00000011, 0xF8405FFD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s index 3cb88b6eb9..896306e4cc 100644 --- a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s @@ -12,4 +12,4 @@ dlabel D_80242CDC_DE516C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80242C74_DE5104, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242DBC_DE524C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000013C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840601F, 0x00000001, 0x00000046, 0x00000001, D_80242CDC_DE516C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000006E, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF840601F, 0x00000043, 0x00000002, AssignScript, D_80242DBC_DE524C, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFE89, 0x0000003C, 0xFFFFFFA1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406020, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000001D6, 0x0000003C, 0xFFFFFFC4, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000013C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840601F, 0x00000001, 0x00000046, 0x00000001, D_80242CDC_DE516C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000006E, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840601F, 0x00000043, 0x00000002, AssignScript, D_80242DBC_DE524C, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFE89, 0x0000003C, 0xFFFFFFA1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406020, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000001D6, 0x0000003C, 0xFFFFFFC4, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s index 89fb2479eb..115fe8b233 100644 --- a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s +++ b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s @@ -30,4 +30,4 @@ dlabel D_802417CC_D5737C .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000034, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406155, 0x00000001, 0x00000046, 0x00000001, D_802416EC_D5729C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241818_D573C8 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8406155, 0x00000043, 0x00000002, AssignScript, D_802417CC_D5737C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406155, 0x00000043, 0x00000002, AssignScript, D_802417CC_D5737C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s b/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s index 5ddd06757c..ab81cc06e4 100644 --- a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s +++ b/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s @@ -12,4 +12,4 @@ dlabel D_8024167C_D62B7C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241614_D62B14, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024175C_D62C5C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406154, 0x00000001, 0x00000046, 0x00000001, D_8024167C_D62B7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8406154, 0x00000043, 0x00000002, AssignScript, D_8024175C_D62C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406154, 0x00000001, 0x00000046, 0x00000001, D_8024167C_D62B7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406154, 0x00000043, 0x00000002, AssignScript, D_8024175C_D62C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s index 93d2cfc359..a77efffef7 100644 --- a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s @@ -30,4 +30,4 @@ dlabel D_802417FC_D6450C .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000116, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840615D, 0x00000001, 0x00000046, 0x00000001, D_8024171C_D6442C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241848_D64558 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF840615D, 0x00000043, 0x00000002, AssignScript, D_802417FC_D6450C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840615D, 0x00000043, 0x00000002, AssignScript, D_802417FC_D6450C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s b/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s index 6ed37e8105..6b88b4a92b 100644 --- a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s +++ b/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s @@ -12,4 +12,4 @@ dlabel D_802416FC_D7B0EC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241694_D7B084, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417DC_D7B1CC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406169, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7B0EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8406169, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7B1CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406169, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7B0EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406169, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7B1CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s b/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s index 738bbe5bf4..c1403e1785 100644 --- a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s +++ b/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s @@ -12,4 +12,4 @@ dlabel D_802416FC_D7C99C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241694_D7C934, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417DC_D7CA7C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000113, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616A, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7C99C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF840616A, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7CA7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000113, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616A, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7C99C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840616A, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7CA7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s b/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s index 2c153516a4..957c375877 100644 --- a/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s +++ b/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s @@ -12,4 +12,4 @@ dlabel D_80243E4C_D9109C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80243DE4_D91034, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F2C_D9117C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000106, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616D, 0x00000001, 0x00000046, 0x00000001, D_80243E4C_D9109C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000001B3, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF840616D, 0x00000043, 0x00000002, AssignScript, D_80243F2C_D9117C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000106, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616D, 0x00000001, 0x00000046, 0x00000001, D_80243E4C_D9109C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000001B3, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840616D, 0x00000043, 0x00000002, AssignScript, D_80243F2C_D9117C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s b/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s index e674408faf..01355cfeb1 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s @@ -12,4 +12,4 @@ dlabel D_8024D95C_D054CC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_8024D8F4_D05464, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DA3C_D055AC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000147, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840611B, 0x00000001, 0x00000046, 0x00000001, D_8024D95C_D054CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000005F, 0x00000000, 0xFFFFFF4C, 0x0000010E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF840611B, 0x00000043, 0x00000002, AssignScript, D_8024DA3C_D055AC, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015D, 0xFFFFFEBB, 0x00000000, 0xFFFFFF10, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000031, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF92, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF840611C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000147, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840611B, 0x00000001, 0x00000046, 0x00000001, D_8024D95C_D054CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000005F, 0x00000000, 0xFFFFFF4C, 0x0000010E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840611B, 0x00000043, 0x00000002, AssignScript, D_8024DA3C_D055AC, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015D, 0xFFFFFEBB, 0x00000000, 0xFFFFFF10, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000031, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF92, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF840611C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s index fa56f275cf..5b66e2d084 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240460_9389F0 -.word 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFB0, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF4C, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF7E, 0x00000049, 0xFFFFFF6A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0xFFFFFF7E, 0x00000000, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240460_9389F0, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFB0, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF4C, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF7E, 0x00000049, 0xFFFFFF6A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0xFFFFFF7E, 0x00000000, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240460_9389F0, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s index b5874a3ff1..fe1eb9ae38 100644 --- a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s +++ b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s @@ -12,7 +12,7 @@ dlabel D_8024112C_86D86C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802410C4_86D804, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024120C_86D94C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000012F, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D0F, 0x00000001, 0x00000046, 0x00000001, D_8024112C_86D86C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000118, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405D0F, 0x00000043, 0x00000002, AssignScript, D_8024120C_86D94C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000012F, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D0F, 0x00000001, 0x00000046, 0x00000001, D_8024112C_86D86C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000118, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D0F, 0x00000043, 0x00000002, AssignScript, D_8024120C_86D94C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802412B0_86D9F0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s b/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s index f339c210a2..3b6af9bd57 100644 --- a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s @@ -15,4 +15,4 @@ dlabel D_8024194C_87670C .word 0x0000000A, 0x00000002, 0xF8405D28, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D28, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0x0000004B, 0x00000069, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_05_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFF6, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_05_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_8024093C_8756FC, 0xFD050F80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B34_8768F4 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000124, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D13, 0x00000001, 0x00000046, 0x00000001, D_8024186C_87662C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFF47, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405D13, 0x00000043, 0x00000002, AssignScript, D_80241B34_8768F4, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000019, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024194C_87670C, 0x0000000A, 0x00000002, 0xF8405D28, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000019, 0x0000004B, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFFDD, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000124, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D13, 0x00000001, 0x00000046, 0x00000001, D_8024186C_87662C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFF47, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D13, 0x00000043, 0x00000002, AssignScript, D_80241B34_8768F4, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000019, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024194C_87670C, 0x0000000A, 0x00000002, 0xF8405D28, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000019, 0x0000004B, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFFDD, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s b/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s index 8ae2263c87..d14b5aae60 100644 --- a/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s @@ -9,4 +9,4 @@ dlabel D_802414F0_8A9470 .word 0x0000000A, 0x00000002, 0xF8405D29, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D29, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0x000000D2, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240770_8A86F0, 0xFD050F80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416D8_8A9658 -.word 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF88, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x0000000A, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240770_8A86F0, 0xFD050F81, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFEF2, 0xFFFFFFA6, 0x00000000, 0x0000005A, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405D27, 0x00000044, 0x00000001, D_80241450_8A93D0, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000D2, 0xFFFFFFB5, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802414F0_8A9470, 0x0000000A, 0x00000002, 0xF8405D29, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x000000D2, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF88, 0xFFFFFFD3, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D8_8A9658, 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFF88, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFFC4, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF88, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x0000000A, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240770_8A86F0, 0xFD050F81, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFEF2, 0xFFFFFFA6, 0x00000000, 0x0000005A, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D27, 0x00000044, 0x00000001, D_80241450_8A93D0, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000D2, 0xFFFFFFB5, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802414F0_8A9470, 0x0000000A, 0x00000002, 0xF8405D29, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x000000D2, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF88, 0xFFFFFFD3, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D8_8A9658, 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFF88, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFFC4, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s index 884c0cb179..184ef98d5f 100644 --- a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s @@ -15,4 +15,4 @@ dlabel D_8024148C_99B0FC .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000104, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E01, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414D8_99B148 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000135, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E02, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000032A, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405E01, 0x00000043, 0x00000002, AssignScript, D_8024148C_99B0FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFD12, 0x000000C8, 0xFFFFFF83, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignFlag, 0xF8405E02, 0x00000043, 0x00000002, AssignScript, D_802414D8_99B148, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFC68, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000145, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000135, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E02, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000032A, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E01, 0x00000043, 0x00000002, AssignScript, D_8024148C_99B0FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFD12, 0x000000C8, 0xFFFFFF83, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E02, 0x00000043, 0x00000002, AssignScript, D_802414D8_99B148, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFC68, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000145, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s b/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s index 648d404a2d..7294189636 100644 --- a/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s +++ b/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240220_B1AE50 -.word 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x0000005A, 0x00000046, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x00000082, 0x00000050, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x000000AA, 0x0000005A, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x000000D2, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x000000FA, 0x0000006E, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x000000C1, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000082, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000005A, 0x00000046, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x00000082, 0x00000050, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000AA, 0x0000005A, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000D2, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000FA, 0x0000006E, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x000000C1, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000082, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s b/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s index 745c4227f8..a5fe5131cf 100644 --- a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s +++ b/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802402C0_B1B240 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA5AC, 0x00000237, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5D0, 0x0000026F, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA07C, 0x0000012C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000168, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000001A4, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA564, 0x000001E0, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5F4, 0x0000021C, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000258, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000012C, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000001A4, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001E0, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000019, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA208, 0x000001EA, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA298, 0x00000208, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x000001A0, 0x00000000, 0x000000E8, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x00000150, 0x00000000, 0x000000E8, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x00000000, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x0000001E, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, 0x802EA5AC, 0x00000237, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5D0, 0x0000026F, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000012C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000168, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000001A4, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA564, 0x000001E0, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA5F4, 0x0000021C, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000258, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000012C, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000001A4, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001E0, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA178, 0x000001CC, 0x00000019, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA208, 0x000001EA, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA298, 0x00000208, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x000001A0, 0x00000000, 0x000000E8, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x00000150, 0x00000000, 0x000000E8, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x00000000, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x0000001E, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s index af581410c9..a28ad8155b 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s @@ -42,8 +42,8 @@ glabel clear_entity_data /* A7444 80110D44 80420070 */ lb $v0, 0x70($v0) /* A7448 80110D48 1440000C */ bnez $v0, .L80110D7C /* A744C 80110D4C 24040003 */ addiu $a0, $zero, 3 -/* A7450 80110D50 3C018015 */ lui $at, %hi(wStaticEntityDataSize) -/* A7454 80110D54 AC20165C */ sw $zero, %lo(wStaticEntityDataSize)($at) +/* A7450 80110D50 3C018015 */ lui $at, %hi(wEntityBlueprintSize) +/* A7454 80110D54 AC20165C */ sw $zero, %lo(wEntityBlueprintSize)($at) /* A7458 80110D58 2404001D */ addiu $a0, $zero, 0x1d /* A745C 80110D5C 3C028015 */ lui $v0, %hi(D_801516DC) /* A7460 80110D60 244216DC */ addiu $v0, $v0, %lo(D_801516DC) @@ -55,10 +55,10 @@ glabel clear_entity_data /* A7474 80110D74 08044367 */ j .L80110D9C /* A7478 80110D78 00000000 */ nop .L80110D7C: -/* A747C 80110D7C 3C018015 */ lui $at, %hi(bStaticEntityDataSize) -/* A7480 80110D80 AC201660 */ sw $zero, %lo(bStaticEntityDataSize)($at) -/* A7484 80110D84 3C028015 */ lui $v0, %hi(bStaticEntityData + 0xC) -/* A7488 80110D88 244216F4 */ addiu $v0, $v0, %lo(bStaticEntityData + 0xC) +/* A747C 80110D7C 3C018015 */ lui $at, %hi(bEntityBlueprintSize) +/* A7480 80110D80 AC201660 */ sw $zero, %lo(bEntityBlueprintSize)($at) +/* A7484 80110D84 3C028015 */ lui $v0, %hi(bEntityBlueprint + 0xC) +/* A7488 80110D88 244216F4 */ addiu $v0, $v0, %lo(bEntityBlueprint + 0xC) .L80110D8C: /* A748C 80110D8C AC400000 */ sw $zero, ($v0) /* A7490 80110D90 2484FFFF */ addiu $a0, $a0, -1 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s index 50c3b131d3..ea8514ae2c 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s @@ -25,8 +25,8 @@ glabel create_entity /* A7FF8 801118F8 0C044305 */ jal load_area_specific_entity_data /* A7FFC 801118FC AFA40040 */ sw $a0, 0x40($sp) /* A8000 80111900 27A40054 */ addiu $a0, $sp, 0x54 -/* A8004 80111904 3C038016 */ lui $v1, %hi(D_8015C7D8) -/* A8008 80111908 2463C7D8 */ addiu $v1, $v1, %lo(D_8015C7D8) +/* A8004 80111904 3C038016 */ lui $v1, %hi(CreateEntityVarArgBuffer2) +/* A8008 80111908 2463C7D8 */ addiu $v1, $v1, %lo(CreateEntityVarArgBuffer2) /* A800C 8011190C C7B60044 */ lwc1 $f22, 0x44($sp) /* A8010 80111910 4680B5A0 */ cvt.s.w $f22, $f22 /* A8014 80111914 C7B80048 */ lwc1 $f24, 0x48($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s index a61c8a410e..4aef3d1541 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s @@ -5,8 +5,8 @@ glabel entity_free_static_data /* A7EDC 801117DC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A7EE0 801117E0 0080382D */ daddu $a3, $a0, $zero /* A7EE4 801117E4 0000182D */ daddu $v1, $zero, $zero -/* A7EE8 801117E8 3C068015 */ lui $a2, %hi(wStaticEntityData) -/* A7EEC 801117EC 24C61668 */ addiu $a2, $a2, %lo(wStaticEntityData) +/* A7EE8 801117E8 3C068015 */ lui $a2, %hi(wEntityBlueprint) +/* A7EEC 801117EC 24C61668 */ addiu $a2, $a2, %lo(wEntityBlueprint) /* A7EF0 801117F0 00C0282D */ daddu $a1, $a2, $zero /* A7EF4 801117F4 AFBF0018 */ sw $ra, 0x18($sp) /* A7EF8 801117F8 AFB10014 */ sw $s1, 0x14($sp) @@ -53,8 +53,8 @@ glabel entity_free_static_data /* A7F8C 8011188C 00000000 */ nop /* A7F90 80111890 14400007 */ bnez $v0, .L801118B0 /* A7F94 80111894 00000000 */ nop -/* A7F98 80111898 3C038015 */ lui $v1, %hi(wStaticEntityDataSize) -/* A7F9C 8011189C 2463165C */ addiu $v1, $v1, %lo(wStaticEntityDataSize) +/* A7F98 80111898 3C038015 */ lui $v1, %hi(wEntityBlueprintSize) +/* A7F9C 8011189C 2463165C */ addiu $v1, $v1, %lo(wEntityBlueprintSize) /* A7FA0 801118A0 8C620000 */ lw $v0, ($v1) /* A7FA4 801118A4 AE200000 */ sw $zero, ($s1) /* A7FA8 801118A8 00501023 */ subu $v0, $v0, $s0 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s index 6c396f9a28..136da420b8 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s @@ -14,8 +14,8 @@ glabel func_80110F10 /* A7634 80110F34 3C178015 */ lui $s7, %hi(gEntityHeapBase) /* A7638 80110F38 26F712C4 */ addiu $s7, $s7, %lo(gEntityHeapBase) /* A763C 80110F3C AFB40020 */ sw $s4, 0x20($sp) -/* A7640 80110F40 3C148015 */ lui $s4, %hi(wStaticEntityData) -/* A7644 80110F44 26941668 */ addiu $s4, $s4, %lo(wStaticEntityData) +/* A7640 80110F40 3C148015 */ lui $s4, %hi(wEntityBlueprint) +/* A7644 80110F44 26941668 */ addiu $s4, $s4, %lo(wEntityBlueprint) /* A7648 80110F48 AFBF0030 */ sw $ra, 0x30($sp) /* A764C 80110F4C AFB20018 */ sw $s2, 0x18($sp) /* A7650 80110F50 AFB10014 */ sw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s index 85bbabd86c..b5bd310537 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s @@ -7,12 +7,12 @@ glabel is_entity_data_loaded /* A7864 80111164 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* A7868 80111168 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* A786C 8011116C 80420070 */ lb $v0, 0x70($v0) -/* A7870 80111170 3C098015 */ lui $t1, %hi(bStaticEntityData) -/* A7874 80111174 252916E8 */ addiu $t1, $t1, %lo(bStaticEntityData) +/* A7870 80111170 3C098015 */ lui $t1, %hi(bEntityBlueprint) +/* A7874 80111174 252916E8 */ addiu $t1, $t1, %lo(bEntityBlueprint) /* A7878 80111178 14400003 */ bnez $v0, .L80111188 /* A787C 8011117C 0000582D */ daddu $t3, $zero, $zero -/* A7880 80111180 3C098015 */ lui $t1, %hi(wStaticEntityData) -/* A7884 80111184 25291668 */ addiu $t1, $t1, %lo(wStaticEntityData) +/* A7880 80111180 3C098015 */ lui $t1, %hi(wEntityBlueprint) +/* A7884 80111184 25291668 */ addiu $t1, $t1, %lo(wEntityBlueprint) .L80111188: /* A7888 80111188 0000502D */ daddu $t2, $zero, $zero .L8011118C: diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s index 1a60ec3406..e8c7020913 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s @@ -93,13 +93,13 @@ glabel load_split_entity_data /* A7C34 80111534 80420070 */ lb $v0, 0x70($v0) /* A7C38 80111538 14400005 */ bnez $v0, .L80111550 /* A7C3C 8011153C 00000000 */ nop -/* A7C40 80111540 3C128015 */ lui $s2, %hi(wStaticEntityDataSize) -/* A7C44 80111544 8E52165C */ lw $s2, %lo(wStaticEntityDataSize)($s2) +/* A7C40 80111540 3C128015 */ lui $s2, %hi(wEntityBlueprintSize) +/* A7C44 80111544 8E52165C */ lw $s2, %lo(wEntityBlueprintSize)($s2) /* A7C48 80111548 08044556 */ j .L80111558 /* A7C4C 8011154C 00000000 */ nop .L80111550: -/* A7C50 80111550 3C128015 */ lui $s2, %hi(bStaticEntityDataSize) -/* A7C54 80111554 8E521660 */ lw $s2, %lo(bStaticEntityDataSize)($s2) +/* A7C50 80111550 3C128015 */ lui $s2, %hi(bEntityBlueprintSize) +/* A7C54 80111554 8E521660 */ lw $s2, %lo(bEntityBlueprintSize)($s2) .L80111558: /* A7C58 80111558 8E620004 */ lw $v0, 4($s3) /* A7C5C 8011155C 8E630000 */ lw $v1, ($s3) @@ -170,13 +170,13 @@ glabel load_split_entity_data /* A7D50 80111650 80420070 */ lb $v0, 0x70($v0) /* A7D54 80111654 14400005 */ bnez $v0, .L8011166C /* A7D58 80111658 24150001 */ addiu $s5, $zero, 1 -/* A7D5C 8011165C 3C018015 */ lui $at, %hi(wStaticEntityDataSize) -/* A7D60 80111660 AC32165C */ sw $s2, %lo(wStaticEntityDataSize)($at) +/* A7D5C 8011165C 3C018015 */ lui $at, %hi(wEntityBlueprintSize) +/* A7D60 80111660 AC32165C */ sw $s2, %lo(wEntityBlueprintSize)($at) /* A7D64 80111664 080445C4 */ j .L80111710 /* A7D68 80111668 00000000 */ nop .L8011166C: -/* A7D6C 8011166C 3C018015 */ lui $at, %hi(bStaticEntityDataSize) -/* A7D70 80111670 AC321660 */ sw $s2, %lo(bStaticEntityDataSize)($at) +/* A7D6C 8011166C 3C018015 */ lui $at, %hi(bEntityBlueprintSize) +/* A7D70 80111670 AC321660 */ sw $s2, %lo(bEntityBlueprintSize)($at) /* A7D74 80111674 080445C4 */ j .L80111710 /* A7D78 80111678 00000000 */ nop .L8011167C: diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s index 88c594d2ec..768e6d756e 100644 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s +++ b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s @@ -24,8 +24,8 @@ glabel entity_HiddenPanel_init /* 1084F0 802E6C70 3402FFFF */ ori $v0, $zero, 0xffff /* 1084F4 802E6C74 A6420006 */ sh $v0, 6($s2) /* 1084F8 802E6C78 C660004C */ lwc1 $f0, 0x4c($s3) -/* 1084FC 802E6C7C 3C038016 */ lui $v1, %hi(D_8015C7D0) -/* 108500 802E6C80 2463C7D0 */ addiu $v1, $v1, %lo(D_8015C7D0) +/* 1084FC 802E6C7C 3C038016 */ lui $v1, %hi(CreateEntityVarArgBuffer) +/* 108500 802E6C80 2463C7D0 */ addiu $v1, $v1, %lo(CreateEntityVarArgBuffer) /* 108504 802E6C84 E6400024 */ swc1 $f0, 0x24($s2) /* 108508 802E6C88 94620002 */ lhu $v0, 2($v1) /* 10850C 802E6C8C A6420074 */ sh $v0, 0x74($s2) diff --git a/ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlock_HitEffect_setupGfx.s b/ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlockContent_setupGfx.s similarity index 99% rename from ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlock_HitEffect_setupGfx.s rename to ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlockContent_setupGfx.s index da7987d850..6bf45a33f4 100644 --- a/ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlock_HitEffect_setupGfx.s +++ b/ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlockContent_setupGfx.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel entity_SuperBlock_HitEffect_setupGfx +glabel entity_SuperBlockContent_setupGfx /* 1070EC 802E586C 27BDFF68 */ addiu $sp, $sp, -0x98 /* 1070F0 802E5870 AFB60088 */ sw $s6, 0x88($sp) /* 1070F4 802E5874 3C16800A */ lui $s6, %hi(gMasterGfxPos) diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index fb5d64c3a2..ced65e4448 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2467,7 +2467,7 @@ AssignAreaFlag = 0x80111FF8; // type:func rom:0xA86F8 gPlayerSpinState = 0x8010F250; // type:data rom:0xA8700 gPlayerData = 0x8010F290; // rom:0xA8740 size:0x340 AssignBlockFlag = 0x8011206C; // type:func rom:0xA876C -AssignFlag = 0x801120B8; // type:func rom:0xA87B8 +AssignChestFlag = 0x801120B8; // type:func rom:0xA87B8 AssignPanelFlag = 0x80112114; // type:func rom:0xA8814 AssignCrateFlag = 0x80112170; // type:func rom:0xA8870 create_entity_shadow = 0x801121CC; // type:func rom:0xA88CC @@ -2909,13 +2909,13 @@ set_area_flag = 0x801455A0; // type:func rom:0xDBCA0 get_area_flag = 0x801455F0; // type:func rom:0xDBCF0 set_area_byte = 0x80145638; // type:func rom:0xDBD38 get_area_byte = 0x80145650; // type:func rom:0xDBD50 -default_trigger_delegate = 0x80145670; // type:func rom:0xDBD70 +default_trigger_on_activate = 0x80145670; // type:func rom:0xDBD70 clear_trigger_data = 0x80145680; // type:func rom:0xDBD80 init_trigger_list = 0x80145728; // type:func rom:0xDBE28 create_trigger = 0x8014576C; // type:func rom:0xDBE6C update_triggers = 0x80145860; // type:func rom:0xDBF60 delete_trigger = 0x80145BF4; // type:func rom:0xDC2F4 -is_trigger_bound = 0x80145C6C; // type:func rom:0xDC36C +is_another_trigger_bound = 0x80145C6C; // type:func rom:0xDC36C get_trigger_by_id = 0x80145CD0; // type:func rom:0xDC3D0 should_collider_allow_interact = 0x80145CE8; // type:func rom:0xDC3E8 load_map_bg = 0x80145D70; // type:func rom:0xDC470 @@ -3351,14 +3351,14 @@ gBattleShadowList = 0x80151568; // rom:0xE7C68 init_script_list = 0x802C32EC; // type:func rom:0xE7C9C suspend_frozen_scripts = 0x802C3390; // type:func rom:0xE7D40 gCurrentShadowListPtr = 0x80151658; // rom:0xE7D58 -wStaticEntityDataSize = 0x8015165C; // type:data rom:0xE7D5C -bStaticEntityDataSize = 0x80151660; // type:data rom:0xE7D60 +wEntityBlueprintSize = 0x8015165C; // type:data rom:0xE7D5C +bEntityBlueprintSize = 0x80151660; // type:data rom:0xE7D60 D_80151664 = 0x80151664; // type:data rom:0xE7D64 -wStaticEntityData = 0x80151668; // type:data rom:0xE7D68 +wEntityBlueprint = 0x80151668; // type:data rom:0xE7D68 start_script = 0x802C33E0; // type:func rom:0xE7D90 D_801516DC = 0x801516DC; // type:data rom:0xE7DDC D_8015DCE0 = 0x801516E0; // type:data rom:0xE7DE0 -bStaticEntityData = 0x801516E8; // type:data rom:0xE7DE8 +bEntityBlueprint = 0x801516E8; // type:data rom:0xE7DE8 D_801516FC = 0x801516FC; // type:data rom:0xE7DFC gMainGameState = 0x80151700; // rom:0xE7E00 gCurrentTileDescriptor = 0x80151740; // type:data rom:0xE7E40 @@ -3562,7 +3562,7 @@ evt_handle_exec1 = 0x802C646C; // type:func rom:0xEAE1C evt_handle_exec1_get_id = 0x802C6524; // type:func rom:0xEAED4 evt_handle_exec_wait = 0x802C65FC; // type:func rom:0xEAFAC evt_handle_jump = 0x802C6640; // type:func rom:0xEAFF0 -evt_bound_script_trigger_handler = 0x802C667C; // type:func rom:0xEB02C +evt_trigger_on_activate_exec_script = 0x802C667C; // type:func rom:0xEB02C evt_handle_bind = 0x802C6714; // type:func rom:0xEB0C4 DeleteTrigger = 0x802C6824; // type:func rom:0xEB1D4 evt_handle_unbind = 0x802C6850; // type:func rom:0xEB200 @@ -3578,7 +3578,7 @@ evt_handle_resume_others = 0x802C69E4; // type:func rom:0xEB394 evt_handle_suspend = 0x802C6A20; // type:func rom:0xEB3D0 evt_handle_resume = 0x802C6A4C; // type:func rom:0xEB3FC evt_handle_does_script_exist = 0x802C6A78; // type:func rom:0xEB428 -evt_standard_trigger_executor = 0x802C6AD0; // type:func rom:0xEB480 +evt_trigger_on_activate_lock = 0x802C6AD0; // type:func rom:0xEB480 evt_handle_bind_lock = 0x802C6B54; // type:func rom:0xEB504 evt_handle_thread = 0x802C6C78; // type:func rom:0xEB628 evt_handle_end_thread = 0x802C6D4C; // type:func rom:0xEB6FC @@ -3838,11 +3838,10 @@ NpcMoveTo = 0x802CE22C; // type:func rom:0xF2BDC _npc_jump_to = 0x802CE434; // type:func rom:0xF2DE4 D_8015C790 = 0x8015C790; // type:data rom:0xF2E90 D_8015C7C0 = 0x8015C7C0; // type:data rom:0xF2EC0 -D_8015C7D0 = 0x8015C7D0; // type:data rom:0xF2ED0 -D_8015C7D2 = 0x8015C7D2; // type:data rom:0xF2ED2 -D_8015C7D4 = 0x8015C7D4; // type:data rom:0xF2ED4 -D_8015C7D8 = 0x8015C7D8; // type:data rom:0xF2ED8 -D_8015C7DC = 0x8015C7DC; // type:data rom:0xF2EDC +CreateEntityVarArgBuffer = 0x8015C7D0; // type:data rom:0xF2ED0 +CreateEntityVarArgBuffer1 = 0x8015C7D4; // type:data rom:0xF2ED4 +CreateEntityVarArgBuffer2 = 0x8015C7D8; // type:data rom:0xF2ED8 +CreateEntityVarArgBuffer3 = 0x8015C7DC; // type:data rom:0xF2EDC D_8015C7E0 = 0x8015C7E0; // type:data rom:0xF2EE0 NpcJump0 = 0x802CE6C4; // type:func rom:0xF3074 NpcJump1 = 0x802CE6E0; // type:func rom:0xF3090 @@ -4275,11 +4274,11 @@ entity_upgrade_block_check_if_inactive = 0x802E56EC; // type:func rom:0x106F6C entity_upgrade_block_init = 0x802E578C; // type:func rom:0x10700C entity_SuperBlock_init = 0x802E57E4; // type:func rom:0x107064 entity_UltraBlock_init = 0x802E5800; // type:func rom:0x107080 -entity_SuperBlock_HitEffect_attach_to_parent = 0x802E581C; // type:func rom:0x10709C -entity_SuperBlock_HitEffect_setupGfx = 0x802E586C; // type:func rom:0x1070EC -entity_SuperBlock_HitEffect_idle = 0x802E5E50; // type:func rom:0x1076D0 -entity_init_SuperBlock_HitEffect1 = 0x802E5F50; // type:func rom:0x1077D0 -entity_init_SuperBlock_HitEffect2 = 0x802E5F7C; // type:func rom:0x1077FC +entity_SuperBlockContent_attach_to_parent = 0x802E581C; // type:func rom:0x10709C +entity_SuperBlockContent_setupGfx = 0x802E586C; // type:func rom:0x1070EC +entity_SuperBlockContent_idle = 0x802E5E50; // type:func rom:0x1076D0 +entity_init_SuperBlockContent1 = 0x802E5F50; // type:func rom:0x1077D0 +entity_init_SuperBlockContent2 = 0x802E5F7C; // type:func rom:0x1077FC entity_ScriptSpring_idle = 0x802E5FB0; // type:func rom:0x107830 entity_SimpleSpring_idle = 0x802E6064; // type:func rom:0x1078E4 entity_SimpleSpring_set_jump_params = 0x802E6118; // type:func rom:0x107998 @@ -5511,7 +5510,7 @@ bMarioDefendAnims = 0x802832D4; // type:data rom:0x1B1BB4 bPeachIdleAnims = 0x8028340C; // type:data rom:0x1B1CEC bMarioDefenseTable = 0x80283420; // type:data rom:0x1B1D00 bPlayerStatusTable = 0x8028342C; // type:data rom:0x1B1D0C -bPlayerActorDesc = 0x802834D8; // type:data rom:0x1B1DB8 +bPlayerActorBlueprint = 0x802834D8; // type:data rom:0x1B1DB8 bMarioParts = 0x80283500; // type:data rom:0x1B1DE0 btl_actorHomePositions = 0x80283524; // type:data rom:0x1B1E04 D_8028358C = 0x8028358C; // type:data rom:0x1B1E6C @@ -23174,8 +23173,8 @@ D_802E92B0 = 0x802E92B0; // type:data D_802E99DC = 0x802E99DC; // type:data D_802E9E54 = 0x802E9E54; // type:data D_802E9E80 = 0x802E9E80; // type:data -D_802EA07C = 0x802EA07C; // type:data -D_802EA0A0 = 0x802EA0A0; // type:data +Entity_InertYellowBlock = 0x802EA07C; // type:data +Entity_InertRedBlock = 0x802EA0A0; // type:data D_802EA0C4 = 0x802EA0C4; // type:data D_802EA2BC = 0x802EA2BC; // type:data D_802EA310 = 0x802EA310; // type:data @@ -23185,11 +23184,11 @@ Entity_HitRedBlock = 0x802EA660; // type:data D_802EA728 = 0x802EA728; // type:data D_802EA744 = 0x802EA744; // type:data D_802EA760 = 0x802EA760; // type:data -D_802EA7BC = 0x802EA7BC; // type:data +Entity_HeartBlockContent = 0x802EA7BC; // type:data D_802EA862 = 0x802EA862; // type:data D_802EA870 = 0x802EA870; // type:data D_802EA871 = 0x802EA871; // type:data -D_802EA934 = 0x802EA934; // type:data +Entity_SuperBlockContent = 0x802EA934; // type:data D_802EAAE0 = 0x802EAAE0; // type:data D_802EAB30 = 0x802EAB30; // type:data D_802EAC0C = 0x802EAC0C; // type:data @@ -23201,12 +23200,12 @@ D_802EAE7C = 0x802EAE7C; // type:data D_802EAFDC = 0x802EAFDC; // type:data D_802EB370 = 0x802EB370; // type:data D_802EB380 = 0x802EB380; // type:data -D_802EB390 = 0x802EB390; // type:data -D_802EB394 = 0x802EB394; // type:data -D_802EB398 = 0x802EB398; // type:data -D_802EB39C = 0x802EB39C; // type:data +SaveBlockTutorialMessagePrinterClosed = 0x802EB390; // type:data +SaveBlockResultMessagePrinterClosed = 0x802EB394; // type:data +SaveBlockTutorialMessagePrinter = 0x802EB398; // type:data +SaveBlockResultMessagePrinter = 0x802EB39C; // type:data D_802EB3A0 = 0x802EB3A0; // type:data -D_802EB3B0 = 0x802EB3B0; // type:data +TriggerBlockVanishEffect = 0x802EB3B0; // type:data D_802EB3C0 = 0x802EB3C0; // type:data D_802EB3D0 = 0x802EB3D0; // type:data gMsgCharsets = 0x802EB5A8; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index f7338ea4e6..f08f625410 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -957,12 +957,12 @@ D_802E0C60 = 0x802E0C60; D_802E0C64 = 0x802E0C64; D_802E0C68 = 0x802E0C68; D_802E0C70 = 0x802E0C70; -D_802EB390 = 0x802EB390; -D_802EB394 = 0x802EB394; -D_802EB398 = 0x802EB398; -D_802EB39C = 0x802EB39C; +SaveBlockTutorialMessagePrinterClosed = 0x802EB390; +SaveBlockResultMessagePrinterClosed = 0x802EB394; +SaveBlockTutorialMessagePrinter = 0x802EB398; +SaveBlockResultMessagePrinter = 0x802EB39C; D_802EB3A0 = 0x802EB3A0; -D_802EB3B0 = 0x802EB3B0; +TriggerBlockVanishEffect = 0x802EB3B0; D_802EB3C0 = 0x802EB3C0; D_802ED970 = 0x802ED970; D_802EE8D0 = 0x802EE8D0;