diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry_powder.h | 3 | ||||
| -rw-r--r-- | include/coins.h | 4 | ||||
| -rw-r--r-- | include/constants/menu.h | 18 | ||||
| -rw-r--r-- | include/constants/metatile_labels.h | 37 | ||||
| -rw-r--r-- | include/constants/trade.h | 13 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/field_specials.h | 6 |
7 files changed, 67 insertions, 16 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/coins.h b/include/coins.h index 83ad7d611..efe036361 100644 --- a/include/coins.h +++ b/include/coins.h @@ -8,7 +8,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y); void HideCoinsWindow(void); u16 GetCoins(void); void SetCoins(u16 coinAmount); -bool8 GiveCoins(u16 toAdd); -bool8 TakeCoins(u16 toSub); +bool8 AddCoins(u16 toAdd); +bool8 RemoveCoins(u16 toSub); #endif // GUARD_COINS_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/metatile_labels.h b/include/constants/metatile_labels.h new file mode 100644 index 000000000..c664290d5 --- /dev/null +++ b/include/constants/metatile_labels.h @@ -0,0 +1,37 @@ +#ifndef GUARD_METATILE_LABELS_H +#define GUARD_METATILE_LABELS_H + +// Pokemon Mansion +#define METATILE_PokemonMansion_Floor 0x284 +#define METATILE_PokemonMansion_Floor_ShadeFull 0x285 +#define METATILE_PokemonMansion_BasementFloor 0x286 +#define METATILE_PokemonMansion_BasementFloor_ShadeFull 0x287 +#define METATILE_PokemonMansion_Wall_EndPost_Mid 0x2A5 +#define METATILE_PokemonMansion_Wall_EndPost_Bottom 0x2AD +#define METATILE_PokemonMansion_Wall_EndCap_Basement 0x2B0 +#define METATILE_PokemonMansion_Wall_EndCap 0x2B5 +#define METATILE_PokemonMansion_Barrier_Horizontal_TopLeft 0x2F8 +#define METATILE_PokemonMansion_Barrier_Horizontal_TopMid 0x2F9 +#define METATILE_PokemonMansion_Barrier_Horizontal_TopRight 0x2FA +#define METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft 0x300 +#define METATILE_PokemonMansion_Barrier_Horizontal_BottomMid 0x301 +#define METATILE_PokemonMansion_Barrier_Horizontal_BottomRight 0x302 +#define METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft_Basement 0x354 +#define METATILE_PokemonMansion_Barrier_Horizontal_BottomMid_Basement 0x355 +#define METATILE_PokemonMansion_Barrier_Horizontal_BottomRight_Basement 0x356 +#define METATILE_PokemonMansion_Barrier_Vertical_TopWall 0x350 +#define METATILE_PokemonMansion_Barrier_Vertical_TopBase 0x358 +#define METATILE_PokemonMansion_Barrier_Vertical_MidShadow 0x360 +#define METATILE_PokemonMansion_Barrier_Vertical_Mid 0x368 +#define METATILE_PokemonMansion_Barrier_Vertical_Bottom 0x370 +#define METATILE_PokemonMansion_Barrier_Vertical_MidShadow_Basement 0x362 +#define METATILE_PokemonMansion_Barrier_Vertical_Mid_Basement 0x36A +#define METATILE_PokemonMansion_Barrier_Vertical_Bottom_Basement 0x372 +#define METATILE_PokemonMansion_Statue_BlackEyes 0x314 +#define METATILE_PokemonMansion_Statue_BlackEyes_Shade 0x315 +#define METATILE_PokemonMansion_Statue_BlackEyes_Basement 0x316 +#define METATILE_PokemonMansion_Statue_RedEyes 0x34D +#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E +#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F + +#endif // GUARD_METATILE_LABELS_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); |