falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ovl_Bg_Keikoku_Spr (#1228) 

* ovl_Bg_Keikoku_Spr

* format

* format

* Co-authored-by: Alejandro Asenjo Nitti <sonicdcer@users.noreply.github.com>

* Co-authored-by: Alejandro Asenjo Nitti <sonicdcer@users.noreply.github.com>
This commit is contained in:
KidFeroz 2023-06-01 17:41:37 -06:00 committed by GitHub
parent eb24680be3
commit e0ae4e24f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -1026,8 +1026,7 @@ beginseg
name "ovl_Bg_Keikoku_Spr" name "ovl_Bg_Keikoku_Spr"
compress compress
include "build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o" include "build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o"
include "build/data/ovl_Bg_Keikoku_Spr/ovl_Bg_Keikoku_Spr.data.o" include "build/src/overlays/actors/ovl_Bg_Keikoku_Spr/ovl_Bg_Keikoku_Spr_reloc.o"
include "build/data/ovl_Bg_Keikoku_Spr/ovl_Bg_Keikoku_Spr.reloc.o"
endseg endseg
beginseg beginseg

47
src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c
View File

@ -1,3 +1,9 @@
/*
* File: z_bg_keikoku_spr.c
* Overlay: ovl_Bg_Keikoku_Spr
* Description: Termina Field Fountain Water
*/
#include "z_bg_keikoku_spr.h" #include "z_bg_keikoku_spr.h"
#include "objects/object_keikoku_obj/object_keikoku_obj.h" #include "objects/object_keikoku_obj/object_keikoku_obj.h"
@ -10,7 +16,6 @@ void BgKeikokuSpr_Destroy(Actor* thisx, PlayState* play);
void BgKeikokuSpr_Update(Actor* thisx, PlayState* play); void BgKeikokuSpr_Update(Actor* thisx, PlayState* play);
void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play); void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play);
/*
const ActorInit Bg_Keikoku_Spr_InitVars = { const ActorInit Bg_Keikoku_Spr_InitVars = {
ACTOR_BG_KEIKOKU_SPR, ACTOR_BG_KEIKOKU_SPR,
ACTORCAT_PROP, ACTORCAT_PROP,
@ -20,14 +25,42 @@ const ActorInit Bg_Keikoku_Spr_InitVars = {
(ActorFunc)BgKeikokuSpr_Init, (ActorFunc)BgKeikokuSpr_Init,
(ActorFunc)BgKeikokuSpr_Destroy, (ActorFunc)BgKeikokuSpr_Destroy,
(ActorFunc)BgKeikokuSpr_Update, (ActorFunc)BgKeikokuSpr_Update,
(ActorFunc)BgKeikokuSpr_Draw (ActorFunc)BgKeikokuSpr_Draw,
}; };
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr/BgKeikokuSpr_Init.s") static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 20, ICHAIN_STOP),
};
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr/BgKeikokuSpr_Destroy.s") void BgKeikokuSpr_Init(Actor* thisx, PlayState* play) {
BgKeikokuSpr* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr/BgKeikokuSpr_Update.s") Actor_ProcessInitChain(&this->actor, sInitChain);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Spr/BgKeikokuSpr_Draw.s") void BgKeikokuSpr_Destroy(Actor* thisx, PlayState* play) {
}
void BgKeikokuSpr_Update(Actor* thisx, PlayState* play) {
}
void BgKeikokuSpr_Draw(Actor* thisx, PlayState* play) {
s32 pad;
OPEN_DISPS(play->state.gfxCtx);
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0001F8));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000100);
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0003F8));
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000300);
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(object_keikoku_obj_Matanimheader_0005F8));
gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_000500);
CLOSE_DISPS(play->state.gfxCtx);
}