ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 05:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,222 Commits 1 Branch 0 Tags 235 MiB
68388f633f
Commit Graph

7222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen 
Document battle factory screen
 2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr 
Minor field_screen_effect / field_player_avatar documentation
 2021-01-03 01:59:36 -05:00
ultima-soul
c2a3c5687b Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:11:47 -08:00
surskitty
a96179a308 Changed Neutralizing Gas. 2021-01-02 17:16:44 -05:00
GriffinR
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc 
Index battle controller cmd tables
 2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2 Label a few flash effect functions 2021-01-01 13:34:25 -05:00
Evan
f172245ad6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem 2021-01-01 08:49:43 -07:00
ExpoSeed
8cfdbaefeb
Merge pull request #1294 from LOuroboros/flower_gift 
Added missing check to Flower Gift (offensive)
 2020-12-31 18:41:50 -06:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit 
Corrected Final Gambit's move data and tweaked its effect
 2020-12-31 18:39:00 -06:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation 
infestation between turn anim
 2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
surskitty
533d9f1c54 Updating move names and ability names. 2020-12-31 18:45:25 -05: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
84fbcc9dd6 Fix modern -> UBFIX macro change 2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
093610b46e Finish factory swap screen doc 2020-12-31 00:26:14 -05:00
amiosi
8d1383f0d5 no text 2020-12-30 23:51:08 -05:00
amiosi
556a863ee3 minimize pr (also text) 2020-12-30 22:56:15 -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
7ae78dc773 Finish factory select screen doc 2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d Index battle controller cmd tables 2020-12-29 17:21:58 -05: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
Evan
59813c9ce7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config 2020-12-23 10:27:54 -07:00
ghoulslash
450ac70ab2
Merge pull request #1288 from LOuroboros/comments 
Some more small battle_config.h tweaks
 2020-12-23 10:27:09 -07:00
LOuroboros
320cc37ac9 USE_BATTLE_DEBUG -> B_ENABLE_DEBUG 2020-12-23 14:04:14 -03:00
LOuroboros
b3c5613ff7 battle_config.h tweaks 
-Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h
-Slight correction to a few comments in battle_config.h
 2020-12-23 13:16:01 -03:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data 
Added the data of SwSh's Crown Tundra's moves
 2020-12-21 23:13:23 -07: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
LOuroboros
3918542b3e Corrections to Final Gambit's effect's battle script 
-Restored the call to resultmessage
-Corrected its behavior against Endured, Focus Banded/Sashed and Sturdy foes
 2020-12-20 21:31:36 -03:00
Kurausukun
14e2898a29 fix structs and some function logic 
(currently does not match)
 2020-12-20 02:54:33 -05:00
LOuroboros
9f2dc914ba Tweaked Final Gambit's effect 
-Made the user faint before the foe like in the official games
-Removed calls to resultmessage and critmessage as those were never needed by this move's effect
 2020-12-19 22:12:17 -03:00
LOuroboros
0aae069db8 Made Fiery Wrath unaffected by King's Rock 2020-12-19 21:11:17 -03:00
LOuroboros
819001c102 Removed redundant check in Punk Rock's effect 2020-12-19 19:15:12 -03:00