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

Misc relabelling

Browse source
This commit is contained in:
U-Fish-PC\Daniel 2014-05-21 11:58:18 -04:00
parent d693721f97
commit f29c4e473e
8 changed files with 187 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

341
main.asm
View file

File diff suppressed because it is too large Load diff

2
scripts/oakslab.asm
View file

@ -847,7 +847,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
ld hl, $d730
set 6, [hl]
ld a, $46
call Predef
call Predef ; DisplayStarterMonDex
ld hl, $d730
res 6, [hl]
call ReloadMapData

6
scripts/route11gateupstairs.asm
View file

@ -21,9 +21,9 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
ld a, [$d7d6]
add a
jr c, .asm_4949b ; 0x49471 $28
ld a, $1e
ld a, 30 ; pokemon needed
ld [$ffdb], a
ld a, $47
ld a, ITEMFINDER ; oak's aide reward
ld [$ffdc], a
ld [$d11e], a
call GetItemName
@ -33,7 +33,7 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
ld bc, $000d
call CopyData
ld a, $62
call Predef
call Predef ; call oak's aide script
ld a, [$ffdb]
dec a
jr nz, .asm_494a1 ; 0x49494 $b

6
scripts/route15gateupstairs.asm
View file

@ -10,9 +10,9 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
ld a, [$d7dd]
bit 0, a
jr nz, .asm_49683 ; 0x49657 $2a
ld a, $32
ld a, 50 ; pokemon needed
ld [$ffdb], a
ld a, EXP__ALL
ld a, EXP__ALL ; oak's aide reward
ld [$ffdc], a
ld [$d11e], a
call GetItemName
@ -21,7 +21,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
ld bc, $000d
call CopyData
ld a, $62
call Predef
call Predef ; call oak's aide script
ld a, [$ffdb]
cp $1
jr nz, .asm_49689 ; 0x4967c $b

6
scripts/route2gate.asm
View file

@ -10,9 +10,9 @@ Route2GateText1: ; 5d5db (17:55db)
ld a, [$d7c2]
bit 0, a
jr nz, .asm_6592c ; 0x5d5e1
ld a, $a
ld a, 10 ; pokemon needed
ldh [$db], a
ld a, $c8
ld a, HM_05 ; oak's aide reward
ldh [$dc], a
ld [$d11e], a
call GetItemName ; $2fcf
@ -21,7 +21,7 @@ Route2GateText1: ; 5d5db (17:55db)
ld bc, $000d
call CopyData
ld a, $62
call Predef
call Predef ; call oak's aide script
ldh a, [$db]
cp $1
jr nz, .asm_ad646 ; 0x5d606

4
scripts/ssanne8.asm
View file

@ -115,8 +115,8 @@ SSAnne8EndBattleText2: ; 61a1f (18:5a1f)
TX_FAR _SSAnne8EndBattleText2
db "@"
SSAnne8Text_61a24: ; 61a24 (18:5a24)
TX_FAR _SSAnne8Text_61a24
SSAnne8AfterBattleText2: ; 61a24 (18:5a24)
TX_FAR _SSAnne8AfterBattleText2
db "@"
SSAnne8BattleText3: ; 61a29 (18:5a29)

2
text.asm
View file

@ -1920,7 +1920,7 @@ _HisNameIsText:: ; 8a64a (22:664a)
cont "name is ", $53, "!"
prompt
_SSAnne8AfterBattleText2:: ; 8a677 (22:6677)
_WillBeTradedText:: ; 8a677 (22:6677)
TX_RAM $cd3f
text " and"
line "@"

2
text/maps/ss_anne_8.asm
View file

@ -30,7 +30,7 @@ _SSAnne8EndBattleText2:: ; 81582 (20:5582)
line "You rude child!"
prompt
_SSAnne8Text_61a24:: ; 8159a (20:559a)
_SSAnne8AfterBattleText2:: ; 8159a (20:559a)
text "I wish to be left"
line "alone! Get out!"
done