Evan
6cb8c6309a
merge with be
2021-03-01 11:28:51 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
Marcus Huderle
a85fada314
Document more battle anim effects
2021-02-28 09:54:55 -06:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec
...
Document easy chat and mail, script.c cleanup, add/use some general constants
2021-02-28 10:26:49 -05:00
Marcus Huderle
c323e7f061
Document some battle anim funcs and data
2021-02-27 11:04:45 -06:00
GriffinR
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
BuffelSaft
2b90c0b945
Fix Spiky Shield/Jump Kick bug
...
Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.
2021-02-19 13:57:29 +13:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -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
56e047f949
Fix Lilcove Motel typos
2021-02-14 21:38:39 +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
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
LOuroboros
43d6340b92
Corrected the order of actions in BattleScript_FirstChargingTurn
2021-02-08 17:51:46 -03:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05: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
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
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
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -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
c003f1c023
check move effectiveness with status effects
2021-01-26 15:41:59 -07: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
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -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
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07:00
GriffinR
de52df5613
Fix some mislabeled scripts
2021-01-19 04:51:34 -05:00
GriffinR
1a40202ea4
Note bug in Foresight AI
2021-01-19 04:46:31 -05:00
GriffinR
c6a81c5277
Use MON_MALE/FEMALE for get_gender
2021-01-19 04:37:17 -05:00
LOuroboros
af3dcf7543
Fixed Focus Blast animation
...
Its gSuperpowerOrbSpriteTemplate was overlapping the battle textbox.
2021-01-16 03:57:47 -03:00
LOuroboros
c21c0f8c37
Fixed incorrect preprocessor directive in ASM file
2021-01-13 22:42:56 -03: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
56395a060f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai
2021-01-13 09:23:07 -07: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
92de664f79
List battle animation indexes alongside tables
2021-01-11 16:07:16 -05:00
opakedragon
3ce4e6b24b
rename string id to reflect usage
2021-01-11 08:47:11 -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
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
