update ewram
This commit is contained in:
+1
-1
@@ -5484,7 +5484,7 @@ sub_810A9D4: @ 810A9D4
|
|||||||
mov r2, r8
|
mov r2, r8
|
||||||
ldrh r1, [r2, 0x10]
|
ldrh r1, [r2, 0x10]
|
||||||
movs r2, 0x2
|
movs r2, 0x2
|
||||||
bl sub_809C09C
|
bl RecordItemPurchase
|
||||||
mov r3, r8
|
mov r3, r8
|
||||||
ldrb r0, [r3]
|
ldrb r0, [r3]
|
||||||
ldr r4, _0810AAE4 @ =gUnknown_203ACFC
|
ldr r4, _0810AAE4 @ =gUnknown_203ACFC
|
||||||
|
|||||||
+2
-11
@@ -11,22 +11,13 @@
|
|||||||
|
|
||||||
#define NUM_CHARS_PRICE 4
|
#define NUM_CHARS_PRICE 4
|
||||||
|
|
||||||
// shop view window NPC info enum
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
EVENT_OBJ_ID,
|
|
||||||
X_COORD,
|
|
||||||
Y_COORD,
|
|
||||||
ANIM_NUM
|
|
||||||
};
|
|
||||||
|
|
||||||
extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
|
extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
|
||||||
|
|
||||||
void CreatePokemartMenu(const u16 *itemsForSale);
|
void CreatePokemartMenu(const u16 *itemsForSale);
|
||||||
void CreateDecorationShop1Menu(const u16 *);
|
void CreateDecorationShop1Menu(const u16 *);
|
||||||
void CreateDecorationShop2Menu(const u16 *);
|
void CreateDecorationShop2Menu(const u16 *);
|
||||||
u8 sub_809B56C(void);
|
u8 GetMartUnk16_4(void);
|
||||||
void sub_809C09C(u16 a0, u16 a1, u8 a2);
|
void RecordItemPurchase(u16 a0, u16 a1, u8 a2);
|
||||||
|
|
||||||
// buy_menu_helper
|
// buy_menu_helper
|
||||||
void BuyMenuInitWindows(bool32 isSellingTM);
|
void BuyMenuInitWindows(bool32 isSellingTM);
|
||||||
|
|||||||
+1
-1
@@ -1384,7 +1384,7 @@ static void Task_SellBerries_PlaySfxAndRemoveBerries(u8 taskId)
|
|||||||
PlaySE(SE_SHOP);
|
PlaySE(SE_SHOP);
|
||||||
RemoveBagItem(gSpecialVar_ItemId, data[8]);
|
RemoveBagItem(gSpecialVar_ItemId, data[8]);
|
||||||
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
|
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
|
||||||
sub_809C09C(gSpecialVar_ItemId, data[8], 2);
|
RecordItemPurchase(gSpecialVar_ItemId, data[8], 2);
|
||||||
DestroyListMenuTask(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow);
|
DestroyListMenuTask(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow);
|
||||||
SortAndCountBerries();
|
SortAndCountBerries();
|
||||||
SanitizeListMenuSelectionParams();
|
SanitizeListMenuSelectionParams();
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ void BuyMenuPrint(u8 windowId, u8 font, const u8 *text, u8 x, u8 y, u8 letterSpa
|
|||||||
|
|
||||||
void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback)
|
void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback)
|
||||||
{
|
{
|
||||||
DisplayMessageAndContinueTask(taskId, 2, 0x13, 0xE, sub_809B56C(), GetTextSpeedSetting(), text, callback);
|
DisplayMessageAndContinueTask(taskId, 2, 0x13, 0xE, GetMartUnk16_4(), GetTextSpeedSetting(), text, callback);
|
||||||
ScheduleBgCopyTilemapToVram(0);
|
ScheduleBgCopyTilemapToVram(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,29 @@ static const u16 gUnknown_83DF0F8[] = {0x02eb, 0x031e, 0x031c};
|
|||||||
#ifdef NONMATCHING
|
#ifdef NONMATCHING
|
||||||
void sub_809C1D8(u8 taskId, const u16* a1, u16 a2)
|
void sub_809C1D8(u8 taskId, const u16* a1, u16 a2)
|
||||||
{
|
{
|
||||||
|
s16 v1, v2, v3;
|
||||||
|
s16 i, j;
|
||||||
|
|
||||||
|
v1 = gTasks[taskId].data[5] - 1;
|
||||||
|
v2 = gTasks[taskId].data[6] - 1;
|
||||||
|
v3 = gTasks[taskId].data[2];
|
||||||
|
|
||||||
|
if (gTasks[taskId].data[3] == 0)
|
||||||
|
{
|
||||||
|
for (i = 0; i < 3; i++)
|
||||||
|
{
|
||||||
|
for (j = 0; j < 3; j++)
|
||||||
|
{
|
||||||
|
MapGridGetMetatileIdAt(v1 + j, v2 + i);
|
||||||
|
if ()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
MapGridSetMetatileIdAt
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
NAKED
|
NAKED
|
||||||
|
|||||||
+294
-355
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1107,7 +1107,7 @@ static void Task_DoSaleOfTMs(u8 taskId)
|
|||||||
PlaySE(SE_SHOP);
|
PlaySE(SE_SHOP);
|
||||||
RemoveBagItem(gSpecialVar_ItemId, data[8]);
|
RemoveBagItem(gSpecialVar_ItemId, data[8]);
|
||||||
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
|
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
|
||||||
sub_809C09C(gSpecialVar_ItemId, data[8], 2);
|
RecordItemPurchase(gSpecialVar_ItemId, data[8], 2);
|
||||||
DestroyListMenuTask(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
|
DestroyListMenuTask(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
|
||||||
TMCaseSetup_GetTMCount();
|
TMCaseSetup_GetTMCount();
|
||||||
TMCaseSetup_InitListMenuPositions();
|
TMCaseSetup_InitListMenuPositions();
|
||||||
|
|||||||
+4
-42
@@ -306,48 +306,10 @@ gUnknown_2039874: @ 2039874
|
|||||||
gBagPockets: @ 203988C
|
gBagPockets: @ 203988C
|
||||||
.space 0x28
|
.space 0x28
|
||||||
|
|
||||||
gUnknown_20398B4: @ 20398B4
|
.align 2
|
||||||
.space 0x4
|
.include "src/shop.o"
|
||||||
|
.align 2
|
||||||
gUnknown_20398B8: @ 20398B8
|
.include "src/sea_cottage_special_anim.o"
|
||||||
.space 0x2
|
|
||||||
|
|
||||||
gUnknown_20398BA: @ 20398BA
|
|
||||||
.space 0x7A
|
|
||||||
|
|
||||||
gShopData: @ 2039934
|
|
||||||
.space 0xE
|
|
||||||
|
|
||||||
gUnknown_2039942: @ 2039942
|
|
||||||
.space 0xE
|
|
||||||
|
|
||||||
gUnknown_2039950: @ 2039950
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_2039954: @ 2039954
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_2039958: @ 2039958
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_203995C: @ 203995C
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_2039960: @ 2039960
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_2039964: @ 2039964
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_2039968: @ 2039968
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_203996C: @ 203996C
|
|
||||||
.space 0x18
|
|
||||||
|
|
||||||
gUnknown_2039984: @ 2039984
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
.align 2
|
.align 2
|
||||||
.include "src/script_menu.o"
|
.include "src/script_menu.o"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user