Relabel a few missed map scripts and TheEndTextString

This commit is contained in:
U-Fish-PC\Daniel 2014-05-31 10:35:46 -04:00
parent 462a7e8cb9
commit 32de1b2694
5 changed files with 12 additions and 11 deletions

View file

@ -243,7 +243,7 @@ Credits: ; 7418e (1d:418e)
call CopyVideoData call CopyVideoData
FuncCoord 4, 8 FuncCoord 4, 8
ld hl, Coord ld hl, Coord
ld de, UnnamedText_74229 ; $4229 ld de, TheEndTextString
call PlaceString call PlaceString
FuncCoord 4, 9 FuncCoord 4, 9
ld hl, Coord ld hl, Coord
@ -251,7 +251,8 @@ Credits: ; 7418e (1d:418e)
call PlaceString call PlaceString
jp Func_740ba jp Func_740ba
UnnamedText_74229: ; 74229 (1d:4229) TheEndTextString: ; 74229 (1d:4229)
; "T H E E N D"
db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@" db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@"
db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@" db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@"

View file

@ -7,7 +7,7 @@ PokemonTower6Script: ; 60aef (18:4aef)
ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_POKEMONTOWER6CURSCRIPT], a
ret ret
Func_60b02: ; 60b02 (18:4b02) PokemonTower6Script_60b02: ; 60b02 (18:4b02)
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_POKEMONTOWER6CURSCRIPT], a
@ -48,7 +48,7 @@ CoordsData_60b45: ; 60b45 (18:4b45)
PokemonTower6Script4: ; 60b48 (18:4b48) PokemonTower6Script4: ; 60b48 (18:4b48)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff cp $ff
jp z, Func_60b02 jp z, PokemonTower6Script_60b02
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, [wd72d] ld a, [wd72d]

View file

@ -7,7 +7,7 @@ Route16Script: ; 59933 (16:5933)
ld [W_ROUTE16CURSCRIPT], a ld [W_ROUTE16CURSCRIPT], a
ret ret
Func_59946: ; 59946 (16:5946) Route16Script_59946: ; 59946 (16:5946)
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [W_ROUTE16CURSCRIPT], a ld [W_ROUTE16CURSCRIPT], a
@ -47,7 +47,7 @@ Route16Script0: ; 59959 (16:5959)
Route16Script3: ; 5998f (16:598f) Route16Script3: ; 5998f (16:598f)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff cp $ff
jp z, Func_59946 jp z, Route16Script_59946
call UpdateSprites call UpdateSprites
ld a, [wcf0b] ld a, [wcf0b]
cp $2 cp $2

View file

@ -13,7 +13,7 @@ Route16GateScriptPointers: ; 496cf (12:56cf)
dw Route16GateScript3 dw Route16GateScript3
Route16GateScript0: ; 496d7 (12:56d7) Route16GateScript0: ; 496d7 (12:56d7)
call Func_49755 call Route16GateScript_49755
ret nz ret nz
ld hl, CoordsData_49714 ld hl, CoordsData_49714
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
@ -82,7 +82,7 @@ Route16GateScript3: ; 49741 (12:5741)
ld [W_ROUTE16GATECURSCRIPT], a ld [W_ROUTE16GATECURSCRIPT], a
ret ret
Func_49755: ; 49755 (12:5755) Route16GateScript_49755: ; 49755 (12:5755)
ld b, BICYCLE ld b, BICYCLE
jp IsItemInBag jp IsItemInBag
@ -93,7 +93,7 @@ Route16GateTextPointers: ; 4975a (12:575a)
Route16GateText1: ; 49760 (12:5760) Route16GateText1: ; 49760 (12:5760)
db $08 ; asm db $08 ; asm
call Func_49755 call Route16GateScript_49755
jr z, .asm_0bdf3 ; 0x49764 jr z, .asm_0bdf3 ; 0x49764
ld hl, Route16GateText_4977c ld hl, Route16GateText_4977c
call PrintText call PrintText

View file

@ -13,7 +13,7 @@ Route18GateScriptPointers: ; 49887 (12:5887)
dw Route18GateScript3 dw Route18GateScript3
Route18GateScript0: ; 4988f (12:588f) Route18GateScript0: ; 4988f (12:588f)
call Func_49755 call Route16GateScript_49755
ret nz ret nz
ld hl, CoordsData_498cc ld hl, CoordsData_498cc
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
@ -88,7 +88,7 @@ Route18GateTextPointers: ; 4990d (12:590d)
Route18GateText1: ; 49911 (12:5911) Route18GateText1: ; 49911 (12:5911)
db $08 ; asm db $08 ; asm
call Func_49755 call Route16GateScript_49755
jr z, .asm_3c84d ; 0x49915 jr z, .asm_3c84d ; 0x49915
ld hl, Route18GateText_4992d ld hl, Route18GateText_4992d
call PrintText call PrintText