ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-08 02:23:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,097 Commits 1 Branch 0 Tags 235 MiB
bee4019d22
Commit Graph

3778 Commits

Author SHA1 Message Date
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav 
Document Pokénav
 2021-11-17 14:47:34 -05:00
GriffinR
eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
GriffinR
61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR
d414787932 Some TV clean-up 2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR
63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
Eduardo Quezada D'Ottone
cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03:00
GriffinR
c1130592fa Drop some overworld prefixes 2021-11-15 10:58:05 -05:00
GriffinR
65d3b58374 Add PARTY_NOTHING_CHOSEN 2021-11-15 10:57:06 -05:00
ghoulslash
2a1299715f merge w be 2021-11-15 10:45:59 -05:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks 
Adjusted elements to simplify the conflicts between BE and IE
 2021-11-15 08:27:28 -05:00
GriffinR
4275cf4b90 Rename pokenav match call files 2021-11-15 01:30:21 -05:00
GriffinR
14d78d7633 Finish match call menu doc 2021-11-15 01:20:03 -05:00
GriffinR
c779d03b3e Rename pokenav_match_call_ui 2021-11-15 00:21:40 -05:00
GriffinR
d4d4234283 Finish pokenav list ui doc 2021-11-15 00:09:02 -05:00
Wiz
927f9d27df Designate gBattleAnimBgImage_Attract and related as arrays 2021-11-14 17:08:03 -05:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off 
Fix Knock Off, add config
 2021-11-14 08:27:51 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim 2021-11-13 23:26:46 -05:00
GriffinR
159bb37bbe
Merge branch 'master' into fix_saveblock_reorder 2021-11-13 23:19:57 -05:00
GriffinR
9a932cd9c3
Merge pull request #1549 from GriffinRichards/doc-binterface 
Document remaining symbols in battle_interface, palette, and save
 2021-11-13 23:19:08 -05:00
ProjectRevoTPP
9d3345a6d6 Enforce structs to enforce save block order for modern toolchains. 2021-11-13 21:41:16 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata 
Clean up sound, add CRY_MODE constants
 2021-11-13 15:54:40 -05:00
GriffinR
b3e593dff5 Continue pokenav list ui doc 2021-11-13 15:52:58 -05:00
GriffinR
ec05157568 Move pokenav list item union out of list struct 2021-11-13 11:27:11 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5 Adjusted elements to simplify the conflicts between BE and IE 2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
Eduardo Quezada D'Ottone
8f52996144
Merge pull request #1892 from ghoulslash/be/wish 
wish update
 2021-11-13 11:01:04 -03:00
ghoulslash
9df66f4ac1
Merge pull request #1843 from Blackforest92/battle_engine 
Update Giga Impact's graphic and use fade-in battle animation.
 2021-11-13 08:54:37 -05:00
ghoulslash
a4204e5491
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-13 08:50:24 -05:00
Eduardo Quezada D'Ottone
bcb0f1b915
Merge pull request #1890 from kleeenexfeu/battle_engine 
Bypassing screens and protections correctly
 2021-11-13 10:11:02 -03:00
kleeenexfeu
f808710932
Moving IsBattlerProtected 2021-11-13 13:38:07 +01:00
GriffinR
3b91d8fdaf Start pokenav list ui doc 2021-11-12 20:36:19 -05:00
GriffinR
da5752fd0d Start match call menu doc 2021-11-12 20:17:06 -05:00
ghoulslash
c4efe06f38 wish update 2021-11-12 17:55:05 -05:00
GriffinR
ffe2970e30 Rename pokenav menu handler files 2021-11-12 17:13:50 -05:00
GriffinR
baeacbe2f1 Clean up pokenav general menus, organize pokenav graphics 2021-11-12 17:08:12 -05:00
ghoulslash
96fd8e696b brick break gen 4 and 5 config. clears aurora veil 2021-11-12 15:00:21 -05:00
ultima-soul
294fecd57c
Merge pull request #1888 from ghoulslash/be/contrary 
Fix Contrary Animation
 2021-11-12 10:19:37 -08:00
ghoulslash
a26da51e9d fix contrary animations for MOVE_EFFECT_statchange 2021-11-12 12:44:45 -05:00
ultima-soul
c5dabf34b8
Improve Serene Grace boost config comment. 2021-11-12 09:39:18 -08:00
GriffinR
004d1cab3f Clean up pokenav conditions doc 2021-11-12 11:13:49 -05:00
GriffinR
35aeff1b6d Rename pokenav conditions files 2021-11-12 11:07:52 -05:00
GriffinR
f5152094a9 Finish pokenav conditions doc 2021-11-12 11:01:22 -05:00
ghoulslash
201a38f487 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/ai_updates 2021-11-12 08:13:21 -05:00
ghoulslash
6214d8b625 rename config 2021-11-12 07:47:24 -05:00
BuffelSaft
bdbdd0564f Fix Knock Off, add config 
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
 2021-11-12 21:05:42 +13:00
ghoulslash
adc1413d98 add kings rock serene grace boost config 2021-11-11 17:48:15 -05:00
ghoulslash
2fac38cc83 merge w be 2021-11-11 16:16:26 -05:00
GriffinR
7efdc0902b Finish condition graph doc 2021-11-11 15:29:15 -05:00
ultima-soul
fd4d0db912 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects 2021-11-10 18:02:00 -08:00
GriffinR
4590887359 Clean up some register constant use 2021-11-10 17:01:21 -05:00
GriffinR
343ac99049 Start pokenav conditions doc 2021-11-10 17:00:54 -05:00
GriffinR
342b7da5d3 Fix CRY_MODE_ECHO 2021-11-10 11:59:15 -05:00
GriffinR
ef935f6f4a
Merge pull request #1544 from GriffinRichards/romheadergf 
Split headers from crt0.s
 2021-11-09 23:54:57 -05:00
BuffelSaft
e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
GriffinR
8e424b6985
Merge branch 'master' into doc-binterface 2021-11-09 16:09:48 -05:00
GriffinR
43e942c3af Clean up pokenav ribbons 2021-11-09 12:50:35 -05:00
ghoulslash
e635930a15 fixes 2021-11-08 21:33:00 -05:00
GriffinR
1c82571fa0
Merge pull request #1542 from GriffinRichards/doc-menu 
Document menu
 2021-11-08 21:23:21 -05:00
GriffinR
adf773f1ed Document remainder of save.c 2021-11-08 19:45:14 -05:00
GriffinR
ab1074e629 Label unknown palette functions 2021-11-08 16:08:36 -05:00
GriffinR
684f599a44 Label remaining battle_interface symbols 2021-11-08 16:03:44 -05:00
GriffinR
e3b6337c3a Finish battle_anim_mons doc 2021-11-08 14:29:37 -05:00
ghoulslash
01cf8e6452 add AI_MoveMakesContact, dissuade multi-hit attacks against rocky helmet 2021-11-08 11:55:06 -05:00
GriffinR
d20341646a Start battle_anim_mons doc 2021-11-08 11:46:13 -05:00
ghoulslash
8f320a8d33 some ai updates, recycle + ripen logic 2021-11-08 11:37:41 -05:00
GriffinR
1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
Blackforest92
76ba9d835a pulled latest RHH battle_engine 08-11-2021 2021-11-08 16:38:42 +07:00
BuffelSaft
d3a845d511 Fix CanAIFaintTarget 
Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.
 2021-11-08 20:37:28 +13:00
ghoulslash
a90cf4a501
Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves 
Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse
 2021-11-07 17:39:03 -05:00
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
Eduardo Quezada D'Ottone
4e6a459b14 Optimized terrain timers 2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone
8773e552ac Organized config and added failsafe to AnimTask_SetCamouflageBlend 2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone
1c4a0c205a Camouflage types config + extra terrains 2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone
b220da1d2a Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table 2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone
e9804a5023 Secret Power animation config 2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone
328976bf81 Secret Power effect config 2021-11-06 17:05:13 -03:00
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
ghoulslash
f7d11527aa
Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic 
Config for Synchronize's interaction with toxic poisoning
 2021-11-06 10:36:50 -04:00
Eduardo Quezada D'Ottone
ae8de0f07a Merge branch 'BattleEngine' into BE_TerrainMoves 
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_util.c
 2021-11-06 10:44:05 -03:00
BuffelSaft
5acebe32aa
Merge pull request #1817 from LOuroboros/photonGeyser 
Implemented Photon Geyser and Shell Side Arm
 2021-11-06 16:04:53 +13:00
Eduardo Quezada D'Ottone
202827068c
a 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone
8e49e3e653 Config for Synchronize's interaction with toxic poisoning 2021-11-05 21:16:13 -03:00
BuffelSaft
4007a8d1f8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song 2021-11-06 11:52:51 +13:00
Eduardo Quezada D'Ottone
6c70a6b872
Merge pull request #1863 from LOuroboros/soulDewBE 
Added a battle config for the Soul Dew
 2021-11-05 17:09:44 -03:00
LOuroboros
5f458c9cd3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-05 10:58:53 -03:00
ghoulslash
0b2542e447 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai 2021-11-05 09:46:12 -04:00
LOuroboros
d15eeeb8eb Fixed the comment for B_SOUL_DEW_BOOST 2021-11-05 10:37:41 -03:00
BuffelSaft
ee83d1142c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-05 21:40:05 +13:00
BuffelSaft
bf786c6c9a Fix Magma Storm 
Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.
 2021-11-05 18:22:52 +13:00
BuffelSaft
a8d44f84a1
Merge pull request #1852 from Blackforest92/battle_engine_2 
Update waterfall, trick room, & focus blast BG
 2021-11-05 15:27:52 +13:00
BuffelSaft
6df3975fc6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-05 14:32:33 +13:00
Eduardo Quezada D'Ottone
5eb8f1c158
Merge pull request #1855 from ghoulslash/be/abilityonside 
AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide
 2021-11-04 21:49:31 -03:00
GriffinR
e65677c944 Update modern linker script 2021-11-04 17:28:41 -04:00
LOuroboros
671cbabc3d Added a battle config for the Soul Dew 2021-11-04 17:25:31 -03:00