Commit graph

6235 commits

Author SHA1 Message Date
Sierra A
7031068641
Update bugs_and_glitches.md 2020-12-12 22:42:29 -08:00
Sierra A
f24307346f
Update bugs_and_glitches.md 2020-12-12 22:42:02 -08:00
Sierra A
56ec5c65a8
Update bugs_and_glitches.md 2020-12-12 22:41:46 -08:00
Sierraffinity
1aca378634 Fix name of SetDexNumberColor 2020-12-12 21:08:15 -08:00
GriffinR
b1197ac2da UBFIX for if_status_not_in_party 2020-12-12 23:57:25 -05:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
Sierraffinity
abef3065d0 Fix affine anim bug with Pokémon going in and out of balls without an intermediate screen transition 2020-12-12 20:29:20 -08:00
Eduardo Quezada D'Ottone
735b9d18d0
Merge pull request #1280 from LOuroboros/abilitiesPE
Reverted include/constants/abilities.h to vanilla
2020-12-12 19:51:52 -03:00
GriffinR
ba3021db64
Merge pull request #1268 from LOuroboros/move_flags
Corrected small inconsistency in move flag names
2020-12-12 11:14:48 -05:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
Michael Panzlaff
eaff64e223 remove trailing spaces 2020-12-12 13:19:08 +01:00
Michael Panzlaff
91ccf9e343 fix typo 2020-12-12 13:07:56 +01:00
GriffinR
52b7576a5e
Merge pull request #1266 from Kurausukun/asmdiff
improve asmdiff.sh
2020-12-11 21:33:29 -05:00
GriffinR
25282fbaa8
Merge pull request #1264 from ExpoSeed/patch-2
Fix incorrect bug description
2020-12-11 21:23:48 -05:00
Michael Panzlaff
f177c736fc more CgbSound decipher work 2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5 use better m4a variable/constant names 2020-12-11 16:33:55 +01:00
Kurausukun
54acea6083 improve asmdiff.sh 2020-12-11 00:32:12 -05:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
LOuroboros
8b5a5a1896 Reverted include/constants/abilities.h to vanilla
With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.
2020-12-10 16:38:29 -03:00
ExpoSeed
76e40fe2dd
Fix incorrect bug description 2020-12-09 16:45:27 -06:00
GriffinR
628ade247b
Merge pull request #1263 from GriffinRichards/unown-constants
Define terminal species IDs relatively
2020-12-08 01:47:00 -05:00
GriffinR
f95192ed87 Define terminal species IDs relatively 2020-12-08 00:45:05 -05:00
Jaizu
8b46a3b305
Change Pidgey front animation 2020-12-07 12:07:50 +01:00
Eduardo Quezada D'Ottone
f9978f2a5a
Merge pull request #1267 from LOuroboros/patch-1
Updated abilities.h
2020-12-06 13:50:32 -03:00
LOuroboros
ce8f794100
Updated abilities.h
Straight up copied from the BE to avoid silly merge conflicts.
2020-12-05 14:57:13 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags
Add mon flags
2020-12-03 15:07:17 -05:00
GriffinR
c76aaa2aa4
Merge pull request #1259 from GriffinRichards/fix-backpicindex
Designated initializers for gTrainerBackPicTable
2020-12-01 16:26:42 -05:00
GriffinR
076b2c2edc Designated initializers for gTrainerBackPicTable 2020-11-30 15:32:08 -05:00
ExpoSeed
7b4806c85e
Merge pull request #1249 from LOuroboros/patch-1
A few evolution updates
2020-11-28 20:26:45 -06:00
GriffinR
571c5988ec
Merge pull request #1257 from Kurausukun/menu_nonmatching
[LEAK INFORMED] match sub_819A080
2020-11-27 11:10:03 -05:00
GriffinR
7b1fee3239
Merge pull request #1258 from V-FEXrt/master
Rename graphics files for COOLTRAINER to match define
2020-11-27 10:57:18 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
Kurausukun
54becd2303
whitespace 2020-11-26 01:35:08 -05:00
Kurausukun
94cbd3ff1b [LEAK INFORMED] match sub_819A080 2020-11-26 01:30:59 -05:00
LOuroboros
1083130125 Another one
Made Crabrawler evolve in the Ice Room of the Shoal Cave too.
2020-11-25 10:42:57 -03:00
ExpoSeed
f2259d7ce1 Remove IS_ULTRA_BEAST 2020-11-24 22:44:00 -06:00
ExpoSeed
3adf316574 Add mon flags 2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e A few more evo related changes.
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
2020-11-25 01:15:19 -03:00
LOuroboros
d817950fb6 Readded the EVO_MAP based Eevee->Leafeon and Eevee->Glaceon evos 2020-11-24 23:49:18 -03:00
LOuroboros
89f6036e77 Bumped EVOS_PER_MON from 8 to 10 2020-11-24 23:47:07 -03: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
LOuroboros
210cfabe4c Another one
In SwSh, Magneton can evolve with a Thunder Stone just like Charjabug
2020-11-23 11:02:23 -03:00
LOuroboros
e6f44328a1 Commented out parameters 2020-11-23 10:49:32 -03:00
LOuroboros
bb75b1ad17
A few evolution updates
- Changed the Eevee->Leafeon evo method from EVO_MAP to EVO_ITEM, which is more accurate in comparison as of Gen. 8 since we still don't have the actual evo method implemented.
- Changed the Eevee->Glaceon evo method for the same reason.
- Added Vikavolt's Thunder Stone based evolution as a second option.
2020-11-23 10:45:00 -03: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