ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,826 Commits 1 Branch 0 Tags 235 MiB
9e8913c698
Commit Graph

4711 Commits

Author SHA1 Message Date
PikalaxALT
c70c44fa48 Simplify RAM reset adaptation for modern 2020-11-06 12:29:40 -05:00
GriffinR
1220f0655c Revert to original battle factory gcc 10 fix 2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a Fix typo 2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735 Condense fix for battle factory on gcc 10 2020-11-04 16:43:59 -05:00
GriffinR
c59a818462 Fix battle factory on gcc 10 2020-11-04 15:35:22 -05:00
Evan
b3d1e8b5b8 turn crit capture odds into a ratio 2020-11-03 08:57:11 -07:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts 
Undo PokeCodec's PRs and port changes
 2020-11-03 09:28:45 -05:00
aaaaaa123456789
ca950a8daf Solve merge conflicts from previous commit 2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts 2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05:00
Evan
e7372e7c5b add B_ prefix to critical capture configs 2020-11-01 21:50:34 -07:00
Evan
a6c3d950f6 critical capture config option and catching charm 2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone
3af9a65506
Fix ability description strings (#553) from ghoulslash 2020-11-01 19:45:51 -03:00
Eduardo Quezada D'Ottone
5a201f006f
More exp options in battle_config (#530) from MandL27 2020-11-01 19:41:29 -03:00
Evan
6c39977a8d HGSS supereffective change 2020-11-01 15:16:51 -07:00
MandL27
5c6b8376fc long equations on one line 2020-11-01 11:45:01 -05:00
Evan
9ad9dbff9f fix ability descriptions 2020-11-01 09:22:28 -07:00
ExpoSeed
1b65e1a1f0
Merge pull request #520 from ghoulslash/battle_engine 
Add Toggle Healthbox Visibility Feature
 2020-10-31 23:07:39 -05:00
GriffinR
9e55ae22b1
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons 
Use constants for menu info icon table
 2020-10-29 23:50:43 -04:00
GriffinR
be1685c87f Use constants for menu info icon table 2020-10-29 16:34:33 -04:00
aaaaaa123456789
9794b077b5
Update src/digit_obj_util.c 
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
 2020-10-26 19:14:08 -03:00
aaaaaa123456789
bcbd05e151 Fix whitespace issues 2020-10-26 15:52:44 -03:00
aaaaaa123456789
4bbc14ecdd
Remove unused variable 
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
 2020-10-26 15:51:10 -03:00
aaaaaa123456789
00db69a302 Port back improvements from later commits 2020-10-26 12:31:07 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation 
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
 2020-10-26 05:52:00 -04:00
Kurausukun
539fd463c8 port MovementAction_StoreAndLockAnim_Step0 fix 2020-10-26 03:46:08 -04:00
Kurausukun
43701c3860 port PrintMonWeight fakematch fix 2020-10-26 00:49:57 -04:00
Kurausukun
b2b363159f port sub_80C6104 fakematch fix 2020-10-26 00:46:01 -04:00
Kurausukun
072797844a port TrendyPhraseIdOld fakematch fix 2020-10-26 00:29:55 -04:00
Kurausukun
e8fd0bd2c3 port InitPaintingMonOamData fakematch fix 2020-10-26 00:26:15 -04:00
Kurausukun
9e033fa554 port BerryCrushCommand_BeginNormalPaletteFade fix 2020-10-26 00:22:56 -04:00
Kurausukun
9ca406b15d port Cmd_forcerandomswitch fakematch fix 2020-10-26 00:17:26 -04:00
Kurausukun
af0a1cb7bf port ReceiveDaycareMailData fakematch fix 2020-10-26 00:10:30 -04:00
Kurausukun
9d067dfe0d port sub_8181C2C fakematching fix 2020-10-26 00:06:19 -04:00
Kurausukun
83846b913a port sub_806F160 fakematch fix 2020-10-26 00:01:53 -04:00
Kurausukun
4c10f3f465 port GetFrontierOpponentClass fakematch fix 2020-10-25 23:55:38 -04:00
Kurausukun
c7d624edeb re-match sub_81D5F58 2020-10-25 23:52:39 -04:00
Kurausukun
077a2c23dc port HasNoMonsToSwitch fakematch fix (from #1181) 2020-10-25 23:45:42 -04:00
Kurausukun
193e601c2c port Phase2_FrontierLogoWave_Func4 fix 2020-10-25 23:42:50 -04:00
Kurausukun
b2100cb480 port ModifyStatByNature fakematch fix (from #1179) 2020-10-25 23:23:40 -04:00
Kurausukun
9c9b626ccb re-match CheckBagHasSpace (from #1179) 2020-10-25 23:19:56 -04:00
Eduardo Quezada
cb53c91b07 rip 2020-10-25 22:36:18 -03:00
Eduardo Quezada
ae60ae8a2d Review changes. 2020-10-24 03:07:45 -03:00
MandL27
bc5ba41f80 Document sExperienceScalingFactors 2020-10-24 02:02:58 -04:00
Eduardo Quezada
b5834b617d Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves 
# Conflicts:
#	src/data/text/move_descriptions.h
 2020-10-24 00:36:29 -03:00
Kurausukun
af04d99cd9 port fix for UpdateSaveAddresses (from #1177) 2020-10-23 22:12:09 -04:00
Kurausukun
44c2d15ca9 re-match sub_81C79BC (from #1177) 
also re-define RBG macros
 2020-10-23 22:07:30 -04:00
Kurausukun
627853a2bf re-match SetSearchRectHighlight (from #1177) 2020-10-23 21:59:15 -04:00
Kurausukun
a1d69ae264 re-match sub_81BF2B8 (from $1177) 2020-10-23 21:51:46 -04:00
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
MandL27
37aff56cc7 turns out gen 7 did indeed use a denominator of 5 2020-10-21 16:57:54 -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
1bc38feca5 Fixed indentation for various files. 2020-10-19 18:01:19 -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
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
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
Eduardo Quezada
09401f0620 Fixed repeated fields. 2020-10-17 23:27:55 -03:00
Eduardo Quezada
b1903af8c1 Adapting move changes (part 1) 2020-10-17 23:08:39 -03:00
Eduardo Quezada
faca6c4867 Organized interface settings into their own category. 2020-10-17 14:31:58 -03:00
Eduardo Quezada
815b525855 Configurable double wild battle chance, surfing double battles and flag for forcing them. 2020-10-17 14:25:43 -03:00
Kurausukun
aedfe27f8d
Remove newline 2020-10-16 17:16:25 -04:00
Kurausukun
bf03f1154f formatting 2020-10-16 16:57:41 -04:00
Kurausukun
c31c2d93d7 [LEAK INFORMED] match FadeOutBody 2020-10-16 16:55:29 -04:00
Evan
bd26919acc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-10-15 18:25:21 -06:00