ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-11 22:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,245 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

5755 Commits

Author SHA1 Message Date
DizzyEggg
d6400448fd
Merge pull request #1563 from ghoulslash/battle_ai 
AI_IsTerrainAffected checks
 2021-07-15 09:36:47 +02:00
ghoulslash
ebc187c16d
Merge pull request #1536 from DizzyEggg/gravity 
Fix Gravity's animation
 2021-07-13 10:54:45 -06:00
GriffinR
a274cc6a76
Merge branch 'master' into flatten_sprite_pos 2021-07-12 01:39:28 -04:00
Collin Styles
eab1d7b5b1 Use the IS_TYPE_PHYSICAL macro in AddMovePoints 2021-07-11 22:02:24 -07:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower 
Clean up Mirage Tower
 2021-07-10 23:26:41 -04:00
BuffelSaft
63faa6e3a9 Fix Disguise reverting on switch out 
Make Mimikyu's disguise stay busted when it's switched out.
 2021-07-11 14:15:24 +12:00
BuffelSaft
8d432e4e34 Undo form changes on capture 
This will revert busted Mimikyu, Schooling Wishiwashi etc. to their base forms when caught.
 2021-07-11 12:51:27 +12:00
ghoulslash
59c16ff1cf AI_IsTerrainAffected checks 2021-07-10 16:41:41 -06:00
GriffinR
32fe412755
Merge pull request #1475 from GriffinRichards/doc-minor 
Label remaining symbols in a few files
 2021-07-08 00:24:56 -04:00
GriffinR
fced9e507d
Merge pull request #1478 from Kurausukun/itemprint 
Change ItemPrintFunc to Use u32 Instead of s32
 2021-07-08 00:15:45 -04:00
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
Kurausukun
42730a8315 Revert "remove gflib" 
This reverts commit 8b59909ac5eb6e3540aeb78396943d57a9702e4d.
 2021-07-03 17:39:33 -04:00
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock 
Fix some object lock names
 2021-07-03 11:21:10 -04:00
SnorlaxMonster
43c5107e4d Correct card lines in Battle Dome comments 
The comments regarding the lines that Trainer information is displayed
on the Battle Dome Trainer Card were off-by-one.
 2021-07-03 22:41:18 +10:00
GriffinR
c42b5d783a Fix 'determining' typo 2021-07-02 03:26:50 -04:00
GriffinR
64d06f4c8f Condense battle AI scripts, minor clean up 2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
d73b3c05c6 Label remaining hall_of_fame symbols 2021-07-02 01:02:28 -04:00
GriffinR
fe89a4d147 Label remaining region_map symbols 2021-07-02 00:52:36 -04:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
GriffinR
3964820a84
Merge pull request #1473 from GriffinRichards/fix-div0 
Fix divide by 0 in Cmd_getexp
 2021-07-01 14:26:34 -04:00
GriffinR
93188ef0a8 Fix divide by 0 in Cmd_getexp 2021-07-01 00:18:52 -04:00
garakmon
d391c136d8 fix encounter slot logic to accomodate changes 2021-06-27 21:14:21 -04:00
GriffinR
6d92b466e7 Add missing use of F_TRAINER_FEMALE 2021-06-25 11:50:09 -04:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts 
Clarify contest heart tiles
 2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
StubbornOne
2d41f08312 Add Telepathy's damage prevention effect 2021-06-21 14:18:33 +08:00
DizzyEggg
800e2395c0
Merge pull request #1542 from BuffelSaft/thaw_moves_2 
Fix Thawing Moves, Add FLAG_THAW_USER
 2021-06-19 13:47:51 +02:00
ultima-soul
9407a1ac76
Replace hardcoded number in MakeCaptureStars. 2021-06-18 19:20:05 -07:00
BuffelSaft
4c18cb7fe7 Remove EFFECT_THAW_HIT 2021-06-19 11:49:00 +12:00
BuffelSaft
06111bdc63 Replace EFFECT_THAW_HIT 
Both moves that used EFFECT_THAW_HIT now use EFFECT_BURN_HIT.
 2021-06-19 11:43:29 +12:00
BuffelSaft
87279ecab9 Fix CANCELLER_FROZEN 
Now checks if current move will thaw user before trying to defrost it.
 2021-06-19 11:31:46 +12:00
Kurausukun
10c80230c4 change printItemFunc to use u32 instead of s32 
also change a use of -2 to LIST_CANCEL
 2021-06-18 00:15:45 -04:00
Kurausukun
8b59909ac5 remove gflib 2021-06-17 22:09:48 -04:00
Sewef
fd55a0d015
Update src/battle_message.c 
Nothing happened.

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-06-17 14:12:06 +02:00
Sewef
d02be421bc
Fix sATypeMove_Table definition 2021-06-17 14:06:40 +02:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
ghoulslash
70fd98a009
Merge pull request #1541 from rh-hideout/DizzyEggg-patch-2 
Fix Imposter looplock
 2021-06-10 11:59:29 -06:00
ghoulslash
de21636f97
Merge pull request #1539 from rh-hideout/DizzyEggg-patch-1 
Fix mon shadow when caught and learn new move
 2021-06-10 11:59:10 -06:00
ExpoSeed
3ed06c2cc2 Remove remaining grey and replace with gray 2021-06-10 11:36:10 -05:00
BuffelSaft
e6a8faec1e Fix thawing moves 
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
 2021-06-10 23:48:18 +12:00
DizzyEggg
179ac9c1e1
Fix Imposter looplock 2021-06-10 13:45:24 +02:00
DizzyEggg
f27dcab784 Rage powder has powder moves qualities when forcing a target 2021-06-10 12:55:05 +02:00
DizzyEggg
c6f3b7f571
Merge pull request #1532 from LOuroboros/emergency_exit 
Fixed Emergency Exit
 2021-06-10 10:41:07 +02:00
DizzyEggg
1e855cf469
Fix mon shadow when caught and learn new move 
Fixes #1477
 2021-06-09 09:49:42 +02:00
DizzyEggg
540719c483 Add support for only one enemy pokemon in double battles start 2021-06-08 22:50:37 +02:00
ultima-soul
1ff3718d1f
Merge pull request #1446 from LOuroboros/inner_focus 
Tweaked Inner Focus
 2021-06-08 13:18:35 -07:00
LOuroboros
d849c31ee8 Followed Ghoulslash's suggestion 2021-06-08 11:56:03 -03:00
ghoulslash
a683c698fb
Merge pull request #1524 from Jaizu/patch-13 
Change the ability popup sound
 2021-06-08 08:41:41 -06:00