2598 Commits

Author	SHA1	Message	Date
hondew	328aecc96e	Document throwing pokeball ... continue Document more Doc more funcs Remove workspace Document shiny stars Document PokeBlock Clean up Clean more	2020-08-30 14:08:06 -04:00
GriffinR	778bdb4d30	Document wallclock data	2020-08-29 15:55:28 -04:00
pi1024e	bdb976dc27	fixed mistakes	2020-08-29 13:18:35 -04:00
GriffinR	a9719c92bf	Merge pull request #1160 from kiliwily/master2 ... add MAX_LEVEL_UP_MOVES macro	2020-08-28 19:18:03 -04:00
kiliwily	c68c2b66e8	add more macros	2020-08-29 01:02:20 +02:00
GriffinR	08a8aad65a	Merge branch 'master' into doc-cablecar	2020-08-28 16:17:48 -04:00
GriffinR	0cfc279af5	Merge branch 'master' into doc-rayscene	2020-08-28 16:17:11 -04:00
GriffinR	c830731734	Merge branch 'master' into doc-blender	2020-08-28 16:16:00 -04:00
GriffinR	09cfed64b5	Merge pull request #1146 from GriffinRichards/rename-songs ... Give songs meaningful english names	2020-08-28 16:14:21 -04:00
GriffinR	e9b734c1ef	Merge branch 'master' into doc-blender	2020-08-28 16:07:35 -04:00
kiliwily	5e7b6a089c	add MAX_LEVEL_UP_MOVES macro	2020-08-28 20:36:07 +02:00
Eduardo Quezada	a2fb98934e	Partially document item_menu.c	2020-08-28 13:32:23 -04:00
GriffinR	71a066f945	Document cable car	2020-08-28 03:54:04 -04:00
Thomas Winwood	58786a7ac0	Add MAX_PER_STAT_EVS macro	2020-08-28 02:25:02 +01:00
GriffinR	38d4fc9c17	Clean up rayquaza scene documentation	2020-08-27 16:04:11 -04:00
GriffinR	c7e685edff	Document third rayquaza scene	2020-08-27 15:43:28 -04:00
GriffinR	ba13e9ec95	Document first rayquaza scene	2020-08-27 15:43:18 -04:00
GriffinR	95ea0e92e7	Start documenting rayquaza_scene	2020-08-25 17:49:42 -04:00
GriffinR	22c1bf965a	Finish documenting berry blender	2020-08-24 17:06:55 -04:00
PokeCodec	86a1e89879	Documentation of unk field	2020-08-23 21:34:31 -04:00
GriffinR	0ff767a9b5	Start documenting berry blender	2020-08-22 19:39:39 -04:00
PokeCodec	cbb94035e3	Cleaned up the libraries.	2020-08-22 00:52:45 -04:00
GriffinR	fbb70b3727	Document contest AI scripts	2020-08-21 14:57:17 -04:00
GriffinR	469ec5f248	Document contest AI commands	2020-08-21 02:36:48 -04:00
GriffinR	ee72696b53	Sync encounter musics with encounter music types	2020-08-20 21:03:24 -04:00
GriffinR	d356e35b64	Fix incorrect pike curtain SE names	2020-08-20 20:23:08 -04:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	6c34effda9	Merge pull request #1138 from GriffinRichards/doc-contest ... Document contest	2020-08-20 16:03:47 -04:00
PokeCodec	e27975afaa	Match battle script commands by correcting a function and the pokemon struct	2020-08-18 22:05:01 -04:00
GriffinR	7d3b68a27b	Fix Champinship typo	2020-08-18 17:51:51 -04:00
GriffinR	503dafd210	Fix wallys parents misnamed as uncle/aunt	2020-08-18 17:51:41 -04:00
GriffinR	fa29ff98a3	Add condition mod constants	2020-08-18 11:38:50 -04:00
GriffinR	19cf1b9770	Fix ContestPokemon offset-named field	2020-08-18 07:30:18 -04:00
PikalaxALT	3372993a63	Merge pull request #1133 from GriffinRichards/doc-pblock ... Document use_pokeblock	2020-08-17 16:28:15 -04:00
GriffinR	65bd2faf94	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest	2020-08-16 05:59:10 -04:00
GriffinR	2749948eeb	Clean up contest doc	2020-08-16 05:52:17 -04:00
GriffinR	e98e4652fd	Document contest live updates	2020-08-16 05:18:09 -04:00
GriffinR	9f4525666d	Document misc contest	2020-08-16 02:50:35 -04:00
GriffinR	c42c1ab8c1	Document contest appeal	2020-08-15 14:32:30 -04:00
GriffinR	25f45ffa84	Merge pull request #1125 from GriffinRichards/doc-namingscr ... Document naming screen	2020-08-15 00:06:57 -04:00
GriffinR	3779422489	Split contest funcs from script_pokemon_util	2020-08-13 17:42:12 -04:00
GriffinR	4911849723	Document link contest connection	2020-08-13 16:27:40 -04:00
GriffinR	ade49de329	Merge branch 'master' into doc-pblock	2020-08-12 19:49:55 -04:00
GriffinR	f6efbe38bf	Clean up use_pokeblock doc, some menu_specialized	2020-08-12 18:39:15 -04:00
GriffinR	70851d9083	Add MAP_SCRIPT descriptions	2020-08-11 15:50:09 -04:00
GriffinR	4f615b65e6	Continue documenting use_pokeblock	2020-08-11 13:56:17 -04:00
GriffinR	8b95e1964b	Merge pull request #1121 from GriffinRichards/doc-roulette ... Document roulette	2020-08-10 17:18:09 -04:00
GriffinR	078c341b2b	Merge pull request #1122 from GriffinRichards/clean-battlemsg ... Add stat stage constants, clean up misc battle msg data	2020-08-10 14:29:27 -04:00
GriffinR	e947729d65	Start documenting use_pokeblock	2020-08-10 13:48:16 -04:00
GriffinR	82e322bb96	Finish documenting naming screen	2020-08-07 20:18:09 -04:00
GriffinR	463d79c7c1	Start documenting naming screen	2020-08-07 02:00:41 -04:00
GriffinR	5e8ffff62f	Add stat stage constants	2020-08-04 20:38:57 -04:00
GriffinR	f8f6575360	Rename roulette_util to palette_util	2020-08-04 19:24:36 -04:00
GriffinR	8e800e2061	Document roulette flash util	2020-08-04 19:20:55 -04:00
GriffinR	868f831167	More roulette doc	2020-08-04 14:25:13 -04:00
GriffinR	b40cee540e	Continue documenting roulette	2020-08-02 14:52:05 -04:00
PikalaxALT	03eba6a62c	Merge pull request #1116 from GriffinRichards/doc-slotmachine ... Document slot machine	2020-08-01 09:56:44 -04:00
GriffinR	22b5b6b074	Start documenting roulette	2020-07-30 19:37:16 -04:00
GriffinR	7ada56f039	Merge pull request #1085 from GriffinRichards/doc-overworld ... Document field effects / misc overworld	2020-07-28 17:54:25 -04:00
GriffinR	c6b27013cc	Merge pull request #1112 from GriffinRichards/add-genwarn ... Add warnings to generated map/layout files	2020-07-28 17:47:55 -04:00
GriffinR	e06de33cbd	Merge branch 'master' into doc-overworld	2020-07-28 17:46:17 -04:00
GriffinR	5eecaf92ba	Merge branch 'master' into doc-slotmachine	2020-07-28 17:41:34 -04:00
GriffinR	1f4813bfd2	Document slot machine funcs	2020-07-28 17:38:05 -04:00
GriffinR	b22709ee3d	More slot machine data documentation	2020-07-28 14:29:44 -04:00
ExpoSeed	b401e2eb86	Fix naming style of function	2020-07-27 21:22:16 -05:00
ExpoSeed	71dc5edf2e	Document some battle_util.c	2020-07-27 17:10:42 -05:00
GriffinR	36a4764a78	Document some slot machine data	2020-07-26 02:15:59 -04:00
GriffinR	2439f42de4	Add warnings to generated files	2020-07-24 03:43:37 -04:00
GriffinR	aca50c87be	Continue new contest documentation	2020-07-24 00:14:53 -04:00
GriffinR	52a4428ba6	Begin new contest documentation	2020-07-23 17:55:40 -04:00
GriffinR	4a42e2a710	Merge branch 'master' into doc-overworld	2020-07-23 10:31:52 -04:00
PikalaxALT	2e077f09e4	Merge pull request #1111 from GriffinRichards/sync-flags ... Sync unused flags with pokeruby	2020-07-23 09:12:33 -04:00
GriffinR	813f0c724f	Sync flags with pokeruby	2020-07-22 18:00:41 -04:00
GriffinR	a1cc7d2bd6	Document faraway island	2020-07-19 14:12:38 -04:00
GriffinR	af09e73d67	Merge branch 'master' into doc-overworld	2020-07-18 20:24:09 -04:00
GriffinR	8e6dd3bafe	Merge pull request #1086 from GriffinRichards/doc-unktrans ... Document unk_transition	2020-07-18 20:22:58 -04:00
GriffinR	1a27af8855	Merge pull request #1100 from GriffinRichards/clean-battlescrdata ... Misc battle and battle palace documentation	2020-07-18 20:22:44 -04:00
GriffinR	fb402725c6	Convert more battle constants to bit shifts	2020-07-18 18:39:38 -04:00
GriffinR	aba42513d3	Clean up some battle scr cmd data	2020-07-18 18:10:15 -04:00
GriffinR	96fd719a19	Merge pull request #1081 from GriffinRichards/add-localids ... Add local object event ids for referenced objects	2020-07-17 18:18:47 -04:00
GriffinR	50e48898d2	Merge pull request #1088 from GriffinRichards/doc-starterchoose ... Document starter_choose.c	2020-07-17 16:02:10 -04:00
PokeCodec	597a238229	Typo Fix	2020-07-17 15:49:46 -04:00
GriffinR	e129d04b93	Merge branch 'master' into doc-overworld	2020-07-15 00:40:47 -04:00
GriffinR	3c356a1d7a	Merge pull request #1082 from GriffinRichards/add-flagvarsave ... Allow flag/var counts to be updated alongside values	2020-07-14 19:58:38 -04:00
GriffinR	a583dfcc42	Merge pull request #1094 from DizzyEggg/rename ... Give proper names to some functions	2020-07-14 19:56:46 -04:00
GriffinR	c177872c9c	Merge pull request #1080 from AsparagusEduardo/EndBalls ... Created constant for easier Ball Expansion.	2020-07-14 19:56:20 -04:00
DizzyEggg	0425cb66ef	Give proper names to some functions	2020-07-14 11:13:03 +02:00
Eduardo Quezada	b31efcd6e3	Renamed constant,	2020-07-12 01:49:32 -04:00
PikalaxALT	535189bf14	Fix some UB exposed with GCC 10.1.0	2020-07-11 10:22:34 -04:00
GriffinR	beeb673ba1	Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave	2020-07-08 16:03:32 -04:00
GriffinR	ebb6c4ee66	Merge branch 'master' into doc-overworld	2020-07-08 15:51:58 -04:00
GriffinR	89bcf3cbd9	Merge branch 'master' into add-localids	2020-07-08 15:47:45 -04:00
GriffinR	431c60c92c	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti	2020-07-08 15:45:31 -04:00
PikalaxALT	8b80b417e2	Merge pull request #1069 from GriffinRichards/doc-link ... Document linking	2020-07-08 15:43:45 -04:00
GriffinR	43c48d95c2	Document starter_choose.c	2020-07-06 17:26:25 -04:00
GriffinR	c0bc7e8f7b	Fix elevator metatile typo	2020-07-06 16:02:49 -04:00
Michael Panzlaff	3264cf697f	fix aggressive loop optimizations ... Previously, aggressive loop optimizations with a new compiler were not possible due to undefined behaviour at end of arrays. A macro "UBFIX" is added to allow ifdefs for fixes which resolve undefined behavior. For example newer GCC versions will detect various bugs in the original game code and will otherwise not compile with -Werror.	2020-07-05 18:09:59 +02:00
GriffinR	72edc46ab6	Document unk_transition	2020-07-02 15:45:37 -04:00
GriffinR	1ce929157f	Clean up field effect doc	2020-07-02 05:05:13 -04:00
GriffinR	c84f98a7ff	Document misc field control	2020-06-29 17:24:17 -04:00
GriffinR	abdf7cbf02	Label fishing effect functions	2020-06-29 16:53:38 -04:00
GriffinR	eb80012757	Document more misc field effects	2020-06-29 16:32:46 -04:00
GriffinR	4ea6992172	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
GriffinR	2ed1f7c6f9	Byte-align daily flags	2020-06-24 18:05:22 -04:00
GriffinR	06025e887f	Allow flag/var counts to be updated alongside values	2020-06-24 17:00:19 -04:00
GriffinR	18d57a3802	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
GriffinR	fac6288156	Add local object event ids for referenced objects	2020-06-22 17:18:58 -04:00
Eduardo Quezada	7244b80fc6	Created constant for easier Ball Expansion.	2020-06-21 02:36:46 -04:00
GriffinR	8b462f3f6c	Specify confetti util name	2020-06-18 18:14:30 -04:00
GriffinR	d2a760afdb	Rename contest_link_80FC4F4, 80F57C4, and 81D9DE4	2020-06-18 18:01:32 -04:00
GriffinR	24569583e4	Document contest results	2020-06-18 17:50:13 -04:00
GriffinR	f600aff711	Rename rom_81520A8	2020-06-17 03:42:10 -04:00
GriffinR	76f6d05173	Document confetti	2020-06-17 03:39:03 -04:00
GriffinR	c2a07276ae	Merge branch 'master' into doc-link	2020-06-13 16:15:11 -04:00
GriffinR	a9a427c6f2	Merge branch 'master' into doc-link	2020-06-10 17:36:43 -04:00
GriffinR	2859900ea9	Second pass on documenting union room	2020-06-10 17:30:59 -04:00
Sierraffinity	74edaed426	Begin item_menu.c cleanup	2020-06-10 13:07:42 -07:00
GriffinR	35867f531b	Some link rfu cleanup / link.c documentation	2020-06-08 15:24:25 -04:00
GriffinR	c98342c973	Document link_rfu_3.c	2020-06-08 00:28:21 -04:00
GriffinR	e6f5c4f264	Sync link_rfu_2.c	2020-06-07 12:54:50 -04:00
GriffinR	3f97763181	Document cable_club.c	2020-06-06 16:10:03 -04:00
SBird	5d752bbe49	shop: document some constants s.t. object events don't break	2020-06-03 19:55:15 -05:00
GriffinR	aaf5d91c18	Document field_message_box.c	2020-06-03 19:47:45 -05:00
GriffinR	9190af73b7	Label union room battle trainer	2020-06-03 15:28:29 -04:00
GriffinR	7632404ba5	Document union_room_chat.c	2020-06-02 18:35:00 -04:00
DizzyEggg	0690abd5a4	its time to ddddddduel	2020-06-02 17:28:47 +02:00
PikalaxALT	72b332d551	Revert "More transitions documentation"	2020-06-01 18:05:31 -04:00
GriffinR	f53e2491bf	Document union_room_player_avatar.c	2020-06-01 10:23:12 -04:00
DizzyEggg	ab3eb6065b	More transitions documentation	2020-06-01 16:17:25 +02:00
GriffinR	4fe507e453	Document union_room.c	2020-05-31 13:11:18 -04:00
PikalaxALT	24075e9e72	Merge pull request #1061 from GriffinRichards/fix-egg ... Clear up misleading egg step name	2020-05-29 16:50:37 -04:00
GriffinR	e27c3d2abd	Clear up misleading egg step name	2020-05-27 16:41:23 -04:00
DizzyEggg	5eeecb56c1	More touches to pokemon summary screen document	2020-05-27 07:57:15 -05:00
GriffinR	f9e6f7540f	Use fixed point macros for math util	2020-05-24 08:28:02 -05:00
GriffinR	c6205b3df4	Document math_util.c	2020-05-24 08:28:02 -05:00
hondew	cfc47e642f	Clean up slot drawing ... Fix typos	2020-05-24 08:24:20 -05:00
hondew	26a197847a	Rename tag offset functions ... Fix typo	2020-05-24 08:24:20 -05:00
PikalaxALT	3c4b9dfacc	Merge pull request #1044 from DizzyEggg/sss ... Document pokemon summary screen	2020-05-19 13:30:42 -04:00
DizzyEggg	bdebab834c	Document pokemon summary screen	2020-05-18 14:03:01 +02:00
GriffinR	5bb688df3e	Label in_connection's field in ObjectEventTemplate	2020-05-14 17:11:18 -04:00
hondew	048d1ffbdb	Clarify stages	2020-05-02 13:38:25 -04:00
hondew	49184cd799	Document berry yield ... fix wording	2020-05-02 11:51:49 -04:00
GriffinR	cb5b8da77b	More trainer type usage	2020-04-28 19:59:08 -05:00
GriffinR	8d9e39e6d1	Sync map types with pokefirered	2020-04-28 19:59:08 -05:00
GriffinR	e5757a3def	Use trainer type constants	2020-04-28 19:59:08 -05:00
GriffinR	ecd4824f67	Index heal location data, use better names	2020-04-28 19:59:08 -05:00
GriffinR	b1d26e10a8	Sync map header property names with pokefirered	2020-04-28 19:59:08 -05:00
jiangzhengwenjz	c7d8d5dae2	fix remainSize type	2020-04-28 07:28:27 +08:00
jiangzhengwenjz	2010ed0f12	librfu issues	2020-04-28 07:25:55 +08:00
PikalaxALT	a12de6e480	Merge pull request #1022 from GriffinRichards/doc-gcn ... Label GCN link flags field	2020-04-14 15:54:34 -04:00
GriffinR	8d3b7bd0b1	Use metatile labels for decor gfx	2020-04-13 14:43:50 -04:00
GriffinR	dde4a0416c	Label GCN link flags field	2020-04-13 08:42:31 -04:00
brain_face	9abda59bd1	Renamed sub_808C1B4 -> PlayerUseAcroBikeOnBumpySlope	2020-04-12 16:22:03 +02:00
brain_face	007a038031	Renamed sub_808B9D4 -> PlayerEndWheelieWhileMoving	2020-04-12 15:43:45 +02:00
brain_face	ce2fe10bec	Renamed sub_808B9A4 -> PlayerPopWheelieWhileMoving	2020-04-12 15:35:38 +02:00
brain_face	1be48a61c1	Renamed sub_808B9BC -> PlayerWheelieMove	2020-04-12 15:31:11 +02:00
brain_face	1472a3a7d4	Renamed sub_808B980 -> PlayerWheelieInPlace	2020-04-12 14:38:18 +02:00
PikalaxALT	c08b4ff3e1	Merge pull request #1019 from GriffinRichards/constants-party ... Add misc party constant usage	2020-04-10 14:05:35 -04:00
PikalaxALT	8188615db8	Merge pull request #1018 from GriffinRichards/sync-util ... Sync link game util files	2020-04-10 14:02:53 -04:00
GriffinR	7a5deff0bc	Add misc party constant usage	2020-04-09 15:18:53 -04:00
GriffinR	e485857df3	Sync minigame_countdown	2020-04-08 17:23:32 -04:00
GriffinR	8853588af0	Sync digit_obj_util	2020-04-08 16:27:11 -04:00
GriffinR	487080b425	Minor player avatar doc	2020-04-01 02:54:26 -04:00
GriffinR	8e4b987699	Revert more porymap-breaking changes	2020-03-18 03:22:07 -04:00
PikalaxALT	39da49495d	Merge pull request #1000 from GriffinRichards/doc-dex ... Document pokedex.c	2020-03-17 10:43:57 -04:00
PikalaxALT	784e29352d	Merge pull request #985 from mrgriffin/decoration ... Document decoration.c	2020-03-17 10:39:37 -04:00
PikalaxALT	7a059c75a6	Merge pull request #968 from GriffinRichards/doc-regionmap ... Document some pokenav and region map	2020-03-17 10:38:20 -04:00
GriffinR	a495379ff0	Document pokedex cry screen	2020-03-10 14:02:03 -04:00
GriffinR	31b0cbe9b4	Document pokedex.c	2020-03-09 16:24:01 -04:00
Martin Griffin	4485d51522	Document decoration.c	2020-03-06 09:47:20 +00:00
PikalaxALT	9259b378ef	Merge pull request #991 from GriffinRichards/fix-eventticket ... Clarify event ticket flag names	2020-03-03 16:15:27 -05:00
GriffinR	b6c9ad505d	Minor fixes in trainer_battle.inc	2020-03-03 14:47:14 -05:00
GriffinR	4637085390	Clarify event ticket flag names	2020-03-03 01:36:20 -05:00
GriffinR	51cd0ac081	Rename battle anim type files, remove unneeded ARG_RET_IDs	2020-02-25 12:54:08 -06:00
GriffinR	dc3c2b72f2	Clean up move anim doc	2020-02-25 12:54:08 -06:00
GriffinR	68dc68907b	Label move anim data	2020-02-25 12:54:08 -06:00
GriffinR	efd53d080c	Clean up battle anim C for doc	2020-02-25 12:54:08 -06:00
GriffinR	afa1ae2209	Finish documenting move anim scripts	2020-02-25 12:54:08 -06:00
GriffinR	e633b57593	Document remaining status/general/special anims	2020-02-25 12:54:08 -06:00
GriffinR	208057d7ae	Document move anims S-Z	2020-02-25 12:54:08 -06:00
GriffinR	501d0d3c18	Document move anims C-H	2020-02-25 12:54:08 -06:00
GriffinR	faf0ba8662	Use macro for randomization with ISO value	2020-02-25 12:54:08 -06:00
GriffinR	6eb44dc507	Document move anims A-C	2020-02-25 12:54:08 -06:00
GriffinR	3456578c0f	Move berry crush data to src	2020-02-17 13:10:23 -06:00
GriffinR	f6275cce57	Misc constant use in TV	2020-02-17 13:09:35 -06:00
PikalaxALT	867734a791	Fix alignment in AgbRfu_LinkManager.h	2020-02-16 15:32:10 -05:00
PikalaxALT	91dd7f5cc3	Port librfu from firered	2020-02-16 13:49:36 -05:00
GriffinR	ac1738e11d	Move smokescreen data to src	2020-02-13 14:48:19 -06:00
GriffinR	956090b05f	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-02-12 13:05:57 -05:00
GriffinR	eaf508ba5e	Resolve missing parens errors	2020-02-12 00:44:09 -05:00
GriffinR	689acd3613	Move slot machine data to src	2020-02-09 14:11:50 -06:00
GriffinR	084bd66924	Document Trainer Card	2020-02-08 14:31:17 -06:00
GriffinR	6640c509c0	Remove unnecessary declaration	2020-02-08 14:22:53 -06:00
GriffinR	d1035f027e	Move contest_link_80F57C4 data to src	2020-02-08 14:22:53 -06:00
Pokestia	f92b03f266	Fix wrong variable name	2020-02-08 14:19:53 -06:00
GriffinR	86354f1d50	Document some pokenav and region map	2020-02-05 21:04:43 -05:00
GriffinR	27c4329e45	Use friendship event constants	2020-02-04 12:16:15 -06:00
GriffinR	8a96aa9e97	Name pokenav files	2020-02-04 08:02:28 -06:00
GriffinR	be5d417236	Document some pokenav menu handlers	2020-02-04 08:02:28 -06:00
GriffinR	9c934c9664	Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers	2020-01-26 12:23:08 -05:00
GriffinR	9a6c2c25d0	Add some capacity constants	2020-01-26 09:42:55 -06:00
GriffinR	25d7577d9d	Label animated doors	2020-01-26 09:40:35 -06:00
GriffinR	4c12ad00d2	Merge branch 'master' into fix-eventobj	2020-01-19 21:57:29 -05:00
GriffinR	a40f054900	Move/rename gfx start/end vars	2020-01-18 08:49:34 -06:00
jiangzhengwenjz	aa631825fc	resolve data sections	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	46b00b11d4	match all the functions	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	c2be2e8c69	sync documentation from firered	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	8a5f292618	document symbols	2020-01-16 08:14:27 -06:00
GriffinR	ea8b1011d3	Merge master into fix-eventobj	2020-01-15 16:11:20 -05:00
Marcus Huderle	5a2d676e71	Merge remote-tracking branch 'upstream' into tustin2121-patch-5	2020-01-13 20:26:20 -06:00
GriffinR	e92cc7752b	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-01-13 20:41:57 -05:00
huderlem	6d6c57f383	Merge pull request #953 from GriffinRichards/sync-script ... Port some macro/script fixes from pokefirered	2020-01-13 19:33:47 -06:00
GriffinR	c19289596d	Give/Take to Add/Remove for silent script macros	2020-01-12 23:24:52 -05:00
GriffinR	655910a16f	Merge branch 'master' into fix-eventobj	2020-01-12 22:42:43 -05:00
huderlem	fa5816915d	Merge pull request #949 from GriffinRichards/doc-dome ... Document Battle Dome and add facility party constants	2020-01-12 20:10:03 -06:00
GriffinR	e736c2d2fd	Document some easy chat specials	2020-01-12 19:39:30 -06:00
GriffinR	6a470ddfda	Some script clean up, document secret base secrets show	2020-01-12 19:39:30 -06:00
GriffinR	58e64b9524	Clean up some of save.c	2020-01-12 18:42:41 -06:00
GriffinR	635267ce32	Merge branch 'master' into fix-eventobj	2020-01-08 05:51:49 -05:00
GriffinR	ef67f2d33b	Merge master into ObjEvent rename and prune accidental inclusions	2020-01-08 05:43:06 -05:00
GriffinR	e5df61e362	Merge branch 'master' into doc-dome	2020-01-08 01:15:36 -05:00
GriffinR	017fa294b5	Add battle tent mon/trainer constants	2020-01-08 01:07:53 -05:00
GriffinR	fb5bea98ce	More battle_dome.c doc	2020-01-07 22:30:37 -05:00
GriffinR	bb692a03eb	Add frontier mon constants	2020-01-03 23:20:11 -05:00
Marcus Huderle	ef751c8d1b	Fix formatting and remove unnecessary comments	2019-12-28 12:07:02 -06:00
huderlem	3b05398975	Merge pull request #945 from Fontbane/patch-5 ... Give rival and Maxie parties better names	2019-12-28 12:06:35 -06:00
GriffinR	3efc8199d4	More battle_dome.c documentation	2019-12-25 22:27:33 -08:00
Fontbane	31b4656324	Labels better	2019-12-25 22:39:06 -05:00
huderlem	8d64bc9df8	Merge pull request #944 from GriffinRichards/doc-itemuse ... Document item_use.c	2019-12-25 11:59:07 -06:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06:00
GriffinR	749965d56b	Document item_use.c	2019-12-21 21:39:30 -05:00
GriffinR	68cdd7b1cb	Merge master into ObjEvent rename	2019-12-21 05:19:27 -05:00
Diegoisawesome	026e1108b2	Merge pull request #935 from GriffinRichards/doc-warp ... Document some warp/field screen effect	2019-12-20 23:44:56 -08:00
GriffinR	ff2d8a9c4e	Add frontier trainer constants	2019-12-20 21:14:05 -05:00
GriffinR	63c8cf97d1	Document Battle Dome scripts and some battle_dome.c	2019-12-20 16:53:33 -05:00
GriffinR	d137a1a0c1	Use constants in compare macro	2019-12-18 19:12:09 -05:00
GriffinR	949509aade	Merge branch 'master' into fix-eventobj	2019-12-18 13:16:38 -05:00
GriffinR	23f952b34e	Merge master into doc-tower	2019-12-17 21:17:46 -05:00
GriffinR	ddfa0c6298	Document Battle Tower scripts	2019-12-17 20:56:13 -05:00
huderlem	f8cef9a6a8	Merge pull request #932 from jiangzhengwenjz/berry_crush ... berry crush	2019-12-17 19:35:00 -06:00
GriffinR	4879c1eab2	Merge branch 'master' into constants-fade	2019-12-17 19:11:51 -05:00
jiangzhengwenjz	5bec27aa34	nonmatch sub_8024604	2019-12-18 03:36:51 +08:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
GriffinR	db8a5c6c2b	Merge branch 'master' into fix-eventobj	2019-12-15 11:47:27 -05:00
GriffinR	96ec5e1b84	Use fadescreen constants	2019-12-15 11:42:50 -05:00
huderlem	fee36224ed	Merge pull request #925 from GriffinRichards/doc-matchcall ... Document some pokenav match call	2019-12-15 09:42:13 -06:00
GriffinR	a04347816f	Split PokenavMatchCallEntries from PokenavMonList	2019-12-15 10:25:47 -05:00
GriffinR	82f55f2381	Merge master into ObjEvent rename	2019-12-15 02:00:00 -05:00
GriffinR	75b0c9d7a9	Document Battle Pyramid scripts	2019-12-14 08:38:26 -06:00
GriffinR	ea9a2c848a	Define start and ends for temp vars and daily/temp/special flags	2019-12-14 08:27:49 -06:00
GriffinR	09840efc64	Name last event_data funcs	2019-12-14 08:27:49 -06:00
GriffinR	1a672dac8d	Use constant for daily flag offset	2019-12-14 08:27:49 -06:00
GriffinR	6556b556dd	Merge branch 'master' into fix-eventobj	2019-12-11 01:09:06 -05:00
GriffinR	47b0d8a597	Merge branch 'master' into doc-matchcall	2019-12-10 20:43:27 -05:00
GriffinR	49f1a90534	Document Battle Pike scripts	2019-12-10 19:31:27 -06:00
GriffinR	b7ab9cbf4c	Update JP translation and fix typo	2019-12-10 19:29:23 -06:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
GriffinR	8da7a94423	Merge branch 'master' into fix-eventobj	2019-12-10 17:41:08 -05:00
Diegoisawesome	49b56d0136	Merge pull request #929 from jiangzhengwenjz/nonmatching ... fake match InitEventObjectStateFromTemplate	2019-12-10 14:32:57 -08:00
jiangzhengwenjz	f34b8f564a	InitEventObjectStateFromTemplate	2019-12-11 05:35:40 +08:00
GriffinR	51179df017	Clean up match call doc	2019-12-08 15:49:36 -05:00
GriffinR	0086cd1efa	More pokenav match call documentation	2019-12-08 15:25:21 -05:00
GriffinR	b93101bbeb	Merge master into ObjEvent rename	2019-12-06 21:37:33 -05:00
GriffinR	22fd579fd9	Add comment for ABNORMAL_WEATHER	2019-12-06 19:05:28 -06:00
GriffinR	7f22fc9879	Update old weather names in field_weather_effect	2019-12-06 19:05:28 -06:00
GriffinR	955bfe3f5c	Add comment for original weather name	2019-12-06 19:05:28 -06:00
GriffinR	efaea2a3ab	Revert WEATHER_CLOUDY to WEATHER_SHADE	2019-12-06 19:05:28 -06:00
GriffinR	a4191040c9	Sync weather names	2019-12-06 19:05:28 -06:00
GriffinR	1b30f0c973	Rename event_obj_lock to event_object_lock	2019-12-06 02:55:30 -05:00
GriffinR	cc9b923dc2	More pokenav match call documentation	2019-12-06 02:35:08 -05:00
GriffinR	c51e0f3bae	Merge branch 'master' into fix-eventobj	2019-12-06 02:34:54 -05:00
GriffinR	467a103bcc	Set up Battle Tent macros	2019-12-05 21:11:17 -06:00
GriffinR	fdae25eab2	Set up Battle Pyramid macros	2019-12-05 21:11:17 -06:00
GriffinR	9fcfbdbef5	Set up Battle Factory macros	2019-12-05 21:11:17 -06:00
GriffinR	41c1c9ca8a	Set up Battle Pike macros	2019-12-05 21:11:17 -06:00
GriffinR	9b3d1cfab6	Set up Battle Dome and Tower macros	2019-12-05 21:11:17 -06:00
GriffinR	be17c1602d	Set up remaining facility script doc, use Palace macros	2019-12-05 21:11:17 -06:00
GriffinR	548af3c0f1	Document a bit of Match Call	2019-12-05 15:33:36 -05:00
GriffinR	cb90f22c5e	Merge master into ObjEvent rename	2019-11-27 12:51:10 -05:00
GriffinR	8d870d94c9	Document Battle Arena scripts	2019-11-26 18:47:48 -06:00
GriffinR	f559fa3fe2	Merge master into ObjEvent rename	2019-11-25 20:00:04 -05:00
GriffinR	0db46e84bc	Use macros for FRONTIER_DATA_6, fix offset comment	2019-11-25 18:37:48 -06:00
GriffinR	63ee15fc28	Document Frontier Util	2019-11-25 18:37:48 -06:00
GriffinR	08a8dc46e3	Use macros for Trainer Hill	2019-11-25 18:37:48 -06:00
GriffinR	4dfa959fa2	Begin documenting Battle Pike and Frontier Util	2019-11-25 18:37:48 -06:00
huderlem	9a81661075	Merge pull request #851 from Sewef/patch-3 ... battle_anim_effects_3	2019-11-24 12:02:54 -06:00
Sewef	07b79c3fc3	battle_anim_effects_3 (5)	2019-11-24 18:00:51 +01:00
huderlem	bef6150b59	Merge pull request #909 from GriffinRichards/doc-apprentice ... Document Apprentice	2019-11-23 09:27:02 -06:00
Sewef	1dfe34dee3	TriForce → TriAttack	2019-11-23 15:51:08 +01:00
Sewef	4f590e8f61	battle_anim_effects_3 (4)	2019-11-23 11:57:39 +01:00
GriffinR	4c52cf9ed1	Fix event constant file names	2019-11-21 14:03:35 -05:00
GriffinR	86c08330c4	Fix Event Object include guards	2019-11-21 14:03:11 -05:00
GriffinR	5822dfca8d	Rename FIELD_OBJ_EVENT to OBJECT_EVENT_MOVEMENT	2019-11-21 10:47:24 -05:00
GriffinR	7034f59c14	Rename EventObj to ObjEvent	2019-11-21 00:14:40 -05:00
GriffinR	82cb741d8b	Standardize EVENT_OBJECT to OBJECT_EVENT	2019-11-20 23:12:51 -05:00
GriffinR	ec3e86f1d2	Standardize Event Object to Object Event	2019-11-20 22:55:44 -05:00
GriffinR	b2eb49888d	Clean up Apprentice doc	2019-11-20 19:00:08 -05:00
GriffinR	a05006421b	Document Apprentice	2019-11-20 17:36:52 -05:00
GriffinR	215bb31d67	Clean up Trainer Fan Club doc	2019-11-20 09:08:24 -06:00
GriffinR	5c5c1836bb	Document Trainer Fan Club	2019-11-20 09:08:24 -06:00