thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-03-31 08:39:19 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix variable naming

Browse source
This commit is contained in:
YamaArashi 2015-07-18 08:17:29 -07:00
parent b85d7c65f3
commit fc9af362ae
106 changed files with 773 additions and 671 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/agatha.asm
View file

@ -76,7 +76,7 @@ AgathaScript0: ; 76490 (1d:6490)
jr z, AgathaScript_76474
.asm_764b4
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
@ -112,7 +112,7 @@ AgathaScript2: ; 764ed (1d:64ed)
cp $ff
jp z, AgathaScript_76464
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [W_GARYCURSCRIPT], a

6
scripts/billshouse.asm
View file

@ -23,7 +23,7 @@ BillsHouseScript1: ; 1e783 (7:6783)
ld de, MovementData_1e7a0
.notDown
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $2
ld [W_BILLSHOUSECURSCRIPT], a
@ -82,7 +82,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
ld c, 8
call DelayFrames
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld de, MovementData_1e807
call MoveSprite
ld a, $4
@ -113,7 +113,7 @@ BillsHouseScript4: ; 1e80d (7:680d)
BillsHouseScript5: ; 1e827 (7:6827)
ld a, $4
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $0
ld [W_BILLSHOUSECURSCRIPT], a

4
scripts/bruno.asm
View file

@ -76,7 +76,7 @@ BrunoScript0: ; 76339 (1d:6339)
jr z, BrunoScript_7631d
.asm_7635d
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
@ -112,7 +112,7 @@ BrunoScript2: ; 76396 (1d:6396)
cp $ff
jp z, BrunoScript_7630d
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
BrunoTextPointers: ; 763a8 (1d:63a8)

6
scripts/celadongamecorner.asm
View file

@ -58,10 +58,10 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19)
ld a, $f0
ld [wJoyIgnore], a
ld a, $d
ld [H_SPRITEHEIGHT], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $b
ld [H_SPRITEHEIGHT], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld de, MovementData_48c5a
ld a, [W_YCOORD]
@ -76,7 +76,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19)
ld de, MovementData_48c63
.asm_48c4d
ld a, $b
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $2
ld [W_CELADONGAMECORNERCURSCRIPT], a

6
scripts/celadongym.asm
View file

@ -44,7 +44,7 @@ CeladonGymScript3: ; 48956 (12:4956)
CeladonGymText_48963: ; 48963 (12:4963)
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd77c
set 1, [hl]
@ -52,14 +52,14 @@ CeladonGymText_48963: ; 48963 (12:4963)
call GiveItem
jr nc, .BagFull
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd77c
set 0, [hl]
jr .asm_4898c
.BagFull
ld a, $b
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_4898c
ld hl, W_OBTAINEDBADGES

24
scripts/ceruleancity.asm
View file

@ -28,7 +28,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7)
ld hl, wd75b
set 7, [hl]
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wJoyIgnore], a
@ -55,7 +55,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ld [wSpriteStateData1 + $29], a
call Delay3
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
.asm_194f7
ld a, [wd75a]
@ -82,9 +82,9 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
cp $14
jr z, .asm_19535
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld a, $5
ld [$ff8b], a
ld [H_SPRITEDATAOFFSET], a
call GetPointerWithinSpriteStateData2
ld [hl], $19
.asm_19535
@ -93,7 +93,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
predef ShowObject
ld de, CeruleanCityMovement1
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $1
ld [W_CERULEANCITYCURSCRIPT], a
@ -117,9 +117,9 @@ CeruleanCityMovement1: ; 19559 (6:5559)
CeruleanCityScript_1955d: ; 1955d (6:555d)
ld a,1
ld [$ff8c],a
ld [H_SPRITEINDEX],a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d],a
ld [hSpriteFacingDirection],a
jp SetSpriteFacingDirectionAndDelay ; face object
CeruleanCityScript1: ; 19567 (6:5567)
@ -129,7 +129,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
xor a
ld [wJoyIgnore], a
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd72d
set 6, [hl]
@ -173,14 +173,14 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
ld hl, wd75a
set 0, [hl]
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld a, [W_XCOORD]
cp $14
@ -191,7 +191,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
ld de, CeruleanCityMovement3
.asm_195f3
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $3
ld [W_CERULEANCITYCURSCRIPT], a
@ -295,7 +295,7 @@ CeruleanCityText2: ; 1967c (6:567c)
ld hl, CeruleanCityText_196ee
ld de, CeruleanCityText_196ee
call SaveEndBattleTextPointers
ld a, [$ff8c]
ld a, [hSpriteIndexOrTextID]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

6
scripts/ceruleangym.asm
View file

@ -44,7 +44,7 @@ CeruleanGymScript3: ; 5c700 (17:4700)
CeruleanGymScript_5c70d: ; 5c70d (17:470d)
ld a, $5
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd75e
set 7, [hl]
@ -52,14 +52,14 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d)
call GiveItem
jr nc, .BagFull
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd75e
set 6, [hl]
jr .asm_5c736
.BagFull
ld a, $7
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_5c736
ld hl, W_OBTAINEDBADGES

14
scripts/cinnabargym.asm
View file

@ -37,7 +37,7 @@ CinnabarGymScript_75792: ; 75792 (1d:5792)
ret
CinnabarGymScript_757a0: ; 757a0 (1d:57a0)
ld a, [H_DOWNARROWBLINKCNT2]
ld a, [hSpriteIndexOrTextID]
ld [wTrainerHeaderFlagBit], a
ret
@ -51,7 +51,7 @@ CinnabarGymScript0: ; 757ae (1d:57ae)
ld a, [wda38]
and a
ret z
ld [$ff8c], a
ld [H_SPRITEINDEX], a
cp $4
jr nz, .asm_757c3
ld a, $4
@ -86,7 +86,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc)
ld [wJoyIgnore], a
ld a, [wda38]
ld [wTrainerHeaderFlagBit], a
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
CinnabarGymScript_757f1: ; 757f1 (1d:57f1)
@ -139,7 +139,7 @@ CinnabarGymScript3: ; 7584a (1d:584a)
ld [wJoyIgnore], a
CinnabarGymScript3_75857: ; 75857 (1d:5857)
ld a, $a
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd79a
set 1, [hl]
@ -147,14 +147,14 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857)
call GiveItem
jr nc, .BagFull
ld a, $b
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd79a
set 0, [hl]
jr .asm_75880
.BagFull
ld a, $c
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_75880
ld hl, W_OBTAINEDBADGES
@ -189,7 +189,7 @@ CinnabarGymTextPointers: ; 7589f (1d:589f)
dw TM38NoRoomText
CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
ld a, [H_DOWNARROWBLINKCNT2]
ld a, [hSpriteIndexOrTextID]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

2
scripts/cinnabarisland.asm
View file

@ -27,7 +27,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
ld a, $8
ld [wd528], a
ld a, $8
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a

14
scripts/fightingdojo.asm
View file

@ -45,12 +45,12 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
ld a, $1
ld [wd528], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_LEFT
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ret
@ -64,9 +64,9 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6)
ld a, $1
ld [wd528], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_LEFT
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
.asm_5cde4
@ -76,7 +76,7 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6)
or $3e
ld [wd7b1], a
ld a, $8
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wJoyIgnore], a
@ -148,7 +148,7 @@ FightingDojoText1: ; 5ce44 (17:4e44)
ld hl, FightingDojoText_5ce93
ld de, FightingDojoText_5ce93
call SaveEndBattleTextPointers
ld a, [H_SPRITEINDEX]
ld a, [hSpriteIndexOrTextID]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

6
scripts/fuchsiagym.asm
View file

@ -44,7 +44,7 @@ FuchsiaGymScript3: ; 7548a (1d:548a)
ld [wJoyIgnore], a
FuchsiaGymScript3_75497: ; 75497 (1d:5497)
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd792
set 1, [hl]
@ -52,14 +52,14 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497)
call GiveItem
jr nc, .BagFull
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd792
set 0, [hl]
jr .asm_754c0
.BagFull
ld a, $b
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_754c0
ld hl, W_OBTAINEDBADGES

2
scripts/fuchsiahouse2.asm
View file

@ -3,7 +3,7 @@ FuchsiaHouse2Script: ; 750b5 (1d:50b5)
FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8)
dw FuchsiaHouse2Text1
dw Predef5CText
dw PickUpItemText
dw BoulderText
dw FuchsiaHouse2Text4
dw FuchsiaHouse2Text5

42
scripts/gary.asm
View file

@ -55,7 +55,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
ld hl, W_OPTIONS
res 7, [hl]
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld hl, wd72d
@ -99,10 +99,10 @@ GaryScript3: ; 75fbb (1d:5fbb)
ld a, $f0
ld [wJoyIgnore], a
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld a, $4
ld [W_GARYCURSCRIPT], a
@ -111,14 +111,14 @@ GaryScript3: ; 75fbb (1d:5fbb)
GaryScript4: ; 75fe4 (1d:5fe4)
callba Music_Cities1AlternateTempo
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld de, MovementData_76014
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, HS_CHAMPIONS_ROOM_OAK
ld [wcc4d], a
@ -142,17 +142,17 @@ GaryScript5: ; 7601a (1d:601a)
ld a, $2
ld [wd528], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_LEFT
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay ; face object
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $6
ld [W_GARYCURSCRIPT], a
@ -160,12 +160,12 @@ GaryScript5: ; 7601a (1d:601a)
GaryScript6: ; 76047 (1d:6047)
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_RIGHT
ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay ; face object
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $4
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $7
ld [W_GARYCURSCRIPT], a
@ -173,16 +173,16 @@ GaryScript6: ; 76047 (1d:6047)
GaryScript7: ; 7605f (1d:605f)
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay ; face object
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $5
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld de, MovementData_76080
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $8
ld [W_GARYCURSCRIPT], a

8
scripts/halloffameroom.asm
View file

@ -83,10 +83,10 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
ld a, $1
ld [wd528], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld a, SPRITE_FACING_LEFT
ld [$ff8d], a
ld a, $8
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call Delay3
xor a
@ -94,7 +94,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
inc a
ld [wd528], a
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wJoyIgnore], a

4
scripts/lance.asm
View file

@ -64,7 +64,7 @@ LanceScript0: ; 5a305 (16:6305)
cp $3
jr nc, .asm_5a325
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
.asm_5a325
cp $5
@ -93,7 +93,7 @@ LanceScript2: ; 5a349 (16:6349)
cp $ff
jp z, LanceScript_5a2f5
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
LanceScript_5a35b: ; 5a35b (16:635b)

4
scripts/lorelei.asm
View file

@ -77,7 +77,7 @@ LoreleiScript0: ; 761e2 (1d:61e2)
jr z, LoreleiScript_761c6
.asm_76206
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
@ -112,7 +112,7 @@ LoreleiScript2: ; 7623f (1d:623f)
cp $ff
jp z, LoreleiScript_761b6
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
LoreleiTextPointers: ; 76251 (1d:6251)

6
scripts/mansion1.asm
View file

@ -53,7 +53,7 @@ Mansion1Script_Switches: ; 44316 (11:4316)
xor a
ld [hJoyHeld], a
ld a, $4
ld [H_SPRITEHEIGHT], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion1ScriptPointers: ; 44326 (11:4326)
@ -63,8 +63,8 @@ Mansion1ScriptPointers: ; 44326 (11:4326)
Mansion1TextPointers: ; 4432c (11:432c)
dw Mansion1Text1
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw Mansion1Text4
Mansion1TrainerHeaders: ; 44334 (11:4334)

4
scripts/mansion2.asm
View file

@ -49,7 +49,7 @@ Mansion2Script_Switches: ; 52037 (14:6037)
xor a
ld [hJoyHeld], a
ld a, $5
ld [H_SPRITEHEIGHT], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion2ScriptPointers: ; 52047 (14:6047)
@ -59,7 +59,7 @@ Mansion2ScriptPointers: ; 52047 (14:6047)
Mansion2TextPointers: ; 5204d (14:604d)
dw Mansion2Text1
dw Predef5CText
dw PickUpItemText
dw Mansion2Text3
dw Mansion2Text4
dw Mansion2Text5

6
scripts/mansion3.asm
View file

@ -80,14 +80,14 @@ Mansion3Script_Switches: ; 5227a (14:627a)
xor a
ld [hJoyHeld], a
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion3TextPointers: ; 5228a (14:628a)
dw Mansion3Text1
dw Mansion3Text2
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw Mansion3Text5
dw Mansion3Text6

12
scripts/mansion4.asm
View file

@ -51,7 +51,7 @@ Mansion4Script_Switches: ; 52420 (14:6420)
xor a
ld [hJoyHeld], a
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Mansion4ScriptPointers: ; 52430 (14:6430)
@ -62,12 +62,12 @@ Mansion4ScriptPointers: ; 52430 (14:6430)
Mansion4TextPointers: ; 52436 (14:6436)
dw Mansion4Text1
dw Mansion4Text2
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw Mansion4Text7
dw Predef5CText
dw PickUpItemText
dw Mansion3Text6
Mansion4TrainerHeaders: ; 52448 (14:6448)

12
scripts/mtmoon1.asm
View file

@ -20,12 +20,12 @@ MtMoon1TextPointers: ; 499e1 (12:59e1)
dw MtMoon1Text5
dw MtMoon1Text6
dw MtMoon1Text7
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw MtMoon1Text14
MtMoon1TrainerHeaders: ; 499fd (12:59fd)

12
scripts/mtmoon3.asm
View file

@ -66,7 +66,7 @@ MtMoon3Script0: ; 49d6f (12:5d6f)
xor a
ld [hJoyHeld], a
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
MtMoon3Script_49d91: ; 49d91 (12:5d91)
@ -92,7 +92,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a)
MtMoon3Script4: ; 49dba (12:5dba)
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld hl, CoordsData_49dea
call ArePlayerCoordsInArray
@ -106,7 +106,7 @@ MtMoon3Script4: ; 49dba (12:5dba)
ld de, MovementData_49df8
.asm_49dda
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $5
ld [W_MTMOON3CURSCRIPT], a
@ -140,7 +140,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, [wd7f6]
bit 6, a
@ -167,8 +167,8 @@ MtMoon3TextPointers: ; 49e34 (12:5e34)
dw MtMoon3Text5
dw MtMoon3Text6
dw MtMoon3Text7
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw MtMoon3Text_49f99
MtMoon3TrainerHeaders: ; 49e48 (12:5e48)

14
scripts/museum1f.asm
View file

@ -25,7 +25,7 @@ Museum1FScript0: ; 5c10d (17:410d)
xor a
ld [hJoyHeld], a
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Museum1FScript1: ; 5c12a (17:412a)
@ -69,7 +69,7 @@ Museum1FText1: ; 5c135 (17:4135)
call PrintText
jp Museum1FScriptEnd
.asm_3ded4
ld a, $13
ld a, MONEY_BOX
ld [wTextBoxID], a
call DisplayTextBoxID
xor a
@ -96,15 +96,15 @@ Museum1FText1: ; 5c135 (17:4135)
ld hl, wd754
set 0, [hl]
xor a
ld [wWhichTrade], a
ld [wTrainerEngageDistance], a
ld [wMuseumPriceTemp], a
ld [wMuseumPriceTemp + 1], a
ld a, $50
ld [wTrainerFacingDirection], a
ld hl, wTrainerFacingDirection
ld [wMuseumPriceTemp + 2], a
ld hl, wMuseumPriceTemp + 2
ld de, wPlayerMoney + 2
ld c, $3
predef SubBCDPredef
ld a, $13
ld a, MONEY_BOX
ld [wTextBoxID], a
call DisplayTextBoxID
ld a, (SFX_02_5a - SFX_Headers_02) / 3

68
scripts/oakslab.asm
View file

@ -89,13 +89,13 @@ OaksLabScript3: ; 1cba2 (7:4ba2)
call StartSimulatingJoypadStates
ld a, $1
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $5
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $4
@ -117,7 +117,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_UP
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call UpdateSprites
ld hl, W_FLAGS_D733
@ -132,19 +132,19 @@ OaksLabScript5: ; 1cbfd (7:4bfd)
ld a, $fc
ld [wJoyIgnore], a
ld a, $11
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, $12
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, $13
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, $14
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd74b
set 1, [hl]
@ -162,16 +162,16 @@ OaksLabScript6: ; 1cc36 (7:4c36)
ld a, $5
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $1
ld [H_SPRITEINDEX], a
xor a
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call UpdateSprites
ld a, $c
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
@ -261,7 +261,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
ld a, $1
ld [H_SPRITEINDEX], a
ld a, $4
ld [$ff8b], a
ld [H_SPRITEDATAOFFSET], a
call GetPointerWithinSpriteStateData1
push hl
ld [hl], $4c
@ -302,10 +302,10 @@ OaksLabScript9: ; 1cd00 (7:4d00)
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_UP
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $d
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, [wTrainerEngageDistance]
cp $2
@ -331,10 +331,10 @@ OaksLabScript9: ; 1cd00 (7:4d00)
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_UP
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $e
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd74b
set 2, [hl]
@ -352,7 +352,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
ld a, $1
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $8
ld [wd528], a
@ -360,7 +360,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $f
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [hNPCPlayerRelativePosPerspective], a
@ -432,7 +432,7 @@ OaksLabScript12: ; 1ce03 (7:4e03)
ld a, $1
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
predef HealParty
ld hl, wd74b
@ -446,7 +446,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
ld c, 20
call DelayFrames
ld a, $10
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
callba Music_RivalAlternateStart
ld a, $1
@ -522,7 +522,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
call PlaySound
callba Music_RivalAlternateStart
ld a, $15
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call OaksLabScript_1d02b
ld a, HS_OAKS_LAB_RIVAL
@ -549,12 +549,12 @@ OaksLabScript_1cefd: ; 1cefd (7:4efd)
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_UP
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $8
ld [H_SPRITEINDEX], a
xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
OaksLabScript16: ; 1cf12 (7:4f12)
@ -567,21 +567,21 @@ OaksLabScript16: ; 1cf12 (7:4f12)
ld [wJoyIgnore], a
call OaksLabScript_1cefd
ld a, $16
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call DelayFrame
call OaksLabScript_1cefd
ld a, $17
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call DelayFrame
call OaksLabScript_1cefd
ld a, $18
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call DelayFrame
ld a, $19
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, HS_POKEDEX_1
@ -592,16 +592,16 @@ OaksLabScript16: ; 1cf12 (7:4f12)
predef HideObject
call OaksLabScript_1cefd
ld a, $1a
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_RIGHT
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call Delay3
ld a, $1b
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd74b
set 5, [hl]
@ -856,13 +856,13 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
ld a, $5
ld [H_SPRITEINDEX], a
ld a, $9
ld [$ff8b], a
ld [H_SPRITEDATAOFFSET], a
call GetPointerWithinSpriteStateData1
ld [hl], $0
ld a, $1
ld [H_SPRITEINDEX], a
ld a, $9
ld [$ff8b], a
ld [H_SPRITEDATAOFFSET], a
call GetPointerWithinSpriteStateData1
ld [hl], $c
ld hl, wd730
@ -962,7 +962,7 @@ OaksLabScript_1d22d: ; 1d22d (7:522d)
ld a, $5
ld [H_SPRITEINDEX], a
ld a, $9
ld [$ff8b], a
ld [H_SPRITEDATAOFFSET], a
call GetPointerWithinSpriteStateData1
ld [hl], $0
ld hl, OaksLabLastMonText

2
scripts/pallettown.asm
View file

@ -67,7 +67,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
ld a,1
ld [H_SPRITEINDEX],a
ld a,SPRITE_FACING_UP
ld [$FF8D],a
ld [hSpriteFacingDirection],a
call SetSpriteFacingDirectionAndDelay
call Delay3
ld a,1

20
scripts/pewtercity.asm
View file

@ -31,7 +31,7 @@ PewterCityScript_1925e: ; 1925e (6:525e)
ld a, $f0
ld [wJoyIgnore], a
ld a, $5
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
CoordsData_19277: ; 19277 (6:5277)
@ -48,16 +48,16 @@ PewterCityScript1: ; 19280 (6:5280)
ld a, $3
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_UP
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, ($3 << 4) | SPRITE_FACING_UP
ld [$ff8d], a
ld [hSpriteImageIndex], a
call SetSpriteImageIndexAfterSettingFacingDirection
call PlayDefaultMusic
ld hl, wFlags_0xcd60
set 4, [hl]
ld a, $d
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3c
ld [$ffeb], a
@ -71,7 +71,7 @@ PewterCityScript1: ; 19280 (6:5280)
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $3
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld de, MovementData_PewterMuseumGuyExit
call MoveSprite
ld a, $2
@ -114,18 +114,18 @@ PewterCityScript4: ; 19305 (6:5305)
and a
ret nz
ld a, $5
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_LEFT
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, ($1 << 4) | SPRITE_FACING_LEFT
ld [$ff8d], a
ld [hSpriteImageIndex], a
call SetSpriteImageIndexAfterSettingFacingDirection
call PlayDefaultMusic
ld hl, wFlags_0xcd60
set 4, [hl]
ld a, $e
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3c
ld [$ffeb], a
@ -139,7 +139,7 @@ PewterCityScript4: ; 19305 (6:5305)
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $5
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld de, MovementData_PewterGymGuyExit
call MoveSprite
ld a, $5

6
scripts/pewtergym.asm
View file

@ -44,7 +44,7 @@ PewterGymScript3: ; 5c3d2 (17:43d2)
PewterGymScript_5c3df: ; 5c3df (17:43df)
ld a, $4
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd755
set 7, [hl]
@ -52,14 +52,14 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)
call GiveItem
jr nc, .BagFull
ld a, $5
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd755
set 6, [hl]
jr .asm_5c408
.BagFull
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_5c408
ld hl, W_OBTAINEDBADGES

12
scripts/pokemontower2.asm
View file

@ -31,7 +31,7 @@ PokemonTower2Script0: ; 6050f (18:450f)
call PlayMusic
ld hl, wd764
res 6, [hl]
ld a, [wWhichTrade]
ld a, [wCoordIndex]
cp $1
ld a, $8
ld b, SPRITE_FACING_DOWN
@ -43,12 +43,12 @@ PokemonTower2Script0: ; 6050f (18:450f)
.asm_60544
ld [wd528], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
ld a, b
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a
@ -69,7 +69,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
ld hl, wd764
set 7, [hl]
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld de, MovementData_605b2
ld a, [wd764]
@ -78,7 +78,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
ld de, MovementData_605a9
.asm_60589
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $ff
ld [wc0ee], a

2
scripts/pokemontower3.asm
View file

@ -16,7 +16,7 @@ PokemonTower3TextPointers: ; 606e5 (18:46e5)
dw PokemonTower3Text1
dw PokemonTower3Text2
dw PokemonTower3Text3
dw Predef5CText
dw PickUpItemText
PokemonTower3TrainerHeaders: ; 606ed (18:46ed)
PokemonTower3TrainerHeader0: ; 606ed (18:46ed)

6
scripts/pokemontower4.asm
View file

@ -16,9 +16,9 @@ PokemonTower4TextPointers: ; 6080f (18:480f)
dw PokemonTower4Text1
dw PokemonTower4Text2
dw PokemonTower4Text3
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
PokemonTower4TrainerHeaders: ; 6081b (18:481b)
PokemonTower4TrainerHeader0: ; 6081b (18:481b)

4
scripts/pokemontower5.asm
View file

@ -38,7 +38,7 @@ PokemonTower5Script0: ; 6094b (18:494b)
call Delay3
call GBFadeInFromWhite
ld a, $7
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wJoyIgnore], a
@ -57,7 +57,7 @@ PokemonTower5TextPointers: ; 6099b (18:499b)
dw PokemonTower5Text3
dw PokemonTower5Text4
dw PokemonTower5Text5
dw Predef5CText
dw PickUpItemText
dw PokemonTower5Text7
PokemonTower5TrainerHeaders: ; 609a9 (18:49a9)

8
scripts/pokemontower6.asm
View file

@ -31,7 +31,7 @@ PokemonTower6Script0: ; 60b17 (18:4b17)
xor a
ld [hJoyHeld], a
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, MAROWAK
ld [W_CUROPPONENT], a
@ -63,7 +63,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
ld hl, wd768
set 7, [hl]
ld a, $7
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wJoyIgnore], a
@ -100,8 +100,8 @@ PokemonTower6TextPointers: ; 60bb1 (18:4bb1)
dw PokemonTower6Text1
dw PokemonTower6Text2
dw PokemonTower6Text3
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PokemonTower6Text6
dw PokemonTower6Text7

6
scripts/pokemontower7.asm
View file

@ -31,7 +31,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23)
ld a, $f0
ld [wJoyIgnore], a
ld a, [wSpriteIndex]
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call PokemonTower7Script_60db6
ld a, $3
@ -72,7 +72,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
ld a, SPRITE_FACING_UP
ld [wSpriteStateData1 + 9], a
ld a, LAVENDER_HOUSE_1
ld [H_DOWNARROWBLINKCNT1], a
ld [hWarpDestinationMap], a
ld a, $1
ld [wDestinationWarpID], a
ld a, LAVENDER_TOWN
@ -107,7 +107,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6)
ld d, [hl]
ld e, a
ld a, [wSpriteIndex]
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
jp MoveSprite
.asm_60dde
inc hl

10
scripts/powerplant.asm
View file

@ -22,11 +22,11 @@ PowerPlantTextPointers: ; 1e2df (7:62df)
dw PowerPlantText7
dw PowerPlantText8
dw PowerPlantText9
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
PowerPlantTrainerHeaders: ; 1e2fb (7:62fb)
PowerPlantTrainerHeader0: ; 1e2fb (7:62fb)

4
scripts/rockethideout1.asm
View file

@ -43,8 +43,8 @@ RocketHideout1TextPointers: ; 44c14 (11:4c14)
dw RocketHideout1Text3
dw RocketHideout1Text4
dw RocketHideout1Text5
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
RocketHideout1TrainerHeaders: ; 44c22 (11:4c22)
RocketHideout1TrainerHeader0: ; 44c22 (11:4c22)

8
scripts/rockethideout2.asm
View file

@ -415,10 +415,10 @@ SpinnerArrowAnimTiles: ; 45087 (11:5087)
RocketHideout2TextPointers: ; 450c7 (11:50c7)
dw RocketHideout2Text1
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
RocketHideout2TrainerHeaders: ; 450d1 (11:50d1)
RocketHideout2TrainerHeader0: ; 450d1 (11:50d1)

4
scripts/rockethideout3.asm
View file

@ -146,8 +146,8 @@ RocketHideout3Script3: ; 452e4 (11:452e4)
RocketHideout3TextPointers: ; 452fa (11:52fa)
dw RocketHideout3Text1
dw RocketHideout3Text2
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
RocketHideout3TrainerHeaders: ; 45302 (11:5302)
RocketHideout3TrainerHeader0: ; 45302 (11:5302)

12
scripts/rockethideout4.asm
View file

@ -56,7 +56,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
ld hl, wd81b
set 7, [hl]
ld a, $a
ld [H_SPRITEHEIGHT], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call GBFadeOutToBlack
ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI
@ -81,11 +81,11 @@ RocketHideout4TextPointers: ; 45501 (11:5501)
dw RocketHideout4Text2
dw RocketHideout4Text3
dw RocketHideout4Text4
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw RocketHideout4Text10
RocketHideout4TrainerHeaders: ; 45515 (11:5515)

8
scripts/route12.asm
View file

@ -28,7 +28,7 @@ Route12Script0: ; 59619 (16:5619)
res 6, [hl]
jp z, CheckFightingMapTrainers
ld a, $d
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, SNORLAX
ld [W_CUROPPONENT], a
@ -51,7 +51,7 @@ Route12Script3: ; 5964c (16:564c)
cp $2
jr z, .asm_59664
ld a, $e
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_59664
ld hl, wd7d8
@ -71,8 +71,8 @@ Route12TextPointers: ; 59675 (16:5675)
dw Route12Text6
dw Route12Text7
dw Route12Text8
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw Route12Text11
dw Route12Text12
dw Route12Text13

2
scripts/route15.asm
View file

@ -23,7 +23,7 @@ Route15TextPointers: ; 597c7 (16:57c7)
dw Route15Text8
dw Route15Text9
dw Route15Text10
dw Predef5CText
dw PickUpItemText
dw Route15Text12
Route15TrainerHeaders: ; 597df (16:57df)

4
scripts/route16.asm
View file

@ -28,7 +28,7 @@ Route16Script0: ; 59959 (16:5959)
res 0, [hl]
jp z, CheckFightingMapTrainers
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, SNORLAX
ld [W_CUROPPONENT], a
@ -52,7 +52,7 @@ Route16Script3: ; 5998f (16:598f)
cp $2
jr z, .asm_599a8
ld a, $b
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_599a8
ld hl, wd7e0

8
scripts/route16gate.asm
View file

@ -19,14 +19,14 @@ Route16GateScript0: ; 496d7 (12:56d7)
call ArePlayerCoordsInArray
ret nc
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a
ld a, [wWhichTrade]
ld a, [wCoordIndex]
cp $1
jr z, .asm_4970e
ld a, [wWhichTrade]
ld a, [wCoordIndex]
dec a
ld [wSimulatedJoypadStatesIndex], a
ld b, $0
@ -59,7 +59,7 @@ Route16GateScript1: ; 4971d (12:571d)
Route16GateScript2: ; 49727 (12:5727)
ld a, $1
ld [H_SPRITEHEIGHT], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [wSimulatedJoypadStatesIndex], a

10
scripts/route18gate.asm
View file

@ -19,17 +19,17 @@ Route18GateScript0: ; 4988f (12:588f)
call ArePlayerCoordsInArray
ret nc
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a
ld a, [wWhichTrade]
ld a, [wCoordIndex]
cp $1
jr z, .asm_498c6
ld a, [wWhichTrade]
ld a, [wCoordIndex]
dec a
ld [wSimulatedJoypadStatesIndex], a
ld b, $0
ld b, 0
ld c, a
ld a, D_UP
ld hl, wSimulatedJoypadStatesEnd
@ -59,7 +59,7 @@ Route18GateScript1: ; 498d5 (12:58d5)
Route18GateScript2: ; 498df (12:58df)
ld a, $1
ld [H_SPRITEHEIGHT], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
ld [wSimulatedJoypadStatesIndex], a

4
scripts/route2.asm
View file

@ -2,8 +2,8 @@ Route2Script: ; 554e3 (15:54e3)
jp EnableAutoTextBoxDrawing
Route2TextPointers: ; 554e6 (15:54e6)
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw Route2Text3
dw Route2Text4

50
scripts/route22.asm
View file

@ -43,8 +43,8 @@ Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
inc de
.asm_50ef1
call MoveSprite
ld a, $c
ld [$ff8d], a
ld a, SPRITE_FACING_RIGHT
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
Route22RivalMovementData: ; 50efb (14:4efb)
@ -61,7 +61,7 @@ Route22Script0: ; 50f00 (14:4f00)
ld hl, .Route22RivalBattleCoords
call ArePlayerCoordsInArray
ret nc
ld a, [wWhichTrade]
ld a, [wCoordIndex]
ld [wcf0d], a
xor a
ld [hJoyHeld], a
@ -98,7 +98,7 @@ Route22Script0: ; 50f00 (14:4f00)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call Route22MoveRivalSprite
ld a, $1
ld [W_ROUTE22CURSCRIPT], a
@ -113,19 +113,19 @@ Route22Script1: ; 50f62 (14:4f62)
jr nz, .asm_50f78
ld a, $4
ld [wd528], a
ld a, $4
ld a, SPRITE_FACING_UP
jr .asm_50f7a
.asm_50f78
ld a, $c
ld a, SPRITE_FACING_RIGHT
.asm_50f7a
ld [$ff8d], a
ld [hSpriteFacingDirection], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteFacingDirectionAndDelay
xor a
ld [wJoyIgnore], a
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd72d
set 6, [hl]
@ -159,16 +159,16 @@ Route22Script2: ; 50fb5 (14:4fb5)
.notDown
ld a, SPRITE_FACING_RIGHT
.done
ld [$ff8d], a
ld [hSpriteFacingDirection], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteFacingDirectionAndDelay
ld a, $f0
ld [wJoyIgnore], a
ld hl, wd7eb
set 5, [hl]
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
@ -194,7 +194,7 @@ Route22Script_5100d: ; 5100d (14:500d)
ld de, Route22RivalExitMovementData2
Route22MoveRival1: ; 51010 (14:5010)
ld a, $1
ld [H_SPRITEHEIGHT], a
ld [H_SPRITEINDEX], a
jp MoveSprite
Route22RivalExitMovementData1: ; 51017 (14:5017)
@ -255,7 +255,7 @@ Route22Script_5104e: ; 5104e (14:504e)
call PlaySound
callba Music_RivalAlternateTempo
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call Route22MoveRivalSprite
ld a, $4
ld [W_ROUTE22CURSCRIPT], a
@ -266,25 +266,25 @@ Route22Script4: ; 51087 (14:5087)
bit 0, a
ret nz
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
ld a, [wcf0d]
cp $1
jr nz, .asm_510a1
ld a, $4
ld [wd528], a
ld a, $4
ld a, SPRITE_FACING_UP
jr .asm_510a8
.asm_510a1
ld a, $2
ld [wd528], a
ld a, $c
ld a, SPRITE_FACING_RIGHT
.asm_510a8
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
xor a
ld [wJoyIgnore], a
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd72d
set 6, [hl]
@ -310,27 +310,27 @@ Route22Script5: ; 510df (14:50df)
cp $ff
jp z, Route22Script_50ece
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
ld a, [wcf0d]
cp $1
jr nz, .asm_510fb
ld a, $4
ld [wd528], a
ld a, $4
ld a, SPRITE_FACING_UP
jr .asm_51102
.asm_510fb
ld a, $2
ld [wd528], a
ld a, $c
ld a, SPRITE_FACING_RIGHT
.asm_51102
ld [$ff8d], a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $f0
ld [wJoyIgnore], a
ld hl, wd7eb
set 6, [hl]
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
@ -356,7 +356,7 @@ Route22Script_51142: ; 51142 (14:5142)
ld de, MovementData_5114d
Route22MoveRival2: ; 51145 (14:5145)
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
jp MoveSprite
MovementData_5114c: ; 5114c (14:514c)

2
scripts/route22gate.asm
View file

@ -24,7 +24,7 @@ Route22GateScript0: ; 1e6a4 (7:66a4)
xor a
ld [hJoyHeld], a
ld a, $1
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
Route22GateScriptCoords: ; 1e6b5 (7:66b5)

20
scripts/route23.asm
View file

@ -49,9 +49,9 @@ Route23Script0: ; 51219 (14:5219)
ret nc
.asm_51237
ld a, e
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
ld a, c
ld [wWhichTrade], a
ld [wWhichBadge], a
ld b, $2
ld hl, wd7ed
predef FlagActionPredef
@ -69,21 +69,21 @@ YCoordsData_51255: ; 51255 (14:5255)
Route23Script_5125d: ; 5125d (14:525d)
ld hl, BadgeTextPointers
ld a, [wWhichTrade]
ld a, [wWhichBadge]
ld c, a
ld b, $0
ld b, 0
add hl, bc
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
ld de, wcd6d
.asm_5126e
.copyTextLoop
ld a, [hli]
ld [de], a
inc de
cp $50
jr nz, .asm_5126e
cp "@"
jr nz, .copyTextLoop
ret
BadgeTextPointers: ; 51276 (14:5276)
@ -188,9 +188,9 @@ Route23Text7: ; 5133d (14:533d)
jp TextScriptEnd
Route23Script_51346: ; 51346 (14:5346)
ld [wWhichTrade], a
ld [wWhichBadge], a
call Route23Script_5125d
ld a, [wWhichTrade]
ld a, [wWhichBadge]
inc a
ld c, a
ld b, $2
@ -208,7 +208,7 @@ Route23Script_51346: ; 51346 (14:5346)
.asm_5136e
ld hl, VictoryRoadGuardText2
call PrintText
ld a, [wWhichTrade]
ld a, [wWhichBadge]
ld c, a
ld b, $1
ld hl, wd7ed

8
scripts/route24.asm
View file

@ -31,7 +31,7 @@ Route24Script0: ; 513d5 (14:53d5)
xor a
ld [hJoyHeld], a
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd7f0
bit 1, [hl]
@ -70,7 +70,7 @@ Route24Script3: ; 51422 (14:5422)
ld hl, wd7ef
set 1, [hl]
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wJoyIgnore], a
@ -87,7 +87,7 @@ Route24TextPointers: ; 5144b (14:544b)
dw Route24Text5
dw Route24Text6
dw Route24Text7
dw Predef5CText
dw PickUpItemText
Route24TrainerHeaders: ; 5145b (14:545b)
Route24TrainerHeader0: ; 5145b (14:545b)
@ -170,7 +170,7 @@ Route24Text1: ; 514a4 (14:54a4)
ld hl, Route24Text_5152b
ld de, Route24Text_5152b
call SaveEndBattleTextPointers
ld a, [$ff8c]
ld a, [hSpriteIndexOrTextID]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

2
scripts/route25.asm
View file

@ -51,7 +51,7 @@ Route25TextPointers: ; 51628 (14:5628)
dw Route25Text7
dw Route25Text8
dw Route25Text9
dw Predef5CText
dw PickUpItemText
dw Route25Text11
Route25TrainerHeaders: ; 5163e (14:563e)

2
scripts/route4.asm
View file

@ -15,7 +15,7 @@ Route4ScriptPointers: ; 5566b (15:566b)
Route4TextPointers: ; 55671 (15:5671)
dw Route4Text1
dw Route4Text2
dw Predef5CText
dw PickUpItemText
dw PokeCenterSignText
dw Route4Text5
dw Route4Text6

4
scripts/route5gate.asm
View file

@ -31,7 +31,7 @@ Route5GateScript0: ; 1df50 (7:5f50)
and a
jr nz, .asm_1df82
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Route5GateScript_1df43
ld a, $1
@ -39,7 +39,7 @@ Route5GateScript0: ; 1df50 (7:5f50)
ret
.asm_1df82
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd728
set 6, [hl]

4
scripts/route6gate.asm
View file

@ -25,7 +25,7 @@ Route6GateScript0: ; 1e04e (7:604e)
and a
jr nz, .asm_1e080
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Route6GateScript_1e0a1
ld a, $1
@ -35,7 +35,7 @@ Route6GateScript0: ; 1e04e (7:604e)
ld hl, wd728
set 6, [hl]
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
CoordsData_1e08c: ; 1e08c (7:608c)

4
scripts/route7gate.asm
View file

@ -37,7 +37,7 @@ Route7GateScript0: ; 1e128 (7:6128)
and a
jr nz, .asm_1e15a
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Route7GateScript_1e111
ld a, $1
@ -45,7 +45,7 @@ Route7GateScript0: ; 1e128 (7:6128)
ret
.asm_1e15a
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd728
set 6, [hl]

4
scripts/route8gate.asm
View file

@ -36,7 +36,7 @@ Route8GateScript0: ; 1e1ee (7:61ee)
and a
jr nz, .asm_1e220
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Route8GateScript_1e1d7
ld a, $1
@ -46,7 +46,7 @@ Route8GateScript0: ; 1e1ee (7:61ee)
ld hl, wd728
set 6, [hl]
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
jp DisplayTextID
CoordsData_1e22c: ; 1e22c (7:622c)

2
scripts/route9.asm
View file

@ -22,7 +22,7 @@ Route9TextPointers: ; 556d5 (15:56d5)
dw Route9Text7
dw Route9Text8
dw Route9Text9
dw Predef5CText
dw PickUpItemText
dw Route9Text11
Route9TrainerHeaders: ; 556eb (15:56eb)

2
scripts/safarizonecenter.asm
View file

@ -2,7 +2,7 @@ SafariZoneCenterScript: ; 45bb2 (11:5bb2)
jp EnableAutoTextBoxDrawing
SafariZoneCenterTextPointers: ; 45bb5 (11:5bb5)
dw Predef5CText
dw PickUpItemText
dw SafariZoneCenterText2
dw SafariZoneCenterText3

8
scripts/safarizoneeast.asm
View file

@ -2,10 +2,10 @@ SafariZoneEastScript: ; 4586b (11:586b)
jp EnableAutoTextBoxDrawing
SafariZoneEastTextPointers: ; 4586e (11:586e)
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw SafariZoneEastText5
dw SafariZoneEastText6
dw SafariZoneEastText7

8
scripts/safarizoneentrance.asm
View file

@ -18,7 +18,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
call ArePlayerCoordsInArray
ret nc
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wJoyIgnore], a
@ -56,7 +56,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
ld [wJoyIgnore], a
call UpdateSprites
ld a, $4
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wJoyIgnore], a
@ -83,7 +83,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
ld a, $f0
ld [wJoyIgnore], a
ld a, $6
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [W_NUMSAFARIBALLS], a
@ -95,7 +95,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
jr .asm_75286
.asm_7527f
ld a, $5
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_75286
ret

4
scripts/safarizonenorth.asm
View file

@ -2,8 +2,8 @@ SafariZoneNorthScript: ; 459ab (11:59ab)
jp EnableAutoTextBoxDrawing
SafariZoneNorthTextPointers: ; 459ae (11:59ae)
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw SafariZoneNorthText3
dw SafariZoneNorthText4
dw SafariZoneNorthText5

8
scripts/safarizonewest.asm
View file

@ -2,10 +2,10 @@ SafariZoneWestScript: ; 4a1b5 (12:61b5)
jp EnableAutoTextBoxDrawing
SafariZoneWestTextPointers: ; 4a1b8 (12:61b8)
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw SafariZoneWestText5
dw SafariZoneWestText6
dw SafariZoneWestText7

6
scripts/saffrongym.asm
View file

@ -44,7 +44,7 @@ SaffronGymScript3: ; 5d05b (17:505b)
SaffronGymText_5d068: ; 5d068 (17:5068)
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd7b3
set 1, [hl]
@ -52,14 +52,14 @@ SaffronGymText_5d068: ; 5d068 (17:5068)
call GiveItem
jr nc, .BagFull
ld a, $b
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd7b3
set 0, [hl]
jr .asm_5d091
.BagFull
ld a, $c
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_5d091
ld hl, W_OBTAINEDBADGES

6
scripts/silphco10.asm
View file

@ -44,9 +44,9 @@ SilphCo10TextPointers: ; 5a186 (16:6186)
dw SilphCo10Text1
dw SilphCo10Text2
dw SilphCo10Text3
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
SilphCo10TrainerHeaders: ; 5a192 (16:6192)
SilphCo10TrainerHeader0: ; 5a192 (16:6192)

24
scripts/silphco11.asm
View file

@ -170,17 +170,17 @@ SilphCo11Script0: ; 621db (18:61db)
ld hl, CoordsData_62211
call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers
ld a, [wWhichTrade]
ld a, [wCoordIndex]
ld [wcf0d], a
xor a
ld [hJoyHeld], a
ld a, $f0
ld [wJoyIgnore], a
ld a, $3
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld de, MovementData_62216
call MoveSprite
@ -201,9 +201,9 @@ MovementData_62216: ; 62216 (18:6216)
SilphCo11Script_6221a: ; 6221a (18:621a)
ld [wd528], a
ld a, $3
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
ld a, b
ld [$ff8d], a
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
SilphCo11Script5: ; 62227 (18:6227)
@ -214,17 +214,17 @@ SilphCo11Script5: ; 62227 (18:6227)
cp $1
jr z, .asm_6223c
ld a, $2
ld b, $c
ld b, SPRITE_FACING_RIGHT
jr .asm_62240
.asm_6223c
ld a, $8
ld b, $0
ld b, SPRITE_FACING_DOWN
.asm_62240
call SilphCo11Script_6221a
ld a, $f0
ld [wJoyIgnore], a
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call GBFadeOutToBlack
call SilphCo11Script_6216d
@ -242,17 +242,17 @@ SilphCo11Script3: ; 6226a (18:626a)
bit 0, a
ret nz
ld a, $3
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld a, [wcf0d]
cp $1
jr z, .asm_62284
ld a, $2
ld b, $c
ld b, SPRITE_FACING_RIGHT
jr .asm_62288
.asm_62284
ld a, $8
ld b, $0
ld b, SPRITE_FACING_DOWN
.asm_62288
call SilphCo11Script_6221a
call Delay3
@ -266,7 +266,7 @@ SilphCo11Script4: ; 62293 (18:6293)
ld hl, SilphCo10Text_62330
ld de, SilphCo10Text_62330
call SaveEndBattleTextPointers
ld a, [H_DOWNARROWBLINKCNT2]
ld a, [H_SPRITEINDEX]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters

2
scripts/silphco3.asm
View file

@ -58,7 +58,7 @@ SilphCo3TextPointers: ; 59fc4 (16:5fc4)
dw SilphCo3Text1
dw SilphCo3Text2
dw SilphCo3Text3
dw Predef5CText
dw PickUpItemText
SilphCo3TrainerHeaders: ; 59fcc (16:5fcc)
SilphCo3TrainerHeader0: ; 59fcc (16:5fcc)

6
scripts/silphco4.asm
View file

@ -95,9 +95,9 @@ SilphCo4TextPointers: ; 19da0 (6:5da0)
dw SilphCo4Text2
dw SilphCo4Text3
dw SilphCo4Text4
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
SilphCo4TrainerHeaders: ; 19dae (6:5dae)
SilphCo4TrainerHeader0: ; 19dae (6:5dae)

6
scripts/silphco5.asm
View file

@ -74,9 +74,9 @@ SilphCo5TextPointers: ; 19fbc (6:5fbc)
dw SilphCo5Text3
dw SilphCo5Text4
dw SilphCo5Text5
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw SilphCo5Text9
dw SilphCo5Text10
dw SilphCo5Text11

4
scripts/silphco6.asm
View file

@ -50,8 +50,8 @@ SilphCo6TextPointers: ; 1a1f6 (6:61f6)
dw SilphCo6Text6
dw SilphCo6Text7
dw SilphCo6Text8
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
SilphCo6TrainerHeaders: ; 1a20a (6:620a)
SilphCo6TrainerHeader0: ; 1a20a (6:620a)

24
scripts/silphco7.asm
View file

@ -136,10 +136,10 @@ SilphCo7Script0: ; 51c23 (14:5c23)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld de, MovementData_51c7d
ld a, [wWhichTrade]
@ -149,7 +149,7 @@ SilphCo7Script0: ; 51c23 (14:5c23)
inc de
.asm_51c6c
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $3
jp SilphCo7Text_51c10
@ -173,7 +173,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
xor a
ld [wJoyIgnore], a
ld a, $d
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld hl, wd72d
@ -212,12 +212,12 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld a, $4
ld [wd528], a
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld a, $4
ld [$ff8d], a
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $f
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wc0ee], a
@ -230,7 +230,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld de, MovementData_51d1a
.asm_51d0e
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $5
jp SilphCo7Text_51c10
@ -272,9 +272,9 @@ SilphCo7TextPointers: ; 51d3f (14:5d3f)
dw SilphCo7Text7
dw SilphCo7Text8
dw SilphCo7Text9
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw SilphCo7Text13
dw SilphCo7Text14
dw SilphCo7Text15

6
scripts/ssanne10.asm
View file

@ -21,9 +21,9 @@ SSAnne10TextPointers: ; 61d6e (18:5d6e)
dw SSAnne10Text6
dw SSAnne10Text7
dw SSAnne10Text8
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
SSAnne10TrainerHeaders: ; 61d84 (18:5d84)
SSAnne10TrainerHeader0: ; 61d84 (18:5d84)

18
scripts/ssanne2.asm
View file

@ -30,14 +30,14 @@ SSAnne2Script0: ; 613be (18:53be)
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, [wWhichTrade]
ld a, [wCoordIndex]
ld [$ffdb], a
ld a, HS_SS_ANNE_2_RIVAL
ld [wcc4d], a
predef ShowObject
call Delay3
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
xor a
ld [hJoyHeld], a
@ -79,11 +79,11 @@ SSAnne2Script_61416: ; 61416 (18:5416)
ld a, SPRITE_FACING_RIGHT
jr .asm_61427
.asm_61426
xor a
xor a ; SPRITE_FACING_DOWN
.asm_61427
ld [$ff8d], a
ld [hSpriteFacingDirection], a
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a
ld [H_SPRITEINDEX], a
jp SetSpriteFacingDirectionAndDelay
SSAnne2Script1: ; 61430 (18:5430)
@ -94,7 +94,7 @@ SSAnne2Script1: ; 61430 (18:5430)
xor a
ld [wJoyIgnore], a
ld a, $2
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
call Delay3
ld a, SONY2 + $c8
@ -129,10 +129,10 @@ SSAnne2Script2: ; 6146d (18:546d)
ld a, $f0
ld [wJoyIgnore], a
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
ld a, [W_XCOORD]
cp $25
@ -143,7 +143,7 @@ SSAnne2Script2: ; 6146d (18:546d)
ld de, MovementData_614b7
.asm_6149a
ld a, $2
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $ff
ld [wc0ee], a

2
scripts/ssanne8.asm
View file

@ -22,7 +22,7 @@ SSAnne8TextPointers: ; 6198f (18:598f)
dw SSAnne8Text7
dw SSAnne8Text8
dw SSAnne8Text9
dw Predef5CText
dw PickUpItemText
dw SSAnne8Text11
SSAnne8TrainerHeaders: ; 619a5 (18:59a5)

4
scripts/ssanne9.asm
View file

@ -21,10 +21,10 @@ SSAnne9TextPointers: ; 61b6a (18:5b6a)
dw SSAnne9Text3
dw SSAnne9Text4
dw SSAnne9Text5
dw Predef5CText
dw PickUpItemText
dw SSAnne9Text7
dw SSAnne9Text8
dw Predef5CText
dw PickUpItemText
dw SSAnne9Text10
dw SSAnne9Text11
dw SSAnne9Text12

12
scripts/tradecenter.asm
View file

@ -2,13 +2,13 @@ TradeCenterScript: ; 4fd10 (13:7d10)
call EnableAutoTextBoxDrawing
ld a, [$ffaa]
cp $2
ld a, $8
jr z, .asm_4fd1d
ld a, $c
.asm_4fd1d
ld [$ff8d], a
ld a, SPRITE_FACING_LEFT
jr z, .next
ld a, SPRITE_FACING_RIGHT
.next
ld [hSpriteFacingDirection], a
ld a, $1
ld [$ff8c], a
ld [H_SPRITEINDEX], a
call SetSpriteFacingDirection
ld hl, wd72d
bit 0, [hl]

6
scripts/unknowndungeon1.asm
View file

@ -2,6 +2,6 @@ UnknownDungeon1Script: ; 74d0c (1d:4d0c)
jp EnableAutoTextBoxDrawing
UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f)
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText

6
scripts/unknowndungeon2.asm
View file

@ -2,6 +2,6 @@ UnknownDungeon2Script: ; 45e0b (11:5e0b)
jp EnableAutoTextBoxDrawing
UnknownDungeon2TextPointers: ; 45e0e (11:5e0e)
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText

4
scripts/unknowndungeon3.asm
View file

@ -14,8 +14,8 @@ UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03)
UnknownDungeon3TextPointers: ; 45f09 (11:5f09)
dw UnknownDungeon3Text1
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f)
UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f)

2
scripts/vermilioncity.asm
View file

@ -49,7 +49,7 @@ VermilionCityScript0: ; 197e6 (6:57e6)
ld [hJoyHeld], a
ld [wcf0d], a
ld a, $3
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, [wd803]
bit 2, a

6
scripts/vermiliongym.asm
View file

@ -64,7 +64,7 @@ VermilionGymScript3: ; 5ca9d (17:4a9d)
VermilionGymScript_5caaa: ; 5caaa (17:4aaa)
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd773
set 7, [hl]
@ -72,14 +72,14 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa)
call GiveItem
jr nc, .BagFull
ld a, $7
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd773
set 6, [hl]
jr .asm_5cad3
.BagFull
ld a, $8
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_5cad3
ld hl, W_OBTAINEDBADGES

4
scripts/victoryroad1.asm
View file

@ -43,8 +43,8 @@ CoordsData_5da5c: ; 5da5c (17:5a5c)
VictoryRoad1TextPointers: ; 5da5f (17:5a5f)
dw VictoryRoad1Text1
dw VictoryRoad1Text2
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw BoulderText
dw BoulderText
dw BoulderText

8
scripts/victoryroad2.asm
View file

@ -77,10 +77,10 @@ VictoryRoad2TextPointers: ; 5181b (14:581b)
dw VictoryRoad2Text4
dw VictoryRoad2Text5
dw VictoryRoad2Text6
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw BoulderText
dw BoulderText
dw BoulderText

4
scripts/victoryroad3.asm
View file

@ -83,8 +83,8 @@ VictoryRoad3TextPointers: ; 44a24 (11:4a24)
dw VictoryRoad3Text2
dw VictoryRoad3Text3
dw VictoryRoad3Text4
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw BoulderText
dw BoulderText
dw BoulderText

6
scripts/viridiancity.asm
View file

@ -32,7 +32,7 @@ ViridianCityScript_1900b: ; 1900b (6:500b)
cp $20
ret nz
ld a, $e
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a
@ -52,7 +52,7 @@ ViridianCityScript_1903d: ; 1903d (6:503d)
cp $13
ret nz
ld a, $5
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a
@ -98,7 +98,7 @@ ViridianCityScript2: ; 1908f (6:508f)
xor a
ld [wJoyIgnore], a
ld a, $f
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [W_BATTLETYPE], a

6
scripts/viridianforest.asm
View file

@ -17,9 +17,9 @@ ViridianForestTextPointers: ; 61126 (18:5126)
dw ViridianForestText2
dw ViridianForestText3
dw ViridianForestText4
dw Predef5CText
dw Predef5CText
dw Predef5CText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw ViridianForestText8
dw ViridianForestText9
dw ViridianForestText10

8
scripts/viridiangym.asm
View file

@ -140,7 +140,7 @@ ViridianGymScript3: ; 74988 (1d:4988)
ld [wJoyIgnore], a
ViridianGymScript3_74995: ; 74995 (1d:4995)
ld a, $c
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd751
set 1, [hl]
@ -148,14 +148,14 @@ ViridianGymScript3_74995: ; 74995 (1d:4995)
call GiveItem
jr nc, .BagFull
ld a, $d
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wd751
set 0, [hl]
jr .asm_749be
.BagFull
ld a, $e
ld [H_DOWNARROWBLINKCNT2], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_749be
ld hl, W_OBTAINEDBADGES
@ -190,7 +190,7 @@ ViridianGymTextPointers: ; 749ec (1d:49ec)
dw ViridianGymText8
dw ViridianGymText9
dw ViridianGymText10
dw Predef5CText
dw PickUpItemText
dw ViridianGymText12
dw ViridianGymText13
dw ViridianGymText14

4
scripts/viridianmart.asm
View file

@ -28,7 +28,7 @@ ViridianMartScriptPointers: ; 1d495 (7:5495)
ViridianMartScript0: ; 1d49b (7:549b)
call UpdateSprites
ld a, $4
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement1d4bb
@ -51,7 +51,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0)
ret nz
call Delay3
ld a, $5
ld [$ff8c], a
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld bc, (OAKS_PARCEL << 8) + 1
call GiveItem