mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-20 05:16:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link m_shop.c

Browse Source
This commit is contained in:
Cuyler36
2023-10-21 01:45:37 -04:00
parent e452460184
commit e52e060be7
15 changed files with 3236 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/m_fuusen.c
+1 -1
View File
@@ -9,7 +9,7 @@
int fuusen_DEBUG_mode_flag;
extern void Balloon_init(GAME_PLAY*) {
extern void Balloon_init(GAME_PLAY* play) {
Common_Set(balloon_state, Balloon_STATE_DEAD);
Common_Set(balloon_last_spawn_min, 0);
Common_Set(balloon_spawn_percent, 0.05f);
rel/m_home.c
+1 -1
View File
@@ -252,7 +252,7 @@ extern void mHm_SetDefaultPlayerRoomData(int home_no) {
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_main.items[ut_z][ut_x], l_mHm_player_room_default_data[home_no & 3].item);
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_main.items[1][1], FTR_ORANGEBOX);
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_secondary.items[1][1], ITM_COLLEGERULE);
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_secondary.items[1][1], ITM_DIARY00);
for (i = 0; i < mHm_ROOM_NUM; i++) {
Save_Set(homes[home_no & 3].floors[i].wall_floor.flooring_idx, l_mHm_player_room_default_data[home_no & 3].floor_num);
rel/m_item_debug.c
+206
View File
@@ -0,0 +1,206 @@
#include "m_item_debug.h"
#include "libultra/libultra.h"
#include "game.h"
#include "m_room_type.h"
#include "padmgr.h"
#include "m_name_table.h"
#include "m_private.h"
#include "m_common_data.h"
typedef struct item_debug_s {
int enabled;
int category;
int index;
} ItemDebug_c;
static char* mItemDebug_category_name_table[mItemDebug_CATEGORY_NUM] = {
"\xC5\xBC", // untranslated JP
"FTR",
"PPR",
"MNY",
"TOL",
"FSH",
"CLT",
"ELS",
"CPT",
"WLL",
"FOD",
"PLT",
"MSC",
"DST",
"LOT",
"IST",
"HPY",
"KAB"
};
static mActor_name_t mItemDebug_category_start_no_table[mItemDebug_CATEGORY_NUM] = {
EMPTY_NO,
FTR0_NO_START,
ITM_PAPER_START,
ITM_MONEY_START,
ITM_TOOL_START,
ITM_FISH_START,
ITM_CLOTH_START,
ITM_ETC_START,
ITM_CARPET_START,
ITM_WALL_START,
ITM_FOOD_START,
ITM_ENV_START,
ITM_MINIDISK_START,
ITM_DIARY_START,
ITM_TICKET_START,
ITM_INSECT_START,
ITM_HUKUBUKURO_START,
ITM_KABU_START
};
static int mItemDebug_category_max_table[mItemDebug_CATEGORY_NUM] = {
0,
FTR_NUM,
PAPER_NUM,
MONEY_NUM,
TOOL_NUM,
FISH_NUM,
CLOTH_NUM,
ETC_NUM,
CARPET_NUM,
WALL_NUM,
FRUIT_NUM,
PLANT_NUM,
MINIDISK_NUM,
DIARY_NUM,
TICKET_NUM,
INSECT_NUM,
HUKUBUKURO_NUM,
KABU_NUM
};
/* @unused ? mItemDebug_ItemDebugCt(...) */
static int mItemDebug_FurnitureCanUse(int ftr_idx) {
if (ftr_idx >= 0 && ftr_idx < FTR_NUM) {
u8* birth_info_p = mRmTp_CheckFtrBirthInfoTop();
if (birth_info_p[ftr_idx] == mRmTp_BIRTH_TYPE_UNOBTAINABLE || birth_info_p[ftr_idx] == mRmTp_BIRTH_TYPE_MY_ORIGINAL) {
return FALSE;
}
return TRUE;
}
return FALSE;
}
static ItemDebug_c l_mItemDebug_work_data;
extern void mItemDebug_ItemDebugMain() {
if ((gamePT->pads[PAD2].on.button & BUTTON_START) == BUTTON_START) {
l_mItemDebug_work_data.enabled = (l_mItemDebug_work_data.enabled + 1) & 1;
if (l_mItemDebug_work_data.enabled != FALSE) {
bzero(&l_mItemDebug_work_data, sizeof(ItemDebug_c));
l_mItemDebug_work_data.enabled = TRUE;
}
else {
bzero(&l_mItemDebug_work_data, sizeof(ItemDebug_c));
}
}
if (l_mItemDebug_work_data.enabled != FALSE) {
int category;
if ((gamePT->pads[PAD2].on.button & BUTTON_DUP) == BUTTON_DUP) {
l_mItemDebug_work_data.index = 0;
l_mItemDebug_work_data.category++;
if (l_mItemDebug_work_data.category > mItemDebug_CATEGORY_KAB) {
l_mItemDebug_work_data.category = 0;
}
}
category = l_mItemDebug_work_data.category;
if (category != mItemDebug_CATEGORY_NONE) {
if ((gamePT->pads[PAD2].on.button & BUTTON_DRIGHT) == BUTTON_DRIGHT) {
/* Holding B increments by 10, holding A increments by 100 */
if ((gamePT->pads[PAD2].now.button & BUTTON_B) == BUTTON_B) {
l_mItemDebug_work_data.index += 10;
}
else if ((gamePT->pads[PAD2].now.button & BUTTON_A) == BUTTON_A) {
l_mItemDebug_work_data.index += 100;
}
else {
l_mItemDebug_work_data.index++;
}
if (l_mItemDebug_work_data.index > mItemDebug_category_max_table[category] - 1) {
l_mItemDebug_work_data.index = 0;
}
}
else if ((gamePT->pads[PAD2].on.button & BUTTON_DLEFT) == BUTTON_DLEFT) {
/* Holding B increments by 10, holding A increments by 100 */
if ((gamePT->pads[PAD2].now.button & BUTTON_B) == BUTTON_B) {
l_mItemDebug_work_data.index -= 10;
}
else if ((gamePT->pads[PAD2].now.button & BUTTON_A) == BUTTON_A) {
l_mItemDebug_work_data.index -= 100;
}
else {
l_mItemDebug_work_data.index--;
}
if (l_mItemDebug_work_data.index < 0) {
l_mItemDebug_work_data.index = 0;
}
}
}
if ((gamePT->pads[PAD2].on.button & BUTTON_DDOWN) == BUTTON_DDOWN && category != mItemDebug_CATEGORY_NONE) {
int slot_idx = mPr_GetPossessionItemIdxWithCond(Common_Get(now_private), EMPTY_NO, mPr_ITEM_COND_NORMAL);
mActor_name_t item;
if (category != mItemDebug_CATEGORY_FTR) {
item = mItemDebug_category_start_no_table[category] + l_mItemDebug_work_data.index;
}
else {
if (mItemDebug_FurnitureCanUse(l_mItemDebug_work_data.index)) {
item = mRmTp_FtrIdx2FtrItemNo(l_mItemDebug_work_data.index, mRmTp_DIRECT_SOUTH);
}
else {
return;
}
}
if (slot_idx != -1) {
mPr_SetPossessionItem(Common_Get(now_private), slot_idx, item, mPr_ITEM_COND_NORMAL);
}
}
}
}
extern void mItemDebug_ItemDebugDraw(gfxprint_t* gfxprint) {
int category = l_mItemDebug_work_data.category;
if (l_mItemDebug_work_data.enabled != FALSE) {
gfxprint_color(gfxprint, 225, 225, 255, 255);
gfxprint_locate8x8(gfxprint, 3, 20);
if (category != mItemDebug_CATEGORY_NONE) {
if (category == mItemDebug_CATEGORY_FTR) {
if (mItemDebug_FurnitureCanUse(l_mItemDebug_work_data.index)) {
gfxprint_printf(gfxprint, "%s:%d", mItemDebug_category_name_table[category], l_mItemDebug_work_data.index);
}
else {
gfxprint_printf(gfxprint, "%s:---(%d)", mItemDebug_category_name_table[category], l_mItemDebug_work_data.index);
}
}
else {
gfxprint_printf(gfxprint, "%s:%d", mItemDebug_category_name_table[category], l_mItemDebug_work_data.index);
}
}
else {
gfxprint_printf(gfxprint, "\xC5\xBC");
}
}
}
rel/m_mail.c
+1 -1
View File
@@ -243,7 +243,7 @@ static void mMl_get_mail_to_player_com(Mail_c* mail, PersonalID_c* recipient_pid
mail->header.sender.type = mMl_NAME_TYPE_MUSEUM;
mail->present = present;
mail->content.paper_type = (paper - ITM_PAPER_START) % 64;
mail->content.paper_type = (paper - ITM_PAPER_START) % PAPER_UNIQUE_NUM;
}
static int mMl_send_mail_box_com(PersonalID_c* recipient_pid, int player_no, Mail_c* mail, mActor_name_t present, mActor_name_t paper, int mail_no, u8* sender_name, u32 proc_type, u8 mail_type) {
rel/m_mail_password_check.c
+1 -1
View File
@@ -1087,7 +1087,7 @@ extern int mMpswd_check_present_user(mActor_name_t item) {
}
else if (
(item >= ITM_RED_BALLOON && item <= ITM_BUNNY_O_BALLOON) ||
(item >= ITM_COLLEGERULE && item <= ITM_CALLIGRAPHY_PAD) ||
(item >= ITM_DIARY00 && item <= ITM_DIARY15) ||
(item >= ITM_BLUEBELL_FAN && item <= ITM_LEAF_FAN) ||
(item >= ITM_YELLOW_PINWHEEL && item <= ITM_FANCY_PINWHEEL) ||
(item >= ITM_GOLDEN_NET && item <= ITM_GOLDEN_ROD) ||
rel/m_shop.c
+2761
View File
File diff suppressed because it is too large Load Diff
rel/m_watch_my_step.c
+1 -1
View File
@@ -493,7 +493,7 @@ static void mWt_mybell_confirmation_move(GAME_PLAY* play) {
}
}
if ((u32)i == 8 || mEv_CheckFirstJob() == TRUE || (i <= 4 && Common_Get(nook_shop_state) == 3)) { // TODO: shop state enum, this is likely raffle
if ((u32)i == 8 || mEv_CheckFirstJob() == TRUE || (i <= 4 && Common_Get(tanuki_shop_status) == mSP_TANUKI_SHOP_STATUS_FUKUBIKI)) {
if (S_mybell_conf.update_money == TRUE) {
S_mybell_conf.all_money = get_all_money();
mWt_set_coin_se(FALSE);