Evan
728586de51
make ultranecrozium-z description fit
2020-12-20 16:36:31 -07:00
Evan
d500bd4e2f
fix zring and ultranecrozium descriptions
2020-12-19 22:17:20 -07:00
Evan
f05249c8da
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion
2020-12-19 22:13:37 -07:00
Evan
a0ae0ece53
add ultranecrozium-z and update z crystal data
2020-12-08 09:55:50 -07:00
ghoulslash
2a251e7551
Merge pull request #1252 from ExpoSeed/IE-ultra-beast
...
Removed IS_ULTRA_BEAST in favor of mon flag
2020-12-03 15:07:45 -05:00
Evan
8a56a52666
update z crystal descriptions
2020-12-01 17:49:43 -05:00
Evan
539a88207e
add z crystal and z ring
2020-11-29 10:00:03 -05:00
ExpoSeed
a158d6138c
Removed IS_ULTRA_BEAST in favor of mon flag
2020-11-24 22:47:27 -06:00
Eduardo Quezada D'Ottone
6f29abbe0e
Plate type data and hold effect #1207 from ExpoSeed
2020-11-09 15:24:13 -03:00
ExpoSeed
79d9cb02ce
Merge pull request #1212 from AsparagusEduardo/IE-GlobalDefine
...
Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine
2020-11-09 12:01:41 -06:00
Eduardo Quezada D'Ottone
b19ee3c554
Capitalization.
2020-11-09 14:53:10 -03:00
Eduardo Quezada D'Ottone
102e686a94
Updated comment.
2020-11-09 14:48:47 -03:00
Eduardo Quezada D'Ottone
bacabf03a8
Review changes.
2020-11-09 13:45:08 -03:00
Eduardo Quezada D'Ottone
b4cf674fa1
Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine
2020-11-09 12:38:53 -03:00
Eduardo Quezada D'Ottone
d00f485ebf
Fixed gen 3 fossil config #1209
...
Fixed gen 3 fossil config
2020-11-08 23:30:29 -03:00
Eduardo Quezada D'Ottone
4a17d62ecd
Fixed gen 3 fossil config
2020-11-08 20:27:46 -03:00
ultima-soul
71e99e5918
Merge pull request #578 from AsparagusEduardo/IE-pretSync
...
Sync with pret
2020-11-08 14:18:39 -08:00
Eduardo Quezada D'Ottone
2e01654eb9
Plate type data and hold effect.
2020-11-08 01:47:05 -06:00
Eduardo Quezada D'Ottone
8d86169283
Merge remote-tracking branch 'pret/master' into IE-pretSync
2020-11-07 14:54:52 -03:00
GriffinR
8b1c2c946b
Merge pull request #1247 from PidgeyALT/attemptcountfix
...
use constants for ball throw count
2020-11-06 15:41:25 -05:00
PikalaxALT
75b12b86dc
Merge pull request #1246 from PikalaxALT/simplify_ram_reset
...
Simplify RAM reset adaptation for modern
2020-11-06 15:00:40 -05:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
PikalaxALT
3112cf5726
swi --> svc
2020-11-06 12:34:57 -05:00
PikalaxALT
c70c44fa48
Simplify RAM reset adaptation for modern
2020-11-06 12:29:40 -05:00
GriffinR
42b7f11db0
Merge pull request #1245 from GriffinRichards/modernfactoryfix
...
Fix battle factory on gcc 10
2020-11-04 18:34:53 -05:00
GriffinR
1220f0655c
Revert to original battle factory gcc 10 fix
2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a
Fix typo
2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735
Condense fix for battle factory on gcc 10
2020-11-04 16:43:59 -05:00
GriffinR
c59a818462
Fix battle factory on gcc 10
2020-11-04 15:35:22 -05:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
aaaaaa123456789
ca950a8daf
Solve merge conflicts from previous commit
2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227
address comments
2020-11-02 18:43:11 -05:00
ExpoSeed
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config
...
Item Expansion config file.
2020-11-02 11:31:51 -06:00
Eduardo Quezada D'Ottone
6c04aadff8
Going to bed now
2020-11-02 00:31:04 -03:00
Eduardo Quezada D'Ottone
28dc577a73
Review changes.
2020-11-02 00:24:19 -03:00
GriffinR
9e55ae22b1
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons
...
Use constants for menu info icon table
2020-10-29 23:50:43 -04:00
GriffinR
fbff087e9a
Merge pull request #1238 from ketsuban/master
...
Eliminate goto in ItemUseCB_Medicine
2020-10-29 23:50:17 -04:00
GriffinR
be1685c87f
Use constants for menu info icon table
2020-10-29 16:34:33 -04:00
aaaaaa123456789
9794b077b5
Update src/digit_obj_util.c
...
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 19:14:08 -03:00
aaaaaa123456789
bcbd05e151
Fix whitespace issues
2020-10-26 15:52:44 -03:00
aaaaaa123456789
4bbc14ecdd
Remove unused variable
...
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 15:51:10 -03:00
aaaaaa123456789
00db69a302
Port back improvements from later commits
2020-10-26 12:31:07 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Kurausukun
539fd463c8
port MovementAction_StoreAndLockAnim_Step0 fix
2020-10-26 03:46:08 -04:00
Kurausukun
43701c3860
port PrintMonWeight fakematch fix
2020-10-26 00:49:57 -04:00
Kurausukun
b2b363159f
port sub_80C6104 fakematch fix
2020-10-26 00:46:01 -04:00
