Commit Graph

5803 Commits

Author SHA1 Message Date
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
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
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 fbff087e9a Merge pull request #1238 from ketsuban/master
Eliminate goto in ItemUseCB_Medicine
2020-10-29 23:50:17 -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
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
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