Commit Graph

1110 Commits

Author SHA1 Message Date
PikalaxALT
11ce98c7ac Remove empty data/berry_crush.s 2020-03-03 15:19:33 -05:00
PikalaxALT
df08e8645b Port some standalone rodata objects to C 2020-03-03 14:05:38 -05:00
PikalaxALT
d047e66310 Duplicate data in dodrio_berry_picking.c 2020-03-03 13:59:54 -05:00
PikalaxALT
89e5082d51 Merge branch 'master' of github.com:pret/pokefirered into berry_crush 2020-03-03 13:47:35 -05:00
PikalaxALT
dd22d97814
Merge pull request #283 from GriffinRichards/fix-eventticket
Sync event ticket flag names
2020-03-03 13:47:29 -05:00
PikalaxALT
8a7c2ded11 Port berry_crush_3 from Emerald 2020-03-03 12:24:18 -05:00
GriffinR
2e8570499d Sync event ticket flag names 2020-03-03 01:44:06 -05:00
PikalaxALT
8594e7f72d Port berry_crush_2 from emerald 2020-03-02 21:36:30 -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
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
GriffinR
6191739a4d Label sign bg events 2020-03-02 12:24:05 -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
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
PikalaxALT
55e00e0c13
Merge pull request #274 from GriffinRichards/doc-fourisland
Document Four Island scripts, trainer_card.inc, sync trainer_card.c
2020-03-02 10:43:01 -05:00
GriffinR
8ff7977b89 Merge branch 'master' into doc-fourisland 2020-03-02 10:34:35 -05:00
PikalaxALT
ff0034d597
Merge pull request #273 from GriffinRichards/doc-threeisland
Document Three Island scripts
2020-03-02 10:28:59 -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
PikalaxALT
a7966b5047 Finish field_effect.c 2020-03-02 09:47:33 -05:00
PikalaxALT
a506860558 field effect 0x43 2020-03-02 09:18:32 -05:00
GriffinR
358f785a03 Resolve some JP text 2020-03-02 00:53:22 -05:00
GriffinR
62100376b7 Split/label some common event scripts 2020-03-02 00:19:11 -05:00
PikalaxALT
cbd380f2bf Name many functions in cable_club.c 2020-02-29 17:01:03 -05:00
PikalaxALT
21dddd5760 Finish cable_club.c 2020-02-29 16:31:57 -05:00
PikalaxALT
9b9ae3d337 through sub_8080E6C 2020-02-29 14:30:01 -05:00
GriffinR
47f6e9f973 Document missed Vermilion house script 2020-02-28 23:01:37 -05:00
GriffinR
575e8da6a9 Document Seven Island scripts 2020-02-28 20:24:19 -05:00
PikalaxALT
fb064f17ba Fly field effect 2020-02-28 17:10:06 -05:00
PikalaxALT
f825186655 Use VS Seeker field effect 2020-02-28 15:55:12 -05:00
PikalaxALT
80e5031619 Use Surf field effect 2020-02-28 15:29:16 -05:00
PikalaxALT
0c492c087e Show Mon field effect 2020-02-28 15:19:50 -05:00
PikalaxALT
410aaa00ff Teleport field effect 2020-02-28 14:26:54 -05:00
PikalaxALT
fb56341fe4 Escape Rope field effect 2020-02-28 14:14:34 -05:00
PikalaxALT
8f42b7b56d Lavaridge Gym 1F Warp field effect 2020-02-28 13:23:51 -05:00
PikalaxALT
9cf19244fa Port Lavaridge Gym B1F Warp from Emerald 2020-02-28 13:18:21 -05:00
PikalaxALT
8a09273846 Unused dive field effect 2020-02-28 11:16:03 -05:00
PikalaxALT
c117bc6864 Waterfall field effect 2020-02-28 10:19:34 -05:00
PikalaxALT
1779aedbf0 Escalator field effect 2020-02-28 10:02:40 -05:00
GriffinR
948b695ad4 Document Six Island scripts 2020-02-28 09:54:01 -05:00
GriffinR
7d7c51973c Document Five Island scripts 2020-02-28 00:22:34 -05:00
PikalaxALT
e07c771f18 through Task_FallWarpFieldEffect 2020-02-27 16:59:05 -05:00
PikalaxALT
701d4635b4 Pokecenter heal and HOF field effects 2020-02-27 16:19:33 -05:00
GriffinR
2d9327a1ff Document Four Island scripts, trainer_card.inc 2020-02-27 14:21:13 -05:00
PikalaxALT
0d88e2d1de through MultiplyPaletteRGBComponents 2020-02-27 14:08:26 -05:00
GriffinR
d3adca3f9d Document Three Island scripts 2020-02-27 12:51:23 -05:00