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,829 Commits 1 Branch 0 Tags 235 MiB
15a587f4e9
Commit Graph

4712 Commits

Author SHA1 Message Date
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
Eduardo Alvaro Quezada D'Ottone
1df696c1fb
Merge pull request #17 from LOuroboros/move_updates 
Updated many moves' data to Gen. 8 standards
 2020-10-15 20:56:58 -03:00
Eduardo Quezada
a6e88b82ee Review changes and option to hide split icon. 2020-10-15 20:15:44 -03:00
Eduardo Alvaro Quezada D'Ottone
e5ad36f643
Merge pull request #25 from Pyredrid/2v1_multibattle_fix 
2v1 multibattle fix
 2020-10-15 16:09:18 -03:00
ExpoSeed
beb19380ce
Merge pull request #21 from LOuroboros/power_items_rhh_be 
Implemented the main effect of the Power Items
 2020-10-15 10:02:06 -05:00
Aaron B-D
29b72700df Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2v1_multibattle_fix 2020-10-15 10:18:54 -04:00
LOuroboros
2578a440a1 Implemented the effects of the Power Items 
For more info: https://bulbapedia.bulbagarden.net/wiki/Power_item
 2020-10-15 05:21:28 -03:00
LOuroboros
e4635525e7 Renamed the HOLD_EFFECT_EV_BOOST label 2020-10-15 04:52:03 -03:00
LOuroboros
1635585e68
Removed duplicate inclusion of battle_config.h 
## Description
I think the title is self-explanatory, but the header file that is `include/constants/battle_config.h` is included twice unnecessarily.

## **Discord contact info**
Lunos#4026

As usual, if there's anything wrong please let me know.
 2020-10-15 02:59:48 -03:00
Eduardo Quezada
0d39b29691 Option to use Gen 3 Physical/Special split. 2020-10-15 00:16:50 -03:00
Eduardo Quezada
47259092e3 LGPE & Isle of Armor move data. 2020-10-14 21:50:22 -03:00
Evan
c9504ca749 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-10-13 11:34:41 -06:00
ExpoSeed
d4e58d9746 Fix style, sync moved functions properly 2020-10-13 09:40:01 -05:00
ExpoSeed
88b9847772 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2 2020-10-12 12:42:37 -05:00
GriffinR
17a77c9018
Merge pull request #1229 from ghoulslash/document 
start pokenav documentation
 2020-10-11 11:59:40 -04:00
Evan
280c68b531 renamed pokenav graphics file fixes 2020-10-11 09:11:12 -06:00
Evan
f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files 2020-10-11 08:50:58 -06:00
kageru
52ebc4252e
Document gUnknown_03006298 2020-10-11 09:54:49 +02:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
Evan
2b2be90a52 start pokenav documentation 2020-10-10 16:17:34 -06:00
Evan
5ab17cc713 Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald into battle_engine 2020-10-09 09:13:17 -06:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
Michael Panzlaff
187c96d6e5 rewrite MultiBootWaitCycles as naked function 
Before, when compiling MultiBootWaitCycles with O3 and MODERN=1, you
might have run into problems during optimizations when the compiler tried
to optimize the function, even if declared NOINLINE.

When rewriting this function as NAKED function, this no longer happens
as the optimizer will treat it as black box and compilation will resume.
 2020-10-02 12:27:16 +02:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Aaron B-D
c4d83f0640 Fixed 2v1 Multi battles stalling indefinitely at the battle's intro 
Fixes Issue #492
 2020-09-25 17:40:38 -04:00
GriffinR
66bd1e6d3f Use constants for item digits 2020-09-25 11:18:52 -04:00
tustin2121
be9100fe52 Review changes 2020-09-20 13:04:20 -04:00
tustin2121
832be34898 More documenting trainer hill 
- Renamed members and added comments in the TrHillDisplay struct.
- Formatted the trainer hill data to better match the metatile layout its representing.
- Documented the function which uses this data.
 2020-09-20 01:50:54 -04:00
tustin2121
0d3646c0b9 Trainer hill location data 
Changed the trainer hill data for trainer locations, directions, and ranges from vague unusable numbers into readable data via use of preprocessor macros.
 2020-09-20 01:09:22 -04:00
GriffinR
0b592228c5
Merge pull request #1186 from kiliwily/DocSomeBugs 
Document some bugs
 2020-09-19 18:09:49 -04:00
kiliwily
f1366dfc69 Fix typos 2020-09-19 20:46:26 +02:00
kiliwily
56848fb891 Update battle_util.c 2020-09-19 20:44:16 +02:00
MeatLoaf3
0e74de0f9e
Changed casts to volatile 
devkitArm wouldn't copy the bits properly in some instances. Casting as volatile solved the issue
 2020-09-18 13:26:36 -04:00
ExpoSeed
227d2dce32 Make description slightly more precise 2020-09-16 12:51:14 -05:00
ExpoSeed
778e6925de Complete TMHM Learnset description 2020-09-16 12:36:11 -05:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
kiliwily
9b4ded46c6 Update pokemon.c 2020-09-12 19:20:42 +02:00
kiliwily
5c3669e0cd Bug documenting 2020-09-12 18:43:20 +02:00
GriffinR
921f389e4e Fix Rusboro and Lavarige typos 2020-09-11 14:47:47 -04:00
PokeCodec
c1286c2fe2 Change according to feedback 2020-09-10 18:07:46 -04:00
PokeCodec
87769756f8 spacing 2020-09-10 10:26:55 -04:00
PokeCodec
6967b234d4 adjustments and fakematch fix 2020-09-10 10:07:16 -04:00
PokeCodec
029db24adb Make return 2020-09-10 09:32:36 -04:00
PokeCodec
eb25b951c3 InitPaintingMonOamData fix 2020-09-10 09:14:53 -04:00
PokeCodec
50a6b73edc Fix sub_80C6104 2020-09-10 09:02:04 -04:00
PokeCodec
08696108e1 Match dewford 2020-09-09 17:02:52 -04:00
PokeCodec
f50ecf5c66 Match PrintMonWeight 2020-09-09 16:35:04 -04:00
PokeCodec
7f1827767c Document size field of unknown struct 2020-09-09 16:09:31 -04:00
PokeCodec
a32f631fe6 Fix Pokemon Fakematch 2020-09-09 15:59:34 -04:00
PokeCodec
84a92279c9 Record mixing fakematch fixed! 2020-09-09 15:49:51 -04:00
PokeCodec
dc34cf1711 Mail Time 2020-09-09 15:09:40 -04:00
PokeCodec
56afdee7fc Remove register variable mention 2020-09-09 14:43:41 -04:00
PokeCodec
aa45c05a3e Match Battle Tower 2020-09-09 11:21:16 -04:00
PokeCodec
a3a8c23e00 Match battle_script commands 2020-09-09 11:18:04 -04:00
PokeCodec
3af118b0a7 Fix fakematch in pokemon animation 2020-09-09 11:12:12 -04:00
PokeCodec
779764b70d Fix Battle_Script_commands fakematch 2020-09-09 10:35:40 -04:00
PokeCodec
f980188b82 Fix battle transition fakematch 2020-09-08 20:54:41 -04:00
PokeCodec
34f54dd438 Fix Battle util fakematch 2020-09-08 20:46:08 -04:00
PokeCodec
6e3f5a462a Remove fakematch in trainer hell 2020-09-08 20:25:07 -04:00
PokeCodec
bb5da949f2 Fix build 2020-09-08 19:44:33 -04:00
PokeCodec
6bb1d58a11 Finished header includes 2020-09-08 19:17:33 -04:00
PokeCodec
e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -04:00
PokeCodec
4d31980359 Undo comment 2020-09-08 16:25:09 -04:00
PokeCodec
3336eb341d More adjustments 2020-09-08 14:26:37 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
LOuroboros
9e6ae57f9f Updated some more moves' data to Gen. 8 standards 2020-09-07 15:28:15 -03:00
PokeCodec
5f7a410359 Preparation for matching BattleIntroOpponent1SendsOutMonAnimation 2020-09-06 20:01:16 -04:00
PokeCodec
8200682b21 u8 position 2020-09-06 19:02:30 -04:00
PokeCodec
e6684664ba Fix casting bug 2020-09-06 15:16:40 -04:00
PokeCodec
781eb38d5b Removed unused comment 2020-09-05 20:51:21 -04:00
PokeCodec
8b729cf225 While to do_while 2020-09-05 18:15:53 -04:00
PokeCodec
fe9ab67063 Change division to explicit shifts for consistency 2020-09-05 18:13:51 -04:00
PokeCodec
3ce29ee7bf Refactor Use Item 2020-09-05 17:36:10 -04:00
PokeCodec
5d694edb18 Specify array size: 12 semitones 2020-09-05 17:31:10 -04:00
PokeCodec
53a4effd57 Tidy up headers 2020-09-05 16:41:44 -04:00
PokeCodec
ac9a86d7ce Remove movementAction fakematch 2020-09-05 14:51:45 -04:00
PokeCodec
0039542e19 Match CheckBagHasSpace 2020-09-05 14:41:43 -04:00
PokeCodec
a7a64ecba0 Fixup ModifyStatByNature 2020-09-05 11:47:24 -04:00
PikalaxALT
16ecbc6446
Merge pull request #1177 from PokeCodec/MatchEmerald 
Match All but 2 remaining naked functions
 2020-09-05 10:25:10 -04:00
PokeCodec
3e25d9e5a2 Removed unused parentheses 2020-09-05 10:01:21 -04:00
Eduardo Quezada
b7fe94108c Fixed Pacifidlog typo. 2020-09-05 01:11:07 -04:00
PokeCodec
7efdcaf120 Removed excess parenthesis 2020-09-04 21:16:55 -04:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
PokeCodec
da582d5258 Make JOY Macros match 2020-09-04 20:41:29 -04:00
PokeCodec
99448002e1 Refactor InitStateHandlers so each key in the reset combo is checked 2020-09-04 20:21:07 -04:00
PokeCodec
3d87a88067 Make battle pyramid defines into enums 2020-09-04 19:49:53 -04:00
PokeCodec
608da287c1 Create Macros and refactor 2020-09-04 19:49:53 -04:00
PokeCodec
aa841047a3 Make data argument const 2020-09-04 19:49:53 -04:00
PokeCodec
abae52a017 Fakematch resolved 2020-09-04 19:49:53 -04:00
PokeCodec
3746efb9c2 Use PokeNav macros 2020-09-04 19:49:53 -04:00
PokeCodec
ae9a60eb2a Documenting and whitespace fixing 2020-09-04 19:49:53 -04:00
PokeCodec
e8f2298498 Fix Typos and capitalization 2020-09-04 19:49:53 -04:00
PokeCodec
3a2a2b6ba9 Fix issues according to feedback 2020-09-04 19:49:53 -04:00
PokeCodec
1cdd0ac199 Make argument int 2020-09-04 19:49:53 -04:00
PokeCodec
52d0b59f5a Make s32 2020-09-04 19:49:53 -04:00
PokeCodec
fe81cc449e Fixed modern issue 2020-09-04 19:49:53 -04:00
PokeCodec
d4158e490a Match more functions 2020-09-04 19:49:53 -04:00
PokeCodec
24b607b9da Match sub_81BF2B8 2020-09-04 19:49:52 -04:00
PokeCodec
5a375b9236 Fix error 2020-09-04 19:49:52 -04:00
PokeCodec
987ef556e5 Match SetSearchRectHighlight 2020-09-04 19:49:52 -04:00