Merge pull request #221 from GriffinRichards/doc-cerulean

Document Cerulean City scripts

include/berry_powder.h

@@ -3,6 +3,7 @@
 
 u32 GetBerryPowder(void);
 void SetBerryPowder(u32 *powder, u32 amount);
-void sub_815EE6C(u32 newKey);
+void ApplyNewEncryptionKeyToBerryPowder(u32 newKey);
+bool8 GiveBerryPowder(u32 amountToAdd);
 
 #endif //GUARD_BERRY_POWDER_H

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

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

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

include/field_specials.h

@@ -19,9 +19,9 @@ void StopPokemonLeagueLightingEffectTask(void);
 void nullsub_60(void);
 void nullsub_61(void);
 u8 ContextNpcGetTextColor(void);
-void set_unknown_box_id(u8);
-u16 get_unknown_box_id(void);
-bool8 sub_80CC7B4(void);
+void SetPCBoxToSendMon(u8);
+u16 GetPCBoxToSendMon(void);
+bool8 ShouldShowBoxWasFullMessage(void);
 u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr);
 u8 GetUnlockedSeviiAreas(void);
 u32 GetPlayerTrainerId(void);