ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-04 00:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,407 Commits 1 Branch 0 Tags 235 MiB
5bab9474dc
Commit Graph

203 Commits

Author SHA1 Message Date
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
GriffinR
031da44cab Document mon markings 2021-02-28 17:11:46 -06:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
GriffinR
81a7f491b7 Use WINDOW_NONE constant 2021-02-24 11:03:08 -05:00
GriffinR
a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush 
fakematch fixes, begin documenting Berry Crush (based on #1187)
 2020-12-14 23:22:41 -05:00
Sierraffinity
1aca378634 Fix name of SetDexNumberColor 2020-12-12 21:08:15 -08:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Eduardo Quezada
a6e88b82ee Review changes and option to hide split icon. 2020-10-15 20:15:44 -03:00
Eduardo Quezada
0d39b29691 Option to use Gen 3 Physical/Special split. 2020-10-15 00:16:50 -03:00
ExpoSeed
88b9847772 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2 2020-10-12 12:42:37 -05:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
Evan
2b2be90a52 start pokenav documentation 2020-10-10 16:17:34 -06:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Kaz
847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix. 
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
 2020-09-19 17:12:25 -04: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
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
PokeCodec
3e25d9e5a2 Removed unused parentheses 2020-09-05 10:01:21 -04:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02: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
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
DizzyEggg
5eeecb56c1 More touches to pokemon summary screen document 2020-05-27 07:57:15 -05:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
PikalaxALT
9317d114a9
Merge pull request #823 from GriffinRichards/constants-strconv 
Use STR_CONV constants
 2019-10-02 09:18:48 -04:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
Ariel Antonitis
208e1c9689 Removed 'Summary_' prefix. 2019-09-25 20:44:17 -05:00