ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 12:44:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,094 Commits 1 Branch 0 Tags 235 MiB
cc174b622c
Commit Graph

69 Commits

Author SHA1 Message Date
Eduardo Quezada
afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
 2022-08-22 20:30:45 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
ghoulslash
770224d341 increase TEXT_BUFF_ARRAY_COUNT for expanded ability names 2021-12-23 18:58:15 -05:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06: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
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06: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
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
Evan
39139323f6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove 2021-01-20 17:36:37 -07: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
Evan
25abdeacc5 tidy up z move code 2020-12-01 16:36:44 -05:00
Evan
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
f114534ae3 z move anim/effect, black hole eclipse anim 2020-11-28 13:09:43 -05:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05: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
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -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
PokeCodec
0a13d718ea Make 0xFF have a lowercase "x" 2020-09-06 20:03:53 -04:00
PokeCodec
b49c5d188f Move buffer has and operation too 2020-09-06 17:59:42 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
7d3b68a27b Fix Champinship typo 2020-08-18 17:51:51 -04:00
DizzyEggg
3bdf675221 Hopefully illusion works as intended now 2020-06-28 19:45:48 +02:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
DizzyEggg
15d34c3513 Fix strings coz they had the same name for some unknown to me reason 2019-12-23 17:09:13 +01:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
Sewef
23b3d4bd5e Fix PREPARE_MOVE_BUFFER macro (#749) 2019-07-22 16:58:35 -04:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
Papa Cancer
61a7bd2788 Taunt fix etc. 
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
 2019-03-24 12:54:01 +00:00
DizzyEggg
8e9296a42b Fix team messages 2019-03-02 12:31:07 +01:00
DizzyEggg
dc39f76a95 Spectral Thief effect 2019-02-14 12:15:53 +01:00
DizzyEggg
68d94ad316 Implement trainer sliding 2018-11-03 01:17:16 +01:00
DizzyEggg
67384c08be Implement double wild battle functionality 2018-10-15 21:19:52 +02:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
38c89b9d0f Bank to battler 2018-09-01 18:36:08 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
e2f5e73445 More battle dome 2018-08-15 23:04:46 +02:00
DizzyEggg
66a3c13f49 Add new Side turn effects 2018-07-21 12:56:07 +02:00
DizzyEggg
5318cc656a Add some new battlestrings. 2018-07-15 18:53:43 +02:00
DizzyEggg
626b80106e Basic Battle Debug Menu is done 2018-07-13 23:00:56 +02:00
DizzyEggg
1c48e58574 small fixes 2018-07-07 14:24:19 +02:00
DizzyEggg
bfc64c9689 C vars sym ewram 2018-06-30 15:35:54 +02:00