mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-31 17:31:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

icon_item_static and icon_item_24_static documented (#1297)

Browse Source 
* extract_archives.py

* autogenerated xmls

* build OK

* cleanup

* Use symbols in gItemIcons

* change how archives are generated

* makeyar in C

* Rename segments

* rename .archive.o to .yar.o

* Explanation at the top of programs

* fix progress calculation

* Ignore archives in progress script

* merge

* document icon items

* cleanup

* remove duplicate headers

* jap -> jpn

* PR review

* link human

* PR Review

* missed some

---------

Co-authored-by: angie <angheloalf95@gmail.com>
This commit is contained in:
engineer124
2023-06-24 00:57:01 +10:00
committed by GitHub
parent 11dac8d020
commit aa9e368561
26 changed files with 499 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_8012EC80.c
+133 -133
View File
@@ -98,137 +98,137 @@ u32 gGsFlagsShift[] = {
};
TexturePtr gItemIcons[] = {
icon_item_static_yar_Blob_000000, // ITEM_OCARINA
icon_item_static_yar_Blob_001000, // ITEM_BOW
icon_item_static_yar_Blob_002000, // ITEM_ARROW_FIRE
icon_item_static_yar_Blob_003000, // ITEM_ARROW_ICE
icon_item_static_yar_Blob_004000, // ITEM_ARROW_LIGHT
icon_item_static_yar_Blob_005000, // ITEM_OCARINA_FAIRY
icon_item_static_yar_Blob_006000, // ITEM_BOMB
icon_item_static_yar_Blob_007000, // ITEM_BOMBCHU
icon_item_static_yar_Blob_008000, // ITEM_STICK
icon_item_static_yar_Blob_009000, // ITEM_NUT
icon_item_static_yar_Blob_00A000, // ITEM_MAGIC_BEANS
icon_item_static_yar_Blob_00B000, // ITEM_SLINGSHOT
icon_item_static_yar_Blob_00C000, // ITEM_POWDER_KEG
icon_item_static_yar_Blob_00D000, // ITEM_PICTO_BOX
icon_item_static_yar_Blob_00E000, // ITEM_LENS
icon_item_static_yar_Blob_00F000, // ITEM_HOOKSHOT
icon_item_static_yar_Blob_010000, // ITEM_SWORD_GREAT_FAIRY
icon_item_static_yar_Blob_011000, // ITEM_LONGSHOT
icon_item_static_yar_Blob_012000, // ITEM_BOTTLE
icon_item_static_yar_Blob_013000, // ITEM_POTION_RED
icon_item_static_yar_Blob_014000, // ITEM_POTION_GREEN
icon_item_static_yar_Blob_015000, // ITEM_POTION_BLUE
icon_item_static_yar_Blob_016000, // ITEM_FAIRY
icon_item_static_yar_Blob_017000, // ITEM_DEKU_PRINCESS
icon_item_static_yar_Blob_018000, // ITEM_MILK_BOTTLE
icon_item_static_yar_Blob_019000, // ITEM_MILK_HALF
icon_item_static_yar_Blob_01A000, // ITEM_FISH
icon_item_static_yar_Blob_01B000, // ITEM_BUG
icon_item_static_yar_Blob_01C000, // ITEM_BLUE_FIRE
icon_item_static_yar_Blob_01D000, // ITEM_POE
icon_item_static_yar_Blob_01E000, // ITEM_BIG_POE
icon_item_static_yar_Blob_01F000, // ITEM_SPRING_WATER
icon_item_static_yar_Blob_020000, // ITEM_HOT_SPRING_WATER
icon_item_static_yar_Blob_021000, // ITEM_ZORA_EGG
icon_item_static_yar_Blob_022000, // ITEM_GOLD_DUST
icon_item_static_yar_Blob_023000, // ITEM_MUSHROOM
icon_item_static_yar_Blob_024000, // ITEM_SEAHORSE
icon_item_static_yar_Blob_025000, // ITEM_CHATEAU
icon_item_static_yar_Blob_026000, // ITEM_HYLIAN_LOACH
icon_item_static_yar_Blob_027000, // ITEM_OBABA_DRINK
icon_item_static_yar_Blob_028000, // ITEM_MOON_TEAR
icon_item_static_yar_Blob_029000, // ITEM_DEED_LAND
icon_item_static_yar_Blob_02A000, // ITEM_DEED_SWAMP
icon_item_static_yar_Blob_02B000, // ITEM_DEED_MOUNTAIN
icon_item_static_yar_Blob_02C000, // ITEM_DEED_OCEAN
icon_item_static_yar_Blob_02D000, // ITEM_ROOM_KEY
icon_item_static_yar_Blob_02E000, // ITEM_LETTER_MAMA
icon_item_static_yar_Blob_02F000, // ITEM_LETTER_TO_KAFEI
icon_item_static_yar_Blob_030000, // ITEM_PENDANT_OF_MEMORIES
icon_item_static_yar_Blob_031000, // ITEM_TINGLE_MAP
icon_item_static_yar_Blob_032000, // ITEM_MASK_DEKU
icon_item_static_yar_Blob_033000, // ITEM_MASK_GORON
icon_item_static_yar_Blob_034000, // ITEM_MASK_ZORA
icon_item_static_yar_Blob_035000, // ITEM_MASK_FIERCE_DEITY
icon_item_static_yar_Blob_036000, // ITEM_MASK_TRUTH
icon_item_static_yar_Blob_037000, // ITEM_MASK_KAFEIS_MASK
icon_item_static_yar_Blob_038000, // ITEM_MASK_ALL_NIGHT
icon_item_static_yar_Blob_039000, // ITEM_MASK_BUNNY
icon_item_static_yar_Blob_03A000, // ITEM_MASK_KEATON
icon_item_static_yar_Blob_03B000, // ITEM_MASK_GARO
icon_item_static_yar_Blob_03C000, // ITEM_MASK_ROMANI
icon_item_static_yar_Blob_03D000, // ITEM_MASK_CIRCUS_LEADER
icon_item_static_yar_Blob_03E000, // ITEM_MASK_POSTMAN
icon_item_static_yar_Blob_03F000, // ITEM_MASK_COUPLE
icon_item_static_yar_Blob_040000, // ITEM_MASK_GREAT_FAIRY
icon_item_static_yar_Blob_041000, // ITEM_MASK_GIBDO
icon_item_static_yar_Blob_042000, // ITEM_MASK_DON_GERO
icon_item_static_yar_Blob_043000, // ITEM_MASK_KAMARO
icon_item_static_yar_Blob_044000, // ITEM_MASK_CAPTAIN
icon_item_static_yar_Blob_045000, // ITEM_MASK_STONE
icon_item_static_yar_Blob_046000, // ITEM_MASK_BREMEN
icon_item_static_yar_Blob_047000, // ITEM_MASK_BLAST
icon_item_static_yar_Blob_048000, // ITEM_MASK_SCENTS
icon_item_static_yar_Blob_049000, // ITEM_MASK_GIANT
icon_item_static_yar_Blob_04A000, // ITEM_BOW_ARROW_FIRE
icon_item_static_yar_Blob_04B000, // ITEM_BOW_ARROW_ICE
icon_item_static_yar_Blob_04C000, // ITEM_BOW_ARROW_LIGHT
icon_item_static_yar_Blob_04D000, // ITEM_SWORD_KOKIRI
icon_item_static_yar_Blob_04E000, // ITEM_SWORD_RAZOR
icon_item_static_yar_Blob_04F000, // ITEM_SWORD_GILDED
icon_item_static_yar_Blob_050000, // ITEM_SWORD_DEITY
icon_item_static_yar_Blob_051000, // ITEM_SHIELD_HERO
icon_item_static_yar_Blob_052000, // ITEM_SHIELD_MIRROR
icon_item_static_yar_Blob_053000, // ITEM_QUIVER_30
icon_item_static_yar_Blob_054000, // ITEM_QUIVER_40
icon_item_static_yar_Blob_055000, // ITEM_QUIVER_50
icon_item_static_yar_Blob_056000, // ITEM_BOMB_BAG_20
icon_item_static_yar_Blob_057000, // ITEM_BOMB_BAG_30
icon_item_static_yar_Blob_058000, // ITEM_BOMB_BAG_40
icon_item_static_yar_Blob_059000, // ITEM_WALLET_DEFAULT
icon_item_static_yar_Blob_05A000, // ITEM_WALLET_ADULT
icon_item_static_yar_Blob_05B000, // ITEM_WALLET_GIANT
icon_item_static_yar_Blob_05C000, // ITEM_FISHING_ROD
icon_item_static_yar_Blob_05D000, // ITEM_REMAINS_ODOLWA
icon_item_static_yar_Blob_05E000, // ITEM_REMAINS_GOHT
icon_item_static_yar_Blob_05F000, // ITEM_REMAINS_GYORG
icon_item_static_yar_Blob_060000, // ITEM_REMAINS_TWINMOLD
icon_item_static_yar_Blob_062000, // ITEM_SONG_SONATA
icon_item_static_yar_Blob_062000, // ITEM_SONG_LULLABY
icon_item_static_yar_Blob_062000, // ITEM_SONG_NOVA
icon_item_static_yar_Blob_062000, // ITEM_SONG_ELEGY
icon_item_static_yar_Blob_062000, // ITEM_SONG_OATH
icon_item_static_yar_Blob_062000, // ITEM_SONG_SARIA
icon_item_static_yar_Blob_062000, // ITEM_SONG_TIME
icon_item_static_yar_Blob_062000, // ITEM_SONG_HEALING
icon_item_static_yar_Blob_062000, // ITEM_SONG_EPONA
icon_item_static_yar_Blob_062000, // ITEM_SONG_SOARING
icon_item_static_yar_Blob_062000, // ITEM_SONG_STORMS
icon_item_static_yar_Blob_062000, // ITEM_SONG_SUN
icon_item_static_yar_Blob_061000, // ITEM_BOMBERS_NOTEBOOK
icon_item_24_static_yar_Blob_000000, // ITEM_SKULL_TOKEN
icon_item_24_static_yar_Blob_000900, // ITEM_HEART_CONTAINER
icon_item_24_static_yar_Blob_001200, // ITEM_HEART_PIECE
icon_item_static_yar_Blob_062000, //
icon_item_static_yar_Blob_062000, //
icon_item_static_yar_Blob_062000, // ITEM_SONG_LULLABY_INTRO
icon_item_24_static_yar_Blob_003600, // ITEM_KEY_BOSS
icon_item_24_static_yar_Blob_004800, // ITEM_COMPASS
icon_item_24_static_yar_Blob_003F00, // ITEM_DUNGEON_MAP
icon_item_24_static_yar_Blob_005100, // ITEM_STRAY_FAIRIES
icon_item_24_static_yar_Blob_005A00, // ITEM_KEY_SMALL
icon_item_24_static_yar_Blob_006300, // ITEM_MAGIC_SMALL
icon_item_24_static_yar_Blob_006C00, // ITEM_MAGIC_LARGE
icon_item_static_yar_Blob_062180, // ITEM_HEART_PIECE_2
icon_item_static_yar_Blob_062A80, // ITEM_INVALID_1
icon_item_static_yar_Blob_063380, // ITEM_INVALID_2
gOcarinaCUpTex, // ITEM_INVALID_3
gOcarinaCDownTex, // ITEM_INVALID_4
gOcarinaCLeftTex, // ITEM_INVALID_5
gOcarinaCRightTex, // ITEM_INVALID_6
gOcarinaATex, // ITEM_INVALID_7
gItemIconOcarinaOfTimeTex, // ITEM_OCARINA
gItemIconBowTex, // ITEM_BOW
gItemIconFireArrowTex, // ITEM_ARROW_FIRE
gItemIconIceArrowTex, // ITEM_ARROW_ICE
gItemIconLightArrowTex, // ITEM_ARROW_LIGHT
gItemIconFairyOcarinaTex, // ITEM_OCARINA_FAIRY
gItemIconBombTex, // ITEM_BOMB
gItemIconBombchuTex, // ITEM_BOMBCHU
gItemIconDekuStickTex, // ITEM_STICK
gItemIconDekuNutTex, // ITEM_NUT
gItemIconMagicBeansTex, // ITEM_MAGIC_BEANS
gItemIconSlingshotTex, // ITEM_SLINGSHOT
gItemIconPowderKegTex, // ITEM_POWDER_KEG
gItemIconPictoBoxTex, // ITEM_PICTO_BOX
gItemIconLensofTruthTex, // ITEM_LENS
gItemIconHookshotTex, // ITEM_HOOKSHOT
gItemIconGreatFairysSwordTex, // ITEM_SWORD_GREAT_FAIRY
gItemIconLongshotTex, // ITEM_LONGSHOT
gItemIconEmptyBottleTex, // ITEM_BOTTLE
gItemIconRedPotionTex, // ITEM_POTION_RED
gItemIconGreenPotionTex, // ITEM_POTION_GREEN
gItemIconBluePotionTex, // ITEM_POTION_BLUE
gItemIconBottledFairyTex, // ITEM_FAIRY
gItemIconBottledDekuPrincessTex, // ITEM_DEKU_PRINCESS
gItemIconBottledFullMilkTex, // ITEM_MILK_BOTTLE
gItemIconBottledHalfMilkTex, // ITEM_MILK_HALF
gItemIconBottledFishTex, // ITEM_FISH
gItemIconBottledBugTex, // ITEM_BUG
gItemIconBottledBlueFireTex, // ITEM_BLUE_FIRE
gItemIconBottledPoeTex, // ITEM_POE
gItemIconBottledBigPoeTex, // ITEM_BIG_POE
gItemIconSpringWaterTex, // ITEM_SPRING_WATER
gItemIconHotSpringWaterTex, // ITEM_HOT_SPRING_WATER
gItemIconBottledZoraEggTex, // ITEM_ZORA_EGG
gItemIconBottledGoldDustTex, // ITEM_GOLD_DUST
gItemIconBottledMushroomTex, // ITEM_MUSHROOM
gItemIconBottledSeahorseTex, // ITEM_SEAHORSE
gItemIconChateauRomaniTex, // ITEM_CHATEAU
gItemIconBottledHylianLoachTex, // ITEM_HYLIAN_LOACH
gItemIconEmptyBottle2Tex, // ITEM_OBABA_DRINK
gItemIconMoonsTearTex, // ITEM_MOONS_TEAR
gItemIconLandDeedTex, // ITEM_DEED_LAND
gItemIconSwampDeedTex, // ITEM_DEED_SWAMP
gItemIconMountainDeedTex, // ITEM_DEED_MOUNTAIN
gItemIconOceanDeedTex, // ITEM_DEED_OCEAN
gItemIconRoomKeyTex, // ITEM_ROOM_KEY
gItemIconLetterToMamaTex, // ITEM_LETTER_MAMA
gItemIconLetterToKafeiTex, // ITEM_LETTER_TO_KAFEI
gItemIconPendantOfMemoriesTex, // ITEM_PENDANT_OF_MEMORIES
gItemIconTingleMapTex, // ITEM_TINGLE_MAP
gItemIconDekuMaskTex, // ITEM_MASK_DEKU
gItemIconGoronMaskTex, // ITEM_MASK_GORON
gItemIconZoraMaskTex, // ITEM_MASK_ZORA
gItemIconFierceDeityMaskTex, // ITEM_MASK_FIERCE_DEITY
gItemIconMaskOfTruthTex, // ITEM_MASK_TRUTH
gItemIconKafeisMaskTex, // ITEM_MASK_KAFEIS_MASK
gItemIconAllNightMaskTex, // ITEM_MASK_ALL_NIGHT
gItemIconBunnyHoodTex, // ITEM_MASK_BUNNY
gItemIconKeatonMaskTex, // ITEM_MASK_KEATON
gItemIconGaroMaskTex, // ITEM_MASK_GARO
gItemIconRomaniMaskTex, // ITEM_MASK_ROMANI
gItemIconCircusLeaderMaskTex, // ITEM_MASK_CIRCUS_LEADER
gItemIconPostmansHatTex, // ITEM_MASK_POSTMAN
gItemIconCouplesMaskTex, // ITEM_MASK_COUPLE
gItemIconGreatFairyMaskTex, // ITEM_MASK_GREAT_FAIRY
gItemIconGibdoMaskTex, // ITEM_MASK_GIBDO
gItemIconDonGeroMaskTex, // ITEM_MASK_DON_GERO
gItemIconKamaroMaskTex, // ITEM_MASK_KAMARO
gItemIconCaptainsHatTex, // ITEM_MASK_CAPTAIN
gItemIconStoneMaskTex, // ITEM_MASK_STONE
gItemIconBremenMaskTex, // ITEM_MASK_BREMEN
gItemIconBlastMaskTex, // ITEM_MASK_BLAST
gItemIconMaskOfScentsTex, // ITEM_MASK_SCENTS
gItemIconGiantsMaskTex, // ITEM_MASK_GIANT
gItemIconBowFireTex, // ITEM_BOW_ARROW_FIRE
gItemIconBowIceTex, // ITEM_BOW_ARROW_ICE
gItemIconBowLightTex, // ITEM_BOW_ARROW_LIGHT
gItemIconKokiriSwordTex, // ITEM_SWORD_KOKIRI
gItemIconRazorSwordTex, // ITEM_SWORD_RAZOR
gItemIconGildedSwordTex, // ITEM_SWORD_GILDED
gItemIconFierceDeitySwordTex, // ITEM_SWORD_DEITY
gItemIconHerosShieldTex, // ITEM_SHIELD_HERO
gItemIconMirrorShieldTex, // ITEM_SHIELD_MIRROR
gItemIconQuiver30Tex, // ITEM_QUIVER_30
gItemIconQuiver40Tex, // ITEM_QUIVER_40
gItemIconQuiver50Tex, // ITEM_QUIVER_50
gItemIconBombBag20Tex, // ITEM_BOMB_BAG_20
gItemIconBombBag30Tex, // ITEM_BOMB_BAG_30
gItemIconBombBag40Tex, // ITEM_BOMB_BAG_40
gItemIconDefaultWalletTex, // ITEM_WALLET_DEFAULT
gItemIconAdultsWalletTex, // ITEM_WALLET_ADULT
gItemIconGiantsWalletTex, // ITEM_WALLET_GIANT
gItemIconFishingRodTex, // ITEM_FISHING_ROD
gItemIconOdolwasRemainsTex, // ITEM_REMAINS_ODOLWA
gItemIconGohtsRemainsTex, // ITEM_REMAINS_GOHT
gItemIconGyorgsRemainsTex, // ITEM_REMAINS_GYORG
gItemIconTwinmoldsRemainsTex, // ITEM_REMAINS_TWINMOLD
gItemIconSongNoteTex, // ITEM_SONG_SONATA
gItemIconSongNoteTex, // ITEM_SONG_LULLABY
gItemIconSongNoteTex, // ITEM_SONG_NOVA
gItemIconSongNoteTex, // ITEM_SONG_ELEGY
gItemIconSongNoteTex, // ITEM_SONG_OATH
gItemIconSongNoteTex, // ITEM_SONG_SARIA
gItemIconSongNoteTex, // ITEM_SONG_TIME
gItemIconSongNoteTex, // ITEM_SONG_HEALING
gItemIconSongNoteTex, // ITEM_SONG_EPONA
gItemIconSongNoteTex, // ITEM_SONG_SOARING
gItemIconSongNoteTex, // ITEM_SONG_STORMS
gItemIconSongNoteTex, // ITEM_SONG_SUN
gItemIconBombersNotebookTex, // ITEM_BOMBERS_NOTEBOOK
gQuestIconGoldSkulltulaTex, // ITEM_SKULL_TOKEN
gQuestIconHeartContainerTex, // ITEM_HEART_CONTAINER
gQuestIconPieceOfHeartTex, // ITEM_HEART_PIECE
gItemIconSongNoteTex, //
gItemIconSongNoteTex, //
gItemIconSongNoteTex, // ITEM_SONG_LULLABY_INTRO
gQuestIconBossKeyTex, // ITEM_KEY_BOSS
gQuestIconDungeonMapTex, // ITEM_COMPASS
gQuestIconCompassTex, // ITEM_DUNGEON_MAP
gQuestIconGoldSkulltula2Tex, // ITEM_STRAY_FAIRIES
gQuestIconSmallKeyTex, // ITEM_KEY_SMALL
gQuestIconSmallMagicJarTex, // ITEM_MAGIC_SMALL
gQuestIconBigMagicJarTex, // ITEM_MAGIC_LARGE
gItemIconHeartPiece1Tex, // ITEM_HEART_PIECE_2
gItemIconHeartPiece2Tex, // ITEM_INVALID_1
gItemIconHeartPiece3Tex, // ITEM_INVALID_2
gOcarinaCUpTex, // ITEM_INVALID_3
gOcarinaCDownTex, // ITEM_INVALID_4
gOcarinaCLeftTex, // ITEM_INVALID_5
gOcarinaCRightTex, // ITEM_INVALID_6
gOcarinaATex, // ITEM_INVALID_7
};
// Used to map item IDs to inventory slots
@@ -273,7 +273,7 @@ u8 gItemSlots[] = {
SLOT_BOTTLE_1, // ITEM_CHATEAU
SLOT_BOTTLE_1, // ITEM_HYLIAN_LOACH
SLOT_BOTTLE_1, // ITEM_OBABA_DRINK
SLOT_TRADE_DEED, // ITEM_MOON_TEAR
SLOT_TRADE_DEED, // ITEM_MOONS_TEAR
SLOT_TRADE_DEED, // ITEM_DEED_LAND
SLOT_TRADE_DEED, // ITEM_DEED_SWAMP
SLOT_TRADE_DEED, // ITEM_DEED_MOUNTAIN
@@ -353,7 +353,7 @@ s16 gItemPrices[] = {
200, // ITEM_CHATEAU
20, // ITEM_HYLIAN_LOACH
0, // ITEM_OBABA_DRINK
0, // ITEM_MOON_TEAR
0, // ITEM_MOONS_TEAR
0, // ITEM_DEED_LAND
0, // ITEM_DEED_SWAMP
0, // ITEM_DEED_MOUNTAIN
src/code/z_draw.c
+2 -2
View File
@@ -313,7 +313,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
{ GetItem_DrawOpa0Xlu1, { gGiRedPotionBottleEmptyDL, gGiRedPotionBottleDL } },
// GID_ZORA_EGG, OBJECT_GI_BOTTLE_15
{ GetItem_DrawOpa0Xlu1, { gGiZoraEggBottleContentsDL, gGiZoraEggBottleGlassAndCorkDL } },
// GID_MOON_TEAR, OBJECT_GI_RESERVE00
// GID_MOONS_TEAR, OBJECT_GI_RESERVE00
{ GetItem_DrawMoonsTear, { gGiMoonsTearItemDL, gGiMoonsTearGlowDL } },
// GID_DEED_LAND, OBJECT_GI_RESERVE01
{ GetItem_DrawOpa01, { gGiTitleDeedEmptyDL, gGiTitleDeedLandColorDL } },
@@ -344,7 +344,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
// GID_SWORD_GILDED, OBJECT_GI_SWORD_3
{ GetItem_DrawOpa01, { gGiGildedSwordDL, gGiGildedSwordEmptyDL } },
// GID_SWORD_GREAT_FAIRY, OBJECT_GI_SWORD_4
{ GetItem_DrawOpa0Xlu1, { gGiGreatFairySwordBladeDL, gGiGreatFairySwordHiltEmblemDL } },
{ GetItem_DrawOpa0Xlu1, { gGiGreatFairysSwordBladeDL, gGiGreatFairysSwordHiltEmblemDL } },
// GID_MASK_GARO, OBJECT_GI_MASK09
{ GetItem_DrawOpa0Xlu1, { gGiGarosMaskCloakDL, gGiGarosMaskFaceDL } },
// GID_MASK_GREAT_FAIRY, OBJECT_GI_MASK14
src/code/z_elf_message.c
+1 -1
View File
@@ -57,7 +57,7 @@ u16 QuestHint_GetTatlTextId(PlayState* play) {
return 0;
}
if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_MOON_TEAR) {
if (INV_CONTENT(ITEM_MOONS_TEAR) == ITEM_MOONS_TEAR) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_04)) {
return 0x242;
}
src/code/z_parameter.c
+9 -10
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "z64snap.h"
#include "z64view.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
#include "interface/parameter_static/parameter_static.h"
#include "interface/do_action_static/do_action_static.h"
#include "misc/story_static/story_static.h"
@@ -8,8 +9,6 @@
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
#include "overlays/actors/ovl_En_Mm3/z_en_mm3.h"
extern TexturePtr D_08095AC0; // gMagicArrowEquipEffectTex
typedef enum {
/* 0 */ PICTO_BOX_STATE_OFF, // Not using the pictograph
/* 1 */ PICTO_BOX_STATE_LENS, // Looking through the lens of the pictograph
@@ -2057,7 +2056,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
} else {
// End of special item cases. Apply restrictions to buttons
if (interfaceCtx->restrictions.tradeItems != 0) {
if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
@@ -2068,7 +2067,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
gSaveContext.buttonStatus[i] = BTN_DISABLED;
}
} else if (interfaceCtx->restrictions.tradeItems == 0) {
if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
if (((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
@@ -2115,7 +2114,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
}
if (interfaceCtx->restrictions.all != 0) {
if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
@@ -2130,7 +2129,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
}
}
} else if (interfaceCtx->restrictions.all == 0) {
if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOON_TEAR) &&
if (!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MOONS_TEAR) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
!((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
(GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
@@ -2899,10 +2898,10 @@ u8 Item_Give(PlayState* play, u8 item) {
}
}
} else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) {
} else if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_MASK_GIANT)) {
temp = INV_CONTENT(item);
INV_CONTENT(item) = item;
if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_PENDANT_OF_MEMORIES) && (temp != ITEM_NONE)) {
if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_PENDANT_OF_MEMORIES) && (temp != ITEM_NONE)) {
for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
if (temp == GET_CUR_FORM_BTN_ITEM(i)) {
SET_CUR_FORM_BTN_ITEM(i, item);
@@ -3066,7 +3065,7 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
}
}
}
} else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) {
} else if ((item >= ITEM_MOONS_TEAR) && (item <= ITEM_MASK_GIANT)) {
return ITEM_NONE;
}
@@ -4295,7 +4294,7 @@ void Interface_DrawPauseMenuEquippingIcons(PlayState* play) {
}
gSPVertex(OVERLAY_DISP++, &pauseCtx->cursorVtx[16], 4, 0);
gDPLoadTextureBlock(OVERLAY_DISP++, &D_08095AC0, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
gDPLoadTextureBlock(OVERLAY_DISP++, gMagicArrowEquipEffectTex, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOLOD);
}
src/code/z_player_lib.c
+1 -1
View File
@@ -695,7 +695,7 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_MILK_HALF
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_CHATEAU
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FAIRY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MOON_TEAR
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MOONS_TEAR
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DEED_LAND
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ROOM_KEY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_LETTER_TO_KAFEI
src/code/z_sram_NES.c
+2 -2
View File
@@ -608,7 +608,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) {
if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOON_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES) {
if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOONS_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES) {
SET_CUR_FORM_BTN_ITEM(j, ITEM_NONE);
Interface_LoadItemIconImpl(play, j);
}
@@ -907,7 +907,7 @@ Inventory sSaveDebugInventory = {
ITEM_ARROW_FIRE,
ITEM_ARROW_ICE,
ITEM_ARROW_LIGHT,
ITEM_MOON_TEAR,
ITEM_MOONS_TEAR,
ITEM_BOMB,
ITEM_BOMBCHU,
ITEM_STICK,
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
+1 -1
View File
@@ -959,7 +959,7 @@ void EnFsn_DeterminePrice(EnFsn* this, PlayState* play) {
if (itemAction > PLAYER_IA_NONE) {
buttonItem = GET_CUR_FORM_BTN_ITEM(player->heldItemButton);
this->price = (buttonItem < ITEM_MOON_TEAR) ? gItemPrices[buttonItem] : 0;
this->price = (buttonItem < ITEM_MOONS_TEAR) ? gItemPrices[buttonItem] : 0;
if (this->price > 0) {
player->actor.textId = 0x29EF;
player->exchangeItemId = buttonItem;
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+4 -4
View File
@@ -147,7 +147,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) {
player->unk_B08 = 1.0f;
this->collider.info.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) {
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 6;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 4;
@@ -158,7 +158,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) {
player->unk_B08 = 0.5f;
this->collider.info.toucher.damage = sDamages[this->type];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) {
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 4;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 3;
@@ -276,7 +276,7 @@ void EnMThunder_Charge(EnMThunder* this, PlayState* play) {
if (player->unk_B08 < 0.85f) {
this->collider.info.toucher.damage = sDamages[this->type];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) {
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 4;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 3;
@@ -286,7 +286,7 @@ void EnMThunder_Charge(EnMThunder* this, PlayState* play) {
} else {
this->collider.info.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT;
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD) {
if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) {
this->scaleTarget = 6;
} else if (this->type == ENMTHUNDER_TYPE_GILDED_SWORD) {
this->scaleTarget = 4;
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
+1 -1
View File
@@ -12,7 +12,7 @@ typedef enum {
/* 0x00 */ ENMTHUNDER_TYPE_KOKIRI_SWORD,
/* 0x01 */ ENMTHUNDER_TYPE_RAZOR_SWORD,
/* 0x02 */ ENMTHUNDER_TYPE_GILDED_SWORD,
/* 0x03 */ ENMTHUNDER_TYPE_GREAT_FAIRY_SWORD,
/* 0x03 */ ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD,
/* 0x80 */ ENMTHUNDER_TYPE_UNK = 0x80
} EnMThunderType;
src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
+3 -3
View File
@@ -341,7 +341,7 @@ void func_80ADB544(EnSellnuts* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x7D0, 0);
this->actor.world.rot.y = this->actor.shape.rot.y;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Player_GetExchangeItemId(play) == PLAYER_IA_MOON_TEAR) {
if (Player_GetExchangeItemId(play) == PLAYER_IA_MOONS_TEAR) {
player->actor.textId = D_80ADD928[this->unk_33A];
this->unk_340 = player->actor.textId;
this->actionFunc = func_80ADBAB8;
@@ -382,7 +382,7 @@ void func_80ADB544(EnSellnuts* this, PlayState* play) {
} else if (((this->actor.xzDistToPlayer < 80.0f) &&
(((this->actor.playerHeightRel < 50.0f) && (this->actor.playerHeightRel > -50.0f)) ? true : false)) ||
this->actor.isTargeted) {
func_800B85E0(&this->actor, play, 80.0f, PLAYER_IA_MOON_TEAR);
func_800B85E0(&this->actor, play, 80.0f, PLAYER_IA_MOONS_TEAR);
if (player->transformation == PLAYER_FORM_DEKU) {
if (gSaveContext.save.day == 3) {
this->unk_33A = 2;
@@ -423,7 +423,7 @@ void func_80ADB924(EnSellnuts* this, PlayState* play) {
itemAction = func_80123810(play);
if (itemAction > PLAYER_IA_NONE) {
if (itemAction == PLAYER_IA_MOON_TEAR) {
if (itemAction == PLAYER_IA_MOONS_TEAR) {
player->actor.textId = D_80ADD928[this->unk_33A];
this->unk_340 = player->actor.textId;
player->exchangeItemId = itemAction;
src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
+1 -1
View File
@@ -265,7 +265,7 @@ s32 func_80C10B0C(EnThiefbird* this, PlayState* play) {
itemId1 = phi_a3 + (ITEM_SWORD_KOKIRI - 1);
if (phi_a3 == 4) {
Inventory_DeleteItem(ITEM_SWORD_GREAT_FAIRY, SLOT_SWORD_GREAT_FAIRY);
this->unk_3E8 = gTakkuriStolenGreatFairySwordDL;
this->unk_3E8 = gTakkuriStolenGreatFairysSwordDL;
itemId1 = ITEM_SWORD_GREAT_FAIRY;
} else {
CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_NONE;
src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c
+1 -1
View File
@@ -117,7 +117,7 @@ void func_80C06768(ObjMoonStone* this, PlayState* play) {
this->actor.draw = NULL;
func_80C0685C(this);
} else if (this->actor.xzDistToPlayer < 25.0f) {
Actor_OfferGetItem(&this->actor, play, GI_MOON_TEAR, 100.0f, 30.0f);
Actor_OfferGetItem(&this->actor, play, GI_MOONS_TEAR, 100.0f, 30.0f);
}
}
}
src/overlays/actors/ovl_player_actor/z_player.c
+7 -7
View File
@@ -2449,8 +2449,8 @@ GetItemEntry sGetItemTable[GI_MAX - 1] = {
// GI_SEAHORSE_CAUGHT
GET_ITEM(ITEM_SEAHORSE_CAUGHT, OBJECT_GI_SEAHORSE, GID_SEAHORSE_CAUGHT, 0x95, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
// GI_MOON_TEAR
GET_ITEM(ITEM_MOON_TEAR, OBJECT_GI_RESERVE00, GID_MOON_TEAR, 0x96, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
// GI_MOONS_TEAR
GET_ITEM(ITEM_MOONS_TEAR, OBJECT_GI_RESERVE00, GID_MOONS_TEAR, 0x96, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
CHEST_ANIM_LONG),
// GI_DEED_LAND
GET_ITEM(ITEM_DEED_LAND, OBJECT_GI_RESERVE01, GID_DEED_LAND, 0x97, GIFIELD(GIFIELD_NO_COLLECTIBLE, 0),
@@ -2912,7 +2912,7 @@ s8 sItemItemActions[] = {
PLAYER_IA_BOTTLE_CHATEAU, // ITEM_CHATEAU,
PLAYER_IA_BOTTLE_HYLIAN_LOACH, // ITEM_HYLIAN_LOACH,
PLAYER_IA_BOTTLE_POE, // ITEM_OBABA_DRINK, // !
PLAYER_IA_MOON_TEAR, // ITEM_MOON_TEAR,
PLAYER_IA_MOONS_TEAR, // ITEM_MOONS_TEAR,
PLAYER_IA_DEED_LAND, // ITEM_DEED_LAND,
PLAYER_IA_DEED_SWAMP, // ITEM_DEED_SWAMP,
PLAYER_IA_DEED_MOUNTAIN, // ITEM_DEED_MOUNTAIN,
@@ -3031,7 +3031,7 @@ PlayerFuncAC4 D_8085C9F0[PLAYER_IA_MAX] = {
func_80848780, // PLAYER_IA_BOTTLE_MILK_HALF
func_80848780, // PLAYER_IA_BOTTLE_CHATEAU
func_80848780, // PLAYER_IA_BOTTLE_FAIRY
func_80848780, // PLAYER_IA_MOON_TEAR
func_80848780, // PLAYER_IA_MOONS_TEAR
func_80848780, // PLAYER_IA_DEED_LAND
func_80848780, // PLAYER_IA_ROOM_KEY
func_80848780, // PLAYER_IA_LETTER_TO_KAFEI
@@ -3118,7 +3118,7 @@ void (*D_8085CB3C[PLAYER_IA_MAX])(PlayState*, Player*) = {
func_8082F594, // PLAYER_IA_BOTTLE_MILK_HALF
func_8082F594, // PLAYER_IA_BOTTLE_CHATEAU
func_8082F594, // PLAYER_IA_BOTTLE_FAIRY
func_8082F594, // PLAYER_IA_MOON_TEAR
func_8082F594, // PLAYER_IA_MOONS_TEAR
func_8082F594, // PLAYER_IA_DEED_LAND
func_8082F594, // PLAYER_IA_ROOM_KEY
func_8082F594, // PLAYER_IA_LETTER_TO_KAFEI
@@ -7054,7 +7054,7 @@ u8 D_8085D1A4[PLAYER_IA_MAX] = {
GI_MILK_HALF, // PLAYER_IA_BOTTLE_MILK_HALF
GI_CHATEAU, // PLAYER_IA_BOTTLE_CHATEAU
GI_FAIRY, // PLAYER_IA_BOTTLE_FAIRY
GI_MOON_TEAR, // PLAYER_IA_MOON_TEAR
GI_MOONS_TEAR, // PLAYER_IA_MOONS_TEAR
GI_DEED_LAND, // PLAYER_IA_DEED_LAND
GI_ROOM_KEY, // PLAYER_IA_ROOM_KEY
GI_LETTER_TO_KAFEI, // PLAYER_IA_LETTER_TO_KAFEI
@@ -7062,7 +7062,7 @@ u8 D_8085D1A4[PLAYER_IA_MAX] = {
GI_DEED_SWAMP, // PLAYER_IA_DEED_SWAMP
GI_DEED_MOUNTAIN, // PLAYER_IA_DEED_MOUNTAIN
GI_DEED_OCEAN, // PLAYER_IA_DEED_OCEAN
GI_MOON_TEAR, // PLAYER_IA_32
GI_MOONS_TEAR, // PLAYER_IA_32
GI_LETTER_TO_MAMA, // PLAYER_IA_LETTER_MAMA
GI_A7, // PLAYER_IA_34
GI_A8, // PLAYER_IA_35
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_collect.c
+7 -8
View File
@@ -6,12 +6,10 @@
#include "z_kaleido_scope.h"
#include "interface/parameter_static/parameter_static.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s16 point);
extern TexturePtr D_08061000; // gBombersNotebookIconTex
extern TexturePtr D_08062000; // gSongNoteIconTex
s16 sQuestRemainsColorTimerInit[] = { 120, 60, 2, 80 };
s16 sQuestHpColorTimerInits[] = { 20, 4, 20, 10 };
s16 sQuestSongPlayedOcarinaButtonsNum = 0;
@@ -117,8 +115,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play) {
255, // QUEST_SONG_SUN
};
static TexturePtr sQuestUpgradeTextures[][3] = {
{ 0x08053000, 0x08054000, 0x08055000 }, // UPG_QUIVER
{ 0x08056000, 0x08057000, 0x08058000 }, // UPG_BOMB_BAG
{ gItemIconQuiver30Tex, gItemIconQuiver40Tex, gItemIconQuiver50Tex }, // UPG_QUIVER
{ gItemIconBombBag20Tex, gItemIconBombBag30Tex, gItemIconBombBag40Tex }, // UPG_BOMB_BAG
};
static u8 sQuestUpgrades[] = { UPG_QUIVER, UPG_BOMB_BAG };
PauseContext* pauseCtx = &play->pauseCtx;
@@ -221,8 +219,9 @@ void KaleidoScope_DrawQuestStatus(PlayState* play) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gDPLoadTextureBlock(POLY_OPA_DISP++, &D_08062000, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTextureBlock(POLY_OPA_DISP++, gItemIconSongNoteTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 24, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
for (i = 0; i < 12; i++, j += 4) {
if (CHECK_QUEST_ITEM(i + QUEST_SONG_SONATA) ||
@@ -256,7 +255,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play) {
if (CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
gSPVertex(POLY_OPA_DISP++, &pauseCtx->questVtx[j], 4, 0);
KaleidoScope_DrawTexQuadRGBA32(play->state.gfxCtx, &D_08061000, 32, 32, 0);
KaleidoScope_DrawTexQuadRGBA32(play->state.gfxCtx, gItemIconBombersNotebookTex, 32, 32, 0);
}
j += 4;
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_debug.c
+9 -9
View File
@@ -805,18 +805,18 @@ void KaleidoScope_UpdateInventoryEditor(PlayState* play) {
Inventory_DeleteItem(value, slot);
} else if (slot == SLOT_TRADE_DEED) {
if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_NONE) {
gSaveContext.save.saveInfo.inventory.items[slot] = ITEM_MOON_TEAR;
} else if ((INV_CONTENT(ITEM_MOON_TEAR) >= ITEM_MOON_TEAR) &&
(INV_CONTENT(ITEM_MOON_TEAR) <= ITEM_DEED_MOUNTAIN)) {
gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOON_TEAR) + 1;
if (INV_CONTENT(ITEM_MOONS_TEAR) == ITEM_NONE) {
gSaveContext.save.saveInfo.inventory.items[slot] = ITEM_MOONS_TEAR;
} else if ((INV_CONTENT(ITEM_MOONS_TEAR) >= ITEM_MOONS_TEAR) &&
(INV_CONTENT(ITEM_MOONS_TEAR) <= ITEM_DEED_MOUNTAIN)) {
gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOONS_TEAR) + 1;
}
} else if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_NONE) {
if (INV_CONTENT(ITEM_MOONS_TEAR) == ITEM_NONE) {
gSaveContext.save.saveInfo.inventory.items[slot] = ITEM_DEED_OCEAN;
} else if ((INV_CONTENT(ITEM_MOON_TEAR) >= ITEM_DEED_LAND) &&
(INV_CONTENT(ITEM_MOON_TEAR) <= ITEM_DEED_OCEAN)) {
gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOON_TEAR) - 1;
} else if ((INV_CONTENT(ITEM_MOONS_TEAR) >= ITEM_DEED_LAND) &&
(INV_CONTENT(ITEM_MOONS_TEAR) <= ITEM_DEED_OCEAN)) {
gSaveContext.save.saveInfo.inventory.items[slot] = INV_CONTENT(ITEM_MOONS_TEAR) - 1;
}
}
} else if (slot == SLOT_TRADE_KEY_MAMA) {
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_map.c
+8 -8
View File
@@ -9,8 +9,7 @@
#include "interface/icon_item_field_static/icon_item_field_static.h"
#include "interface/icon_item_dungeon_static/icon_item_dungeon_static.h"
#include "interface/icon_item_jpn_static/icon_item_jpn_static.h"
extern TexturePtr D_09007500; // gPlayerFaceIcon
#include "archives/icon_item_24_static/icon_item_24_static_yar.h"
void KaleidoScope_DrawDungeonStrayFairyCount(PlayState* play) {
s16 counterDigits[2];
@@ -76,9 +75,9 @@ void KaleidoScope_DrawDungeonStrayFairyCount(PlayState* play) {
}
TexturePtr sDungeonItemTextures[] = {
0x09003600, // `gBossKeyIconTex`: DUNGEON_BOSS_KEY
0x09003F00, // `gCompassIconTex`: DUNGEON_COMPASS
0x09004800, // `gDungeonMapIconTex`: DUNGEON_MAP
gQuestIconBossKeyTex, // DUNGEON_BOSS_KEY
gQuestIconCompassTex, // DUNGEON_COMPASS
gQuestIconDungeonMapTex, // DUNGEON_MAP
};
TexturePtr sDungeonTitleTextures[] = {
@@ -283,7 +282,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play) {
// Draw Player's face next to the dungeon floor icon currently in.
POLY_OPA_DISP =
Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, &D_09007500, 16, 16, 62,
Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, gQuestIconLinkHumanFaceTex, 16, 16, 62,
sDungeonMapFloorIconPosY[R_REVERSE_FLOOR_INDEX], 16, 16, 1 << 10, 1 << 10);
if (CHECK_DUNGEON_ITEM(DUNGEON_COMPASS, gSaveContext.dungeonIndex)) {
@@ -813,8 +812,9 @@ void KaleidoScope_DrawWorldMap(PlayState* play) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
POLY_OPA_DISP = Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, &D_09007500, 16, 16, sWorldMapCursorsRectLeft[n],
sWorldMapCursorsRectTop[n], 16, 16, 1 << 10, 1 << 10);
POLY_OPA_DISP =
Gfx_DrawTexRectRGBA16(POLY_OPA_DISP, gQuestIconLinkHumanFaceTex, 16, 16, sWorldMapCursorsRectLeft[n],
sWorldMapCursorsRectTop[n], 16, 16, 1 << 10, 1 << 10);
}
}
src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
+54 -60
View File
@@ -3,102 +3,96 @@
* Overlay: ovl_kaleido_scope
* Description: Pause Menu
*/
#include "prevent_bss_reordering.h"
#include "z_kaleido_scope.h"
#include "overlays/gamestates/ovl_opening/z_opening.h"
#include "interface/icon_item_gameover_static/icon_item_gameover_static.h"
#include "interface/icon_item_jpn_static/icon_item_jpn_static.h"
#include "z64view.h"
#include "overlays/gamestates/ovl_opening/z_opening.h"
#include "archives/icon_item_static/icon_item_static_yar.h"
#include "interface/icon_item_gameover_static/icon_item_gameover_static.h"
#include "interface/icon_item_jpn_static/icon_item_jpn_static.h"
#include "interface/icon_item_vtx_static/icon_item_vtx_static.h"
// iconItemSegment
extern TexturePtr D_08064340; // gPauseMenuCursorTex
// Page Textures (Background of Page):
// Broken up into multiple textures.
// Numbered by column/row.
TexturePtr sMaskPageBgTextures[] = {
// Column 0
0x08064440, // gPauseMasks00Tex
0x0806E440, // gPauseMasks01Tex
0x08077A40, // gPauseMasks02Tex
0x08081040, // gPauseMasks03Tex
0x0808A640, // gPauseMasks04Tex
gPauseMasks00Tex,
gPauseMasks01Tex,
gPauseMasks02Tex,
gPauseMasks03Tex,
gPauseMasks04Tex,
// Column 1
gPauseMasks10ENGTex,
0x0806EE40, // gPauseMasks11Tex
0x08078440, // gPauseMasks12Tex
0x08081A40, // gPauseMasks13Tex
0x0808B040, // gPauseMasks14Tex
gPauseMasks11Tex,
gPauseMasks12Tex,
gPauseMasks13Tex,
gPauseMasks14Tex,
// Column 2
0x08065840, // gPauseMasks20Tex
0x0806F840, // gPauseMasks21Tex
0x08078E40, // gPauseMasks22Tex
0x08082440, // gPauseMasks23Tex
0x0808BA40, // gPauseMasks24Tex
gPauseMasks20Tex,
gPauseMasks21Tex,
gPauseMasks22Tex,
gPauseMasks23Tex,
gPauseMasks24Tex,
};
TexturePtr sItemPageBgTextures[] = {
// Column 0
gPauseSelectItem00ENGTex,
0x08070240, // gPauseSelectItem01Tex
0x08079840, // gPauseSelectItem02Tex
0x08082E40, // gPauseSelectItem03Tex
0x0808C440, // gPauseSelectItem04Tex
gPauseSelectItem01Tex,
gPauseSelectItem02Tex,
gPauseSelectItem03Tex,
gPauseSelectItem04Tex,
// Column 1
gPauseSelectItem10ENGTex,
0x08070C40, // gPauseSelectItem11Tex
0x0807A240, // gPauseSelectItem12Tex
0x08083840, // gPauseSelectItem13Tex
0x0808CE40, // gPauseSelectItem14Tex
gPauseSelectItem11Tex,
gPauseSelectItem12Tex,
gPauseSelectItem13Tex,
gPauseSelectItem14Tex,
// Column 2
gPauseSelectItem20ENGTex,
0x08071640, // gPauseSelectItem21Tex
0x0807AC40, // gPauseSelectItem22Tex
0x08084240, // gPauseSelectItem23Tex
0x0808D840, // gPauseSelectItem24Tex
gPauseSelectItem21Tex,
gPauseSelectItem22Tex,
gPauseSelectItem23Tex,
gPauseSelectItem24Tex,
};
TexturePtr sMapPageBgTextures[] = {
// Column 0
0x08068040, // gPauseMap00Tex
0x08072040, // gPauseMap01Tex
0x0807B640, // gPauseMap02Tex
0x08084C40, // gPauseMap03Tex
0x0808E240, // gPauseMap04Tex
gPauseMap00Tex,
gPauseMap01Tex,
gPauseMap02Tex,
gPauseMap03Tex,
gPauseMap04Tex,
// Column 1
gPauseMap10ENGTex,
0x08072A40, // gPauseMap11Tex
0x0807C040, // gPauseMap12Tex
0x08085640, // gPauseMap13Tex
0x0808EC40, // gPauseMap14Tex
gPauseMap11Tex,
gPauseMap12Tex,
gPauseMap13Tex,
gPauseMap14Tex,
// Column 2
0x08069440, // gPauseMap20Tex
0x08073440, // gPauseMap21Tex
0x0807CA40, // gPauseMap22Tex
0x08086040, // gPauseMap23Tex
0x0808F640, // gPauseMap24Tex
gPauseMap20Tex,
gPauseMap21Tex,
gPauseMap22Tex,
gPauseMap23Tex,
gPauseMap24Tex,
};
TexturePtr sQuestPageBgTextures[] = {
// Column 0
gPauseQuestStatus00ENGTex,
0x08073E40, // gPauseQuestStatus01Tex
0x0807D440, // gPauseQuestStatus02Tex
0x08086A40, // gPauseQuestStatus03Tex
0x08090040, // gPauseQuestStatus04Tex
gPauseQuestStatus01Tex,
gPauseQuestStatus02Tex,
gPauseQuestStatus03Tex,
gPauseQuestStatus04Tex,
// Column 1
gPauseQuestStatus10ENGTex,
0x08074840, // gPauseQuestStatus11Tex
0x0807DE40, // gPauseQuestStatus12Tex
0x08087440, // gPauseQuestStatus13Tex
0x08090A40, // gPauseQuestStatus14Tex
gPauseQuestStatus11Tex,
gPauseQuestStatus12Tex,
gPauseQuestStatus13Tex,
gPauseQuestStatus14Tex,
// Column 2
gPauseQuestStatus20ENGTex,
0x08075240, // gPauseQuestStatus21Tex
0x0807E840, // gPauseQuestStatus22Tex
0x08087E40, // gPauseQuestStatus23Tex
0x08091440, // gPauseQuestStatus24Tex
gPauseQuestStatus21Tex,
gPauseQuestStatus22Tex,
gPauseQuestStatus23Tex,
gPauseQuestStatus24Tex,
};
s16 gVtxPageMapWorldQuadsWidth[VTX_PAGE_MAP_WORLD_QUADS] = {
@@ -2607,7 +2601,7 @@ void KaleidoScope_DrawCursor(PlayState* play) {
Matrix_Translate(sCursorCirclesX[i], sCursorCirclesY[i], -50.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_OPA_DISP++);
gDPLoadTextureBlock(POLY_OPA_DISP++, &D_08064340, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0,
gDPLoadTextureBlock(POLY_OPA_DISP++, gPauseMenuCursorTex, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOLOD);
gSPVertex(POLY_OPA_DISP++, &pauseCtx->cursorVtx[0], 4, 0);