diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-14 20:29:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-14 20:29:03 -0500 |
| commit | cdc04dfe9f259535ee1cd2155f838d8092def817 (patch) | |
| tree | f4c372594f6ae720a9340a2a1a933ed8302123bc /include/constants | |
| parent | 58935b17f7e9073346d4f08254a35991274ad5c2 (diff) | |
| parent | f544f6e356d5bdee868e685a537e18a69aed1890 (diff) | |
Merge pull request #221 from GriffinRichards/doc-cerulean
Document Cerulean City scripts
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/menu.h | 18 | ||||
| -rw-r--r-- | include/constants/trade.h | 13 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 |
3 files changed, 23 insertions, 10 deletions
diff --git a/include/constants/menu.h b/include/constants/menu.h index 44df246d9..6d72787dc 100644 --- a/include/constants/menu.h +++ b/include/constants/menu.h @@ -61,13 +61,21 @@ #define MULTICHOICE_SEVII_NAVEL 54 #define MULTICHOICE_SEVII_BIRTH 55 #define MULTICHOICE_SEVII_NAVEL_BIRTH 56 -#define MULTICHOICE_SEAGALLOP_123 57 -#define MULTICHOICE_SEAGALLOP_V23 58 -#define MULTICHOICE_SEAGALLOP_V13 59 -#define MULTICHOICE_SEAGALLOP_V12 60 -#define MULTICHOICE_SEAGALLOP_VERMILION 61 +#define MULTICHOICE_SEAGALLOP_123 57 +#define MULTICHOICE_SEAGALLOP_V23 58 +#define MULTICHOICE_SEAGALLOP_V13 59 +#define MULTICHOICE_SEAGALLOP_V12 60 +#define MULTICHOICE_SEAGALLOP_VERMILION 61 #define MULTICHOICE_62 62 #define MULTICHOICE_JOIN_OR_LEAD 63 #define MULTICHOICE_TRAINER_TOWER_MODE 64 +#define LISTMENU_BADGES 0 +#define LISTMENU_SILPHCO_FLOORS 1 +#define LISTMENU_ROCKET_HIDEOUT_FLOORS 2 +#define LISTMENU_DEPT_STORE_FLOORS 3 +#define LISTMENU_WIRELESS_LECTURE_HEADERS 4 +#define LISTMENU_BERRY_POWDER 5 +#define LISTMENU_TRAINER_TOWER_FLOORS 6 + #endif //GUARD_CONSTANTS_MENU_H diff --git a/include/constants/trade.h b/include/constants/trade.h index b22cd26d2..e9964c4c3 100644 --- a/include/constants/trade.h +++ b/include/constants/trade.h @@ -10,10 +10,15 @@ #define LINK_TRADE_TIMEOUT 300 // In-game Trade IDs -#define INGAME_TRADE_SEEDOT 0 -#define INGAME_TRADE_PLUSLE 1 -#define INGAME_TRADE_HORSEA 2 -#define INGAME_TRADE_MEOWTH 3 +#define INGAME_TRADE_MR_MIME 0 +#define INGAME_TRADE_JYNX 1 +#define INGAME_TRADE_NIDORAN 2 // M or F depending on version +#define INGAME_TRADE_FARFETCHD 3 +#define INGAME_TRADE_NIDORINOA 4 // Nidorino or Nidorina depending on version +#define INGAME_TRADE_LICKITUNG 5 +#define INGAME_TRADE_ELECTRODE 6 +#define INGAME_TRADE_TANGELA 7 +#define INGAME_TRADE_SEEL 8 // Flag IDs for sending link data #define INITIATE_TRADE 1 diff --git a/include/constants/vars.h b/include/constants/vars.h index de03ab6ee..54375e08e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -97,7 +97,7 @@ #define VAR_0x4034 0x4034 #define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035 #define VAR_RESORT_GORGEOUS_REQUESTED_MON 0x4036 -#define VAR_0x4037 0x4037 +#define VAR_PC_BOX_TO_SEND_MON 0x4037 #define VAR_0x4038 0x4038 #define VAR_0x4039 0x4039 #define VAR_ELEVATOR_FLOOR 0x403A |