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

Crystal Palace reflection include & name some segments (#274)

Browse Source 
* src/evt section

* evt data

* entity

* update entity func names

* names

* reflection wip

* lol

* ~pra_01

* nabbed em

* match func_80240500_D4D540

* match func_802402F0_D4D330

* last pra include func git add -A

* gCurrentCamID

* reflection.inc.c for pra_01

* reflection.inc.c

* rm

* match a few in tst_11

* use npc flags

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
alex 2021-04-22 04:19:31 +01:00 committed by GitHub
parent 9900e9a2b8
commit df3ef58ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
785 changed files with 1784 additions and 25721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/common_structs.h
View File

@ -1117,8 +1117,8 @@ typedef struct ItemEntityPhysicsData {
typedef struct RenderTask {
/* 0x00 */ s32 renderMode;
/* 0x04 */ s32 distance; /* value between 0 and -10k */
/* 0x08 */ struct Model* model;
/* 0x0C */ UNK_FUN_PTR(fpBuildDL); /* function for making display list for model */
/* 0x08 */ void* appendGfxArg;
/* 0x0C */ void (*appendGfx)(void*);
} RenderTask; // size = 0x10
typedef struct SelectableTarget {
@ -1543,8 +1543,8 @@ typedef struct PlayerStatus {
/* 0x00A */ char unk_0A[2];
/* 0x00C */ s8 peachDisguise;
/* 0x00D */ s8 unk_0D;
/* 0x00E */ u8 unk_0E;
/* 0x00F */ u8 unk_0F;
/* 0x00E */ u8 alpha1;
/* 0x00F */ u8 alpha2;
/* 0x010 */ s16 unk_10;
/* 0x012 */ s16 moveFrames;
/* 0x014 */ s8 enableCollisionOverlapsCheck;
@ -1567,13 +1567,13 @@ typedef struct PlayerStatus {
/* 0x080 */ f32 targetYaw;
/* 0x084 */ f32 currentYaw;
/* 0x088 */ f32 unk_88;
/* 0x08C */ s32 unk_8C;
/* 0x08C */ f32 unk_8C;
/* 0x090 */ f32 unk_90;
/* 0x094 */ s32 unk_94;
/* 0x098 */ s32 unk_98;
/* 0x09C */ s32 unk_9C;
/* 0x0A0 */ f32 heading;
/* 0x0A4 */ char unk_A4[4];
/* 0x0A4 */ s32 trueAnimation; ///< Encoding back-facing sprite
/* 0x0A8 */ f32 spriteFacingAngle; /* angle of sprite, relative to camera, from 0 to 180 */
/* 0x0AC */ char unk_AC[4];
/* 0x0B0 */ s16 colliderHeight;
@ -1584,7 +1584,7 @@ typedef struct PlayerStatus {
/* 0x0B7 */ char unk_B7;
/* 0x0B8 */ s32 anim;
/* 0x0BC */ u16 unk_BC;
/* 0x0BE */ u8 renderMode;
/* 0x0BE */ s8 renderMode;
/* 0x0BF */ s8 unk_BF;
/* 0x0C0 */ s16 decorationList;
/* 0x0C2 */ s16 unk_C2;

32
include/enums.h
View File

@ -1546,8 +1546,9 @@ enum NpcFlags {
NPC_FLAG_4000 = 0x00004000,
NPC_FLAG_8000 = 0x00008000,
NPC_FLAG_DIRTY_SHADOW = 0x00010000, ///< Set if shadow model is dirty (needs to be repositioned etc.)
NPC_FLAG_INVISIBLE = 0x00020000, ///< Invisible sprite (shadow and particles still render) (TODO: possibly causes loading of player sprites instead?)
NPC_FLAG_40000 = 0x00040000, ///< Related to NPC_FLAG_8000
NPC_FLAG_REFLECT_WALL = 0x00020000, ///< Mirror rendering across z=0
NPC_FLAG_40000 = 0x00040000, ///< Yaw?
NPC_FLAG_REFLECT_FLOOR = 0x00080000, ///< Mirror rendering across y=0
NPC_FLAG_MOTION_BLUR = 0x00100000, ///< Gives motion blur effect as NPC moves. Set by enable_npc_blur
NPC_FLAG_200000 = 0x00200000,
NPC_FLAG_400000 = 0x00400000,
@ -1582,4 +1583,31 @@ enum PlayerAnimFlags {
PLAYER_ANIM_FLAG_8BIT_MARIO = 0x00004000,
};
/// not really
enum RenderMode {
RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0 = 0x00,
RENDER_MODE_SURFACE_OPA = 0x01,
RENDER_MODE_SURFACE_OPA_NO_AA = 0x03,
RENDER_MODE_SURFACE_OPA_NO_ZB = 0x04,
RENDER_MODE_DECAL_OPA = 0x05,
RENDER_MODE_DECAL_OPA_NO_AA = 0x07,
RENDER_MODE_INTERSECTING_OPA = 0x09,
RENDER_MODE_ALPHATEST = 0x0D,
RENDER_MODE_ALPHATEST_ONESIDED = 0x0F,
RENDER_MODE_ALPHATEST_NO_ZB = 0x10,
RENDER_MODE_SURFACE_XLU_LAYER1 = 0x11,
RENDER_MODE_SURFACE_XLU_NO_AA = 0x13,
RENDER_MODE_SURFACE_XLU_NO_ZB = 0x14,
RENDER_MODE_SURF_XLU_ZB_ZUPD = 0x15,
RENDER_MODE_SURFACE_XLU_LAYER2 = 0x16,
RENDER_MODE_DECAL_XLU = 0x1A,
RENDER_MODE_DECAL_XLU_NO_AA = 0x1C,
RENDER_MODE_SHADOW = 0x20,
RENDER_MODE_SURFACE_XLU_LAYER3 = 0x22,
RENDER_MODE_INTERSECTING_XLU = 0x26,
RENDER_MODE_SURF_XLU_AA_ZB_ZUPD = 0x29,
RENDER_MODE_CLOUD = 0x2E,
RENDER_MODE_CLOUD_NO_ZB = 0x2F,
};
#endif

15
include/functions.h
View File

@ -81,6 +81,8 @@ void func_800706D0(s32, f32, f32, f32);
// Text
PrintContext* load_string(s32 stringID, s32* a1);
// TODO: out types are s32 not f32
void get_screen_coords(Cam camID, f32 x, f32 y, f32 z, f32* outX, f32* outY, f32* outZ);
void parent_collider_to_model(s32 colliderID, s16 modelIndex);
@ -97,7 +99,7 @@ s32 partner_player_can_pause(void);
s32 disable_player_static_collisions(void);
s32 disable_player_input(void);
void func_80027088(s32);
void set_time_freeze_mode(s32);
void get_dpad_input_radial(f32* angle, f32* magnitude);
@ -216,7 +218,7 @@ ItemEntity* get_item_entity(s32 itemEntityIndex);
s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar);
void set_item_entity_flags(s32 itemEntityIndex, s32 flag);
s32 bind_dynamic_entity_7(void (*updateFunc)(void), void (*drawFunc)(void));
s32 create_dynamic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(void));
s32 get_dynamic_entity(s32 arg0);
void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height);
@ -293,11 +295,7 @@ void func_80070CD0(s32, f32, f32, f32, f32, f32);
void func_802B2078(void);
extern f32 gCurtainScale;
extern f32 gCurtainScaleGoal;
extern f32 gCurtainFade;
extern f32 gCurtainFadeGoal;
extern UNK_FUN_PTR(gCurtainDrawCallback);
void func_802DDA8C(s32, s32, f32);
void initialize_curtains(void);
void update_curtains(void);
@ -335,5 +333,8 @@ ApiStatus func_802CA988(ScriptInstance* script, s32 isInitialCall);
ApiStatus func_802CDE68(ScriptInstance* script, s32 isInitialCall);
ApiStatus func_802D8248(ScriptInstance* script, s32 isInitialCall);
s32 create_dynamic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void));
EntityModel* get_entity_model(s32 idx);
f32 func_800E5938(s32 lag, s32* x, s32* y, s32* z);
#endif

2
include/macros.h
View File

@ -48,6 +48,8 @@
#define PI 3.141592f
#define TAU 6.28318f
#define SPRITE_WORLD_SCALE 0.71428573f
//NOTE: SCRIPT_ALLOC is probably not quite correct, but this is the closest thing to matching for the functions its used in. Needs more work.
#define SCRIPT_ALLOC(new, index) \
{ \

24
include/variables.h
View File

@ -67,8 +67,6 @@ extern ShadowList* gCurrentShadowListPtr;
extern Camera gCameras[4];
extern s32 gCurrentCameraID;
extern Npc* gPlayerNpcPtr;
extern CollisionData gCollisionData;
extern s8 D_800A0900;
@ -233,8 +231,15 @@ extern s32 D_800B0CF0;
extern s32 D_800D91E0;
extern s32 D_800D9230;
extern s32* D_80210000;
extern s8 D_802D9D70;
extern s8 D_802D9D71;
extern u8 D_802D9D70; // player alpha1 copy?
extern u8 D_802D9D71; // player alpha2 copy?
extern f32 gCurtainScale;
extern f32 gCurtainScaleGoal;
extern f32 gCurtainFade;
extern f32 gCurtainFadeGoal;
extern UNK_FUN_PTR(gCurtainDrawCallback);
extern s16 gCurrentDoorSoundsSet;
@ -275,12 +280,12 @@ extern u32 gWorldMapFlags[MAX_MAPFLAGS];
extern u32 gBattleMapFlags[MAX_MAPFLAGS];
extern s32 D_8009A5D0;
extern s32 D_8009A5D8;
extern s32 timeFreezeMode;
extern s32 D_8009A678;
extern u8 D_800779B0;
extern u32 D_80078174;
extern s32 D_8009A5D8;
extern s32 timeFreezeMode;
extern u8 D_800A0963;
extern s32 D_8009A5D0;
@ -305,9 +310,8 @@ extern UNK_TYPE D_0A000808;
// Scripts
extern Bytecode* SCRIPT_NpcDefeat;
extern Bytecode* ShakeCam1;
extern Bytecode* ShakeCamX;
extern Bytecode* D_802D9D50;
extern Script ShakeCam1;
extern Script ShakeCamX;
extern s16 gMusicUnkVolume;
extern s16 gMusicUnkVolume2;
@ -354,6 +358,8 @@ extern UNK_PTR D_800F7BBC;
extern s32 D_802C05CC;
extern s16 gCurrentCamID;
// Heap?
extern s32 D_803DA800;

4
src/102610_len_2330.c
View File

@ -30,13 +30,13 @@ void func_802E10F4(Entity* entity) {
}
void func_802E114C(void) {
func_80027088(1);
set_time_freeze_mode(1);
disable_player_input();
gPlayerStatusPtr->currentSpeed = 0.0f;
}
void func_802E117C(void) {
func_80027088(0);
set_time_freeze_mode(0);
enable_player_input();
}

4
src/10400_len_d30.c
View File

@ -4,7 +4,7 @@ void state_init_language_select(void) {
D_800A0931 = 0;
D_800A0932[0] = 0;
disable_player_input();
func_80027088(2);
set_time_freeze_mode(2);
set_transition_stencil_zoom_0(0, D_800A0932[0]);
}
@ -14,7 +14,7 @@ void state_init_file_select(void) {
D_800A0931 = 0;
D_800A0932[0] = 0;
disable_player_input();
func_80027088(2);
set_time_freeze_mode(2);
general_heap_create();
func_801452E8(0, 0);
func_80141100();

4
src/105F90.c
View File

@ -99,7 +99,7 @@ void func_802E54CC(Entity* entity) {
UNK_TYPE* ptr = &D_802EB3C0;
*ptr = 0;
load_string(0x1D0001, ptr);
func_80027088(1);
set_time_freeze_mode(1);
OVERRIDE_FLAG_SET(0x40);
disable_player_input();
set_global_flag(SI_SAVE_FLAG(96));
@ -111,7 +111,7 @@ void func_802E54CC(Entity* entity) {
void func_802E555C(Entity* entity) {
if (D_802EB3C0) {
exec_entity_updatecmd(entity);
func_80027088(0);
set_time_freeze_mode(0);
OVERRIDE_FLAG_UNSET(0x40);
enable_player_input();
}

2
src/111f0_len_860.c
View File

@ -34,7 +34,7 @@ void func_80035E54(void) {
OVERRIDE_FLAG_SET(0x8);
set_variable(0, SI_SAVE_VAR(1), (*gameStatus)->unk_A9);
D_8009A5D8 = 0;
timeFreezeMode = 0;
}
INCLUDE_ASM(s32, "111f0_len_860", func_80035EEC);

30
src/1b40_len_20b0.c
View File

@ -2,6 +2,8 @@
#include "nu/nusys.h"
#include "ld_addrs.h"
// TODO: timeFreezeMode is probably bss here
s8 D_80074020 = 1;
s8 D_80074021 = 5;
@ -178,7 +180,7 @@ void load_engine_data(void) {
dma_copy(FEE30_ROM_START, FEE30_ROM_END, FEE30_VRAM);
dma_copy(_759B0_ROM_START, _759B0_ROM_END, _759B0_VRAM);
dma_copy(E79B0_ROM_START, E79B0_ROM_END, E79B0_VRAM);
dma_copy(evt_ROM_START, evt_ROM_END, evt_VRAM);
dma_copy(_102610_ROM_START, _102610_ROM_END, _102610_VRAM);
dma_copy(A5DD0_ROM_START, A5DD0_ROM_END, A5DD0_VRAM);
dma_copy(_10CC10_ROM_START, _10CC10_ROM_END, _10CC10_VRAM);
@ -193,7 +195,7 @@ void load_engine_data(void) {
(*gameStatus)->unk_81 = 0;
(*gameStatus)->unk_82 = -8;
(*gameStatus)->unk_83 = 4;
D_8009A5D8 = 0;
timeFreezeMode = 0;
(*gameStatus)->unk_75 = (*gameStatus)->unk_13C = 0;
D_80074021 = 5;
(*gameStatus)->saveCount = 0;
@ -240,40 +242,46 @@ void load_engine_data(void) {
set_game_mode(0);
}
void func_80027088(s32 arg0) {
switch (arg0) {
/// Time freeze modes:
/// 0: normal
/// 1: NPCs move, can't be interacted with
/// 2: NPCs don't move, no partner ability, can't interact, can't use exits
/// 3: NPCs don't more or animate (partner switch menu)
/// 4: NPCs can move, animations don't update, can use exits
void set_time_freeze_mode(s32 mode) {
switch (mode) {
case 0:
D_8009A5D8 = arg0;
timeFreezeMode = mode;
OVERRIDE_FLAG_UNSET(0xF00);
resume_all_group(3);
break;
case 1:
D_8009A5D8 = arg0;
timeFreezeMode = mode;
OVERRIDE_FLAG_UNSET(0xE00);
OVERRIDE_FLAG_SET(0x100);
suspend_all_group(1);
break;
case 2:
D_8009A5D8 = arg0;
timeFreezeMode = mode;
OVERRIDE_FLAG_UNSET(0xC00);
OVERRIDE_FLAG_SET(0x300);
suspend_all_group(2);
break;
case 3:
D_8009A5D8 = arg0;
timeFreezeMode = mode;
OVERRIDE_FLAG_UNSET(0x800);
OVERRIDE_FLAG_SET(0x700);
suspend_all_group(2);
break;
case 4:
D_8009A5D8 = arg0;
timeFreezeMode = mode;
OVERRIDE_FLAG_SET(0xF00);
break;
}
}
s32 func_80027190(void) {
return D_8009A5D8;
s32 get_time_freeze_mode(void) {
return timeFreezeMode;
}
#ifdef NON_MATCHING

4
src/3251D0.c
View File

@ -67,13 +67,13 @@ ApiStatus func_802BD388(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus func_802BD3E4(ScriptInstance* script, s32 isInitialCall) {
func_80027088(2);
set_time_freeze_mode(2);
OVERRIDE_FLAG_SET(0x200000);
return ApiStatus_DONE2;
}
ApiStatus func_802BD41C(ScriptInstance* script, s32 isInitialCall) {
func_80027088(0);
set_time_freeze_mode(0);
OVERRIDE_FLAG_UNSET(0x200000);
return ApiStatus_DONE2;
}

3
src/43F0.c
View File

@ -115,8 +115,7 @@ INCLUDE_ASM(s32, "43F0", int_to_string);
// should maybe be called bzero
void mem_clear(s8* data, s32 numBytes) {
while (numBytes > 0) {
*data = 0;
data++;
*data++ = 0;
numBytes--;
}
}

14
src/77480.c
View File

@ -116,9 +116,9 @@ void update_player(void) {
update_player_shadow();
check_for_interactables();
func_800E0580();
func_800E0398();
func_800E0294();
check_for_conversation();
check_for_pulse_stone();
check_for_ispy();
playerStatus->extraVelocity.x = 0.0f;
playerStatus->extraVelocity.y = 0.0f;
@ -356,7 +356,7 @@ void func_800E0260(void) {
// Weird control flow / issue with loading linker addrs
#ifdef NON_MATCHING
extern s8 D_8015A57A;
void func_800E0294(void) {
void check_for_ispy(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
if (D_8015A57A != 0) {
@ -378,7 +378,7 @@ void func_800E0294(void) {
}
}
#else
INCLUDE_ASM(s32, "77480", func_800E0294);
INCLUDE_ASM(s32, "77480", check_for_ispy);
#endif
void func_800E0330(void) {
@ -392,7 +392,7 @@ void func_800E0374(void) {
gPlayerStatusPtr->animFlags &= ~PLAYER_ANIM_FLAG_100;
}
INCLUDE_ASM(s32, "77480", func_800E0398);
INCLUDE_ASM(s32, "77480", check_for_pulse_stone);
void func_800E04D0(void) {
if ((gPlayerStatusPtr->animFlags & 0x40) && (D_8010C920 != 0)) {
@ -418,7 +418,7 @@ s32 func_800E0538(void) {
return ret;
}
INCLUDE_ASM(s32, "77480", func_800E0580);
INCLUDE_ASM(s32, "77480", check_for_conversation);
void func_800E0658(void) {
if ((gPlayerStatusPtr->animFlags & 0x20) && (D_8010C940 != 0)) {

4
src/7B440.c
View File

@ -75,8 +75,8 @@ void func_800E205C(void) {
playerStatus->renderMode = 0xD;
gameStatus = &gGameStatusPtr;
playerStatus->unk_0E = 255;
playerStatus->unk_0F = 255;
playerStatus->alpha1 = 255;
playerStatus->alpha2 = 255;
(*gameStatus)->peachFlags &= ~0x8;
(*gameStatus)->peachFlags &= ~0x10;

2
src/7bb60_len_41b0.c
View File

@ -341,7 +341,7 @@ INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5530);
INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E58F0);
INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5938);
INCLUDE_ASM(f32, "7bb60_len_41b0", func_800E5938, s32 lag, s32* x, s32* y, s32* z);
INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E59A0);

6
src/7fd10_len_b40.c
View File

@ -6,9 +6,9 @@ void func_800E6860(void) {
if (D_8010EBB0.unk_00 != 0 && D_8010EBB0.unk_03 == 9) {
Npc* partner = get_npc_unsafe(NPC_PARTNER);
func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->unk_0E, 0);
func_8003D624(partner, 7, playerStatus->unk_0E, 0, 0, 0, 0);
playerStatus->unk_0F = 0;
func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
func_8003D624(partner, 7, playerStatus->alpha1, 0, 0, 0, 0);
playerStatus->alpha2 = 0;
}
}

10
src/a5dd0_len_114e0.c
View File

@ -14,8 +14,8 @@ typedef struct Fog {
typedef struct RenderTaskEntry {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ struct Model* model;
/* 0x0C */ UNK_FUN_PTR(fpBuildDL); /* function for making display list for model */
/* 0x08 */ void* appendGfxArg;
/* 0x0C */ void (*appendGfx)(void*);
} RenderTaskEntry; // size = 0x10
typedef Model* SmallModelList[4];
@ -195,7 +195,7 @@ s32 is_player_action_state(ActionState actionState) {
void func_80110BCC(Entity *entity) {
if (!(entity->flags & 8)) {
func_80122D7C(entity->virtualModelIndex);
set_entity_model_render_command_list(entity->virtualModelIndex);
}
}
@ -690,8 +690,8 @@ RenderTaskEntry* queue_render_task(RenderTask* task) {
entry->unk_00 = 0x21;
}
entry->model = task->model;
entry->fpBuildDL = task->fpBuildDL;
entry->appendGfxArg = task->appendGfxArg;
entry->appendGfx = task->appendGfx;
entry->unk_04 = D_8014C188[task->renderMode] - task->distance;
return entry;

4
src/battle/item/dizzy_dial/lib.c
View File

@ -73,7 +73,7 @@ ApiStatus N(func_802A1270_727B80)(ScriptInstance* script, s32 isInitialCall) {
script->functionTemp[2].s = 0;
sfx_play_sound(0x2033);
camera->unk_1C = 0;
D_802A1CD0 = bind_dynamic_entity_7(NULL, func_802A123C_727B4C);
D_802A1CD0 = create_dynamic_entity_frontUI(NULL, func_802A123C_727B4C);
script->functionTemp[0].s = 1;
case 1:
camera->flags |= 8;
@ -86,7 +86,7 @@ ApiStatus N(func_802A1270_727B80)(ScriptInstance* script, s32 isInitialCall) {
}
camera->unk_1C = 0;
camera->flags &= ~8;
func_801235C0(D_802A1CD0);
free_dynamic_entity(D_802A1CD0);
return ApiStatus_DONE2;
}

4
src/battle/item/mystery/lib.c
View File

@ -123,7 +123,7 @@ ApiStatus N(func_802A13E4_72C994)(ScriptInstance* script, s32 isInitialCall) {
struct N(tempStc)* ic;
StaticItem* itemTable;
D_802A25F8 = bind_dynamic_entity_7(NULL, func_802A123C_72C7EC);
D_802A25F8 = create_dynamic_entity_frontUI(NULL, func_802A123C_72C7EC);
D_802A25EC = rand_int(18200);
D_802A25F0 = 1000;
tablePtr = &D_802A25FC;
@ -246,7 +246,7 @@ ApiStatus N(func_802A13E4_72C994)(ScriptInstance* script, s32 isInitialCall) {
g = D_802A25FC[i];
battleStatus->selectedItemID = g;
script->varTable[0] = g;
func_801235C0(D_802A25F8);
free_dynamic_entity(D_802A25F8);
for (i = 0; i < 7; i++) {
free_icon(*iconPtr++);
}

4
src/battle/item/strange_cake/lib.c
View File

@ -123,7 +123,7 @@ ApiStatus N(func_802A13E4_7316E4)(ScriptInstance* script, s32 isInitialCall) {
s32 i;
MenuIcon** iconPtr;
D_802A2E00 = bind_dynamic_entity_7(NULL, func_802A123C_73153C);
D_802A2E00 = create_dynamic_entity_frontUI(NULL, func_802A123C_73153C);
i = rand_int(13000);
D_802A2DF4 = i;
@ -238,7 +238,7 @@ ApiStatus N(func_802A13E4_7316E4)(ScriptInstance* script, s32 isInitialCall) {
g = N(D_802A2858_732B58)[i];
battleStatus->selectedItemID = g;
script->varTable[0] = g;
func_801235C0(D_802A2E00);
free_dynamic_entity(D_802A2E00);
for (i = 0; i < 5; i++) {
free_icon(*iconPtr++);
}

4
src/ebd0_len_6a0.c
View File

@ -124,8 +124,8 @@ void step_battle(void) {
load_battle_section();
D_800A0904 = gPlayerStatusPtr->animFlags;
gPlayerStatusPtr->animFlags &= ~0x40;
D_800A0908 = func_80027190(gPlayerStatusPtr);
func_80027088(0);
D_800A0908 = get_time_freeze_mode(gPlayerStatusPtr);
set_time_freeze_mode(0);
OVERRIDE_FLAG_UNSET(0x8);
if (D_800A0900 >= 0) {

116
src/b72b0_len_15ed0.c → src/entity.c
View File

@ -5,15 +5,15 @@ extern EntityModelList gBattleEntityModelList;
extern EntityModelList* gCurrentEntityModelList;
extern s32 gEntityModelCount;
extern s32 D_8014C260[];
extern s32 D_80154378; // entity fog enabled
extern s32 D_8015437C; // entity fog red
extern s32 D_80154380; // entity fog green
extern s32 D_80154384; // entity fog blue
extern s32 D_80154388; // entity fog alpha
extern s32 D_8015438C; // entity fog dist min
extern s32 D_80154390; // entity fog dist max
extern s32 entity_fog_enabled;
extern s32 entity_fog_red;
extern s32 entity_fog_green;
extern s32 entity_fog_blue;
extern s32 entity_fog_alpha;
extern s32 entity_fog_dist_min;
extern s32 entity_fog_dist_max;
s32 step_entity_rendercmd(EntityModel* entityModel);
s32 step_entity_model_commandlist(EntityModel* entityModel);
void clear_entity_models(void) {
s32 i;
@ -28,14 +28,14 @@ void clear_entity_models(void) {
(*gCurrentEntityModelList)[i] = NULL;
}
D_8015437C = 10;
D_80154380 = 10;
D_80154384 = 10;
D_80154388 = 10;
D_8015438C = 800;
entity_fog_red = 10;
entity_fog_green = 10;
entity_fog_blue = 10;
entity_fog_alpha = 10;
entity_fog_dist_min = 800;
gEntityModelCount = 0;
D_80154378 = 0;
D_80154390 = 1000;
entity_fog_enabled = 0;
entity_fog_dist_max = 1000;
}
void init_entity_models(void) {
@ -47,14 +47,14 @@ void init_entity_models(void) {
gCurrentEntityModelList = &gBattleEntityModelList;
}
D_8015437C = 10;
D_80154380 = 10;
D_80154384 = 10;
D_80154388 = 10;
D_8015438C = 800;
entity_fog_red = 10;
entity_fog_green = 10;
entity_fog_blue = 10;
entity_fog_alpha = 10;
entity_fog_dist_min = 800;
gEntityModelCount = 0;
D_80154378 = 0;
D_80154390 = 1000;
entity_fog_enabled = 0;
entity_fog_dist_max = 1000;
}
s32 load_entity_model(s32* cmdList) {
@ -137,7 +137,7 @@ s32 ALT_load_entity_model(s32* cmdList) {
return i;
}
void update_entity_rendercmd(s32 idx) {
void exec_entity_model_commandlist(s32 idx) {
EntityModel* entityModel;
void* temp_v0_2;
@ -150,7 +150,7 @@ void update_entity_rendercmd(s32 idx) {
entityModel->flags &= ~0x100;
entityModel->nextFrameTime -= entityModel->timeScale;
if (entityModel->nextFrameTime <= 0.0f) {
while (step_entity_rendercmd(entityModel));
while (step_entity_model_commandlist(entityModel));
}
}
}
@ -158,7 +158,7 @@ void update_entity_rendercmd(s32 idx) {
}
}
s32 step_entity_rendercmd(EntityModel* entityModel) {
s32 step_entity_model_commandlist(EntityModel* entityModel) {
Gfx* displayList;
u32* curPos = entityModel->cmdListReadPos;
@ -202,7 +202,7 @@ s32 step_entity_rendercmd(EntityModel* entityModel) {
return 0;
}
void make_mtx_flipZ(Matrix4f mtx) {
void make_entity_model_mtx_flipZ(Matrix4f mtx) {
guMtxIdentF(*mtx);
mtx[0][0] = 1.0f;
mtx[1][1] = 1.0f;
@ -210,25 +210,25 @@ void make_mtx_flipZ(Matrix4f mtx) {
mtx[3][3] = 1.0f;
}
INCLUDE_ASM(s32, "b72b0_len_15ed0", appendGfx_entity_model);
INCLUDE_ASM(s32, "entity", appendGfx_entity_model);
INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_shadow);
INCLUDE_ASM(s32, "entity", draw_entity_model_shadow);
INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_main);
INCLUDE_ASM(s32, "entity", draw_entity_model_main);
INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_extra1);
INCLUDE_ASM(s32, "entity", draw_entity_model_extra1);
INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_extra2);
INCLUDE_ASM(s32, "entity", draw_entity_model_extra2);
INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_extra3);
INCLUDE_ASM(s32, "entity", draw_entity_model_extra3);
void func_80122D7C(s32 idx, u32* arg1) {
void set_entity_model_render_command_list(s32 idx, u32* commandList) {
u32* phi_a1;
EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800];
if (entityModel != NULL && entityModel->flags) {
phi_a1 = arg1;
if (arg1 == NULL) {
phi_a1 = commandList;
if (commandList == NULL) {
phi_a1 = &D_8014C260;
}
entityModel->cmdListReadPos = phi_a1;
@ -290,7 +290,7 @@ void clear_entity_model_flags(s32 idx, s32 newFlags) {
}
}
void func_80122F64(s32 idx, s32 setupGfxCallbackArg0, UNK_FUN_PTR(fpSetupGfxCallback)) {
void bind_entity_model_setupGfx(s32 idx, s32 setupGfxCallbackArg0, UNK_FUN_PTR(fpSetupGfxCallback)) {
EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800];
entityModel->fpSetupGfxCallback = fpSetupGfxCallback;
@ -310,39 +310,39 @@ void func_80122FB8(s32 idx, s32 newFlags) {
}
void enable_entity_fog(void) {
D_80154378 = 1;
entity_fog_enabled = 1;
}
void disable_entity_fog(void) {
D_80154378 = 0;
entity_fog_enabled = 0;
}
void set_entity_fog_dist(s32 min, s32 max) {
D_8015438C = min;
D_80154390 = max;
entity_fog_dist_min = min;
entity_fog_dist_max = max;
}
void set_entity_fog_color(s32 r, s32 g, s32 b, s32 a) {
D_8015437C = r;
D_80154380 = g;
D_80154384 = b;
D_80154388 = a;
entity_fog_red = r;
entity_fog_green = g;
entity_fog_blue = b;
entity_fog_alpha = a;
}
s32 is_entity_fog_enabled(void) {
return D_80154378;
return entity_fog_enabled;
}
void get_entity_fog_distance(s32* start, s32* end) {
*start = D_8015438C;
*end = D_80154390;
*start = entity_fog_dist_min;
*end = entity_fog_dist_max;
}
void get_entity_fog_color(s32* r, s32* g, s32* b, s32* a) {
*r = D_8015437C;
*g = D_80154380;
*b = D_80154384;
*a = D_80154388;
*r = entity_fog_red;
*g = entity_fog_green;
*b = entity_fog_blue;
*a = entity_fog_alpha;
}
void stub_dynamic_entity_delegate(void) {
@ -370,7 +370,7 @@ void init_dynamic_entity_list(void) {
}
}
s32 bind_dynamic_entity_3(void (*updateFunc)(void), void (*drawFunc)(void)) {
s32 create_dynamic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void)) {
s32 i;
DynamicEntity* newDynEntity;
@ -401,7 +401,7 @@ s32 bind_dynamic_entity_3(void (*updateFunc)(void), void (*drawFunc)(void)) {
return i;
}
s32 bind_dynamic_entity_7(void (*updateFunc)(void), void (*drawFunc)(void)) {
s32 create_dynamic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(void)) {
s32 i;
DynamicEntity* newDynEntity;
@ -432,7 +432,7 @@ s32 bind_dynamic_entity_7(void (*updateFunc)(void), void (*drawFunc)(void)) {
return i;
}
s32 bind_dynamic_entity_B(void (*updateFunc)(void), void (*drawFunc)(void)) {
s32 create_dynamic_entity_backUI(void (*updateFunc)(void), void (*drawFunc)(void)) {
s32 i;
DynamicEntity* newDynEntity;
@ -475,7 +475,7 @@ void update_dynamic_entities(void) {
}
}
void render_dynamic_entities(void) {
void render_dynamic_entities_world(void) {
s32 i;
for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) {
@ -488,7 +488,7 @@ void render_dynamic_entities(void) {
}
}
void func_801234E0(void) {
void render_dynamic_entities_frontUI(void) {
s32 i;
for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) {
@ -501,7 +501,7 @@ void func_801234E0(void) {
}
}
void func_80123550(void) {
void render_dynamic_entities_backUI(void) {
s32 i;
for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) {
@ -514,7 +514,7 @@ void func_80123550(void) {
}
}
void func_801235C0(s32 idx) {
void free_dynamic_entity(s32 idx) {
if (!gGameStatusPtr->isBattle || (idx & 0x800)) {
DynamicEntityList** curDynEntityList = &gCurrentDynamicEntityListPtr;

38
src/ef070_len_3400.c → src/evt/cam_api.c
View File

@ -1,5 +1,15 @@
#include "common.h"
Script ShakeCam1 = SCRIPT({
group 0;
ShakeCam(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0);
});
Script ShakeCamX = SCRIPT({
group 0;
ShakeCam(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3));
});
ApiStatus SetCamEnabled(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 id = get_variable(script, *args++);
@ -179,9 +189,9 @@ ApiStatus SetCamTarget(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ef070_len_3400", func_802CB008, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/cam_api", func_802CB008, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ef070_len_3400", ShakeCam, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/cam_api", ShakeCam, ScriptInstance* script, s32 isInitialCall);
void exec_ShakeCam1(s32 arg0, s32 arg1, s32 arg2) {
ScriptInstance* script;
@ -248,9 +258,9 @@ ApiStatus PanToTarget(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ef070_len_3400", UseSettingsFrom, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/cam_api", UseSettingsFrom, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ef070_len_3400", LoadSettings, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/cam_api", LoadSettings, ScriptInstance* script, s32 isInitialCall);
ApiStatus SetCamType(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -459,11 +469,11 @@ ApiStatus WaitForCam(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ef070_len_3400", SetCamProperties, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/cam_api", SetCamProperties, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ef070_len_3400", AdjustCam, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/cam_api", AdjustCam, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ef070_len_3400", ResetCam, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/cam_api", ResetCam, ScriptInstance* script, s32 isInitialCall);
void func_802CCAC0(void) {
s32 i;
@ -477,7 +487,7 @@ void func_802CCAC0(void) {
}
}
INCLUDE_ASM(s32, "ef070_len_3400", draw_anim_models);
INCLUDE_ASM(s32, "evt/cam_api", draw_anim_models);
ApiStatus func_802CCCB0(ScriptInstance* script, s32 isInitialCall) {
if (!gGameStatusPtr->isBattle) {
@ -685,7 +695,7 @@ ApiStatus func_802CD418(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ef070_len_3400", func_802CD4B4);
INCLUDE_ASM(s32, "evt/cam_api", func_802CD4B4);
void func_802CD57C(void) {
if (!gGameStatusPtr->isBattle) {
@ -695,12 +705,12 @@ void func_802CD57C(void) {
}
}
INCLUDE_ASM(s32, "ef070_len_3400", func_802CD5C0);
INCLUDE_ASM(s32, "evt/cam_api", func_802CD5C0);
INCLUDE_ASM(s32, "ef070_len_3400", func_802CD6E0);
INCLUDE_ASM(s32, "evt/cam_api", func_802CD6E0);
INCLUDE_ASM(s32, "ef070_len_3400", func_802CD7D8);
INCLUDE_ASM(s32, "evt/cam_api", func_802CD7D8);
INCLUDE_ASM(s32, "ef070_len_3400", func_802CD8F8);
INCLUDE_ASM(s32, "evt/cam_api", func_802CD8F8);
INCLUDE_ASM(s32, "ef070_len_3400", func_802CD9F0);
INCLUDE_ASM(s32, "evt/cam_api", func_802CD9F0);

2
src/fe0b0_len_5a0.c → src/evt/demo_api.c
View File

@ -1,6 +1,6 @@
#include "common.h"
INCLUDE_ASM(ApiStatus, "fe0b0_len_5a0", SetSpriteShading, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/demo_api", SetSpriteShading, ScriptInstance* script, s32 isInitialCall);
ApiStatus EnableSpriteShading(ScriptInstance* script, s32 isInitialCall) {
if (get_variable(script, *script->ptrReadPos) != 0) {

8
src/f8f60_len_1560.c → src/evt/f8f60_len_1560.c
View File

@ -346,10 +346,10 @@ void setup_path_data(s32 numVecs, f32* arg1, struct Vec3f* arg2, struct Vec3f* a
heap_free(temp_s4);
}
#else
INCLUDE_ASM(s32, "f8f60_len_1560", setup_path_data);
INCLUDE_ASM(s32, "evt/f8f60_len_1560", setup_path_data);
#endif
INCLUDE_ASM(s32, "f8f60_len_1560", func_802D5270);
INCLUDE_ASM(s32, "evt/f8f60_len_1560", func_802D5270);
s32 LoadPath(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -373,7 +373,7 @@ s32 LoadPath(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "f8f60_len_1560", GetNextPathPos, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/f8f60_len_1560", GetNextPathPos, ScriptInstance* script, s32 isInitialCall);
ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
@ -390,7 +390,7 @@ ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus func_802D5830(ScriptInstance* script, s32 initialCall) {
func_80027088(get_variable(script, *script->ptrReadPos));
set_time_freeze_mode(get_variable(script, *script->ptrReadPos));
return ApiStatus_DONE2;
}

16
src/fa4c0_len_3bf0.c → src/evt/fa4c0_len_3bf0.c
View File

@ -1,8 +1,14 @@
#include "common.h"
INCLUDE_ASM(s32, "fa4c0_len_3bf0", func_802D5B10);
s32 D_802D9D30 = 0;
INCLUDE_ASM(s32, "fa4c0_len_3bf0", func_802D5C70);
INCLUDE_ASM(s32, "evt/fa4c0_len_3bf0", func_802D5B10);
Script D_802D9D34 = SCRIPT({
func_802D5B10();
});
INCLUDE_ASM(s32, "evt/fa4c0_len_3bf0", func_802D5C70);
ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -166,9 +172,11 @@ ApiStatus PlaySoundAtF(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(ApiStatus, "fa4c0_len_3bf0", func_802D6420, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/fa4c0_len_3bf0", func_802D6420, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "fa4c0_len_3bf0", func_802D663C);
INCLUDE_ASM(s32, "evt/fa4c0_len_3bf0", func_802D663C);
// TODO: probably a split here (sound_api, item_api)
ApiStatus RemoveKeyItemAt(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;

22
src/FBE10.c → src/evt/fx_api.c
View File

@ -1,8 +1,8 @@
#include "common.h"
INCLUDE_ASM(void, "FBE10", func_802D7460, f32 x, f32 y, f32 z, s32 arg3);
INCLUDE_ASM(void, "evt/fx_api", func_802D7460, f32 x, f32 y, f32 z, s32 arg3);
INCLUDE_ASM(void, "FBE10", func_802D74C0, f32 x, f32 y, f32 z, s32 arg3);
INCLUDE_ASM(void, "evt/fx_api", func_802D74C0, f32 x, f32 y, f32 z, s32 arg3);
ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -26,9 +26,9 @@ ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "FBE10", func_802D7690);
INCLUDE_ASM(s32, "evt/fx_api", func_802D7690);
INCLUDE_ASM(s32, "FBE10", ShowEmote, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/fx_api", ShowEmote, ScriptInstance* script, s32 isInitialCall);
ApiStatus RemoveEffect(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -94,6 +94,10 @@ ApiStatus func_802D7BA4(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
Script D_802D9D50 = SCRIPT({
func_802D7BA4();
});
ApiStatus Spawn802D9D50(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 var0 = get_variable(script, *args++);
@ -104,7 +108,7 @@ ApiStatus Spawn802D9D50(ScriptInstance* script, s32 isInitialCall) {
s32 var5 = get_variable(script, *args++);
s32 var6 = get_variable(script, *args++);
ScriptInstance* newScript = start_script(&D_802D9D50, 1, 0);
ScriptInstance* newScript = start_script(D_802D9D50, 1, 0);
newScript->varTable[0] = var0;
newScript->varTable[1] = var1;
newScript->varTable[2] = var2;
@ -116,10 +120,10 @@ ApiStatus Spawn802D9D50(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "FBE10", func_802D7E08);
INCLUDE_ASM(s32, "evt/fx_api", func_802D7E08);
INCLUDE_ASM(ApiStatus, "FBE10", ShowSleepBubble, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/fx_api", ShowSleepBubble, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "FBE10", func_802D8248, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/fx_api", func_802D8248, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "FBE10", PlayEffect, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/fx_api", PlayEffect, ScriptInstance* script, s32 isInitialCall);

32
src/ED510.c → src/evt/map_api.c
View File

@ -24,7 +24,7 @@ ApiStatus TranslateModel(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "ED510", TranslateModel, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", TranslateModel, ScriptInstance* script, s32 isInitialCall);
#endif
ApiStatus RotateModel(ScriptInstance* script, s32 isInitialCall) {
@ -74,7 +74,7 @@ ApiStatus ScaleModel(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "ED510", ScaleModel, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", ScaleModel, ScriptInstance* script, s32 isInitialCall);
#endif
ApiStatus GetModelIndex(ScriptInstance* script, s32 isInitialCall) {
@ -161,7 +161,7 @@ ApiStatus func_802C90FC(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "ED510", func_802C90FC);
INCLUDE_ASM(s32, "evt/map_api", func_802C90FC);
#endif
ApiStatus func_802C91A4(ScriptInstance* script, s32 isInitialCall) {
@ -266,10 +266,10 @@ ApiStatus SetModelFlags(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "ED510", SetModelFlags, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", SetModelFlags, ScriptInstance* script, s32 isInitialCall);
#endif
INCLUDE_ASM(s32, "ED510", func_802C95A0);
INCLUDE_ASM(s32, "evt/map_api", func_802C95A0);
ApiStatus func_802C971C(ScriptInstance* script, s32 isInitialCall) {
func_8011B37C((u16)get_variable(script, *script->ptrReadPos));
@ -289,11 +289,11 @@ ApiStatus func_802C9748(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ED510", TranslateGroup, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", TranslateGroup, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ED510", RotateGroup, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", RotateGroup, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ED510", ScaleGroup, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", ScaleGroup, ScriptInstance* script, s32 isInitialCall);
ApiStatus func_802C9B40(ScriptInstance* script, s32 isInitialCall) {
Bytecode* thisPos = script->ptrReadPos;
@ -304,7 +304,7 @@ ApiStatus func_802C9B40(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ED510", EnableGroup, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", EnableGroup, ScriptInstance* script, s32 isInitialCall);
ApiStatus func_802C9C70(ScriptInstance* script, s32 isInitialCall) {
Bytecode* thisPos = script->ptrReadPos;
@ -316,13 +316,13 @@ ApiStatus func_802C9C70(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ED510", modify_collider_family_flags);
INCLUDE_ASM(s32, "evt/map_api", modify_collider_family_flags);
INCLUDE_ASM(s32, "ED510", ModifyColliderFlags, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", ModifyColliderFlags, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ED510", ResetFromLava, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/map_api", ResetFromLava, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ED510", func_802C9FD4);
INCLUDE_ASM(s32, "evt/map_api", func_802C9FD4);
ApiStatus GetColliderCenter(ScriptInstance* script, s32 isInitialCall) {
f32 x, y, z;
@ -351,11 +351,11 @@ ApiStatus UpdateColliderTransform(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "ED510", set_zone_enabled);
INCLUDE_ASM(s32, "evt/map_api", set_zone_enabled);
INCLUDE_ASM(ApiStatus, "ED510", SetZoneEnabled, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/map_api", SetZoneEnabled, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "ED510", goto_map);
INCLUDE_ASM(s32, "evt/map_api", goto_map);
ApiStatus GotoMap(ScriptInstance* script, s32 isInitialCall) {
goto_map(script, 0);

2
src/f4c60_len_4300.c → src/evt/msg_api.c
View File

@ -18,7 +18,7 @@ ApiStatus SpeakToNpc(ScriptInstance* script, s32 isInitialCall) {
return _show_message(script, isInitialCall, 3);
}
INCLUDE_ASM(ApiStatus, "f4c60_len_4300", _show_message, ScriptInstance* script, s32 isInitialCall, s32 arg2);
INCLUDE_ASM(ApiStatus, "evt/msg_api", _show_message, ScriptInstance* script, s32 isInitialCall, s32 arg2);
ApiStatus ShowMessageAtScreenPos(ScriptInstance *script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;

18
src/f2470_len_27f0.c → src/evt/npc_api.c
View File

@ -24,7 +24,7 @@ void set_npc_animation(Npc* npc, u32 arg1) {
}
/// Used in battle scripts.
INCLUDE_ASM(ApiStatus, "f2470_len_27f0", CreateNpc, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/npc_api", CreateNpc, ScriptInstance* script, s32 isInitialCall);
ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -207,9 +207,9 @@ ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "f2470_len_27f0", NpcMoveTo, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/npc_api", NpcMoveTo, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "f2470_len_27f0", _npc_jump_to);
INCLUDE_ASM(s32, "evt/npc_api", _npc_jump_to);
ApiStatus NpcJump0(ScriptInstance* script, s32 isInitialCall) {
return _npc_jump_to(script, isInitialCall, 0);
@ -219,7 +219,7 @@ ApiStatus NpcJump1(ScriptInstance* script, s32 isInitialCall) {
return _npc_jump_to(script, isInitialCall, 1);
}
INCLUDE_ASM(s32, "f2470_len_27f0", NpcFlyTo, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/npc_api", NpcFlyTo, ScriptInstance* script, s32 isInitialCall);
ApiStatus GetNpcYaw(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;
@ -248,11 +248,11 @@ ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "f2470_len_27f0", InterpNpcYaw, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/npc_api", InterpNpcYaw, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "f2470_len_27f0", NpcFacePlayer, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/npc_api", NpcFacePlayer, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "f2470_len_27f0", NpcFaceNpc, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/npc_api", NpcFaceNpc, ScriptInstance* script, s32 isInitialCall);
ApiStatus SetNpcFlagBits(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -432,9 +432,9 @@ ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(ApiStatus, "f2470_len_27f0", BringPartnerOut, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/npc_api", BringPartnerOut, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "f2470_len_27f0", PutPartnerAway, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/npc_api", PutPartnerAway, ScriptInstance* script, s32 isInitialCall);
ApiStatus GetCurrentPartnerID(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner);

118
src/F5750.c → src/evt/player_api.c
View File

@ -18,6 +18,8 @@ typedef UnkF5750* UnkF5750List[0x40];
extern s16 D_802DB5B0;
extern UnkF5750List* D_802DB7C0;
Npc* playerNpc = (Npc*) 0x802DB270; // XXX: raw ptr
ApiStatus HidePlayerShadow(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 hideShadow = get_variable(script, *args++);
@ -73,13 +75,13 @@ ApiStatus SetPlayerPos(ScriptInstance* script, s32 isInitialCall) {
f32 y = get_variable(script, *args++);
f32 z = get_variable(script, *args++);
gPlayerNpcPtr->pos.x = x;
gPlayerNpcPtr->pos.y = y;
gPlayerNpcPtr->pos.z = z;
playerNpc->pos.x = x;
playerNpc->pos.y = y;
playerNpc->pos.z = z;
playerStatus->position.x = gPlayerNpcPtr->pos.x;
playerStatus->position.y = gPlayerNpcPtr->pos.y;
playerStatus->position.z = gPlayerNpcPtr->pos.z;
playerStatus->position.x = playerNpc->pos.x;
playerStatus->position.y = playerNpc->pos.y;
playerStatus->position.z = playerNpc->pos.z;
return ApiStatus_DONE2;
}
@ -88,7 +90,7 @@ ApiStatus SetPlayerCollisionSize(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 height = get_variable(script, *args++);
s32 radius = get_variable(script, *args);
Npc* player = gPlayerNpcPtr;
Npc* player = playerNpc;
PlayerStatus* playerStatus = &gPlayerStatus;
player->collisionHeight = height;
@ -101,12 +103,12 @@ ApiStatus SetPlayerCollisionSize(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus SetPlayerSpeed(ScriptInstance* script, s32 isInitialCall) {
gPlayerNpcPtr->moveSpeed = get_float_variable(script, *script->ptrReadPos);
playerNpc->moveSpeed = get_float_variable(script, *script->ptrReadPos);
return ApiStatus_DONE2;
}
ApiStatus SetPlayerJumpscale(ScriptInstance* script, s32 isInitialCall) {
gPlayerNpcPtr->jumpScale = get_float_variable(script, *script->ptrReadPos);
playerNpc->jumpScale = get_float_variable(script, *script->ptrReadPos);
return ApiStatus_DONE2;
}
@ -117,7 +119,7 @@ ApiStatus SetPlayerAnimation(ScriptInstance* script, s32 isInitialCall) {
animation = get_variable(script, *args);
gPlayerNpcPtr->currentAnim = animation;
playerNpc->currentAnim = animation;
gPlayerAnimation = animation;
if (animation == 0x80003) {
@ -127,7 +129,7 @@ ApiStatus SetPlayerAnimation(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "F5750", SetPlayerAnimation, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/player_api", SetPlayerAnimation, ScriptInstance* script, s32 isInitialCall);
#endif
ApiStatus SetPlayerActionState(ScriptInstance* script, s32 isInitialCall) {
@ -136,7 +138,7 @@ ApiStatus SetPlayerActionState(ScriptInstance* script, s32 isInitialCall) {
}
ApiStatus SetPlayerAnimationSpeed(ScriptInstance* script, s32 isInitialCall) {
gPlayerNpcPtr->animationSpeed = get_float_variable(script, *script->ptrReadPos);
playerNpc->animationSpeed = get_float_variable(script, *script->ptrReadPos);
return ApiStatus_DONE2;
}
@ -154,8 +156,8 @@ ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) {
if (script->functionTemp[0].s == 0) {
script->functionTemp[0].s = dist2D(playerStatus->position.x, playerStatus->position.z, targetX,
targetZ) / gPlayerNpcPtr->moveSpeed;
moveSpeed = gPlayerNpcPtr->moveSpeed;
targetZ) / playerNpc->moveSpeed;
moveSpeed = playerNpc->moveSpeed;
} else {
moveSpeed = dist2D(playerStatus->position.x, playerStatus->position.z, targetX, targetZ) / script->functionTemp[0].s;
}
@ -167,11 +169,11 @@ ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) {
return script->functionTemp[0].s < 0;
}
INCLUDE_ASM(s32, "F5750", func_802D1270);
INCLUDE_ASM(s32, "evt/player_api", func_802D1270);
INCLUDE_ASM(s32, "F5750", func_802D1380);
INCLUDE_ASM(s32, "evt/player_api", func_802D1380);
INCLUDE_ASM(s32, "F5750", player_jump);
INCLUDE_ASM(s32, "evt/player_api", player_jump);
ApiStatus PlayerJump(ScriptInstance* script, s32 isInitialCall) {
return player_jump(script, isInitialCall, 0);
@ -193,7 +195,7 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
s32* time = &script->functionTemp[3].s;
if (isInitialCall) {
Npc** player = &gPlayerNpcPtr;
Npc** player = &playerNpc;
(*player)->yaw = playerStatus->targetYaw;
*initialYaw = (*player)->yaw;
@ -210,7 +212,7 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
}
if (*time > 0) {
Npc** player = &gPlayerNpcPtr;
Npc** player = &playerNpc;
(*player)->duration++;
(*player)->yaw = *initialYaw + ((*deltaYaw * (*player)->duration) / *time);
@ -219,7 +221,7 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
return !((*player)->duration < *time);
} else {
Npc** player = &gPlayerNpcPtr;
Npc** player = &playerNpc;
(*player)->yaw += *deltaYaw;
(*player)->yaw = clamp_angle((*player)->yaw);
@ -229,7 +231,7 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
}
}
INCLUDE_ASM(s32, "F5750", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/player_api", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall);
ApiStatus GetPlayerTargetYaw(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, gPlayerStatus.targetYaw);
@ -309,16 +311,16 @@ ApiStatus DisablePartner(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(ApiStatus, "F5750", UseEntryHeading, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", UseEntryHeading, ScriptInstance* script, s32 isInitialCall);
ApiStatus func_802D2148(ScriptInstance* script, s32 isInitialCall) {
gPlayerStatus.flags &= ~0x4000000;
return ApiStatus_DONE2;
}
INCLUDE_ASM(ApiStatus, "F5750", UseExitHeading, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", UseExitHeading, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "F5750", func_802D23F8);
INCLUDE_ASM(s32, "evt/player_api", func_802D23F8);
ApiStatus WaitForPlayerTouchingFloor(ScriptInstance* script, s32 isInitialCall) {
if ((gCollisionStatus.currentFloor >= 0) && (func_802D23F8() != 0)) {
@ -352,7 +354,7 @@ ApiStatus WaitForPlayerInputEnabled(ScriptInstance* script, s32 isInitialCall) {
return !(gPlayerStatus.flags & 0x2000) * ApiStatus_DONE2;
}
INCLUDE_ASM(ApiStatus, "F5750", func_802D2520, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D2520, ScriptInstance* script, s32 isInitialCall);
ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) {
s32 temp = *script->ptrReadPos;
@ -361,7 +363,7 @@ ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "F5750", func_802D2884);
INCLUDE_ASM(s32, "evt/player_api", func_802D2884);
ApiStatus DisablePulseStone(ScriptInstance* script, s32 isInitialCall) {
PlayerStatus* playerStatus = &gPlayerStatus;
@ -450,21 +452,21 @@ ApiStatus PlaySoundAtPlayer(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "F5750", func_802D2D30);
INCLUDE_ASM(s32, "evt/player_api", func_802D2D30);
INCLUDE_ASM(s32, "F5750", func_802D2ED4);
INCLUDE_ASM(s32, "evt/player_api", func_802D2ED4);
INCLUDE_ASM(s32, "F5750", func_802D2F34);
INCLUDE_ASM(s32, "evt/player_api", func_802D2F34);
INCLUDE_ASM(s32, "F5750", func_802D2FCC);
INCLUDE_ASM(s32, "evt/player_api", func_802D2FCC);
INCLUDE_ASM(s32, "F5750", func_802D3028);
INCLUDE_ASM(s32, "evt/player_api", func_802D3028);
INCLUDE_ASM(s32, "F5750", func_802D31E0);
INCLUDE_ASM(s32, "evt/player_api", func_802D31E0);
INCLUDE_ASM(s32, "F5750", func_802D3398);
INCLUDE_ASM(s32, "evt/player_api", func_802D3398);
INCLUDE_ASM(s32, "F5750", func_802D33D4);
INCLUDE_ASM(s32, "evt/player_api", func_802D33D4);
ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -495,7 +497,7 @@ ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall) {
temp->unk_20 = 1.0f;
temp->unk_24 = 1.0f;
update_entity_rendercmd(temp->unk_00);
exec_entity_model_commandlist(temp->unk_00);
set_variable(script, outVar, i);
return ApiStatus_DONE2;
@ -530,52 +532,52 @@ ApiStatus func_802D354C(ScriptInstance* script, s32 isInitialCall) {
temp->unk_20 = 1.0f;
temp->unk_24 = 1.0f;
update_entity_rendercmd(temp->unk_00);
exec_entity_model_commandlist(temp->unk_00);
set_variable(script, outVar, i);
return ApiStatus_DONE2;
}
INCLUDE_ASM(ApiStatus, "F5750", func_802D3624, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D3624, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "F5750", func_802D3674);
INCLUDE_ASM(s32, "evt/player_api", func_802D3674);
INCLUDE_ASM(ApiStatus, "F5750", func_802D36E0, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D36E0, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "F5750", func_802D378C);
INCLUDE_ASM(s32, "evt/player_api", func_802D378C);
INCLUDE_ASM(ApiStatus, "F5750", func_802D3840, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D3840, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "F5750", func_802D38EC, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D38EC, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "F5750", func_802D3998);
INCLUDE_ASM(s32, "evt/player_api", func_802D3998);
INCLUDE_ASM(ApiStatus, "F5750", func_802D39FC, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D39FC, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "F5750", func_802D3A60);
INCLUDE_ASM(s32, "evt/player_api", func_802D3A60);
INCLUDE_ASM(ApiStatus, "F5750", func_802D3C58, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "evt/player_api", func_802D3C58, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "F5750", func_802D3EB8);
INCLUDE_ASM(s32, "evt/player_api", func_802D3EB8);
INCLUDE_ASM(s32, "F5750", func_802D3F74);
INCLUDE_ASM(s32, "evt/player_api", func_802D3F74);
INCLUDE_ASM(s32, "F5750", func_802D3FC8);
INCLUDE_ASM(s32, "evt/player_api", func_802D3FC8);
INCLUDE_ASM(s32, "F5750", func_802D4050);
INCLUDE_ASM(s32, "evt/player_api", func_802D4050);
UnkF5750* func_802D4164(s32 index) {
return (*D_802DB7C0)[index];
}
INCLUDE_ASM(s32, "F5750", func_802D417C);
INCLUDE_ASM(s32, "evt/player_api", func_802D417C);
void func_802D420C(UnkF5750* arg0);
INCLUDE_ASM(void, "F5750", func_802D420C, UnkF5750* arg0);
INCLUDE_ASM(void, "evt/player_api", func_802D420C, UnkF5750* arg0);
INCLUDE_ASM(s32, "F5750", func_802D42AC);
INCLUDE_ASM(s32, "evt/player_api", func_802D42AC);
INCLUDE_ASM(s32, "F5750", func_802D4364);
INCLUDE_ASM(s32, "evt/player_api", func_802D4364);
void func_802D43AC(s32 index, f32 arg1, f32 arg2, f32 arg3) {
UnkF5750* temp = (*D_802DB7C0)[index];
@ -593,10 +595,10 @@ void func_802D43D0(s32 index, s32 arg1, s32 arg2, s32 arg3) {
temp->unk_18 = arg3;
}
INCLUDE_ASM(s32, "F5750", func_802D43F4);
INCLUDE_ASM(s32, "evt/player_api", func_802D43F4);
INCLUDE_ASM(s32, "F5750", func_802D4434);
INCLUDE_ASM(s32, "evt/player_api", func_802D4434);
INCLUDE_ASM(s32, "F5750", func_802D4488);
INCLUDE_ASM(s32, "evt/player_api", func_802D4488);
INCLUDE_ASM(s32, "F5750", func_802D4560);
INCLUDE_ASM(s32, "evt/player_api", func_802D4560);

12
src/e79b0_len_1920.c → src/evt/script_list.c
View File

@ -136,7 +136,7 @@ void init_script_list(void) {
void func_802C3390(ScriptInstance* script) {
s32 arg;
switch (D_8009A5D8) {
switch (timeFreezeMode) {
default:
case 0:
case 4:
@ -218,7 +218,7 @@ ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialSta
return newScript;
}
#else
INCLUDE_ASM(ScriptInstance*, "e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority,
INCLUDE_ASM(ScriptInstance*, "evt/script_list", start_script, Bytecode* initialLine, s32 priority,
s32 initialState);
#endif
@ -294,7 +294,7 @@ ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, u8 ini
return newScript;
}
INCLUDE_ASM(s32, "e79b0_len_1920", start_child_script);
INCLUDE_ASM(s32, "evt/script_list", start_child_script);
#ifdef NON_MATCHING
// appears to be functionally equivalent, some ordering and regalloc issues
@ -363,7 +363,7 @@ ScriptInstance* func_802C39F8(ScriptInstance* parentScript, Bytecode* nextLine,
return child;
}
#else
INCLUDE_ASM(ScriptInstance*, "e79b0_len_1920", func_802C39F8, ScriptInstance* parentScript, Bytecode* nextLine,
INCLUDE_ASM(ScriptInstance*, "evt/script_list", func_802C39F8, ScriptInstance* parentScript, Bytecode* nextLine,
s32 newState);
#endif
@ -431,10 +431,10 @@ ScriptInstance* restart_script(ScriptInstance* script) {
return script;
}
INCLUDE_ASM(s32, "e79b0_len_1920", update_scripts);
INCLUDE_ASM(s32, "evt/script_list", update_scripts);
// this function is evil.
INCLUDE_ASM(s32, "e79b0_len_1920", func_802C3EE4);
INCLUDE_ASM(s32, "evt/script_list", func_802C3EE4);
void kill_script(ScriptInstance* instanceToKill) {
ScriptInstance* childScript;

26
src/si.c → src/evt/si.c
View File

@ -1135,14 +1135,14 @@ ApiStatus si_handle_bind_lock(ScriptInstance* script) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "si", si_handle_spawn_thread, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/si", si_handle_spawn_thread, ScriptInstance* script, s32 isInitialCall);
ApiStatus si_handle_end_spawn_thread(ScriptInstance* script) {
kill_script(script);
return ApiStatus_FINISH;
}
INCLUDE_ASM(s32, "si", si_handle_parallel_thread, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/si", si_handle_parallel_thread, ScriptInstance* script, s32 isInitialCall);
ApiStatus si_handle_end_parallel_thread(ScriptInstance* script) {
kill_script(script);
@ -1153,7 +1153,7 @@ ApiStatus func_802C6E14(ScriptInstance* script) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "si", si_handle_print_debug_var, ScriptInstance* script, s32 isInitialCall);
INCLUDE_ASM(s32, "evt/si", si_handle_print_debug_var, ScriptInstance* script, s32 isInitialCall);
ApiStatus func_802C739C(ScriptInstance* script) {
script->ptrSavedPosition = (Bytecode*)*script->ptrReadPos;
@ -1175,7 +1175,7 @@ s32 func_802C73B8(ScriptInstance* script) {
return 1;
}
INCLUDE_ASM(s32, "si", si_execute_next_command);
INCLUDE_ASM(s32, "evt/si", si_execute_next_command);
// TODO: consider renaming to si_get_variable
#ifdef NON_MATCHING
@ -1233,7 +1233,7 @@ s32 get_variable(ScriptInstance* script, Bytecode var) {
}
}
#else
INCLUDE_ASM(s32, "si", get_variable, ScriptInstance* script, Bytecode var);
INCLUDE_ASM(s32, "evt/si", get_variable, ScriptInstance* script, Bytecode var);
#endif
s32 get_variable_index(ScriptInstance* script, s32 var) {
@ -1322,7 +1322,7 @@ s32 get_variable_index_alt(s32 var) {
return var;
}
INCLUDE_ASM(s32, "si", set_variable, ScriptInstance* script, Bytecode var, s32 value);
INCLUDE_ASM(s32, "evt/si", set_variable, ScriptInstance* script, Bytecode var, s32 value);
// Tiny regalloc issue with the var <= -80000000 / -60000000 blocks
#ifdef NON_MATCHING
@ -1371,10 +1371,10 @@ f32 get_float_variable(ScriptInstance* script, Bytecode var) {
}
}
#else
INCLUDE_ASM(f32, "si", get_float_variable, ScriptInstance* script, Bytecode var);
INCLUDE_ASM(f32, "evt/si", get_float_variable, ScriptInstance* script, Bytecode var);
#endif
INCLUDE_ASM(f32, "si", set_float_variable, ScriptInstance* script, Bytecode var, f32 value);
INCLUDE_ASM(f32, "evt/si", set_float_variable, ScriptInstance* script, Bytecode var, f32 value);
Bytecode* si_find_label(ScriptInstance* script, s32 arg1) {
Bytecode* ret = script->ptrReadPos;
@ -1395,7 +1395,7 @@ Bytecode* si_find_label(ScriptInstance* script, s32 arg1) {
return ret;
}
INCLUDE_ASM(Bytecode*, "si", si_skip_if, ScriptInstance* script);
INCLUDE_ASM(Bytecode*, "evt/si", si_skip_if, ScriptInstance* script);
// Matching but needs rodata support
/*Bytecode* si_skip_if(ScriptInstance* script) {
s32 nestedIfDepth = 0;
@ -1435,7 +1435,7 @@ INCLUDE_ASM(Bytecode*, "si", si_skip_if, ScriptInstance* script);
} while(1);
}*/
INCLUDE_ASM(Bytecode*, "si", si_skip_else, ScriptInstance* script);
INCLUDE_ASM(Bytecode*, "evt/si", si_skip_else, ScriptInstance* script);
// Matching but needs rodata support
/*Bytecode* si_skip_else(ScriptInstance* script) {
s32 nestedIfDepth = 0;
@ -1471,8 +1471,8 @@ INCLUDE_ASM(Bytecode*, "si", si_skip_else, ScriptInstance* script);
} while(1);
}*/
INCLUDE_ASM(Bytecode*, "si", si_goto_end_case, ScriptInstance* script);
INCLUDE_ASM(Bytecode*, "evt/si", si_goto_end_case, ScriptInstance* script);
INCLUDE_ASM(Bytecode*, "si", si_goto_next_case, ScriptInstance* script);
INCLUDE_ASM(Bytecode*, "evt/si", si_goto_next_case, ScriptInstance* script);
INCLUDE_ASM(Bytecode*, "si", si_goto_end_loop, ScriptInstance* script);
INCLUDE_ASM(Bytecode*, "evt/si", si_goto_end_loop, ScriptInstance* script);

8
src/f270_len_1190.c
View File

@ -310,7 +310,7 @@ void state_init_pause(void) {
D_800A0921 = 0;
D_800A0922 = 0;
disable_player_input();
func_80027088(3);
set_time_freeze_mode(3);
set_windows_visible(2);
}
@ -488,10 +488,10 @@ void state_step_unpause(void) {
func_8003B1B0();
set_windows_visible(0);
func_800E98C4();
func_80027088(1);
set_time_freeze_mode(1);
D_800A0921 = 3;
playerStatus = &gPlayerStatus;
playerStatus->unk_0F = playerStatus->unk_0E - 1;
playerStatus->alpha2 = playerStatus->alpha1 - 1;
D_802D9D71 = D_802D9D70 + 1;
update_counters();
@ -525,7 +525,7 @@ void state_step_unpause(void) {
}
break;
case 4:
func_80027088(0);
set_time_freeze_mode(0);
update_counters();
npc_list_update();
update_player();

4
src/npc.c
View File

@ -391,7 +391,7 @@ void func_8003E338(void) {
func_80045AC0();
gGameState = 0;
bind_dynamic_entity_3(0, npc_dyn_entity_draw_no_op);
create_dynamic_entity_world(0, npc_dyn_entity_draw_no_op);
}
void clear_encounter_status(void) {
@ -432,7 +432,7 @@ void clear_encounter_status(void) {
func_80045AC0();
gGameState = 0;
bind_dynamic_entity_3(NULL, npc_dyn_entity_draw_no_op);
create_dynamic_entity_world(NULL, npc_dyn_entity_draw_no_op);
}
void func_8003E50C(void) {

2
src/sprite.c
View File

@ -275,7 +275,7 @@ s32 func_802DDA84(void) {
return 0;
}
INCLUDE_ASM(s32, "sprite", func_802DDA8C);
INCLUDE_ASM(void, "sprite", func_802DDA8C, s32 arg0, s32 arg1, f32 arg2);
INCLUDE_ASM(s32, "sprite", render_sprite);

2
src/world/action/idle.c
View File

@ -36,7 +36,7 @@ void world_action_idle_update(void) {
playerStatus->decorationList = 0;
playerStatus->unk_C2 = 0;
playerStatus->currentSpeed = 0.0f;
playerStatus->unk_8C = 0;
playerStatus->unk_8C = 0.0f;
if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) {
anim = 0x90002;

2
src/world/area_arn/arn_02/arn_02.h
View File

@ -13,4 +13,4 @@ NpcGroupList N(npcGroupList_80241A9C);
Script N(makeEntities);
ApiStatus N(func_80240C90_BDDE40)(ScriptInstance *script, s32 isInitialCall);
extern s16 D_8009A634;
extern s16 gCurrentCamID;

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

@ -204,7 +204,7 @@ s32 N(func_80240000_BDD1B0)(ScriptInstance* script, NpcAISettings* aiSettings, E
PlayerStatus** playerStatus;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
f32 phi_f20;
s32 ret = FALSE;

4
src/world/area_arn/arn_03/arn_03.h
View File

@ -5,7 +5,7 @@
#define NAMESPACE arn_03
ApiStatus N(SomeXYZFuncTodoRename)(ScriptInstance* script, s32 isInitialCall);
ApiStatus N(AddPlayerHandsOffset)(ScriptInstance* script, s32 isInitialCall);
ApiStatus N(func_80241648_BE03D8)(ScriptInstance* script, s32 isInitialCall);
ApiStatus N(func_80241680_BE0410)(ScriptInstance* script, s32 isInitialCall);
ApiStatus N(func_802415F4_BE0384)(ScriptInstance* script, s32 isInitialCall);
@ -17,7 +17,7 @@ NpcGroupList N(npcGroupList_80244740);
NpcGroupList N(npcGroupList_80244788);
Script N(makeEntities);
ApiStatus N(func_8024113C_BDFECC)(ScriptInstance *script, s32 isInitialCall);
ApiStatus N(SomeXYZFuncTodoRename)(ScriptInstance *script, s32 isInitialCall);
ApiStatus N(AddPlayerHandsOffset)(ScriptInstance *script, s32 isInitialCall);
ApiStatus N(func_80241648_BE03D8)(ScriptInstance *script, s32 isInitialCall);
ApiStatus N(func_80241680_BE0410)(ScriptInstance *script, s32 isInitialCall);
ApiStatus N(func_802415F4_BE0384)(ScriptInstance *script, s32 isInitialCall);

4
src/world/area_arn/arn_03/events.c
View File

@ -123,7 +123,7 @@ Script N(80241CD4) = SCRIPT({
else {
RemoveKeyItemAt(SI_VAR(1));
GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5));
N(SomeXYZFuncTodoRename)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
N(AddPlayerHandsOffset)(SI_VAR(3), SI_VAR(4), SI_VAR(5));
SI_VAR(0) |=c 0x50000;
MakeItemEntity(SI_VAR(0), SI_VAR(3), SI_VAR(4), SI_VAR(5), 1, 0);
SetPlayerAnimation(0x60005);
@ -1234,7 +1234,7 @@ ApiStatus N(func_802412B0_BE0040)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
ApiStatus N(func_802415F4_BE0384)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;

2
src/world/area_arn/arn_04/arn_04.h
View File

@ -14,4 +14,4 @@ Script N(802433D0);
NpcGroupList N(npcGroupList_80244000);
Script N(makeEntities);
extern s16 D_8009A634;
extern s16 gCurrentCamID;

4
src/world/area_arn/arn_04/events.c
View File

@ -652,7 +652,7 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings,
if (aiSettings->unk_14 >= 0) {
if (script->functionTemp[1].s <= 0) {
script->functionTemp[1].s = aiSettings->unk_14;
if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) &&
func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) {
fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var);
npc->moveToPos.y = npc->pos.y;
@ -968,7 +968,7 @@ s32 N(func_80242388_BE5B38)(ScriptInstance* script, NpcAISettings *aiSettings, E
PlayerStatus** playerStatus;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
f32 phi_f20;
s32 ret = FALSE;

4
src/world/area_dgb/dgb_02/C2EBA0.c
View File

@ -2,7 +2,7 @@
#include "sprite/npc/world_clubba.h"
#include "message_ids.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
extern Npc* wPartnerNpc;
enum {
@ -425,7 +425,7 @@ s32 N(func_80240208_C2EDA8)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_dgb/dgb_03/C31730.c
View File

@ -2,7 +2,7 @@
#include "sprite/npc/world_clubba.h"
#include "message_ids.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
extern Npc* wPartnerNpc;
enum {
@ -750,7 +750,7 @@ s32 N(func_80240458_C31938)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_dgb/dgb_05/C3AA10.c
View File

@ -2,7 +2,7 @@
#include "sprite/npc/world_clubba.h"
#include "message_ids.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
extern Npc* wPartnerNpc;
enum {
@ -360,7 +360,7 @@ s32 N(func_80240268_C3AC78)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_dgb/dgb_07/C3DBF0.c
View File

@ -2,7 +2,7 @@
#include "message_ids.h"
#include "sprite/npc/world_clubba.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
extern Npc* wPartnerNpc;
enum {
@ -269,7 +269,7 @@ s32 N(func_80240208_C3DDF8)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_dgb/dgb_08/C3FDB0.c
View File

@ -4,7 +4,7 @@
#include "sprite/npc/world_clubba.h"
#include "sprite/npc/world_tubba.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
enum {
NPC_WORLD_CLUBBA7,
@ -1231,7 +1231,7 @@ s32 N(func_80241098_C40E48)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_dgb/dgb_09/C46BE0.c
View File

@ -3,7 +3,7 @@
#include "sprite/npc/sentinel.h"
#include "sprite/npc/world_clubba.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
extern Npc* wPartnerNpc;
enum {
@ -610,7 +610,7 @@ s32 N(func_80240208_C46DE8)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_dgb/dgb_15/C4F510.c
View File

@ -2,7 +2,7 @@
#include "message_ids.h"
#include "sprite/npc/world_tubba.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
enum {
NPC_WORLD_TUBBA,
@ -456,7 +456,7 @@ s32 N(func_80240208_C4F718)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_dgb/dgb_16/C52540.c
View File

@ -2,7 +2,7 @@
#include "message_ids.h"
#include "sprite/npc/world_clubba.h"
extern s16 D_8009A634;
extern s16 gCurrentCamID;
extern Npc* wPartnerNpc;
enum {
@ -626,7 +626,7 @@ s32 N(func_80240208_C52748)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_dro/dro_01/95B7E0.c
View File

@ -241,7 +241,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802424D4_95D6D4);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242730_95D930);
/*

4
src/world/area_dro/dro_02/9694C0.c
View File

@ -99,7 +99,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243068_96C228);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802432C0_96C480);
/*
@ -128,7 +128,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243314_96C4D4);
/*
ApiStatus N(func_80243314_96C4D4)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_flo/flo_08/CAFAC0.c
View File

@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_8024150C_CB024C);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241970_CB06B0);
/*
@ -39,7 +39,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802419C4_CB0704);
/*
ApiStatus N(func_802419C4_CB0704)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

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

@ -32,7 +32,7 @@ ApiStatus N(func_8024027C_CC10AC)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_802405C0_CC13F0);
/*
@ -61,7 +61,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_80240614_CC1444);
/*
ApiStatus N(func_80240614_CC1444)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

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

@ -121,7 +121,7 @@ ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242234_CCD544);
/*

4
src/world/area_flo/flo_23/CEE2A0.c
View File

@ -2,7 +2,7 @@
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_8024026C_CEE4CC);
/*
@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_23/CEE2A0", func_802402C0_CEE520);
/*
ApiStatus N(func_802402C0_CEE520)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

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

@ -190,7 +190,7 @@ ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241D58_CF4928);
/*

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

@ -32,7 +32,7 @@ ApiStatus N(func_80240310_A397F0)(ScriptInstance* script, s32 isInitialCall) {
#define NAMESPACE dup_hos_06
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#define NAMESPACE hos_06
INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34);
@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88);
/*
ApiStatus N(func_802406A8_A39B88)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

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

@ -2,7 +2,7 @@
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C);
/*
@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0);
/*
ApiStatus N(func_80240FD0_A3A4B0)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_iwa/iwa_10/91F5A0.c
View File

@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241030_91F5A0);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0_91F950);
/*
@ -33,7 +33,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434_91F9A4);
/*
ApiStatus N(func_80241434_91F9A4)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_jan/jan_00/B20540.c
View File

@ -37,7 +37,7 @@ ApiStatus N(func_802403F4_B20934)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240738_B20C78);
/*
@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C_B20CCC);
/*
ApiStatus N(func_8024078C_B20CCC)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_jan/jan_02/B2C8A0.c
View File

@ -168,7 +168,7 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C);
/*

2
src/world/area_jan/jan_03/B34BD0.c
View File

@ -206,7 +206,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8);
/*

2
src/world/area_jan/jan_05/B4B260.c
View File

@ -36,7 +36,7 @@ s32 N(func_80241AD4_B4C544)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_jan/jan_06/B52F70.c
View File

@ -36,7 +36,7 @@ s32 N(func_80241A24_B54254)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_jan/jan_07/B59870.c
View File

@ -18,7 +18,7 @@ s32 N(func_8024041C_B59C8C)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_jan/jan_08/B5F650.c
View File

@ -20,7 +20,7 @@ s32 N(func_80241870_B5FB20)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_jan/jan_09/B663F0.c
View File

@ -18,7 +18,7 @@ s32 N(func_80240D5C_B6680C)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_jan/jan_12/B73570.c
View File

@ -18,7 +18,7 @@ s32 N(func_802408DC_B7398C)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_kkj/kkj_18/AF2FE0.c
View File

@ -2,7 +2,7 @@
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024056C_AF320C);
/*
@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_802405C0_AF3260);
/*
ApiStatus N(func_802405C0_AF3260)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_kkj/kkj_19/AF7C00.c
View File

@ -2,7 +2,7 @@
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C);
/*
@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240530_AF7E80);
/*
ApiStatus N(func_80240530_AF7E80)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_kmr/kmr_02/8B0070.c
View File

@ -117,7 +117,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC);
/*
@ -146,7 +146,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330);
/*
ApiStatus N(func_802422C0_8B2330)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_kmr/kmr_06/8D2A10.c
View File

@ -20,7 +20,7 @@ ApiStatus func_80241CC8_8D31D8(ScriptInstance* script, s32 isInitialCall) {
s32 mapVar11 = get_variable(script, SI_MAP_VAR(11));
s32 mapVar12 = get_variable(script, SI_MAP_VAR(12));
func_801235C0(mapVar10[1]);
free_dynamic_entity(mapVar10[1]);
heap_free(mapVar10);
heap_free(mapVar11);

4
src/world/area_kpa/kpa_81/A78510.c
View File

@ -2,7 +2,7 @@
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C);
/*
@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790);
/*
ApiStatus N(func_802402D0_A78790)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_kpa/kpa_82/A7A550.c
View File

@ -2,7 +2,7 @@
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C);
/*
@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802402D0_A7A7D0);
/*
ApiStatus N(func_802402D0_A7A7D0)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_kzn/kzn_02/C5AC20.c
View File

@ -217,7 +217,7 @@ ApiStatus N(func_80241FCC_C5C70C)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242310_C5CA50);
/*

6
src/world/area_kzn/kzn_03/C61020.c
View File

@ -26,7 +26,7 @@ s32 N(func_80240E00_C61B10)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;
@ -196,7 +196,7 @@ ApiStatus N(func_8024259C_C632AC)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802428E0_C635F0);
/*
@ -225,7 +225,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242934_C63644);
/*
ApiStatus N(func_80242934_C63644)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_kzn/kzn_08/C71ED0.c
View File

@ -202,7 +202,7 @@ s32 N(func_80242744_C73BC4)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

6
src/world/area_kzn/kzn_09/C77D00.c
View File

@ -14,7 +14,7 @@ s32 N(func_80241228_C77F08)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;
@ -196,7 +196,7 @@ ApiStatus N(func_802432AC_C79F8C)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802435F0_C7A2D0);
/*
@ -225,7 +225,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243644_C7A324);
/*
ApiStatus N(func_80243644_C7A324)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

6
src/world/area_kzn/kzn_17/C85DC0.c
View File

@ -14,7 +14,7 @@ s32 N(func_80240518_C85FC8)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;
@ -196,7 +196,7 @@ ApiStatus N(func_8024259C_C8804C)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802428E0_C88390);
/*
@ -225,7 +225,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242934_C883E4);
/*
ApiStatus N(func_80242934_C883E4)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

6
src/world/area_kzn/kzn_19/C8DBB0.c
View File

@ -89,7 +89,7 @@ ApiStatus N(func_80240A14_C8E5C4)(ScriptInstance* script, s32 isInitialCall) {
ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f));
ptr->unk_4C = clamp_angle(ptr->unk_4C + 8);
if (dist2D(playerStatus->position.x, playerStatus->position.z,
if (dist2D(playerStatus->position.x, playerStatus->position.z,
ptr->unk_18, ptr->unk_20) <= 30.0f) {
ptr->unk_4E = 3;
}
@ -146,7 +146,7 @@ ApiStatus N(func_80241468_C8F018)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802417AC_C8F35C);
/*
@ -175,7 +175,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241800_C8F3B0);
/*
ApiStatus N(func_80241800_C8F3B0)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_kzn/kzn_20/C96240.c
View File

@ -29,7 +29,7 @@ ApiStatus N(func_80240310_C96240)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240654_C96584);
/*
@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406A8_C965D8);
/*
ApiStatus N(func_802406A8_C965D8)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_mac/mac_00/7EB340.c
View File

@ -77,7 +77,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241694_7EC3A4);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600);
/*
@ -106,7 +106,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654);
/*
ApiStatus N(func_80241944_7EC654)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_mac/mac_00/7ED280.c
View File

@ -198,7 +198,7 @@ ApiStatus N(func_80243400_7EE110)(ScriptInstance* script, s32 isInitialCall) {
#define NAMESPACE mac_00
#define NAMESPACE dup_mac_00
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#define NAMESPACE mac_00
INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454);

2
src/world/area_mac/mac_01/8017D0.c
View File

@ -291,7 +291,7 @@ ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554);
/*

2
src/world/area_mac/mac_02/823BF0.c
View File

@ -241,7 +241,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242824_825AE4);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40);
/*

4
src/world/area_mac/mac_03/831B20.c
View File

@ -79,7 +79,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241514_832D14);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70);
/*
@ -108,7 +108,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4);
/*
ApiStatus N(func_802417C4_832FC4)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_mac/mac_04/843030.c
View File

@ -77,7 +77,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414C4_844094);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0);
/*
@ -106,7 +106,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344);
/*
ApiStatus N(func_80241774_844344)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_mac/mac_05/852170.c
View File

@ -249,7 +249,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242384_8544F4);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750);
/*

2
src/world/area_mim/mim_01/B93940.c
View File

@ -14,7 +14,7 @@ s32 N(func_80240708_B93B48)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_mim/mim_02/B97C70.c
View File

@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240C60_B98860);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802410B0_B98CB0);
/*
@ -47,7 +47,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80241104_B98D04);
/*
ApiStatus N(func_80241104_B98D04)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_mim/mim_05/BA07A0.c
View File

@ -14,7 +14,7 @@ s32 N(func_80240278_BA09A8)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_mim/mim_06/BA4CF0.c
View File

@ -14,7 +14,7 @@ s32 N(func_80240778_BA4EF8)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

2
src/world/area_mim/mim_08/BAD940.c
View File

@ -137,7 +137,7 @@ s32 N(func_802417A0_BAF0E0)(ScriptInstance *script) {
PlayerStatus** playerStatus = &gPlayerStatusPtr;
Enemy* enemy = script->owner1.enemy;
Npc *npc = get_npc_unsafe(enemy->npcID);
Camera* camera = CAM2(D_8009A634);
Camera* camera = CAM2(gCurrentCamID);
Enemy* enemy2 = get_enemy(enemy->npcID + 1);
f32 phi_f20;
s32 ret = TRUE;

4
src/world/area_nok/nok_01/9C53E0.c
View File

@ -117,7 +117,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC_9C71AC);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408);
/*
@ -146,7 +146,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C);
/*
ApiStatus N(func_8024207C_9C745C)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_nok/nok_02/9D7020.c
View File

@ -46,7 +46,7 @@ ApiStatus N(func_802402E0_9D7300)(ScriptInstance* script, s32 isInitialCall) {
#define NAMESPACE nok_02
#define NAMESPACE dup_nok_02
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#define NAMESPACE nok_02
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644);
@ -76,7 +76,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698);
/*
ApiStatus N(func_80240678_9D7698)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

2
src/world/area_nok/nok_02/9D7AA0.c
View File

@ -241,7 +241,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242974_9D9994);
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0);
/*

4
src/world/area_nok/nok_02/9DA8F0.c
View File

@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0_9DA8F0);
#define NAMESPACE nok_02
#define NAMESPACE dup2_nok_02
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
#define NAMESPACE nok_02
INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C);
@ -37,7 +37,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60);
/*
ApiStatus N(func_80243C40_9DAC60)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

4
src/world/area_obk/obk_01/BBD980.c
View File

@ -29,7 +29,7 @@ ApiStatus N(func_802407E0_BBD980)(ScriptInstance* script, s32 isInitialCall) {
#include "world/common/GetNpcCollisionHeight.inc.c"
#include "world/common/SomeXYZFuncTodoRename.inc.c"
#include "world/common/AddPlayerHandsOffset.inc.c"
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24_BBDCC4);
/*
@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18);
/*
ApiStatus N(func_80240B78_BBDD18)(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
D_80241CD0_BE0A60 = get_variable(script, *args);
D_80241CCC_BE0A5C = 1;
return ApiStatus_DONE2;

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