2264 Commits

Author	SHA1	Message	Date
DizzyEggg	1efdaebe23	finish decompiling battle tower	2018-10-25 21:27:10 +02:00
garak	17c26fae1a	fire, electric, ice data	2018-10-24 20:01:40 -04:00
DizzyEggg	549b669f2a	battle tower, match sth and dumb loop instead of goto	2018-10-24 23:14:45 +02:00
garak	22a0b58e57	effects_2 and water data	2018-10-24 15:52:21 -04:00
garak	2f4b00e34b	finish effects_1 data	2018-10-23 12:17:31 -04:00
garak	68814c42de	begin 80FE840 data	2018-10-23 08:25:51 -04:00
DizzyEggg	b330bdba51	More and more battle tower	2018-10-22 19:22:57 +02:00
garak	d267fcbfb1	name remaining tags	2018-10-22 10:36:43 -04:00
garak	2b9fd18dd4	battle_anims.s data to C	2018-10-21 22:30:20 -04:00
garak	f2363f5982	more tag names	2018-10-21 19:30:27 -04:00
Diegoisawesome	32d2640dc7	Match GameClear (thanks Egg)	2018-10-21 16:24:43 -05:00
DizzyEggg	0ab27e44b1	more tower, fail	2018-10-21 20:13:12 +02:00
Diegoisawesome	8e7202ec3d	Fix LZ compressed data alignment	2018-10-21 12:05:34 -05:00
Diegoisawesome	97bbb326b8	GameClear nonsense	2018-10-20 19:53:41 -05:00
golem galvanize	ba3247d5cd	decompiled more, stuck on sub_81B1760	2018-10-20 20:25:28 -04:00
Slawter666	3d8874d919	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-10-21 00:20:09 +01:00
DizzyEggg	16026fe91d	More battle tower.	2018-10-21 00:06:42 +02:00
Slawter666	7a072d4527	Continue synchronising	2018-10-20 21:01:45 +01:00
Diegoisawesome	2a3ba78831	Merge pull request #369 from garakmon/pan-constants ... Use sound pan constants in data/battle_anim_scripts.s	2018-10-19 20:27:54 -05:00
DizzyEggg	f4e55999a5	begin porting and decomping battle tower	2018-10-20 00:33:51 +02:00
garak	38fcc46abb	Merge remote-tracking branch 'upstream/master' into pan-constants	2018-10-19 16:05:14 -04:00
garak	901f3ff557	use sound panning constants in battle_anim_scripts	2018-10-19 15:57:19 -04:00
Diegoisawesome	bf8fa23462	Merge pull request #365 from garakmon/event-flags ... [WIP] Event flags	2018-10-19 14:24:34 -05:00
garak	113a8d1efd	clean flags and remove temp macro	2018-10-19 14:59:18 -04:00
Diegoisawesome	95d8815721	Merge pull request #368 from Diegoisawesome/master ... Finish porting/decompiling field_player_avatar	2018-10-19 00:08:59 -05:00
Diegoisawesome	dd3689fdbf	Finish porting/decompiling field_player_avatar	2018-10-19 00:05:54 -05:00
garak	cb5981cdf2	name more event flags	2018-10-18 21:32:21 -04:00
garak	c27043bd3c	more event flags	2018-10-18 15:28:59 -04:00
DizzyEggg	dfee5deca8	Move Bitmap struct and clear sprite/text files	2018-10-18 21:24:37 +02:00
Diegoisawesome	b23dc9a123	Merge pull request #366 from Diegoisawesome/master ... Finish shop and fldeff_escalator	2018-10-18 12:08:38 -05:00
Diegoisawesome	6206acd2d2	Finish shop and fldeff_escalator	2018-10-18 12:05:02 -05:00
golem galvanize	dded980cde	fix building	2018-10-17 23:36:18 -04:00
garak	d1b7f32b0a	begin event flag names, add temporary hidden item macro	2018-10-17 22:07:23 -04:00
golem galvanize	2c6d634acd	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-10-17 20:03:31 -04:00
golem galvanize	65a0c48eec	decompiled some more of the file	2018-10-17 20:03:02 -04:00
garak	7d88b9647f	Merge branch 'master' into event-flags	2018-10-17 12:30:45 -04:00
garak	ff97873c30	label temp flags, test replace script	2018-10-17 12:25:12 -04:00
Slawter666	b7b1d609d0	More synchronisation	2018-10-17 13:52:26 +01:00
Diegoisawesome	f67bbbdaaa	Merge pull request #364 from Diegoisawesome/master ... Port/decompile field_control_avatar	2018-10-16 21:54:14 -05:00
Diegoisawesome	e75f0b4f80	Port/decompile field_control_avatar	2018-10-16 21:47:08 -05:00
Slawter666	1435c96b41	Further synchronisation	2018-10-17 01:11:44 +01:00
DizzyEggg	1f358fbb07	Use constants	2018-10-16 22:34:53 +02:00
Slawter666	3aff112127	Begin synchronising with pokeruby	2018-10-16 14:55:16 +01:00
Diegoisawesome	a9abb930aa	Merge pull request #352 from huderlem/shop ... [WIP] Shop	2018-10-14 19:03:48 -05:00
Diegoisawesome	7f211b2588	Merge pull request #359 from Slawter666/label_field_effect_helpers ... Label field_effect_helpers.c	2018-10-14 18:37:11 -05:00
Deokishisu	bf2063cc1a	Update All EVENT_OBJ_GFX References ... Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.	2018-10-14 19:09:18 -04:00
Slawter666	137f6549ff	label field_effect_helpers	2018-10-14 23:43:40 +01:00
Deokishisu	94bec0b8db	Fix Double Underscores ... Whoops.	2018-10-14 16:14:01 -04:00
Deokishisu	d7ba8a306c	Rename OW Sprites ... Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed. Renamed: LittleBoy1 -> NinjaBoy LittleGirl1 -> Twin Woman2 -> PokefanF OldMan1 -> ExpertM OldWoman1 -> ExpertF Man3 -> PokefanM Woman6 -> LinkReceptionist Man7 -> DevonEmployee Boy4 -> RichBoy Boy5 -> GameboyKid (Consistent with pokecrystal) ContestOldMan -> ContestJudge Renamed Because of Numbering Changes: LittleBoy2 -> LittleBoy LittleGirl2 -> LittleGirl OldWoman2 -> OldWoman OldMan2 -> OldMan Man4 -> Man3 Man5 -> Man4 Man6 -> Man5 Woman3 -> Woman2 Woman4 -> Woman3 Woman5 -> Woman4 Woman7 -> Woman5	2018-10-14 15:49:55 -04:00
Deokishisu	a8afec762b	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:22:56 -04:00
Diegoisawesome	02049d52ee	Merge pull request #351 from DizzyEggg/apprentice ... Decompile apprentice	2018-10-14 13:20:38 -05:00
Deokishisu	c89b14f5ef	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:19:23 -04:00
Diegoisawesome	43316ffae8	Merge pull request #356 from DizzyEggg/clean_battlestruct ... Clean a couple of battlestructs' fields	2018-10-14 13:18:29 -05:00
Deokishisu	e129f4864f	Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly	2018-10-14 14:16:07 -04:00
Diegoisawesome	0979ea91fb	Merge pull request #357 from DizzyEggg/move_heap ... Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 13:15:31 -05:00
DizzyEggg	c3113db931	Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 20:00:14 +02:00
Diegoisawesome	d40e737d52	Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers ... Decompile field effect helpers	2018-10-14 12:48:18 -05:00
Diegoisawesome	e0bc3fd59c	Merge pull request #355 from DizzyEggg/use_eos ... Use defines for text chars	2018-10-14 12:21:37 -05:00
DizzyEggg	ecdf0fd69d	Clean battle structs	2018-10-14 18:37:52 +02:00
Deokishisu	2bd86dad2f	Rename Boy4 to RichBoy	2018-10-14 12:26:48 -04:00
DizzyEggg	b73611bccb	clean battle structs	2018-10-14 18:10:54 +02:00
DizzyEggg	cd4f65ecef	Make apprentice compile	2018-10-14 17:06:47 +02:00
DizzyEggg	f47ed3268c	Finish documenting apprentice for now	2018-10-14 17:00:41 +02:00
DizzyEggg	d60e4e23f8	Merge pull request #25 from Slawter666/apprentice-data ... Move apprentice data to C	2018-10-14 16:28:27 +02:00
DizzyEggg	7952cfeba5	document more of apprentice	2018-10-14 16:27:48 +02:00
Slawter666	f08b56d645	Move apprentice data to C	2018-10-14 15:26:13 +01:00
DizzyEggg	af7aa624cd	make aprentice compile	2018-10-14 15:23:14 +02:00
DizzyEggg	84936b4260	Merge branch 'master' into apprentice	2018-10-14 15:07:16 +02:00
DizzyEggg	541043a661	Use defines for text chars	2018-10-14 15:04:25 +02:00
DizzyEggg	7a008a944a	Move 'blend_palette'.c to util.c	2018-10-14 14:43:19 +02:00
DizzyEggg	145df49063	Document more of apprentice	2018-10-14 14:35:51 +02:00
DizzyEggg	b4a42a6832	Decompile apprentice	2018-10-14 11:37:44 +02:00
DizzyEggg	36b8a6a9a2	More apprentice work	2018-10-13 23:23:33 +02:00
DizzyEggg	a496a763ca	Merge record mixing, pokemon and global with apprentice	2018-10-13 20:38:46 +02:00
Diegoisawesome	32fbf67d47	Merge branch 'master' into shop	2018-10-13 12:55:06 -05:00
Diegoisawesome	a26380663c	Merge branch 'master' of github.com:pret/pokeemerald	2018-10-13 12:44:23 -05:00
Diegoisawesome	35c6938814	Port/decompile cable_club.s	2018-10-13 12:41:10 -05:00
Marcus Huderle	b24559d69b	Merge remote-tracking branch 'upstream/master' into shop ... # Conflicts: # asm/shop.s	2018-10-13 10:22:58 -05:00
DizzyEggg	74b81bf229	start apprentice	2018-10-13 00:48:26 +02:00
golem galvanize	d3d725cc83	decompiled up to sub_81B0948	2018-10-11 21:23:39 -04:00
Diegoisawesome	04836db167	Start porting cable_club.c	2018-10-11 16:02:58 -05:00
golem galvanize	803c2388ce	finish porting field_effect_helpers	2018-10-10 12:02:02 -04:00
golem galvanize	35ee9f67c0	ported some of field_effect_helpers	2018-10-09 17:32:39 -04:00
Marcus Huderle	807050a048	Merge pull request #348 from DizzyEggg/anim_files ... Decompile/Port battle_anim_80A5C6C	2018-10-07 12:23:07 -05:00
DizzyEggg	dbb09aa445	get rid of SPRITE and TASK	2018-10-07 19:19:13 +02:00
DizzyEggg	413e26e83d	port 80d51ac	2018-10-07 17:45:37 +02:00
DizzyEggg	61343d5069	Decompile battle_anim_80A9C70	2018-10-07 15:39:46 +02:00
DizzyEggg	8c834b9ae8	battle anim 80a5c6c decompiled	2018-10-07 12:32:20 +02:00
DizzyEggg	54fc92bc92	Start porting ruby battle anim file	2018-10-06 23:04:53 +02:00
Diegoisawesome	7a7aeed5e8	Merge pull request #347 from Deokishisu/GamV ... Fill out VERSION_ enum with all possible values	2018-10-06 13:45:21 -05:00
Marcus Huderle	b9e38a569e	Merge pull request #320 from DizzyEggg/anims ... Document battle animation scripts	2018-10-06 08:20:41 -05:00
Deokishisu	9f69ea1931	Update gGameVersion to use GAME_VERSION	2018-10-06 01:57:39 -04:00
Marcus Huderle	ec0d350137	Move metatile behavior constants to include/constants and sync closer to pokeruby	2018-10-04 17:57:07 -05:00
Diegoisawesome	25033ef311	Finish tileset_anims macroization	2018-09-23 14:58:36 -05:00
Diegoisawesome	584cad6c0b	Merge pull request #339 from Kermalis/master ... Rename voicegroups	2018-09-22 15:48:29 -05:00
Kermalis	e93f1182e6	Rename voicegroups	2018-09-22 16:42:34 -04:00
Diegoisawesome	58a5e4a261	Merge branch 'master' of github.com:pret/pokeemerald	2018-09-22 15:39:34 -05:00
Diegoisawesome	9e840dc5fe	Merge remote-tracking branch 'Tetra/master'	2018-09-22 15:23:47 -05:00
Diegoisawesome	d50554bb8e	Use macros and defines in tileset_anims	2018-09-22 15:02:49 -05:00
DizzyEggg	611360c29e	calledattack to calledmove	2018-09-22 19:08:41 +02:00
DizzyEggg	e362c06aea	gRandomMove to gCalledMove	2018-09-22 18:41:00 +02:00
Tetrable	1f767e4c49	Document and make tileset_anims.c easier to use	2018-09-22 13:27:43 +01:00
Tetrable	4d9c513e3e	Document and improve tileset_anims.c further	2018-09-22 12:50:24 +01:00
DizzyEggg	66fd9b2ddf	Label trainer hill battle type	2018-09-20 22:00:00 +02:00
DizzyEggg	bf64333299	Give labels to healthbox gfx	2018-09-20 21:42:38 +02:00
DizzyEggg	e4b7ba0977	Document some not labeled battle things	2018-09-20 11:55:35 +02:00
Diegoisawesome	8a05bf82ec	Merge branch 'master' of github.com:pret/pokeemerald	2018-09-18 10:03:57 -05:00
Diegoisawesome	899ae7a59a	Add defines for tile, metatile, and palette count	2018-09-18 10:03:24 -05:00
Diegoisawesome	7f2d52d9e0	Merge pull request #332 from DizzyEggg/patch-5 ... Use defines for BattleAI_ChooseMoveOrAction	2018-09-17 10:11:25 -05:00
Diegoisawesome	6978a896d1	Merge pull request #331 from DizzyEggg/patch-3 ... Use pokeruby's formatting for move descriptions	2018-09-17 10:11:12 -05:00
DizzyEggg	5164215c91	Use defines for BattleAI_ChooseMoveOrAction	2018-09-16 17:06:35 +02:00
DizzyEggg	94bbfa7fa0	Use pokeruby's formatting for move descriptions	2018-09-16 15:58:13 +02:00
DizzyEggg	de65ddf4b6	Make it easier to edit ability text	2018-09-16 10:17:10 +02:00
Diegoisawesome	6a8f27c1ac	Merge pull request #326 from DizzyEggg/cablecarutil ... Decompile cable_car_util.c	2018-09-16 01:06:33 -05:00
DizzyEggg	4d2637883a	Slot machine is decompiled.	2018-09-15 23:19:37 +02:00
DizzyEggg	db248dada2	slot machine is decompiled	2018-09-15 22:59:45 +02:00
DizzyEggg	0547e260a4	More of slot machine	2018-09-15 18:01:20 +02:00
DizzyEggg	ff13cb6352	decompile cable car util which has nothing to do with actual cable car	2018-09-15 13:50:23 +02:00
DizzyEggg	2a7811456a	Add anim tag sprite defines	2018-09-15 00:30:20 +02:00
Diegoisawesome	b8c9d9a980	Merge pull request #324 from Diegoisawesome/master ... Document main_menu	2018-09-14 12:17:11 -05:00
Diegoisawesome	b860d583e4	Document main_menu	2018-09-14 12:15:46 -05:00
DizzyEggg	a08d9dd451	Merge branch 'master' into anims	2018-09-12 22:59:04 +02:00
DizzyEggg	8a81bd1bce	Sync battle anim labels with pokeruby	2018-09-12 22:58:03 +02:00
Diegoisawesome	095cbbc5c2	Merge pull request #321 from Slawter666/data ... Move more data to C	2018-09-11 22:10:26 -05:00
Slawter666	f40fa37398	Move battle_bg data to C	2018-09-11 23:37:47 +01:00
Marcus Huderle	ba125b23fd	Remove transparency from event object spritesheets	2018-09-11 17:18:10 -05:00
Slawter666	991151f461	Move item_use data to C	2018-09-11 03:04:19 +01:00
Slawter666	3c16d8c598	Move braille_puzzles data to C	2018-09-11 02:17:21 +01:00
Slawter666	b6ee8823f0	Move field_special_scene data to C	2018-09-11 02:04:03 +01:00
Slawter666	bcea321494	Finish converting data2b data	2018-09-11 01:35:47 +01:00
DizzyEggg	10b479a3ca	Document battle animation scripts.	2018-09-10 21:19:19 +02:00
Diegoisawesome	d9941cd1a8	Standardize sprite visibility to boolean	2018-09-10 10:25:58 -05:00
Diegoisawesome	cb053b3a15	Merge pull request #312 from DizzyEggg/decompile_frontier_2 ... Decompile Battle Factory	2018-09-10 10:20:41 -05:00
DizzyEggg	74cc2cf512	battle factory review changes	2018-09-10 10:18:30 +02:00
DizzyEggg	b87856b58e	Battle Factory is decompiled and documented.	2018-09-10 01:01:39 +02:00
Tetrable	044ef98309	Document trainer animations, correct unused table labelling	2018-09-09 22:35:07 +01:00
DizzyEggg	cf8898071d	Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2	2018-09-09 20:31:56 +02:00
DizzyEggg	4d1df7ecbe	comm	2018-09-09 20:31:51 +02:00
Slawter666	135e98a824	Move battle factory data to C	2018-09-09 16:06:35 +01:00
Slawter666	1ba17e1666	Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data	2018-09-09 15:51:13 +01:00
DizzyEggg	6454740587	More battle factory	2018-09-09 13:12:26 +02:00
DizzyEggg	2f59df03ab	Standartize AddTextPrinterParametrized functions,	2018-09-08 23:38:30 +02:00
DizzyEggg	1616c254d2	Swap_InitAllSprites done	2018-09-08 22:33:07 +02:00
Diegoisawesome	e1834c9d7b	Change overworld_frame macro to use tiles	2018-09-08 03:07:44 -05:00
Diegoisawesome	eb8b0ff0f7	Merge branch 'master' of github.com:pret/pokeemerald	2018-09-08 02:43:19 -05:00
Diegoisawesome	12521fb1a8	Merge branch 'Slawter666-spritesheet'	2018-09-08 02:37:33 -05:00
Diegoisawesome	2b07588c02	Merge branch 'master' of github.com:Diegoisawesome/pokeemerald	2018-09-08 02:36:59 -05:00
Diegoisawesome	f73807ea60	Add palette tags for event objects	2018-09-07 23:52:11 -05:00
Diegoisawesome	d945a8bf2f	Macroize main_menu and general cleanup	2018-09-07 19:24:33 -05:00
Slawter666	291ac2cee9	Add build rules for overworld sprite sheets	2018-09-08 00:28:32 +01:00
Diegoisawesome	cf8f73bde1	Merge pull request #314 from Slawter666/data ... Convert data to C	2018-09-07 11:39:07 -05:00
Slawter666	54d5a7ad97	Format event object pic tables	2018-09-07 14:14:52 +01:00
Slawter666	9dec2bdef8	Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet	2018-09-07 11:50:23 +01:00
DizzyEggg	1283b87505	up to sub_819d064	2018-09-06 23:02:16 +02:00
Marcus Huderle	fa9d1759bd	checkpoint	2018-09-06 11:37:45 -05:00
Slawter666	9ad7dc9fd7	Move remaining field_player_avatar data across	2018-09-06 12:02:37 +01:00
Slawter666	26c91f1502	Move field_player_avatar data to C	2018-09-06 03:11:33 +01:00
Diegoisawesome	f8f7a8e300	Merge pull request #304 from Slawter666/graphics ... Move data from graphics.s to C	2018-09-05 20:32:23 -05:00
Slawter666	9350ac0a74	Move battle_pyramid_bag data to C	2018-09-06 01:24:11 +01:00
Slawter666	07c2882390	Move starter_choose data to C	2018-09-06 00:47:29 +01:00
Slawter666	0cd250a83e	Deleted accidently uploaded file	2018-09-06 00:00:29 +01:00
Slawter666	5656ceab6c	Move graphics to src/data/graphics	2018-09-05 23:53:54 +01:00
Diegoisawesome	8defc345f0	Merge pull request #313 from ultima-soul/overworld_and_mapping ... Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be de…	2018-09-05 16:50:25 -05:00
DizzyEggg	75384546b5	More factory decomp and documentation.	2018-09-05 23:30:15 +02:00
ultima-soul	857ac33adb	Fixed a typo.	2018-09-05 17:25:44 +00:00
Diegoisawesome	41fe72b95d	Merge pull request #310 from DizzyEggg/patch-1 ... Update item_menu.c	2018-09-05 01:36:40 -05:00
ultima-soul	f505ba1bc7	Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent.	2018-09-05 01:13:17 +00:00
Slawter666	4c54212b1f	Bring labels for overworld.c over from pokeruby	2018-09-04 23:31:37 +01:00
DizzyEggg	24b9cd721f	More Battle Factory	2018-09-03 22:55:55 +02:00
Slawter666	5c66b8a7ef	Label event_object_movement.c	2018-09-02 23:20:45 +01:00
DizzyEggg	0238b1c8ec	More battle factory work	2018-09-02 19:41:33 +02:00
Slawter666	f74adc80c1	Format more templates	2018-09-02 17:53:52 +01:00
DizzyEggg	10eb952db5	Start battle factory	2018-09-02 18:10:36 +02:00
Slawter666	6106154801	Format WindowTemplate in battle_pyramid_bag.c	2018-09-02 16:26:23 +01:00
Slawter666	c1b3dfa15a	Format templates in wallclock.c	2018-09-02 16:10:06 +01:00
Slawter666	c9db9b7a59	Format WindowTemplate in berry_blender.c	2018-09-02 15:14:23 +01:00
Slawter666	3119aae4b2	Format WindowTemplate in berry_tag_screen.c	2018-09-02 15:02:39 +01:00
Slawter666	f45c9e75db	Format templates in item_menu.c	2018-09-02 14:49:29 +01:00
Slawter666	ef4695a72c	Minor labelling	2018-09-02 13:47:12 +01:00
DizzyEggg	23aab35b96	Update item_menu.c ... Don't use signed values for unsigned variables	2018-09-02 00:28:03 +02:00
Marcus Huderle	8ecf3b2159	Start decompiling shop.c	2018-09-01 17:15:35 -05:00
DizzyEggg	528a1e9ed0	Match CopySpriteTiles	2018-09-01 22:53:29 +02:00
DizzyEggg	e28ce3be78	Fix the strings length issue	2018-09-01 22:03:21 +02:00
DizzyEggg	5c7ca813e7	Add AI flags to trainers data	2018-09-01 21:25:19 +02:00
DizzyEggg	44ba432dad	Label various battle scripts	2018-09-01 20:00:13 +02:00
DizzyEggg	38c89b9d0f	Bank to battler	2018-09-01 18:36:08 +02:00
DizzyEggg	ce949ba705	document move type variables in pss	2018-09-01 18:31:53 +02:00
DizzyEggg	96f2b995dc	Pyramid bag review changes	2018-08-30 21:28:03 +02:00
DizzyEggg	43b74032fa	Make pyramid bag compile.	2018-08-30 20:25:57 +02:00
DizzyEggg	917b32ffbe	Finish decompiling pyramid bag.	2018-08-30 20:10:57 +02:00
DizzyEggg	bc9fe72c6e	Do some pyramid bag	2018-08-30 15:01:07 +02:00
Diegoisawesome	8e5c72766c	Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 ... Decompile battle_dome	2018-08-29 14:13:39 -05:00
DizzyEggg	3dea8fa265	battle tent review changes	2018-08-29 20:38:54 +02:00
Slawter666	e30c2251ce	Convert more of data2b	2018-08-27 00:26:54 +01:00
DizzyEggg	d65ebcd3dd	Label a dome functiion	2018-08-26 21:41:47 +02:00
DizzyEggg	ddd4733de3	rename battle pyramid to battle pyramid bag	2018-08-26 17:54:58 +02:00
Slawter666	ca07412686	Format SpriteTemplate	2018-08-26 15:45:08 +01:00
DizzyEggg	a8a2444f93	make battle dome compikle	2018-08-26 15:58:44 +02:00
DizzyEggg	df3af2d9e1	Clean up battle dome code a bit	2018-08-26 15:51:14 +02:00
DizzyEggg	71de20a159	Merge pull request #9 from Slawter666/frontier-data ... Convert battle dome data to C	2018-08-26 15:28:09 +02:00
DizzyEggg	78cad0dee5	try battle tent and fail	2018-08-26 15:27:06 +02:00
Slawter666	69c20f18ac	Convert battle dome data to C	2018-08-26 13:40:36 +01:00
DizzyEggg	2b7c138cbe	Some labels	2018-08-25 21:04:12 +02:00
DizzyEggg	0d8c5b613e	make battle dome compile	2018-08-25 20:14:10 +02:00
DizzyEggg	447e65860c	Merge branch 'master' into decompile_battle_frontier_1	2018-08-25 20:02:09 +02:00
DizzyEggg	edcf04b665	Document battle dome.	2018-08-25 19:59:47 +02:00
DizzyEggg	62a645abaf	Up To CopyDomeTrainerName	2018-08-25 18:46:15 +02:00
DizzyEggg	91349324c6	up to CB2_BattleDome	2018-08-25 11:55:16 +02:00
Slawter666	709b63efa9	Split files	2018-08-24 21:21:19 +01:00
Slawter666	6b145ed77c	Move data from graphics.s to C	2018-08-24 04:21:07 +01:00
Diegoisawesome	96d744706d	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-08-23 02:42:45 -05:00
Diegoisawesome	26ef40553c	Move data from include to src	2018-08-23 02:32:34 -05:00
Slawter666	ed24233274	Convert more of data2b.s to C	2018-08-22 23:03:44 +01:00
Slawter666	4db5ef3ae6	Convert more data	2018-08-22 21:41:34 +01:00
Slawter666	ef6a3c2278	Move some data from data2b.s to C	2018-08-22 14:34:36 +01:00
DizzyEggg	dea1de3fed	More battle dome	2018-08-21 23:36:59 +02:00
DizzyEggg	a12b69eae1	DisplayMatchInfoOnCard decompiled	2018-08-20 22:56:05 +02:00
DizzyEggg	5da12f2b21	battle dome - more work	2018-08-19 22:26:07 +02:00
DizzyEggg	4a0f7398ec	Cant believe Ive matched this	2018-08-19 20:21:37 +02:00
DizzyEggg	239c56496b	This is impossible	2018-08-19 17:13:05 +02:00
DizzyEggg	fb19a8fc59	battle dome cards sensibly renamed	2018-08-19 01:06:10 +02:00
DizzyEggg	e4649245ba	this file is too much	2018-08-18 19:52:25 +02:00
DizzyEggg	f7fd5ce75c	Match one of the hardest battle dome functions	2018-08-18 18:23:40 +02:00
DizzyEggg	63cbc8f3cc	battle dome - a couple more functions	2018-08-18 00:54:18 +02:00
DizzyEggg	5dd1afd383	contest effect review changes	2018-08-16 22:55:36 +02:00
DizzyEggg	0bfe894566	Merge with master	2018-08-16 22:53:01 +02:00
DizzyEggg	7669a94f0d	this function is driving me insane	2018-08-16 22:46:02 +02:00
Diegoisawesome	2b81db7ace	Fix Task_Truck1	2018-08-15 19:49:17 -07:00
Diegoisawesome	13dc7a4170	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-15 16:22:54 -07:00
Diegoisawesome	f65da613cf	Merge pull request #299 from DizzyEggg/contest_ai ... Decompile Contest ai	2018-08-15 16:19:18 -07:00
Diegoisawesome	e7da514382	Finish documenting and cleaning up summary_screen ... Also fix remaining nonmatchings	2018-08-15 15:58:41 -07:00
DizzyEggg	e2f5e73445	More battle dome	2018-08-15 23:04:46 +02:00
Tetrable	8896b54e8f	Add national/hoenn dex defines, update dex arrays	2018-08-15 20:10:28 +01:00
Diegoisawesome	ac3f4fd994	Continue documentation and cleanup of pokemon_summary_screen	2018-08-15 11:51:47 -07:00
DizzyEggg	a54fa23b5f	Begin battle frontier 1	2018-08-15 15:49:50 +02:00
DizzyEggg	dc6cf391ce	Make contest ai compile.	2018-08-15 12:06:23 +02:00
DizzyEggg	92c4fc6345	Contest AI clean-up	2018-08-15 11:50:18 +02:00
DizzyEggg	c806992cfc	Port contest ai from pokeruby	2018-08-15 11:43:57 +02:00
Diegoisawesome	0bc975bf57	Document and cleanup pokemon_summary_screen	2018-08-15 01:44:20 -07:00
Diegoisawesome	332a8bcb1d	Extract rodata for unk_pokedex_area_screen_helper	2018-08-14 22:37:59 -07:00
Diegoisawesome	a07d69d7c2	Finish pokemon_summary_screen	2018-08-14 22:00:35 -07:00
DizzyEggg	ba225f8eaa	Fix fakematching in contest effect	2018-08-15 00:25:19 +02:00
DizzyEggg	0b22ad4ab5	make contest effect build	2018-08-15 00:01:43 +02:00
DizzyEggg	0c7063c5ba	Make contest effect table easier to edit in the future	2018-08-14 23:50:58 +02:00
DizzyEggg	c72b55a5c4	Match the worst function ever	2018-08-14 22:28:25 +02:00
DizzyEggg	1a0e6f7aed	match contest effect	2018-08-13 21:24:11 +02:00
Diegoisawesome	6dac87abfd	Cleanup and document learn_move	2018-08-12 14:28:15 -07:00
DizzyEggg	0d68af7f06	copy contest effect from ruby	2018-08-12 23:20:17 +02:00
Diegoisawesome	b40957c09b	Finish decompiling learn_move	2018-08-12 13:33:41 -07:00
Diegoisawesome	bd2b7beb07	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 13:17:51 -07:00
Diegoisawesome	335f4c1e81	Merge pull request #296 from DizzyEggg/event_data ... Event data	2018-08-12 13:17:36 -07:00
DizzyEggg	f1daf7442d	event data review changes	2018-08-12 22:04:49 +02:00
Diegoisawesome	9a73a47ddd	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 12:55:21 -07:00
DizzyEggg	577e6e7c1f	Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data	2018-08-12 21:55:20 +02:00
Diegoisawesome	2dd5fc23d4	Prepare learn_move for merge	2018-08-12 12:54:07 -07:00
Diegoisawesome	25832810f6	Merge pull request #288 from DizzyEggg/slot_machine ... Port a little bit of slot machine	2018-08-12 12:27:23 -07:00
Diegoisawesome	32b0e102cf	Merge pull request #287 from DizzyEggg/easy_chat ... Pikalax's Easy chat	2018-08-12 12:17:23 -07:00
Diegoisawesome	6bb761a711	Merge pull request #277 from atasro2/player_field_avatar ... decompile a portion of field_player_avatar.s	2018-08-12 12:09:09 -07:00
Diegoisawesome	26e18f2292	Merge pull request #289 from DizzyEggg/contests ... Pikalax's contests	2018-08-12 12:04:53 -07:00
MCboy	1bc93c5a66	Merge branch 'master' into player_field_avatar	2018-08-12 23:26:00 +04:30
MCboy	2ddabca996	apply some changes	2018-08-12 22:31:58 +04:30
DizzyEggg	7dac22314e	Decompile a bit of pokemon storarage system	2018-08-12 16:40:31 +02:00
DizzyEggg	957dcd01b3	merge with master	2018-08-12 12:11:35 +02:00
DizzyEggg	e787d5b602	Contest review changes	2018-08-12 12:08:51 +02:00
DizzyEggg	1229bead2e	slot machine review changes	2018-08-12 11:50:26 +02:00
DizzyEggg	3a72e6a80d	Easy chat review changes	2018-08-12 11:39:09 +02:00
Diegoisawesome	a000eb4f36	Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move	2018-08-11 19:03:38 -07:00
Diegoisawesome	18d5186630	Merge remote-tracking branch 'garakmon/heal-loc-2'	2018-08-11 16:57:46 -07:00
Diegoisawesome	cf9518f237	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-11 16:32:03 -07:00
Diegoisawesome	94eef0bfa5	Merge pull request #294 from DizzyEggg/learnsets ... Make learnsets easier to edit	2018-08-11 16:27:52 -07:00
Diegoisawesome	0c29447717	Merge pull request #292 from DizzyEggg/move_desc ... Move move descriptions to C	2018-08-11 16:26:16 -07:00
DizzyEggg	7b9a7765e0	Make learnsets easier to edit	2018-08-12 00:42:25 +02:00
Diegoisawesome	57b3393192	Fix compile error	2018-08-11 15:42:08 -07:00
Diegoisawesome	cb9127ccaf	Revert "Rename some specials" ... This reverts commit 658f9351fe.	2018-08-11 15:16:41 -07:00
DizzyEggg	df5009cb3e	Move move descriptions to C	2018-08-12 00:03:19 +02:00
Diegoisawesome	658f9351fe	Rename some specials	2018-08-11 14:59:43 -07:00
Diegoisawesome	b54793be91	Finish decompiling field_specials	2018-08-11 14:51:54 -07:00
DizzyEggg	7f167ca9f4	Update battle_script_commands.c	2018-08-11 23:00:16 +02:00
DizzyEggg	feee4751eb	Make event data look cleaner	2018-08-11 22:54:34 +02:00
DizzyEggg	537ebd36ac	Merge contests with master	2018-08-11 19:04:28 +02:00
DizzyEggg	0e0d103044	port more of slot machine	2018-08-11 18:47:56 +02:00
DizzyEggg	7961aa44ba	start porting slot machine	2018-08-11 17:57:20 +02:00
garak	2fc3b7f171	change sUnknown_085A1E3C to sMapHealLocations	2018-08-11 10:28:13 -04:00
DizzyEggg	59d8d56868	merge easy chat with master	2018-08-11 14:14:51 +02:00
Diegoisawesome	1e0f3ec433	Continue decompiling field_specials	2018-08-10 14:07:23 -07:00
garak	c3512e3b39	port larger heal location changes from poke ruby pr	2018-08-10 10:45:15 -04:00
Diegoisawesome	12ff59f9c1	Continue decompiling field_specials	2018-08-10 00:42:06 -07:00
Slawter666	bc42c5054c	Merge remaining overworld frames	2018-08-10 00:20:19 +01:00
Slawter666	877a80d3bc	Merge berry tree frames	2018-08-09 23:19:45 +01:00
Diegoisawesome	bad170b0cb	Continue decompiling field_specials	2018-08-08 23:53:21 -07:00
Slawter666	dea0bba64e	Merge "pokemon" frames	2018-08-09 00:55:32 +01:00
Diegoisawesome	90896e38c9	Begin porting/decompiling field_specials	2018-08-08 01:37:12 -07:00
garak	45b730e474	copy heal_location changes from pokeruby	2018-08-07 23:05:48 -04:00
Slawter666	704e3c7334	Merge https://github.com/pret/pokeemerald into spritesheet	2018-08-07 22:18:30 +01:00
Slawter666	ab2cc59629	Merge remaining "people" overworld frames	2018-08-07 22:16:03 +01:00
Diegoisawesome	85ebd76cd0	Fix fanfare constant to use define	2018-08-04 18:41:53 -07:00
DizzyEggg	eb4d9f6fed	Tabs to spaces	2018-08-03 00:24:10 +02:00
DizzyEggg	d6537c811b	Battle code enums in case switches	2018-08-03 00:13:44 +02:00
Diegoisawesome	759bc2671c	Merge pull request #280 from DizzyEggg/decompile_part_mon_summary ... Decompile a few pokemon summary screen functions	2018-08-02 08:27:05 -07:00
Slawter666	5917f7d108	Merge frontier brains, team magma and team aqua frames	2018-08-02 00:34:28 +01:00
Slawter666	52aa9cedcf	Merge May frames into sprite sheets ... Plus fix Brendan's surfing and watering frame order.	2018-07-29 17:29:36 +01:00
DizzyEggg	9febcd3a0a	Document a bit of atk47	2018-07-29 15:51:08 +02:00
DizzyEggg	68145cd002	Document atk48	2018-07-29 15:33:16 +02:00
DizzyEggg	4080c6f831	Decompile a few pokemon summary screen functions	2018-07-28 23:26:19 +02:00
Slawter666	d5825230e5	Merge "brendan" frames into sprite sheets	2018-07-28 18:11:28 +01:00
MCboy	6c365fdc94	Update field_player_avatar.c	2018-07-25 17:47:04 +04:30
MCboy	3a15012085	Update field_player_avatar.c	2018-07-25 17:28:25 +04:30
MCboy	94a5f8d529	made file better ?	2018-07-25 17:18:49 +04:30
Diegoisawesome	7270e73fee	Move strings to C	2018-07-25 01:15:36 -07:00
Diegoisawesome	e92e2cb0aa	Merge branch 'master' of github.com:pret/pokeemerald	2018-07-24 21:18:36 -07:00
Diegoisawesome	156fb472e1	Clean up files and add entries to charmap	2018-07-24 21:18:23 -07:00
Diegoisawesome	5883f867f0	Merge pull request #278 from vblm12/trainer_data ... Move some trainer data into c structs	2018-07-24 18:58:56 -07:00
MCboy	82d88479ce	decompiled a bunch of functions ... i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that	2018-07-24 16:59:52 +04:30
DizzyEggg	1e9143e0b2	merge union room with master	2018-07-22 13:14:58 +02:00
DizzyEggg	c9d486a5d3	make union room compile i guess	2018-07-22 12:49:49 +02:00
vblm12	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05:00
MCboy	201fb6f818	ported code over from pokeruby	2018-07-21 03:06:40 +04:30
MCboy	43fa9da52a	decompile more code ... 1 non matching need help	2018-07-20 03:44:20 +04:30
MCboy	416db8e751	oops	2018-07-19 21:23:45 +04:30
MCboy	a8f9adeaf5	decompile player_field_avatar	2018-07-19 21:22:35 +04:30
MCboy	e3a82bd2c5	decompile player_field_avatar.s	2018-07-19 21:18:09 +04:30
DizzyEggg	118fa3afce	IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL	2018-07-16 22:00:27 +02:00
DizzyEggg	bf0178238a	Battle files - review changes	2018-07-16 20:47:30 +02:00
DizzyEggg	ea5ffa3375	Merge with master	2018-07-16 20:23:05 +02:00
Diegoisawesome	07ef762770	Merge pull request #275 from Diegoisawesome/master ... Document list_menu.c and main_menu.c	2018-07-15 04:43:03 -07:00
Diegoisawesome	731d6d59bc	Document list_menu.c and main_menu.c	2018-07-15 04:30:37 -07:00
Marcus Huderle	546819bc72	Use map type constants in map headers	2018-07-12 22:39:38 -05:00
Marcus Huderle	7d375972ba	Sync bg_event macros with pokeruby	2018-07-11 11:12:26 -05:00
Marcus Huderle	d675b7578c	Move movement type constants into include/constants/event_object_movement_constants.h	2018-07-10 18:04:41 -05:00
Slawter666	08774bdd88	Merge https://github.com/pret/pokeemerald into pokedex-doc	2018-07-08 01:23:28 +01:00
Slawter666	dd228fae5a	Minor variable labelling	2018-07-08 01:20:01 +01:00
DizzyEggg	ee3d505b58	little touches for HandleTurnActionSelectionState	2018-07-07 21:14:41 +02:00
DizzyEggg	008d961b2a	add party menu defines	2018-07-07 19:57:09 +02:00
DizzyEggg	1c48e58574	small fixes	2018-07-07 14:24:19 +02:00
DizzyEggg	9892298645	Merge branch 'master' into final_battle_files_touches	2018-07-07 14:11:04 +02:00
Diegoisawesome	f79ac26ce3	Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer	2018-07-05 20:33:07 -07:00
Diegoisawesome	5189442bcc	Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut	2018-07-05 20:32:12 -07:00
DizzyEggg	e6d67c7c22	give labels to player controller functions	2018-07-01 15:45:47 +02:00
DizzyEggg	c556358e47	label multiuse sprite template functions	2018-07-01 15:28:57 +02:00
DizzyEggg	f35c0abe80	merge with battle tent update	2018-07-01 12:16:52 +02:00
DizzyEggg	d2e47323fe	document frontier related	2018-07-01 11:15:42 +02:00
DizzyEggg	2d0be91217	Move all trainer defines to trainers.h and identify frontier brain trainer id	2018-06-30 18:55:34 +02:00
DizzyEggg	bfc64c9689	C vars sym ewram	2018-06-30 15:35:54 +02:00
DizzyEggg	97712ec931	change mapDataId to mapLayoutId	2018-06-30 14:52:13 +02:00
DizzyEggg	15fe5a031b	Merge branch 'master' into decompile_battle_tent	2018-06-30 14:43:41 +02:00
DizzyEggg	cdacc27714	change for loop in fldeff_cut	2018-06-30 14:26:33 +02:00
DizzyEggg	5434db2fc6	use region map constants	2018-06-30 14:22:09 +02:00
DizzyEggg	30c85a5128	more battle documentation	2018-06-30 14:12:17 +02:00
DizzyEggg	272b98da6c	document party status summary	2018-06-28 21:06:32 +02:00
Marcus Huderle	5e00c0bfcf	Fix map constants	2018-06-20 19:54:21 -05:00