mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 11:44:17 +01:00
daycare file fully done
This commit is contained in:
DizzyEggg
parent
616edd6c3f
commit
ba00a1c688
@ -1,22 +0,0 @@
|
||||
@ the third big chunk of data
|
||||
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
|
||||
|
||||
|
||||
.align 2
|
||||
sDaycareLevelMenuWindowTemplate:: @ 832B6C0
|
||||
.incbin "baserom.gba", 0x32b6c0, 0x20
|
||||
|
||||
sDaycareListMenuLevelTemplate:: @ 832B6E0
|
||||
.incbin "baserom.gba", 0x32b6e0, 0x18
|
||||
|
||||
sCompatibilityMessages:: @ 832B6F8
|
||||
.incbin "baserom.gba", 0x32b6f8, 0x10
|
||||
|
||||
sJapaneseEggNickname:: @ 832B708
|
||||
.string "タマゴ$" @ "tamago" ("egg" in Japanese)
|
||||
@ -5121,16 +5121,16 @@ gText_YouDontHaveThreeCoins:: @ 85EF734
|
||||
gText_ReelTimeHelp:: @ 85EF750
|
||||
.string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus.$"
|
||||
|
||||
gUnknown_085EF7DA:: @ 85EF7DA
|
||||
gDaycareText_GetAlongVeryWell:: @ 85EF7DA
|
||||
.string "The two seem to get along\nvery well.$"
|
||||
|
||||
gUnknown_085EF7FF:: @ 85EF7FF
|
||||
gDaycareText_GetAlong:: @ 85EF7FF
|
||||
.string "The two seem to get along.$"
|
||||
|
||||
gUnknown_085EF81A:: @ 85EF81A
|
||||
gDaycareText_DontLikeOther:: @ 85EF81A
|
||||
.string "The two don’t seem to like\neach other much.$"
|
||||
|
||||
gUnknown_085EF846:: @ 85EF846
|
||||
gDaycareText_PlayOther:: @ 85EF846
|
||||
.string "The two prefer to play with other\nPOKéMON than each other.$"
|
||||
|
||||
gText_NewLine2:: @ 85EF881
|
||||
|
||||
@ -3,4 +3,25 @@
|
||||
|
||||
#define EGG_HATCH_LEVEL 5
|
||||
|
||||
u8 *GetMonNick(struct Pokemon *mon, u8 *dest);
|
||||
u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest);
|
||||
u8 CountPokemonInDaycare(struct DayCare *daycare);
|
||||
void InitDaycareMailRecordMixing(struct DayCare *daycare, struct RecordMixingDayCareMail *daycareMail);
|
||||
void StoreSelectedPokemonInDaycare(void);
|
||||
u16 TakePokemonFromDaycare(void);
|
||||
void GetDaycareCost(void);
|
||||
u8 GetNumLevelsGainedFromDaycare(void);
|
||||
void TriggerPendingDaycareEgg(void);
|
||||
void RejectEggFromDayCare(void);
|
||||
void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation);
|
||||
void GiveEggFromDaycare(void);
|
||||
bool8 DoEggActions_CheckHatch(void);
|
||||
u16 GetSelectedMonNickAndSpecies(void);
|
||||
void GetDaycareMonNicknames(void);
|
||||
u8 GetDaycareState(void);
|
||||
void SetDaycareCompatibilityString(void);
|
||||
bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio);
|
||||
void ShowDaycareLevelMenu(void);
|
||||
void ChooseSendDaycareMon(void);
|
||||
|
||||
#endif // GUARD_DAYCARE_H
|
||||
|
||||
@ -5,31 +5,33 @@
|
||||
|
||||
// Exported RAM declarations
|
||||
|
||||
struct ListMenuItem {
|
||||
struct ListMenuItem
|
||||
{
|
||||
const u8 *unk_00;
|
||||
s32 unk_04;
|
||||
};
|
||||
|
||||
struct ListMenu;
|
||||
|
||||
struct ListMenuTemplate {
|
||||
struct ListMenuItem *unk_00;
|
||||
struct ListMenuTemplate
|
||||
{
|
||||
const struct ListMenuItem *items;
|
||||
void (* unk_04)(u32, bool8, struct ListMenu *);
|
||||
void (* unk_08)(u8, s32, u8);
|
||||
u16 unk_0c;
|
||||
u16 unk_0e;
|
||||
u16 totalItems;
|
||||
u16 maxShowed;
|
||||
u8 unk_10;
|
||||
u8 unk_11;
|
||||
u8 unk_12;
|
||||
u8 unk_13;
|
||||
u32 unk_14_0:4;
|
||||
u32 unk_14_4:4;
|
||||
u32 unk_15_0:4;
|
||||
u32 unk_15_4:4;
|
||||
u32 unk_16_0:1;
|
||||
u32 unk_16_1:6;
|
||||
u32 unk_16_7:1;
|
||||
u32 unk_17_0:6;
|
||||
u8 cursor_Y;
|
||||
u32 upText_Y:4; // x1, x2, x4, x8 = xF
|
||||
u32 cursorColor:4; // x10, x20, x40, x80 = xF0
|
||||
u32 fillColor:4; // x100, x200, x400, x800 = xF00
|
||||
u32 cursorShadowColor:4; // x1000, x2000, x4000, x8000 = xF000
|
||||
u32 unk_16_0:1; // x10000
|
||||
u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000
|
||||
u32 unk_16_7:1; // x800000
|
||||
u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000
|
||||
};
|
||||
|
||||
struct ListMenu {
|
||||
|
||||
@ -344,7 +344,6 @@ SECTIONS {
|
||||
src/trig.o(.rodata);
|
||||
src/util.o(.rodata);
|
||||
src/daycare.o(.rodata);
|
||||
data/daycare.o(.rodata);
|
||||
src/egg_hatch.o(.rodata);
|
||||
src/battle_gfx_sfx_util.o(.rodata);
|
||||
src/battle_interface.o(.rodata);
|
||||
|
||||
120
src/daycare.c
120
src/daycare.c
@ -24,6 +24,20 @@
|
||||
|
||||
extern u16 gMoveToLearn;
|
||||
|
||||
// text
|
||||
extern const u8 gText_MaleSymbol4[];
|
||||
extern const u8 gText_FemaleSymbol4[];
|
||||
extern const u8 gText_GenderlessSymbol[];
|
||||
extern const u8 gText_NewLine2[];
|
||||
extern const u8 gText_Exit4[];
|
||||
extern const u8 gText_Lv[];
|
||||
extern const u8 gExpandedPlaceholder_Empty[];
|
||||
extern const u8 gText_Exit[];
|
||||
extern const u8 gDaycareText_GetAlongVeryWell[];
|
||||
extern const u8 gDaycareText_GetAlong[];
|
||||
extern const u8 gDaycareText_DontLikeOther[];
|
||||
extern const u8 gDaycareText_PlayOther[];
|
||||
|
||||
extern u8 GetCursorSelectionMonId(void);
|
||||
extern u16 ItemIdToBattleMoveId(u16);
|
||||
extern s32 ListMenuHandleInput(u8);
|
||||
@ -31,12 +45,14 @@ extern void sub_81AE6C8(u8, u16*, u16*);
|
||||
extern void sub_819746C(u8, bool8);
|
||||
extern void sub_81973FC(u8, bool8);
|
||||
extern void sub_81B9328(void);
|
||||
extern void sub_81AF078(u32, bool8, struct ListMenu *);
|
||||
extern void c2_exit_to_overworld_2_switch(void);
|
||||
|
||||
// this file's functions
|
||||
static void ClearDaycareMonMisc(struct DaycareMiscMon *misc);
|
||||
void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
|
||||
u8 GetDaycareCompatibilityScore(struct DayCare *daycare);
|
||||
static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
|
||||
static u8 GetDaycareCompatibilityScore(struct DayCare *daycare);
|
||||
static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y);
|
||||
|
||||
// RAM buffers used to assist with BuildEggMoveset()
|
||||
EWRAM_DATA static u16 sHatchedEggLevelUpMoves[EGG_LVL_UP_MOVES_ARRAY_COUNT] = {0};
|
||||
@ -47,10 +63,45 @@ EWRAM_DATA static u16 sHatchedEggMotherMoves[4] = {0};
|
||||
|
||||
#include "data/pokemon/egg_moves.h"
|
||||
|
||||
extern const struct WindowTemplate sDaycareLevelMenuWindowTemplate;
|
||||
extern const struct ListMenuTemplate sDaycareListMenuLevelTemplate;
|
||||
extern const u8 *sCompatibilityMessages[];
|
||||
extern const u8 sJapaneseEggNickname[];
|
||||
static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = {0, 0xF, 1, 0xE, 6, 0xF, 8};
|
||||
|
||||
static const struct ListMenuItem sLevelMenuItems[] =
|
||||
{
|
||||
{gExpandedPlaceholder_Empty, 0},
|
||||
{gExpandedPlaceholder_Empty, 1},
|
||||
{gText_Exit, 5}
|
||||
};
|
||||
|
||||
static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
|
||||
{
|
||||
.items = sLevelMenuItems,
|
||||
.unk_04 = sub_81AF078,
|
||||
.unk_08 = DaycarePrintMonInfo,
|
||||
.totalItems = 3,
|
||||
.maxShowed = 3,
|
||||
.unk_10 = 0,
|
||||
.unk_11 = 0,
|
||||
.unk_12 = 8,
|
||||
.cursor_Y = 0,
|
||||
.upText_Y = 1,
|
||||
.cursorColor = 2,
|
||||
.fillColor = 1,
|
||||
.cursorShadowColor = 3,
|
||||
.unk_16_0 = TRUE,
|
||||
.spaceBetweenItems = 0,
|
||||
.unk_16_7 = FALSE,
|
||||
.unk_17_0 = 1
|
||||
};
|
||||
|
||||
static const u8 *const sCompatibilityMessages[] =
|
||||
{
|
||||
gDaycareText_GetAlongVeryWell,
|
||||
gDaycareText_GetAlong,
|
||||
gDaycareText_DontLikeOther,
|
||||
gDaycareText_PlayOther
|
||||
};
|
||||
|
||||
static const u8 sJapaneseEggNickname[] = _("タマゴ"); // "tamago" ("egg" in Japanese)
|
||||
|
||||
u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
|
||||
{
|
||||
@ -252,7 +303,7 @@ u16 TakePokemonFromDaycare(void)
|
||||
return TakeSelectedPokemonMonFromDaycareShiftSlots(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004);
|
||||
}
|
||||
|
||||
u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps)
|
||||
static u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps)
|
||||
{
|
||||
struct BoxPokemon tempMon = *mon;
|
||||
|
||||
@ -261,7 +312,7 @@ u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps)
|
||||
return GetLevelFromBoxMonExp(&tempMon);
|
||||
}
|
||||
|
||||
u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon)
|
||||
static u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon)
|
||||
{
|
||||
u8 levelBefore;
|
||||
u8 levelAfter;
|
||||
@ -271,7 +322,7 @@ u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon)
|
||||
return levelAfter - levelBefore;
|
||||
}
|
||||
|
||||
u8 GetNumLevelsGainedForDaycareMon(struct DaycareMon *daycareMon)
|
||||
static u8 GetNumLevelsGainedForDaycareMon(struct DaycareMon *daycareMon)
|
||||
{
|
||||
u8 numLevelsGained = GetNumLevelsGainedFromSteps(daycareMon);
|
||||
ConvertIntToDecimalStringN(gStringVar2, numLevelsGained, STR_CONV_MODE_LEFT_ALIGN, 2);
|
||||
@ -347,7 +398,7 @@ static void ClearAllDaycareData(struct DayCare *daycare)
|
||||
// Determines what the species of an Egg would be based on the given species.
|
||||
// It determines this by working backwards through the evolution chain of the
|
||||
// given species.
|
||||
u16 GetEggSpecies(u16 species)
|
||||
static u16 GetEggSpecies(u16 species)
|
||||
{
|
||||
int i, j, k;
|
||||
bool8 found;
|
||||
@ -462,14 +513,14 @@ void TriggerPendingDaycareEgg(void)
|
||||
_TriggerPendingDaycareEgg(&gSaveBlock1Ptr->daycare);
|
||||
}
|
||||
|
||||
void TriggerPendingDaycareMaleEgg(void)
|
||||
static void TriggerPendingDaycareMaleEgg(void)
|
||||
{
|
||||
_TriggerPendingDaycareMaleEgg(&gSaveBlock1Ptr->daycare);
|
||||
}
|
||||
|
||||
// Removes the selected index from the given IV list and shifts the remaining
|
||||
// elements to the left.
|
||||
void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
|
||||
static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
|
||||
{
|
||||
s32 i, j;
|
||||
u8 temp[NUM_STATS];
|
||||
@ -488,7 +539,7 @@ void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
|
||||
}
|
||||
}
|
||||
|
||||
void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
|
||||
static void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
|
||||
{
|
||||
u8 i;
|
||||
u8 selectedIvs[3];
|
||||
@ -587,7 +638,7 @@ static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
|
||||
return numEggMoves;
|
||||
}
|
||||
|
||||
void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
|
||||
static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
|
||||
{
|
||||
u16 numSharedParentMoves;
|
||||
u32 numLevelUpMoves;
|
||||
@ -675,7 +726,7 @@ void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxP
|
||||
}
|
||||
}
|
||||
|
||||
void RemoveEggFromDayCare(struct DayCare *daycare)
|
||||
static void RemoveEggFromDayCare(struct DayCare *daycare)
|
||||
{
|
||||
daycare->offspringPersonality = 0;
|
||||
daycare->stepCounter = 0;
|
||||
@ -686,7 +737,7 @@ void RejectEggFromDayCare(void)
|
||||
RemoveEggFromDayCare(&gSaveBlock1Ptr->daycare);
|
||||
}
|
||||
|
||||
void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare)
|
||||
static void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare)
|
||||
{
|
||||
u16 motherItem, fatherItem;
|
||||
if (*species == SPECIES_WYNAUT || *species == SPECIES_AZURILL)
|
||||
@ -705,7 +756,7 @@ void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare)
|
||||
}
|
||||
}
|
||||
|
||||
void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)
|
||||
static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)
|
||||
{
|
||||
u32 motherItem = GetBoxMonData(&daycare->mons[0].mon, MON_DATA_HELD_ITEM);
|
||||
u32 fatherItem = GetBoxMonData(&daycare->mons[1].mon, MON_DATA_HELD_ITEM);
|
||||
@ -717,7 +768,7 @@ void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)
|
||||
}
|
||||
}
|
||||
|
||||
u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots)
|
||||
static u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots)
|
||||
{
|
||||
u16 i;
|
||||
u16 species[2];
|
||||
@ -762,7 +813,7 @@ u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots)
|
||||
return eggSpecies;
|
||||
}
|
||||
|
||||
void _GiveEggFromDaycare(struct DayCare *daycare) // give_egg
|
||||
static void _GiveEggFromDaycare(struct DayCare *daycare) // give_egg
|
||||
{
|
||||
struct Pokemon egg;
|
||||
u16 species;
|
||||
@ -813,7 +864,7 @@ void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation)
|
||||
SetMonData(mon, MON_DATA_IS_EGG, &isEgg);
|
||||
}
|
||||
|
||||
void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare)
|
||||
static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare)
|
||||
{
|
||||
u32 personality;
|
||||
u16 ball;
|
||||
@ -901,7 +952,7 @@ static bool8 IsEggPending(struct DayCare *daycare)
|
||||
// gStringVar1 = first mon's nickname
|
||||
// gStringVar2 = second mon's nickname
|
||||
// gStringVar3 = first mon trainer's name
|
||||
void _GetDaycareMonNicknames(struct DayCare *daycare)
|
||||
static void _GetDaycareMonNicknames(struct DayCare *daycare)
|
||||
{
|
||||
u8 text[12];
|
||||
if (GetBoxMonData(&daycare->mons[0].mon, MON_DATA_SPECIES) != 0)
|
||||
@ -952,7 +1003,7 @@ u8 GetDaycareState(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
u8 GetDaycarePokemonCount(void)
|
||||
static u8 GetDaycarePokemonCount(void)
|
||||
{
|
||||
u8 ret = CountPokemonInDaycare(&gSaveBlock1Ptr->daycare);
|
||||
if (ret)
|
||||
@ -979,7 +1030,7 @@ static bool8 EggGroupsOverlap(u16 *eggGroups1, u16 *eggGroups2)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
|
||||
static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
|
||||
{
|
||||
u32 i;
|
||||
u16 eggGroups[2][2];
|
||||
@ -1040,7 +1091,7 @@ u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
|
||||
}
|
||||
}
|
||||
|
||||
u8 GetDaycareCompatibilityScoreFromSave(void)
|
||||
static u8 GetDaycareCompatibilityScoreFromSave(void)
|
||||
{
|
||||
return GetDaycareCompatibilityScore(&gSaveBlock1Ptr->daycare);
|
||||
}
|
||||
@ -1086,13 +1137,6 @@ bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
extern const u8 gText_MaleSymbol4[];
|
||||
extern const u8 gText_FemaleSymbol4[];
|
||||
extern const u8 gText_GenderlessSymbol[];
|
||||
extern const u8 gText_NewLine2[];
|
||||
extern const u8 gText_Exit4[];
|
||||
extern const u8 gText_Lv[];
|
||||
|
||||
static u8 *AppendGenderSymbol(u8 *name, u8 gender)
|
||||
{
|
||||
if (gender == MON_MALE)
|
||||
@ -1109,7 +1153,7 @@ static u8 *AppendGenderSymbol(u8 *name, u8 gender)
|
||||
return StringAppend(name, gText_GenderlessSymbol);
|
||||
}
|
||||
|
||||
u8 *AppendMonGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
|
||||
static u8 *AppendMonGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
|
||||
{
|
||||
return AppendGenderSymbol(name, GetBoxMonGender(boxMon));
|
||||
}
|
||||
@ -1150,7 +1194,7 @@ static void GetDaycareLevelMenuLevelText(struct DayCare *daycare, u8 *dest)
|
||||
}
|
||||
}
|
||||
|
||||
void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
|
||||
static void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
|
||||
{
|
||||
struct TextSubPrinter printer;
|
||||
|
||||
@ -1172,7 +1216,7 @@ void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
|
||||
AddTextPrinter(&printer, 0xFF, NULL);
|
||||
}
|
||||
|
||||
void DaycarePrintMonNick(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
|
||||
static void DaycarePrintMonNick(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
|
||||
{
|
||||
u8 nick[POKEMON_NAME_LENGTH * 2];
|
||||
|
||||
@ -1181,7 +1225,7 @@ void DaycarePrintMonNick(struct DayCare *daycare, u8 windowId, u32 daycareSlotId
|
||||
DaycareAddTextPrinter(windowId, nick, 8, y);
|
||||
}
|
||||
|
||||
void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
|
||||
static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
|
||||
{
|
||||
u8 level;
|
||||
u32 x;
|
||||
@ -1196,9 +1240,9 @@ void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycareSlotId,
|
||||
DaycareAddTextPrinter(windowId, lvlText, x, y);
|
||||
}
|
||||
|
||||
void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y)
|
||||
static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y)
|
||||
{
|
||||
if (daycareSlotId < DAYCARE_MON_COUNT)
|
||||
if (daycareSlotId < (unsigned) DAYCARE_MON_COUNT)
|
||||
{
|
||||
DaycarePrintMonNick(&gSaveBlock1Ptr->daycare, windowId, daycareSlotId, y);
|
||||
DaycarePrintMonLvl(&gSaveBlock1Ptr->daycare, windowId, daycareSlotId, y);
|
||||
@ -1208,7 +1252,7 @@ void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y)
|
||||
#define tMenuListTaskId data[0]
|
||||
#define tWindowId data[1]
|
||||
|
||||
void Task_HandleDaycareLevelMenuInput(u8 taskId)
|
||||
static void Task_HandleDaycareLevelMenuInput(u8 taskId)
|
||||
{
|
||||
u32 var = ListMenuHandleInput(gTasks[taskId].tMenuListTaskId);
|
||||
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
|
||||
// Includes
|
||||
#include "global.h"
|
||||
#include "decompress.h"
|
||||
#include "malloc.h"
|
||||
@ -68,27 +66,27 @@ struct DecorRearrangementDataBuffer {
|
||||
// Static RAM declarations
|
||||
|
||||
EWRAM_DATA u8 *gCurDecorInventoryItems = NULL;
|
||||
EWRAM_DATA u8 sSecretBasePCMenuCursorPos = 0;
|
||||
EWRAM_DATA u8 sCurDecorCatCount = 0;
|
||||
EWRAM_DATA u8 sSecretBaseItemsIndicesBuffer[16] = {};
|
||||
EWRAM_DATA u8 sPlayerRoomItemsIndicesBuffer[12] = {};
|
||||
EWRAM_DATA u16 sSecretBasePCSelectDecorLineNo = 0;
|
||||
EWRAM_DATA u16 sSecretBasePCSelectDecorPageNo = 0;
|
||||
EWRAM_DATA static u8 sSecretBasePCMenuCursorPos = 0;
|
||||
EWRAM_DATA static u8 sCurDecorCatCount = 0;
|
||||
EWRAM_DATA static u8 sSecretBaseItemsIndicesBuffer[16] = {};
|
||||
EWRAM_DATA static u8 sPlayerRoomItemsIndicesBuffer[12] = {};
|
||||
EWRAM_DATA static u16 sSecretBasePCSelectDecorLineNo = 0;
|
||||
EWRAM_DATA static u16 sSecretBasePCSelectDecorPageNo = 0;
|
||||
EWRAM_DATA u8 gCurDecorationIndex = 0;
|
||||
EWRAM_DATA u8 sCurDecorationCategory = DECORCAT_DESK;
|
||||
EWRAM_DATA u32 filler_0203a174[2] = {};
|
||||
EWRAM_DATA static u8 sCurDecorationCategory = DECORCAT_DESK;
|
||||
EWRAM_DATA static u32 filler_0203a174[2] = {};
|
||||
EWRAM_DATA struct DecorPCPointers gUnknown_0203A17C = {};
|
||||
EWRAM_DATA u8 sDecorMenuWindowIndices[4] = {};
|
||||
EWRAM_DATA static u8 sDecorMenuWindowIndices[4] = {};
|
||||
EWRAM_DATA struct DecorPCBuffer *sDecorPCBuffer = NULL;
|
||||
EWRAM_DATA struct PlaceDecorationGraphicsDataBuffer sPlaceDecorationGraphicsDataBuffer = {};
|
||||
EWRAM_DATA u16 sCurDecorMapX = 0;
|
||||
EWRAM_DATA u16 sCurDecorMapY = 0;
|
||||
EWRAM_DATA u8 sDecor_CameraSpriteObjectIdx1 = 0;
|
||||
EWRAM_DATA u8 sDecor_CameraSpriteObjectIdx2 = 0;
|
||||
EWRAM_DATA u8 sDecorationLastDirectionMoved = 0;
|
||||
EWRAM_DATA struct OamData sDecorSelectorOam = {};
|
||||
EWRAM_DATA struct DecorRearrangementDataBuffer sDecorRearrangementDataBuffer[16] = {};
|
||||
EWRAM_DATA u8 sCurDecorSelectedInRearrangement = 0;
|
||||
EWRAM_DATA static u16 sCurDecorMapX = 0;
|
||||
EWRAM_DATA static u16 sCurDecorMapY = 0;
|
||||
EWRAM_DATA static u8 sDecor_CameraSpriteObjectIdx1 = 0;
|
||||
EWRAM_DATA static u8 sDecor_CameraSpriteObjectIdx2 = 0;
|
||||
EWRAM_DATA static u8 sDecorationLastDirectionMoved = 0;
|
||||
EWRAM_DATA static struct OamData sDecorSelectorOam = {};
|
||||
EWRAM_DATA static struct DecorRearrangementDataBuffer sDecorRearrangementDataBuffer[16] = {};
|
||||
EWRAM_DATA static u8 sCurDecorSelectedInRearrangement = 0;
|
||||
|
||||
// Static ROM declarations
|
||||
|
||||
@ -800,9 +798,9 @@ void sub_8127330(u8 taskId)
|
||||
sDecorPCBuffer->items[i].unk_04 = -2;
|
||||
gUnknown_03006310 = gUnknown_085A6BD0;
|
||||
gUnknown_03006310.unk_10 = sDecorMenuWindowIndices[1];
|
||||
gUnknown_03006310.unk_0c = sDecorPCBuffer->unk_520;
|
||||
gUnknown_03006310.unk_00 = sDecorPCBuffer->items;
|
||||
gUnknown_03006310.unk_0e = sDecorPCBuffer->unk_521;
|
||||
gUnknown_03006310.totalItems = sDecorPCBuffer->unk_520;
|
||||
gUnknown_03006310.items = sDecorPCBuffer->items;
|
||||
gUnknown_03006310.maxShowed = sDecorPCBuffer->unk_521;
|
||||
}
|
||||
|
||||
void sub_8127454(u8 *dest, u16 decorId)
|
||||
|
||||
@ -1099,9 +1099,9 @@ void game_continue(u8 taskId)
|
||||
}
|
||||
gUnknown_03006310 = gUnknown_0858D07C;
|
||||
gUnknown_03006310.unk_10 = data[6];
|
||||
gUnknown_03006310.unk_0c = data[0];
|
||||
gUnknown_03006310.unk_00 = gUnknown_0203A020->items;
|
||||
gUnknown_03006310.unk_0e = data[3];
|
||||
gUnknown_03006310.totalItems = data[0];
|
||||
gUnknown_03006310.items = gUnknown_0203A020->items;
|
||||
gUnknown_03006310.maxShowed = data[3];
|
||||
}
|
||||
|
||||
void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user