4528 Commits

Author SHA1 Message Date
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
ultima-soul
840e2bc3f9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-16 16:33:34 -07: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
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
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
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
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
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
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
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