Commit Graph

821 Commits

Author SHA1 Message Date
Rangi
60add76ee7 * Remove rept 4 (fa3192e)
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
2018-02-25 19:23:01 -05:00
Rangi
ff3a43d4b0 Use maskbits NUM_TYPES 2018-02-20 10:54:48 -05:00
Rangi
612fd7cb96 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
Rangi
c158404b7c questionmark is not a pokemon pic 2018-02-07 14:43:58 -05:00
Rangi
118c387d73 Remove commented G/S roaming Suicune code 2018-02-05 22:03:40 -05:00
Rangi
71f51955c9 Terser name for the does-nothing effect 2018-02-05 13:07:22 -05:00
Rangi
c648a6ced9 Off by one 2018-02-05 13:05:26 -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
bc3cc69749 Consistent "X percent [+/- Y]" order 2018-02-04 21:21:34 -05:00
Rangi
d6b00d0cc1 Sync code with wiki 2018-02-04 13:16:40 -05:00
Rangi
6c405e3859 Keep specials files together 2018-02-04 12:03:31 -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
73ea7c6326 Macro factors out sine code, just like sine data, since it's used 5 times 2018-02-03 21:11:55 -05:00
Rangi
271aa20b73 Keep documentation in sync with new WRAM labels 2018-02-03 20:40:21 -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
e32e5212af use "x + -1" not "x +- 1"
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
Rangi
45373ec601 sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment) 2018-02-02 22:45:42 -05:00
Rangi
c834bdadf2 spriteface → objectface, consistent with the other script commands 2018-02-02 21:50:43 -05:00
Rangi
aa8db1632c Remove checkmorn/checkday/checknite macros 2018-02-02 21:20:13 -05:00
Rangi
68d855c213 Script commands don't have underscores 2018-02-02 21:09:17 -05:00
Rangi
b7e44124d3 Fix confusing label 2018-02-02 12:29:42 -05:00
Rangi
b2970e75f4 SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern) 2018-02-01 15:06:06 -05:00
Rangi
fcfe77bc3d Meaningful scene constant names
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
2018-02-01 13:03:21 -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
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
Rangi
006d9f6441 Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix is not) 2018-01-30 22:34:05 -05:00
Rangi
6e00101b89 Comment values of special pointers, same as predefs 2018-01-30 14:55:27 -05:00
luckytyphlosion
4a3384ab09 wSpritesEnd -> wVirtualOAMEnd. 2018-01-30 14:55:20 -05:00
luckytyphlosion
0b45e2e846 Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -05:00
luckytyphlosion
3c7ba37de7 Fix wVirtualOAM labels, part 1. 2018-01-30 14:47:14 -05:00
luckytyphlosion
3203ad7d50 Fix comment/style issues caused from w-izing. 2018-01-30 14:05:25 -05:00
Rangi
e22670438e Badge type boosts make sense in data/types/ 2018-01-28 01:17:32 -05:00
Rangi
4d93741a54 use PAL_COLOR_SIZE 2018-01-26 21:25:49 -05:00
Rangi
f5ba69f5e5 Sync documentation with code 2018-01-26 14:36:59 -05:00
Rangi
3332305bb4 Define more bit flag constants 2018-01-26 12:27:02 -05:00
Rangi
0cf4eb6895 Move-unique effect commands consistently go in engine/battle/move_effects/ 2018-01-26 11:36:00 -05:00
Rangi
a0cc4a3392 Move power data belongs in data/moves/ 2018-01-26 11:01:15 -05:00
Rangi
6ebe45e41f Move event data to data/events/ 2018-01-25 22:19:24 -05:00
Rangi
87514598be More battle data in data/battle/ 2018-01-25 21:34:42 -05:00
Rangi
d504fb8852 Move AI data tables into data/battle/ai (mirroring engine/battle/ai) so they're more discoverable. 2018-01-25 20:34:33 -05:00
Rangi
95fd05744d Remove "UnusedSpecial_" prefixes too 2018-01-24 11:20:41 -05:00
Rangi
d719d318e8 Remove Special_ prefix from special routines (close #478) 2018-01-24 11:17:05 -05:00
Rangi
132fe46925 Rename some routines to avoid conflicts when removing "Special_" prefixes 2018-01-24 11:12:02 -05:00
Rangi
505a6595bc EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) 2018-01-24 10:46:49 -05:00
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00