mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-15 04:33:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into play

Browse Source
This commit is contained in:
Derek Hensley
2022-10-05 19:50:49 -07:00
parent ed3f288130 589925ce3e
commit 506ff57b74
31 changed files with 1323 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+9 -9
View File
@@ -2410,7 +2410,7 @@
0x8012ED78:("Inventory_DeleteEquipment",),
0x8012EDE8:("Inventory_ChangeUpgrade",),
0x8012EE34:("Inventory_IsMapVisible",),
0x8012EF0C:("Inventory_SetMapVisibility",),
0x8012EF0C:("Inventory_SetWorldMapCloudVisibility",),
0x8012F0EC:("Inventory_SaveDekuPlaygroundHighScore",),
0x8012F1BC:("Inventory_IncrementSkullTokenCount",),
0x8012F22C:("Inventory_GetSkullTokenCount",),
@@ -2452,7 +2452,7 @@
0x80130540:("Scene_HeaderCmdMiniMap",),
0x80130578:("Scene_HeaderCmd1D",),
0x80130588:("Scene_HeaderCmdMiniMapCompassInfo",),
0x801305B0:("Scene_HeaderCmdSetAreaVisitedFlag",),
0x801305B0:("Scene_HeaderCmdSetRegionVisitedFlag",),
0x80130674:("Scene_HeaderCmdAnimatedMaterials",),
0x801306A4:("Scene_SetExitFade",),
0x801306E8:("Scene_ProcessHeader",),
@@ -2880,7 +2880,7 @@
0x80158C04:("Message_LoadLocalizedRupeesNES",),
0x80158D98:("Message_LoadRupeesNES",),
0x80158FB0:("Message_LoadTimeNES",),
0x8015926C:("Message_LoadAreaTextNES",),
0x8015926C:("Message_LoadOwlWarpTextNES",),
0x80159438:("func_80159438",),
0x8015966C:("func_8015966C",),
0x8015B198:("func_8015B198",),
@@ -4209,11 +4209,11 @@
0x8081B6EC:("KaleidoScope_DrawItemSelect",),
0x8081BCA8:("KaleidoScope_UpdateItemCursor",),
0x8081C684:("KaleidoScope_UpdateItemEquip",),
0x8081D240:("func_8081D240",),
0x8081D6DC:("func_8081D6DC",),
0x8081E118:("func_8081E118",),
0x8081E7D8:("func_8081E7D8",),
0x8081FB1C:("func_8081FB1C",),
0x8081D240:("KaleidoScope_DrawDungeonStrayFairyCount",),
0x8081D6DC:("KaleidoScope_DrawDungeonMap",),
0x8081E118:("KaleidoScope_UpdateDungeonCursor",),
0x8081E7D8:("KaleidoScope_DrawWorldMap",),
0x8081FB1C:("KaleidoScope_UpdateWorldMapCursor",),
0x8081FF80:("KaleidoScope_DrawMaskSelect",),
0x808204AC:("KaleidoScope_UpdateMaskCursor",),
0x80820FA4:("KaleidoScope_UpdateMaskEquip",),
@@ -4234,7 +4234,7 @@
0x80824B90:("func_80824B90",),
0x808256E4:("func_808256E4",),
0x8082585C:("func_8082585C",),
0x808259D4:("func_808259D4",),
0x808259D4:("KaleidoScope_SetView",),
0x80825A50:("func_80825A50",),
0x80825E28:("func_80825E28",),
0x808274DC:("func_808274DC",),
tools/disasm/variables.txt
+21 -21
View File
@@ -4703,28 +4703,28 @@
0x8082B484:("sCButtonPosX","UNK_TYPE1","",0x1),
0x8082B48C:("sCButtonPosY","UNK_TYPE1","",0x1),
0x8082B494:("sEquipMagicArrowBowSlotHoldTimer","UNK_TYPE2","",0x2),
0x8082B4A0:("D_8082B4A0","UNK_TYPE4","",0x4),
0x8082B4AC:("D_8082B4AC","UNK_TYPE1","",0x1),
0x8082B4BC:("D_8082B4BC","UNK_TYPE1","",0x1),
0x8082B4A0:("sDungeonItemTextures","UNK_TYPE4","",0x4),
0x8082B4AC:("sDungeonTitleTextures","UNK_TYPE1","",0x1),
0x8082B4BC:("sDungeonMapFloorIconPosY","UNK_TYPE1","",0x1),
0x8082B4C4:("D_8082B4C4","UNK_TYPE1","",0x1),
0x8082B4C8:("D_8082B4C8","UNK_TYPE2","",0x2),
0x8082B4CC:("D_8082B4CC","UNK_TYPE2","",0x2),
0x8082B4D0:("D_8082B4D0","UNK_TYPE2","",0x2),
0x8082B4D4:("D_8082B4D4","UNK_TYPE2","",0x2),
0x8082B4D8:("D_8082B4D8","UNK_TYPE2","",0x2),
0x8082B4DC:("D_8082B4DC","f32","",0x4),
0x8082B4E0:("D_8082B4E0","UNK_TYPE1","",0x1),
0x8082B520:("D_8082B520","UNK_TYPE1","",0x1),
0x8082B52C:("D_8082B52C","UNK_TYPE1","",0x1),
0x8082B538:("D_8082B538","UNK_TYPE1","",0x1),
0x8082B548:("D_8082B548","s16","[30]",0x3C),
0x8082B584:("D_8082B584","UNK_TYPE2","",0x2),
0x8082B590:("D_8082B590","UNK_TYPE2","",0x2),
0x8082B59C:("D_8082B59C","UNK_TYPE1","",0x1),
0x8082B5B4:("D_8082B5B4","UNK_TYPE1","",0x1),
0x8082B5CC:("D_8082B5CC","UNK_TYPE1","",0x1),
0x8082B5E0:("D_8082B5E0","UNK_TYPE1","",0x1),
0x8082B5F4:("D_8082B5F4","UNK_TYPE2","",0x2),
0x8082B4C8:("sStrayFairyIconTimer","UNK_TYPE2","",0x2),
0x8082B4CC:("sStrayFairyIconIndex","UNK_TYPE2","",0x2),
0x8082B4D0:("sStrayFairyIconAlphaScaleTimer","UNK_TYPE2","",0x2),
0x8082B4D4:("sStrayFairyIconAlphaScaleState","UNK_TYPE2","",0x2),
0x8082B4D8:("sStrayFairyIconAlpha","UNK_TYPE2","",0x2),
0x8082B4DC:("sStrayFairyIconScale","f32","",0x4),
0x8082B4E0:("sStrayFairyIconTextures","UNK_TYPE1","",0x1),
0x8082B520:("sStrayFairyIconPrimColors","UNK_TYPE1","",0x1),
0x8082B52C:("sStrayFairyIconEnvColors","UNK_TYPE1","",0x1),
0x8082B538:("sStrayFairyIconRectS","UNK_TYPE1","",0x1),
0x8082B548:("sCloudTextures","s16","[30]",0x3C),
0x8082B584:("sWorldMapDotPrimColors","UNK_TYPE2","",0x2),
0x8082B590:("sWorldMapDotEnvColors","UNK_TYPE2","",0x2),
0x8082B59C:("sWorldMapCursorsRectLeft","UNK_TYPE1","",0x1),
0x8082B5B4:("sWorldMapCursorsRectTop","UNK_TYPE1","",0x1),
0x8082B5CC:("sGreatFairySpawnRegions","UNK_TYPE1","",0x1),
0x8082B5E0:("sOwlWarpPauseItems","UNK_TYPE1","",0x1),
0x8082B5F4:("sStickAdjTimer","UNK_TYPE2","",0x2),
0x8082B600:("sMaskEquipState","UNK_TYPE2","",0x2),
0x8082B604:("sMaskEquipMagicArrowSlotHoldTimer","UNK_TYPE2","",0x2),
0x8082B608:("sMaskEquipAnimTimer","UNK_TYPE2","",0x2),
tools/namefixer.py
+1 -1
View File
@@ -597,7 +597,7 @@ wordReplace = {
"func_80158C04": "Message_LoadLocalizedRupeesNES",
"func_80158D98": "Message_LoadRupeesNES",
"func_80158FB0": "Message_LoadTimeNES",
"func_8015926C": "Message_LoadAreaTextNES",
"func_8015926C": "Message_LoadOwlWarpTextNES",
"func_8015E750": "Message_FindCreditsMessage",
"func_80133038": "Schedule_RunScript",
tools/permuter_settings.toml
+2
View File
@@ -1,3 +1,5 @@
compiler_type = "ido"
[preserve_macros]
"g[DS]P.*" = "void"
"gs[DS]P.*" = "void"
tools/sizes/code_functions.csv
+3 -3
View File
@@ -1924,7 +1924,7 @@ asm/non_matchings/code/code_8012EC80/Inventory_ChangeEquipment.s,Inventory_Chang
asm/non_matchings/code/code_8012EC80/Inventory_DeleteEquipment.s,Inventory_DeleteEquipment,0x8012ED78,0x1C
asm/non_matchings/code/code_8012EC80/Inventory_ChangeUpgrade.s,Inventory_ChangeUpgrade,0x8012EDE8,0x13
asm/non_matchings/code/code_8012EC80/Inventory_IsMapVisible.s,Inventory_IsMapVisible,0x8012EE34,0x36
asm/non_matchings/code/code_8012EC80/Inventory_SetMapVisibility.s,Inventory_SetMapVisibility,0x8012EF0C,0x78
asm/non_matchings/code/code_8012EC80/Inventory_SetWorldMapCloudVisibility.s,Inventory_SetWorldMapCloudVisibility,0x8012EF0C,0x78
asm/non_matchings/code/code_8012EC80/Inventory_SaveDekuPlaygroundHighScore.s,Inventory_SaveDekuPlaygroundHighScore,0x8012F0EC,0x34
asm/non_matchings/code/code_8012EC80/Inventory_IncrementSkullTokenCount.s,Inventory_IncrementSkullTokenCount,0x8012F1BC,0x1C
asm/non_matchings/code/code_8012EC80/Inventory_GetSkullTokenCount.s,Inventory_GetSkullTokenCount,0x8012F22C,0x13
@@ -1966,7 +1966,7 @@ asm/non_matchings/code/z_scene/Scene_HeaderCmdActorCutsceneList.s,Scene_HeaderCm
asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMap.s,Scene_HeaderCmdMiniMap,0x80130540,0xE
asm/non_matchings/code/z_scene/Scene_HeaderCmd1D.s,Scene_HeaderCmd1D,0x80130578,0x4
asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMapCompassInfo.s,Scene_HeaderCmdMiniMapCompassInfo,0x80130588,0xA
asm/non_matchings/code/z_scene/Scene_HeaderCmdSetAreaVisitedFlag.s,Scene_HeaderCmdSetAreaVisitedFlag,0x801305B0,0x31
asm/non_matchings/code/z_scene/Scene_HeaderCmdSetRegionVisitedFlag.s,Scene_HeaderCmdSetRegionVisitedFlag,0x801305B0,0x31
asm/non_matchings/code/z_scene/Scene_HeaderCmdAnimatedMaterials.s,Scene_HeaderCmdAnimatedMaterials,0x80130674,0xC
asm/non_matchings/code/z_scene/Scene_SetExitFade.s,Scene_SetExitFade,0x801306A4,0x11
asm/non_matchings/code/z_scene/Scene_ProcessHeader.s,Scene_ProcessHeader,0x801306E8,0x20
@@ -2394,7 +2394,7 @@ asm/non_matchings/code/z_message_nes/Message_LoadPluralRupeesNES.s,Message_LoadP
asm/non_matchings/code/z_message_nes/Message_LoadLocalizedRupeesNES.s,Message_LoadLocalizedRupeesNES,0x80158C04,0x65
asm/non_matchings/code/z_message_nes/Message_LoadRupeesNES.s,Message_LoadRupeesNES,0x80158D98,0x86
asm/non_matchings/code/z_message_nes/Message_LoadTimeNES.s,Message_LoadTimeNES,0x80158FB0,0xAF
asm/non_matchings/code/z_message_nes/Message_LoadAreaTextNES.s,Message_LoadAreaTextNES,0x8015926C,0x73
asm/non_matchings/code/z_message_nes/Message_LoadOwlWarpTextNES.s,Message_LoadOwlWarpTextNES,0x8015926C,0x73
asm/non_matchings/code/z_message_nes/func_80159438.s,func_80159438,0x80159438,0x8D
asm/non_matchings/code/z_message_nes/func_8015966C.s,func_8015966C,0x8015966C,0x6CB
asm/non_matchings/code/z_message_nes/func_8015B198.s,func_8015B198,0x8015B198,0xD6E
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1924 asm/non_matchings/code/code_8012EC80/Inventory_DeleteEquipment.s Inventory_DeleteEquipment 0x8012ED78 0x1C
1925 asm/non_matchings/code/code_8012EC80/Inventory_ChangeUpgrade.s Inventory_ChangeUpgrade 0x8012EDE8 0x13
1926 asm/non_matchings/code/code_8012EC80/Inventory_IsMapVisible.s Inventory_IsMapVisible 0x8012EE34 0x36
1927 asm/non_matchings/code/code_8012EC80/Inventory_SetMapVisibility.s asm/non_matchings/code/code_8012EC80/Inventory_SetWorldMapCloudVisibility.s Inventory_SetMapVisibility Inventory_SetWorldMapCloudVisibility 0x8012EF0C 0x78
1928 asm/non_matchings/code/code_8012EC80/Inventory_SaveDekuPlaygroundHighScore.s Inventory_SaveDekuPlaygroundHighScore 0x8012F0EC 0x34
1929 asm/non_matchings/code/code_8012EC80/Inventory_IncrementSkullTokenCount.s Inventory_IncrementSkullTokenCount 0x8012F1BC 0x1C
1930 asm/non_matchings/code/code_8012EC80/Inventory_GetSkullTokenCount.s Inventory_GetSkullTokenCount 0x8012F22C 0x13
1966 asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMap.s Scene_HeaderCmdMiniMap 0x80130540 0xE
1967 asm/non_matchings/code/z_scene/Scene_HeaderCmd1D.s Scene_HeaderCmd1D 0x80130578 0x4
1968 asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMapCompassInfo.s Scene_HeaderCmdMiniMapCompassInfo 0x80130588 0xA
1969 asm/non_matchings/code/z_scene/Scene_HeaderCmdSetAreaVisitedFlag.s asm/non_matchings/code/z_scene/Scene_HeaderCmdSetRegionVisitedFlag.s Scene_HeaderCmdSetAreaVisitedFlag Scene_HeaderCmdSetRegionVisitedFlag 0x801305B0 0x31
1970 asm/non_matchings/code/z_scene/Scene_HeaderCmdAnimatedMaterials.s Scene_HeaderCmdAnimatedMaterials 0x80130674 0xC
1971 asm/non_matchings/code/z_scene/Scene_SetExitFade.s Scene_SetExitFade 0x801306A4 0x11
1972 asm/non_matchings/code/z_scene/Scene_ProcessHeader.s Scene_ProcessHeader 0x801306E8 0x20
2394 asm/non_matchings/code/z_message_nes/Message_LoadLocalizedRupeesNES.s Message_LoadLocalizedRupeesNES 0x80158C04 0x65
2395 asm/non_matchings/code/z_message_nes/Message_LoadRupeesNES.s Message_LoadRupeesNES 0x80158D98 0x86
2396 asm/non_matchings/code/z_message_nes/Message_LoadTimeNES.s Message_LoadTimeNES 0x80158FB0 0xAF
2397 asm/non_matchings/code/z_message_nes/Message_LoadAreaTextNES.s asm/non_matchings/code/z_message_nes/Message_LoadOwlWarpTextNES.s Message_LoadAreaTextNES Message_LoadOwlWarpTextNES 0x8015926C 0x73
2398 asm/non_matchings/code/z_message_nes/func_80159438.s func_80159438 0x80159438 0x8D
2399 asm/non_matchings/code/z_message_nes/func_8015966C.s func_8015966C 0x8015966C 0x6CB
2400 asm/non_matchings/code/z_message_nes/func_8015B198.s func_8015B198 0x8015B198 0xD6E