 aaaaaa123456789
|
bacc831aa9
|
Re-apply joypad macros (minus merge conflicts)
|
2020-11-02 22:02:39 -03:00 |
|
|
aaaaaa123456789
|
1c3d75f673
|
Merge branch 'master' into reverts
|
2020-10-26 12:16:36 -03:00 |
|
|
GriffinR
|
66bd1e6d3f
|
Use constants for item digits
|
2020-09-25 11:18:52 -04:00 |
|
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
|
PokeCodec
|
28ef2fb774
|
Switch to button macros
|
2020-09-04 21:11:55 -04:00 |
|
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
|
GriffinR
|
18d57a3802
|
Document some overworld and field effects
|
2020-06-23 15:48:53 -04:00 |
|
|
Sierraffinity
|
74edaed426
|
Begin item_menu.c cleanup
|
2020-06-10 13:07:42 -07:00 |
|
|
huderlem
|
675f5ac03e
|
Remove unnecessary comment
|
2020-06-03 19:55:15 -05:00 |
|
|
SBird
|
5d752bbe49
|
shop: document some constants s.t. object events don't break
|
2020-06-03 19:55:15 -05:00 |
|
|
GriffinR
|
9c934c9664
|
Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers
|
2020-01-26 12:23:08 -05:00 |
|
|
GriffinR
|
9a6c2c25d0
|
Add some capacity constants
|
2020-01-26 09:42:55 -06:00 |
|
|
GriffinR
|
68cdd7b1cb
|
Merge master into ObjEvent rename
|
2019-12-21 05:19:27 -05:00 |
|
|
Diegoisawesome
|
026e1108b2
|
Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
|
2019-12-20 23:44:56 -08:00 |
|
|
GriffinR
|
949509aade
|
Merge branch 'master' into fix-eventobj
|
2019-12-18 13:16:38 -05:00 |
|
|
GriffinR
|
d1cf9006fb
|
Document some warp/field screen effect
|
2019-12-17 05:23:07 -05:00 |
|
|
GriffinR
|
96ec5e1b84
|
Use fadescreen constants
|
2019-12-15 11:42:50 -05:00 |
|
|
GriffinR
|
b93101bbeb
|
Merge master into ObjEvent rename
|
2019-12-06 21:37:33 -05:00 |
|
|
GriffinR
|
2756771958
|
More usage of ST_OAM constants and SPRITE macros
|
2019-12-06 19:05:44 -06:00 |
|
|
GriffinR
|
82cb741d8b
|
Standardize EVENT_OBJECT to OBJECT_EVENT
|
2019-11-20 23:12:51 -05:00 |
|
|
GriffinR
|
ec3e86f1d2
|
Standardize Event Object to Object Event
|
2019-11-20 22:55:44 -05:00 |
|
|
GriffinR
|
0df304d629
|
Document roulette.inc
|
2019-10-07 02:00:16 -04:00 |
|
|
PikalaxALT
|
9317d114a9
|
Merge pull request #823 from GriffinRichards/constants-strconv
Use STR_CONV constants
|
2019-10-02 09:18:48 -04:00 |
|
|
GriffinR
|
5325835ee7
|
Use STR_CONV constants
|
2019-09-30 15:43:44 -04:00 |
|
|
PikalaxALT
|
306ce048ad
|
Move gflib srcs and headers to gflib subdir
|
2019-09-08 21:07:54 -04:00 |
|
|
PikalaxALT
|
20863ac85b
|
Resolve compile warnings in modern
|
2019-07-18 20:46:00 -04:00 |
|
|
garak
|
daecd5ec40
|
name some trainer card related functions
|
2019-05-16 17:10:13 -05:00 |
|
|
Fontbane
|
901a83d249
|
Fix some labels and include decorations.h
Include decorations.h in shop.c
Include decorations.h in event_scripts.s
|
2019-04-22 17:23:59 -05:00 |
|
|
Fontbane
|
6cf06d5f95
|
Doc some event scripts
Doc decoration shops
Revert "Doc decoration shops"
This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.
Document through comments
Un-revert decor documentation
|
2019-04-22 17:23:59 -05:00 |
|
|
Phlosioneer
|
50350cc2e1
|
Merge branch 'master' into contest-ai-cleanup
|
2019-04-07 20:20:22 -04:00 |
|
|
DizzyEggg
|
b0223f691f
|
Clean up data headers
|
2019-04-05 07:53:23 -05:00 |
|
|
Phlosioneer
|
1360b3a477
|
RGB Constants
|
2019-04-04 17:05:46 -04:00 |
|
|
Phlosioneer
|
b93d923826
|
Merge branch 'master' into move-tutor
|
2019-03-08 02:27:20 -05:00 |
|
|
Phlosioneer
|
4907ce6f7f
|
Fully document move_tutor (formerly learn_move)
|
2019-03-03 02:50:40 -05:00 |
|
|
Phlosioneer
|
3716da5430
|
Rename macro with correct name for pixel values
|
2019-03-02 17:25:39 -05:00 |
|
|
Phlosioneer
|
44e92ce259
|
Give window drawing functions better names
|
2019-02-22 01:40:11 -05:00 |
|
|
Phlosioneer
|
c96f8751cd
|
Improve window palette macros
|
2019-02-21 23:27:12 -05:00 |
|
|
Phlosioneer
|
d979ac3bf3
|
Document main_menu state machine, name window constants
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
|
2019-02-11 00:34:50 -05:00 |
|
|
DizzyEggg
|
23b240ab65
|
Fix Menu and List Menu input defines
|
2019-02-02 11:04:38 +01:00 |
|
|
DizzyEggg
|
4683cdc30c
|
Merge branch 'master' into weather
|
2018-12-09 11:56:50 +01:00 |
|
|
DizzyEggg
|
4ec14b3d43
|
Finish field screen
|
2018-12-08 22:05:11 +01:00 |
|
|
nullableVoidPtr
|
f9ff7316d5
|
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
|
2018-12-06 10:38:28 +08:00 |
|
|
nullableVoidPtr
|
3909b6408c
|
Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
|
2018-12-06 09:44:08 +08:00 |
|
|
Diegoisawesome
|
18839a4872
|
Merge remote-tracking branch 'pret/master' into script_menu
|
2018-11-06 20:20:56 -06:00 |
|
|
Diegoisawesome
|
f8d337e491
|
Finish cleaning up text.c
|
2018-11-06 11:30:21 -06:00 |
|
|
Diegoisawesome
|
7dd4ed7060
|
r5/r6 swap on sub_80E2578
|
2018-11-05 14:45:54 -06:00 |
|
|
DizzyEggg
|
b252bd0292
|
Window priority to window bg
|
2018-10-27 00:53:07 +02:00 |
|
|
Diegoisawesome
|
6206acd2d2
|
Finish shop and fldeff_escalator
|
2018-10-18 12:05:02 -05:00 |
|
|
Marcus Huderle
|
b24559d69b
|
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
|
2018-10-13 10:22:58 -05:00 |
|
|
Marcus Huderle
|
fa9d1759bd
|
checkpoint
|
2018-09-06 11:37:45 -05:00 |
|