diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-07 20:22:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 20:22:56 -0600 |
| commit | 030784dece994daf90ac1cb06a44912245b519ea (patch) | |
| tree | 6cd3e380eb75e699f304740b7b91ae3c7ba5e4ab /include | |
| parent | 1ceee6ef70a163118b67d78a9581fba443e1c13c (diff) | |
| parent | 702ef745d97dcdeae03e1c47fb1f2f7fc1be6dd0 (diff) | |
Merge pull request #882 from GriffinRichards/doc-mauville
Document Mauville and New Mauville scripts
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/coins.h | 6 | ||||
| -rw-r--r-- | include/constants/metatile_labels.h | 2 | ||||
| -rw-r--r-- | include/event_scripts.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/constants/coins.h b/include/constants/coins.h new file mode 100644 index 000000000..fd68f3f9e --- /dev/null +++ b/include/constants/coins.h @@ -0,0 +1,6 @@ +#ifndef GUARD_CONSTANTS_COINS_H +#define GUARD_CONSTANTS_COINS_H + +#define MAX_COINS 9999 + +#endif // GUARD_CONSTANTS_COINS_H
\ No newline at end of file diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 6d17fc047..c3ec28406 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -381,7 +381,7 @@ #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C #define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right 0x298 -// gTileset_BikeShop +// gTileset_BikeShop (also used by New Mauville) #define METATILE_BikeShop_Barrier_Hidden_Top 0x269 #define METATILE_BikeShop_Barrier_Hidden_Bottom 0x271 #define METATILE_BikeShop_Floor_Shadow_Top 0x26D diff --git a/include/event_scripts.h b/include/event_scripts.h index b86c46df0..6410907d7 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -552,7 +552,7 @@ extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; -extern const u8 MauvilleCity_EventScript_1DF7BA[]; +extern const u8 MauvilleCity_EventScript_RegisterWallyCall[]; extern const u8 Route119_EventScript_1F49EC[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; |