Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-15 08:41:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,444 Commits 2 Branches 0 Tags 366 MiB
8dcae92a5f
Commit Graph

2444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT
8dcae92a5f port/decomp through sub_8150FDC 2020-03-04 11:19:39 -05:00
PikalaxALT
437fe6631a
Merge pull request #286 from jiangzhengwenjz/nonmatching 
real match sub_814DFA4
 2020-03-03 16:55:56 -05:00
jiangzhengwenjz
d6352f7429 sub_814DFA4 2020-03-04 05:50:07 +08:00
PikalaxALT
0e468b49bb
Merge pull request #284 from PikalaxALT/berry_crush 
Berry crush
 2020-03-03 15:55:58 -05: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
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
f77b0feba6 Port berry_crush.c part 1 from Emerald 2020-03-02 16:57:00 -05:00
PikalaxALT
1261a414cd Update calcrom.pl for optionally more verbose output 2020-03-02 16:28:02 -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
PikalaxALT
6363d39e99 port field_effect_helpers from emerald 2020-03-02 13:34:34 -05:00
PikalaxALT
40af0d1302
Merge pull request #281 from GriffinRichards/fix-specialvars 
Fix special var names
 2020-03-02 13:15:48 -05:00
GriffinR
4ab3d77d80 Fix special var names 2020-03-02 12:57:54 -05:00
PikalaxALT
9803cb612e
Merge pull request #280 from GriffinRichards/fix-signs 
Label sign bg events
 2020-03-02 12:31:02 -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
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
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
a1995d8029 Fix alignment 2020-03-02 10:36:46 -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
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
fc51c579d4
Merge pull request #277 from PikalaxALT/cable_club 
Cable club
 2020-03-02 10:13:06 -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
c36ef94a0d address review comments 2020-02-29 21:00:31 -05:00
PikalaxALT
cbd380f2bf Name many functions in cable_club.c 2020-02-29 17:01:03 -05:00
PikalaxALT
13687bb97f Static symbols in cable_club.c 2020-02-29 16:35:23 -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