mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Interface improvements (#822)

Browse source 
* Add symbols, does NOT build OK

* parameter OK with syms

* Use `static` more and inline arrays

* wip docs

* Start on Interface_Draw, NOT OK yet

* rename variables since interface dev is weird

* nonmatching for now

* kaleido

* Update src/code/z_parameter.c

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>

* Make most texture rectangles use shifts

* fix symbols for all interface things

* done with interface_draw for now

* Update z_parameter.c

* format files

* fix wrong function calls

* fix bss

* improvements in matching

* remove button enum for now

* (void)0 to fix warning

* make conditional look nicer

* fix

* fix wrong combiner

* Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* format

* remove "HUD" naming

* review suggestions

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2021-06-15 12:29:10 -05:00 • committed by GitHub
parent 566d107e55
commit c644aaa2ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 954 additions and 842 deletions
Download patch file Download diff file Expand all files Collapse all files

112
assets/xml/textures/parameter_static.xml
View file

@ -1,60 +1,60 @@
<Root>
<File Name="parameter_static" Segment="2">
<Texture Name="gHUDHeartEmptyTex" OutName="hud_heart_empty" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDHeartQuarterTex" OutName="hud_heart_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDHeartHalfTex" OutName="hud_heart_half" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDHeartThreeQuarterTex" OutName="hud_heart_three_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDHeartFullTex" OutName="hud_heart_full" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDDefenseHeartEmptyTex" OutName="hud_defense_heart_empty" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDDefenseHeartQuarterTex" OutName="hud_defense_heart_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDDefenseHeartHalfTex" OutName="hud_defense_heart_half" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDDefenseHeartThreeQuarterTex" OutName="hud_defense_heart_three_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDDefenseHeartFullTex" OutName="hud_defense_heart_full" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDActionButtonTex" OutName="hud_action_button" Format="ia8" Width="32" Height="32"/>
<Texture Name="gHUDEmptyMapTex" OutName="hud_empty_map" Format="ia8" Width="32" Height="32"/>
<Texture Name="gHUDCButtonLeftArrowTex" OutName="hud_c_button_left_arrow" Format="ia8" Width="32" Height="32"/>
<Texture Name="gHUDCButtonDownArrowTex" OutName="hud_c_button_down_arrow" Format="ia8" Width="32" Height="32"/>
<Texture Name="gHUDCButtonRightArrowTex" OutName="hud_c_button_right_arrow" Format="ia8" Width="32" Height="32"/>
<Texture Name="gHUDSmallKeyCounterTex" OutName="hud_small_key_counter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDRupeeCounterTex" OutName="hud_rupee_counter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDTimerClockTex" OutName="hud_timer_clock" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDCarrotTex" OutName="hud_carrot" Format="rgba32" Width="16" Height="16"/>
<Texture Name="gHUDExitMarkerTex" OutName="hud_exit_marker" Format="rgb5a1" Width="8" Height="8"/>
<Texture Name="gHUDTreasureMarkerTex" OutName="hud_treasure_marker" Format="rgb5a1" Width="8" Height="8"/>
<Texture Name="gHUDArrowMinigameScoreTex" OutName="hud_arrow_minigame_score" Format="rgb5a1" Width="24" Height="16"/>
<Texture Name="gHUDBossMarkerTex" OutName="hud_boss_marker" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDButtonATex" OutName="hud_button_a" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDButtonCDownTex" OutName="hud_button_c_down" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDButtonCRightTex" OutName="hud_button_c_right" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDButtonCLeftTex" OutName="hud_button_c_left" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDButtonCUpTex" OutName="hud_button_c_up" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHUDTrebleClefTex" OutName="hud_treble_clef" Format="i4" Width="16" Height="32"/>
<Texture Name="gHUDNaviJPTex" OutName="hud_navi_jp" Format="ia4" Width="32" Height="8"/>
<Texture Name="gHUDNaviENGTex" OutName="hud_navi_eng" Format="ia4" Width="32" Height="8"/>
<Texture Name="gHUDCounterDigit0Tex" OutName="hud_counter_digit_0" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit1Tex" OutName="hud_counter_digit_1" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit2Tex" OutName="hud_counter_digit_2" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit3Tex" OutName="hud_counter_digit_3" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit4Tex" OutName="hud_counter_digit_4" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit5Tex" OutName="hud_counter_digit_5" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit6Tex" OutName="hud_counter_digit_6" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit7Tex" OutName="hud_counter_digit_7" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit8Tex" OutName="hud_counter_digit_8" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterDigit9Tex" OutName="hud_counter_digit_9" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDCounterColonTex" OutName="hud_counter_colon" Format="i8" Width="8" Height="16"/>
<Texture Name="gHUDAmmo0Tex" OutName="hud_ammo_0" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo1Tex" OutName="hud_ammo_1" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo2Tex" OutName="hud_ammo_2" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo3Tex" OutName="hud_ammo_3" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo4Tex" OutName="hud_ammo_4" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo5Tex" OutName="hud_ammo_5" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo6Tex" OutName="hud_ammo_6" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo7Tex" OutName="hud_ammo_7" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo8Tex" OutName="hud_ammo_8" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDAmmo9Tex" OutName="hud_ammo_9" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHUDUnusedAmmoHalfTex" OutName="hud_unused_ammo_half" Format="ia8" Width="16" Height="8"/>
<Texture Name="gHUDMagicBarEndTex" OutName="hud_magic_bar_end" Format="ia8" Width="8" Height="16"/>
<Texture Name="gHUDMagicBarMidTex" OutName="hud_magic_bar_mid" Format="ia8" Width="24" Height="16"/>
<Texture Name="gHUDMagicBarFillTex" OutName="hud_magic_bar_fill" Format="ia8" Width="8" Height="8"/>
<Texture Name="gHeartEmptyTex" OutName="heart_empty" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHeartQuarterTex" OutName="heart_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHeartHalfTex" OutName="heart_half" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHeartThreeQuarterTex" OutName="heart_three_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gHeartFullTex" OutName="heart_full" Format="ia8" Width="16" Height="16"/>
<Texture Name="gDefenseHeartEmptyTex" OutName="defense_heart_empty" Format="ia8" Width="16" Height="16"/>
<Texture Name="gDefenseHeartQuarterTex" OutName="defense_heart_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gDefenseHeartHalfTex" OutName="defense_heart_half" Format="ia8" Width="16" Height="16"/>
<Texture Name="gDefenseHeartThreeQuarterTex" OutName="defense_heart_three_quarter" Format="ia8" Width="16" Height="16"/>
<Texture Name="gDefenseHeartFullTex" OutName="defense_heart_full" Format="ia8" Width="16" Height="16"/>
<Texture Name="gButtonBackgroundTex" OutName="button_background" Format="ia8" Width="32" Height="32"/>
<Texture Name="gEquippedItemOutlineTex" OutName="equipped_item_outline" Format="ia8" Width="32" Height="32"/>
<Texture Name="gEmptyCLeftArrowTex" OutName="empty_c_left_arrow" Format="ia8" Width="32" Height="32"/>
<Texture Name="gEmptyCDownArrowTex" OutName="empty_c_down_arrow" Format="ia8" Width="32" Height="32"/>
<Texture Name="gEmptyCRightArrowTex" OutName="empty_c_right_arrow" Format="ia8" Width="32" Height="32"/>
<Texture Name="gSmallKeyCounterIconTex" OutName="small_key_counter_icon" Format="ia8" Width="16" Height="16"/>
<Texture Name="gRupeeCounterIconTex" OutName="rupee_counter_icon" Format="ia8" Width="16" Height="16"/>
<Texture Name="gClockIconTex" OutName="clock_icon" Format="ia8" Width="16" Height="16"/>
<Texture Name="gCarrotIconTex" OutName="carrot_icon" Format="rgba32" Width="16" Height="16"/>
<Texture Name="gMapDungeonEntranceIconTex" OutName="map_dungeon_entrance_icon" Format="rgb5a1" Width="8" Height="8"/>
<Texture Name="gMapChestIconTex" OutName="map_chest_icon" Format="rgb5a1" Width="8" Height="8"/>
<Texture Name="gArcheryScoreIconTex" OutName="archery_score_icon" Format="rgb5a1" Width="24" Height="16"/>
<Texture Name="gMapBossIconTex" OutName="map_boss_icon" Format="ia8" Width="8" Height="8"/>
<Texture Name="gOcarinaATex" OutName="ocarina_a" Format="ia8" Width="16" Height="16"/>
<Texture Name="gOcarinaCDownTex" OutName="ocarina_c_down" Format="ia8" Width="16" Height="16"/>
<Texture Name="gOcarinaCRightTex" OutName="ocarina_c_right" Format="ia8" Width="16" Height="16"/>
<Texture Name="gOcarinaCLeftTex" OutName="ocarina_c_left" Format="ia8" Width="16" Height="16"/>
<Texture Name="gOcarinaCUpTex" OutName="ocarina_c_up" Format="ia8" Width="16" Height="16"/>
<Texture Name="gOcarinaTrebleClefTex" OutName="ocarina_treble_clef" Format="i4" Width="16" Height="32"/>
<Texture Name="gNaviCUpJPTex" OutName="navi_c_up_jp" Format="ia4" Width="32" Height="8"/>
<Texture Name="gNaviCUpENGTex" OutName="navi_c_up_eng" Format="ia4" Width="32" Height="8"/>
<Texture Name="gCounterDigit0Tex" OutName="counter_digit_0" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit1Tex" OutName="counter_digit_1" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit2Tex" OutName="counter_digit_2" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit3Tex" OutName="counter_digit_3" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit4Tex" OutName="counter_digit_4" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit5Tex" OutName="counter_digit_5" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit6Tex" OutName="counter_digit_6" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit7Tex" OutName="counter_digit_7" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit8Tex" OutName="counter_digit_8" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterDigit9Tex" OutName="counter_digit_9" Format="i8" Width="8" Height="16"/>
<Texture Name="gCounterColonTex" OutName="counter_colon" Format="i8" Width="8" Height="16"/>
<Texture Name="gAmmoDigit0Tex" OutName="ammo_digit_0" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit1Tex" OutName="ammo_digit_1" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit2Tex" OutName="ammo_digit_2" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit3Tex" OutName="ammo_digit_3" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit4Tex" OutName="ammo_digit_4" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit5Tex" OutName="ammo_digit_5" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit6Tex" OutName="ammo_digit_6" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit7Tex" OutName="ammo_digit_7" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit8Tex" OutName="ammo_digit_8" Format="ia8" Width="8" Height="8"/>
<Texture Name="gAmmoDigit9Tex" OutName="ammo_digit_9" Format="ia8" Width="8" Height="8"/>
<Texture Name="gUnusedAmmoDigitHalfTex" OutName="unused_ammo_digit_half" Format="ia8" Width="16" Height="8"/>
<Texture Name="gMagicBarEndTex" OutName="magic_bar_end" Format="ia8" Width="8" Height="16"/>
<Texture Name="gMagicBarMidTex" OutName="magic_bar_mid" Format="ia8" Width="24" Height="16"/>
<Texture Name="gMagicBarFillTex" OutName="magic_bar_fill" Format="ia8" Width="8" Height="8"/>
</File>
</Root>