Commit Graph

5291 Commits

Author SHA1 Message Date
DizzyEggg
1ee15997b7
Update hold_effects.h 2020-07-01 09:39:56 +02:00
DizzyEggg
8fac888121
Merge pull request #443 from AsparagusEduardo/EvioliteDesc
Fixed Eviolite description.
2020-06-22 10:02:35 +02:00
Eduardo Quezada
0be261cc74 Fixed Eviolite description. 2020-06-21 04:25:08 -04:00
LOuroboros
705743a10e
Fix the secondaryId of the Ice and Fighting Gems (#382)
Addresses #378
2020-05-24 10:18:07 +02:00
DizzyEggg
f86282f423 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-29 08:47:51 +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
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
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
Sierraffinity
21e9ed6615 gbagfx: Various fixes and improvements
Fix num_colors exceeding amount of colors in palette leading to use of uninitialized colors

Handle png -> pal conversion (aka extracting JASC palettes from png

Allow using only file extension as output to reuse entire path from input before extension
2020-04-22 14:39:20 -07:00
LOuroboros
32bb717bf1
Implemented missing TMs/HMs type palettes (#327)
* Implemented palettes for Bug type and Fairy type TMs/HMs thanks to Ghoulslash

* Actually added the Bug and Fairy type TM/HM sprite palettes now
2020-04-16 09:27:13 +02:00
Diegoisawesome
922a8de78d
Merge pull request #1016 from PlatinumMaster/master
Split voicegroups and cry tables properly.
2020-04-15 12:52:43 -07:00
PlatinumMaster
3ff8b0cb5c Remove debug sound check. 2020-04-15 14:19:46 -04:00
PlatinumMaster
1b696e8119 Finalized pull request. 2020-04-15 13:35:12 -04:00
PlatinumMaster
da34eedd9b Keep up to date with master. 2020-04-15 13:33:06 -04:00
AsparagusEduardo
6eefcb1f82 Using sandstorm weather constant for Sand Veil encounter rate. 2020-04-15 07:40:39 -05:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
PikalaxALT
a12de6e480
Merge pull request #1022 from GriffinRichards/doc-gcn
Label GCN link flags field
2020-04-14 15:54:34 -04:00
PikalaxALT
c21175d6b8
Merge pull request #1023 from GriffinRichards/fix-decor
Misc decoration gfx fixes
2020-04-14 15:16:42 -04:00
GriffinR
8d3b7bd0b1 Use metatile labels for decor gfx 2020-04-13 14:43:50 -04:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
GriffinR
0ffe63a23b Fix decor png dimensions 2020-04-13 12:58:48 -04:00
GriffinR
dde4a0416c Label GCN link flags field 2020-04-13 08:42:31 -04:00
PikalaxALT
8a31778733
Merge pull request #1021 from Brainface1/master
Named some bike-related functions
2020-04-12 13:30:04 -04:00
PikalaxALT
ee1744865e
Merge pull request #1014 from GriffinRichards/fix-png
Re-export tileset anim pngs to use palettes
2020-04-12 13:29:50 -04:00
GriffinR
715e0d7f64 Fix indentation in graphics_file_rules.mk 2020-04-12 13:13:02 -04:00
GriffinR
d478156ad9 Split stormy_water png for kyogre/groudon 2020-04-12 13:04:05 -04:00
brain_face
9abda59bd1 Renamed sub_808C1B4 -> PlayerUseAcroBikeOnBumpySlope 2020-04-12 16:22:03 +02:00
brain_face
007a038031 Renamed sub_808B9D4 -> PlayerEndWheelieWhileMoving 2020-04-12 15:43:45 +02:00
brain_face
ce2fe10bec Renamed sub_808B9A4 -> PlayerPopWheelieWhileMoving 2020-04-12 15:35:38 +02:00
brain_face
1be48a61c1 Renamed sub_808B9BC -> PlayerWheelieMove 2020-04-12 15:31:11 +02:00
brain_face
1472a3a7d4 Renamed sub_808B980 -> PlayerWheelieInPlace 2020-04-12 14:38:18 +02:00
PikalaxALT
7eaabab3f0
Merge pull request #1020 from GriffinRichards/doc-unkanim
Give partial labels to unknown anims
2020-04-10 14:07:23 -04:00
PikalaxALT
c08b4ff3e1
Merge pull request #1019 from GriffinRichards/constants-party
Add misc party constant usage
2020-04-10 14:05:35 -04:00
PikalaxALT
8188615db8
Merge pull request #1018 from GriffinRichards/sync-util
Sync link game util files
2020-04-10 14:02:53 -04:00
PikalaxALT
384a7cdef8
Merge pull request #1011 from GriffinRichards/doc-avflag
Minor player avatar doc
2020-04-10 13:56:52 -04:00
PikalaxALT
6133c6b0af
Merge pull request #1006 from AsparagusEduardo/UsingBattleAction
Using Battle Action constants
2020-04-10 13:56:25 -04:00
GriffinR
2615a6838e Label unknown anims 2020-04-09 19:24:47 -04:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
GriffinR
e485857df3 Sync minigame_countdown 2020-04-08 17:23:32 -04:00
GriffinR
8853588af0 Sync digit_obj_util 2020-04-08 16:27:11 -04:00