Merge branch 'master' into pokemon
This commit is contained in:
+8
-1
@@ -175,7 +175,7 @@ extern const u8 gUnknown_841665C[];
|
||||
extern const u8 gUnknown_8416690[];
|
||||
extern const u8 gUnknown_84166A7[];
|
||||
extern const u8 gUnknown_84169DC[];
|
||||
|
||||
extern const u8 gUnknown_841623D[];
|
||||
extern const u8 gUnknown_84162BD[];
|
||||
extern const u8 gUnknown_841D148[];
|
||||
|
||||
@@ -189,4 +189,11 @@ extern const u8 gText_BadEgg[];
|
||||
extern const u8 gText_PkmnsXPreventsSwitching[];
|
||||
extern u8 *gUnknown_83FD5D0[];
|
||||
|
||||
// diploma
|
||||
extern const u8 gUnknown_841B60E[];
|
||||
extern const u8 gUnknown_841B619[];
|
||||
extern const u8 gUnknown_841B684[];
|
||||
extern const u8 gUnknown_841B68F[];
|
||||
extern const u8 gUnknown_841B698[];
|
||||
|
||||
#endif //GUARD_STRINGS_H
|
||||
|
||||
Reference in New Issue
Block a user