* BillPhoneGeneriText -> BillPhoneGenericText

* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm * ,ROM -> , ROM0
gutenkode · Feb 27, 2018 · e2c15b0 · e2c15b0
1 parent f0b01a4
commit e2c15b0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/data/phone/text/bill.asm b/data/phone/text/bill.asm
@@ -28,7 +28,7 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
 	line "SERVICE."
 	done
 
-BillPhoneGeneriText: ; 0x1b44fe
+BillPhoneGenericText: ; 0x1b44fe
 	text "Who's calling?"
 
 	para "<PLAY_G>, is it?"

diff --git a/data/phone/text/trainers1.asm → data/phone/text/trainers.asm b/data/phone/text/trainers1.asm → data/phone/text/trainers.asm
diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm
@@ -169,7 +169,7 @@ BillPhoneScript1: ; 0xbcfc5
 	jump .main
 
 .main ; 0xbcfe7
-	farwritetext BillPhoneGeneriText
+	farwritetext BillPhoneGenericText
 	buttonsound
 	checkcode VAR_BOXSPACE
 	vartomem MEM_BUFFER_0

diff --git a/home/rst.asm b/home/rst.asm
@@ -1,24 +1,24 @@
 ; rst vectors
 
-SECTION "rst0",ROM0
+SECTION "rst0", ROM0
 	di
 	jp Start
 
-SECTION "rst8",ROM0
+SECTION "rst8", ROM0 ; rst FarCall
 	jp FarCall_hl
 
-SECTION "rst10",ROM0
+SECTION "rst10", ROM0 ; rst Bankswitch
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 	ret
 
-SECTION "rst18",ROM0
+SECTION "rst18", ROM0
 	rst $38
 
-SECTION "rst20",ROM0
+SECTION "rst20", ROM0
 	rst $38
 
-SECTION "rst28",ROM0
+SECTION "rst28", ROM0 ; rst JumpTable
 	push de
 	ld e, a
 	ld d, 0
@@ -30,8 +30,8 @@ SECTION "rst28",ROM0
 	pop de
 	jp hl
 
-; SECTION "rst30",ROM0
+; SECTION "rst30", ROM0
 ; rst30 is midst rst28
 
-SECTION "rst38",ROM0
+SECTION "rst38", ROM0
 	rst $38
diff --git a/main.asm b/main.asm
@@ -560,7 +560,7 @@ SECTION "Special Phone Text", ROMX
 INCLUDE "data/phone/text/mom.asm"
 INCLUDE "data/phone/text/bill.asm"
 INCLUDE "data/phone/text/elm.asm"
-INCLUDE "data/phone/text/trainers1.asm"
+INCLUDE "data/phone/text/trainers.asm"
 
 
 SECTION "Miscellaneous Text", ROMX