izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
petrie911
2022-10-09 12:28:47 -05:00
parent b7b4b09e4d e75b0c51f5
commit 01bcdd939c
47 changed files with 3449 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/interface/icon_item_dungeon_static.xml
+32
View File
@@ -0,0 +1,32 @@
<Root>
<!-- Assets for dungeon icons -->
<File Name="icon_item_dungeon_static" Segment="12">
<!-- Identical icons to OoT -->
<Texture Name="gDungeonMapBlankFloorButtonTex" OutName="dungeon_map_blank_floor_button" Format="ia8" Width="24" Height="16" Offset="0x0"/>
<Texture Name="gDungeonMap1FButtonTex" OutName="dungeon_map_1f_button" Format="ia8" Width="24" Height="16" Offset="0x180"/>
<Texture Name="gDungeonMap2FButtonTex" OutName="dungeon_map_2f_button" Format="ia8" Width="24" Height="16" Offset="0x300"/>
<Texture Name="gDungeonMap3FButtonTex" OutName="dungeon_map_3f_button" Format="ia8" Width="24" Height="16" Offset="0x480"/>
<Texture Name="gDungeonMap4FButtonTex" OutName="dungeon_map_4f_button" Format="ia8" Width="24" Height="16" Offset="0x600"/>
<Texture Name="gDungeonMap5FButtonTex" OutName="dungeon_map_5f_button" Format="ia8" Width="24" Height="16" Offset="0x780"/>
<Texture Name="gDungeonMap6FButtonTex" OutName="dungeon_map_6f_button" Format="ia8" Width="24" Height="16" Offset="0x900"/>
<Texture Name="gDungeonMap7FButtonTex" OutName="dungeon_map_7f_button" Format="ia8" Width="24" Height="16" Offset="0xA80"/>
<Texture Name="gDungeonMap8FButtonTex" OutName="dungeon_map_8f_button" Format="ia8" Width="24" Height="16" Offset="0xC00"/>
<Texture Name="gDungeonMapB1ButtonTex" OutName="dungeon_map_b1_button" Format="ia8" Width="24" Height="16" Offset="0xD80"/>
<Texture Name="gDungeonMapB2ButtonTex" OutName="dungeon_map_b2_button" Format="ia8" Width="24" Height="16" Offset="0xF00"/>
<Texture Name="gDungeonMapB3ButtonTex" OutName="dungeon_map_b3_button" Format="ia8" Width="24" Height="16" Offset="0x1080"/>
<Texture Name="gDungeonMapB4ButtonTex" OutName="dungeon_map_b4_button" Format="ia8" Width="24" Height="16" Offset="0x1200"/>
<Texture Name="gDungeonMapB5ButtonTex" OutName="dungeon_map_b5_button" Format="ia8" Width="24" Height="16" Offset="0x1380"/>
<Texture Name="gDungeonMapB6ButtonTex" OutName="dungeon_map_b6_button" Format="ia8" Width="24" Height="16" Offset="0x1500"/>
<Texture Name="gDungeonMapB7ButtonTex" OutName="dungeon_map_b7_button" Format="ia8" Width="24" Height="16" Offset="0x1680"/>
<Texture Name="gDungeonMapB8ButtonTex" OutName="dungeon_map_b8_button" Format="ia8" Width="24" Height="16" Offset="0x1800"/>
<!-- Skull has a slightly altered design compared to OoT -->
<Texture Name="gDungeonMapSkullTex" OutName="dungeon_map_skull" Format="rgba16" Width="16" Height="16" Offset="0x1980"/>
<!-- Similar to stray fairy icons in parameter_static, except facing forward -->
<Texture Name="gDungeonStrayFairyWoodfallIconTex" OutName="dungeon_stray_fairy_woodfall_icon" Format="rgba32" Width="32" Height="24" Offset="0x1B80"/>
<Texture Name="gDungeonStrayFairySnowheadIconTex" OutName="dungeon_stray_fairy_snowhead_icon" Format="rgba32" Width="32" Height="24" Offset="0x2780"/>
<Texture Name="gDungeonStrayFairyGreatBayIconTex" OutName="dungeon_stray_fairy_great_bay_icon" Format="rgba32" Width="32" Height="24" Offset="0x3380"/>
<Texture Name="gDungeonStrayFairyStoneTowerIconTex" OutName="dungeon_stray_fairy_stone_tower_icon" Format="rgba32" Width="32" Height="24" Offset="0x3F80"/>
</File>
</Root>
assets/xml/interface/icon_item_field_static.xml
+40
View File
@@ -0,0 +1,40 @@
<Root>
<!-- Assets for the world map -->
<File Name="icon_item_field_static" Segment="12">
<!-- World map itself -->
<Texture Name="gWorldMapImageTex" OutName="world_map_image" Format="ci8" Width="216" Height="128" Offset="0x0" TlutOffset="0x6C00"/>
<Texture Name="gWorldMapImageTLUT" OutName="world_map_image_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6C00"/>
<!-- Identical To OoT -->
<Texture Name="gWorldMapDotTex" OutName="world_map_dot" Format="ia8" Width="8" Height="8" Offset="0x6E00"/>
<Texture Name="gWorldMapAreaBox1Tex" OutName="world_map_area_box_1" Format="ia4" Width="32" Height="19" Offset="0x6E40"/>
<Texture Name="gWorldMapAreaBox2Tex" OutName="world_map_area_box_2" Format="ia4" Width="48" Height="38" Offset="0x6F70"/>
<Texture Name="gWorldMapAreaBox3Tex" OutName="world_map_area_box_3" Format="ia4" Width="32" Height="17" Offset="0x7300"/>
<Texture Name="gWorldMapAreaBox4Tex" OutName="world_map_area_box_4" Format="ia4" Width="32" Height="13" Offset="0x7410"/>
<Texture Name="gWorldMapAreaBox5Tex" OutName="world_map_area_box_5" Format="ia4" Width="32" Height="26" Offset="0x74E0"/>
<Texture Name="gWorldMapAreaBox6Tex" OutName="world_map_area_box_6" Format="ia4" Width="48" Height="19" Offset="0x7680"/>
<Texture Name="gWorldMapAreaBox7Tex" OutName="world_map_area_box_7" Format="ia4" Width="96" Height="59" Offset="0x7848"/>
<Texture Name="gWorldMapAreaBox8Tex" OutName="world_map_area_box_8" Format="ia4" Width="16" Height="16" Offset="0x8358"/>
<Texture Name="gWorldMapArrowTex" OutName="world_map_arrow" Format="ia8" Width="8" Height="8" Offset="0x83D8"/>
<!-- Cloud cover based on tingle maps -->
<Texture Name="gWorldMapClockTownCloud1Tex" OutName="world_map_clock_town_cloud_1" Format="ia8" Width="80" Height="40" Offset="0x8418"/>
<Texture Name="gWorldMapClockTownCloud2Tex" OutName="world_map_clock_town_cloud_2" Format="ia8" Width="64" Height="31" Offset="0x9098"/>
<Texture Name="gWorldMapRomaniRanchCloudTex" OutName="world_map_romani_ranch_cloud" Format="ia8" Width="48" Height="32" Offset="0x9858"/>
<Texture Name="gWorldMapGreatBayCloud1Tex" OutName="world_map_great_bay_cloud_1" Format="ia8" Width="64" Height="64" Offset="0x9E58"/>
<Texture Name="gWorldMapGreatBayCloud2Tex" OutName="world_map_great_bay_cloud_2" Format="ia8" Width="64" Height="64" Offset="0xAE58"/>
<Texture Name="gWorldMapGreatBayCloud3Tex" OutName="world_map_great_bay_cloud_3" Format="ia8" Width="64" Height="64" Offset="0xBE58"/>
<Texture Name="gWorldMapGreatBayCloud4Tex" OutName="world_map_great_bay_cloud_4" Format="ia8" Width="64" Height="64" Offset="0xCE58"/>
<Texture Name="gWorldMapSnowheadCloud1Tex" OutName="world_map_snowhead_cloud_1" Format="ia8" Width="64" Height="52" Offset="0xDE58"/>
<Texture Name="gWorldMapSnowheadCloud2Tex" OutName="world_map_snowhead_cloud_2" Format="ia8" Width="112" Height="35" Offset="0xEB58"/>
<Texture Name="gWorldMapSnowheadCloud3Tex" OutName="world_map_snowhead_cloud_3" Format="ia8" Width="112" Height="35" Offset="0xFAA8"/>
<Texture Name="gWorldMapStoneTowerCloud1Tex" OutName="world_map_stone_tower_cloud_1" Format="ia8" Width="48" Height="82" Offset="0x109F8"/>
<Texture Name="gWorldMapStoneTowerCloud2Tex" OutName="world_map_stone_tower_cloud_2" Format="ia8" Width="64" Height="61" Offset="0x11958"/>
<Texture Name="gWorldMapWoodfallCloud1Tex" OutName="world_map_woodfall_cloud_1" Format="ia8" Width="64" Height="53" Offset="0x12898"/>
<Texture Name="gWorldMapWoodfallCloud2Tex" OutName="world_map_woodfall_cloud_2" Format="ia8" Width="64" Height="53" Offset="0x135D8"/>
<Texture Name="gWorldMapWoodfallCloud3Tex" OutName="world_map_woodfall_cloud_3" Format="ia8" Width="16" Height="53" Offset="0x14318"/>
<!-- Face of an owl to indicate warp points -->
<Texture Name="gWorldMapOwlFaceTex" OutName="world_map_owl_face" Format="rgba32" Width="24" Height="12" Offset="0x14668"/>
</File>
</Root>
assets/xml/interface/icon_item_jpn_static.xml
+31
View File
@@ -0,0 +1,31 @@
<Root>
<!-- Pause Menu: Language-Dependent Textures -->
<File Name="icon_item_jpn_static" Segment="13">
<!-- Pause Menu Dungeon Title Cards -->
<Texture Name="gPauseWoodfallTitleENGTex" OutName="pause_woodfall_title_eng" Format="ia8" Width="128" Height="16" Offset="0x0"/>
<Texture Name="gPauseSnowheadTitleENGTex" OutName="pause_snowhead_title_eng" Format="ia8" Width="128" Height="16" Offset="0x800"/>
<Texture Name="gPauseGreatBayTitleENGTex" OutName="pause_great_bay_title_eng" Format="ia8" Width="128" Height="16" Offset="0x1000"/>
<Texture Name="gPauseStoneTowerTitleENGTex" OutName="pause_stone_tower_title_eng" Format="ia8" Width="128" Height="16" Offset="0x1800"/>
<!-- Pause Menu Info Panel To-> Textures -->
<Texture Name="gPauseToEquipENGTex" OutName="pause_to_equip_eng" Format="ia4" Width="64" Height="16" Offset="0x2000"/>
<Texture Name="gPauseToDecideENGTex" OutName="pause_to_decide_eng" Format="ia4" Width="64" Height="16" Offset="0x2200"/>
<Texture Name="gPauseToPlayMelodyENGTex" OutName="pause_to_play_melody_eng" Format="ia4" Width="96" Height="16" Offset="0x2400"/>
<Texture Name="gPauseToSelectItemENGTex" OutName="pause_to_select_item_eng" Format="ia4" Width="128" Height="16" Offset="0x2700"/>
<Texture Name="gPauseToMapENGTex" OutName="pause_to_map_eng" Format="ia4" Width="128" Height="16" Offset="0x2B00"/>
<Texture Name="gPauseToQuestStatusENGTex" OutName="pause_to_quest_status_eng" Format="ia4" Width="128" Height="16" Offset="0x2F00"/>
<Texture Name="gPauseToMasksENGTex" OutName="pause_to_masks_eng" Format="ia4" Width="128" Height="16" Offset="0x3300"/>
<Texture Name="gPauseToViewNotebookENGTex" OutName="pause_to_view_notebook_eng" Format="ia4" Width="96" Height="16" Offset="0x3700"/>
<!-- Pause Menu Pages Background Textures -->
<!-- Divided into 3 columns (first digit) and 5 rows (second digit) -->
<Texture Name="gPauseMasks10ENGTex" OutName="pause_masks_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x3A00"/>
<Texture Name="gPauseSelectItem00ENGTex" OutName="pause_select_item_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x4400"/>
<Texture Name="gPauseSelectItem10ENGTex" OutName="pause_select_item_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x4E00"/>
<Texture Name="gPauseSelectItem20ENGTex" OutName="pause_select_item_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0x5800"/>
<Texture Name="gPauseMap10ENGTex" OutName="pause_map_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x6200"/>
<Texture Name="gPauseQuestStatus00ENGTex" OutName="pause_quest_status_0_0_eng" Format="ia8" Width="80" Height="32" Offset="0x6C00"/>
<Texture Name="gPauseQuestStatus10ENGTex" OutName="pause_quest_status_1_0_eng" Format="ia8" Width="80" Height="32" Offset="0x7600"/>
<Texture Name="gPauseQuestStatus20ENGTex" OutName="pause_quest_status_2_0_eng" Format="ia8" Width="80" Height="32" Offset="0x8000"/>
</File>
</Root>
assets/xml/interface/parameter_static.xml
+1
View File
@@ -127,6 +127,7 @@
<Texture Name="gMinigameLetterTTex" OutName="minigame_letter_t" Format="i4" Width="32" Height="33" Offset="0x8578"/> <Texture Name="gMinigameLetterTTex" OutName="minigame_letter_t" Format="i4" Width="32" Height="33" Offset="0x8578"/>
<Texture Name="gMinigameExclamationTex" OutName="minigame_exclamation" Format="i4" Width="32" Height="33" Offset="0x8788"/> <Texture Name="gMinigameExclamationTex" OutName="minigame_exclamation" Format="i4" Width="32" Height="33" Offset="0x8788"/>
<!-- Similar to stray fairy icons in icon_item_dungeon_static, except with a turned head -->
<Texture Name="gStrayFairyWoodfallIconTex" OutName="stray_fairy_woodfall_icon" Format="rgba32" Width="32" Height="24" Offset="0x8998"/> <Texture Name="gStrayFairyWoodfallIconTex" OutName="stray_fairy_woodfall_icon" Format="rgba32" Width="32" Height="24" Offset="0x8998"/>
<Texture Name="gStrayFairySnowheadIconTex" OutName="stray_fairy_snowhead_icon" Format="rgba32" Width="32" Height="24" Offset="0x9598"/> <Texture Name="gStrayFairySnowheadIconTex" OutName="stray_fairy_snowhead_icon" Format="rgba32" Width="32" Height="24" Offset="0x9598"/>
<Texture Name="gStrayFairyGreatBayIconTex" OutName="stray_fairy_great_bay_icon" Format="rgba32" Width="32" Height="24" Offset="0xA198"/> <Texture Name="gStrayFairyGreatBayIconTex" OutName="stray_fairy_great_bay_icon" Format="rgba32" Width="32" Height="24" Offset="0xA198"/>
assets/xml/objects/object_bee.xml
+34 -24
View File
@@ -1,28 +1,38 @@
<Root> <Root>
<!-- Object for Bee -->
<File Name="object_bee" Segment="6"> <File Name="object_bee" Segment="6">
<Animation Name="object_bee_Anim_00005C" Offset="0x5C" /> <!-- Bee Animations -->
<DList Name="object_bee_DL_000550" Offset="0x550" /> <Animation Name="gBeeFlyingAnim" Offset="0x5C" />
<DList Name="object_bee_DL_000780" Offset="0x780" />
<DList Name="object_bee_DL_000848" Offset="0x848" /> <!-- Bee Limb DisplayLists -->
<DList Name="object_bee_DL_000918" Offset="0x918" /> <DList Name="gBeeBodyDL" Offset="0x550" />
<DList Name="object_bee_DL_0009D0" Offset="0x9D0" /> <DList Name="gBeeHeadDL" Offset="0x780" />
<Texture Name="object_bee_TLUT_000A88" OutName="tlut_000A88" Format="rgba16" Width="4" Height="4" Offset="0xA88" /> <DList Name="gBeeAntennaeDL" Offset="0x848" />
<Texture Name="object_bee_TLUT_000AA8" OutName="tlut_000AA8" Format="rgba16" Width="4" Height="4" Offset="0xAA8" /> <DList Name="gBeeRightWingDL" Offset="0x918" />
<Texture Name="object_bee_TLUT_000AC8" OutName="tlut_000AC8" Format="rgba16" Width="4" Height="4" Offset="0xAC8" /> <DList Name="gBeeLeftWingDL" Offset="0x9D0" />
<Texture Name="object_bee_TLUT_000AE8" OutName="tlut_000AE8" Format="rgba16" Width="4" Height="4" Offset="0xAE8" />
<Texture Name="object_bee_Tex_000B08" OutName="tex_000B08" Format="ci4" Width="32" Height="32" Offset="0xB08" /> <!-- Bee Textures -->
<Texture Name="object_bee_Tex_000D08" OutName="tex_000D08" Format="ci4" Width="32" Height="32" Offset="0xD08" /> <Texture Name="gBeeWingTLUT" OutName="bee_wing_tlut" Format="rgba16" Width="4" Height="4" Offset="0xA88" />
<Texture Name="object_bee_Tex_000F08" OutName="tex_000F08" Format="ci4" Width="32" Height="32" Offset="0xF08" /> <Texture Name="gBeeHeadTLUT" OutName="bee_head_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAA8" />
<Texture Name="object_bee_Tex_001108" OutName="tex_001108" Format="ci4" Width="32" Height="32" Offset="0x1108" /> <Texture Name="gBeeBodyTLUT" OutName="bee_body_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAC8" />
<Limb Name="object_bee_Standardlimb_001308" Type="Standard" EnumName="OBJECT_BEE_LIMB_01" Offset="0x1308" /> <Texture Name="gBeeAntennaeTLUT" OutName="bee_antennae_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAE8" />
<Limb Name="object_bee_Standardlimb_001314" Type="Standard" EnumName="OBJECT_BEE_LIMB_02" Offset="0x1314" /> <Texture Name="gBeeWingTex" OutName="bee_wing" Format="ci4" Width="32" Height="32" Offset="0xB08" />
<Limb Name="object_bee_Standardlimb_001320" Type="Standard" EnumName="OBJECT_BEE_LIMB_03" Offset="0x1320" /> <Texture Name="gBeeHeadTex" OutName="bee_head" Format="ci4" Width="32" Height="32" Offset="0xD08" />
<Limb Name="object_bee_Standardlimb_00132C" Type="Standard" EnumName="OBJECT_BEE_LIMB_04" Offset="0x132C" /> <Texture Name="gBeeBodyTex" OutName="bee_body" Format="ci4" Width="32" Height="32" Offset="0xF08" />
<Limb Name="object_bee_Standardlimb_001338" Type="Standard" EnumName="OBJECT_BEE_LIMB_05" Offset="0x1338" /> <Texture Name="gBeeAntennaeTex" OutName="bee_antennae" Format="ci4" Width="32" Height="32" Offset="0x1108" />
<Limb Name="object_bee_Standardlimb_001344" Type="Standard" EnumName="OBJECT_BEE_LIMB_06" Offset="0x1344" />
<Limb Name="object_bee_Standardlimb_001350" Type="Standard" EnumName="OBJECT_BEE_LIMB_07" Offset="0x1350" /> <!-- Bee Limbs -->
<Limb Name="object_bee_Standardlimb_00135C" Type="Standard" EnumName="OBJECT_BEE_LIMB_08" Offset="0x135C" /> <Limb Name="gBeeRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ROOT" Offset="0x1308" />
<Limb Name="object_bee_Standardlimb_001368" Type="Standard" EnumName="OBJECT_BEE_LIMB_09" Offset="0x1368" /> <Limb Name="gBeeWingsRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_WINGS_ROOT" Offset="0x1314" />
<Skeleton Name="object_bee_Skel_001398" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="ObjectBeeLimb" Offset="0x1398" /> <Limb Name="gBeeLeftWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING_ROOT" Offset="0x1320" />
<Limb Name="gBeeLeftWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_LEFT_WING" Offset="0x132C" />
<Limb Name="gBeeRightWingRootLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING_ROOT" Offset="0x1338" />
<Limb Name="gBeeRightWingLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_RIGHT_WING" Offset="0x1344" />
<Limb Name="gBeeBodyLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_BODY" Offset="0x1350" />
<Limb Name="gBeeAntennaeLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_ANTENNAE" Offset="0x135C" />
<Limb Name="gBeeHeadLimb" Type="Standard" EnumName="OBJECT_BEE_LIMB_HEAD" Offset="0x1368" />
<!-- Bee Skeleton -->
<Skeleton Name="gBeeSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="ObjectBeeLimb" Offset="0x1398" />
</File> </File>
</Root> </Root>
assets/xml/objects/object_kamejima.xml
+93 -75
View File
@@ -1,81 +1,99 @@
<Root> <Root>
<!-- Assest for the giant turtle and wave he creates -->
<File Name="object_kamejima" Segment="6"> <File Name="object_kamejima" Segment="6">
<Array Name="object_kamejima_Vtx_000000" Count="20" Offset="0x0"> <!-- Turtle Wave -->
<Array Name="gTurtleWaveVtx" Count="20" Offset="0x0">
<Vtx/> <Vtx/>
</Array> </Array>
<DList Name="object_kamejima_DL_000140" Offset="0x140" /> <DList Name="gTurtleWaveDL" Offset="0x140" />
<Texture Name="object_kamejima_Tex_0002D8" OutName="tex_0002D8" Format="i8" Width="32" Height="64" Offset="0x2D8" /> <Texture Name="gTurtleWaveUnusedTex" OutName="turtle_wave_unused" Format="i8" Width="32" Height="64" Offset="0x2D8" />
<Texture Name="object_kamejima_Tex_000AD8" OutName="tex_000AD8" Format="i8" Width="64" Height="64" Offset="0xAD8" /> <Texture Name="gTurtleWaveTex" OutName="turtle_wave" Format="i8" Width="64" Height="64" Offset="0xAD8" />
<TextureAnimation Name="object_kamejima_Matanimheader_001AF0" Offset="0x1AF0" /> <TextureAnimation Name="gTurtleWaveTexAnim" Offset="0x1AF0" />
<Collision Name="object_kamejima_Colheader_002328" Offset="0x2328" />
<!-- <Blob Name="object_kamejima_Blob_002354" Size="0x1C" Offset="0x2354" /> -->
<Collision Name="object_kamejima_Colheader_002470" Offset="0x2470" /> <!-- Turtle -->
<Collision Name="object_kamejima_Colheader_002E04" Offset="0x2E04" /> <Collision Name="gTurtleZoraCapeAsleepCol" Offset="0x2328" />
<Animation Name="object_kamejima_Anim_003980" Offset="0x3980" /> <TextureAnimation Name="gTurtleEmptyTexAnim" Offset="0x2360"/>
<Animation Name="object_kamejima_Anim_0047B8" Offset="0x47B8" /> <Collision Name="gTurtleZoraCapeAwakeCol" Offset="0x2470" />
<Animation Name="object_kamejima_Anim_0048B0" Offset="0x48B0" /> <Collision Name="gTurtleUnusedCol" Offset="0x2E04" />
<DList Name="object_kamejima_DL_004E70" Offset="0x4E70" />
<Texture Name="object_kamejima_TLUT_005248" OutName="tlut_005248" Format="rgba16" Width="16" Height="16" Offset="0x5248" /> <Animation Name="gTurtleGlitchy1Anim" Offset="0x3980" />
<Texture Name="object_kamejima_Tex_005448" OutName="tex_005448" Format="ci8" Width="32" Height="32" Offset="0x5448" /> <Animation Name="gTurtleCoughAnim" Offset="0x47B8" />
<Texture Name="object_kamejima_Tex_005848" OutName="tex_005848" Format="ci8" Width="64" Height="32" Offset="0x5848" /> <Animation Name="gTurtleIdleAnim" Offset="0x48B0" />
<!-- <Blob Name="object_kamejima_Blob_006050" Size="0x10" Offset="0x6050" /> -->
<Animation Name="object_kamejima_Anim_006980" Offset="0x6980" /> <DList Name="gTurtleAsleepDL" Offset="0x4E70" /> <!-- When asleep, the turtle looks like a giant rock -->
<DList Name="object_kamejima_DL_008760" Offset="0x8760" />
<DList Name="object_kamejima_DL_008E18" Offset="0x8E18" /> <Texture Name="gTurtleAsleepTLUT" OutName="turtle_asleep_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5248" />
<DList Name="object_kamejima_DL_0090E8" Offset="0x90E8" /> <Texture Name="gTurtleAsleepGrassTex" OutName="turtle_asleep_grass" Format="ci8" Width="32" Height="32" Offset="0x5448" />
<DList Name="object_kamejima_DL_009278" Offset="0x9278" /> <Texture Name="gTurtleAsleepGrassDirtTex" OutName="turtle_asleep_grass_dirt" Format="ci8" Width="64" Height="32" Offset="0x5848" />
<DList Name="object_kamejima_DL_0093E8" Offset="0x93E8" />
<DList Name="object_kamejima_DL_0096B8" Offset="0x96B8" /> <Animation Name="gTurtleSwimAnim" Offset="0x6980" />
<DList Name="object_kamejima_DL_009848" Offset="0x9848" />
<DList Name="object_kamejima_DL_0099B8" Offset="0x99B8" /> <DList Name="gTurtleShellDL" Offset="0x8760" />
<DList Name="object_kamejima_DL_009C38" Offset="0x9C38" /> <DList Name="gTurtleFrontLeftUpperFlipperDL" Offset="0x8E18" />
<DList Name="object_kamejima_DL_009E38" Offset="0x9E38" /> <DList Name="gTurtleFrontLeftLowerFlipperDL" Offset="0x90E8" />
<DList Name="object_kamejima_DL_009F18" Offset="0x9F18" /> <DList Name="gTurtleFrontLeftEndFlipperDL" Offset="0x9278" />
<DList Name="object_kamejima_DL_00A118" Offset="0xA118" /> <DList Name="gTurtleFrontRightUpperFlipperDL" Offset="0x93E8" />
<DList Name="object_kamejima_DL_00A4B8" Offset="0xA4B8" /> <DList Name="gTurtleFrontRightLowerFlipperDL" Offset="0x96B8" />
<DList Name="object_kamejima_DL_00A7C8" Offset="0xA7C8" /> <DList Name="gTurtleFrontRightEndFlipperDL" Offset="0x9848" />
<Texture Name="object_kamejima_TLUT_00AAD8" OutName="tlut_00AAD8" Format="rgba16" Width="16" Height="16" Offset="0xAAD8" /> <DList Name="gTurtleBackRightFlipperDL" Offset="0x99B8" />
<Texture Name="object_kamejima_TLUT_00ACD8" OutName="tlut_00ACD8" Format="rgba16" Width="16" Height="16" Offset="0xACD8" /> <DList Name="gTurtleBackLeftFlipperDL" Offset="0x9C38" />
<Texture Name="object_kamejima_Tex_00AED8" OutName="tex_00AED8" Format="ci8" Width="32" Height="32" Offset="0xAED8" /> <DList Name="gTurtleTailDL" Offset="0x9E38" />
<Texture Name="object_kamejima_Tex_00B2D8" OutName="tex_00B2D8" Format="ci8" Width="16" Height="16" Offset="0xB2D8" /> <DList Name="gTurtleNeckDL" Offset="0x9F18" />
<Texture Name="object_kamejima_Tex_00B3D8" OutName="tex_00B3D8" Format="ci8" Width="16" Height="32" Offset="0xB3D8" /> <DList Name="gTurtleHeadDL" Offset="0xA118" />
<Texture Name="object_kamejima_Tex_00B5D8" OutName="tex_00B5D8" Format="ci8" Width="64" Height="32" Offset="0xB5D8" /> <DList Name="gTurtleUpperMouthDL" Offset="0xA4B8" />
<Texture Name="object_kamejima_Tex_00BDD8" OutName="tex_00BDD8" Format="ci8" Width="16" Height="16" Offset="0xBDD8" /> <DList Name="gTurtleLowerMouthDL" Offset="0xA7C8" />
<!-- <Blob Name="object_kamejima_Blob_00BED8" Size="0x1800" Offset="0xBED8" /> -->
<Texture Name="object_kamejima_Tex_00D6D8" OutName="tex_00D6D8" Format="ci8" Width="16" Height="16" Offset="0xD6D8" /> <Texture Name="gTurtleSkinTLUT" OutName="turtle_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAAD8" />
<Texture Name="object_kamejima_Tex_00D7D8" OutName="tex_00D7D8" Format="ci8" Width="32" Height="64" Offset="0xD7D8" /> <Texture Name="gTurtleTLUT" OutName="turtle_tlut" Format="rgba16" Width="16" Height="16" Offset="0xACD8" />
<Texture Name="object_kamejima_Tex_00DFD8" OutName="tex_00DFD8" Format="ci8" Width="32" Height="32" Offset="0xDFD8" /> <Texture Name="gTurtleNostrilTex" OutName="turtle_nostril" Format="ci8" Width="32" Height="32" Offset="0xAED8" />
<Texture Name="object_kamejima_Tex_00E3D8" OutName="tex_00E3D8" Format="ci8" Width="16" Height="32" Offset="0xE3D8" /> <Texture Name="gTurtleInsideUpperMouthTex" OutName="turtle_inside_upper_mouth" Format="ci8" Width="16" Height="16" Offset="0xB2D8" />
<Limb Name="object_kamejima_Standardlimb_00E5D8" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_01" Offset="0xE5D8" /> <Texture Name="gTurtleInsideLowerMouthTex" OutName="turtle_inside_lower_mouth" Format="ci8" Width="16" Height="32" Offset="0xB3D8"/>
<Limb Name="object_kamejima_Standardlimb_00E5E4" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_02" Offset="0xE5E4" /> <Texture Name="gTurtleSpottedSkinTex" OutName="turtle_spotted_skin" Format="ci8" Width="64" Height="32" Offset="0xB5D8"/>
<Limb Name="object_kamejima_Standardlimb_00E5F0" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_03" Offset="0xE5F0" /> <Texture Name="gTurtleSkinTex" OutName="turtle_skin" Format="ci8" Width="16" Height="16" Offset="0xBDD8" />
<Limb Name="object_kamejima_Standardlimb_00E5FC" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_04" Offset="0xE5FC" /> <Texture Name="gTurtleEyeOpenStraightTex" OutName="turtle_eye_open_straight" Format="ci8" Width="32" Height="32" Offset="0xBED8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E608" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_05" Offset="0xE608" /> <Texture Name="gTurtleEyeHalfStraightTex" OutName="turtle_eye_half_straight" Format="ci8" Width="32" Height="32" Offset="0xC2D8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E614" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_06" Offset="0xE614" /> <Texture Name="gTurtleEyeClosedTex" OutName="turtle_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xC6D8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E620" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_07" Offset="0xE620" /> <Texture Name="gTurtleEyeHalfLeftTex" OutName="turtle_eye_half_left" Format="ci8" Width="32" Height="32" Offset="0xCAD8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E62C" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_08" Offset="0xE62C" /> <Texture Name="gTurtleEyeOpenRightTex" OutName="turtle_eye_half_right" Format="ci8" Width="32" Height="32" Offset="0xCED8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E638" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_09" Offset="0xE638" /> <Texture Name="gTurtleEyeOpenLeftTex" OutName="turtle_eye_half_left_2" Format="ci8" Width="32" Height="32" Offset="0xD2D8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E644" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0A" Offset="0xE644" />
<Limb Name="object_kamejima_Standardlimb_00E650" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0B" Offset="0xE650" /> <Texture Name="gTurtleHeadTex" OutName="turtle_head" Format="ci8" Width="16" Height="16" Offset="0xD6D8"/>
<Limb Name="object_kamejima_Standardlimb_00E65C" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0C" Offset="0xE65C" /> <Texture Name="gTurtleShellGrassTex" OutName="turtle_shell_grass" Format="ci8" Width="32" Height="64" Offset="0xD7D8" />
<Limb Name="object_kamejima_Standardlimb_00E668" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0D" Offset="0xE668" /> <Texture Name="gTurtleShellScutesTex" OutName="turtle_shell_scutes" Format="ci8" Width="32" Height="32" Offset="0xDFD8"/>
<Limb Name="object_kamejima_Standardlimb_00E674" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0E" Offset="0xE674" /> <Texture Name="gTurtleShellBottomTex" OutName="turtle_shell_bottom" Format="ci8" Width="16" Height="32" Offset="0xE3D8"/>
<Limb Name="object_kamejima_Standardlimb_00E680" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0F" Offset="0xE680" />
<Limb Name="object_kamejima_Standardlimb_00E68C" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_10" Offset="0xE68C" /> <Limb Name="gTurtleRootLimb" Type="Standard" EnumName="TURTLE_LIMB_ROOT" Offset="0xE5D8" />
<Limb Name="object_kamejima_Standardlimb_00E698" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_11" Offset="0xE698" /> <Limb Name="gTurtleShellLimb" Type="Standard" EnumName="TURTLE_LIMB_SHELL" Offset="0xE5E4" />
<Limb Name="object_kamejima_Standardlimb_00E6A4" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_12" Offset="0xE6A4" /> <Limb Name="gTurtleNeckHeadRootLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK_HEAD_ROOT" Offset="0xE5F0" />
<Limb Name="object_kamejima_Standardlimb_00E6B0" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_13" Offset="0xE6B0" /> <Limb Name="gTurtleNeckLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK" Offset="0xE5FC" />
<Limb Name="object_kamejima_Standardlimb_00E6BC" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_14" Offset="0xE6BC" /> <Limb Name="gTurtleHeadLimb" Type="Standard" EnumName="TURTLE_LIMB_HEAD" Offset="0xE608" />
<Limb Name="object_kamejima_Standardlimb_00E6C8" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_15" Offset="0xE6C8" /> <Limb Name="gTurtleUpperMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_UPPER_MOUTH" Offset="0xE614" />
<Limb Name="object_kamejima_Standardlimb_00E6D4" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_16" Offset="0xE6D4" /> <Limb Name="gTurtleLowerMouthRootLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH_ROOT" Offset="0xE620" />
<Limb Name="object_kamejima_Standardlimb_00E6E0" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_17" Offset="0xE6E0" /> <Limb Name="gTurtleLowerMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH" Offset="0xE62C" />
<Skeleton Name="object_kamejima_Skel_00E748" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KAMEJIMA_LIMB_NONE" LimbMax="OBJECT_KAMEJIMA_LIMB_MAX" EnumName="ObjectKamejimaLimb" Offset="0xE748" /> <Limb Name="gTurtleBackLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER_ROOT" Offset="0xE638" />
<Animation Name="object_kamejima_Anim_00EF98" Offset="0xEF98" /> <Limb Name="gTurtleBackLeftFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER" Offset="0xE644" />
<Animation Name="object_kamejima_Anim_0100CC" Offset="0x100CC" /> <Limb Name="gTurtleBackRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER_ROOT" Offset="0xE650" />
<Animation Name="object_kamejima_Anim_010918" Offset="0x10918" /> <Limb Name="gTurtleBackRightFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER" Offset="0xE65C" />
<Animation Name="object_kamejima_Anim_0119D4" Offset="0x119D4" /> <Limb Name="gTurtleTailRootLimb" Type="Standard" EnumName="TURTLE_TAIL_ROOT_LIMB" Offset="0xE668" />
<Animation Name="object_kamejima_Anim_012260" Offset="0x12260" /> <Limb Name="gTurtleTailLimb" Type="Standard" EnumName="TURTLE_TAIL_LIMB" Offset="0xE674" />
<Animation Name="object_kamejima_Anim_013264" Offset="0x13264" /> <Limb Name="gTurtleTailEndRootLimb" Type="Standard" EnumName="TURTLE_TAIL_END_ROOT_LIMB" Offset="0xE680" />
<Animation Name="object_kamejima_Anim_014E8C" Offset="0x14E8C" /> <Limb Name="gTurtleFrontLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_FLIPPER_ROOT" Offset="0xE68C" />
<Limb Name="gTurtleFrontLeftUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_UPPER_FLIPPER" Offset="0xE698" />
<Limb Name="gTurtleFrontLeftLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_LOWER_FLIPPER" Offset="0xE6A4" />
<Limb Name="gTurtleFrontLeftEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_END_FLIPPER" Offset="0xE6B0" />
<Limb Name="gTurtleFrontRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_FLIPPER_ROOT" Offset="0xE6BC" />
<Limb Name="gTurtleFrontRightUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_UPPER_FLIPPER" Offset="0xE6C8" />
<Limb Name="gTurtleFrontRightLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_LOWER_FLIPPER" Offset="0xE6D4" />
<Limb Name="gTurtleFrontRightEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_END_FLIPPER" Offset="0xE6E0" />
<Skeleton Name="gTurtleSkel" Type="Flex" LimbType="Standard" LimbNone="TURTLE_LIMB_NONE" LimbMax="TURTLE_LIMB_MAX" EnumName="TurtleLimb" Offset="0xE748" />
<Animation Name="gTurtleGlitchy2Anim" Offset="0xEF98" />
<Animation Name="gTurtleSpeak1Anim" Offset="0x100CC" />
<Animation Name="gTurtleGlitchyRaiseHeadAnim" Offset="0x10918" />
<Animation Name="gTurtleSpeak2Anim" Offset="0x119D4" />
<Animation Name="gTurtleFloatAnim" Offset="0x12260" />
<Animation Name="gTurtleGlitchyLookAroundAnim" Offset="0x13264" />
<Animation Name="gTurtleYawnAnim" Offset="0x14E8C" />
</File> </File>
</Root> </Root>
assets/xml/objects/object_umajump.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<File Name="object_umajump" Segment="6"> <File Name="object_umajump" Segment="6">
<Texture Name="object_umajump_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="64" Offset="0x0" /> <Texture Name="object_umajump_Tex_000000" OutName="tex_000000" Format="rgba16" Width="16" Height="64" Offset="0x0" />
<Texture Name="object_umajump_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="64" Offset="0x800" /> <Texture Name="object_umajump_Tex_000800" OutName="tex_000800" Format="rgba16" Width="16" Height="64" Offset="0x800" />
<DList Name="object_umajump_DL_001220" Offset="0x1220" /> <DList Name="gHorseJumpFenceDL" Offset="0x1220" />
<Collision Name="object_umajump_Colheader_001438" Offset="0x1438" /> <Collision Name="object_umajump_Colheader_001438" Offset="0x1438" />
<Collision Name="object_umajump_Colheader_001558" Offset="0x1558" /> <Collision Name="object_umajump_Colheader_001558" Offset="0x1558" />
</File> </File>
assets/xml/overlays/ovl_Dm_Char08.xml
+17
View File
@@ -0,0 +1,17 @@
<Root>
<File Name="ovl_Dm_Char08" BaseAddress="0x80AAF050" RangeStart="0x2320" RangeEnd="0x266C">
<Array Name="sTurtleGreatBayTempleColPolygons" Count="19" Offset="0x2350">
<CollisionPoly/>
</Array>
<Array Name="sTurtleGreatBayTempleColPolygons2" Count="19" Offset="0x2480">
<CollisionPoly/>
</Array>
<Array Name="sTurtleGreatBayTempleColVertices" Count="12" Offset="0x25B0">
<Vector Type="s16" Dimensions="3" />
</Array>
<Array Name="sTurtleGreatBayTempleColVertices2" Count="12" Offset="0x25F8">
<Vector Type="s16" Dimensions="3" />
</Array>
<Collision Name="sTurtleGreatBayTempleCol" Offset="0x2640"/>
</File>
</Root>
docs/tutorial/other_functions.md
+1 -1
View File
@@ -401,7 +401,7 @@ There remains one thing we need to fix before trying to compile it, namely `*(&g
```C ```C
/* 0x0EF8 */ u8 weekEventReg[100]; // "week_event_reg" /* 0x0EF8 */ u8 weekEventReg[100]; // "week_event_reg"
/* 0x0F5C */ u32 mapsVisited; // "area_arrival" /* 0x0F5C */ u32 regionsVisited; // "area_arrival"
``` ```
so it's somewhere in `weekEventReg`. `0xF37 - 0xEF8 = 0x3F = 63`, and it's a byte array, so the access is actually `gSaveContext.save.weekEventReg[63] & 0x80`. Now it will compile. We also don't use `!= 0` for flag comparisons: just `if (gSaveContext.save.weekEventReg[63] & 0x80)` will do. so it's somewhere in `weekEventReg`. `0xF37 - 0xEF8 = 0x3F = 63`, and it's a byte array, so the access is actually `gSaveContext.save.weekEventReg[63] & 0x80`. Now it will compile. We also don't use `!= 0` for flag comparisons: just `if (gSaveContext.save.weekEventReg[63] & 0x80)` will do.
include/PR/gbi.h
+2 -2
View File
@@ -3572,7 +3572,7 @@ _DW({ \
#define gDPLoadTextureBlock(pkt, timg, fmt, siz, width, height, \ #define gDPLoadTextureBlock(pkt, timg, fmt, siz, width, height, \
pal, cms, cmt, masks, maskt, shifts, shiftt) \ pal, cms, cmt, masks, maskt, shifts, shiftt) \
{ \ _DW({ \
gDPSetTextureImage(pkt, fmt, siz##_LOAD_BLOCK, 1, timg); \ gDPSetTextureImage(pkt, fmt, siz##_LOAD_BLOCK, 1, timg); \
gDPSetTile(pkt, fmt, siz##_LOAD_BLOCK, 0, 0, G_TX_LOADTILE, \ gDPSetTile(pkt, fmt, siz##_LOAD_BLOCK, 0, 0, G_TX_LOADTILE, \
0 , cmt, maskt, shiftt, cms, masks, shifts); \ 0 , cmt, maskt, shiftt, cms, masks, shifts); \
@@ -3588,7 +3588,7 @@ _DW({ \
gDPSetTileSize(pkt, G_TX_RENDERTILE, 0, 0, \ gDPSetTileSize(pkt, G_TX_RENDERTILE, 0, 0, \
((width)-1) << G_TEXTURE_IMAGE_FRAC, \ ((width)-1) << G_TEXTURE_IMAGE_FRAC, \
((height)-1) << G_TEXTURE_IMAGE_FRAC); \ ((height)-1) << G_TEXTURE_IMAGE_FRAC); \
} })
#define gDPLoadTextureBlockYuv(pkt, timg, fmt, siz, width, height, \ #define gDPLoadTextureBlockYuv(pkt, timg, fmt, siz, width, height, \
pal, cms, cmt, masks, maskt, shifts, shiftt) \ pal, cms, cmt, masks, maskt, shifts, shiftt) \
include/functions.h
+11 -10
View File
@@ -882,6 +882,7 @@ void func_800C636C(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C63C4(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void func_800C63C4(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C641C(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void func_800C641C(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C6474(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void func_800C6474(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C6554(PlayState* play, DynaCollisionContext* dyna);
void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void BgCheck_CalcWaterboxDimensions(Vec3f* minPos, Vec3f* maxXPos, Vec3f* maxZPos, Vec3s* minPosOut, s16* xLength, s16* zLength); void BgCheck_CalcWaterboxDimensions(Vec3f* minPos, Vec3f* maxXPos, Vec3f* maxZPos, Vec3s* minPosOut, s16* xLength, s16* zLength);
void DynaPoly_ExpandSRT(PlayState* play, DynaCollisionContext* dyna, s32 bgId, s32* vtxStartIndex, s32* polyStartIndex, s32* waterBoxStartIndex); void DynaPoly_ExpandSRT(PlayState* play, DynaCollisionContext* dyna, s32 bgId, s32* vtxStartIndex, s32* polyStartIndex, s32* waterBoxStartIndex);
@@ -1672,8 +1673,8 @@ void func_80106644(PlayState* play, s16 arg1, s16 arg2, s16 arg3);
// void func_80108558(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7); // void func_80108558(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
// void func_80108A10(void); // void func_80108A10(void);
// void func_80108A64(void); // void func_80108A64(void);
// void func_80108AF8(void); void func_80108AF8(PlayState* play);
// void func_801090B0(void); s32 func_801090B0(s32 arg0);
s32 func_80109124(s16 arg0); s32 func_80109124(s16 arg0);
// void func_801091F0(void); // void func_801091F0(void);
// void func_80109428(void); // void func_80109428(void);
@@ -1805,15 +1806,15 @@ Vec3f* OLib_Vec3fDiffDegF(Vec3f* dest, Vec3f* a, Vec3f* b);
Vec3s* OLib_Vec3fDiffBinAng(Vec3s* dest, Vec3f* a, Vec3f* b); Vec3s* OLib_Vec3fDiffBinAng(Vec3s* dest, Vec3f* a, Vec3f* b);
void OLib_DbCameraVec3fDiff(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode); void OLib_DbCameraVec3fDiff(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
void OLib_DbCameraVec3fSum(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode); void OLib_DbCameraVec3fSum(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
// void func_8010CB80(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10); Gfx* func_8010CB80(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* func_8010CD98(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy); Gfx* func_8010CD98(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
// void func_8010CFBC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11, UNK_TYPE2 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14); // void func_8010CFBC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11, UNK_TYPE2 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14);
// void func_8010D2D4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11); // void func_8010D2D4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11);
// void func_8010D480(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11, UNK_TYPE2 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14, UNK_TYPE4 param_15, UNK_TYPE4 param_16); // void func_8010D480(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10, UNK_TYPE2 param_11, UNK_TYPE2 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14, UNK_TYPE4 param_15, UNK_TYPE4 param_16);
Gfx* func_8010D7D0(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy); Gfx* func_8010D7D0(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
// void func_8010D9F4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10, UNK_TYPE4 param_11, UNK_TYPE4 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14); // void func_8010D9F4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10, UNK_TYPE4 param_11, UNK_TYPE4 param_12, UNK_TYPE2 param_13, UNK_TYPE2 param_14);
Gfx* func_8010DC58(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, u16 i); Gfx* func_8010DC58(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, u16 i);
// void func_8010DE38(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6); Gfx* func_8010DE38(Gfx* gfx, TexturePtr texture, s32 fmt, s16 textureWidth, s16 textureHeight, u16 point);
// void func_8010E028(void); // void func_8010E028(void);
void Interface_StartTimer(s16 timerId, s16 seconds); void Interface_StartTimer(s16 timerId, s16 seconds);
void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState); void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState);
@@ -2056,7 +2057,7 @@ void Inventory_ChangeEquipment(s16 value);
u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment); u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment);
void Inventory_ChangeUpgrade(s16 upgrade, u32 value); void Inventory_ChangeUpgrade(s16 upgrade, u32 value);
s32 Inventory_IsMapVisible(s16 sceneId); s32 Inventory_IsMapVisible(s16 sceneId);
void Inventory_SetMapVisibility(s16 tingleIndex); void Inventory_SetWorldMapCloudVisibility(s16 tingleIndex);
void Inventory_SaveDekuPlaygroundHighScore(s16 timerId); void Inventory_SaveDekuPlaygroundHighScore(s16 timerId);
void Inventory_IncrementSkullTokenCount(s16 sceneIndex); void Inventory_IncrementSkullTokenCount(s16 sceneIndex);
s16 Inventory_GetSkullTokenCount(s16 sceneIndex); s16 Inventory_GetSkullTokenCount(s16 sceneIndex);
@@ -2098,7 +2099,7 @@ void Scene_HeaderCmdActorCutsceneList(PlayState* play, SceneCmd* cmd);
void Scene_HeaderCmdMiniMap(PlayState* play, SceneCmd* cmd); void Scene_HeaderCmdMiniMap(PlayState* play, SceneCmd* cmd);
void Scene_HeaderCmd1D(PlayState* play, SceneCmd* cmd); void Scene_HeaderCmd1D(PlayState* play, SceneCmd* cmd);
void Scene_HeaderCmdMiniMapCompassInfo(PlayState* play, SceneCmd* cmd); void Scene_HeaderCmdMiniMapCompassInfo(PlayState* play, SceneCmd* cmd);
void Scene_HeaderCmdSetAreaVisitedFlag(PlayState* play, SceneCmd* cmd); void Scene_HeaderCmdSetRegionVisitedFlag(PlayState* play, SceneCmd* cmd);
void Scene_HeaderCmdAnimatedMaterials(PlayState* play, SceneCmd* cmd); void Scene_HeaderCmdAnimatedMaterials(PlayState* play, SceneCmd* cmd);
void Scene_SetExitFade(PlayState* play); void Scene_SetExitFade(PlayState* play);
s32 Scene_ProcessHeader(PlayState* play, SceneCmd* header); s32 Scene_ProcessHeader(PlayState* play, SceneCmd* header);
@@ -2360,7 +2361,7 @@ void Message_FindMessageNES(PlayState* play, u16 textId);
// void Message_LoadLocalizedRupeesNES(void); // void Message_LoadLocalizedRupeesNES(void);
// void Message_LoadRupeesNES(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5); // void Message_LoadRupeesNES(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
// void Message_LoadTimeNES(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5); // void Message_LoadTimeNES(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void Message_LoadAreaTextNES(void); // void Message_LoadOwlWarpTextNES(void);
// void func_80159438(void); // void func_80159438(void);
void func_8015966C(PlayState* play, UNK_PTR puParm2, UNK_TYPE arg3); void func_8015966C(PlayState* play, UNK_PTR puParm2, UNK_TYPE arg3);
// void func_8015A144(void); // void func_8015A144(void);
include/regs.h
+8 -2
View File
@@ -47,8 +47,9 @@
#define R_RUN_SPEED_LIMIT REG(45) #define R_RUN_SPEED_LIMIT REG(45)
#define R_UPDATE_RATE SREG(30) #define R_UPDATE_RATE SREG(30)
#define R_PAUSE_MENU_MODE SREG(94) #define R_PAUSE_MENU_MODE SREG(94)
#define R_C_UP_ICON_X YREG(88) #define R_PAUSE_WORLD_MAP_YAW YREG(24)
#define R_C_UP_ICON_Y YREG(89) #define R_PAUSE_WORLD_MAP_Y_OFFSET YREG(25)
#define R_PAUSE_WORLD_MAP_DEPTH YREG(26)
#define R_MAGIC_FILL_COLOR(i) ZREG(0 + i) #define R_MAGIC_FILL_COLOR(i) ZREG(0 + i)
#define R_C_BTN_COLOR(i) ZREG(39 + i) #define R_C_BTN_COLOR(i) ZREG(39 + i)
#define R_B_BTN_COLOR(i) ZREG(43 + i) #define R_B_BTN_COLOR(i) ZREG(43 + i)
@@ -71,8 +72,13 @@
#define R_A_ICON_X XREG(20) #define R_A_ICON_X XREG(20)
#define R_A_BTN_COLOR(i) XREG(22 + i) #define R_A_BTN_COLOR(i) XREG(22 + i)
#define R_MAGIC_CONSUME_TIMER_GIANTS_MASK XREG(41) #define R_MAGIC_CONSUME_TIMER_GIANTS_MASK XREG(41)
#define R_PAUSE_DBG_MAP_CLOUD_ON XREG(50)
#define R_PAUSE_DBG_MAP_CLOUD_X XREG(52)
#define R_PAUSE_DBG_MAP_CLOUD_Y XREG(53)
#define R_MOON_CRASH_TIMER_Y XREG(80) #define R_MOON_CRASH_TIMER_Y XREG(80)
#define R_MOON_CRASH_TIMER_X XREG(81) #define R_MOON_CRASH_TIMER_X XREG(81)
#define R_PAUSE_OWLWARP_ALPHA XREG(87)
#define R_REVERSE_FLOOR_INDEX XREG(94)
#define R_MINIMAP_DISABLED XREG(95) #define R_MINIMAP_DISABLED XREG(95)
#define R_B_LABEL_DD WREG(0) #define R_B_LABEL_DD WREG(0)
#define R_OW_MINIMAP_X WREG(29) #define R_OW_MINIMAP_X WREG(29)
include/z64.h
+3 -3
View File
@@ -439,7 +439,7 @@ typedef struct {
/* 0x238 */ s16 cursorPoint[5]; /* 0x238 */ s16 cursorPoint[5];
/* 0x242 */ s16 cursorXIndex[5]; /* 0x242 */ s16 cursorXIndex[5];
/* 0x24C */ s16 cursorYIndex[5]; /* 0x24C */ s16 cursorYIndex[5];
/* 0x256 */ s16 unk_256; /* 0x256 */ s16 unk_256; // Uses DungeonItem enum
/* 0x258 */ s16 cursorSpecialPos; /* 0x258 */ s16 cursorSpecialPos;
/* 0x25A */ s16 pageSwitchTimer; /* 0x25A */ s16 pageSwitchTimer;
/* 0x25C */ u16 unk_25C; /* 0x25C */ u16 unk_25C;
@@ -472,8 +472,8 @@ typedef struct {
/* 0x2BA */ s16 equipAnimScale; // scale of item icon while moving being equipped to c-button /* 0x2BA */ s16 equipAnimScale; // scale of item icon while moving being equipped to c-button
/* 0x2BC */ s16 equipAnimShrinkRate; // rate the scale is shrinking for the item icon while moving being equipped to c-button /* 0x2BC */ s16 equipAnimShrinkRate; // rate the scale is shrinking for the item icon while moving being equipped to c-button
/* 0x2BE */ s16 unk_2BE[5]; /* 0x2BE */ s16 unk_2BE[5];
/* 0x2C8 */ u16 unk_2C8; /* 0x2C8 */ u16 unk_2C8; // Uses PauseMenuPage enum for Owl Warp. Never set.
/* 0x2CA */ s16 unk_2CA; /* 0x2CA */ s16 unk_2CA; // Uses OwlStatueId enum for Owl Warp. Never set.
} PauseContext; // size = 0x2D0 } PauseContext; // size = 0x2D0
typedef struct { typedef struct {
include/z64item.h
+14 -1
View File
@@ -65,6 +65,19 @@ typedef enum {
/* 0x1C */ QUEST_HEART_PIECE_COUNT = 0x1C /* 0x1C */ QUEST_HEART_PIECE_COUNT = 0x1C
} QuestItem; } QuestItem;
typedef enum {
/* -1 */ DUNGEON_NONE = -1,
/* 0 */ DUNGEON_BOSS_KEY,
/* 1 */ DUNGEON_COMPASS,
/* 2 */ DUNGEON_MAP,
/* 3 */ DUNGEON_STRAY_FAIRIES,
/* 4 */ DUNGEON_FLOOR_INDEX_4, // Top Floor
/* 5 */ DUNGEON_FLOOR_INDEX_3,
/* 6 */ DUNGEON_FLOOR_INDEX_2,
/* 7 */ DUNGEON_FLOOR_INDEX_1,
/* 8 */ DUNGEON_FLOOR_INDEX_0 // Bottom Floor
} DungeonItem;
typedef enum { typedef enum {
/* 0x00 */ SLOT_OCARINA, /* 0x00 */ SLOT_OCARINA,
/* 0x01 */ SLOT_BOW, /* 0x01 */ SLOT_BOW,
@@ -550,6 +563,6 @@ typedef enum {
/* 0x74 */ GID_PICTO_BOX, /* 0x74 */ GID_PICTO_BOX,
/* 0x75 */ GID_MASK_FIERCE_DEITY, /* 0x75 */ GID_MASK_FIERCE_DEITY,
/* 0x76 */ GID_MAX /* 0x76 */ GID_MAX
} GetItemDrawID; } GetItemDrawId;
#endif #endif
include/z64save.h
+2 -2
View File
@@ -272,8 +272,8 @@ typedef struct Save {
/* 0x0EF0 */ u32 lotteryCodeGuess; // Lottery code chosen by player (only uses lower three hex digits) /* 0x0EF0 */ u32 lotteryCodeGuess; // Lottery code chosen by player (only uses lower three hex digits)
/* 0x0EF4 */ u32 shootingGalleryHighScores; // High scores for both shooting galleries. Town uses lower 16 bits, Swamp uses higher 16 bits. /* 0x0EF4 */ u32 shootingGalleryHighScores; // High scores for both shooting galleries. Town uses lower 16 bits, Swamp uses higher 16 bits.
/* 0x0EF8 */ u8 weekEventReg[100]; // "week_event_reg" /* 0x0EF8 */ u8 weekEventReg[100]; // "week_event_reg"
/* 0x0F5C */ u32 mapsVisited; // "area_arrival" /* 0x0F5C */ u32 regionsVisited; // "area_arrival"
/* 0x0F60 */ u32 mapsVisible; // "cloud_clear" /* 0x0F60 */ u32 worldMapCloudVisibility; // "cloud_clear"
/* 0x0F64 */ u8 unk_F64; // "oca_rec_flag" has scarecrows song /* 0x0F64 */ u8 unk_F64; // "oca_rec_flag" has scarecrows song
/* 0x0F65 */ u8 unk_F65; // "oca_rec_flag8" scarecrows song set? /* 0x0F65 */ u8 unk_F65; // "oca_rec_flag8" scarecrows song set?
/* 0x0F66 */ u8 scarecrowSpawnSong[128]; /* 0x0F66 */ u8 scarecrowSpawnSong[128];
include/z64scene.h
+54 -11
View File
@@ -174,9 +174,9 @@ typedef struct {
typedef struct { typedef struct {
/* 0x0 */ u8 code; /* 0x0 */ u8 code;
/* 0x1 */ u8 cameraMovement; /* 0x1 */ u8 sceneCsCount;
/* 0x4 */ u32 area; /* 0x4 */ void* segment;
} SCmdMiscSettings; // size = 0x8 } SCmdCutsceneList; // size = 0x8
typedef struct { typedef struct {
/* 0x0 */ u8 code; /* 0x0 */ u8 code;
@@ -186,9 +186,8 @@ typedef struct {
typedef struct { typedef struct {
/* 0x0 */ u8 code; /* 0x0 */ u8 code;
/* 0x1 */ u8 data1; /* 0x1 */ UNK_TYPE1 pad[7];
/* 0x4 */ u32 data2; } SCmdRegionVisited; // size = 0x8
} SCmdWorldMapVisited; // size = 0x8
typedef struct { typedef struct {
/* 0x0 */ u8 code; /* 0x0 */ u8 code;
@@ -523,9 +522,9 @@ typedef union {
/* Command: 0x14 */ SCmdEndMarker endMarker; /* Command: 0x14 */ SCmdEndMarker endMarker;
/* Command: 0x15 */ SCmdSoundSettings soundSettings; /* Command: 0x15 */ SCmdSoundSettings soundSettings;
/* Command: 0x16 */ SCmdEchoSettings echoSettings; /* Command: 0x16 */ SCmdEchoSettings echoSettings;
/* Command: 0x17 */ SCmdMiscSettings miscSettings; /* Command: 0x17 */ SCmdCutsceneList cutsceneList;
/* Command: 0x18 */ SCmdAltHeaders altHeaders; /* Command: 0x18 */ SCmdAltHeaders altHeaders;
/* Command: 0x19 */ SCmdWorldMapVisited worldMapVisited; /* Command: 0x19 */ SCmdRegionVisited regionVisited;
/* Command: 0x1A */ SCmdTextureAnimations textureAnimations; /* Command: 0x1A */ SCmdTextureAnimations textureAnimations;
/* Command: 0x1B */ SCmdCutsceneActorList cutsceneActorList; /* Command: 0x1B */ SCmdCutsceneActorList cutsceneActorList;
/* Command: 0x1C */ SCmdMinimapSettings minimapSettings; /* Command: 0x1C */ SCmdMinimapSettings minimapSettings;
@@ -533,6 +532,49 @@ typedef union {
/* Command: 0x1E */ SCmdMinimapChests minimapChests; /* Command: 0x1E */ SCmdMinimapChests minimapChests;
} SceneCmd; // size = 0x8 } SceneCmd; // size = 0x8
// Sets cursor point options on the world map
typedef enum {
/* 0x0 */ REGION_GREAT_BAY,
/* 0x1 */ REGION_ZORA_HALL,
/* 0x2 */ REGION_ROMANI_RANCH,
/* 0x3 */ REGION_DEKU_PALACE,
/* 0x4 */ REGION_WOODFALL,
/* 0x5 */ REGION_CLOCK_TOWN,
/* 0x6 */ REGION_SNOWHEAD,
/* 0x7 */ REGION_IKANA_GRAVEYARD,
/* 0x8 */ REGION_IKANA_CANYON,
/* 0x9 */ REGION_GORON_VILLAGE,
/* 0xA */ REGION_STONE_TOWER,
/* 0xB */ REGION_MAX
} RegionId;
// Sets warp points for owl statues
typedef enum {
/* 0x0 */ OWL_WARP_GREAT_BAY_COAST,
/* 0x1 */ OWL_WARP_ZORA_CAPE,
/* 0x2 */ OWL_WARP_SNOWHEAD,
/* 0x3 */ OWL_WARP_MOUNTAIN_VILLAGE,
/* 0x4 */ OWL_WARP_CLOCK_TOWN,
/* 0x5 */ OWL_WARP_MILK_ROAD,
/* 0x6 */ OWL_WARP_WOODFALL,
/* 0x7 */ OWL_WARP_SOUTHERN_SWAMP,
/* 0x8 */ OWL_WARP_IKANA_CANYON,
/* 0x9 */ OWL_WARP_STONE_TOWER,
/* 0xA */ OWL_WARP_ENTRANCE, // Special index for warping to the entrance of a scene
/* 0xB */ OWL_WARP_MAX
} OwlWarpId;
// Sets cloud visibility on the world map
typedef enum {
/* 0 */ TINGLE_MAP_CLOCK_TOWN,
/* 1 */ TINGLE_MAP_WOODFALL,
/* 2 */ TINGLE_MAP_SNOWHEAD,
/* 3 */ TINGLE_MAP_ROMANI_RANCH,
/* 4 */ TINGLE_MAP_GREAT_BAY,
/* 5 */ TINGLE_MAP_STONE_TOWER,
/* 6 */ TINGLE_MAP_MAX
} TingleMapId;
typedef enum { typedef enum {
/* 0x00 */ SCENE_20SICHITAI2, // Southern Swamp (Clear) /* 0x00 */ SCENE_20SICHITAI2, // Southern Swamp (Clear)
/* 0x01 */ SCENE_UNSET_1, /* 0x01 */ SCENE_UNSET_1,
@@ -810,7 +852,7 @@ typedef enum {
/* 0x16 */ SCENE_CMD_ID_ECHO_SETTINGS, /* 0x16 */ SCENE_CMD_ID_ECHO_SETTINGS,
/* 0x17 */ SCENE_CMD_ID_CUTSCENE_LIST, /* 0x17 */ SCENE_CMD_ID_CUTSCENE_LIST,
/* 0x18 */ SCENE_CMD_ID_ALTERNATE_HEADER_LIST, /* 0x18 */ SCENE_CMD_ID_ALTERNATE_HEADER_LIST,
/* 0x19 */ SCENE_CMD_ID_MISC_SETTINGS, /* 0x19 */ SCENE_CMD_ID_SET_REGION_VISITED,
/* 0x1A */ SCENE_CMD_ID_ANIMATED_MATERIAL_LIST, /* 0x1A */ SCENE_CMD_ID_ANIMATED_MATERIAL_LIST,
/* 0x1B */ SCENE_CMD_ID_ACTOR_CUTSCENE_LIST, /* 0x1B */ SCENE_CMD_ID_ACTOR_CUTSCENE_LIST,
/* 0x1C */ SCENE_CMD_ID_MINIMAP_INFO, /* 0x1C */ SCENE_CMD_ID_MINIMAP_INFO,
@@ -899,8 +941,9 @@ typedef enum {
#define SCENE_CMD_ALTERNATE_HEADER_LIST(alternateHeaderList) \ #define SCENE_CMD_ALTERNATE_HEADER_LIST(alternateHeaderList) \
{ SCENE_CMD_ID_ALTERNATE_HEADER_LIST, 0, CMD_PTR(alternateHeaderList) } { SCENE_CMD_ID_ALTERNATE_HEADER_LIST, 0, CMD_PTR(alternateHeaderList) }
#define SCENE_CMD_MISC_SETTINGS() \ #define SCENE_CMD_MISC_SETTINGS SCENE_CMD_SET_REGION_VISITED // TODO: ZAPD Capatability
{ SCENE_CMD_ID_MISC_SETTINGS, 0, CMD_W(0) } #define SCENE_CMD_SET_REGION_VISITED() \
{ SCENE_CMD_ID_SET_REGION_VISITED, 0, CMD_W(0) }
#define SCENE_CMD_ANIMATED_MATERIAL_LIST(matAnimList) \ #define SCENE_CMD_ANIMATED_MATERIAL_LIST(matAnimList) \
{ SCENE_CMD_ID_ANIMATED_MATERIAL_LIST, 0, CMD_PTR(matAnimList) } { SCENE_CMD_ID_ANIMATED_MATERIAL_LIST, 0, CMD_PTR(matAnimList) }
spec
+9 -9
View File
@@ -293,14 +293,16 @@ beginseg
name "icon_item_field_static" name "icon_item_field_static"
compress compress
romalign 0x1000 romalign 0x1000
include "build/baserom/icon_item_field_static.o" include "build/assets/interface/icon_item_field_static/icon_item_field_static.o"
number 12
endseg endseg
beginseg beginseg
name "icon_item_dungeon_static" name "icon_item_dungeon_static"
compress compress
romalign 0x1000 romalign 0x1000
include "build/baserom/icon_item_dungeon_static.o" include "build/assets/interface/icon_item_dungeon_static/icon_item_dungeon_static.o"
number 12
endseg endseg
beginseg beginseg
@@ -315,7 +317,8 @@ beginseg
name "icon_item_jpn_static" name "icon_item_jpn_static"
compress compress
romalign 0x1000 romalign 0x1000
include "build/baserom/icon_item_jpn_static.o" include "build/assets/interface/icon_item_jpn_static/icon_item_jpn_static.o"
number 13
endseg endseg
beginseg beginseg
@@ -1283,8 +1286,7 @@ beginseg
name "ovl_Bg_Umajump" name "ovl_Bg_Umajump"
compress compress
include "build/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.o" include "build/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.o"
include "build/data/ovl_Bg_Umajump/ovl_Bg_Umajump.data.o" include "build/src/overlays/actors/ovl_Bg_Umajump/ovl_Bg_Umajump_reloc.o"
include "build/data/ovl_Bg_Umajump/ovl_Bg_Umajump.reloc.o"
endseg endseg
beginseg beginseg
@@ -3105,8 +3107,7 @@ beginseg
name "ovl_Dm_Char08" name "ovl_Dm_Char08"
compress compress
include "build/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.o" include "build/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.o"
include "build/data/ovl_Dm_Char08/ovl_Dm_Char08.data.o" include "build/src/overlays/actors/ovl_Dm_Char08/ovl_Dm_Char08_reloc.o"
include "build/data/ovl_Dm_Char08/ovl_Dm_Char08.reloc.o"
endseg endseg
beginseg beginseg
@@ -4362,8 +4363,7 @@ beginseg
name "ovl_En_Stone_heishi" name "ovl_En_Stone_heishi"
compress compress
include "build/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.o" include "build/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.o"
include "build/data/ovl_En_Stone_heishi/ovl_En_Stone_heishi.data.o" include "build/src/overlays/actors/ovl_En_Stone_heishi/ovl_En_Stone_heishi_reloc.o"
include "build/data/ovl_En_Stone_heishi/ovl_En_Stone_heishi.reloc.o"
endseg endseg
beginseg beginseg
src/code/code_8012EC80.c
+53 -56
View File
@@ -96,7 +96,7 @@ u32 gGsFlagsShift[] = {
}; };
// TODO: use symbols for these icon textures once textures are properly in C // TODO: use symbols for these icon textures once textures are properly in C
void* gItemIcons[] = { TexturePtr gItemIcons[] = {
0x08000000, // ITEM_OCARINA 0x08000000, // ITEM_OCARINA
0x08001000, // ITEM_BOW 0x08001000, // ITEM_BOW
0x08002000, // ITEM_ARROW_FIRE 0x08002000, // ITEM_ARROW_FIRE
@@ -249,7 +249,7 @@ u8 gItemSlots[] = {
SLOT_LENS, // ITEM_LENS SLOT_LENS, // ITEM_LENS
SLOT_HOOKSHOT, // ITEM_HOOKSHOT SLOT_HOOKSHOT, // ITEM_HOOKSHOT
SLOT_SWORD_GREAT_FAIRY, // ITEM_SWORD_GREAT_FAIRY SLOT_SWORD_GREAT_FAIRY, // ITEM_SWORD_GREAT_FAIRY
SLOT_BOTTLE_1, // SLOT_BOTTLE_1, // ITEM_LONGSHOT
SLOT_BOTTLE_1, // ITEM_BOTTLE SLOT_BOTTLE_1, // ITEM_BOTTLE
SLOT_BOTTLE_1, // ITEM_POTION_RED SLOT_BOTTLE_1, // ITEM_POTION_RED
SLOT_BOTTLE_1, // ITEM_POTION_GREEN SLOT_BOTTLE_1, // ITEM_POTION_GREEN
@@ -365,8 +365,8 @@ s16 gItemPrices[] = {
}; };
// Used to map scene indexes to their region in Termina // Used to map scene indexes to their region in Termina
u16 gSceneIdsPerRegion[11][27] = { u16 gSceneIdsPerRegion[REGION_MAX][27] = {
// Great Bay // REGION_GREAT_BAY
{ {
SCENE_30GYOSON, SCENE_30GYOSON,
SCENE_LABO, SCENE_LABO,
@@ -378,15 +378,15 @@ u16 gSceneIdsPerRegion[11][27] = {
SCENE_PIRATE, SCENE_PIRATE,
SCENE_35TAKI, SCENE_35TAKI,
SCENE_KINDAN2, SCENE_KINDAN2,
-1, 0xFFFF,
}, },
// Zora Hall // REGION_ZORA_HALL
{ {
SCENE_33ZORACITY, SCENE_33ZORACITY,
SCENE_BANDROOM, SCENE_BANDROOM,
-1, 0xFFFF,
}, },
// Romani Ranch // REGION_ROMANI_RANCH
{ {
SCENE_F01, SCENE_F01,
SCENE_ROMANYMAE, SCENE_ROMANYMAE,
@@ -394,17 +394,17 @@ u16 gSceneIdsPerRegion[11][27] = {
SCENE_F01C, SCENE_F01C,
SCENE_F01_B, SCENE_F01_B,
SCENE_KOEPONARACE, SCENE_KOEPONARACE,
-1, 0xFFFF,
}, },
// Deku Palace // REGION_DEKU_PALACE
{ {
SCENE_22DEKUCITY, SCENE_22DEKUCITY,
SCENE_DEKU_KING, SCENE_DEKU_KING,
SCENE_26SARUNOMORI, SCENE_26SARUNOMORI,
SCENE_DANPEI, SCENE_DANPEI,
-1, 0xFFFF,
}, },
// Southern Swamp // REGION_WOODFALL
{ {
SCENE_20SICHITAI, SCENE_20SICHITAI,
SCENE_20SICHITAI2, SCENE_20SICHITAI2,
@@ -412,21 +412,18 @@ u16 gSceneIdsPerRegion[11][27] = {
SCENE_WITCH_SHOP, SCENE_WITCH_SHOP,
SCENE_21MITURINMAE, SCENE_21MITURINMAE,
SCENE_KINSTA1, SCENE_KINSTA1,
-1, 0xFFFF,
}, },
// Clock Town // REGION_CLOCK_TOWN
{ {
SCENE_00KEIKOKU, SCENE_TENMON_DAI, SCENE_13HUBUKINOMITI, SCENE_00KEIKOKU, SCENE_TENMON_DAI, SCENE_13HUBUKINOMITI, SCENE_24KEMONOMITI, SCENE_SYATEKI_MORI,
SCENE_24KEMONOMITI, SCENE_SYATEKI_MORI, SCENE_IKANAMAE, SCENE_IKANAMAE, SCENE_TOWN, SCENE_SYATEKI_MIZU, SCENE_BOWLING, SCENE_TAKARAYA,
SCENE_TOWN, SCENE_SYATEKI_MIZU, SCENE_BOWLING, SCENE_YADOYA, SCENE_SONCHONOIE, SCENE_MILK_BAR, SCENE_ICHIBA, SCENE_BOMYA,
SCENE_TAKARAYA, SCENE_YADOYA, SCENE_SONCHONOIE, SCENE_AYASHIISHOP, SCENE_8ITEMSHOP, SCENE_DOUJOU, SCENE_POSTHOUSE, SCENE_TAKARAKUJI,
SCENE_MILK_BAR, SCENE_ICHIBA, SCENE_BOMYA, SCENE_BACKTOWN, SCENE_CLOCKTOWER, SCENE_INSIDETOWER, SCENE_OKUJOU, SCENE_ALLEY,
SCENE_AYASHIISHOP, SCENE_8ITEMSHOP, SCENE_DOUJOU, SCENE_DEKUTES, 0xFFFF,
SCENE_POSTHOUSE, SCENE_TAKARAKUJI, SCENE_BACKTOWN,
SCENE_CLOCKTOWER, SCENE_INSIDETOWER, SCENE_OKUJOU,
SCENE_ALLEY, SCENE_DEKUTES, -1,
}, },
// Snowhead // REGION_SNOWHEAD
{ {
SCENE_10YUKIYAMANOMURA, SCENE_10YUKIYAMANOMURA,
SCENE_10YUKIYAMANOMURA2, SCENE_10YUKIYAMANOMURA2,
@@ -437,15 +434,15 @@ u16 gSceneIdsPerRegion[11][27] = {
SCENE_GORON_HAKA, SCENE_GORON_HAKA,
SCENE_17SETUGEN, SCENE_17SETUGEN,
SCENE_17SETUGEN2, SCENE_17SETUGEN2,
-1, 0xFFFF,
}, },
// Ikana Graveyard // REGION_IKANA_GRAVEYARD
{ {
SCENE_BOTI, SCENE_BOTI,
SCENE_DANPEI2TEST, SCENE_DANPEI2TEST,
-1, 0xFFFF,
}, },
// Ikana Canyon // REGION_IKANA_CANYON
{ {
SCENE_CASTLE, SCENE_CASTLE,
SCENE_IKNINSIDE, SCENE_IKNINSIDE,
@@ -456,21 +453,21 @@ u16 gSceneIdsPerRegion[11][27] = {
SCENE_REDEAD, SCENE_REDEAD,
SCENE_TOUGITES, SCENE_TOUGITES,
SCENE_HAKASHITA, SCENE_HAKASHITA,
-1, 0xFFFF,
}, },
// Goron Village // REGION_GORON_VILLAGE
{ {
SCENE_11GORONNOSATO, SCENE_11GORONNOSATO,
SCENE_11GORONNOSATO2, SCENE_11GORONNOSATO2,
SCENE_16GORON_HOUSE, SCENE_16GORON_HOUSE,
SCENE_GORONSHOP, SCENE_GORONSHOP,
-1, 0xFFFF,
}, },
// Stone Tower // REGION_STONE_TOWER
{ {
SCENE_F40, SCENE_F40,
SCENE_F41, SCENE_F41,
-1, 0xFFFF,
}, },
}; };
@@ -553,9 +550,9 @@ s32 Inventory_IsMapVisible(s16 sceneId) {
return false; return false;
} }
static u16 sSceneIdsPerTingleMap[6][12] = { static u16 sSceneIdsPerTingleMap[TINGLE_MAP_MAX][12] = {
{ {
// Clock Town Tingle Map // TINGLE_MAP_CLOCK_TOWN
SCENE_00KEIKOKU, SCENE_00KEIKOKU,
SCENE_BOTI, SCENE_BOTI,
SCENE_13HUBUKINOMITI, SCENE_13HUBUKINOMITI,
@@ -566,20 +563,20 @@ static u16 sSceneIdsPerTingleMap[6][12] = {
SCENE_BACKTOWN, SCENE_BACKTOWN,
SCENE_CLOCKTOWER, SCENE_CLOCKTOWER,
SCENE_ALLEY, SCENE_ALLEY,
-1, 0xFFFF,
}, },
{ {
// Woodfall Tingle Map // TINGLE_MAP_WOODFALL
SCENE_20SICHITAI, SCENE_20SICHITAI,
SCENE_20SICHITAI2, SCENE_20SICHITAI2,
SCENE_21MITURINMAE, SCENE_21MITURINMAE,
SCENE_22DEKUCITY, SCENE_22DEKUCITY,
SCENE_DEKU_KING, SCENE_DEKU_KING,
SCENE_KINSTA1, SCENE_KINSTA1,
-1, 0xFFFF,
}, },
{ {
// Snowhead Tingle Map // TINGLE_MAP_SNOWHEAD
SCENE_10YUKIYAMANOMURA, SCENE_10YUKIYAMANOMURA,
SCENE_10YUKIYAMANOMURA2, SCENE_10YUKIYAMANOMURA2,
SCENE_11GORONNOSATO, SCENE_11GORONNOSATO,
@@ -590,20 +587,20 @@ static u16 sSceneIdsPerTingleMap[6][12] = {
SCENE_GORONRACE, SCENE_GORONRACE,
SCENE_17SETUGEN, SCENE_17SETUGEN,
SCENE_17SETUGEN2, SCENE_17SETUGEN2,
-1, 0xFFFF,
}, },
{ {
// Romani Ranch Tingle Map // TINGLE_MAP_ROMANI_RANCH
SCENE_F01, SCENE_F01,
SCENE_ROMANYMAE, SCENE_ROMANYMAE,
SCENE_OMOYA, SCENE_OMOYA,
SCENE_F01C, SCENE_F01C,
SCENE_F01_B, SCENE_F01_B,
SCENE_KOEPONARACE, SCENE_KOEPONARACE,
-1, 0xFFFF,
}, },
{ {
// Great Bay Tingle Map // TINGLE_MAP_GREAT_BAY
SCENE_30GYOSON, SCENE_30GYOSON,
SCENE_SINKAI, SCENE_SINKAI,
SCENE_31MISAKI, SCENE_31MISAKI,
@@ -611,28 +608,28 @@ static u16 sSceneIdsPerTingleMap[6][12] = {
SCENE_KAIZOKU, SCENE_KAIZOKU,
SCENE_33ZORACITY, SCENE_33ZORACITY,
SCENE_35TAKI, SCENE_35TAKI,
-1, 0xFFFF,
}, },
{ {
// Stone Tower Tingle Map // TINGLE_MAP_STONE_TOWER
SCENE_F40, SCENE_F40,
SCENE_F41, SCENE_F41,
SCENE_CASTLE, SCENE_CASTLE,
SCENE_IKANA, SCENE_IKANA,
SCENE_REDEAD, SCENE_REDEAD,
-1, 0xFFFF,
}, },
}; };
/** /**
* Map visibility is achieved by purchasing a tingle map * Removing clouds from the World Map is achieved by purchasing a tingle map
*/ */
void Inventory_SetMapVisibility(s16 tingleIndex) { void Inventory_SetWorldMapCloudVisibility(s16 tingleIndex) {
s16 i = 0; s16 i = 0;
s16 index = 0; s16 index = 0;
u16(*tingleMapSceneIds)[] = &sSceneIdsPerTingleMap[tingleIndex]; u16(*tingleMapSceneIds)[] = &sSceneIdsPerTingleMap[tingleIndex];
if ((tingleIndex >= 0) && (tingleIndex < 6)) { if ((tingleIndex >= 0) && (tingleIndex < TINGLE_MAP_MAX)) {
while (true) { while (true) {
if ((*tingleMapSceneIds)[i] == 0xFFFF) { if ((*tingleMapSceneIds)[i] == 0xFFFF) {
break; break;
@@ -665,21 +662,21 @@ void Inventory_SetMapVisibility(s16 tingleIndex) {
} }
if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[0]) { if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[0]) {
gSaveContext.save.mapsVisible |= 3; gSaveContext.save.worldMapCloudVisibility |= 3;
} else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[1]) { } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[1]) {
gSaveContext.save.mapsVisible |= 0x1C; gSaveContext.save.worldMapCloudVisibility |= 0x1C;
} else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[2]) { } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[2]) {
gSaveContext.save.mapsVisible |= 0xE0; gSaveContext.save.worldMapCloudVisibility |= 0xE0;
} else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[3]) { } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[3]) {
gSaveContext.save.mapsVisible |= 0x100; gSaveContext.save.worldMapCloudVisibility |= 0x100;
} else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[4]) { } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[4]) {
gSaveContext.save.mapsVisible |= 0x1E00; gSaveContext.save.worldMapCloudVisibility |= 0x1E00;
} else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[5]) { } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[5]) {
gSaveContext.save.mapsVisible |= 0x6000; gSaveContext.save.worldMapCloudVisibility |= 0x6000;
} }
} }
XREG(95) = 0; R_MINIMAP_DISABLED = false;
} }
/** /**
src/code/title_setup.c
+3 -3
View File
@@ -23,13 +23,13 @@ void Setup_SetRegs(void) {
XREG(77) = 0x3C; XREG(77) = 0x3C;
XREG(78) = 0x2F; XREG(78) = 0x2F;
XREG(79) = 0x62; XREG(79) = 0x62;
XREG(87) = 0; R_PAUSE_OWLWARP_ALPHA = 0;
XREG(88) = 0x56; XREG(88) = 0x56;
XREG(89) = 0x258; XREG(89) = 0x258;
XREG(90) = 0x1C2; XREG(90) = 0x1C2;
XREG(91) = 0; XREG(91) = 0;
XREG(94) = 0; R_REVERSE_FLOOR_INDEX = 0;
XREG(95) = 0; R_MINIMAP_DISABLED = false;
YREG(32) = 0x50; YREG(32) = 0x50;
YREG(33) = 0x3C; YREG(33) = 0x3C;
src/code/z_actor.c
+4 -3
View File
@@ -861,10 +861,11 @@ void TitleCard_Draw(GameState* gameState, TitleCardContext* titleCtx) {
OPEN_DISPS(gameState->gfxCtx); OPEN_DISPS(gameState->gfxCtx);
height = (width * height > TMEM_SIZE) ? TMEM_SIZE / width : height; if (width * height > TMEM_SIZE) {
spB4 = spB8 + (height * 4); height = TMEM_SIZE / width;
}
if (1) {} spB4 = spB8 + (height * 4);
OVERLAY_DISP = func_8012C014(OVERLAY_DISP); OVERLAY_DISP = func_8012C014(OVERLAY_DISP);

Some files were not shown because too many files have changed in this diff Show More