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

Fix temporarily

Browse Source
This commit is contained in:
Edouard Veyrier
2018-03-29 11:56:10 +02:00
parent 990784a6d9
commit cfacd23248
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/learn_move.h
+7 -1
View File
@@ -31,6 +31,12 @@ struct LearnMoveStruct *gUnknown_0203BC34 = NULL;
void sub_8160624(void); void sub_8160624(void);
void sub_8160638(void); void sub_8160638(void);
const struct SpritePalette gUnknown_08402D88 = {gDexArrows_Pal, 5526}; // Ew, just copied from pokeruby...
//const u16 gDexArrows_Pal[] = INCBIN_U16("graphics/pokedex/arrows.gbapal");
//const u8 gDexArrows_Gfx[] = INCBIN_U8("graphics/pokedex/arrows.4bpp");
//const struct SpritePalette gUnknown_085CEBB8 = {gDexArrows_Pal, 5526};
//const struct SpriteSheet gUnknown_085CEBB0 = {gDexArrows_Gfx, sizeof(gDexArrows_Gfx), 5525};
void *gUnknown_0203BC38 = (void*)0x0203BC38;
#endif //GUARD_LEAN_MOVE_H #endif //GUARD_LEAN_MOVE_H
src/learn_move.c
+9 -9
View File
@@ -14,12 +14,6 @@
extern void (*gFieldCallback)(void); extern void (*gFieldCallback)(void);
extern struct LearnMoveStruct *gUnknown_0203BC34; extern struct LearnMoveStruct *gUnknown_0203BC34;
// Ew, just copied from pokeruby...
const u16 gDexArrows_Pal[] = INCBIN_U16("graphics/pokedex/arrows.gbapal");
const u8 gDexArrows_Gfx[] = INCBIN_U8("graphics/pokedex/arrows.4bpp");
const struct SpritePalette gUnknown_085CEBB8 = {gDexArrows_Pal, 5526};
const struct SpriteSheet gUnknown_085CEBB0 = {gDexArrows_Gfx, sizeof(gDexArrows_Gfx), 5525};
static struct LearnMoveStruct *sLearnMoveStruct; static struct LearnMoveStruct *sLearnMoveStruct;
static void sub_8160664(u8 taskId); static void sub_8160664(u8 taskId);
void sub_81606A0(void); //CB2_InitLearnMove void sub_81606A0(void); //CB2_InitLearnMove
@@ -50,6 +44,12 @@ void sub_8160664(u8 taskId)
void sub_81606A0(void) //CB2_InitLearnMove void sub_81606A0(void) //CB2_InitLearnMove
{ {
//FIXME
void (*sub_81607EC)(void) = (void*)0x081607EC;
void (*sub_81D2824)(void*) = (void*)0x081D2824;
void (*sub_81610B8)(void) = (void*)0x081610B8;
void (*sub_8161280)(void) = (void*)0x08161280;
//Less calls than pokeruby, is it normal ? //Less calls than pokeruby, is it normal ?
ResetSpriteData(); ResetSpriteData();
FreeAllSpritePalettes(); FreeAllSpritePalettes();
@@ -74,11 +74,11 @@ void sub_81606A0(void) //CB2_InitLearnMove
(&gUnknown_0203BC38)[4] = 0; (&gUnknown_0203BC38)[4] = 0;
sub_8161280(); sub_8161280();
LoadSpriteSheet(&gUnknown_085CEBB0); LoadSpriteSheet(/*FIXME &gUnknown_085CEBB0*/(void*)0x085CEBB0);
LoadSpritePalette(&gUnknown_085CEBB8); LoadSpritePalette(/*FIXME &gUnknown_085CEBB8*/(void*)0x085CEBB8);
sub_81610B8(); sub_81610B8();
ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
FillPalette(0, 0, 2); FillPalette(0, 0, 2);
SetMainCallback2(sub_816082C); SetMainCallback2(/*FIXME sub_816082C*/(void*)0x0816082C);
} }