ultima-soul
|
3cb09b6507
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
|
2021-01-11 15:19:11 -08:00 |
|
ExpoSeed
|
10f4b48215
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-01 14:14:51 -08:00 |
|
ultima-soul
|
6a0939cd4e
|
Remove special handling for Deoxys.
|
2020-12-21 22:39:19 -08: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 |
|
Eduardo Quezada D'Ottone
|
68627882a5
|
Merge remote-tracking branch 'pret/master' into PE-pretSync
|
2020-11-07 15:00:10 -03: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 |
|
ExpoSeed
|
81ac09af0b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion
|
2020-10-12 12:45:42 -05:00 |
|
Evan
|
2b2be90a52
|
start pokenav documentation
|
2020-10-10 16:17:34 -06:00 |
|
ExpoSeed
|
5794fc69e8
|
Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion
|
2020-10-04 02:35:23 -05: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
|
448599f53c
|
Merge with master
|
2020-09-08 12:01:20 +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
|
c2733236be
|
Merge with master
|
2020-08-27 11:36:35 +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
|
ff5fc97859
|
Merge with master
|
2020-07-11 14:07:10 +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
|
cca1dcc04a
|
merge with master
|
2020-05-29 13:07:53 +02:00 |
|
DizzyEggg
|
5eeecb56c1
|
More touches to pokemon summary screen document
|
2020-05-27 07:57:15 -05:00 |
|
DizzyEggg
|
bdebab834c
|
Document pokemon summary screen
|
2020-05-18 14:03:01 +02:00 |
|
DizzyEggg
|
88bdeed1a6
|
Merge with master
|
2020-04-15 14:40:16 +02:00 |
|
GriffinR
|
86354f1d50
|
Document some pokenav and region map
|
2020-02-05 21:04:43 -05:00 |
|
DizzyEggg
|
5fc298c4eb
|
Add graphical fairy type
|
2019-12-30 18:34:30 +01:00 |
|
GriffinR
|
ed1ff0ad77
|
Document misc strings and text colors
|
2019-12-10 19:29:23 -06:00 |
|
GriffinR
|
c40879aa36
|
Use ST_OAM constants for OamData definitions
|
2019-12-06 19:05:44 -06: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 |
|
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 |
|
Ariel Antonitis
|
ea638b82fa
|
Fixed typo.
|
2019-09-25 20:44:17 -05:00 |
|
Ariel Antonitis
|
4b7f096bbd
|
Relabeled unknown functions in pokemon_summary_screen.c
|
2019-09-25 20:44:17 -05:00 |
|
GriffinR
|
85d97542cd
|
Use MAX_MON_MOVES constants
|
2019-09-16 19:21:23 -05:00 |
|
PikalaxALT
|
306ce048ad
|
Move gflib srcs and headers to gflib subdir
|
2019-09-08 21:07:54 -04:00 |
|
DizzyEggg
|
33979f0fa6
|
use ability num instead of alt ability
|
2019-05-16 17:09:43 -05:00 |
|
DizzyEggg
|
b0223f691f
|
Clean up data headers
|
2019-04-05 07:53:23 -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
|
146c194b0c
|
Actually change the variable name this time
|
2019-03-08 03:12:08 -05:00 |
|
Phlosioneer
|
ac7a048380
|
Removed PREV and NEXT macros, changed summary name
|
2019-03-04 00:25:07 -05:00 |
|
Phlosioneer
|
05199f8fc7
|
Fix merge issue
|
2019-03-03 22:27:57 -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 |
|