Commit Graph

6060 Commits

Author SHA1 Message Date
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
ExpoSeed
76e40fe2dd
Fix incorrect bug description 2020-12-09 16:45:27 -06:00
Evan
a0ae0ece53 add ultranecrozium-z and update z crystal data 2020-12-08 09:55:50 -07: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
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
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
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05: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
ExpoSeed
a158d6138c Removed IS_ULTRA_BEAST in favor of mon flag 2020-11-24 22:47:27 -06: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
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
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
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
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
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
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
Eduardo Quezada D'Ottone
8d86169283 Merge remote-tracking branch 'pret/master' into IE-pretSync 2020-11-07 14:54:52 -03:00