ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 21:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,398 Commits 1 Branch 0 Tags 235 MiB
bbe2eccf62
Commit Graph

5888 Commits

Author SHA1 Message Date
DizzyEggg
4b744374c8 Allow larger exp gains 2021-06-03 23:17:44 +02:00
ultima-soul
2813b4f9bf
Merge pull request #1519 from DizzyEggg/flameburst 
Fix FlameBurst
 2021-06-03 09:30:50 -07:00
ultima-soul
e5a3123b8c
Merge pull request #1505 from MissingNoL/Decaps-and-Miracle-Eye-Text-Fixes 
Decaps and Miracle Eye text fixes
 2021-06-03 09:06:15 -07:00
ultima-soul
9584b8539f
Merge pull request #1492 from LOuroboros/battle_debug 
Tweaked src/battle_debug.c to comply with the PE
 2021-06-03 09:01:37 -07:00
LOuroboros
b67e82c7c1
Syntax change #2 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 05:17:52 -03:00
LOuroboros
cb4f16a178
Syntax change #1 
Though I don't like it, personally.

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 05:17:41 -03:00
MissingNoL
1022d34218
Update src/data/text/move_descriptions.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 01:16:03 -07:00
LOuroboros
b215b44951 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales 2021-06-03 05:09:14 -03:00
DizzyEggg
85ff866998 Fix FlameBurst 2021-06-03 09:50:43 +02:00
ultima-soul
72f23ff7ba
Merge pull request #1507 from ghoulslash/flower_gift 
Add Sunny Check to Flower Gift Ally Boosts
 2021-06-02 23:35:59 -07:00
ultima-soul
bb9a7b04f8
Merge pull request #1499 from LOuroboros/patch-1 
Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT
 2021-06-02 23:07:50 -07:00
ultima-soul
c01247237d
Merge pull request #1498 from AsparagusEduardo/fix_BE_X_items 
Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7
 2021-06-02 23:05:33 -07:00
LOuroboros
37875a7850 Commented out call to inexistent IsZMove func 2021-06-02 18:02:04 -03:00
LOuroboros
bf679fc99e Tweaked Task_ShowAiKnowledge too 2021-06-02 17:42:55 -03:00
LOuroboros
e65f8dfd0e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_debug 2021-06-02 17:40:17 -03:00
LOuroboros
586c76d93a Changed Clanging Scales' secondaryEffectChance to 0 
Review request.
 2021-06-02 16:46:28 -03:00
BuffelSaft
2a6b989c92 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press 2021-06-02 12:41:28 +12:00
LOuroboros
d48a6e00d4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious 2021-06-01 18:15:01 -03:00
Kurausukun
5c6b8ea8d6 re-add const to gEvolutionTable in daycare.c 2021-06-01 17:14:45 -04:00
Kurausukun
9f5bf65fb3 [PROBABLY LEAK-INFORMED] fix battle_transition fakematch, make 
consistent use of SOME_VRAM_STORE
 2021-05-31 18:12:35 -05:00
Kurausukun
2bbaf71998 [LEAK-INFORMED] fix CreateShedinja fakematch 
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
 2021-05-31 08:20:46 -05:00
Kurausukun
2705f2e5f4 [LEAK-INFORMED] also pretty dumb 2021-05-31 08:20:46 -05:00
Kurausukun
42021db743 [LEAK-INFORMED] literal dumbest fakematch ever 2021-05-31 08:20:46 -05:00
amiosi
b588e94395 more requested changes 2021-05-28 15:05:33 -04:00
amiosi
7b530a34bf finish requested changes 2021-05-27 20:14:46 -04:00
amiosi
03a7020512 double oops 2021-05-27 16:16:12 -04:00
amiosi
36c977d9eb oopsie 2021-05-27 16:01:34 -04:00
amiosi
f7651fd592 most fixes from requested changes 2021-05-27 15:55:19 -04:00
amiosi
fc81994579 Merge branch 'battle_engine' into old_findings 2021-05-27 15:28:02 -04:00
gAlfonso-bit
c9c5586068
Fixed ChangeBgY_ScreenOff‘s signature. (#1447) 
* Fix Functions

* Fix ChangeBgY_ScreenOff signature

* Remove unneeded changes

* Fix argument mismatch

Just to get this out of the way

* Not needed

* Update palette.c
 2021-05-27 07:32:09 -05:00
Kurausukun
5d5327c0b7 better match 2021-05-25 04:32:47 -04:00
Kurausukun
5ae5cf110d [LEAK-INFORMED] fix fakematch in DrawWallpaper 2021-05-25 04:03:11 -04:00
ghoulslash
c91240068c add sun check to flower gift ally boosts 2021-05-23 14:45:21 -06:00
Eduardo Quezada D'Ottone
6afe2ec74e Fixed compile error & updated names and value to correspond to the change. 2021-05-23 15:28:29 -04:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d fix SIDE_STATUS_SCREEN_ANY 2021-05-23 12:22:07 -06:00
gAlfonso-bit
ff16812f99
UBFix: uninitialized variables in m4a engine and siirtc.c (#1432) 2021-05-23 09:56:37 -05:00
gAlfonso-bit
ffbbc88801
BUGFIX: battle scripts (#1436) 2021-05-23 09:35:03 -05:00
MissingNoL
dd9920e80b
Update move_descriptions.h 2021-05-23 02:41:41 -07:00
MissingNoL
8b6906bf32
Update abilities.h 2021-05-23 02:39:57 -07:00
LOuroboros
5ef106f061
Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT 2021-05-22 10:29:57 -03:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
Eduardo Quezada D'Ottone
d1d95df409 Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7 2021-05-21 11:29:13 -04:00
LOuroboros
83a1351e82 Tweaked Task_ShowAiPoints to comply with the PE 
Due to the removal of the Deoxys hack, this function needed some minor adjustments that could have always been handled by using the #ifdef preproc directive.
 2021-05-17 18:33:12 -03:00
Eduardo Quezada D'Ottone
76b99e66dc Added missing Treecko from animation list. 2021-05-16 20:46:58 -04:00
ExpoSeed
a7e3da2301 pyramidWinStreas 2021-05-15 15:59:54 -05:00
ExpoSeed
361fa594b3 Various BUGFIXes and UBFIXes 2021-05-15 15:56:17 -05:00
gAlfonso-bit
ab8318cc79 Fix UB: Destoyed task is modified. 
After destruction, task is no longer used, so updating its values is worthless.
 2021-05-15 14:35:32 -05:00
Kurausukun
3a403dc520 [LEAK-INFORMED] fix do {} while (0) in apprentice 2021-05-13 11:29:46 -05:00
Kurausukun
e737f1f924 fix main_menu goto 2021-05-13 11:29:11 -05:00
Kurausukun
2cc38acb84 fix item.c gotos 2021-05-13 11:29:11 -05:00
Kurausukun
3b7f708eb0 fix player_pc goto 2021-05-13 11:29:11 -05:00
Kurausukun
0c7773ad75 fix mystery_gift gotos 2021-05-13 11:29:11 -05:00
Kurausukun
f0453871a2 fix battle_dome goto 2021-05-13 11:29:11 -05:00
Kurausukun
dbc1b9aacf fix goto in bike.c 2021-05-13 11:29:11 -05:00
Kurausukun
7740ca1303 replace raw values with char constants 2021-05-13 11:26:15 -05:00
Kurausukun
fa23b196a9 [LEAK-INFORMED] fix battle_interface fakematch 2021-05-13 11:26:15 -05:00
gAlfonso-bit
9a195c0fef Cherry-pick roamer bug fix from pokefirered 
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
 2021-05-13 11:23:42 -05:00
gAlfonso-bit
3e15a3ef8f Update IsPokemonCryPlaying 2021-05-13 11:23:11 -05:00
ExpoSeed
43854664b5 Fix UB in RotatingGate_RotateInDirection 2021-05-11 10:12:01 -05:00
LOuroboros
95d41524a2 Implemented Clanging Scales' effect 2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04:00
ultima-soul
e864c39a5d Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-05-04 10:04:35 -07:00
ghoulslash
fd3605b023
Merge pull request #1443 from AmbientDinosaur/patch-1 
Keen Eye evasion ignoring effect from Gen 6
 2021-05-04 09:49:56 -06:00
ghoulslash
6b7a7ca260
Merge pull request #1406 from ghoulslash/be_bugfix 
Fix data corruption from HideMegaTriggerSprite
 2021-05-04 09:45:03 -06:00
ghoulslash
1ccf43b5f7
Merge pull request #1451 from LOuroboros/stench 
Implemented Stench's battle effect
 2021-05-04 09:41:13 -06:00
ghoulslash
a3e6fe1ef4
Merge pull request #1442 from LOuroboros/patch-1 
Fixed Punk Rock
 2021-05-04 09:37:54 -06:00
ghoulslash
984f49747f
Merge pull request #1454 from LOuroboros/HandleAction_UseMove 
Minor syntax tweaks to HandleAction_UseMove
 2021-05-04 09:37:10 -06:00
ghoulslash
97ae2fe1be
Merge pull request #1460 from AmbientDinosaur/patch-2 
Corrected the move data for Gen 4 Overheat
 2021-05-04 09:36:36 -06:00
ghoulslash
d73efc45e4
Merge pull request #1462 from AmbientDinosaur/patch-3 
Remove superfluous define of LEVEL_UP_END
 2021-05-04 09:33:23 -06:00
ghoulslash
e803b42827
Merge pull request #1467 from LOuroboros/gravity_acc 
Added Gravity's missing acc boost
 2021-05-04 09:32:58 -06:00
ghoulslash
afea2cf5fa
Merge pull request #1482 from BuffelSaft/room_moves_text 
Fix Wonder Room, Magic Room battle messages
 2021-05-04 09:32:37 -06:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix 
Make Big Root affect absorb moves
 2021-05-04 09:32:18 -06:00
ghoulslash
e343090a8b
Merge pull request #1479 from BuffelSaft/orb_fix 
Fix Toxic Orb and Flame Orb affecting Pokemon they shouldn't
 2021-05-04 09:31:58 -06:00
BuffelSaft
ec4012e95d Fix "Room" move battle messages 
Move new line so these messages fit in the text box.
 2021-05-04 23:57:43 +12:00
BuffelSaft
5d177f0a15 Make Big Root affect absorb moves 
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
 2021-05-04 23:20:22 +12:00
BuffelSaft
542201dd4f Add missing ability checks to orbs 
Flame Orb shouldn't burn mons with Water Bubble and neither orb should affect mons with Comatose.
 2021-05-04 23:08:48 +12:00
BuffelSaft
e8598076a8 Fix Toxic and Flame Orb 
Shouldn't inflict status conditions on a fainted mon.
 2021-05-04 22:55:19 +12:00
GriffinR
4206359862 Fix some object lock names 2021-05-04 01:21:50 -04:00
LOuroboros
5489ab97e4 MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK 2021-05-01 07:37:23 -03:00
Kurausukun
608c829acd change usages of float/double to f32/f64 2021-05-01 01:41:27 -04:00
GriffinR
2608018862 Use some missing fieldmap constants in trainer hill 2021-04-29 16:12:50 -04:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix 
Document TV
 2021-04-29 00:25:01 -04:00
LOuroboros
3dbb096393 Added Gravity's missing acc boost 2021-04-28 23:31:58 -03:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims 
Document battler affine anims, default pokeball throw
 2021-04-28 13:56:42 -04:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp 
Sync e-reader helpers, document trainer hill e-reader
 2021-04-28 06:08:57 -04:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
c6300b5325
Merge pull request #1417 from GriffinRichards/doc-pyramidbag 
Document Battle Pyramid Bag
 2021-04-27 14:48:09 -04:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil 
Some Contest clean up
 2021-04-27 02:29:41 -04:00
GriffinR
265b49c47b Label missing sprite anims 2021-04-26 14:41:15 -04:00
GriffinR
d74017d256
Merge pull request #1419 from GriffinRichards/doc-animstatus 
Label more unused battle anims
 2021-04-26 13:32:15 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata 
Document trade sequence animation, some trade cleanup
 2021-04-26 13:26:12 -04:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bee60f4c64 Document battler sprite affine anims, default pokeball throw 2021-04-25 02:18:34 -04:00
GriffinR
e065c0c285 Label more unused battle anims 2021-04-24 18:26:25 -04:00
GriffinR
86475c5ded Document trainer hill ereader 2021-04-24 18:04:27 -04:00
GriffinR
004c37bf02 Sync ereader_helpers with pokefirered 2021-04-24 18:03:06 -04:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
GriffinR
f823cd224f
Merge pull request #1416 from ProjectRevoTPP/apprentice_fix 
[LEAK INFORMED] Fix apprentice.c do{}while(0)
 2021-04-22 17:25:52 -04:00
ProjectRevoTPP
6ebd0ccb57 add NO_COND macro 2021-04-22 17:20:28 -04:00
ProjectRevoTPP
5c51a3ecc6 get rid of apprentice fakematching(s) 2021-04-22 16:40:46 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
e874dfcbc8
Merge pull request #1408 from GriffinRichards/doc-pokemonstorage 
Document Pokémon Storage System
 2021-04-22 01:32:16 -04:00
ProjectRevoTPP
ddc1534098 idiot, get rid of code in block 2021-04-21 21:38:42 -04:00
ProjectRevoTPP
00eeb727db fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy 2021-04-21 21:37:12 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
ProjectRevoTPP
57948b86a8 Eliminate the last fakematching. We are free of nonmatchings/fakematchings! 2021-04-20 21:31:39 -04:00
GriffinR
a2a9f22612 Clean up contest_util 2021-04-20 21:16:47 -04:00
ProjectRevoTPP
21f05a3c01 Resolve sio32intr_clock_slave fakematching. One left! 2021-04-20 12:58:50 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
Kurausukun
d542baf14b THE BEAST IS SLAIN 2021-04-19 23:44:24 -04:00
GriffinR
342ebbf406
Merge branch 'master' into doc-pokemonstorage 2021-04-18 01:49:09 -04:00
GriffinR
52495e889f Doc storage - cleanup 2021-04-18 01:44:25 -04:00
GriffinR
6f967ff6ad Doc storage - standardize names, drop PSS 2021-04-17 23:40:27 -04:00
GriffinR
33c68255de Doc storage - unk utility 2021-04-17 23:31:29 -04:00
GriffinR
7bf89d6446 Doc storage - icon scroll 2021-04-17 23:00:08 -04:00
GriffinR
c921994ce1 Doc storage - tilemap util, place change 2021-04-17 19:02:30 -04:00
GriffinR
1c3e387d43 Doc storage - party menu 2021-04-17 14:33:00 -04:00
GriffinR
cd2a99b7c4 Doc storage - misc cleanup, some item/cursor 2021-04-17 13:33:29 -04:00
GriffinR
96dabc1a7f Doc storage - multi move 2021-04-16 22:36:37 -04:00
GriffinR
80cc7d46ae Doc storage - fix row/column flip 2021-04-16 15:07:10 -04:00
GriffinR
e5f0d2f736 Doc storage - releasing, some cursor 2021-04-16 04:30:09 -04:00
GriffinR
c1da6b29bc
Merge pull request #1405 from GriffinRichards/constants-display 
Add more usage of DISPLAY constants, misc REG constants
 2021-04-16 01:30:03 -04:00
Kurausukun
3e804cb7d1 document decoding buffer 2021-04-16 00:58:54 -04:00
GriffinR
84e1cbaaa6 Doc storage - misc gfx, item icons 2021-04-15 22:07:12 -04:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
a1ed59450e Doc storage - wallpaper and titles 2021-04-15 16:09:41 -04:00
GriffinR
30fecca109 Doc storage - menu texts 2021-04-15 13:31:18 -04:00
GriffinR
f94540c2b8 Misc reg constant cleanup 2021-04-15 03:14:42 -04:00
GriffinR
8368b753df More usage of WININ/OUT constants 2021-04-15 02:43:09 -04:00
GriffinR
62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
GriffinR
c4ef45c161
Merge pull request #1403 from GriffinRichards/doc-pokeblock 
Document Pokéblock menu and feeding scene
 2021-04-14 14:17:36 -04:00
GriffinR
be84499b56 Drop static function argument names 2021-04-14 12:24:09 -04:00
GriffinR
98ab546d3a Label misc unused move anims 2021-04-13 04:04:09 -04:00
GriffinR
7645be27eb Label unused move anims in anim_effects_3 2021-04-13 03:28:03 -04:00
GriffinR
f9f33b643e Label unused move anims in anim_effects_2 2021-04-13 03:17:39 -04:00
GriffinR
56057d3c32 Label more unused battle anims 2021-04-13 02:50:37 -04:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim 
Document Pokémon animation
 2021-04-13 01:36:15 -04:00
GriffinR
042a2ecc41 Document pokeblock feed scene 2021-04-12 18:44:37 -04:00
Marcus Huderle
e92d2005c4 Use designated initializers for gTypeNames 2021-04-12 17:41:16 -05:00
GriffinR
c786a9b20c Document pokeblock menu 2021-04-11 18:10:05 -04:00
GriffinR
2166e337a1 Label unused move anims 2021-04-11 13:21:22 -04:00
AmbientDinosaur
232acab1a2
Remove superfluous define of LEVEL_UP_END 
LEVEL_UP_END is already defined in constants/pokemon.h
 2021-04-10 22:55:07 +02:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field 
Document field
 2021-04-10 13:05:51 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc 
Clean up battle scripts
 2021-04-10 12:41:35 -04:00
GriffinR
fb24336e8f Pokemon animation misc cleanup 2021-04-10 01:36:06 -04:00
GriffinR
72ba8cf58d Document pokemon animation types 2021-04-10 00:50:28 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
AmbientDinosaur
ad19b262eb
Corrected the move data for Gen 4 Overheat 
The contact flag was removed in Gen 4, and the base power was lowered in Gen 6. Currently, the changes are flipped around.
 2021-04-08 03:21:51 +02:00
ExpoSeed
e11fd352fa
Merge pull request #1364 from ghoulslash/two-turn 
Fix Two-Turn Moves Failing Innapropriately
 2021-04-07 16:12:13 -05:00
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05:00
ExpoSeed
45405e95b0
Merge pull request #1418 from BuffelSaft/rage_powder_fix_1 
Fix powder immunity for self-targeting moves
 2021-04-07 16:06:57 -05:00
ExpoSeed
8a49d66622
Revert "Made Thousand Arrows bypass type immunity" 2021-04-07 15:03:11 -05:00
ExpoSeed
f8d3029537
Merge pull request #1453 from LOuroboros/thousand_arrows 
Made Thousand Arrows bypass type immunity
 2021-04-07 14:58:48 -05:00
GriffinR
c95e89e083 Remove old variables 2021-04-07 13:32:08 -04:00
GriffinR
356e63db03 Clean up fieldmap, port frlg macros 2021-04-07 13:26:02 -04:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
0dc7ff8994 Minor misc field doc 2021-04-06 17:17:41 -04:00
GriffinR
7d2a94282a Label horizontal fog data 2021-04-06 17:05:38 -04:00
GriffinR
4a1cfbead2 Document remaining overworld 2021-04-06 16:55:43 -04:00
GriffinR
86a9d94ce1 Document fieldmap 2021-04-06 16:05:43 -04:00
GriffinR
8bad478b49 Document disguise field effects 2021-04-06 14:51:39 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
802d2b2f0f Label Kyogre/Groudon anims 2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
GriffinR
553fe6239a Document more field effects 2021-04-05 18:21:17 -04:00
GriffinR
f90026826a Document some weather, field effects 2021-04-04 17:52:07 -04:00
ExpoSeed
2bbab03eba
Merge pull request #1430 from LOuroboros/decap_battle_types 
Decapped the in battle type strings
 2021-04-04 15:11:13 -05:00
ExpoSeed
df900ca310
Merge pull request #1419 from LOuroboros/mega_bracelet 
Added a check for the Mega Bracelet in CanMegaEvolve
 2021-04-04 15:06:40 -05:00
Eduardo Quezada D'Ottone
2034d6eb32
Merge pull request #1424 from ghoulslash/popup 
Ability Pop Up Apostrophes
 2021-04-04 15:32:32 -04:00
Eduardo Quezada D'Ottone
8bc91f9d23
Merge pull request #1435 from LOuroboros/defeatist 
Fixed Defeatist's check
 2021-04-04 13:59:34 -04:00
LOuroboros
63edb34fe2 Minor syntax tweaks to HandleAction_UseMove 2021-04-04 08:47:38 -03:00
LOuroboros
228f711bf6 Made Thousand Arrows bypass type immunity 2021-04-04 07:38:38 -03:00
GriffinR
5fa20534f9 Label remaining fields in Weather struct 2021-04-04 00:52:17 -04:00
GriffinR
b926fa6b07 Document thunderstorm 2021-04-04 00:44:20 -04:00
GriffinR
1494a83035 Sync drought with pokefirered, add weather tags 2021-04-03 22:47:58 -04:00
LOuroboros
9f83c9b574 Implemented Stench's battle effect 
And updated its description.
 2021-04-03 23:47:10 -03:00
GriffinR
fe1b757af5 Some constant use in WallyHandleActions 2021-04-03 16:37:00 -04:00
GriffinR
b6711441f5 Fix AI Guard Spec use, and Specs->Spec 2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
LOuroboros
4d773ef40c Removed the BattleScript from Inner Focus 
Any questions shall be directed to Mr. Junichi Masuda.
 2021-04-03 00:17:30 -03:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
AmbientDinosaur
d310edda4b
Keen Eye evasion ignoring effect from Gen 6 2021-04-02 19:25:07 +02:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b Document Contest Lady TV Show 2021-04-02 01:49:38 -04:00
LOuroboros
5106867116
Update battle_util.c 2021-04-02 04:10:20 +00:00
GriffinR
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred 
Document intro and credits sequences
 2021-04-01 23:13:59 -04:00
GriffinR
51970f97b0
Merge pull request #1393 from GriffinRichards/doc-dewfordtrend 
Document Dewford Trend and match_call.c
 2021-04-01 22:19:48 -04:00
GriffinR
1ff6aaf57d Add constant use for match call text ids 2021-04-01 04:21:26 -04:00
GriffinR
f58465a274 Document match_call.c 2021-04-01 03:29:15 -04:00
BuffelSaft
20a7dec070 Fix Thousand Arrows vs. Flying Type 
Should ignore type modifiers against flying types that aren't grounded. Previous code just negated the targets' flying typing.
 2021-04-01 17:23:47 +13:00
LOuroboros
ed74430d26 Added a variation of BattleScript_NotAffected 
This one triggers the Ability PopUp.
 2021-03-31 23:33:51 -03:00
LOuroboros
da24b9c251 Tweaked Oblivious 
-Made it unaffected by a foe's taunt.
-Changed the Battle Script it calls when a foe tries to infatuate.
 2021-03-31 21:20:00 -03:00
LOuroboros
60b566f8b6 Fixed Defeatist's check 2021-03-31 20:17:05 -03:00
GriffinR
69a6a97468 Remove incorrect comment 2021-03-31 17:29:09 -04:00
GriffinR
5ba858d19c Label missing easy chat symbols 2021-03-31 16:56:10 -04:00
GriffinR
771a434730 Label Trend Watcher TV show texts 2021-03-31 16:29:42 -04:00
GriffinR
86856098a3 Document Dewford Trend 2021-03-31 16:08:42 -04:00
BuffelSaft
35add44a90 Thousand Arrows hits airborne targets 
Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc.
Also fixed its effect chance, which was 0 instead of 100.
 2021-03-31 23:05:30 +13:00
GriffinR
6b070010b2
Merge pull request #1392 from GriffinRichards/multichoicebool 
Use bool for multichoice ignoreBPress
 2021-03-31 01:27:42 -04:00
GriffinR
5d7c438efc
Merge pull request #1391 from GriffinRichards/objvram 
Add some uses of OBJ_VRAM/VRAM_SIZE
 2021-03-31 00:36:20 -04:00
GriffinR
f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
LOuroboros
66e86e3aac Decapped the in battle type strings 2021-03-31 00:47:57 -03:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
GriffinR
d5d1caf965 Add some uses of OBJ_VRAM/VRAM_SIZE 2021-03-30 15:07:04 -04:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00
GriffinR
dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR
09ff1524b4 Finish documenting credits 2021-03-29 19:58:29 -04:00
Kurausukun
102582a3df Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc 2021-03-29 18:36:18 -04:00
Kurausukun
79a8eb481f 1 to true 2021-03-29 18:32:22 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush 
Document Berry Crush
 2021-03-29 12:38:16 -04:00
Marcus Huderle
6cceb05cb7 Document some text-related things 2021-03-29 11:20:00 -05:00
ghoulslash
856781ce56
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:03:05 -06:00
ghoulslash
a8c40a8d6f
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:03:00 -06:00
ghoulslash
332286ce03
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:56 -06:00
ghoulslash
d7c7f808b8
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:51 -06:00
ghoulslash
97428b6e10
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:46 -06:00
ghoulslash
31cdf043cc
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:41 -06:00
ghoulslash
d0f5528abb
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:34 -06:00
ghoulslash
492b5718e7
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-29 08:02:21 -06:00
GriffinR
62968895ca Add MON_PIC_SIZE constant 2021-03-29 09:38:19 -04:00
GriffinR
357c5439f5 Document some credits 2021-03-29 08:52:40 -04:00
GriffinR
c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
Scott
5cb8ec4247 Rename IsNotEventLegalMewOrDeoxys 2021-03-27 17:27:32 -05:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
GriffinR
0f869fb266 Remaining labels in trainer_card 2021-03-22 15:30:19 -05:00
GriffinR
2be0c52c17 Remaining labels in map_name_popup 2021-03-22 15:30:19 -05:00
GriffinR
1cc0a3506f Label misc field effects 2021-03-22 15:30:19 -05:00
GriffinR
4077c53338 A few labels in party, start, option menus 2021-03-22 15:30:19 -05:00
GriffinR
9773b436d2 Clean up shop.c 2021-03-22 15:30:19 -05:00
GriffinR
6127c6f32e Misc labels in battle facilities 2021-03-22 15:30:19 -05:00
Kurausukun
9eb5794482 cleanup some m4a code (thanks to shoomer) 2021-03-21 13:43:53 -05:00
GriffinR
dfc6ee0e9e Add SAFE_DIV 2021-03-21 13:43:14 -05:00
GriffinR
28aff5b179 Correct ClearRankingHallRecords bugfix 2021-03-21 13:43:14 -05:00
GriffinR
557152b06e Minor link cleanup 2021-03-21 13:40:40 -05:00
Kurausukun
7198d40ec8 port some documentation from FR 2021-03-19 18:49:19 -04:00
Kurausukun
5b910a11b4 port miscellaneous fr documentation 2021-03-18 20:35:39 -04:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
ghoulslash
539806d176 ability pop up apostrophes 2021-03-17 14:26:33 -06:00
BuffelSaft
937c24ca51 Remove special Body Press effect 
Only include the official effect for Body Press to stay faithful to the gen 8 games.
 2021-03-16 23:37:02 +13:00
BuffelSaft
7d237d8ff6 Implement Body Press' effect 
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
 2021-03-16 22:56:44 +13:00
Kurausukun
3baac6ef3c port some missed berry crush documentation 2021-03-15 23:55:10 -04:00
GriffinR
ecd269ba2c
Merge pull request #1372 from GriffinRichards/doc-countdown 
Document minigame countdown
 2021-03-15 21:39:58 -04:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8352ebcc48 Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer 2021-03-15 09:46:57 -04:00
LOuroboros
d6e89a99ce Corrected the name of an included header file 
include/constants/battle_moves.h doesn't exist.
The right header file to include was include/constants/moves.h instead.
 2021-03-14 12:54:57 -03:00
amiosi
b081a00891 Merge branch 'battle_engine' into old_findings 2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen 
Add Ripen and Finish Gen4 Berries
 2021-03-13 11:16:42 -03:00
Seth Barberee
4158f07dee move bgBuffers back to unk138 2021-03-12 19:24:03 -06:00
Seth Barberee
fda56d6f47 berry_crush: sync some pokefirered names with pokeemerald 2021-03-12 18:39:25 -06:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
PikalaxALT
e6b1b97aa1 Nonmatching resoltuion 
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
 2021-03-12 13:55:07 -05:00
GriffinR
b1a69d95ea Document minigame countdown 2021-03-11 14:25:22 -05:00
GriffinR
6c297d19e8
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking 
Document Dodrio Berry Picking
 2021-03-10 18:55:41 -05:00
LOuroboros
aa4c28dcf3 Added a check for the Mega Bracelet in CanMegaEvolve 2021-03-10 09:10:58 -03:00
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
ghoulslash
208b964a56
Update src/battle_util.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-03-09 16:35:56 -07:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
ghoulslash
68388f633f merge with be 2021-03-08 18:58:16 -07:00
ExpoSeed
9ec04fcce8
Merge pull request #1397 from ghoulslash/escape 
Fix Ghost Types Unable to Escape
 2021-03-08 17:24:00 -06:00
GriffinR
6274acfe5f Fix out of bounds access for fighting anims 2021-03-08 14:32:20 -05:00
BuffelSaft
1f54233953 Fix powder immunity for self-targeting moves 
Example: Because Rage Powder targets the user, this check is needed to allow grass types to use it.
 2021-03-07 11:00:52 +13:00
N
94a883d600 Fix space 2021-03-04 19:36:44 -06:00
N
99c6a504e0 Finish renaming functions 2021-03-04 19:36:44 -06:00
N
b9b33b6f2b Some renaming 2021-03-04 19:36:44 -06:00
N
7b046ebd1d rename gBerryCrushGame 2021-03-04 19:36:44 -06:00
N
d5a63681e8 Fixed faulty define 2021-03-04 19:33:40 -06:00
N
d63431ae88 Fix comment 2021-03-04 19:33:40 -06:00
N
a2f757c7a6 Document BG_PLTT usage in Agb_Main 2021-03-04 19:33:40 -06:00
Kurausukun
204e95dfea remove unnecessary changes 2021-03-04 19:32:16 -06:00
Kurausukun
dec5e8eee5 steal matching from #1333 2021-03-04 19:32:16 -06:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
GriffinR
734a15135f Clean up a few unlabeled scripts 2021-03-04 19:30:19 -06:00
GriffinR
69f7882b5e Label missed pokemon jump anims 2021-03-03 14:32:09 -05:00
GriffinR
b9c733495b Document dodrio berry picking 2021-03-03 14:26:05 -05:00
ghoulslash
f83e8b4f94
Update src/battle_message.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 10:48:17 -07:00
ghoulslash
5207d48b21
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 10:48:11 -07:00
ghoulslash
6739433e9e
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 10:48:05 -07:00
ghoulslash
64e3f7dc24
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 10:47:59 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
99c8bd19ca
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:25 -07:00
ghoulslash
3edb7ede29
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:20 -07:00
ghoulslash
43ec4e1041
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:14 -07:00
ghoulslash
bcb6fe154b
Update src/battle_main.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:00 -07:00
ghoulslash
63b1a02c28
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:13:56 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities 
More Gen 8 Abilities
 2021-03-01 10:40:09 -08:00
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
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns 
Update tailwind timer To Gen5
 2021-03-01 08:51:40 -08:00
ultima-soul
ef054c5d48
Merge pull request #1342 from ghoulslash/fixes 
Magic Room Affects Macho Brace/Power Item Speed Drop
 2021-03-01 08:50:59 -08:00
GriffinR
91ab30fa71 Rename mon markings struct 2021-02-28 17:11:46 -06:00
GriffinR
ed0347476c Remove old declaration and define 2021-02-28 17:11:46 -06:00
GriffinR
031da44cab Document mon markings 2021-02-28 17:11:46 -06:00
GriffinR
8bfd1370c9
Merge pull request #1352 from huderlem/GetOpponentMostCommonMonType 
Document GetOpponentMostCommonMonType and fix its fake matching
 2021-02-28 17:27:39 -05:00
Marcus Huderle
200e8214cf Document GetOpponentMostCommonMonType and fix its fake matching 2021-02-28 10:43:56 -06:00
GriffinR
cbc7a72814
Merge pull request #1346 from GriffinRichards/doc-pokejump 
Document pokemon jump
 2021-02-28 11:19:02 -05:00
N
6c07031c85 Remove redundant statements 2021-02-28 10:06:07 -06:00
N
cab3728e96 Strangest match 2021-02-28 10:06:07 -06:00
huderlem
10c77f1bc2
Merge pull request #1345 from GriffinRichards/doc-rtcscreen 
Document/clean up some minor screens
 2021-02-28 10:03:22 -06:00
Marcus Huderle
c900de35e7 Fix build and cleanup mistakes 2021-02-28 09:54:55 -06:00
Marcus Huderle
a85fada314 Document more battle anim effects 2021-02-28 09:54:55 -06:00
GriffinR
1912b0cf0a
Merge branch 'master' into doc-rtcscreen 2021-02-28 10:28:43 -05:00
GriffinR
3f59362397
Merge branch 'master' into doc-pokejump 2021-02-28 10:27:50 -05: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
763724a980 Shifts to mult in ShowBonus 2021-02-26 21:13:16 -05:00
GriffinR
117b90a261 Document pokemon jump 2021-02-26 17:26:39 -05:00
GriffinR
2dfa84c10f Clean up berry_fix_program 2021-02-24 16:46:57 -05:00
GriffinR
f172ff84c9 Clean up save_failed_screen 2021-02-24 14:53:32 -05:00
GriffinR
f09278393e Document reset_rtc_screen 2021-02-24 14:29:33 -05:00
GriffinR
293df1887f Fix comment typo 2021-02-24 11:26:26 -05:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
GriffinR
e52b46ab43 Clean up script.c 2021-02-24 11:03:17 -05:00
GriffinR
81a7f491b7 Use WINDOW_NONE constant 2021-02-24 11:03:08 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
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
amiosi
524982d218 rock blast was unaffected by bulletproof in gen 6 
source: bulbapedia
 2021-02-19 22:25:57 -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
Evan
d65d5cb8fd add AI_FLAG_SMART_SWITCHING, some burn checks 2021-02-14 09:37:04 -07:00
Evan
167aaef8f6 add faint check to AI_SetupFirstTurn (thx Syreldar) 2021-02-14 09:20:42 -07:00
Evan
49e41a2d3b fix ShouldSetScreen (thx Syreldar) 2021-02-14 09:11:29 -07: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
Evan
0664daf384 fix some post-merge errors 2021-02-12 11:02:10 -07:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
Evan
4782f713f2 update semi invulnerable state check 2021-02-12 08:57:57 -07:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
Evan
6f9b310a23 fix mega trigger sprite data corruption 2021-02-11 16:00:49 -07:00
amiosi
e5ff25ccbf partial update to nature/secret power and camouflage 2021-02-11 17:38:18 -05:00
amiosi
62c3a8ce2a spacing 2021-02-11 17:19:45 -05:00
amiosi
1df295a582 battle config and zippy zap 
plus fix mirror move mistakes
 2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af water shuriken and howl 2021-02-11 16:20:13 -05:00
amiosi
172fe3a257 mirror move + nightmare fix 2021-02-11 09:49:45 -05:00
amiosi
eaf88687b9 do gen 4 king's rock 
fix some other mistakes as well
 2021-02-10 19:14:05 -05:00
amiosi
648f7343a8 old gen fixes + lock-on & psych up 
fix beat up config option as well
 2021-02-10 18:41:49 -05:00
amiosi
541f7eb7b6 targetting fixes 2021-02-10 13:57:23 -05:00
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene 
Document evolution scene
 2021-02-08 18:21:30 -05:00
amiosi
160b08afb0 fix the rest of the flinching moves 2021-02-08 17:29:35 -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
amiosi
038bf42b51 kings rock Gen_X configs 2021-02-08 17:04:33 -05:00
GriffinR
2237d0748f Label unused layouts 2021-02-08 14:45:56 -05:00
Evan
1405f04e1e ai understands constant-damage effects 2021-02-07 12:39:23 -07: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
amiosi
eb56488b81 fix build errors 2021-02-06 20:08:25 -05:00
amiosi
8416f65dac king's rock changes 2021-02-06 19:47:06 -05:00
amiosi
30434b92de update even more moves to Gen 8 standard 2021-02-06 19:41:38 -05:00
amiosi
d8e592bf46 update many moves to Gen 8 standard 2021-02-06 19:08:46 -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
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
Evan
60f3ad77fe fix prankster blocking self-targeting moves 2021-01-23 12:40:17 -07: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