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
6,073 Commits 1 Branch 0 Tags 235 MiB
9b1a482837
Commit Graph

4080 Commits

Author SHA1 Message Date
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05:00
GriffinR
571c5988ec
Merge pull request #1257 from Kurausukun/menu_nonmatching 
[LEAK INFORMED] match sub_819A080
 2020-11-27 11:10:03 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
Kurausukun
54becd2303
whitespace 2020-11-26 01:35:08 -05:00
Kurausukun
94cbd3ff1b [LEAK INFORMED] match sub_819A080 2020-11-26 01:30:59 -05:00
ExpoSeed
a158d6138c Removed IS_ULTRA_BEAST in favor of mon flag 2020-11-24 22:47:27 -06:00
GriffinR
9d056e8656 Move object event pal declarations to graphics 2020-11-23 14:45:16 -05:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
GriffinR
0aa06c307b
Merge pull request #1251 from ExpoSeed/patch-1 
Document bugged IV inheritance difference
 2020-11-17 14:25:36 -05:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code 2020-11-17 17:40:26 +01:00
LOuroboros
cad5b57b42
sanityIsBagEgg -> sanityIsBadEgg 
Fixed a typo.

Lunos#4026
 2020-11-16 15:36:38 -03:00
ExpoSeed
e5f043ff72
Fix grammar 2020-11-15 16:28:09 -06:00
ExpoSeed
3f157b5293
Document bugged IV inheritance difference 2020-11-15 16:24:19 -06:00
Eduardo Quezada D'Ottone
6f29abbe0e
Plate type data and hold effect #1207 from ExpoSeed 2020-11-09 15:24:13 -03:00
Eduardo Quezada D'Ottone
4a17d62ecd Fixed gen 3 fossil config 2020-11-08 20:27:46 -03:00
Eduardo Quezada D'Ottone
2e01654eb9 Plate type data and hold effect. 2020-11-08 01:47:05 -06:00
luckytyphlosion
4b748d32cc Bugfix for ChooseMoveOrAction_Doubles. 2020-11-07 18:21:17 -05:00
Eduardo Quezada D'Ottone
8d86169283 Merge remote-tracking branch 'pret/master' into IE-pretSync 2020-11-07 14:54:52 -03:00
GriffinR
8b1c2c946b
Merge pull request #1247 from PidgeyALT/attemptcountfix 
use constants for ball throw count
 2020-11-06 15:41:25 -05:00
PikalaxALT
75b12b86dc
Merge pull request #1246 from PikalaxALT/simplify_ram_reset 
Simplify RAM reset adaptation for modern
 2020-11-06 15:00:40 -05:00
MCboy
e31158d017 add spaces around - and remove comment from include in battle.h 2020-11-06 23:29:52 +03:30
MCboy
3b91735e63 use constants for ball throw count 2020-11-06 22:59:46 +03:30
PikalaxALT
3112cf5726 swi --> svc 2020-11-06 12:34:57 -05:00
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
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
ExpoSeed
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config 
Item Expansion config file.
 2020-11-02 11:31:51 -06:00
Eduardo Quezada D'Ottone
6c04aadff8 Going to bed now 2020-11-02 00:31:04 -03:00
Eduardo Quezada D'Ottone
28dc577a73 Review changes. 2020-11-02 00:24:19 -03: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
4aa6442cd4 Fixed price mixed up. 2020-10-25 01:28:14 -03:00
Eduardo Quezada
9eeb574ad1 Fixed Escape Rope using bug. Thanks ExpoSeed! 2020-10-25 01:08:27 -03:00
LOuroboros
c2502b0bf5 Review corrections 2020-10-24 15:44:40 -03:00
LOuroboros
c2f278bde3 Corrections to various items 
-Fixed the Honey's sprite thanks to Blackforest
-Corrected many items' descriptions (with feedback from the bois at RHH's Discord server)
-Added missing items data
 2020-10-24 09:41:19 -03:00
LOuroboros
15345fb401 Fixed the Honey's sprite and description 2020-10-24 06:26:30 -03:00
Eduardo Quezada
14f3d69c83 Beast ball effect. 2020-10-23 23:43:07 -03:00
Eduardo Quezada
3a3ef1a369 Reworked Heavy Ball 2020-10-23 23:12:22 -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
Eduardo Quezada
e861abeff3 Initial review changes. 2020-10-23 22:19:37 -03: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
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
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
Thomas Winwood
2239f3aa60 Eliminate goto in ItemUseCB_Medicine 2020-10-21 20:11:40 +01: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
f7c3b3e246 reformat oval charm description 2020-10-19 16:07:04 -06:00
Evan
d64b926469 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-10-19 11:22:41 -06: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
12bc93dc78 Review changes 2020-10-17 17:07:54 -03:00
Eduardo Quezada
0717783651 Dream ball config. 2020-10-17 02:51:08 -03:00
Eduardo Quezada
e320e6f7ff Quick Ball config. 2020-10-17 02:44:09 -03:00
Eduardo Quezada
6f246bb0c7 Dusk Ball config 2020-10-17 02:41:02 -03:00
Eduardo Quezada
ce3b877666 Dive Ball config. 2020-10-17 02:33:15 -03:00
Eduardo Quezada
14c243b273 Timer ball config. 2020-10-17 02:08:58 -03:00
Eduardo Quezada
32a2f91ecb Repeat Ball modifier in config. 2020-10-17 02:04:39 -03:00