12991 Commits

Author SHA1 Message Date
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
ultima-soul
ad8cfda831 Add and rearrange Key Items. 2021-07-06 17:03:46 -07:00
ultima-soul
2d8d38f44c Add TM51 through TM100. 2021-07-05 18:11:57 -07:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
ghoulslash
542f0accf5 fix updating last used ball when run out of item id 2021-07-04 10:09:57 -06:00
ghoulslash
d28ac33b0e fix throw last used ball action turn order checks 2021-07-04 09:28:59 -06: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
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
TheXaman
c9d902d722 Renamed functions for better readability 2021-07-02 12:26:15 +02:00
TheXaman
af355fcb12 added Debug to StartMenu via DEBUG_MENU option 2021-07-02 11:49:32 +02: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
TheXaman
a663742eba fixed a bug not showing hidden abilities (POKEMON_EXPANSION) if the second ability was ABILITY_NONE, thanks to Syreldar 2021-06-30 10:44:09 +02:00
garakmon
d391c136d8 fix encounter slot logic to accomodate changes 2021-06-27 21:14:21 -04:00
ghoulslash
53e6ba1c48 Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav 2021-06-27 07:43:02 -06:00
ghoulslash
fbdbc33f37 fix dexnav headerId overflow issue 2021-06-27 07:42:55 -06:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
GriffinR
6d92b466e7 Add missing use of F_TRAINER_FEMALE 2021-06-25 11:50:09 -04:00
TheXaman
45012a66d7 fixes PlaySE overwriting some "music tracks" like MUS_MOVE_DELETED 2021-06-22 19:04:39 +02:00
TheXaman
010c1b5d82 fixed some songs not properly stopping and overlapping others, thanks to @Lunos for reporting 2021-06-22 18:29:04 +02:00
TheXaman
81d7986d34 added SE and MUS names 2021-06-22 15:57:02 +02:00
TheXaman
defd7d9e07 Added Sound menu for SE and MUS 2021-06-22 12:38:00 +02: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
TheXaman
9708ee0744 fixed credit link 2021-06-20 16:57:34 +02:00
TheXaman
20ca83bb20 Added menu to run custom scripts easily, credit: @Jaizu 2021-06-20 15:48:44 +02: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
TheXaman
a83ece83cd fixed navigation buttons on evo page not showing when switching from cry screen, thanks to @AsparagusEduardo for pointing it out 2021-06-19 11:45:15 +02:00
ultima-soul
9e0b866f09 Rearranged Poke Ball item ids. 2021-06-18 21:46:20 -07: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
ghoulslash
5da18d9263 add TryFindHiddenPokemon back in 2021-06-18 13:03:01 -06: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