ultima-soul
|
be7acc919a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-04-03 21:53:29 -07:00 |
|
ultima-soul
|
939608f5b8
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-02 13:16:40 -07:00 |
|
GriffinR
|
1b8d405b5e
|
Add missing include guard suffixes
|
2021-04-02 12:54:40 -04:00 |
|
GriffinR
|
a0b3d4df12
|
Merge pull request #1390 from GriffinRichards/doc-introcred
Document intro and credits sequences
|
2021-04-01 23:13:59 -04:00 |
|
GriffinR
|
51970f97b0
|
Merge pull request #1393 from GriffinRichards/doc-dewfordtrend
Document Dewford Trend and match_call.c
|
2021-04-01 22:19:48 -04:00 |
|
GriffinR
|
f58465a274
|
Document match_call.c
|
2021-04-01 03:29:15 -04:00 |
|
GriffinR
|
771a434730
|
Label Trend Watcher TV show texts
|
2021-03-31 16:29:42 -04:00 |
|
GriffinR
|
86856098a3
|
Document Dewford Trend
|
2021-03-31 16:08:42 -04:00 |
|
GriffinR
|
50e9666e16
|
Merge branch 'master' into doc-introcred
|
2021-03-29 20:56:15 -04:00 |
|
GriffinR
|
dea07dc865
|
Standardize intro gfx names
|
2021-03-29 20:48:48 -04:00 |
|
GriffinR
|
09ff1524b4
|
Finish documenting credits
|
2021-03-29 19:58:29 -04:00 |
|
Kurausukun
|
102582a3df
|
Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc
|
2021-03-29 18:36:18 -04:00 |
|
GriffinR
|
c40fb9288c
|
Merge pull request #1378 from GriffinRichards/doc-berrycrush
Document Berry Crush
|
2021-03-29 12:38:16 -04:00 |
|
GriffinR
|
62968895ca
|
Add MON_PIC_SIZE constant
|
2021-03-29 09:38:19 -04:00 |
|
GriffinR
|
357c5439f5
|
Document some credits
|
2021-03-29 08:52:40 -04:00 |
|
GriffinR
|
c86cc8b371
|
Document intro, start intro_credits/credits
|
2021-03-28 23:13:56 -04:00 |
|
GriffinR
|
7a5c6d4d86
|
Standardize Friendship/Happiness
|
2021-03-27 17:27:20 -05:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
GriffinR
|
6127c6f32e
|
Misc labels in battle facilities
|
2021-03-22 15:30:19 -05:00 |
|
GriffinR
|
dfc6ee0e9e
|
Add SAFE_DIV
|
2021-03-21 13:43:14 -05:00 |
|
GriffinR
|
557152b06e
|
Minor link cleanup
|
2021-03-21 13:40:40 -05:00 |
|
Kurausukun
|
5b910a11b4
|
port miscellaneous fr documentation
|
2021-03-18 20:35:39 -04:00 |
|
GriffinR
|
22e2c0a47c
|
Document Berry Crush
|
2021-03-18 15:18:23 -04:00 |
|
GriffinR
|
ecd269ba2c
|
Merge pull request #1372 from GriffinRichards/doc-countdown
Document minigame countdown
|
2021-03-15 21:39:58 -04:00 |
|
PikalaxALT
|
925e68c03f
|
Update newly named fields
|
2021-03-15 15:22:41 -04:00 |
|
Eduardo Quezada D'Ottone
|
292993e360
|
Merge pull request #1338 from ghoulslash/ripen
Add Ripen and Finish Gen4 Berries
|
2021-03-13 11:16:42 -03:00 |
|
PikalaxALT
|
8d4dcb228a
|
More documentation in battle_main
|
2021-03-12 16:55:58 -05:00 |
|
PikalaxALT
|
e32a1571af
|
Resolve link comm buffers in gBattleStruct
|
2021-03-12 15:37:31 -05:00 |
|
GriffinR
|
b1a69d95ea
|
Document minigame countdown
|
2021-03-11 14:25:22 -05:00 |
|
GriffinR
|
6c297d19e8
|
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking
Document Dodrio Berry Picking
|
2021-03-10 18:55:41 -05:00 |
|
ghoulslash
|
3f9bf5acc0
|
merge with be
|
2021-03-09 10:33:48 -07:00 |
|
ghoulslash
|
68388f633f
|
merge with be
|
2021-03-08 18:58:16 -07:00 |
|
GriffinR
|
55a40b901f
|
Label battle tower link script
|
2021-03-04 19:30:19 -06:00 |
|
GriffinR
|
b9c733495b
|
Document dodrio berry picking
|
2021-03-03 14:26:05 -05:00 |
|
Evan
|
41d47a867e
|
format fixes
|
2021-03-03 10:48:57 -07:00 |
|
Evan
|
2ccdf1d89e
|
merge with be. magic guard checks
|
2021-03-03 09:21:06 -07:00 |
|
ghoulslash
|
0ee9425599
|
Update include/battle_scripts.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-03-03 09:14:07 -07:00 |
|
ghoulslash
|
3a30fe900a
|
Update include/constants/hold_effects.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-03-03 09:13:49 -07:00 |
|
ultima-soul
|
e5fa583a08
|
Merge pull request #1334 from ghoulslash/gen8_abilities
More Gen 8 Abilities
|
2021-03-01 10:40:09 -08:00 |
|
Evan
|
6cb8c6309a
|
merge with be
|
2021-03-01 11:28:51 -07:00 |
|
Evan
|
55649a67cc
|
Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain
|
2021-03-01 11:23:05 -07:00 |
|
Evan
|
55b8538f68
|
merge with be
|
2021-03-01 11:22:37 -07:00 |
|
ultima-soul
|
f6147ee054
|
Merge pull request #1356 from ghoulslash/tailwind_turns
Update tailwind timer To Gen5
|
2021-03-01 08:51:40 -08:00 |
|
GriffinR
|
91ab30fa71
|
Rename mon markings struct
|
2021-02-28 17:11:46 -06:00 |
|
GriffinR
|
ed0347476c
|
Remove old declaration and define
|
2021-02-28 17:11:46 -06:00 |
|
GriffinR
|
031da44cab
|
Document mon markings
|
2021-02-28 17:11:46 -06:00 |
|
GriffinR
|
cbc7a72814
|
Merge pull request #1346 from GriffinRichards/doc-pokejump
Document pokemon jump
|
2021-02-28 11:19:02 -05:00 |
|
N
|
cab3728e96
|
Strangest match
|
2021-02-28 10:06:07 -06:00 |
|
huderlem
|
10c77f1bc2
|
Merge pull request #1345 from GriffinRichards/doc-rtcscreen
Document/clean up some minor screens
|
2021-02-28 10:03:22 -06:00 |
|
Marcus Huderle
|
c900de35e7
|
Fix build and cleanup mistakes
|
2021-02-28 09:54:55 -06:00 |
|