ref: 32de1b269468f48d073a8e6d52843877baff0ba4
parent: 462a7e8cb90ee5a2114eddc0918c3cb12c631775
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Sat May 31 06:35:46 EDT 2014
Relabel a few missed map scripts and TheEndTextString
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -243,7 +243,7 @@
call CopyVideoData
FuncCoord 4, 8
ld hl, Coord
- ld de, UnnamedText_74229 ; $4229
+ ld de, TheEndTextString
call PlaceString
FuncCoord 4, 9
ld hl, Coord
@@ -251,7 +251,8 @@
call PlaceString
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 $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@"
--- a/scripts/pokemontower6.asm
+++ b/scripts/pokemontower6.asm
@@ -7,7 +7,7 @@
ld [W_POKEMONTOWER6CURSCRIPT], a
ret
-Func_60b02: ; 60b02 (18:4b02)
+PokemonTower6Script_60b02: ; 60b02 (18:4b02)
xor a
ld [wJoyIgnore], a
ld [W_POKEMONTOWER6CURSCRIPT], a
@@ -48,7 +48,7 @@
PokemonTower6Script4: ; 60b48 (18:4b48)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
- jp z, Func_60b02
+ jp z, PokemonTower6Script_60b02
ld a, $ff
ld [wJoyIgnore], a
ld a, [wd72d]
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -7,7 +7,7 @@
ld [W_ROUTE16CURSCRIPT], a
ret
-Func_59946: ; 59946 (16:5946)
+Route16Script_59946: ; 59946 (16:5946)
xor a
ld [wJoyIgnore], a
ld [W_ROUTE16CURSCRIPT], a
@@ -47,7 +47,7 @@
Route16Script3: ; 5998f (16:598f)
ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
- jp z, Func_59946
+ jp z, Route16Script_59946
call UpdateSprites
ld a, [wcf0b]
cp $2
--- a/scripts/route16gate.asm
+++ b/scripts/route16gate.asm
@@ -13,7 +13,7 @@
dw Route16GateScript3
Route16GateScript0: ; 496d7 (12:56d7)
- call Func_49755
+ call Route16GateScript_49755
ret nz
ld hl, CoordsData_49714
call ArePlayerCoordsInArray
@@ -82,7 +82,7 @@
ld [W_ROUTE16GATECURSCRIPT], a
ret
-Func_49755: ; 49755 (12:5755)
+Route16GateScript_49755: ; 49755 (12:5755)
ld b, BICYCLE
jp IsItemInBag
@@ -93,7 +93,7 @@
Route16GateText1: ; 49760 (12:5760)
db $08 ; asm
- call Func_49755
+ call Route16GateScript_49755
jr z, .asm_0bdf3 ; 0x49764
ld hl, Route16GateText_4977c
call PrintText
--- a/scripts/route18gate.asm
+++ b/scripts/route18gate.asm
@@ -13,7 +13,7 @@
dw Route18GateScript3
Route18GateScript0: ; 4988f (12:588f)
- call Func_49755
+ call Route16GateScript_49755
ret nz
ld hl, CoordsData_498cc
call ArePlayerCoordsInArray
@@ -88,7 +88,7 @@
Route18GateText1: ; 49911 (12:5911)
db $08 ; asm
- call Func_49755
+ call Route16GateScript_49755
jr z, .asm_3c84d ; 0x49915
ld hl, Route18GateText_4992d
call PrintText