Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,866 Commits 2 Branches 0 Tags 197 MiB
Commit Graph

44 Commits

Author SHA1 Message Date
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
luckytyphlosion a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
Remy Oukaour d054116458 Merge branch 'patch' of https://github.com/mid-kid/pokecrystal 
# Conflicts:
#	constants/sprite_anim_constants.asm
#	data/sprite_anims/framesets.asm
#	data/sprite_anims/oam.asm
 2018-01-12 17:23:50 -05:00
mid-kid 5b7773b7d3 Label frameset 09 
It seems to be used as the "big" text entry cursor (i.e. for the bottom
3 buttons in the text entry screen).
It is never referenced explicitly, instead used when adding 1 to
SPRITEANIMSTRUCT_0E, in NamingScreen_AnimateCursor.
 2018-01-12 12:17:55 +01:00
Remy Oukaour d91e42ca5e Group some mutually edited files in data/sprites/ 2018-01-10 18:10:01 -05:00
xCrystal 69762a2bfd SET -> set 2017-12-29 17:15:01 +01: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 065de03646 Separate sprite constants and sprite-related data constants, like Pokémon and maps 2017-12-12 01:06:23 -05:00
Remy Oukaour f1f84743f7 Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
Remy Oukaour 31cce83e9b Move lots of data tables into individual data/ files 
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
 2017-12-11 14:23:18 -05:00
Remy Oukaour c6fefd0fe8 Rename overworld sprite files, consistent with their constants 2017-12-11 00:17:39 -05:00
Remy Oukaour a0bef01a1d Define more palette constants 2017-12-10 20:10:39 -05:00
Remy Oukaour 699495bfcb Consistent capitalization for map names, matching their constants 2017-12-10 13:37:15 -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 2cc2f057e8 Fix some SPRITE_ANIM_FRAMESET_ constants 
Thanks to @roukaour for the fixes.
 2017-11-29 20:24:19 +01:00
PikalaxALT 8f2d68a9e6 Person action and facing labels, part 2 2016-09-27 10:10:13 -04:00
PikalaxALT ef98c44edd Person action and facing labels, part 1 2016-09-27 09:37:10 -04:00
pikalaxalt ca01a92880 Fix indentation in many places 2016-06-07 08:13:08 -04:00
pikalaxalt 87b733994b SPRITE_ANIM_FRAME_IDX constants 2016-05-15 22:00:17 -04:00
pikalaxalt 1a84ca4e55 EZChat cursor object 2016-05-14 01:11:01 -04:00
pikalaxalt 5ea3a953c3 Name all link trade animation related functions 2016-05-13 22:46:32 -04:00
PikalaxALT 8bf255b9f8 Prepare to merge 2016-01-18 00:39:01 -05:00
PikalaxALT 3dcbe0ff55 Pokegear 2016-01-10 17:44:09 -05:00
PikalaxALT 8360a1a2e8 Pokegear functions and RAM labels 2016-01-09 23:41:03 -05:00
PikalaxALT a2a2668233 Dummy Game 2015-12-28 17:09:53 -05:00
PikalaxALT 3d36f1a837 Events and some WRAM cleanup 2015-12-18 20:07:09 -05:00
PikalaxALT caa83c08a7 Movement etc. 2015-12-17 15:14:51 -05:00
PikalaxALT efe3462f9a Replaced SignpostItem with Hidden(ItemName) 2015-12-15 11:21:58 -05:00
PikalaxALT b9870541d4 slot machines 2015-12-10 22:26:31 -05:00
PikalaxALT 6eac26732a Celebi Event 2015-12-05 15:38:25 -05:00
PikalaxALT 5b94d54a6c More work on animations 2015-12-04 08:46:11 -05:00
PikalaxALT ffbf2c0f5d More animations including cutting grass 2015-12-01 15:35:28 -05:00
PikalaxALT fb88b2ccf8 Movement constants, script stack 2015-11-16 11:53:26 -05:00
PikalaxALT aba038a4a4 Fix some movement macro/function names 2015-11-15 21:28:15 -05:00
PikalaxALT b921226aea More map object, swap StandingTile and NextTile 2015-11-14 23:02:38 -05:00
PikalaxALT ed44de4bb4 More map object work 2015-11-14 14:41:47 -05:00
PikalaxALT cc8c36ee14 Creation of constants for OBJECT_09 indices 2015-11-13 18:59:49 -05:00
PikalaxALT ac824f62fc More battle core labels 2015-11-08 13:27:26 -05:00
PikalaxALT ae2970d73b Sprite movement function labels 2015-11-06 16:42:38 -05:00
PikalaxALT 3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -05:00
PikalaxALT fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
PikalaxALT da7849d800 Restructured functions in main.asm to resemble the home functions they clone 2015-10-17 13:00:34 -04:00