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

add script interpreter constants

Browse Source
This commit is contained in:
Alex Bates 2020-08-16 07:55:51 +01:00
parent e39d02e55e
commit 812288ca1a
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
86 changed files with 1011 additions and 995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common_structs.h
View File

@ -3,6 +3,7 @@
#include "ultra64.h" #include "ultra64.h"
#include "types.h" #include "types.h"
#include "si.h"
typedef struct Vec3f { typedef struct Vec3f {
/* 0x00 */ f32 x; /* 0x00 */ f32 x;
@ -239,7 +240,7 @@ typedef struct ScriptInstance {
/* 0x068 */ struct ScriptInstance* childScript; /* 0x068 */ struct ScriptInstance* childScript;
/* 0x06C */ struct ScriptInstance* parentScript; /* brother? */ /* 0x06C */ struct ScriptInstance* parentScript; /* brother? */
/* 0x070 */ s32 functionTemp[4]; /* 0x070 */ s32 functionTemp[4];
/* 0x080 */ UNK_PTR callFunction; /* 0x080 */ API_FUN(callFunction);
/* 0x084 */ s32 varTable[16]; /* 0x084 */ s32 varTable[16];
/* 0x0C4 */ s32 varFlags[3]; /* 0x0C4 */ s32 varFlags[3];
/* 0x0D0 */ s32 loopStartTable[8]; /* 0x0D0 */ s32 loopStartTable[8];

18
include/si.h
View File

@ -1,8 +1,22 @@
#ifndef _SI_H_ #ifndef _SI_H_
#define _SI_H #define _SI_H_
#define SI_VAR_0 0xFE363C80 #define SI_VAR_0 0xFE363C80
// TODO /* Return type of si_execute_next_command */
#define SI_CONTINUE 0 /* Continue to next command */
#define SI_ABORT 1 /* Quit execution */
#define SI_FINISH 255 /* Return from script */
/* Return type of script API functions */
typedef s32 ApiStatus;
#define ApiStatus_BLOCK 0 /* Call again next frame */
#define ApiStatus_DONE1 1 /* Unconditional. Probably only exists to return a bool from functions */
#define ApiStatus_DONE2 2 /* Conditional on ScriptInstance->disableScripts */
#define ApiStatus_REPEAT 3 /* Call again immediately */
#define ApiStatus_FINISH 255 /* Corresponds to SI_FINISH */
#define API_FUN(NAME) ApiStatus (*NAME)(struct ScriptInstance* script, s32 isInitialCall)
#define INCLUDE_API_ASM(FOLDER, NAME) ApiStatus INCLUDE_ASM(FOLDER, NAME, struct ScriptInstance* script, s32 isInitialCall)
#endif #endif

502
src/code_16c8e0.c
View File

@ -98,9 +98,9 @@ INCLUDE_ASM(code_16c8e0, func_80245440);
INCLUDE_ASM(code_16c8e0, func_802456B0); INCLUDE_ASM(code_16c8e0, func_802456B0);
INCLUDE_ASM(code_16c8e0, EnablePartnerBlur); INCLUDE_API_ASM(code_16c8e0, EnablePartnerBlur);
INCLUDE_ASM(code_16c8e0, DisablePartnerBlur); INCLUDE_API_ASM(code_16c8e0, DisablePartnerBlur);
INCLUDE_ASM(code_16c8e0, update_swap_partner); INCLUDE_ASM(code_16c8e0, update_swap_partner);
@ -174,25 +174,25 @@ INCLUDE_ASM(code_16c8e0, unfreeze_cam);
INCLUDE_ASM(code_16c8e0, func_8024E60C); INCLUDE_ASM(code_16c8e0, func_8024E60C);
INCLUDE_ASM(code_16c8e0, UseCamPreset); INCLUDE_API_ASM(code_16c8e0, UseCamPreset);
INCLUDE_ASM(code_16c8e0, SetBattleCamTarget); INCLUDE_API_ASM(code_16c8e0, SetBattleCamTarget);
INCLUDE_ASM(code_16c8e0, SetBattleCamOffsetZ); INCLUDE_API_ASM(code_16c8e0, SetBattleCamOffsetZ);
INCLUDE_ASM(code_16c8e0, AddBattleCamOffsetZ); INCLUDE_API_ASM(code_16c8e0, AddBattleCamOffsetZ);
INCLUDE_ASM(code_16c8e0, SetBattleCamYaw); INCLUDE_API_ASM(code_16c8e0, SetBattleCamYaw);
INCLUDE_ASM(code_16c8e0, BattleCamTargetActor); INCLUDE_API_ASM(code_16c8e0, BattleCamTargetActor);
INCLUDE_ASM(code_16c8e0, MoveBattleCamOver); INCLUDE_API_ASM(code_16c8e0, MoveBattleCamOver);
INCLUDE_ASM(code_16c8e0, SetBattleCamZoom); INCLUDE_API_ASM(code_16c8e0, SetBattleCamZoom);
INCLUDE_ASM(code_16c8e0, AddBattleCamZoom); INCLUDE_API_ASM(code_16c8e0, AddBattleCamZoom);
INCLUDE_ASM(code_16c8e0, FreezeBattleCam); INCLUDE_API_ASM(code_16c8e0, FreezeBattleCam);
INCLUDE_ASM(code_16c8e0, func_8024EDC0); INCLUDE_ASM(code_16c8e0, func_8024EDC0);
@ -226,17 +226,17 @@ INCLUDE_ASM(code_16c8e0, close_action_command_instruction_popup);
INCLUDE_ASM(code_16c8e0, show_message_popup); INCLUDE_ASM(code_16c8e0, show_message_popup);
INCLUDE_ASM(code_16c8e0, ShowMessageBox); INCLUDE_API_ASM(code_16c8e0, ShowMessageBox);
INCLUDE_ASM(code_16c8e0, ShowVariableMessageBox); INCLUDE_API_ASM(code_16c8e0, ShowVariableMessageBox);
INCLUDE_ASM(code_16c8e0, IsMessageBoxDisplayed); INCLUDE_API_ASM(code_16c8e0, IsMessageBoxDisplayed);
INCLUDE_ASM(code_16c8e0, WaitForMessageBoxDone); INCLUDE_API_ASM(code_16c8e0, WaitForMessageBoxDone);
INCLUDE_ASM(code_16c8e0, ForceCloseMessageBox); INCLUDE_API_ASM(code_16c8e0, ForceCloseMessageBox);
INCLUDE_ASM(code_16c8e0, SetMessageBoxDuration); INCLUDE_API_ASM(code_16c8e0, SetMessageBoxDuration);
INCLUDE_ASM(code_16c8e0, func_80251474); INCLUDE_ASM(code_16c8e0, func_80251474);
@ -244,31 +244,31 @@ INCLUDE_ASM(code_16c8e0, calc_item_check_hit);
INCLUDE_ASM(code_16c8e0, calc_item_damage_enemy); INCLUDE_ASM(code_16c8e0, calc_item_damage_enemy);
INCLUDE_ASM(code_16c8e0, ItemDamageEnemy); INCLUDE_API_ASM(code_16c8e0, ItemDamageEnemy);
INCLUDE_ASM(code_16c8e0, ItemAfflictEnemy); INCLUDE_API_ASM(code_16c8e0, ItemAfflictEnemy);
INCLUDE_ASM(code_16c8e0, ItemCheckHit); INCLUDE_API_ASM(code_16c8e0, ItemCheckHit);
INCLUDE_ASM(code_16c8e0, ActorSpeak); INCLUDE_API_ASM(code_16c8e0, ActorSpeak);
INCLUDE_ASM(code_16c8e0, EndActorSpeech); INCLUDE_API_ASM(code_16c8e0, EndActorSpeech);
INCLUDE_ASM(code_16c8e0, ShowBattleChoice); INCLUDE_API_ASM(code_16c8e0, ShowBattleChoice);
INCLUDE_ASM(code_16c8e0, OverrideBattleDmaDest); INCLUDE_API_ASM(code_16c8e0, OverrideBattleDmaDest);
INCLUDE_ASM(code_16c8e0, LoadBattleDmaData); INCLUDE_API_ASM(code_16c8e0, LoadBattleDmaData);
INCLUDE_ASM(code_16c8e0, PlaySoundAtActor); INCLUDE_API_ASM(code_16c8e0, PlaySoundAtActor);
INCLUDE_ASM(code_16c8e0, PlaySoundAtPart); INCLUDE_API_ASM(code_16c8e0, PlaySoundAtPart);
INCLUDE_ASM(code_16c8e0, SetForegroundModelsVisibleUnchecked); INCLUDE_API_ASM(code_16c8e0, SetForegroundModelsVisibleUnchecked);
INCLUDE_ASM(code_16c8e0, SetForegroundModelsVisible); INCLUDE_API_ASM(code_16c8e0, SetForegroundModelsVisible);
INCLUDE_ASM(code_16c8e0, MakeStatusField); INCLUDE_API_ASM(code_16c8e0, MakeStatusField);
INCLUDE_ASM(code_16c8e0, is_actor_hp_bar_visible); INCLUDE_ASM(code_16c8e0, is_actor_hp_bar_visible);
@ -278,15 +278,15 @@ INCLUDE_ASM(code_16c8e0, save_tattle_flags);
INCLUDE_ASM(code_16c8e0, load_tattle_flags); INCLUDE_ASM(code_16c8e0, load_tattle_flags);
INCLUDE_ASM(code_16c8e0, MultiplyByActorScale); INCLUDE_API_ASM(code_16c8e0, MultiplyByActorScale);
INCLUDE_ASM(code_16c8e0, MultiplyVec2ByActorScale); INCLUDE_API_ASM(code_16c8e0, MultiplyVec2ByActorScale);
INCLUDE_ASM(code_16c8e0, MultiplyVec3ByActorScale); INCLUDE_API_ASM(code_16c8e0, MultiplyVec3ByActorScale);
INCLUDE_ASM(code_16c8e0, ApplyShrinkFromOwner); INCLUDE_API_ASM(code_16c8e0, ApplyShrinkFromOwner);
INCLUDE_ASM(code_16c8e0, StartRumble); INCLUDE_API_ASM(code_16c8e0, StartRumble);
INCLUDE_ASM(code_16c8e0, func_80254250); INCLUDE_ASM(code_16c8e0, func_80254250);
@ -448,15 +448,15 @@ INCLUDE_ASM(code_16c8e0, func_80260A60);
INCLUDE_ASM(code_16c8e0, activate_defend_command); INCLUDE_ASM(code_16c8e0, activate_defend_command);
INCLUDE_ASM(code_16c8e0, HasMerleeCastsLeft); INCLUDE_API_ASM(code_16c8e0, HasMerleeCastsLeft);
INCLUDE_ASM(code_16c8e0, FXRecoverHP); INCLUDE_API_ASM(code_16c8e0, FXRecoverHP);
INCLUDE_ASM(code_16c8e0, FXRecoverFP); INCLUDE_API_ASM(code_16c8e0, FXRecoverFP);
INCLUDE_ASM(code_16c8e0, IncrementPlayerHP); INCLUDE_API_ASM(code_16c8e0, IncrementPlayerHP);
INCLUDE_ASM(code_16c8e0, IncrementPlayerFP); INCLUDE_API_ASM(code_16c8e0, IncrementPlayerFP);
INCLUDE_ASM(code_16c8e0, create_target_list); INCLUDE_ASM(code_16c8e0, create_target_list);
@ -606,17 +606,17 @@ INCLUDE_ASM(code_16c8e0, hide_foreground_models);
INCLUDE_ASM(code_16c8e0, show_foreground_models); INCLUDE_ASM(code_16c8e0, show_foreground_models);
INCLUDE_ASM(code_16c8e0, StartRumbleWithParams); INCLUDE_API_ASM(code_16c8e0, StartRumbleWithParams);
INCLUDE_ASM(code_16c8e0, start_rumble_type); INCLUDE_ASM(code_16c8e0, start_rumble_type);
INCLUDE_ASM(code_16c8e0, LoadItemScript); INCLUDE_API_ASM(code_16c8e0, LoadItemScript);
INCLUDE_ASM(code_16c8e0, LoadFreeItemScript); INCLUDE_API_ASM(code_16c8e0, LoadFreeItemScript);
INCLUDE_ASM(code_16c8e0, LoadMoveScript); INCLUDE_API_ASM(code_16c8e0, LoadMoveScript);
INCLUDE_ASM(code_16c8e0, LoadActionCommand); INCLUDE_API_ASM(code_16c8e0, LoadActionCommand);
INCLUDE_ASM(code_16c8e0, func_80268284); INCLUDE_ASM(code_16c8e0, func_80268284);
@ -626,15 +626,15 @@ INCLUDE_ASM(code_16c8e0, func_80268E88);
INCLUDE_ASM(code_16c8e0, check_block_input); INCLUDE_ASM(code_16c8e0, check_block_input);
INCLUDE_ASM(code_16c8e0, GetActionSuccess); INCLUDE_API_ASM(code_16c8e0, GetActionSuccess);
INCLUDE_ASM(code_16c8e0, SetActionSuccess); INCLUDE_API_ASM(code_16c8e0, SetActionSuccess);
INCLUDE_ASM(code_16c8e0, CloseActionCommandInfo); INCLUDE_API_ASM(code_16c8e0, CloseActionCommandInfo);
INCLUDE_ASM(code_16c8e0, GetActionSuccessCopy); INCLUDE_API_ASM(code_16c8e0, GetActionSuccessCopy);
INCLUDE_ASM(code_16c8e0, GetBlockResult); INCLUDE_API_ASM(code_16c8e0, GetBlockResult);
INCLUDE_ASM(code_16c8e0, count_targets); INCLUDE_ASM(code_16c8e0, count_targets);
@ -652,257 +652,257 @@ INCLUDE_ASM(code_16c8e0, set_actor_home_position);
INCLUDE_ASM(code_16c8e0, get_actor); INCLUDE_ASM(code_16c8e0, get_actor);
INCLUDE_ASM(code_16c8e0, LoadBattleSection); INCLUDE_API_ASM(code_16c8e0, LoadBattleSection);
INCLUDE_ASM(code_16c8e0, GetBattlePhase); INCLUDE_API_ASM(code_16c8e0, GetBattlePhase);
INCLUDE_ASM(code_16c8e0, GetLastElement); INCLUDE_API_ASM(code_16c8e0, GetLastElement);
INCLUDE_ASM(code_16c8e0, SetGoalToHome); INCLUDE_API_ASM(code_16c8e0, SetGoalToHome);
INCLUDE_ASM(code_16c8e0, SetIdleGoalToHome); INCLUDE_API_ASM(code_16c8e0, SetIdleGoalToHome);
INCLUDE_ASM(code_16c8e0, SetGoalToIndex); INCLUDE_API_ASM(code_16c8e0, SetGoalToIndex);
INCLUDE_ASM(code_16c8e0, GetIndexFromPos); INCLUDE_API_ASM(code_16c8e0, GetIndexFromPos);
INCLUDE_ASM(code_16c8e0, GetIndexFromHome); INCLUDE_API_ASM(code_16c8e0, GetIndexFromHome);
INCLUDE_ASM(code_16c8e0, CountPlayerTargets); INCLUDE_API_ASM(code_16c8e0, CountPlayerTargets);
INCLUDE_ASM(code_16c8e0, ForceHomePos); INCLUDE_API_ASM(code_16c8e0, ForceHomePos);
INCLUDE_ASM(code_16c8e0, SetHomePos); INCLUDE_API_ASM(code_16c8e0, SetHomePos);
INCLUDE_ASM(code_16c8e0, SetGoalToTarget); INCLUDE_API_ASM(code_16c8e0, SetGoalToTarget);
INCLUDE_ASM(code_16c8e0, SetPartGoalToTarget); INCLUDE_API_ASM(code_16c8e0, SetPartGoalToTarget);
INCLUDE_ASM(code_16c8e0, SetGoalToFirstTarget); INCLUDE_API_ASM(code_16c8e0, SetGoalToFirstTarget);
INCLUDE_ASM(code_16c8e0, SetGoalPos); INCLUDE_API_ASM(code_16c8e0, SetGoalPos);
INCLUDE_ASM(code_16c8e0, SetIdleGoal); INCLUDE_API_ASM(code_16c8e0, SetIdleGoal);
INCLUDE_ASM(code_16c8e0, AddGoalPos); INCLUDE_API_ASM(code_16c8e0, AddGoalPos);
INCLUDE_ASM(code_16c8e0, GetGoalPos); INCLUDE_API_ASM(code_16c8e0, GetGoalPos);
INCLUDE_ASM(code_16c8e0, GetIdleGoal); INCLUDE_API_ASM(code_16c8e0, GetIdleGoal);
INCLUDE_ASM(code_16c8e0, GetPartTarget); INCLUDE_API_ASM(code_16c8e0, GetPartTarget);
INCLUDE_ASM(code_16c8e0, GetActorPos); INCLUDE_API_ASM(code_16c8e0, GetActorPos);
INCLUDE_ASM(code_16c8e0, GetPartOffset); INCLUDE_API_ASM(code_16c8e0, GetPartOffset);
INCLUDE_ASM(code_16c8e0, GetPartPos); INCLUDE_API_ASM(code_16c8e0, GetPartPos);
INCLUDE_ASM(code_16c8e0, GetHomePos); INCLUDE_API_ASM(code_16c8e0, GetHomePos);
INCLUDE_ASM(code_16c8e0, SetActorPos); INCLUDE_API_ASM(code_16c8e0, SetActorPos);
INCLUDE_ASM(code_16c8e0, SetPartPos); INCLUDE_API_ASM(code_16c8e0, SetPartPos);
INCLUDE_ASM(code_16c8e0, SetEnemyTargetOffset); INCLUDE_API_ASM(code_16c8e0, SetEnemyTargetOffset);
INCLUDE_ASM(code_16c8e0, SetAnimation); INCLUDE_API_ASM(code_16c8e0, SetAnimation);
INCLUDE_ASM(code_16c8e0, GetAnimation); INCLUDE_API_ASM(code_16c8e0, GetAnimation);
INCLUDE_ASM(code_16c8e0, SetAnimationRate); INCLUDE_API_ASM(code_16c8e0, SetAnimationRate);
INCLUDE_ASM(code_16c8e0, SetActorYaw); INCLUDE_API_ASM(code_16c8e0, SetActorYaw);
INCLUDE_ASM(code_16c8e0, GetActorYaw); INCLUDE_API_ASM(code_16c8e0, GetActorYaw);
INCLUDE_ASM(code_16c8e0, SetPartYaw); INCLUDE_API_ASM(code_16c8e0, SetPartYaw);
INCLUDE_ASM(code_16c8e0, GetPartYaw); INCLUDE_API_ASM(code_16c8e0, GetPartYaw);
INCLUDE_ASM(code_16c8e0, SetActorJumpGravity); INCLUDE_API_ASM(code_16c8e0, SetActorJumpGravity);
INCLUDE_ASM(code_16c8e0, SetActorIdleJumpGravity); INCLUDE_API_ASM(code_16c8e0, SetActorIdleJumpGravity);
INCLUDE_ASM(code_16c8e0, SetActorSpeed); INCLUDE_API_ASM(code_16c8e0, SetActorSpeed);
INCLUDE_ASM(code_16c8e0, SetActorIdleSpeed); INCLUDE_API_ASM(code_16c8e0, SetActorIdleSpeed);
INCLUDE_ASM(code_16c8e0, SetPartJumpGravity); INCLUDE_API_ASM(code_16c8e0, SetPartJumpGravity);
INCLUDE_ASM(code_16c8e0, SetPartMoveSpeed); INCLUDE_API_ASM(code_16c8e0, SetPartMoveSpeed);
INCLUDE_ASM(code_16c8e0, SetJumpAnimations); INCLUDE_API_ASM(code_16c8e0, SetJumpAnimations);
INCLUDE_ASM(code_16c8e0, AddActorPos); INCLUDE_API_ASM(code_16c8e0, AddActorPos);
INCLUDE_ASM(code_16c8e0, SetActorDispOffset); INCLUDE_API_ASM(code_16c8e0, SetActorDispOffset);
INCLUDE_ASM(code_16c8e0, GetPartDispOffset); INCLUDE_API_ASM(code_16c8e0, GetPartDispOffset);
INCLUDE_ASM(code_16c8e0, SetPartDispOffset); INCLUDE_API_ASM(code_16c8e0, SetPartDispOffset);
INCLUDE_ASM(code_16c8e0, AddPartDispOffset); INCLUDE_API_ASM(code_16c8e0, AddPartDispOffset);
INCLUDE_ASM(code_16c8e0, GetActorVar); INCLUDE_API_ASM(code_16c8e0, GetActorVar);
INCLUDE_ASM(code_16c8e0, SetActorVar); INCLUDE_API_ASM(code_16c8e0, SetActorVar);
INCLUDE_ASM(code_16c8e0, AddActorVar); INCLUDE_API_ASM(code_16c8e0, AddActorVar);
INCLUDE_ASM(code_16c8e0, GetPartMovementVar); INCLUDE_API_ASM(code_16c8e0, GetPartMovementVar);
INCLUDE_ASM(code_16c8e0, SetPartMovementVar); INCLUDE_API_ASM(code_16c8e0, SetPartMovementVar);
INCLUDE_ASM(code_16c8e0, AddPartMovementVar); INCLUDE_API_ASM(code_16c8e0, AddPartMovementVar);
INCLUDE_ASM(code_16c8e0, SetActorRotation); INCLUDE_API_ASM(code_16c8e0, SetActorRotation);
INCLUDE_ASM(code_16c8e0, SetActorRotationOffset); INCLUDE_API_ASM(code_16c8e0, SetActorRotationOffset);
INCLUDE_ASM(code_16c8e0, GetActorRotation); INCLUDE_API_ASM(code_16c8e0, GetActorRotation);
INCLUDE_ASM(code_16c8e0, SetPartRotation); INCLUDE_API_ASM(code_16c8e0, SetPartRotation);
INCLUDE_ASM(code_16c8e0, SetPartRotationOffset); INCLUDE_API_ASM(code_16c8e0, SetPartRotationOffset);
INCLUDE_ASM(code_16c8e0, GetPartRotation); INCLUDE_API_ASM(code_16c8e0, GetPartRotation);
INCLUDE_ASM(code_16c8e0, SetActorScale); INCLUDE_API_ASM(code_16c8e0, SetActorScale);
INCLUDE_ASM(code_16c8e0, SetActorScaleModifier); INCLUDE_API_ASM(code_16c8e0, SetActorScaleModifier);
INCLUDE_ASM(code_16c8e0, GetActorScale); INCLUDE_API_ASM(code_16c8e0, GetActorScale);
INCLUDE_ASM(code_16c8e0, SetPartScale); INCLUDE_API_ASM(code_16c8e0, SetPartScale);
INCLUDE_ASM(code_16c8e0, GetPartScale); INCLUDE_API_ASM(code_16c8e0, GetPartScale);
INCLUDE_ASM(code_16c8e0, GetBattleFlags); INCLUDE_API_ASM(code_16c8e0, GetBattleFlags);
INCLUDE_ASM(code_16c8e0, SetBattleFlagBits); INCLUDE_API_ASM(code_16c8e0, SetBattleFlagBits);
INCLUDE_ASM(code_16c8e0, GetBattleFlags2); INCLUDE_API_ASM(code_16c8e0, GetBattleFlags2);
INCLUDE_ASM(code_16c8e0, SetBattleFlagBits2); INCLUDE_API_ASM(code_16c8e0, SetBattleFlagBits2);
INCLUDE_ASM(code_16c8e0, SetActorFlags); INCLUDE_API_ASM(code_16c8e0, SetActorFlags);
INCLUDE_ASM(code_16c8e0, SetActorFlagBits); INCLUDE_API_ASM(code_16c8e0, SetActorFlagBits);
INCLUDE_ASM(code_16c8e0, GetActorFlags); INCLUDE_API_ASM(code_16c8e0, GetActorFlags);
INCLUDE_ASM(code_16c8e0, SetPartFlags); INCLUDE_API_ASM(code_16c8e0, SetPartFlags);
INCLUDE_ASM(code_16c8e0, SetPartFlagBits); INCLUDE_API_ASM(code_16c8e0, SetPartFlagBits);
INCLUDE_ASM(code_16c8e0, SetPartTargetFlags); INCLUDE_API_ASM(code_16c8e0, SetPartTargetFlags);
INCLUDE_ASM(code_16c8e0, SetPartTargetFlagBits); INCLUDE_API_ASM(code_16c8e0, SetPartTargetFlagBits);
INCLUDE_ASM(code_16c8e0, GetPartFlags); INCLUDE_API_ASM(code_16c8e0, GetPartFlags);
INCLUDE_ASM(code_16c8e0, GetPartTargetFlags); INCLUDE_API_ASM(code_16c8e0, GetPartTargetFlags);
INCLUDE_ASM(code_16c8e0, SetPartEventFlags); INCLUDE_API_ASM(code_16c8e0, SetPartEventFlags);
INCLUDE_ASM(code_16c8e0, SetPartEventBits); INCLUDE_API_ASM(code_16c8e0, SetPartEventBits);
INCLUDE_ASM(code_16c8e0, GetPartEventFlags); INCLUDE_API_ASM(code_16c8e0, GetPartEventFlags);
INCLUDE_ASM(code_16c8e0, HPBarToHome); INCLUDE_API_ASM(code_16c8e0, HPBarToHome);
INCLUDE_ASM(code_16c8e0, HPBarToCurrent); INCLUDE_API_ASM(code_16c8e0, HPBarToCurrent);
INCLUDE_ASM(code_16c8e0, SummonEnemy); INCLUDE_API_ASM(code_16c8e0, SummonEnemy);
INCLUDE_ASM(code_16c8e0, GetOwnerID); INCLUDE_API_ASM(code_16c8e0, GetOwnerID);
INCLUDE_ASM(code_16c8e0, SetOwnerID); INCLUDE_API_ASM(code_16c8e0, SetOwnerID);
INCLUDE_ASM(code_16c8e0, ActorExists); INCLUDE_API_ASM(code_16c8e0, ActorExists);
INCLUDE_ASM(code_16c8e0, SetBattleInputMask); INCLUDE_API_ASM(code_16c8e0, SetBattleInputMask);
INCLUDE_ASM(code_16c8e0, SetBattleInputButtons); INCLUDE_API_ASM(code_16c8e0, SetBattleInputButtons);
INCLUDE_ASM(code_16c8e0, CheckButtonPress); INCLUDE_API_ASM(code_16c8e0, CheckButtonPress);
INCLUDE_ASM(code_16c8e0, CheckButtonHeld); INCLUDE_API_ASM(code_16c8e0, CheckButtonHeld);
INCLUDE_ASM(code_16c8e0, CheckButtonDown); INCLUDE_API_ASM(code_16c8e0, CheckButtonDown);
INCLUDE_ASM(code_16c8e0, GetBattleState); INCLUDE_API_ASM(code_16c8e0, GetBattleState);
INCLUDE_ASM(code_16c8e0, PlayerCreateTargetList); INCLUDE_API_ASM(code_16c8e0, PlayerCreateTargetList);
INCLUDE_ASM(code_16c8e0, EnemyCreateTargetList); INCLUDE_API_ASM(code_16c8e0, EnemyCreateTargetList);
INCLUDE_ASM(code_16c8e0, InitTargetIterator); INCLUDE_API_ASM(code_16c8e0, InitTargetIterator);
INCLUDE_ASM(code_16c8e0, SetOwnerTarget); INCLUDE_API_ASM(code_16c8e0, SetOwnerTarget);
INCLUDE_ASM(code_16c8e0, ChooseNextTarget); INCLUDE_API_ASM(code_16c8e0, ChooseNextTarget);
INCLUDE_ASM(code_16c8e0, GetTargetListLength); INCLUDE_API_ASM(code_16c8e0, GetTargetListLength);
INCLUDE_ASM(code_16c8e0, GetOwnerTarget); INCLUDE_API_ASM(code_16c8e0, GetOwnerTarget);
INCLUDE_ASM(code_16c8e0, GetPlayerActorID); INCLUDE_API_ASM(code_16c8e0, GetPlayerActorID);
INCLUDE_ASM(code_16c8e0, GetDistanceToGoal); INCLUDE_API_ASM(code_16c8e0, GetDistanceToGoal);
INCLUDE_ASM(code_16c8e0, AddActorDecoration); INCLUDE_API_ASM(code_16c8e0, AddActorDecoration);
INCLUDE_ASM(code_16c8e0, RemoveActorDecoration); INCLUDE_API_ASM(code_16c8e0, RemoveActorDecoration);
INCLUDE_ASM(code_16c8e0, ModifyActorDecoration); INCLUDE_API_ASM(code_16c8e0, ModifyActorDecoration);
INCLUDE_ASM(code_16c8e0, UseIdleAnimation); INCLUDE_API_ASM(code_16c8e0, UseIdleAnimation);
INCLUDE_ASM(code_16c8e0, GetStatusFlags); INCLUDE_API_ASM(code_16c8e0, GetStatusFlags);
INCLUDE_ASM(code_16c8e0, RemovePlayerBuffs); INCLUDE_API_ASM(code_16c8e0, RemovePlayerBuffs);
INCLUDE_ASM(code_16c8e0, SetPartAlpha); INCLUDE_API_ASM(code_16c8e0, SetPartAlpha);
INCLUDE_ASM(code_16c8e0, CreatePartShadow); INCLUDE_API_ASM(code_16c8e0, CreatePartShadow);
INCLUDE_ASM(code_16c8e0, RemovePartShadow); INCLUDE_API_ASM(code_16c8e0, RemovePartShadow);
INCLUDE_ASM(code_16c8e0, SetBattleVar); INCLUDE_API_ASM(code_16c8e0, SetBattleVar);
INCLUDE_ASM(code_16c8e0, GetBattleVar); INCLUDE_API_ASM(code_16c8e0, GetBattleVar);
INCLUDE_ASM(code_16c8e0, ResetAllActorSounds); INCLUDE_API_ASM(code_16c8e0, ResetAllActorSounds);
INCLUDE_ASM(code_16c8e0, SetActorSounds); INCLUDE_API_ASM(code_16c8e0, SetActorSounds);
INCLUDE_ASM(code_16c8e0, ResetActorSounds); INCLUDE_API_ASM(code_16c8e0, ResetActorSounds);
INCLUDE_ASM(code_16c8e0, SetPartSounds); INCLUDE_API_ASM(code_16c8e0, SetPartSounds);
INCLUDE_ASM(code_16c8e0, SetActorType); INCLUDE_API_ASM(code_16c8e0, SetActorType);
INCLUDE_ASM(code_16c8e0, ShowShockEffect); INCLUDE_API_ASM(code_16c8e0, ShowShockEffect);
INCLUDE_ASM(code_16c8e0, GetActorAttackBoost); INCLUDE_API_ASM(code_16c8e0, GetActorAttackBoost);
INCLUDE_ASM(code_16c8e0, GetActorDefenseBoost); INCLUDE_API_ASM(code_16c8e0, GetActorDefenseBoost);
INCLUDE_ASM(code_16c8e0, BoostAttack); INCLUDE_API_ASM(code_16c8e0, BoostAttack);
INCLUDE_ASM(code_16c8e0, BoostDefense); INCLUDE_API_ASM(code_16c8e0, BoostDefense);
INCLUDE_ASM(code_16c8e0, VanishActor); INCLUDE_API_ASM(code_16c8e0, VanishActor);
INCLUDE_ASM(code_16c8e0, ElectrifyActor); INCLUDE_API_ASM(code_16c8e0, ElectrifyActor);
INCLUDE_ASM(code_16c8e0, HealActor); INCLUDE_API_ASM(code_16c8e0, HealActor);
INCLUDE_ASM(code_16c8e0, WaitForBuffDone); INCLUDE_API_ASM(code_16c8e0, WaitForBuffDone);
INCLUDE_ASM(code_16c8e0, CopyBuffs); INCLUDE_API_ASM(code_16c8e0, CopyBuffs);
INCLUDE_ASM(code_16c8e0, dispatch_event_player); INCLUDE_ASM(code_16c8e0, dispatch_event_player);
@ -918,29 +918,29 @@ INCLUDE_ASM(code_16c8e0, dispatch_damage_event_player_0);
INCLUDE_ASM(code_16c8e0, dispatch_damage_event_player_1); INCLUDE_ASM(code_16c8e0, dispatch_damage_event_player_1);
INCLUDE_ASM(code_16c8e0, GetMenuSelection); INCLUDE_API_ASM(code_16c8e0, GetMenuSelection);
INCLUDE_ASM(code_16c8e0, PlayerFallToGoal); INCLUDE_API_ASM(code_16c8e0, PlayerFallToGoal);
INCLUDE_ASM(code_16c8e0, PlayerLandJump); INCLUDE_API_ASM(code_16c8e0, PlayerLandJump);
INCLUDE_ASM(code_16c8e0, PlayerRunToGoal); INCLUDE_API_ASM(code_16c8e0, PlayerRunToGoal);
INCLUDE_ASM(code_16c8e0, CancelablePlayerRunToGoal); INCLUDE_API_ASM(code_16c8e0, CancelablePlayerRunToGoal);
INCLUDE_ASM(code_16c8e0, GetPlayerHP); INCLUDE_API_ASM(code_16c8e0, GetPlayerHP);
INCLUDE_ASM(code_16c8e0, PlayerDamageEnemy); INCLUDE_API_ASM(code_16c8e0, PlayerDamageEnemy);
INCLUDE_ASM(code_16c8e0, PlayerPowerBounceEnemy); INCLUDE_API_ASM(code_16c8e0, PlayerPowerBounceEnemy);
INCLUDE_ASM(code_16c8e0, PlayerTestEnemy); INCLUDE_API_ASM(code_16c8e0, PlayerTestEnemy);
INCLUDE_ASM(code_16c8e0, DispatchDamagePlayerEvent); INCLUDE_API_ASM(code_16c8e0, DispatchDamagePlayerEvent);
INCLUDE_ASM(code_16c8e0, EnablePlayerBlur); INCLUDE_API_ASM(code_16c8e0, EnablePlayerBlur);
INCLUDE_ASM(code_16c8e0, DidActionSucceed); INCLUDE_API_ASM(code_16c8e0, DidActionSucceed);
INCLUDE_ASM(code_16c8e0, func_80276F50); INCLUDE_ASM(code_16c8e0, func_80276F50);
@ -960,111 +960,111 @@ INCLUDE_ASM(code_16c8e0, dispatch_damage_event_actor_0);
INCLUDE_ASM(code_16c8e0, dispatch_damage_event_actor_1); INCLUDE_ASM(code_16c8e0, dispatch_damage_event_actor_1);
INCLUDE_ASM(code_16c8e0, BindTakeTurn); INCLUDE_API_ASM(code_16c8e0, BindTakeTurn);
INCLUDE_ASM(code_16c8e0, PauseTakeTurn); INCLUDE_API_ASM(code_16c8e0, PauseTakeTurn);
INCLUDE_ASM(code_16c8e0, ResumeTakeTurn); INCLUDE_API_ASM(code_16c8e0, ResumeTakeTurn);
INCLUDE_ASM(code_16c8e0, BindIdle); INCLUDE_API_ASM(code_16c8e0, BindIdle);
INCLUDE_ASM(code_16c8e0, EnableIdleScript); INCLUDE_API_ASM(code_16c8e0, EnableIdleScript);
INCLUDE_ASM(code_16c8e0, BindHandleEvent); INCLUDE_API_ASM(code_16c8e0, BindHandleEvent);
INCLUDE_ASM(code_16c8e0, BindNextTurn); INCLUDE_API_ASM(code_16c8e0, BindNextTurn);
INCLUDE_ASM(code_16c8e0, JumpToGoal); INCLUDE_API_ASM(code_16c8e0, JumpToGoal);
INCLUDE_ASM(code_16c8e0, IdleJumpToGoal); INCLUDE_API_ASM(code_16c8e0, IdleJumpToGoal);
INCLUDE_ASM(code_16c8e0, JumpToGoalSimple2); INCLUDE_API_ASM(code_16c8e0, JumpToGoalSimple2);
INCLUDE_ASM(code_16c8e0, JumpWithBounce); INCLUDE_API_ASM(code_16c8e0, JumpWithBounce);
INCLUDE_ASM(code_16c8e0, LandJump); INCLUDE_API_ASM(code_16c8e0, LandJump);
INCLUDE_ASM(code_16c8e0, FallToGoal); INCLUDE_API_ASM(code_16c8e0, FallToGoal);
INCLUDE_ASM(code_16c8e0, RunToGoal); INCLUDE_API_ASM(code_16c8e0, RunToGoal);
INCLUDE_ASM(code_16c8e0, IdleRunToGoal); INCLUDE_API_ASM(code_16c8e0, IdleRunToGoal);
INCLUDE_ASM(code_16c8e0, JumpPartTo); INCLUDE_API_ASM(code_16c8e0, JumpPartTo);
INCLUDE_ASM(code_16c8e0, FallPartTo); INCLUDE_API_ASM(code_16c8e0, FallPartTo);
INCLUDE_ASM(code_16c8e0, LandJumpPart); INCLUDE_API_ASM(code_16c8e0, LandJumpPart);
INCLUDE_ASM(code_16c8e0, RunPartTo); INCLUDE_API_ASM(code_16c8e0, RunPartTo);
INCLUDE_ASM(code_16c8e0, update_lerp_battle); INCLUDE_ASM(code_16c8e0, update_lerp_battle);
INCLUDE_ASM(code_16c8e0, FlyToGoal); INCLUDE_API_ASM(code_16c8e0, FlyToGoal);
INCLUDE_ASM(code_16c8e0, IdleFlyToGoal); INCLUDE_API_ASM(code_16c8e0, IdleFlyToGoal);
INCLUDE_ASM(code_16c8e0, FlyPartTo); INCLUDE_API_ASM(code_16c8e0, FlyPartTo);
INCLUDE_ASM(code_16c8e0, GetLastEvent); INCLUDE_API_ASM(code_16c8e0, GetLastEvent);
INCLUDE_ASM(code_16c8e0, SetTargetActor); INCLUDE_API_ASM(code_16c8e0, SetTargetActor);
INCLUDE_ASM(code_16c8e0, SetEnemyHP); INCLUDE_API_ASM(code_16c8e0, SetEnemyHP);
INCLUDE_ASM(code_16c8e0, GetActorHP); INCLUDE_API_ASM(code_16c8e0, GetActorHP);
INCLUDE_ASM(code_16c8e0, GetEnemyMaxHP); INCLUDE_API_ASM(code_16c8e0, GetEnemyMaxHP);
INCLUDE_ASM(code_16c8e0, RemoveActor); INCLUDE_API_ASM(code_16c8e0, RemoveActor);
INCLUDE_ASM(code_16c8e0, DropStarPoints); INCLUDE_API_ASM(code_16c8e0, DropStarPoints);
INCLUDE_ASM(code_16c8e0, SetDefenseTable); INCLUDE_API_ASM(code_16c8e0, SetDefenseTable);
INCLUDE_ASM(code_16c8e0, SetStatusTable); INCLUDE_API_ASM(code_16c8e0, SetStatusTable);
INCLUDE_ASM(code_16c8e0, SetIdleAnimations); INCLUDE_API_ASM(code_16c8e0, SetIdleAnimations);
INCLUDE_ASM(code_16c8e0, EnemyDamageTarget); INCLUDE_API_ASM(code_16c8e0, EnemyDamageTarget);
INCLUDE_ASM(code_16c8e0, EnemyFollowupAfflictTarget); INCLUDE_API_ASM(code_16c8e0, EnemyFollowupAfflictTarget);
INCLUDE_ASM(code_16c8e0, EnemyTestTarget); INCLUDE_API_ASM(code_16c8e0, EnemyTestTarget);
INCLUDE_ASM(code_16c8e0, DispatchDamageEvent); INCLUDE_API_ASM(code_16c8e0, DispatchDamageEvent);
INCLUDE_ASM(code_16c8e0, DispatchEvent); INCLUDE_API_ASM(code_16c8e0, DispatchEvent);
INCLUDE_ASM(code_16c8e0, SetTargetOffset); INCLUDE_API_ASM(code_16c8e0, SetTargetOffset);
INCLUDE_ASM(code_16c8e0, EnableActorBlur); INCLUDE_API_ASM(code_16c8e0, EnableActorBlur);
INCLUDE_ASM(code_16c8e0, AfflictActor); INCLUDE_API_ASM(code_16c8e0, AfflictActor);
INCLUDE_ASM(code_16c8e0, GetEncounterState); INCLUDE_API_ASM(code_16c8e0, GetEncounterState);
INCLUDE_ASM(code_16c8e0, YieldTurn); INCLUDE_API_ASM(code_16c8e0, YieldTurn);
INCLUDE_ASM(code_16c8e0, SetActorSize); INCLUDE_API_ASM(code_16c8e0, SetActorSize);
INCLUDE_ASM(code_16c8e0, GetActorSize); INCLUDE_API_ASM(code_16c8e0, GetActorSize);
INCLUDE_ASM(code_16c8e0, SetPartSize); INCLUDE_API_ASM(code_16c8e0, SetPartSize);
INCLUDE_ASM(code_16c8e0, GetOriginalActorType); INCLUDE_API_ASM(code_16c8e0, GetOriginalActorType);
INCLUDE_ASM(code_16c8e0, GetCurrentActorType); INCLUDE_API_ASM(code_16c8e0, GetCurrentActorType);
INCLUDE_ASM(code_16c8e0, GetLastDamage); INCLUDE_API_ASM(code_16c8e0, GetLastDamage);
INCLUDE_ASM(code_16c8e0, EnableActorGlow); INCLUDE_API_ASM(code_16c8e0, EnableActorGlow);
INCLUDE_ASM(code_16c8e0, WasStatusInflicted); INCLUDE_API_ASM(code_16c8e0, WasStatusInflicted);
INCLUDE_ASM(code_16c8e0, CopyStatusEffects); INCLUDE_API_ASM(code_16c8e0, CopyStatusEffects);
INCLUDE_ASM(code_16c8e0, ClearStatusEffects); INCLUDE_API_ASM(code_16c8e0, ClearStatusEffects);
INCLUDE_ASM(code_16c8e0, dispatch_event_partner); INCLUDE_ASM(code_16c8e0, dispatch_event_partner);
@ -1080,22 +1080,22 @@ INCLUDE_ASM(code_16c8e0, dispatch_damage_event_partner_0);
INCLUDE_ASM(code_16c8e0, dispatch_damage_event_partner_1); INCLUDE_ASM(code_16c8e0, dispatch_damage_event_partner_1);
INCLUDE_ASM(code_16c8e0, MakeOwnerTargetIndex); INCLUDE_API_ASM(code_16c8e0, MakeOwnerTargetIndex);
INCLUDE_ASM(code_16c8e0, GetActorLevel); INCLUDE_API_ASM(code_16c8e0, GetActorLevel);
INCLUDE_ASM(code_16c8e0, PartnerDamageEnemy); INCLUDE_API_ASM(code_16c8e0, PartnerDamageEnemy);
INCLUDE_ASM(code_16c8e0, PartnerAfflictEnemy); INCLUDE_API_ASM(code_16c8e0, PartnerAfflictEnemy);
INCLUDE_ASM(code_16c8e0, PartnerPowerBounceEnemy); INCLUDE_API_ASM(code_16c8e0, PartnerPowerBounceEnemy);
INCLUDE_ASM(code_16c8e0, PartnerTestEnemy); INCLUDE_API_ASM(code_16c8e0, PartnerTestEnemy);
INCLUDE_ASM(code_16c8e0, DeletePartner); INCLUDE_API_ASM(code_16c8e0, DeletePartner);
INCLUDE_ASM(code_16c8e0, GetDamageIntensity); INCLUDE_API_ASM(code_16c8e0, GetDamageIntensity);
INCLUDE_ASM(code_16c8e0, ActorAddMovePos); INCLUDE_API_ASM(code_16c8e0, ActorAddMovePos);
INCLUDE_ASM(code_16c8e0, LoadStarPowerScript); INCLUDE_API_ASM(code_16c8e0, LoadStarPowerScript);

8
src/code_1a1f0_len_5390.c
View File

@ -4,13 +4,13 @@ INCLUDE_ASM(code_1a1f0_len_5390, get_defeated);
INCLUDE_ASM(code_1a1f0_len_5390, set_defeated); INCLUDE_ASM(code_1a1f0_len_5390, set_defeated);
INCLUDE_ASM(code_1a1f0_len_5390, GetCamLookAtObjVector); INCLUDE_API_ASM(code_1a1f0_len_5390, GetCamLookAtObjVector);
INCLUDE_ASM(code_1a1f0_len_5390, HasMerleeCasts); INCLUDE_API_ASM(code_1a1f0_len_5390, HasMerleeCasts);
INCLUDE_ASM(code_1a1f0_len_5390, OnDefeatEnemy); INCLUDE_API_ASM(code_1a1f0_len_5390, OnDefeatEnemy);
INCLUDE_ASM(code_1a1f0_len_5390, OnFleeBattleDrops); INCLUDE_API_ASM(code_1a1f0_len_5390, OnFleeBattleDrops);
INCLUDE_ASM(code_1a1f0_len_5390, func_8003F7CC); INCLUDE_ASM(code_1a1f0_len_5390, func_8003F7CC);

84
src/code_1f580_len_1940.c
View File

@ -1,94 +1,94 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(code_1f580_len_1940, SetEncounterStatusFlags); INCLUDE_API_ASM(code_1f580_len_1940, SetEncounterStatusFlags);
s32 LoadDemoBattle(ScriptInstance* script) { ApiStatus LoadDemoBattle(ScriptInstance* script, s32 isInitialCall) {
load_demo_battle(get_variable(script, *script->ptrReadPos)); load_demo_battle(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
// ??? // ???
s32 func_80044290(ScriptInstance* script) { ApiStatus func_80044290(ScriptInstance* script, s32 isInitialCall) {
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_1f580_len_1940, MakeNpcs); INCLUDE_API_ASM(code_1f580_len_1940, MakeNpcs);
INCLUDE_ASM(code_1f580_len_1940, RemoveNpc); INCLUDE_API_ASM(code_1f580_len_1940, RemoveNpc);
INCLUDE_ASM(code_1f580_len_1940, RemoveEncounter); INCLUDE_API_ASM(code_1f580_len_1940, RemoveEncounter);
INCLUDE_ASM(code_1f580_len_1940, GetBattleOutcome); INCLUDE_API_ASM(code_1f580_len_1940, GetBattleOutcome);
s32 GetOwnerEncountered(ScriptInstance* script) { ApiStatus GetOwnerEncountered(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, script->ownerActorID->encountered); set_variable(script, *script->ptrReadPos, script->ownerActorID->encountered);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_1f580_len_1940, DoNpcDefeat); INCLUDE_API_ASM(code_1f580_len_1940, DoNpcDefeat);
INCLUDE_ASM(code_1f580_len_1940, start_battle); INCLUDE_ASM(code_1f580_len_1940, start_battle);
s32 StartBattle(ScriptInstance* script) { ApiStatus StartBattle(ScriptInstance* script, s32 isInitialCall) {
start_battle(script, -1); start_battle(script, -1);
return 1; return ApiStatus_DONE1;
} }
s32 StartBattleWith(ScriptInstance* script) { ApiStatus StartBattleWith(ScriptInstance* script, s32 isInitialCall) {
start_battle(script, get_variable(script, *script->ptrReadPos)); start_battle(script, get_variable(script, *script->ptrReadPos));
return 1; return ApiStatus_DONE1;
} }
INCLUDE_ASM(code_1f580_len_1940, StartBossBattle); INCLUDE_API_ASM(code_1f580_len_1940, StartBossBattle);
INCLUDE_ASM(code_1f580_len_1940, SetBattleMusic); INCLUDE_API_ASM(code_1f580_len_1940, SetBattleMusic);
INCLUDE_ASM(code_1f580_len_1940, BindNpcAI); INCLUDE_API_ASM(code_1f580_len_1940, BindNpcAI);
INCLUDE_ASM(code_1f580_len_1940, BindNpcIdle); INCLUDE_API_ASM(code_1f580_len_1940, BindNpcIdle);
INCLUDE_ASM(code_1f580_len_1940, RestartNpcAI); INCLUDE_API_ASM(code_1f580_len_1940, RestartNpcAI);
INCLUDE_ASM(code_1f580_len_1940, EnableNpcAI); INCLUDE_API_ASM(code_1f580_len_1940, EnableNpcAI);
INCLUDE_ASM(code_1f580_len_1940, SetNpcAux); INCLUDE_API_ASM(code_1f580_len_1940, SetNpcAux);
INCLUDE_ASM(code_1f580_len_1940, BindNpcAux); INCLUDE_API_ASM(code_1f580_len_1940, BindNpcAux);
INCLUDE_ASM(code_1f580_len_1940, RestartNpcAux); INCLUDE_API_ASM(code_1f580_len_1940, RestartNpcAux);
INCLUDE_ASM(code_1f580_len_1940, EnableNpcAux); INCLUDE_API_ASM(code_1f580_len_1940, EnableNpcAux);
INCLUDE_ASM(code_1f580_len_1940, BindNpcInteract); INCLUDE_API_ASM(code_1f580_len_1940, BindNpcInteract);
INCLUDE_ASM(code_1f580_len_1940, BindNpcHit); INCLUDE_API_ASM(code_1f580_len_1940, BindNpcHit);
INCLUDE_ASM(code_1f580_len_1940, BindNpcDefeat); INCLUDE_API_ASM(code_1f580_len_1940, BindNpcDefeat);
INCLUDE_ASM(code_1f580_len_1940, SetSelfVar); INCLUDE_API_ASM(code_1f580_len_1940, SetSelfVar);
INCLUDE_ASM(code_1f580_len_1940, GetSelfVar); INCLUDE_API_ASM(code_1f580_len_1940, GetSelfVar);
INCLUDE_ASM(code_1f580_len_1940, SetNpcVar); INCLUDE_API_ASM(code_1f580_len_1940, SetNpcVar);
INCLUDE_ASM(code_1f580_len_1940, GetNpcVar); INCLUDE_API_ASM(code_1f580_len_1940, GetNpcVar);
INCLUDE_ASM(code_1f580_len_1940, SetSelfRotation); INCLUDE_API_ASM(code_1f580_len_1940, SetSelfRotation);
s32 SetSelfEnemyFlags(ScriptInstance* script) { ApiStatus SetSelfEnemyFlags(ScriptInstance* script, s32 isInitialCall) {
script->ownerActorID->flags = *script->ptrReadPos; script->ownerActorID->flags = *script->ptrReadPos;
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_1f580_len_1940, SetSelfEnemyFlagBits); INCLUDE_API_ASM(code_1f580_len_1940, SetSelfEnemyFlagBits);
s32 GetSelfNpcID(ScriptInstance* script) { ApiStatus GetSelfNpcID(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, script->ownerActorID->npcID); set_variable(script, *script->ptrReadPos, script->ownerActorID->npcID);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_1f580_len_1940, ClearDefeatedEnemies); INCLUDE_API_ASM(code_1f580_len_1940, ClearDefeatedEnemies);
INCLUDE_ASM(code_1f580_len_1940, SetEnemyFlagBits); INCLUDE_API_ASM(code_1f580_len_1940, SetEnemyFlagBits);
INCLUDE_ASM(code_1f580_len_1940, GetSelfAnimationFromTable); INCLUDE_API_ASM(code_1f580_len_1940, GetSelfAnimationFromTable);

2
src/code_20ec0_len_5040.c
View File

@ -112,7 +112,7 @@ INCLUDE_ASM(code_20ec0_len_5040, func_8004A124);
INCLUDE_ASM(code_20ec0_len_5040, func_8004A3E8); INCLUDE_ASM(code_20ec0_len_5040, func_8004A3E8);
INCLUDE_ASM(code_20ec0_len_5040, DoBasicAI); INCLUDE_API_ASM(code_20ec0_len_5040, DoBasicAI);
INCLUDE_ASM(code_20ec0_len_5040, func_8004A73C); INCLUDE_ASM(code_20ec0_len_5040, func_8004A73C);

10
src/code_25f00_len_940.c
View File

@ -2,12 +2,12 @@
INCLUDE_ASM(code_25f00_len_940, func_8004AB00); INCLUDE_ASM(code_25f00_len_940, func_8004AB00);
INCLUDE_ASM(code_25f00_len_940, nuAuDmaCallBack); INCLUDE_API_ASM(code_25f00_len_940, nuAuDmaCallBack);
INCLUDE_ASM(code_25f00_len_940, nuAuDmaNew); INCLUDE_API_ASM(code_25f00_len_940, nuAuDmaNew);
INCLUDE_ASM(code_25f00_len_940, nuAuCleanDMABuffers); INCLUDE_API_ASM(code_25f00_len_940, nuAuCleanDMABuffers);
INCLUDE_ASM(code_25f00_len_940, alRename1); INCLUDE_API_ASM(code_25f00_len_940, alRename1);
INCLUDE_ASM(code_25f00_len_940, alRename2); INCLUDE_API_ASM(code_25f00_len_940, alRename2);

4
src/code_303c0_len_3e10.c
View File

@ -92,7 +92,7 @@ INCLUDE_ASM(code_303c0_len_3e10, func_80056228);
INCLUDE_ASM(code_303c0_len_3e10, func_80056250); INCLUDE_ASM(code_303c0_len_3e10, func_80056250);
INCLUDE_ASM(code_303c0_len_3e10, alRename4); INCLUDE_API_ASM(code_303c0_len_3e10, alRename4);
INCLUDE_ASM(code_303c0_len_3e10, func_80056D34); INCLUDE_ASM(code_303c0_len_3e10, func_80056D34);
@ -136,7 +136,7 @@ INCLUDE_ASM(code_303c0_len_3e10, func_80057ED0);
INCLUDE_ASM(code_303c0_len_3e10, func_80057F20); INCLUDE_ASM(code_303c0_len_3e10, func_80057F20);
INCLUDE_ASM(code_303c0_len_3e10, alRename3); INCLUDE_API_ASM(code_303c0_len_3e10, alRename3);
INCLUDE_ASM(code_303c0_len_3e10, func_80057FD8); INCLUDE_ASM(code_303c0_len_3e10, func_80057FD8);

10
src/code_42e0_len_1f60.c
View File

@ -8,7 +8,7 @@ INCLUDE_ASM(code_42e0_len_1f60, func_80028F8C);
INCLUDE_ASM(code_42e0_len_1f60, func_80028FE0); INCLUDE_ASM(code_42e0_len_1f60, func_80028FE0);
INCLUDE_ASM(code_42e0_len_1f60, length2D); INCLUDE_API_ASM(code_42e0_len_1f60, length2D);
INCLUDE_ASM(code_42e0_len_1f60, _heap_create); INCLUDE_ASM(code_42e0_len_1f60, _heap_create);
@ -20,9 +20,9 @@ INCLUDE_ASM(code_42e0_len_1f60, _heap_free);
INCLUDE_ASM(code_42e0_len_1f60, _heap_realloc); INCLUDE_ASM(code_42e0_len_1f60, _heap_realloc);
INCLUDE_ASM(code_42e0_len_1f60, cosine); INCLUDE_API_ASM(code_42e0_len_1f60, cosine);
INCLUDE_ASM(code_42e0_len_1f60, sign); INCLUDE_API_ASM(code_42e0_len_1f60, sign);
INCLUDE_ASM(code_42e0_len_1f60, int_to_string); INCLUDE_ASM(code_42e0_len_1f60, int_to_string);
@ -44,9 +44,9 @@ INCLUDE_ASM(code_42e0_len_1f60, func_80029994);
s32 INCLUDE_ASM(code_42e0_len_1f60, rand_int, s32 arg0); s32 INCLUDE_ASM(code_42e0_len_1f60, rand_int, s32 arg0);
INCLUDE_ASM(code_42e0_len_1f60, signF); INCLUDE_API_ASM(code_42e0_len_1f60, signF);
INCLUDE_ASM(code_42e0_len_1f60, round); INCLUDE_API_ASM(code_42e0_len_1f60, round);
f32 INCLUDE_ASM(code_42e0_len_1f60, clamp_angle, f32 theta); f32 INCLUDE_ASM(code_42e0_len_1f60, clamp_angle, f32 theta);

2
src/code_7E2AA0.c
View File

@ -2,4 +2,4 @@
INCLUDE_ASM(code_7E2AA0, func_80281C20); INCLUDE_ASM(code_7E2AA0, func_80281C20);
INCLUDE_ASM(code_7E2AA0, MakeDoorAdvanced); INCLUDE_API_ASM(code_7E2AA0, MakeDoorAdvanced);

12
src/code_7E3700.c
View File

@ -2,14 +2,14 @@
INCLUDE_ASM(code_7E3700, func_80282880); INCLUDE_ASM(code_7E3700, func_80282880);
INCLUDE_ASM(code_7E3700, CheckActionState); INCLUDE_API_ASM(code_7E3700, CheckActionState);
INCLUDE_ASM(code_7E3700, CreatePushBlockGrid); INCLUDE_API_ASM(code_7E3700, CreatePushBlockGrid);
INCLUDE_ASM(code_7E3700, SetPushBlock); INCLUDE_API_ASM(code_7E3700, SetPushBlock);
INCLUDE_ASM(code_7E3700, GetPushBlock); INCLUDE_API_ASM(code_7E3700, GetPushBlock);
INCLUDE_ASM(code_7E3700, GetGridIndexFromPos); INCLUDE_API_ASM(code_7E3700, GetGridIndexFromPos);
INCLUDE_ASM(code_7E3700, SetPushBlockFallEffect); INCLUDE_API_ASM(code_7E3700, SetPushBlockFallEffect);

34
src/code_7e0e80.c
View File

@ -18,40 +18,40 @@ INCLUDE_ASM(code_7e0e80, func_80280AC4);
INCLUDE_ASM(code_7e0e80, func_80280B44); INCLUDE_ASM(code_7e0e80, func_80280B44);
INCLUDE_ASM(code_7e0e80, BtlBringPartnerOut); INCLUDE_API_ASM(code_7e0e80, BtlBringPartnerOut);
INCLUDE_ASM(code_7e0e80, func_80280B78); INCLUDE_ASM(code_7e0e80, func_80280B78);
INCLUDE_ASM(code_7e0e80, CamPreset_B); INCLUDE_API_ASM(code_7e0e80, CamPreset_B);
INCLUDE_ASM(code_7e0e80, CamPreset_F); INCLUDE_API_ASM(code_7e0e80, CamPreset_F);
INCLUDE_ASM(code_7e0e80, CamPreset_M); INCLUDE_API_ASM(code_7e0e80, CamPreset_M);
INCLUDE_ASM(code_7e0e80, CamPreset_G); INCLUDE_API_ASM(code_7e0e80, CamPreset_G);
INCLUDE_ASM(code_7e0e80, CamPreset_I); INCLUDE_API_ASM(code_7e0e80, CamPreset_I);
INCLUDE_ASM(code_7e0e80, CamPreset_H); INCLUDE_API_ASM(code_7e0e80, CamPreset_H);
INCLUDE_ASM(code_7e0e80, CamPreset_N); INCLUDE_API_ASM(code_7e0e80, CamPreset_N);
INCLUDE_ASM(code_7e0e80, CamPreset_C); INCLUDE_API_ASM(code_7e0e80, CamPreset_C);
INCLUDE_ASM(code_7e0e80, CamPreset_D); INCLUDE_API_ASM(code_7e0e80, CamPreset_D);
INCLUDE_ASM(code_7e0e80, CamPreset_E); INCLUDE_API_ASM(code_7e0e80, CamPreset_E);
INCLUDE_ASM(code_7e0e80, CamPreset_J); INCLUDE_API_ASM(code_7e0e80, CamPreset_J);
INCLUDE_ASM(code_7e0e80, CamPreset_K); INCLUDE_API_ASM(code_7e0e80, CamPreset_K);
INCLUDE_ASM(code_7e0e80, CamPreset_L); INCLUDE_API_ASM(code_7e0e80, CamPreset_L);
INCLUDE_ASM(code_7e0e80, CamPreset_A); INCLUDE_API_ASM(code_7e0e80, CamPreset_A);
INCLUDE_ASM(code_7e0e80, draw_shop_items); INCLUDE_ASM(code_7e0e80, draw_shop_items);
INCLUDE_ASM(code_7e0e80, MakeShop); INCLUDE_API_ASM(code_7e0e80, MakeShop);
INCLUDE_ASM(code_7e0e80, MakeShopOwner); INCLUDE_API_ASM(code_7e0e80, MakeShopOwner);

5
src/code_80850_len_3060.c
View File

@ -393,13 +393,14 @@ void func_800E96C8(void) {
} }
} }
s32 ShowCoinCounter(ScriptInstance* script) { ApiStatus ShowCoinCounter(ScriptInstance* script, s32 isInitialCall) {
if (get_variable(script, *script->ptrReadPos)) { if (get_variable(script, *script->ptrReadPos)) {
show_coin_counter(); show_coin_counter();
} else { } else {
hide_coin_counter(); hide_coin_counter();
} }
return 2;
return ApiStatus_DONE2;
} }
void func_800E973C(void) { void func_800E973C(void) {

10
src/code_8230_len_1ae0.c
View File

@ -1,14 +1,14 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(code_8230_len_1ae0, nuSiMgrInit); INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrInit);
INCLUDE_ASM(code_8230_len_1ae0, nuSiSendMesg); INCLUDE_API_ASM(code_8230_len_1ae0, nuSiSendMesg);
INCLUDE_ASM(code_8230_len_1ae0, nuSiMgrStop); INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrStop);
INCLUDE_ASM(code_8230_len_1ae0, nuSiMgrRestart); INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrRestart);
INCLUDE_ASM(code_8230_len_1ae0, nuSiMgrThread); INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrThread);
INCLUDE_ASM(code_8230_len_1ae0, func_8002D160); INCLUDE_ASM(code_8230_len_1ae0, func_8002D160);

14
src/code_a5dd0_len_114e0.c
View File

@ -72,19 +72,19 @@ INCLUDE_ASM(code_a5dd0_len_114e0, create_entity);
INCLUDE_ASM(code_a5dd0_len_114e0, create_shadow_from_data); INCLUDE_ASM(code_a5dd0_len_114e0, create_shadow_from_data);
INCLUDE_ASM(code_a5dd0_len_114e0, MakeEntity); INCLUDE_API_ASM(code_a5dd0_len_114e0, MakeEntity);
INCLUDE_ASM(code_a5dd0_len_114e0, AssignScript); INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignScript);
INCLUDE_ASM(code_a5dd0_len_114e0, AssignAreaFlag); INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignAreaFlag);
INCLUDE_ASM(code_a5dd0_len_114e0, AssignBlockFlag); INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignBlockFlag);
INCLUDE_ASM(code_a5dd0_len_114e0, AssignFlag); INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignFlag);
INCLUDE_ASM(code_a5dd0_len_114e0, AssignPanelFlag); INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignPanelFlag);
INCLUDE_ASM(code_a5dd0_len_114e0, AssignCrateFlag); INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignCrateFlag);
INCLUDE_ASM(code_a5dd0_len_114e0, create_entity_shadow); INCLUDE_ASM(code_a5dd0_len_114e0, create_entity_shadow);

8
src/code_e79b0_len_1920.c
View File

@ -21,7 +21,7 @@ INCLUDE_ASM(code_e79b0_len_1920, func_802C39F8);
INCLUDE_ASM(code_e79b0_len_1920, restart_script); INCLUDE_ASM(code_e79b0_len_1920, restart_script);
// TODO: Find out why things break when script->timeScale = 1 goes after the previous lines // TODO: Find out why things break when script->timeScale = 1 goes after the previous lines
/* /*
script_context* restart_script(script_context* script) { ScriptInstance* restart_script(ScriptInstance* script) {
script->loopDepth = -1; script->loopDepth = -1;
script->switchDepth = -1; script->switchDepth = -1;
script->currentOpcode = 0; script->currentOpcode = 0;
@ -309,10 +309,10 @@ void set_script_flags(ScriptInstance* script, s32 flags) {
INCLUDE_ASM(code_e79b0_len_1920, clear_script_flags); INCLUDE_ASM(code_e79b0_len_1920, clear_script_flags);
/* /*
// TODO: Really close but some weirdness is going on // TODO: Really close but some weirdness is going on
void clear_script_flags(script_context* script, s32 flags) { void clear_script_flags(ScriptInstance* script, s32 flags) {
int i; int i;
script_context* scriptContextPtr; ScriptInstance* scriptContextPtr;
script_context* childScript = script->childScript; ScriptInstance* childScript = script->childScript;
script->state &= ~flags; script->state &= ~flags;
if (childScript != NULL) { if (childScript != NULL) {

266
src/code_e92d0_len_5da0.c
View File

@ -13,31 +13,31 @@ INCLUDE_ASM(code_e92d0_len_5da0, float_to_fixed_var);
return (s32)(arg0 * (f32)1024.0f) + -230000000; return (s32)(arg0 * (f32)1024.0f) + -230000000;
}*/ }*/
s32 si_handle_return(ScriptInstance* script) { ApiStatus si_handle_return(ScriptInstance* script) {
kill_script(script); kill_script(script);
return 255; return ApiStatus_FINISH;
} }
s32 si_handle_label(ScriptInstance* script) { ApiStatus si_handle_label(ScriptInstance* script) {
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_goto(ScriptInstance* script) { ApiStatus si_handle_goto(ScriptInstance* script) {
script->ptrNextLine = si_goto_label(script, get_variable(script, *script->ptrReadPos)); script->ptrNextLine = si_goto_label(script, get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_Loop); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_Loop);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_loop); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_loop);
s32 si_handle_break_loop(ScriptInstance* script) { ApiStatus si_handle_break_loop(ScriptInstance* script) {
if (script->loopDepth < 0) { if (script->loopDepth < 0) {
while (1) {}; // todo INF_LOOP while (1) {}; // todo INF_LOOP
} }
script->ptrNextLine = si_goto_end_loop(script); script->ptrNextLine = si_goto_end_loop(script);
script->loopDepth -= 1; script->loopDepth -= 1;
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_wait); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_wait);
@ -56,7 +56,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_less_equal);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_greater_equal); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_greater_equal);
s32 si_handle_if_AND(ScriptInstance* script) { ApiStatus si_handle_if_AND(ScriptInstance* script) {
s32 var1; s32 var1;
s32 *ptrReadPos = script->ptrReadPos; s32 *ptrReadPos = script->ptrReadPos;
@ -65,13 +65,13 @@ s32 si_handle_if_AND(ScriptInstance* script) {
if ((get_variable(script, var1) & *ptrReadPos) == 0) { if ((get_variable(script, var1) & *ptrReadPos) == 0) {
script->ptrNextLine = si_skip_if(script); script->ptrNextLine = si_skip_if(script);
return 2; return ApiStatus_DONE2;
} }
return 2; return ApiStatus_DONE2;
} }
//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_not_AND); //INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_not_AND);
s32 si_handle_if_not_AND(ScriptInstance* script) { ApiStatus si_handle_if_not_AND(ScriptInstance* script) {
s32 var1; s32 var1;
s32 *ptrReadPos = script->ptrReadPos; s32 *ptrReadPos = script->ptrReadPos;
@ -80,24 +80,24 @@ s32 si_handle_if_not_AND(ScriptInstance* script) {
if ((get_variable(script, var1) & *ptrReadPos) != 0) { if ((get_variable(script, var1) & *ptrReadPos) != 0) {
script->ptrNextLine = si_skip_if(script); script->ptrNextLine = si_skip_if(script);
return 2; return ApiStatus_DONE2;
} }
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_else(ScriptInstance* script) { ApiStatus si_handle_else(ScriptInstance* script) {
script->ptrNextLine = si_skip_else(script); script->ptrNextLine = si_skip_else(script);
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_end_if(ScriptInstance* script) { ApiStatus si_handle_end_if(ScriptInstance* script) {
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_switch); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_switch);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_switch_const); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_switch_const);
/*s32 si_handle_switch_const(script_context* script) { /*ApiStatus si_handle_switch_const(ScriptInstance* script) {
s32 ptrReadPos = *script->ptrReadPos; s32 ptrReadPos = *script->ptrReadPos;
s8 switchDepth = script->switchDepth + 1; s8 switchDepth = script->switchDepth + 1;
@ -106,7 +106,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_switch_const);
} }
script->switchBlockValue[script->switchDepth + 1] = ptrReadPos; script->switchBlockValue[script->switchDepth + 1] = ptrReadPos;
script->switchBlockState[script->switchDepth + 1] = 1; script->switchBlockState[script->switchDepth + 1] = 1;
return 2; return ApiStatus_DONE2;
}*/ }*/
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_equal); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_equal);
@ -133,15 +133,15 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_equal_AND);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_case_group); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_case_group);
s32 si_handle_break_case(ScriptInstance* script) { ApiStatus si_handle_break_case(ScriptInstance* script) {
if (script->switchDepth < 0) { if (script->switchDepth < 0) {
while (1) {}; //todo INF_LOOP while (1) {}; //todo INF_LOOP
} }
script->ptrNextLine = si_goto_end_case(script); script->ptrNextLine = si_goto_end_case(script);
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_end_switch(ScriptInstance* script) { ApiStatus si_handle_end_switch(ScriptInstance* script) {
s32 switchDepth = script->switchDepth; s32 switchDepth = script->switchDepth;
if (switchDepth < 0) { if (switchDepth < 0) {
@ -150,29 +150,29 @@ s32 si_handle_end_switch(ScriptInstance* script) {
script->switchBlockState[script->switchDepth] = 0; script->switchBlockState[script->switchDepth] = 0;
script->switchDepth -= 1; script->switchDepth -= 1;
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_var(ScriptInstance* script) { ApiStatus si_handle_set_var(ScriptInstance* script) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 curPtrReadPos = ptrReadPos[0]; s32 curPtrReadPos = ptrReadPos[0];
set_variable(script, curPtrReadPos, get_variable(script, ptrReadPos[1])); set_variable(script, curPtrReadPos, get_variable(script, ptrReadPos[1]));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_const(ScriptInstance* script) { ApiStatus si_handle_set_const(ScriptInstance* script) {
set_variable(script, *script->ptrReadPos, script->ptrReadPos[1]); set_variable(script, *script->ptrReadPos, script->ptrReadPos[1]);
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_float(ScriptInstance* script) { ApiStatus si_handle_set_float(ScriptInstance* script) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 curPtrReadPos = ptrReadPos[0]; s32 curPtrReadPos = ptrReadPos[0];
set_float_variable(script, curPtrReadPos, get_float_variable(script, ptrReadPos[1])); set_float_variable(script, curPtrReadPos, get_float_variable(script, ptrReadPos[1]));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_add); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_add);
@ -193,22 +193,22 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_multiplyF);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_divideF); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_divideF);
s32 si_handle_set_int_buffer_ptr(ScriptInstance* script) { ApiStatus si_handle_set_int_buffer_ptr(ScriptInstance* script) {
script->buffer = get_variable(script, *script->ptrReadPos); script->buffer = get_variable(script, *script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_float_buffer_ptr(ScriptInstance* script) { ApiStatus si_handle_set_float_buffer_ptr(ScriptInstance* script) {
script->buffer = get_variable(script, *script->ptrReadPos); script->buffer = get_variable(script, *script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_get_1_word(ScriptInstance* script) { ApiStatus si_handle_get_1_word(ScriptInstance* script) {
s32 ptrReadPos = *script->ptrReadPos; s32 ptrReadPos = *script->ptrReadPos;
s32 buffer = *script->buffer++; s32 buffer = *script->buffer++;
set_variable(script, ptrReadPos, buffer); set_variable(script, ptrReadPos, buffer);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_2_word); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_2_word);
@ -217,12 +217,12 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_3_word);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_word); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_word);
s32 si_handle_get_Nth_word(ScriptInstance* script) { ApiStatus si_handle_get_Nth_word(ScriptInstance* script) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 curPtrReadPos = ptrReadPos[0]; s32 curPtrReadPos = ptrReadPos[0];
set_variable(script, curPtrReadPos, script->buffer[get_variable(script, ptrReadPos[1])]); set_variable(script, curPtrReadPos, script->buffer[get_variable(script, ptrReadPos[1])]);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_1_float); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_1_float);
@ -235,14 +235,14 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_float);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_Nth_float); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_Nth_float);
s32 si_handle_set_array(ScriptInstance* script) { ApiStatus si_handle_set_array(ScriptInstance* script) {
script->array = get_variable(script, *script->ptrReadPos); script->array = get_variable(script, *script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_flag_array(ScriptInstance* script) { ApiStatus si_handle_set_flag_array(ScriptInstance* script) {
script->flagArray = get_variable(script, *script->ptrReadPos); script->flagArray = get_variable(script, *script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_allocate_array); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_allocate_array);
@ -250,8 +250,8 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_allocate_array);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND);
//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND_const); //INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND_const);
s32 si_handle_AND_const(ScriptInstance* script) { ApiStatus si_handle_AND_const(ScriptInstance* script) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
// todo ??? // todo ???
s32 temp_s0 = ptrReadPos[0]; s32 temp_s0 = ptrReadPos[0];
s32 temp_s2 = ptrReadPos[0]; s32 temp_s2 = ptrReadPos[0];
@ -259,14 +259,14 @@ s32 si_handle_AND_const(ScriptInstance* script) {
temp_s0 = ptrReadPos[1]; temp_s0 = ptrReadPos[1];
// end todo // end todo
set_variable(script, temp_s2, temp_s0 & get_variable(script, temp_s2)); set_variable(script, temp_s2, temp_s0 & get_variable(script, temp_s2));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR);
//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR_const); //INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR_const);
s32 si_handle_OR_const(ScriptInstance* script) { ApiStatus si_handle_OR_const(ScriptInstance* script) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
// todo ??? // todo ???
s32 temp_s0 = ptrReadPos[0]; s32 temp_s0 = ptrReadPos[0];
s32 temp_s2 = ptrReadPos[0]; s32 temp_s2 = ptrReadPos[0];
@ -274,7 +274,7 @@ s32 si_handle_OR_const(ScriptInstance* script) {
temp_s0 = ptrReadPos[1]; temp_s0 = ptrReadPos[1];
// end todo // end todo
set_variable(script, temp_s2, temp_s0 | get_variable(script, temp_s2)); set_variable(script, temp_s2, temp_s0 | get_variable(script, temp_s2));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_call); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_call);
@ -283,113 +283,113 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_exec1);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_exec2); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_exec2);
s32 si_handle_exec_wait(ScriptInstance* script) { ApiStatus si_handle_exec_wait(ScriptInstance* script) {
start_child_script(script, get_variable(script, *script->ptrReadPos), 0); start_child_script(script, get_variable(script, *script->ptrReadPos), 0);
script->currentOpcode = 0; script->currentOpcode = 0;
return 0xFF; return 0xFF;
} }
s32 si_handle_jump(ScriptInstance* script) { ApiStatus si_handle_jump(ScriptInstance* script) {
script->ptrFirstLine = get_variable(script, *script->ptrReadPos); script->ptrFirstLine = get_variable(script, *script->ptrReadPos);
restart_script(script); restart_script(script);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, _bound_script_trigger_handler); INCLUDE_ASM(code_e92d0_len_5da0, _bound_script_trigger_handler);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind);
s32 DeleteTrigger(ScriptInstance* script) { ApiStatus DeleteTrigger(ScriptInstance* script, s32 isInitialCall) {
delete_trigger(get_variable(script, *script->ptrReadPos)); delete_trigger(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_unbind(ScriptInstance* script) { ApiStatus si_handle_unbind(ScriptInstance* script) {
delete_trigger(script->ownerID); delete_trigger(script->ownerID);
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_kill(ScriptInstance* script) { ApiStatus si_handle_kill(ScriptInstance* script) {
kill_script_by_ID(get_variable(script, *script->ptrReadPos)); kill_script_by_ID(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_priority(ScriptInstance* script) { ApiStatus si_handle_set_priority(ScriptInstance* script) {
set_script_priority(script, get_variable(script, *script->ptrReadPos)); set_script_priority(script, get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_timescale(ScriptInstance* script) { ApiStatus si_handle_set_timescale(ScriptInstance* script) {
set_script_timescale(script, get_float_variable(script, *script->ptrReadPos)); set_script_timescale(script, get_float_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_set_group(ScriptInstance* script) { ApiStatus si_handle_set_group(ScriptInstance* script) {
set_script_group(script, get_variable(script, *script->ptrReadPos)); set_script_group(script, get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_suspend_all(ScriptInstance* script) { ApiStatus si_handle_suspend_all(ScriptInstance* script) {
suspend_all_group(get_variable(script, *script->ptrReadPos)); suspend_all_group(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_resume_all(ScriptInstance* script) { ApiStatus si_handle_resume_all(ScriptInstance* script) {
resume_all_group(get_variable(script, *script->ptrReadPos)); resume_all_group(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_suspend_others(ScriptInstance* script) { ApiStatus si_handle_suspend_others(ScriptInstance* script) {
suspend_group_others(script, get_variable(script, *script->ptrReadPos)); suspend_group_others(script, get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_resume_others(ScriptInstance* script) { ApiStatus si_handle_resume_others(ScriptInstance* script) {
resume_group_others(script, get_variable(script, *script->ptrReadPos)); resume_group_others(script, get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_suspend(ScriptInstance* script) { ApiStatus si_handle_suspend(ScriptInstance* script) {
suspend_all_script(get_variable(script, *script->ptrReadPos)); suspend_all_script(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 si_handle_resume(ScriptInstance* script) { ApiStatus si_handle_resume(ScriptInstance* script) {
resume_all_script(get_variable(script, *script->ptrReadPos)); resume_all_script(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_does_script_exist); ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_does_script_exist);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind_lock); ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind_lock);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_thread); ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_thread);
s32 si_handle_end_thread(ScriptInstance* script) { ApiStatus si_handle_end_thread(ScriptInstance* script) {
kill_script(script); kill_script(script);
return 255; return ApiStatus_FINISH;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_child_thread); ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_child_thread);
s32 si_handle_end_child_thread(ScriptInstance* script) { ApiStatus si_handle_end_child_thread(ScriptInstance* script) {
kill_script(script); kill_script(script);
return 0; return ApiStatus_BLOCK;
} }
s32 func_802C6E14(ScriptInstance* script) { ApiStatus func_802C6E14(ScriptInstance* script) {
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_print_debug_var); ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_print_debug_var);
s32 func_802C739C(ScriptInstance* script) { ApiStatus func_802C739C(ScriptInstance* script) {
script->ptrSavedPosition = *script->ptrReadPos; script->ptrSavedPosition = *script->ptrReadPos;
return 2; return ApiStatus_DONE2;
} }
s32 func_802C73B0(ScriptInstance* script) { ApiStatus func_802C73B0(ScriptInstance* script) {
return 2; return ApiStatus_DONE2;
} }
s32 func_802C73B8(ScriptInstance* script) { s32 func_802C73B8(ScriptInstance* script) {
@ -431,100 +431,100 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_goto_next_case);
INCLUDE_ASM(code_e92d0_len_5da0, si_goto_end_loop); INCLUDE_ASM(code_e92d0_len_5da0, si_goto_end_loop);
INCLUDE_ASM(code_e92d0_len_5da0, TranslateModel); INCLUDE_API_ASM(code_e92d0_len_5da0, TranslateModel);
INCLUDE_ASM(code_e92d0_len_5da0, RotateModel); INCLUDE_API_ASM(code_e92d0_len_5da0, RotateModel);
INCLUDE_ASM(code_e92d0_len_5da0, ScaleModel); INCLUDE_API_ASM(code_e92d0_len_5da0, ScaleModel);
INCLUDE_ASM(code_e92d0_len_5da0, GetModelIndex); INCLUDE_API_ASM(code_e92d0_len_5da0, GetModelIndex);
s32 CloneModel(ScriptInstance* script) { ApiStatus CloneModel(ScriptInstance* script, s32 isInitialCall) {
s32* thisPos = script->ptrReadPos; Bytecode* thisPos = script->ptrReadPos;
s32 srcModelID = get_variable(script, *thisPos++); s32 srcModelID = get_variable(script, *thisPos++);
s32 newModelID = get_variable(script, *thisPos++); s32 newModelID = get_variable(script, *thisPos++);
clone_model(srcModelID, newModelID); clone_model(srcModelID, newModelID);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, GetModelCenter); INCLUDE_API_ASM(code_e92d0_len_5da0, GetModelCenter);
INCLUDE_ASM(code_e92d0_len_5da0, SetTexPanner); INCLUDE_API_ASM(code_e92d0_len_5da0, SetTexPanner);
INCLUDE_ASM(code_e92d0_len_5da0, SetModelFlag10); INCLUDE_API_ASM(code_e92d0_len_5da0, SetModelFlag10);
INCLUDE_ASM(code_e92d0_len_5da0, EnableTexPanning); INCLUDE_API_ASM(code_e92d0_len_5da0, EnableTexPanning);
INCLUDE_ASM(code_e92d0_len_5da0, EnableModel); INCLUDE_API_ASM(code_e92d0_len_5da0, EnableModel);
INCLUDE_ASM(code_e92d0_len_5da0, SetGroupEnabled); INCLUDE_API_ASM(code_e92d0_len_5da0, SetGroupEnabled);
INCLUDE_ASM(code_e92d0_len_5da0, SetTexPanOffset); INCLUDE_API_ASM(code_e92d0_len_5da0, SetTexPanOffset);
INCLUDE_ASM(code_e92d0_len_5da0, SetModelFlags); INCLUDE_API_ASM(code_e92d0_len_5da0, SetModelFlags);
INCLUDE_ASM(code_e92d0_len_5da0, func_802C95A0); INCLUDE_ASM(code_e92d0_len_5da0, func_802C95A0);
INCLUDE_ASM(code_e92d0_len_5da0, TranslateGroup); INCLUDE_API_ASM(code_e92d0_len_5da0, TranslateGroup);
INCLUDE_ASM(code_e92d0_len_5da0, RotateGroup); INCLUDE_API_ASM(code_e92d0_len_5da0, RotateGroup);
INCLUDE_ASM(code_e92d0_len_5da0, ScaleGroup); INCLUDE_API_ASM(code_e92d0_len_5da0, ScaleGroup);
INCLUDE_ASM(code_e92d0_len_5da0, EnableGroup); INCLUDE_API_ASM(code_e92d0_len_5da0, EnableGroup);
INCLUDE_ASM(code_e92d0_len_5da0, modify_collider_family_flags); INCLUDE_ASM(code_e92d0_len_5da0, modify_collider_family_flags);
INCLUDE_ASM(code_e92d0_len_5da0, ModifyColliderFlags); INCLUDE_API_ASM(code_e92d0_len_5da0, ModifyColliderFlags);
INCLUDE_ASM(code_e92d0_len_5da0, ResetFromLava); INCLUDE_API_ASM(code_e92d0_len_5da0, ResetFromLava);
INCLUDE_ASM(code_e92d0_len_5da0, GetColliderCenter); INCLUDE_API_ASM(code_e92d0_len_5da0, GetColliderCenter);
INCLUDE_ASM(code_e92d0_len_5da0, ParentColliderToModel); INCLUDE_API_ASM(code_e92d0_len_5da0, ParentColliderToModel);
s32 UpdateColliderTransform(ScriptInstance* script) { ApiStatus UpdateColliderTransform(ScriptInstance* script, s32 isInitialCall) {
update_collider_transform(get_variable(script, *script->ptrReadPos)); update_collider_transform(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, func_802CA1B8); INCLUDE_ASM(code_e92d0_len_5da0, func_802CA1B8);
INCLUDE_ASM(code_e92d0_len_5da0, goto_map); INCLUDE_ASM(code_e92d0_len_5da0, goto_map);
s32 GotoMap(ScriptInstance* script) { ApiStatus GotoMap(ScriptInstance* script, s32 isInitialCall) {
goto_map(script, 0); goto_map(script, 0);
return 1; return ApiStatus_DONE1;
} }
s32 GotoMapSpecial(ScriptInstance* script) { ApiStatus GotoMapSpecial(ScriptInstance* script, s32 isInitialCall) {
goto_map(script, 1); goto_map(script, 1);
return 1; return ApiStatus_DONE1;
} }
s32 GotoMapByID(ScriptInstance* script) { ApiStatus GotoMapByID(ScriptInstance* script, s32 isInitialCall) {
goto_map(script, 2); goto_map(script, 2);
return 1; return ApiStatus_DONE1;
} }
s32 GetEntryID(ScriptInstance* script) { ApiStatus GetEntryID(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->entryID); set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->entryID);
return 2; return ApiStatus_DONE2;
} }
s32 GetMapID(ScriptInstance* script, s32 initialCall) { ApiStatus GetMapID(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->mapID); set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->mapID);
return 2; return ApiStatus_DONE2;
} }
s32 GetLoadType(ScriptInstance* script, s32 initialCall) { ApiStatus GetLoadType(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->loadType != 0); set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->loadType != 0);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_e92d0_len_5da0, SetRenderMode); INCLUDE_API_ASM(code_e92d0_len_5da0, SetRenderMode);
INCLUDE_ASM(code_e92d0_len_5da0, PlaySoundAtModel); INCLUDE_API_ASM(code_e92d0_len_5da0, PlaySoundAtModel);
INCLUDE_ASM(code_e92d0_len_5da0, PlaySoundAtCollider); INCLUDE_API_ASM(code_e92d0_len_5da0, PlaySoundAtCollider);

76
src/code_ef070_len_3400.c
View File

@ -1,86 +1,86 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(code_ef070_len_3400, SetCamEnabled); INCLUDE_API_ASM(code_ef070_len_3400, SetCamEnabled);
INCLUDE_ASM(code_ef070_len_3400, SetCamFlag80); INCLUDE_API_ASM(code_ef070_len_3400, SetCamFlag80);
INCLUDE_ASM(code_ef070_len_3400, SetCamPerspective); INCLUDE_API_ASM(code_ef070_len_3400, SetCamPerspective);
INCLUDE_ASM(code_ef070_len_3400, SetCamViewport); INCLUDE_API_ASM(code_ef070_len_3400, SetCamViewport);
INCLUDE_ASM(code_ef070_len_3400, SetCamBGColor); INCLUDE_API_ASM(code_ef070_len_3400, SetCamBGColor);
INCLUDE_ASM(code_ef070_len_3400, SetCamTarget); INCLUDE_API_ASM(code_ef070_len_3400, SetCamTarget);
INCLUDE_ASM(code_ef070_len_3400, ShakeCam); INCLUDE_API_ASM(code_ef070_len_3400, ShakeCam);
INCLUDE_ASM(code_ef070_len_3400, exec_ShakeCam1); INCLUDE_ASM(code_ef070_len_3400, exec_ShakeCam1);
INCLUDE_ASM(code_ef070_len_3400, exec_ShakeCamX); INCLUDE_ASM(code_ef070_len_3400, exec_ShakeCamX);
INCLUDE_ASM(code_ef070_len_3400, SetCamLeadPlayer); INCLUDE_API_ASM(code_ef070_len_3400, SetCamLeadPlayer);
INCLUDE_ASM(code_ef070_len_3400, PanToTarget); INCLUDE_API_ASM(code_ef070_len_3400, PanToTarget);
INCLUDE_ASM(code_ef070_len_3400, UseSettingsFrom); INCLUDE_API_ASM(code_ef070_len_3400, UseSettingsFrom);
INCLUDE_ASM(code_ef070_len_3400, LoadSettings); INCLUDE_API_ASM(code_ef070_len_3400, LoadSettings);
INCLUDE_ASM(code_ef070_len_3400, SetCamType); INCLUDE_API_ASM(code_ef070_len_3400, SetCamType);
INCLUDE_ASM(code_ef070_len_3400, SetCamPitch); INCLUDE_API_ASM(code_ef070_len_3400, SetCamPitch);
INCLUDE_ASM(code_ef070_len_3400, SetCamDistance); INCLUDE_API_ASM(code_ef070_len_3400, SetCamDistance);
INCLUDE_ASM(code_ef070_len_3400, SetCamPosA); INCLUDE_API_ASM(code_ef070_len_3400, SetCamPosA);
INCLUDE_ASM(code_ef070_len_3400, SetCamPosB); INCLUDE_API_ASM(code_ef070_len_3400, SetCamPosB);
INCLUDE_ASM(code_ef070_len_3400, SetCamPosC); INCLUDE_API_ASM(code_ef070_len_3400, SetCamPosC);
INCLUDE_ASM(code_ef070_len_3400, SetPanTarget); INCLUDE_API_ASM(code_ef070_len_3400, SetPanTarget);
INCLUDE_ASM(code_ef070_len_3400, SetCamSpeed); INCLUDE_API_ASM(code_ef070_len_3400, SetCamSpeed);
INCLUDE_ASM(code_ef070_len_3400, GetCamType); INCLUDE_API_ASM(code_ef070_len_3400, GetCamType);
INCLUDE_ASM(code_ef070_len_3400, GetCamPitch); INCLUDE_API_ASM(code_ef070_len_3400, GetCamPitch);
INCLUDE_ASM(code_ef070_len_3400, GetCamDistance); INCLUDE_API_ASM(code_ef070_len_3400, GetCamDistance);
INCLUDE_ASM(code_ef070_len_3400, GetCamPosA); INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosA);
INCLUDE_ASM(code_ef070_len_3400, GetCamPosB); INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosB);
INCLUDE_ASM(code_ef070_len_3400, GetCamPosC); INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosC);
INCLUDE_ASM(code_ef070_len_3400, GetCamPosition); INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosition);
INCLUDE_ASM(code_ef070_len_3400, WaitForCam); INCLUDE_API_ASM(code_ef070_len_3400, WaitForCam);
INCLUDE_ASM(code_ef070_len_3400, SetCamProperties); INCLUDE_API_ASM(code_ef070_len_3400, SetCamProperties);
INCLUDE_ASM(code_ef070_len_3400, AdjustCam); INCLUDE_API_ASM(code_ef070_len_3400, AdjustCam);
INCLUDE_ASM(code_ef070_len_3400, ResetCam); INCLUDE_API_ASM(code_ef070_len_3400, ResetCam);
INCLUDE_ASM(code_ef070_len_3400, draw_anim_models); INCLUDE_ASM(code_ef070_len_3400, draw_anim_models);
INCLUDE_ASM(code_ef070_len_3400, LoadModelAnimation); INCLUDE_API_ASM(code_ef070_len_3400, LoadModelAnimation);
INCLUDE_ASM(code_ef070_len_3400, PlayModelAnimation); INCLUDE_API_ASM(code_ef070_len_3400, PlayModelAnimation);
INCLUDE_ASM(code_ef070_len_3400, ChangeModelAnimation); INCLUDE_API_ASM(code_ef070_len_3400, ChangeModelAnimation);
INCLUDE_ASM(code_ef070_len_3400, SetAnimModelPosition); INCLUDE_API_ASM(code_ef070_len_3400, SetAnimModelPosition);
INCLUDE_ASM(code_ef070_len_3400, GetAnimModelPosition); INCLUDE_API_ASM(code_ef070_len_3400, GetAnimModelPosition);
INCLUDE_ASM(code_ef070_len_3400, AddAnimModelPosition); INCLUDE_API_ASM(code_ef070_len_3400, AddAnimModelPosition);
INCLUDE_ASM(code_ef070_len_3400, SetAnimModelRotation); INCLUDE_API_ASM(code_ef070_len_3400, SetAnimModelRotation);
INCLUDE_ASM(code_ef070_len_3400, SetAnimModelScale); INCLUDE_API_ASM(code_ef070_len_3400, SetAnimModelScale);
INCLUDE_ASM(code_ef070_len_3400, func_802CD4B4); INCLUDE_ASM(code_ef070_len_3400, func_802CD4B4);

82
src/code_f2470_len_27f0.c
View File

@ -12,100 +12,100 @@ Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr) {
INCLUDE_ASM(code_f2470_len_27f0, set_npc_animation); INCLUDE_ASM(code_f2470_len_27f0, set_npc_animation);
s32 DeleteNpc(ScriptInstance* script, s32 initialCall) { ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
Npc* npcPtr = get_npc_unsafe(get_variable(script, *ptrReadPos++)); Npc* npcPtr = get_npc_unsafe(get_variable(script, *ptrReadPos++));
if (npcPtr) { if (npcPtr) {
free_npc(npcPtr); free_npc(npcPtr);
return 2; return ApiStatus_DONE2;
} }
return 2; return ApiStatus_DONE2;
} }
s32 GetNpcPointer(ScriptInstance* script, s32 initialCall) { ApiStatus GetNpcPointer(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
NpcId npcID = get_variable(script, *ptrReadPos++); NpcId npcID = get_variable(script, *ptrReadPos++);
Bytecode varNPC = *ptrReadPos++; Bytecode varNPC = *ptrReadPos++;
set_variable(script, varNPC, get_npc_safe(npcID)); set_variable(script, varNPC, get_npc_safe(npcID));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_f2470_len_27f0, SetNpcPos); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcPos);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcRotation); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcRotation);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcScale); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcScale);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcCollisionSize); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcCollisionSize);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcSpeed); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcSpeed);
// TODO: Fix issue with BNEZL vs BNEZ // TODO: Fix issue with BNEZL vs BNEZ
/* /*
s32 SetNpcSpeed(script_context* script, s32 initialCall) { ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) {
bytecode* ptrReadPos = script->ptrReadPos; Vytecode* ptrReadPos = script->ptrReadPos;
bytecode npcID = get_variable(script, *ptrReadPos++); NpcId npcID = get_variable(script, *ptrReadPos++);
f32 speed = get_float_variable(script, *ptrReadPos); f32 speed = get_float_variable(script, *ptrReadPos);
npc* npcPtr = resolve_npc(script, npcID); Npc* npcPtr = resolve_npc(script, npcID);
npcPtr->moveSpeed = speed; npcPtr->moveSpeed = speed;
if(npcPtr != NULL) { if(npcPtr != NULL) {
return 2; return ApiStatus_DONE2;
} }
} }
*/ */
INCLUDE_ASM(code_f2470_len_27f0, SetNpcJumpscale); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcJumpscale);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcAnimation); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcAnimation);
INCLUDE_ASM(code_f2470_len_27f0, GetNpcAnimation); INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcAnimation);
INCLUDE_ASM(code_f2470_len_27f0, NpcMoveTo); INCLUDE_API_ASM(code_f2470_len_27f0, NpcMoveTo);
INCLUDE_ASM(code_f2470_len_27f0, _npc_jump_to); INCLUDE_ASM(code_f2470_len_27f0, _npc_jump_to);
INCLUDE_ASM(code_f2470_len_27f0, NpcJump0); INCLUDE_API_ASM(code_f2470_len_27f0, NpcJump0);
INCLUDE_ASM(code_f2470_len_27f0, NpcJump1); INCLUDE_API_ASM(code_f2470_len_27f0, NpcJump1);
INCLUDE_ASM(code_f2470_len_27f0, NpcFlyTo); INCLUDE_API_ASM(code_f2470_len_27f0, NpcFlyTo);
INCLUDE_ASM(code_f2470_len_27f0, GetNpcYaw); INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcYaw);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcYaw); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcYaw);
INCLUDE_ASM(code_f2470_len_27f0, InterpNpcYaw); INCLUDE_API_ASM(code_f2470_len_27f0, InterpNpcYaw);
INCLUDE_ASM(code_f2470_len_27f0, NpcFacePlayer); INCLUDE_API_ASM(code_f2470_len_27f0, NpcFacePlayer);
INCLUDE_ASM(code_f2470_len_27f0, NpcFaceNpc); INCLUDE_API_ASM(code_f2470_len_27f0, NpcFaceNpc);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcFlagBits); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcFlagBits);
INCLUDE_ASM(code_f2470_len_27f0, GetNpcPos); INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcPos);
INCLUDE_ASM(code_f2470_len_27f0, EnableNpcShadow); INCLUDE_API_ASM(code_f2470_len_27f0, EnableNpcShadow);
INCLUDE_ASM(code_f2470_len_27f0, EnableNpcBlur); INCLUDE_API_ASM(code_f2470_len_27f0, EnableNpcBlur);
INCLUDE_ASM(code_f2470_len_27f0, ClearPartnerMoveHistory); INCLUDE_API_ASM(code_f2470_len_27f0, ClearPartnerMoveHistory);
INCLUDE_ASM(code_f2470_len_27f0, NpcSetHomePosToCurrent); INCLUDE_API_ASM(code_f2470_len_27f0, NpcSetHomePosToCurrent);
INCLUDE_ASM(code_f2470_len_27f0, GetPartnerPos); INCLUDE_API_ASM(code_f2470_len_27f0, GetPartnerPos);
INCLUDE_ASM(code_f2470_len_27f0, DisablePartnerAI); INCLUDE_API_ASM(code_f2470_len_27f0, DisablePartnerAI);
INCLUDE_ASM(code_f2470_len_27f0, EnablePartnerAI); INCLUDE_API_ASM(code_f2470_len_27f0, EnablePartnerAI);
INCLUDE_ASM(code_f2470_len_27f0, BringPartnerOut); INCLUDE_API_ASM(code_f2470_len_27f0, BringPartnerOut);
INCLUDE_ASM(code_f2470_len_27f0, PutPartnerAway); INCLUDE_API_ASM(code_f2470_len_27f0, PutPartnerAway);
INCLUDE_ASM(code_f2470_len_27f0, GetCurrentPartnerID); INCLUDE_API_ASM(code_f2470_len_27f0, GetCurrentPartnerID);
INCLUDE_ASM(code_f2470_len_27f0, SetNpcEffect); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcEffect);
INCLUDE_ASM(code_f2470_len_27f0, PlaySoundAtNpc); INCLUDE_API_ASM(code_f2470_len_27f0, PlaySoundAtNpc);

136
src/code_f4c60_len_4300.c
View File

@ -1,166 +1,166 @@
#include "common.h" #include "common.h"
s32 SpeakToPlayer(ScriptInstance* script, s32 initialCall) { ApiStatus SpeakToPlayer(ScriptInstance* script, s32 isInitialCall) {
return _show_message(script, initialCall, 0); return _show_message(script, isInitialCall, 0);
} }
s32 EndSpeech(ScriptInstance* script, s32 initialCall) { ApiStatus EndSpeech(ScriptInstance* script, s32 isInitialCall) {
return _show_message(script, initialCall, 1); return _show_message(script, isInitialCall, 1);
} }
s32 ContinueSpeech(ScriptInstance* script, s32 initialCall) { ApiStatus ContinueSpeech(ScriptInstance* script, s32 isInitialCall) {
return _show_message(script, initialCall, 2); return _show_message(script, isInitialCall, 2);
} }
s32 SpeakToNpc(ScriptInstance* script, s32 initialCall) { ApiStatus SpeakToNpc(ScriptInstance* script, s32 isInitialCall) {
return _show_message(script, initialCall, 3); return _show_message(script, isInitialCall, 3);
} }
INCLUDE_ASM(code_f4c60_len_4300, _show_message); INCLUDE_ASM(code_f4c60_len_4300, _show_message);
INCLUDE_ASM(code_f4c60_len_4300, ShowMessageAtScreenPos); INCLUDE_API_ASM(code_f4c60_len_4300, ShowMessageAtScreenPos);
INCLUDE_ASM(code_f4c60_len_4300, ShowMessageAtWorldPos); INCLUDE_API_ASM(code_f4c60_len_4300, ShowMessageAtWorldPos);
INCLUDE_ASM(code_f4c60_len_4300, CloseMessage); INCLUDE_API_ASM(code_f4c60_len_4300, CloseMessage);
INCLUDE_ASM(code_f4c60_len_4300, SwitchMessage); INCLUDE_API_ASM(code_f4c60_len_4300, SwitchMessage);
INCLUDE_ASM(code_f4c60_len_4300, ShowChoice); INCLUDE_API_ASM(code_f4c60_len_4300, ShowChoice);
s32 CloseChoice(ScriptInstance* script, s32 initialCall) { ApiStatus CloseChoice(ScriptInstance* script, s32 isInitialCall) {
close_message(D_802DB268); close_message(D_802DB268);
return 1; return ApiStatus_DONE1;
} }
s32 CancelMessage(ScriptInstance* script, s32 initialCall) { ApiStatus CancelMessage(ScriptInstance* script, s32 isInitialCall) {
cancel_message(gCurrentPrintContext); cancel_message(gCurrentPrintContext);
return 2; return ApiStatus_DONE2;
} }
s32 CancelMessageAndBlock(ScriptInstance* script, s32 initialCall) { ApiStatus CancelMessageAndBlock(ScriptInstance* script, s32 isInitialCall) {
cancel_message(gCurrentPrintContext); cancel_message(gCurrentPrintContext);
return 0; return ApiStatus_BLOCK;
} }
s32 SetMessageImages(ScriptInstance* script, s32 initialCall) { ApiStatus SetMessageImages(ScriptInstance* script, s32 isInitialCall) {
set_message_images(*script->ptrReadPos); set_message_images(*script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
s32 func_802D0C94(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D0C94(ScriptInstance* script, s32 initialCall) {
if (get_variable(script, *script->ptrReadPos) == 0) { if (get_variable(script, *script->ptrReadPos) == 0) {
D_8009A650[0] |= 0x10; D_8009A650[0] |= 0x10;
} else { } else {
D_8009A650[0] &= ~0x10; D_8009A650[0] &= ~0x10;
} }
return 2; return ApiStatus_DONE2;
} }
s32 SetMessageString(ScriptInstance* script, s32 initialCall) { ApiStatus SetMessageString(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
Bytecode string = get_variable(script, *ptrReadPos++); Bytecode string = get_variable(script, *ptrReadPos++);
Bytecode index = get_variable(script, *ptrReadPos++); Bytecode index = get_variable(script, *ptrReadPos++);
set_message_string(string, index); set_message_string(string, index);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_f4c60_len_4300, SetMessageValue); INCLUDE_API_ASM(code_f4c60_len_4300, SetMessageValue);
// TODO: Figure out why there's an extra NOP after this function // TODO: Figure out why there's an extra NOP after this function
// It's probably because of a file split issue // It's probably because of a file split issue
/* /*
s32 SetMessageValue(script_context* script, s32 initialCall) { ApiStatus SetMessageValue(ScriptInstance* script, s32 initialCall) {
bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
bytecode value = get_variable(script, *ptrReadPos++); Bytecode value = get_variable(script, *ptrReadPos++);
bytecode index = get_variable(script, *ptrReadPos); Bytecode index = get_variable(script, *ptrReadPos);
set_message_value(value, index); set_message_value(value, index);
return 2; return ApiStatus_DONE2;
} }
*/ */
INCLUDE_ASM(code_f4c60_len_4300, HidePlayerShadow); INCLUDE_API_ASM(code_f4c60_len_4300, HidePlayerShadow);
INCLUDE_ASM(code_f4c60_len_4300, DisablePlayerPhysics); INCLUDE_API_ASM(code_f4c60_len_4300, DisablePlayerPhysics);
INCLUDE_ASM(code_f4c60_len_4300, DisablePlayerInput); INCLUDE_API_ASM(code_f4c60_len_4300, DisablePlayerInput);
INCLUDE_ASM(code_f4c60_len_4300, SetPlayerPos); INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerPos);
INCLUDE_ASM(code_f4c60_len_4300, SetPlayerCollisionSize); INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerCollisionSize);
INCLUDE_ASM(code_f4c60_len_4300, SetPlayerSpeed); INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerSpeed);
INCLUDE_ASM(code_f4c60_len_4300, SetPlayerJumpscale); INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerJumpscale);
INCLUDE_ASM(code_f4c60_len_4300, SetPlayerAnimation); INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerAnimation);
INCLUDE_ASM(code_f4c60_len_4300, SetPlayerActionState); INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerActionState);
INCLUDE_ASM(code_f4c60_len_4300, MovePlayerTo); INCLUDE_API_ASM(code_f4c60_len_4300, MovePlayerTo);
INCLUDE_ASM(code_f4c60_len_4300, player_jump); INCLUDE_ASM(code_f4c60_len_4300, player_jump);
INCLUDE_ASM(code_f4c60_len_4300, PlayerJump); INCLUDE_API_ASM(code_f4c60_len_4300, PlayerJump);
INCLUDE_ASM(code_f4c60_len_4300, PlayerJump1); INCLUDE_API_ASM(code_f4c60_len_4300, PlayerJump1);
INCLUDE_ASM(code_f4c60_len_4300, PlayerJump2); INCLUDE_API_ASM(code_f4c60_len_4300, PlayerJump2);
INCLUDE_ASM(code_f4c60_len_4300, InterpPlayerYaw); INCLUDE_API_ASM(code_f4c60_len_4300, InterpPlayerYaw);
INCLUDE_ASM(code_f4c60_len_4300, PlayerFaceNpc); INCLUDE_API_ASM(code_f4c60_len_4300, PlayerFaceNpc);
INCLUDE_ASM(code_f4c60_len_4300, GetPlayerTargetYaw); INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerTargetYaw);
INCLUDE_ASM(code_f4c60_len_4300, SetPlayerFlagBits); INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerFlagBits);
INCLUDE_ASM(code_f4c60_len_4300, GetPlayerActionState); INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerActionState);
INCLUDE_ASM(code_f4c60_len_4300, GetPlayerPos); INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerPos);
INCLUDE_ASM(code_f4c60_len_4300, GetPlayerAnimation); INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerAnimation);
INCLUDE_ASM(code_f4c60_len_4300, FullyRestoreHPandFP); INCLUDE_API_ASM(code_f4c60_len_4300, FullyRestoreHPandFP);
INCLUDE_ASM(code_f4c60_len_4300, FullyRestoreSP); INCLUDE_API_ASM(code_f4c60_len_4300, FullyRestoreSP);
INCLUDE_ASM(code_f4c60_len_4300, EnablePartner); INCLUDE_API_ASM(code_f4c60_len_4300, EnablePartner);
INCLUDE_ASM(code_f4c60_len_4300, DisablePartner); INCLUDE_API_ASM(code_f4c60_len_4300, DisablePartner);
INCLUDE_ASM(code_f4c60_len_4300, ForceExitHeading); INCLUDE_API_ASM(code_f4c60_len_4300, ForceExitHeading);
INCLUDE_ASM(code_f4c60_len_4300, UseExitHeading); INCLUDE_API_ASM(code_f4c60_len_4300, UseExitHeading);
INCLUDE_ASM(code_f4c60_len_4300, func_802D23F8); INCLUDE_ASM(code_f4c60_len_4300, func_802D23F8);
INCLUDE_ASM(code_f4c60_len_4300, DisablePulseStone); INCLUDE_API_ASM(code_f4c60_len_4300, DisablePulseStone);
INCLUDE_ASM(code_f4c60_len_4300, GetCurrentPartner); INCLUDE_API_ASM(code_f4c60_len_4300, GetCurrentPartner);
INCLUDE_ASM(code_f4c60_len_4300, Disable8bitMario); INCLUDE_API_ASM(code_f4c60_len_4300, Disable8bitMario);
INCLUDE_ASM(code_f4c60_len_4300, PlaySoundAtPlayer); INCLUDE_API_ASM(code_f4c60_len_4300, PlaySoundAtPlayer);
INCLUDE_ASM(code_f4c60_len_4300, func_802D2D30); INCLUDE_ASM(code_f4c60_len_4300, func_802D2D30);
INCLUDE_ASM(code_f4c60_len_4300, func_802D2F34); INCLUDE_ASM(code_f4c60_len_4300, func_802D2F34);
INCLUDE_ASM(code_f4c60_len_4300, CreateImageObj); INCLUDE_API_ASM(code_f4c60_len_4300, CreateImageObj);
INCLUDE_ASM(code_f4c60_len_4300, RemoveImageObj); INCLUDE_API_ASM(code_f4c60_len_4300, RemoveImageObj);
INCLUDE_ASM(code_f4c60_len_4300, SetObjPosition); INCLUDE_API_ASM(code_f4c60_len_4300, SetObjPosition);
INCLUDE_ASM(code_f4c60_len_4300, SetObjRotation); INCLUDE_API_ASM(code_f4c60_len_4300, SetObjRotation);
INCLUDE_ASM(code_f4c60_len_4300, SetObjScale); INCLUDE_API_ASM(code_f4c60_len_4300, SetObjScale);
INCLUDE_ASM(code_f4c60_len_4300, SetObjJumpScale); INCLUDE_API_ASM(code_f4c60_len_4300, SetObjJumpScale);
INCLUDE_ASM(code_f4c60_len_4300, JumpObj); INCLUDE_API_ASM(code_f4c60_len_4300, JumpObj);
INCLUDE_ASM(code_f4c60_len_4300, func_802D4164); INCLUDE_ASM(code_f4c60_len_4300, func_802D4164);

118
src/code_f8f60_len_1560.c
View File

@ -1,7 +1,7 @@
#include "common.h" #include "common.h"
s32 MakeLerp(ScriptInstance* script, s32 initialCall) { ApiStatus MakeLerp(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
script->varTable[0xC] = get_variable(script, *ptrReadPos++); // start script->varTable[0xC] = get_variable(script, *ptrReadPos++); // start
script->varTable[0xD] = get_variable(script, *ptrReadPos++); // end script->varTable[0xD] = get_variable(script, *ptrReadPos++); // end
@ -9,10 +9,10 @@ s32 MakeLerp(ScriptInstance* script, s32 initialCall) {
script->varTable[0xB] = get_variable(script, *ptrReadPos++); // easing type script->varTable[0xB] = get_variable(script, *ptrReadPos++); // easing type
script->varTable[0xE] = 0; // elapsed script->varTable[0xE] = 0; // elapsed
return 2; return ApiStatus_DONE2;
} }
s32 UpdateLerp(ScriptInstance* script, s32 initialCall) { ApiStatus UpdateLerp(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0x0] = (s32) update_lerp( script->varTable[0x0] = (s32) update_lerp(
script->varTable[0xB], script->varTable[0xB],
script->varTable[0xC], script->varTable[0xC],
@ -28,10 +28,10 @@ s32 UpdateLerp(ScriptInstance* script, s32 initialCall) {
} }
script->varTable[0xE]++; script->varTable[0xE]++;
return 2; return ApiStatus_DONE2;
} }
s32 RandInt(ScriptInstance* script, s32 initialCall) { ApiStatus RandInt(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 max = get_variable(script, *ptrReadPos++); s32 max = get_variable(script, *ptrReadPos++);
@ -39,10 +39,10 @@ s32 RandInt(ScriptInstance* script, s32 initialCall) {
set_variable(script, outVar, rand_int(max)); set_variable(script, outVar, rand_int(max));
return 2; return ApiStatus_DONE2;
} }
s32 GetAngleBetweenNPCs(ScriptInstance* script, s32 initialCall) { ApiStatus GetAngleBetweenNPCs(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
NpcId aID = get_variable(script, *ptrReadPos++); NpcId aID = get_variable(script, *ptrReadPos++);
@ -53,10 +53,10 @@ s32 GetAngleBetweenNPCs(ScriptInstance* script, s32 initialCall) {
Npc* b = resolve_npc(script, bID); Npc* b = resolve_npc(script, bID);
set_variable(script, outVar, atan2(a->pos.x, a->pos.z, b->pos.x, b->pos.z)); set_variable(script, outVar, atan2(a->pos.x, a->pos.z, b->pos.x, b->pos.z));
return 2; return ApiStatus_DONE2;
} }
s32 GetAngleToNPC(ScriptInstance* script, s32 initialCall) { ApiStatus GetAngleToNPC(ScriptInstance* script, s32 isInitialCall) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
@ -66,10 +66,10 @@ s32 GetAngleToNPC(ScriptInstance* script, s32 initialCall) {
Npc* npc = resolve_npc(script, npcID); Npc* npc = resolve_npc(script, npcID);
set_variable(script, outVar, atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z)); set_variable(script, outVar, atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z));
return 2; return ApiStatus_DONE2;
} }
s32 GetAngleToPlayer(ScriptInstance* script, s32 initialCall) { ApiStatus GetAngleToPlayer(ScriptInstance* script, s32 isInitialCall) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
@ -79,10 +79,10 @@ s32 GetAngleToPlayer(ScriptInstance* script, s32 initialCall) {
Npc* npc = resolve_npc(script, npcID); Npc* npc = resolve_npc(script, npcID);
set_variable(script, outVar, atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z)); set_variable(script, outVar, atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z));
return 2; return ApiStatus_DONE2;
} }
s32 AwaitPlayerApproach(ScriptInstance* script, s32 initialCall) { ApiStatus AwaitPlayerApproach(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
@ -92,7 +92,7 @@ s32 AwaitPlayerApproach(ScriptInstance* script, s32 initialCall) {
f32 distance; f32 distance;
if (initialCall) { if (isInitialCall) {
*targetX = get_variable(script, *ptrReadPos++); *targetX = get_variable(script, *ptrReadPos++);
*targetZ = get_variable(script, *ptrReadPos++); *targetZ = get_variable(script, *ptrReadPos++);
*distanceRequired = get_variable(script, *ptrReadPos++); *distanceRequired = get_variable(script, *ptrReadPos++);
@ -104,13 +104,13 @@ s32 AwaitPlayerApproach(ScriptInstance* script, s32 initialCall) {
); );
if (distance < *distanceRequired) { if (distance < *distanceRequired) {
return 2; return ApiStatus_DONE2;
} else { } else {
return 0; return ApiStatus_BLOCK;
} }
} }
s32 IsPlayerWithin(ScriptInstance* script, s32 initialCall) { ApiStatus IsPlayerWithin(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
@ -121,7 +121,7 @@ s32 IsPlayerWithin(ScriptInstance* script, s32 initialCall) {
f32 distance; f32 distance;
Bytecode outVar = SI_VAR_0; Bytecode outVar = SI_VAR_0;
if (initialCall) { if (isInitialCall) {
*targetX = get_variable(script, *ptrReadPos++); *targetX = get_variable(script, *ptrReadPos++);
*targetZ = get_variable(script, *ptrReadPos++); *targetZ = get_variable(script, *ptrReadPos++);
*distanceRequired = get_variable(script, *ptrReadPos++); *distanceRequired = get_variable(script, *ptrReadPos++);
@ -138,10 +138,10 @@ s32 IsPlayerWithin(ScriptInstance* script, s32 initialCall) {
set_variable(script, outVar, 1); set_variable(script, outVar, 1);
} }
return 2; return ApiStatus_DONE2;
} }
s32 AwaitPlayerLeave(ScriptInstance* script, s32 initialCall) { ApiStatus AwaitPlayerLeave(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
@ -151,7 +151,7 @@ s32 AwaitPlayerLeave(ScriptInstance* script, s32 initialCall) {
f32 distance; f32 distance;
if (initialCall) { if (isInitialCall) {
*targetX = get_variable(script, *ptrReadPos++); *targetX = get_variable(script, *ptrReadPos++);
*targetZ = get_variable(script, *ptrReadPos++); *targetZ = get_variable(script, *ptrReadPos++);
*distanceRequired = get_variable(script, *ptrReadPos++); *distanceRequired = get_variable(script, *ptrReadPos++);
@ -163,13 +163,13 @@ s32 AwaitPlayerLeave(ScriptInstance* script, s32 initialCall) {
); );
if (distance > *distanceRequired) { if (distance > *distanceRequired) {
return 2; return ApiStatus_DONE2;
} else { } else {
return 0; return ApiStatus_BLOCK;
} }
} }
s32 AddVectorPolar(ScriptInstance* script, s32 initialCall) { ApiStatus AddVectorPolar(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
Bytecode xVar = *ptrReadPos++; Bytecode xVar = *ptrReadPos++;
@ -185,12 +185,12 @@ s32 AddVectorPolar(ScriptInstance* script, s32 initialCall) {
set_float_variable(script, xVar, x); set_float_variable(script, xVar, x);
set_float_variable(script, yVar, y); set_float_variable(script, yVar, y);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_f8f60_len_1560, func_802D4BDC); INCLUDE_API_ASM(code_f8f60_len_1560, func_802D4BDC);
/* /*
s32 func_802D4BDC(script_context* script, s32 initialCall) { ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) {
s32* t0 = &script->functionTemp[0]; s32* t0 = &script->functionTemp[0];
s32* t1 = &script->functionTemp[1]; s32* t1 = &script->functionTemp[1];
s32 t1v; s32 t1v;
@ -211,7 +211,7 @@ s32 func_802D4BDC(script_context* script, s32 initialCall) {
t1v = 0xFF; t1v = 0xFF;
func_80137DA4(0xA, (f32) *t1); func_80137DA4(0xA, (f32) *t1);
} else { } else {
return 2; return ApiStatus_DONE2;
} }
} }
@ -220,11 +220,11 @@ s32 func_802D4BDC(script_context* script, s32 initialCall) {
*/ */
// Very similar to func_802D4BDC // Very similar to func_802D4BDC
INCLUDE_ASM(code_f8f60_len_1560, func_802D4C4C); INCLUDE_API_ASM(code_f8f60_len_1560, func_802D4C4C);
INCLUDE_ASM(code_f8f60_len_1560, func_802D4CC4); INCLUDE_API_ASM(code_f8f60_len_1560, func_802D4CC4);
/* /*
s32 func_802D4CC4(script_context* script, s32 initialCall) { ApiStatus func_802D4CC4(ScriptInstance* script, s32 initialCall) {
s32 value = get_variable(script, *script->ptrReadPos); s32 value = get_variable(script, *script->ptrReadPos);
if (value < 0) { if (value < 0) {
func_80137DA4(0xFF, -1.0f); func_80137DA4(0xFF, -1.0f);
@ -232,34 +232,34 @@ s32 func_802D4CC4(script_context* script, s32 initialCall) {
func_80137DA4(0xA, value); func_80137DA4(0xA, value);
} }
return 2; return ApiStatus_DONE2;
} }
*/ */
s32 func_802D4D18(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D4D18(ScriptInstance* script, s32 initialCall) {
s32 value = get_float_variable(script, *script->ptrReadPos); s32 value = get_float_variable(script, *script->ptrReadPos);
func_80137E4C(0, 0, 0xC, 0x14); func_80137E4C(0, 0, 0xC, 0x14);
func_80137E4C(0, 1, 0x134, 0xDC); func_80137E4C(0, 1, 0x134, 0xDC);
func_80137D88(0xC, value); func_80137D88(0xC, value);
return 2; return ApiStatus_DONE2;
} }
s32 func_802D4D88(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D4D88(ScriptInstance* script, s32 initialCall) {
func_80137D88(0xC, 0); func_80137D88(0xC, 0);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_f8f60_len_1560, setup_path_data); INCLUDE_ASM(code_f8f60_len_1560, setup_path_data);
INCLUDE_ASM(code_f8f60_len_1560, func_802D5270); INCLUDE_ASM(code_f8f60_len_1560, func_802D5270);
INCLUDE_ASM(code_f8f60_len_1560, LoadPath); INCLUDE_API_ASM(code_f8f60_len_1560, LoadPath);
INCLUDE_ASM(code_f8f60_len_1560, GetNextPathPos); INCLUDE_API_ASM(code_f8f60_len_1560, GetNextPathPos);
s32 GetDist2D(ScriptInstance* script, s32 initialCall) { ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
Bytecode outVar = *ptrReadPos++; Bytecode outVar = *ptrReadPos++;
@ -270,15 +270,15 @@ s32 GetDist2D(ScriptInstance* script, s32 initialCall) {
get_float_variable(script, *ptrReadPos++) get_float_variable(script, *ptrReadPos++)
)); ));
return 2; return ApiStatus_DONE2;
} }
s32 func_802D5830(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D5830(ScriptInstance* script, s32 initialCall) {
func_80027088(get_variable(script, *script->ptrReadPos)); func_80027088(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 func_802D585C(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D585C(ScriptInstance* script, s32 initialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 setMode = get_variable(script, *ptrReadPos++); s32 setMode = get_variable(script, *ptrReadPos++);
s32 flags = get_variable(script, *ptrReadPos++); s32 flags = get_variable(script, *ptrReadPos++);
@ -291,20 +291,20 @@ s32 func_802D585C(ScriptInstance* script, s32 initialCall) {
D_8009A650[0] &= ~flags; D_8009A650[0] &= ~flags;
} }
return 2; return ApiStatus_DONE2;
} }
s32 SetValueByRef(ScriptInstance* script, s32 initialCall) { ApiStatus SetValueByRef(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 dest = get_variable(script, *ptrReadPos++); /* Reference */ s32 dest = get_variable(script, *ptrReadPos++); /* Reference */
s32 src = get_variable(script, *ptrReadPos++); s32 src = get_variable(script, *ptrReadPos++);
set_variable(script, dest, src); set_variable(script, dest, src);
return 2; return ApiStatus_DONE2;
} }
s32 GetValueByRef(ScriptInstance* script, s32 initialCall) { ApiStatus GetValueByRef(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 src = get_variable(script, *ptrReadPos++); /* Reference */ s32 src = get_variable(script, *ptrReadPos++); /* Reference */
@ -312,20 +312,20 @@ s32 GetValueByRef(ScriptInstance* script, s32 initialCall) {
set_variable(script, dest, get_variable(script, src)); set_variable(script, dest, get_variable(script, src));
return 2; return ApiStatus_DONE2;
} }
s32 EnableStatusMenu(ScriptInstance* script, s32 initialCall) { ApiStatus EnableStatusMenu(ScriptInstance* script, s32 isInitialCall) {
if (get_variable(script, *script->ptrReadPos) != 0) { if (get_variable(script, *script->ptrReadPos) != 0) {
decrement_status_menu_disabled(); decrement_status_menu_disabled();
} else { } else {
increment_status_menu_disabled(); increment_status_menu_disabled();
} }
return 2; return ApiStatus_DONE2;
} }
s32 ShowStatusMenu(ScriptInstance* script, s32 initialCall) { ApiStatus ShowStatusMenu(ScriptInstance* script, s32 isInitialCall) {
if (get_variable(script, *script->ptrReadPos) != 0) { if (get_variable(script, *script->ptrReadPos) != 0) {
status_menu_enable_ignore_changes(); status_menu_enable_ignore_changes();
func_800E97B8(); func_800E97B8();
@ -333,29 +333,29 @@ s32 ShowStatusMenu(ScriptInstance* script, s32 initialCall) {
status_menu_disable_ignore_changes(); status_menu_disable_ignore_changes();
} }
return 2; return ApiStatus_DONE2;
} }
s32 SetGameMode(ScriptInstance* script, s32 initialCall) { ApiStatus SetGameMode(ScriptInstance* script, s32 isInitialCall) {
set_game_mode( set_game_mode(
// Clear upper half // Clear upper half
(get_variable(script, *script->ptrReadPos) << 0x10) >> 0x10 (get_variable(script, *script->ptrReadPos) << 0x10) >> 0x10
); );
return 2; return ApiStatus_DONE2;
} }
s32 ClampAngleInt(ScriptInstance* script, s32 initialCall) { ApiStatus ClampAngleInt(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
set_variable(script, *ptrReadPos, clamp_angle(get_variable(script, *ptrReadPos))); set_variable(script, *ptrReadPos, clamp_angle(get_variable(script, *ptrReadPos)));
return 2; return ApiStatus_DONE2;
} }
s32 ClampAngleFloat(ScriptInstance* script, s32 initialCall) { ApiStatus ClampAngleFloat(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
set_float_variable(script, *ptrReadPos, clamp_angle(get_float_variable(script, *ptrReadPos))); set_float_variable(script, *ptrReadPos, clamp_angle(get_float_variable(script, *ptrReadPos)));
return 2; return ApiStatus_DONE2;
} }

212
src/code_fa4c0_len_3bf0.c
View File

@ -2,16 +2,16 @@
INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D5B10); INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D5B10);
s32 FadeOutMusic(ScriptInstance* script, s32 initialCall) { ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32* ptrNextPos = ptrReadPos++; s32* ptrNextPos = ptrReadPos++;
return (set_music_track(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * 2; return (set_music_track(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * 2;
} }
s32 SetMusicTrack(ScriptInstance* script, s32 initialCall) { ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 musicPlayer = get_variable(script, *ptrReadPos++); s32 musicPlayer = get_variable(script, *ptrReadPos++);
s32 songID = get_variable(script, *ptrReadPos++); s32 songID = get_variable(script, *ptrReadPos++);
s32 variation = get_variable(script, *ptrReadPos++); s32 variation = get_variable(script, *ptrReadPos++);
@ -20,34 +20,34 @@ s32 SetMusicTrack(ScriptInstance* script, s32 initialCall) {
return (set_music_track(musicPlayer, songID, variation, 0x1F4, volume) != 0) * 2; return (set_music_track(musicPlayer, songID, variation, 0x1F4, volume) != 0) * 2;
} }
INCLUDE_ASM(code_fa4c0_len_3bf0, FadeInMusic); INCLUDE_API_ASM(code_fa4c0_len_3bf0, FadeInMusic);
s32 PlayAmbientSounds(ScriptInstance* script, s32 initialCall) { ApiStatus PlayAmbientSounds(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 soundID = get_variable(script, *ptrReadPos++); s32 soundID = get_variable(script, *ptrReadPos++);
return (play_ambient_sounds(soundID, 0xFA) != 0) * 2; return (play_ambient_sounds(soundID, 0xFA) != 0) * 2;
} }
s32 PlaySound(ScriptInstance* script, s32 initialCall) { ApiStatus PlaySound(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 soundID = get_variable(script, *ptrReadPos++); s32 soundID = get_variable(script, *ptrReadPos++);
play_sound(soundID); play_sound(soundID);
return 2; return ApiStatus_DONE2;
} }
s32 func_802D617C(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D617C(ScriptInstance* script, s32 initialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 soundID = get_variable(script, *ptrReadPos++); s32 soundID = get_variable(script, *ptrReadPos++);
s32 value2 = get_variable(script, *ptrReadPos++); s32 value2 = get_variable(script, *ptrReadPos++);
_play_sound(soundID, value2 & 0xFF, 0, 0); _play_sound(soundID, value2 & 0xFF, 0, 0);
return 2; return ApiStatus_DONE2;
} }
s32 PlaySoundAt(ScriptInstance* script, s32 initialCall) { ApiStatus PlaySoundAt(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 soundID = get_variable(script, *ptrReadPos++); s32 soundID = get_variable(script, *ptrReadPos++);
s32 value2 = get_variable(script, *ptrReadPos++); s32 value2 = get_variable(script, *ptrReadPos++);
s32 x = get_variable(script, *ptrReadPos++); s32 x = get_variable(script, *ptrReadPos++);
@ -55,60 +55,60 @@ s32 PlaySoundAt(ScriptInstance* script, s32 initialCall) {
s32 z = get_variable(script, *ptrReadPos++); s32 z = get_variable(script, *ptrReadPos++);
play_sound_at_position(soundID, value2, x, y, z); play_sound_at_position(soundID, value2, x, y, z);
return 2; return ApiStatus_DONE2;
} }
s32 StopSound(ScriptInstance* script, s32 initialCall) { ApiStatus StopSound(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
stop_sound(get_variable(script, *ptrReadPos++)); stop_sound(get_variable(script, *ptrReadPos++));
return 2; return ApiStatus_DONE2;
} }
s32 func_802D62E4(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D62E4(ScriptInstance* script, s32 initialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
func_80149A6C(get_variable(script, *ptrReadPos++), 1); func_80149A6C(get_variable(script, *ptrReadPos++), 1);
return 2; return ApiStatus_DONE2;
} }
s32 UseDoorSounds(ScriptInstance* script, s32 initialCall) { ApiStatus UseDoorSounds(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
gCurrentDoorSoundsSet = get_variable(script, *ptrReadPos++); gCurrentDoorSoundsSet = get_variable(script, *ptrReadPos++);
return 2; return ApiStatus_DONE2;
} }
s32 func_802D6340(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D6340(ScriptInstance* script, s32 initialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
D_80151308 = get_variable(script, *ptrReadPos++); D_80151308 = get_variable(script, *ptrReadPos++);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_fa4c0_len_3bf0, PlaySoundAtF); INCLUDE_API_ASM(code_fa4c0_len_3bf0, PlaySoundAtF);
s32 RemoveKeyItemAt(ScriptInstance* script, s32 initialCall) { ApiStatus RemoveKeyItemAt(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 index = get_variable(script, *ptrReadPos++); s32 index = get_variable(script, *ptrReadPos++);
s16* ptrKeyItems = (s16 *) &gPlayerData.keyItems; s16* ptrKeyItems = (s16 *) &gPlayerData.keyItems;
ptrKeyItems[index] = 0; ptrKeyItems[index] = 0;
return 2; return ApiStatus_DONE2;
} }
s32 RemoveItemAt(ScriptInstance* script, s32 initialCall) { ApiStatus RemoveItemAt(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 index = get_variable(script, *ptrReadPos++); s32 index = get_variable(script, *ptrReadPos++);
s16* ptrInvItems = (s16 *) &gPlayerData.invItems; s16* ptrInvItems = (s16 *) &gPlayerData.invItems;
ptrInvItems[index] = 0; ptrInvItems[index] = 0;
sort_items(); sort_items();
return 2; return ApiStatus_DONE2;
} }
s32 AddKeyItem(ScriptInstance* script, s32 initialCall) { ApiStatus AddKeyItem(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 value = *ptrReadPos++; s32 value = *ptrReadPos++;
PlayerData* playerData = &gPlayerData; PlayerData* playerData = &gPlayerData;
s32 itemID = get_variable(script, value); s32 itemID = get_variable(script, value);
@ -116,7 +116,7 @@ s32 AddKeyItem(ScriptInstance* script, s32 initialCall) {
if (itemID == ItemId_FORTRESS_KEY) { if (itemID == ItemId_FORTRESS_KEY) {
playerData->fortressKeyCount++; playerData->fortressKeyCount++;
return 2; return ApiStatus_DONE2;
} }
for (i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) { for (i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) {
@ -128,19 +128,19 @@ s32 AddKeyItem(ScriptInstance* script, s32 initialCall) {
if (i < ARRAY_COUNT(playerData->keyItems)) { if (i < ARRAY_COUNT(playerData->keyItems)) {
playerData->keyItems[i] = itemID; playerData->keyItems[i] = itemID;
} }
return 2; return ApiStatus_DONE2;
} }
s32 func_802D6954(void) { ApiStatus func_802D6954(ScriptInstance* script, s32 isInitialCall) {
func_800E01A4(); func_800E01A4();
disable_player_physics(); disable_player_physics();
func_800EF600(); func_800EF600();
D_8009A650[0] &= ~0x40; D_8009A650[0] &= ~0x40;
return 2; return ApiStatus_DONE2;
} }
s32 HasKeyItem(ScriptInstance* script, s32 initialCall) { ApiStatus HasKeyItem(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32 value = *ptrReadPos++; s32 value = *ptrReadPos++;
PlayerData* playerData = &gPlayerData; PlayerData* playerData = &gPlayerData;
@ -152,11 +152,11 @@ s32 HasKeyItem(ScriptInstance* script, s32 initialCall) {
} }
} }
set_variable(script, value, i < ARRAY_COUNT(playerData->keyItems)); set_variable(script, value, i < ARRAY_COUNT(playerData->keyItems));
return 2; return ApiStatus_DONE2;
} }
s32 FindKeyItem(ScriptInstance* script, s32 initialCall) { ApiStatus FindKeyItem(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32 value = *ptrReadPos++; s32 value = *ptrReadPos++;
PlayerData* playerData = &gPlayerData; PlayerData* playerData = &gPlayerData;
@ -175,25 +175,25 @@ s32 FindKeyItem(ScriptInstance* script, s32 initialCall) {
} }
set_variable(script, value, itemIndex); set_variable(script, value, itemIndex);
return 2; return ApiStatus_DONE2;
} }
s32 AddItem(ScriptInstance* script, s32 initialCall) { ApiStatus AddItem(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32* ptrNextPos = (s32 *) *ptrReadPos++; s32* ptrNextPos = (s32 *) *ptrReadPos++;
set_variable(script, ptrNextPos, add_item(itemID)); set_variable(script, ptrNextPos, add_item(itemID));
return 2; return ApiStatus_DONE2;
} }
s32 func_802D6AF0(ScriptInstance* script, s32 initialCall) { ApiStatus func_802D6AF0(ScriptInstance* script, s32 initialCall) {
set_variable(script, *script->ptrReadPos, 0); set_variable(script, *script->ptrReadPos, 0);
return 2; return ApiStatus_DONE2;
} }
s32 FindItem(ScriptInstance* script, s32 initialCall) { ApiStatus FindItem(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32 value = *ptrReadPos++; s32 value = *ptrReadPos++;
PlayerData* playerData = &gPlayerData; PlayerData* playerData = &gPlayerData;
@ -212,11 +212,11 @@ s32 FindItem(ScriptInstance* script, s32 initialCall) {
} }
set_variable(script, value, itemIndex); set_variable(script, value, itemIndex);
return 2; return ApiStatus_DONE2;
} }
s32 RemoveItem(ScriptInstance* script, s32 initialCall) { ApiStatus RemoveItem(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32 value = *ptrReadPos++; s32 value = *ptrReadPos++;
PlayerData* playerData = &gPlayerData; PlayerData* playerData = &gPlayerData;
@ -242,32 +242,32 @@ s32 RemoveItem(ScriptInstance* script, s32 initialCall) {
sort_items(); sort_items();
set_variable(script, value, itemIndex); set_variable(script, value, itemIndex);
return 2; return ApiStatus_DONE2;
} }
s32 CountFortressKeys(ScriptInstance* script, s32 initialCall) { ApiStatus CountFortressKeys(ScriptInstance* script, s32 isInitialCall) {
s32 outVar = *script->ptrReadPos; s32 outVar = *script->ptrReadPos;
set_variable(script, outVar, get_fortress_key_count()); set_variable(script, outVar, get_fortress_key_count());
return 2; return ApiStatus_DONE2;
} }
s32 RemoveFortressKeys(ScriptInstance* script, s32 initialCall) { ApiStatus RemoveFortressKeys(ScriptInstance* script, s32 isInitialCall) {
s32 num = get_variable(script, *script->ptrReadPos); s32 num = get_variable(script, *script->ptrReadPos);
subtract_fortress_keys(num); subtract_fortress_keys(num);
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_fa4c0_len_3bf0, MakeItemEntity); INCLUDE_API_ASM(code_fa4c0_len_3bf0, MakeItemEntity);
INCLUDE_ASM(code_fa4c0_len_3bf0, DropItemEntity); INCLUDE_API_ASM(code_fa4c0_len_3bf0, DropItemEntity);
INCLUDE_ASM(code_fa4c0_len_3bf0, DropItemEntityB); INCLUDE_API_ASM(code_fa4c0_len_3bf0, DropItemEntityB);
/* /*
// Close to working // Close to working
s32 DropItemEntityB(script_context* script, s32 initialCall) { ApiStatus DropItemEntityB(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32 x = get_variable(script, *ptrReadPos++); s32 x = get_variable(script, *ptrReadPos++);
s32 y = get_variable(script, *ptrReadPos++); s32 y = get_variable(script, *ptrReadPos++);
@ -277,31 +277,31 @@ s32 DropItemEntityB(script_context* script, s32 initialCall) {
script->varTable[0] = make_item_entity_nodelay(itemID, x, y, z); script->varTable[0] = make_item_entity_nodelay(itemID, x, y, z);
set_item_entity_flags(script, 0x4000); set_item_entity_flags(script, 0x4000);
return 2; return ApiStatus_DONE2;
} }
*/ */
s32 RemoveItemEntity(ScriptInstance* script, s32 initialCall) { ApiStatus RemoveItemEntity(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemEntityIndex = get_variable(script, *ptrReadPos++); s32 itemEntityIndex = get_variable(script, *ptrReadPos++);
remove_item_entity_by_index(itemEntityIndex); remove_item_entity_by_index(itemEntityIndex);
return 2; return ApiStatus_DONE2;
} }
s32 AddBadge(ScriptInstance* script, s32 initialCall) { ApiStatus AddBadge(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32* ptrNextPos = (s32 *) *ptrReadPos++; s32* ptrNextPos = (s32 *) *ptrReadPos++;
set_variable(script, ptrNextPos, add_badge(itemID)); set_variable(script, ptrNextPos, add_badge(itemID));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_fa4c0_len_3bf0, RemoveBadge); INCLUDE_API_ASM(code_fa4c0_len_3bf0, RemoveBadge);
s32 SetItemPos(ScriptInstance* script, s32 initialCall) { ApiStatus SetItemPos(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
ItemEntity* ptrItemEntity; ItemEntity* ptrItemEntity;
s32 itemEntityIndex; s32 itemEntityIndex;
s32 x, y, z; s32 x, y, z;
@ -315,31 +315,31 @@ s32 SetItemPos(ScriptInstance* script, s32 initialCall) {
ptrItemEntity->position.x = x; ptrItemEntity->position.x = x;
ptrItemEntity->position.y = y; ptrItemEntity->position.y = y;
ptrItemEntity->position.z = z; ptrItemEntity->position.z = z;
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_fa4c0_len_3bf0, SetItemFlags); INCLUDE_API_ASM(code_fa4c0_len_3bf0, SetItemFlags);
s32 AddCoin(ScriptInstance* script, s32 initialCall) { ApiStatus AddCoin(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = add_coins(get_variable(script, *script->ptrReadPos)); script->varTable[0] = add_coins(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 AddStarPoints(ScriptInstance* script, s32 initialCall) { ApiStatus AddStarPoints(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = add_star_points(get_variable(script, *script->ptrReadPos)); script->varTable[0] = add_star_points(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
s32 AddStarPieces(ScriptInstance* script, s32 initialCall) { ApiStatus AddStarPieces(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = add_star_pieces(get_variable(script, *script->ptrReadPos)); script->varTable[0] = add_star_pieces(get_variable(script, *script->ptrReadPos));
return 2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(code_fa4c0_len_3bf0, GetItemPower); INCLUDE_API_ASM(code_fa4c0_len_3bf0, GetItemPower);
/* /*
// Close to working // Close to working
s32 GetItemPower(script_context* script, s32 initialCall) { ApiStatus GetItemPower(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32 itemID = get_variable(script, *ptrReadPos++); s32 itemID = get_variable(script, *ptrReadPos++);
s32* ptrNextPos = ptrReadPos++; s32* ptrNextPos = ptrReadPos++;
item_table_entry* item = &gItemTable[itemID]; item_table_entry* item = &gItemTable[itemID];
@ -347,60 +347,60 @@ s32 GetItemPower(script_context* script, s32 initialCall) {
set_variable(script, ptrNextPos++, item->potencyA); set_variable(script, ptrNextPos++, item->potencyA);
set_variable(script, ptrNextPos++, item->potencyB); set_variable(script, ptrNextPos++, item->potencyB);
return 2; return ApiStatus_DONE2;
} }
*/ */
INCLUDE_ASM(code_fa4c0_len_3bf0, ShowGotItem); INCLUDE_API_ASM(code_fa4c0_len_3bf0, ShowGotItem);
INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D7460); INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D7460);
INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D74C0); INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D74C0);
INCLUDE_ASM(code_fa4c0_len_3bf0, ShowEmote); INCLUDE_API_ASM(code_fa4c0_len_3bf0, ShowEmote);
INCLUDE_ASM(code_fa4c0_len_3bf0, RemoveEffect); INCLUDE_API_ASM(code_fa4c0_len_3bf0, RemoveEffect);
/* /*
// Works // Works
s32 RemoveEffect(script_context* script, s32 initialCall) { ApiStatus RemoveEffect(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
remove_effect(get_variable(script, *ptrReadPos++)); remove_effect(get_variable(script, *ptrReadPos++));
return 2; return ApiStatus_DONE2;
} }
// Works // Works
s32 func_802D7B10(script_context* script, s32 initialCall) { ApiStatus func_802D7B10(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32* ptrValue = get_variable(script, *ptrReadPos++); s32* ptrValue = get_variable(script, *ptrReadPos++);
*ptrValue |= 0x10; *ptrValue |= 0x10;
return 2; return ApiStatus_DONE2;
} }
// Works // Works
s32 func_802D7B44(script_context* script, s32 initialCall) { ApiStatus func_802D7B44(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32* ptrValue = get_variable(script, *ptrReadPos++); s32* ptrValue = get_variable(script, *ptrReadPos++);
s32* ptrTemp = ptrValue[3]; s32* ptrTemp = ptrValue[3];
ptrTemp[5] = 10; ptrTemp[5] = 10;
return 2; return ApiStatus_DONE2;
} }
// Works // Works
s32 func_802D7B74(script_context* script, s32 initialCall) { ApiStatus func_802D7B74(ScriptInstance* script, s32 isInitialCall) {
s32* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
s32* ptrValue = get_variable(script, *ptrReadPos++); s32* ptrValue = get_variable(script, *ptrReadPos++);
s32* ptrTemp = ptrValue[3]; s32* ptrTemp = ptrValue[3];
ptrTemp[11] = 5; ptrTemp[11] = 5;
return 2; return ApiStatus_DONE2;
} }
// More functions still in RemoveEffect.s but the ones above are matching properly // More functions still in RemoveEffect.s but the ones above are matching properly
*/ */
INCLUDE_ASM(code_fa4c0_len_3bf0, ShowSleepBubble); INCLUDE_API_ASM(code_fa4c0_len_3bf0, ShowSleepBubble);
INCLUDE_ASM(code_fa4c0_len_3bf0, PlayEffect); INCLUDE_API_ASM(code_fa4c0_len_3bf0, PlayEffect);

28
src/code_fe0b0_len_5a0.c
View File

@ -1,37 +1,37 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(code_fe0b0_len_5a0, SetSpriteShading); INCLUDE_API_ASM(code_fe0b0_len_5a0, SetSpriteShading);
s32 EnableSpriteShading(ScriptInstance* script) { ApiStatus EnableSpriteShading(ScriptInstance* script, s32 isInitialCall) {
if (get_variable(script, *script->ptrReadPos) != 0) { if (get_variable(script, *script->ptrReadPos) != 0) {
*D_80151328 |= 1; *D_80151328 |= 1;
} else { } else {
*D_80151328 &= ~1; *D_80151328 &= ~1;
} }
return 2; return ApiStatus_DONE2;
} }
s32 getDemoState(ScriptInstance* script) { s32 getDemoState(ScriptInstance* script) {
set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->demoState); set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->demoState);
return 2; return ApiStatus_DONE2;
} }
s32 DemoPressButton(ScriptInstance* script) { ApiStatus DemoPressButton(ScriptInstance* script, s32 isInitialCall) {
(*gGameStatusPtr)->demoButtonInput |= get_variable(script, *script->ptrReadPos); (*gGameStatusPtr)->demoButtonInput |= get_variable(script, *script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
s32 DemoReleaseButton(ScriptInstance* script) { ApiStatus DemoReleaseButton(ScriptInstance* script, s32 isInitialCall) {
(*gGameStatusPtr)->demoButtonInput &= ~get_variable(script, *script->ptrReadPos); (*gGameStatusPtr)->demoButtonInput &= ~get_variable(script, *script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
s32 DemoSetButtons(ScriptInstance* script) { ApiStatus DemoSetButtons(ScriptInstance* script, s32 isInitialCall) {
(*gGameStatusPtr)->demoButtonInput = get_variable(script, *script->ptrReadPos); (*gGameStatusPtr)->demoButtonInput = get_variable(script, *script->ptrReadPos);
return 2; return ApiStatus_DONE2;
} }
s32 DemoJoystickRadial(ScriptInstance* script) { ApiStatus DemoJoystickRadial(ScriptInstance* script, s32 isInitialCall) {
f32 a; f32 a;
f32 b; f32 b;
s32* thisPos = script->ptrReadPos; s32* thisPos = script->ptrReadPos;
@ -42,10 +42,10 @@ s32 DemoJoystickRadial(ScriptInstance* script) {
(*gGameStatusPtr)->demoStickX = a * sin_deg(b); (*gGameStatusPtr)->demoStickX = a * sin_deg(b);
(*gGameStatusPtr)->demoStickY = a * cos_deg(b); (*gGameStatusPtr)->demoStickY = a * cos_deg(b);
return 2; return ApiStatus_DONE2;
} }
s32 DemoJoystickXY(ScriptInstance* script) { ApiStatus DemoJoystickXY(ScriptInstance* script, s32 isInitialCall) {
f32 x; f32 x;
f32 y; f32 y;
s32* thisPos = script->ptrReadPos; s32* thisPos = script->ptrReadPos;
@ -56,5 +56,5 @@ s32 DemoJoystickXY(ScriptInstance* script) {
(*gGameStatusPtr)->demoStickX = x; (*gGameStatusPtr)->demoStickX = x;
(*gGameStatusPtr)->demoStickY = y; (*gGameStatusPtr)->demoStickY = y;
return 2; return ApiStatus_DONE2;
} }

2
src/os/code_39cb0_len_100.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_39cb0_len_100, nuBoot); INCLUDE_API_ASM(os/code_39cb0_len_100, nuBoot);
INCLUDE_ASM(os/code_39cb0_len_100, boot_idle); INCLUDE_ASM(os/code_39cb0_len_100, boot_idle);

26
src/os/code_39db0_len_8a0.c
View File

@ -1,27 +1,27 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_39db0_len_8a0, nuScCreateScheduler); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScCreateScheduler);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScExecuteAudio); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScExecuteAudio);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScExecuteGraphics); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScExecuteGraphics);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScAddClient); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScAddClient);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScRemoveClient); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScRemoveClient);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScResetClientMesgType); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScResetClientMesgType);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScGetGfxMQ); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScGetGfxMQ);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScGetAudioMQ); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScGetAudioMQ);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScSetFrameBufferNum); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScSetFrameBufferNum);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScGetFrameRate); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScGetFrameRate);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScEventHandler); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScEventHandler);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScEventBroadcast); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScEventBroadcast);
INCLUDE_ASM(os/code_39db0_len_8a0, nuScWaitTaskReady); INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScWaitTaskReady);

2
src/os/code_3a650_len_40.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3a650_len_40, nuGfxFuncSet); INCLUDE_API_ASM(os/code_3a650_len_40, nuGfxFuncSet);

2
src/os/code_3a690_len_40.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3a690_len_40, nuGfxPreNMIFuncSet); INCLUDE_API_ASM(os/code_3a690_len_40, nuGfxPreNMIFuncSet);

2
src/os/code_3a6d0_len_20.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3a6d0_len_20, nuGfxTaskAllEndWait); INCLUDE_API_ASM(os/code_3a6d0_len_20, nuGfxTaskAllEndWait);

2
src/os/code_3a6f0_len_110.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3a6f0_len_110, nuGfxSetCfb); INCLUDE_API_ASM(os/code_3a6f0_len_110, nuGfxSetCfb);

2
src/os/code_3a800_len_30.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3a800_len_30, nuGfxDisplayOff); INCLUDE_API_ASM(os/code_3a800_len_30, nuGfxDisplayOff);

2
src/os/code_3a830_len_20.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3a830_len_20, nuGfxDisplayOn); INCLUDE_API_ASM(os/code_3a830_len_20, nuGfxDisplayOn);

40
src/os/code_3a850_le_a40.c
View File

@ -1,44 +1,44 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3a850_le_a40, nuPiInit); INCLUDE_API_ASM(os/code_3a850_le_a40, nuPiInit);
INCLUDE_ASM(os/code_3a850_le_a40, nuPiReadRom); INCLUDE_API_ASM(os/code_3a850_le_a40, nuPiReadRom);
INCLUDE_ASM(os/code_3a850_le_a40, nuGfxInit); INCLUDE_API_ASM(os/code_3a850_le_a40, nuGfxInit);
INCLUDE_ASM(os/code_3a850_le_a40, nuContInit); INCLUDE_API_ASM(os/code_3a850_le_a40, nuContInit);
INCLUDE_ASM(os/code_3a850_le_a40, nuContDataGet); INCLUDE_API_ASM(os/code_3a850_le_a40, nuContDataGet);
INCLUDE_ASM(os/code_3a850_le_a40, nuContPakMgrInit); INCLUDE_API_ASM(os/code_3a850_le_a40, nuContPakMgrInit);
INCLUDE_ASM(os/code_3a850_le_a40, nuContPakMgrRemove); INCLUDE_API_ASM(os/code_3a850_le_a40, nuContPakMgrRemove);
INCLUDE_ASM(os/code_3a850_le_a40, contPakOpen); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakOpen);
INCLUDE_ASM(os/code_3a850_le_a40, contPakFree); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFree);
INCLUDE_ASM(os/code_3a850_le_a40, contPakFileReadWrite); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileReadWrite);
INCLUDE_ASM(os/code_3a850_le_a40, contPakFileOpen); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileOpen);
INCLUDE_ASM(os/code_3a850_le_a40, contPakFileDelete); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileDelete);
INCLUDE_ASM(os/code_3a850_le_a40, contPakFileState); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileState);
INCLUDE_ASM(os/code_3a850_le_a40, contPakFileNum); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileNum);
INCLUDE_ASM(os/code_3a850_le_a40, contPakRepairId); INCLUDE_API_ASM(os/code_3a850_le_a40, contPakRepairId);
#undef osMotorStop #undef osMotorStop
s32 INCLUDE_ASM(os/code_3a850_le_a40, osMotorStop, OSPfs* unk); s32 INCLUDE_ASM(os/code_3a850_le_a40, osMotorStop, OSPfs* unk);
INCLUDE_ASM(os/code_3a850_le_a40, contRmbControl); INCLUDE_API_ASM(os/code_3a850_le_a40, contRmbControl);
INCLUDE_ASM(os/code_3a850_le_a40, nuContRmbMgrInit); INCLUDE_API_ASM(os/code_3a850_le_a40, nuContRmbMgrInit);
INCLUDE_ASM(os/code_3a850_le_a40, nuContRmbMgrRemove); INCLUDE_API_ASM(os/code_3a850_le_a40, nuContRmbMgrRemove);
INCLUDE_ASM(os/code_3a850_le_a40, contRmbCheckMesg); INCLUDE_API_ASM(os/code_3a850_le_a40, contRmbCheckMesg);
INCLUDE_ASM(os/code_3a850_le_a40, contRmbStartMesg); INCLUDE_API_ASM(os/code_3a850_le_a40, contRmbStartMesg);

4
src/os/code_3b290_len_100.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3b290_len_100, nuContRmbStart); INCLUDE_API_ASM(os/code_3b290_len_100, nuContRmbStart);
INCLUDE_ASM(os/code_3b290_len_100, nuContRmbCheck); INCLUDE_API_ASM(os/code_3b290_len_100, nuContRmbCheck);

2
src/os/code_3b390_len_110.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3b390_len_110, nuContRmbModeSet); INCLUDE_API_ASM(os/code_3b390_len_110, nuContRmbModeSet);

10
src/os/code_3b4a0_len_270.c
View File

@ -1,11 +1,11 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3b4a0_len_270, nuContRmbForceStop); INCLUDE_API_ASM(os/code_3b4a0_len_270, nuContRmbForceStop);
INCLUDE_ASM(os/code_3b4a0_len_270, nuContRmbForceStopEnd); INCLUDE_API_ASM(os/code_3b4a0_len_270, nuContRmbForceStopEnd);
INCLUDE_ASM(os/code_3b4a0_len_270, nuPiReadRomOverlay); INCLUDE_API_ASM(os/code_3b4a0_len_270, nuPiReadRomOverlay);
INCLUDE_ASM(os/code_3b4a0_len_270, nuGfxThreadStart); INCLUDE_API_ASM(os/code_3b4a0_len_270, nuGfxThreadStart);
INCLUDE_ASM(os/code_3b4a0_len_270, nuGfxThread); INCLUDE_API_ASM(os/code_3b4a0_len_270, nuGfxThread);

2
src/os/code_3b710_len_40.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3b710_len_40, nuGfxSwapCfbFuncSet); INCLUDE_API_ASM(os/code_3b710_len_40, nuGfxSwapCfbFuncSet);

2
src/os/code_3b770_len_80.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3b770_len_80, nuGfxRetraceWait); INCLUDE_API_ASM(os/code_3b770_len_80, nuGfxRetraceWait);

4
src/os/code_3b7f0_len_120.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3b7f0_len_120, nuSiCallBackAdd); INCLUDE_API_ASM(os/code_3b7f0_len_120, nuSiCallBackAdd);
INCLUDE_ASM(os/code_3b7f0_len_120, nuSiCallBackRemove); INCLUDE_API_ASM(os/code_3b7f0_len_120, nuSiCallBackRemove);

20
src/os/code_3b910_len_410.c
View File

@ -1,21 +1,21 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3b910_len_410, nuContMgrInit); INCLUDE_API_ASM(os/code_3b910_len_410, nuContMgrInit);
INCLUDE_ASM(os/code_3b910_len_410, nuContMgrRemove); INCLUDE_API_ASM(os/code_3b910_len_410, nuContMgrRemove);
INCLUDE_ASM(os/code_3b910_len_410, nuContDataClose); INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataClose);
INCLUDE_ASM(os/code_3b910_len_410, nuContDataOpen); INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataOpen);
INCLUDE_ASM(os/code_3b910_len_410, contRetrace); INCLUDE_API_ASM(os/code_3b910_len_410, contRetrace);
INCLUDE_ASM(os/code_3b910_len_410, contReadData); INCLUDE_API_ASM(os/code_3b910_len_410, contReadData);
INCLUDE_ASM(os/code_3b910_len_410, contReadNW); INCLUDE_API_ASM(os/code_3b910_len_410, contReadNW);
INCLUDE_ASM(os/code_3b910_len_410, contQuery); INCLUDE_API_ASM(os/code_3b910_len_410, contQuery);
INCLUDE_ASM(os/code_3b910_len_410, nuContDataLock); INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataLock);
INCLUDE_ASM(os/code_3b910_len_410, nuContDataUnLock); INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataUnLock);

2
src/os/code_3bd20_len_c0.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3bd20_len_c0, nuContQueryRead); INCLUDE_API_ASM(os/code_3bd20_len_c0, nuContQueryRead);
OSIntMask INCLUDE_ASM(os/code_3bd20_len_c0, osSetIntMask, OSIntMask mask); OSIntMask INCLUDE_ASM(os/code_3bd20_len_c0, osSetIntMask, OSIntMask mask);

2
src/os/code_3bde0_len_3e0.c
View File

@ -2,6 +2,6 @@
void INCLUDE_ASM(os/code_3bde0_len_3e0, osCreatePiManager, OSPri prio, OSMesgQueue* queue, OSMesg* mesg, s32 unk); void INCLUDE_ASM(os/code_3bde0_len_3e0, osCreatePiManager, OSPri prio, OSMesgQueue* queue, OSMesg* mesg, s32 unk);
INCLUDE_ASM(os/code_3bde0_len_3e0, osEPiRawStartDma); INCLUDE_API_ASM(os/code_3bde0_len_3e0, osEPiRawStartDma);
s32 INCLUDE_ASM(os/code_3bde0_len_3e0, osEPiWriteIo, OSPiHandle* handle, u32 unk1, u32 unk2); s32 INCLUDE_ASM(os/code_3bde0_len_3e0, osEPiWriteIo, OSPiHandle* handle, u32 unk1, u32 unk2);

2
src/os/code_3c490_len_3c0.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3c490_len_3c0, osDevMgrMain); INCLUDE_API_ASM(os/code_3c490_len_3c0, osDevMgrMain);

6
src/os/code_3c850_len_f0.c
View File

@ -1,7 +1,7 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3c850_len_f0, osPiCreateAccessQueue); INCLUDE_API_ASM(os/code_3c850_len_f0, osPiCreateAccessQueue);
INCLUDE_ASM(os/code_3c850_len_f0, osPiGetAccess); INCLUDE_API_ASM(os/code_3c850_len_f0, osPiGetAccess);
INCLUDE_ASM(os/code_3c850_len_f0, osPiRelAccess); INCLUDE_API_ASM(os/code_3c850_len_f0, osPiRelAccess);

6
src/os/code_3cd00_len_5f0.c
View File

@ -8,12 +8,12 @@ s32 INCLUDE_ASM(os/code_3cd00_len_5f0, osContStartReadData, OSMesgQueue* queue);
void INCLUDE_ASM(os/code_3cd00_len_5f0, osContGetReadData, OSContPad* pad); void INCLUDE_ASM(os/code_3cd00_len_5f0, osContGetReadData, OSContPad* pad);
INCLUDE_ASM(os/code_3cd00_len_5f0, osPackReadData); INCLUDE_API_ASM(os/code_3cd00_len_5f0, osPackReadData);
s32 INCLUDE_ASM(os/code_3cd00_len_5f0, osContInit, OSMesgQueue* queue, u8* unk, OSContStatus* status); s32 INCLUDE_ASM(os/code_3cd00_len_5f0, osContInit, OSMesgQueue* queue, u8* unk, OSContStatus* status);
INCLUDE_ASM(os/code_3cd00_len_5f0, osContGetInitData); INCLUDE_API_ASM(os/code_3cd00_len_5f0, osContGetInitData);
INCLUDE_ASM(os/code_3cd00_len_5f0, osPackRequestData); INCLUDE_API_ASM(os/code_3cd00_len_5f0, osPackRequestData);
u32 INCLUDE_ASM(os/code_3cd00_len_5f0, osVirtualToPhysical, void* virt); u32 INCLUDE_ASM(os/code_3cd00_len_5f0, osVirtualToPhysical, void* virt);

2
src/os/code_3d2f0_len_10.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3d2f0_len_10, sqrtf); INCLUDE_API_ASM(os/code_3d2f0_len_10, sqrtf);

4
src/os/code_3f6d0_len_320.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_3f6d0_len_320, guRotateAnglesF); INCLUDE_API_ASM(os/code_3f6d0_len_320, guRotateAnglesF);
INCLUDE_ASM(os/code_3f6d0_len_320, guRotateAngles); INCLUDE_API_ASM(os/code_3f6d0_len_320, guRotateAngles);

8
src/os/code_3fa50_len_f60.c
View File

@ -4,11 +4,11 @@ void INCLUDE_ASM(os/code_3fa50_len_f60, bcopy, const void* src, void* dst, int s
void INCLUDE_ASM(os/code_3fa50_len_f60, bzero, void* buf, int size); void INCLUDE_ASM(os/code_3fa50_len_f60, bzero, void* buf, int size);
INCLUDE_ASM(os/code_3fa50_len_f60, strchr); INCLUDE_API_ASM(os/code_3fa50_len_f60, strchr);
INCLUDE_ASM(os/code_3fa50_len_f60, strlen); INCLUDE_API_ASM(os/code_3fa50_len_f60, strlen);
INCLUDE_ASM(os/code_3fa50_len_f60, memcpy); INCLUDE_API_ASM(os/code_3fa50_len_f60, memcpy);
INCLUDE_ASM(os/code_3fa50_len_f60, _Printf); INCLUDE_ASM(os/code_3fa50_len_f60, _Printf);
@ -16,6 +16,6 @@ INCLUDE_ASM(os/code_3fa50_len_f60, _Putfld);
int INCLUDE_ASM(os/code_3fa50_len_f60, sprintf, char* s, const char* fmt, ...); int INCLUDE_ASM(os/code_3fa50_len_f60, sprintf, char* s, const char* fmt, ...);
INCLUDE_ASM(os/code_3fa50_len_f60, proutSprintf); INCLUDE_API_ASM(os/code_3fa50_len_f60, proutSprintf);
void INCLUDE_ASM(os/code_3fa50_len_f60, osCreateMesgQueue, OSMesgQueue* queue, OSMesg* mesg, s32 unk); void INCLUDE_ASM(os/code_3fa50_len_f60, osCreateMesgQueue, OSMesgQueue* queue, OSMesg* mesg, s32 unk);

2
src/os/code_41050_len_120.c
View File

@ -4,4 +4,4 @@ void INCLUDE_ASM(os/code_41050_len_120, osSpTaskYield, void);
OSYieldResult INCLUDE_ASM(os/code_41050_len_120, osSpTaskYielded, OSTask* tp); OSYieldResult INCLUDE_ASM(os/code_41050_len_120, osSpTaskYielded, OSTask* tp);
INCLUDE_ASM(os/code_41050_len_120, osSiRawStartDma); INCLUDE_API_ASM(os/code_41050_len_120, osSiRawStartDma);

6
src/os/code_41170_len_f0.c
View File

@ -1,7 +1,7 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_41170_len_f0, osSiCreateAccessQueue); INCLUDE_API_ASM(os/code_41170_len_f0, osSiCreateAccessQueue);
INCLUDE_ASM(os/code_41170_len_f0, osSiGetAccess); INCLUDE_API_ASM(os/code_41170_len_f0, osSiGetAccess);
INCLUDE_ASM(os/code_41170_len_f0, osSiRelAccess); INCLUDE_API_ASM(os/code_41170_len_f0, osSiRelAccess);

2
src/os/code_41600_len_40.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_41600_len_40, osDequeueThread); INCLUDE_API_ASM(os/code_41600_len_40, osDequeueThread);

2
src/os/code_41690_len_10.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_41690_len_10, osGetActiveQueue); INCLUDE_API_ASM(os/code_41690_len_10, osGetActiveQueue);

8
src/os/code_41750_len_450.c
View File

@ -3,10 +3,10 @@
int INCLUDE_ASM(os/code_41750_len_450, osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, int INCLUDE_ASM(os/code_41750_len_450, osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue,
OSMesg mesg); OSMesg mesg);
INCLUDE_ASM(os/code_41750_len_450, osTimerServicesInit); INCLUDE_API_ASM(os/code_41750_len_450, osTimerServicesInit);
INCLUDE_ASM(os/code_41750_len_450, osTimerInterrupt); INCLUDE_API_ASM(os/code_41750_len_450, osTimerInterrupt);
INCLUDE_ASM(os/code_41750_len_450, osSetTimerIntr); INCLUDE_API_ASM(os/code_41750_len_450, osSetTimerIntr);
INCLUDE_ASM(os/code_41750_len_450, osInsertTimer); INCLUDE_API_ASM(os/code_41750_len_450, osInsertTimer);

2
src/os/code_41c60_len_c0.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_41c60_len_c0, osProbeTLB); INCLUDE_API_ASM(os/code_41c60_len_c0, osProbeTLB);

2
src/os/code_41e70_len_340.c
View File

@ -2,4 +2,4 @@
void INCLUDE_ASM(os/code_41e70_len_340, osCreateViManager, OSPri pri); void INCLUDE_ASM(os/code_41e70_len_340, osCreateViManager, OSPri pri);
INCLUDE_ASM(os/code_41e70_len_340, viMgrMain); INCLUDE_API_ASM(os/code_41e70_len_340, viMgrMain);

2
src/os/code_42470_len_310.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_42470_len_310, osViSwapContext); INCLUDE_API_ASM(os/code_42470_len_310, osViSwapContext);

2
src/os/code_42d60_len_80.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_42d60_len_80, guMtxCat); INCLUDE_API_ASM(os/code_42d60_len_80, guMtxCat);

4
src/os/code_43200_len_7c0.c
View File

@ -1,10 +1,10 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_43200_len_7c0, osMotorAccess); INCLUDE_API_ASM(os/code_43200_len_7c0, osMotorAccess);
s32 INCLUDE_ASM(os/code_43200_len_7c0, osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); s32 INCLUDE_ASM(os/code_43200_len_7c0, osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk);
s32 INCLUDE_ASM(os/code_43200_len_7c0, osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, s32 INCLUDE_ASM(os/code_43200_len_7c0, osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4,
int unk5, s32* unk6); int unk5, s32* unk6);
INCLUDE_ASM(os/code_43200_len_7c0, osPfsDeclearPage); INCLUDE_API_ASM(os/code_43200_len_7c0, osPfsDeclearPage);

2
src/os/code_439c0_len_220.c
View File

@ -2,4 +2,4 @@
s32 INCLUDE_ASM(os/code_439c0_len_220, osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4); s32 INCLUDE_ASM(os/code_439c0_len_220, osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4);
INCLUDE_ASM(os/code_439c0_len_220, osPfsReleasePages); INCLUDE_API_ASM(os/code_439c0_len_220, osPfsReleasePages);

2
src/os/code_44380_len_4e0.c
View File

@ -6,4 +6,4 @@ s32 INCLUDE_ASM(os/code_44380_len_4e0, osPfsNumFiles, OSPfs* pfs, s32* unk1, s32
s32 INCLUDE_ASM(os/code_44380_len_4e0, osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); s32 INCLUDE_ASM(os/code_44380_len_4e0, osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1);
INCLUDE_ASM(os/code_44380_len_4e0, osPfsCheckRamArea); INCLUDE_API_ASM(os/code_44380_len_4e0, osPfsCheckRamArea);

6
src/os/code_448c0_len_210.c
View File

@ -1,7 +1,7 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_448c0_len_210, osPfsGetStatus); INCLUDE_API_ASM(os/code_448c0_len_210, osPfsGetStatus);
INCLUDE_ASM(os/code_448c0_len_210, osPfsRequestOneChannel); INCLUDE_API_ASM(os/code_448c0_len_210, osPfsRequestOneChannel);
INCLUDE_ASM(os/code_448c0_len_210, osPfsGetOneChannelData); INCLUDE_API_ASM(os/code_448c0_len_210, osPfsGetOneChannelData);

2
src/os/code_44ad0_len_70.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_44ad0_len_70, osPfsSelectBank); INCLUDE_API_ASM(os/code_44ad0_len_70, osPfsSelectBank);

14
src/os/code_44b40_len_a90.c
View File

@ -1,15 +1,15 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_44b40_len_a90, osSumcalc); INCLUDE_API_ASM(os/code_44b40_len_a90, osSumcalc);
INCLUDE_ASM(os/code_44b40_len_a90, osIdCheckSum); INCLUDE_API_ASM(os/code_44b40_len_a90, osIdCheckSum);
INCLUDE_ASM(os/code_44b40_len_a90, osRepairPackId); INCLUDE_API_ASM(os/code_44b40_len_a90, osRepairPackId);
INCLUDE_ASM(os/code_44b40_len_a90, osCheckPackId); INCLUDE_API_ASM(os/code_44b40_len_a90, osCheckPackId);
INCLUDE_ASM(os/code_44b40_len_a90, osGetId); INCLUDE_API_ASM(os/code_44b40_len_a90, osGetId);
INCLUDE_ASM(os/code_44b40_len_a90, osCheckId); INCLUDE_API_ASM(os/code_44b40_len_a90, osCheckId);
INCLUDE_ASM(os/code_44b40_len_a90, osPfsRWInode); INCLUDE_API_ASM(os/code_44b40_len_a90, osPfsRWInode);

2
src/os/code_455d0_len_1f0.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_455d0_len_1f0, osContRamRead); INCLUDE_API_ASM(os/code_455d0_len_1f0, osContRamRead);

2
src/os/code_457c0_len_270.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_457c0_len_270, osContRamWrite); INCLUDE_API_ASM(os/code_457c0_len_270, osContRamWrite);

54
src/os/code_45df0_len_970.c
View File

@ -2,13 +2,13 @@
INCLUDE_ASM(os/code_45df0_len_970, func_8006A9F0); INCLUDE_ASM(os/code_45df0_len_970, func_8006A9F0);
INCLUDE_ASM(os/code_45df0_len_970, osExceptionPreamble); INCLUDE_API_ASM(os/code_45df0_len_970, osExceptionPreamble);
INCLUDE_ASM(os/code_45df0_len_970, savecontext); INCLUDE_API_ASM(os/code_45df0_len_970, savecontext);
INCLUDE_ASM(os/code_45df0_len_970, savercp); INCLUDE_API_ASM(os/code_45df0_len_970, savercp);
INCLUDE_ASM(os/code_45df0_len_970, endrcp); INCLUDE_API_ASM(os/code_45df0_len_970, endrcp);
INCLUDE_ASM(os/code_45df0_len_970, handle_interrupt); INCLUDE_ASM(os/code_45df0_len_970, handle_interrupt);
@ -18,41 +18,41 @@ INCLUDE_ASM(os/code_45df0_len_970, IP6_Hdlr);
INCLUDE_ASM(os/code_45df0_len_970, IP7_Hdlr); INCLUDE_ASM(os/code_45df0_len_970, IP7_Hdlr);
INCLUDE_ASM(os/code_45df0_len_970, counter); INCLUDE_API_ASM(os/code_45df0_len_970, counter);
INCLUDE_ASM(os/code_45df0_len_970, cart); INCLUDE_API_ASM(os/code_45df0_len_970, cart);
INCLUDE_ASM(os/code_45df0_len_970, rcp); INCLUDE_API_ASM(os/code_45df0_len_970, rcp);
INCLUDE_ASM(os/code_45df0_len_970, sp_other_break); INCLUDE_ASM(os/code_45df0_len_970, sp_other_break);
INCLUDE_ASM(os/code_45df0_len_970, vi); INCLUDE_API_ASM(os/code_45df0_len_970, vi);
INCLUDE_ASM(os/code_45df0_len_970, ai); INCLUDE_API_ASM(os/code_45df0_len_970, ai);
INCLUDE_ASM(os/code_45df0_len_970, si); INCLUDE_API_ASM(os/code_45df0_len_970, si);
INCLUDE_ASM(os/code_45df0_len_970, pi); INCLUDE_API_ASM(os/code_45df0_len_970, pi);
INCLUDE_ASM(os/code_45df0_len_970, dp); INCLUDE_API_ASM(os/code_45df0_len_970, dp);
INCLUDE_ASM(os/code_45df0_len_970, NoMoreRcpInts); INCLUDE_API_ASM(os/code_45df0_len_970, NoMoreRcpInts);
INCLUDE_ASM(os/code_45df0_len_970, prenmi); INCLUDE_API_ASM(os/code_45df0_len_970, prenmi);
INCLUDE_ASM(os/code_45df0_len_970, firstnmi); INCLUDE_API_ASM(os/code_45df0_len_970, firstnmi);
INCLUDE_ASM(os/code_45df0_len_970, sw2); INCLUDE_API_ASM(os/code_45df0_len_970, sw2);
INCLUDE_ASM(os/code_45df0_len_970, sw1); INCLUDE_API_ASM(os/code_45df0_len_970, sw1);
INCLUDE_ASM(os/code_45df0_len_970, handle_break); INCLUDE_ASM(os/code_45df0_len_970, handle_break);
INCLUDE_ASM(os/code_45df0_len_970, redispatch); INCLUDE_API_ASM(os/code_45df0_len_970, redispatch);
INCLUDE_ASM(os/code_45df0_len_970, enqueueRunning); INCLUDE_API_ASM(os/code_45df0_len_970, enqueueRunning);
INCLUDE_ASM(os/code_45df0_len_970, panic); INCLUDE_API_ASM(os/code_45df0_len_970, panic);
INCLUDE_ASM(os/code_45df0_len_970, send_mesg); INCLUDE_ASM(os/code_45df0_len_970, send_mesg);
@ -60,18 +60,18 @@ INCLUDE_ASM(os/code_45df0_len_970, send_done);
INCLUDE_ASM(os/code_45df0_len_970, handle_CPU); INCLUDE_ASM(os/code_45df0_len_970, handle_CPU);
INCLUDE_ASM(os/code_45df0_len_970, osEnqueueAndYield); INCLUDE_API_ASM(os/code_45df0_len_970, osEnqueueAndYield);
INCLUDE_ASM(os/code_45df0_len_970, noEnqueue); INCLUDE_API_ASM(os/code_45df0_len_970, noEnqueue);
INCLUDE_ASM(os/code_45df0_len_970, osEnqueueThread); INCLUDE_API_ASM(os/code_45df0_len_970, osEnqueueThread);
INCLUDE_ASM(os/code_45df0_len_970, osPopThread); INCLUDE_API_ASM(os/code_45df0_len_970, osPopThread);
INCLUDE_ASM(os/code_45df0_len_970, osNop); INCLUDE_API_ASM(os/code_45df0_len_970, osNop);
INCLUDE_ASM(os/code_45df0_len_970, osDispatchThread); INCLUDE_API_ASM(os/code_45df0_len_970, osDispatchThread);
INCLUDE_ASM(os/code_45df0_len_970, osDispatchThreadSave); INCLUDE_API_ASM(os/code_45df0_len_970, osDispatchThreadSave);
void INCLUDE_ASM(os/code_45df0_len_970, osCleanupThread, void); void INCLUDE_ASM(os/code_45df0_len_970, osCleanupThread, void);

4
src/os/code_467f0_len_90.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_467f0_len_90, osSetGlobalIntMask); INCLUDE_API_ASM(os/code_467f0_len_90, osSetGlobalIntMask);
INCLUDE_ASM(os/code_467f0_len_90, osResetGlobalIntMask); INCLUDE_API_ASM(os/code_467f0_len_90, osResetGlobalIntMask);

6
src/os/code_46880_len_260.c
View File

@ -1,7 +1,7 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_46880_len_260, osPiRawStartDma); INCLUDE_API_ASM(os/code_46880_len_260, osPiRawStartDma);
INCLUDE_ASM(os/code_46880_len_260, osPiGetCmdQueue); INCLUDE_API_ASM(os/code_46880_len_260, osPiGetCmdQueue);
INCLUDE_ASM(os/code_46880_len_260, osEPiRawReadIo); INCLUDE_API_ASM(os/code_46880_len_260, osEPiRawReadIo);

2
src/os/code_46ae0_len_170.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_46ae0_len_170, osEPiRawWriteIo); INCLUDE_API_ASM(os/code_46ae0_len_170, osEPiRawWriteIo);

2
src/os/code_46c50_len_20.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_46c50_len_20, osAiDeviceBusy); INCLUDE_API_ASM(os/code_46c50_len_20, osAiDeviceBusy);

2
src/os/code_46c70_len_e00.c
View File

@ -10,4 +10,4 @@ INCLUDE_ASM(os/code_46c70_len_e00, _Ldunscale);
INCLUDE_ASM(os/code_46c70_len_e00, _Genld); INCLUDE_ASM(os/code_46c70_len_e00, _Genld);
INCLUDE_ASM(os/code_46c70_len_e00, osGetCause); INCLUDE_API_ASM(os/code_46c70_len_e00, osGetCause);

2
src/os/code_47a70_len_10.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47a70_len_10, osGetSR); INCLUDE_API_ASM(os/code_47a70_len_10, osGetSR);

2
src/os/code_47a80_len_10.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47a80_len_10, osSetCompare); INCLUDE_API_ASM(os/code_47a80_len_10, osSetCompare);

8
src/os/code_47a90_len_50.c
View File

@ -1,9 +1,9 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47a90_len_50, osSetFpcCsr); INCLUDE_API_ASM(os/code_47a90_len_50, osSetFpcCsr);
INCLUDE_ASM(os/code_47a90_len_50, osSetSR); INCLUDE_API_ASM(os/code_47a90_len_50, osSetSR);
INCLUDE_ASM(os/code_47a90_len_50, osSetWatchLo); INCLUDE_API_ASM(os/code_47a90_len_50, osSetWatchLo);
INCLUDE_ASM(os/code_47a90_len_50, osSpDeviceBusy); INCLUDE_API_ASM(os/code_47a90_len_50, osSpDeviceBusy);

8
src/os/code_47ae0_len_e0.c
View File

@ -1,9 +1,9 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47ae0_len_e0, osSpGetStatus); INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpGetStatus);
INCLUDE_ASM(os/code_47ae0_len_e0, osSpSetStatus); INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpSetStatus);
INCLUDE_ASM(os/code_47ae0_len_e0, osSpSetPc); INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpSetPc);
INCLUDE_ASM(os/code_47ae0_len_e0, osSpRawStartDma); INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpRawStartDma);

2
src/os/code_47bc0_len_50.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47bc0_len_50, osSiRawReadIo); INCLUDE_API_ASM(os/code_47bc0_len_50, osSiRawReadIo);

2
src/os/code_47c10_len_50.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47c10_len_50, osSiRawWriteIo); INCLUDE_API_ASM(os/code_47c10_len_50, osSiRawWriteIo);

4
src/os/code_47c60_len_f0.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47c60_len_f0, osContAddressCrc); INCLUDE_API_ASM(os/code_47c60_len_f0, osContAddressCrc);
INCLUDE_ASM(os/code_47c60_len_f0, osContDataCrc); INCLUDE_API_ASM(os/code_47c60_len_f0, osContDataCrc);

2
src/os/code_47e90_len_110.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47e90_len_110, osViInit); INCLUDE_API_ASM(os/code_47e90_len_110, osViInit);

2
src/os/code_47fa0_len_20.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_47fa0_len_20, osViGetCurrentContext); INCLUDE_API_ASM(os/code_47fa0_len_20, osViGetCurrentContext);

6
src/os/code_48020_len_a00.c
View File

@ -4,10 +4,10 @@ s32 INCLUDE_ASM(os/code_48020_len_a00, osPfsChecker, OSPfs* pfs);
INCLUDE_ASM(os/code_48020_len_a00, corrupted_init); INCLUDE_ASM(os/code_48020_len_a00, corrupted_init);
INCLUDE_ASM(os/code_48020_len_a00, corrupted); INCLUDE_API_ASM(os/code_48020_len_a00, corrupted);
s32 INCLUDE_ASM(os/code_48020_len_a00, osPfsIsPlug, OSMesgQueue* queue, u8* unk); s32 INCLUDE_ASM(os/code_48020_len_a00, osPfsIsPlug, OSMesgQueue* queue, u8* unk);
INCLUDE_ASM(os/code_48020_len_a00, osPfsRequestData); INCLUDE_API_ASM(os/code_48020_len_a00, osPfsRequestData);
INCLUDE_ASM(os/code_48020_len_a00, osPfsGetInitData); INCLUDE_API_ASM(os/code_48020_len_a00, osPfsGetInitData);

4
src/os/code_48a20_len_1c0.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_48a20_len_1c0, ldiv); INCLUDE_API_ASM(os/code_48a20_len_1c0, ldiv);
INCLUDE_ASM(os/code_48a20_len_1c0, lldiv); INCLUDE_API_ASM(os/code_48a20_len_1c0, lldiv);

2
src/os/code_48be0_len_20.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_48be0_len_20, osSiDeviceBusy); INCLUDE_API_ASM(os/code_48be0_len_20, osSiDeviceBusy);

4
src/os/code_4a140_len_70.c
View File

@ -1,5 +1,5 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_4a140_len_70, strcpy); INCLUDE_API_ASM(os/code_4a140_len_70, strcpy);
INCLUDE_ASM(os/code_4a140_len_70, strcmp); INCLUDE_API_ASM(os/code_4a140_len_70, strcmp);

2
src/os/code_4a1b0_len_40.c
View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_4a1b0_len_40, memset); INCLUDE_API_ASM(os/code_4a1b0_len_40, memset);

18
src/os/code_4a360_len_930.c
View File

@ -2,20 +2,20 @@
INCLUDE_ASM(os/code_4a360_len_930, func_8008EF60); INCLUDE_ASM(os/code_4a360_len_930, func_8008EF60);
INCLUDE_ASM(os/code_4a360_len_930, osFlashInit); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashInit);
INCLUDE_ASM(os/code_4a360_len_930, osFlashReadStatus); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashReadStatus);
INCLUDE_ASM(os/code_4a360_len_930, osFlashReadId); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashReadId);
INCLUDE_ASM(os/code_4a360_len_930, osFlashClearStatus); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashClearStatus);
INCLUDE_ASM(os/code_4a360_len_930, osFlashAllErase); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashAllErase);
INCLUDE_ASM(os/code_4a360_len_930, osFlashSectorErase); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashSectorErase);
INCLUDE_ASM(os/code_4a360_len_930, osFlashWriteBuffer); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashWriteBuffer);
INCLUDE_ASM(os/code_4a360_len_930, osFlashWriteArray); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashWriteArray);
INCLUDE_ASM(os/code_4a360_len_930, osFlashReadArray); INCLUDE_API_ASM(os/code_4a360_len_930, osFlashReadArray);

6
src/os/code_7e40_len_3f0.c
View File

@ -1,7 +1,7 @@
#include "common.h" #include "common.h"
INCLUDE_ASM(os/code_7e40_len_3f0, nuGfxTaskMgr); INCLUDE_API_ASM(os/code_7e40_len_3f0, nuGfxTaskMgr);
INCLUDE_ASM(os/code_7e40_len_3f0, nuGfxTaskMgrInit); INCLUDE_API_ASM(os/code_7e40_len_3f0, nuGfxTaskMgrInit);
INCLUDE_ASM(os/code_7e40_len_3f0, nuGfxTaskStart); INCLUDE_API_ASM(os/code_7e40_len_3f0, nuGfxTaskStart);