Commit Graph

53 Commits

Author SHA1 Message Date
xCrystal
d6001be90c Sync with pokecrystal up to 8873506b1 2023-09-24 14:21:42 +02:00
vulcandth
4c239a6f65
Rename macros/wram.asm to macros/ram.asm (#1003) 2022-09-11 01:05:07 -04:00
vulcandth
5f0597e944
Rename SLP to SLP_MASK (#918)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-17 22:25:56 -04:00
vulcandth
3648afda16
RGBDS syntax updates (#905)
New MACRO and DEF syntax
2022-06-06 17:25:42 -04:00
Rangi
dbe2360ecd Miscellaneous cleanup 2021-03-22 16:41:17 -04:00
Rangi
3684296583 Revise some constant definitions 2021-03-16 18:06:18 -04:00
Rangi
40902ffe24 Verify data table sizes with table_width and assert_table_length macros
This was discussed in #706

It also uncovered some off-by-one issues with defining some constants.

A few structs now use rsreset/_RS to define their offset constants, as discussed in #739
2021-03-04 00:15:03 -05:00
Rangi
6a5edc98e9 Terser damage calculation constants 2020-11-09 16:12:19 -05:00
Rangi
650686476c Identify remaining battle AI labels 2020-10-21 21:34:18 -04:00
Rangi
c086de0c98 Use const_skip and const_next macros for brevity 2020-07-10 20:03:46 -04:00
Rangi
6ca82e5c86 Eliminate enum: use const instead, with case-by-case parallel const implementations 2020-07-08 15:30:23 -04:00
Rangi
7eef66af3f Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc
Also make .gitignore consistent with pokered
2020-07-05 15:12:53 -04:00
Rangi
6a6ba10315 rgbds supports 'X - 1' instead of 'X + -1' 2020-03-21 14:01:05 -04:00
Rangi
3b20a18200 Identify BATTLEACTION_D and _E (thanks, ax6) 2018-10-21 00:52:10 -04:00
Rangi
9dec80b07e Add meaningful aliases for wd265
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
2018-07-29 00:25:52 -04:00
Rangi
9a1ae1332c Correct NUM_STATS 2018-07-24 22:54:15 -04:00
Rangi
187e30cac8 Replace more hex values with constants or decimal 2018-07-11 15:40:09 -04:00
Rangi
7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -04:00
Rangi
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
Rangi
08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi
7d3ad2136a Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm 2018-01-25 18:10:41 -05:00
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f Prefix wram labels with w, part 1.
Handle edge cases first.
2018-01-23 16:45:34 -05:00
Remy Oukaour
b45f89f80c More constants and data tables 2018-01-11 01:45:27 -05:00
Remy Oukaour
0a3b251dcb Arrays end with -1, not $ff 2018-01-10 22:53:42 -05:00
Remy Oukaour
c8575823a0 Battle data goes in data/battle/
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -05:00
Remy Oukaour
a849c3557b More comments
Fix some constants
2018-01-09 15:39:48 -05:00
xCrystal
69762a2bfd SET -> set 2017-12-29 17:15:01 +01:00
Remy Oukaour
d15429e3b7 Separate constants in a consistent way 2017-12-26 22:25:11 -05:00
Remy Oukaour
b5417fafec Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
Remy Oukaour
24f0e7d045 Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05:00
Remy Oukaour
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
Remy Oukaour
148fd299f9 Add more constants for some maximum values 2017-12-24 19:49:57 -05:00
Remy Oukaour
512863989f Document constants with comments, actual names, and more thorough usage 2017-12-09 02:15:46 -05:00
mid-kid
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
yenatch
866ca63c51 Fix a misleading define for SLP 2017-06-24 17:49:31 -04:00
PikalaxALT
ac824f62fc More battle core labels 2015-11-08 13:27:26 -05:00
PikalaxALT
d8aa438644 More battle command labels 2015-11-06 20:55:16 -05:00
PikalaxALT
f0830f084f BATTLEACTION constants 2015-11-06 09:04:27 -05:00
PikalaxALT
0a244e043c Move battle start animation functions to its own file 2015-10-19 10:23:58 -04:00
PikalaxALT
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
PikalaxALT
3a9f537f8a Enumerate various constants 2015-07-13 01:44:27 -04:00
yenatch
58e5b396c1 Use more struct offsets and constants for monsters and moves. 2015-03-03 18:31:57 -08:00
yenatch
43a961af42 More unknown mobile code and MIN_LEVEL. 2014-12-26 11:31:55 -08:00
yenatch
da799c80d4 Better trainer AI comments and finish off trainer attributes. 2014-08-13 19:44:56 -07:00
yenatch
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
yenatch
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
yenatch
c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -07:00
yenatch
e23f341258 Battle type constants in the wild.
Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
yenatch
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