2581 Commits

Author	SHA1	Message	Date
DizzyEggg	20841a9f87	Use PLAYER_NAME_LENGTH constant	2019-05-15 16:53:59 -05:00
DizzyEggg	94045ace0b	Merge branch 'master' into battle_engine_v2	2019-05-15 13:31:53 +02:00
PikalaxALT	539d472796	Merge branch 'master' into dodrio_berry_picking	2019-05-11 21:22:09 -04:00
DizzyEggg	824a95fe07	Incinerate	2019-05-10 15:12:33 +02:00
DizzyEggg	d027bb0d7a	Life Flame toxic orbs	2019-05-10 11:03:33 +02:00
DizzyEggg	875b413a09	Various battle target items	2019-05-09 20:31:58 +02:00
DizzyEggg	bb8e397e5b	Gems and dmg reducing berries	2019-05-07 15:26:58 +02:00
DizzyEggg	5bc63ab550	Merge branch 'master' into battle_engine_v2	2019-05-07 10:23:14 +02:00
hjk321	438c5432aa	Document MON_DATA_10	2019-05-03 18:21:11 -05:00
DizzyEggg	900c15c20c	Mega evo animation	2019-05-03 17:27:49 +02:00
PikalaxALT	f13e1c78b2	through sub_81CA0EC	2019-05-02 17:53:00 -04:00
DizzyEggg	d0f91a996d	Tweak up mega evo	2019-05-02 23:10:01 +02:00
PikalaxALT	a14162eb9f	through sub_81C9F28	2019-05-02 16:43:32 -04:00
PikalaxALT	518865d8d9	sub_81C9A10	2019-05-02 16:19:25 -04:00
PikalaxALT	9b40cdaeb9	through sub_81C99FC	2019-05-02 14:27:59 -04:00
DizzyEggg	a7f2fa67ef	Merge pull request #142 from thechurchofcage/beta ... Magnetic Flux + Gear Up	2019-05-01 11:11:46 +02:00
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
Fontbane	6cf06d5f95	Doc some event scripts ... Doc decoration shops Revert "Doc decoration shops" This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435. Document through comments Un-revert decor documentation	2019-04-22 17:23:59 -05:00
Fontbane	2c076f1f3e	Doc most OnTransitions	2019-04-22 17:23:59 -05:00
Papa Cancer	3cde800bd0	Magnetic Flux + Gear Up ... Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.	2019-04-20 20:17:56 +01:00
Papa Cancer	b50007e861	Instruct ... Re-PR'd due to excess "merges"	2019-04-20 20:11:49 +01:00
Papa Cancer	7e99272482	Laser Focus ... Re-PR'd due to excess "merges"	2019-04-20 20:02:52 +01:00
Papa Cancer	c4acc3dbf8	Merge branch 'battle_engine_v2' into beta	2019-04-20 16:49:57 +01:00
DizzyEggg	5b43a9289d	Merge pull request #134 from thechurchofcage/epsilon ... Baneful Bunker + King's Shield	2019-04-20 08:42:35 +02:00
Papa Cancer	e310d0f10e	Core Enforcer ... New code - uses Gastro Acid script instead through own move effect	2019-04-18 12:10:18 +01:00
Papa Cancer	754befe393	Baneful Bunker + King's Shield ... Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!	2019-04-17 14:54:21 +01:00
Papa Cancer	e5e45bbcf5	Throat Chop ... Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.	2019-04-17 13:52:25 +01:00
Marcus Huderle	9915a3fd7f	Decompile pokenav_unk_5.c	2019-04-16 14:29:00 -05:00
DizzyEggg	b4e1375bb6	Document pokemon item effects	2019-04-16 11:23:09 -05:00
Marcus Huderle	f9f5f34b0c	Finish decompiling pokenav_unk_4.c	2019-04-16 11:21:13 -05:00
Marcus Huderle	c7954e1212	Decompile pokenav_unk_4.c through sub_81CB678()	2019-04-16 11:21:13 -05:00
Marcus Huderle	394c0f5546	Start decompiling pokenav_unk_4.c	2019-04-16 11:21:13 -05:00
Marcus Huderle	f40f2c5e9c	Decompile all of pokenav_unk_3.c	2019-04-14 13:44:44 -05:00
Marcus Huderle	e3bdb08efa	Start decompiling pokenav_unk_3.c	2019-04-14 13:44:44 -05:00
DizzyEggg	59797e4801	Use constants in battle_anim_special.c	2019-04-14 10:19:50 -05:00
DizzyEggg	dc764698c9	Use implicilt berry indexes in arrays	2019-04-14 10:15:18 -05:00
Fontbane	e430fe4b02	Add Dance flag	2019-04-13 21:15:00 -04:00
Marcus Huderle	065c60544d	Cleanup some pokenav code	2019-04-13 16:18:04 -05:00
Marcus Huderle	1268691410	Finish decompiling pokenav_unk_1.c	2019-04-13 16:18:04 -05:00
Marcus Huderle	cb9d471a2a	Decompile pokemon_jump through sub_802CE48()	2019-04-13 11:37:50 -05:00
Phlosioneer	2b740b46e8	About halfway done with pokenav_unk_1.s	2019-04-13 11:34:53 -05:00
Phlosioneer	ee2edb068a	Start decomp of pokenav_unk_1 ... Looks like it's the Ribbons menu, based on the first function.	2019-04-13 11:34:53 -05:00
DizzyEggg	31222ef64b	Add held effect debug override	2019-04-13 14:56:26 +02:00
DizzyEggg	93e86e6a76	Tweak Stomping Tantrum	2019-04-13 14:36:08 +02:00
DizzyEggg	549a9cdcc2	Merge pull request #118 from thechurchofcage/beta ... Stomping Tantrum	2019-04-13 14:09:15 +02:00
DizzyEggg	4e5c543327	Remove new items data from battle engine	2019-04-13 14:02:04 +02:00
DizzyEggg	2646f3b26a	Merge with master	2019-04-13 13:42:44 +02:00
huderlem	ce93d3ab9a	Merge pull request #661 from Phlosioneer/contest-ai-cleanup ... contest & contest_ai cleanup	2019-04-08 17:30:28 -05:00
ultima-soul	2c432c314a	Match sub_8159308	2019-04-08 17:29:44 -05:00
DizzyEggg	1c73e61a2b	Parabolic Charge anim	2019-04-08 16:48:04 +02:00
DizzyEggg	cf73a3ba28	Merge pull request #126 from thechurchofcage/zeta ... Ability-ignoring moves	2019-04-08 15:21:08 +02:00
DizzyEggg	27d645ad8a	Merge pull request #123 from thechurchofcage/delta ... Leaf Storm animation	2019-04-08 15:20:09 +02:00
DizzyEggg	0e02c28927	Merge with master	2019-04-08 09:37:41 +02:00
Phlosioneer	50350cc2e1	Merge branch 'master' into contest-ai-cleanup	2019-04-07 20:20:22 -04:00
huderlem	a4ea0ac816	Merge pull request #645 from Phlosioneer/pokenav-decomp-again ... Pokenav decomp again	2019-04-07 18:03:32 -05:00
Phlosioneer	d352999cd8	Change "navgear" to "pokenav"	2019-04-07 18:10:53 -04:00
Phlosioneer	0dc73b0b3a	Break up pokenav into subfiles ... The files are separated based on the pokenav resources substruct ID they use.	2019-04-07 14:40:35 -04:00
Marcus Huderle	78151b6d88	Start decompiling pokemon_jump.c	2019-04-07 13:12:27 -05:00
Papa Cancer	fc8e59403a	Ability-ignoring moves ... Just Moongeist Meme and Sunsteel Strike for now. Added a special flag and modified "GetBattlerAbility" to check the current move for it.	2019-04-07 13:03:40 +01:00
Phlosioneer	d84d94e29a	Merge branch 'master' into pokenav-decomp-again	2019-04-07 01:56:36 -04:00
Phlosioneer	ddfe0f91cf	Document decompiled parts of the pokenav main menu	2019-04-06 23:34:30 -04:00
Papa Cancer	255ac6b54d	Leaf Storm animation ... All credit to Doesnt, just stole it from his pokeruby build	2019-04-06 22:02:22 +01:00
DizzyEggg	f8713f9c15	Merge with master	2019-04-06 20:43:13 +02:00
Marcus Huderle	fe12f2f4b3	Document and cleanup some decoration code	2019-04-06 12:49:09 -05:00
Fontbane	4a09a5da33	Doc field move scripts completely, use fldeff constants for dofieldeffect ... Fix labels Fix labels again Delete extra boulder scripts Now it should build fine	2019-04-06 12:48:50 -05:00
DizzyEggg	b85a74afc5	Give names to battle anim backgrounds	2019-04-06 12:44:27 -05:00
DizzyEggg	19f151417e	Rename sprite sheet to sprite gfx	2019-04-06 10:14:48 -05:00
DizzyEggg	b93581b519	Rename battle anim sprites	2019-04-06 10:14:48 -05:00
DizzyEggg	311c1b9cba	Change anim tag names	2019-04-06 10:14:48 -05:00
Phlosioneer	bc50686158	Decomp everything onvolving UnknownSubStruct_81C81D4 ... Now I can start cleaning up the fields and substructs	2019-04-06 03:42:14 -04:00
Papa Cancer	33d484a7ed	Merge branch 'battle_engine_v2' into beta	2019-04-06 00:38:56 +01:00
Papa Cancer	43525d2a9c	Merge branch 'battle_engine_v2' into delta	2019-04-05 23:13:41 +01:00
DizzyEggg	794c9aa255	Merge pull request #121 from thechurchofcage/epsilon ... Three pointless moves	2019-04-05 23:47:54 +02:00
DizzyEggg	7c8f69e6e3	Merge pull request #109 from Fontbane/patch-4 ... Field Effects for Gen IV Abilities	2019-04-05 23:40:30 +02:00
Marcus Huderle	033580da96	Document secret base	2019-04-05 16:24:57 -05:00
Papa Cancer	4c8bc9d526	Three pointless moves ... Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)	2019-04-05 18:10:02 +01:00
Fontbane	e8dd8f93d1	Remove Honey functionality	2019-04-05 10:33:19 -04:00
DizzyEggg	70569e7ebc	Use shiny species tag	2019-04-05 07:53:23 -05:00
DizzyEggg	b0223f691f	Clean up data headers	2019-04-05 07:53:23 -05:00
DizzyEggg	c36476af85	Clean up data2b.c	2019-04-05 07:53:23 -05:00
DizzyEggg	dd24597d52	Finish up menu specialised	2019-04-05 07:53:23 -05:00
PikalaxALT	a58d9a16dd	Merge branch 'master' into dodrio_berry_picking	2019-04-05 08:41:31 -04:00
DizzyEggg	183b714ff1	Merge with master and fix web moves	2019-04-05 12:43:44 +02:00
Fontbane	9e74409bb2	Fix labels, label more scripts	2019-04-04 19:34:35 -05:00
PikalaxALT	8db03ba6fa	Documentation of ereader helpers, 2	2019-04-04 19:26:45 -05:00
PikalaxALT	c46f271f67	Documentation of ereader_helpers, 1	2019-04-04 19:26:45 -05:00
PikalaxALT	53efbe2832	Finish decomp of union_room_chat	2019-04-04 19:26:45 -05:00
PikalaxALT	a47abb3949	union_room_chat data, 1	2019-04-04 19:26:45 -05:00
Phlosioneer	1360b3a477	RGB Constants	2019-04-04 17:05:46 -04:00
Diegoisawesome	f125de3e66	Merge pull request #659 from ultima-soul/pokemon ... Remove pokemon_3.h	2019-04-04 12:49:46 -05:00
Diegoisawesome	8361ada4ba	Merge pull request #656 from ultima-soul/menu_specialized ... Decompile some of menu_specialized	2019-04-04 12:49:17 -05:00
Diegoisawesome	e476a6d02d	Merge pull request #624 from Wyrserth/master ... Use constants for naming screen's pages	2019-04-04 12:44:18 -05:00
ultima-soul	91a94a0ca1	Try to get closer to matching.	2019-04-03 21:13:26 -07:00
Phlosioneer	3b3b2dd031	General cleanup of the second half of contest.c	2019-04-03 20:43:23 -04:00
ultima-soul	48d27c035a	Remove pokemon_3.h	2019-04-03 15:15:08 -07:00
PikalaxALT	4fadbaf161	Minor fixes ... gotoram --> returnram cmdCF/execram --> gotoram fix indentation in sym_ewram.txt fix mevent_client.h guard name	2019-04-03 17:04:42 -05:00
PikalaxALT	d0384ee95e	mevent_server_ish --> mevent_client	2019-04-03 17:04:42 -05:00
PikalaxALT	d220f876fc	Some symbol documentation	2019-04-03 17:04:42 -05:00
PikalaxALT	28646ea64e	Decompile mevent server scripts	2019-04-03 17:04:42 -05:00
PikalaxALT	6c12d154e7	Reformat mevent server and client scripts	2019-04-03 17:04:42 -05:00
PikalaxALT	03badd9c40	mevent_server_ish	2019-04-03 17:04:42 -05:00
PikalaxALT	dabd1f6177	finish mevent_server.s	2019-04-03 17:04:42 -05:00
PikalaxALT	a455d98385	start porting mevent_server from firered	2019-04-03 17:04:42 -05:00
Phlosioneer	3a2ea40188	Rename and document more contest setup functions ... Also properly label the link contest flags variable, and label the contest window ID's.	2019-04-03 17:24:32 -04:00
Phlosioneer	f82bdb332a	Document applause meter code	2019-04-03 03:00:06 -04:00
ultima-soul	02651f6177	Attempt to decompile menu_specialized. 2 NONMATCHING	2019-04-02 19:18:36 -07:00
Phlosioneer	8f13e991d2	Found a debug system for pokemon contests	2019-04-02 21:51:21 -04:00
Phlosioneer	99e8e8e53f	More cleanup, document contestant sorting	2019-04-02 20:00:05 -04:00
Marcus Huderle	181baf9fe5	Merge remote-tracking branch 'upstream/master' into misc_docs ... # Conflicts: # src/field_weather_effect.c	2019-04-02 18:29:51 -05:00
Marcus Huderle	1241700b20	Finish documenting the other weather effects	2019-04-02 18:28:56 -05:00
DizzyEggg	d8c9f1b30f	Rows and columns	2019-04-02 16:28:38 -05:00
DizzyEggg	baa187665b	Document a bit of script menu and battle anims	2019-04-02 16:28:38 -05:00
Phlosioneer	9f44ebc5cd	Automatically calculate REMATCH_TABLE_ENTRIES ... Uses the standard C way of calculating the length of an enum.	2019-04-02 07:28:30 -05:00
Phlosioneer	6916f09cd5	Expand MatchCallStruct defs, use REMATCH_* enum	2019-04-02 07:28:30 -05:00
DizzyEggg	5c44f44ad2	Organize new battle anim gfx	2019-04-02 12:26:24 +02:00
DizzyEggg	cd3de7821e	Merge branch 'master' into battle_engine_v2	2019-04-02 08:37:54 +02:00
Phlosioneer	c3200c0beb	Cleanup some of gContestResources	2019-04-02 00:35:57 -04:00
PikalaxALT	7571969a45	Finish union room battle	2019-04-01 22:08:50 -05:00
PikalaxALT	4be97b2dc6	through sub_801A960	2019-04-01 22:08:50 -05:00
Phlosioneer	845307b3a6	Rename contest AI stuff	2019-04-01 22:16:07 -04:00
Marcus Huderle	35505c7f5b	Document somre more weather effects	2019-04-01 20:04:23 -05:00
Phlosioneer	c429e6d69c	Move gPlayerFacingPosition out of sym_ewram.txt (#617) ... * Move gPlayerFacingPosition out of sym_ewram.txt * Fix tabs in sym_ewram.txt * Remove redundant faraway island extern	2019-04-01 19:30:41 -05:00
DizzyEggg	d39b5f6d26	Fix messing with move result flags when not needed	2019-04-02 00:14:01 +02:00
Papa Cancer	c9ad96d228	Stomping Tantrum ... Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.	2019-04-01 20:06:45 +01:00
PikalaxALT	9f1d1219ce	create header and fix prototypes	2019-04-01 14:20:34 -04:00
PikalaxALT	ce89cf6f75	through sub_801A3D0	2019-04-01 14:09:56 -04:00
PikalaxALT	1fe5208560	through sub_801A02C	2019-04-01 12:05:58 -04:00
huderlem	1e8e5af033	Merge pull request #607 from Phlosioneer/contest-data ... Contest data	2019-04-01 07:37:15 -05:00
huderlem	bee1d1cbb0	Merge pull request #611 from Phlosioneer/pokedex-area-const-array ... Document sAreaGlowTilemapMapping	2019-04-01 07:33:33 -05:00
DizzyEggg	944dc4f6bf	Merge with master	2019-04-01 13:40:42 +02:00
DizzyEggg	62192b86f7	Aroma Veil	2019-04-01 11:42:37 +02:00
Marcus Huderle	099ea89b77	Document rain weather effect	2019-03-31 21:09:30 -05:00
Phlosioneer	cd069446e0	Merge branch 'master' into pokedex-area-const-array	2019-03-31 20:43:42 -04:00
Phlosioneer	3181c64c64	Change names from MAP_AREA_ to MAP_GROUP_	2019-03-31 20:40:14 -04:00
Phlosioneer	37c7441a15	Merge branch 'master' into contest-data	2019-03-31 20:22:47 -04:00
Phlosioneer	23ac2cc94e	Prep for merge	2019-03-31 20:15:44 -04:00
Phlosioneer	207a54393c	Fix mistakes and use EVENT_OBJ_GFX_* macros	2019-03-31 20:07:24 -04:00
PikalaxALT	ade0183378	Document mystery_gift	2019-03-31 18:59:52 -04:00
PikalaxALT	0a8427c8ef	fakematching task00_mystery_gift	2019-03-31 15:43:51 -05:00
PikalaxALT	90fb329b70	through task_add_00_mystery_gift	2019-03-31 15:43:51 -05:00
PikalaxALT	fb5c19a33b	through mevent_message	2019-03-31 15:43:51 -05:00
PikalaxALT	813de11154	Through mevent_save_game	2019-03-31 15:43:51 -05:00
PikalaxALT	f88f815cff	WIP sub_8018DAC	2019-03-31 15:43:51 -05:00
PikalaxALT	aafe9df454	through sub_8018798	2019-03-31 15:43:51 -05:00
PikalaxALT	f34cda3b52	Start decompiling mystery gift	2019-03-31 15:43:51 -05:00
DizzyEggg	e878de782e	Merge pull request #114 from thechurchofcage/gamma ... Misc. move updates	2019-03-31 22:08:14 +02:00
DizzyEggg	6f9096c613	Add Sweet Veil	2019-03-31 22:02:39 +02:00
DizzyEggg	b12334c88b	Remove cases from ABE, add functionality of Flower Veil	2019-03-31 21:38:58 +02:00
Marcus Huderle	d13563b174	Document some faraway_island code	2019-03-31 14:09:40 -05:00
Papa Cancer	1d5cf3acb5	Misc. move updates ... Bind: 75% Acc -> 85% Acc Disable: 55% Acc. -> 100% Acc. Freeze-Dry: 10% chance to freeze Hammer Arm and Ice Hammer: lower user's speed High Jump Kick: 130BP, 10 PP Jump Kick: 100BP, 10 PP Tail Glow: raises Sp. Atk by 3 stages Waterfall: 20% chance to flinch	2019-03-31 18:25:37 +01:00
Marcus Huderle	462b196abc	Give battle_anim files appropriate names	2019-03-31 12:15:39 -05:00
Papa Cancer	ebe2dc6bbb	Mat Block ... Nothing more needs to be said	2019-03-31 17:17:13 +01:00
Marcus Huderle	500d009b5c	Start decompiling berry_crush.c	2019-03-31 09:13:19 -05:00
huderlem	b9bf3bf072	Merge pull request #637 from DizzyEggg/pokeblock_attempt ... Use Pokeblock clean-up and some menu_specialised decomp	2019-03-31 08:39:18 -05:00
DizzyEggg	d90767c490	Switch effect and argument fields in BattleMove struct	2019-03-31 15:24:46 +02:00
DizzyEggg	17e74756cb	Merge with master, add defines to atk49 and statbuffchange commands	2019-03-31 15:19:25 +02:00
DizzyEggg	e3c07c83f2	More work on use pokeblock	2019-03-31 14:32:26 +02:00
DizzyEggg	aa7f69f067	Begin use pokeblock and menu specialised	2019-03-31 12:59:01 +02:00
PikalaxALT	ccac4694cd	Merge branch 'master' into continue_union_room	2019-03-30 12:41:10 -04:00
DizzyEggg	35cffea987	Helpful macros for atk49	2019-03-30 08:29:56 -05:00
PikalaxALT	2f57d6bc0f	sub_8018220	2019-03-30 09:18:58 -04:00
DizzyEggg	876be1d9cd	Merge pull request #104 from thechurchofcage/beta ... Spiky Shield	2019-03-30 11:21:27 +01:00
Marcus Huderle	accc5ae8dd	Merge remote-tracking branch 'upstream/master' into union_room_chat ... # Conflicts: # ld_script.txt	2019-03-29 21:27:08 -05:00
Marcus Huderle	a978a6a624	Finish decompiling union_room_chat.c	2019-03-29 21:26:08 -05:00
PikalaxALT	2e588fd4d7	through sub_80181DC	2019-03-29 22:22:26 -04:00
PikalaxALT	8fc51b0459	through sub_8017CB0	2019-03-29 15:50:04 -04:00
Marcus Huderle	519426f4e6	Decompile union_room_chat through sub_8020118	2019-03-28 20:20:52 -05:00
PikalaxALT	7c45a7c443	port mevent_801BAAC from fire red	2019-03-28 07:32:25 -05:00
Marcus Huderle	aebc676913	Decompile union_room_chat.c up to sub_801F5B8	2019-03-27 19:09:12 -05:00
PikalaxALT	8e0773675c	through sub_8017168	2019-03-27 13:16:10 -04:00
PikalaxALT	9a8b001ebf	through sub_801704C	2019-03-27 10:44:49 -04:00
scnorton	c6c0c9582f	Port menews_jisan.c from FireRed	2019-03-27 07:40:08 -05:00
Marcus Huderle	af1baa89f1	Start decompiling union_room_chat.c	2019-03-26 21:58:20 -05:00
Papa Cancer	a3b4767dd2	Spiky Shield ... Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed	2019-03-26 17:45:34 +00:00
Fontbane	2cfa5ea326	Fixed Honey ... And updated gitignore	2019-03-25 19:00:46 -04:00
Fontbane	fc69631a10	Field effects for Gen IV Abilities ... Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.	2019-03-25 17:49:29 -04:00
scnorton	e3a11bc3ca	through sub_80259FC	2019-03-25 15:26:23 -04:00
PikalaxALT	d4cca4ffa2	through sub_8024F38	2019-03-24 22:56:16 -04:00
PikalaxALT	d49d3b6858	through sub_8024E38	2019-03-24 21:17:25 -04:00
Marcus Huderle	d7a9fcb975	Cleanup mevent2	2019-03-24 18:29:00 -05:00
Marcus Huderle	e6caf0ff10	Port mevent2.c from pokefirered	2019-03-24 18:29:00 -05:00
Marcus Huderle	cf917a8733	Decompile berry_powder.c	2019-03-24 14:50:16 -05:00
Marcus Huderle	456cc3a6f0	Split out the remaining wireless-related files	2019-03-24 13:15:37 -05:00
Papa Cancer	61a7bd2788	Taunt fix etc. ... Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.	2019-03-24 12:54:01 +00:00
Marcus Huderle	4fd2b0b484	Decompile remaining functions in use_pokeblock.s	2019-03-23 17:23:14 -05:00
Wyrserth	6566a49beb	Use constants for naming screen's pages.	2019-03-23 21:52:58 +01:00
DizzyEggg	7018745230	Fix Defiant stat raise by allies	2019-03-23 17:21:14 +01:00
Marcus Huderle	511ff2f20f	Match sub_8166BEC and do some cleanup	2019-03-23 10:41:09 -05:00
DizzyEggg	e135ea47e5	Touch up Anger Point	2019-03-23 16:33:08 +01:00
Marcus Huderle	a5ee2c14fd	Merge remote-tracking branch 'upstream/master' into use_pokeblock ... # Conflicts: # include/menu_specialized.h	2019-03-23 10:14:31 -05:00
Marcus Huderle	91fa5faf4a	Match sub_8166564	2019-03-23 10:10:51 -05:00
Fontbane	e8add87bf3	Document Field Effects and some related text ... Also VAR_TRICK_HOUSE_LEVEL	2019-03-23 09:57:37 -05:00
Fontbane	7d54c2b960	EventScript and Text Documentation ... In event_script.s. Also renamed a couple events for consistency/detail.	2019-03-23 09:57:37 -05:00
DizzyEggg	53c60ab292	Merge branch 'master' into battle_engine_v2	2019-03-23 15:54:08 +01:00
DizzyEggg	77c4856e62	Nonmatchings go away	2019-03-23 09:51:27 -05:00
Marcus Huderle	65391a1eb2	Merge remote-tracking branch 'upstream/master' into use_pokeblock ... # Conflicts: # src/use_pokeblock.c	2019-03-23 09:39:46 -05:00
Marcus Huderle	a7d5f032b1	Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c	2019-03-22 14:16:26 -05:00
Marcus Huderle	f4f666f5af	Finish decompiling ereader.c	2019-03-22 13:36:06 -05:00
DizzyEggg	54ab6b43dc	Merge with master	2019-03-22 10:40:31 +01:00
Marcus Huderle	768a68d3e8	Decompile ereader.c up to faraway island code	2019-03-21 18:36:12 -05:00
Marcus Huderle	7118462b9f	Decompile ereader.c up to faraway island code	2019-03-21 18:28:44 -05:00
Marcus Huderle	e9a3cc6d51	Merge remote-tracking branch 'upstream/master' into move-tutor ... # Conflicts: # include/pokenav.h # src/battle_script_commands.c	2019-03-17 17:20:40 -05:00
Phlosioneer	9848f84b9e	Use constants for Oam .shape and .size fields ... Also some general formatting fixes for constants.	2019-03-16 12:37:04 -05:00
Phlosioneer	092608aef6	Add a constant for "no music" on maps.	2019-03-16 12:31:29 -05:00
Phlosioneer	61344a4fee	Document the water droplet data.	2019-03-16 12:25:02 -05:00
Phlosioneer	8cea949e6d	Move constant and EWRAM data into C.	2019-03-15 19:33:30 -04:00
Phlosioneer	7f70b629f5	Document sAreaGlowTilemapMapping ... I used a script to generate the format for the array, so I can easily change its formatting if needed.	2019-03-12 05:35:15 -04:00
Phlosioneer	8e1537fb57	Document map name popup flag	2019-03-10 09:23:58 -05:00
Phlosioneer	0c935a8bd5	Move the contest opponent filter to C	2019-03-09 22:54:17 -05:00
Phlosioneer	153499ed6f	Clean up contest_opponents.inc	2019-03-09 01:38:38 -05:00
Phlosioneer	5b4b0a245b	Move contest winner list to C	2019-03-09 00:01:49 -05:00
Phlosioneer	b7cfa9d365	Move more contest constants into C	2019-03-08 21:39:51 -05:00
huderlem	32f71b2976	Merge pull request #600 from Phlosioneer/summary-screen-macros ... Summary screen macros	2019-03-08 13:37:12 -06:00
DizzyEggg	c329252ce3	Add Safety Googles effect	2019-03-08 10:16:54 +01:00
Phlosioneer	5886f82ef5	Merge branch 'master' into extern-cleanup	2019-03-08 02:45:26 -05:00
Phlosioneer	b93d923826	Merge branch 'master' into move-tutor	2019-03-08 02:27:20 -05:00
Phlosioneer	eac70acab6	Change filename to something more descriptive	2019-03-08 02:17:01 -05:00
Phlosioneer	af182d6f16	Minor cleanup before pushing	2019-03-08 02:10:44 -05:00
Phlosioneer	69aec91577	Decompile move tutor stuff ... 2 nonmatching.	2019-03-08 01:56:38 -05:00
DizzyEggg	055f5a17b4	Merge pull request #103 from LOuroboros/battle_engine_v2 ... Protective Pads' description and Safety Goggles	2019-03-07 19:20:51 +01:00
DizzyEggg	b3ec24ab12	Merge pull request #102 from LOuroboros/battle_engine_v2 ... Gen. 5 Gems and Gen. 7 hold items stuff	2019-03-07 18:53:48 +01:00
LOuroboros	7d7e54c59a	Added the item sprite of the Safety Goggles.	2019-03-07 13:54:54 -03:00
LOuroboros	25ff138ead	Reordered the Item IDs a little bit to add the Safety Goggles and also added their item data.	2019-03-07 13:52:46 -03:00
DizzyEggg	f9ee31903d	VCreate and fix stat stage changes functions	2019-03-07 12:20:57 +01:00
LOuroboros	75d78f4941	Added the item sprites of the Gen. 7 hold items.	2019-03-07 07:19:40 -03:00
LOuroboros	2f4aceb4a9	Defined a hold effect for the terrain effect boosting seeds and the Adrenaline Orb.	2019-03-07 07:09:19 -03:00
Phlosioneer	0da83abad2	Several nonmatching functions ... Huge and difficult.	2019-03-06 22:27:30 -05:00
LOuroboros	ee8b72e68c	Implemented the sprites for the Gen. 5 gems.	2019-03-06 15:33:02 -03:00
LOuroboros	7dc39298d6	Added a new hold effect for the Gen. 5 gems.	2019-03-06 15:29:00 -03:00
LOuroboros	36421d81eb	Reordered the Item IDs a little bit, in order to include battle items like the Gen. 5 Gems and the Gen. 7 Seeds.	2019-03-06 15:07:25 -03:00
DizzyEggg	7a8f524bc5	Proper Roar handling in double battles	2019-03-06 12:09:34 +01:00
Phlosioneer	4345ba8e6c	More decompiled and cleanup	2019-03-05 22:32:28 -05:00
Phlosioneer	c3594f982d	Decompiling pokeblock ui stuff	2019-03-05 20:32:14 -05:00
DizzyEggg	fddb5159b4	Merge with master	2019-03-05 21:46:45 +01:00
Papa Cancer	2050ac3963	Grassy Terrain v2 ... All corrected, simplest version Also includes proper ending strings for all terrains	2019-03-05 19:13:25 +00:00
DizzyEggg	b150091436	Rename an erroneously named battlescript	2019-03-05 17:06:29 +01:00
Phlosioneer	9bea9e1624	Start decompiling menu_unknown	2019-03-05 06:06:20 -05:00
Phlosioneer	907492fd6e	Split rom asm file in half ... The first half is ui/menu stuff, while the second half is link-related stuff.	2019-03-04 23:26:51 -05:00
Phlosioneer	cae63cf1c7	Rename move tutor to move relearner	2019-03-04 20:56:39 -05:00
Phlosioneer	2879fe7fe0	Merge branch 'master' into summary-screen-macros	2019-03-03 16:58:54 -05:00
Phlosioneer	63e700af6c	Use macros for summary windows ... Other minor changes and fixes are included	2019-03-03 16:50:51 -05:00
Phlosioneer	4ea5e85bed	Fix typos ... This is an updated version of #554, since it hasn't been updated in two weeks.	2019-03-03 09:31:47 -06:00
Phlosioneer	e03595a10d	Bugfixes from #591	2019-03-03 09:31:08 -06:00
Phlosioneer	4907ce6f7f	Fully document move_tutor (formerly learn_move)	2019-03-03 02:50:40 -05:00
Papa Cancer	cfd50eb65a	Grassy Terrain + minor fixes ... Includes strings for all Fixes: ・Psychic Terrain blocks priority if the TARGET is grounded, not the user ・Psychic Terrain no longer targets an opponent ・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable ・Small fix: Meteor Mash corrected to being a physical attack	2019-03-02 22:52:43 +00:00
Phlosioneer	9372731c3e	Merge branch 'master' into main-menu-state-machine	2019-03-02 17:35:44 -05:00
Phlosioneer	3716da5430	Rename macro with correct name for pixel values	2019-03-02 17:25:39 -05:00
Phlosioneer	80a4ee1145	Remove water.h and flying.h	2019-03-02 17:23:10 -05:00
DizzyEggg	5dd7ab98d1	Merge pull request #99 from LOuroboros/battle_engine_v2 ... Various Things	2019-03-02 22:42:50 +01:00
LOuroboros	5c1cf3063f	Implemented the sprites for the Gen. 6 items.	2019-03-02 12:42:53 -03:00
LOuroboros	e15c745cf5	Fixed 2 typos. Loppunite>Lopunnite and Loppunny>Lopunny.	2019-03-02 12:35:11 -03:00
LOuroboros	07f9bcad10	Swapped Keystone with Mega Bracelet.	2019-03-02 12:31:43 -03:00
huderlem	ee9694d9ba	Merge pull request #587 from Phlosioneer/document-all-event-vars ... Document all event vars	2019-03-02 08:24:46 -06:00
DizzyEggg	bf70861798	Powder moves on grass types	2019-03-02 13:08:50 +01:00
DizzyEggg	8e9296a42b	Fix team messages	2019-03-02 12:31:07 +01:00
Phlosioneer	25050b9944	Fix tabs, do suggested rename	2019-03-02 04:13:27 -05:00
Phlosioneer	49bef25856	Clean up the last extern functions	2019-03-02 03:18:08 -05:00
Phlosioneer	ee69426838	Eliminate more externs	2019-03-02 02:44:02 -05:00
Phlosioneer	3ceb1667c9	Reduce externs	2019-03-01 22:32:50 -05:00
huderlem	3b04cfa437	Merge pull request #551 from Phlosioneer/multiplayer-stuff ... Document overworld.c and link stuff in general	2019-03-01 08:43:55 -06:00
DizzyEggg	eea162d3d8	Effect Spore ability pop-up	2019-03-01 13:59:08 +01:00
DizzyEggg	201b68413d	Merge pull request #92 from LOuroboros/fileformat ... Implemented the sprites for the Gen. 4 and 5 items.	2019-03-01 13:40:23 +01:00
DizzyEggg	bfe95bc4b9	Merge branch 'master' into battle_engine_v2	2019-03-01 13:29:50 +01:00
Phlosioneer	a7e5852f1d	More minor fixes	2019-03-01 01:49:11 -05:00
Phlosioneer	459fd93b59	Fix minor errors	2019-03-01 01:18:58 -05:00
Phlosioneer	da0687987d	Pick better names for constants	2019-02-28 22:21:16 -06:00
Phlosioneer	189d387f01	Add macros for metatile manipulation	2019-02-28 22:21:16 -06:00
hondew	9ed0f77528	fixed issues in data and include dirs	2019-02-28 21:21:56 -06:00
hondew	6a4202cdbd	tidied lucky flags	2019-02-28 21:21:56 -06:00
hondew	1dc0d346d9	fix spelling error	2019-02-28 21:21:56 -06:00
hondew	dd8ecabe26	fix mistakes and bad formatting	2019-02-28 21:21:56 -06:00
hondew	f965f1b13d	label luckyFlags	2019-02-28 21:21:56 -06:00
hondew	67fe781ed2	clean up slot machine until AwardPayout	2019-02-28 21:21:56 -06:00
hondew	5c8cc5225f	document slot machine	2019-02-28 21:21:56 -06:00
LOuroboros	9564de6edb	Implemented the sprites for the Gen. 4 and 5 items.	2019-03-01 00:06:31 -03:00
DizzyEggg	cebada80d0	Merge with master	2019-02-28 20:56:52 +01:00
Phlosioneer	99bfd8c80f	VAR_0x3F20 is not a var	2019-02-28 00:10:44 -05:00
Phlosioneer	373d73eb3b	Fix last special var	2019-02-28 00:06:27 -05:00
Phlosioneer	bf45b83c65	Finish documenting event vars	2019-02-27 23:54:51 -05:00
Phlosioneer	782979f1fc	Finish documenting trainer hill ... Trainer hill isn't anywhere close to done, but I figured out enough to name the VAR. That's all this PR should do.	2019-02-27 22:16:01 -05:00
Phlosioneer	66f0616a2d	I guess I'm documenting Trainer Hill now	2019-02-27 21:31:05 -05:00
Phlosioneer	e77e7844ea	Name several vars, document some related events	2019-02-27 20:25:09 -05:00
Phlosioneer	648fc3d4f3	Name more unknown vars	2019-02-27 15:18:56 -05:00
Phlosioneer	4137dd7b0b	Identify unused, never read, and never written vars	2019-02-27 14:42:32 -05:00
Marcus Huderle	4b9e93850c	Document easy chat screen types	2019-02-27 12:55:29 -06:00
Phlosioneer	c1348d22f3	Name most event scripts related to unusual weather	2019-02-27 04:27:54 -05:00
Phlosioneer	fe55580fe1	Reverse engineer unusual weather events	2019-02-27 03:42:04 -05:00
Phlosioneer	72bb0daccb	Merge branch 'master' into main-menu-state-machine	2019-02-26 22:34:42 -05:00
Phlosioneer	6cb4c677cd	Fix backwards names	2019-02-26 22:30:40 -05:00
Phlosioneer	3a44b090d1	Merge branch 'master' into multiplayer-stuff	2019-02-26 22:07:29 -05:00
Phlosioneer	accea672f1	Incorporate feedback	2019-02-26 22:04:44 -05:00
Marcus Huderle	231355f84d	Decompile easy_chat data	2019-02-26 14:50:02 -06:00
Marcus Huderle	b60611c38e	Finish decompiling easy_chat.c code	2019-02-26 14:50:02 -06:00
huderlem	153f134318	Merge pull request #583 from huderlem/easy_chat ... Decompile more easy_chat.c	2019-02-25 14:12:18 -06:00
Marcus Huderle	7ea05431a5	Decompile more easy_chat.c	2019-02-25 14:11:31 -06:00
DizzyEggg	df9e6a6889	Free up two status3 flags	2019-02-25 16:17:23 +01:00
huderlem	d77ba3d413	Merge pull request #581 from arantonitis/pokemon_summary ... Documented/polished pokemon_summary_screen.c	2019-02-25 08:09:14 -06:00
huderlem	b3a7a1278a	Merge pull request #577 from Phlosioneer/weather-15 ... Document the weather state functions	2019-02-25 08:03:22 -06:00
huderlem	84573f1774	Merge pull request #574 from Phlosioneer/event-vars ... Event vars	2019-02-25 08:02:28 -06:00
Phlosioneer	5f7a971313	Source file part of map script renaming	2019-02-25 08:01:22 -06:00
Phlosioneer	1cd5cb09cf	Merge branch 'master' into weather-15	2019-02-25 02:30:35 -05:00
Phlosioneer	e1b2460748	Adjust formatting, rename function	2019-02-25 02:28:41 -05:00
Phlosioneer	4e5fae0086	Merge branch 'master' into event-vars	2019-02-25 02:24:20 -05:00
Phlosioneer	87859a655b	Fix flag formatting for fun	2019-02-25 02:20:38 -05:00
DizzyEggg	da33c38183	Merge pull request #78 from thechurchofcage/beta ... Gravity fix	2019-02-24 19:38:42 +01:00
Papa Cancer	d704b9cd5b	Gravity fix ... Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity	2019-02-24 13:28:24 +00:00
Ariel Antonitis	74a3c06270	Documented/polished pokemon_summary_screen.c ... Mostly variables mislabeled as global and some formerly unknown stuff.	2019-02-23 21:12:35 -05:00
Diegoisawesome	7995cf5b61	Merge pull request #578 from DizzyEggg/pokenav ... pokenav	2019-02-23 16:04:59 -06:00
DizzyEggg	842e379a7b	Merge branch 'master' into battle_engine_v2	2019-02-23 22:50:46 +01:00
Marcus Huderle	f34903bc45	Decompile more easy_chat.c	2019-02-23 13:05:34 -06:00
ultima-soul	eb48cc2f7e	Decompile through sub_8167930.	2019-02-23 09:08:07 -08:00
DizzyEggg	788caa4fe2	pokenav	2019-02-23 13:34:01 +01:00
Phlosioneer	b2866fae21	Document the weather state functions ... All weather types are now documented (including WEATHER_15)	2019-02-22 22:20:42 -05:00
Marcus Huderle	d3f66a98ff	Decompile more easy_chat	2019-02-22 11:46:05 -06:00
Phlosioneer	cea5696f23	Finish moving pokeruby vars	2019-02-22 04:18:43 -05:00
Phlosioneer	e12a7790cf	Start porting pokeruby vars to pokeemerald	2019-02-22 04:01:38 -05:00
Phlosioneer	44e92ce259	Give window drawing functions better names	2019-02-22 01:40:11 -05:00
Phlosioneer	c96f8751cd	Improve window palette macros	2019-02-21 23:27:12 -05:00
Phlosioneer	399d646e3f	Merge branch 'master' into main-menu-state-machine	2019-02-21 22:24:25 -05:00
Phlosioneer	eca329f9c5	Merge branch 'master' into multiplayer-stuff	2019-02-21 21:22:10 -05:00
Marcus Huderle	b105d20d1e	Decompile chunk of easy_chat.c	2019-02-21 17:46:14 -06:00
Marcus Huderle	1c6502338e	Decompile contest_link_80F57C4.c	2019-02-20 18:11:27 -06:00
Diegoisawesome	1b0079445d	Merge pull request #559 from Phlosioneer/finish-newgame-docs ... Finish and polish new_game.c	2019-02-18 13:28:50 -06:00
Diegoisawesome	924cbe9ee4	Merge pull request #560 from Phlosioneer/regi-documentation ... Document the regi* code more	2019-02-18 13:23:19 -06:00
Phlosioneer	486cf449b8	Make flag names more consistent	2019-02-18 14:17:02 -05:00
Phlosioneer	fcb541189d	Rename some flags, and use map ID macros	2019-02-18 02:02:20 -05:00
Phlosioneer	93e9b9fe5d	Fix some names	2019-02-18 01:33:41 -05:00
Phlosioneer	5695617d64	Merge branch 'master' into multiplayer-stuff	2019-02-18 01:12:47 -05:00
Phlosioneer	08579edbcd	Clean up mistakes and bad formatting	2019-02-18 01:03:44 -05:00
Phlosioneer	be08a662a8	More data moved into C code	2019-02-17 23:14:14 -05:00
Phlosioneer	a4aaf279ac	Move more data into pokenav, name some strings	2019-02-17 23:14:14 -05:00
Phlosioneer	3bb4057bad	Decompiled sub_81C7764	2019-02-17 23:14:14 -05:00
DizzyEggg	a001faeced	New AI command for using priority moves in death situatiions	2019-02-16 14:54:17 +01:00
DizzyEggg	c1f9032989	Defiant and Competitive	2019-02-16 12:54:11 +01:00
Phlosioneer	e90e3458cb	Document the regi* code more ... Fixed some confusing naming, named some unknown symbols, and fixed the names of some flags.	2019-02-15 18:24:55 -05:00
Phlosioneer	986d3d8b2f	Finish and polish new_game.c ... Only one function is left undocumented. I tried to go into the assembly to at least name it, but it clears fields in the save block that aren't even documented yet.	2019-02-15 03:40:57 -05:00
DizzyEggg	08892d19f2	Modify the stat changer, so it supports raise/lower by 12	2019-02-14 19:48:21 +01:00
DizzyEggg	94cd547e9a	Change move effect to u16	2019-02-14 13:17:27 +01:00
DizzyEggg	dc39f76a95	Spectral Thief effect	2019-02-14 12:15:53 +01:00
Phlosioneer	9e8a841bfa	Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine	2019-02-13 23:04:56 -05:00
Diegoisawesome	047c282763	Merge pull request #548 from Phlosioneer/intro-movie-state-machine ... Document the intro movie state machine	2019-02-13 21:24:20 -06:00
Diegoisawesome	aa5d5fa34a	Merge pull request #550 from Phlosioneer/name-palette-return-values ... Name the possible return values of palette fading functions	2019-02-13 20:15:47 -06:00
Diegoisawesome	dfb896356c	Merge branch 'master' of github.com:pret/pokeemerald	2019-02-12 00:40:42 -06:00
Diegoisawesome	449fb25f23	Clear up misnamed time-based flags and functions	2019-02-12 00:40:34 -06:00
Phlosioneer	d979ac3bf3	Document main_menu state machine, name window constants ... The new names for the constants (and newly named functions) give a much better understanding of what the window system is trying to do.	2019-02-11 00:34:50 -05:00
Phlosioneer	e75f45dbcf	Reverse engineered many of the multiplayer events ... Some corrections to the way events are handled and identified.	2019-02-10 20:42:50 -05:00
DizzyEggg	4c535a1b03	Merge pull request #71 from thechurchofcage/partingshot ... Parting Shot	2019-02-10 18:18:49 +01:00
DizzyEggg	b5d0253890	Merge with master	2019-02-10 18:17:33 +01:00
Phlosioneer	f2f1b1978b	Done documenting link code in overworld.c	2019-02-10 03:54:50 -05:00
Phlosioneer	3fd878483f	Start renaming symbols ... I finally figured out what the code is trying to do. I have a foothold; the rest should follow.	2019-02-10 00:50:46 -05:00
Phlosioneer	d0cc8dfc17	Change negative constant into unsigned hex constant	2019-02-09 22:02:56 -05:00
Phlosioneer	37bea25b01	Name the possible return values of palette fading functions ... Also replace implicit conversion from gPalette.active into a status with if statements, to make the return value clear. I've also added comments when the check is redundant.	2019-02-09 21:50:12 -05:00
Phlosioneer	45297797e6	Document the intro movie state machine ... Need to study the water droplet animation more closely before they can be renamed; otherwise, this names every major symbol in this file.	2019-02-09 21:07:07 -05:00
Marcus Huderle	6f1d2b870c	Give proper names to dynamic map layouts	2019-02-09 09:57:30 -06:00
DizzyEggg	3d616dfffe	Add Surge Abilities	2019-02-09 14:30:16 +01:00
Marcus Huderle	40dc6833c5	Fully document tileset animations	2019-02-08 15:07:42 -06:00
Marcus Huderle	abebd2b864	Cleanup externs in overworld.c	2019-02-08 11:48:51 -06:00
Marcus Huderle	6add3e1794	Document some battle dome stuff	2019-02-08 11:08:25 -06:00
Marcus Huderle	4570e3b6a5	Document battle arena	2019-02-08 09:41:36 -06:00
Marcus Huderle	3a40f5203b	Remove old rom_818CFC8.h header	2019-02-07 17:41:44 -06:00
Marcus Huderle	85040e26fd	Document battle pike	2019-02-07 17:37:41 -06:00
DizzyEggg	aa33a61e58	Merge branch 'master' into battle_engine_v2	2019-02-07 21:17:30 +01:00
Marcus Huderle	4785a07acd	Document battle factory functions	2019-02-07 12:58:09 -06:00
Marcus Huderle	3a88ab831d	Document more battle pyramid	2019-02-07 11:51:03 -06:00
Marcus Huderle	a1ad1bad3a	Document a bunch of battle pyramid	2019-02-06 21:14:28 -06:00
Marcus Huderle	1253cbf5f6	Document some battle anim things	2019-02-06 21:14:28 -06:00
Papa Cancer	62fd90caa0	Parting Shot ... Effect plus animation (looks like Snarl)	2019-02-05 21:47:50 +00:00
huderlem	b0ee100975	Merge pull request #543 from pret/mapdata ... Convert map data to JSON	2019-02-04 21:36:18 -06:00
Marcus Huderle	d4125fef9b	Cleanup and add game version flag to mapjson tool	2019-02-04 17:28:45 -06:00
DizzyEggg	f415871369	Merge with master	2019-02-03 10:44:05 +01:00
Diegoisawesome	59807c0f2c	Merge pull request #536 from DizzyEggg/menu ... Use Menu and List Menu input defines	2019-02-02 12:45:35 -06:00
Diegoisawesome	e8952c2374	Merge pull request #539 from DizzyEggg/ram_vars ... Move ram vars in sym files to C	2019-02-02 11:17:50 -06:00
Diegoisawesome	47c105bef6	Merge pull request #538 from DizzyEggg/data ... Dump last battle anim file	2019-02-02 11:12:29 -06:00
DizzyEggg	363fa9bed2	Clean up ram vars	2019-02-02 12:44:00 +01:00
DizzyEggg	a7f94bbeea	Dump last battle anim file	2019-02-02 11:55:11 +01:00
DizzyEggg	a740bc7190	Name action 11	2019-02-02 11:32:00 +01:00
DizzyEggg	23b240ab65	Fix Menu and List Menu input defines	2019-02-02 11:04:38 +01:00
DizzyEggg	a42bba755b	Add Crafty Shield effect	2019-02-01 14:34:16 +01:00
DizzyEggg	a3460c9e45	Code Belch effect	2019-02-01 14:17:24 +01:00
DizzyEggg	7750a8126d	CgbSound is decompiled.	2019-02-01 00:25:31 +01:00
Marcus Huderle	29d6221935	Convert map data to JSON	2019-01-31 15:51:20 -06:00
Marcus Huderle	5c1667b41a	Define layout constants	2019-01-29 16:55:25 -06:00
DizzyEggg	d46e60765d	Rename a palace battle field	2019-01-29 22:22:02 +01:00
DizzyEggg	7bc4a3b3f7	Merge with master	2019-01-29 22:12:53 +01:00
Marcus Huderle	e81838dba3	Misc. documentation and move some data into .c files	2019-01-29 14:36:02 -06:00
DizzyEggg	94d2a30d44	Merge with master	2019-01-28 20:41:46 +01:00
DizzyEggg	73d919fa0f	Define double single left right qutoation marks char	2019-01-28 19:02:34 +01:00
DizzyEggg	ad59811154	Decompile whole contest	2019-01-28 18:13:07 +01:00
Diegoisawesome	183b6857ff	Merge pull request #458 from ultima-soul/contest ... Decompile more of contest	2019-01-27 23:08:24 -06:00
DizzyEggg	736826e863	New feature - battle 2 vs 1 opponent	2019-01-27 20:54:34 +01:00
DizzyEggg	abd518b668	Refactor GF's idiotic coding	2019-01-27 13:52:02 +01:00
DizzyEggg	88b788bfab	Fix Charge Beam effect	2019-01-27 11:57:13 +01:00
DizzyEggg	897592a8d4	Merge branch 'master' into battle_engine_v2	2019-01-27 10:58:57 +01:00
DizzyEggg	01c3f3fc05	Document all of frontier pass	2019-01-26 20:56:06 +01:00
DizzyEggg	0688725afb	Document and decompile more of frontier pass.	2019-01-26 14:50:24 +01:00
DizzyEggg	08a3533682	Start frontier pass	2019-01-25 23:32:45 +01:00
DizzyEggg	524db6068e	Merge branch 'master' into trainer_card	2019-01-22 21:59:32 +01:00
DizzyEggg	b6e5b4ee1a	trainer card diego pls	2019-01-22 21:56:57 +01:00
Diegoisawesome	900f294011	Add var const prefix for some missed var numbers	2019-01-21 22:34:01 -06:00
DizzyEggg	4e396207d3	document more of trainer card	2019-01-20 18:24:35 +01:00
DizzyEggg	576d1b3474	Document and match somne trainer card	2019-01-19 23:04:33 +01:00
shinny456	f06c0749bc	trainer_card up to sub_80C4998	2019-01-19 12:14:59 -05:00
DizzyEggg	f34ab49f63	Merge pull request #56 from SBird1337/feature/battle-engine-animpack1 ... Add some animations (see below)	2019-01-18 23:06:19 +01:00
DizzyEggg	2c3210f4d1	merge with master	2019-01-18 22:30:34 +01:00
DizzyEggg	4b420643dc	Merge branch 'master' into trainer_hill	2019-01-13 20:51:05 +01:00
DizzyEggg	edddd847c5	Document and clean up trainer hill	2019-01-13 20:50:08 +01:00
DizzyEggg	c0bc01d301	Move some vars to C	2019-01-13 13:15:23 +01:00
DizzyEggg	11a49a7f02	Decompile trainer hill	2019-01-13 12:12:27 +01:00
Karathan	832c0d6333	add toxic spike animation	2019-01-12 17:02:24 +01:00
Diegoisawesome	af2c39860d	Rename non-mapsec constants	2019-01-08 13:40:11 -06:00
ultima-soul	284751e761	Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present.	2019-01-06 13:41:18 -08:00
ultima-soul	2ca482dc24	Committing progress so far.	2019-01-06 13:38:31 -08:00
ultima-soul	76510d58bb	Matched up to sub_80DBF68, sub_80DBF90 WIP.	2019-01-06 13:32:47 -08:00
Slawter666	aeaf390706	Update constants	2019-01-05 20:12:50 +00:00
DizzyEggg	b667c20d80	Remove unused vars in battle main.c	2019-01-05 18:52:33 +01:00
DizzyEggg	78d7c29290	Move buffers to allocated reousrces, get rid of old type effectiveness table	2019-01-05 16:00:57 +01:00
DizzyEggg	4827776a3c	Merge with master	2019-01-05 10:14:20 +01:00
Marcus Huderle	95db853a78	Decompile more of contest_link_80F57C4.c	2019-01-04 20:03:29 -06:00
Philipp AUER	55202eac24	rename coords to size in struct MonCoords	2019-01-04 19:59:55 -06:00
huderlem	cba2f81bf8	Merge pull request #507 from Tetrable/master ... Finish off labeling flags	2019-01-03 20:37:25 -06:00
Marcus Huderle	fd201f8395	Start decompiling contest_link_80F57C4.c	2019-01-03 20:35:20 -06:00
Marcus Huderle	2857f7fff9	Decompile contest_link_81D9DE4.c	2019-01-03 20:35:20 -06:00
Marcus Huderle	bc43dbab13	Decompile contest_link_81D9DE4.c	2019-01-03 20:35:20 -06:00
Tetrable	97ebeef1db	Relabel TEMP_FLAG_20 into FLAG_UNUSED_0x020	2019-01-03 18:13:16 +00:00
Tetrable	30e7ac0dca	Fix merge conflicts	2019-01-03 02:28:18 +00:00
Tetrable	50aa222aff	Corrected typos	2019-01-03 01:54:55 +00:00
Marcus Huderle	b471bba55e	Use better names for match call texts	2019-01-02 19:46:15 -06:00
Marcus Huderle	e1092028ec	Decompile match_call.c	2019-01-02 19:46:15 -06:00
Diegoisawesome	0053e61535	Merge pull request #504 from Diegoisawesome/roulette ... Port/decompile roulette	2019-01-02 17:00:33 -06:00
Diegoisawesome	a0188aac33	Cleanup and EWRAM	2019-01-02 16:55:50 -06:00
Diegoisawesome	6202ae1df0	Extract rodata from roulette	2019-01-02 16:40:40 -06:00
Tetrable	a3ebca4d81	Fix merge conflicts	2019-01-02 21:25:14 +00:00
Tetrable	1e3da62d24	Finish off labelling flags	2019-01-02 21:12:43 +00:00
Diegoisawesome	d28d8c850d	Up to sub_81446DC	2018-12-31 19:39:41 -06:00
Diegoisawesome	af1e44befe	Continue porting roulette	2018-12-31 18:07:29 -06:00
Marcus Huderle	a0ff38d0be	Fix build	2018-12-31 16:53:38 -06:00
Marcus Huderle	05b1d2ea94	Document field_tasks.c	2018-12-31 16:53:38 -06:00
Marcus Huderle	b6ee970e7a	Minor berry.c cleanup	2018-12-31 16:53:38 -06:00
Marcus Huderle	fb2d1591c1	Document more battle anim effects	2018-12-31 16:53:38 -06:00
Diegoisawesome	439fa13e94	Start porting/decompiling roulette	2018-12-31 16:09:45 -06:00
Diegoisawesome	530a20354c	Merge pull request #500 from Deokishisu/patch-1 ... Consolidate unused escapeRope MapHeader field into filler_18 field	2018-12-31 11:55:33 -06:00
Diegoisawesome	d004ce065c	Merge branch 'master' of github.com:pret/pokeemerald into trade	2018-12-31 02:30:30 -06:00
Diegoisawesome	ec780bb209	Cleanup and documentation	2018-12-31 02:22:21 -06:00
Diegoisawesome	c5c6e437ec	Document, cleanup, extract data from trade	2018-12-31 01:23:27 -06:00
Deokishisu	447fec26dc	Consolidate unused escapeRope MapHeader field into filler_18 field	2018-12-30 19:59:57 -05:00
Marcus Huderle	58f130d007	Document some battle anims and helpers	2018-12-30 11:04:17 -06:00
Diegoisawesome	2fb9f490fb	Almost done with trade	2018-12-29 12:46:15 -06:00
Melody	dc6c0ed17e	add event object var references	2018-12-29 11:56:53 -06:00
DizzyEggg	75b4e9ac70	compile contest	2018-12-29 11:48:28 -06:00
DizzyEggg	55e44b0951	a bit more of contest painting effect	2018-12-29 11:48:28 -06:00
Marcus Huderle	d0d870e193	Cleanup formatting	2018-12-29 11:36:54 -06:00
Marcus Huderle	6e7bdb3ca4	Document misc field_specials things	2018-12-29 11:36:54 -06:00
Marcus Huderle	67636b7c64	Document deoxys rock	2018-12-29 11:36:54 -06:00
Marcus Huderle	95dcff581b	Document some fieldmap stuff	2018-12-29 11:36:54 -06:00
DizzyEggg	27b1d74dad	Merge branch 'master' into battle_engine_v2	2018-12-29 15:11:54 +01:00
Diegoisawesome	f30270dffe	Undo bad idea with BLDALPHA_BLEND macro	2018-12-28 12:56:06 -06:00
Melody	6d556f8cf7	improve checkplayergender calls ... clean up constant definitions make tweaks from review	2018-12-28 08:22:21 -06:00
Diegoisawesome	9cad5e8197	Big switch mofo	2018-12-28 02:11:41 -06:00
Marcus Huderle	d59f5a8e56	Misc overworld documentation	2018-12-27 16:52:13 -06:00
Diegoisawesome	5691a67629	Up to sub_807B62C	2018-12-27 02:05:09 -06:00
DizzyEggg	6411d1d693	Merge pull request #55 from huderlem/anims ... Some battle anims	2018-12-26 17:48:03 +01:00
DizzyEggg	517573eb4b	Update with master	2018-12-26 17:46:51 +01:00
DizzyEggg	7f6f6c33ab	Fix BgAttributes	2018-12-26 13:05:02 +01:00
Diegoisawesome	d8948a5cda	Merge remote-tracking branch 'pret/master' into trade	2018-12-25 15:03:13 -06:00
melthelesbian	2dd706ca54	use max mon moves constant where able (#480) ... * use max mon moves constant where able * fix errors in script commands file * fix more errors	2018-12-25 11:50:15 -06:00
Marcus Huderle	dcbc8db6a3	Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)	2018-12-25 11:46:35 -06:00
DizzyEggg	49517aca9e	make it compie hopefully	2018-12-24 22:19:40 +01:00
DizzyEggg	e230afd543	Merge branch 'master' into learn	2018-12-24 22:01:52 +01:00
DizzyEggg	442b1826a2	asm party and fldeff clean-up	2018-12-24 21:59:05 +01:00
Marcus Huderle	c2fdbb0ef7	Decompile psychic.c	2018-12-24 10:52:56 -06:00
Marcus Huderle	f1213ebb4b	Decompile dark.c	2018-12-24 09:55:00 -06:00
Diegoisawesome	3f08e0c76c	Some more trade nonsense	2018-12-24 03:03:02 -06:00
DizzyEggg	6fa5f33519	Merge branch 'master' into battle_engine_v2	2018-12-24 09:07:18 +01:00
Marcus Huderle	c17f7d73fa	Merge remote-tracking branch 'origin/battle_engine_v2' into features ... # Conflicts: # ld_script.txt # src/effects_1.c	2018-12-23 17:24:14 -06:00
DizzyEggg	72aa9eb5a9	clear headers more	2018-12-24 00:20:38 +01:00
DizzyEggg	9320fe8f85	Clear includes	2018-12-24 00:02:29 +01:00
DizzyEggg	bd817d70d6	Refactor battle intro, allow to speed it up	2018-12-23 18:47:00 +01:00
DizzyEggg	efa820469a	move data to c	2018-12-23 14:52:47 +01:00
DizzyEggg	c23b1acc5e	Merge with master	2018-12-23 10:26:58 +01:00
Diegoisawesome	a5c09bfec6	S'more trade	2018-12-23 01:26:38 -06:00
DizzyEggg	ef55bdac89	Merge branch 'master' into battle_engine_v2	2018-12-22 23:57:42 +01:00
DizzyEggg	adb4927504	Merge with master	2018-12-22 23:30:41 +01:00
Diegoisawesome	ebbe826133	Merge pull request #437 from DizzyEggg/storage ... Pokemon Storage System	2018-12-22 16:12:27 -06:00
DizzyEggg	c805bab483	Storage - review changes	2018-12-22 23:00:22 +01:00
DizzyEggg	53b9d4a224	Dont clear AI flags on move choose. Will come in handy in smart ai switch logic	2018-12-22 20:57:12 +01:00
DizzyEggg	6dffa6d17c	Match and clean up fldeff misc	2018-12-22 19:33:45 +01:00
DizzyEggg	f7a7ddde0c	Fix Quick Guard	2018-12-22 15:10:24 +01:00
DizzyEggg	0748069705	Merge pull request #53 from ultima-soul/battle_engine ... Added new battle items.	2018-12-22 13:54:19 +01:00
DizzyEggg	e54dd6a02b	Merge with master	2018-12-22 13:53:07 +01:00
Diegoisawesome	052d458f48	sub_80796B4 is a pain	2018-12-21 12:20:28 -06:00
DizzyEggg	ecee02816d	Merge with master	2018-12-20 22:53:08 +01:00
golem galvanize	64832ff67e	start ice	2018-12-20 16:20:34 -05:00
DizzyEggg	7dcb614cca	PSS is done	2018-12-20 22:14:36 +01:00
Marcus Huderle	ecda59a406	Add Poison Jab animation	2018-12-20 11:58:21 -06:00
Marcus Huderle	0369780db9	Add Rock Polish animation	2018-12-20 10:18:17 -06:00
Diegoisawesome	6ef9671718	Merge pull request #440 from garakmon/fldeff ... Decompile / port fldeff_80F9BCC	2018-12-19 22:16:59 -06:00
garak	5eac3ce1a2	rename fldeff_misc	2018-12-19 22:19:54 -05:00
Marcus Huderle	b7ce383a96	Document a bunch of battle anims	2018-12-19 21:19:44 -06:00
Diegoisawesome	48d7c0a7a3	Merge pull request #454 from golemgalvanize/decompile_party_menu ... Decompile party menu	2018-12-19 19:57:31 -06:00
Diegoisawesome	5b73fe138c	Merge pull request #457 from golemgalvanize/decompile_water ... Decompile water	2018-12-19 19:16:40 -06:00
DizzyEggg	128239d65e	Almost there	2018-12-19 22:47:27 +01:00
Melody	5e6ceeb631	update applymovement to remove magic numbers	2018-12-19 14:08:01 -05:00
golem galvanize	cd785011fe	decompiled water	2018-12-19 10:31:37 -05:00
Diegoisawesome	bd7c251859	Fix compressed palette alignment	2018-12-18 20:15:59 -06:00
Diegoisawesome	2592803460	Merge branch 'master' of github.com:pret/pokeemerald into trade	2018-12-18 19:54:27 -06:00
Diegoisawesome	cd994f4935	Begin trade.c	2018-12-18 19:29:41 -06:00
Marcus Huderle	b2ac3b6d6f	Decompile most of battle_anim_effects_3.c	2018-12-18 19:15:59 -06:00
golem galvanize	8781d969ff	finish party_menu	2018-12-18 05:38:08 -05:00
golem galvanize	c259ee46d3	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-12-18 05:31:39 -05:00
Marcus Huderle	c74468fd11	Document a bunch of battle anim stuff	2018-12-17 22:16:17 -06:00
Marcus Huderle	c04ce0ee64	Decompile battle_anim_effects_2.c	2018-12-17 22:16:17 -06:00
DizzyEggg	9ffd0c7382	3.5 asm left	2018-12-17 23:00:08 +01:00
golem galvanize	076d07f6fe	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-12-17 02:40:30 -05:00
golem galvanize	71a7a8a075	decompiled up to sub_81B8A7C	2018-12-17 02:39:17 -05:00
shinny456	60484153a5	decompile electric.s	2018-12-16 22:23:05 -05:00
garak	e292d0ca83	Merge branch 'master' into fldeff	2018-12-16 20:05:31 -05:00
DizzyEggg	aae36b5653	6k left	2018-12-16 21:10:01 +01:00
Marcus Huderle	d1e6e705cc	Decompile battle_anim_effects_1.c	2018-12-16 11:39:22 -06:00
Marcus Huderle	fb9a365dc6	Merge pull request #448 from Meowsy/pokedex-documentation ... Pokedex Documentation	2018-12-15 18:06:42 -06:00
DizzyEggg	f1421d94c3	Up to sub 0x80ce580	2018-12-15 23:58:47 +01:00
Meowsy	bc11a4a9f4	Document various things relating to the Pokedex.	2018-12-15 15:12:28 -05:00
Marcus Huderle	1ca3656d74	Decompile contest_painting.c (#447)	2018-12-15 13:07:07 -06:00
Slawter666	2fa0555ed5	Document some of item_menu.c	2018-12-15 18:08:13 +00:00
Marcus Huderle	5e92481f51	Merge pull request #443 from Meowsy/misc-renamings ... Misc renamings.	2018-12-13 21:35:36 -06:00
Marcus Huderle	2c6849bee8	Decompile battle_anim_8170478.c (#445)	2018-12-13 21:33:54 -06:00
ultima-soul	a00eb2f5d8	Added new battle items.	2018-12-13 09:31:47 -08:00
golem galvanize	6748ef72fb	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-12-13 00:31:06 -05:00
Marcus Huderle	170b6ef449	Decompile battle_intro.c (#444)	2018-12-12 23:18:25 -06:00
golem galvanize	2265d49ac2	decompiled up to sub_81B5A8C	2018-12-12 22:55:39 -05:00
DizzyEggg	59a69eb627	Storage up to icon palettes	2018-12-12 23:19:50 +01:00
DizzyEggg	74746603ad	More pokemon storage	2018-12-11 23:09:12 +01:00
DizzyEggg	c5b5f4bd77	More storage	2018-12-10 23:42:44 +01:00
Meowsy	d3e32ab287	Rename Mauville Man text.	2018-12-10 15:50:10 -05:00
Meowsy	68017b531a	Rename UnknownPokemonStruct to BattleTowerPokemon.	2018-12-10 15:49:33 -05:00
DizzyEggg	c2d8876174	Document PSS functions	2018-12-10 21:36:52 +01:00
Diegoisawesome	58ca87accc	Merge pull request #441 from Meowsy/document-pockets ... Document bag pocket magic numbers.	2018-12-10 11:23:41 -06:00
Diegoisawesome	bfdfe367e8	Merge pull request #422 from garakmon/frontier_data_1 ... Battle tower data	2018-12-10 11:22:16 -06:00
Meowsy	2f008e866b	Document return locations.	2018-12-10 11:39:57 -05:00
garak	10237e8d13	move externs and remove comments	2018-12-10 09:52:36 -05:00
Meowsy	e143804af0	Document pocket magic numbers.	2018-12-10 04:33:29 -05:00
golem galvanize	a6db7b2419	decompiled up to brm_cancel_1	2018-12-10 02:38:23 -05:00
garak	62384e7a61	use facility class constants	2018-12-09 22:57:46 -05:00
garak	e1e2132a37	sync fldeff function names with pokeruby	2018-12-09 22:24:54 -05:00
garak	b4312648e2	decompile fldeff_80F9BCC with data	2018-12-09 19:22:59 -05:00
DizzyEggg	431e7e7e5c	More storage work	2018-12-09 21:06:43 +01:00
Marcus Huderle	a7722a0b93	Decompile cable_car.c (#438)	2018-12-09 13:41:52 -06:00
DizzyEggg	e0f3de0b74	Start pokemon storage system	2018-12-09 16:44:01 +01:00
Marcus Huderle	342d23e0ba	Merge pull request #436 from KDSKardabox/master ... Decompile ghost	2018-12-09 07:59:32 -06:00
DizzyEggg	180aa839c4	Fix conflicts	2018-12-09 13:12:02 +01:00
DizzyEggg	4683cdc30c	Merge branch 'master' into weather	2018-12-09 11:56:50 +01:00