foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Labels for Fuji in Pokémon Tower.

Browse source
This commit is contained in:
IIMarckus 2014-10-26 21:00:29 -06:00
parent b17d958e60
commit 5ea1d8a61f
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/mapObjects/pokemontower7.asm
View file

@ -6,11 +6,18 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
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

14
scripts/pokemontower7.asm
View file

@ -14,7 +14,7 @@ PokemonTower7Script_60d18: ; 60d18 (18:4d18)
ld [W_CURMAPSCRIPT], a
ret
PokemonTower7ScriptPointers: ; 60d23 (18:4d23)
PokemonTower7ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw PokemonTower7Script2
@ -164,7 +164,7 @@ PokemonTower7TextPointers: ; 60e3f (18:4e3f)
dw PokemonTower7Text1
dw PokemonTower7Text2
dw PokemonTower7Text3
dw PokemonTower7Text4
dw PokemonTower7FujiText
PokemonTower7TrainerHeaders: ; 60e47 (18:4e47)
PokemonTower7TrainerHeader0: ; 60e47 (18:4e47)
@ -214,9 +214,9 @@ PokemonTower7Text3: ; 60e80 (18:4e80)
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 @@ PokemonTower7Text4: ; 60e8a (18:4e8a)
ld [W_CURMAPSCRIPT], a
jp TextScriptEnd
PokemonTower7Text_60ec4: ; 60ec4 (18:4ec4)
TX_FAR _PokemonTower7Text_60ec4
TowerRescueFujiText:
TX_FAR _TowerRescueFujiText
db "@"
PokemonTower7BattleText1: ; 60ec9 (18:4ec9)

2
text/maps/pokemon_tower_7f.asm
View file

@ -24,7 +24,7 @@ _PokemonTowerJessieJamesText4::
cont "off again!@@"
ENDC
_PokemonTower7Text_60ec4:: ; 99c1a (26:5c1a)
_TowerRescueFujiText:: ; 99c1a (26:5c1a)
text "MR.FUJI: Heh? You"
line "came to save me?"