Commit Graph

6902 Commits

Author SHA1 Message Date
Kurausukun
9b573b283c re-match CreateFrontierBrainPokemon (from #1177) 2020-10-23 21:36:38 -04:00
Kurausukun
a6cb8279f7 re-match DrawResultsTextWindow (from #1177) 2020-10-23 21:29:59 -04:00
Kurausukun
36d7e8c769 re-match TryPutLinkBattleTvShowOnAir (from #1177) 2020-10-23 21:04:28 -04:00
Kurausukun
16cf49ffbe re-match GetTypeEffectivenessPoints (from #1177) 2020-10-23 20:59:27 -04:00
Eduardo Quezada
27a31224aa Fixed mix up. 2020-10-23 21:50:25 -03:00
Eduardo Quezada
d596fa7e12 Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption
# Conflicts:
#	include/battle_util.h
#	include/constants/battle_config.h
#	src/battle_util.c
2020-10-23 21:49:59 -03:00
Kurausukun
90211248af re-match Cmd_unknown_24 (from #1140)
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
2020-10-23 20:47:10 -04:00
MandL27
9c574f3adb Fixed some comparison operators 2020-10-23 19:49:27 -04:00
MandL27
f8dabc37ae Use #if more often
Avoided it on a couple lines to avoid splitting compound ifs.
2020-10-23 12:44:20 -04:00
ExpoSeed
34729ce99c
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs
More Battle Config options
2020-10-23 10:59:12 -05:00
ultima-soul
84c134779a
Merge pull request #521 from AsparagusEduardo/BE-Identation
Fixed indentation for various files.
2020-10-23 08:46:17 -07:00
Eduardo Quezada
d7c5ce3602 Idented battle_script_commands.c comments 2020-10-22 09:33:46 -03:00
Kurausukun
64ba8c8061 port fakematch fixes from #1155 2020-10-22 05:45:53 -04:00
Kurausukun
9c4dddf870 re-match _InitContestMonPixels (from #1153) 2020-10-22 05:37:51 -04:00
Kurausukun
0bca313b41 remove naked asm (oops) 2020-10-22 05:04:35 -04:00
Kurausukun
2945a3a845 re-match GetConnectedChildStrength 2020-10-22 05:03:16 -04:00
Eduardo Quezada D'Ottone
a4bad16b5d
Merge pull request #529 from LOuroboros/badge_boosts
Reincorporated badge based stat boosts
2020-10-21 21:50:46 -03:00
MandL27
37aff56cc7 turns out gen 7 did indeed use a denominator of 5 2020-10-21 16:57:54 -04:00
MandL27
6d5547bdb4 fix indentation 2020-10-21 16:20:49 -04:00
MandL27
efdaa25640 Add B_SCALED_EXP and B_SPLIT_EXP 2020-10-21 16:19:07 -04:00
LOuroboros
00bc6ab96b More review corrections 2020-10-21 16:39:06 -03:00
Thomas Winwood
2239f3aa60 Eliminate goto in ItemUseCB_Medicine 2020-10-21 20:11:40 +01:00
LOuroboros
682d29b088 Removed the static variable from the ShouldGetStatBadgeBoost function 2020-10-21 15:30:20 -03:00
LOuroboros
503134167a Review corrections 2020-10-21 15:01:53 -03:00
LOuroboros
4794c63066 Reincorporated badge based stat boosts 2020-10-21 12:57:57 -03:00
Kurausukun
03f46ff23a re-match battle_anim_water functions (from #1136) 2020-10-21 04:41:57 -04:00
Kurausukun
063596d87b re-match GLYPH_COPY 2020-10-21 04:26:45 -04:00
Kurausukun
5fd555016f re-match battle_anim_flying functions (from #1126) 2020-10-21 04:04:59 -04:00
Kurausukun
eee55c65f6 re-do "match function signatures" (from #1119)
not a matching, but I don't see why we shouldn't do this
2020-10-21 03:45:29 -04:00
Evan
aede11dae4 fix hp boxes reappearing for fainted mons 2020-10-20 20:57:05 -06:00
Eduardo Quezada D'Ottone
c783f789ed
Merge pull request #523 from LOuroboros/eerie_impulse
Fixed Eerie Impulse's animation again
2020-10-20 18:52:36 -03:00
Eduardo Quezada D'Ottone
c880f7dd92
Merge pull request #524 from LOuroboros/electrify
Fixed Electrify's animation again
2020-10-20 18:47:04 -03:00
LOuroboros
22093e75fc Fixed Electrify's animation again
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
2020-10-20 10:30:32 -03:00
LOuroboros
ea54afbdc7 Fixed Eerie Impulse's animation again
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
2020-10-20 10:15:49 -03:00
Eduardo Quezada
1bc38feca5 Fixed indentation for various files. 2020-10-19 18:01:19 -03:00
Eduardo Quezada
d0feac8fe4 Fix comment identation. 2020-10-19 17:48:27 -03:00
Evan
739e5c7fb5 redo hp box visibility toggle 2020-10-19 13:35:59 -06:00
Aaron B-D
b83a87c8e8 Added scripted double wild battles 2020-10-19 14:47:32 -04:00
Eduardo Quezada
5f7c01bd41 Replaced spaces to tabs. 2020-10-19 11:58:19 -03:00
Eduardo Quezada
8f9659f846 Fixed Pika Papow's name. 2020-10-19 11:45:54 -03:00
Kurausukun
c8e832980b re-match CreateWaterPulseRingBubbles 2020-10-19 06:37:00 -04:00
Kurausukun
f0efd11aa9 re-match InitObjectEventStateFromTemplate 2020-10-19 06:19:21 -04:00
Kurausukun
56c3eefd9f re-match RotateAuroraRingColors_Step 2020-10-19 06:15:35 -04:00
Kurausukun
7d5fce9a72 re-remove extra semicolons (from #1104) 2020-10-19 05:58:51 -04:00
GriffinR
585f313c64
Merge pull request #1232 from Kurausukun/match_m4a
[LEAK INFORMED] Match FadeOutBody
2020-10-18 21:41:37 -04:00
Eduardo Quezada
e42a565a84 Adapting move changes (part 3) + fixed Wish being affected by Protect. 2020-10-18 17:53:27 -03:00
Eduardo Quezada
a23e9a8a37 Adapting move changes (part 2) + Hyperspace Fury type. 2020-10-18 12:07:11 -03:00
Eduardo Quezada
3342573881 Updated name of setting. 2020-10-18 11:19:39 -03:00
Eduardo Quezada
30d999bb6f Adapting move changes (part 2) 2020-10-18 11:15:42 -03:00
Eduardo Quezada
2ba2751049 Moved if-else to the top. 2020-10-18 10:26:07 -03:00