ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 08:32:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,176 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

12176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
f4ef67d897
Merge pull request #2689 from DizzyEggg/grenja 
Fix Battle Bond activating multiple times in battle
 2023-02-16 09:36:02 -05:00
ghoulslash
6b0b427d93
Merge pull request #2680 from DizzyEggg/mirror_armor 
Fix Mirror Armor against Clear Body
 2023-02-16 09:29:04 -05:00
DizzyEggg
978d342953 use NUM_BATTLE_SIDES 2023-02-16 15:26:26 +01:00
ghoulslash
05bef50a1f
Merge pull request #2658 from DizzyEggg/one_vs_two_egg 
Fix 1 vs 2 battles with eggs
 2023-02-16 09:20:18 -05:00
ghoulslash
60a3da5811
Merge pull request #2691 from DizzyEggg/clang_scales 
Fix Clanging Scales target and effect
 2023-02-16 09:13:33 -05:00
DizzyEggg
4c18ed2bd4 remove comment 2023-02-16 15:11:48 +01:00
ghoulslash
8c81cf1e66
Merge pull request #2692 from DizzyEggg/shields_down 
Fix Shield Down Ability pop-up
 2023-02-16 09:11:24 -05:00
DizzyEggg
1c970afd6a
fix follow me working in singles (#2644) 
* fix follow me working in singles
 2023-02-16 10:53:29 +01:00
sbird
fea54c9277 [intro] add fading, refactor abort, align intro gfx 2023-02-16 10:43:50 +01:00
DizzyEggg
97f9c0a4d9 oof 2023-02-15 23:45:53 +01:00
DizzyEggg
f6a0c882d1 Fix Shield Down Ability pop-up 2023-02-15 23:44:00 +01:00
DizzyEggg
94651e77a5 Fix Clang Scales target and effect 2023-02-15 22:18:18 +01:00
Alex
e4045a7a5f
z move pp color (#2690) 2023-02-15 16:19:09 +01:00
DizzyEggg
3f0f7c6b7f Fix Battle Bond activating multiple times in battle 2023-02-15 15:30:29 +01:00
Jaizu
e3e005b0cc
Merge pull request #2684 from LOuroboros/introFix 
Fixed glitchy-looking water drops in the game's intro
 2023-02-14 22:58:57 +01:00
LOuroboros
7885941d3c Tweaked Task_HandleExpansionIntro to fix the water drops glitch 
Thanks to Tustin2121.
 2023-02-14 14:03:18 -03:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects (#2602) 
* fix round base power calc, add turn order change

* remove unused callnative cmd

* fix round turn order update

* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-14 16:49:50 +01:00
ghoulslash
094554b3a3
Merge pull request #2681 from DizzyEggg/jaw_lock 
Fix Jaw Lock locking player pokemon
 2023-02-13 10:40:47 -05:00
DizzyEggg
2b4d2a7695 Fix Jaw Lock locking player pokemon 2023-02-13 16:27:21 +01:00
ghoulslash
d1ef53f93a
Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles 
Z-Move Indicator was wrongly displayed in double battles
 2023-02-13 08:52:06 -05:00
DizzyEggg
0577d8d04d Fix Mirror Armor against Clear Body 2023-02-13 14:44:34 +01:00
ghoulslash
c399391891
Merge pull request #2677 from AlexOn1ine/z_moves_switch_order 
Fix switching Z-Moves when pressing SELECT in battle
 2023-02-13 08:41:58 -05:00
DizzyEggg
5d958e245a
Merge pull request #2669 from Jaizu/giga_impact_contests 
Fix Giga Impact on contests.
 2023-02-13 09:22:24 +01:00
Alex
2b32bfcdc1 add battlerId arg to ShowZMoveTriggerSprite 2023-02-12 19:39:14 +01:00
Alex
d363ed8152 z indicator in double battles 2023-02-11 19:55:08 +01:00
Alex
ce416be297 z_move switch move bug 2023-02-11 18:32:07 +01:00
Eduardo Quezada D'Ottone
59f367b165
Merge pull request #2665 from SBird1337/refactor/rhh-credits 
[intro] refactor expansion intro
 2023-02-11 09:23:48 -03:00
Martin Griffin
f933ad3183 Build patchelf and hydra only for check 2023-02-10 18:06:15 +01:00
Martin Griffin
d59e576b51
Hydra: remove tmpnam (#2668) 
* Use a PID-based filename instead of tmpnam

* Use FILENAME_MAX over L_tmpnam

---------

Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-02-09 23:54:11 +01:00
Martin Griffin
074f1b544e Use variable in patchelf invocation 2023-02-09 23:29:14 +01:00
sbird
dac138cef6 [test] add some ability tests 2023-02-09 23:25:25 +01:00
sbird
4bcbb7c9e1 [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
ghoulslash
8ac3197c85
Merge pull request #2671 from DizzyEggg/spacial_rend 
Fix Spacial Rend animation
 2023-02-09 08:22:47 -05:00
ghoulslash
deb23fc7c6
Merge pull request #2648 from AlexOn1ine/pollen_puff 
Fixes Pollen Puff issue #2611
 2023-02-09 08:21:33 -05:00
ghoulslash
27933836b5
Merge pull request #2662 from AlexOn1ine/heal_pulse_v2 
Add Logic for Heal Pulse effects in double battles
 2023-02-09 08:18:00 -05:00
DizzyEggg
513ecd50ba Fix Spacial Rend animation 2023-02-09 13:24:23 +01:00
Jaizu
9f7267e48d Fix Giga Impact on contests. 2023-02-09 11:29:29 +01:00
Eduardo Quezada D'Ottone
cd8bf15f3c
Merge pull request #2666 from DizzyEggg/base_stats_info 
Fix SpeciesInfo(base stats) struct offset labels
 2023-02-08 19:57:11 -03:00
DizzyEggg
0048e59e05 Fix SpeciesInfo struct offsets 2023-02-08 22:08:12 +01:00
Eduardo Quezada D'Ottone
8381b14c51
Implemented Xhyzi's RHH copyright intro (with config) (#2415) 
* Rhh & Pret Copyright Screen

* Porygon recovered his voice

* Expansion text

---------

Co-authored-by: Xhyzi <xhyzdot@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
 2023-02-08 15:54:12 +01:00
Alex
41d64ea41e heal pulse effect in double battles 2023-02-08 13:02:41 +01:00
DizzyEggg
8c257bde99 Fix 1 vs 2 battles with eggs 2023-02-08 10:24:19 +01:00
Eduardo Quezada D'Ottone
b048afb56d
Merge pull request #2653 from AsparagusEduardo/RHH/pr/prtest 
Test PR
 2023-02-08 00:54:38 -03:00
Eduardo Quezada
6c30c5490c Test PR 2023-02-08 00:51:59 -03:00
DizzyEggg
ff088752e7
Insomnia ability pop-up (#2643) 
* Insomnia ability pop-up

* remove B_MSG_STAYED_AWAKE_USING constant
 2023-02-07 18:47:23 +01:00
Alex
5bf607049e Fix Pollen Puff score 2023-02-07 16:41:30 +01:00
ghoulslash
7e9d40d401
Merge pull request #2645 from DizzyEggg/damp_aftermath 
Damp shows ability pop-up when reacting with Aftermath
 2023-02-07 10:18:23 -05:00
DizzyEggg
0d6b640876
Merge pull request #2439 from AsparagusEduardo/RHH/pr/cleanup/DragonTailEffect 
Cleaned up move effect checks for Dragon Tail/Circle Throw
 2023-02-07 16:17:12 +01:00
DizzyEggg
dcb63e1518
Merge pull request #2610 from ghoulslash/be/animsilktrap 
Silk trap Animation
 2023-02-07 16:13:53 +01:00
ghoulslash
5d4a75dcb7
Merge pull request #2647 from DizzyEggg/cleanout_timers 
remove pointless timers from disable struct
 2023-02-07 09:58:01 -05:00