LOuroboros
216d8f0608
Solved game freezing issue
...
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
BuffelSaft
bb89d03a1d
Fix Venoshock
...
Damage should double if target is poisoned, not attacker.
2021-08-25 22:57:10 +12:00
ultima-soul
b620349da0
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-16 15:43:27 -07:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
...
Document item menu
2021-08-15 12:01:57 -04:00
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound
...
Fix CgbSound Fakematches (Thanks to Revo)
2021-08-11 19:55:44 -04:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
GriffinR
034b7f0513
Fix conflicting PC window names
2021-08-11 19:14:50 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2
2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc
...
Document player pc
2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2
...
Document frontier pass
2021-08-11 17:40:55 -04:00
GriffinR
d951d7c363
Use tag constants in region_map.c
2021-08-11 09:31:20 -04:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
Kurausukun
2e892c6961
unsigned int -> u32
2021-08-08 22:22:50 -04:00
Kurausukun
ddb3911d0d
oops
2021-08-08 20:49:29 -04:00
Kurausukun
0bceaab046
rename variable
2021-08-08 20:34:16 -04:00
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
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 8b59909ac5
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
