diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 826e1e8a6..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 3753ef5ba..cdae20883 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index e90a3e57e..3f9088022 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/013_Items/004_1_PokeradarUI.rb b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
index 1e5b04a2d..a40020c12 100644
--- a/Data/Scripts/013_Items/004_1_PokeradarUI.rb
+++ b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
@@ -84,7 +84,7 @@ class PokeRadar_UI
     @sprites[iconId].z = 100
 
     @current_x += ICON_MARGIN_X
-    if @current_x >= ICON_LINE_END
+    if @current_x > ICON_LINE_END
       @current_x = ICON_START_X
       @current_y +=ICON_MARGIN_Y
       @sprites["background"].zoom_y += 1
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index de532297a..b062bf8aa 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 9873e9ae6..8d34a0eef 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/PBS/trainers.txt b/PBS/trainers.txt
index 4da7c10d7..e31dd6ffa 100644
--- a/PBS/trainers.txt
+++ b/PBS/trainers.txt
@@ -899,7 +899,7 @@ Pokemon = B58H4,43 #CHARLITHE
 ##############################
 
 [BUGCATCHER,Rick]
-Pokemon = B41H13,6 
+Pokemon = WEEDLE,6 
 Pokemon = B41H10,6 
 #-------------------
 
@@ -2156,7 +2156,7 @@ Pokemon = B59H38,47 #NINENINE
 	Moves = ROAR,FIREFANG,CONFUSERAY,THUNDERFANG
 	AbilityIndex = 0			
 	Item = CHARCOAL
-Pokemon = B126H112,49 #Rhymar,
+Pokemon = B112H126,49 #magmar + rhydon,
 	Moves = FIREPUNCH,DRILLRUN,CONFUSERAY,HAMMERARM
 	AbilityIndex = 0	
 	Item = PASSHOBERRY