diff options
| author | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-19 21:35:32 -0500 |
| commit | af208a6bbb671cbf471d08856994470e707c5051 (patch) | |
| tree | 9a57703eecf8c18f444454f2fae8f5dccf19d408 /include/event_scripts.h | |
| parent | 7e170a06cc3155a6a8785af0b910434e5ab43d2b (diff) | |
| parent | f801eed3a84862d88af0d5e43c6b6754e36001f2 (diff) | |
Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff
Diffstat (limited to 'include/event_scripts.h')
| -rw-r--r-- | include/event_scripts.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h index dd0eca12f..2661494d3 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1,7 +1,3 @@ -// -// Created by scott on 9/12/2017. -// - #ifndef GUARD_EVENT_SCRIPTS_H #define GUARD_EVENT_SCRIPTS_H @@ -14,11 +10,11 @@ extern const u8 EventScript_275D0C[]; extern const u8 EventScript_275D1F[]; extern const u8 EventScript_275D2E[]; extern const u8 EventScript_271354[]; -extern const u8 EventScript_2713C2[]; +extern const u8 EventScript_DoTainerBattle[]; extern const u8 EventScript_TryDoDoubleTrainerBattle[]; -extern const u8 EventScript_271362[]; +extern const u8 EventScript_TryDoNormalTrainerBattle[]; extern const u8 EventScript_TryDoDoubleRematchBattle[]; -extern const u8 EventScript_2713D1[]; +extern const u8 EventScript_TryDoRematchBattle[]; extern const u8 EventScript_SecretPower1[]; extern const u8 EventScript_SecretPower2[]; @@ -409,14 +405,14 @@ extern const u8 gText_SoDesirable[]; extern const u8 gText_SoExciting[]; extern const u8 gText_SoAmusing[]; extern const u8 gText_SoMagical[]; -extern const u8 gUnknown_08294313[]; -extern const u8 gUnknown_08294359[]; -extern const u8 gUnknown_08294398[]; -extern const u8 gUnknown_082943DA[]; -extern const u8 gUnknown_0829441C[]; -extern const u8 gUnknown_08294460[]; -extern const u8 gUnknown_082944A0[]; -extern const u8 gUnknown_082944D5[]; +extern const u8 gMauvilleManText_ISoWantToGoOnAVacation[]; +extern const u8 gMauvilleManText_IBoughtCrayonsWith120Colors[]; +extern const u8 gMauvilleManText_WouldntItBeNiceIfWeCouldFloat[]; +extern const u8 gMauvilleManText_WhenYouWriteOnASandyBeach[]; +extern const u8 gMauvilleManText_WhatsTheBottomOfTheSeaLike[]; +extern const u8 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt[]; +extern const u8 gMauvilleManText_LyingBackInTheGreenGrass[]; +extern const u8 gMauvilleManText_SecretBasesAreSoWonderful[]; extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E930[]; @@ -578,4 +574,9 @@ extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; extern const u8 gUnknown_082A8350[]; -#endif //GUARD_EVENT_SCRIPTS_H +// Battle Pyramid. +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[]; + +#endif // GUARD_EVENT_SCRIPTS_H |