pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

* BillPhoneGeneriText -> BillPhoneGenericText

Browse Source 
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
This commit is contained in:
Rangi 2018-02-26 22:29:09 -05:00
parent f0b01a4eea
commit e2c15b0b92
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/phone/text/bill.asm
View File

@ -28,7 +28,7 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
line "SERVICE."
done
BillPhoneGeneriText: ; 0x1b44fe
BillPhoneGenericText: ; 0x1b44fe
text "Who's calling?"
para "<PLAY_G>, is it?"

0
data/phone/text/trainers1.asm → data/phone/text/trainers.asm
View File

2
engine/phone/phone_scripts.asm
View File

@ -169,7 +169,7 @@ BillPhoneScript1: ; 0xbcfc5
jump .main
.main ; 0xbcfe7
farwritetext BillPhoneGeneriText
farwritetext BillPhoneGenericText
buttonsound
checkcode VAR_BOXSPACE
vartomem MEM_BUFFER_0

16
home/rst.asm
View File

@ -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

2
main.asm
View File

@ -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