mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-22 06:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_item getcheck improvements (#46)

Browse Source 
* more accurate getcheck funcs

* format

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
TakaRikka
2021-01-01 22:44:02 -08:00
committed by GitHub
parent 22be2e1a6d
commit ee838ccbc6
1 changed files with 139 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_item/d_item.cpp
+139 -232
View File
@@ -1026,22 +1026,18 @@ int item_getcheck_func_COMPUS(void) {
return -1; return -1;
} }
int item_getcheck_func_DUNGEON_EXIT(void) { bool item_getcheck_func_DUNGEON_EXIT(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
DUNGEON_EXIT - SLOT_18, true) == DUNGEON_EXIT;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
return check_item >> 5;
} }
bool item_getcheck_func_BOSS_KEY(void) { bool item_getcheck_func_BOSS_KEY(void) {
return g_dComIfG_gameInfo.info.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG); return g_dComIfG_gameInfo.info.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG);
} }
int item_getcheck_func_DUNGEON_BACK(void) { bool item_getcheck_func_DUNGEON_BACK(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
DUNGEON_BACK - SLOT_18, true) == DUNGEON_BACK;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
return check_item >> 5;
} }
void item_getcheck_func_SWORD(void) { void item_getcheck_func_SWORD(void) {
@@ -1066,11 +1062,9 @@ void item_getcheck_func_HYLIA_SHIELD(void) {
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(HYLIA_SHIELD); g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(HYLIA_SHIELD);
} }
int item_getcheck_func_TKS_LETTER(void) { bool item_getcheck_func_TKS_LETTER(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
TKS_LETTER - SLOT_18, true) == TKS_LETTER;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
return check_item >> 5;
} }
void item_getcheck_func_WEAR_CASUAL(void) { void item_getcheck_func_WEAR_CASUAL(void) {
@@ -1094,11 +1088,9 @@ int item_getcheck_func_MAGIC_LV1(void) {
return -1; return -1;
} }
int item_getcheck_func_DUNGEON_EXIT_2(void) { bool item_getcheck_func_DUNGEON_EXIT_2(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
DUNGEON_EXIT - SLOT_18, true) == DUNGEON_EXIT;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
return check_item >> 5;
} }
int item_getcheck_func_WALLET_LV1(void) { int item_getcheck_func_WALLET_LV1(void) {
@@ -1113,11 +1105,9 @@ int item_getcheck_func_WALLET_LV3(void) {
return -1; return -1;
} }
int item_getcheck_func_ZORAS_JEWEL(void) { bool item_getcheck_func_ZORAS_JEWEL(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
ZORAS_JEWEL - SLOT_20, true) == ZORAS_JEWEL;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_20, true));
return check_item >> 5;
} }
void item_getcheck_func_HAWK_EYE(void) { void item_getcheck_func_HAWK_EYE(void) {
@@ -1128,67 +1118,49 @@ void item_getcheck_func_WOOD_STICK(void) {
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WOOD_STICK); g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WOOD_STICK);
} }
int item_getcheck_func_BOOMERANG(void) { bool item_getcheck_func_BOOMERANG(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
BOOMERANG - SLOT_0, true) == BOOMERANG;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_0, true));
return check_item >> 5;
} }
int item_getcheck_func_SPINNER(void) { bool item_getcheck_func_SPINNER(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
SPINNER - SLOT_2, true) == SPINNER;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_2, true));
return check_item >> 5;
} }
int item_getcheck_func_IRONBALL(void) { bool item_getcheck_func_IRONBALL(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
IRONBALL - SLOT_6, true) == IRONBALL;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_6, true));
return check_item >> 5;
} }
int item_getcheck_func_BOW(void) { bool item_getcheck_func_BOW(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_4,
__cntlzw(BOW - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem( false) == BOW;
SLOT_4, false));
return check_item >> 5;
} }
int item_getcheck_func_HOOKSHOT(void) { bool item_getcheck_func_HOOKSHOT(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
HOOKSHOT - SLOT_9, true) == HOOKSHOT;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_9, true));
return check_item >> 5;
} }
int item_getcheck_func_HVY_BOOTS(void) { bool item_getcheck_func_HVY_BOOTS(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
HVY_BOOTS - SLOT_3, true) == HVY_BOOTS;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_3, true));
return check_item >> 5;
} }
int item_getcheck_func_COPY_ROD(void) { bool item_getcheck_func_COPY_ROD(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
COPY_ROD - SLOT_8, true) == COPY_ROD;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_8, true));
return check_item >> 5;
} }
int item_getcheck_func_W_HOOKSHOT(void) { bool item_getcheck_func_W_HOOKSHOT(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
W_HOOKSHOT - SLOT_10, true) == W_HOOKSHOT;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_10, true));
return check_item >> 5;
} }
int item_getcheck_func_KANTERA(void) { bool item_getcheck_func_KANTERA(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
KANTERA - SLOT_1, true) == KANTERA;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_1, true));
return check_item >> 5;
} }
void item_getcheck_func_LIGHT_SWORD(void) { void item_getcheck_func_LIGHT_SWORD(void) {
@@ -1201,11 +1173,9 @@ asm int item_getcheck_func_FISHING_ROD_1(void) {
#include "d/d_item/d_item/asm/func_8009A0C8.s" #include "d/d_item/d_item/asm/func_8009A0C8.s"
} }
int item_getcheck_func_PACHINKO(void) { bool item_getcheck_func_PACHINKO(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
PACHINKO - SLOT_23, true) == PACHINKO;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_23, true));
return check_item >> 5;
} }
int item_getcheck_func_COPY_ROD_2(void) { int item_getcheck_func_COPY_ROD_2(void) {
@@ -1230,7 +1200,7 @@ void item_getcheck_func_LIGHT_ARROW(void) {
int item_getcheck_func_ARROW_LV1(void) { int item_getcheck_func_ARROW_LV1(void) {
return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem( return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
SLOT_4, false) == 0x43 && SLOT_4, false) == BOW &&
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >=
30) ? 30) ?
1 : 1 :
@@ -1239,7 +1209,7 @@ int item_getcheck_func_ARROW_LV1(void) {
int item_getcheck_func_ARROW_LV2(void) { int item_getcheck_func_ARROW_LV2(void) {
return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem( return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
SLOT_4, false) == 0x43 && SLOT_4, false) == BOW &&
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >=
60) ? 60) ?
1 : 1 :
@@ -1248,7 +1218,7 @@ int item_getcheck_func_ARROW_LV2(void) {
int item_getcheck_func_ARROW_LV3(void) { int item_getcheck_func_ARROW_LV3(void) {
return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem( return (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
SLOT_4, false) == 0x43 && SLOT_4, false) == BOW &&
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >=
100) ? 100) ?
1 : 1 :
@@ -1288,99 +1258,79 @@ void item_getcheck_func_JEWEL_WORM_ROD(void) {
} }
int item_getcheck_func_EMPTY_BOTTLE(void) { int item_getcheck_func_EMPTY_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(EMPTY_BOTTLE); EMPTY_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_RED_BOTTLE(void) { int item_getcheck_func_RED_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE); RED_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_GREEN_BOTTLE(void) { int item_getcheck_func_GREEN_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(GREEN_BOTTLE); GREEN_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_BLUE_BOTTLE(void) { int item_getcheck_func_BLUE_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(BLUE_BOTTLE); BLUE_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_MILK_BOTTLE(void) { int item_getcheck_func_MILK_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(MILK_BOTTLE); MILK_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_HALF_MILK_BOTTLE(void) { int item_getcheck_func_HALF_MILK_BOTTLE(void) {
u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
HALF_MILK_BOTTLE); HALF_MILK_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_OIL_BOTTLE(void) { int item_getcheck_func_OIL_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE); OIL_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_WATER_BOTTLE(void) { int item_getcheck_func_WATER_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(WATER_BOTTLE); WATER_BOTTLE);
return bottle_check;
} }
int item_getcheck_func_OIL_BOTTLE2(void) { int item_getcheck_func_OIL_BOTTLE2(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE_2); OIL_BOTTLE_2);
return bottle_check;
} }
int item_getcheck_func_RED_BOTTLE2(void) { int item_getcheck_func_RED_BOTTLE2(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(RED_BOTTLE_2); RED_BOTTLE_2);
return bottle_check;
} }
int item_getcheck_func_UGLY_SOUP(void) { int item_getcheck_func_UGLY_SOUP(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(UGLY_SOUP);
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(UGLY_SOUP);
return bottle_check;
} }
int item_getcheck_func_HOT_SPRING(void) { int item_getcheck_func_HOT_SPRING(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING); HOT_SPRING);
return bottle_check;
} }
int item_getcheck_func_FAIRY_BOTTLE(void) { int item_getcheck_func_FAIRY_BOTTLE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY);
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY);
return bottle_check;
} }
int item_getcheck_func_HOT_SPRING2(void) { int item_getcheck_func_HOT_SPRING2(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(HOT_SPRING); HOT_SPRING);
return bottle_check;
} }
int item_getcheck_func_OIL2(void) { int item_getcheck_func_OIL2(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL2);
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL2);
return bottle_check;
} }
int item_getcheck_func_OIL(void) { int item_getcheck_func_OIL(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL);
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(OIL);
return bottle_check;
} }
void item_getcheck_func_NORMAL_BOMB(void) { void item_getcheck_func_NORMAL_BOMB(void) {
@@ -1396,15 +1346,12 @@ void item_getcheck_func_POKE_BOMB(void) {
} }
int item_getcheck_func_FAIRY_DROP(void) { int item_getcheck_func_FAIRY_DROP(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(FAIRY_DROP); FAIRY_DROP);
return bottle_check;
} }
int item_getcheck_func_WORM(void) { int item_getcheck_func_WORM(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(WORM);
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(WORM);
return bottle_check;
} }
void item_getcheck_func_DROP_BOTTLE(void) { void item_getcheck_func_DROP_BOTTLE(void) {
@@ -1416,39 +1363,33 @@ int item_getcheck_func_BEE_CHILD(void) {
} }
int item_getcheck_func_CHUCHU_RARE(void) { int item_getcheck_func_CHUCHU_RARE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RARE); CHUCHU_RARE);
return bottle_check;
} }
int item_getcheck_func_CHUCHU_RED(void) { int item_getcheck_func_CHUCHU_RED(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_RED); CHUCHU_RED);
return bottle_check;
} }
int item_getcheck_func_CHUCHU_BLUE(void) { int item_getcheck_func_CHUCHU_BLUE(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLUE); CHUCHU_BLUE);
return bottle_check;
} }
int item_getcheck_func_CHUCHU_GREEN(void) { int item_getcheck_func_CHUCHU_GREEN(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_GREEN); CHUCHU_GREEN);
return bottle_check;
} }
int item_getcheck_func_CHUCHU_YELLOW(void) { int item_getcheck_func_CHUCHU_YELLOW(void) {
u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
CHUCHU_YELLOW); CHUCHU_YELLOW);
return bottle_check;
} }
int item_getcheck_func_CHUCHU_PURPLE(void) { int item_getcheck_func_CHUCHU_PURPLE(void) {
u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
CHUCHU_PURPLE); CHUCHU_PURPLE);
return bottle_check;
} }
void item_getcheck_func_LV1_SOUP(void) { void item_getcheck_func_LV1_SOUP(void) {
@@ -1463,59 +1404,44 @@ void item_getcheck_func_LV3_SOUP(void) {
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV3_SOUP); g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV3_SOUP);
} }
int item_getcheck_func_LETTER(void) { bool item_getcheck_func_LETTER(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
__cntlzw(LETTER - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem( SLOT_21, true) == LETTER;
SLOT_21, true));
return check_item >> 5;
} }
int item_getcheck_func_BILL(void) { bool item_getcheck_func_BILL(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21,
__cntlzw(BILL - g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem( true) == BILL;
SLOT_21, true));
return check_item >> 5;
} }
int item_getcheck_func_WOOD_STATUE(void) { bool item_getcheck_func_WOOD_STATUE(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
WOOD_STATUE - SLOT_21, true) == WOOD_STATUE;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true));
return check_item >> 5;
} }
int item_getcheck_func_IRIAS_PENDANT(void) { bool item_getcheck_func_IRIAS_PENDANT(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
IRIAS_PENDANT - SLOT_21, true) == IRIAS_PENDANT;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_21, true));
return check_item >> 5;
} }
int item_getcheck_func_HORSE_FLUTE(void) { bool item_getcheck_func_HORSE_FLUTE(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
HORSE_FLUTE - SLOT_22, true) == HORSE_FLUTE;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
return check_item >> 5;
} }
int item_getcheck_func_RAFRELS_MEMO(void) { bool item_getcheck_func_RAFRELS_MEMO(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
RAFRELS_MEMO - SLOT_19, true) == RAFRELS_MEMO;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19, true));
return check_item >> 5;
} }
int item_getcheck_func_ASHS_SCRIBBLING(void) { bool item_getcheck_func_ASHS_SCRIBBLING(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
ASHS_SCRIBBLING - SLOT_19, true) == ASHS_SCRIBBLING;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_19, true));
return check_item >> 5;
} }
int item_getcheck_func_CHUCHU_YELLOW2(void) { int item_getcheck_func_CHUCHU_YELLOW2(void) {
u8 bottle_check = g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
CHUCHU_YELLOW2); CHUCHU_YELLOW2);
return bottle_check;
} }
int item_getcheck_func_OIL_BOTTLE3(void) { int item_getcheck_func_OIL_BOTTLE3(void) {
@@ -1527,9 +1453,8 @@ int item_getcheck_func_SHOP_BEE_CHILD(void) {
} }
int item_getcheck_func_CHUCHU_BLACK(void) { int item_getcheck_func_CHUCHU_BLACK(void) {
u8 bottle_check = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().checkBottle(CHUCHU_BLACK); CHUCHU_BLACK);
return bottle_check;
} }
void item_getcheck_func_LIGHT_DROP(void) { void item_getcheck_func_LIGHT_DROP(void) {
@@ -1567,43 +1492,33 @@ int item_getcheck_func_MIRROR_PIECE_4(void) {
return -1; return -1;
} }
int item_getcheck_func_SMELL_YELIA_POUCH(void) { bool item_getcheck_func_SMELL_YELIA_POUCH(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent() ==
__cntlzw(SMELL_YELIA_POUCH - SMELL_YELIA_POUCH;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
return check_item >> 5;
} }
int item_getcheck_func_SMELL_PUMPKIN(void) { int item_getcheck_func_SMELL_PUMPKIN(void) {
return -1; return -1;
} }
int item_getcheck_func_SMELL_POH(void) { bool item_getcheck_func_SMELL_POH(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent() ==
__cntlzw(SMELL_POH - SMELL_POH;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
return check_item >> 5;
} }
int item_getcheck_func_SMELL_FISH(void) { bool item_getcheck_func_SMELL_FISH(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent() ==
__cntlzw(SMELL_FISH - SMELL_FISH;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
return check_item >> 5;
} }
int item_getcheck_func_SMELL_CHILDREN(void) { bool item_getcheck_func_SMELL_CHILDREN(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent() ==
__cntlzw(SMELL_CHILDREN - SMELL_CHILDREN;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
return check_item >> 5;
} }
int item_getcheck_func_SMELL_MEDICINE(void) { bool item_getcheck_func_SMELL_MEDICINE(void) {
u32 check_item = return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent() ==
__cntlzw(SMELL_MEDICINE - SMELL_MEDICINE;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getScent());
return check_item >> 5;
} }
void item_getcheck_func_M_BEETLE(void) { void item_getcheck_func_M_BEETLE(void) {
@@ -1706,32 +1621,24 @@ int item_getcheck_func_POU_SPIRIT(void) {
return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().getPoeCount(); return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerCollect().getPoeCount();
} }
int item_getcheck_func_ANCIENT_DOCUMENT(void) { bool item_getcheck_func_ANCIENT_DOCUMENT(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
ANCIENT_DOCUMENT - SLOT_22, true) == ANCIENT_DOCUMENT;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
return check_item >> 5;
} }
int item_getcheck_func_AIR_LETTER(void) { bool item_getcheck_func_AIR_LETTER(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
AIR_LETTER - SLOT_22, true) == AIR_LETTER;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
return check_item >> 5;
} }
int item_getcheck_func_ANCIENT_DOCUMENT2(void) { bool item_getcheck_func_ANCIENT_DOCUMENT2(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
ANCIENT_DOCUMENT2 - SLOT_22, true) == ANCIENT_DOCUMENT2;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_22, true));
return check_item >> 5;
} }
int item_getcheck_func_LV7_DUNGEON_EXIT(void) { bool item_getcheck_func_LV7_DUNGEON_EXIT(void) {
u32 check_item = __cntlzw( return g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(
LV7_DUNGEON_EXIT - SLOT_18, true) == LV7_DUNGEON_EXIT;
g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().getItem(SLOT_18, true));
return check_item >> 5;
} }
int item_getcheck_func_LINKS_SAVINGS(void) { int item_getcheck_func_LINKS_SAVINGS(void) {