837 Commits

Author	SHA1	Message	Date
camthesaxman	89092b609a	fix more command names	2017-10-01 12:21:52 -05:00
camthesaxman	639493e0ee	fix more command names	2017-10-01 12:07:22 -05:00
camthesaxman	6ca1e8747d	fix more command names	2017-10-01 11:51:50 -05:00
camthesaxman	f91da8a210	Merge remote-tracking branch 'upstream/master' into script_cmd_renaming	2017-10-01 11:17:34 -05:00
camthesaxman	e926119b72	update	2017-09-30 17:04:25 -05:00
camthesaxman	0f0f7856f1	update	2017-09-30 16:41:50 -05:00
camthesaxman	c0c4ab681c	update	2017-09-30 16:25:36 -05:00
camthesaxman	e2f293d771	name some ScrCmd_ functions	2017-09-30 16:13:50 -05:00
camthesaxman	676ffb73ca	stuff... I don't remember	2017-09-30 15:38:46 -05:00
Marcus Huderle	f74d4742f5	Merge pull request #399 from Doesnty/battle4 ... Improve battle_4	2017-09-29 21:15:47 -07:00
PikalaxALT	b3477c99c6	Merge branch 'master' into field_effect_helpers	2017-09-29 22:53:43 -04:00
PikalaxALT	6235276ca2	Merge branch 'master' into daycare	2017-09-28 21:41:17 -04:00
camthesaxman	b4ba35a54c	more command renaming	2017-09-26 14:33:52 -05:00
camthesaxman	9458b3fad1	single compare macro	2017-09-26 14:09:41 -05:00
camthesaxman	598756eaa4	more script command renaming	2017-09-24 17:57:54 -05:00
camthesaxman	207f8e6a76	more script command renaming	2017-09-24 17:36:39 -05:00
camthesaxman	1e2601a028	more script command renaming	2017-09-24 17:10:51 -05:00
camthesaxman	86e7bf1fd6	Replace more script commands and fix German build	2017-09-24 14:28:51 -05:00
camthesaxman	ae5ec7f5b0	Replace script commands: snop -> nop, snop1 -> nop1, jump -> goto	2017-09-24 14:17:14 -05:00
camthesaxman	0c234d0929	more renaming	2017-09-24 12:12:53 -05:00
PikalaxALT	d87ed69449	Merge branch 'master' into field_effect_helpers	2017-09-21 17:55:30 -04:00
camthesaxman	270bd98d41	more labeling	2017-09-13 00:03:22 -05:00
camthesaxman	2c87516ca3	more labels and fix build	2017-09-12 20:23:23 -05:00
camthesaxman	02104e52dd	move data to overworld.c	2017-09-12 17:26:13 -05:00
camthesaxman	a185f8a26d	lots more relabeling	2017-09-12 16:53:04 -05:00
camthesaxman	6f9ad223a5	stuff	2017-09-10 16:21:30 -05:00
camthesaxman	df71c1a803	lots more renaming	2017-09-10 12:34:41 -05:00
camthesaxman	5e9e52e3a9	more renaming/refactoring	2017-09-09 22:04:01 -05:00
camthesaxman	7309b13cb3	fix German build	2017-09-09 19:29:05 -05:00
camthesaxman	95f856c39e	more script_menu refactoring	2017-09-09 18:17:09 -05:00
PikalaxALT	add1b59b63	npc_pal_op and all data	2017-09-09 14:59:57 -04:00
Cameron Hall	99dc97f6aa	Merge pull request #417 from camthesaxman/decompile_mauville_old_man ... finish decompiling mauville_old_man	2017-09-08 22:11:08 -05:00
Cameron Hall	0194be6556	Merge pull request #420 from DizzyEggg/decompile_evolution_scene ... decompile evolution scene	2017-09-08 21:44:04 -05:00
Cameron Hall	4e64934d5f	Merge pull request #424 from DizzyEggg/decompile_pokemon_menu ... decompile pokemon menu	2017-09-08 19:11:14 -05:00
Cameron Hall	76320b6f84	Merge pull request #413 from Touched/decompile/field_ground_effect.s ... Decompile field_ground_effect.s	2017-09-08 19:02:55 -05:00
scnorton	7755869cd2	Convert egg moves and daycare strings/pointers to C objects	2017-08-30 09:43:48 -04:00
DizzyEggg	0e382fbe2c	decompile pokemon_menu	2017-08-29 23:18:35 +02:00
camthesaxman	2bc843ccbb	clean up mauville man script	2017-08-28 21:41:57 -05:00
DizzyEggg	c6e0f8cfd7	start decomp of pokemon menu	2017-08-28 21:09:02 +02:00
DizzyEggg	4a69db7a41	Merge branch 'master' into decompile_evolution_scene	2017-08-27 18:26:55 +02:00
camthesaxman	9202e8d4c0	data2c.s -> battle_moves.s	2017-08-27 11:13:32 -05:00
DizzyEggg	77ae82fc51	move data to C	2017-08-27 14:15:39 +02:00
camthesaxman	991cbbffbc	import DizzyEggg's battle controller changes	2017-08-26 19:45:45 -05:00
Cameron Hall	47e34a5ea3	Merge pull request #412 from ProjectRevoTPP/shop ... finish decompiling shop.c	2017-08-26 13:36:06 -05:00
ProjectRevoTPP	e9037c7861	move data to C	2017-08-25 23:38:46 -04:00
DizzyEggg	b4f9fe17d7	move evo graphics data to C	2017-08-25 20:55:08 +02:00
camthesaxman	b6ea4d9a77	label more stuff in mauville_old_man.c	2017-08-24 21:18:07 -05:00
camthesaxman	8c57ef0fad	finish labeling script	2017-08-24 20:50:39 -05:00
camthesaxman	19e06e09c9	actually fix build	2017-08-24 19:37:36 -05:00
DizzyEggg	ace4c34c14	Merge branch 'master' into decompile_pokeblock_feed	2017-08-25 00:18:58 +02:00