Commit Graph

67 Commits

Author SHA1 Message Date
GriffinR 0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
aaaaaa123456789 bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
aaaaaa123456789 7dc95a0103 Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
2020-09-13 06:30:55 -03:00
PokeCodec 28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
GriffinR 7c8bc0fbe3 Merge pull request #1149 from PokeCodec/datatypes
gflib documenting
2020-09-01 14:25:21 -04:00
GriffinR 22c1bf965a Finish documenting berry blender 2020-08-24 17:06:55 -04:00
PokeCodec 6aee7d38f3 sizeOf data type, not pointer value 2020-08-23 21:34:31 -04:00
GriffinR cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
GriffinR af09e73d67 Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR 18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
Sierraffinity 74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
GriffinR 749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR 2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR 6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
PikalaxALT 7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
GriffinR 06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
PikalaxALT 306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
Phlosioneer 1360b3a477 RGB Constants 2019-04-04 17:05:46 -04: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 b93d923826 Merge branch 'master' into move-tutor 2019-03-08 02:27:20 -05:00
Phlosioneer 4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
Phlosioneer 3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -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 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
DizzyEggg 23b240ab65 Fix Menu and List Menu input defines 2019-02-02 11:04:38 +01:00
DizzyEggg 9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
DizzyEggg 9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
nullableVoidPtr f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr 3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-12-06 09:44:08 +08:00
Slawter666 4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
Diegoisawesome 18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome f8d337e491 Finish cleaning up text.c 2018-11-06 11:30:21 -06:00
Diegoisawesome 7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg b252bd0292 Window priority to window bg 2018-10-27 00:53:07 +02: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 2f59df03ab Standartize AddTextPrinterParametrized functions, 2018-09-08 23:38:30 +02:00
Slawter666 f74adc80c1 Format more templates 2018-09-02 17:53:52 +01:00
Diegoisawesome 2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
DizzyEggg ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
Diegoisawesome 731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg caa36b530a label and document battle windows 2018-06-17 16:48:58 +02:00
DizzyEggg 9385036ff7 make menu indicators compile 2018-05-19 11:53:22 +02:00
Diegoisawesome 416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
DizzyEggg 25c669e36b decompile item 2018-04-29 13:36:26 +02:00
KDSKardabox f9f64fff42 Resolve conflicts 2018-03-19 16:15:13 +05:30