diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-27 14:07:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 14:07:31 -0600 |
| commit | 5498eaf94849bbc7b56d8c280862b61ecefa0643 (patch) | |
| tree | 518b0b12e669c09c31a33c7a071f10bcd4ea76b9 /data/scripts/mauville_man.inc | |
| parent | 66f2ac4ba38cb32eb210545536a487969b593d10 (diff) | |
| parent | 5d74d11d3e3047b4b53153365325db9e6999c627 (diff) | |
Merge pull request #477 from camthesaxman/constant_headers
Use common headers for constants in assembly and C
Diffstat (limited to 'data/scripts/mauville_man.inc')
| -rw-r--r-- | data/scripts/mauville_man.inc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 402afae23..465c61d1a 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -1,11 +1,4 @@ -@ From mauville_old_man.h -@ TODO: Put these in a header - -MAUVILLE_MAN_BARD = 0 -MAUVILLE_MAN_HIPSTER = 1 -MAUVILLE_MAN_TRADER = 2 -MAUVILLE_MAN_STORYTELLER = 3 -MAUVILLE_MAN_GIDDY = 4 +#include "constants/mauville_man.h" MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 special ScrSpecial_GetCurrentMauvilleMan |