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

Daycare

Browse Source
This commit is contained in:
PikalaxALT
2019-05-05 14:56:59 -04:00
parent 7f07bd6607
commit a37da53f20
24 changed files with 2770 additions and 3338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/daycare.s
-3216
View File
File diff suppressed because it is too large Load Diff
asm/field_control_avatar.s
+1 -1
View File
@@ -1828,7 +1828,7 @@ _0806D6EC:
.align 2, 0 .align 2, 0
_0806D700: .4byte gUnknown_81A8DFD _0806D700: .4byte gUnknown_81A8DFD
_0806D704: _0806D704:
bl sub_80463B8 bl ShouldEggHatch
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0806D720 beq _0806D720
asm/party_menu.s
+2 -2
View File
@@ -5909,7 +5909,7 @@ sub_8121808: @ 8121808
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, _0812184C @ =gStringVar1 ldr r4, _0812184C @ =gStringVar1
ldr r1, _08121850 @ =gUnknown_8416223 ldr r1, _08121850 @ =gText_Lv
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
@@ -5927,7 +5927,7 @@ sub_8121808: @ 8121808
.align 2, 0 .align 2, 0
_08121848: .4byte gStringVar2 _08121848: .4byte gStringVar2
_0812184C: .4byte gStringVar1 _0812184C: .4byte gStringVar1
_08121850: .4byte gUnknown_8416223 _08121850: .4byte gText_Lv
thumb_func_end sub_8121808 thumb_func_end sub_8121808
thumb_func_start sub_8121854 thumb_func_start sub_8121854
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -3549,7 +3549,7 @@ _08136264:
ldr r0, [r6] ldr r0, [r6]
ldr r4, _08136328 @ =0x00003088 ldr r4, _08136328 @ =0x00003088
adds r0, r4 adds r0, r4
ldr r1, _0813632C @ =gUnknown_8416223 ldr r1, _0813632C @ =gText_Lv
bl StringCopy bl StringCopy
ldr r0, [r6] ldr r0, [r6]
adds r0, r4 adds r0, r4
@@ -3580,7 +3580,7 @@ _0813631C: .4byte 0x00003290
_08136320: .4byte 0x0000ffff _08136320: .4byte 0x0000ffff
_08136324: .4byte 0x0000306c _08136324: .4byte 0x0000306c
_08136328: .4byte 0x00003088 _08136328: .4byte 0x00003088
_0813632C: .4byte gUnknown_8416223 _0813632C: .4byte gText_Lv
_08136330: .4byte 0x00003074 _08136330: .4byte 0x00003074
_08136334: .4byte gUnknown_84161EF _08136334: .4byte gUnknown_84161EF
_08136338: _08136338:
data/data.s
+6 -20
View File
@@ -555,23 +555,9 @@ gUnknown_825E2F4:: @ 825E2F4
.section .rodata.825EF0C .section .rodata.825EF0C
gUnknown_825EF0C:: @ 825EF0C .align 2
.incbin "baserom.gba", 0x25EF0C, 0x8E8 gUnknown_825F844:: @ 825F842
.incbin "baserom.gba", 0x25f844, 0x8d8
gUnknown_825F7F4:: @ 825F7F4
.incbin "baserom.gba", 0x25F7F4, 0x20
gUnknown_825F814:: @ 825F814
.incbin "baserom.gba", 0x25F814, 0x18
gUnknown_825F82C:: @ 825F82C
.incbin "baserom.gba", 0x25F82C, 0x10
gUnknown_825F83C:: @ 825F83C
.incbin "baserom.gba", 0x25F83C, 0x2
gUnknown_825F83E:: @ 825F83E
.incbin "baserom.gba", 0x25F83E, 0x8DE
gUnknown_826011C:: @ 826011C gUnknown_826011C:: @ 826011C
.incbin "baserom.gba", 0x26011C, 0x8 .incbin "baserom.gba", 0x26011C, 0x8
@@ -741,13 +727,13 @@ gUnknown_8261E8A:: @ 8261E8A
gUnknown_8261EB6:: @ 8261EB6 gUnknown_8261EB6:: @ 8261EB6
.incbin "baserom.gba", 0x261EB6, 0xB .incbin "baserom.gba", 0x261EB6, 0xB
gUnknown_8261EC1:: @ 8261EC1 gText_MaleSymbol4:: @ 8261EC1
.incbin "baserom.gba", 0x261EC1, 0x2 .incbin "baserom.gba", 0x261EC1, 0x2
gUnknown_8261EC3:: @ 8261EC3 gText_FemaleSymbol4:: @ 8261EC3
.incbin "baserom.gba", 0x261EC3, 0x2 .incbin "baserom.gba", 0x261EC3, 0x2
gUnknown_8261EC5:: @ 8261EC5 gText_GenderlessSymbol:: @ 8261EC5
.incbin "baserom.gba", 0x261EC5, 0x2 .incbin "baserom.gba", 0x261EC5, 0x2
gUnknown_8261EC7:: @ 8261EC7 gUnknown_8261EC7:: @ 8261EC7
data/data_83FECCC.s
+14 -2
View File
@@ -817,7 +817,7 @@ gUnknown_841621F:: @ 841621F
gUnknown_8416221:: @ 8416221 gUnknown_8416221:: @ 8416221
.string "♀$" .string "♀$"
gUnknown_8416223:: @ 8416223 gText_Lv:: @ 8416223
.string "{UNKNOWN_F9 0x05}$" .string "{UNKNOWN_F9 0x05}$"
gOtherText_UnkF9_08_Clear_01:: @ 8416226 gOtherText_UnkF9_08_Clear_01:: @ 8416226
@@ -2375,7 +2375,19 @@ gUnknown_841E234:: @ 841E234
.incbin "baserom.gba", 0x41E234, 0xF1 .incbin "baserom.gba", 0x41E234, 0xF1
gUnknown_841E325:: @ 841E325 gUnknown_841E325:: @ 841E325
.incbin "baserom.gba", 0x41E325, 0xBE .string "Communication standby…$"
gDaycareText_GetAlongVeryWell:: @ 841E33C
.string "The two seem to get along\nvery well.$"
gDaycareText_GetAlong:: @ 841E361
.string "The two seem to get along.$"
gDaycareText_DontLikeOther:: @ 841E37C
.string "The two don’t seem to like\neach other much.$"
gDaycareText_PlayOther:: @ 841E3A8
.string "The two prefer to play with other\nPOKéMON than each other.$"
gUnknown_841E3E3:: @ 841E3E3 gUnknown_841E3E3:: @ 841E3E3
.incbin "baserom.gba", 0x41E3E3, 0x18 .incbin "baserom.gba", 0x41E3E3, 0x18
data/specials.inc
+6 -6
View File
@@ -191,7 +191,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special sub_80CA74C def_special sub_80CA74C
def_special GetDaycareMonNicknames def_special GetDaycareMonNicknames
def_special sub_80464B4 def_special GetDaycareState
def_special RejectEggFromDayCare def_special RejectEggFromDayCare
def_special GiveEggFromDaycare def_special GiveEggFromDaycare
def_special SetDaycareCompatibilityString def_special SetDaycareCompatibilityString
@@ -383,11 +383,11 @@ gSpecials:: @ 815FD60
def_special SetFlavorTextFlagFromSpecialVars def_special SetFlavorTextFlagFromSpecialVars
def_special UpdatePickStateFromSpecialVar8005 def_special UpdatePickStateFromSpecialVar8005
def_special sub_8054C48 def_special sub_8054C48
def_special sub_8046B40 def_special PutMonInRoute5Daycare
def_special sub_8046B70 def_special GetCostToWithdrawRoute5DaycareMon
def_special sub_8046B94 def_special IsThereMonInRoute5Daycare
def_special sub_8046BBC def_special GetNumLevelsGainedForRoute5DaycareMon
def_special sub_8046BDC def_special TakePokemonFromRoute5Daycare
def_special ScrSpecial_SeaGallopFerry def_special ScrSpecial_SeaGallopFerry
def_special sub_80CC48C def_special sub_80CC48C
def_special sub_812B220 def_special sub_812B220
include/constants/flags.h
+2 -2
View File
@@ -136,7 +136,7 @@
#define FLAG_0x083 0x83 #define FLAG_0x083 0x83
#define FLAG_0x084 0x84 #define FLAG_0x084 0x84
#define FLAG_0x085 0x85 #define FLAG_0x085 0x85
#define FLAG_PENDING_DAYCARE_EGG 0x86 #define FLAG_0x086 0x86
#define FLAG_0x087 0x87 #define FLAG_0x087 0x87
#define FLAG_0x088 0x88 #define FLAG_0x088 0x88
#define FLAG_0x089 0x89 #define FLAG_0x089 0x89
@@ -616,7 +616,7 @@
#define FLAG_0x263 0x263 #define FLAG_0x263 0x263
#define FLAG_0x264 0x264 #define FLAG_0x264 0x264
#define FLAG_0x265 0x265 #define FLAG_0x265 0x265
#define FLAG_0x266 0x266 #define FLAG_PENDING_DAYCARE_EGG 0x266
#define FLAG_0x267 0x267 #define FLAG_0x267 0x267
#define FLAG_0x268 0x268 #define FLAG_0x268 0x268
#define FLAG_0x269 0x269 #define FLAG_0x269 0x269
include/global.h
+8 -12
View File
@@ -498,9 +498,9 @@ struct ContestWinner
u8 contestRank; u8 contestRank;
}; };
struct DaycareMiscMon struct DayCareMail
{ {
struct MailStruct mail; struct MailStruct message;
u8 OT_name[OT_NAME_LENGTH + 1]; u8 OT_name[OT_NAME_LENGTH + 1];
u8 monName[POKEMON_NAME_LENGTH + 1]; u8 monName[POKEMON_NAME_LENGTH + 1];
u8 gameLanguage:4; u8 gameLanguage:4;
@@ -510,7 +510,7 @@ struct DaycareMiscMon
struct DaycareMon struct DaycareMon
{ {
struct BoxPokemon mon; struct BoxPokemon mon;
struct DaycareMiscMon misc; struct DayCareMail mail;
u32 steps; u32 steps;
}; };
@@ -519,14 +519,8 @@ struct DaycareMon
struct DayCare struct DayCare
{ {
struct DaycareMon mons[DAYCARE_MON_COUNT]; struct DaycareMon mons[DAYCARE_MON_COUNT];
u16 unk_118; u16 offspringPersonality;
u8 unk_11A; u8 stepCounter;
};
struct DayCareMail
{
/*0x00*/ struct MailStruct message;
/*0x24*/ u8 names[19];
}; };
struct RecordMixingDayCareMail struct RecordMixingDayCareMail
@@ -753,7 +747,9 @@ struct SaveBlock1
/*0x3A48*/ u8 filler_3a48[4]; /*0x3A48*/ u8 filler_3a48[4];
/*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
/*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS]; /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
/*0x3A94*/ u8 filler3A94[0x2A0]; /*0x3A94*/ u8 filler3A94[0x204];
/*0x3C98*/ struct DaycareMon route5DayCareMon;
/*0x3D24*/ u8 filler3D24[0x10];
/*0x3D34*/ u32 unkArrayIdx; /*0x3D34*/ u32 unkArrayIdx;
/*0x3D38*/ struct TrainerTowerLog unkArray[4]; /*0x3D38*/ struct TrainerTowerLog unkArray[4];
}; };
include/new_menu_helpers.h
+1
View File
@@ -31,5 +31,6 @@ void * malloc_and_decompress(const void * src, u32 * size);
u16 sub_80F796C(void); u16 sub_80F796C(void);
void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void sub_80F696C(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4); void sub_80F696C(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4);
void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
#endif // GUARD_NEW_MENU_HELPERS_H #endif // GUARD_NEW_MENU_HELPERS_H
include/party_menu.h
+1
View File
@@ -26,5 +26,6 @@ void sub_8124C8C(void);
void sub_8126EDC(void); void sub_8126EDC(void);
void c2_8123744(void); void c2_8123744(void);
u8 GetCursorSelectionMonId(void); u8 GetCursorSelectionMonId(void);
void sub_8128370(void);
#endif // GUARD_PARTY_MENU_H #endif // GUARD_PARTY_MENU_H
include/pokemon.h
+3 -3
View File
@@ -7,9 +7,9 @@
#define MON_DATA_OT_ID 1 #define MON_DATA_OT_ID 1
#define MON_DATA_NICKNAME 2 #define MON_DATA_NICKNAME 2
#define MON_DATA_LANGUAGE 3 #define MON_DATA_LANGUAGE 3
#define MON_DATA_SANITY_BIT1 4 #define MON_DATA_SANITY_IS_BAD_EGG 4
#define MON_DATA_SANITY_BIT2 5 #define MON_DATA_SANITY_HAS_SPECIES 5
#define MON_DATA_SANITY_BIT3 6 #define MON_DATA_SANITY_IS_EGG 6
#define MON_DATA_OT_NAME 7 #define MON_DATA_OT_NAME 7
#define MON_DATA_MARKINGS 8 #define MON_DATA_MARKINGS 8
#define MON_DATA_CHECKSUM 9 #define MON_DATA_CHECKSUM 9
include/text.h
+14 -14
View File
@@ -106,9 +106,9 @@ struct TextPrinterSubStruct
u8 active; u8 active;
}; };
struct TextSubPrinter // TODO: Better name struct TextPrinterTemplate // TODO: Better name
{ {
const u8* current_text_offset; const u8* currentChar;
u8 windowId; u8 windowId;
u8 fontId; u8 fontId;
u8 x; u8 x;
@@ -117,17 +117,17 @@ struct TextSubPrinter // TODO: Better name
u8 currentY; u8 currentY;
u8 letterSpacing; u8 letterSpacing;
u8 lineSpacing; u8 lineSpacing;
u8 fontColor_l:4; // 0xC u8 unk:4; // 0xC
u8 fontColor_h:4; u8 fgColor:4;
u8 bgColor:4; u8 bgColor:4;
u8 shadowColor:4; u8 shadowColor:4;
}; };
struct TextPrinter struct TextPrinter
{ {
struct TextSubPrinter subPrinter; struct TextPrinterTemplate subPrinter;
void (*callback)(struct TextSubPrinter *, u16); // 0x10 void (*callback)(struct TextPrinterTemplate *, u16); // 0x10
union { union {
struct TextPrinterSubStruct sub; struct TextPrinterSubStruct sub;
@@ -150,8 +150,8 @@ struct FontInfo
u8 maxLetterHeight; u8 maxLetterHeight;
u8 letterSpacing; u8 letterSpacing;
u8 lineSpacing; u8 lineSpacing;
u8 fontColor_l:4; u8 unk:4;
u8 fontColor_h:4; u8 fgColor:4;
u8 bgColor:4; u8 bgColor:4;
u8 shadowColor:4; u8 shadowColor:4;
}; };
@@ -172,10 +172,10 @@ struct KeypadIcon
}; };
typedef struct { typedef struct {
u8 flag_0:1; u8 canABSpeedUpPrint:1;
u8 flag_1:1; u8 useAlternateDownArrow:1;
u8 flag_2:1; u8 autoScroll:1;
u8 flag_3:1; u8 forceMidTextSpeed:1;
} TextFlags; } TextFlags;
extern TextFlags gTextFlags; extern TextFlags gTextFlags;
@@ -194,8 +194,8 @@ extern u8 gStringVar4[];
void SetFontsPointer(const struct FontInfo *fonts); void SetFontsPointer(const struct FontInfo *fonts);
void DeactivateAllTextPrinters(void); void DeactivateAllTextPrinters(void);
u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
void RunTextPrinters(void); void RunTextPrinters(void);
bool16 IsTextPrinterActive(u8 id); bool16 IsTextPrinterActive(u8 id);
u32 RenderFont(struct TextPrinter *textPrinter); u32 RenderFont(struct TextPrinter *textPrinter);
ld_script.txt
+2 -1
View File
@@ -81,7 +81,7 @@ SECTIONS {
src/random.o(.text); src/random.o(.text);
src/util.o(.text); src/util.o(.text);
src/blend_palette.o(.text); src/blend_palette.o(.text);
asm/daycare.o(.text); src/daycare.o(.text);
asm/egg_hatch.o(.text); asm/egg_hatch.o(.text);
asm/battle_interface.o(.text); asm/battle_interface.o(.text);
asm/smokescreen.o(.text); asm/smokescreen.o(.text);
@@ -364,6 +364,7 @@ SECTIONS {
src/string_util.o(.rodata); src/string_util.o(.rodata);
data/data.o(.rodata); data/data.o(.rodata);
src/util.o(.rodata); src/util.o(.rodata);
src/daycare.o(.rodata);
data/data.o(.rodata.825EF0C); data/data.o(.rodata.825EF0C);
data/connections.o(.rodata); data/connections.o(.rodata);
src/fieldmap.o(.rodata); src/fieldmap.o(.rodata);
src/data/pokemon/egg_moves.h
+1310
View File
File diff suppressed because it is too large Load Diff
src/daycare.c
+1353
View File
File diff suppressed because it is too large Load Diff
src/menu2.c
+13 -13
View File
@@ -426,9 +426,9 @@ static const u8 gUnknown_845FD54[][5] = {
void box_print(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * color, s8 speed, const u8 * str) void box_print(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * color, s8 speed, const u8 * str)
{ {
struct TextSubPrinter printer; struct TextPrinterTemplate printer;
printer.current_text_offset = str; printer.currentChar = str;
printer.windowId = windowId; printer.windowId = windowId;
printer.fontId = fontId; printer.fontId = fontId;
printer.x = x; printer.x = x;
@@ -437,8 +437,8 @@ void box_print(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * colo
printer.currentY = printer.y; printer.currentY = printer.y;
printer.letterSpacing = GetFontAttribute(fontId, 2); printer.letterSpacing = GetFontAttribute(fontId, 2);
printer.lineSpacing = GetFontAttribute(fontId, 3); printer.lineSpacing = GetFontAttribute(fontId, 3);
printer.fontColor_l = 0; printer.unk = 0;
printer.fontColor_h = color->bgColor; printer.fgColor = color->bgColor;
printer.bgColor = color->fgColor; printer.bgColor = color->fgColor;
printer.shadowColor = color->shadowColor; printer.shadowColor = color->shadowColor;
AddTextPrinter(&printer, speed, NULL); AddTextPrinter(&printer, speed, NULL);
@@ -446,9 +446,9 @@ void box_print(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * colo
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str) void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
{ {
struct TextSubPrinter printer; struct TextPrinterTemplate printer;
printer.current_text_offset = str; printer.currentChar = str;
printer.windowId = windowId; printer.windowId = windowId;
printer.fontId = fontId; printer.fontId = fontId;
printer.x = x; printer.x = x;
@@ -457,18 +457,18 @@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSp
printer.currentY = printer.y; printer.currentY = printer.y;
printer.letterSpacing = letterSpacing; printer.letterSpacing = letterSpacing;
printer.lineSpacing = lineSpacing; printer.lineSpacing = lineSpacing;
printer.fontColor_l = 0; printer.unk = 0;
printer.fontColor_h = color->bgColor; printer.fgColor = color->bgColor;
printer.bgColor = color->fgColor; printer.bgColor = color->fgColor;
printer.shadowColor = color->shadowColor; printer.shadowColor = color->shadowColor;
AddTextPrinter(&printer, speed, NULL); AddTextPrinter(&printer, speed, NULL);
} }
void sub_812E62C(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing) void sub_812E62C(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing)
{ {
struct TextSubPrinter printer; struct TextPrinterTemplate printer;
printer.current_text_offset = str; printer.currentChar = str;
printer.windowId = windowId; printer.windowId = windowId;
printer.fontId = fontId; printer.fontId = fontId;
printer.x = x; printer.x = x;
@@ -477,8 +477,8 @@ void sub_812E62C(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, vo
printer.currentY = y; printer.currentY = y;
printer.letterSpacing = letterSpacing; printer.letterSpacing = letterSpacing;
printer.lineSpacing = lineSpacing; printer.lineSpacing = lineSpacing;
printer.fontColor_l = 0; printer.unk = 0;
printer.fontColor_h = GetFontAttribute(fontId, 5); printer.fgColor = GetFontAttribute(fontId, 5);
printer.bgColor = GetFontAttribute(fontId, 6); printer.bgColor = GetFontAttribute(fontId, 6);
printer.shadowColor = GetFontAttribute(fontId, 7); printer.shadowColor = GetFontAttribute(fontId, 7);
AddTextPrinter(&printer, speed, callback); AddTextPrinter(&printer, speed, callback);
src/oak_speech.c
+3 -3
View File
@@ -535,7 +535,7 @@ static void Task_OaksSpeech1(u8 taskId)
break; break;
case 5: case 5:
sOakSpeechResources->textSpeed = GetTextSpeedSetting(); sOakSpeechResources->textSpeed = GetTextSpeedSetting();
gTextFlags.flag_0 = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
decompress_and_copy_tile_data_to_vram(1, sOakSpeechGfx_GameStartHelpUI, 0, 0, 0); decompress_and_copy_tile_data_to_vram(1, sOakSpeechGfx_GameStartHelpUI, 0, 0, 0);
break; break;
case 6: case 6:
@@ -1516,7 +1516,7 @@ static void Task_OakSpeech42(u8 taskId)
sub_8044D80(); sub_8044D80();
Free(sOakSpeechResources); Free(sOakSpeechResources);
sOakSpeechResources = NULL; sOakSpeechResources = NULL;
gTextFlags.flag_0 = FALSE; gTextFlags.canABSpeedUpPrint = FALSE;
SetMainCallback2(CB2_NewGame); SetMainCallback2(CB2_NewGame);
DestroyTask(taskId); DestroyTask(taskId);
} }
@@ -1600,7 +1600,7 @@ static void CB2_ReturnFromNamingScreen(void)
ShowBg(2); ShowBg(2);
EnableInterrupts(INTR_FLAG_VBLANK); EnableInterrupts(INTR_FLAG_VBLANK);
SetVBlankCallback(VBlankCB_NewGameOaksSpeech); SetVBlankCallback(VBlankCB_NewGameOaksSpeech);
gTextFlags.flag_0 = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
SetMainCallback2(CB2_NewGameOaksSpeech); SetMainCallback2(CB2_NewGameOaksSpeech);
return; return;
} }
src/pokemon.c
+7 -7
View File
@@ -1415,13 +1415,13 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
case MON_DATA_LANGUAGE: case MON_DATA_LANGUAGE:
retVal = boxMon->language; retVal = boxMon->language;
break; break;
case MON_DATA_SANITY_BIT1: case MON_DATA_SANITY_IS_BAD_EGG:
retVal = boxMon->isBadEgg; retVal = boxMon->isBadEgg;
break; break;
case MON_DATA_SANITY_BIT2: case MON_DATA_SANITY_HAS_SPECIES:
retVal = boxMon->hasSpecies; retVal = boxMon->hasSpecies;
break; break;
case MON_DATA_SANITY_BIT3: case MON_DATA_SANITY_IS_EGG:
retVal = boxMon->isEgg; retVal = boxMon->isEgg;
break; break;
case MON_DATA_OT_NAME: case MON_DATA_OT_NAME:
@@ -1809,13 +1809,13 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
case MON_DATA_LANGUAGE: case MON_DATA_LANGUAGE:
SET8(boxMon->language); SET8(boxMon->language);
break; break;
case MON_DATA_SANITY_BIT1: case MON_DATA_SANITY_IS_BAD_EGG:
SET8(boxMon->isBadEgg); SET8(boxMon->isBadEgg);
break; break;
case MON_DATA_SANITY_BIT2: case MON_DATA_SANITY_HAS_SPECIES:
SET8(boxMon->hasSpecies); SET8(boxMon->hasSpecies);
break; break;
case MON_DATA_SANITY_BIT3: case MON_DATA_SANITY_IS_EGG:
SET8(boxMon->isEgg); SET8(boxMon->isEgg);
break; break;
case MON_DATA_OT_NAME: case MON_DATA_OT_NAME:
@@ -5223,7 +5223,7 @@ void sub_8043B48(struct Pokemon *mon, int species, u8 unused, u32 data)
} }
} }
bool32 sub_8043B90(struct Pokemon *mon) bool8 TryIncrementMonLevel(struct Pokemon *mon)
{ {
u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL); u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL);
src/quest_log.c
+5 -5
View File
@@ -1055,7 +1055,7 @@ void sub_8111438(void)
{ {
for (r6 = 0; r6 < 30; r6++) for (r6 = 0; r6 < 30; r6++)
{ {
if (GetBoxMonDataFromAnyBox(r3, r6, MON_DATA_SANITY_BIT2)) if (GetBoxMonDataFromAnyBox(r3, r6, MON_DATA_SANITY_HAS_SPECIES))
{ {
sub_808BCB4(r3, r6); sub_808BCB4(r3, r6);
r5--; r5--;
@@ -1074,7 +1074,7 @@ void sub_8111438(void)
for (r6 = 0; r6 < IN_BOX_COUNT; r6++) for (r6 = 0; r6 < IN_BOX_COUNT; r6++)
{ {
struct BoxPokemon * boxMon = GetBoxedMonPtr(r3, r6); struct BoxPokemon * boxMon = GetBoxedMonPtr(r3, r6);
if (!GetBoxMonData(boxMon, MON_DATA_SANITY_BIT2)) if (!GetBoxMonData(boxMon, MON_DATA_SANITY_HAS_SPECIES))
{ {
CopyMon(boxMon, &r9->mon.box, sizeof(struct BoxPokemon)); CopyMon(boxMon, &r9->mon.box, sizeof(struct BoxPokemon));
r5++; r5++;
@@ -1104,7 +1104,7 @@ u16 sub_8111618(void)
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_BIT2)) if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES))
count++; count++;
} }
@@ -1120,7 +1120,7 @@ u16 sub_811164C(void)
{ {
for (j = 0; j < IN_BOX_COUNT; j++) for (j = 0; j < IN_BOX_COUNT; j++)
{ {
if (GetBoxMonDataFromAnyBox(i, j, MON_DATA_SANITY_BIT2)) if (GetBoxMonDataFromAnyBox(i, j, MON_DATA_SANITY_HAS_SPECIES))
count++; count++;
} }
} }
@@ -1599,7 +1599,7 @@ void sub_81120AC(u8 taskId)
gUnknown_203AE94 = (struct UnkStruct_203AE94){}; gUnknown_203AE94 = (struct UnkStruct_203AE94){};
sub_80696C0(); sub_80696C0();
ScriptContext2_Disable(); ScriptContext2_Disable();
gTextFlags.flag_2 = FALSE; gTextFlags.autoScroll = FALSE;
gUnknown_2036E28 = 0; gUnknown_2036E28 = 0;
sub_8082740(0); sub_8082740(0);
gUnknown_3005ECC = 1; gUnknown_3005ECC = 1;
src/text.c
+6 -6
View File
@@ -453,7 +453,7 @@ void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter)
{ {
struct TextPrinterSubStruct *subStruct = &textPrinter->sub_union.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->sub_union.sub;
if (gTextFlags.flag_2 == 1) if (gTextFlags.autoScroll == 1)
subStruct->frames_visible_counter = 0; subStruct->frames_visible_counter = 0;
else else
{ {
@@ -467,7 +467,7 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
struct TextPrinterSubStruct *subStruct = &textPrinter->sub_union.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->sub_union.sub;
const u8 *arrowTiles; const u8 *arrowTiles;
if (gTextFlags.flag_2 == 0) if (gTextFlags.autoScroll == 0)
{ {
if (subStruct->field_1 != 0) if (subStruct->field_1 != 0)
{ {
@@ -483,7 +483,7 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
10, 10,
12); 12);
switch (gTextFlags.flag_1) switch (gTextFlags.useAlternateDownArrow)
{ {
case 0: case 0:
default: default:
@@ -544,7 +544,7 @@ bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter) bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
{ {
bool8 result = FALSE; bool8 result = FALSE;
if (gTextFlags.flag_2 != 0) if (gTextFlags.autoScroll != 0)
{ {
result = TextPrinterWaitAutoMode(textPrinter); result = TextPrinterWaitAutoMode(textPrinter);
} }
@@ -563,7 +563,7 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
bool16 TextPrinterWait(struct TextPrinter *textPrinter) bool16 TextPrinterWait(struct TextPrinter *textPrinter)
{ {
bool16 result = FALSE; bool16 result = FALSE;
if (gTextFlags.flag_2 != 0) if (gTextFlags.autoScroll != 0)
{ {
result = TextPrinterWaitAutoMode(textPrinter); result = TextPrinterWaitAutoMode(textPrinter);
} }
@@ -591,7 +591,7 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c
FillWindowPixelRect(windowId, (bgColor << 4) | bgColor, x, y, 10, 12); FillWindowPixelRect(windowId, (bgColor << 4) | bgColor, x, y, 10, 12);
if (drawArrow == 0) if (drawArrow == 0)
{ {
switch (gTextFlags.flag_1) switch (gTextFlags.useAlternateDownArrow)
{ {
case 0: case 0:
default: default:
src/text_printer.c
+7 -7
View File
@@ -48,11 +48,11 @@ void DeactivateAllTextPrinters (void)
sTextPrinters[printer].sub_union.sub.active = 0; sTextPrinters[printer].sub_union.sub.active = 0;
} }
u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)) u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
{ {
struct TextSubPrinter subPrinter; struct TextPrinterTemplate subPrinter;
subPrinter.current_text_offset = str; subPrinter.currentChar = str;
subPrinter.windowId = windowId; subPrinter.windowId = windowId;
subPrinter.fontId = fontId; subPrinter.fontId = fontId;
subPrinter.x = x; subPrinter.x = x;
@@ -61,14 +61,14 @@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8
subPrinter.currentY = y; subPrinter.currentY = y;
subPrinter.letterSpacing = gFonts[fontId].letterSpacing; subPrinter.letterSpacing = gFonts[fontId].letterSpacing;
subPrinter.lineSpacing = gFonts[fontId].lineSpacing; subPrinter.lineSpacing = gFonts[fontId].lineSpacing;
subPrinter.fontColor_l = gFonts[fontId].fontColor_l; subPrinter.unk = gFonts[fontId].unk;
subPrinter.fontColor_h = gFonts[fontId].fontColor_h; subPrinter.fgColor = gFonts[fontId].fgColor;
subPrinter.bgColor = gFonts[fontId].bgColor; subPrinter.bgColor = gFonts[fontId].bgColor;
subPrinter.shadowColor = gFonts[fontId].shadowColor; subPrinter.shadowColor = gFonts[fontId].shadowColor;
return AddTextPrinter(&subPrinter, speed, callback); return AddTextPrinter(&subPrinter, speed, callback);
} }
bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16)) bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
{ {
int i; int i;
u16 j; u16 j;
@@ -92,7 +92,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
sTempTextPrinter.minLetterSpacing = 0; sTempTextPrinter.minLetterSpacing = 0;
sTempTextPrinter.japanese = 0; sTempTextPrinter.japanese = 0;
GenerateFontHalfRowLookupTable(textSubPrinter->fontColor_h, textSubPrinter->bgColor, textSubPrinter->shadowColor); GenerateFontHalfRowLookupTable(textSubPrinter->fgColor, textSubPrinter->bgColor, textSubPrinter->shadowColor);
if (speed != TEXT_SPEED_FF && speed != 0x0) if (speed != TEXT_SPEED_FF && speed != 0x0)
{ {
--sTempTextPrinter.text_speed; --sTempTextPrinter.text_speed;
src/tm_case.c
+1 -1
View File
@@ -281,7 +281,7 @@ void InitTMCase(u8 type, void (* callback)(void), u8 a2)
sTMCaseStaticResources.savedCallback = callback; sTMCaseStaticResources.savedCallback = callback;
if (a2 != 0xFF) if (a2 != 0xFF)
sTMCaseStaticResources.unk_05 = a2; sTMCaseStaticResources.unk_05 = a2;
gTextFlags.flag_2 = FALSE; gTextFlags.autoScroll = FALSE;
SetMainCallback2(CB2_SetUpTMCaseUI_Blocking); SetMainCallback2(CB2_SetUpTMCaseUI_Blocking);
} }
sym_ewram.txt
+3 -15
View File
@@ -515,21 +515,9 @@ gMultiuseSpriteTemplate: @ 20244DC
gUnknown_20244F4: @ 20244F4 gUnknown_20244F4: @ 20244F4
.space 0x4 .space 0x4
gUnknown_20244F8: @ 20244F8 .align 2
.space 0x64 .include "src/daycare.o"
.align 2
gUnknown_202455C: @ 202455C
.space 0x8
gUnknown_2024564: @ 2024564
.space 0x8
gUnknown_202456C: @ 202456C
.space 0x14
gUnknown_2024580: @ 2024580
.space 0x8
.include "src/load_save.o" .include "src/load_save.o"
.align 2 .align 2