Commit Graph

60 Commits

Author SHA1 Message Date
Rangi
b035d9fb89 Define constants for wBillsPCPokemonList entries (#1183) 2025-05-31 15:07:44 -04:00
Rangi42
098944485b Rename "city" treemon set to "none", since it has no encounters 2025-04-21 12:42:57 -04:00
SnorlaxMonster
b9dce73573 Rename MON_ID to MON_OT_ID (#1114)
* Rename MON_ID to MON_TRAINER_ID

The constant name MON_ID implies it relates to the ID number of the
Pokémon itself. However, it actually refers to the Trainer ID number of
the Pokémon's Original Trainer. Renaming it to MON_TRAINER_ID makes it
substantially more clear what its purpose is.

The original definition of MON_ID is preserved in macros/legacy.asm

* Remove MON_ID from macros/legacy.asm

Co-authored-by: Sylvie <35663410+Rangi42@users.noreply.github.com>

* Apply rename to missed file

* Rename to `MON_OT_ID`

---------

Co-authored-by: SnorlaxMonster <snorlaxmonster@users.noreply.github.com>
Co-authored-by: Sylvie <35663410+Rangi42@users.noreply.github.com>
Co-authored-by: vulcandth <vulcandth@gmail.com>
2024-04-27 12:16:34 -05:00
vulcandth
4c239a6f65 Rename macros/wram.asm to macros/ram.asm (#1003) 2022-09-11 01:05:07 -04:00
vulcandth
3648afda16 RGBDS syntax updates (#905)
New MACRO and DEF syntax
2022-06-06 17:25:42 -04:00
Rangi
13837b429c Define the *_WILDDATA_LENGTH equations to match their data representation 2022-02-12 10:01:12 -05:00
Rangi
1f9e688b76 MON_PKRUS -> MON_POKERUS 2021-06-07 20:00:21 -04:00
Rangi
efd1006917 Use {interpolation} to generate sequences of RAM labels
This makes the table_width/assert_table_length usages unnecessary, and also keeps the labels automatically up to date if the length constants change.
2021-04-27 12:11:39 -04:00
Rangi
dbe2360ecd Miscellaneous cleanup 2021-03-22 16:41:17 -04:00
Rangi
0506e5b1b9 Assert the sBox1-14 tables have NUM_BOXES entries 2021-03-21 17:47:53 -04:00
Rangi
6c8f8609cb Assert some more table widths 2021-03-17 11:38:01 -04:00
Rangi
98da09b3e9 Define more struct offset constants with rsreset instead of const_def
This was discussed in #739
2021-03-04 18:15:38 -05: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
9dcdad5e60 Comment, remove, or revise many unreferenced labels 2020-10-26 20:29:58 -04:00
Rangi
f2efda1f68 Identify more unnamed labels 2020-06-29 12:25:58 -04:00
Rangi
5f197c53f4 Clean up some percentage values 2020-05-07 14:21:24 -04:00
Rangi
6a6ba10315 rgbds supports 'X - 1' instead of 'X + -1' 2020-03-21 14:01:05 -04:00
Rangi
d482dc28f4 Identify four padding bytes in base data as beta front/back pic pointers 2020-02-04 11:07:16 -05:00
Rangi
b24cd55f96 Correct the older+younger haircut brothers' labels and constants 2019-05-18 13:27:32 -04:00
Rangi
b975f3e068 Clean up some Odd Egg and Battle Tower code and data
Fixes #589
2019-01-02 19:04:50 -05:00
Rangi
67d1364c7a Fix triple newlines left over from removing address comments 2018-06-24 23:22:50 -04:00
Rangi
5a58f90ec6 FISHGROUP_DATA_LENGTH 2018-06-24 11:46:55 -04:00
mid-kid
2d8f3a0654 Use Stadium 2 Egg Group names
Out of the current two most prevalent official conventions, this one was
chosen, because they're used in a direct counterpart to this game, and
thus feel more accurate.
2018-04-05 07:54:20 +02:00
mid-kid
1891879b62 GENDERLESS -> GENDER_UNKNOWN
This is how they're called in official sources, and it fits better with
the other `GENDER_` constants.
2018-04-05 07:54:20 +02:00
Rangi
7453bd1aa8 "HUMANSHAPE, aka Humanshape" 2018-02-25 22:38:09 -05:00
Rangi
409fd9d33f Comment Stadium 2 alternative egg group names 2018-02-25 22:11:32 -05:00
Rangi
60add76ee7 * Remove rept 4 (fa3192e)
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
2018-02-25 19:23:01 -05: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
e32e5212af use "x + -1" not "x +- 1"
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
Rangi
0eeb00d6ac Official egg group names 2018-01-31 12:03:43 -05:00
Rangi
b8f4b1b8a7 MINERAL egg group works 2018-01-31 11:45:18 -05:00
Rangi
08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi
dcc0ca9b83 Move some more constants out of misc_constants.asm 2018-01-25 17:30:13 -05:00
Rangi
0380c2a493 Move some more constants out of misc_constants.asm 2018-01-25 17:00:31 -05:00
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
Rangi
94ae404732 Separate data/mon_menu.asm 2018-01-23 10:46:26 -05:00
Rangi
9e8f33d605 Cleaner roammon and treemon data 2018-01-22 11:30:17 -05:00
Remy Oukaour
7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -05:00
Remy Oukaour
94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Remy Oukaour
1a2bc57841 Event script–related constants go in constants/script_constants.asm 2018-01-11 02:35:46 -05:00
Remy Oukaour
a8cf8979d9 Do a little cleanup towards issue #465 2018-01-09 17:20:47 -05:00
xCrystal
69762a2bfd SET -> set 2017-12-29 17:15:01 +01:00
Remy Oukaour
e614dd1278 gfx/pokemon/animation.asm → engine/pic_animation.asm
Correct comment in constants/pokemon_constants.asm
2017-12-27 01:58:36 -05:00
Remy Oukaour
35a3a19fda Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
Remy Oukaour
b5417fafec Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
Remy Oukaour
f96aab4014 Correct some documentation comments 2017-12-15 21:32:43 -05:00
Remy Oukaour
6ab1d028bb Split items/ and trainers/ into their data/ and engine/ components
Move some data into a pokemon/ subdirectory
2017-12-14 23:00:54 -05:00
Remy Oukaour
0e7a101e41 Use constants for gender ratios 2017-12-13 17:59:14 -05:00
Remy Oukaour
4afc2f01ef Add member constants for the base data struct, same as most other structs 2017-12-11 17:35:35 -05:00
Remy Oukaour
690442e31d Map dimensions are separate from other constants, same as pokemon_constants vs pokemon_data_constants 2017-12-11 16:51:12 -05:00