summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-14 14:48:25 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-14 16:41:38 -0500
commitf544f6e356d5bdee868e685a537e18a69aed1890 (patch)
tree7c3fa31eb13b05953c1eca68b90ef0b4eaa04095 /include
parent8c560386edeecf0b40b4c9f58ceaac50f4f22397 (diff)
Document Cerulean City scripts
Diffstat (limited to 'include')
-rw-r--r--include/berry_powder.h3
-rw-r--r--include/constants/menu.h18
-rw-r--r--include/constants/trade.h13
-rw-r--r--include/constants/vars.h2
-rw-r--r--include/field_specials.h6
5 files changed, 28 insertions, 14 deletions
diff --git a/include/berry_powder.h b/include/berry_powder.h
index d944ae44d..f34bb3bf5 100644
--- a/include/berry_powder.h
+++ b/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
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
diff --git a/include/field_specials.h b/include/field_specials.h
index c435bdaee..02069ff84 100644
--- a/include/field_specials.h
+++ b/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);