Hex Tutor in Lavender Town

JustRegularLuna · May 12, 2016 · 5ca0c8a · 5ca0c8a
1 parent 5be3d3e
commit 5ca0c8a
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 48 deletions.
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/abra.pic",0,1 ; 55, sprite dimensions
 dw AbraPicFront
 dw AbraPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/alakazam.pic",0,1 ; 77, sprite dimensions
 dw AlakazamPicFront
 dw AlakazamPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/butterfree.pic",0,1 ; 77, sprite dimensions
 dw ButterfreePicFront
 dw ButterfreePicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/espeon.asm b/data/baseStats/espeon.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/espeon.pic",0,1 ; 66, sprite dimensions
 dw EspeonPicFront
 dw EspeonPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/gastly.pic",0,1 ; 77, sprite dimensions
 dw GastlyPicFront
 dw GastlyPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/gengar.pic",0,1 ; 66, sprite dimensions
 dw GengarPicFront
 dw GengarPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/haunter.pic",0,1 ; 66, sprite dimensions
 dw HaunterPicFront
 dw HaunterPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/honchkrow.asm b/data/baseStats/honchkrow.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/honchkrow.pic",0,1 ; sprite dimensions
 dw HonchkrowPicFront
 dw HonchkrowPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/houndoom.asm b/data/baseStats/houndoom.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/houndoom.pic",0,1 ; 77, sprite dimensions
 dw HoundoomPicFront
 dw HoundoomPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/houndour.asm b/data/baseStats/houndour.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/houndour.pic",0,1 ; 55, sprite dimensions
 dw HoundourPicFront
 dw HoundourPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/jynx.pic",0,1 ; 66, sprite dimensions
 dw JynxPicFront
 dw JynxPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/kadabra.pic",0,1 ; 66, sprite dimensions
 dw KadabraPicFront
 dw KadabraPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/mew.pic",0,1 ; 55, sprite dimensions
 dw MewPicFront
 dw MewPicBack
 ; move tutor compatibility flags
-	m_tutor 5,6,7
+	m_tutor 5,6,7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/mewtwo.pic",0,1 ; 77, sprite dimensions
 dw MewtwoPicFront
 dw MewtwoPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/misdreavus.asm b/data/baseStats/misdreavus.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/misdreavus.pic",0,1 ; 55, sprite dimensions
 dw MisdreavusPicFront
 dw MisdreavusPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/mismagius.asm b/data/baseStats/mismagius.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/mismagius.pic",0,1 ; 55, sprite dimensions
 dw MismagiusPicFront
 dw MismagiusPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/mr.mime.pic",0,1 ; 66, sprite dimensions
 dw MrMimePicFront
 dw MrMimePicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/murkrow.asm b/data/baseStats/murkrow.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/murkrow.pic",0,1 ; 55, sprite dimensions
 dw MurkrowPicFront
 dw MurkrowPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions
 dw NinetalesPicFront
 dw NinetalesPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/slowbro.pic",0,1 ; 77, sprite dimensions
 dw SlowbroPicFront
 dw SlowbroPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/slowking.asm b/data/baseStats/slowking.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/slowking.pic",0,1 ; 77, sprite dimensions
 dw SlowkingPicFront
 dw SlowkingPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/slowpoke.pic",0,1 ; 55, sprite dimensions
 dw SlowpokePicFront
 dw SlowpokePicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/tentacool.pic",0,1 ; 55, sprite dimensions
 dw TentacoolPicFront
 dw TentacoolPicBack
 ; move tutor compatibility flags
-	m_tutor 5
+	m_tutor 5,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/tentacruel.pic",0,1 ; 66, sprite dimensions
 dw TentacruelPicFront
 dw TentacruelPicBack
 ; move tutor compatibility flags
-	m_tutor 5
+	m_tutor 5,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/torkoal.asm b/data/baseStats/torkoal.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/torkoal.pic",0,1 ; 55, sprite dimensions
 dw TorkoalPicFront
 dw TorkoalPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/umbreon.asm b/data/baseStats/umbreon.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/umbreon.pic",0,1 ; 66, sprite dimensions
 dw UmbreonPicFront
 dw UmbreonPicBack
 ; move tutor compatibility flags
-	m_tutor 7
+	m_tutor 7,8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/venomoth.pic",0,1 ; 77, sprite dimensions
 dw VenomothPicFront
 dw VenomothPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm
@@ -13,7 +13,7 @@ INCBIN "pic/bmon/vulpix.pic",0,1 ; 66, sprite dimensions
 dw VulpixPicFront
 dw VulpixPicBack
 ; move tutor compatibility flags
-	m_tutor 0
+	m_tutor 8
 	m_tutor 0
 	m_tutor 0
 	m_tutor 0

diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm
@@ -9,7 +9,7 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32)
 
 	db $2 ; people
 	db SPRITE_SLOWBRO, $5 + 4, $3 + 4, $ff, $d1, $1 ; person
-	db SPRITE_BRUNETTE_GIRL, $4 + 4, $2 + 4, $ff, $d3, $2 ; person
+	db SPRITE_MEDIUM, $4 + 4, $2 + 4, $ff, $d3, $2 ; person
 
 	; warp-to
 	EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2

diff --git a/data/move_tutors.asm b/data/move_tutors.asm
@@ -6,7 +6,7 @@ MoveTutorMoves: ; A list of all moves taught by move tutors, their location as a
 	db GUNK_SHOT    ; Cinnabar Island
 	db DRACO_METEOR ; Indigo Plateau Lobby
 	db MOONBLAST    ; Mt. Moon Square
-	db 0 ; placeholder
+	db HEX          ; Lavender Town
 	db 0 ; placeholder
 	db 0 ; placeholder
 	db 0 ; placeholder

diff --git a/scripts/lavenderhouse2.asm b/scripts/lavenderhouse2.asm
@@ -15,22 +15,7 @@ LavenderHouse2Text1: ; 1d9b6 (7:59b6)
 
 LavenderHouse2Text2: ; 1d9c3 (7:59c3)
 	db $08 ; asm
-	ld a, [wd7e0]
-	bit 7, a
-	jr nz, .asm_65711 ; 0x1d9c9
-	ld hl, LavenderHouse2Text_1d9dc
-	call PrintText
-	jr .asm_64be1 ; 0x1d9d1
-.asm_65711 ; 0x1d9d3
-	ld hl, LavenderHouse2Text_1d9e1
-	call PrintText
-.asm_64be1 ; 0x1d9d9
+	ld a, 8
+	ld [wWhichTrade], a
+	callba MoveTutorScript
 	jp TextScriptEnd
-
-LavenderHouse2Text_1d9dc: ; 1d9dc (7:59dc)
-	TX_FAR _LavenderHouse2Text_1d9dc
-	db "@"
-
-LavenderHouse2Text_1d9e1: ; 1d9e1 (7:59e1)
-	TX_FAR _LavenderHouse2Text_1d9e1
-	db "@"