summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-06 10:49:52 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-06 10:49:52 -0500
commite4a84faabf3f4e2f005e55a88babce7e8ae49c58 (patch)
tree5ba51555a660ba2ba37a777049a647cae1c5ba68 /include
parent818dfa314e1658ab797af686fedd464c9fda6557 (diff)
through unref_sub_8095C60
Diffstat (limited to 'include')
-rw-r--r--include/decoration.h5
-rw-r--r--include/pokemon.h8
2 files changed, 4 insertions, 9 deletions
diff --git a/include/decoration.h b/include/decoration.h
index 972e82faf..3d619a598 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -127,10 +127,6 @@ extern u8 gUnknown_020388F5;
extern u8 gUnknown_020388F6;
extern u8 gUnknown_020388D6[16];
extern u8 gUnknown_020388E6[12];
-extern u16 gSpecialVar_0x8004;
-extern u16 gSpecialVar_0x8005;
-extern u16 gSpecialVar_0x8006;
-extern u16 gSpecialVar_0x8007;
extern u16 gUnknown_020391A4;
extern u16 gUnknown_020391A6;
extern u8 gUnknown_020391A8;
@@ -161,7 +157,6 @@ extern const struct YesNoFuncTable gUnknown_083ECAA0;
extern u8 sub_8134194(u8); // src/decoration_inventory
extern bool8 sub_81341D4(void); // src/decoration_inventory
extern void sub_8134104(u8); // src/decoration_inventory
-extern bool8 sub_807D770(void);
extern void sub_8109DAC(u8); // src/trader
extern void ReshowPlayerPC(u8); // src/player_pc
void Task_SecretBasePC_Decoration(u8);
diff --git a/include/pokemon.h b/include/pokemon.h
index a1c30f1f3..89599d994 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -418,10 +418,10 @@ struct BattleMove
struct PokemonStorage
{
- /*0x00*/ u8 currentBox;
- /*0x01*/ struct BoxPokemon boxes[14][30];
- u8 boxNames[14][9];
- u8 unkArray[14];
+ /*0x0000*/ u8 currentBox;
+ /*0x0004*/ struct BoxPokemon boxes[14][30];
+ /*0x8344*/ u8 boxNames[14][9];
+ /*0x83c2*/ u8 unkArray[14];
};
struct SpindaSpot