ghoulslash
136fbb5862
fix swapped descs
2021-09-20 21:33:50 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04:00
PikalaxALT
0c2e9a5b4c
Merge pull request #1502 from GriffinRichards/clean-lilycovelady
...
Clean up Lilycove Lady
2021-09-09 16:04:08 -04:00
GriffinR
cbf8863e5b
Clean up Lilycove Lady
2021-09-09 15:24:34 -04:00
GriffinR
4037cf147b
Merge pull request #1500 from GriffinRichards/fix-healthboxgfx
...
Move more gfx symbols into gHealthboxElementsGfxTable
2021-09-06 21:47:44 -04:00
GriffinR
b183a793a1
Move more gfx symbols into gHealthboxElementsGfxTable
2021-09-06 17:45:10 -04:00
GriffinR
4dbaca9dc6
Merge pull request #1499 from froggestspirit/master
...
Identify unknown healthbox GFX
2021-09-06 16:54:28 -04:00
froggestspirit
71da126dbb
case
2021-09-06 16:41:59 -04:00
froggestspirit
5f755757f9
Const rename
2021-09-06 11:40:40 -04:00
froggestspirit
f8a24cdd6f
Identify unknown healthbox GFX
2021-09-06 10:42:05 -04:00
froggestspirit
73554ec88d
Merge remote-tracking branch 'pret/master'
2021-09-06 10:32:14 -04:00
ultima-soul
2cda676b50
Merge pull request #1628 from LOuroboros/patch-2
...
Sync hold_effects.h with the BE
2021-09-04 11:57:49 -07:00
LOuroboros
376b65f6bf
Update hold_effects.h
2021-09-04 15:36:47 -03:00
ghoulslash
3066e09e68
decap pokemon in mental herb
2021-09-04 08:43:33 -04:00
ghoulslash
f682e409f0
update mental herb desc
2021-09-04 08:19:57 -04:00
ultima-soul
5cb73a012c
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-08-30 11:57:27 -07:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
63e6b914e4
Merge pull request #1497 from GriffinRichards/doc-hasmargin
...
Label swap line margin flag
2021-08-21 12:06:30 -04:00
GriffinR
8f5e2bbeba
Label swap line margin flag
2021-08-21 11:04:28 -04:00
ExpoSeed
29b6276e64
Merge pull request #1595 from ultima-soul/item_expansion_sync
...
Item Expansion Upstream Sync
2021-08-16 19:47:39 -05:00
ultima-soul
840e2bc3f9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-16 16:33:34 -07:00
GriffinR
dfdcfc1568
Document remaining functions in cable_club
2021-08-15 16:22:15 -04:00
GriffinR
e01ae55c13
Start more link_rfu_2 documentation
2021-08-15 15:13:42 -04:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
...
Document item menu
2021-08-15 12:01:57 -04:00
ultima-soul
64a48800c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound
...
Fix CgbSound Fakematches (Thanks to Revo)
2021-08-11 19:55:44 -04: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
3a14f4472d
Merge pull request #1495 from GriffinRichards/fix-symbols
...
Fix symbols branch commit message, limit to upstream
2021-08-11 17:35:31 -04:00
GriffinR
1860b7682f
Allow symbols branch on forks
2021-08-11 17:19:21 -04:00
GriffinR
5098fbf7bb
Fix symbols branch commit message, limit to upstream
2021-08-11 17:09:03 -04:00
GriffinR
2fb7440315
Merge pull request #1494 from GriffinRichards/tag-regionmap
...
Use tag constants in region_map.c
2021-08-11 12:24:36 -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
0e33df21b9
Merge pull request #1491 from LOuroboros/inconsFlag
...
Corrected inconsistent flag label spelling
2021-08-05 16:41:10 -04:00
LOuroboros
b4c4650186
Corrected inconsistent flag label spelling
2021-08-05 17:26:03 -03:00
GriffinR
3714963f0d
Merge pull request #1490 from GriffinRichards/align-marts
...
Add align directives to all marts
2021-08-05 14:35:45 -04:00
GriffinR
44cd9eed6b
Add align directives to all marts
2021-08-04 11:50:33 -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
d391486247
Merge pull request #1484 from GriffinRichards/remove-addrcomments
...
Remove address comments
2021-07-27 18:08:10 -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
