diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_anim_constants.asm | 8 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 93 | ||||
| -rw-r--r-- | constants/credits_constants.asm | 14 | ||||
| -rw-r--r-- | constants/deco_constants.asm | 16 | ||||
| -rw-r--r-- | constants/event_flags.asm | 724 | ||||
| -rw-r--r-- | constants/item_constants.asm | 23 | ||||
| -rw-r--r-- | constants/item_data_constants.asm | 34 | ||||
| -rw-r--r-- | constants/map_constants.asm | 5 | ||||
| -rw-r--r-- | constants/map_object_constants.asm | 33 | ||||
| -rw-r--r-- | constants/menu_constants.asm | 2 | ||||
| -rw-r--r-- | constants/move_constants.asm | 5 | ||||
| -rw-r--r-- | constants/phone_constants.asm | 16 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 3 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 6 | ||||
| -rw-r--r-- | constants/sprite_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 10 | ||||
| -rw-r--r-- | constants/trainer_data_constants.asm | 37 | ||||
| -rw-r--r-- | constants/type_constants.asm | 10 |
18 files changed, 180 insertions, 861 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 57bbfcc8..5d3dc5d2 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -17,13 +17,7 @@ const BATTLEANIMSTRUCT_ANON_JT_INDEX const BATTLEANIMSTRUCT_0F const BATTLEANIMSTRUCT_10 - const BATTLEANIMSTRUCT_11 - const BATTLEANIMSTRUCT_12 - const BATTLEANIMSTRUCT_13 - const BATTLEANIMSTRUCT_14 - const BATTLEANIMSTRUCT_15 - const BATTLEANIMSTRUCT_16 - const BATTLEANIMSTRUCT_17 + const_skip 7 BATTLEANIMSTRUCT_LENGTH EQU const_value NUM_ANIM_OBJECTS EQU 10 ; see wActiveAnimObjects diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 63128b34..45dfa491 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -160,59 +160,60 @@ SLP EQU %111 ; 0-7 turns ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP ; wPlayerSubStatus1 or wEnemySubStatus1 bit flags - enum_start 7, -1 - enum SUBSTATUS_IN_LOVE - enum SUBSTATUS_ROLLOUT - enum SUBSTATUS_ENDURE - enum SUBSTATUS_PERISH - enum SUBSTATUS_IDENTIFIED - enum SUBSTATUS_PROTECT - enum SUBSTATUS_CURSE - enum SUBSTATUS_NIGHTMARE + const_def + const SUBSTATUS_NIGHTMARE + const SUBSTATUS_CURSE + const SUBSTATUS_PROTECT + const SUBSTATUS_IDENTIFIED + const SUBSTATUS_PERISH + const SUBSTATUS_ENDURE + const SUBSTATUS_ROLLOUT + const SUBSTATUS_IN_LOVE ; wPlayerSubStatus2 or wEnemySubStatus2 bit flags -SUBSTATUS_CURLED EQU 0 + const_def + const SUBSTATUS_CURLED ; wPlayerSubStatus3 or wEnemySubStatus3 bit flags - enum_start 7, -1 - enum SUBSTATUS_CONFUSED - enum SUBSTATUS_FLYING - enum SUBSTATUS_UNDERGROUND - enum SUBSTATUS_CHARGED - enum SUBSTATUS_FLINCHED - enum SUBSTATUS_IN_LOOP - enum SUBSTATUS_RAMPAGE - enum SUBSTATUS_BIDE + const_def + const SUBSTATUS_BIDE + const SUBSTATUS_RAMPAGE + const SUBSTATUS_IN_LOOP + const SUBSTATUS_FLINCHED + const SUBSTATUS_CHARGED + const SUBSTATUS_UNDERGROUND + const SUBSTATUS_FLYING + const SUBSTATUS_CONFUSED ; wPlayerSubStatus4 or wEnemySubStatus4 bit flags - enum_start 7, -1 - enum SUBSTATUS_LEECH_SEED - enum SUBSTATUS_RAGE - enum SUBSTATUS_RECHARGE - enum SUBSTATUS_SUBSTITUTE - enum SUBSTATUS_UNKNOWN_1 - enum SUBSTATUS_FOCUS_ENERGY - enum SUBSTATUS_MIST - enum SUBSTATUS_X_ACCURACY + const_def + const SUBSTATUS_X_ACCURACY + const SUBSTATUS_MIST + const SUBSTATUS_FOCUS_ENERGY + const_skip + const SUBSTATUS_SUBSTITUTE + const SUBSTATUS_RECHARGE + const SUBSTATUS_RAGE + const SUBSTATUS_LEECH_SEED ; wPlayerSubStatus5 or wEnemySubStatus5 bit flags - enum_start 7, -1 - enum SUBSTATUS_CANT_RUN - enum SUBSTATUS_DESTINY_BOND - enum SUBSTATUS_LOCK_ON - enum SUBSTATUS_ENCORED - enum SUBSTATUS_TRANSFORMED - enum SUBSTATUS_UNKNOWN_2 - enum SUBSTATUS_UNKNOWN_3 - enum SUBSTATUS_TOXIC + const_def + const SUBSTATUS_TOXIC + const_skip + const_skip + const SUBSTATUS_TRANSFORMED + const SUBSTATUS_ENCORED + const SUBSTATUS_LOCK_ON + const SUBSTATUS_DESTINY_BOND + const SUBSTATUS_CANT_RUN ; wPlayerScreens or wEnemyScreens bit flags - enum_start 4, -1 - enum SCREENS_REFLECT - enum SCREENS_LIGHT_SCREEN - enum SCREENS_SAFEGUARD - enum SCREENS_UNUSED - enum SCREENS_SPIKES + const_def + const SCREENS_SPIKES + const_skip + const SCREENS_SAFEGUARD + const SCREENS_LIGHT_SCREEN + const SCREENS_REFLECT ; values in wBattleWeather const_def @@ -236,9 +237,9 @@ SUBSTATUS_CURLED EQU 0 const BATTLEACTION_SWITCH4 const BATTLEACTION_SWITCH5 const BATTLEACTION_SWITCH6 - const BATTLEACTION_A - const BATTLEACTION_B - const BATTLEACTION_C + const_skip + const_skip + const_skip const BATTLEACTION_SKIPTURN const BATTLEACTION_STRUGGLE const BATTLEACTION_FORFEIT diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index 9a786ee6..b0dad230 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -78,11 +78,11 @@ const PAAD_TESTING ; CreditsScript indexes (see data/credits_script.asm) - const_def -7 - const CREDITS_THEEND - const CREDITS_WAIT2 - const CREDITS_MUSIC - const CREDITS_CLEAR - const CREDITS_SCENE - const CREDITS_WAIT + const_def -1, -1 const CREDITS_END + const CREDITS_WAIT + const CREDITS_SCENE + const CREDITS_CLEAR + const CREDITS_MUSIC + const CREDITS_WAIT2 + const CREDITS_THEEND diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 09d292d5..29aea301 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -1,5 +1,5 @@ ; decoration types -const_value = 1 + const_def 1 const DECO_PLANT const DECO_BED const DECO_CARPET @@ -8,7 +8,7 @@ const_value = 1 const DECO_BIGDOLL ; DecorationNames indexes (see data/decorations/names.asm) -const_value = 1 + const_def 1 const PUT_IT_AWAY const MAGNAPLANT const TROPICPLANT @@ -36,7 +36,7 @@ const_value = 1 const GREEN_CARPET ; DoDecorationAction2.DecoActions indexes (see engine/overworld/decorations.asm) -const_value = 1 + const_def 1 const SET_UP_BED const PUT_AWAY_BED const SET_UP_CARPET @@ -54,16 +54,18 @@ const_value = 1 const SET_UP_ORNAMENT const PUT_AWAY_ORNAMENT +__deco_value__ = 0 + deco: MACRO const DECO_\1 - enum DECOFLAG_\1 +DECOFLAG_\1 EQU __deco_value__ +__deco_value__ = __deco_value__ + 1 ENDM ; decorations: ; - DecorationAttributes (see data/decorations/attributes.asm) ; - DecorationIDs (see data/decorations/decorations.asm) const_def 1 - enum_start ; FindOwnedBeds.beds values (see engine/overworld/decorations.asm) const BEDS deco FEATHERY_BED @@ -121,7 +123,7 @@ ENDM deco GEODUDE_DOLL deco MACHOP_DOLL deco TENTACOOL_DOLL -NUM_NON_TROPHY_DECOS EQU __enum__ +NUM_NON_TROPHY_DECOS EQU __deco_value__ deco GOLD_TROPHY_DOLL deco SILVER_TROPHY_DOLL -NUM_DECOS EQU __enum__ +NUM_DECOS EQU __deco_value__ diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 5f2bff06..c57c0a0e 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,4 +1,5 @@ ; wEventFlags bit flags + const_def ; The first eight flags are reset upon reloading the map const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 @@ -25,7 +26,7 @@ const EVENT_GOT_HM04_STRENGTH const EVENT_GOT_HM05_FLASH const EVENT_GOT_HM06_WHIRLPOOL - const EVENT_016 ; unused + const_skip ; unused ; Rods const EVENT_GOT_OLD_ROD const EVENT_GOT_GOOD_ROD @@ -64,8 +65,8 @@ const EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP const EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP const EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY - const EVENT_03B ; unused - const EVENT_03C ; unused + const_skip ; unused + const_skip ; unused const EVENT_HEALED_MOOMOO const EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO @@ -191,22 +192,9 @@ const EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY const EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION const EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE -; Unused - const EVENT_0B9 - const EVENT_0BA - const EVENT_0BB - const EVENT_0BC - const EVENT_0BD - const EVENT_0BE - const EVENT_0BF - const EVENT_0C0 - const EVENT_0C1 - const EVENT_0C2 - const EVENT_0C3 - const EVENT_0C4 - const EVENT_0C5 - const EVENT_0C6 - const EVENT_0C7 +; Unused: next 15 events + + const_next 200 ; Kanto story events const EVENT_GOT_NUGGET_FROM_GUY const EVENT_RETURNED_MACHINE_PART @@ -270,346 +258,9 @@ const EVENT_DANA_GAVE_THUNDERSTONE const EVENT_TULLY_GAVE_WATER_STONE const EVENT_TIFFANY_GAVE_PINK_BOW -; Unused - const EVENT_105 - const EVENT_106 - const EVENT_107 - const EVENT_108 - const EVENT_109 - const EVENT_10A - const EVENT_10B - const EVENT_10C - const EVENT_10D - const EVENT_10E - const EVENT_10F - const EVENT_110 - const EVENT_111 - const EVENT_112 - const EVENT_113 - const EVENT_114 - const EVENT_115 - const EVENT_116 - const EVENT_117 - const EVENT_118 - const EVENT_119 - const EVENT_11A - const EVENT_11B - const EVENT_11C - const EVENT_11D - const EVENT_11E - const EVENT_11F - const EVENT_120 - const EVENT_121 - const EVENT_122 - const EVENT_123 - const EVENT_124 - const EVENT_125 - const EVENT_126 - const EVENT_127 - const EVENT_128 - const EVENT_129 - const EVENT_12A - const EVENT_12B - const EVENT_12C - const EVENT_12D - const EVENT_12E - const EVENT_12F - const EVENT_130 - const EVENT_131 - const EVENT_132 - const EVENT_133 - const EVENT_134 - const EVENT_135 - const EVENT_136 - const EVENT_137 - const EVENT_138 - const EVENT_139 - const EVENT_13A - const EVENT_13B - const EVENT_13C - const EVENT_13D - const EVENT_13E - const EVENT_13F - const EVENT_140 - const EVENT_141 - const EVENT_142 - const EVENT_143 - const EVENT_144 - const EVENT_145 - const EVENT_146 - const EVENT_147 - const EVENT_148 - const EVENT_149 - const EVENT_14A - const EVENT_14B - const EVENT_14C - const EVENT_14D - const EVENT_14E - const EVENT_14F - const EVENT_150 - const EVENT_151 - const EVENT_152 - const EVENT_153 - const EVENT_154 - const EVENT_155 - const EVENT_156 - const EVENT_157 - const EVENT_158 - const EVENT_159 - const EVENT_15A - const EVENT_15B - const EVENT_15C - const EVENT_15D - const EVENT_15E - const EVENT_15F - const EVENT_160 - const EVENT_161 - const EVENT_162 - const EVENT_163 - const EVENT_164 - const EVENT_165 - const EVENT_166 - const EVENT_167 - const EVENT_168 - const EVENT_169 - const EVENT_16A - const EVENT_16B - const EVENT_16C - const EVENT_16D - const EVENT_16E - const EVENT_16F - const EVENT_170 - const EVENT_171 - const EVENT_172 - const EVENT_173 - const EVENT_174 - const EVENT_175 - const EVENT_176 - const EVENT_177 - const EVENT_178 - const EVENT_179 - const EVENT_17A - const EVENT_17B - const EVENT_17C - const EVENT_17D - const EVENT_17E - const EVENT_17F - const EVENT_180 - const EVENT_181 - const EVENT_182 - const EVENT_183 - const EVENT_184 - const EVENT_185 - const EVENT_186 - const EVENT_187 - const EVENT_188 - const EVENT_189 - const EVENT_18A - const EVENT_18B - const EVENT_18C - const EVENT_18D - const EVENT_18E - const EVENT_18F - const EVENT_190 - const EVENT_191 - const EVENT_192 - const EVENT_193 - const EVENT_194 - const EVENT_195 - const EVENT_196 - const EVENT_197 - const EVENT_198 - const EVENT_199 - const EVENT_19A - const EVENT_19B - const EVENT_19C - const EVENT_19D - const EVENT_19E - const EVENT_19F - const EVENT_1A0 - const EVENT_1A1 - const EVENT_1A2 - const EVENT_1A3 - const EVENT_1A4 - const EVENT_1A5 - const EVENT_1A6 - const EVENT_1A7 - const EVENT_1A8 - const EVENT_1A9 - const EVENT_1AA - const EVENT_1AB - const EVENT_1AC - const EVENT_1AD - const EVENT_1AE - const EVENT_1AF - const EVENT_1B0 - const EVENT_1B1 - const EVENT_1B2 - const EVENT_1B3 - const EVENT_1B4 - const EVENT_1B5 - const EVENT_1B6 - const EVENT_1B7 - const EVENT_1B8 - const EVENT_1B9 - const EVENT_1BA - const EVENT_1BB - const EVENT_1BC - const EVENT_1BD - const EVENT_1BE - const EVENT_1BF - const EVENT_1C0 - const EVENT_1C1 - const EVENT_1C2 - const EVENT_1C3 - const EVENT_1C4 - const EVENT_1C5 - const EVENT_1C6 - const EVENT_1C7 - const EVENT_1C8 - const EVENT_1C9 - const EVENT_1CA - const EVENT_1CB - const EVENT_1CC - const EVENT_1CD - const EVENT_1CE - const EVENT_1CF - const EVENT_1D0 - const EVENT_1D1 - const EVENT_1D2 - const EVENT_1D3 - const EVENT_1D4 - const EVENT_1D5 - const EVENT_1D6 - const EVENT_1D7 - const EVENT_1D8 - const EVENT_1D9 - const EVENT_1DA - const EVENT_1DB - const EVENT_1DC - const EVENT_1DD - const EVENT_1DE - const EVENT_1DF - const EVENT_1E0 - const EVENT_1E1 - const EVENT_1E2 - const EVENT_1E3 - const EVENT_1E4 - const EVENT_1E5 - const EVENT_1E6 - const EVENT_1E7 - const EVENT_1E8 - const EVENT_1E9 - const EVENT_1EA - const EVENT_1EB - const EVENT_1EC - const EVENT_1ED - const EVENT_1EE - const EVENT_1EF - const EVENT_1F0 - const EVENT_1F1 - const EVENT_1F2 - const EVENT_1F3 - const EVENT_1F4 - const EVENT_1F5 - const EVENT_1F6 - const EVENT_1F7 - const EVENT_1F8 - const EVENT_1F9 - const EVENT_1FA - const EVENT_1FB - const EVENT_1FC - const EVENT_1FD - const EVENT_1FE - const EVENT_1FF - const EVENT_200 - const EVENT_201 - const EVENT_202 - const EVENT_203 - const EVENT_204 - const EVENT_205 - const EVENT_206 - const EVENT_207 - const EVENT_208 - const EVENT_209 - const EVENT_20A - const EVENT_20B - const EVENT_20C - const EVENT_20D - const EVENT_20E - const EVENT_20F - const EVENT_210 - const EVENT_211 - const EVENT_212 - const EVENT_213 - const EVENT_214 - const EVENT_215 - const EVENT_216 - const EVENT_217 - const EVENT_218 - const EVENT_219 - const EVENT_21A - const EVENT_21B - const EVENT_21C - const EVENT_21D - const EVENT_21E - const EVENT_21F - const EVENT_220 - const EVENT_221 - const EVENT_222 - const EVENT_223 - const EVENT_224 - const EVENT_225 - const EVENT_226 - const EVENT_227 - const EVENT_228 - const EVENT_229 - const EVENT_22A - const EVENT_22B - const EVENT_22C - const EVENT_22D - const EVENT_22E - const EVENT_22F - const EVENT_230 - const EVENT_231 - const EVENT_232 - const EVENT_233 - const EVENT_234 - const EVENT_235 - const EVENT_236 - const EVENT_237 - const EVENT_238 - const EVENT_239 - const EVENT_23A - const EVENT_23B - const EVENT_23C - const EVENT_23D - const EVENT_23E - const EVENT_23F - const EVENT_240 - const EVENT_241 - const EVENT_242 - const EVENT_243 - const EVENT_244 - const EVENT_245 - const EVENT_246 - const EVENT_247 - const EVENT_248 - const EVENT_249 - const EVENT_24A - const EVENT_24B - const EVENT_24C - const EVENT_24D - const EVENT_24E - const EVENT_24F - const EVENT_250 - const EVENT_251 - const EVENT_252 - const EVENT_253 - const EVENT_254 - const EVENT_255 - const EVENT_256 - const EVENT_257 +; Unused: next 339 events + + const_next 600 ; Kurt Apricorn events const EVENT_GAVE_KURT_RED_APRICORN const EVENT_GAVE_KURT_BLU_APRICORN @@ -659,8 +310,8 @@ const EVENT_ARNIE_READY_FOR_REMATCH const EVENT_ALAN_ASKED_FOR_PHONE_NUMBER const EVENT_ALAN_READY_FOR_REMATCH - const EVENT_287 ; unused - const EVENT_288 ; unused + const_skip ; unused + const_skip ; unused const EVENT_DANA_ASKED_FOR_PHONE_NUMBER const EVENT_DANA_READY_FOR_REMATCH const EVENT_CHAD_ASKED_FOR_PHONE_NUMBER @@ -683,7 +334,7 @@ const EVENT_PARRY_READY_FOR_REMATCH const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER const EVENT_ERIN_READY_FOR_REMATCH - const EVENT_29F ; unused + const_skip ; unused ; Ruins of Alph puzzles const EVENT_SOLVED_HO_OH_PUZZLE const EVENT_SOLVED_KABUTO_PUZZLE @@ -821,201 +472,9 @@ const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA const EVENT_LISTENED_TO_INITIAL_RADIO -; Unused - const EVENT_326 - const EVENT_327 - const EVENT_328 - const EVENT_329 - const EVENT_32A - const EVENT_32B - const EVENT_32C - const EVENT_32D - const EVENT_32E - const EVENT_32F - const EVENT_330 - const EVENT_331 - const EVENT_332 - const EVENT_333 - const EVENT_334 - const EVENT_335 - const EVENT_336 - const EVENT_337 - const EVENT_338 - const EVENT_339 - const EVENT_33A - const EVENT_33B - const EVENT_33C - const EVENT_33D - const EVENT_33E - const EVENT_33F - const EVENT_340 - const EVENT_341 - const EVENT_342 - const EVENT_343 - const EVENT_344 - const EVENT_345 - const EVENT_346 - const EVENT_347 - const EVENT_348 - const EVENT_349 - const EVENT_34A - const EVENT_34B - const EVENT_34C - const EVENT_34D - const EVENT_34E - const EVENT_34F - const EVENT_350 - const EVENT_351 - const EVENT_352 - const EVENT_353 - const EVENT_354 - const EVENT_355 - const EVENT_356 - const EVENT_357 - const EVENT_358 - const EVENT_359 - const EVENT_35A - const EVENT_35B - const EVENT_35C - const EVENT_35D - const EVENT_35E - const EVENT_35F - const EVENT_360 - const EVENT_361 - const EVENT_362 - const EVENT_363 - const EVENT_364 - const EVENT_365 - const EVENT_366 - const EVENT_367 - const EVENT_368 - const EVENT_369 - const EVENT_36A - const EVENT_36B - const EVENT_36C - const EVENT_36D - const EVENT_36E - const EVENT_36F - const EVENT_370 - const EVENT_371 - const EVENT_372 - const EVENT_373 - const EVENT_374 - const EVENT_375 - const EVENT_376 - const EVENT_377 - const EVENT_378 - const EVENT_379 - const EVENT_37A - const EVENT_37B - const EVENT_37C - const EVENT_37D - const EVENT_37E - const EVENT_37F - const EVENT_380 - const EVENT_381 - const EVENT_382 - const EVENT_383 - const EVENT_384 - const EVENT_385 - const EVENT_386 - const EVENT_387 - const EVENT_388 - const EVENT_389 - const EVENT_38A - const EVENT_38B - const EVENT_38C - const EVENT_38D - const EVENT_38E - const EVENT_38F - const EVENT_390 - const EVENT_391 - const EVENT_392 - const EVENT_393 - const EVENT_394 - const EVENT_395 - const EVENT_396 - const EVENT_397 - const EVENT_398 - const EVENT_399 - const EVENT_39A - const EVENT_39B - const EVENT_39C - const EVENT_39D - const EVENT_39E - const EVENT_39F - const EVENT_3A0 - const EVENT_3A1 - const EVENT_3A2 - const EVENT_3A3 - const EVENT_3A4 - const EVENT_3A5 - const EVENT_3A6 - const EVENT_3A7 - const EVENT_3A8 - const EVENT_3A9 - const EVENT_3AA - const EVENT_3AB - const EVENT_3AC - const EVENT_3AD - const EVENT_3AE - const EVENT_3AF - const EVENT_3B0 - const EVENT_3B1 - const EVENT_3B2 - const EVENT_3B3 - const EVENT_3B4 - const EVENT_3B5 - const EVENT_3B6 - const EVENT_3B7 - const EVENT_3B8 - const EVENT_3B9 - const EVENT_3BA - const EVENT_3BB - const EVENT_3BC - const EVENT_3BD - const EVENT_3BE - const EVENT_3BF - const EVENT_3C0 - const EVENT_3C1 - const EVENT_3C2 - const EVENT_3C3 - const EVENT_3C4 - const EVENT_3C5 - const EVENT_3C6 - const EVENT_3C7 - const EVENT_3C8 - const EVENT_3C9 - const EVENT_3CA - const EVENT_3CB - const EVENT_3CC - const EVENT_3CD - const EVENT_3CE - const EVENT_3CF - const EVENT_3D0 - const EVENT_3D1 - const EVENT_3D2 - const EVENT_3D3 - const EVENT_3D4 - const EVENT_3D5 - const EVENT_3D6 - const EVENT_3D7 - const EVENT_3D8 - const EVENT_3D9 - const EVENT_3DA - const EVENT_3DB - const EVENT_3DC - const EVENT_3DD - const EVENT_3DE - const EVENT_3DF - const EVENT_3E0 - const EVENT_3E1 - const EVENT_3E2 - const EVENT_3E3 - const EVENT_3E4 - const EVENT_3E5 - const EVENT_3E6 - const EVENT_3E7 +; Unused: next 194 events + + const_next 1000 ; Trainer flags ; Swimmer F const EVENT_BEAT_SWIMMERF_ELAINE @@ -1095,7 +554,7 @@ const EVENT_BEAT_BURGLAR_DUNCAN const EVENT_BEAT_BURGLAR_EDDIE const EVENT_BEAT_BURGLAR_COREY - const EVENT_430 ; unused + const_skip ; unused ; Biker const EVENT_BEAT_BIKER_BENNY const EVENT_BEAT_BIKER_KAZU @@ -1287,7 +746,7 @@ const EVENT_BEAT_POKEFANF_BEVERLY3 const EVENT_BEAT_POKEFANF_GEORGIA ; Kimono Girl - const EVENT_4DE ; unused + const_skip ; unused const EVENT_BEAT_KIMONO_GIRL_NAOKO const EVENT_BEAT_KIMONO_GIRL_SAYO const EVENT_BEAT_KIMONO_GIRL_ZUKI @@ -1529,138 +988,9 @@ const EVENT_BEAT_ELITE_4_BRUNO const EVENT_BEAT_ELITE_4_KAREN const EVENT_BEAT_CHAMPION_LANCE -; Unused - const EVENT_5BD - const EVENT_5BE - const EVENT_5BF - const EVENT_5C0 - const EVENT_5C1 - const EVENT_5C2 - const EVENT_5C3 - const EVENT_5C4 - const EVENT_5C5 - const EVENT_5C6 - const EVENT_5C7 - const EVENT_5C8 - const EVENT_5C9 - const EVENT_5CA - const EVENT_5CB - const EVENT_5CC - const EVENT_5CD - const EVENT_5CE - const EVENT_5CF - const EVENT_5D0 - const EVENT_5D1 - const EVENT_5D2 - const EVENT_5D3 - const EVENT_5D4 - const EVENT_5D5 - const EVENT_5D6 - const EVENT_5D7 - const EVENT_5D8 - const EVENT_5D9 - const EVENT_5DA - const EVENT_5DB - const EVENT_5DC - const EVENT_5DD - const EVENT_5DE - const EVENT_5DF - const EVENT_5E0 - const EVENT_5E1 - const EVENT_5E2 - const EVENT_5E3 - const EVENT_5E4 - const EVENT_5E5 - const EVENT_5E6 - const EVENT_5E7 - const EVENT_5E8 - const EVENT_5E9 - const EVENT_5EA - const EVENT_5EB - const EVENT_5EC - const EVENT_5ED - const EVENT_5EE - const EVENT_5EF - const EVENT_5F0 - const EVENT_5F1 - const EVENT_5F2 - const EVENT_5F3 - const EVENT_5F4 - const EVENT_5F5 - const EVENT_5F6 - const EVENT_5F7 - const EVENT_5F8 - const EVENT_5F9 - const EVENT_5FA - const EVENT_5FB - const EVENT_5FC - const EVENT_5FD - const EVENT_5FE - const EVENT_5FF - const EVENT_600 - const EVENT_601 - const EVENT_602 - const EVENT_603 - const EVENT_604 - const EVENT_605 - const EVENT_606 - const EVENT_607 - const EVENT_608 - const EVENT_609 - const EVENT_60A - const EVENT_60B - const EVENT_60C - const EVENT_60D - const EVENT_60E - const EVENT_60F - const EVENT_610 - const EVENT_611 - const EVENT_612 - const EVENT_613 - const EVENT_614 - const EVENT_615 - const EVENT_616 - const EVENT_617 - const EVENT_618 - const EVENT_619 - const EVENT_61A - const EVENT_61B - const EVENT_61C - const EVENT_61D - const EVENT_61E - const EVENT_61F - const EVENT_620 - const EVENT_621 - const EVENT_622 - const EVENT_623 - const EVENT_624 - const EVENT_625 - const EVENT_626 - const EVENT_627 - const EVENT_628 - const EVENT_629 - const EVENT_62A - const EVENT_62B - const EVENT_62C - const EVENT_62D - const EVENT_62E - const EVENT_62F - const EVENT_630 - const EVENT_631 - const EVENT_632 - const EVENT_633 - const EVENT_634 - const EVENT_635 - const EVENT_636 - const EVENT_637 - const EVENT_638 - const EVENT_639 - const EVENT_63A - const EVENT_63B - const EVENT_63C - const EVENT_63D - const EVENT_63E - const EVENT_63F +; Unused: next 131 events + + const_next 1600 ; Sprite visibility flags ; When these events are cleared, the sprite becomes visible; when set, the sprite is hidden. ; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility. @@ -1963,10 +1293,9 @@ const EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_LEFT const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_SAGE_RIGHT - const EVENT_768 ; unused - const EVENT_769 ; unused - const EVENT_76A ; unused - const EVENT_76B ; unused +; Unused: next 4 events + + const_next 1900 ; Kanto people const EVENT_ROUTE_24_ROCKET const EVENT_CERULEAN_GYM_ROCKET @@ -2001,4 +1330,7 @@ const EVENT_ROUTE_12_NUGGET const EVENT_ROUTE_15_PP_UP const EVENT_ROUTE_25_PROTEIN -NUM_EVENTS EQU const_value ; 78c +; Unused: next 116 events + + const_next 2048 +NUM_EVENTS EQU const_value ; 800 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 7061b86c..4763454e 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -197,6 +197,8 @@ const MIRAGE_MAIL ; bd const ITEM_BE ; be +__tmhm_value__ = 1 + add_tm: MACRO ; Defines three constants: ; - TM_\1: the item id, starting at $bf @@ -205,17 +207,17 @@ add_tm: MACRO ; The first usage also defines TM01 as the first TM item id. if !DEF(TM01) TM01 EQU const_value - enum_start 1 endc -if __enum__ < 10 -MOVE_FOR_TM EQUS "TM0{d:__enum__}_MOVE" +if __tmhm_value__ < 10 +MOVE_FOR_TM EQUS "TM0{d:__tmhm_value__}_MOVE" else -MOVE_FOR_TM EQUS "TM{d:__enum__}_MOVE" +MOVE_FOR_TM EQUS "TM{d:__tmhm_value__}_MOVE" endc MOVE_FOR_TM = \1 PURGE MOVE_FOR_TM const TM_\1 - enum \1_TMNUM +\1_TMNUM EQU __tmhm_value__ +__tmhm_value__ = __tmhm_value__ + 1 ENDM ; see data/moves/tmhm_moves.asm for moves @@ -271,7 +273,7 @@ ENDM add_tm FIRE_PUNCH ; f0 add_tm FURY_CUTTER ; f1 add_tm NIGHTMARE ; f2 -NUM_TMS EQU __enum__ - 1 +NUM_TMS EQU __tmhm_value__ - 1 add_hm: MACRO ; Defines three constants: @@ -282,7 +284,7 @@ add_hm: MACRO if !DEF(HM01) HM01 EQU const_value endc -HM_VALUE EQU __enum__ - NUM_TMS +HM_VALUE EQU __tmhm_value__ - NUM_TMS if HM_VALUE < 10 MOVE_FOR_HM EQUS "HM0{d:HM_VALUE}_MOVE" else @@ -292,7 +294,8 @@ MOVE_FOR_HM = \1 PURGE MOVE_FOR_HM PURGE HM_VALUE const HM_\1 - enum \1_TMNUM +\1_TMNUM EQU __tmhm_value__ +__tmhm_value__ = __tmhm_value__ + 1 ENDM add_hm CUT ; f3 @@ -302,9 +305,9 @@ ENDM add_hm FLASH ; f7 add_hm WHIRLPOOL ; f8 add_hm WATERFALL ; f9 -NUM_HMS EQU __enum__ - NUM_TMS - 1 +NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1 -NUM_TM_HM EQU __enum__ - 1 +NUM_TM_HM EQU __tmhm_value__ - 1 const ITEM_FA ; fa diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index 5040ab04..4c295d5b 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -1,6 +1,6 @@ ; item_attributes struct members (see data/items/attributes.asm) const_def - const ITEMATTR_PRICE + const ITEMATTR_PRICE_LO const ITEMATTR_PRICE_HI const ITEMATTR_EFFECT const ITEMATTR_PARAM @@ -19,10 +19,12 @@ ITEMATTR_STRUCT_LENGTH EQU const_value ; item menu types ; UseItem.dw indexes (see engine/items/pack.asm) ; UseRegisteredItem.SwitchTo indexes (see engine/overworld/select_menu.asm) -ITEMMENU_NOUSE EQU 0 -ITEMMENU_CURRENT EQU 4 -ITEMMENU_PARTY EQU 5 -ITEMMENU_CLOSE EQU 6 + const_def + const ITEMMENU_NOUSE ; 0 + const_skip 3 + const ITEMMENU_CURRENT ; 4 + const ITEMMENU_PARTY ; 5 + const ITEMMENU_CLOSE ; 6 ; item actions CANT_SELECT_F EQU 6 @@ -57,13 +59,13 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_BERRY const HELD_2 const HELD_LEFTOVERS - const HELD_4 + const_skip const HELD_5 const HELD_RESTORE_PP - const HELD_7 + const_skip const HELD_CLEANSE_TAG - const_def 10 + const_next 10 const HELD_HEAL_POISON const HELD_HEAL_FREEZE const HELD_HEAL_BURN @@ -72,7 +74,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_HEAL_STATUS const HELD_HEAL_CONFUSION - const_def 20 + const_next 20 const HELD_PREVENT_POISON const HELD_PREVENT_BURN const HELD_PREVENT_FREEZE @@ -80,7 +82,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_PREVENT_PARALYZE const HELD_PREVENT_CONFUSE - const_def 30 + const_next 30 const HELD_30 const HELD_ATTACK_UP const HELD_DEFENSE_UP @@ -91,12 +93,12 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_EVASION_UP const HELD_38 - const_def 40 - const HELD_40 - const HELD_41 + const_next 40 + const_skip + const_skip const HELD_METAL_POWDER - const_def 50 + const_next 50 const HELD_NORMAL_BOOST const HELD_FIGHTING_BOOST const HELD_FLYING_BOOST @@ -115,7 +117,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_DARK_BOOST const HELD_STEEL_BOOST - const_def 70 + const_next 70 const HELD_CATCH_CHANCE const HELD_71 const HELD_ESCAPE @@ -124,5 +126,5 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_FLINCH const HELD_AMULET_COIN const HELD_BRIGHTPOWDER - const HELD_78 + const_skip const HELD_FOCUS_BAND diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9bd588b9..33b1e25b 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,6 +1,6 @@ newgroup: MACRO const_value = const_value + 1 - enum_start 1 +__map_value__ = 1 ENDM map_const: MACRO @@ -8,7 +8,8 @@ map_const: MACRO ;\2: width: in blocks ;\3: height: in blocks GROUP_\1 EQU const_value - enum MAP_\1 +MAP_\1 EQU __map_value__ +__map_value__ = __map_value__ + 1 \1_WIDTH EQU \2 \1_HEIGHT EQU \3 ENDM diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 51480453..374b5cf6 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -33,8 +33,8 @@ const OBJECT_1E ; 1e const OBJECT_1F ; 1f const OBJECT_RANGE ; 20 - ; 21-27 are not used -OBJECT_LENGTH EQU 40 + const_skip 7 +OBJECT_LENGTH EQU const_value NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs ; object_struct OBJECT_FACING values @@ -99,21 +99,20 @@ ABSOLUTE_TILE_ID EQU 1 << ABSOLUTE_TILE_ID_F ; map_object struct members (see macros/wram.asm) const_def const MAPOBJECT_OBJECT_STRUCT_ID ; 0 - const MAPOBJECT_SPRITE ; 1 - const MAPOBJECT_Y_COORD ; 2 - const MAPOBJECT_X_COORD ; 3 - const MAPOBJECT_MOVEMENT ; 4 - const MAPOBJECT_RADIUS ; 5 - const MAPOBJECT_HOUR ; 6 - const MAPOBJECT_TIMEOFDAY ; 7 - const MAPOBJECT_COLOR ; 8 - const MAPOBJECT_RANGE ; 9 - const MAPOBJECT_SCRIPT_POINTER ; a - const MAPOBJECT_POINTER_HI ; b - const MAPOBJECT_EVENT_FLAG ; c - const MAPOBJECT_FLAG_HI ; d - const MAPOBJECT_E ; unused - const MAPOBJECT_F ; unused + const MAPOBJECT_SPRITE ; 1 + const MAPOBJECT_Y_COORD ; 2 + const MAPOBJECT_X_COORD ; 3 + const MAPOBJECT_MOVEMENT ; 4 + const MAPOBJECT_RADIUS ; 5 + const MAPOBJECT_HOUR ; 6 + const MAPOBJECT_TIMEOFDAY ; 7 + const MAPOBJECT_COLOR ; 8 + const MAPOBJECT_RANGE ; 9 + const MAPOBJECT_SCRIPT_POINTER ; a + const_skip ; high MAPOBJECT_SCRIPT_POINTER byte + const MAPOBJECT_EVENT_FLAG ; c + const_skip ; high MAPOBJECT_EVENT_FLAG byte + const_skip 2 ; unused MAPOBJECT_LENGTH EQU const_value ; SpriteMovementData struct members (see data/sprites/map_objects.asm) diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 28ea3a17..69d3af36 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -86,7 +86,7 @@ HMENURETURN_ASM EQU %11111111 const PARTYMENUACTION_GIVE_MON_FEMALE ; unused const PARTYMENUACTION_GIVE_ITEM ; PrintPartyMenuActionText arguments (see engine/pokemon/party_menu.asm) - const_def $f0 + const_next $f0 const PARTYMENUTEXT_HEAL_PSN const PARTYMENUTEXT_HEAL_BRN const PARTYMENUTEXT_HEAL_FRZ diff --git a/constants/move_constants.asm b/constants/move_constants.asm index b26f86d0..1a3d4f1a 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -259,11 +259,8 @@ const BEAT_UP ; fb NUM_ATTACKS EQU const_value - 1 - const MOVE_OR_ANIM_FC ; fc - const MOVE_OR_ANIM_FD ; fd - const MOVE_OR_ANIM_FE ; fe - ; Battle animations use the same constants as the moves up to this point + const_next $ff const ANIM_SWEET_SCENT_2 ; ff const ANIM_THROW_POKE_BALL ; 100 const ANIM_SEND_OUT_MON ; 101 diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm index 2483d9df..d4db60e9 100644 --- a/constants/phone_constants.asm +++ b/constants/phone_constants.asm @@ -8,9 +8,9 @@ const PHONE_SCHOOLBOY_JACK const PHONE_POKEFAN_BEVERLY const PHONE_SAILOR_HUEY - const PHONE_08 - const PHONE_09 - const PHONE_0A + const_skip + const_skip + const_skip const PHONE_COOLTRAINERM_GAVEN const PHONE_COOLTRAINERF_BETH const PHONE_BIRDKEEPER_JOSE @@ -25,7 +25,7 @@ const PHONE_JUGGLER_IRWIN const PHONE_BUG_CATCHER_ARNIE const PHONE_SCHOOLBOY_ALAN - const PHONE_19 + const_skip const PHONE_LASS_DANA const PHONE_SCHOOLBOY_CHAD const PHONE_POKEFANM_DEREK @@ -58,12 +58,12 @@ const PHONE_CONTACT_MAP_NUMBER const PHONE_CONTACT_SCRIPT1_TIME const PHONE_CONTACT_SCRIPT1_BANK - const PHONE_CONTACT_SCRIPT1_ADDR_LO - const PHONE_CONTACT_SCRIPT1_ADDR_HI + const PHONE_CONTACT_SCRIPT1_ADDR + const_skip ; high PHONE_CONTACT_SCRIPT1_ADDR byte const PHONE_CONTACT_SCRIPT2_TIME const PHONE_CONTACT_SCRIPT2_BANK - const PHONE_CONTACT_SCRIPT2_ADDR_LO - const PHONE_CONTACT_SCRIPT2_ADDR_HI + const PHONE_CONTACT_SCRIPT2_ADDR + const_skip ; high PHONE_CONTACT_SCRIPT2_ADDR byte PHONE_CONTACT_SIZE EQU const_value ; maximum number of pokegear contacts diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 2f0ce2c7..d336521a 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -266,9 +266,8 @@ JOHTO_POKEMON EQU const_value const HO_OH ; fa const CELEBI ; fb NUM_POKEMON EQU const_value - 1 - const MON_FC ; fc + const_skip ; fc const EGG ; fd - const MON_FE ; fe ; Unown forms ; indexes for: diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index c0beb93c..161fcbc5 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -99,7 +99,7 @@ const SPRITE_SILVER_TROPHY ; 5f ; SpriteMons indexes (see data/sprites/sprite_mons.asm) - const_def $80 + const_next $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN ; 80 const SPRITE_GEODUDE ; 81 @@ -138,12 +138,12 @@ SPRITE_POKEMON EQU const_value const SPRITE_HO_OH ; a2 ; special GetMonSprite values (see engine/overworld/overworld.asm) - const_def $e0 + const_next $e0 const SPRITE_DAY_CARE_MON_1 ; e0 const SPRITE_DAY_CARE_MON_2 ; e1 ; wVariableSprites indexes (see wram.asm) - const_def $f0 + const_next $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE ; f0 const SPRITE_DOLL_1 ; f1 diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index 329833b1..271faca1 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -1,7 +1,7 @@ ; overworld_sprite struct members (see data/sprites.asm) const_def const SPRITEDATA_ADDR ; 0 - const SPRITEDATA_ADDR_HI ; 1 + const_skip ; high SPRITEDATA_ADDR byte const SPRITEDATA_SIZE ; 2 const SPRITEDATA_BANK ; 3 const SPRITEDATA_TYPE ; 4 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index e3952834..deb8791a 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,5 +1,8 @@ +__trainer_class__ = 0 + trainerclass: MACRO - enum \1 +\1 EQU __trainer_class__ +__trainer_class__ = __trainer_class__ + 1 const_value = 1 ENDM @@ -13,8 +16,7 @@ ENDM ; - TrainerPicPointers (see data/trainers/pic_pointers.asm) ; - TrainerPalettes (see data/trainers/palettes.asm) ; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm) - enum_start -CHRIS EQU __enum__ +CHRIS EQU __trainer_class__ trainerclass TRAINER_NONE ; 0 const PHONECONTACT_MOM const PHONECONTACT_BIKESHOP @@ -654,4 +656,4 @@ CHRIS EQU __enum__ const GRUNTF_4 const GRUNTF_5 -NUM_TRAINER_CLASSES EQU __enum__ +NUM_TRAINER_CLASSES EQU __trainer_class__ diff --git a/constants/trainer_data_constants.asm b/constants/trainer_data_constants.asm index 00c1c6c3..0f893253 100644 --- a/constants/trainer_data_constants.asm +++ b/constants/trainer_data_constants.asm @@ -4,16 +4,14 @@ const TRNATTR_ITEM2 ; 1 const TRNATTR_BASEMONEY ; 2 const TRNATTR_AI_MOVE_WEIGHTS ; 3 - const TRNATTR_AI2 ; 4 + const_skip ; high TRNATTR_AI_MOVE_WEIGHTS byte const TRNATTR_AI_ITEM_SWITCH ; 5 - const TRNATTR_AI4 ; 6 + const_skip ; high TRNATTR_AI_ITEM_SWITCH byte NUM_TRAINER_ATTRIBUTES EQU const_value ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags) ; AIScoringPointers indexes (see engine/battle/ai/move.asm) const_def - const NO_AI -const_value = 0 shift_const AI_BASIC shift_const AI_SETUP shift_const AI_TYPES @@ -24,27 +22,24 @@ const_value = 0 shift_const AI_CAUTIOUS shift_const AI_STATUS shift_const AI_RISKY - shift_const AI_10 - shift_const AI_11 - shift_const AI_12 - shift_const AI_13 - shift_const AI_14 - shift_const AI_15 +NO_AI EQU 0 ; TRNATTR_AI_ITEM_SWITCH bit flags -CONTEXT_USE_F EQU 6 -UNKNOWN_USE_F EQU 5 -ALWAYS_USE_F EQU 4 -SWITCH_SOMETIMES_F EQU 2 -SWITCH_RARELY_F EQU 1 -SWITCH_OFTEN_F EQU 0 + const_def + const SWITCH_OFTEN_F ; 0 + const SWITCH_RARELY_F ; 1 + const SWITCH_SOMETIMES_F ; 2 + const_skip ; 3 + const ALWAYS_USE_F ; 4 + const UNKNOWN_USE_F ; 5 + const CONTEXT_USE_F ; 6 -CONTEXT_USE EQU 1 << CONTEXT_USE_F -UNKNOWN_USE EQU 1 << UNKNOWN_USE_F -ALWAYS_USE EQU 1 << ALWAYS_USE_F -SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F -SWITCH_RARELY EQU 1 << SWITCH_RARELY_F SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F +SWITCH_RARELY EQU 1 << SWITCH_RARELY_F +SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F +ALWAYS_USE EQU 1 << ALWAYS_USE_F +UNKNOWN_USE EQU 1 << UNKNOWN_USE_F +CONTEXT_USE EQU 1 << CONTEXT_USE_F ; TrainerTypes indexes (see engine/battle/read_trainer_party.asm) const_def diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 3fb9649a..c18d71c7 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -19,15 +19,7 @@ PHYSICAL EQU const_value const STEEL UNUSED_TYPES EQU const_value - const TYPE_10 - const TYPE_11 - const TYPE_12 - const TYPE_13 - const TYPE_14 - const TYPE_15 - const TYPE_16 - const TYPE_17 - const TYPE_18 + const_next 19 const CURSE_TYPE UNUSED_TYPES_END EQU const_value |