7307fc8dce
Use constants for bit/set/res more
2018-04-05 11:44:02 -04:00
32ed487a47
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
2018-02-03 19:42:56 -05:00
08891da822
const_def N
2018-01-31 11:38:45 -05:00
7d3ad2136a
Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm
2018-01-25 18:10:41 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
b45f89f80c
More constants and data tables
2018-01-11 01:45:27 -05:00
0a3b251dcb
Arrays end with -1, not $ff
2018-01-10 22:53:42 -05:00
c8575823a0
Battle data goes in data/battle/
...
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -05:00
a849c3557b
More comments
...
Fix some constants
2018-01-09 15:39:48 -05:00
69762a2bfd
SET -> set
2017-12-29 17:15:01 +01:00
d15429e3b7
Separate constants in a consistent way
2017-12-26 22:25:11 -05:00
b5417fafec
Split battle/ into data/ and engine/ components
2017-12-26 17:47:05 -05:00
24f0e7d045
Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers
2017-12-26 12:50:32 -05:00
e34e68095d
Resolve #428 : Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 14:23:16 -05:00
148fd299f9
Add more constants for some maximum values
2017-12-24 19:49:57 -05:00
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
fd14253796
Clean up labels in battle/moves/move_effects.asm
...
There were a lot of unused labels in there, and a few confusing
misnomers around move_effects_pointers.asm. They now match up exactly
with the names in battle_constants.asm.
Also renamed a few effects, to make their purpose clearer, and to match
up with their respective event script commands:
EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT
EFFECT_HAZE -> EFFECT_RESET_STATS
EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH
EFFECT_BIND -> EFFECT_TRAP_TARGET
EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT
EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT
EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT
EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 16:36:13 +01:00
866ca63c51
Fix a misleading define for SLP
2017-06-24 17:49:31 -04:00
ac824f62fc
More battle core labels
2015-11-08 13:27:26 -05:00
d8aa438644
More battle command labels
2015-11-06 20:55:16 -05:00
f0830f084f
BATTLEACTION constants
2015-11-06 09:04:27 -05:00
0a244e043c
Move battle start animation functions to its own file
2015-10-19 10:23:58 -04:00
60cd04b023
Trainer data structure and field move functions
...
Trainer data in map scripts is now a macro-defined structure.
Field move functions in main.asm are now nearly completely annotated, with local references.
Trailing white space deleted.
2015-07-18 23:45:39 -04:00
3a9f537f8a
Enumerate various constants
2015-07-13 01:44:27 -04:00
58e5b396c1
Use more struct offsets and constants for monsters and moves.
2015-03-03 18:31:57 -08:00
43a961af42
More unknown mobile code and MIN_LEVEL.
2014-12-26 11:31:55 -08:00
da799c80d4
Better trainer AI comments and finish off trainer attributes.
2014-08-13 19:44:56 -07:00
d6fbdfb8de
More comments and constants in move effect command code.
...
Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:52 -07:00
dbe4c7ab67
Fix some misnamed substatus constants.
...
SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE.
SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT.
Substatus 5 bit 4 was actually SUBSTATUS_ENCORED.
Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
c2dba43188
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
e23f341258
Battle type constants in the wild.
...
Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
eb9fc6676c
More battle code cleanup.
...
- Use more substatus constants.
- Reformat some code to be more atomic.
- Add constants for unused status prevention held item effects.
- Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
e2b00ea117
shorten SP_ATTACK and SP_DEFENSE move effect constants
2013-12-30 23:12:06 -05:00
4bb8c82d8a
battle animation constants
2013-12-19 04:47:39 -05:00
41dbd3b4a6
move constants files into constants/
2013-06-17 21:30:25 -04:00
Rangi