Commit Graph

6180 Commits

Author SHA1 Message Date
Sierra A
4dd3cc7b76
Merge pull request #1035 from Sierraffinity/master
Document undefined sprite template behavior
2020-05-04 21:14:57 -07:00
Sierraffinity
a1244aa5dd Merge branch 'master' of github.com:pret/pokeemerald 2020-05-04 20:54:27 -07:00
Sierra A
b3b99b52ca
Merge pull request #1029 from GriffinRichards/fix-clangwarn
Fix -Wmissing-braces clang warning
2020-05-04 19:56:41 -07:00
Sierra A
4f0fd1b94b
Merge pull request #1034 from ipatix/modern_lib_path
Fix MODERN=1 for non-devkitARM compilation
2020-05-04 19:56:16 -07:00
Michael Panzlaff
c11fb6a3fd Fix MODERN=1 for non-devkitARM compilation
gcc has this nice option "-print-file-name=" to locate a file
in its search path. This is a more portable way to locate
libgcc.a and libc.a so there is no longer the need to mess around with
devkitARM's path's.
2020-05-05 00:09:06 +02:00
Evan
c18b5966bf undo some revert(?) 2020-05-03 22:09:03 -06:00
Sierra A
b398ef344f
Merge pull request #1030 from SBird1337/gfx/fix-hp-anim
gfx: fix hpbar_anim.png visual palette
2020-05-03 11:40:32 -07:00
SBird
7c4c1d3a5c gfx: merge battle_interface gfx table 2020-05-03 15:24:33 +02:00
Sierra A
8778aec7d6
Merge pull request #1031 from hondew/berry-yield
Document minor berry yield bug
2020-05-03 02:26:18 -07:00
Sierra A
5c49bc6d34
Merge pull request #1032 from AsparagusEduardo/OldUnown
Ordered OLD_UNOWN in the same way as the other base stats.
2020-05-03 02:24:48 -07:00
Sierra A
0009692395
Merge pull request #1033 from DizzyEggg/patch-1
Give a define for all dex interface sprites
2020-05-03 02:23:40 -07:00
DizzyEggg
a35ce6ecdf
Give a define for all dex interface sprites
for easier editing
2020-05-03 11:12:05 +02:00
AsparagusEduardo
f6932518b0 Ordered OLD_UNOWN in the same way as the other base stats. 2020-05-03 00:00:01 -04:00
hondew
84f012fc6e Update external links 2020-05-02 13:59:28 -04:00
hondew
048d1ffbdb Clarify stages 2020-05-02 13:38:25 -04:00
hondew
49184cd799 Document berry yield
fix wording
2020-05-02 11:51:49 -04:00
Eduardo Alvaro Quezada D'Ottone
f82bd2f9c4
Fix sleeping turns (#370)
* Fix sleeping turns

* Readjusted numbers. Thanks Doesnt
2020-05-02 10:35:50 +02:00
SBird
67e9309415 gfx: fix hpbar_anim.png visual palette 2020-05-01 20:51:29 +02:00
GriffinR
b057411eea Fix -Wmissing-braces clang warning 2020-04-29 16:39:14 -04:00
DizzyEggg
a848c96798 Fix Tailwind string 2020-04-29 11:58:57 +02:00
DizzyEggg
f71f1c9d62 Possibly fix gem issue 2020-04-29 11:53:03 +02:00
DizzyEggg
4fc88d18aa Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-29 09:17:25 +02:00
Eduardo Alvaro Quezada D'Ottone
deae125412
Updated moves affected by other moves (#361)
* Updated moves affected by Snatch

* Updated moves that bypass protect

* Updated moves affected by Magic Coat
2020-04-29 09:17:50 +02:00
GriffinR
cb5b8da77b More trainer type usage 2020-04-28 19:59:08 -05:00
GriffinR
8d9e39e6d1 Sync map types with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR
e5757a3def Use trainer type constants 2020-04-28 19:59:08 -05:00
GriffinR
09b39527ff Generalize oamtable names 2020-04-28 19:59:08 -05:00
GriffinR
ecd4824f67 Index heal location data, use better names 2020-04-28 19:59:08 -05:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
DizzyEggg
98b2e88e56 Forewarn 2020-04-28 15:36:13 +02:00
DizzyEggg
36b52eb063 Shed Shell 2020-04-28 11:14:20 +02:00
Eduardo Alvaro Quezada D'Ottone
7b4ccbc6bc
Counter affected by Protect, not by Mirror Move (#359) 2020-04-28 10:59:50 +02:00
Eduardo Alvaro Quezada D'Ottone
40a23ad799
String Shot lowers speed twice, (#360) 2020-04-28 10:59:28 +02:00
PikalaxALT
724ffe14ee
Merge pull request #1028 from jiangzhengwenjz/misc
sync with pokefirered
2020-04-27 19:38:38 -04:00
jiangzhengwenjz
bc0d0caec3 CopyTileMapEntry 2020-04-28 07:29:15 +08:00
jiangzhengwenjz
c7d8d5dae2 fix remainSize type 2020-04-28 07:28:27 +08:00
jiangzhengwenjz
2010ed0f12 librfu issues 2020-04-28 07:25:55 +08:00
DizzyEggg
432ae46570 Fix Acrobatics gem boost 2020-04-27 10:58:35 +02:00
Eduardo Alvaro Quezada D'Ottone
a2cc51ac93
In Gen2 and Gen4 onwards, Razor Wind has a higher Critical Hit chance. (#355) 2020-04-26 20:59:53 +02:00
Sierraffinity
072a98ca9a Document undefined sprite template behavior 2020-04-25 18:25:55 -07:00
Evan
4c231a5d47 Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald into battle_engine 2020-04-25 15:38:13 -06:00
PikalaxALT
a4509d06ef Fix an issue with uninitialized tilemap ptr 2020-04-25 16:54:27 -04:00
MandL27
073218d544
Mind Blown has contest data (#332)
* uncomment mind blown

* more contest moves
2020-04-25 11:22:12 +02:00
DizzyEggg
ee68f0f826 Fix switch-in abilities when shift style switch 2020-04-25 11:17:59 +02:00
PikalaxALT
14f76fbe03 Add tilemap rendering capability to gbagfx 2020-04-24 08:47:22 -04:00
DizzyEggg
738d92e39d Infiltrator affects mist safeguard 2020-04-23 11:29:19 +02:00
Eduardo Alvaro Quezada D'Ottone
d529ac3b60
More Battle config (#352)
* Binding move turns.

* Binding damage.

* Incineratable Gems.

* Flash Fire while frozen.

* Sleep turns.

* Synchronized natures %

* Confusion self damage chance.

* Fixed confused self-damage check
2020-04-23 09:01:28 +02:00
Sierra A
dc126e3016
Merge pull request #1026 from Sierraffinity/master
gbagfx: Check for nullptr for new output path
2020-04-22 17:23:36 -07:00
Sierraffinity
b2d8c6793d gbagfx: Check for nullptr for new output path 2020-04-22 16:53:11 -07:00
Sierra A
dbe48cfb08
Merge pull request #1025 from Sierraffinity/master
gbagfx: Various fixes and improvements
2020-04-22 14:58:03 -07:00