PikalaxALT
|
4a24826e0a
|
Clarify the data/dodrio_berry_picking.h include
|
2020-03-05 15:00:43 -05:00 |
|
PikalaxALT
|
3a894f7b08
|
Static symbols in dbp
|
2020-03-05 14:50:53 -05:00 |
|
PikalaxALT
|
83137b4005
|
Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking
|
2020-03-05 14:38:26 -05:00 |
|
GriffinR
|
5ab4af2d0e
|
Fix some JP character mapping
|
2020-03-05 14:26:48 -05:00 |
|
GriffinR
|
eb4327a714
|
Move strings.s to src
|
2020-03-05 14:20:02 -05:00 |
|
PikalaxALT
|
7f81fdc8df
|
Port dodrio_berry_picking_3 from emerald
|
2020-03-05 14:03:23 -05:00 |
|
PikalaxALT
|
b56c2b75b4
|
Finish dodrio_berry_picking_2.c
|
2020-03-05 13:58:14 -05:00 |
|
PikalaxALT
|
cb99443c51
|
through sub_81556E0
|
2020-03-05 10:31:31 -05:00 |
|
PikalaxALT
|
362cddc0f5
|
Merge pull request #285 from GriffinRichards/doc-scriptclean
Clean up script documentation
|
2020-03-05 06:06:51 -05:00 |
|
GriffinR
|
102744163b
|
Use explicit initializers for help text
|
2020-03-05 01:12:29 -05:00 |
|
GriffinR
|
a82a7b5fcb
|
Lowercase new pokedude labels
|
2020-03-04 18:29:32 -05:00 |
|
GriffinR
|
4df660dc76
|
Add enums for help system text, label help context
|
2020-03-04 18:26:54 -05:00 |
|
PikalaxALT
|
e9c3b78d9f
|
through sub_8154A2C; reorganize dbp files a bit
|
2020-03-04 17:21:41 -05:00 |
|
PikalaxALT
|
ff13649f47
|
through sub_81537AC
|
2020-03-04 15:14:59 -05:00 |
|
PikalaxALT
|
6871f3dd33
|
through sub_8153048
|
2020-03-04 14:58:44 -05:00 |
|
PikalaxALT
|
171e4bbea4
|
through sub_815184C
|
2020-03-04 13:56:54 -05:00 |
|
PikalaxALT
|
8dcae92a5f
|
port/decomp through sub_8150FDC
|
2020-03-04 11:19:39 -05:00 |
|
GriffinR
|
13e06bf7f8
|
Combine special prefixes, drop more
|
2020-03-04 10:42:16 -05:00 |
|
GriffinR
|
4c1d30a832
|
Add more metatile labels
|
2020-03-03 22:23:40 -05:00 |
|
GriffinR
|
7af1b35d17
|
Sync some specials/drop unnecessary prefixes
|
2020-03-03 17:45:25 -05:00 |
|
jiangzhengwenjz
|
d6352f7429
|
sub_814DFA4
|
2020-03-04 05:50:07 +08:00 |
|
PikalaxALT
|
c2f85a5326
|
Address review comments
|
2020-03-03 15:42:14 -05:00 |
|
PikalaxALT
|
11ce98c7ac
|
Remove empty data/berry_crush.s
|
2020-03-03 15:19:33 -05:00 |
|
GriffinR
|
1aa1f18972
|
Sync trainer_battle.inc
|
2020-03-03 14:52:32 -05:00 |
|
PikalaxALT
|
df08e8645b
|
Port some standalone rodata objects to C
|
2020-03-03 14:05:38 -05:00 |
|
GriffinR
|
4c4b19da7e
|
Label help system text
|
2020-03-03 14:02:34 -05:00 |
|
PikalaxALT
|
d047e66310
|
Duplicate data in dodrio_berry_picking.c
|
2020-03-03 13:59:54 -05:00 |
|
PikalaxALT
|
8a7c2ded11
|
Port berry_crush_3 from Emerald
|
2020-03-03 12:24:18 -05:00 |
|
PikalaxALT
|
8594e7f72d
|
Port berry_crush_2 from emerald
|
2020-03-02 21:36:30 -05:00 |
|
PikalaxALT
|
f77b0feba6
|
Port berry_crush.c part 1 from Emerald
|
2020-03-02 16:57:00 -05:00 |
|
GriffinR
|
63e0b54f96
|
Label pokedude text
|
2020-03-02 16:35:52 -05:00 |
|
PikalaxALT
|
fdc2a0b40e
|
Fix undetected issue in #282
|
2020-03-02 14:46:42 -05:00 |
|
PikalaxALT
|
f5011a27d6
|
Merge pull request #282 from PikalaxALT/field_effect_helpers
port field_effect_helpers from emerald
|
2020-03-02 14:11:32 -05:00 |
|
PikalaxALT
|
e2a29e9db9
|
Address review comments
|
2020-03-02 13:59:38 -05:00 |
|
GriffinR
|
dd5f3c3c3d
|
Add missing script labels
|
2020-03-02 13:52:16 -05:00 |
|
PikalaxALT
|
6363d39e99
|
port field_effect_helpers from emerald
|
2020-03-02 13:34:34 -05:00 |
|
GriffinR
|
4ab3d77d80
|
Fix special var names
|
2020-03-02 12:57:54 -05:00 |
|
PikalaxALT
|
0169a98c68
|
Merge pull request #278 from GriffinRichards/doc-miscscript
Split/label some common event scripts
|
2020-03-02 12:19:18 -05:00 |
|
PikalaxALT
|
e8504c7a3f
|
Merge pull request #276 from GriffinRichards/doc-sixisland
Document Six and Seven Island scripts
|
2020-03-02 12:17:52 -05:00 |
|
PikalaxALT
|
ae08a40290
|
Merge pull request #279 from PikalaxALT/field_effect
Field effect
|
2020-03-02 12:11:22 -05:00 |
|
PikalaxALT
|
2d820809d7
|
Revert erroneous use of SPRITE_INVALID_TAG
|
2020-03-02 12:01:57 -05:00 |
|
PikalaxALT
|
b3803dcc99
|
Address review comments, 2
|
2020-03-02 11:53:08 -05:00 |
|
PikalaxALT
|
d12dd578b8
|
Address review comments
|
2020-03-02 11:16:34 -05:00 |
|
GriffinR
|
6280a3786b
|
Merge branch 'master' into doc-sixisland
|
2020-03-02 10:48:56 -05:00 |
|
PikalaxALT
|
5198a05272
|
Merge pull request #275 from GriffinRichards/doc-fiveisland
Document Five Island scripts
|
2020-03-02 10:48:13 -05:00 |
|
GriffinR
|
8ff7977b89
|
Merge branch 'master' into doc-fourisland
|
2020-03-02 10:34:35 -05:00 |
|
PikalaxALT
|
d975572a6a
|
Fix some extern declarations
|
2020-03-02 10:26:42 -05:00 |
|
PikalaxALT
|
d758ae0dc2
|
Merge branch 'master' of github.com:pret/pokefirered into field_effect
|
2020-03-02 10:15:07 -05:00 |
|
PikalaxALT
|
2f8ac698c8
|
Static symbols in field_effect.c
|
2020-03-02 09:57:54 -05:00 |
|
PikalaxALT
|
875dde7a0c
|
Rename remaining field effect callbacks
|
2020-03-02 09:51:21 -05:00 |
|