dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #106 from PikalaxALT/berry_pouch

Browse Source 
Berry pouch
This commit is contained in:
PikalaxALT
2019-10-02 20:02:21 -04:00
committed by PikalaxALT
parent 872d5eaf4a 32f2bb3dda
commit d9ab841b0d
25 changed files with 1703 additions and 3955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/berry_pouch.s
-3819
View File
File diff suppressed because it is too large Load Diff
asm/item_menu.s
+9 -9
View File
@@ -3922,7 +3922,7 @@ sub_8109CC0: @ 8109CC0
_08109D14: .4byte gTasks+0x8
_08109D18:
ldrh r0, [r4, 0x2]
ldr r1, _08109D30 @ =gUnknown_84163DB
ldr r1, _08109D30 @ =gText_TossOutHowManyStrVar1s
bl sub_810971C
adds r0, r7, 0
subs r0, 0x8
@@ -3934,7 +3934,7 @@ _08109D2A:
pop {r0}
bx r0
.align 2, 0
_08109D30: .4byte gUnknown_84163DB
_08109D30: .4byte gText_TossOutHowManyStrVar1s
_08109D34: .4byte sub_8109DEC
thumb_func_end sub_8109CC0
@@ -3957,7 +3957,7 @@ sub_8109D38: @ 8109D38
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r5, _08109DA4 @ =gStringVar4
ldr r1, _08109DA8 @ =gUnknown_8416409
ldr r1, _08109DA8 @ =gText_ThrowAwayStrVar2OfThisItemQM
adds r0, r5, 0
bl StringExpandPlaceholders
movs r0, 0x6
@@ -3988,7 +3988,7 @@ sub_8109D38: @ 8109D38
_08109D9C: .4byte gTasks+0x8
_08109DA0: .4byte gStringVar2
_08109DA4: .4byte gStringVar4
_08109DA8: .4byte gUnknown_8416409
_08109DA8: .4byte gText_ThrowAwayStrVar2OfThisItemQM
_08109DAC: .4byte gUnknown_8452F50
thumb_func_end sub_8109D38
@@ -4133,7 +4133,7 @@ sub_8109EA8: @ 8109EA8
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r6, _08109F38 @ =gStringVar4
ldr r1, _08109F3C @ =gUnknown_84163F4
ldr r1, _08109F3C @ =gText_ThrewAwayStrVar2StrVar1s
adds r0, r6, 0
bl StringExpandPlaceholders
movs r0, 0x6
@@ -4167,7 +4167,7 @@ _08109F2C: .4byte gUnknown_203ACFC
_08109F30: .4byte gStringVar1
_08109F34: .4byte gStringVar2
_08109F38: .4byte gStringVar4
_08109F3C: .4byte gUnknown_84163F4
_08109F3C: .4byte gText_ThrewAwayStrVar2StrVar1s
_08109F40: .4byte sub_8109F44
thumb_func_end sub_8109EA8
@@ -4706,7 +4706,7 @@ _0810A3C4: .4byte gUnknown_841630F
_0810A3C8: .4byte sub_810A1D0
_0810A3CC:
movs r0, 0xB6
lsls r0, 1
lsls r0, 1 @ ITEM_TM_CASE
cmp r4, r0
bne _0810A3DC
ldr r0, _0810A3D8 @ =sub_810A434
@@ -4714,7 +4714,7 @@ _0810A3CC:
.align 2, 0
_0810A3D8: .4byte sub_810A434
_0810A3DC:
ldr r0, _0810A3F0 @ =0x0000016d
ldr r0, _0810A3F0 @ =ITEM_BERRY_POUCH
cmp r4, r0
bne _0810A3F8
ldr r0, _0810A3F4 @ =sub_810A448
@@ -4724,7 +4724,7 @@ _0810A3E4:
bl ItemMenu_StartFadeToExitCallback
b _0810A426
.align 2, 0
_0810A3F0: .4byte 0x0000016d
_0810A3F0: .4byte 0x0000016d @ ITEM_BERRY_POUCH
_0810A3F4: .4byte sub_810A448
_0810A3F8:
mov r1, r8
asm/new_game.s
+1 -1
View File
@@ -184,7 +184,7 @@ ResetMenuAndMonGlobals: @ 8054A28
bl ZeroEnemyPartyMons
bl sub_81089BC
bl ResetTMCaseCursorPos
bl sub_813D6E4
bl BerryPouch_CursorResetToTop
bl sub_811089C
bl Random
lsls r0, 16
baserom.ips
BIN
View File
Binary file not shown.
data/berry_pouch.s
-59
View File
@@ -1,59 +0,0 @@
.section .rodata
.align 2
gUnknown_846434C:: @ 846434C
.incbin "baserom.gba", 0x46434C, 0xC
gUnknown_8464358:: @ 8464358
.incbin "baserom.gba", 0x464358, 0x14
gUnknown_846436C:: @ 846436C
.incbin "baserom.gba", 0x46436C, 0x8
gUnknown_8464374:: @ 8464374
.incbin "baserom.gba", 0x464374, 0x8
gUnknown_846437C:: @ 846437C
.incbin "baserom.gba", 0x46437C, 0x28
gUnknown_84643A4:: @ 84643A4
.incbin "baserom.gba", 0x4643A4, 0x4
gUnknown_84643A8:: @ 84643A8
.incbin "baserom.gba", 0x4643A8, 0x4
gUnknown_84643AC:: @ 84643AC
.incbin "baserom.gba", 0x4643AC, 0x4
gUnknown_84643B0:: @ 84643B0
.incbin "baserom.gba", 0x4643B0, 0x4
gUnknown_84643B4:: @ 84643B4
.incbin "baserom.gba", 0x4643B4, 0x4
gUnknown_84643B8:: @ 84643B8
.incbin "baserom.gba", 0x4643B8, 0x20
gUnknown_84643D8:: @ 84643D8
.incbin "baserom.gba", 0x4643D8, 0x18
gUnknown_84643F0:: @ 84643F0
.incbin "baserom.gba", 0x4643F0, 0x8
gUnknown_84643F8:: @ 84643F8
.incbin "baserom.gba", 0x4643F8, 0x8
gUnknown_8464400:: @ 8464400
.incbin "baserom.gba", 0x464400, 0x48
gUnknown_8464448:: @ 8464448
.incbin "baserom.gba", 0x464448, 0x60
gUnknown_84644A8:: @ 84644A8
.incbin "baserom.gba", 0x4644A8, 0x8
gUnknown_84644B0:: @ 84644B0
.incbin "baserom.gba", 0x4644B0, 0x8
gUnknown_84644B8:: @ 84644B8
.incbin "baserom.gba", 0x4644B8, 0x32C
data/graphics.s
+12 -12
View File
@@ -13988,23 +13988,23 @@ gItemPcBgPals:: @ 8E85408
gItemPcTilemap:: @ 8E85458
.incbin "graphics/item_pc/unk_8E85458.bin.lz"
gUnknown_8E8560C:: @ 8E8560C
.incbin "baserom.gba", 0xE8560C, 0x3C4
gBerryPouchSpriteTiles:: @ 8E8560C
.incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz"
gUnknown_8E859D0:: @ 8E859D0
.incbin "baserom.gba", 0xE859D0, 0x1D4
gBerryPouchBgGfx:: @ 8E859D0
.incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz"
gUnknown_8E85BA4:: @ 8E85BA4
.incbin "baserom.gba", 0xE85BA4, 0x50
gBerryPouchBgPals:: @ 8E85BA4
.incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz"
gUnknown_8E85BF4:: @ 8E85BF4
.incbin "baserom.gba", 0xE85BF4, 0x28
gBerryPouchBgPal0FemaleOverride:: @ 8E85BF4
.incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz"
gUnknown_8E85C1C:: @ 8E85C1C
.incbin "baserom.gba", 0xE85C1C, 0x28
gBerryPouchSpritePalette:: @ 8E85C1C
.incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz"
gUnknown_8E85C44:: @ 8E85C44
.incbin "baserom.gba", 0xE85C44, 0x184
gBerryPouchBg1Tilemap:: @ 8E85C44
.incbin "graphics/berry_pouch/unk_8E85C44.bin.lz"
gUnknown_8E85DC8:: @ 8E85DC8
.incbin "baserom.gba", 0xE85DC8, 0x134
data/itemfinder.s
+4
View File
@@ -1,5 +1,9 @@
.section .rodata
.align 2
gUnknown_84644D0:: @ 84644D0
.incbin "baserom.gba", 0x4644D0, 0x314
gUnknown_84647E4:: @ 84647E4
.incbin "baserom.gba", 0x4647E4, 0x18
data/strings.s
+11 -11
View File
@@ -372,7 +372,7 @@ gUnknown_8416195::
gOtherText_Use::
.string "USE$"
gUnknown_84161A4::
gOtherText_Toss::
.string "TOSS$"
gUnknown_84161A9::
@@ -555,25 +555,25 @@ gOtherText_WhereShouldTheStrVar1BePlaced:: @ 841633F
gText_ItemCantBeHeld:: @ 841635E
.string "The {STR_VAR_1} can't be held.$"
gUnknown_8416374:: @ 8416374
gText_TheStrVar1CantBeHeldHere:: @ 8416374
.string "The {STR_VAR_1} can't be held\nhere.$"
gUnknown_841638F:: @ 841638F
.string "Deposit how many\n{STR_VAR_1}シsス?$"
.string "Deposit how many\n{STR_VAR_1}(s)?$"
gUnknown_84163A7:: @ 84163A7
.string "Deposited {STR_VAR_2}\n{STR_VAR_1}シsス.$"
.string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$"
gUnknown_84163BB:: @ 84163BB
.string "There's no room to\nstore items.$"
gUnknown_84163DB:: @ 84163DB
.string "Toss out how many\n{STR_VAR_1}シsス?$"
gText_TossOutHowManyStrVar1s:: @ 84163DB
.string "Toss out how many\n{STR_VAR_1}(s)?$"
gUnknown_84163F4:: @ 84163F4
.string "Threw away {STR_VAR_2}\n{STR_VAR_1}シsス.$"
gText_ThrewAwayStrVar2StrVar1s:: @ 84163F4
.string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$"
gUnknown_8416409:: @ 8416409
gText_ThrowAwayStrVar2OfThisItemQM:: @ 8416409
.string "Throw away {STR_VAR_2} of\nthis item?$"
gUnknown_8416425:: @ 8416425
@@ -654,10 +654,10 @@ gText_FontSize2:: @ 8416703
gUnknown_8416707:: @ 8416707
.string " $"
gUnknown_841670A:: @ 841670A
gText_BerryPouch:: @ 841670A
.string "BERRY POUCH$"
gUnknown_8416716:: @ 8416716
gText_TheBerryPouchWillBePutAway:: @ 8416716
.string "The BERRY POUCH will be\nput away.$"
gUnknown_8416738:: @ 0x8416738
graphics/berry_pouch/unk_8E8560C.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 782 B

graphics/berry_pouch/unk_8E859D0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 444 B

graphics/berry_pouch/unk_8E85BA4.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
0 65 90
255 0 255
41 57 82
65 180 164
255 0 255
255 0 255
106 205 197
164 205 238
189 238 255
255 255 205
180 189 180
148 148 148
238 230 172
106 106 106
106 156 238
0 90 131
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
189 213 213
238 255 255
222 246 255
255 255 255
164 222 255
16 172 222
0 82 115
0 115 139
0 123 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
189 213 213
238 255 255
222 246 255
255 255 255
164 222 255
24 82 180
0 90 131
24 82 180
24 82 180
graphics/berry_pouch/unk_8E85BF4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 65 90
255 0 255
41 57 82
213 139 115
255 0 255
255 0 255
255 172 148
164 205 238
189 238 255
255 255 205
180 189 180
148 148 148
238 230 172
106 106 106
106 156 238
0 90 131
graphics/berry_pouch/unk_8E85C1C.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
222 222 90
98 115 123
255 205 156
230 189 139
213 164 115
189 139 90
156 82 0
115 57 0
197 205 213
246 115 0
222 57 0
230 148 98
255 172 123
222 230 230
49 57 57
255 255 255
graphics/berry_pouch/unk_8E85C44.bin
BIN
View File
Binary file not shown.
include/berry_pouch.h
+15 -4
View File
@@ -3,10 +3,21 @@
#include "task.h"
enum BerryPouchType
{
BERRYPOUCH_FROMFIELD,
BERRYPOUCH_FROMPARTYGIVE,
BERRYPOUCH_FROMMARTSELL,
BERRYPOUCH_FROMPOKEMONSTORAGEPC,
BERRYPOUCH_FROMBATTLE,
BERRYPOUCH_FROMBERRYCRUSH,
BERRYPOUCH_NA
};
void BerryPouch_StartFadeToExitCallback(u8 taskId);
void BerryPouch_SetExitCallback(void (*)(void));
void InitBerryPouch(u8, void (*)(void), u8);
void DisplayItemMessageInBerryPouch(u8 taskId, u8 bgId, const u8 * str, TaskFunc followUpFunc);
void sub_813E2B8(u8 taskId);
void BerryPouch_SetExitCallback(void (*exitCallback)(void));
void InitBerryPouch(u8 type, void (*savedCallback)(void), u8 allowSelect);
void DisplayItemMessageInBerryPouch(u8 taskId, u8 fontId, const u8 * str, TaskFunc followUpFunc);
void Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu(u8 taskId);
#endif //GUARD_BERRY_POUCH_H
include/graphics.h
+8
View File
@@ -998,4 +998,12 @@ extern const u16 gCreditsAllRightsReservedGfxPal[];
extern const u8 gCreditsAllRightsReservedGfxTiles[];
extern const u8 gCreditsAllRightsReservedGfxMap[];
// berry_pouch
extern const u32 gBerryPouchSpriteTiles[];
extern const u8 gBerryPouchBgGfx[];
extern const u32 gBerryPouchBgPals[];
extern const u32 gBerryPouchBgPal0FemaleOverride[];
extern const u32 gBerryPouchSpritePalette[];
extern const u8 gBerryPouchBg1Tilemap[];
#endif //GUARD_GRAPHICS_H
include/item.h
+4 -4
View File
@@ -64,18 +64,18 @@ u8 ItemId_GetSecondaryId(u16 itemId);
u16 itemid_get_market_price(u16 itemId);
void ClearItemSlotsInAllBagPockets(void);
void ClearPCItemSlots(void);
void CopyItemName(u16, u8 *);
void sub_809A824(u16 itemId);
bool8 AddBagItem(u16 itemId, u16 amount);
void SortPocketAndPlaceHMsFirst(struct BagPocket *);
u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1);
u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1);
void SortPocketAndPlaceHMsFirst(struct BagPocket * pocket);
u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 itemId);
u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 itemId);
bool8 itemid_is_unique(u16 itemId);
void BagPocketCompaction(struct ItemSlot * slots, u8 capacity);
u16 GetPcItemQuantity(u16 *);
void ItemPcCompaction(void);
void RemoveItemFromPC(u16 itemId, u16 quantity);
void SortAndCompactBagPocket(struct BagPocket * pocket);
#endif // GUARD_ITEM_H
include/menu_helpers.h
+2 -1
View File
@@ -3,6 +3,7 @@
#include "global.h"
#include "task.h"
#include "window.h"
struct YesNoFuncTable
{
@@ -22,7 +23,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 palet
void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
u8 GetLRKeysState(void);
u8 sub_80BF66C(void);
bool8 sub_80BF6A8(u16 itemId);
bool8 itemid_link_can_give_berry(u16 itemId);
bool8 itemid_80BF6D8_mail_related(u16 itemId);
void ClearVramOamPltt(void);
include/party_menu.h
+1
View File
@@ -81,5 +81,6 @@ void sub_8127DA8(u8 battlerId, u8 multiplayerFlag);
void OpenPartyMenuInBattle(u8 arg);
void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
bool8 IsMultiBattle(void);
void sub_8126EDC(void);
#endif // GUARD_PARTY_MENU_H
include/strings.h
+9
View File
@@ -94,6 +94,7 @@ extern const u8 gText_Pokemon[];
extern const u8 gText_PkmnFainted3[];
extern const u8 gOtherText_Use[];
extern const u8 gOtherText_Toss[];
extern const u8 gOtherText_Give[];
extern const u8 gOtherText_Exit[];
extern const u8 gText_ThreeHyphens[];
@@ -315,4 +316,12 @@ extern const u8 gCreditsString_The_Royal_New_Zealand_Foundation_of_the_Blind_Gre
extern const u8 gCreditsString_Graphic_Designer[];
extern const u8 gCreditsString_Akira_Kinashi[];
// berry_pouch
extern const u8 gText_TheStrVar1CantBeHeldHere[];
extern const u8 gText_TossOutHowManyStrVar1s[];
extern const u8 gText_ThrewAwayStrVar2StrVar1s[];
extern const u8 gText_ThrowAwayStrVar2OfThisItemQM[];
extern const u8 gText_BerryPouch[];
extern const u8 gText_TheBerryPouchWillBePutAway[];
#endif //GUARD_STRINGS_H
ld_script.txt
+2 -2
View File
@@ -251,7 +251,7 @@ SECTIONS {
src/help_system.o(.text);
asm/wild_pokemon_area.o(.text);
src/dynamic_placeholder_text_util.o(.text);
asm/berry_pouch.o(.text);
src/berry_pouch.o(.text);
asm/itemfinder.o(.text);
src/buy_menu_helpers.o(.text);
src/slot_machine.o(.text);
@@ -466,7 +466,7 @@ SECTIONS {
src/help_system.o(.rodata);
data/wild_pokemon_area.o(.rodata);
src/dynamic_placeholder_text_util.o(.rodata);
data/berry_pouch.o(.rodata);
src/berry_pouch.o(.rodata);
data/itemfinder.o(.rodata);
src/buy_menu_helpers.o(.rodata);
src/slot_machine.o(.rodata);
src/berry_pouch.c
+1528
View File
File diff suppressed because it is too large Load Diff
src/item_use.c
+4 -4
View File
@@ -435,7 +435,7 @@ void FieldUseFunc_BerryPouch(u8 taskId)
void InitBerryPouchFromBag(void)
{
InitBerryPouch(0, ReturnToBagFromKeyItem, 0);
InitBerryPouch(BERRYPOUCH_FROMFIELD, ReturnToBagFromKeyItem, 0);
}
void Task_InitBerryPouchFromField(u8 taskId)
@@ -444,7 +444,7 @@ void Task_InitBerryPouchFromField(u8 taskId)
{
CleanupOverworldWindowsAndTilemaps();
sub_80A1184();
InitBerryPouch(0, CB2_ReturnToField, 1);
InitBerryPouch(BERRYPOUCH_FROMFIELD, CB2_ReturnToField, 1);
DestroyTask(taskId);
}
}
@@ -457,7 +457,7 @@ void BattleUseFunc_BerryPouch(u8 taskId)
void InitBerryPouchFromBattle(void)
{
InitBerryPouch(4, sub_8107ECC, 0);
InitBerryPouch(BERRYPOUCH_FROMBATTLE, sub_8107ECC, 0);
}
void FieldUseFunc_TeachyTv(u8 taskId)
@@ -852,7 +852,7 @@ void FieldUseFunc_OakStopsYou(u8 taskId)
if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH)
{
StringExpandPlaceholders(gStringVar4, gUnknown_8416425);
DisplayItemMessageInBerryPouch(taskId, 4, gStringVar4, sub_813E2B8);
DisplayItemMessageInBerryPouch(taskId, 4, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu);
}
else
sub_80A1110(taskId, gTasks[taskId].data[3]);
src/menu_helpers.c
+1 -1
View File
@@ -95,7 +95,7 @@ u8 sub_80BF66C(void)
return 0;
}
bool8 sub_80BF6A8(u16 itemId)
bool8 itemid_link_can_give_berry(u16 itemId)
{
if (itemId != ITEM_ENIGMA_BERRY)
return TRUE;
sym_ewram.txt
+3 -28
View File
@@ -1325,35 +1325,10 @@ gUnknown_203B170: @ 203B170
.align 2
.include "src/help_system.o"
.align 2
.include "src/dynamic_placeholder_text_util.o"
gUnknown_203F36C: @ 203F36C
.space 0x4
gUnknown_203F370: @ 203F370
.space 0xA
gUnknown_203F37A: @ 203F37A
.space 0x2
gUnknown_203F37C: @ 203F37C
.space 0x4
gUnknown_203F380: @ 203F380
.space 0x4
gUnknown_203F384: @ 203F384
.space 0x4
gUnknown_203F388: @ 203F388
.space 0x4
gUnknown_203F38C: @ 203F38C
.space 0x10
gUnknown_203F39C: @ 203F39C
.space 0x4
.align 2
.include "src/berry_pouch.o"
.align 2
.include "src/slot_machine.o"