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
9fcf7d2453
zero terrain timers for steel roll, remove unused move effectd
2021-01-28 13:51:39 -07:00
Evan
e11100b030
fix temp learnsets
2021-01-28 13:31:57 -07:00
Evan
c009b51ae8
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 13:27:00 -07:00
Evan
a37acb8345
coaching, lash out, burning jealousy
2021-01-28 12:21:11 -07:00
Evan
dd51edd881
add eerie spell, surging strikes, jungle healing
2021-01-28 10:51:00 -07: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
Evan
b9e425252d
remove duplicate non-user check
2021-01-27 08:33:43 -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
Evan
18f5d9f0a3
better AI_TryToFaint
2021-01-26 17:11:55 -07:00
Evan
c003f1c023
check move effectiveness with status effects
2021-01-26 15:41:59 -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
Evan
d8d00ba967
fix orb check
2021-01-21 21:28:19 -07: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
Evan
e61309dce6
merge with be
2021-01-20 17:34:24 -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
Evan
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07: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
Evan
6b59a9ac01
add ai info debug option
2021-01-19 12:58:58 -07: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
Evan
455899acf7
fix AI_DATA->battlerAtk
2021-01-19 08:54:39 -07:00
Evan
71185dbf67
fix DoesBattlerIgnoreAbilityChecks
2021-01-19 08:50:36 -07: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
Evan
c2dfc571b2
misty terrain blocks confusion
2021-01-16 12:21:04 -07:00
Evan
10b1d33d13
handle battler being affected by terrain
2021-01-16 12:05:51 -07:00
Evan
4a5a3ea6af
add safeguard checks
2021-01-16 11:47:29 -07: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
9e29d303ec
electric and misty terrain preventions
2021-01-16 11:40:02 -07:00
Evan
24b19eb9a4
fix AI_WeatherHasEffect
2021-01-15 21:29:39 -07:00
Evan
544d598506
update tailwind timer
2021-01-15 18:34:47 -07:00
Evan
449c2bcc34
add config option
2021-01-15 18:28:10 -07:00
Evan
0d8f804194
update mental herb to gen 5
2021-01-15 18:11:55 -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
Evan
44a124acb7
fix CanBeParayzed
2021-01-15 09:23:23 -07: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
062d2ee50e
add atk up 3 effects to HpAware
2021-01-13 16:42:10 -07: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
Evan
09dc1b7e89
fix double battle ai logic
2021-01-13 11:08:43 -07:00
Evan
56395a060f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-13 09:23:07 -07:00
Evan
47bf5b2840
a few tweaks
2021-01-12 22:45:02 -07: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
Evan
c95bfae701
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects
2021-01-10 09:02:21 -07:00
Evan
6a3266a265
fix syntax err
2021-01-10 09:02:06 -07:00
Evan
bb540b6236
fix AI_WeatherHasEffect to handle unknown abilities
2021-01-10 08:58:41 -07:00
Evan
e748db8ef4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-10 08:58:16 -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
Evan
b5128be68b
eject packer invisible before openpartymenu
2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3
merge with be
2021-01-07 21:24:21 -07:00
Evan
2bd5167a6c
eject pack
2021-01-07 21:11:56 -07:00
Evan
0118723a9c
add eject button
2021-01-07 20:31:27 -07:00
Evan
5eb49722c0
add red card effect
2021-01-07 19:33:39 -07: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
bf644f23a7
add heavy duty boots
2021-01-06 20:53:48 -07:00
Evan
7fffe23e63
add terrain seeds
2021-01-06 20:22:05 -07:00
Evan
c1dd3fca21
add room service
2021-01-06 18:00:14 -07:00
Evan
0cdab790dc
add blunder policy
2021-01-06 15:40:20 -07:00
Evan
db6f9d05ec
add throat spray
2021-01-06 15:28:58 -07:00
Evan
d5d2cac60c
init branch
2021-01-06 14:42:45 -07: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
Evan
81c56a224a
fix bad ai util func
2021-01-04 20:23:09 -07:00
Evan
f21b0140b9
revert to CheckViability and stat change effect viabilities
2021-01-04 19:39:59 -07: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
Evan
1ae57f26a3
fix up some negative checks, organize some effects in AI_CheckBadMove
2021-01-04 15:30:02 -07:00
GriffinR
0ca76fc179
Some decoration labels, use constant for tileset size
2021-01-04 16:27:57 -06:00
GriffinR
039108284d
Clean up gDecorations with gItems format
2021-01-04 16:27:57 -06:00
Evan
5ae1e3c25b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-04 11:43:36 -07:00
GriffinR
e0c0143f41
Fix substitute back sprite
2021-01-04 10:14:01 -05:00
LOuroboros
adf039fe12
Made BufferStatRoseMessage print an extra string if B_X_ITEMS_BUFF == GEN_7
...
Also turned sText_StatSharply into gText_StatSharply.
2021-01-04 07:41:56 -03:00
LOuroboros
be46ed84ea
Made the old X Items buff code make use of B_X_ITEMS_BUFF
2021-01-04 04:15:58 -03:00
LOuroboros
dbc3690282
Tweaked preprocessor directives
...
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
2021-01-04 03:58:31 -03:00
LOuroboros
517c8ffdd0
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
2021-01-03 22:05:14 -03:00
amiosi
19b82dcf57
tabs -> spaces
2021-01-03 19:12:47 -05:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only
2021-01-04 10:55:30 +13:00
GriffinR
06af0f0fe5
Remove unnecessary string.h includes
2021-01-03 13:36:07 -05:00
LOuroboros
da1f525d45
Made Alolan Marowak be affected by Thick Club
2021-01-03 09:58:19 -03:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen
...
Document battle factory screen
2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr
...
Minor field_screen_effect / field_player_avatar documentation
2021-01-03 01:59:36 -05:00
ultima-soul
c2a3c5687b
Add Fairy-type icon to fix Fairy TM info icon being blank.
2021-01-02 21:11:47 -08:00
surskitty
a96179a308
Changed Neutralizing Gas.
2021-01-02 17:16:44 -05:00
GriffinR
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc
...
Index battle controller cmd tables
2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3
Label some ReturnToField funcs
2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b
Document warp spin functions
2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2
Label a few flash effect functions
2021-01-01 13:34:25 -05:00
Evan
f172245ad6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem
2021-01-01 08:49:43 -07:00
ExpoSeed
8cfdbaefeb
Merge pull request #1294 from LOuroboros/flower_gift
...
Added missing check to Flower Gift (offensive)
2020-12-31 18:41:50 -06:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit
...
Corrected Final Gambit's move data and tweaked its effect
2020-12-31 18:39:00 -06:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation
...
infestation between turn anim
2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae
Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.
2020-12-31 18:57:36 -05:00
surskitty
533d9f1c54
Updating move names and ability names.
2020-12-31 18:45:25 -05:00
GriffinR
84fbcc9dd6
Fix modern -> UBFIX macro change
2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen
2020-12-31 00:40:45 -05:00
GriffinR
093610b46e
Finish factory swap screen doc
2020-12-31 00:26:14 -05:00
amiosi
8d1383f0d5
no text
2020-12-30 23:51:08 -05:00
amiosi
556a863ee3
minimize pr (also text)
2020-12-30 22:56:15 -05:00
Sierraffinity
ef7832a55c
Change how mon affine transform fix is handled
2020-12-30 17:36:53 -08:00
GriffinR
7ae78dc773
Finish factory select screen doc
2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6
Resume factory screen doc
2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d
Index battle controller cmd tables
2020-12-29 17:21:58 -05:00
Sierraffinity
127bb97c0e
Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite
2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d
Add UBFIX for null deref in sub_80D08CC
2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6
Add UBFIX for null derefs in sub_8088950
2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea
Add UBFIX for null deref in CameraObjectReset2
2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower
...
Label remaining subs in battle_tower.c
2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
Evan
59813c9ce7
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config
2020-12-23 10:27:54 -07:00
LOuroboros
320cc37ac9
USE_BATTLE_DEBUG -> B_ENABLE_DEBUG
2020-12-23 14:04:14 -03:00
Evan
a426092006
fix sticky barb theft in trainer battles
2020-12-22 08:35:11 -07:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data
...
Added the data of SwSh's Crown Tundra's moves
2020-12-21 23:13:23 -07:00
Kurausukun
254b4e621c
change "filler" to "unk", remove newline
2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8
fix remaining functions, finally matches
2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390
oops
2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6
fix sub_8021A28
2020-12-21 20:24:36 -05:00
Kurausukun
3203bac053
fix struct
2020-12-20 23:15:35 -05:00
Evan
5bdf266000
add additional item theft check
2020-12-20 19:06:50 -07:00
Evan
a0b9ece980
merge with BE
2020-12-20 16:39:50 -07:00
Evan
21e7d6d318
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2020-12-20 16:33:43 -07:00
Evan
19b1d4bfa2
speed stat increases based on current stat stage
2020-12-20 15:15:33 -07:00
Evan
62fc47881d
smaller score bonus to speed increase
2020-12-20 15:10:57 -07:00
Evan
7988a1f41d
Ai_TryOnAlly and reorganize files
2020-12-20 14:47:20 -07:00
Kurausukun
14e2898a29
fix structs and some function logic
...
(currently does not match)
2020-12-20 02:54:33 -05:00
Evan
c5597e2e18
fix first battle bug
2020-12-19 22:57:08 -07:00
Evan
a504199ea6
ai prefer baton pass
2020-12-19 22:51:25 -07:00
Evan
b2e5760479
risky ai script -> c
2020-12-19 22:12:31 -07:00
Evan
cd119ed6c3
first turn ai script
2020-12-19 22:07:21 -07:00
Evan
31ec3e8479
non-partner good move checks
2020-12-19 21:58:23 -07:00
LOuroboros
0aae069db8
Made Fiery Wrath unaffected by King's Rock
2020-12-19 21:11:17 -03:00
LOuroboros
819001c102
Removed redundant check in Punk Rock's effect
2020-12-19 19:15:12 -03:00
LOuroboros
a417a1b2b9
Corrected Punk Rock's checks
2020-12-19 16:18:39 -03:00
LOuroboros
ffa35a33c1
Review corrections
2020-12-19 07:44:34 -03:00
ultima-soul
1b1b2ff0a3
Merge pull request #1281 from NamNguyenUTSA/patch-2
...
Allow player partner NPC's to mega evolve
2020-12-18 23:39:15 -08:00
ultima-soul
aefa35a04f
Merge pull request #1275 from ghoulslash/battle_anims
...
Fix Shadow Sneak Animation
2020-12-18 23:15:07 -08:00
Evan
8a544665e4
move common ai params to preloaded struct
2020-12-16 22:56:10 -07:00
Evan
916d0416e3
outline AI_CheckGoodMove
2020-12-15 21:57:33 -07:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00
Kurausukun
69cfe5ad01
use direction constant
2020-12-14 21:54:19 -05:00
Kurausukun
68b456e7f9
name a2
2020-12-14 21:51:38 -05:00
Kurausukun
266a23b327
fix indentation
2020-12-14 21:44:25 -05:00
Kurausukun
6faa63347a
document reuse of variables in link mode
2020-12-14 21:41:30 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
...
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
...
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
Evan
259e59bae0
fix early mummy activation on two-turn moves
2020-12-14 12:27:48 -07:00
Evan
09496abef0
reset VAR_TERRAIN on whiteout
2020-12-14 08:59:57 -07:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
9c64635ebe
remove redundant permanent terrain check
2020-12-13 19:50:02 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
Evan
97172fc5b5
merge with be
2020-12-13 17:21:22 -07:00
Evan
ead8637e4f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-13 17:09:04 -07:00
Evan
ac332d5e98
check bad move
2020-12-13 15:02:21 -07:00
Sierraffinity
1aca378634
Fix name of SetDexNumberColor
2020-12-12 21:08:15 -08:00
GriffinR
b1197ac2da
UBFIX for if_status_not_in_party
2020-12-12 23:57:25 -05:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
Sierraffinity
abef3065d0
Fix affine anim bug with Pokémon going in and out of balls without an intermediate screen transition
2020-12-12 20:29:20 -08:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite
...
Updated Spite
2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
ea1dca3024
Merge pull request #1270 from LOuroboros/drives_and_types
...
Made Techno Blast's animation change depending on the Drive held
2020-12-12 21:43:45 -03:00
LOuroboros
1f10b94a11
Implemented Power Spot
2020-12-12 21:22:42 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup
...
toggleable manual ability popup destruction
2020-12-12 20:36:55 -03:00
LOuroboros
305bea32df
Added missing check to Flower Gift (offensive)
2020-12-12 20:32:52 -03:00
LOuroboros
8e187d1d5b
Implemented Ice Scales
2020-12-12 19:39:35 -03:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
LOuroboros
e9c6c96b9d
Corrected Final Gambit's move data
...
It didn't have its own working effect assigned, and it wasn't being affected by King's Rock even though it should.
2020-12-12 11:57:49 -03:00
Michael Panzlaff
eaff64e223
remove trailing spaces
2020-12-12 13:19:08 +01:00
LOuroboros
c5e04cf243
Removed the unnecessary Dragon Energy effect
...
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
2020-12-12 01:35:54 -03:00
LOuroboros
9ec2e44f4c
Updated Spite
2020-12-11 21:36:59 -03:00
LOuroboros
0ac026e6ca
Added the data of SwSh's Crown Tundra's moves
...
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
2020-12-11 20:49:23 -03:00
LOuroboros
c930a63c84
Implemented Punk Rock
2020-12-11 19:46:33 -03:00
LOuroboros
2b0702ec04
Implemented Perish Body
...
Inspired by Raguzero's implementation.
2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8
Implemented Sand Spit
2020-12-11 16:47:23 -03:00
Michael Panzlaff
f177c736fc
more CgbSound decipher work
2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5
use better m4a variable/constant names
2020-12-11 16:33:55 +01:00
Evan
28698a982d
try to faint script -> c
2020-12-11 08:05:00 -07:00
NamNguyenUTSA
ee59fab143
Allow player partner NPC's to mega evolve
...
(i.e., Steven at Mossdeep)
2020-12-11 08:31:00 -06:00
Evan
aad3a800c3
c functions for ai roamers/safari/first battle
2020-12-10 22:10:21 -07:00
Evan
eac8135687
set up ai c function table
2020-12-10 21:37:37 -07:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
LOuroboros
322918e280
Implemented Steam Engine
...
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 18:27:35 -03:00
ExpoSeed
76e40fe2dd
Fix incorrect bug description
2020-12-09 16:45:27 -06:00
Evan
34dd11448b
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 10:28:18 -07:00
Evan
a93a8b2194
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2020-12-08 20:50:43 -07:00
LOuroboros
791d561f14
Reworked the effects of the X Items
...
Thanks to Karathan's indications.
2020-12-08 18:24:42 -03:00
Evan
964ec53a65
port cfru shadow sneak anim
2020-12-08 11:36:19 -07:00
LOuroboros
c9824a8dd9
Fixed Cotton Down
...
It was tough, but the nightmare is finally over.
Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 20:08:36 -03:00
BuffelSaft
a3b891bd65
Cap recoil for Gen 4 Jump Kick
...
Jump Kick's recoil in Gen 4 cannot exceed half of the target's maximum HP.
2020-12-07 19:41:49 +13:00
BuffelSaft
72b769ec75
Add config options for Jump Kick
...
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
d5ad14c349
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup
2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
Evan
37aeeae277
fix terrain bg on subsequent battle start
2020-12-05 20:25:03 -07:00
BuffelSaft
ef41a4c14d
Fix Jump Kick
...
* Now inflicts recoil damage on the user if the target was immune to the attack
* Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 16:14:02 +13:00
LOuroboros
b6d0681779
Included hold_effects.h in battle_anim_new.c
...
Otherwise the file won't recognize HOLD_EFFECT_PLATE and will refuse to build a ROM.
2020-12-05 20:50:33 -03:00
LOuroboros
49ca76f880
Made Techno Blast's animation change depending on the Drive held
2020-12-05 20:39:05 -03:00
LOuroboros
c83c67ff8e
Implemented Stalwart
2020-12-05 14:19:25 -03:00
LOuroboros
6a0fee9c56
Fixed Intrepid Sword and Dauntless Shield
...
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 14:03:13 -03:00
LOuroboros
002973d373
Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn
...
This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
2020-12-05 13:50:47 -03:00
LOuroboros
6bbd88049a
Ball Fetch tweaks
2020-12-05 03:03:55 -03:00
LOuroboros
e2f4ca27b0
BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn
2020-12-05 02:43:29 -03:00
Eduardo Quezada D'Ottone
15a587f4e9
Merge pull request #1261 from ghoulslash/u16-abilities
...
Fix Buffering abilities > 255
2020-12-04 15:18:45 -03:00
Evan
39cbc21925
fix trainer theft, update config option
2020-12-03 08:42:12 -05:00
LOuroboros
9e8913c698
Implemented Propeller Tail
2020-12-02 23:23:34 -03:00
LOuroboros
9e1d7cc827
Implemented Ball Fetch
2020-12-02 23:09:35 -03:00
LOuroboros
0c4c6fc778
Implemented Cotton Down
2020-12-02 22:53:00 -03:00
LOuroboros
3d8308844c
Implemented Libero
...
Kappa.
2020-12-02 19:09:59 -03:00
LOuroboros
e11fa09632
Implemented Intrepid Sword and Dauntless Shield and...
...
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin
Their labels reflect the instances of a battle in which they can be called.
2020-12-02 19:07:08 -03:00
Evan
5c72a89105
fix B_BUFF_ABILITY
2020-12-02 15:03:49 -05:00
Evan
dcefaf2563
anim particle changes false by default
2020-12-01 18:01:02 -05:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Evan
1e68c46890
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-01 17:51:38 -05:00
Evan
5478179464
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims
2020-12-01 17:46:26 -05:00
GriffinR
c76aaa2aa4
Merge pull request #1259 from GriffinRichards/fix-backpicindex
...
Designated initializers for gTrainerBackPicTable
2020-12-01 16:26:42 -05:00
GriffinR
076b2c2edc
Designated initializers for gTrainerBackPicTable
2020-11-30 15:32:08 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities
...
Finish Switch In Ability Activation Messages
2020-11-28 20:27:32 -06:00
Eduardo Quezada D'Ottone
7aa999af59
Merge pull request #1235 from ultima-soul/ability_expansion
...
Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony
2020-11-28 14:56:01 -03: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
Evan
6c0878b5fe
infestation between turn anim
2020-11-24 17:21:59 -05:00
Evan
9ec67db8fa
keep permanent terrain bg from party menu, bag
2020-11-24 17:03:40 -05: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
Evan
9472bc894f
formatting
2020-11-20 08:26:50 -07:00
Evan
ef43596a79
toggleable manual ability popup destruction
2020-11-19 15:16:27 -07:00
Evan
56c0a39206
fix pressure typo
2020-11-19 11:53:47 -07:00
Evan
07a4400d50
finish switch in ability messages
2020-11-19 11:42:00 -07:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
ultima-soul
fdfe330330
Merge pull request #519 from Pyredrid/doublescriptedwilds
...
Added commands for scripted double wild battles
2020-11-18 08:57:19 -08:00
Evan
5c658c6950
config option for terrain bg change
2020-11-17 20:26:09 -07:00
Evan
c026f705b3
permanent terrain move bgs
2020-11-17 19:45:27 -07:00
Evan
479f6be51a
redo power trick anim
2020-11-17 15:31:18 -07:00
GriffinR
0aa06c307b
Merge pull request #1251 from ExpoSeed/patch-1
...
Document bugged IV inheritance difference
2020-11-17 14:25:36 -05:00
ultima-soul
e15a86caae
Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.
2020-11-17 10:32:24 -08:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code
2020-11-17 17:40:26 +01:00
Aaron B-D
151aca8365
Changed how scripted wild encounters work to include double battles
...
Removed the old commands for scripted wild double encounters
2020-11-17 03:13:00 -05:00
ultima-soul
06e3097d44
Merge pull request #1234 from LOuroboros/guts
...
Implemented Guts' missing effect
2020-11-16 20:24:35 -08:00
Eduardo Quezada D'Ottone
27166a7147
Fixed UndoFormChange bug at the end of battles
2020-11-16 20:56:11 -03:00
ultima-soul
63bd0ec836
Remove Cacophony and fix some Gen 8 ability descriptions to fit.
2020-11-16 15:42:09 -08:00
LOuroboros
9c6a5f1ab6
Implemented Guts' missing effect
2020-11-16 20:22:59 -03:00
ultima-soul
e32659d4bb
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
2020-11-16 13:50:26 -08: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
4da357aef4
Fixed compatibility with Pokémon Expansion
2020-11-15 13:35:02 -03:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves
...
LGPE & Isle of Armor move data.
2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
f0154028ff
Review changes 2
2020-11-14 09:01:43 -03:00
Evan
66152538ec
add back accidentally deleted item theft battle type checks
2020-11-13 13:42:49 -07:00
Evan
a05d8f7d43
fix conflicts
2020-11-13 11:21:15 -07:00
Evan
435f928aa4
opponent trainer theft config option. Clean up code a bit
2020-11-13 11:00:44 -07:00
Eduardo Quezada D'Ottone
e87f0f1ddb
Review changes
2020-11-13 14:51:50 -03:00
ultima-soul
236d7145ae
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances
...
Added config option for Steel type resistances.
2020-11-12 23:25:21 -08:00
Evan
64bcac4589
move pickpocket to back of moveend sequence
2020-11-12 23:30:00 -07:00
ultima-soul
c3423b4212
Merge pull request #1206 from ExpoSeed/type-changing-moves
...
Refactor move effects for type changing moves
2020-11-12 19:10:48 -08:00
Evan
520f00f4ae
add pickpocket
2020-11-11 18:08:46 -07:00
Eduardo Quezada D'Ottone
4b9d0d8e24
Added config option for Steel type resistances.
2020-11-11 17:48:02 -03:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
...
Implemented Wish Mega Evolution
2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
e021a4aa87
Critical Capture Config Option And Catching Charm #556 from ghoulslash
...
Critical Capture Config Option And Catching Charm
2020-11-10 17:31:08 -03:00
Eduardo Quezada D'Ottone
e6f8d57f08
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
...
# Conflicts:
# include/constants/battle_string_ids.h
2020-11-10 17:28:17 -03:00
ExpoSeed
429df3c319
Merge pull request #571 from LOuroboros/new_surf_pal
...
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
2020-11-10 11:37:07 -06:00
ExpoSeed
17f7af747c
Merge pull request #569 from LOuroboros/anim_settings_label_fixes
...
Fixed anim. settings labels in src/battle_anim.c
2020-11-10 11:36:27 -06:00
LOuroboros
a25190f357
A few things.
...
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
2020-11-10 10:34:51 -03:00
Eduardo Quezada D'Ottone
9eea1cc296
Updated to use internal Gen 8 move data.
2020-11-09 13:34:38 -03:00
Eduardo Quezada D'Ottone
ddb6142709
Review changes 3.
2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone
255a14affb
Review changes 2.
2020-11-08 21:03:50 -03:00
Eduardo Quezada D'Ottone
35d5324324
Review changes.
2020-11-08 21:02:34 -03:00
Evan
03f480fa17
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2020-11-08 15:21:48 -07:00
Evan
cdad1e7101
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2020-11-08 14:07:50 -07:00
Evan
980f208b78
use NATIONAL_DEX_COUNT for critical capture odds
2020-11-08 14:07:43 -07:00
ExpoSeed
7ea34968f9
Add damage calc for plates
2020-11-08 01:57:52 -06:00
ExpoSeed
d2566c8988
Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect
2020-11-07 23:34:04 -06:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
luckytyphlosion
4b748d32cc
Bugfix for ChooseMoveOrAction_Doubles.
2020-11-07 18:21:17 -05:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
LOuroboros
ea99195194
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
2020-11-06 22:29:20 -03:00
LOuroboros
d66b2fc820
Fixed anim. settings labels in src/battle_anim.c
2020-11-06 21:37:04 -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
LOuroboros
93d9ad0997
Fixed the descriptions of Freeze Dry and Flying Press
...
Addresses https://github.com/DizzyEggg/pokeemerald/issues/508
2020-11-06 15:24:00 -03:00
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
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
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
Kaz
32ae13f9b6
walda_phrase.c: Proper sub_81D9C90 match GET.
2020-09-19 19:03:07 -04:00
GriffinR
0b592228c5
Merge pull request #1186 from kiliwily/DocSomeBugs
...
Document some bugs
2020-09-19 18:09:49 -04:00
Kaz
94711208a2
menu_specialized.c: Fix fakematches.
2020-09-19 17:38:54 -04:00
Kaz
847878eae9
battle_gfx_sfx_util.c: Very annoying fakematch fix.
...
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-19 17:12:25 -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
Kaz
1404cf3330
field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch.
2020-09-17 18:24:11 -04:00
Kaz
c724f2b809
battle_ai_script_commands.c: -g fixes the fakematch.
2020-09-16 22:01:45 -04:00
Kaz
5a70f99e16
battle_script_commands.c: Eliminate the last nonmatching (swapped expressions).
2020-09-16 21:39:44 -04:00
Kaz
171154a097
Convert to -g; will be required for eliminating fakematches.
2020-09-16 19:36:30 -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
Kaz
327dd877b5
use_pokeblock: fakematch fix.
...
I am beginning to suspect that we should be using the gflib DMA macros
everywhere wherever possible.
2020-09-13 03:47:12 -04:00
Kaz
f952144922
party_menu fakematch fix
2020-09-13 03:02:41 -04:00
Kaz
449df5860d
Begin documenting berry_crush
2020-09-13 00:26:01 -04:00
Kaz
d0fcb9168b
Match two minor functions in battle_tent and berry_crush
2020-09-12 21:51:16 -04: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
