ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,806 Commits 1 Branch 0 Tags 235 MiB
d103025527
Commit Graph

11806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada
d103025527 Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2022-12-22 10:30:01 -03: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
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
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
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
LOuroboros
af6ea91e72 Applied Eduardo's suggestion 2022-12-14 10:48:12 -03:00
LOuroboros
37151e4a2d Updated SetMoveEffect 2022-12-14 10:46:11 -03:00
ghoulslash
90dd59c039
Merge pull request #2513 from LOuroboros/patch-1 
Update battle.h
 2022-12-13 11:54:18 -05:00
LOuroboros
6ef30da492
Update battle.h 2022-12-13 02:44:49 -03:00
ghoulslash
657e0d755b
Merge pull request #2511 from AsparagusEduardo/RHH/pr/cleanup/SpecialStatus 
Reorganized SpecialStatus struct to minimize padding.
 2022-12-11 22:50:17 -05:00
Eduardo Quezada
1290a9411d Reorganized SpecialStatus struct to minimize padding. 2022-12-12 00:37:00 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
LOuroboros
8eff1a13c1 Updated BattleScript_IntimidateEffect to comply with BattleScript_TryAdrenalineOrb's demands 2022-12-11 23:17:59 -03:00
LOuroboros
e6a3396b0f Added Adrenaline Orb check and removed silly comment 2022-12-11 19:24:36 -03:00
Eduardo Quezada D'Ottone
db32032781
Merge pull request #2475 from Bassoonian/gen9moves 
Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon
 2022-12-11 18:39:25 -03:00
Bassoonian
07a8af5975 Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon 2022-12-11 22:09:23 +01:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves 
Generation IX Moves
 2022-12-11 14:47:47 -05:00
GriffinR
5c90df73ba
Merge pull request #1825 from AsparagusEduardo/pret/pr2/AnimationMacros 
Species animation tables into macros
 2022-12-10 10:00:34 -05:00
Eduardo Quezada
2f96344cd9 Removed ANIM_CMD macro from unused_anims.h 2022-12-10 11:46:41 -03:00
GriffinR
f87c5be45a
Merge pull request #1827 from SBird1337/fix/debugprint 
[fix] DebugPrintf with no format arguments
 2022-12-09 12:54:19 -05:00
sbird
0d5adac1e1 [debug, printf] add DebugPrintfLevel macro 2022-12-07 00:03:25 +01:00
sbird
fab26b99f1 [fix] DebugPrintf with no format arguments 2022-12-06 15:59:59 +01:00
Eduardo Quezada D'Ottone
3718f58a0a
Merge pull request #2469 from LOuroboros/patch-1 
Updated TryChangeBattleTerrain
 2022-12-05 23:40:52 -03:00
LOuroboros
f9458117ee
Updated TryChangeBattleTerrain 2022-12-05 23:31:41 -03:00
Eduardo Quezada
2d694a84e3 Trying to fix remote reference 2022-12-05 21:57:28 -03:00
Eduardo Quezada D'Ottone
63310df7c6
Merge pull request #2468 from LOuroboros/patch-1 
Update INSTALL.md
 2022-12-04 20:57:29 -03:00
LOuroboros
4d1494bf95
Update INSTALL.md 2022-12-04 20:48:17 -03:00
Bassoonian
8c77ae59d6 Use official Double Shock message 2022-12-04 21:57:02 +01:00
Bassoonian
06ab4fc842 Update move flags 2022-12-04 21:56:40 +01:00
Bassoonian
b0ead44ee8 Update battle_tv.c 2022-12-04 21:23:45 +01:00
Bassoonian
58a54c90d2 Restore GEN_LATEST to GEN_8 2022-12-04 18:16:37 +01:00
Bassoonian
5bcb6b8afd Update B_METRONOME_MOVES 2022-12-04 18:16:15 +01:00