Kurausukun
|
b51d025f1c
|
port cgb fakematching fixes (thanks to revo)
|
2021-08-08 20:33:21 -04:00 |
|
GriffinR
|
bd5cf07059
|
Merge branch 'master' into doc-playerpc
|
2021-08-02 14:08:10 -04:00 |
|
GriffinR
|
06b909bcd8
|
Document player pc
|
2021-08-02 13:58:40 -04:00 |
|
GriffinR
|
3e60a78406
|
Merge branch 'master' into doc-frontierpass2
|
2021-07-31 13:30:40 -04:00 |
|
GriffinR
|
602855ea99
|
Document frontier pass
|
2021-07-31 13:28:08 -04:00 |
|
GriffinR
|
459b20d762
|
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
|
2021-07-27 18:02:00 -04:00 |
|
ghoulslash
|
fd61770c34
|
water bubble prevents burn
|
2021-07-25 07:53:44 -06:00 |
|
ghoulslash
|
eadd09bebd
|
block item use under embargo
|
2021-07-25 07:39:02 -06:00 |
|
sphericalice
|
71de6ea939
|
Use the correct constant for PSS page comparison
|
2021-07-24 18:54:37 +01:00 |
|
ghoulslash
|
e6a2d2226f
|
Merge pull request #1540 from DizzyEggg/rage_powder
Rage powder updated to gen6
|
2021-07-24 07:15:58 -06:00 |
|
LOuroboros
|
29b1ba2a3c
|
Fixed calls to UndoFormChange in battle_script_commands.c
|
2021-07-18 12:34:17 -03:00 |
|
DizzyEggg
|
312583de5e
|
Merge pull request #1564 from BuffelSaft/form-capture
Undo form changes on capture
|
2021-07-16 09:22:23 +02:00 |
|
DizzyEggg
|
304f3b9203
|
Merge pull request #1565 from BuffelSaft/disguise-fix
Fix Disguise reverting on switch out
|
2021-07-16 09:17:10 +02:00 |
|
BuffelSaft
|
d2d7b6ffef
|
Remove Mimikyu check from loop
More efficient than checking in each loop iteration.
|
2021-07-16 18:09:41 +12:00 |
|
BuffelSaft
|
90fdb74ccb
|
Remove UndoFormChangeOnSwitch
Handle switching out Mimikyu Busted in UndoFormChange.
|
2021-07-16 17:56:53 +12:00 |
|
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 |
|
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 |
|