mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-12 20:26:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_room (1 non-matching) (#1143)

Browse Source 
* begin room docs and decomp

* match Room_DrawImageSingle

* match Room_DrawImageMulti

* Room_AllocateAndLoad non-matching

* big improvements on Room_DrawCullable

* match Room_AllocateAndLoad

* improvement?

* cleanup

* comments

* cleanup

* small pr suggestions

* PR Suggestions

* cleanup sceneCmds

* some PR

* PR Suggestions

* more PR Suggestions

* col to collision
This commit is contained in:
engineer124
2023-03-23 09:36:09 +11:00
committed by GitHub
parent 9bb978527f
commit 2cb01b5b6a
26 changed files with 907 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+41 -41
View File
@@ -2391,14 +2391,14 @@
0x8012CF0C:("func_8012CF0C",),
0x8012D374:("func_8012D374",),
0x8012D40C:("func_8012D40C",),
0x8012D510:("Room_nop8012D510",),
0x8012D528:("Room_DrawType3Mesh",),
0x8012D53C:("Room_DrawType0Mesh",),
0x8012D750:("Room_DrawType2Mesh",),
0x8012DEE8:("func_8012DEE8",),
0x8012E254:("func_8012E254",),
0x8012E32C:("func_8012E32C",),
0x8012E6A8:("Room_DrawType1Mesh",),
0x8012D510:("Room_Noop",),
0x8012D528:("Room_DrawNone",),
0x8012D53C:("Room_DrawNormal",),
0x8012D750:("Room_DrawCullable",),
0x8012DEE8:("Room_DrawImageSingle",),
0x8012E254:("Room_GetImageMultiBgEntry",),
0x8012E32C:("Room_DrawImageMulti",),
0x8012E6A8:("Room_DrawImage",),
0x8012E710:("Room_Init",),
0x8012E750:("Room_AllocateAndLoad",),
0x8012E96C:("Room_StartRoomTransition",),
@@ -2422,40 +2422,40 @@
0x8012F668:("Object_IsLoaded",),
0x8012F698:("Object_LoadAll",),
0x8012F73C:("func_8012F73C",),
0x8012F79C:("Scene_HeaderCmdSpawnList",),
0x8012F90C:("Scene_HeaderCmdActorList",),
0x8012F954:("Scene_HeaderCmdActorCutsceneCamList",),
0x8012F984:("Scene_HeaderCmdColHeader",),
0x8012FA24:("Scene_HeaderCmdRoomList",),
0x8012FA68:("Scene_HeaderCmdEntranceList",),
0x8012FA98:("Scene_HeaderCmdSpecialFiles",),
0x8012FB60:("Scene_HeaderCmdRoomBehavior",),
0x8012FBE8:("Scene_HeaderCmdMesh",),
0x8012FC18:("Scene_HeaderCmdObjectList",),
0x8012FDA4:("Scene_HeaderCmdLightList",),
0x8012FE2C:("Scene_HeaderCmdPathList",),
0x8012FE5C:("Scene_HeaderCmdTransiActorList",),
0x8012F79C:("Scene_CommandSpawnList",),
0x8012F90C:("Scene_CommandActorList",),
0x8012F954:("Scene_CommandActorCutsceneCamList",),
0x8012F984:("Scene_CommandCollisionHeader",),
0x8012FA24:("Scene_CommandRoomList",),
0x8012FA68:("Scene_CommandEntranceList",),
0x8012FA98:("Scene_CommandSpecialFiles",),
0x8012FB60:("Scene_CommandRoomBehavior",),
0x8012FBE8:("Scene_CommandMesh",),
0x8012FC18:("Scene_CommandObjectList",),
0x8012FDA4:("Scene_CommandLightList",),
0x8012FE2C:("Scene_CommandPathList",),
0x8012FE5C:("Scene_CommandTransiActorList",),
0x8012FEBC:("Door_InitContext",),
0x8012FECC:("Scene_HeaderCmdEnvLightSettings",),
0x8012FECC:("Scene_CommandEnvLightSettings",),
0x8012FF10:("Scene_LoadAreaTextures",),
0x8012FF8C:("Scene_HeaderCmdSkyboxSettings",),
0x8012FFF0:("Scene_HeaderCmdSkyboxDisables",),
0x80130018:("Scene_HeaderCmdTimeSettings",),
0x8013033C:("Scene_HeaderCmdWindSettings",),
0x801303A0:("Scene_HeaderCmdExitList",),
0x801303D0:("Scene_HeaderCmd09",),
0x801303E0:("Scene_HeaderCmdSoundSettings",),
0x8013043C:("Scene_HeaderCmdEchoSetting",),
0x80130454:("Scene_HeaderCmdAltHeaderList",),
0x801304CC:("Scene_HeaderCmdCutsceneList",),
0x80130500:("Scene_HeaderCmdActorCutsceneList",),
0x80130540:("Scene_HeaderCmdMiniMap",),
0x80130578:("Scene_HeaderCmd1D",),
0x80130588:("Scene_HeaderCmdMiniMapCompassInfo",),
0x801305B0:("Scene_HeaderCmdSetRegionVisitedFlag",),
0x80130674:("Scene_HeaderCmdAnimatedMaterials",),
0x8012FF8C:("Scene_CommandSkyboxSettings",),
0x8012FFF0:("Scene_CommandSkyboxDisables",),
0x80130018:("Scene_CommandTimeSettings",),
0x8013033C:("Scene_CommandWindSettings",),
0x801303A0:("Scene_CommandExitList",),
0x801303D0:("Scene_Command09",),
0x801303E0:("Scene_CommandSoundSettings",),
0x8013043C:("Scene_CommandEchoSetting",),
0x80130454:("Scene_CommandAltHeaderList",),
0x801304CC:("Scene_CommandCutsceneList",),
0x80130500:("Scene_CommandActorCutsceneList",),
0x80130540:("Scene_CommandMiniMap",),
0x80130578:("Scene_Command1D",),
0x80130588:("Scene_CommandMiniMapCompassInfo",),
0x801305B0:("Scene_CommandSetRegionVisitedFlag",),
0x80130674:("Scene_CommandAnimatedMaterials",),
0x801306A4:("Scene_SetExitFade",),
0x801306E8:("Scene_ProcessHeader",),
0x801306E8:("Scene_ExecuteCommands",),
0x80130768:("Entrance_Create",),
0x80130784:("Entrance_CreateFromSpawn",),
0x801307C0:("Scene_Draw",),
@@ -3032,7 +3032,7 @@
0x80169EFC:("func_80169EFC",),
0x80169F78:("func_80169F78",),
0x80169FDC:("func_80169FDC",),
0x80169FFC:("func_80169FFC",),
0x80169FFC:("Play_CamIsNotFixed",),
0x8016A01C:("FrameAdvance_IsEnabled",),
0x8016A02C:("func_8016A02C",),
0x8016A0AC:("Play_IsUnderwater",),
@@ -3079,7 +3079,7 @@
0x80172078:("PreRender_ApplyFiltersSlowlyDestroy",),
0x801720C4:("func_801720C4",),
0x801720FC:("func_801720FC",),
0x80172758:("func_80172758",),
0x80172758:("Prerender_DrawBackground2D",),
0x801727F0:("THGA_Ct",),
0x80172810:("THGA_Dt",),
0x80172830:("THGA_IsCrash",),
tools/disasm/variables.txt
+2 -2
View File
@@ -1339,8 +1339,8 @@
0x801C0EF0:("sSetupDL","Gfx","[438]",0xdb0),
0x801C1CA0:("sFillSetupDL","Gfx","[12]",0x60),
0x801C1D00:("gEmptyDL","Gfx","[1]",0x8),
0x801C1D10:("D_801C1D10","Vec3f","",0xc),
0x801C1D1C:("roomDrawFuncs","room_draw_func","[4]",0x10),
0x801C1D10:("sZeroVec","Vec3f","",0xc),
0x801C1D1C:("sRoomDrawHandlers","RoomDrawHandler","[4]",0x10),
0x801C1D30:("gBitFlags","u32","[32]",0x80),
0x801C1DB0:("gEquipMasks","u16","[4]",0x8),
0x801C1DB8:("gEquipNegMasks","u16","[4]",0x8),