Phlosioneer
5b4b0a245b
Move contest winner list to C
2019-03-09 00:01:49 -05:00
Phlosioneer
b7cfa9d365
Move more contest constants into C
2019-03-08 21:39:51 -05:00
huderlem
32f71b2976
Merge pull request #600 from Phlosioneer/summary-screen-macros
...
Summary screen macros
2019-03-08 13:37:12 -06:00
Phlosioneer
5886f82ef5
Merge branch 'master' into extern-cleanup
2019-03-08 02:45:26 -05:00
Phlosioneer
b93d923826
Merge branch 'master' into move-tutor
2019-03-08 02:27:20 -05:00
Phlosioneer
eac70acab6
Change filename to something more descriptive
2019-03-08 02:17:01 -05:00
Phlosioneer
af182d6f16
Minor cleanup before pushing
2019-03-08 02:10:44 -05:00
Phlosioneer
69aec91577
Decompile move tutor stuff
...
2 nonmatching.
2019-03-08 01:56:38 -05:00
Phlosioneer
0da83abad2
Several nonmatching functions
...
Huge and difficult.
2019-03-06 22:27:30 -05:00
Phlosioneer
4345ba8e6c
More decompiled and cleanup
2019-03-05 22:32:28 -05:00
Phlosioneer
c3594f982d
Decompiling pokeblock ui stuff
2019-03-05 20:32:14 -05:00
DizzyEggg
b150091436
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
Phlosioneer
9bea9e1624
Start decompiling menu_unknown
2019-03-05 06:06:20 -05:00
Phlosioneer
907492fd6e
Split rom asm file in half
...
The first half is ui/menu stuff, while the second half is link-related
stuff.
2019-03-04 23:26:51 -05:00
Phlosioneer
cae63cf1c7
Rename move tutor to move relearner
2019-03-04 20:56:39 -05:00
Phlosioneer
2879fe7fe0
Merge branch 'master' into summary-screen-macros
2019-03-03 16:58:54 -05:00
Phlosioneer
63e700af6c
Use macros for summary windows
...
Other minor changes and fixes are included
2019-03-03 16:50:51 -05:00
Phlosioneer
4ea5e85bed
Fix typos
...
This is an updated version of #554 , since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
Phlosioneer
e03595a10d
Bugfixes from #591
2019-03-03 09:31:08 -06:00
Phlosioneer
4907ce6f7f
Fully document move_tutor (formerly learn_move)
2019-03-03 02:50:40 -05:00
Phlosioneer
9372731c3e
Merge branch 'master' into main-menu-state-machine
2019-03-02 17:35:44 -05:00
Phlosioneer
3716da5430
Rename macro with correct name for pixel values
2019-03-02 17:25:39 -05:00
Phlosioneer
80a4ee1145
Remove water.h and flying.h
2019-03-02 17:23:10 -05:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars
...
Document all event vars
2019-03-02 08:24:46 -06:00
Phlosioneer
25050b9944
Fix tabs, do suggested rename
2019-03-02 04:13:27 -05:00
Phlosioneer
49bef25856
Clean up the last extern functions
2019-03-02 03:18:08 -05:00
Phlosioneer
ee69426838
Eliminate more externs
2019-03-02 02:44:02 -05:00
Phlosioneer
3ceb1667c9
Reduce externs
2019-03-01 22:32:50 -05:00
huderlem
3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff
...
Document overworld.c and link stuff in general
2019-03-01 08:43:55 -06:00
Phlosioneer
a7e5852f1d
More minor fixes
2019-03-01 01:49:11 -05:00
Phlosioneer
459fd93b59
Fix minor errors
2019-03-01 01:18:58 -05:00
Phlosioneer
da0687987d
Pick better names for constants
2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01
Add macros for metatile manipulation
2019-02-28 22:21:16 -06:00
hondew
9ed0f77528
fixed issues in data and include dirs
2019-02-28 21:21:56 -06:00
hondew
6a4202cdbd
tidied lucky flags
2019-02-28 21:21:56 -06:00
hondew
1dc0d346d9
fix spelling error
2019-02-28 21:21:56 -06:00
hondew
dd8ecabe26
fix mistakes and bad formatting
2019-02-28 21:21:56 -06:00
hondew
f965f1b13d
label luckyFlags
2019-02-28 21:21:56 -06:00
hondew
67fe781ed2
clean up slot machine until AwardPayout
2019-02-28 21:21:56 -06:00
hondew
5c8cc5225f
document slot machine
2019-02-28 21:21:56 -06:00
Phlosioneer
99bfd8c80f
VAR_0x3F20 is not a var
2019-02-28 00:10:44 -05:00
Phlosioneer
373d73eb3b
Fix last special var
2019-02-28 00:06:27 -05:00
Phlosioneer
bf45b83c65
Finish documenting event vars
2019-02-27 23:54:51 -05:00
Phlosioneer
782979f1fc
Finish documenting trainer hill
...
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
2019-02-27 22:16:01 -05:00
Phlosioneer
66f0616a2d
I guess I'm documenting Trainer Hill now
2019-02-27 21:31:05 -05:00
Phlosioneer
e77e7844ea
Name several vars, document some related events
2019-02-27 20:25:09 -05:00
Phlosioneer
648fc3d4f3
Name more unknown vars
2019-02-27 15:18:56 -05:00
Phlosioneer
4137dd7b0b
Identify unused, never read, and never written vars
2019-02-27 14:42:32 -05:00
Marcus Huderle
4b9e93850c
Document easy chat screen types
2019-02-27 12:55:29 -06:00
Phlosioneer
c1348d22f3
Name most event scripts related to unusual weather
2019-02-27 04:27:54 -05:00
Phlosioneer
fe55580fe1
Reverse engineer unusual weather events
2019-02-27 03:42:04 -05:00
Phlosioneer
72bb0daccb
Merge branch 'master' into main-menu-state-machine
2019-02-26 22:34:42 -05:00
Phlosioneer
6cb4c677cd
Fix backwards names
2019-02-26 22:30:40 -05:00
Phlosioneer
3a44b090d1
Merge branch 'master' into multiplayer-stuff
2019-02-26 22:07:29 -05:00
Phlosioneer
accea672f1
Incorporate feedback
2019-02-26 22:04:44 -05:00
Marcus Huderle
231355f84d
Decompile easy_chat data
2019-02-26 14:50:02 -06:00
Marcus Huderle
b60611c38e
Finish decompiling easy_chat.c code
2019-02-26 14:50:02 -06:00
huderlem
153f134318
Merge pull request #583 from huderlem/easy_chat
...
Decompile more easy_chat.c
2019-02-25 14:12:18 -06:00
Marcus Huderle
7ea05431a5
Decompile more easy_chat.c
2019-02-25 14:11:31 -06:00
huderlem
d77ba3d413
Merge pull request #581 from arantonitis/pokemon_summary
...
Documented/polished pokemon_summary_screen.c
2019-02-25 08:09:14 -06:00
huderlem
b3a7a1278a
Merge pull request #577 from Phlosioneer/weather-15
...
Document the weather state functions
2019-02-25 08:03:22 -06:00
huderlem
84573f1774
Merge pull request #574 from Phlosioneer/event-vars
...
Event vars
2019-02-25 08:02:28 -06:00
Phlosioneer
5f7a971313
Source file part of map script renaming
2019-02-25 08:01:22 -06:00
Phlosioneer
1cd5cb09cf
Merge branch 'master' into weather-15
2019-02-25 02:30:35 -05:00
Phlosioneer
e1b2460748
Adjust formatting, rename function
2019-02-25 02:28:41 -05:00
Phlosioneer
4e5fae0086
Merge branch 'master' into event-vars
2019-02-25 02:24:20 -05:00
Phlosioneer
87859a655b
Fix flag formatting for fun
2019-02-25 02:20:38 -05:00
Ariel Antonitis
74a3c06270
Documented/polished pokemon_summary_screen.c
...
Mostly variables mislabeled as global and some formerly unknown stuff.
2019-02-23 21:12:35 -05:00
Diegoisawesome
7995cf5b61
Merge pull request #578 from DizzyEggg/pokenav
...
pokenav
2019-02-23 16:04:59 -06:00
Marcus Huderle
f34903bc45
Decompile more easy_chat.c
2019-02-23 13:05:34 -06:00
ultima-soul
eb48cc2f7e
Decompile through sub_8167930.
2019-02-23 09:08:07 -08:00
DizzyEggg
788caa4fe2
pokenav
2019-02-23 13:34:01 +01:00
Phlosioneer
b2866fae21
Document the weather state functions
...
All weather types are now documented (including WEATHER_15)
2019-02-22 22:20:42 -05:00
Marcus Huderle
d3f66a98ff
Decompile more easy_chat
2019-02-22 11:46:05 -06:00
Phlosioneer
cea5696f23
Finish moving pokeruby vars
2019-02-22 04:18:43 -05:00
Phlosioneer
e12a7790cf
Start porting pokeruby vars to pokeemerald
2019-02-22 04:01:38 -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
399d646e3f
Merge branch 'master' into main-menu-state-machine
2019-02-21 22:24:25 -05:00
Phlosioneer
eca329f9c5
Merge branch 'master' into multiplayer-stuff
2019-02-21 21:22:10 -05:00
Marcus Huderle
b105d20d1e
Decompile chunk of easy_chat.c
2019-02-21 17:46:14 -06:00
Marcus Huderle
1c6502338e
Decompile contest_link_80F57C4.c
2019-02-20 18:11:27 -06:00
Diegoisawesome
1b0079445d
Merge pull request #559 from Phlosioneer/finish-newgame-docs
...
Finish and polish new_game.c
2019-02-18 13:28:50 -06:00
Diegoisawesome
924cbe9ee4
Merge pull request #560 from Phlosioneer/regi-documentation
...
Document the regi* code more
2019-02-18 13:23:19 -06:00
Phlosioneer
486cf449b8
Make flag names more consistent
2019-02-18 14:17:02 -05:00
Phlosioneer
fcb541189d
Rename some flags, and use map ID macros
2019-02-18 02:02:20 -05:00
Phlosioneer
93e9b9fe5d
Fix some names
2019-02-18 01:33:41 -05:00
Phlosioneer
5695617d64
Merge branch 'master' into multiplayer-stuff
2019-02-18 01:12:47 -05:00
Phlosioneer
08579edbcd
Clean up mistakes and bad formatting
2019-02-18 01:03:44 -05:00
Phlosioneer
be08a662a8
More data moved into C code
2019-02-17 23:14:14 -05:00
Phlosioneer
a4aaf279ac
Move more data into pokenav, name some strings
2019-02-17 23:14:14 -05:00
Phlosioneer
3bb4057bad
Decompiled sub_81C7764
2019-02-17 23:14:14 -05:00
Phlosioneer
e90e3458cb
Document the regi* code more
...
Fixed some confusing naming, named some unknown symbols, and fixed the
names of some flags.
2019-02-15 18:24:55 -05:00
Phlosioneer
986d3d8b2f
Finish and polish new_game.c
...
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
2019-02-15 03:40:57 -05:00
Phlosioneer
9e8a841bfa
Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine
2019-02-13 23:04:56 -05:00
Diegoisawesome
047c282763
Merge pull request #548 from Phlosioneer/intro-movie-state-machine
...
Document the intro movie state machine
2019-02-13 21:24:20 -06:00
Diegoisawesome
aa5d5fa34a
Merge pull request #550 from Phlosioneer/name-palette-return-values
...
Name the possible return values of palette fading functions
2019-02-13 20:15:47 -06:00
Diegoisawesome
dfb896356c
Merge branch 'master' of github.com:pret/pokeemerald
2019-02-12 00:40:42 -06:00
Diegoisawesome
449fb25f23
Clear up misnamed time-based flags and functions
2019-02-12 00:40:34 -06: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
Phlosioneer
e75f45dbcf
Reverse engineered many of the multiplayer events
...
Some corrections to the way events are handled and identified.
2019-02-10 20:42:50 -05:00
Phlosioneer
f2f1b1978b
Done documenting link code in overworld.c
2019-02-10 03:54:50 -05:00
Phlosioneer
3fd878483f
Start renaming symbols
...
I finally figured out what the code is trying to do. I have a foothold;
the rest should follow.
2019-02-10 00:50:46 -05:00
Phlosioneer
d0cc8dfc17
Change negative constant into unsigned hex constant
2019-02-09 22:02:56 -05:00
Phlosioneer
37bea25b01
Name the possible return values of palette fading functions
...
Also replace implicit conversion from gPalette.active into a status with
if statements, to make the return value clear.
I've also added comments when the check is redundant.
2019-02-09 21:50:12 -05:00
Phlosioneer
45297797e6
Document the intro movie state machine
...
Need to study the water droplet animation more closely before they can
be renamed; otherwise, this names every major symbol in this file.
2019-02-09 21:07:07 -05:00
Marcus Huderle
6f1d2b870c
Give proper names to dynamic map layouts
2019-02-09 09:57:30 -06:00
Marcus Huderle
40dc6833c5
Fully document tileset animations
2019-02-08 15:07:42 -06:00
Marcus Huderle
abebd2b864
Cleanup externs in overworld.c
2019-02-08 11:48:51 -06:00
Marcus Huderle
6add3e1794
Document some battle dome stuff
2019-02-08 11:08:25 -06:00
Marcus Huderle
4570e3b6a5
Document battle arena
2019-02-08 09:41:36 -06:00
Marcus Huderle
3a40f5203b
Remove old rom_818CFC8.h header
2019-02-07 17:41:44 -06:00
Marcus Huderle
85040e26fd
Document battle pike
2019-02-07 17:37:41 -06:00
Marcus Huderle
4785a07acd
Document battle factory functions
2019-02-07 12:58:09 -06:00
Marcus Huderle
3a88ab831d
Document more battle pyramid
2019-02-07 11:51:03 -06:00
Marcus Huderle
a1ad1bad3a
Document a bunch of battle pyramid
2019-02-06 21:14:28 -06:00
Marcus Huderle
1253cbf5f6
Document some battle anim things
2019-02-06 21:14:28 -06:00
huderlem
b0ee100975
Merge pull request #543 from pret/mapdata
...
Convert map data to JSON
2019-02-04 21:36:18 -06:00
Marcus Huderle
d4125fef9b
Cleanup and add game version flag to mapjson tool
2019-02-04 17:28:45 -06:00
Diegoisawesome
59807c0f2c
Merge pull request #536 from DizzyEggg/menu
...
Use Menu and List Menu input defines
2019-02-02 12:45:35 -06:00
Diegoisawesome
e8952c2374
Merge pull request #539 from DizzyEggg/ram_vars
...
Move ram vars in sym files to C
2019-02-02 11:17:50 -06:00
Diegoisawesome
47c105bef6
Merge pull request #538 from DizzyEggg/data
...
Dump last battle anim file
2019-02-02 11:12:29 -06:00
DizzyEggg
363fa9bed2
Clean up ram vars
2019-02-02 12:44:00 +01:00
DizzyEggg
a7f94bbeea
Dump last battle anim file
2019-02-02 11:55:11 +01:00
DizzyEggg
a740bc7190
Name action 11
2019-02-02 11:32:00 +01:00
DizzyEggg
23b240ab65
Fix Menu and List Menu input defines
2019-02-02 11:04:38 +01:00
DizzyEggg
7750a8126d
CgbSound is decompiled.
2019-02-01 00:25:31 +01:00
Marcus Huderle
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
Marcus Huderle
5c1667b41a
Define layout constants
2019-01-29 16:55:25 -06:00
DizzyEggg
d46e60765d
Rename a palace battle field
2019-01-29 22:22:02 +01:00
Marcus Huderle
e81838dba3
Misc. documentation and move some data into .c files
2019-01-29 14:36:02 -06:00
DizzyEggg
73d919fa0f
Define double single left right qutoation marks char
2019-01-28 19:02:34 +01:00
DizzyEggg
ad59811154
Decompile whole contest
2019-01-28 18:13:07 +01:00
Diegoisawesome
183b6857ff
Merge pull request #458 from ultima-soul/contest
...
Decompile more of contest
2019-01-27 23:08:24 -06:00
DizzyEggg
01c3f3fc05
Document all of frontier pass
2019-01-26 20:56:06 +01:00
DizzyEggg
0688725afb
Document and decompile more of frontier pass.
2019-01-26 14:50:24 +01:00
DizzyEggg
08a3533682
Start frontier pass
2019-01-25 23:32:45 +01:00
DizzyEggg
524db6068e
Merge branch 'master' into trainer_card
2019-01-22 21:59:32 +01:00
DizzyEggg
b6e5b4ee1a
trainer card diego pls
2019-01-22 21:56:57 +01:00
Diegoisawesome
900f294011
Add var const prefix for some missed var numbers
2019-01-21 22:34:01 -06:00
DizzyEggg
4e396207d3
document more of trainer card
2019-01-20 18:24:35 +01:00
DizzyEggg
576d1b3474
Document and match somne trainer card
2019-01-19 23:04:33 +01:00
shinny456
f06c0749bc
trainer_card up to sub_80C4998
2019-01-19 12:14:59 -05:00
DizzyEggg
4b420643dc
Merge branch 'master' into trainer_hill
2019-01-13 20:51:05 +01:00
DizzyEggg
edddd847c5
Document and clean up trainer hill
2019-01-13 20:50:08 +01:00
DizzyEggg
c0bc01d301
Move some vars to C
2019-01-13 13:15:23 +01:00
DizzyEggg
11a49a7f02
Decompile trainer hill
2019-01-13 12:12:27 +01:00
Diegoisawesome
af2c39860d
Rename non-mapsec constants
2019-01-08 13:40:11 -06:00
ultima-soul
284751e761
Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present.
2019-01-06 13:41:18 -08:00
ultima-soul
2ca482dc24
Committing progress so far.
2019-01-06 13:38:31 -08:00
ultima-soul
76510d58bb
Matched up to sub_80DBF68, sub_80DBF90 WIP.
2019-01-06 13:32:47 -08:00
Slawter666
aeaf390706
Update constants
2019-01-05 20:12:50 +00:00
Marcus Huderle
95db853a78
Decompile more of contest_link_80F57C4.c
2019-01-04 20:03:29 -06:00
Philipp AUER
55202eac24
rename coords to size in struct MonCoords
2019-01-04 19:59:55 -06:00
huderlem
cba2f81bf8
Merge pull request #507 from Tetrable/master
...
Finish off labeling flags
2019-01-03 20:37:25 -06:00
Marcus Huderle
fd201f8395
Start decompiling contest_link_80F57C4.c
2019-01-03 20:35:20 -06:00
Marcus Huderle
2857f7fff9
Decompile contest_link_81D9DE4.c
2019-01-03 20:35:20 -06:00
Marcus Huderle
bc43dbab13
Decompile contest_link_81D9DE4.c
2019-01-03 20:35:20 -06:00
Tetrable
97ebeef1db
Relabel TEMP_FLAG_20 into FLAG_UNUSED_0x020
2019-01-03 18:13:16 +00:00
Tetrable
30e7ac0dca
Fix merge conflicts
2019-01-03 02:28:18 +00:00
Tetrable
50aa222aff
Corrected typos
2019-01-03 01:54:55 +00:00
Marcus Huderle
b471bba55e
Use better names for match call texts
2019-01-02 19:46:15 -06:00
Marcus Huderle
e1092028ec
Decompile match_call.c
2019-01-02 19:46:15 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette
...
Port/decompile roulette
2019-01-02 17:00:33 -06:00
Diegoisawesome
a0188aac33
Cleanup and EWRAM
2019-01-02 16:55:50 -06:00
Diegoisawesome
6202ae1df0
Extract rodata from roulette
2019-01-02 16:40:40 -06:00
Tetrable
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
Diegoisawesome
d28d8c850d
Up to sub_81446DC
2018-12-31 19:39:41 -06:00
Diegoisawesome
af1e44befe
Continue porting roulette
2018-12-31 18:07:29 -06:00
Marcus Huderle
a0ff38d0be
Fix build
2018-12-31 16:53:38 -06:00
Marcus Huderle
05b1d2ea94
Document field_tasks.c
2018-12-31 16:53:38 -06:00
Marcus Huderle
b6ee970e7a
Minor berry.c cleanup
2018-12-31 16:53:38 -06:00
Marcus Huderle
fb2d1591c1
Document more battle anim effects
2018-12-31 16:53:38 -06:00
Diegoisawesome
439fa13e94
Start porting/decompiling roulette
2018-12-31 16:09:45 -06:00
Diegoisawesome
530a20354c
Merge pull request #500 from Deokishisu/patch-1
...
Consolidate unused escapeRope MapHeader field into filler_18 field
2018-12-31 11:55:33 -06:00
Diegoisawesome
d004ce065c
Merge branch 'master' of github.com:pret/pokeemerald into trade
2018-12-31 02:30:30 -06:00
Diegoisawesome
ec780bb209
Cleanup and documentation
2018-12-31 02:22:21 -06:00
Diegoisawesome
c5c6e437ec
Document, cleanup, extract data from trade
2018-12-31 01:23:27 -06:00
Deokishisu
447fec26dc
Consolidate unused escapeRope MapHeader field into filler_18 field
2018-12-30 19:59:57 -05:00
Marcus Huderle
58f130d007
Document some battle anims and helpers
2018-12-30 11:04:17 -06:00
Diegoisawesome
2fb9f490fb
Almost done with trade
2018-12-29 12:46:15 -06:00
Melody
dc6c0ed17e
add event object var references
2018-12-29 11:56:53 -06:00
DizzyEggg
75b4e9ac70
compile contest
2018-12-29 11:48:28 -06:00
DizzyEggg
55e44b0951
a bit more of contest painting effect
2018-12-29 11:48:28 -06:00
Marcus Huderle
d0d870e193
Cleanup formatting
2018-12-29 11:36:54 -06:00
Marcus Huderle
6e7bdb3ca4
Document misc field_specials things
2018-12-29 11:36:54 -06:00
Marcus Huderle
67636b7c64
Document deoxys rock
2018-12-29 11:36:54 -06:00
Marcus Huderle
95dcff581b
Document some fieldmap stuff
2018-12-29 11:36:54 -06:00
Diegoisawesome
f30270dffe
Undo bad idea with BLDALPHA_BLEND macro
2018-12-28 12:56:06 -06:00
Melody
6d556f8cf7
improve checkplayergender calls
...
clean up constant definitions
make tweaks from review
2018-12-28 08:22:21 -06:00
Diegoisawesome
9cad5e8197
Big switch mofo
2018-12-28 02:11:41 -06:00
Marcus Huderle
d59f5a8e56
Misc overworld documentation
2018-12-27 16:52:13 -06:00
Diegoisawesome
5691a67629
Up to sub_807B62C
2018-12-27 02:05:09 -06:00
DizzyEggg
7f6f6c33ab
Fix BgAttributes
2018-12-26 13:05:02 +01:00
Diegoisawesome
d8948a5cda
Merge remote-tracking branch 'pret/master' into trade
2018-12-25 15:03:13 -06:00
melthelesbian
2dd706ca54
use max mon moves constant where able ( #480 )
...
* use max mon moves constant where able
* fix errors in script commands file
* fix more errors
2018-12-25 11:50:15 -06:00
Marcus Huderle
dcbc8db6a3
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
2018-12-25 11:46:35 -06:00
DizzyEggg
49517aca9e
make it compie hopefully
2018-12-24 22:19:40 +01:00
DizzyEggg
e230afd543
Merge branch 'master' into learn
2018-12-24 22:01:52 +01:00