zeldaret/af
1
0
Fork 0
mirror of https://github.com/zeldaret/af.git synced 2026-10-02 07:49:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

m_kankyo OK (#207)

Browse Source 
* implement kankyo

* m_kankyo OK
This commit is contained in:
Prakxo
2024-08-12 19:36:07 +02:00
committed by GitHub
parent c3164cd99c
commit eb99af89c8
18 changed files with 1887 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/m_actor.c
+10 -10
View File
@@ -60,7 +60,7 @@ void Actor_position_move(Actor* actor) {
speedRate = game_GameFrame_2F;
kankyo->unk_C0(actor);
kankyo->nature.proc(actor);
actor->world.pos.x += actor->velocity.x * speedRate + actor->colStatus.displacement.x;
actor->world.pos.y += actor->velocity.y * speedRate + actor->colStatus.displacement.y;
@@ -1111,26 +1111,26 @@ Hilite* HiliteReflect_light_init(xyz_t* object, xyz_t* eye, xyz_t* lightDir, Gra
Hilite* Setpos_HiliteReflect_init(xyz_t* object, Game_Play* game_play) {
xyz_t sp24;
sp24.x = game_play->kankyo.unk_02;
sp24.y = game_play->kankyo.unk_03;
sp24.z = game_play->kankyo.unk_04;
sp24.x = game_play->kankyo.sunLight.lights.diffuse.x;
sp24.y = game_play->kankyo.sunLight.lights.diffuse.y;
sp24.z = game_play->kankyo.sunLight.lights.diffuse.z;
return HiliteReflect_init(object, &game_play->view.eye, &sp24, game_play->state.gfxCtx);
}
Hilite* Setpos_HiliteReflect_xlu_init(xyz_t* object, Game_Play* game_play) {
xyz_t sp24;
sp24.x = game_play->kankyo.unk_02;
sp24.y = game_play->kankyo.unk_03;
sp24.z = game_play->kankyo.unk_04;
sp24.x = game_play->kankyo.sunLight.lights.diffuse.x;
sp24.y = game_play->kankyo.sunLight.lights.diffuse.y;
sp24.z = game_play->kankyo.sunLight.lights.diffuse.z;
return HiliteReflect_xlu_init(object, &game_play->view.eye, &sp24, game_play->state.gfxCtx);
}
Hilite* Setpos_HiliteReflect_light_init(xyz_t* object, Game_Play* game_play) {
xyz_t sp24;
sp24.x = game_play->kankyo.unk_02;
sp24.y = game_play->kankyo.unk_03;
sp24.z = game_play->kankyo.unk_04;
sp24.x = game_play->kankyo.sunLight.lights.diffuse.x;
sp24.y = game_play->kankyo.sunLight.lights.diffuse.y;
sp24.z = game_play->kankyo.sunLight.lights.diffuse.z;
return HiliteReflect_xlu_init(object, &game_play->view.eye, &sp24, game_play->state.gfxCtx);
}
src/code/m_actor_shadow.c
+1 -1
View File
@@ -261,7 +261,7 @@ void mActorShadow_DrawActorShadow(Actor* actor, ShadowInfo* shadow, Game* game,
}
gSPMatrix(SHADOW_DISP++, _Matrix_to_Mtx_new(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
mEnv_GetShadowPrimColor_Light(&r, &g, &b, &play->state);
mEnv_GetShadowPrimColor_Light(&r, &g, &b, play);
gDPSetPrimColor(SHADOW_DISP++, 0, 0xFF, r, g, b, (u8)alpha);
if ((shadow->kind == 0) && (id == 0)) {
src/code/m_kankyo.c
+1649
View File
File diff suppressed because it is too large Load Diff
src/code/m_npc.c
+1 -1
View File
@@ -2329,7 +2329,7 @@ void mNpc_AddNpc_inNpcRoom(FieldMakeMoveActor* moveActor, u8 bx, u8 bz) {
}
}
} else if (fieldId == 0x300A) {
animalIdInField = func_8008033C_jp(0xE, 0xF);
animalIdInField = mEv_get_save_area(0xE, 0xF);
if (animalIdInField != NULL) {
npcId = *animalIdInField;
currentNpc = common_data.save.animals[npcId].id.npcId;
src/code/m_private.c
+1
View File
@@ -11,6 +11,7 @@
#include "m_handbill.h"
#include "m_house.h"
#include "6DA460.h"
#include "prevent_bss_reordering.h"
PrivateInfo g_foreigner_private;
Mail_c l_mpr_mail;
src/code/m_scene.c
+20 -20
View File
@@ -522,7 +522,7 @@ void Scene_player_select(s32 sceneNo, s32 npcActor) {
mNpc_RegistEventNpc(npcActor, npcId, npcId, common_data.save.animals[found].cloth);
}
void Scene_Proc_Ctrl_Actor_Ptr(Game_Play* play, SceneData* scene_data);
void Scene_Proc_Ctrl_Actor_Ptr(Game_Play* play, SceneData* sceneData);
void Scene_Proc_MyRoom_ct(Game_Play* play, SceneData* data);
@@ -562,12 +562,12 @@ void Scene_ct(Game_Play* play, SceneData* sceneData) {
Scene_player_select(SCENE_PLAYERSELECT_SAVE, 0xD06A); // save
}
void Scene_Proc_Player_Ptr(Game_Play* play, SceneData* scene_data) {
void Scene_Proc_Player_Ptr(Game_Play* play, SceneData* sceneData) {
static s16 angle_table[] = {
0x0000, 0x2000, 0x4000, 0x6000, 0x8000, 0xA000, 0xC000, 0xE000,
};
ActorEntry* data = Lib_SegmentedToVirtual(scene_data->actor.actorDataPtr);
ActorEntry* data = Lib_SegmentedToVirtual(sceneData->actor.actorDataPtr);
play->unk_1EA8 = data;
@@ -581,30 +581,30 @@ void Scene_Proc_Player_Ptr(Game_Play* play, SceneData* scene_data) {
mSM_Object_Exchange_keep_new_Menu(play);
}
void Scene_Proc_Ctrl_Actor_Ptr(Game_Play* play, SceneData* scene_data) {
s16* data = scene_data->controlActor.ctrlActorDataPtr;
void Scene_Proc_Ctrl_Actor_Ptr(Game_Play* play, SceneData* sceneData) {
s16* data = sceneData->controlActor.ctrlActorDataPtr;
play->unk_1EA6 = scene_data->controlActor.numCtrlActors;
play->unk_1EA6 = sceneData->controlActor.numCtrlActors;
play->unk_1EB0 = Lib_SegmentedToVirtual(data);
}
void Scene_Proc_Actor_Ptr(Game_Play* play, SceneData* scene_data) {
ActorEntry* data = scene_data->actor.actorDataPtr;
void Scene_Proc_Actor_Ptr(Game_Play* play, SceneData* sceneData) {
ActorEntry* data = sceneData->actor.actorDataPtr;
play->unk_1EA5 = scene_data->actor.numActors;
play->unk_1EA5 = sceneData->actor.numActors;
play->unk_1EAC = Lib_SegmentedToVirtual(data);
}
void Scene_Proc_Object_Exchange_Bank_Ptr(Game_Play* play, SceneData* scene_data) {
void Scene_Proc_Object_Exchange_Bank_Ptr(Game_Play* play, SceneData* sceneData) {
play->unk_1EA7 = scene_data->objectBank.numBanks;
play->unk_1EB4 = Lib_SegmentedToVirtual(scene_data->objectBank.banksDataPtr);
play->unk_1EA7 = sceneData->objectBank.numBanks;
play->unk_1EB4 = Lib_SegmentedToVirtual(sceneData->objectBank.banksDataPtr);
}
void Scene_Proc_Door_Data_Ptr(Game_Play* play, SceneData* scene_data) {
DoorData* data = scene_data->doorData.doorDataPtr;
void Scene_Proc_Door_Data_Ptr(Game_Play* play, SceneData* sceneData) {
DoorData* data = sceneData->doorData.doorDataPtr;
play->sceneDoorInfo.numDoors = scene_data->doorData.numDoors;
play->sceneDoorInfo.numDoors = sceneData->doorData.numDoors;
play->sceneDoorInfo.doorDataPtr = Lib_SegmentedToVirtual(data);
}
@@ -612,7 +612,7 @@ void Door_info_ct(DoorInfo* door_info) {
door_info->numDoors = 0;
}
void Scene_Proc_Sound(UNUSED Game_Play* play, UNUSED SceneData* scene_data) {
void Scene_Proc_Sound(UNUSED Game_Play* play, UNUSED SceneData* sceneData) {
}
void set_item_info(Game_Play* play, SceneDataField* field) {
@@ -636,10 +636,10 @@ void set_item_info(Game_Play* play, SceneDataField* field) {
}
}
void Scene_Proc_Field_ct(Game_Play* play, SceneData* scene_data) {
mFM_SetFieldInitData(scene_data->field.bgNum, scene_data->field.bgDispSize);
set_item_info(play, &scene_data->field);
common_data.unk_10002 = scene_data->field.drawType;
void Scene_Proc_Field_ct(Game_Play* play, SceneData* sceneData) {
mFM_SetFieldInitData(sceneData->field.bgNum, sceneData->field.bgDispSize);
set_item_info(play, &sceneData->field);
common_data.fieldDrawType = sceneData->field.drawType;
common_data.unk_10000 = FALSE;
common_data.unk_104AC = TRUE;
common_data.sunlightFlag = TRUE;