ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 21:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,829 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

11829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
4dc72dcfc1
Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 
Implementing Teatime effect
 2022-12-30 17:49:54 -03:00
Eduardo Quezada D'Ottone
d120f2f183
Merge pull request #2541 from sphericalice/beat-up 
Fix Beat Up's battle script to avoid an out-of-bounds array access
 2022-12-27 13:32:05 -03:00
SphericalIce
200b71be02 Fix Beat Up's battle script to avoid an out-of-bounds array access 2022-12-27 10:49:57 +00:00
Eduardo Quezada D'Ottone
b74997f82e
Merge pull request #2538 from LOuroboros/intimidate 
Fixed some issues of the Intimidate's rework
 2022-12-26 08:10:25 -03:00
LOuroboros
17410fa9c5 Fixed some issues of the Intimidate's rework 2022-12-26 00:50:44 -03:00
SonikkuA-DatH
3e807e5b1e
Update battle_scripts_1.s 
fix ORs
 2022-12-21 15:12:06 -08:00
SonikkuA-DatH
c4db74460a
Update battle_util.c 
Noted Protection Bypassing
 2022-12-21 14:50:06 -08:00
SonikkuA-DatH
0a5154499e
Update battle_scripts_1.s 
Compensating Substitute, removing item
 2022-12-21 14:27:39 -08:00
Eduardo Quezada D'Ottone
da535fc8f1
Merge pull request #2530 from mrgriffin/rhh-setroost-cleanup 
Minor Roost fixes/cleanup
 2022-12-21 17:04:14 -03:00
Eduardo Quezada D'Ottone
341d2abdd6
Merge pull request #2533 from ghoulslash/be/aifix 
Fix Helping Hand AI
 2022-12-21 16:17:52 -03:00
ghoulslash
dba1aa4f0b fix ai helping hand 2022-12-21 12:05:38 -05:00
Eduardo Quezada D'Ottone
42d2bee519
Merge pull request #2527 from mrgriffin/rhh-cleanup-handle-terrain-move 
Cleanup HandleTerrainMove
 2022-12-21 12:21:46 -03:00
Martin Griffin
632ec92475 Minor Roost changes 
- Fix 'mon with Flying in type3 but not type1 or type2 is set to
  uninitialized roostTypes.
- Remove unread third roostTypes element.
- Option for Gen IV pure-Flying behavior.
 2022-12-21 14:52:01 +00:00
SonikkuA-DatH
405a42b246
Update battle_anim_effects_1.c 
spacing
 2022-12-20 18:17:49 -08:00
SonikkuA-DatH
8d28d23e74
Update src/battle_util.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 18:09:15 -08:00
SonikkuA-DatH
2c28076696
Update include/constants/battle_script_commands.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 18:08:38 -08:00
SonikkuA-DatH
5eaf0e15fc
Update data/battle_scripts_1.s 
-_-

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 18:08:01 -08:00
Philipp AUER
766c0140ee
Refactor sInverseTypeEffectivenessTable to implicit lookup (#2528) 
* [refactor, battle_util] replace sInverseTypeEffectivenessTable LUT by implicit lookup

* [review, style, squashme] update switch/case codestyle

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

* [review, squashme] merge code branches

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 22:48:41 -03:00
Martin Griffin
682c59869b Cleanup HandleTerrainMove 2022-12-20 21:28:54 +00:00
SonikkuA-DatH
07a91b9e9b
Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-19 17:18:43 -08:00
SonikkuA-DatH
459631eb96
Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-19 17:18:23 -08:00
SonikkuA-DatH
6215d4b1b4
Update src/battle_script_commands.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-19 17:18:05 -08:00
SonikkuA-DatH
f6fab92ac8
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-19 15:52:20 -08:00
ghoulslash
79fa2c79e2
Merge pull request #2517 from LOuroboros/speed_swap 
Fixed Speed Swap's effect
 2022-12-19 08:56:36 -05:00
ghoulslash
386a62fe81
Merge pull request #2526 from AsparagusEduardo/RHH/pr/fix/doubleWildChance 
Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set
 2022-12-19 08:55:32 -05:00
SonikkuA-DatH
562736a5e6
Update battle_scripts_1.s 
Changed STAT_BUFF_ALLOW_PTR to STAT_CHANGE_ALLOW_PTR
 2022-12-18 22:50:41 -08:00
SonikkuA-DatH
ffda816507
Update battle_script_commands.h 
Whoops, forgot the to copy paste various
 2022-12-18 22:41:15 -08:00
SonikkuA-DatH
2dbfc1c8f5
Update data/battle_scripts_1.s 
Fixes spacing. Thanks Lunos!

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-18 22:28:33 -08:00
SonikkuA-DatH
bf1a205661
Update src/battle_script_commands.c 
Bracket fixing

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-18 22:27:12 -08:00
SonikkuA-DatH
c81b702a86
Update src/battle_script_commands.c 
Spacing refix

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-18 22:26:51 -08:00
SonikkuA-DatH
03b5d36249
Update src/battle_script_commands.c 
removes various description

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-18 22:26:06 -08:00
SonikkuA-DatH
6a2a026c70
Update battle_anim.h 
Added required tags
 2022-12-18 22:23:51 -08:00
SonikkuA-DatH
5682247ace
Add files via upload 
Base upload. Need to apply Teatime changes...
 2022-12-18 19:14:54 -08:00
SonikkuA-DatH
b97a68656c
Delete battle_anim.h 
Need to replace with current...
 2022-12-18 19:14:01 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
SonikkuA-DatH
44b522fd1c
Update battle_script_commands.c 
Spacing
 2022-12-18 15:53:07 -08:00
SonikkuA-DatH
9cd8d81412
Update battle_scripts_1.s 
Fixed spacing
 2022-12-18 15:37:44 -08:00
Eduardo Quezada
bd7d949f5f Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set 2022-12-18 13:49:02 -03:00
Eduardo Quezada D'Ottone
892fa1bc55
Merge pull request #2524 from LOuroboros/patch-1 
Removed repeated stat change defines
 2022-12-18 10:42:28 -03:00
LOuroboros
089104cd9c
Update battle_script_commands.c 2022-12-18 10:35:58 -03:00
Eduardo Quezada D'Ottone
f6a89c9cc8
Merge pull request #2520 from LOuroboros/patch-1 
Updated ENDTURN_PLASMA_FISTS
 2022-12-17 12:14:07 -03:00
LOuroboros
4f951b7887
Updated ENDTURN_PLASMA_FISTS 2022-12-17 03:44:19 -03:00
Eduardo Quezada D'Ottone
937f5acc84
Merge pull request #2519 from AsparagusEduardo/RHH/pr/sync/pret_20221216 
I'll make your face the greatest in Hoenn! Or else you will DIE. (Pret merge 2022/12/16)
 2022-12-16 21:06:38 -03:00
Eduardo Quezada
c03f354dca Finished cleaning up the animations to the new standard 2022-12-16 20:58:41 -03:00
Eduardo Quezada
6a57dcdc4c Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 
# Conflicts:
#	src/data.c
#	src/data/pokemon_graphics/front_pic_anims.h
 2022-12-16 19:19:23 -03:00
Eduardo Quezada D'Ottone
0dca5a5230
Merge pull request #2516 from LOuroboros/patch-1 
Updated SetMoveEffect
 2022-12-15 18:10:08 -03:00
Eduardo Quezada D'Ottone
79a753efcc
Merge pull request #2518 from LOuroboros/bSides 
Updated SIDE constant usages
 2022-12-15 18:09:37 -03:00
LOuroboros
852f06deea Updated SIDE constant usages 2022-12-15 17:44:56 -03:00
LOuroboros
7c447a1f62 Small corrections 2022-12-14 12:09:16 -03:00
LOuroboros
4c9446ed0a Fixed Speed Swap's effect 2022-12-14 12:00:45 -03:00