dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into decomp_battle2

Browse Source
This commit is contained in:
DizzyEggg
2017-10-04 11:18:50 +02:00
parent 46fe1f441f 09d5d81c9c
commit aaa191f0d8
297 changed files with 2056 additions and 2880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/battle_transition.h Normal file
View File

@@ -0,0 +1,6 @@
#ifndef GUARD_BATTLE_TRANSITION_H
#define GUARD_BATTLE_TRANSITION_H
void sub_8149DFC(u8 a1);
#endif // GUARD_BATTLE_TRANSITION_H

12
include/blend_palette.h Normal file
View File

@@ -0,0 +1,12 @@
#ifndef GUARD_BLEND_PALETTE_H
#define GUARD_BLEND_PALETTE_H
// Exported type declarations
// Exported RAM declarations
// Exported ROM declarations
void BlendPalette(u16, u16, u8, u16);
#endif //GUARD_BLEND_PALETTE_H

14
include/dma3.h
View File

@@ -1,20 +1,6 @@
#ifndef GUARD_DMA3_H
#define GUARD_DMA3_H
extern u8 gDma3ManagerLocked;
extern u8 gDma3RequestCursor;
struct DmaRequestsStruct
{
/* 0x00 */ const u8 *src;
/* 0x04 */ u8 *dest;
/* 0x08 */ u16 size;
/* 0x0A */ u16 mode;
/* 0x0C */ u32 value;
};
extern struct DmaRequestsStruct gDma3Requests[128];
void ClearDma3Requests(void);
void ProcessDma3Requests(void);
int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode);

52
include/text.h
View File

@@ -85,6 +85,22 @@
#define NUM_TEXT_PRINTERS 32
struct TextPrinterSubStruct
{
u8 font_type:4; // 0x14
u8 font_type_upper:1;
u8 font_type_5:3;
u8 field_1:5;
u8 field_1_upmid:2;
u8 field_1_top:1;
u8 frames_visible_counter;
u8 field_3;
u8 field_4; // 0x18
u8 field_5;
u8 field_6;
u8 active;
};
struct TextSubPrinter // TODO: Better name
{
u8* current_text_offset;
@@ -109,20 +125,7 @@ struct TextPrinter
void (*callback)(struct TextSubPrinter *, u16); // 0x10
union {
struct TextPrinterSubStruct
{
u8 font_type:4; // 0x14
u8 font_type_upper:4;
u8 field_1:5;
u8 field_1_upmid:2;
u8 field_1_top:1;
u8 frames_visible_counter;
u8 field_3;
u8 field_4; // 0x18
u8 field_5;
u8 field_6;
u8 active;
} sub;
struct TextPrinterSubStruct sub;
u8 sub_fields[8];
} sub_union;
@@ -148,6 +151,8 @@ struct FontInfo
u8 shadowColor:4;
};
extern const struct FontInfo *gFonts;
struct GlyphWidthFunc
{
u32 font_id;
@@ -161,6 +166,14 @@ struct KeypadIcon
u8 height;
};
typedef struct {
u8 flag_0:1;
u8 flag_1:1;
u8 flag_2:1;
} TextFlags;
extern TextFlags gTextFlags;
struct __attribute__((packed)) TextColor
{
u8 fgColor;
@@ -173,6 +186,13 @@ extern u8 gStringVar2[];
extern u8 gStringVar3[];
extern u8 gStringVar4[];
u8 gUnknown_03002F84;
u8 gUnknown_03002F90[0x20];
u8 gUnknown_03002FB0[0x20];
u8 gUnknown_03002FD0[0x20];
u8 gUnknown_03002FF0[0x20];
u8 gGlyphDimensions[0x2];
void SetFontsPointer(const struct FontInfo *fonts);
void DeactivateAllTextPrinters(void);
u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
@@ -201,8 +221,8 @@ void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter);
void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter);
void TextPrinterClearDownArrow(struct TextPrinter *textPrinter);
bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter);
bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter);
bool8 TextPrinterWait(struct TextPrinter *textPrinter);
bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter);
bool16 TextPrinterWait(struct TextPrinter *textPrinter);
void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex);
u16 RenderText(struct TextPrinter *textPrinter);
u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing);