ref: 5ea1d8a61f8ba733f2438b963fdc30b766cd808f
parent: b17d958e6016588ecc1f1f842ad2194dd7d7c4d9
author: IIMarckus <iimarckus@gmail.com>
date: Sun Oct 26 17:00:29 EDT 2014
Labels for Fuji in Pokémon Tower.
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -6,11 +6,18 @@
db $0 ; signs
+IF DEF(_YELLOW)
+ db 3 ; people
+ db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1
+ db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2
+ db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3
+ELSE
db $4 ; people
db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13
db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14
db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15
db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person
+ENDC
; warp-to
EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -14,7 +14,7 @@
ld [W_CURMAPSCRIPT], a
ret
-PokemonTower7ScriptPointers: ; 60d23 (18:4d23)
+PokemonTower7ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw PokemonTower7Script2
@@ -164,7 +164,7 @@
dw PokemonTower7Text1
dw PokemonTower7Text2
dw PokemonTower7Text3
- dw PokemonTower7Text4
+ dw PokemonTower7FujiText
PokemonTower7TrainerHeaders: ; 60e47 (18:4e47)
PokemonTower7TrainerHeader0: ; 60e47 (18:4e47)
@@ -214,9 +214,9 @@
call TalkToTrainer
jp TextScriptEnd
-PokemonTower7Text4: ; 60e8a (18:4e8a)
- db $08 ; asm
- ld hl, PokemonTower7Text_60ec4
+PokemonTower7FujiText:
+ db 8 ; asm
+ ld hl, TowerRescueFujiText
call PrintText
ld hl, wd7e0
set 7, [hl]
@@ -236,8 +236,8 @@
ld [W_CURMAPSCRIPT], a
jp TextScriptEnd
-PokemonTower7Text_60ec4: ; 60ec4 (18:4ec4)
- TX_FAR _PokemonTower7Text_60ec4
+TowerRescueFujiText:
+ TX_FAR _TowerRescueFujiText
db "@"
PokemonTower7BattleText1: ; 60ec9 (18:4ec9)
--- a/text/maps/pokemon_tower_7f.asm
+++ b/text/maps/pokemon_tower_7f.asm
@@ -24,7 +24,7 @@
cont "off again!@@"
ENDC
-_PokemonTower7Text_60ec4:: ; 99c1a (26:5c1a)
+_TowerRescueFujiText:: ; 99c1a (26:5c1a)
text "MR.FUJI: Heh? You"
line "came to save me?"