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

40% (#459)

Browse Source 
* cleanup
* some of effect_9
* remove 1 warning
* restore Bowser Slug to his former glory (behavior)
This commit is contained in:
Ethan Roseman 2021-10-04 02:42:38 +09:00 committed by GitHub
parent 59050ec3e9
commit 969e28c76c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 411 additions and 630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Jenkinsfile vendored
View File

@ -42,10 +42,11 @@ pipeline {
def message = "${us_progress}\n${jp_progress}\n${warnings}"
if (message != "\n\n") {
if (comment_id != -1) {
pullRequest.deleteComment(comment_id)
if (comment_id == -1) {
pullRequest.comment(message)
} else {
pullRequest.editComment(comment_id, message)
}
pullRequest.comment(message)
}
}
}

8
include/common_structs.h
View File

@ -335,12 +335,12 @@ typedef struct Evt {
/* 0x144 */ s32 id;
/* 0x148 */ union {
s32 enemyID;
ActorID actorID;
s32 actorID;
struct Enemy* enemy; ///< For overworld scripts owned by an Npc
struct Actor* actor; ///< For battle scripts
} owner1; ///< Initially -1
/* 0x14C */ union {
NpcID npcID;
s32 npcID;
s32 triggerID;
struct Npc* npc; ///< For overworld scripts owned by an Npc
struct Trigger* trigger;
@ -1659,7 +1659,7 @@ typedef struct Actor {
/* 0x208 */ s8 unk_208;
/* 0x209 */ char unk_209[3];
/* 0x20C */ u32* statusTable;
/* 0x210 */ Status debuff;
/* 0x210 */ s8 debuff;
/* 0x211 */ s8 debuffDuration;
/* 0x212 */ s8 staticStatus; /* 0B = yes */
/* 0x213 */ s8 staticDuration;
@ -2077,7 +2077,7 @@ typedef struct Temp8010F250 {
/* 0x08 */ s32 unk_08;
/* 0x0C */ s32 unk_0C;
/* 0x10 */ char unk_10[0x20];
/* 0x30 */ SoundID unk_30;
/* 0x30 */ s32 unk_30;
} Temp8010F250; // size = 0x34
typedef struct PartnerActionStatus {

4
include/effects.h
View File

@ -54,7 +54,7 @@ typedef struct StarSpiritEffect {
/* 0x34 */ f32 unk_34;
/* 0x38 */ s32 unk_38;
/* 0x3C */ s32 unk_3C;
/* 0x40 */ s32 unk_40; // an shadowID
/* 0x40 */ s32 unk_40; // a shadowID
/* 0x44 */ s16 unk_44;
/* 0x46 */ s16 unk_46;
/* 0x48 */ s16 unk_48;
@ -138,7 +138,7 @@ typedef struct EffectGraphics {
} EffectGraphics; // size = 0x20
typedef struct EffectTableEntry {
/* 0x00 */ void (*entryPoint)(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 x, f32 y, f32 z);
/* 0x00 */ void (*entryPoint);
/* 0x04 */ void* dmaStart;
/* 0x08 */ void* dmaEnd;
/* 0x0C */ void* dmaDest;

31
include/enums.h
View File

@ -242,7 +242,6 @@ enum StoryProgress {
STORY_EPILOGUE,
};
typedef UNK_TYPE EncounterTrigger;
enum EncounterTriggers {
ENCOUNTER_TRIGGER_NONE = 1,
ENCOUNTER_TRIGGER_JUMP,
@ -252,7 +251,6 @@ enum EncounterTriggers {
ENCOUNTER_TRIGGER_PARTNER,
};
typedef s32 SongID;
enum SongIDs {
SONG_TOAD_TOWN = 0,
SONG_UNUSED_1,
@ -407,7 +405,6 @@ enum SongIDs {
SONG_NEW_PARTNER_J_P,
};
typedef UNK_TYPE Ability;
enum Abilities {
ABILITY_DODGE_MASTER,
ABILITY_UNUSED,
@ -467,7 +464,6 @@ enum Abilities {
ABILITY_HEALTHY_HEALTHY,
};
typedef UNK_TYPE Emote;
enum Emotes {
EMOTE_EXCLAMATION,
EMOTE_SHOCK,
@ -477,7 +473,6 @@ enum Emotes {
EMOTE_INVALID,
};
typedef UNK_TYPE Easing;
enum Easings {
EASING_LINEAR,
EASING_QUADRATIC_IN,
@ -494,7 +489,6 @@ enum Easings {
EASING_COS_IN,
};
typedef UNK_TYPE SoundID;
enum SoundIDs {
SOUND_UNKNOWN_0,
SOUND_MENU_BADGE_EQUIP = 5,
@ -640,7 +634,6 @@ enum Cams {
#define LOOKUP_ITEM(itemID) gItemTable[itemID & ~0xF0000]
typedef s16 ItemID;
enum ItemIDs {
ITEM_NONE,
ITEM_JUMP,
@ -1010,7 +1003,6 @@ enum ItemIDs {
#define ITEM_LAST_BADGE ITEM_ATTACK_F_X_F5
// TODO: use NPC_ANIM-like macro for player animations
typedef UNK_TYPE PlayerAnim;
enum PlayerAnims {
ANIM_1 = 1, // XXX
ANIM_STAND_STILL = 0x10000,
@ -1071,7 +1063,6 @@ enum PlayerAnims {
ANIM_90006,
};
typedef UNK_TYPE AmbientSound;
enum AmbientSounds {
AMBIENT_SPOOKY,
AMBIENT_WIND,
@ -1090,7 +1081,6 @@ enum AmbientSounds {
AMBIENT_MUSIC = 16,
};
typedef UNK_TYPE EncounterOutcome;
enum EncounterOutcomes {
OUTCOME_PLAYER_WON,
OUTCOME_PLAYER_LOST,
@ -1098,7 +1088,6 @@ enum EncounterOutcomes {
OUTCOME_ENEMY_FLED,
};
typedef UNK_TYPE DecorationID;
enum DecorationIDs {
DECORATION_GOLDEN_FLAMES = 1,
DECORATION_SWEAT,
@ -1111,7 +1100,6 @@ enum DecorationIDs {
DECORATION_RADIAL_STAR_EMITTER = 11,
};
typedef UNK_TYPE HitResult;
enum HitResults {
HIT_RESULT_TRIGGERED_EXPLODE = -1,
HIT_RESULT_HIT,
@ -1123,7 +1111,6 @@ enum HitResults {
HIT_RESULT_IMMUNE,
};
typedef UNK_TYPE Iter;
enum Iters {
ITER_FIRST = -1,
ITER_NEXT,
@ -1131,7 +1118,6 @@ enum Iters {
ITER_LAST = 10,
};
typedef UNK_TYPE ActorSoundID;
enum ActorSoundIDs {
ACTOR_SOUND_WALK,
ACTOR_SOUND_FLY,
@ -1141,7 +1127,6 @@ enum ActorSoundIDs {
ACTOR_SOUND_FLY_INCREMENT,
};
typedef UNK_TYPE Phase;
enum Phases {
PHASE_EXECUTE_ACTION,
PHASE_FIRST_STRIKE,
@ -1160,7 +1145,6 @@ enum Phases {
PHASE_PLAYER_HAPPY = 30,
};
typedef s32 ActorID;
enum ActorIDs {
ACTOR_SELF = 0xFFFFFF81,
ACTOR_PLAYER = 0x0,
@ -1191,7 +1175,6 @@ enum ActorIDs {
ACTOR_ENEMY23,
};
typedef UNK_TYPE Element;
enum Elements {
ELEMENT_END,
ELEMENT_NORMAL,
@ -1209,7 +1192,6 @@ enum Elements {
ELEMENT_THROW = 15,
};
typedef UNK_TYPE Event;
enum Events {
EVENT_HIT_COMBO = 9,
EVENT_HIT,
@ -1252,7 +1234,6 @@ enum Events {
EVENT_REVIVE,
};
typedef UNK_TYPE HitSound;
enum HitSounds {
HIT_SOUND_MISS,
HIT_SOUND_BONES,
@ -1262,7 +1243,6 @@ enum HitSounds {
HIT_SOUND_SHOCK,
};
typedef s8 Status;
enum Statuses {
STATUS_END,
STATUS_NORMAL,
@ -1299,13 +1279,11 @@ enum Statuses {
STATUS_STOP_TURN_MOD,
};
typedef UNK_TYPE DoorSwing;
enum DoorSwings {
DOOR_SWING_OUT = -1,
DOOR_SWING_IN = 1,
};
typedef UNK_TYPE ItemSpawnMode;
enum ItemSpawnModes {
ITEM_SPAWN_MODE_UNKNOWN_0,
ITEM_SPAWN_MODE_DECORATION,
@ -1337,7 +1315,6 @@ enum ItemSpawnModes {
ITEM_SPAWN_MODE_UNKNOWN_1B,
};
typedef UNK_TYPE Location;
enum Locations {
LOCATION_TOAD_TOWN = 1,
LOCATION_TOAD_TOWN_TUNNELS,
@ -1377,7 +1354,6 @@ enum Locations {
LOCATION_MARIOS_HOUSE,
};
typedef UNK_TYPE DoorSound;
enum DoorSounds {
DOOR_SOUND_BASIC,
DOOR_SOUND_METAL,
@ -1388,7 +1364,6 @@ enum DoorSounds {
DOOR_SOUND_UNKNOWN_6,
};
typedef s8 ActionState;
enum ActionStates {
ACTION_STATE_IDLE,
ACTION_STATE_WALK,
@ -1433,7 +1408,6 @@ enum ActionStates {
ACTION_STATE_USE_SPRING,
};
typedef s32 NpcID;
enum NpcIDs {
NPC_SELF = -1,
NPC_PLAYER = -2,
@ -1456,7 +1430,6 @@ enum {
TRIGGER_POINT_BOMB = 0x00100000,
};
typedef UNK_TYPE Button;
enum Buttons {
BUTTON_C_RIGHT = 0x00000001,
BUTTON_C_LEFT = 0x00000002,
@ -1478,7 +1451,6 @@ enum Buttons {
BUTTON_STICK_RIGHT = 0x00080000,
};
typedef UNK_TYPE PlayerBuff;
enum PlayerBuffs {
PLAYER_BUFF_JUMP_CHARGE = 0x00000001,
PLAYER_BUFF_HAMMER_CHARGE = 0x00000002,
@ -1493,7 +1465,6 @@ enum PlayerBuffs {
PLAYER_BUFF_ALL = 0xFFFFFFFF,
};
typedef UNK_TYPE StatusFlag;
enum StatusFlags {
STATUS_FLAG_SLEEP = 0x00001000,
STATUS_FLAG_STATIC = 0x00002000,
@ -1514,7 +1485,6 @@ enum StatusFlags {
STATUS_FLAG_RIGHT_ON = 0x40000000,
};
typedef UNK_TYPE DamageType;
enum DamageTypes {
DAMAGE_TYPE_FIRE = 0x00000002,
DAMAGE_TYPE_WATER = 0x00000004,
@ -1535,7 +1505,6 @@ enum DamageTypes {
DAMAGE_TYPE_TRIGGER_LUCKY = 0x80000000,
};
typedef s8 PartnerID;
enum PartnerIDs {
PARTNER_NONE,
PARTNER_GOOMBARIO,

36
include/functions.h
View File

@ -172,7 +172,7 @@ Trigger* create_trigger(TriggerDefinition* def);
s32 evt_bound_script_trigger_handler(Trigger* trigger);
Trigger* get_trigger_by_id(s32 triggerID);
Actor* get_actor(ActorID actorID);
Actor* get_actor(s32 actorID);
ActorPart* get_actor_part(Actor* actor, s32 partIndex);
s32 add_coins(s32 amt);
@ -281,7 +281,7 @@ Evt* start_script_in_group(EvtSource* source, u8 priority, u8 initialState, u8 g
f32 get_player_normal_yaw(void);
void set_standard_shadow_scale(Shadow* shadow, f32 scale);
void set_peach_shadow_scale(Shadow* shadow, f32 scale);
void set_animation_rate(ActorID actorID, s32 partIndex, f32 rate);
void set_animation_rate(s32 actorID, s32 partIndex, f32 rate);
void func_8011B7C0(u16, s32, s32);
AnimatedMesh* get_animator_by_index(s32 arg0);
void set_screen_overlay_params_front(u8, f32);
@ -294,7 +294,7 @@ s32 rand_int(s32);
void sort_items(void);
s32 is_ability_active(s32 arg0);
s32 is_starting_conversation(void);
f32 update_lerp(Easing easing, f32 start, f32 end, s32 elapsed, s32 duration);
f32 update_lerp(s32 easing, f32 start, f32 end, s32 elapsed, s32 duration);
void sin_cos_deg(f32 rad, f32* outSinTheta, f32* outCosTheta);
void set_main_pan_u(s32 texPannerID, s32 value);
@ -313,7 +313,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic
s32 make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 pickupVar);
void set_item_entity_position(s32 itemEntityIndex, f32 x, f32 y, f32 z);
ItemEntity* get_item_entity(s32 itemEntityIndex);
s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar);
s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupVar);
void set_item_entity_flags(s32 itemEntityIndex, s32 flag);
s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(void));
@ -328,9 +328,9 @@ s32 enable_player_static_collisions(void);
s32 check_input_jump(void);
s32 check_input_hammer(void);
Npc* get_npc_safe(NpcID npcId);
Npc* get_npc_unsafe(NpcID npcId);
Npc* resolve_npc(Evt* script, NpcID npcIdOrPtr);
Npc* get_npc_safe(s32 npcId);
Npc* get_npc_unsafe(s32 npcId);
Npc* resolve_npc(Evt* script, s32 npcIdOrPtr);
void set_npc_yaw(Npc* npcPtr, f32 angle);
void npc_move_heading(Npc* npc, f32 speed, f32 yaw);
void enable_npc_blur(Npc* npc);
@ -355,18 +355,18 @@ s32 basic_hidden_window_update(void);
void player_create_target_list(Actor* actor);
void enemy_create_target_list(Actor* actor);
void set_actor_yaw(ActorID actorID, s32 yaw);
void set_part_yaw(ActorID actorID, s32 partIndex, s32 value);
void set_actor_yaw(s32 actorID, s32 yaw);
void set_part_yaw(s32 actorID, s32 partIndex, s32 value);
void add_part_decoration(ActorPart* part, s32 decorationIndex, DecorationID decorationType);
void add_actor_decoration(Actor* actor, s32 decorationIndex, DecorationID decorationType);
void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationType);
void add_actor_decoration(Actor* actor, s32 decorationIndex, s32 decorationType);
void remove_part_decoration(ActorPart* part, s32 decorationIndex);
void remove_actor_decoration(Actor* actor, s32 decorationIndex);
s32 player_team_is_ability_active(Actor* actor, Ability ability);
s32 player_team_is_ability_active(Actor* actor, s32 ability);
void create_part_shadow(ActorID actorID, s32 partIndex);
void remove_part_shadow(ActorID actorID, s32 partIndex);
void create_part_shadow(s32 actorID, s32 partIndex);
void remove_part_shadow(s32 actorID, s32 partIndex);
void create_part_shadow_by_ref(UNK_TYPE arg0, ActorPart* part); // arg0 unused
Evt* get_script_by_index(s32 index);
@ -467,7 +467,7 @@ void crash_screen_init(void);
void crash_screen_set_draw_info(u16* frameBufPtr, s16 width, s16 height);
// Dead functions:
//Npc* dead_get_npc_safe(NpcID npcId); // get_npc_safe
//Npc* dead_get_npc_safe(s32 npcId); // get_npc_safe
void func_80077BD0(s32, s32, s32, s32, s32, s32);
void func_8006CAC0(float mf[4][4], float x, float y, float z);
@ -497,6 +497,8 @@ s32 mdl_get_next_texture_address(s32);
void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style);
void get_background_color_blend(u8* r, u8* g, u8* b, u8* a);
s8 set_global_byte(s32 index, s32 value);
s32 entity_base_block_idle(Entity* entity);
s32 recover_hp(s32 amt);
s32 recover_fp(s32 amt);
@ -517,11 +519,11 @@ void enable_player_shadow(void);
s32 get_msg_lines(s32 messageID);
void set_window_properties(s32 panelID, s32 posX, s32 posY, s32 width, s32 height, s32, void* drawContents, PopupMessage* popup, s32 parent);
void set_window_update(s32 panelID, s32);
void snd_stop_sound(SoundID soundID);
void snd_stop_sound(s32 soundID);
void partner_disable_input(void);
void func_80268798(s32, s32, s32, s32);
void func_802687E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void sfx_stop_sound(SongID soundID);
void sfx_stop_sound(s32 soundID);
void close_message(MessagePrintState* msgPrintState);
void show_foreground_models_unchecked(void);
void hide_foreground_models_unchecked(void);

13
include/map.h
View File

@ -9,7 +9,6 @@
// TODO: consider moving Npc here
#define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f))
typedef s32 MessageID;
typedef Vec4f EntryList[];
/// Fields other than main, entryList, entryCount, background, and tattle are initialised when the map loads.
@ -28,7 +27,7 @@ typedef struct MapConfig {
/* 0x34 */ char unk_34[4];
/* 0x38 */ BackgroundHeader* background;
/* 0x3C */ union {
MessageID msgID;
s32 msgID;
UNK_FUN_PTR(get);
} tattle;
} MapConfig; // size = 0x40
@ -100,7 +99,7 @@ typedef struct NpcSettings {
} NpcSettings; // size = 0x2C
typedef struct ItemDrop {
/* 0x00 */ ItemID item;
/* 0x00 */ s16 item;
/* 0x02 */ s16 weight;
/* 0x04 */ s16 unk_08;
} ItemDrop; // size = 0x06
@ -191,7 +190,7 @@ typedef struct EnemyDrops {
} EnemyDrops; // size = 0xB8
typedef struct StaticNpc {
/* 0x000 */ NpcID id;
/* 0x000 */ s32 id;
/* 0x004 */ NpcSettings* settings;
/* 0x008 */ Vec3f pos;
/* 0x014 */ s32 flags;
@ -226,7 +225,7 @@ typedef struct StaticNpc {
} animations;
/* 0x1E0 */ char unk_1E0[8];
/* 0x1E8 */ s32* extraAnimations;
/* 0x1EC */ MessageID tattle;
/* 0x1EC */ s32 tattle;
} StaticNpc; // size = 0x1F0
enum TerritoryShape { SHAPE_CYLINDER, SHAPE_RECT };
@ -330,7 +329,7 @@ typedef struct {
#define NPC_GROUP(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle }
Enemy* get_enemy(NpcID npcId);
Enemy* get_enemy(s32 npcId);
MapConfig* get_current_map_header(void);
s32 func_800490B4(EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, f32 arg3, s32 arg4);
@ -340,7 +339,7 @@ extern Area gAreas[29];
/// Lists the songs that are forced to use the variation determined by `map.songVariation & 1`.
/// @see bgm_get_map_default_variation
extern SongID gSongsUsingVariationFlag[6];
extern s32 gSongsUsingVariationFlag[6];
extern s16 D_8014F738;
#endif

6
include/variables.h
View File

@ -9,8 +9,8 @@
extern UiStatus gUIStatus;
extern PlayerData gPlayerData;
extern ActionState gPlayerActionState;
extern PlayerAnim gPlayerAnimation;
extern s8 gPlayerActionState;
extern s32 gPlayerAnimation;
extern PlayerStatus gPlayerStatus;
extern PlayerStatus* gPlayerStatusPtr;
extern CollisionStatus gCollisionStatus;
@ -206,7 +206,7 @@ extern MenuWindowBP pause_map_windowBlueprints[7];
// Badges
extern s32 gBadgeMenuCurrentScrollPos;
extern s32 gBadgeMenuTargetScrollPos;
extern ItemID gBadgeMenuItemIDs[128];
extern s16 gBadgeMenuItemIDs[128];
extern s32 gBadgeMenuCurrentPage;
extern PauseItemPage gBadgeMenuPages[20];
extern s32 gBadgeMenuSelectedIndex;

2
src/16c8e0.c
View File

@ -15,7 +15,7 @@ void* D_802809FC[] = {
s32 D_80280A30 = 0xFF;
extern PartnerID D_8029DA33;
extern s8 D_8029DA33;
extern s32 D_8029DA34;
extern Camera D_8029DA50[ARRAY_COUNT(gCameras)];
extern f32 D_8029EFB0;

8
src/1776B0.c
View File

@ -150,13 +150,13 @@ void func_8024E40C(s32 arg0) {
}
}
void btl_cam_target_actor(ActorID actorID) {
void btl_cam_target_actor(s32 actorID) {
if (D_80280CE0 == 0) {
D_8029F27C = actorID;
}
}
void func_8024E45C(ActorID actorID, s32 arg1) {
void func_8024E45C(s32 actorID, s32 arg1) {
if (D_80280CE0 == 0) {
D_8029F27C = actorID;
D_8029F27E = arg1;
@ -421,7 +421,7 @@ ApiStatus SetBattleCamYaw(Evt* script, s32 isInitialCall) {
ApiStatus BattleCamTargetActor(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID;
s32 actorID;
if (D_80280CE0 != 0) {
return ApiStatus_DONE2;
@ -440,7 +440,7 @@ ApiStatus BattleCamTargetActor(Evt* script, s32 isInitialCall) {
ApiStatus func_8024EB84(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID;
s32 actorID;
if (D_80280CE0 != 0) {
return ApiStatus_DONE2;

4
src/17FEB0.c
View File

@ -1,9 +1,9 @@
#include "common.h"
HitResult calc_item_check_hit(void) {
s32 calc_item_check_hit(void) {
BattleStatus* battleStatus = &gBattleStatus;
ActorMovement* walk = &battleStatus->playerActor->state;
ActorID actorID = battleStatus->currentTargetID;
s32 actorID = battleStatus->currentTargetID;
s8 currentTargetPartS8;
u32 currentTargetPart;
Actor* actor;

10
src/181810.c
View File

@ -16,7 +16,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) {
Actor* actor;
ActorPart* part;
s32 msgID;
ActorID actorID;
s32 actorID;
s32 partIndex;
s32 anim;
@ -285,7 +285,7 @@ ApiStatus func_802537C0(Evt* script, s32 isInitialCall) {
ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Bytecode soundID = *args++;
Actor* actor;
@ -301,7 +301,7 @@ ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall) {
ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
Bytecode soundID = *args++;
ActorPart* part;
@ -318,7 +318,7 @@ ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall) {
ApiStatus PlayLoopingSoundAtActor(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 idx = evt_get_variable(script, *args++);
Bytecode soundID = *args++;
Actor* actor;
@ -336,7 +336,7 @@ ApiStatus PlayLoopingSoundAtActor(Evt* script, s32 isInitialCall) {
ApiStatus StopLoopingSoundAtActor(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 idx = evt_get_variable(script, *args++);
Actor* actor;

32
src/190B20.c
View File

@ -7,7 +7,7 @@ s32 D_80280FC0[] = {
0x000A005A, 0x00000032, 0x0003000B, 0x00000032, 0x0001002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00010031, 0x00000032, 0x00010031, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00010032, 0x00000032, 0x00010032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x0003000A, 0x00000032, 0x0003000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x0003000A, 0x00000014, 0x0003000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
};
MessageID bActorNames[ACTOR_TYPE_COUNT] = {
s32 bActorNames[ACTOR_TYPE_COUNT] = {
/* 0x00 */ MSG_actor_red_goomba,
/* 0x01 */ MSG_actor_red_paragoomba,
/* 0x02 */ MSG_actor_gloomba,
@ -439,7 +439,7 @@ ActorSounds bActorSoundTable[ACTOR_TYPE_COUNT] = {
/* 0xD3 */ { .walk = { 0x0000, 0x0000 }, .fly = { 0x0000, 0x0000 }, .jump = 0x0000, .hurt = 0x0000, .delay = { 30, 30 } },
};
MessageID bActorTattles[ACTOR_TYPE_COUNT] = {
s32 bActorTattles[ACTOR_TYPE_COUNT] = {
/* 0x00 */ NULL,
/* 0x01 */ NULL,
/* 0x02 */ MSG_actor_gloomba_tattle,
@ -1031,7 +1031,7 @@ s32 D_80283744[] = {
0x00000000, 0x80283D98, 0x80283D98, 0x80283D98, 0x80283D98, 0x80283D98, 0x80283D98, 0x80283D98, 0x80283D98, 0x80283D98, 0x80283D98,
};
MessageID bMessages[] = {
s32 bMessages[] = {
MSG_merlee_increase_atk, MSG_merlee_increase_dmg, MSG_merlee_increase_star_points, MSG_merlee_end,
MSG_charge_hammer, MSG_charge_hammer_more, MSG_charge_jump, MSG_charge_jump_more, MSG_charge_max,
MSG_enemy_missed,
@ -1047,7 +1047,7 @@ MessageID bMessages[] = {
MSG_no_switch_used_turn, MSG_no_switch_dazed, MSG_no_switch_used_turn, MSG_no_switch_dazed, 0x001D00C3,
};
MessageID bActorMessages[] = {
s32 bActorMessages[] = {
MSG_party_mario, MSG_party_goombario, MSG_party_kooper, MSG_party_bombette, MSG_party_parakarry, MSG_party_goompa, MSG_party_watt, MSG_party_sushie, MSG_party_lakilester, MSG_party_bow, MSG_party_goombaria, MSG_party_twink, MSG_party_peach
};
@ -1130,13 +1130,13 @@ INCLUDE_ASM(s32, "190B20", set_animation);
INCLUDE_ASM(s32, "190B20", func_80263E08);
INCLUDE_ASM(void, "190B20", set_animation_rate, ActorID actorID, s32 partIndex, f32 rate);
INCLUDE_ASM(void, "190B20", set_animation_rate, s32 actorID, s32 partIndex, f32 rate);
void set_actor_yaw(ActorID actorID, s32 yaw) {
void set_actor_yaw(s32 actorID, s32 yaw) {
get_actor(actorID)->yaw = yaw;
}
void set_part_yaw(ActorID actorID, s32 partIndex, s32 value) {
void set_part_yaw(s32 actorID, s32 partIndex, s32 value) {
get_actor_part(get_actor(actorID), partIndex)->yaw = value;
}
@ -1200,7 +1200,7 @@ INCLUDE_ASM(s32, "190B20", func_80265CE8);
INCLUDE_ASM(s32, "190B20", func_80265D44);
s32 lookup_defense(DictionaryEntry* defenseTable, Element elementKey) {
s32 lookup_defense(DictionaryEntry* defenseTable, s32 elementKey) {
s32 normalDefense = 0;
while (defenseTable->key != ELEMENT_END) {
@ -1219,7 +1219,7 @@ s32 lookup_defense(DictionaryEntry* defenseTable, Element elementKey) {
return normalDefense;
}
s32 lookup_status_chance(DictionaryEntry* statusTable, Element statusKey) {
s32 lookup_status_chance(DictionaryEntry* statusTable, s32 statusKey) {
s32 defaultChance = 0;
while (statusTable->key != STATUS_END) {
@ -1238,7 +1238,7 @@ s32 lookup_status_chance(DictionaryEntry* statusTable, Element statusKey) {
return defaultChance;
}
s32 lookup_status_duration_mod(DictionaryEntry* statusTable, Element statusKey) {
s32 lookup_status_duration_mod(DictionaryEntry* statusTable, s32 statusKey) {
s32 defaultTurnMod = 0;
while (statusTable->key != ELEMENT_END) {
@ -1570,7 +1570,7 @@ INCLUDE_ASM(s32, "190B20", func_8026709C);
INCLUDE_ASM(s32, "190B20", func_802670C8);
void add_part_decoration(ActorPart* part, s32 decorationIndex, DecorationID decorationType) {
void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationType) {
if ((part->idleAnimations) && !(part->flags & 2)) {
DecorationTable* decorationTable = part->decorationTable;
@ -1582,7 +1582,7 @@ void add_part_decoration(ActorPart* part, s32 decorationIndex, DecorationID deco
}
}
void add_actor_decoration(Actor* actor, s32 decorationIndex, DecorationID decorationType) {
void add_actor_decoration(Actor* actor, s32 decorationIndex, s32 decorationType) {
ActorPart* part;
for (part = actor->partsTable; part != NULL; part = part->nextPart) {
if ((part->flags & 0x100001) == 0 && part->idleAnimations && !(part->flags & 2)) {
@ -1604,7 +1604,7 @@ void remove_actor_decoration(Actor* actor, s32 decorationIndex) {
}
}
s32 player_team_is_ability_active(Actor* actor, Ability ability) {
s32 player_team_is_ability_active(Actor* actor, s32 ability) {
s32 actorGenus = actor->actorID & 0x700;
s32 hasAbility = FALSE;
@ -1622,7 +1622,7 @@ s32 player_team_is_ability_active(Actor* actor, Ability ability) {
return hasAbility;
}
void create_part_shadow(ActorID actorID, s32 partIndex) {
void create_part_shadow(s32 actorID, s32 partIndex) {
ActorPart* part = get_actor_part(get_actor(actorID), partIndex);
part->flags &= ~4;
@ -1630,7 +1630,7 @@ void create_part_shadow(ActorID actorID, s32 partIndex) {
part->shadowScale = part->size.x / 24.0;
}
void remove_part_shadow(ActorID actorID, s32 partIndex) {
void remove_part_shadow(s32 actorID, s32 partIndex) {
ActorPart* part = get_actor_part(get_actor(actorID), partIndex);
part->flags |= 4;
@ -1643,7 +1643,7 @@ void create_part_shadow_by_ref(UNK_TYPE arg0, ActorPart* part) {
part->shadowScale = part->size.x / 24.0;
}
void remove_player_buffs(PlayerBuff buffs) {
void remove_player_buffs(s32 buffs) {
BattleStatus* battleStatus = &gBattleStatus;
Actor* player = battleStatus->playerActor;
Actor* partner = battleStatus->partnerActor;

180
src/197F40.c
View File

@ -39,11 +39,11 @@ s32 get_nearest_home_index(f32 x, f32 y, f32 z) {
return yVal | (xVal << 2);
}
INCLUDE_ASM(void, "197F40", set_goal_pos_to_part, f32* goalPos, ActorID target, s32 partIndex);
INCLUDE_ASM(void, "197F40", set_goal_pos_to_part, f32* goalPos, s32 target, s32 partIndex);
INCLUDE_ASM(s32, "197F40", set_part_goal_to_actor_part);
void set_actor_current_position(ActorID actorID, f32 x, f32 y, f32 z) {
void set_actor_current_position(s32 actorID, f32 x, f32 y, f32 z) {
Actor* actor = get_actor(actorID);
actor->currentPos.x = x;
@ -51,7 +51,7 @@ void set_actor_current_position(ActorID actorID, f32 x, f32 y, f32 z) {
actor->currentPos.z = z;
}
void set_part_absolute_position(ActorID actorID, s32 partIndex, f32 x, f32 y, f32 z) {
void set_part_absolute_position(s32 actorID, s32 partIndex, f32 x, f32 y, f32 z) {
Actor* actor = get_actor(actorID);
ActorPart* actorPart;
@ -71,7 +71,7 @@ void set_part_absolute_position(ActorID actorID, s32 partIndex, f32 x, f32 y, f3
}
}
void set_actor_home_position(ActorID actorID, f32 x, f32 y, f32 z) {
void set_actor_home_position(s32 actorID, f32 x, f32 y, f32 z) {
Actor* actor = get_actor(actorID);
actor->homePos.x = x;
@ -79,7 +79,7 @@ void set_actor_home_position(ActorID actorID, f32 x, f32 y, f32 z) {
actor->homePos.z = z;
}
Actor* get_actor(ActorID actorID) {
Actor* get_actor(s32 actorID) {
Actor* ret = NULL;
BattleStatus* battleStatus = &gBattleStatus;
s32 idFlag = actorID & 0x700;
@ -130,7 +130,7 @@ ApiStatus func_80269EAC(Evt* script, s32 isInitialCall) {
}
ApiStatus SetGoalToHome(Evt* script, s32 isInitialCall) {
ActorID actorID = evt_get_variable(script, *script->ptrReadPos);
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
Actor* actor;
if (actorID == ACTOR_SELF) {
@ -146,7 +146,7 @@ ApiStatus SetGoalToHome(Evt* script, s32 isInitialCall) {
}
ApiStatus SetIdleGoalToHome(Evt* script, s32 isInitialCall) {
ActorID actorID = evt_get_variable(script, *script->ptrReadPos);
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
Actor* actor;
if (actorID == ACTOR_SELF) {
@ -165,7 +165,7 @@ INCLUDE_ASM(s32, "197F40", SetGoalToIndex);
ApiStatus GetIndexFromPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 a1 = *args++;
Actor* actor;
@ -181,7 +181,7 @@ ApiStatus GetIndexFromPos(Evt* script, s32 isInitialCall) {
ApiStatus GetIndexFromHome(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 a1 = *args++;
Actor* actor;
@ -197,7 +197,7 @@ ApiStatus GetIndexFromHome(Evt* script, s32 isInitialCall) {
ApiStatus CountPlayerTargets(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 targetSelectionFlags = *args++;
s32 outVar = *args++;
Actor* actor;
@ -215,7 +215,7 @@ ApiStatus CountPlayerTargets(Evt* script, s32 isInitialCall) {
ApiStatus ForceHomePos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
f32 x, y, z;
Actor* actor;
@ -240,7 +240,7 @@ ApiStatus ForceHomePos(Evt* script, s32 isInitialCall) {
ApiStatus SetHomePos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
f32 x, y, z;
Actor* actor;
@ -262,7 +262,7 @@ ApiStatus SetHomePos(Evt* script, s32 isInitialCall) {
ApiStatus SetGoalToTarget(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
if (actorID == ACTOR_SELF) {
@ -277,7 +277,7 @@ ApiStatus SetGoalToTarget(Evt* script, s32 isInitialCall) {
ApiStatus SetPartGoalToTarget(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
Actor* actor;
@ -293,7 +293,7 @@ ApiStatus SetPartGoalToTarget(Evt* script, s32 isInitialCall) {
ApiStatus SetGoalToFirstTarget(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
SelectableTarget* target;
@ -310,7 +310,7 @@ ApiStatus SetGoalToFirstTarget(Evt* script, s32 isInitialCall) {
ApiStatus SetGoalPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
ActorMovement* walk;
f32 x, y, z;
@ -350,7 +350,7 @@ ApiStatus SetGoalPos(Evt* script, s32 isInitialCall) {
ApiStatus SetIdleGoal(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
ActorMovement* fly;
f32 x, y, z;
@ -389,7 +389,7 @@ ApiStatus SetIdleGoal(Evt* script, s32 isInitialCall) {
ApiStatus AddGoalPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
f32 x, y, z;
@ -411,7 +411,7 @@ ApiStatus AddGoalPos(Evt* script, s32 isInitialCall) {
ApiStatus GetGoalPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 outX, outY, outZ;
s32 x, y, z;
@ -440,7 +440,7 @@ ApiStatus GetGoalPos(Evt* script, s32 isInitialCall) {
// should this be renamed to GetFlyGoal ?
ApiStatus GetIdleGoal(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 outX, outY, outZ;
s32 x, y, z;
@ -468,7 +468,7 @@ ApiStatus GetIdleGoal(Evt* script, s32 isInitialCall) {
ApiStatus GetPartTarget(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
Actor* actor;
ActorPart* actorPart;
@ -499,7 +499,7 @@ ApiStatus GetPartTarget(Evt* script, s32 isInitialCall) {
ApiStatus GetActorPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 outX, outY, outZ;
s32 x, y, z;
@ -527,7 +527,7 @@ ApiStatus GetActorPos(Evt* script, s32 isInitialCall) {
ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* actorPart;
s32 outX, outY, outZ;
@ -563,7 +563,7 @@ ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) {
ApiStatus GetPartPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* actorPart;
s32 outX, outY, outZ;
@ -593,7 +593,7 @@ ApiStatus GetPartPos(Evt* script, s32 isInitialCall) {
ApiStatus GetHomePos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 outX, outY, outZ;
s32 x, y, z;
@ -621,7 +621,7 @@ ApiStatus GetHomePos(Evt* script, s32 isInitialCall) {
ApiStatus SetActorPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
f32 x, y, z;
@ -643,7 +643,7 @@ ApiStatus SetActorPos(Evt* script, s32 isInitialCall) {
ApiStatus SetPartPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 partIndex;
f32 x, y, z;
@ -687,7 +687,7 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) {
ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 partIndex;
f32 x, y;
@ -719,7 +719,7 @@ ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) {
ApiStatus SetAnimation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
if (actorID == ACTOR_SELF) {
@ -733,7 +733,7 @@ ApiStatus SetAnimation(Evt* script, s32 isInitialCall) {
ApiStatus GetAnimation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 var1;
ActorPart* actorPart;
s32 a1;
@ -754,7 +754,7 @@ ApiStatus GetAnimation(Evt* script, s32 isInitialCall) {
ApiStatus SetAnimationRate(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
if (actorID == ACTOR_SELF) {
@ -768,7 +768,7 @@ ApiStatus SetAnimationRate(Evt* script, s32 isInitialCall) {
ApiStatus SetActorYaw(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -780,7 +780,7 @@ ApiStatus SetActorYaw(Evt* script, s32 isInitialCall) {
ApiStatus GetActorYaw(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 a1;
if (actorID == ACTOR_SELF) {
@ -795,7 +795,7 @@ ApiStatus GetActorYaw(Evt* script, s32 isInitialCall) {
ApiStatus SetPartYaw(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -807,7 +807,7 @@ ApiStatus SetPartYaw(Evt* script, s32 isInitialCall) {
ApiStatus GetPartYaw(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
s32 a1;
@ -824,7 +824,7 @@ ApiStatus GetPartYaw(Evt* script, s32 isInitialCall) {
ApiStatus SetActorJumpGravity(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
f32 jumpAccel;
if (actorID == ACTOR_SELF) {
@ -838,7 +838,7 @@ ApiStatus SetActorJumpGravity(Evt* script, s32 isInitialCall) {
ApiStatus SetActorIdleJumpGravity(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
f32 flyJumpAccel;
if (actorID == ACTOR_SELF) {
@ -852,7 +852,7 @@ ApiStatus SetActorIdleJumpGravity(Evt* script, s32 isInitialCall) {
ApiStatus SetActorSpeed(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
f32 moveSpeed;
if (actorID == ACTOR_SELF) {
@ -867,7 +867,7 @@ ApiStatus SetActorSpeed(Evt* script, s32 isInitialCall) {
// SetActorFlySpeed?
ApiStatus SetActorIdleSpeed(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
f32 flySpeed;
if (actorID == ACTOR_SELF) {
@ -881,7 +881,7 @@ ApiStatus SetActorIdleSpeed(Evt* script, s32 isInitialCall) {
ApiStatus SetPartJumpGravity(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
f32 jumpScale;
@ -898,7 +898,7 @@ ApiStatus SetPartJumpGravity(Evt* script, s32 isInitialCall) {
ApiStatus SetPartMoveSpeed(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
f32 moveSpeed;
@ -915,7 +915,7 @@ ApiStatus SetPartMoveSpeed(Evt* script, s32 isInitialCall) {
ApiStatus SetJumpAnimations(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 jumpPartIndex;
s32 animJumpRise;
@ -942,7 +942,7 @@ ApiStatus SetJumpAnimations(Evt* script, s32 isInitialCall) {
ApiStatus AddActorPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
f32 x, y, z;
@ -964,7 +964,7 @@ ApiStatus AddActorPos(Evt* script, s32 isInitialCall) {
ApiStatus SetActorDispOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
f32 x, y, z;
@ -986,7 +986,7 @@ ApiStatus SetActorDispOffset(Evt* script, s32 isInitialCall) {
ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 partIndex;
s32 outX, outY, outZ;
@ -1022,7 +1022,7 @@ ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) {
ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 partIndex;
f32 x, y, z;
@ -1053,7 +1053,7 @@ ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) {
ApiStatus AddPartDispOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 partIndex;
f32 x, y, z;
@ -1098,7 +1098,7 @@ ApiStatus func_8026BF48(Evt* script, s32 isInitialCall) {
ApiStatus GetActorVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 var1;
s32 a2;
@ -1116,7 +1116,7 @@ ApiStatus GetActorVar(Evt* script, s32 isInitialCall) {
ApiStatus SetActorVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 index;
s32 val;
@ -1134,7 +1134,7 @@ ApiStatus SetActorVar(Evt* script, s32 isInitialCall) {
ApiStatus AddActorVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 index;
s32 val;
ActorState* state;
@ -1154,7 +1154,7 @@ ApiStatus AddActorVar(Evt* script, s32 isInitialCall) {
ApiStatus GetPartMovementVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
s32 tableIndex;
s32 outVar;
@ -1174,7 +1174,7 @@ ApiStatus GetPartMovementVar(Evt* script, s32 isInitialCall) {
ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
s32 tableIndex;
s32 val;
@ -1194,7 +1194,7 @@ ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) {
ApiStatus AddPartMovementVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
s32 tableIndex;
s32 val;
@ -1214,7 +1214,7 @@ ApiStatus AddPartMovementVar(Evt* script, s32 isInitialCall) {
ApiStatus SetActorRotation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 x, y, z;
@ -1245,7 +1245,7 @@ ApiStatus SetActorRotation(Evt* script, s32 isInitialCall) {
ApiStatus SetActorRotationOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 x, y, z;
@ -1268,7 +1268,7 @@ ApiStatus SetActorRotationOffset(Evt* script, s32 isInitialCall) {
ApiStatus GetActorRotation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 x, y, z;
@ -1291,7 +1291,7 @@ ApiStatus GetActorRotation(Evt* script, s32 isInitialCall) {
ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 x, y, z;
@ -1315,7 +1315,7 @@ ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) {
ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 x, y, z;
@ -1339,7 +1339,7 @@ ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) {
ApiStatus GetPartRotation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 x, y, z;
@ -1363,7 +1363,7 @@ ApiStatus GetPartRotation(Evt* script, s32 isInitialCall) {
ApiStatus SetActorScale(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
f32 x, y, z;
@ -1386,7 +1386,7 @@ ApiStatus SetActorScale(Evt* script, s32 isInitialCall) {
ApiStatus SetActorScaleModifier(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
f32 x, y, z;
@ -1409,7 +1409,7 @@ ApiStatus SetActorScaleModifier(Evt* script, s32 isInitialCall) {
ApiStatus GetActorScale(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
f32 x, y, z;
@ -1432,7 +1432,7 @@ ApiStatus GetActorScale(Evt* script, s32 isInitialCall) {
ApiStatus SetPartScale(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
ActorPart* actorPart;
f32 x, y, z;
@ -1456,7 +1456,7 @@ ApiStatus SetPartScale(Evt* script, s32 isInitialCall) {
ApiStatus GetPartScale(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 x, y, z;
@ -1518,7 +1518,7 @@ ApiStatus SetBattleFlagBits2(Evt* script, s32 isInitialCall) {
ApiStatus SetActorFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 a1;
if (actorID == ACTOR_SELF) {
@ -1533,7 +1533,7 @@ ApiStatus SetActorFlags(Evt* script, s32 isInitialCall) {
ApiStatus SetActorFlagBits(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 a1;
s32 var1;
Actor* actor;
@ -1557,7 +1557,7 @@ ApiStatus SetActorFlagBits(Evt* script, s32 isInitialCall) {
ApiStatus GetActorFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 a1;
if (actorID == ACTOR_SELF) {
@ -1573,7 +1573,7 @@ ApiStatus GetActorFlags(Evt* script, s32 isInitialCall) {
ApiStatus SetPartFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 a1;
s32 partIndex;
@ -1591,7 +1591,7 @@ ApiStatus SetPartFlags(Evt* script, s32 isInitialCall) {
ApiStatus SetPartFlagBits(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 bits;
s32 partIndex;
@ -1618,7 +1618,7 @@ ApiStatus SetPartFlagBits(Evt* script, s32 isInitialCall) {
ApiStatus SetPartTargetFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 flags;
s32 partIndex;
@ -1638,7 +1638,7 @@ ApiStatus SetPartTargetFlags(Evt* script, s32 isInitialCall) {
ApiStatus SetPartTargetFlagBits(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 partIndex;
s32 bits;
@ -1665,7 +1665,7 @@ ApiStatus SetPartTargetFlagBits(Evt* script, s32 isInitialCall) {
ApiStatus GetPartFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* actorPart;
s32 a2;
@ -1684,7 +1684,7 @@ ApiStatus GetPartFlags(Evt* script, s32 isInitialCall) {
ApiStatus GetPartTargetFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* actorPart;
s32 a2;
@ -1703,7 +1703,7 @@ ApiStatus GetPartTargetFlags(Evt* script, s32 isInitialCall) {
ApiStatus SetPartEventFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 flags;
s32 partIndex;
@ -1723,7 +1723,7 @@ ApiStatus SetPartEventFlags(Evt* script, s32 isInitialCall) {
ApiStatus SetPartEventBits(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 partIndex;
s32 bits;
@ -1750,7 +1750,7 @@ ApiStatus SetPartEventBits(Evt* script, s32 isInitialCall) {
ApiStatus GetPartEventFlags(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* actorPart;
s32 a2;
@ -1769,7 +1769,7 @@ ApiStatus GetPartEventFlags(Evt* script, s32 isInitialCall) {
ApiStatus func_8026D51C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 flags;
s32 partIndex;
@ -1789,7 +1789,7 @@ ApiStatus func_8026D51C(Evt* script, s32 isInitialCall) {
ApiStatus func_8026D5A4(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
ActorPart* actorPart;
s32 partIndex;
s32 bits;
@ -1816,7 +1816,7 @@ ApiStatus func_8026D5A4(Evt* script, s32 isInitialCall) {
ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
if (actorID == ACTOR_SELF) {
@ -1839,7 +1839,7 @@ ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) {
ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
if (actorID == ACTOR_SELF) {
@ -1862,7 +1862,7 @@ ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) {
ApiStatus func_8026D8EC(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -1875,7 +1875,7 @@ ApiStatus func_8026D8EC(Evt* script, s32 isInitialCall) {
ApiStatus func_8026D940(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 x, y;
@ -1903,7 +1903,7 @@ ApiStatus func_8026D940(Evt* script, s32 isInitialCall) {
ApiStatus func_8026DA94(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 a, b, c, d;
@ -1941,7 +1941,7 @@ ApiStatus ActorExists(Evt* script, s32 isInitialCall) {
Bytecode isExist;
Actor* partner = gBattleStatus.partnerActor;
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -1958,7 +1958,7 @@ ApiStatus ActorExists(Evt* script, s32 isInitialCall) {
ApiStatus func_8026DEF0(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
s32 a2 = *args++;
@ -1973,7 +1973,7 @@ ApiStatus func_8026DEF0(Evt* script, s32 isInitialCall) {
ApiStatus func_8026DF88(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
s32 a2 = *args++;
@ -2179,7 +2179,7 @@ ApiStatus GetBattleVar(Evt* script, s32 isInitialCall) {
ApiStatus ResetAllActorSounds(Evt* script, s32 isInitialCall) {
ActorID actorID = evt_get_variable(script, *script->ptrReadPos);
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -2197,7 +2197,7 @@ INCLUDE_ASM(s32, "197F40", SetPartSounds);
ApiStatus SetActorType(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID* actorID = evt_get_variable(script, *args++);
s32* actorID = evt_get_variable(script, *args++);
Actor* enemy;
s32 actorType;
@ -2218,7 +2218,7 @@ ApiStatus SetActorType(Evt* script, s32 isInitialCall) {
ApiStatus ShowShockEffect(Evt* script, s32 isInitialCall) {
ActorID actorID = evt_get_variable(script, *script->ptrReadPos);
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -2272,7 +2272,7 @@ ApiStatus WaitForBuffDone(Evt* script, s32 isInitialCall) {
ApiStatus CopyBuffs(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actorFrom;
Actor* actorTo;

4
src/19FAF0.c
View File

@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "19FAF0", calc_player_damage_enemy);
INCLUDE_ASM(s32, "19FAF0", dispatch_damage_event_player);
s32 dispatch_damage_event_player_0(s32 damageAmount, Event event) {
s32 dispatch_damage_event_player_0(s32 damageAmount, s32 event) {
BattleStatus* battleStatus = &gBattleStatus;
battleStatus->currentAttackElement = ELEMENT_END;
@ -94,7 +94,7 @@ s32 dispatch_damage_event_player_0(s32 damageAmount, Event event) {
return dispatch_damage_event_player(damageAmount, event, FALSE);
}
void dispatch_damage_event_player_1(s32 damageAmount, Event event) {
void dispatch_damage_event_player_1(s32 damageAmount, s32 event) {
dispatch_damage_event_player(damageAmount, event, TRUE);
}

88
src/1A5830.c
View File

@ -5,7 +5,7 @@
extern s32 D_802946E0[];
void dispatch_event_actor(Actor* actor, Event event);
void dispatch_event_actor(Actor* actor, s32 event);
void func_8024EFE0(f32 x, f32 y, f32 z, s32 a, s32 b);
void func_802664DC(f32 x, f32 y, f32 z, s32 damage);
s32 dispatch_damage_event_actor_1(Actor* actor, s32 damageAmount, s32 event);
@ -28,7 +28,7 @@ s32 has_enchanted_part(Actor* actor) {
return ret;
}
void dispatch_event_general(Actor* actor, Event event) {
void dispatch_event_general(Actor* actor, s32 event) {
switch (actor->actorID & 0x700) {
case ACTOR_PLAYER:
dispatch_event_player(event);
@ -107,7 +107,7 @@ void play_hit_sound(Actor* actor, f32 x, f32 y, f32 z, u32 hitSound) {
}
}
void dispatch_event_actor(Actor* actor, Event event) {
void dispatch_event_actor(Actor* actor, s32 event) {
Evt* onHitScript = actor->onHitScript;
s32 onHitID = actor->onHitID;
@ -797,7 +797,7 @@ s32 dispatch_damage_event_actor_1(Actor* actor, s32 damageAmount, s32 event) {
ApiStatus BindTakeTurn(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
EvtSource* takeTurnScript;
if (actorID == ACTOR_SELF) {
@ -811,7 +811,7 @@ ApiStatus BindTakeTurn(Evt* script, s32 isInitialCall) {
ApiStatus PauseTakeTurn(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -824,7 +824,7 @@ ApiStatus PauseTakeTurn(Evt* script, s32 isInitialCall) {
ApiStatus ResumeTakeTurn(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -837,7 +837,7 @@ ApiStatus ResumeTakeTurn(Evt* script, s32 isInitialCall) {
ApiStatus BindIdle(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
EvtSource* idleCode;
Actor* actor;
Evt* newScriptContext;
@ -864,7 +864,7 @@ ApiStatus BindIdle(Evt* script, s32 isInitialCall) {
ApiStatus EnableIdleScript(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 var1;
Actor* actor;
@ -895,7 +895,7 @@ ApiStatus EnableIdleScript(Evt* script, s32 isInitialCall) {
ApiStatus BindHandleEvent(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
EvtSource* var1;
if (actorID == ACTOR_SELF) {
@ -909,7 +909,7 @@ ApiStatus BindHandleEvent(Evt* script, s32 isInitialCall) {
ApiStatus BindNextTurn(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
EvtSource* var1;
if (actorID == ACTOR_SELF) {
@ -994,7 +994,7 @@ INCLUDE_ASM(s32, "1A5830", FlyPartTo);
ApiStatus GetLastEvent(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outVar;
if (actorID == ACTOR_SELF) {
@ -1008,7 +1008,7 @@ ApiStatus GetLastEvent(Evt* script, s32 isInitialCall) {
ApiStatus SetTargetActor(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 targetActorID;
Actor* actor;
@ -1025,7 +1025,7 @@ ApiStatus SetTargetActor(Evt* script, s32 isInitialCall) {
ApiStatus SetEnemyHP(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s8 newHP;
Actor* actor;
@ -1049,7 +1049,7 @@ ApiStatus SetEnemyHP(Evt* script, s32 isInitialCall) {
ApiStatus GetActorHP(Evt* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 outVar;
s32 outVal;
@ -1079,7 +1079,7 @@ ApiStatus GetActorHP(Evt* script, s32 isInitialCall) {
ApiStatus GetEnemyMaxHP(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outVar;
if (actorID == ACTOR_SELF) {
@ -1097,7 +1097,7 @@ ApiStatus RemoveActor(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
EncounterStatus* currentEncounter = &gCurrentEncounter;
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 i;
@ -1131,7 +1131,7 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) {
Actor* dropper;
f32 playerLevel;
f32 enemyLevel;
ActorID actorID;
s32 actorID;
f32 ntd;
s32 numToDrop;
@ -1183,7 +1183,7 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) {
ApiStatus SetDefenseTable(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
u32* var2;
@ -1199,7 +1199,7 @@ ApiStatus SetDefenseTable(Evt* script, s32 isInitialCall) {
ApiStatus SetStatusTable(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
u32* var1;
if (actorID == ACTOR_SELF) {
@ -1213,7 +1213,7 @@ ApiStatus SetStatusTable(Evt* script, s32 isInitialCall) {
ApiStatus SetIdleAnimations(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
u32* var2;
@ -1229,7 +1229,7 @@ ApiStatus SetIdleAnimations(Evt* script, s32 isInitialCall) {
ApiStatus func_8027CC10(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
if (actorID == ACTOR_SELF) {
@ -1249,7 +1249,7 @@ ApiStatus func_8027CC10(Evt* script, s32 isInitialCall) {
ApiStatus EnemyDamageTarget(Evt *script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
BattleStatus* battleStatus = &gBattleStatus;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 outVar;
s32 hitResult;
@ -1362,7 +1362,7 @@ ApiStatus EnemyFollowupAfflictTarget(Evt* script, s32 isInitialCall) {
ApiStatus EnemyTestTarget(Evt *script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
BattleStatus* battleStatus = &gBattleStatus;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor *actor;
s32 outVar;
s32 hitResult;
@ -1433,7 +1433,7 @@ ApiStatus EnemyTestTarget(Evt *script, s32 isInitialCall) {
ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 damageAmount;
s32 scriptExists;
@ -1455,7 +1455,7 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) {
ApiStatus DispatchEvent(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -1466,7 +1466,7 @@ ApiStatus DispatchEvent(Evt* script, s32 isInitialCall) {
}
ApiStatus func_8027D2D8(Evt* script, s32 isInitialCall) {
ActorID actorID = evt_get_variable(script, *script->ptrReadPos);
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -1477,7 +1477,7 @@ ApiStatus func_8027D2D8(Evt* script, s32 isInitialCall) {
}
ApiStatus func_8027D32C(Evt* script, s32 isInitialCall) {
ActorID actorID = evt_get_variable(script, *script->ptrReadPos);
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -1489,7 +1489,7 @@ ApiStatus func_8027D32C(Evt* script, s32 isInitialCall) {
ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* part;
s32 x;
@ -1513,7 +1513,7 @@ ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) {
ApiStatus func_8027D434(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* part;
@ -1529,7 +1529,7 @@ ApiStatus func_8027D434(Evt* script, s32 isInitialCall) {
ApiStatus func_8027D4C8(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex;
ActorPart* part;
s32 temp;
@ -1553,7 +1553,7 @@ ApiStatus func_8027D4C8(Evt* script, s32 isInitialCall) {
ApiStatus EnableActorBlur(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 enable = evt_get_variable(script, *args++);
Actor* actor;
@ -1574,7 +1574,7 @@ ApiStatus EnableActorBlur(Evt* script, s32 isInitialCall) {
}
ApiStatus func_8027D628(Evt* script, s32 isInitialCall) {
ActorID actorID = evt_get_variable(script, *script->ptrReadPos);
s32 actorID = evt_get_variable(script, *script->ptrReadPos);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
@ -1586,7 +1586,7 @@ ApiStatus func_8027D628(Evt* script, s32 isInitialCall) {
ApiStatus AfflictActor(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Actor* actor;
s32 statusTypeKey;
s32 duration;
@ -1625,7 +1625,7 @@ ApiStatus AfflictActor(Evt* script, s32 isInitialCall) {
ApiStatus func_8027D75C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outVar = *args++;
if (actorID == ACTOR_SELF) {
@ -1648,7 +1648,7 @@ ApiStatus YieldTurn(Evt* script, s32 isInitialCall) {
ApiStatus SetActorSize(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 y = evt_get_variable(script, *args++);
s32 x = evt_get_variable(script, *args++);
Actor* actor;
@ -1672,7 +1672,7 @@ ApiStatus SetActorSize(Evt* script, s32 isInitialCall) {
ApiStatus GetActorSize(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outY = *args++;
s32 outX = *args++;
Actor* actor;
@ -1689,7 +1689,7 @@ ApiStatus GetActorSize(Evt* script, s32 isInitialCall) {
ApiStatus SetPartSize(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
s32 sizeY = evt_get_variable(script, *args++);
s32 sizeX = evt_get_variable(script, *args++);
@ -1716,7 +1716,7 @@ ApiStatus SetPartSize(Evt* script, s32 isInitialCall) {
ApiStatus GetOriginalActorType(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outVar = *args++;
if (actorID == ACTOR_SELF) {
@ -1729,7 +1729,7 @@ ApiStatus GetOriginalActorType(Evt* script, s32 isInitialCall) {
ApiStatus GetCurrentActorType(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outVar = *args++;
if (actorID == ACTOR_SELF) {
@ -1742,7 +1742,7 @@ ApiStatus GetCurrentActorType(Evt* script, s32 isInitialCall) {
ApiStatus GetLastDamage(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outVar;
if (actorID == ACTOR_SELF) {
@ -1756,7 +1756,7 @@ ApiStatus GetLastDamage(Evt* script, s32 isInitialCall) {
ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 flag;
Actor* actor;
@ -1802,8 +1802,8 @@ ApiStatus WasStatusInflicted(Evt* script, s32 isInitialCall) {
ApiStatus CopyStatusEffects(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorIDTo;
ActorID actorIDFrom;
s32 actorIDTo;
s32 actorIDFrom;
Actor* actorTo;
Actor* actorFrom;
@ -1833,7 +1833,7 @@ ApiStatus CopyStatusEffects(Evt* script, s32 isInitialCall) {
ApiStatus ClearStatusEffects(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 flag;
Actor* actor;

4
src/1AC760.c
View File

@ -159,7 +159,7 @@ ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
s32 hitResult;
Actor* actor;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
s32 outVar;
if (actorID == ACTOR_SELF) {
@ -180,7 +180,7 @@ ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) {
ApiStatus GetActorLevel(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
Bytecode* outVar;
if (actorID == ACTOR_SELF) {

110
src/77480.c
View File

@ -604,117 +604,7 @@ INCLUDE_ASM(void, "77480", render_player_model);
INCLUDE_ASM(s32, "77480", appendGfx_player);
/// Only used when speedy spinning.
// Close-ish, but needs work. Started and then got intimidated - Ethan
#ifdef NON_MATCHING
void func_802DDEE4(s32, s32, s32, s32, s32, s32, s32, s32); // extern
void func_802DDFF8(s32, s32, s32, s32, s32, s32, s32); // extern
void appendGfx_player_spin(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
s32 z;
s32 y;
s32 x;
Matrix4f sp20;
Matrix4f sp60;
Matrix4f spA0;
Matrix4f spE0;
f32 temp_f0;
f32 temp_f20;
f32 temp_f26;
f32 temp_f28;
f32 temp_f2;
f32 temp_f2_2;
f32 temp_f30;
s32 temp_a2;
s32 i;
s32 i;
f32 phi_f20;
s32 phi_a2;
f32 phi_f20_2;
f32 phi_f30;
f32 phi_f24;
f32 phi_f28;
s32 phi_a0;
i = 0;
do {
temp_f20 = -gCameras[gCurrentCamID].currentYaw;
phi_f20_2 = temp_f20;
if (i == 0) {
temp_f2 = playerStatus->spriteFacingAngle;
if ((temp_f2 > 90.0f) && (temp_f2 <= 180.0f)) {
phi_f20 = 180.0f - temp_f2;
} else {
temp_f0 = playerStatus->spriteFacingAngle;
if (temp_f0 > 180.0f) {
if (temp_f0 <= 270.0f) {
phi_f20 = temp_f0 - 180.0f;
} else {
goto block_9;
}
} else {
block_9:
if ((temp_f0 > 270.0f) && (temp_f0 <= 360.0f)) {
phi_f20 = 360.0f - temp_f0;
} else {
phi_f20 = playerStatus->spriteFacingAngle;
}
}
}
temp_a2 = 0xFF - ((s32) (phi_f20 / 25.0f) * 60);
phi_a2 = temp_a2;
phi_f20_2 = phi_f20;
if (temp_a2 < 100) {
phi_a2 = 100;
}
func_802DDFF8(0, 6, phi_a2, phi_a2, phi_a2, 0xFF, 0);
guRotateF(spA0, phi_f20, 0.0f, -1.0f, 0.0f);
guRotateF(sp20, clamp_angle(playerStatus->unk_8C), 0.0f, 0.0f, 1.0f);
guMtxCatF(spA0, sp20, sp20);
phi_f30 = playerStatus->position.x;
phi_f24 = playerStatus->position.y;
phi_f28 = playerStatus->position.z;
} else {
temp_f26 = phys_get_spin_history(i, &x, &y, &z);
if (y == 0x80000000) {
phi_f24 = playerStatus->position.y;
} else {
phi_f24 = (f32) y;
}
temp_f30 = playerStatus->position.x;
temp_f28 = playerStatus->position.z;
func_802DDEE4(0, -1, 7, 0, 0, 0, 0x40, 0);
guRotateF(sp20, temp_f20, 0.0f, -1.0f, 0.0f);
guRotateF(spA0, temp_f20, 0.0f, -1.0f, 0.0f);
guRotateF(sp20, temp_f26, 0.0f, 1.0f, 0.0f);
guMtxCatF(spA0, sp20, sp20);
phi_f30 = temp_f30;
phi_f28 = temp_f28;
}
guTranslateF(sp60, 0.0f, -playerStatus->colliderHeight * 0.5f, 0.0f);
guMtxCatF(sp60, sp20, sp20);
guRotateF(spA0, phi_f20_2, 0.0f, 1.0f, 0.0f);
guMtxCatF(sp20, spA0, sp20);
guRotateF(spA0, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f);
guMtxCatF(sp20, spA0, sp20);
guTranslateF(sp60, 0.0f, playerStatus->colliderHeight * 0.5f, 0.0f);
guMtxCatF(sp20, sp60, sp20);
guScaleF(spE0, SPRITE_WORLD_SCALE, SPRITE_WORLD_SCALE, SPRITE_WORLD_SCALE);
guMtxCatF(sp20, spE0, sp20);
guTranslateF(sp60, phi_f30, phi_f24, phi_f28);
guMtxCatF(sp20, sp60, sp20);
temp_f2_2 = playerStatus->spriteFacingAngle;
phi_a0 = 0;
if (temp_f2_2 >= 90.0f && (temp_f2_2 < 270.0f)) {
phi_a0 = 0x10000000;
}
spr_draw_player_sprite(phi_a0, 0, 0, 0, &sp20);
i++;
} while (i < 2);
}
#else
INCLUDE_ASM(s32, "77480", appendGfx_player_spin);
#endif
void update_player_shadow(void) {
PlayerStatus* playerStatus = &gPlayerStatus;

2
src/7E9D0.c
View File

@ -102,7 +102,7 @@ void set_action_state(s32 actionState) {
}
if (actionState == ACTION_STATE_HIT_FIRE || actionState == ACTION_STATE_HIT_LAVA) {
PartnerID partner;
s8 partner;
if (playerStatus->unk_BF == 3) {
actionState = ACTION_STATE_HIT_FIRE;

2
src/7bb60_len_41b0.c
View File

@ -360,7 +360,7 @@ void check_input_midair_jump(void) {
}
}
PartnerID get_current_partner_id(void) {
s8 get_current_partner_id(void) {
return gPlayerData.currentPartner;
}

2
src/80850_len_3060.c
View File

@ -872,7 +872,7 @@ void reset_status_menu(void) {
// Weird order of loading stuff
#ifdef NON_MATCHING
s32 is_ability_active(Ability ability) {
s32 is_ability_active(s32 ability) {
s32 abilityMoveID;
PlayerData* playerData = &gPlayerData;
s32 attackFXArray[6];

30
src/DF950.c
View File

@ -4,7 +4,7 @@
typedef struct SoundInstance {
/* 0x00 */ s32 flags;
/* 0x04 */ SoundID soundID;
/* 0x04 */ s32 soundID;
/* 0x08 */ s32 sourceFlags;
/* 0x0C */ u8 volume;
/* 0x0D */ u8 pan;
@ -290,7 +290,7 @@ void sfx_stop_env_sounds(void) {
}
}
SoundInstance* sfx_get_env_sound_instance(SoundID soundID) {
SoundInstance* sfx_get_env_sound_instance(s32 soundID) {
SoundInstance* sound = D_80159AD0;
s32 i;
@ -303,7 +303,7 @@ SoundInstance* sfx_get_env_sound_instance(SoundID soundID) {
return NULL;
}
void sfx_play_sound_looping(SoundID soundId, u8 volume, u8 pan, s16 pitchShift) {
void sfx_play_sound_looping(s32 soundId, u8 volume, u8 pan, s16 pitchShift) {
SoundInstance* sound = D_80159AD0;
s32 i;
@ -322,7 +322,7 @@ void sfx_play_sound_looping(SoundID soundId, u8 volume, u8 pan, s16 pitchShift)
snd_start_sound_with_shift(soundId, volume, pan, pitchShift);
}
void sfx_register_looping_sound_at_position(SoundID soundID, s32 flags, f32 x, f32 y, f32 z) {
void sfx_register_looping_sound_at_position(s32 soundID, s32 flags, f32 x, f32 y, f32 z) {
SoundInstance* sound = D_80159AD0;
s32 i;
@ -342,7 +342,7 @@ void sfx_register_looping_sound_at_position(SoundID soundID, s32 flags, f32 x, f
sfx_play_sound_at_position(soundID, flags, x, y, z);
}
s32 sfx_adjust_env_sound_pos(SoundID soundID, s32 sourceFlags, f32 x, f32 y, f32 z) {
s32 sfx_adjust_env_sound_pos(s32 soundID, s32 sourceFlags, f32 x, f32 y, f32 z) {
SoundInstance* sound = sfx_get_env_sound_instance(soundID);
if (sound == NULL) {
@ -359,7 +359,7 @@ s32 sfx_adjust_env_sound_pos(SoundID soundID, s32 sourceFlags, f32 x, f32 y, f32
return 1;
}
void func_80149A6C(SoundID soundID, s32 keepPlaying) {
void func_80149A6C(s32 soundID, s32 keepPlaying) {
SoundInstance* sound = sfx_get_env_sound_instance(soundID);
if (sound != NULL) {
@ -371,7 +371,7 @@ void func_80149A6C(SoundID soundID, s32 keepPlaying) {
}
#ifdef NON_MATCHING // weird & 0xFF everywhere
void sfx_play_sound_with_params(SoundID soundID, u8 arg1, u8 arg2, s16 arg3) {
void sfx_play_sound_with_params(s32 soundID, u8 arg1, u8 arg2, s16 arg3) {
AlternatingSoundSet* alternatingSound;
if (gGameStatusPtr->demoState) {
@ -379,7 +379,7 @@ void sfx_play_sound_with_params(SoundID soundID, u8 arg1, u8 arg2, s16 arg3) {
}
if (soundID < 0) {
SoundID sound = soundID & 0xFF;
s32 sound = soundID & 0xFF;
switch ((soundID >> 0x1C) & 7) {
case 0:
sfx_play_sound_looping(D_8014F2D0[sound], arg1, arg2, arg3);
@ -409,7 +409,7 @@ void sfx_play_sound_with_params(SoundID soundID, u8 arg1, u8 arg2, s16 arg3) {
INCLUDE_ASM(void, "DF950", sfx_play_sound_with_params, s32 arg0, u8 arg1, u8 arg2, s16 arg3);
#endif
void sfx_adjust_env_sound_params(SoundID soundID, u8 volume, u8 pan, s16 pitchShift) {
void sfx_adjust_env_sound_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift) {
SoundInstance* sound;
if (soundID < 0) {
@ -424,8 +424,8 @@ void sfx_adjust_env_sound_params(SoundID soundID, u8 volume, u8 pan, s16 pitchSh
}
}
void sfx_stop_sound(SoundID soundID) {
SoundID sound = soundID;
void sfx_stop_sound(s32 soundID) {
s32 sound = soundID;
if (sound < 0) {
func_80149A6C(D_8014F2D0[sound & 0xFFFF], 0);
@ -434,17 +434,17 @@ void sfx_stop_sound(SoundID soundID) {
}
}
void sfx_play_sound(SoundID soundID) {
void sfx_play_sound(s32 soundID) {
sfx_play_sound_with_params(soundID, 0, 0, 0);
}
void sfx_play_sound_at_player(SoundID soundID, s32 arg1) {
void sfx_play_sound_at_player(s32 soundID, s32 arg1) {
PlayerStatus* playerStatus = &gPlayerStatus;
sfx_play_sound_at_position(soundID, arg1, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z);
}
void sfx_play_sound_at_npc(SoundID soundID, s32 arg1, s32 npcID) {
void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) {
Npc* npc = get_npc_safe(npcID);
if (npc != NULL) {
@ -452,7 +452,7 @@ void sfx_play_sound_at_npc(SoundID soundID, s32 arg1, s32 npcID) {
}
}
INCLUDE_ASM(s32, "DF950", sfx_play_sound_at_position, SoundID soundID, s32 value2, f32 posX, f32 posY,
INCLUDE_ASM(s32, "DF950", sfx_play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY,
f32 posZ);
INCLUDE_ASM(void, "DF950", sfx_get_spatialized_sound_params, f32 arg0, f32 arg1, f32 arg2, s16* arg3, s16* arg4,

2
src/E21870.c
View File

@ -2,7 +2,7 @@
s32 func_802B7000_2(void) {
PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus;
ActionState actionState = gPlayerActionState;
s8 actionState = gPlayerActionState;
if (actionState != ACTION_STATE_USE_TWEESTER) {
if (partnerActionStatus->actionState.b[0] != 1 || (partnerActionStatus->actionState.b[3] != 9 && partnerActionStatus->actionState.b[3] != 4)) {

2
src/a5dd0_len_114e0.c
View File

@ -1304,7 +1304,7 @@ s32 test_player_entity_aabb(Entity* entity) {
INCLUDE_ASM(s32, "a5dd0_len_114e0", test_player_entity_aabb);
#endif
s32 is_player_action_state(ActionState actionState) {
s32 is_player_action_state(s8 actionState) {
return actionState == gPlayerActionState;
}

8
src/battle/battle.h
View File

@ -334,10 +334,10 @@ typedef DictionaryEntry DefenseTable[];
typedef DictionaryEntry StatusTable[];
typedef struct ActorSounds {
/* 0x00 */ SoundID walk[2];
/* 0x08 */ SoundID fly[2];
/* 0x10 */ SoundID jump;
/* 0x14 */ SoundID hurt;
/* 0x00 */ s32 walk[2];
/* 0x08 */ s32 fly[2];
/* 0x10 */ s32 jump;
/* 0x14 */ s32 hurt;
/* 0x18 */ s16 delay[2]; ///< Number of frames to wait between walk/fly sounds. Negative values are in distance.
} ActorSounds; // size = 0x20

4
src/battle/partner/goombario.c
View File

@ -10,7 +10,7 @@
extern EffectInstance* D_8023CDA0;
extern s32 D_8023CDA4;
extern s32 D_8023BB98_6ECC78;
extern MessageID bActorTattles[ACTOR_TYPE_COUNT];
extern s32 bActorTattles[ACTOR_TYPE_COUNT];
extern EvtSource N(init);
extern EvtSource N(80239784);
@ -124,7 +124,7 @@ ApiStatus func_80238B60_6F1C40(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;
Actor* targetActor = get_actor(partnerActor->targetActorID);
MessageID* tattle = &bActorTattles[targetActor->actorType];
s32* tattle = &bActorTattles[targetActor->actorType];
script->varTable[0] = *tattle;

2
src/dba20_len_350.c
View File

@ -104,7 +104,7 @@ s32 get_global_flag(s32 index) {
return flag;
}
s8 set_global_byte(s32 index, s8 value) {
s8 set_global_byte(s32 index, s32 value) {
SaveData* saveFile = &gCurrentSaveFile;
s32 ret = saveFile->globalBytes[index];

14
src/e0b30_len_b80.c
View File

@ -17,7 +17,7 @@ MusicSettings D_8014F6F0 = {
.unk_2C = 0
};
SongID gSongsUsingVariationFlag[] = { SONG_SPECIAL_BATTLE, SONG_TUBBA_BLUBBA_BATTLE, SONG_JR_TROOPA_BATTLE,
s32 gSongsUsingVariationFlag[] = { SONG_SPECIAL_BATTLE, SONG_TUBBA_BLUBBA_BATTLE, SONG_JR_TROOPA_BATTLE,
SONG_YOSHI_KIDS_FOUND, SONG_ITEM_UPGRADE, SONG_NEW_PARTNER,
};
@ -30,11 +30,11 @@ void bgm_set_target_volume(s16 volume);
///
/// @see gSongsUsingVariationFlag
/// @returns -1: no override; 0: override to variation 0; 1 override to variation 1
s32 bgm_get_map_default_variation(SongID songID) {
s32 bgm_get_map_default_variation(s32 songID) {
u32 i = 0;
Area* areas = gAreas;
GameStatus** gameStatus = &gGameStatusPtr;
SongID* allowed = gSongsUsingVariationFlag;
s32* allowed = gSongsUsingVariationFlag;
for (i = 0; i < ARRAY_COUNT(gSongsUsingVariationFlag); i++) {
if (allowed[i] == songID) {
@ -69,7 +69,7 @@ void bgm_reset_volume(void) {
INCLUDE_ASM(s32, "e0b30_len_b80", bgm_update_music_settings);
s32 _bgm_set_song(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
if (gGameStatusPtr->demoState != 0) {
return 1;
} else {
@ -111,7 +111,7 @@ s32 _bgm_set_song(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime
}
}
s32 bgm_set_song(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) {
s32 bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) {
MusicSettings* musicSettings = gMusicSettings;
musicSettings[playerIndex].flags &= ~8;
@ -119,7 +119,7 @@ s32 bgm_set_song(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime,
return _bgm_set_song(playerIndex, songID, variation, fadeOutTime, volume);
}
s32 func_8014A964(s32 playerIndex, SongID songID, s32 variation, s32 fadeInTime, s16 arg4, s16 arg5) {
s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s16 arg4, s16 arg5) {
if (gGameStatusPtr->demoState != 0) {
return 1;
} else {
@ -273,7 +273,7 @@ void bgm_pop_song(void) {
}
}
void bgm_push_song(SongID songID, s32 variation) {
void bgm_push_song(s32 songID, s32 variation) {
MusicSettings* musicSetting = &gMusicSettings[0];
if (gGameStatusPtr->demoState == 0) {

4
src/effects.c
View File

@ -13,7 +13,7 @@ extern EffectGraphics gEffectGraphicsData[15];
extern EffectInstance* gEffectInstances[96];
extern s32 D_801A6000;
#define FX_MAIN(name) void name(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 x, f32 y, f32 z);
#define FX_MAIN(name) void name(s32); // the actual signature is going to be wrong but doesn't matter
#define FX_ENTRY(name, gfx_name) { fx_##name##_main, effect_##name##_ROM_START, effect_##name##_ROM_END, \
effect_##name##_VRAM, gfx_name##_ROM_START, gfx_name##_ROM_END }
@ -403,7 +403,7 @@ void render_effects_UI(void) {
if (effectInstance != NULL) {
if (effectInstance->flags & 1) {
if (effectInstance->flags & 8) {
void (*renderUI)(EffectInstance* effectInst);
void (*renderUI)(EffectInstance* effect);
if (gGameStatusPtr->isBattle && !(effectInstance->flags & 4)) {
continue;

95
src/effects/effect_9.c
View File

@ -1,18 +1,101 @@
#include "common.h"
#include "effects_internal.h"
INCLUDE_ASM(s32, "effects/effect_9", func_E0012000);
typedef struct Effect9 {
/* 0x00 */ s32 unk_00;
/* 0x04 */ char unk_04[0x2];
/* 0x06 */ s16 unk_06;
/* 0x08 */ u8 primAlpha;
/* 0x09 */ char unk_09[0x3];
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ f32 unk_20;
/* 0x24 */ f32 unk_24;
/* 0x28 */ f32 unk_28;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ Mtx unk_30;
/* 0x70 */ f32 unk_70;
/* 0x74 */ f32 unk_74;
/* 0x78 */ f32 unk_78;
/* 0x7C */ f32 unk_7C;
/* 0x80 */ f32 unk_80;
/* 0x84 */ f32 unk_84;
/* 0x88 */ f32 unk_88;
/* 0x8C */ f32 unk_8C;
/* 0x90 */ f32 unk_90;
/* 0x94 */ f32 unk_94;
} Effect9; // size = 0x98
void fx_9_init(EffectInstance* effect);
void fx_9_update(EffectInstance* effect);
void fx_9_render(EffectInstance* effect);
void fx_9_appendGfx(EffectInstance* effect);
void func_E0012000(Effect9* effect) {
Matrix4f sp18;
Matrix4f sp58;
shim_guRotateF(sp18, effect->unk_24, 1.0f, 0.0f, 0.0f);
shim_guRotateF(sp58, effect->unk_2C, 0.0f, 0.0f, 1.0f);
shim_guMtxCatF(sp58, sp18, sp18);
shim_guRotateF(sp58, effect->unk_28, 0.0f, 1.0f, 0.0f);
shim_guMtxCatF(sp18, sp58, sp18);
shim_guScaleF(sp58, effect->unk_18, effect->unk_1C, effect->unk_20);
shim_guMtxCatF(sp58, sp18, sp18);
shim_guTranslateF(sp58, effect->unk_0C, effect->unk_10, effect->unk_14);
shim_guMtxCatF(sp18, sp58, sp18);
shim_guMtxF2L(sp18, &effect->unk_30);
}
void func_E0012104(Effect9* effect);
INCLUDE_ASM(s32, "effects/effect_9", func_E0012104);
INCLUDE_ASM(s32, "effects/effect_9", fx_9_main);
void func_E0012440(void) {
void func_E0012440(EffectInstance* effect) {
}
INCLUDE_ASM(s32, "effects/effect_9", func_E0012448);
void fx_9_update(EffectInstance* effect) {
Effect9* part = (Effect9*)effect->data;
s32 cond = FALSE;
s32 i;
INCLUDE_ASM(s32, "effects/effect_9", func_E0012504);
for (i = 0; i < effect->numParts; i++, part++) {
if (part->unk_00 != 0) {
part->unk_06--;
if (part->unk_06 <= 0) {
part->unk_00 = 0;
} else {
cond = TRUE;
func_E0012104(part);
func_E0012000(part);
}
}
}
INCLUDE_ASM(s32, "effects/effect_9", func_E0012548);
if (!cond) {
shim_remove_effect(effect);
}
}
INCLUDE_ASM(s32, "effects/effect_9", func_E0012564);
void fx_9_render(EffectInstance* effect) {
RenderTask renderTask;
RenderTask* retTask;
renderTask.appendGfx = fx_9_appendGfx;
renderTask.appendGfxArg = effect;
renderTask.distance = 0;
renderTask.renderMode = RENDER_MODE_28;
retTask = shim_queue_render_task(&renderTask);
retTask->renderMode |= RENDER_MODE_2;
}
void func_E0012548(EffectInstance* effect) {
shim_remove_effect(effect);
}
INCLUDE_ASM(s32, "effects/effect_9", fx_9_appendGfx);

24
src/encounter_api.c
View File

@ -244,7 +244,7 @@ INCLUDE_ASM(s32, "encounter_api", BindNpcAI, Evt* script, s32 isInitialCall);
ApiStatus BindNpcIdle(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* owner = script->owner1.enemy;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
Bytecode* aiBytecode = (Bytecode*)evt_get_variable(script, *args);
if (npcID == NPC_SELF) {
@ -260,7 +260,7 @@ ApiStatus BindNpcIdle(Evt* script, s32 isInitialCall) {
ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Evt* newScript;
s32 groupFlags;
@ -294,7 +294,7 @@ ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) {
ApiStatus EnableNpcAI(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args);
if (npcId == NPC_SELF) {
@ -319,7 +319,7 @@ INCLUDE_ASM(s32, "encounter_api", SetNpcAux, Evt* script, s32 isInitialCall);
ApiStatus BindNpcAux(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode* auxBytecode = (Bytecode*)evt_get_variable(script, *args);
if (npcId == NPC_SELF) {
@ -335,7 +335,7 @@ ApiStatus BindNpcAux(Evt* script, s32 isInitialCall) {
ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
Evt* newScript;
s32 groupFlags;
@ -368,7 +368,7 @@ ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) {
ApiStatus EnableNpcAux(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args);
if (npcId == NPC_SELF) {
@ -391,7 +391,7 @@ ApiStatus EnableNpcAux(Evt* script, s32 isInitialCall) {
ApiStatus BindNpcInteract(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode* interactBytecode = (Bytecode*)evt_get_variable(script, *args);
if (npcId == NPC_SELF) {
@ -411,7 +411,7 @@ ApiStatus BindNpcInteract(Evt* script, s32 isInitialCall) {
ApiStatus BindNpcHit(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode* hitBytecode = (Bytecode*)evt_get_variable(script, *args);
if (npcId == NPC_SELF) {
@ -464,7 +464,7 @@ ApiStatus GetSelfVar(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
s32 varIdx = evt_get_variable(script, *args++);
s32 val = evt_get_variable(script, *args);
@ -481,7 +481,7 @@ ApiStatus SetNpcVar(Evt* script, s32 isInitialCall) {
ApiStatus GetNpcVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
s32 varIdx = evt_get_variable(script, *args++);
s32 var3 = *args;
@ -561,7 +561,7 @@ ApiStatus ClearDefeatedEnemies(Evt* script, s32 isInitialCall) {
ApiStatus SetEnemyFlagBits(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Enemy* npc = script->owner1.enemy;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
s32 bits = *args++;
s32 var2 = evt_get_variable(script, *args);
@ -670,7 +670,7 @@ ApiStatus func_80045900(Evt* script, s32 isInitialCall) {
ApiStatus SetTattleMsg(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID enemyId = evt_get_variable(script, *args++);
s32 enemyId = evt_get_variable(script, *args++);
u32 tattleMsg = evt_get_variable(script, *args);
Enemy* npc = get_enemy(enemyId);

8
src/evt/f8f60_len_1560.c
View File

@ -45,8 +45,8 @@ ApiStatus RandInt(Evt* script, s32 isInitialCall) {
ApiStatus GetAngleBetweenNPCs(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID aID = evt_get_variable(script, *ptrReadPos++);
NpcID bID = evt_get_variable(script, *ptrReadPos++);
s32 aID = evt_get_variable(script, *ptrReadPos++);
s32 bID = evt_get_variable(script, *ptrReadPos++);
Bytecode outVar = *ptrReadPos++;
Npc* a = resolve_npc(script, aID);
@ -60,7 +60,7 @@ ApiStatus GetAngleToNPC(Evt* script, s32 isInitialCall) {
PlayerStatus* playerStatus = &gPlayerStatus;
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
Bytecode outVar = *ptrReadPos++;
Npc* npc = resolve_npc(script, npcID);
@ -73,7 +73,7 @@ ApiStatus GetAngleToPlayer(Evt* script, s32 isInitialCall) {
PlayerStatus* playerStatus = &gPlayerStatus;
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
Bytecode outVar = *ptrReadPos++;
Npc* npc = resolve_npc(script, npcID);

4
src/evt/map_api.c
View File

@ -705,7 +705,7 @@ ApiStatus SetRenderMode(Evt* script, s32 isInitialCall) {
ApiStatus PlaySoundAtModel(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 modelID = evt_get_variable(script, *args++);
SoundID soundID = evt_get_variable(script, *args++);
s32 soundID = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++);
f32 x, y, z;
f32 sx, sy, sz;
@ -719,7 +719,7 @@ ApiStatus PlaySoundAtModel(Evt* script, s32 isInitialCall) {
ApiStatus PlaySoundAtCollider(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 colliderID = evt_get_variable(script, *args++);
SoundID soundID = evt_get_variable(script, *args++);
s32 soundID = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++);
f32 x, y, z;

74
src/evt/npc_api.c
View File

@ -5,7 +5,7 @@
extern s32 D_802DAE40;
extern s32 D_802DAE44;
Npc* resolve_npc(Evt* script, NpcID npcIdOrPtr) {
Npc* resolve_npc(Evt* script, s32 npcIdOrPtr) {
if (npcIdOrPtr == NPC_SELF) {
return get_npc_safe(script->owner2.npcID);
} else if (npcIdOrPtr >= -270000000) {
@ -29,7 +29,7 @@ void set_npc_animation(Npc* npc, u32 arg1) {
ApiStatus CreateNpc(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
s32 initialAnim = evt_get_variable(script, *args++);
NpcBlueprint blueprint;
Npc *npc;
@ -59,7 +59,7 @@ ApiStatus DeleteNpc(Evt* script, s32 isInitialCall) {
ApiStatus GetNpcPointer(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
Bytecode varNPC = *args++;
evt_set_variable(script, varNPC, (s32)get_npc_safe(npcID));
@ -68,7 +68,7 @@ ApiStatus GetNpcPointer(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
f32 x = evt_get_variable(script, *args++);
f32 y = evt_get_variable(script, *args++);
f32 z = evt_get_variable(script, *args++);
@ -91,7 +91,7 @@ ApiStatus SetNpcPos(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcRotation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
f32 rotX = evt_get_float_variable(script, *args++);
f32 rotY = evt_get_float_variable(script, *args++);
f32 rotZ = evt_get_float_variable(script, *args++);
@ -109,7 +109,7 @@ ApiStatus SetNpcRotation(Evt* script, s32 isInitialCall) {
ApiStatus func_802CDE68(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
f32 var1 = evt_get_float_variable(script, *args++);
Npc* npc;
@ -124,7 +124,7 @@ ApiStatus func_802CDE68(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcScale(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
f32 sizeX = evt_get_float_variable(script, *ptrReadPos++);
f32 sizeY = evt_get_float_variable(script, *ptrReadPos++);
f32 sizeZ = evt_get_float_variable(script, *ptrReadPos++);
@ -142,7 +142,7 @@ ApiStatus SetNpcScale(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcCollisionSize(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
s32 height = evt_get_variable(script, *ptrReadPos++);
s32 radius = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
@ -158,7 +158,7 @@ ApiStatus SetNpcCollisionSize(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcSpeed(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
f32 speed = evt_get_float_variable(script, *ptrReadPos);
Npc* npc = resolve_npc(script, npcID);
@ -172,7 +172,7 @@ ApiStatus SetNpcSpeed(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcJumpscale(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
f32 jumpScale = evt_get_float_variable(script, *ptrReadPos);
Npc* npc = resolve_npc(script, npcID);
@ -186,7 +186,7 @@ ApiStatus SetNpcJumpscale(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcAnimation(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
s32 animation = evt_get_variable(script, *ptrReadPos);
Npc* npc = resolve_npc(script, npcID);
@ -200,7 +200,7 @@ ApiStatus SetNpcAnimation(Evt* script, s32 isInitialCall) {
ApiStatus GetNpcAnimation(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
Bytecode outVar = *ptrReadPos++;
Npc* npc = resolve_npc(script, npcID);
@ -214,7 +214,7 @@ ApiStatus GetNpcAnimation(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcAnimationSpeed(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
f32 animationSpeed = evt_get_float_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
@ -237,7 +237,7 @@ ApiStatus NpcMoveTo(Evt* script, s32 isInitialCall) {
}
if (script->functionTemp[0] == 0) {
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
f32 targetX = evt_get_variable(script, *args++);
f32 targetZ = evt_get_variable(script, *args++);
s32 duration = evt_get_variable(script, *args++);
@ -297,7 +297,7 @@ ApiStatus _npc_jump_to(Evt* script, s32 isInitialCall, s32 snapYaw) {
}
if (script->functionTemp[0] == 0) {
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
f32 xTemp = evt_get_variable(script, *args++);
f32 yTemp = evt_get_variable(script, *args++);
f32 zTemp = evt_get_variable(script, *args++);
@ -439,7 +439,7 @@ ApiStatus NpcFlyTo(Evt* script, s32 isInitialCall) {
ApiStatus GetNpcYaw(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
Bytecode outVar = *ptrReadPos++;
Npc* npc = resolve_npc(script, npcID);
@ -453,7 +453,7 @@ ApiStatus GetNpcYaw(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcYaw(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
if (npc == NULL) {
@ -473,7 +473,7 @@ ApiStatus InterpNpcYaw(Evt* script, s32 isInitialCall) {
Npc* npc;
if (isInitialCall) {
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
npc = resolve_npc(script, npcID);
if (npc == NULL) {
@ -521,7 +521,7 @@ ApiStatus NpcFacePlayer(Evt* script, s32 isInitialCall) {
Npc* npc;
if (isInitialCall) {
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
npc = resolve_npc(script, npcID);
if (npc == NULL) {
@ -563,8 +563,8 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) {
Npc* npc2;
if (isInitialCall) {
NpcID npcID = evt_get_variable(script, *args++);
NpcID npcID2 = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
s32 npcID2 = evt_get_variable(script, *args++);
npc = resolve_npc(script, npcID2);
if (npc == NULL) {
@ -604,7 +604,7 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcFlagBits(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
s32 flagBits = *args++;
s32 enable = evt_get_variable(script, *args++);
Npc* npc = resolve_npc(script, npcID);
@ -624,7 +624,7 @@ ApiStatus SetNpcFlagBits(Evt* script, s32 isInitialCall) {
ApiStatus GetNpcPos(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
s32 a1 = *args++;
s32 a2 = *args++;
s32 a3 = *args++;
@ -642,7 +642,7 @@ ApiStatus GetNpcPos(Evt* script, s32 isInitialCall) {
ApiStatus func_802CF1B4(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode arg1 = *args;
Npc* npc = resolve_npc(script, npcId);
@ -656,7 +656,7 @@ ApiStatus func_802CF1B4(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcSprite(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode arg1 = *args;
Npc* npc = resolve_npc(script, npcId);
@ -670,7 +670,7 @@ ApiStatus SetNpcSprite(Evt* script, s32 isInitialCall) {
ApiStatus EnableNpcShadow(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
s32 enableShadow = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
@ -688,7 +688,7 @@ ApiStatus EnableNpcShadow(Evt* script, s32 isInitialCall) {
ApiStatus EnableNpcBlur(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
s32 enableBlur = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
@ -706,7 +706,7 @@ ApiStatus EnableNpcBlur(Evt* script, s32 isInitialCall) {
ApiStatus ClearPartnerMoveHistory(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
if (npc == NULL) {
@ -967,7 +967,7 @@ ApiStatus PartnerIsFlying(Evt* script, s32 isInitialCall) {
ApiStatus func_802CFD30(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode var1 = evt_get_variable(script, *args++);
Bytecode var2 = evt_get_variable(script, *args++);
Bytecode var3 = evt_get_variable(script, *args++);
@ -985,7 +985,7 @@ ApiStatus func_802CFD30(Evt* script, s32 isInitialCall) {
ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode arg1 = *args;
Npc* npc = resolve_npc(script, npcId);
@ -999,7 +999,7 @@ ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode var1 = evt_get_variable(script, *args++);
Npc* npc = resolve_npc(script, npcId);
@ -1013,7 +1013,7 @@ ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcPaletteSwapLower(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode var1 = evt_get_variable(script, *args++);
Bytecode var2 = evt_get_variable(script, *args++);
Bytecode var3 = evt_get_variable(script, *args++);
@ -1030,7 +1030,7 @@ ApiStatus SetNpcPaletteSwapLower(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcPaletteSwapping(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcId = evt_get_variable(script, *args++);
s32 npcId = evt_get_variable(script, *args++);
Bytecode var1 = evt_get_variable(script, *args++);
Bytecode var2 = evt_get_variable(script, *args++);
Bytecode var3 = evt_get_variable(script, *args++);
@ -1052,7 +1052,7 @@ ApiStatus SetNpcPaletteSwapping(Evt* script, s32 isInitialCall) {
ApiStatus SetNpcDecoration(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
s32 value1 = evt_get_variable(script, *ptrReadPos++);
s32 value2 = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
@ -1067,8 +1067,8 @@ ApiStatus SetNpcDecoration(Evt* script, s32 isInitialCall) {
ApiStatus PlaySoundAtNpc(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
SoundID soundID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
s32 soundID = evt_get_variable(script, *ptrReadPos++);
s32 value2 = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);
@ -1082,7 +1082,7 @@ ApiStatus PlaySoundAtNpc(Evt* script, s32 isInitialCall) {
ApiStatus func_802D0244(Evt* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *ptrReadPos++);
s32 npcID = evt_get_variable(script, *ptrReadPos++);
u8 renderMode = evt_get_variable(script, *ptrReadPos++);
Npc* npc = resolve_npc(script, npcID);

4
src/evt/player_api.c
View File

@ -103,7 +103,7 @@ ApiStatus SetPlayerJumpscale(Evt* script, s32 isInitialCall) {
ApiStatus SetPlayerAnimation(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
PlayerAnim currentAnim = evt_get_variable(script, *args++);
s32 currentAnim = evt_get_variable(script, *args++);
s32 shakeAnim = 0x80003;
playerNpc->currentAnim.w = currentAnim;
@ -388,7 +388,7 @@ ApiStatus PlayerFaceNpc(Evt* script, s32 isInitialCall) {
s32* ft3 = &script->functionTemp[3];
if (isInitialCall) {
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
Npc* npc;
if (npcID == NPC_SELF) {

4
src/npc.c
View File

@ -624,7 +624,7 @@ void npc_move_heading(Npc* npc, f32 speed, f32 yaw) {
npc->pos.z += -speed * cos;
}
Npc* get_npc_unsafe(NpcID npcID) {
Npc* get_npc_unsafe(s32 npcID) {
s32 i;
Npc* npc;
@ -639,7 +639,7 @@ Npc* get_npc_unsafe(NpcID npcID) {
return npc;
}
Npc* get_npc_safe(NpcID npcID) {
Npc* get_npc_safe(s32 npcID) {
s32 i;
Npc* npc;

6
src/npc.h
View File

@ -57,10 +57,10 @@ void render_npcs(void);
void npc_move_heading(Npc* npc, f32 speed, f32 yaw);
Npc* get_npc_unsafe(NpcID npcID);
Npc* get_npc_unsafe(s32 npcID);
/// @returns NULL if not found
Npc* get_npc_safe(NpcID npcID);
Npc* get_npc_safe(s32 npcID);
void enable_npc_shadow(Npc* npc);
@ -256,7 +256,7 @@ void bind_npc_interact(s32 npcID, EvtSource* npcInteractBytecode);
/// @param npcID ID of the npc bound to the desired enemy.
///
/// @returns pointer to Enemy struct, if one is found. If one is not found, a panic occurs.
Enemy* get_enemy(NpcID npcID);
Enemy* get_enemy(s32 npcID);
/// Same as get_enemy(), with the exception of always returning a value if an enemy is not found.
///

2
src/pause/135EE0.c
View File

@ -228,7 +228,7 @@ s32 pause_get_total_equipped_bp_cost(void) {
s32 i;
for (i = 0; i < ARRAY_COUNT(gPlayerData.equippedBadges); i++) {
ItemID itemID = gPlayerData.equippedBadges[i];
s16 itemID = gPlayerData.equippedBadges[i];
if (itemID != ITEM_NONE) {
s32 moveID = gItemTable[itemID].moveID;

2
src/world/common/Bandit_DropCoin.inc.c
View File

@ -3,7 +3,7 @@
ApiStatus N(Bandit_DropCoin)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID;
s32 npcID;
Npc* npc;
s32 itemEntityIndex;
s32 areaFlag;

2
src/world/common/GetNpcCollisionHeight.inc.c
View File

@ -3,7 +3,7 @@
ApiStatus N(GetNpcCollisionHeight)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcID npcID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
Npc* npc = get_npc_safe(npcID);
if (npc != NULL) {

5
src/world/common/StarSpiritEffectFunc.inc.c
View File

@ -60,7 +60,6 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) {
ptr->unk_46 = 0;
}
break;
case 1:
ptr->unk_46++;
if (ptr->unk_46 >= 60) {
@ -70,7 +69,6 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) {
ptr->unk_50->unk_0C->unk_74 = 0;
}
break;
case 2:
ptr->unk_46++;
if (ptr->unk_46 >= 60) {
@ -85,7 +83,6 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) {
ptr->unk_30 = 36.0f;
}
break;
case 3:
ptr->unk_30 = update_lerp(0, 36.0f, 19.0f, ptr->unk_46, 120);
ptr->unk_46++;
@ -115,7 +112,6 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) {
ptr->unk_4E = 2;
}
break;
case 2:
ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f));
ptr->unk_4C = clamp_angle(ptr->unk_4C + 8);
@ -129,7 +125,6 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) {
switch (ptr->unk_48) {
case 1:
ptr->unk_2C = clamp_angle(ptr->unk_2C + ptr->unk_30);
case 2:
ptr->unk_54->unk_0C->unk_24.f = ptr->unk_2C;
ptr->unk_54->unk_0C->unk_04 = ptr->unk_18;

4
src/world/common/UnkFunc41.inc.c
View File

@ -4,8 +4,8 @@
ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
PlayerData* playerData = &gPlayerData;
NpcID npcID = evt_get_variable(script, *args++);
PartnerID partnerID = evt_get_variable(script, *args++);
s32 npcID = evt_get_variable(script, *args++);
s8 partnerID = evt_get_variable(script, *args++);
Npc* npc = get_npc_safe(npcID);
if (isInitialCall) {

2
src/world/common/UnkFunc52.inc.c
View File

@ -6,7 +6,7 @@ ApiStatus N(UnkFunc52)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Actor* actor;
ActorID actorID = evt_get_variable(script, *args++);
s32 actorID = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.enemyID;

2
src/world/common/foliage.inc.c
View File

@ -11,7 +11,7 @@ typedef struct FoliageDropList {
struct {
s32 itemID;
Vec3i pos;
ItemSpawnMode spawnMode;
s32 spawnMode;
Bytecode pickupFlag;
Bytecode spawnFlag;
} drops[0];

2
src/world/partners.c
View File

@ -324,7 +324,7 @@ void partner_create_npc(void) {
WorldPartner* partnerEntry = &wPartners[D_8010CFD8];
Npc** partnerNpcPtr = &wPartnerNpc;
WorldPartner** partner = &wPartner;
NpcID npcIndex;
s32 npcIndex;
NpcBlueprint blueprint;
NpcBlueprint* blueprintPtr;

2
src/world/partners.h
View File

@ -37,7 +37,7 @@ extern s32 D_8010CFE8;
extern WorldPartner wPartners[12];
extern WorldPartner* wPartner;
extern NpcID D_8010CFD0; // wPartnerNpcIndex
extern s32 D_8010CFD0; // wPartnerNpcIndex
extern Npc* wPartnerNpc; // wPartnerNpc
s32 partner_init_get_out(Npc*);

4
tools/make_npc_structs.py
View File

@ -209,7 +209,7 @@ def get_vals(fd, offset, var):
data = unpack_from('>B', fd, offset)[0]
fmt = "d"
offset += 1
elif var["type"] == "s16" or var["type"] in ("ItemID"):
elif var["type"] == "s16" or var["type"] in ("s16"):
offset += offset % 2
data = unpack_from('>h', fd, offset)[0]
fmt = "d"
@ -219,7 +219,7 @@ def get_vals(fd, offset, var):
data = unpack_from('>H', fd, offset)[0]
fmt = "d"
offset += 2
elif var["type"] == "s32" or var["type"] in ("NpcID", "s32", "MessageID", "s32"):
elif var["type"] == "s32" or var["type"] in ("s32"):
poff = offset
offset += offset % 4
data = unpack_from('>i', fd, offset)[0]

69
ver/us/asm/nonmatchings/effects/effect_9/func_E0012000.s
View File

@ -1,69 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_E0012000
/* 32DD10 E0012000 27BDFF48 */ addiu $sp, $sp, -0xb8
/* 32DD14 E0012004 F7B400A8 */ sdc1 $f20, 0xa8($sp)
/* 32DD18 E0012008 4480A000 */ mtc1 $zero, $f20
/* 32DD1C E001200C F7B600B0 */ sdc1 $f22, 0xb0($sp)
/* 32DD20 E0012010 3C013F80 */ lui $at, 0x3f80
/* 32DD24 E0012014 4481B000 */ mtc1 $at, $f22
/* 32DD28 E0012018 AFB1009C */ sw $s1, 0x9c($sp)
/* 32DD2C E001201C 0080882D */ daddu $s1, $a0, $zero
/* 32DD30 E0012020 AFBF00A0 */ sw $ra, 0xa0($sp)
/* 32DD34 E0012024 AFB00098 */ sw $s0, 0x98($sp)
/* 32DD38 E0012028 E7B40010 */ swc1 $f20, 0x10($sp)
/* 32DD3C E001202C 8E250024 */ lw $a1, 0x24($s1)
/* 32DD40 E0012030 4406B000 */ mfc1 $a2, $f22
/* 32DD44 E0012034 4407A000 */ mfc1 $a3, $f20
/* 32DD48 E0012038 0C080104 */ jal shim_guRotateF
/* 32DD4C E001203C 27A40018 */ addiu $a0, $sp, 0x18
/* 32DD50 E0012040 27B00058 */ addiu $s0, $sp, 0x58
/* 32DD54 E0012044 E7B60010 */ swc1 $f22, 0x10($sp)
/* 32DD58 E0012048 8E25002C */ lw $a1, 0x2c($s1)
/* 32DD5C E001204C 4406A000 */ mfc1 $a2, $f20
/* 32DD60 E0012050 4407A000 */ mfc1 $a3, $f20
/* 32DD64 E0012054 0C080104 */ jal shim_guRotateF
/* 32DD68 E0012058 0200202D */ daddu $a0, $s0, $zero
/* 32DD6C E001205C 0200202D */ daddu $a0, $s0, $zero
/* 32DD70 E0012060 27A50018 */ addiu $a1, $sp, 0x18
/* 32DD74 E0012064 0C080114 */ jal shim_guMtxCatF
/* 32DD78 E0012068 00A0302D */ daddu $a2, $a1, $zero
/* 32DD7C E001206C E7B40010 */ swc1 $f20, 0x10($sp)
/* 32DD80 E0012070 8E250028 */ lw $a1, 0x28($s1)
/* 32DD84 E0012074 4406A000 */ mfc1 $a2, $f20
/* 32DD88 E0012078 4407B000 */ mfc1 $a3, $f22
/* 32DD8C E001207C 0C080104 */ jal shim_guRotateF
/* 32DD90 E0012080 0200202D */ daddu $a0, $s0, $zero
/* 32DD94 E0012084 27A40018 */ addiu $a0, $sp, 0x18
/* 32DD98 E0012088 0200282D */ daddu $a1, $s0, $zero
/* 32DD9C E001208C 0C080114 */ jal shim_guMtxCatF
/* 32DDA0 E0012090 0080302D */ daddu $a2, $a0, $zero
/* 32DDA4 E0012094 8E250018 */ lw $a1, 0x18($s1)
/* 32DDA8 E0012098 8E26001C */ lw $a2, 0x1c($s1)
/* 32DDAC E001209C 8E270020 */ lw $a3, 0x20($s1)
/* 32DDB0 E00120A0 0C080110 */ jal shim_guScaleF
/* 32DDB4 E00120A4 0200202D */ daddu $a0, $s0, $zero
/* 32DDB8 E00120A8 0200202D */ daddu $a0, $s0, $zero
/* 32DDBC E00120AC 27A50018 */ addiu $a1, $sp, 0x18
/* 32DDC0 E00120B0 0C080114 */ jal shim_guMtxCatF
/* 32DDC4 E00120B4 00A0302D */ daddu $a2, $a1, $zero
/* 32DDC8 E00120B8 8E25000C */ lw $a1, 0xc($s1)
/* 32DDCC E00120BC 8E260010 */ lw $a2, 0x10($s1)
/* 32DDD0 E00120C0 8E270014 */ lw $a3, 0x14($s1)
/* 32DDD4 E00120C4 0C080108 */ jal shim_guTranslateF
/* 32DDD8 E00120C8 0200202D */ daddu $a0, $s0, $zero
/* 32DDDC E00120CC 27A40018 */ addiu $a0, $sp, 0x18
/* 32DDE0 E00120D0 0200282D */ daddu $a1, $s0, $zero
/* 32DDE4 E00120D4 0C080114 */ jal shim_guMtxCatF
/* 32DDE8 E00120D8 0080302D */ daddu $a2, $a0, $zero
/* 32DDEC E00120DC 27A40018 */ addiu $a0, $sp, 0x18
/* 32DDF0 E00120E0 0C080118 */ jal shim_guMtxF2L
/* 32DDF4 E00120E4 26250030 */ addiu $a1, $s1, 0x30
/* 32DDF8 E00120E8 8FBF00A0 */ lw $ra, 0xa0($sp)
/* 32DDFC E00120EC 8FB1009C */ lw $s1, 0x9c($sp)
/* 32DE00 E00120F0 8FB00098 */ lw $s0, 0x98($sp)
/* 32DE04 E00120F4 D7B600B0 */ ldc1 $f22, 0xb0($sp)
/* 32DE08 E00120F8 D7B400A8 */ ldc1 $f20, 0xa8($sp)
/* 32DE0C E00120FC 03E00008 */ jr $ra
/* 32DE10 E0012100 27BD00B8 */ addiu $sp, $sp, 0xb8

57
ver/us/asm/nonmatchings/effects/effect_9/func_E0012448.s
View File

@ -1,57 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_E0012448
/* 32E158 E0012448 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 32E15C E001244C AFB40020 */ sw $s4, 0x20($sp)
/* 32E160 E0012450 0080A02D */ daddu $s4, $a0, $zero
/* 32E164 E0012454 AFB20018 */ sw $s2, 0x18($sp)
/* 32E168 E0012458 0000902D */ daddu $s2, $zero, $zero
/* 32E16C E001245C AFB3001C */ sw $s3, 0x1c($sp)
/* 32E170 E0012460 AFBF0024 */ sw $ra, 0x24($sp)
/* 32E174 E0012464 AFB10014 */ sw $s1, 0x14($sp)
/* 32E178 E0012468 AFB00010 */ sw $s0, 0x10($sp)
/* 32E17C E001246C 8E820008 */ lw $v0, 8($s4)
/* 32E180 E0012470 8E90000C */ lw $s0, 0xc($s4)
/* 32E184 E0012474 18400017 */ blez $v0, .LE00124D4
/* 32E188 E0012478 0240982D */ daddu $s3, $s2, $zero
/* 32E18C E001247C 26110006 */ addiu $s1, $s0, 6
.LE0012480:
/* 32E190 E0012480 8E020000 */ lw $v0, ($s0)
/* 32E194 E0012484 5040000E */ beql $v0, $zero, .LE00124C0
/* 32E198 E0012488 26520001 */ addiu $s2, $s2, 1
/* 32E19C E001248C 96220000 */ lhu $v0, ($s1)
/* 32E1A0 E0012490 2442FFFF */ addiu $v0, $v0, -1
/* 32E1A4 E0012494 A6220000 */ sh $v0, ($s1)
/* 32E1A8 E0012498 00021400 */ sll $v0, $v0, 0x10
/* 32E1AC E001249C 5C400003 */ bgtzl $v0, .LE00124AC
/* 32E1B0 E00124A0 24130001 */ addiu $s3, $zero, 1
/* 32E1B4 E00124A4 0800492F */ j .LE00124BC
/* 32E1B8 E00124A8 AE000000 */ sw $zero, ($s0)
.LE00124AC:
/* 32E1BC E00124AC 0C004841 */ jal func_E0012104
/* 32E1C0 E00124B0 0200202D */ daddu $a0, $s0, $zero
/* 32E1C4 E00124B4 0C004800 */ jal func_E0012000
/* 32E1C8 E00124B8 0200202D */ daddu $a0, $s0, $zero
.LE00124BC:
/* 32E1CC E00124BC 26520001 */ addiu $s2, $s2, 1
.LE00124C0:
/* 32E1D0 E00124C0 26310098 */ addiu $s1, $s1, 0x98
/* 32E1D4 E00124C4 8E820008 */ lw $v0, 8($s4)
/* 32E1D8 E00124C8 0242102A */ slt $v0, $s2, $v0
/* 32E1DC E00124CC 1440FFEC */ bnez $v0, .LE0012480
/* 32E1E0 E00124D0 26100098 */ addiu $s0, $s0, 0x98
.LE00124D4:
/* 32E1E4 E00124D4 16600003 */ bnez $s3, .LE00124E4
/* 32E1E8 E00124D8 00000000 */ nop
/* 32E1EC E00124DC 0C080128 */ jal shim_remove_effect
/* 32E1F0 E00124E0 0280202D */ daddu $a0, $s4, $zero
.LE00124E4:
/* 32E1F4 E00124E4 8FBF0024 */ lw $ra, 0x24($sp)
/* 32E1F8 E00124E8 8FB40020 */ lw $s4, 0x20($sp)
/* 32E1FC E00124EC 8FB3001C */ lw $s3, 0x1c($sp)
/* 32E200 E00124F0 8FB20018 */ lw $s2, 0x18($sp)
/* 32E204 E00124F4 8FB10014 */ lw $s1, 0x14($sp)
/* 32E208 E00124F8 8FB00010 */ lw $s0, 0x10($sp)
/* 32E20C E00124FC 03E00008 */ jr $ra
/* 32E210 E0012500 27BD0028 */ addiu $sp, $sp, 0x28

21
ver/us/asm/nonmatchings/effects/effect_9/func_E0012504.s
View File

@ -1,21 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_E0012504
/* 32E214 E0012504 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 32E218 E0012508 3C02E001 */ lui $v0, %hi(func_E0012564)
/* 32E21C E001250C 24422564 */ addiu $v0, $v0, %lo(func_E0012564)
/* 32E220 E0012510 AFA2001C */ sw $v0, 0x1c($sp)
/* 32E224 E0012514 24020028 */ addiu $v0, $zero, 0x28
/* 32E228 E0012518 AFA40018 */ sw $a0, 0x18($sp)
/* 32E22C E001251C 27A40010 */ addiu $a0, $sp, 0x10
/* 32E230 E0012520 AFBF0020 */ sw $ra, 0x20($sp)
/* 32E234 E0012524 AFA00014 */ sw $zero, 0x14($sp)
/* 32E238 E0012528 0C080120 */ jal shim_queue_render_task
/* 32E23C E001252C AFA20010 */ sw $v0, 0x10($sp)
/* 32E240 E0012530 8C430000 */ lw $v1, ($v0)
/* 32E244 E0012534 34630002 */ ori $v1, $v1, 2
/* 32E248 E0012538 AC430000 */ sw $v1, ($v0)
/* 32E24C E001253C 8FBF0020 */ lw $ra, 0x20($sp)
/* 32E250 E0012540 03E00008 */ jr $ra
/* 32E254 E0012544 27BD0028 */ addiu $sp, $sp, 0x28

11
ver/us/asm/nonmatchings/effects/effect_9/func_E0012548.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_E0012548
/* 32E258 E0012548 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 32E25C E001254C AFBF0010 */ sw $ra, 0x10($sp)
/* 32E260 E0012550 0C080128 */ jal shim_remove_effect
/* 32E264 E0012554 00000000 */ nop
/* 32E268 E0012558 8FBF0010 */ lw $ra, 0x10($sp)
/* 32E26C E001255C 03E00008 */ jr $ra
/* 32E270 E0012560 27BD0018 */ addiu $sp, $sp, 0x18

2
ver/us/asm/nonmatchings/effects/effect_9/func_E0012564.s → ver/us/asm/nonmatchings/effects/effect_9/fx_9_appendGfx.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_E0012564
glabel fx_9_appendGfx
/* 32E274 E0012564 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 32E278 E0012568 0080602D */ daddu $t4, $a0, $zero
/* 32E27C E001256C 3C05DB06 */ lui $a1, 0xdb06

8
ver/us/asm/nonmatchings/effects/effect_9/fx_9_main.s
View File

@ -15,11 +15,11 @@ glabel fx_9_main
/* 32DF3C E001222C 3C02E001 */ lui $v0, %hi(func_E0012440)
/* 32DF40 E0012230 24422440 */ addiu $v0, $v0, %lo(func_E0012440)
/* 32DF44 E0012234 AFA20018 */ sw $v0, 0x18($sp)
/* 32DF48 E0012238 3C02E001 */ lui $v0, %hi(func_E0012448)
/* 32DF4C E001223C 24422448 */ addiu $v0, $v0, %lo(func_E0012448)
/* 32DF48 E0012238 3C02E001 */ lui $v0, %hi(fx_9_update)
/* 32DF4C E001223C 24422448 */ addiu $v0, $v0, %lo(fx_9_update)
/* 32DF50 E0012240 AFA2001C */ sw $v0, 0x1c($sp)
/* 32DF54 E0012244 3C02E001 */ lui $v0, %hi(func_E0012504)
/* 32DF58 E0012248 24422504 */ addiu $v0, $v0, %lo(func_E0012504)
/* 32DF54 E0012244 3C02E001 */ lui $v0, %hi(fx_9_render)
/* 32DF58 E0012248 24422504 */ addiu $v0, $v0, %lo(fx_9_render)
/* 32DF5C E001224C AFA20020 */ sw $v0, 0x20($sp)
/* 32DF60 E0012250 24020009 */ addiu $v0, $zero, 9
/* 32DF64 E0012254 AFBF003C */ sw $ra, 0x3c($sp)

6
ver/us/symbol_addrs.txt
View File

@ -4913,10 +4913,10 @@ func_E0012000 = 0xE0012000; // type:func rom:0x32DD10
func_E0012104 = 0xE0012104; // type:func rom:0x32DE14
fx_9_main = 0xE0012204; // type:func rom:0x32DF14
func_E0012440 = 0xE0012440; // type:func rom:0x32E150
func_E0012448 = 0xE0012448; // type:func rom:0x32E158
func_E0012504 = 0xE0012504; // type:func rom:0x32E214
fx_9_update = 0xE0012448; // type:func rom:0x32E158
fx_9_render = 0xE0012504; // type:func rom:0x32E214
func_E0012548 = 0xE0012548; // type:func rom:0x32E258
func_E0012564 = 0xE0012564; // type:func rom:0x32E274
fx_9_appendGfx = 0xE0012564; // type:func rom:0x32E274
fx_10_main = 0xE0014000; // type:func rom:0x32E490
func_E0014258 = 0xE0014258; // type:func rom:0x32E6E8
func_E0014260 = 0xE0014260; // type:func rom:0x32E6F0