diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2020-05-01 17:09:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 11:09:20 -0400 |
| commit | 9f98210488073f1b5c8136152b95e3fc8970b6e4 (patch) | |
| tree | 9793615dfb0a6580cfb93bfbb9f8f5d6412f3a3e /src/code/z_actor.c | |
| parent | 9f1c996db5590edf0d612aeaeb10492f4391e8dc (diff) | |
Decompile z_map_exp.c (2 non matchings left) (#104)
Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index aa3b4999c..decdcc605 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2753,11 +2753,10 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId overlayEntry->nbLoaded = 0; } - actorInit = - (ActorInit*)((u32)(overlayEntry->initInfo != NULL - ? (ActorInit*)((u32)overlayEntry->initInfo - (s32)((u32)overlayEntry->vramStart - - (u32)overlayEntry->loadedRamAddr)) - : NULL)); + actorInit = (void*)(u32)((overlayEntry->initInfo != NULL) + ? (void*)((u32)overlayEntry->initInfo - + (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)) + : NULL); } objBankIndex = Object_GetIndex(&globalCtx->objectCtx, actorInit->objectId); |