From 600164d524f55bc650c88b976418bdbe0ba8b036 Mon Sep 17 00:00:00 2001
From: Kristian Sims <kristian.sims@gmail.com>
Date: Sat, 22 Oct 2022 15:01:28 -0400
Subject: [PATCH] Removed license of unused SDL2 cython libs, and fixed some
 typos

---
 LICENSE.SDL2.txt                               | 15 ---------------
 README.md                                      | 10 +++++-----
 pyboy/core/ram.pxd                             |  3 ++-
 pyboy/core/ram.py                              | 16 ++++++++--------
 pyboy/plugins/game_wrapper_super_mario_land.py |  4 ++--
 5 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 LICENSE.SDL2.txt

diff --git a/LICENSE.SDL2.txt b/LICENSE.SDL2.txt
deleted file mode 100644
index 480c61edc..000000000
--- a/LICENSE.SDL2.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
diff --git a/README.md b/README.md
index 17fca2c26..3825b43c6 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ It is highly recommended to read the [report](https://github.com/Baekalfen/PyBoy
 
 If you've read the report and want more explicit details, have a look at the [Pan Docs](http://bgb.bircd.org/pandocs.htm).
 
-__If you are looking to make a bot or AI__, you can find all the external components in the [PyBoy Documentation](https://baekalfen.github.io/PyBoy/index.html). There is also a short example on our Wiki page [Scripts, AI and Bots](https://github.com/Baekalfen/PyBoy/wiki/Scripts,-AI-and-Bots) as well as in the [examples directory](https://github.com/Baekalfen/PyBoy/tree/master/examples). If more features are needed, or if you find a bug, don't hesitate to make an issue here on GitHub, or write on our [Discord channel](https://discord.gg/Zrf2nyH).
+__If you are looking to make a bot or AI__, you can find all the external components in the [PyBoy Documentation](https://baekalfen.github.io/PyBoy/index.html). There is also a short example on our Wiki page [Scripts, AI and Bots](https://github.com/Baekalfen/PyBoy/wiki/Scripts,-AI-and-Bots) as well as in the [examples directory](https://github.com/Baekalfen/PyBoy/tree/master/examples). If more features are needed, or if you find a bug, don't hesitate to make an issue here on GitHub, or post on our [Discord channel](https://discord.gg/Zrf2nyH).
 
 
 <!---
@@ -49,7 +49,7 @@ Generate GIF with the layout and captions
 
 Installation
 ============
-The instructions are simple, if you already have a functioning Python environment on your machine.
+The instructions are simple if you already have a functioning Python environment on your machine.
 
  1. Install PyBoy using __`pip install pyboy`__ (add __` --user`__ if your system asks)
  2. If your system isn't supported by [pysdl2-dll](https://pypi.org/project/pysdl2-dll/), you'll need to install SDL2 from your package manager.
@@ -85,13 +85,13 @@ pil_image = pyboy.screen_image()
 pil_image.save('screenshot.png')
 ```
 
-At the Wiki page, you will also find out how to interface with PyBoy from your own project: [Wiki](https://github.com/Baekalfen/PyBoy/wiki).
+The Wiki shows how to interface with PyBoy from your own project: [Wiki](https://github.com/Baekalfen/PyBoy/wiki).
 
 
 Contributors
 ============
 
-Thanks to all the people, who have contributed to the project!
+Thanks to all the people who have contributed to the project!
 
 Original Developers
 -------------------
@@ -114,7 +114,7 @@ Student Projects
 
 Contribute
 ==========
-Any contribution is appreciated. The currently known errors are registered in the Issues tab. Feel free to take a swing at any one of them.
+Any contribution is appreciated. The currently known problems are tracked in the Issues tab. Feel free to take a swing at any one of them.
 
 For the more major features, there are the following that you can give a try. They are also described in more detail in the [project list](https://github.com/Baekalfen/PyBoy/raw/master/Projects/Projects.pdf):
 * Link Cable
diff --git a/pyboy/core/ram.pxd b/pyboy/core/ram.pxd
index 9b6e3345d..e310853b6 100644
--- a/pyboy/core/ram.pxd
+++ b/pyboy/core/ram.pxd
@@ -6,13 +6,14 @@
 from libc.stdint cimport uint8_t
 from pyboy.utils cimport IntIOInterface
 
+
 cdef class RAM:
     cdef void save_state(self, IntIOInterface)
     cdef void load_state(self, IntIOInterface, int)
+
     cdef uint8_t[:] internal_ram0 # Dynamic size for DMG/CGB
     cdef uint8_t[0x60] non_io_internal_ram0
     cdef uint8_t[0x4C] io_ports
     cdef uint8_t[0x7F] internal_ram1
     cdef uint8_t[0x34] non_io_internal_ram1
     cdef bint cgb
-
diff --git a/pyboy/core/ram.py b/pyboy/core/ram.py
index a582d7229..167f5cee8 100644
--- a/pyboy/core/ram.py
+++ b/pyboy/core/ram.py
@@ -25,14 +25,14 @@ def __init__(self, cgb, randomize=False):
         self.non_io_internal_ram1 = array("B", [0] * (NON_IO_INTERNAL_RAM1))
 
         if randomize:
-            for i in range(INTERNAL_RAM0_CGB if cgb else INTERNAL_RAM0):
-                self.internal_ram0[i] = getrandbits(8)
-            for i in range(NON_IO_INTERNAL_RAM0):
-                self.non_io_internal_ram0[i] = getrandbits(8)
-            for i in range(INTERNAL_RAM1):
-                self.internal_ram1[i] = getrandbits(8)
-            for i in range(NON_IO_INTERNAL_RAM1):
-                self.non_io_internal_ram1[i] = getrandbits(8)
+            for n in range(INTERNAL_RAM0_CGB if cgb else INTERNAL_RAM0):
+                self.internal_ram0[n] = getrandbits(8)
+            for n in range(NON_IO_INTERNAL_RAM0):
+                self.non_io_internal_ram0[n] = getrandbits(8)
+            for n in range(INTERNAL_RAM1):
+                self.internal_ram1[n] = getrandbits(8)
+            for n in range(NON_IO_INTERNAL_RAM1):
+                self.non_io_internal_ram1[n] = getrandbits(8)
 
     def save_state(self, f):
         for n in range(INTERNAL_RAM0_CGB if self.cgb else INTERNAL_RAM0):
diff --git a/pyboy/plugins/game_wrapper_super_mario_land.py b/pyboy/plugins/game_wrapper_super_mario_land.py
index b97be5664..d632454dd 100644
--- a/pyboy/plugins/game_wrapper_super_mario_land.py
+++ b/pyboy/plugins/game_wrapper_super_mario_land.py
@@ -189,8 +189,8 @@ def set_world_level(self, world, level):
         Patches the handler for pressing start in the menu. It hardcodes a world and level to always "continue" from.
 
         Args:
-            world (int): The wanted number of lives
-            level (int): The wanted number of lives
+            world (int): The world to select a level from, 0-3
+            level (int): The level to start from, 0-2
         """
 
         for i in range(0x450, 0x461):