diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-08-14 18:35:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-14 15:35:04 -0700 |
| commit | f19df74c6ee597f01c3d7def1fdef105d9bdef92 (patch) | |
| tree | 0e9eef519791ed6612c05295a4e077f7667da199 /src/boot/O2 | |
| parent | bdb8ef6d5b33c24580d7861c4ccf8d937caac8fb (diff) | |
`m_actor.c` with 1 NON_MATCHING (#49)
* C file
* drafts
* Actor_info_ct and Actor_info_dt
* Actor_info_make_actor draft
* new_var = &argC;
* func_80057940_jp
* Actor_free_overlay_area, actor_free_check, Actor_get_overlay_area, func_80057940_jp, Actor_data_bank_regist_check
* Shape_Info_init
* Actor struct's size confirmed, Actor_malloc_actor_class and Actor_init_actor_class
* func_80056380_jp, Actor_info_part_new, restore_fgdata, Actor_info_delete
* Actor_info_draw_actor
* Actor_data_bank_dma_end_check, Actor_draw_actor_no_culling_check, Actor_draw_actor_no_culling_check2, Actor_cull_check, Actor_delete_check, Actor_info_make_child_actor, restore_fgdata_all, Actor_info_save_actor
* gSegments
* Actor_world_to_eye, Actor_position_speed_set, Actor_position_moveF and func_80057B70_jp
* Actor_player_look_direction_check
* Actor_position_move
* find m_kankyo file split
* Actor_ct
* fgName
* projection_pos_set, Actor_display_position_set
* Actor_info_call_actor
* func_80057A8C_jp
* import data and bss
* cleanups
* more cleanup
* format
* and even more cleanup
* hilite funcs
* Part_Break_init
* and more cleanup
* Actor_draw
* fake stuff
* Part_Break stuff from OoT
* a
* fix
* fix fake symbol
* fix
* fix
Diffstat (limited to 'src/boot/O2')
| -rw-r--r-- | src/boot/O2/loadfragment2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/boot/O2/loadfragment2.c b/src/boot/O2/loadfragment2.c index 42a826d..f9fe629 100644 --- a/src/boot/O2/loadfragment2.c +++ b/src/boot/O2/loadfragment2.c @@ -13,15 +13,15 @@ void DoRelocation(void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs, void* vramStart); // Unknown original name -s32 Overlay_Load(void* vromStart, void* vromEnd, void* ovlStart, void* ovlEnd, void* vramStart, void* vramEnd, +s32 Overlay_Load(RomOffset vromStart, RomOffset vromEnd, void* ovlStart, void* ovlEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr, OverlayRelocationSection* ovlRelocs) { OverlayRelocationSection* ovl = ovlRelocs; - s32 vromSize = (uintptr_t)vromEnd - (uintptr_t)vromStart; + s32 vromSize = vromEnd - vromStart; s32 ovlSize = (uintptr_t)ovlEnd - (uintptr_t)ovlStart; s32 vramSize = (uintptr_t)vramEnd - (uintptr_t)vramStart; void* end = (void*)((uintptr_t)allocatedRamAddr + vromSize); - DmaMgr_RequestSync(allocatedRamAddr, vromStart, vromSize); + DmaMgr_RequestSync(allocatedRamAddr, (void*)vromStart, vromSize); DmaMgr_RequestSync(ovl, ovlStart, ovlSize); DoRelocation(allocatedRamAddr, ovl, vramStart); |