Commit Graph

5269 Commits

Author SHA1 Message Date
DizzyEggg
887fb1b45c Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-03-13 22:45:51 +01: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
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
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
DizzyEggg
25ab5b2400 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-03-06 11:37:00 +01:00
LOuroboros
0387876c6d
[pokemon_expansion] ABILITIES_COUNT_GEN6 => ABILITIES_COUNT_GEN7 (#300) 2020-03-06 11:37:30 +01: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
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
Diegoisawesome
07da4225c3
Merge pull request #990 from GriffinRichards/fix-librtcdata
Delete asm siirtc data
2020-02-29 21:51:13 -08:00
GriffinR
53724e2b43 Delete asm siirtc data 2020-03-01 00:35:42 -05:00
DizzyEggg
f95a335c0d Merge with master 2020-02-29 10:35:01 +01:00
PikalaxALT
afe081cbba Match MultiplyInvertedPaletteRGBComponents and MultiplyPaletteRGBComponents 2020-02-27 14:00:36 -06:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00
GriffinR
dc3c2b72f2 Clean up move anim doc 2020-02-25 12:54:08 -06:00
GriffinR
68dc68907b Label move anim data 2020-02-25 12:54:08 -06:00
GriffinR
efd53d080c Clean up battle anim C for doc 2020-02-25 12:54:08 -06:00
GriffinR
afa1ae2209 Finish documenting move anim scripts 2020-02-25 12:54:08 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
GriffinR
208057d7ae Document move anims S-Z 2020-02-25 12:54:08 -06:00
GriffinR
0d651c7c9e Some battle anim review changes 2020-02-25 12:54:08 -06:00
GriffinR
1ba12dc050 Document move anims I-S 2020-02-25 12:54:08 -06:00
GriffinR
501d0d3c18 Document move anims C-H 2020-02-25 12:54:08 -06:00
GriffinR
faf0ba8662 Use macro for randomization with ISO value 2020-02-25 12:54:08 -06:00
GriffinR
6eb44dc507 Document move anims A-C 2020-02-25 12:54:08 -06:00
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268)
* Midnight Lycanroc

* Dusk Lycanroc
2020-02-22 23:42:16 +01:00
Diegoisawesome
a85587d8c2
Merge pull request #984 from Diegoisawesome/master
Make aif2pcm looping not dependent on order of MARK and INST chunks
2020-02-19 09:18:16 -08:00
Diegoisawesome
f84ac6d633 Make aif2pcm looping not dependent on order of MARK and INST chunks 2020-02-19 08:51:01 -08:00
PikalaxALT
da7e797236
Merge pull request #982 from jiangzhengwenjz/nonmatching
real match sub_802C838
2020-02-19 08:47:03 -05:00