GriffinR
65433c790e
Merge pull request #1342 from sphericalice/heart-icon-palette-tag-constant
...
Use the field effects palette tag constant for the heart icon
2021-02-22 10:43:55 -05:00
SphericalIce
2d7b25428a
Use the field effects palette tag constant for the heart icon
2021-02-22 15:35:09 +00:00
SphericalIce
381116b3c4
Add labels for cracked floor metatiles
2021-02-22 15:29:14 +00:00
Sahith Nallapareddy
dafca0ba22
changing to use constants
2021-02-21 19:27:59 -05:00
HornedCrusader
84cb04fa38
Fix bike flag
2021-02-20 11:52:41 -05:00
GriffinR
64fc585cc3
Document pokenav ribbons summary screen
2021-02-18 11:33:55 -05:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -05:00
GriffinR
642ae8295e
Some constant use in pokemon_icon.c
2021-02-17 14:11:59 -05:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
GriffinR
2e355ac848
Merge pull request #1329 from Kurausukun/fakematches
...
[LEAK-INFORMED] Resolve Fakematches
2021-02-15 23:59:55 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb
...
Document remainder of secret_base.c
2021-02-15 17:41:55 -05:00
Deokishisu
d418321627
Update crt0.s
2021-02-15 17:25:36 -05:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried
...
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 21:48:21 -05:00
SphericalIce
27dc32de26
Use RGB macros
2021-02-14 22:08:19 +00:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts
...
Label unused layouts
2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree
...
Add berry tree id constants
2021-02-14 14:15:51 -05:00
Kurausukun
10e430ae15
oops
2021-02-14 04:03:53 -05:00
Kurausukun
7c4116b32a
fix indentation
2021-02-14 04:01:20 -05:00
Kurausukun
6b5db889dd
[LEAK-INFORMED] remove fakematching comment
...
it is in fact not a fakematch
2021-02-14 03:57:50 -05:00
Kurausukun
bf062f5547
[LEAK-INFORMED] fix battle dome fakematching
...
yes they actually fucking did this
2021-02-14 03:51:38 -05:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
LOuroboros
21ee6cb9fb
Added constant labels for EV manipulating item effects
2021-02-12 07:26:11 -03:00
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene
...
Document evolution scene
2021-02-08 18:21:30 -05:00
GriffinR
487e04d269
Merge pull request #1319 from GriffinRichards/crt0comm
...
Add comments for some data in crt0.s
2021-02-08 17:15:52 -05:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
Evan
5e8c8a6aaf
fix ghost types unable to escape from mean look/trap
2021-02-07 12:05:55 -07:00
GriffinR
6899acfb6f
Merge pull request #1317 from opakedragon/master
...
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-02-07 13:43:05 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
GriffinR
2e57a00d17
Use GAME_LANGUAGE instead of LANGUAGE_ENGLISH
2021-02-05 12:08:49 -05:00
GriffinR
a240481d5f
Document secret_base.c
2021-02-05 12:08:25 -05:00
GriffinR
2b5f7fe151
Merge pull request #1323 from LOuroboros/newCursorArea
...
newCurosrArea -> newCursorArea
2021-02-05 07:16:38 -05:00
LOuroboros
2e51a69400
newCurosrArea -> newCursorArea
2021-02-05 04:59:26 -03:00
Deokishisu
ac43365d58
Fix "Compatibility" Misspelling
...
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
2021-02-05 01:27:11 -05:00
GriffinR
15906ca143
Document evolution scene
2021-02-03 17:55:37 -05:00
Evan
6139b12a49
fix hp boxes not dissapearing
2021-02-02 23:30:08 -07:00
ultima-soul
7a237595c9
Merge pull request #1389 from LOuroboros/syntax
...
Removed trailing spaces from various files
2021-02-02 11:04:34 -08:00
ghoulslash
a00db597ba
Merge pull request #1383 from ultima-soul/battle_engine_sync
...
Battle Engine Upstream Sync
2021-02-02 10:02:31 -07:00
Evan
00cbe61e13
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities
2021-02-02 09:00:12 -07:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers
...
Document battle controllers, misc other battle
2021-02-02 00:24:16 -05:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd
...
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
2021-02-01 21:04:00 -05:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
LOuroboros
fc04c6974b
Edit->Blank Operations->Trim Trailing Space for the win
2021-02-01 17:05:49 -03:00
GriffinR
90513a9d72
Merge pull request #1318 from GriffinRichards/bardmoves
...
Minor bard music clean up
2021-02-01 14:59:45 -05:00
Evan
1c75483f51
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ripen
2021-01-31 23:31:38 -07:00
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -07:00
Lukien
9704049818
Merge remote-tracking branch 'upstream/battle_engine' into battle_engine
2021-01-31 22:46:27 -05:00
Lukien
f69bff6605
Update battle_util.c
...
Added weather check for the ability Sand Force.
2021-01-31 22:43:16 -05:00
ultima-soul
eb78b5434c
Merge pull request #1377 from ghoulslash/thaw
...
Update Thawing Moves
2021-01-31 13:57:44 -08:00
Evan
be0326301d
erge branch 'thaw' of https://github.com/ghoulslash/pokeemerald into thaw
2021-01-31 14:55:56 -07:00
Evan
552f548700
fix IsThawingMove
2021-01-31 14:55:44 -07:00
ghoulslash
9499469337
Update src/battle_util.c
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-31 14:43:24 -07:00
ExpoSeed
8b8d4d4a9f
Merge pull request #1376 from ghoulslash/fire_blast
...
Fix Fire Blast Power
2021-01-31 15:24:52 -06:00
GriffinR
45ee3a687d
Add comments for some data in crt0.s
2021-01-29 18:36:39 -05:00
amiosi
ae2b8be147
Update battle_moves.h
2021-01-29 18:07:36 -05:00
ghoulslash
00085d9d90
Merge pull request #1321 from amiosi/battle_engine
...
remove redundant minimize interactions and add move config ifs
2021-01-29 12:24:56 -07:00
opakedragon
1e8edcbfcd
Revert "Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow""
...
This reverts commit be50fab8f2
2021-01-29 13:36:24 -05:00
opakedragon
be50fab8f2
Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow"
...
This reverts commit 3a6be5a34c
2021-01-29 13:30:09 -05:00
GriffinR
12af03cd62
Label bard music pitch table
2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec
Index gBardSounds_Moves and gBardSounds_Pokemon with constants
2021-01-28 15:55:33 -05:00
Evan
a104c156cc
thaw move list function
2021-01-28 09:00:46 -07:00
Evan
34908a2252
fix fire blast power
2021-01-27 19:56:11 -07:00
opakedragon
3a6be5a34c
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-01-27 06:18:29 -05:00
ghoulslash
345987c9f9
Merge pull request #1367 from LOuroboros/gastro_acid
...
Updated the list of abilities unaffected by Gastro Acid
2021-01-26 21:42:12 -07:00
ghoulslash
ef5faf94de
Merge pull request #1369 from LOuroboros/trace
...
Updated the list of untraceable abilities
2021-01-26 21:41:50 -07:00
ghoulslash
55b9bc7e17
Merge pull request #1366 from LOuroboros/patch-1
...
Fixed Mind Blown's category
2021-01-26 21:41:07 -07:00
luckytyphlosion
b0de03356b
Merge pull request #1315 from PokeCodec/patch-3
...
Use INTR_FLAG_VBLANK instead of constant 0x1
2021-01-26 15:22:24 -05:00
luckytyphlosion
ff8952a3f0
Merge pull request #1308 from PokeCodec/pain
...
Get rid of Task_data_OP macro
2021-01-26 15:22:13 -05:00
GriffinR
92bd6400b7
Fix up berry sparkle
2021-01-26 05:40:34 -05:00
GriffinR
9e59581220
Document object lock and some trainer approach
2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
N
b1a29e5017
Use INTR_FLAG_VBLANK instead of constant 0x1
2021-01-25 21:37:04 -05:00
LOuroboros
c4a7205b6f
Added As One to the untraceable abilities list
2021-01-25 15:37:11 -03:00
LOuroboros
7c9ddd23c1
Updated the list of untraceable abilities
2021-01-25 14:55:51 -03:00
ultima-soul
833218cc5b
Merge pull request #1354 from SBird1337/fix/wrap
...
Fix wrap-style move damage
2021-01-25 09:50:12 -08:00
LOuroboros
d0e0ff34b4
Updated the list of abilities unaffected by Gastro Acid
...
https://bulbapedia.bulbagarden.net/wiki/Category:Abilities_that_cannot_be_suppressed
2021-01-24 23:09:23 -03:00
amiosi
c6ea2c28f8
fix steamroller
2021-01-24 18:22:51 -05:00
GriffinR
3fd5e143a9
Misc battle anim documentation
2021-01-23 00:40:46 -05:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
GriffinR
4228509e95
Sync link opponent controller doc to opponent
2021-01-22 21:47:00 -05:00
GriffinR
6f71569fbd
Sync recorded opponent controller doc to opponent
2021-01-22 21:41:49 -05:00
GriffinR
c106f7f130
Document battle_controller_opponent.c
2021-01-22 21:35:16 -05:00
GriffinR
d1878f933b
Sync link partner controller doc to player
2021-01-22 20:49:14 -05:00
GriffinR
74990a5a76
Sync player partner controller doc to player
2021-01-22 20:48:43 -05:00
GriffinR
1042426cc6
Sync recorded player controller doc to player
2021-01-22 20:47:59 -05:00
GriffinR
b9baf9437d
Sync safari/wally controller doc to player
2021-01-22 20:13:34 -05:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
N
07d19ba526
Update main.c
2021-01-22 18:40:08 -05:00
N
3102d94e3c
Undo change
2021-01-22 17:41:57 -05:00
N
c636b7c3ae
Some more tweaks
2021-01-22 17:41:07 -05:00
LOuroboros
267bbe2f70
Fixed Mind Blown's category
...
As it was pointed out by BigAngryDev on Discord, Mind Blown is supposed to be a Special move, not a Physical one.
2021-01-22 19:20:55 -03:00
amiosi
50ce6b2374
Merge branch 'battle_engine' into battle_engine
2021-01-22 07:39:47 -05:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
ghoulslash
a3a2d881fa
Merge pull request #1327 from ultima-soul/add_fairy_frlg_icon_be
...
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
2021-01-21 12:18:42 -07:00
Evan
bfb7333507
memento gen4 failing
2021-01-21 12:03:30 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
...
Document battle tv data
2021-01-21 12:27:14 -05:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald
...
Fix misnamed ground effect flags & document reflections
2021-01-20 18:50:31 -05:00
SphericalIce
c0489199c0
Rename GetObjEventReflectionType & fix fakematch in GetGroundEffectFlags_Reflection
2021-01-20 22:32:04 +00:00
LOuroboros
2a888a7b3e
Corrected base species check for Thick Club's effect
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-20 19:30:48 -03:00
LOuroboros
a6b03d45a8
Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro
2021-01-20 18:16:02 -03:00
LOuroboros
c90cbc0021
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into thick_club
2021-01-20 18:15:37 -03:00
ghoulslash
71f18bfbf4
Merge pull request #1316 from ultima-soul/form_species_tables_be
...
Add Form Species ID Tables
2021-01-20 13:54:39 -07:00
ultima-soul
d3b0e98325
Merge branch 'form_species_tables' into form_species_tables_be
2021-01-20 11:40:48 -08:00
ultima-soul
267900bdcb
Add Form Species ID tables and functions to access them.
2021-01-20 11:31:20 -08:00
SphericalIce
86297398e6
Move the definition of RETURN_REFLECTION_TYPE_AT and make use of REFL_TYPE_NONE
2021-01-20 10:34:33 +00:00
SphericalIce
4334f7a379
Include NUM_REFLECTION_TYPES in the ReflectionTypes enum
2021-01-20 10:17:07 +00:00
Evan
57c460f40a
fix two turn moves failing on turn 1 w no target
2021-01-19 22:10:03 -07:00
GriffinR
18b8e0ee8e
Merge pull request #1311 from GriffinRichards/clean-unused
...
Remove unused local variables and functions
2021-01-19 23:22:44 -05:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro
...
Use constants for item data, misc other constants/fixes
2021-01-19 20:49:58 -05:00
SphericalIce
2746fd1f95
Name object event ID arguments properly
2021-01-19 23:35:57 +00:00
SphericalIce
6dd973012b
Correct ground effect flag names for reflections & document sprite data usage
2021-01-19 23:21:50 +00:00
GriffinR
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
N
e5e390d64b
Revert zero initialization
2021-01-19 14:33:11 -05:00
N
d720520de8
Clarified comment again
2021-01-19 13:47:09 -05:00
N
b6c483394e
Clarified comments
...
Made comments clearer.
2021-01-19 13:43:57 -05:00
GriffinR
752982552e
Add FIRST_BALL, some FIRST_BERRY_INDEX usage
2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472
Name color return values more accurately
2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533
Make broader use of RGB macros
2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5
Add misc item data constants
2021-01-19 05:49:20 -05:00
GriffinR
4e845b6395
Use constants for contestLinkResults
2021-01-19 04:40:06 -05:00
GriffinR
3f36529cba
Use NUMBER_OF_MON_TYPES in pokedex search
2021-01-19 04:34:50 -05:00
GriffinR
9dd867689e
Use ARRAY_COUNT in PrintMenuTable
2021-01-19 04:19:14 -05:00
GriffinR
3f9037d63a
Use ARRAY_COUNT in InitBgsFromTemplates
2021-01-19 04:14:07 -05:00
GriffinR
bc20fda604
Use GET_UNOWN_LETTER macro
2021-01-19 04:03:16 -05:00
N
7134763b73
Update task.c
2021-01-17 13:00:53 -05:00
N
8297090267
Update task.c
2021-01-17 12:49:50 -05:00
N
ad6ab09e30
Update comment
2021-01-17 12:46:08 -05:00
N
3b80f3caf1
Make variable name shorter
2021-01-17 12:44:08 -05:00
N
d3259ebe2c
renamed taskNum to followupFuncDataIndex
2021-01-16 21:56:49 -05:00
N
72e8683975
FIxed the comments
2021-01-16 21:50:59 -05:00
N
e7436ab4c8
Update task.c
2021-01-16 21:35:40 -05:00
N
0159c0c1ae
Update task.c
2021-01-16 21:09:51 -05:00
N
a950167d89
Remove define
2021-01-16 21:05:35 -05:00
N
6b5ce647df
Update task.c
2021-01-16 20:31:09 -05:00
N
26246ce281
Update task.c
2021-01-16 20:29:42 -05:00
N
926ef40c52
Get rid of Task_data_OP macro
...
This macro is so annoying. Can we please do away with it?
2021-01-16 20:19:00 -05:00
ultima-soul
8647895f1a
Merge pull request #1259 from ghoulslash/be_config
...
anim particle configs false by default
2021-01-16 10:41:18 -08:00
Evan
544d598506
update tailwind timer
2021-01-15 18:34:47 -07:00
ExpoSeed
98b4af151c
Merge pull request #1346 from luckytyphlosion/origin/battle_engine
...
Fix AI corruption bug.
2021-01-15 12:44:27 -06:00
Evan
f1d89b2d79
merge with be
2021-01-15 11:17:45 -07:00
ExpoSeed
b166e9a5e3
Merge pull request #1276 from LOuroboros/x_items_BE
...
Reworked the effects of the X Items #1
2021-01-15 12:05:07 -06:00
sbird
5d02cc2059
[battle_engine] fix wrap style move damage
2021-01-15 16:04:09 +01:00
GriffinR
564278fd49
Document battle tv data
2021-01-14 06:29:59 -05:00
GriffinR
8e06d5679c
Index gBardSoundsTable
2021-01-14 03:54:59 -05:00
GriffinR
46e0a0607d
Array count for easy chat word groups
2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a
Index sTMHMMoves
2021-01-14 03:41:28 -05:00
Evan
d26605c9fe
fix bad bg fade if no permanent terrain
2021-01-13 16:01:47 -07:00
Evan
9902f6e603
merge with be
2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
luckytyphlosion
cb7b77500f
Just remove the commented out function and notes.
2021-01-12 18:52:37 -05:00
luckytyphlosion
f626fac9dc
Fix AI corruption bug.
2021-01-12 18:43:16 -05:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine
...
Increase readability of too-long names
2021-01-12 09:20:53 -07:00
GriffinR
fa3acd79e7
Fix missing header for sub_817F77C BUGFIX
2021-01-11 10:37:22 -05:00
GriffinR
4a7a3df205
Move SeedRngWithRtc fix to BUGFIX conditional
2021-01-11 10:36:53 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master
...
Document the unused battle strings for downpour weather
2021-01-11 10:01:57 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage
2021-01-11 08:49:31 -05:00
Evan
8bad377a2e
magic room affects macho brace/power item speed drop
2021-01-10 16:57:27 -07:00
SatoMew
ead437e89b
Document the unused battle strings for downpour weather
2021-01-10 22:26:00 +00:00
surskitty
f58539b602
Renaming the last two and fixing the merge conflict with PE.
2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2021-01-10 15:40:21 -05:00
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo
...
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:34:39 -05:00
GriffinR
8afc28c98f
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:24:59 -05:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5
merge with be
2021-01-10 09:04:21 -07:00
LOuroboros
3ffa7f993a
Renamed some X Defend labels to reflect its new name in the IE
2021-01-10 01:58:02 -03:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant
...
battle_config.h tweaks
2021-01-09 12:36:37 -08:00
ultima-soul
1caed479de
Merge pull request #1298 from ghoulslash/mummy
...
Fix Early Mummy Activation
2021-01-09 12:33:04 -08:00
SphericalIce
f02afc134b
Use the correct constant for max-IV masks
2021-01-07 22:34:57 +00:00
SphericalIce
3c2a33b9b2
Use constants for max IVs & the random IV generation flag
2021-01-07 22:13:14 +00:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
...
Implemented various Gen. 8 abilities
2021-01-07 13:31:17 -08:00
LOuroboros
a481233304
Review correction to case 2 of PokemonUseItemEffects
2021-01-07 18:20:53 -03:00
LOuroboros
8511ed57e4
Tweaked Steam Engine's battle string
2021-01-07 18:13:16 -03:00
SphericalIce
fb69d97b24
Use the constant for the max total of EVs
2021-01-07 21:11:45 +00:00
LOuroboros
de9b0328ec
Corrections to Steam Engine
2021-01-07 16:33:52 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
...
Sync battle engine
2021-01-07 12:13:26 -07:00
LOuroboros
8d9c10224d
Removed pointless EmptyString print
2021-01-07 15:51:52 -03:00
LOuroboros
339aa95c1d
Review corrections
...
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
2021-01-07 04:31:26 -03:00
Evan
aac3f9c3db
kee, maranga, sitrus beries
2021-01-06 13:07:18 -07:00
Evan
c3615485f3
merge in berry branch
2021-01-06 12:54:02 -07:00
Evan
7646855e79
jaboca, rowap berry effects
2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad
micle berry
2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d
custap berry effect, custap/quick claw activation message
2021-01-06 09:37:31 -07:00
Evan
d3ae05189d
resist berry ripen boost
2021-01-05 22:21:38 -07:00
Evan
b3a6df8d57
stat raising berries
2021-01-05 22:13:32 -07:00
Evan
f046a25ce0
ripen & hp restoring berries
2021-01-05 21:15:21 -07:00
Evan
4c1e8f2f2e
add curious medicine
2021-01-05 20:02:11 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
LOuroboros
3246c20be5
Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers
2021-01-05 19:51:52 -03:00
Evan
4923af960e
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 15:44:12 -07:00
GriffinR
c506cf747f
Merge pull request #1293 from GriffinRichards/typo-pyramind
...
Fix sPyramindFloorNames typo
2021-01-05 00:16:24 -05:00
GriffinR
fe5269b875
Fix sPyramindFloorNames typo
2021-01-04 23:58:33 -05:00
GriffinR
a291bc4a2c
Merge pull request #1292 from GriffinRichards/fix-partymenu
...
Remove unnecessary subtraction in switch
2021-01-04 20:49:08 -05:00
GriffinR
1b2c9d00ca
Merge pull request #1291 from Sierraffinity/master
...
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 20:48:58 -05:00
GriffinR
eba7933c0c
Remove unnecessary subtraction in switch
2021-01-04 19:50:05 -05:00
Sierraffinity
67a656a4df
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 16:26:28 -08:00
