diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-08 17:23:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 17:23:11 -0600 |
| commit | b38bc9a3a2d93e3482643b257685057e339dec9f (patch) | |
| tree | 1175aa70b24f9c07b8089e23b2e8e7fdcba1b524 /include | |
| parent | 030784dece994daf90ac1cb06a44912245b519ea (diff) | |
| parent | 9140594b233b08d05d0832b62d3e64d50528a460 (diff) | |
Merge pull request #885 from GriffinRichards/doc-littleroot
Document Littleroot scripts
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 4 | ||||
| -rw-r--r-- | include/event_scripts.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 64ff6622b..2e3ec758e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -144,7 +144,7 @@ #define VAR_ROUTE132_STATE 0x407F // Unused Var #define VAR_ROUTE133_STATE 0x4080 // Unused Var #define VAR_ROUTE134_STATE 0x4081 // Unused Var -#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 +#define VAR_LITTLEROOT_HOUSES_STATE_MAY 0x4082 #define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_BIRCH_LAB_STATE 0x4084 #define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman @@ -154,7 +154,7 @@ #define VAR_SECRET_BASE_INITIALIZED 0x4089 #define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_UNUSED_0x408B 0x408B // Unused Var -#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C +#define VAR_LITTLEROOT_HOUSES_STATE_BRENDAN 0x408C #define VAR_LITTLEROOT_RIVAL_STATE 0x408D #define VAR_BOARD_BRINEY_BOAT_STATE 0x408E #define VAR_DEVON_CORP_3F_STATE 0x408F diff --git a/include/event_scripts.h b/include/event_scripts.h index 6410907d7..1b2759787 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -554,7 +554,7 @@ extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; extern const u8 MauvilleCity_EventScript_RegisterWallyCall[]; extern const u8 Route119_EventScript_1F49EC[]; -extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; +extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; |