Viridian Trainer School

6 files changed, 30 insertions, 9 deletions

diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm
index b60be6c0..4c802e64 100755
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/school.asm
@@ -7,9 +7,10 @@ SchoolObject: ; 0x1d55d (size=32)
 
 	db $0 ; signs
 
-	db $2 ; objects
+	db $3 ; objects
 	object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person
 	object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person
+	object SPRITE_LITTLE_GIRL, $4, $5, STAY, UP, $3 ; person
 
 	; warp-to
 	EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index dbe4d15f..2e528fcd 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -43,7 +43,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(OaksLab_h)
 	db BANK(ViridianPokecenter_h)
 	db BANK(ViridianMart_h)
-	db $07 ; db BANK(School_h)
+	db BANK(School_h)
 	db $07 ; db BANK(ViridianHouse_h)
 	db $1d ; db BANK(ViridianGym_h)
 	db $07 ; db BANK(DiglettsCaveRoute2_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index e3edc139..e7a2c570 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -43,7 +43,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw OaksLab_h ;id=40
 	dw ViridianPokecenter_h
 	dw ViridianMart_h
-	dw $4d6d ; dw School_h
+	dw School_h
 	dw $4dc6 ; dw ViridianHouse_h
 	dw $40d4 ; dw ViridianGym_h
 	dw $57ae ; dw DiglettsCaveRoute2_h
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index c3726c5e..6f949238 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -350,7 +350,11 @@ INCLUDE "scripts/route1_2.asm"
 INCLUDE "scripts/route22_2.asm"
 INCLUDE "scripts/redshouse1f2.asm"
 Func_f1be0:
-	dr $f1be0, $f220e
+	dr $f1be0, $f1c03
+Func_f1c03:
+	dr $f1c03, $f1c0f
+Func_f1c0f:
+	dr $f1c0f, $f220e
 
 INCLUDE "data/mapHeaders/beach_house.asm"
 INCLUDE "scripts/beach_house.asm"
diff --git a/main.asm b/main.asm
index 325bcdbe..fa68ed90 100755
--- a/main.asm
+++ b/main.asm
@@ -292,7 +292,10 @@ INCBIN "maps/route1.blk"
 	dr $1c1b0,$1c1c0 ; headers, objects, blocks
 OaksLabBlocks:
 INCBIN "maps/oakslab.blk"
-	dr $1c1de,$1c21e ; headers, objects, blocks
+	dr $1c1de,$1c1ee ; headers, objects, blocks
+SchoolBlocks:
+INCBIN "maps/school.blk"
+	dr $1c1fe,$1c21e ; headers, objects, blocks
 
 INCLUDE "engine/clear_save.asm"
 INCLUDE "engine/predefs7.asm"
@@ -317,7 +320,12 @@ SaffronMartBlocks:
 FuchsiaMartBlocks:
 CinnabarMartBlocks:
 INCBIN "maps/viridianmart.blk"
-	dr $1cd6d,$1e2ae ; map scripts
+
+INCLUDE "data/mapHeaders/school.asm"
+INCLUDE "scripts/school.asm"
+INCLUDE "data/mapObjects/school.asm"
+
+	dr $1cdc6,$1e2ae ; map scripts
 
 INCLUDE "engine/menu/oaks_pc.asm"
 
diff --git a/scripts/school.asm b/scripts/school.asm
index 57eb58c8..6ee0d36e 100755
--- a/scripts/school.asm
+++ b/scripts/school.asm
@@ -1,14 +1,22 @@
 SchoolScript: ; 1d54c (7:554c)
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ret
 
 SchoolTextPointers: ; 1d54f (7:554f)
 	dw SchoolText1
 	dw SchoolText2
+	dw SchoolText3
 
 SchoolText1: ; 1d553 (7:5553)
 	TX_FAR _SchoolText1
 	db "@"
 
 SchoolText2: ; 1d558 (7:5558)
-	TX_FAR _SchoolText2
-	db "@"
+	TX_ASM
+	callba Func_f1c0f
+	jp TextScriptEnd
+
+SchoolText3: ; 1d558 (7:5558)
+	TX_ASM
+	callba Func_f1c03
+	jp TextScriptEnd