GriffinR
bf61de01a7
Start documenting battle factory screen
2020-08-31 13:36:48 -04:00
GriffinR
778bdb4d30
Document wallclock data
2020-08-29 15:55:28 -04:00
GriffinR
71a066f945
Document cable car
2020-08-28 03:54:04 -04:00
GriffinR
38d4fc9c17
Clean up rayquaza scene documentation
2020-08-27 16:04:11 -04:00
GriffinR
95ea0e92e7
Start documenting rayquaza_scene
2020-08-25 17:49:42 -04:00
GriffinR
22c1bf965a
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
GriffinR
0ff767a9b5
Start documenting berry blender
2020-08-22 19:39:39 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest
...
Document contest
2020-08-20 16:03:47 -04:00
PikalaxALT
3372993a63
Merge pull request #1133 from GriffinRichards/doc-pblock
...
Document use_pokeblock
2020-08-17 16:28:15 -04:00
GriffinR
65bd2faf94
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
2020-08-16 05:59:10 -04:00
GriffinR
c42c1ab8c1
Document contest appeal
2020-08-15 14:32:30 -04:00
GriffinR
25f45ffa84
Merge pull request #1125 from GriffinRichards/doc-namingscr
...
Document naming screen
2020-08-15 00:06:57 -04:00
GriffinR
ade49de329
Merge branch 'master' into doc-pblock
2020-08-12 19:49:55 -04:00
GriffinR
4f615b65e6
Continue documenting use_pokeblock
2020-08-11 13:56:17 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
...
Document roulette
2020-08-10 17:18:09 -04:00
GriffinR
e947729d65
Start documenting use_pokeblock
2020-08-10 13:48:16 -04:00
GriffinR
82e322bb96
Finish documenting naming screen
2020-08-07 20:18:09 -04:00
GriffinR
463d79c7c1
Start documenting naming screen
2020-08-07 02:00:41 -04:00
GriffinR
b40cee540e
Continue documenting roulette
2020-08-02 14:52:05 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine
...
Document slot machine
2020-08-01 09:56:44 -04:00
GriffinR
22b5b6b074
Start documenting roulette
2020-07-30 19:37:16 -04:00
GriffinR
b22709ee3d
More slot machine data documentation
2020-07-28 14:29:44 -04:00
GriffinR
36a4764a78
Document some slot machine data
2020-07-26 02:15:59 -04:00
GriffinR
52a4428ba6
Begin new contest documentation
2020-07-23 17:55:40 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld
2020-07-18 20:24:09 -04:00
GriffinR
8e6dd3bafe
Merge pull request #1086 from GriffinRichards/doc-unktrans
...
Document unk_transition
2020-07-18 20:22:58 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose
...
Document starter_choose.c
2020-07-17 16:02:10 -04:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld
2020-07-15 00:40:47 -04:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld
2020-07-08 15:51:58 -04:00
GriffinR
431c60c92c
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
2020-07-08 15:45:31 -04:00
GriffinR
43c48d95c2
Document starter_choose.c
2020-07-06 17:26:25 -04:00
GriffinR
72edc46ab6
Document unk_transition
2020-07-02 15:45:37 -04:00
GriffinR
1ce929157f
Clean up field effect doc
2020-07-02 05:05:13 -04:00
GriffinR
eb80012757
Document more misc field effects
2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172
Continue documenting overworld/field effects
2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802
Document some overworld and field effects
2020-06-23 15:48:53 -04:00
GriffinR
24569583e4
Document contest results
2020-06-18 17:50:13 -04:00
GriffinR
a9a427c6f2
Merge branch 'master' into doc-link
2020-06-10 17:36:43 -04:00
GriffinR
7632404ba5
Document union_room_chat.c
2020-06-02 18:35:00 -04:00
DizzyEggg
ab3eb6065b
More transitions documentation
2020-06-01 16:17:25 +02:00
DizzyEggg
bdebab834c
Document pokemon summary screen
2020-05-18 14:03:01 +02:00
SBird
67e9309415
gfx: fix hpbar_anim.png visual palette
2020-05-01 20:51:29 +02:00
GriffinR
96958ba5e9
Drop unnecessary decor prefix
2020-04-13 13:04:22 -04:00
GriffinR
0ffe63a23b
Fix decor png dimensions
2020-04-13 12:58:48 -04:00
GriffinR
e485857df3
Sync minigame_countdown
2020-04-08 17:23:32 -04:00
GriffinR
ab87c90998
Revert city_zoom_tiles.png name
2020-03-17 12:08:05 -04:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex
...
Document pokedex.c
2020-03-17 10:43:57 -04:00
PikalaxALT
784e29352d
Merge pull request #985 from mrgriffin/decoration
...
Document decoration.c
2020-03-17 10:39:37 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap
...
Document some pokenav and region map
2020-03-17 10:38:20 -04:00
garakmon
b1dd945cbf
move fonts from data/graphics/ to graphics/
2020-03-12 13:40:00 -04:00
GriffinR
a495379ff0
Document pokedex cry screen
2020-03-10 14:02:03 -04:00
GriffinR
31b0cbe9b4
Document pokedex.c
2020-03-09 16:24:01 -04:00
Martin Griffin
4485d51522
Document decoration.c
2020-03-06 09:47:20 +00:00
GriffinR
172cb7bae9
Sync Unown and qmark mon folders with pokefirered
2020-02-25 14:18:28 -06:00
GriffinR
68dc68907b
Label move anim data
2020-02-25 12:54:08 -06:00
Marcus Huderle
49421a41b2
Move field effects data and graphics into own directory, and cleanup naming for object events
2020-02-12 17:32:51 -06:00
GriffinR
956090b05f
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-02-12 13:05:57 -05:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
GriffinR
86354f1d50
Document some pokenav and region map
2020-02-05 21:04:43 -05:00
GriffinR
9c934c9664
Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers
2020-01-26 12:23:08 -05:00
GriffinR
a152900211
Combine animated door frames
2020-01-26 09:40:35 -06:00
GriffinR
25d7577d9d
Label animated doors
2020-01-26 09:40:35 -06:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
c85ca4b860
Standardize farfetchd spelling
2020-01-06 15:17:11 -06:00
GriffinR
68cdd7b1cb
Merge master into ObjEvent rename
2019-12-21 05:19:27 -05:00
GriffinR
63c8cf97d1
Document Battle Dome scripts and some battle_dome.c
2019-12-20 16:53:33 -05:00
GriffinR
d1cf9006fb
Document some warp/field screen effect
2019-12-17 05:23:07 -05:00
GriffinR
b93101bbeb
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
GriffinR
7f22fc9879
Update old weather names in field_weather_effect
2019-12-06 19:05:28 -06:00
GriffinR
f559fa3fe2
Merge master into ObjEvent rename
2019-11-25 20:00:04 -05:00
huderlem
9a81661075
Merge pull request #851 from Sewef/patch-3
...
battle_anim_effects_3
2019-11-24 12:02:54 -06:00
Sewef
1dfe34dee3
TriForce → TriAttack
2019-11-23 15:51:08 +01:00
GriffinR
570881b119
Rename event_object directories
2019-11-21 00:44:55 -05:00
GriffinR
98b81722e7
Rename field_objet_palettes
2019-11-20 23:54:22 -05:00
Marcus Huderle
01e6fb6dd0
Document some battle_bg-related things
2019-11-07 18:24:04 -06:00
GriffinR
e01ec84837
Document party_menu second pass
2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
GriffinR
2c062dc764
More trade documentation
2019-10-09 05:56:44 -04:00
GriffinR
66a68159b1
Continue trade doc
2019-10-05 10:41:37 -04:00
garak
f6d55db535
decompile pokenav_unk_5 data
2019-07-19 21:05:55 -04:00
Papa Cancer
e53ba4773d
Documenting bags, berries and graphics
...
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
DizzyEggg
59797e4801
Use constants in battle_anim_special.c
2019-04-14 10:19:50 -05:00
Marcus Huderle
c3cfd60658
Generate zoom_tiles palette from correct image
2019-04-06 15:16:05 -05:00
Marcus Huderle
146da2df96
Generate palette from zoom_tiles.png
2019-04-06 14:48:46 -05:00
Marcus Huderle
fe12f2f4b3
Document and cleanup some decoration code
2019-04-06 12:49:09 -05:00
DizzyEggg
b85a74afc5
Give names to battle anim backgrounds
2019-04-06 12:44:27 -05:00
DizzyEggg
b93581b519
Rename battle anim sprites
2019-04-06 10:14:48 -05:00
Marcus Huderle
1241700b20
Finish documenting the other weather effects
2019-04-02 18:28:56 -05:00
Marcus Huderle
e9a3cc6d51
Merge remote-tracking branch 'upstream/master' into move-tutor
...
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
garak
d0115db565
move pokemon graphics to mon-specific directories
2019-03-16 12:21:47 -05:00
Phlosioneer
aa7657a82a
Move constants into C
...
Also figured out what one of the graphics files is for.
2019-03-06 22:58:05 -05:00
Marcus Huderle
4b9e93850c
Document easy chat screen types
2019-02-27 12:55:29 -06:00
Marcus Huderle
4570e3b6a5
Document battle arena
2019-02-08 09:41:36 -06:00
Marcus Huderle
8f832434e5
Change drought colors table files to .bin
2019-01-29 14:36:02 -06:00
Marcus Huderle
e81838dba3
Misc. documentation and move some data into .c files
2019-01-29 14:36:02 -06:00
Marcus Huderle
fb2d1591c1
Document more battle anim effects
2018-12-31 16:53:38 -06:00
Marcus Huderle
d2b5a0e83f
Convert battle_anim_815A0D4 data to .c
2018-12-18 19:15:59 -06:00
Melody
b9cf4f27b5
renames the winstrate graphics names to pokefan
2018-12-02 00:47:04 -05:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c ( #406 )
2018-11-28 10:14:32 -06:00
Slawter666
3b501cb470
Document battle ui
2018-11-22 01:10:50 +00:00
Deokishisu
d7ba8a306c
Rename OW Sprites
...
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.
Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge
Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
2018-10-14 15:49:55 -04:00
Deokishisu
2bd86dad2f
Rename Boy4 to RichBoy
2018-10-14 12:26:48 -04:00
DizzyEggg
bf64333299
Give labels to healthbox gfx
2018-09-20 21:42:38 +02:00
Marcus Huderle
ba125b23fd
Remove transparency from event object spritesheets
2018-09-11 17:18:10 -05:00
Slawter666
9dec2bdef8
Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet
2018-09-07 11:50:23 +01:00
Diegoisawesome
a000eb4f36
Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move
2018-08-11 19:03:38 -07:00
Diegoisawesome
12ff59f9c1
Continue decompiling field_specials
2018-08-10 00:42:06 -07:00
Slawter666
bc42c5054c
Merge remaining overworld frames
2018-08-10 00:20:19 +01:00
Slawter666
877a80d3bc
Merge berry tree frames
2018-08-09 23:19:45 +01:00
Slawter666
dea0bba64e
Merge "pokemon" frames
2018-08-09 00:55:32 +01:00
Slawter666
ab2cc59629
Merge remaining "people" overworld frames
2018-08-07 22:16:03 +01:00
Slawter666
5917f7d108
Merge frontier brains, team magma and team aqua frames
2018-08-02 00:34:28 +01:00
Slawter666
52aa9cedcf
Merge May frames into sprite sheets
...
Plus fix Brendan's surfing and watering frame order.
2018-07-29 17:29:36 +01:00
Slawter666
d5825230e5
Merge "brendan" frames into sprite sheets
2018-07-28 18:11:28 +01:00
DizzyEggg
3bcd30969a
cut field effect is decompiled and documented
2018-06-16 14:04:29 +02:00
Marcus Huderle
aa9a45c16f
Rebrand 'map object' and 'field object' to 'event object'
2018-06-11 19:11:48 -05:00
Diegoisawesome
416d67c832
Finish porting/decompiling field_effect.c
2018-05-10 18:36:57 -05:00
Edouard Veyrier
75b07292c9
Translate first functions of learn move
2018-03-28 19:20:20 +02:00
Diegoisawesome
387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data
...
Move data from asm to pokemon_1.c
2018-02-08 14:06:57 -06:00
Diegoisawesome
772fd47564
Merge branch 'master' of https://github.com/pret/pokeemerald into menu
2018-02-07 18:06:59 -06:00
DizzyEggg
4b7d778a5c
move mon data fix conflicts
2018-02-07 20:17:55 +01:00
camthesaxman
3ec68d5f79
reorganize berry graphics files
2018-02-06 11:51:43 -06:00
camthesaxman
89e6170748
remove some redundant .pal files
2018-02-06 11:46:34 -06:00
DizzyEggg
ae8e89a10d
move some pokemon data to c
2018-02-05 17:39:26 +01:00
Diegoisawesome
3793152bc3
More work on menu
2018-01-29 17:26:36 -06:00
Diegoisawesome
5a57485ece
Decompile naming_screen.c
2018-01-23 21:30:13 -06:00
Devin
8f1bfcbf3a
Fix more of them sneaky executables
2018-01-21 15:25:18 -05:00
Devin
35cc20c9aa
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
2018-01-21 15:22:05 -05:00
DizzyEggg
ad2ef517bd
option menu fix conflicts
2018-01-21 12:46:19 +01:00
golem galvanize
bce63b3694
REMOVE BASEROM
2018-01-20 22:41:02 -05:00
golem galvanize
f22d295cfc
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms
2018-01-20 21:37:47 -05:00
Diegoisawesome
28c9f40b3e
Extract data from fossil_special_fldeff_groundshake
2018-01-20 19:18:03 -06:00
golem galvanize
33ebcabc3a
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms
2018-01-20 19:45:38 -05:00
golem galvanize
bdc8cf6ac4
fixing conflicts
2018-01-20 19:44:34 -05:00
Diegoisawesome
8d7a830151
Extract data from field_effect_misc
2018-01-20 18:30:33 -06:00
Diegoisawesome
ed8269889b
Extract data from pokedex.s
2018-01-20 17:17:51 -06:00
golem galvanize
59e1aacd26
DIEGO SEND HELP
2018-01-20 17:26:30 -05:00
Diegoisawesome
b47b9e5758
Extract data from starter_choose
2018-01-20 16:22:16 -06:00
Diegoisawesome
d10c91f1b0
Extract data from item_menu_icons.s
2018-01-20 15:37:37 -06:00
Diegoisawesome
971b47755d
Extract data from naming screen
2018-01-20 14:16:01 -06:00
Diegoisawesome
2ef7467951
Extract data from pokemon_summary_screen
2018-01-20 02:37:28 -06:00
Diegoisawesome
098671750b
Extract data from text window
2018-01-20 00:49:21 -06:00
Diegoisawesome
7abfc6a989
Extract data from trainer card
2018-01-19 23:42:30 -06:00
Diegoisawesome
fbb51bc24b
Extract baseroms from party_menu.s
2018-01-19 21:38:57 -06:00
Diegoisawesome
b22a800581
Extract data from trade.s
...
Also rename window_template_terminator to null_window_template, in keeping with naming conventions
2018-01-19 19:52:46 -06:00
Devin
c408110319
Fix file permissions.
2018-01-19 15:06:49 -05:00
Diegoisawesome
fd544ba438
Start extracting data from trade.s
2018-01-19 12:38:09 -06:00
Diegoisawesome
4c6511c8f9
Extract data from field_screen.s
...
Also move files incorrectly placed in interface dir
2018-01-18 22:36:24 -06:00
Diegoisawesome
6445394929
Extract rotating_gate.s
2018-01-18 15:38:31 -06:00
Diegoisawesome
b7ee548897
Merge remote-tracking branch 'Bird/dump_pokenav.s'
2018-01-18 14:38:45 -06:00
Diegoisawesome
7086bf0048
Merge remote-tracking branch 'Bird/dump_slot_machine.s'
2018-01-18 14:19:13 -06:00
Diegoisawesome
dcdf91c111
Merge remote-tracking branch 'Bird/dump_learn_move.s'
2018-01-18 13:46:34 -06:00
Diegoisawesome
b806ee8bed
Finish extracting pokemon storage system data
2018-01-18 12:52:37 -06:00
Diegoisawesome
ec8594fd10
Extract Wanda PC box wallpapers
2018-01-18 04:06:43 -06:00
golem galvanize
c9a3ef7a6e
dump pokenav.s
2018-01-17 23:01:33 -05:00
Diegoisawesome
184fedc870
Extract PC box background images
2018-01-17 20:57:19 -06:00
golem galvanize
173c5923cb
clean up reel_time_gfx
2018-01-17 19:19:47 -05:00
golem galvanize
442398261e
fix tabs and add forgotten image
2018-01-17 14:48:50 -05:00
golem galvanize
84c6a97429
dump slot_machine.s
2018-01-17 14:44:38 -05:00
golem galvanize
820c11358d
dump learn_move.s
2018-01-16 15:31:43 -05:00
DizzyEggg
4dd06dbcd3
optiom menu move data to C
2018-01-16 19:39:35 +01:00
golem galvanize
5a5eb4ff59
dumped most of pokenav.s
2018-01-15 23:38:10 -05:00
Diegoisawesome
90c175b73f
Extract baseroms from field_effect.s
2018-01-15 02:49:52 -06:00
Diegoisawesome
79451b5bb4
Extract data around Deoxys icon
2018-01-14 23:40:55 -06:00
Diegoisawesome
75f9c16504
Merge branch 'master' of https://github.com/pret/pokeemerald
2018-01-07 18:47:05 -06:00
Diegoisawesome
efe19e95c8
Extract door animations
2018-01-07 01:29:26 -06:00
ProjectRevoTPP
48378f791c
last wave of graphics.s dumps
2017-12-30 01:09:06 -05:00
ProjectRevoTPP
06aa07306e
sixteenth wave of graphics.s dumps
2017-12-29 20:25:32 -05:00
Diegoisawesome
f0df833f37
Extract easy chat and pokemon animation
2017-12-29 13:34:24 -06:00
ProjectRevoTPP
cfe17cc552
fifteenth wave of graphics.s dumps
2017-12-28 22:05:30 -05:00
ProjectRevoTPP
77b7462dbb
merge
2017-12-28 17:26:58 -05:00
ProjectRevoTPP
03a2a3b81b
fourteenth wave of graphics.s dumps
2017-12-28 17:15:37 -05:00
Diegoisawesome
1496ea3a24
Merge branch 'master' of github.com:pret/pokeemerald
2017-12-28 03:00:15 -06:00
Diegoisawesome
2d04eb22ab
Split rom_81370FC and port function names
2017-12-28 02:09:11 -06:00
Diegoisawesome
ca49f8438d
Extract battle_transition data
2017-12-27 15:25:15 -06:00
ProjectRevoTPP
8a338f44db
thirteenth wave of graphics.s dumps
2017-12-26 22:37:36 -05:00
Diegoisawesome
eff0caf759
Split and extract roulette data
2017-12-26 01:42:08 -06:00
ProjectRevoTPP
0af942e0b8
twelfth wave of graphics.s dumps
2017-12-26 01:39:01 -05:00
ProjectRevoTPP
770714dcee
eleventh wave of graphics.s dumps
2017-12-25 22:00:56 -05:00
ProjectRevoTPP
d6bac7f9f8
tenth wave of graphics.s dumps (battle_frontier)
2017-12-25 15:51:01 -05:00
Diegoisawesome
15c92318d3
Extract data from misc files
...
Also split data4d.s
2017-12-25 00:32:01 -06:00
ProjectRevoTPP
2c7112ce8f
ninth wave of graphics.s dumps
2017-12-24 22:39:43 -05:00
ProjectRevoTPP
addfdfbcba
eighth wave of graphics.s dumps
2017-12-24 02:54:08 -05:00
Diegoisawesome
e8153598ef
Extract contest painting
2017-12-24 01:09:18 -06:00
ProjectRevoTPP
d0659a3ec6
seventh wave of graphics.s dumps
2017-12-24 01:00:53 -05:00
ProjectRevoTPP
e56f04ae2e
sixth wave of graphics.s dumps
2017-12-24 00:08:28 -05:00
ProjectRevoTPP
ac74d6f100
fifth wave of graphics.s dumps
2017-12-23 22:06:01 -05:00
ProjectRevoTPP
4ad2c5c941
fourth wave of graphics.s dumps
2017-12-23 18:30:48 -05:00
ProjectRevoTPP
d137b7f0a8
third wave of graphics.s dumps (battle_anim part 2)
2017-12-23 15:50:58 -05:00
Diegoisawesome
a64b5cd31f
Extract start of battle_frontier_2
2017-12-23 01:16:45 -06:00
ProjectRevoTPP
3499ff51b5
second wave of graphics.s dumps (battle_anim part 1)
2017-12-23 01:45:04 -05:00
ProjectRevoTPP
d10c645353
first wave of graphics.s dump
2017-12-22 19:18:09 -05:00
Diegoisawesome
04b64dda0b
Extract baseroms from battle frontier and tent files
2017-12-22 15:04:05 -06:00
DizzyEggg
cb229f56e8
fix pokeblock conflicts
2017-12-18 16:58:14 +01:00
PikalaxALT
da2e0dfe50
Merge branch 'master' into clock
2017-12-15 21:04:25 -05:00
DizzyEggg
37ae6a7758
move more pokeblock data to C and label
2017-12-10 16:38:27 +01:00