Game-Decompilation/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-23 13:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

struct renaming and trigger/entity cleanup (#623)

Browse Source 
* rename static structs to blueprint

* evt structs renamed

* renamed HudElementAnim to HudScript, worked on triggers

* fix Trigger/TriggerBP fields and entity cleanup

* entity data cleanup 1

* block

* blue warp pipe

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2022-01-16 08:28:09 -05:00 committed by GitHub
parent 079302ff23
commit 4e33a016eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
520 changed files with 4974 additions and 4990 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

493
include/common_structs.h
View File

@ -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];

131
include/enums.h
View File

@ -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,

12
include/evt.h
View File

@ -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

4
include/evt_funcs.h
View File

@ -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);

16
include/functions.h
View File

@ -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);

2
include/map.h
View File

@ -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];

38
include/npc.h
View File

@ -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.
///

172
include/script_api/battle.h
View File

@ -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

6
include/script_api/common.h
View File

@ -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

16
include/script_api/map.h
View File

@ -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

4
include/si_funcs.h
View File

@ -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);

63
include/variables.h
View File

@ -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;

34
src/104730.c
View File

@ -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);

24
src/16c8e0.c
View File

@ -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)

34
src/1776B0.c
View File

@ -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) {

2
src/17FEB0.c
View File

@ -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) {

6
src/18F340.c
View File

@ -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) {

104
src/190B20.c
View File

@ -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;

14
src/19FAF0.c
View File

@ -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

24
src/1A5830.c
View File

@ -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;
}

2
src/1AC760.c
View File

@ -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;
}

102
src/1AF120.c
View File

@ -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))

24
src/1AF230.c
View File

@ -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, },

8
src/3251D0.c
View File

@ -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))

174
src/415D90.c
View File

@ -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 };

22
src/80850_len_3060.c
View File

@ -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) {

22
src/8a860_len_3f30.c
View File

@ -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,
};

2
src/ECAA80.c
View File

@ -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;

82
src/a5dd0_len_114e0.c
View File

@ -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) {

16
src/actor_api.c
View File

@ -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) {

6
src/battle/action_cmd/07.c
View File

@ -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);

6
src/battle/action_cmd/0A.c
View File

@ -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;

6
src/battle/action_cmd/air_lift.c
View File

@ -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;

6
src/battle/action_cmd/air_raid.c
View File

@ -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;

8
src/battle/action_cmd/body_slam.c
View File

@ -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) {

8
src/battle/action_cmd/bomb.c
View File

@ -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;

8
src/battle/action_cmd/break_free.c
View File

@ -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;

6
src/battle/action_cmd/dizzy_shell.c
View File

@ -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;

6
src/battle/action_cmd/fire_shell.c
View File

@ -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;

12
src/battle/action_cmd/flee.c
View File

@ -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;

14
src/battle/action_cmd/hammer.c
View File

@ -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;

8
src/battle/action_cmd/hurricane.c
View File

@ -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;

6
src/battle/action_cmd/jump.c
View File

@ -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;

12
src/battle/action_cmd/mega_shock.c
View File

@ -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);

10
src/battle/action_cmd/power_shock.c
View File

@ -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;

10
src/battle/action_cmd/smack.c
View File

@ -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++;

6
src/battle/action_cmd/spiny_surge.c
View File

@ -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;

6
src/battle/action_cmd/spook.c
View File

@ -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) {

4
src/battle/action_cmd/squirt.c
View File

@ -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) {

6
src/battle/action_cmd/stop_leech.c
View File

@ -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) {

8
src/battle/action_cmd/tidal_wave.c
View File

@ -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;

2
src/battle/action_cmd/water_block.c
View File

@ -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;

4
src/battle/action_cmd/whirlwind.c
View File

@ -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;

36
src/battle/area_hos/actor/ember.c
View File

@ -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))

24
src/battle/area_hos/actor/goombario_tutor.c
View File

@ -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)

72
src/battle/area_hos/actor/magikoopa.c
View File

@ -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))

6
src/battle/area_hos/area.c
View File

@ -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);

6
src/battle/area_hos/stage/hos_00.c
View File

@ -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
};

4
src/battle/area_hos/stage/hos_01.c
View File

@ -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
};

4
src/battle/area_hos/stage/hos_02.c
View File

@ -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
};

32
src/battle/area_isk_part_1/actor/buzzy_beetle.c
View File

@ -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))

46
src/battle/area_isk_part_1/actor/pokey_mummy.c
View File

@ -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)

32
src/battle/area_isk_part_1/actor/stone_chomp.c
View File

@ -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)

28
src/battle/area_isk_part_1/actor/swooper.c
View File

@ -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))

8
src/battle/area_isk_part_1/area.c
View File

@ -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);

4
src/battle/area_isk_part_1/stage/isk_00.c
View File

@ -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
};

4
src/battle/area_isk_part_1/stage/isk_01.c
View File

@ -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
};

4
src/battle/area_isk_part_1/stage/isk_02.c
View File

@ -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
};

4
src/battle/area_isk_part_1/stage/isk_02b.c
View File

@ -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
};

4
src/battle/area_isk_part_1/stage/isk_02c.c
View File

@ -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
};

4
src/battle/area_isk_part_1/stage/isk_03.c
View File

@ -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
};

4
src/battle/area_isk_part_1/stage/isk_03b.c
View File

@ -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
};

4
src/battle/area_isk_part_1/stage/isk_04.c
View File

@ -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

4
src/battle/area_isk_part_1/stage/isk_05.c
View File

@ -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

4
src/battle/area_isk_part_1/stage/isk_06.c
View File

@ -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

4
src/battle/area_isk_part_1/stage/isk_06b.c
View File

@ -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

4
src/battle/area_isk_part_1/stage/isk_07.c
View File

@ -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

4
src/battle/area_isk_part_1/stage/isk_08.c
View File

@ -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

62
src/battle/area_iwa/actor/buzzar.c
View File

@ -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

26
src/battle/area_iwa/actor/cleft.c
View File

@ -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))

28
src/battle/area_iwa/actor/monty_mole.c
View File

@ -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)

28
src/battle/area_iwa/actor/whacka.c
View File

@ -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)

8
src/battle/area_iwa/area.c
View File

@ -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);

34
src/battle/area_iwa/stage/iwa_01.c
View File

@ -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)

4
src/battle/area_iwa/stage/iwa_01b.c
View File

@ -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
};

34
src/battle/area_iwa/stage/iwa_02.c
View File

@ -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)

2
src/battle/area_kkj/6DBDA0.c
View File

@ -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;

6
src/battle/area_kmr_part_1/area.c
View File

@ -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);

4
src/battle/area_kmr_part_1/stage/kmr_02.c
View File

@ -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
};

4
src/battle/area_kmr_part_1/stage/kmr_03.c
View File

@ -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
};

4
src/battle/area_kmr_part_1/stage/kmr_04.c
View File

@ -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
};

4
src/battle/area_kmr_part_1/stage/kmr_05.c
View File

@ -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
};

4
src/battle/area_kmr_part_1/stage/kmr_06.c
View File

@ -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
};

30
src/battle/area_kmr_part_2/actor/blue_goomba.c
View File

@ -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)

22
src/battle/area_kmr_part_2/actor/blue_goomba2.c
View File

@ -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))

42
src/battle/area_kmr_part_2/actor/goomba_king.c
View File

@ -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)

30
src/battle/area_kmr_part_2/actor/goomnut_tree.c
View File

@ -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)

26
src/battle/area_kmr_part_2/actor/red_goomba.c
View File

@ -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)

22
src/battle/area_kmr_part_2/actor/red_goomba2.c
View File

@ -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))

12
src/battle/area_kmr_part_2/area.c
View File

@ -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);

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