diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:14 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:14 -0400 |
commit | b014273d73996d98519f90b1349feb469cd5f765 (patch) | |
tree | 7e206d7ee1e1a2f9a8ea9eec69d178599e6c624d /include/trade.h | |
parent | 22c795304d6c1edb568dfde9c6de2091d9470785 (diff) | |
parent | cf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (diff) |
Merge branch 'master' into trade
Diffstat (limited to 'include/trade.h')
-rw-r--r-- | include/trade.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/trade.h b/include/trade.h index d1cd6d3bf..1dd4b53bd 100644 --- a/include/trade.h +++ b/include/trade.h @@ -1,9 +1,6 @@ -// -// Created by scott on 9/2/2017. -// -#ifndef POKERUBY_TRADE_H -#define POKERUBY_TRADE_H +#ifndef GUARD_TRADE_H +#define GUARD_TRADE_H struct TradeEwramSubstruct2 { /*0x0000*/ u8 filler_0000; @@ -57,6 +54,10 @@ void sub_8047CD8(void); u16 sub_804DB2C(void); void sub_804DB68(void); void sub_804E174(void); +const u8 gOtherText_MaleSymbol3[2]; +const u8 gOtherText_FemaleSymbol3[2]; +const u8 gOtherText_GenderlessSymbol[2]; + void sub_804E22C(void); u16 sub_804D89C(void); |