yenatch
f44f306cfd
Merge pull request #477 from mid-kid/master
...
Medium-sized cleanups
2018-02-25 20:12:59 -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
cbd423ec08
Format map object attributes like trainer attributes, in preparation for bit flag constants
2018-02-25 16:49:03 -05:00
Rangi
eb3726bba0
NO_ITEM == 0
2018-02-25 16:48:31 -05:00
Rangi
e018a9d005
Sprite data values match GetSpriteLength return values and are not limited to multiples of 4
2018-02-25 16:32:40 -05:00
mid-kid
e8bc86d1fe
Pkmn -> Mon
...
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.
Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
2018-02-22 17:39:06 +01:00
Rangi
612fd7cb96
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
mid-kid
89c5f0adf0
Comment GeneratePartyMonStats
2018-02-09 22:21:59 +01:00
Rangi
62d6f72bb3
Make tileset palette maps easier to edit
2018-02-09 13:50:20 -05:00
Rangi
96c058f0a7
No redundant item effect labels
2018-02-05 13:03:05 -05:00
luckytyphlosion
8b007e8d51
Fix more w-izing edge cases.
2018-02-04 22:45:04 -05:00
Rangi
f8f3294130
Add ROOF_ constants
2018-02-04 21:39:46 -05:00
Rangi
885080f213
"chances" → "probabilities", since other files use that term and "changes" exists right next to it
2018-02-04 11:46:53 -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
6ff2cb20e6
map → map_id; map_def → map; map_data → map_attributes
2018-02-03 17:11:55 -05:00
Rangi
bf138d94d4
scene_def → scene_var (for "variable", like loadvar, copybytetovar, etc)
2018-02-03 16:20:19 -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
323ef81286
More comments and macros
2018-02-01 15:19:27 -05:00
Rangi
936a170e0d
MobileTradeRoom matches MobileBattleRoom
2018-01-31 23:21:15 -05:00
Rangi
a17623d96b
Add scene ID constants (TODO: meaningful names)
2018-01-31 23:16:51 -05:00
Rangi
7d6e82ef1c
NPC trade constants don't all just start with TRADE_
2018-01-31 21:16:57 -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
a9334f7468
Correct engine flag constants
2018-01-31 10:55:35 -05:00
