ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,128 Commits 1 Branch 0 Tags 235 MiB
1287c3d263
Commit Graph

4546 Commits

Author SHA1 Message Date
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const 
Add some missing battle arena constants
 2022-08-20 22:54:32 -04:00
GriffinR
1685365cd4
Merge pull request #1727 from AsparagusEduardo/pret_clean 
Cleanup from https://github.com/pret/pokefirered/pull/532
 2022-08-19 21:27:55 -04:00
GriffinR
c2d5dd2a1f Additional battle anim sync 2022-08-19 11:51:13 -04:00
Eduardo Quezada
5933c42439 Synced Route 4 and 10's MapSec labels 2022-08-16 18:23:37 -04:00
GriffinR
26734d80f3
Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum 
Convert MON_DATA constants into enum to ease editing and addition of fields.
 2022-08-15 18:51:32 -04:00
Eduardo Quezada
0149f420f9 Corrected comment 2022-08-15 17:36:55 -04:00
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
tustin2121
ec73158f16 Moving documentation comments per request 
from the discord chat.
 2022-08-15 16:37:38 -04:00
tustin2121
1cb659df8c Renaming Script Contexts 
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
 2022-08-15 15:18:12 -04:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen 
Clean up naming screen graphics
 2022-08-12 11:05:55 -04:00
GriffinR
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature 
Sector security -> signature
 2022-08-12 10:47:10 -04:00
GriffinR
cf4d05e9e7 Fix typo 2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb Add some missing battle arena constants 2022-08-11 12:02:56 -04:00
GriffinR
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable 
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
 2022-08-10 21:28:14 -04:00
GriffinR
bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up 2022-08-09 09:27:28 -04:00
Eduardo Quezada
1fd1870a13 Moved enum to include/pokemon.h 2022-08-08 18:40:47 -04:00
Eduardo Quezada
75d52dc762 Convert MON_DATA constants into enum to ease editing and addition of fields. 2022-08-08 18:18:17 -04:00
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
GriffinR
2487ddb128 Sector security -> signature 2022-08-05 10:42:31 -04:00
DizzyEggg
c991131b75 Change language stuff based on the french decomp 2022-08-04 11:53:16 +02:00
GriffinR
e5c36cd745 MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes 2022-08-03 14:21:13 -04:00
GriffinR
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn 
Clean up field_poison.c
 2022-08-02 13:20:49 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro 
Macros for keeping .partyFlags, .partySize, and .party in sync
 2022-08-02 13:11:43 -04:00
ExpoSeed
807c3fd17f Delete item and ability defines in configs 2022-08-02 00:28:42 -05:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
GriffinR
79c5a5983e
Merge pull request #1721 from AsparagusEduardo/pret_clean2 
Companion PR to pokefirered #525
 2022-08-01 16:57:40 -04:00
Eduardo Quezada
c6cdb2a281 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-31 22:57:46 -04:00
GriffinR
5101811407
Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands 
Further cleaning after comparing with pokefirered
 2022-07-30 09:09:23 -04:00
Eduardo Quezada
40805fffc0 Space cleanup 2022-07-29 21:28:39 -04:00
Eduardo Quezada
5d4b76c0ba Review changes from pokefirered #524 2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd Review changes 2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064 Cleanup by syncing src/battle_script_commands.c with pokefirered 2022-07-29 09:43:16 -04:00
Jaizu
7a8c28ccca
Remove duplicated CB2_InitCopyrightScreenAfterBootup 2022-07-29 10:52:36 +02:00
Greenphx9
05cbd6a906 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names 2022-07-29 18:49:25 +10:00
Eduardo Quezada
09af7422d5 Further cleaning after comparing with pokefirered 
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
 2022-07-28 01:27:05 -04:00
Martin Griffin
2380d13a43 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-07-27 23:25:37 +01:00
GriffinR
1da46a4bbc
Merge pull request #1715 from AsparagusEduardo/pret_docBooleans 
Documented boolean uses
 2022-07-27 12:09:02 -04:00
Eduardo Quezada
e1c15a9cf6 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-27 08:16:10 -04:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
LOuroboros
032b7b2ab9 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection 2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone
bfb86fdc86 Config for Gen 3 faint switch mechanics 2022-07-24 14:57:47 -04:00
Eduardo Quezada
e96c9c87fa Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 23:38:52 -04:00
Eduardo Quezada
231727d02b Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge 
# Conflicts:
#	asm/macros/event.inc
#	data/specials.inc
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2022-07-22 23:33:04 -04:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
ghoulslash
1260666c91
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides 
Added Egg breeding species overrides.
 2022-07-22 14:05:14 -04:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge 
Battle Engine pret merge
 2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone
56b9a50109 Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus 
# Conflicts:
#	include/constants/battle_config.h
 2022-07-21 16:28:16 -04:00
ghoulslash
49a932a892
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky 
Fixed Light That Burns The Sky not using the calculated damage category
 2022-07-21 16:14:38 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion 
Config for Explosion halving defense
 2022-07-21 16:11:32 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy 
Config for Sturdy's Gen5+ effect.
 2022-07-21 16:09:01 -04:00
Eduardo Quezada D'Ottone
e4ae280ca6 Fixed calls to IsZMove 2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone
25397e5794 Fixed Light That Burns The Sky not using the calculated damage category 
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
 2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone
0f3fdd410a Config for Sturdy's Gen5+ effect. 2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone
e14afd8957 Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5. 2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
cb34119711 Config for Charge raising Sp. Def. 2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1 Merge branch 'battle_engine' into BE_pretmerge 
# Conflicts:
#	src/battle_anim_fire.c
#	src/battle_controller_player.c
 2022-07-20 08:50:30 -04:00
ghoulslash
99424e1aaf
Update include/battle.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-07-19 19:03:05 -04:00
ghoulslash
2b5bb9f6e4 move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check 2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone
1cfb267b34 Config for Explosion halving defense 2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone
1dcbf59686 Config for Plus and Minus interaction 2022-07-18 08:11:02 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
Eduardo Quezada D'Ottone
e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone
f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-12 17:42:32 -04:00
Eduardo Quezada D'Ottone
c69275f373 Merge remote-tracking branch 'pret/master' into PE_pretmerge 
# Conflicts:
#	include/battle_anim.h
#	include/pokemon.h
#	src/data/pokemon/base_stats.h
 2022-07-12 17:20:49 -04:00
GriffinR
30a5821997
Merge pull request #1705 from sphericalice/move-unavailable 
Introduces a MOVE_UNAVAILABLE constant
 2022-07-12 11:32:57 -04:00
sphericalice
186f2c0232 Introduce a MOVE_UNAVAILABLE constant 2022-07-11 15:18:13 +01:00
Greenphx9
4294682d8c 16-letter move names 
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE

Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
 2022-07-11 12:49:30 +10:00
LOuroboros
a1004485c5 Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH 2022-07-10 20:08:28 -03:00
GriffinR
06dc93fc2f Clean up field_poison.c 2022-07-06 21:04:54 -04:00
ghoulslash
fac6f21ed0 AI_EFFECTIVENESS_xY are enums 2022-07-03 16:28:34 -04:00
ghoulslash
e4bf99d777 merge w be 2022-07-03 16:20:05 -04:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney 
Config for lost money after losing a battle
 2022-07-01 11:58:36 -04:00
ghoulslash
6cf0620f93
Merge pull request #2159 from Sneed69/trap-move-arrays 
Trap move battle string related code cleanup
 2022-07-01 11:07:28 -04:00
sneed
c1af418340 define B_MSG_WRAPPED_ constants 2022-07-01 17:52:46 +03:00
ghoulslash
fc2cfd8c9d
Merge pull request #2136 from LOuroboros/pePretMerge 
Pret merge for the pokemon_expansion
 2022-07-01 09:22:55 -04:00
ghoulslash
a349462b78
Merge pull request #2134 from LOuroboros/bePretMerge 
Pret merge for the battle_engine
 2022-07-01 09:21:51 -04:00
ghoulslash
42f3cccdbe
Merge pull request #2154 from HamishSinclair/poltergeist 
add poltergeist animation
 2022-07-01 09:19:49 -04:00
ghoulslash
f4918222e8
Merge pull request #2156 from Sneed69/ai_3rd_type 
Type effectivess related AI bugfixes
 2022-07-01 09:09:12 -04:00
ghoulslash
80ac427443
Merge pull request #2160 from Sneed69/ignore-mystery-type-3 
IS_BATTLER_OF_TYPE ignores third type if it's Mystery
 2022-07-01 08:55:08 -04:00
LOuroboros
aa5c6a3f01 Implemented affection-now-friendship mechanics 2022-06-22 00:18:01 -03:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier 
Add some battle frontier constant usage
 2022-06-18 10:22:58 -04:00
GriffinR
4660f8c88b Document battle tower TV show 2022-06-14 09:37:39 -04:00
GriffinR
7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
GriffinR
1f540845cb
Merge pull request #1675 from GriffinRichards/doc-arg 
Document generic arguments
 2022-06-09 11:11:02 -04:00
ghoulslash
b33a8b0cb4 move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use 2022-06-05 11:09:04 -04:00
ghoulslash
c694e0cb90 merge w be 2022-06-05 08:22:24 -04:00
GriffinR
bc2dbd772e Add warning to NUM_OBJ_EVENT_GFX 2022-06-03 16:18:34 -04:00
GriffinR
1ca1bff81c Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg 2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
Sneed69
c60de5055d remove IsMoveWithoutAnimation 2022-06-03 17:42:42 +03:00
sphericalice
380cb46919
Correct CreateRegionMapPlayerIcon's argument names 
Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h
 2022-06-03 15:04:52 +01:00
sneed
5934acbdc5 IS_BATTLER_OF_TYPE ignores 3rd type if mystery 2022-06-01 22:21:32 +03:00
sneed
86b436782a trap move related code cleanup 2022-06-01 22:01:50 +03:00
GriffinR
a8437493c1 Document generic argument names in battle anim palettes 2022-06-01 12:25:01 -04:00
GriffinR
5e6d8a77e4 Document some generic argument names 2022-05-31 14:34:25 -04:00