fixes

Author: Salsbar

.github/workflows/makefile.yml

@@ -0,0 +1,37 @@
+name: Makefile CI
+
+on:
+  push:
+    branches: [ unovared ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: submodules-init
+      with:
+        ref: unovared
+    # You may pin to the exact commit or the version.
+    # uses: snickerbockers/submodules-init@74927a8bb0fe1bb0f1f1e4d102384a8e69f19171
+      uses: snickerbockers/submodules-init@v4
+    
+    - name: before_build
+      run:  wget https://github.com/rednex/rgbds/archive/v0.2.5.tar.gz -O rgbds.tar.gz && 
+            tar xf rgbds.tar.gz && 
+            cd rgbds-0.2.5 && 
+            sudo make install;
+            sudo apt-get install virtualenv
+            
+    - name: build
+      run: virtualenv venv -p python27 && source venv/bin/activate && 
+           make
+    - uses: actions/upload-artifact@v2
+      with:
+        name: unovared
+        path: |
+          unovared/*.gbc
+          *.gbc
+          *.gb

.gitignore

@@ -33,3 +33,5 @@
 # for vim configuration
 # url: http://www.vim.org/scripts/script.php?script_id=441
 .lvimrc
+
+Thumbs.db

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "extras"]
 	path = extras
 	url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git
+
+[submodule "rgbds"]
+	path = rgbds
+	url = git://github.com/gbdev/rgbds.git

Makefile

@@ -1,10 +1,10 @@
 PYTHON := python
 MD5 := md5sum -c --quiet
 
-2bpp     := $(PYTHON) extras/pokemontools/gfx.py 2bpp
-1bpp     := $(PYTHON) extras/pokemontools/gfx.py 1bpp
-pic      := $(PYTHON) extras/pokemontools/pic.py compress
-includes := $(PYTHON) extras/pokemontools/scan_includes.py
+2bpp     := $(PYTHON) -m extras.pokemontools.gfx 2bpp
+1bpp     := $(PYTHON) -m extras.pokemontools.gfx 1bpp
+pic      := $(PYTHON) -m extras.pokemontools.pic compress
+includes := $(PYTHON) -m extras.pokemontools.scan_includes
 
 pokered_obj := audio_red.o main_red.o text_red.o wram_red.o
 pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o

data/moves.asm

@@ -43,7 +43,7 @@ MoveEnd:
         move HORN_ATTACK,  NO_ADDITIONAL_EFFECT,        65, NORMAL,   100, 25
         move FURY_ATTACK,  TWO_TO_FIVE_ATTACKS_EFFECT,  15, NORMAL,    85, 20
         move HORN_DRILL,   OHKO_EFFECT,                  1, NORMAL,    30,  5
-        move TACKLE,       NO_ADDITIONAL_EFFECT,        40, NORMAL,    100, 35
+        move TACKLE,       NO_ADDITIONAL_EFFECT,        50, NORMAL,    100, 35
         move BODY_SLAM,    PARALYZE_SIDE_EFFECT2,       85, NORMAL,   100, 15
         move WRAP,         TRAPPING_EFFECT,             15, NORMAL,    85, 20
         move TAKE_DOWN,    RECOIL_EFFECT,               90, NORMAL,    85, 20
@@ -141,7 +141,7 @@ MoveEnd:
         move GIGA_DRAIN,   DRAIN_HP_EFFECT,             75, GRASS,     100, 10
         move SWIFT,        SWIFT_EFFECT,                60, NORMAL,   100, 20
         move SKULL_BASH,   CHARGE_EFFECT,              120, NORMAL,   100, 15
-        move METAL_CLAW,   NO_ADDITIONAL_EFFECT,       50, STEEL,   95, 35
+        move METAL_CLAW,   NO_ADDITIONAL_EFFECT,       50, STEEL,   100, 35
         move IRON_HEAD,    FLINCH_SIDE_EFFECT1,         80, STEEL,   100, 15
         move AMNESIA,      SPECIAL_UP2_EFFECT,           0, PSYCHIC,  100, 20
         move CRUNCH,       DEFENSE_DOWN_SIDE_EFFECT,    80, DARK,   100, 15

data/wildPokemon/route21.asm

@@ -3,13 +3,13 @@ Route21Mons:
 	db 21,TRANQUILL
 	db 23,WATCHOG
 	db 30,HERDIER
-	db 23,MIENFOO
+	db 30,AUDINO
 	db 21,TRANQUILL
 	db 30,HERDIER
 	db 32,WATCHOG
-	db 28,MIENFOO
-	db 30,MIENFOO
-	db 32,HERDIER
+	db 28,AUDINO
+	db 33,AUDINO
+	db 36,AUDINO
 	db $05
 	db 15,FRILLISH
 	db 20,DUCKLETT

engine/pokedex_rating.asm

@@ -86,7 +86,7 @@ DexRatingsTable:
 	dw PokedexRatingText_44242
 	db 150
 	dw PokedexRatingText_44247
-	db 152
+	db 156
 	dw PokedexRatingText_4424c
 
 PokedexRatingText_44201:

main.asm

@@ -598,7 +598,7 @@ DrilburPicFront::      INCBIN "pic/bmon/drilbur.pic"
 DrilburPicBack::       INCBIN "pic/monback/drilburb.pic"
 ExcadrillPicFront::    INCBIN "pic/bmon/excadrill.pic"
 ExcadrillPicBack::     INCBIN "pic/monback/excadrillb.pic"
-AudinoPicFront::     INCBIN "pic/bmon/Audino.pic"
+AudinoPicFront::     INCBIN "pic/bmon/audino.pic"
 AudinoPicBack::      INCBIN "pic/monback/audinob.pic"
 TimburrPicFront::    INCBIN "pic/bmon/timburr.pic"
 TimburrPicBack::     INCBIN "pic/monback/timburrb.pic"