Maruno17 c4e69d0a2e Fixing up merge

2020-10-18 22:08:55 +01:00

..

001_Technical

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

002_Switches and Variables

Removed all excess whitespace and standardized line endings.

2020-09-05 21:23:16 +02:00

003_Game classes

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

004_Sprites

Resolved many Rubocop warnings

2020-09-06 17:31:12 +01:00

005_Map renderer

Resolved many Rubocop warnings

2020-09-06 17:31:12 +01:00

006_Game processing

Tidying and rearranging

2020-09-28 21:07:54 +01:00

007_Events and files

Fixing broken code

2020-09-06 19:10:25 +01:00

008_Audio

Changed a proc's return to next

2020-09-27 18:07:42 +01:00

009_Objects and windows

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

010_Scenes

Tidied up credits script

2020-10-17 01:11:22 +01:00

011_Data

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

012_Battle

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

013_Overworld

Fixing up merge

2020-10-18 22:08:55 +01:00

014_Trainers

Moved trainer data constants into module TrainerData

2020-10-17 00:45:39 +01:00

015_Items

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

016_Pokemon

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

017_UI

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

018_Minigames

Merge branch 'pr/43' into refactor

2020-10-17 14:40:52 +01:00

019_Other battles

Moved species data constants into module SpeciesData

2020-10-17 00:17:40 +01:00

020_System and utilities

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

021_Debug

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

022_Compiler

Fixing up merge

2020-10-18 22:08:55 +01:00

999_Main

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00

001_Settings.rb

Merge branch 'master' into refactor

2020-10-18 21:40:04 +01:00