Commit Graph

6060 Commits

Author SHA1 Message Date
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
ghoulslash
5dcbdf08f0
Merge pull request #1323 from ExpoSeed/IE/sync
Sync Item Expansion
2021-01-07 11:46:31 -07:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
GriffinR
dfe03618c7
Merge pull request #1284 from GriffinRichards/deadname
Remove deadnaming, sync BgEvent
2020-12-31 14:35:23 -05:00
GriffinR
ef60edd933 Remove deadnaming, sync BgEvent 2020-12-31 14:27:46 -05:00
GriffinR
0c74e2097f
Merge pull request #1282 from Sierraffinity/master
Change how mon affine transform fix is handled
2020-12-30 21:21:12 -05:00
Sierraffinity
b88922daea Merge branch 'master' of github.com:pret/pokeemerald 2020-12-30 17:37:17 -08:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
GriffinR
e1fd2f2a89
Merge pull request #1280 from Sierraffinity/master
Add fixes for undefined behavior with modern compiler
2020-12-26 22:08:48 -05:00
Sierraffinity
127bb97c0e Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite 2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d Add UBFIX for null deref in sub_80D08CC 2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6 Add UBFIX for null derefs in sub_8088950 2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea Add UBFIX for null deref in CameraObjectReset2 2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower
Label remaining subs in battle_tower.c
2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
GriffinR
4ec5c888b4
Merge pull request #1275 from Kurausukun/berrycrush_nonmatching
[LEAK INFORMED] Correct Berry Crush Structs and Eliminate Non/Fakematchings
2020-12-22 00:16:36 -05:00
Kurausukun
254b4e621c change "filler" to "unk", remove newline 2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8 fix remaining functions, finally matches 2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390 oops 2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6 fix sub_8021A28 2020-12-21 20:24:36 -05:00
Kurausukun
3203bac053 fix struct 2020-12-20 23:15:35 -05:00
Evan
728586de51 make ultranecrozium-z description fit 2020-12-20 16:36:31 -07:00
Kurausukun
14e2898a29 fix structs and some function logic
(currently does not match)
2020-12-20 02:54:33 -05:00
Evan
d500bd4e2f fix zring and ultranecrozium descriptions 2020-12-19 22:17:20 -07:00
Evan
f05249c8da Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-12-19 22:13:37 -07:00
GriffinR
49bdaeb940
Remove redundant modern CFLAGS 2020-12-16 14:10:30 -05:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
2020-12-14 23:22:41 -05:00
Kurausukun
69cfe5ad01 use direction constant 2020-12-14 21:54:19 -05:00
Kurausukun
68b456e7f9 name a2 2020-12-14 21:51:38 -05:00
Kurausukun
266a23b327 fix indentation 2020-12-14 21:44:25 -05:00
Kurausukun
6faa63347a document reuse of variables in link mode 2020-12-14 21:41:30 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
GriffinR
6dea3374d2
Merge pull request #1271 from Sierraffinity/pkmn_affine_anim_bugfix
Add bugfix for Pokémon with affine transforms as part of their entry animation glitching when being sent out/put back in ball
2020-12-13 18:43:55 -05:00
GriffinR
f7a729df30 BUGFIX implies UBFIX 2020-12-13 16:16:48 -05:00
GriffinR
5fa47dc895
Merge pull request #1270 from timgates42/bugfix_typo_redundant
docs: fix simple typo, redunant -> redundant
2020-12-13 08:53:50 -05:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant
There is a small typo in include/constants/battle_frontier.h.

Should read `redundant` rather than `redunant`.
2020-12-13 22:14:50 +11:00
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
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