diff options
| author | Sirius902 <10891979+Sirius902@users.noreply.github.com> | 2020-11-23 06:53:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 08:53:21 -0500 |
| commit | 385c419aa2e04d0a78b461e0b21f9a6e4e252bc7 (patch) | |
| tree | bc655c1f6f0461e7cdd1a592d22ba7a1cf880b11 /src/code | |
| parent | 9312c21c2f0898ca31294a1c7607f77d63d4b9dc (diff) | |
ovl_En_Ik (#461)
* merge upstream
* Merge upstream
* Progress
* Progress
* Fixes
* Migrate bss for now ig
* func_80A772EC
* Use rom reloc
* Cleanup
* Correct prototype
* Rename to _PlayBGM
* Eh revert to _StartMusic
* Match func_80A74398 more
* Fixes
* Work on func_80A74398
* Work on func_80A74398
* Match func_80A74398
* Use thisx
* Name, static, and move some stuff
* Match some graphics functions
* Rename asm for named functions
* Forgot one
* More graphics stuff
* Progress
* More progress
* Fix jump table
* Figure out types for a lot of data
* Fix data
* Type remaining data
* Work on func_80A7492C
* Ugly match for func_80A7492C
* Fix func_80A7492C
* Match some interesting stuff
* Move and remove forward declarations
* Sort declarations
* Progress
* Use quotes for vt import
* Slightly better diff
* Better diff again
* Fix stack on func_80A74BA4
* match func_80A74BA4
* func_80A74674
* Progress
* Progress
* Progress
* Progress
* Eh early return probably makes more sense here
* Progress
* Progress
* Progress
* Autocomplete sucks
* Name stuff in func_80A76E2C
* Work a bit on func_80A75C38
* Ugly match func_80A75FA0
* Name it prevInvincibilityTimer
* EnIk_PostLimbDraw3
* Use hex for line numbers in EnIk_PostLimbDraw3
* EnIk_PostLimbDraw2
* EnIk_PostLimbDraw1
* Use hex for line numbers in EnIk_PostLimbDraw1
* Use ACTORTYPE_ENEMY
* Progress
* Possible fake match of func_80A75C38
* Update spec and remove asm
* Cleanup forward declarations
* Move data to fun places
* Move data into func_80A76E2C
* Move data into func_80A75A38
* Make D_80A7847C an array
* Remove struct padding
* Revert "Remove struct padding"
This reverts commit 87b0bd73da689beb65242e95fc81290c522a06f8.
* Name colliders
* Use else
* Name shieldColliderItems
* Use new graphics macros
* Cleanup
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index e2290e5a7..42ad328bd 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3074,12 +3074,12 @@ void func_80032E24(struct_80032E24* arg0, s32 arg1, GlobalContext* globalCtx) { } } -void func_80032F54(struct_80032E24* arg0, s32 arg1, s32 arg2, s32 arg3, u32 arg4, s32* arg5, s16 arg6) { +void func_80032F54(struct_80032E24* arg0, s32 arg1, s32 arg2, s32 arg3, u32 arg4, Gfx** dList, s16 arg6) { GlobalContext* globalCtx = Effect_GetGlobalCtx(); if ((globalCtx->actorCtx.unk_00 == 0) && (arg0->unk_10 > 0)) { - if ((arg1 >= arg2) && (arg3 >= arg1) && (*arg5 != 0)) { - arg0->unk_0C[arg0->unk_10] = *arg5; + if ((arg1 >= arg2) && (arg3 >= arg1) && (*dList != 0)) { + arg0->unk_0C[arg0->unk_10] = *dList; Matrix_Get(&arg0->unk_00[arg0->unk_10]); arg0->unk_04[arg0->unk_10] = arg6; arg0->unk_10++; |