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
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
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
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
GriffinR
80c77fc120
Merge pull request #1487 from LOuroboros/hidden_item_flags
...
Re-ordered the hidden item flags list
2021-07-27 10:36:20 -04:00
LOuroboros
8012f4b25a
Re-ordered the hidden item flags list
...
Instead of sorting them by location, it makes more sense to sort them by their value.
2021-07-26 20:18:11 -03:00
GriffinR
b5bc762dc7
Merge pull request #1486 from sphericalice/pss-constant-fix
...
Use the correct constant for PSS page comparison
2021-07-25 12:49:35 -04:00
sphericalice
71de6ea939
Use the correct constant for PSS page comparison
2021-07-24 18:54:37 +01:00
GriffinR
0e22b21b14
Merge pull request #1485 from LOuroboros/patch-3
...
Removed unused status ailment constants
2021-07-23 13:15:46 -04:00
LOuroboros
bfa824f761
Removed unused status ailment constants
2021-07-23 13:18:24 -03:00
GriffinR
e67729f647
Remove address comments in sound directory
2021-07-21 00:56:04 -04:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
PikalaxALT
bea170e8e9
Merge pull request #1483 from PikalaxALT/symbols_merge_commit
...
Use merge commit message for symbols branch
2021-07-16 12:59:03 -04:00
PikalaxALT
52512cfbe1
Use merge commit message for symbols branch
2021-07-16 12:15:53 -04:00
GriffinR
a274cc6a76
Merge branch 'master' into flatten_sprite_pos
2021-07-12 01:39:28 -04:00
GriffinR
876a89eba4
Merge pull request #1482 from cstyles/physical-macro
...
Use the `IS_TYPE_PHYSICAL` macro in `AddMovePoints`
2021-07-12 01:25:05 -04:00
Collin Styles
eab1d7b5b1
Use the IS_TYPE_PHYSICAL
macro in AddMovePoints
2021-07-11 22:02:24 -07:00
GriffinR
01f2381e01
Add LINK_MANAGER field comments from SDK
2021-07-11 16:48:59 -04:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
...
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
PikalaxALT
4419337aeb
Merge pull request #1481 from GriffinRichards/fix-symsname
...
Use PR title for symbols branch commits
2021-07-08 08:00:16 -04:00
GriffinR
2f1a997440
Use PR title for symbols branch commits
2021-07-08 00:49:27 -04:00