Commit Graph

5207 Commits

Author SHA1 Message Date
GriffinR 097ddb0677 Re-export tileset anim pngs to use palettes 2020-04-02 11:18:47 -04:00
PikalaxALT 22fa4cb178 Merge pull request #1012 from jiangzhengwenjz/nonmatching
resolve some naked functions
2020-04-02 09:52:03 -04:00
jiangzhengwenjz afdcb69bf4 better matching approach than upstream 2020-04-02 20:30:31 +08:00
jiangzhengwenjz 61b7b45084 Merge branch 'master' of https://github.com/pret/pokeemerald into nonmatching 2020-04-02 20:26:16 +08:00
PikalaxALT 3a0a4385f6 Merge pull request #1013 from Sewef/patch-2
Two pokedex matching
2020-04-02 07:46:37 -04:00
Sewef 1c895bb8d0 Match HighlightSubmenuScreenSelectBarItem 2020-04-02 13:17:33 +02:00
Sewef 096e57f56c Match HighlightScreenSelectBarItem 2020-04-02 13:11:18 +02:00
jiangzhengwenjz 0fe5ff34dc Pokeblock_BufferEnhancedStatText 2020-04-02 13:53:53 +08:00
jiangzhengwenjz cd60736e36 PrintMonWeight 2020-04-02 12:15:03 +08:00
jiangzhengwenjz 69f6d2afad HighlightSubmenuScreenSelectBarItem 2020-04-02 01:03:44 +08:00
jiangzhengwenjz 3d2c42adfe HighlightScreenSelectBarItem 2020-04-02 01:03:25 +08:00
GriffinR 487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
PikalaxALT f1cccc975b Merge pull request #1009 from Sewef/patch-1
Fix 'AnimMovmentWaves' typo
2020-03-27 09:52:31 -04:00
Sewef 685f120b5e Fix 'AnimMovmentWaves' typo 2020-03-27 14:50:15 +01:00
PikalaxALT c2d95be156 Merge pull request #1007 from GriffinRichards/fix-healloc
Revert more porymap-breaking changes from #968
2020-03-19 16:30:45 -04:00
GriffinR 8e4b987699 Revert more porymap-breaking changes 2020-03-18 03:22:07 -04:00
AsparagusEduardo f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
PikalaxALT 33ecfb46e4 Merge pull request #1005 from GriffinRichards/fix-rme
Revert city_zoom_tiles.png name
2020-03-17 12:39:08 -04:00
GriffinR ab87c90998 Revert city_zoom_tiles.png name 2020-03-17 12:08:05 -04:00
PikalaxALT 39da49495d Merge pull request #1000 from GriffinRichards/doc-dex
Document pokedex.c
2020-03-17 10:43:57 -04:00
PikalaxALT 784e29352d Merge pull request #985 from mrgriffin/decoration
Document decoration.c
2020-03-17 10:39:37 -04:00
PikalaxALT 7a059c75a6 Merge pull request #968 from GriffinRichards/doc-regionmap
Document some pokenav and region map
2020-03-17 10:38:20 -04:00
Diegoisawesome 20d28ee18b Merge pull request #1003 from garakmon/move-fonts
move fonts from data/graphics/ to graphics/
2020-03-12 10:47:55 -07:00
garakmon b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04:00
AsparagusEduardo c73fdb8954 Restored some tItemCount instances as requested. 2020-03-10 17:46:26 -05:00
AsparagusEduardo 130929a7a4 Slight item_menu.c documentation 2020-03-10 17:46:26 -05:00
AsparagusEduardo 97096aab07 Applied review changes 2020-03-10 17:45:29 -05:00
AsparagusEduardo 1b9a01798e monMarks 2020-03-10 17:45:29 -05:00
AsparagusEduardo fdf1faa563 SetMonIconTransparency 2020-03-10 17:45:29 -05:00
AsparagusEduardo 1159180a25 sMovingItemId 2020-03-10 17:45:29 -05:00
AsparagusEduardo f9725affd0 MODE_2 renamed to MODE_MOVING 2020-03-10 17:45:29 -05:00
GriffinR a495379ff0 Document pokedex cry screen 2020-03-10 14:02:03 -04:00
PikalaxALT 08bced2cbb Merge pull request #999 from ProjectRevoTPP/patch-1
Fix the source of pain and suffering for the last 2 years.
2020-03-09 16:28:27 -04:00
GriffinR 31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
Revo 295e1d2c2e Fix the source of pain and suffering for the last 2 years.
Why wasn't this fixed yet. This is dumb. This is really dumb. This is fuckin' stupid.
2020-03-09 16:20:53 -04:00
Eduardo Quezada f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
PikalaxALT c805c4cc6f Merge pull request #995 from AsparagusEduardo/Ignore-mGBA-savestate
Ignores mGBA's first savestate file.
2020-03-06 13:11:50 -05:00
Martin Griffin 4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00
Eduardo Quezada 84f1d0a89a Changed to ignore all mGBA's savestates. 2020-03-06 01:28:11 -03:00
Eduardo Quezada ce2d4dadf9 Ignores mGBA's first savestate file. 2020-03-05 23:14:54 -03:00
PikalaxALT b3244301b7 Merge pull request #994 from jiangzhengwenjz/nonmatching
real match sub_8021A28
2020-03-05 18:14:08 -05:00
jiangzhengwenjz 93f0bff49c sub_8021A28 2020-03-06 07:01:12 +08:00
PikalaxALT e26293448c Merge pull request #993 from jiangzhengwenjz/nonmatching
real match sub_8027E30
2020-03-05 16:39:00 -05:00
jiangzhengwenjz 69aff34afd sub_8027E30 2020-03-06 05:31:27 +08:00
GriffinR 8e1e09562e Use array count for InitBgsFromTemplates 2020-03-03 22:46:48 -05:00
PikalaxALT 32520c80e9 Celebratory change to calcrom.pl 2020-03-03 16:29:57 -05:00
PikalaxALT 9259b378ef Merge pull request #991 from GriffinRichards/fix-eventticket
Clarify event ticket flag names
2020-03-03 16:15:27 -05:00
PikalaxALT 0eae6d0d07 Merge pull request #992 from GriffinRichards/fix-trainerbattle
Minor fixes in trainer_battle.inc
2020-03-03 15:56:28 -05:00
GriffinR b6c9ad505d Minor fixes in trainer_battle.inc 2020-03-03 14:47:14 -05:00
GriffinR 4637085390 Clarify event ticket flag names 2020-03-03 01:36:20 -05:00