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

Merge pull request #579 from ultima-soul/use_pokeblock

Browse Source 
Decompile use_pokeblock  (5 NONMATCHING)
This commit is contained in:
huderlem
2019-03-23 11:29:40 -05:00
committed by GitHub
parent e8add87bf3 24e7269117
commit cd192e303d
6 changed files with 1746 additions and 2594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/use_pokeblock.s
-2491
View File
File diff suppressed because it is too large Load Diff
data/use_pokeblock.s
+3 -3
View File
@@ -48,10 +48,10 @@ sContestStatNames:: @ 85DFD04
.4byte gText_Cuteness .4byte gText_Cuteness
.4byte gText_Beauty3 .4byte gText_Beauty3
gUnknown_085DFD18:: @ 85DFD18 gSpriteSheet_ConditionUpDown:: @ 85DFD18
obj_tiles gUsePokeblockUpDown_Gfx, 0x200, 0 obj_tiles gUsePokeblockUpDown_Gfx, 0x200, 0
gUnknown_085DFD20:: @ 85DFD20 gSpritePalette_ConditionUpDown:: @ 85DFD20
obj_pal gUsePokeblockUpDown_Pal, 0 obj_pal gUsePokeblockUpDown_Pal, 0
gUnknown_085DFD28:: @ 85DFD28 gUnknown_085DFD28:: @ 85DFD28
@@ -79,7 +79,7 @@ gUnknown_085DFD54:: @ 85DFD54
.4byte gUnknown_085DFD44 .4byte gUnknown_085DFD44
.4byte gUnknown_085DFD4C .4byte gUnknown_085DFD4C
gUnknown_085DFD5C:: @ 85DFD5C gSpriteTemplate_085DFD5C:: @ 85DFD5C
spr_template 0, 0, gUnknown_085DFD3C, gUnknown_085DFD54, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy spr_template 0, 0, gUnknown_085DFD3C, gUnknown_085DFD54, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085DFD74:: @ 85DFD74 gUnknown_085DFD74:: @ 85DFD74
include/graphics.h
+5
View File
@@ -4775,6 +4775,11 @@ extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[];
extern const u32 gBattleAnimFogTilemap[]; extern const u32 gBattleAnimFogTilemap[];
extern const u32 gUsePokeblockGraph_Gfx[];
extern const u32 gUsePokeblockGraph_Tilemap[];
extern const u16 gUsePokeblockGraph_Pal[];
extern const u16 gUsePokeblockNatureWin_Pal[];
// Berry blender // Berry blender
extern const u32 gBerryBlenderArrowTiles[]; extern const u32 gBerryBlenderArrowTiles[];
extern const u32 gBerryBlenderStartTiles[]; extern const u32 gBerryBlenderStartTiles[];
include/menu_specialized.h
+15 -13
View File
@@ -1,6 +1,7 @@
#ifndef GUARD_MENU_SPECIALIZED_H #ifndef GUARD_MENU_SPECIALIZED_H
#define GUARD_MENU_SPECIALIZED_H #define GUARD_MENU_SPECIALIZED_H
#include "sprite.h"
#include "player_pc.h" #include "player_pc.h"
#include "list_menu.h" #include "list_menu.h"
#include "pokemon.h" #include "pokemon.h"
@@ -13,17 +14,16 @@ struct UnknownSubStruct_81D1ED4
struct UnknownStruct_81D1ED4 struct UnknownStruct_81D1ED4
{ {
u8 unk0[4][5]; /*0x000*/ u8 unk0[4][5];
struct UnknownSubStruct_81D1ED4 unk14[4][5]; /*0x014*/ struct UnknownSubStruct_81D1ED4 unk14[4][5];
struct UnknownSubStruct_81D1ED4 unk64[10][5]; /*0x064*/ struct UnknownSubStruct_81D1ED4 unk64[10][5];
struct UnknownSubStruct_81D1ED4 unk12C[5]; /*0x12C*/ struct UnknownSubStruct_81D1ED4 unk12C[5];
u16 unk140[66][2]; /*0x140*/ u16 unk140[66][2];
u16 unk248[66][2]; /*0x248*/ u16 unk248[66][2];
u16 unk350; /*0x350*/ u16 unk350;
u16 unk352; /*0x352*/ u16 unk352;
u8 unk354; /*0x354*/ u8 unk354;
u8 unk355; /*0x355*/ u8 unk355;
u8 unk356[0x22];
}; };
bool8 sub_81D1C44(u8 count); bool8 sub_81D1C44(u8 count);
@@ -38,9 +38,11 @@ void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0);
void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0);
void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0); void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0);
void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0); void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0);
void sub_81D3520(struct Sprite **);
bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0); bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0);
void sub_81D3464(void *arg0); void sub_81D354C(struct Sprite **);
void sub_81D3480(void *arg0, u8 arg1); void sub_81D3464(struct Sprite **arg0);
void sub_81D3480(struct Sprite **arg0, u8 arg1, u8 arg2);
void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1); void sub_81D2754(u8 *arg0, struct UnknownSubStruct_81D1ED4 *arg1);
void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2); void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1, struct UnknownSubStruct_81D1ED4 *arg2);
void MoveRelearnerPrintText(u8 *str); void MoveRelearnerPrintText(u8 *str);
include/strings.h
+5
View File
@@ -9,6 +9,11 @@ extern const u8 gText_OpenLevel[];
extern const u8 gText_Mom[]; extern const u8 gText_Mom[];
extern const u8 gText_Dad[]; extern const u8 gText_Dad[];
extern const u8 gText_GetsAPokeBlockQuestion[];
extern const u8 gText_WontEatAnymore[];
extern const u8 gText_WasEnhanced[];
extern const u8 gText_NothingChanged[];
extern const u8 gText_Cool[]; extern const u8 gText_Cool[];
extern const u8 gText_Beauty[]; extern const u8 gText_Beauty[];
extern const u8 gText_Cute[]; extern const u8 gText_Cute[];
src/use_pokeblock.c
+1718 -87
View File
File diff suppressed because it is too large Load Diff