diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2024-02-28 08:31:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-28 08:31:56 -0700 |
| commit | 8ac6fcf5db5addcefb4219dc1e918498ee8262c3 (patch) | |
| tree | b1805f33e7382d86fd02679aa23bf4f1db506149 /src | |
| parent | c632d1d20b680081c8b1ced4877a32d50d917730 (diff) | |
match aMHS_make_bgOffset (#150)
* matched aMHS_make_bgOffset
* cleaned up
* cleanup
* combine var_v0
Diffstat (limited to 'src')
| -rw-r--r-- | src/overlays/actors/ovl_MyHouse/ac_my_house.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/overlays/actors/ovl_MyHouse/ac_my_house.c b/src/overlays/actors/ovl_MyHouse/ac_my_house.c index ce947f3..674a429 100644 --- a/src/overlays/actors/ovl_MyHouse/ac_my_house.c +++ b/src/overlays/actors/ovl_MyHouse/ac_my_house.c @@ -2,6 +2,7 @@ #include "m_actor_dlftbls.h" #include "m_object.h" #include "overlays/gamestates/ovl_play/m_play.h" +#include "m_collision_bg.h" void func_80A05D50_jp(Actor* thisx, Game_Play* game_play); void func_80A05F88_jp(Actor* thisx, Game_Play* game_play); @@ -48,7 +49,22 @@ ActorProfile MyHouse_Profile = { #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_MyHouse/ac_my_house/func_80A066B4_jp.s") -#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_MyHouse/ac_my_house/func_80A067D8_jp.s") +extern s8 D_80A07510_jp[]; + +void aMHS_make_bgOffset(mCoBG_unkStruct2* arg0, s8 arg1, s32 arg2) { + s32 var_v0 = (arg2 == 0) ? 0 : 0x60; + s32 i; + + for (i = 0; i != 16; i++, arg0++) { + arg0->unk0 = 0x64; + arg0->unk1 = (D_80A07510_jp[var_v0 + i * 6 + 0] != 0xB) ? D_80A07510_jp[var_v0 + i * 6 + 0] : arg1; + arg0->unk2 = (D_80A07510_jp[var_v0 + i * 6 + 1] != 0xB) ? D_80A07510_jp[var_v0 + i * 6 + 1] : arg1; + arg0->unk3 = (D_80A07510_jp[var_v0 + i * 6 + 2] != 0xB) ? D_80A07510_jp[var_v0 + i * 6 + 2] : arg1; + arg0->unk4 = (D_80A07510_jp[var_v0 + i * 6 + 3] != 0xB) ? D_80A07510_jp[var_v0 + i * 6 + 3] : arg1; + arg0->unk5 = (D_80A07510_jp[var_v0 + i * 6 + 4] != 0xB) ? D_80A07510_jp[var_v0 + i * 6 + 4] : arg1; + arg0->unk6 = D_80A07510_jp[var_v0 + i * 6 + 5]; + } +} #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_MyHouse/ac_my_house/func_80A068AC_jp.s") @@ -66,8 +82,11 @@ ActorProfile MyHouse_Profile = { #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_MyHouse/ac_my_house/func_80A06DF0_jp.s") +// aMHS_actor_draw_before #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_MyHouse/ac_my_house/func_80A06E64_jp.s") +// aMHS_actor_draw_after #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_MyHouse/ac_my_house/func_80A07008_jp.s") +// aMHS_actor_draw #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_MyHouse/ac_my_house/func_80A071A0_jp.s") |