update ewram

This commit is contained in:
Evan
2019-11-25 15:04:38 -07:00
parent 3099483113
commit c73f061cc6
8 changed files with 682 additions and 768 deletions
+1 -1
View File
@@ -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
View File
@@ -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
View File
@@ -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();
+1 -1
View File
@@ -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);
} }
+23 -1
View File
@@ -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
+291 -352
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -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();
+362 -400
View File
File diff suppressed because it is too large Load Diff