Merge remote-tracking branch 'origin/master' into pngs-kind-of

Conflicts: INSTALL.md
2025-12-11 05:02:16 -08:00 · 2015-10-26 01:34:08 -04:00
parent b8da3874bb 0d17d4a758
commit e638cdb74c
461 changed files with 22335 additions and 21207 deletions
--- a/gfx/credits/border.png
+++ b/gfx/credits/border.png
--- a/gfx/credits/pichu.png
+++ b/gfx/credits/pichu.png
--- a/gfx/credits/theend.png
+++ b/gfx/credits/theend.png
--- a/gfx/misc/pack.png
+++ b/gfx/misc/pack.png
--- a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp
+++ b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp
--- a/gfx/pics/animation.asm
+++ b/gfx/pics/animation.asm
@@ -3,7 +3,7 @@

 Functiond0000: ; d0000
 	hlcoord 12, 0
-	ld a, [IsInBattle]
+	ld a, [wBattleMode]
 	cp $1
 	jr z, .asm_d0012
 	ld e, $0