Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
GriffinR
8d29f65c6c
Merge pull request #1255 from GriffinRichards/doc-paltags
...
Name object event palettes and tags
2020-11-24 15:59:14 -05:00
GriffinR
9d056e8656
Move object event pal declarations to graphics
2020-11-23 14:45:16 -05:00
GriffinR
513c7c5f45
Clarify Kecleon objects
2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25
Name object event pals/tags
2020-11-23 14:24:48 -05:00
GriffinR
c0e3c71673
Merge pull request #1252 from luckytyphlosion/master
...
Missing inc files in asm/*.s and data/*.s will raise an actual error message.
2020-11-18 22:10:33 -05:00
luckytyphlosion
70b6e05a47
Remove useless comment.
2020-11-18 21:31:04 -05:00
luckytyphlosion
68b53c7437
Optimize Makefile, also add *.sna to gitignore.
2020-11-18 20:53:42 -05:00
GriffinR
0aa06c307b
Merge pull request #1251 from ExpoSeed/patch-1
...
Document bugged IV inheritance difference
2020-11-17 14:25:36 -05:00
GriffinR
116fbecbe4
Merge pull request #1254 from kageru/pret
...
Use more constants in Battle Tower code
2020-11-17 13:49:58 -05:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code
2020-11-17 17:40:26 +01:00
GriffinR
de153a67cf
Merge pull request #1253 from LOuroboros/patch-1
...
sanityIsBagEgg -> sanityIsBadEgg
2020-11-16 14:57:16 -05:00
LOuroboros
cad5b57b42
sanityIsBagEgg -> sanityIsBadEgg
...
Fixed a typo.
Lunos#4026
2020-11-16 15:36:38 -03:00
ExpoSeed
e5f043ff72
Fix grammar
2020-11-15 16:28:09 -06:00
ExpoSeed
3f157b5293
Document bugged IV inheritance difference
2020-11-15 16:24:19 -06:00
luckytyphlosion
5029c90979
Missing inc files in asm/*.s and data/*.s will raise an actual error message.
2020-11-12 11:04:38 -05:00
GriffinR
7172ea35f9
Merge pull request #1248 from luckytyphlosion/master
...
Bugfix for ChooseMoveOrAction_Doubles.
2020-11-09 12:17:41 -05:00
GriffinR
19fa021c63
Merge pull request #1249 from luckytyphlosion/master
...
Add missing files to .gitattributes.
2020-11-09 12:13:45 -05:00
luckytyphlosion
8a780977a8
Add missing files to .gitattributes.
...
Only *.sed is required, all other files are listed to be explicit.
2020-11-08 20:13:21 -05:00
luckytyphlosion
4b748d32cc
Bugfix for ChooseMoveOrAction_Doubles.
2020-11-07 18:21:17 -05:00
luckytyphlosion
a29b18ed2f
Merge branch 'master' of https://github.com/pret/pokeemerald
2020-11-07 18:06:37 -05: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
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
Kurausukun
072797844a
port TrendyPhraseIdOld fakematch fix
2020-10-26 00:29:55 -04:00
