LOuroboros
|
a0a888698e
|
Corrected Bronzor's evo level
|
2021-08-22 23:19:26 -03:00 |
|
GriffinR
|
63e6b914e4
|
Merge pull request #1497 from GriffinRichards/doc-hasmargin
Label swap line margin flag
|
2021-08-21 12:06:30 -04:00 |
|
GriffinR
|
8f5e2bbeba
|
Label swap line margin flag
|
2021-08-21 11:04:28 -04:00 |
|
ghoulslash
|
5b47bfacf2
|
Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs
|
2021-08-18 20:22:26 -06:00 |
|
ghoulslash
|
03fa4939ff
|
merge with pret
|
2021-08-18 20:22:03 -06:00 |
|
ghoulslash
|
019a582c47
|
replace level bonus with current chain
|
2021-08-18 20:02:44 -06:00 |
|
ExpoSeed
|
a9e9837b25
|
Merge pull request #1596 from ultima-soul/master_sync
Master Upstream Sync
|
2021-08-17 16:46:02 -05:00 |
|
ultima-soul
|
43e8f76338
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:55:48 -07:00 |
|
ultima-soul
|
4c3ed52c2f
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:39:11 -07:00 |
|
ultima-soul
|
988320b89a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:25:13 -07:00 |
|
ExpoSeed
|
5493333ff5
|
Merge pull request #1594 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
|
2021-08-16 19:47:41 -05:00 |
|
ExpoSeed
|
29b6276e64
|
Merge pull request #1595 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
|
2021-08-16 19:47:39 -05:00 |
|
ExpoSeed
|
38120afbac
|
Merge pull request #1593 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2021-08-16 19:47:35 -05:00 |
|
ultima-soul
|
840e2bc3f9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-16 16:33:34 -07:00 |
|
ultima-soul
|
76a7a2720d
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-16 16:10:59 -07:00 |
|
ultima-soul
|
b620349da0
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-16 15:43:27 -07:00 |
|
GriffinR
|
dfdcfc1568
|
Document remaining functions in cable_club
|
2021-08-15 16:22:15 -04:00 |
|
GriffinR
|
e01ae55c13
|
Start more link_rfu_2 documentation
|
2021-08-15 15:13:42 -04:00 |
|
GriffinR
|
ee5eee6ccc
|
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
Document item menu
|
2021-08-15 12:01:57 -04:00 |
|
ghoulslash
|
d344612346
|
fix last used ball window in wild doubles
|
2021-08-12 14:49:17 -06:00 |
|
ghoulslash
|
a2d885c0d4
|
merge with be
|
2021-08-12 14:48:58 -06:00 |
|
ghoulslash
|
85f98300ff
|
use B_WAIT_TIME_SHORT and B_WAIT_TIME_LONG
|
2021-08-12 14:14:51 -06:00 |
|
ghoulslash
|
0bbbd1e7a9
|
fix electric/misty yawn/rest interactions
|
2021-08-12 14:08:41 -06:00 |
|
ghoulslash
|
5e250853c6
|
misty terrain blocks toxic spikes
|
2021-08-12 13:45:50 -06:00 |
|
ghoulslash
|
f050168c55
|
misty terrain blocks toxic spikes
|
2021-08-12 13:41:18 -06:00 |
|
ghoulslash
|
c7c0fbc296
|
merge with be, make AI CanBeStatused functions separate from general util ones
|
2021-08-12 13:37:53 -06:00 |
|
ghoulslash
|
7b0e60c705
|
some tweaks
|
2021-08-12 12:44:53 -06:00 |
|
ghoulslash
|
e3d30602d9
|
record item effect with trick
|
2021-08-12 01:29:52 -04:00 |
|
ghoulslash
|
d218322b2c
|
merge with be
|
2021-08-12 01:26:13 -04:00 |
|
ultima-soul
|
64a48800c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-11 17:10:57 -07:00 |
|
PikalaxALT
|
c7fc6ac893
|
Merge pull request #1492 from Kurausukun/cgbsound
Fix CgbSound Fakematches (Thanks to Revo)
|
2021-08-11 19:55:44 -04:00 |
|
ultima-soul
|
3f75a58137
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-11 16:55:29 -07:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
GriffinR
|
034b7f0513
|
Fix conflicting PC window names
|
2021-08-11 19:14:50 -04:00 |
|
GriffinR
|
80348e7188
|
Merge branch 'master' into doc-itemmenu2
|
2021-08-11 19:01:47 -04:00 |
|
GriffinR
|
cc51627465
|
Merge pull request #1489 from GriffinRichards/doc-playerpc
Document player pc
|
2021-08-11 18:59:58 -04:00 |
|
GriffinR
|
0bc26d9d79
|
Merge pull request #1488 from GriffinRichards/doc-frontierpass2
Document frontier pass
|
2021-08-11 17:40:55 -04:00 |
|
GriffinR
|
3a14f4472d
|
Merge pull request #1495 from GriffinRichards/fix-symbols
Fix symbols branch commit message, limit to upstream
|
2021-08-11 17:35:31 -04:00 |
|
GriffinR
|
1860b7682f
|
Allow symbols branch on forks
|
2021-08-11 17:19:21 -04:00 |
|
GriffinR
|
5098fbf7bb
|
Fix symbols branch commit message, limit to upstream
|
2021-08-11 17:09:03 -04:00 |
|
GriffinR
|
2fb7440315
|
Merge pull request #1494 from GriffinRichards/tag-regionmap
Use tag constants in region_map.c
|
2021-08-11 12:24:36 -04:00 |
|
GriffinR
|
d951d7c363
|
Use tag constants in region_map.c
|
2021-08-11 09:31:20 -04:00 |
|
GriffinR
|
28a8fe191a
|
Document item menu
|
2021-08-10 22:13:02 -04:00 |
|
BuffelSaft
|
017a0fb693
|
Fix Mienshao's front sprite
|
2021-08-09 21:48:12 +12:00 |
|
Kurausukun
|
2e892c6961
|
unsigned int -> u32
|
2021-08-08 22:22:50 -04:00 |
|
Kurausukun
|
ddb3911d0d
|
oops
|
2021-08-08 20:49:29 -04:00 |
|
Kurausukun
|
0bceaab046
|
rename variable
|
2021-08-08 20:34:16 -04:00 |
|
Kurausukun
|
b51d025f1c
|
port cgb fakematching fixes (thanks to revo)
|
2021-08-08 20:33:21 -04:00 |
|
BuffelSaft
|
30c983d9ca
|
Define Burmy forms in battle engine
Title. BE needs these to compile on its own.
|
2021-08-08 13:14:51 +12:00 |
|
cynderquil
|
757207ff84
|
Fix Bastiodon's second icon frame
|
2021-08-07 21:39:06 +01:00 |
|