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

Tidy global namespace and document

Browse Source
This commit is contained in:
PikalaxALT
2019-09-30 20:58:29 -04:00
parent 8eea5b6d75
commit beedb8d73f
11 changed files with 540 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
data/graphics.s
+2 -2
View File
@@ -13988,7 +13988,7 @@ gItemPcBgPals:: @ 8E85408
gItemPcTilemap:: @ 8E85458
.incbin "graphics/item_pc/unk_8E85458.bin.lz"
gUnknown_8E8560C:: @ 8E8560C
gBerryPouchSpriteTiles:: @ 8E8560C
.incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz"
gUnknown_8E859D0:: @ 8E859D0
@@ -14000,7 +14000,7 @@ gUnknown_8E85BA4:: @ 8E85BA4
gUnknown_8E85BF4:: @ 8E85BF4
.incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz"
gUnknown_8E85C1C:: @ 8E85C1C
gBerryPouchSpritePalette:: @ 8E85C1C
.incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz"
gUnknown_8E85C44:: @ 8E85C44
data/strings.s
+6 -6
View File
@@ -555,7 +555,7 @@ 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
@@ -567,13 +567,13 @@ gUnknown_84163A7:: @ 84163A7
gUnknown_84163BB:: @ 84163BB
.string "There's no room to\nstore items.$"
gUnknown_84163DB:: @ 84163DB
gText_TossOutHowManyStrVar1s:: @ 84163DB
.string "Toss out how many\n{STR_VAR_1}(s)?$"
gUnknown_84163F4:: @ 84163F4
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
include/berry_pouch.h
+14 -3
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 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 sub_813E2B8(u8 taskId);
void Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu(u8 taskId);
#endif //GUARD_BERRY_POUCH_H
include/graphics.h
+2 -2
View File
@@ -999,11 +999,11 @@ extern const u8 gCreditsAllRightsReservedGfxTiles[];
extern const u8 gCreditsAllRightsReservedGfxMap[];
// berry_pouch
extern const u32 gUnknown_8E8560C[];
extern const u32 gBerryPouchSpriteTiles[];
extern const u8 gUnknown_8E859D0[];
extern const u8 gUnknown_8E85BA4[];
extern const u8 gUnknown_8E85BF4[];
extern const u32 gUnknown_8E85C1C[];
extern const u32 gBerryPouchSpritePalette[];
extern const u8 gUnknown_8E85C44[];
#endif //GUARD_GRAPHICS_H
include/menu_helpers.h
+1 -1
View File
@@ -23,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/strings.h
+6 -6
View File
@@ -317,11 +317,11 @@ extern const u8 gCreditsString_Graphic_Designer[];
extern const u8 gCreditsString_Akira_Kinashi[];
// berry_pouch
extern const u8 gUnknown_8416374[];
extern const u8 gUnknown_84163DB[];
extern const u8 gUnknown_84163F4[];
extern const u8 gUnknown_8416409[];
extern const u8 gUnknown_841670A[];
extern const u8 gUnknown_8416716[];
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
src/berry_pouch.c
+494 -495
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;