Merge pull request #153 from marijnvdwerf/decompile/pokemon-summary-screen

Attempt to decompile trainer memo printing

2 files changed, 29 insertions, 0 deletions

diff --git a/include/asm.inc.h b/include/asm.inc.h
index 9cf316079..5e2b49a84 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -376,6 +376,7 @@ bool8 IsEasyChatPairEqual(u16 *, u16 *);
 
 // asm/region_map.o
 void sub_80FBFB4(u8 *str, u8 region, u8);
+u8 *CopyLocationName(u8 *dest, u8 location);
 void CopyMapName();
 
 // asm/slot_machine.o
diff --git a/include/pokemon.h b/include/pokemon.h
index ee141dcc5..b705ab6a1 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -114,6 +114,34 @@
 #define TYPE_DRAGON   0x10
 #define TYPE_DARK     0x11
 
+enum {
+    NATURE_HARDY,
+    NATURE_LONELY,
+    NATURE_BRAVE,
+    NATURE_ADAMANT,
+    NATURE_NAUGHTY,
+    NATURE_BOLD,
+    NATURE_DOCILE,
+    NATURE_RELAXED,
+    NATURE_IMPISH,
+    NATURE_LAX,
+    NATURE_TIMID,
+    NATURE_HASTY,
+    NATURE_SERIOUS,
+    NATURE_JOLLY,
+    NATURE_NAIVE,
+    NATURE_MODEST,
+    NATURE_MILD,
+    NATURE_QUIET,
+    NATURE_BASHFUL,
+    NATURE_RASH,
+    NATURE_CALM,
+    NATURE_GENTLE,
+    NATURE_SASSY,
+    NATURE_CAREFUL,
+    NATURE_QUIRKY,
+};
+
 struct PokemonSubstruct0
 {
     u16 species;