Merge branch 'master' into master

2 files changed, 281 insertions, 3 deletions

diff --git a/include/constants/items.h b/include/constants/items.h
index a7fcc32f..5fb58947 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -1,6 +1,162 @@
 #ifndef POKEDIAMOND_CONSTANTS_ITEMS_H
 #define POKEDIAMOND_CONSTANTS_ITEMS_H
 
+#define POCKET_ITEMS        0
+#define POCKET_MEDICINE     1
+#define POCKET_BALLS        2
+#define POCKET_TMHMS        3
+#define POCKET_BERRIES      4
+#define POCKET_MAIL         5
+#define POCKET_BATTLE_ITEMS 6
+#define POCKET_KEY_ITEMS    7
+
+#define HOLD_EFFECT_NONE                    0
+#define HOLD_EFFECT_HP_RESTORE              1
+#define HOLD_EFFECT_DIALGA_BOOST            2
+#define HOLD_EFFECT_PALKIA_BOOST            3
+#define HOLD_EFFECT_PRZ_RESTORE             4
+#define HOLD_EFFECT_SLP_RESTORE             5
+#define HOLD_EFFECT_PSN_RESTORE             6
+#define HOLD_EFFECT_BRN_RESTORE             7
+#define HOLD_EFFECT_FRZ_RESTORE             8
+#define HOLD_EFFECT_PP_RESTORE              9
+#define HOLD_EFFECT_CONFUSE_RESTORE        10
+#define HOLD_EFFECT_STATUS_RESTORE         11
+#define HOLD_EFFECT_HP_PCT_RESTORE         12
+#define HOLD_EFFECT_HP_RESTORE_SPICY       13
+#define HOLD_EFFECT_HP_RESTORE_DRY         14
+#define HOLD_EFFECT_HP_RESTORE_SWEET       15
+#define HOLD_EFFECT_HP_RESTORE_BITTER      16
+#define HOLD_EFFECT_HP_RESTORE_SOUR        17
+#define HOLD_EFFECT_WEAKEN_SE_FIRE         18
+#define HOLD_EFFECT_WEAKEN_SE_WATER        19
+#define HOLD_EFFECT_WEAKEN_SE_ELECTRIC     20
+#define HOLD_EFFECT_WEAKEN_SE_GRASS        21
+#define HOLD_EFFECT_WEAKEN_SE_ICE          22
+#define HOLD_EFFECT_WEAKEN_SE_FIGHT        23
+#define HOLD_EFFECT_WEAKEN_SE_POISON       24
+#define HOLD_EFFECT_WEAKEN_SE_GROUND       25
+#define HOLD_EFFECT_WEAKEN_SE_FLYING       26
+#define HOLD_EFFECT_WEAKEN_SE_PSYCHIC      27
+#define HOLD_EFFECT_WEAKEN_SE_BUG          28
+#define HOLD_EFFECT_WEAKEN_SE_ROCK         29
+#define HOLD_EFFECT_WEAKEN_SE_GHOST        30
+#define HOLD_EFFECT_WEAKEN_SE_DRAGON       31
+#define HOLD_EFFECT_WEAKEN_SE_DARK         32
+#define HOLD_EFFECT_WEAKEN_SE_STEEL        33
+#define HOLD_EFFECT_WEAKEN_NORMAL          34
+#define HOLD_EFFECT_PINCH_ATK_UP           35
+#define HOLD_EFFECT_PINCH_DEF_UP           36
+#define HOLD_EFFECT_PINCH_SPEED_UP         37
+#define HOLD_EFFECT_PINCH_SPATK_UP         38
+#define HOLD_EFFECT_PINCH_SPDEF_UP         39
+#define HOLD_EFFECT_PINCH_CRITRATE_UP      40
+#define HOLD_EFFECT_PINCH_RANDOM_UP        41
+#define HOLD_EFFECT_HP_RESTORE_SE          42
+#define HOLD_EFFECT_PINCH_ACC_UP           43
+#define HOLD_EFFECT_PINCH_PRIORITY         44
+#define HOLD_EFFECT_RECOIL_PHYSICAL        45
+#define HOLD_EFFECT_RECOIL_SPECIAL         46
+#define HOLD_EFFECT_ACC_REDUCE             47
+#define HOLD_EFFECT_STATDOWN_RESTORE       48
+#define HOLD_EFFECT_EXP_UP_SPEED_DOWN      49
+#define HOLD_EFFECT_EXP_SHARE              50
+#define HOLD_EFFECT_SOMETIMES_PRIORITY     51
+#define HOLD_EFFECT_FRIENDSHIP_UP          52
+#define HOLD_EFFECT_HEAL_INFATUATION       53
+#define HOLD_EFFECT_CHOICE_ATK             54
+#define HOLD_EFFECT_CRIT_UP                55
+#define HOLD_EFFECT_STRENGTHEN_BUG         56
+#define HOLD_EFFECT_MONEY_UP               57
+#define HOLD_EFFECT_ENCOUNTERS_DOWN        58
+#define HOLD_EFFECT_LATI_SPECIAL           59
+#define HOLD_EFFECT_CLAMPERL_SPATK         60
+#define HOLD_EFFECT_CLAMPERL_SPDEF         61
+#define HOLD_EFFECT_FLEE                   62
+#define HOLD_EFFECT_NO_EVOLVE              63
+#define HOLD_EFFECT_MAYBE_ENDURE           64
+#define HOLD_EFFECT_EXP_UP                 65
+#define HOLD_EFFECT_CRITRATE_UP            66
+#define HOLD_EFFECT_STRENGTHEN_STEEL       67
+#define HOLD_EFFECT_HP_RESTORE_GRADUAL     68
+#define HOLD_EFFECT_EVOLVE_SEADRA          69
+#define HOLD_EFFECT_PIKA_SPATK_UP          70
+#define HOLD_EFFECT_STRENGTHEN_GROUND      71
+#define HOLD_EFFECT_STRENGTHEN_ROCK        72
+#define HOLD_EFFECT_STRENGTHEN_GRASS       73
+#define HOLD_EFFECT_STRENGTHEN_DARK        74
+#define HOLD_EFFECT_STRENGTHEN_FIGHT       75
+#define HOLD_EFFECT_STRENGTHEN_ELECTRIC    76
+#define HOLD_EFFECT_STRENGTHEN_WATER       77
+#define HOLD_EFFECT_STRENGTHEN_FLYING      78
+#define HOLD_EFFECT_STRENGTHEN_POISON      79
+#define HOLD_EFFECT_STRENGTHEN_ICE         80
+#define HOLD_EFFECT_STRENGTHEN_GHOST       81
+#define HOLD_EFFECT_STRENGTHEN_PSYCHIC     82
+#define HOLD_EFFECT_STRENGTHEN_FIRE        83
+#define HOLD_EFFECT_STRENGTHEN_DRAGON      84
+#define HOLD_EFFECT_STRENGTHEN_NORMAL      85
+#define HOLD_EFFECT_EVOLVE_PORYGON         86
+#define HOLD_EFFECT_HP_RESTORE_ON_DMG      87
+#define HOLD_EFFECT_CHANSEY_CRITRATE_UP    88
+#define HOLD_EFFECT_DITTO_DEF_UP           89
+#define HOLD_EFFECT_CUBONE_ATK_UP          90
+#define HOLD_EFFECT_FARFETCHD_CRITRATE_UP  91
+#define HOLD_EFFECT_ACCURACY_UP            92
+#define HOLD_EFFECT_POWER_UP_PHYS          93
+#define HOLD_EFFECT_POWER_UP_SPEC          94
+#define HOLD_EFFECT_POWER_UP_SE            95
+#define HOLD_EFFECT_EXTEND_SCREENS         96
+#define HOLD_EFFECT_HP_DRAIN_ON_ATK        97
+#define HOLD_EFFECT_CHARGE_SKIP            98
+#define HOLD_EFFECT_PSN_USER               99
+#define HOLD_EFFECT_BRN_USER              100
+#define HOLD_EFFECT_DITTO_SPEED_UP        101
+#define HOLD_EFFECT_ENDURE                102
+#define HOLD_EFFECT_CRITRATE_UP_SLOWER    103
+#define HOLD_EFFECT_BOOST_REPEATED        104
+#define HOLD_EFFECT_SPEED_DOWN_GROUNDED   105
+#define HOLD_EFFECT_SPEED_DOWN            106
+#define HOLD_EFFECT_RECIPROCATE_INFAT     107
+#define HOLD_EFFECT_HP_RESTORE_PSN_TYPE   108
+#define HOLD_EFFECT_EXTEND_HAIL           109
+#define HOLD_EFFECT_EXTEND_SANDSTORM      110
+#define HOLD_EFFECT_EXTEND_SUN            111
+#define HOLD_EFFECT_EXTEND_RAIN           112
+#define HOLD_EFFECT_EXTEND_TRAPPING       113
+#define HOLD_EFFECT_CHOICE_SPEED          114
+#define HOLD_EFFECT_DMG_USER_CONTACT_XFR  115
+#define HOLD_EFFECT_LVLUP_ATK_EV_UP       116
+#define HOLD_EFFECT_LVLUP_DEF_EV_UP       117
+#define HOLD_EFFECT_LVLUP_SPATK_EV_UP     118
+#define HOLD_EFFECT_LVLUP_SPDEF_EV_UP     119
+#define HOLD_EFFECT_LVLUP_SPEED_EV_UP     120
+#define HOLD_EFFECT_LVLUP_HP_EV_UP        121
+#define HOLD_EFFECT_SWITCH                122
+#define HOLD_EFFECT_LEECH_BOOST           123
+#define HOLD_EFFECT_CHOICE_SPATK          124
+#define HOLD_EFFECT_ARCEUS_FIRE           125
+#define HOLD_EFFECT_ARCEUS_WATER          126
+#define HOLD_EFFECT_ARCEUS_ELECTRIC       127
+#define HOLD_EFFECT_ARCEUS_GRASS          128
+#define HOLD_EFFECT_ARCEUS_ICE            129
+#define HOLD_EFFECT_ARCEUS_FIGHT          130
+#define HOLD_EFFECT_ARCEUS_POISON         131
+#define HOLD_EFFECT_ARCEUS_GROUND         132
+#define HOLD_EFFECT_ARCEUS_FLYING         133
+#define HOLD_EFFECT_ARCEUS_PSYCHIC        134
+#define HOLD_EFFECT_ARCEUS_BUG            135
+#define HOLD_EFFECT_ARCEUS_ROCK           136
+#define HOLD_EFFECT_ARCEUS_GHOST          137
+#define HOLD_EFFECT_ARCEUS_DRAGON         138
+#define HOLD_EFFECT_ARCEUS_DARK           139
+#define HOLD_EFFECT_ARCEUS_STEEL          140
+#define HOLD_EFFECT_EVOLVE_RHYDON         141
+#define HOLD_EFFECT_EVOLVE_ELECTABUZZ     142
+#define HOLD_EFFECT_EVOLVE_MAGMAR         143
+#define HOLD_EFFECT_EVOLVE_PORYGON2       144
+#define HOLD_EFFECT_EVOLVE_DUSCLOPS       145
+
 #define ITEM_NONE                  0
 #define ITEM_MASTER_BALL           1
 #define ITEM_ULTRA_BALL            2
@@ -35,10 +191,12 @@
 #define ITEM_SODA_POP             31
 #define ITEM_LEMONADE             32
 #define ITEM_MOOMOO_MILK          33
+
 #define ITEM_ENERGYPOWDER         34
 #define ITEM_ENERGY_ROOT          35
 #define ITEM_HEAL_POWDER          36
 #define ITEM_REVIVAL_HERB         37
+
 #define ITEM_ETHER                38
 #define ITEM_MAX_ETHER            39
 #define ITEM_ELIXIR               40
@@ -130,7 +288,6 @@
 #define ITEM_BRICK_MAIL          148
 
 #define ITEM_CHERI_BERRY         149
-#define FIRST_BERRY_IDX ITEM_CHERI_BERRY
 #define ITEM_CHESTO_BERRY        150
 #define ITEM_PECHA_BERRY         151
 #define ITEM_RAWST_BERRY         152
@@ -194,6 +351,11 @@
 #define ITEM_CUSTAP_BERRY        210
 #define ITEM_JABOCA_BERRY        211
 #define ITEM_ROWAP_BERRY         212
+
+#define FIRST_BERRY_IDX ITEM_CHERI_BERRY
+#define LAST_BERRY_IDX ITEM_ROWAP_BERRY
+#define NUM_BERRIES (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1)
+
 #define ITEM_BRIGHTPOWDER        213
 #define ITEM_WHITE_HERB          214
 #define ITEM_MACHO_BRACE         215
@@ -468,7 +630,7 @@
 #define TM_GIGA_DRAIN   ITEM_TM19
 #define TM_SAFEGUARD    ITEM_TM20
 #define TM_FRUSTRATION  ITEM_TM21
-#define TM_SOLARBEAM    ITEM_TM22
+#define TM_SOLAR_BEAM   ITEM_TM22
 #define TM_IRON_TAIL    ITEM_TM23
 #define TM_THUNDERBOLT  ITEM_TM24
 #define TM_THUNDER      ITEM_TM25
@@ -544,7 +706,6 @@
 #define HM_SURF         ITEM_HM03
 #define HM_STRENGTH     ITEM_HM04
 #define HM_DEFOG        ITEM_HM05
-#define HM_WHIRLPOOL    ITEM_HM05
 #define HM_ROCK_SMASH   ITEM_HM06
 #define HM_WATERFALL    ITEM_HM07
 #define HM_ROCK_CLIMB   ITEM_HM08
diff --git a/include/constants/map_sections.h b/include/constants/map_sections.h
new file mode 100644
index 00000000..3cc9d597
--- /dev/null
+++ b/include/constants/map_sections.h
@@ -0,0 +1,117 @@
+#ifndef POKEDIAMOND_CONSTANTS_MAP_SECTIONS_H
+#define POKEDIAMOND_CONSTANTS_MAP_SECTIONS_H
+
+#define MAPSEC_MYSTERY_ZONE       0
+#define MAPSEC_TWINLEAF_TOWN      1
+#define MAPSEC_SANDGEM_TOWN       2
+#define MAPSEC_FLOAROMA_TOWN      3
+#define MAPSEC_SOLACEON_TOWN      4
+#define MAPSEC_CELESTIC_TOWN      5
+#define MAPSEC_JUBILIFE_CITY      6
+#define MAPSEC_CANALAVE_CITY      7
+#define MAPSEC_OREBURGH_CITY      8
+#define MAPSEC_ETERNA_CITY        9
+#define MAPSEC_HEARTHOME_CITY    10
+#define MAPSEC_PASTORIA_CITY     11
+#define MAPSEC_VEILSTONE_CITY    12
+#define MAPSEC_SUNYSHORE_CITY    13
+#define MAPSEC_SNOWPOINT_CITY    14
+#define MAPSEC_POKEMON_LEAGUE    15
+#define MAPSEC_ROUTE_201         16
+#define MAPSEC_ROUTE_202         17
+#define MAPSEC_ROUTE_203         18
+#define MAPSEC_ROUTE_204         19
+#define MAPSEC_ROUTE_205         20
+#define MAPSEC_ROUTE_206         21
+#define MAPSEC_ROUTE_207         22
+#define MAPSEC_ROUTE_208         23
+#define MAPSEC_ROUTE_209         24
+#define MAPSEC_ROUTE_210         25
+#define MAPSEC_ROUTE_211         26
+#define MAPSEC_ROUTE_212         27
+#define MAPSEC_ROUTE_213         28
+#define MAPSEC_ROUTE_214         29
+#define MAPSEC_ROUTE_215         30
+#define MAPSEC_ROUTE_216         31
+#define MAPSEC_ROUTE_217         32
+#define MAPSEC_ROUTE_218         33
+#define MAPSEC_ROUTE_219         34
+#define MAPSEC_ROUTE_220         35
+#define MAPSEC_ROUTE_221         36
+#define MAPSEC_ROUTE_222         37
+#define MAPSEC_ROUTE_223         38
+#define MAPSEC_ROUTE_224         39
+#define MAPSEC_ROUTE_225         40
+#define MAPSEC_ROUTE_226         41
+#define MAPSEC_ROUTE_227         42
+#define MAPSEC_ROUTE_228         43
+#define MAPSEC_ROUTE_229         44
+#define MAPSEC_ROUTE_230         45
+#define MAPSEC_OREBURGH_MINE     46
+#define MAPSEC_VALLEY_WINDWORKS  47
+#define MAPSEC_ETERNA_FOREST     48
+#define MAPSEC_FUEGO_IRONWORKS   49
+#define MAPSEC_MT_CORONET        50
+#define MAPSEC_SPEAR_PILLAR      51
+#define MAPSEC_GREAT_MARSH       52
+#define MAPSEC_SOLACEON_RUINS    53
+#define MAPSEC_VICTORY_ROAD      54
+#define MAPSEC_PAL_PARK          55
+#define MAPSEC_AMITY_SQUARE      56
+#define MAPSEC_RAVAGED_PATH      57
+#define MAPSEC_FLOAROMA_MEADOW   58
+#define MAPSEC_OREBURGH_GATE     59
+#define MAPSEC_FULLMOON_ISLAND   60
+#define MAPSEC_SENDOFF_SPRING    61
+#define MAPSEC_TURNBACK_CAVE     62
+#define MAPSEC_FLOWER_PARADISE   63
+#define MAPSEC_SNOWPOINT_TEMPLE  64
+#define MAPSEC_WAYWARD_CAVE      65
+#define MAPSEC_RUIN_MANIAC_CAVE  66
+#define MAPSEC_MANIAC_TUNNEL     67
+#define MAPSEC_TROPHY_GARDEN     68
+#define MAPSEC_IRON_ISLAND       69
+#define MAPSEC_OLD_CHATEAU       70
+#define MAPSEC_GALACTIC_HQ       71
+#define MAPSEC_VERITY_LAKEFRONT  72
+#define MAPSEC_VALOR_LAKEFRONT   73
+#define MAPSEC_ACUITY_LAKEFRONT  74
+#define MAPSEC_SPRING_PATH       75
+#define MAPSEC_LAKE_VERITY       76
+#define MAPSEC_LAKE_VALOR        77
+#define MAPSEC_LAKE_ACUITY       78
+#define MAPSEC_NEWMOON_ISLAND    79
+#define MAPSEC_BATTLE_TOWER      80
+#define MAPSEC_FIGHT_AREA        81
+#define MAPSEC_SURVIVAL_AREA     82
+#define MAPSEC_RESORT_AREA       83
+#define MAPSEC_STARK_MOUNTAIN    84
+#define MAPSEC_SEABREAK_PATH     85
+#define MAPSEC_HALL_OF_ORIGIN    86
+#define MAPSEC_VERITY_CAVERN     87
+#define MAPSEC_VALOR_CAVERN      88
+#define MAPSEC_ACUITY_CAVERN     89
+#define MAPSEC_JUBILIFE_TV       90
+#define MAPSEC_POKETCH_CO        91
+#define MAPSEC_GTS               92
+#define MAPSEC_TRAINERS_SCHOOL   93
+#define MAPSEC_MINING_MUSEUM     94
+#define MAPSEC_FLOWER_SHOP       95
+#define MAPSEC_CYCLE_SHOP        96
+#define MAPSEC_CONTEST_HALL      97
+#define MAPSEC_POFFIN_HOUSE      98
+#define MAPSEC_FOREIGN_BUILDING  99
+#define MAPSEC_POKEMON_DAY_CARE 100
+#define MAPSEC_VEILSTONE_STORE  101
+#define MAPSEC_GAME_CORNER      102
+#define MAPSEC_CANALAVE_LIBRARY 103
+#define MAPSEC_VISTA_LIGHTHOUSE 104
+#define MAPSEC_SUNYSHORE_MARKET 105
+#define MAPSEC_POKEMON_MANSION  106
+#define MAPSEC_FOOTSTEP_HOUSE   107
+#define MAPSEC_CAFE             108
+#define MAPSEC_GRAND_LAKE       109
+#define MAPSEC_RESTAURANT       110
+#define MAPSEC_BATTLE_PARK      111
+
+#endif //POKEDIAMOND_CONSTANTS_MAP_SECTIONS_H