thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

More direction constants

Browse source 
facing directions, npc movement, joypad
This commit is contained in:
dannye 2015-07-17 02:52:25 -05:00
parent 77ba61cb17
commit fb559f1f4e
38 changed files with 445 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/overworld/movement.asm
View file

@ -162,8 +162,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1)
ld [hl], a ; increment movement byte 1 (movement data index) ld [hl], a ; increment movement byte 1 (movement data index)
dec a dec a
push hl push hl
ld hl, wcf0f ld hl, wNPCNumScriptedSteps
dec [hl] ; decrement wcf0f dec [hl] ; decrement wNPCNumScriptedSteps
pop hl pop hl
ld de, wNPCMovementDirections ld de, wNPCMovementDirections
call LoadDEPlusA ; a = [wNPCMovementDirections + movement byte 1] call LoadDEPlusA ; a = [wNPCMovementDirections + movement byte 1]

19
engine/overworld/pewter_guys.asm
View file

@ -66,17 +66,18 @@ PewterMuseumGuyCoords: ; 37cea (d:7cea)
dw .right dw .right
.down .down
db $40, $40, $ff db D_UP, D_UP, $ff
.up .up
db $10, $20, $ff db D_RIGHT, D_LEFT, $ff
.left .left
db $40, $10, $ff db D_UP, D_RIGHT, $ff
.right .right
db $40, $20, $ff db D_UP, D_LEFT, $ff
; these are the five coordinates which trigger the gym guy and pointers to ; these are the five coordinates which trigger the gym guy and pointers to
; different movements for the player to make to get positioned before the ; different movements for the player to make to get positioned before the
; main movement ; main movement
; $00 is a pause
PewterGymGuyCoords: ; 37d06 (d:7d06) PewterGymGuyCoords: ; 37d06 (d:7d06)
db 16, 34 db 16, 34
dw .one dw .one
@ -90,12 +91,12 @@ PewterGymGuyCoords: ; 37d06 (d:7d06)
dw .five dw .five
.one .one
db $20, $80, $80, $10, $ff db D_LEFT, D_DOWN, D_DOWN, D_RIGHT, $ff
.two .two
db $20, $80, $10, $20, $ff db D_LEFT, D_DOWN, D_RIGHT, D_LEFT, $ff
.three .three
db $20, $20, $20, $00, $00, $00, $00, $00, $00, $00, $00, $ff db D_LEFT, D_LEFT, D_LEFT, $00, $00, $00, $00, $00, $00, $00, $00, $ff
.four .four
db $20, $20, $40, $20, $ff db D_LEFT, D_LEFT, D_UP, D_LEFT, $ff
.five .five
db $20, $80, $20, $00, $00, $00, $00, $00, $00, $00, $00, $ff db D_LEFT, D_DOWN, D_LEFT, $00, $00, $00, $00, $00, $00, $00, $00, $ff

2
home.asm
View file

@ -3064,7 +3064,7 @@ MoveSprite_:: ; 363d (0:363d)
jr nz,.loop jr nz,.loop
ld a,c ld a,c
ld [wcf0f],a ; number of steps taken ld [wNPCNumScriptedSteps],a ; number of steps taken
pop bc pop bc
ld hl,wd730 ld hl,wd730

19
scripts/billshouse.asm
View file

@ -30,11 +30,19 @@ BillsHouseScript1: ; 1e783 (7:6783)
ret ret
MovementData_1e79c: ; 1e79c (7:679c) MovementData_1e79c: ; 1e79c (7:679c)
db $40,$40,$40,$FF db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db $FF
; make Bill walk around the player ; make Bill walk around the player
MovementData_1e7a0: ; 1e7a0 (7:67a0) MovementData_1e7a0: ; 1e7a0 (7:67a0)
db $C0,$40,$40,$80,$40,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_UP
db $FF
BillsHouseScript2: ; 1e7a6 (7:67a6) BillsHouseScript2: ; 1e7a6 (7:67a6)
ld a, [wd730] ld a, [wd730]
@ -82,7 +90,12 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
ret ret
MovementData_1e807: ; 1e807 (7:6807) MovementData_1e807: ; 1e807 (7:6807)
db $00,$C0,$C0,$C0,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db $FF
BillsHouseScript4: ; 1e80d (7:680d) BillsHouseScript4: ; 1e80d (7:680d)
ld a, [wd730] ld a, [wd730]

17
scripts/celadongamecorner.asm
View file

@ -83,10 +83,23 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19)
ret ret
MovementData_48c5a: ; 48c5a (12:4c5a) MovementData_48c5a: ; 48c5a (12:4c5a)
db $00,$C0,$C0,$40,$C0,$C0,$C0,$C0,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
MovementData_48c63: ; 48c63 (12:4c63) MovementData_48c63: ; 48c63 (12:4c63)
db $C0,$C0,$C0,$C0,$C0,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
CeladonGameCornerScript2: ; 48c69 (12:4c69) CeladonGameCornerScript2: ; 48c69 (12:4c69)
ld a, [wd730] ld a, [wd730]

29
scripts/ceruleancity.asm
View file

@ -45,10 +45,10 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ld a, [wWhichTrade] ld a, [wWhichTrade]
cp $1 cp $1
ld a, $8 ld a, $8
ld b, $0 ld b, SPRITE_FACING_DOWN
jr nz, .asm_194e6 jr nz, .asm_194e6
ld a, $4 ld a, $4
ld b, $4 ld b, SPRITE_FACING_UP
.asm_194e6 .asm_194e6
ld [wd528], a ld [wd528], a
ld a, b ld a, b
@ -110,12 +110,15 @@ CeruleanCityCoords2: ; 19554 (6:5554)
db $ff db $ff
CeruleanCityMovement1: ; 19559 (6:5559) CeruleanCityMovement1: ; 19559 (6:5559)
db $00,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
CeruleanCityScript_1955d: ; 1955d (6:555d) CeruleanCityScript_1955d: ; 1955d (6:555d)
ld a,1 ld a,1
ld [$ff8c],a ld [$ff8c],a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d],a ld [$ff8d],a
jp SetSpriteFacingDirectionAndDelay ; face object jp SetSpriteFacingDirectionAndDelay ; face object
@ -195,10 +198,24 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
ret ret
CeruleanCityMovement3: ; 19600 (6:5600) CeruleanCityMovement3: ; 19600 (6:5600)
db $80,$00,$00,$00,$00,$00,$00,$FF db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
CeruleanCityMovement4: ; 19608 (6:5608) CeruleanCityMovement4: ; 19608 (6:5608)
db $c0,$00,$00,$00,$00,$00,$00,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
CeruleanCityScript3: ; 19610 (6:5610) CeruleanCityScript3: ; 19610 (6:5610)
ld a, [wd730] ld a, [wd730]

7
scripts/cinnabargym.asm
View file

@ -70,10 +70,13 @@ CinnabarGymScript0: ; 757ae (1d:57ae)
ret ret
MovementData_757d7: ; 757d7 (1d:57d7) MovementData_757d7: ; 757d7 (1d:57d7)
db $80,$40,$FF db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_UP
db $FF
MovementData_757da: ; 757da (1d:57da) MovementData_757da: ; 757da (1d:57da)
db $80,$FF db NPC_MOVEMENT_LEFT
db $FF
CinnabarGymScript1: ; 757dc (1d:57dc) CinnabarGymScript1: ; 757dc (1d:57dc)
ld a, [wd730] ld a, [wd730]

4
scripts/fightingdojo.asm
View file

@ -46,7 +46,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
ld [wd528], a ld [wd528], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
ld a, $8 ld a, SPRITE_FACING_LEFT
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $1 ld a, $1
@ -65,7 +65,7 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6)
ld [wd528], a ld [wd528], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
ld a, $8 ld a, SPRITE_FACING_LEFT
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay

29
scripts/gary.asm
View file

@ -40,9 +40,9 @@ GaryScript1: ; 75f48 (1d:5f48)
ret ret
RLEMovement75f63: ; 75f63 (1d:5f63) RLEMovement75f63: ; 75f63 (1d:5f63)
db $40,1 db D_UP,1
db $10,1 db D_RIGHT,1
db $40,3 db D_UP,3
db $ff db $ff
GaryScript2: ; 75f6a (1d:5f6a) GaryScript2: ; 75f6a (1d:5f6a)
@ -128,7 +128,12 @@ GaryScript4: ; 75fe4 (1d:5fe4)
ret ret
MovementData_76014: ; 76014 (1d:6014) MovementData_76014: ; 76014 (1d:6014)
db $40,$40,$40,$40,$40,$FF db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db $FF
GaryScript5: ; 7601a (1d:601a) GaryScript5: ; 7601a (1d:601a)
ld a, [wd730] ld a, [wd730]
@ -138,12 +143,12 @@ GaryScript5: ; 7601a (1d:601a)
ld [wd528], a ld [wd528], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
ld a, $8 ld a, SPRITE_FACING_LEFT
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay ; face object call SetSpriteFacingDirectionAndDelay ; face object
ld a, $3 ld a, $3
@ -156,7 +161,7 @@ GaryScript5: ; 7601a (1d:601a)
GaryScript6: ; 76047 (1d:6047) GaryScript6: ; 76047 (1d:6047)
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
ld a, $c ld a, SPRITE_FACING_RIGHT
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay ; face object call SetSpriteFacingDirectionAndDelay ; face object
ld a, $4 ld a, $4
@ -169,7 +174,7 @@ GaryScript6: ; 76047 (1d:6047)
GaryScript7: ; 7605f (1d:605f) GaryScript7: ; 7605f (1d:605f)
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay ; face object call SetSpriteFacingDirectionAndDelay ; face object
ld a, $5 ld a, $5
@ -184,7 +189,9 @@ GaryScript7: ; 7605f (1d:605f)
ret ret
MovementData_76080: ; 76080 (1d:6080) MovementData_76080: ; 76080 (1d:6080)
db $40,$40,$FF db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db $FF
GaryScript8: ; 76083 (1d:6083) GaryScript8: ; 76083 (1d:6083)
ld a, [wd730] ld a, [wd730]
@ -211,8 +218,8 @@ GaryScript9: ; 76099 (1d:6099)
ret ret
RLEMovement760b4: ; 760b4 (1d:60b4) RLEMovement760b4: ; 760b4 (1d:60b4)
db $40,4 db D_UP,4
db $20,1 db D_LEFT,1
db $ff db $ff
GaryScript10: ; 760b9 (1d:60b9) GaryScript10: ; 760b9 (1d:60b9)

4
scripts/halloffameroom.asm
View file

@ -73,7 +73,7 @@ HallofFameRoomScript0: ; 5a50d (16:650d)
ret ret
RLEMovement5a528: ; 5a528 (16:6528) RLEMovement5a528: ; 5a528 (16:6528)
db $40,$5 db D_UP,$5
db $ff db $ff
HallofFameRoomScript1: ; 5a52b (16:652b) HallofFameRoomScript1: ; 5a52b (16:652b)
@ -85,7 +85,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
ld a, $8 ld a, SPRITE_FACING_LEFT
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
call Delay3 call Delay3

8
scripts/lance.asm
View file

@ -111,10 +111,10 @@ LanceScript_5a35b: ; 5a35b (16:635b)
ret ret
RLEList_5a379: ; 5a379 (16:6379) RLEList_5a379: ; 5a379 (16:6379)
db $40, $0C db D_UP, $0C
db $20, $0C db D_LEFT, $0C
db $80, $07 db D_DOWN, $07
db $20, $06 db D_LEFT, $06
db $FF db $FF
LanceScript3: ; 5a382 (16:6382) LanceScript3: ; 5a382 (16:6382)

4
scripts/mtmoon3.asm
View file

@ -126,10 +126,10 @@ CoordsData_49df1: ; 49df1 (12:5df1)
db $FF db $FF
MovementData_49df8: ; 49df8 (12:5df8) MovementData_49df8: ; 49df8 (12:5df8)
db $C0 db NPC_MOVEMENT_RIGHT
MovementData_49df9: ; 49df9 (12:5df9) MovementData_49df9: ; 49df9 (12:5df9)
db $40,$FF db NPC_MOVEMENT_UP,$FF
MtMoon3Script5: ; 49dfb (12:5dfb) MtMoon3Script5: ; 49dfb (12:5dfb)
ld a, [wd730] ld a, [wd730]

2
scripts/museum1f.asm
View file

@ -116,7 +116,7 @@ Museum1FText1: ; 5c135 (17:4135)
call PrintText call PrintText
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
call UpdateSprites call UpdateSprites

80
scripts/oakslab.asm
View file

@ -59,7 +59,10 @@ OaksLabScript1: ; 1cb6e (7:4b6e)
ret ret
OakEntryMovement: ; 1cb7e (7:4b7e) OakEntryMovement: ; 1cb7e (7:4b7e)
db $40,$40,$40,$FF db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db $FF
OaksLabScript2: ; 1cb82 (7:4b82) OaksLabScript2: ; 1cb82 (7:4b82)
ld a, [wd730] ld a, [wd730]
@ -86,12 +89,12 @@ OaksLabScript3: ; 1cba2 (7:4ba2)
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $5 ld a, $5
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
@ -100,7 +103,8 @@ OaksLabScript3: ; 1cba2 (7:4ba2)
ret ret
PlayerEntryMovementRLE: ; 1cbcf (7:4bcf) PlayerEntryMovementRLE: ; 1cbcf (7:4bcf)
db $40, $8, $ff db D_UP,$8
db $ff
OaksLabScript4: ; 1cbd2 (7:4bd2) OaksLabScript4: ; 1cbd2 (7:4bd2)
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]
@ -112,7 +116,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
set 0, [hl] set 0, [hl]
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, SPRITE_FACING_UP
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
call UpdateSprites call UpdateSprites
@ -157,7 +161,7 @@ OaksLabScript6: ; 1cc36 (7:4c36)
ret nz ret nz
ld a, $5 ld a, $5
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $1 ld a, $1
@ -171,7 +175,7 @@ OaksLabScript6: ; 1cc36 (7:4c36)
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $40 ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
ld a, $8 ld a, $8
@ -207,9 +211,20 @@ OaksLabScript8: ; 1cc80 (7:4c80)
jr .asm_1ccf3 jr .asm_1ccf3
.MiddleBallMovement1 .MiddleBallMovement1
db 0,0,$C0,$C0,$C0,$40,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_UP
db $FF
.MiddleBallMovement2 .MiddleBallMovement2
db 0,$C0,$C0,$C0,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
.Squirtle .Squirtle
ld de, .RightBallMovement1 ld de, .RightBallMovement1
@ -220,9 +235,22 @@ OaksLabScript8: ; 1cc80 (7:4c80)
jr .asm_1ccf3 jr .asm_1ccf3
.RightBallMovement1 .RightBallMovement1
db 0,0,$C0,$C0,$C0,$C0,$40,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_UP
db $FF
.RightBallMovement2 .RightBallMovement2
db 0,$C0,$C0,$C0,$C0,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
.Bulbasaur .Bulbasaur
ld de, .LeftBallMovement1 ld de, .LeftBallMovement1
@ -250,9 +278,11 @@ OaksLabScript8: ; 1cc80 (7:4c80)
jr .asm_1ccf3 jr .asm_1ccf3
.LeftBallMovement1 .LeftBallMovement1
db $00,$C0 ; not yet terminated! db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT ; not yet terminated!
.LeftBallMovement2 .LeftBallMovement2
db $C0,$FF db NPC_MOVEMENT_RIGHT
db $FF
.asm_1ccf3 .asm_1ccf3
ld a, $1 ld a, $1
@ -271,7 +301,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, SPRITE_FACING_UP
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $d ld a, $d
@ -300,7 +330,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
call GetMonName call GetMonName
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, SPRITE_FACING_UP
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $e ld a, $e
@ -321,7 +351,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
ret nz ret nz
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $8 ld a, $8
@ -401,7 +431,7 @@ OaksLabScript12: ; 1ce03 (7:4e03)
call SetSpritePosition1 call SetSpritePosition1
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
predef HealParty predef HealParty
@ -439,7 +469,13 @@ OaksLabScript13: ; 1ce32 (7:4e32)
ret ret
.RivalExitMovement .RivalExitMovement
db $E0,$00,$00,$00,$00,$00,$FF db $E0 ; change sprite facing direction
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
OaksLabScript14: ; 1ce6d (7:4e6d) OaksLabScript14: ; 1ce6d (7:4e6d)
ld a, [wd730] ld a, [wd730]
@ -456,7 +492,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
jr .done jr .done
; make the player keep facing the rival as he walks away ; make the player keep facing the rival as he walks away
.asm_1ce8c .asm_1ce8c
ld a, [wcf0f] ld a, [wNPCNumScriptedSteps]
cp $5 cp $5
jr nz, .asm_1cea8 jr nz, .asm_1cea8
ld a, [W_XCOORD] ld a, [W_XCOORD]
@ -512,12 +548,12 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
OaksLabScript_1cefd: ; 1cefd (7:4efd) OaksLabScript_1cefd: ; 1cefd (7:4efd)
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
ld a, $4 ld a, SPRITE_FACING_UP
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, $8 ld a, $8
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
xor a xor a ; SPRITE_FACING_DOWN
ld [$ff8d], a ld [$ff8d], a
jp SetSpriteFacingDirectionAndDelay jp SetSpriteFacingDirectionAndDelay
@ -560,7 +596,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [H_SPRITEINDEX], a ld [H_SPRITEINDEX], a
ld a, $c ld a, SPRITE_FACING_RIGHT
ld [$ff8d], a ld [$ff8d], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
call Delay3 call Delay3

13
scripts/pewtercity.asm
View file

@ -79,7 +79,11 @@ PewterCityScript1: ; 19280 (6:5280)
ret ret
MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce) MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce)
db $00,$00,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
PewterCityScript2: ; 192d3 (6:52d3) PewterCityScript2: ; 192d3 (6:52d3)
ld a, [wd730] ld a, [wd730]
@ -143,7 +147,12 @@ PewterCityScript4: ; 19305 (6:5305)
ret ret
MovementData_PewterGymGuyExit: ; 19353 (6:5353) MovementData_PewterGymGuyExit: ; 19353 (6:5353)
db $C0,$C0,$C0,$C0,$C0,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
PewterCityScript5: ; 19359 (6:5359) PewterCityScript5: ; 19359 (6:5359)
ld a, [wd730] ld a, [wd730]

24
scripts/pokemontower2.asm
View file

@ -34,12 +34,12 @@ PokemonTower2Script0: ; 6050f (18:450f)
ld a, [wWhichTrade] ld a, [wWhichTrade]
cp $1 cp $1
ld a, $8 ld a, $8
ld b, $0 ld b, SPRITE_FACING_DOWN
jr nz, .asm_60544 jr nz, .asm_60544
ld hl, wd764 ld hl, wd764
set 6, [hl] set 6, [hl]
ld a, $2 ld a, $2
ld b, $c ld b, SPRITE_FACING_RIGHT
.asm_60544 .asm_60544
ld [wd528], a ld [wd528], a
ld a, $1 ld a, $1
@ -90,10 +90,26 @@ PokemonTower2Script1: ; 60563 (18:4563)
ret ret
MovementData_605a9: ; 605a9 (18:45a9) MovementData_605a9: ; 605a9 (18:45a9)
db $C0,$00,$00,$C0,$00,$00,$C0,$C0,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
MovementData_605b2: ; 605b2 (18:45b2) MovementData_605b2: ; 605b2 (18:45b2)
db $00,$00,$C0,$C0,$C0,$C0,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
PokemonTower2Script2: ; 605bb (18:45bb) PokemonTower2Script2: ; 605bb (18:45bb)
ld a, [wd730] ld a, [wd730]

50
scripts/pokemontower7.asm
View file

@ -143,22 +143,60 @@ CoordsData_60de3: ; 60de3 (18:4de3)
dw MovementData_60e22 dw MovementData_60e22
MovementData_60e13: ; 60e13 MovementData_60e13: ; 60e13
db $C0,$00,$00,$00,$00,$00,$80,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_LEFT
db $FF
MovementData_60e1b: ; 60e1b MovementData_60e1b: ; 60e1b
db $00,$C0,$00,$00,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
MovementData_60e22: ; 60e22 MovementData_60e22: ; 60e22
db $00,$00,$00,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
MovementData_60e28: ; 60e28 MovementData_60e28: ; 60e28
db $80,$00,$00,$00,$00,$00,$00,$FF db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
MovementData_60e30: ; 60e30 MovementData_60e30: ; 60e30
db $00,$00,$00,$80,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
MovementData_60e37: ; 60e37 MovementData_60e37: ; 60e37
db $C0,$00,$00,$00,$00,$00,$00,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
PokemonTower7TextPointers: ; 60e3f (18:4e3f) PokemonTower7TextPointers: ; 60e3f (18:4e3f)
dw PokemonTower7Text1 dw PokemonTower7Text1

136
scripts/rockethideout2.asm
View file

@ -126,183 +126,179 @@ RocketHideout2ArrowTilePlayerMovement: ; 44e6d (11:4e6d)
db $FF db $FF
;format: direction, count ;format: direction, count
;right: $10
;left: $20
;up: $40
;down: $80
;each list is read starting from the $FF and working backwards ;each list is read starting from the $FF and working backwards
RocketHideout2ArrowMovement1: ; 44f1a (11:4f1a) RocketHideout2ArrowMovement1: ; 44f1a (11:4f1a)
db $20,$02 db D_LEFT,$02
db $FF db $FF
RocketHideout2ArrowMovement2: ; 44f1d (11:4f1d) RocketHideout2ArrowMovement2: ; 44f1d (11:4f1d)
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout2ArrowMovement3: ; 44f20 (11:4f20) RocketHideout2ArrowMovement3: ; 44f20 (11:4f20)
db $40,$04 db D_UP,$04
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout2ArrowMovement4: ; 44f25 (11:4f25) RocketHideout2ArrowMovement4: ; 44f25 (11:4f25)
db $40,$04 db D_UP,$04
db $10,$04 db D_RIGHT,$04
db $40,$01 db D_UP,$01
db $FF db $FF
RocketHideout2ArrowMovement5: ; 44f2c (11:4f2c) RocketHideout2ArrowMovement5: ; 44f2c (11:4f2c)
db $20,$02 db D_LEFT,$02
db $40,$03 db D_UP,$03
db $FF db $FF
RocketHideout2ArrowMovement6: ; 44f31 (11:4f31) RocketHideout2ArrowMovement6: ; 44f31 (11:4f31)
db $80,$02 db D_DOWN,$02
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout2ArrowMovement7: ; 44f36 (11:4f36) RocketHideout2ArrowMovement7: ; 44f36 (11:4f36)
db $40,$02 db D_UP,$02
db $FF db $FF
RocketHideout2ArrowMovement8: ; 44f39 (11:4f39) RocketHideout2ArrowMovement8: ; 44f39 (11:4f39)
db $40,$04 db D_UP,$04
db $FF db $FF
RocketHideout2ArrowMovement9: ; 44f3c (11:4f3c) RocketHideout2ArrowMovement9: ; 44f3c (11:4f3c)
db $20,$06 db D_LEFT,$06
db $FF db $FF
RocketHideout2ArrowMovement10: ; 44f3f (11:4f3f) RocketHideout2ArrowMovement10: ; 44f3f (11:4f3f)
db $40,$01 db D_UP,$01
db $FF db $FF
RocketHideout2ArrowMovement11: ; 44f42 (11:4f42) RocketHideout2ArrowMovement11: ; 44f42 (11:4f42)
db $20,$06 db D_LEFT,$06
db $40,$04 db D_UP,$04
db $FF db $FF
RocketHideout2ArrowMovement12: ; 44f47 (11:4f47) RocketHideout2ArrowMovement12: ; 44f47 (11:4f47)
db $80,$02 db D_DOWN,$02
db $FF db $FF
RocketHideout2ArrowMovement13: ; 44f4a (11:4f4a) RocketHideout2ArrowMovement13: ; 44f4a (11:4f4a)
db $20,$08 db D_LEFT,$08
db $FF db $FF
RocketHideout2ArrowMovement14: ; 44f4d (11:4f4d) RocketHideout2ArrowMovement14: ; 44f4d (11:4f4d)
db $20,$08 db D_LEFT,$08
db $40,$01 db D_UP,$01
db $FF db $FF
RocketHideout2ArrowMovement15: ; 44f52 (11:4f52) RocketHideout2ArrowMovement15: ; 44f52 (11:4f52)
db $20,$08 db D_LEFT,$08
db $40,$06 db D_UP,$06
db $FF db $FF
RocketHideout2ArrowMovement16: ; 44f57 (11:4f57) RocketHideout2ArrowMovement16: ; 44f57 (11:4f57)
db $40,$02 db D_UP,$02
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout2ArrowMovement17: ; 44f5c (11:4f5c) RocketHideout2ArrowMovement17: ; 44f5c (11:4f5c)
db $40,$02 db D_UP,$02
db $10,$04 db D_RIGHT,$04
db $40,$02 db D_UP,$02
db $FF db $FF
RocketHideout2ArrowMovement18: ; 44f63 (11:4f63) RocketHideout2ArrowMovement18: ; 44f63 (11:4f63)
db $80,$02 db D_DOWN,$02
db $10,$04 db D_RIGHT,$04
db $80,$02 db D_DOWN,$02
db $FF db $FF
RocketHideout2ArrowMovement19: ; 44f6a (11:4f6a) RocketHideout2ArrowMovement19: ; 44f6a (11:4f6a)
db $80,$02 db D_DOWN,$02
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout2ArrowMovement20: ; 44f6f (11:4f6f) RocketHideout2ArrowMovement20: ; 44f6f (11:4f6f)
db $20,$0A db D_LEFT,$0A
db $FF db $FF
RocketHideout2ArrowMovement21: ; 44f72 (11:4f72) RocketHideout2ArrowMovement21: ; 44f72 (11:4f72)
db $20,$0A db D_LEFT,$0A
db $40,$02 db D_UP,$02
db $FF db $FF
RocketHideout2ArrowMovement22: ; 44f77 (11:4f77) RocketHideout2ArrowMovement22: ; 44f77 (11:4f77)
db $20,$0A db D_LEFT,$0A
db $40,$04 db D_UP,$04
db $FF db $FF
RocketHideout2ArrowMovement23: ; 44f7c (11:4f7c) RocketHideout2ArrowMovement23: ; 44f7c (11:4f7c)
db $40,$02 db D_UP,$02
db $10,$02 db D_RIGHT,$02
db $FF db $FF
RocketHideout2ArrowMovement24: ; 44f81 (11:4f81) RocketHideout2ArrowMovement24: ; 44f81 (11:4f81)
db $10,$01 db D_RIGHT,$01
db $80,$02 db D_DOWN,$02
db $FF db $FF
RocketHideout2ArrowMovement25: ; 44f86 (11:4f86) RocketHideout2ArrowMovement25: ; 44f86 (11:4f86)
db $10,$01 db D_RIGHT,$01
db $FF db $FF
RocketHideout2ArrowMovement26: ; 44f89 (11:4f89) RocketHideout2ArrowMovement26: ; 44f89 (11:4f89)
db $80,$02 db D_DOWN,$02
db $10,$02 db D_RIGHT,$02
db $FF db $FF
RocketHideout2ArrowMovement27: ; 44f8e (11:4f8e) RocketHideout2ArrowMovement27: ; 44f8e (11:4f8e)
db $80,$02 db D_DOWN,$02
db $20,$02 db D_LEFT,$02
db $FF db $FF
RocketHideout2ArrowMovement28: ; 44f93 (11:4f93) RocketHideout2ArrowMovement28: ; 44f93 (11:4f93)
db $40,$02 db D_UP,$02
db $10,$04 db D_RIGHT,$04
db $40,$02 db D_UP,$02
db $20,$03 db D_LEFT,$03
db $FF db $FF
RocketHideout2ArrowMovement29: ; 44f9c (11:4f9c) RocketHideout2ArrowMovement29: ; 44f9c (11:4f9c)
db $80,$02 db D_DOWN,$02
db $20,$04 db D_LEFT,$04
db $FF db $FF
RocketHideout2ArrowMovement30: ; 44fa1 (11:4fa1) RocketHideout2ArrowMovement30: ; 44fa1 (11:4fa1)
db $20,$06 db D_LEFT,$06
db $40,$04 db D_UP,$04
db $20,$05 db D_LEFT,$05
db $FF db $FF
RocketHideout2ArrowMovement31: ; 44fa8 (11:4fa8) RocketHideout2ArrowMovement31: ; 44fa8 (11:4fa8)
db $40,$02 db D_UP,$02
db $FF db $FF
RocketHideout2ArrowMovement32: ; 44fab (11:4fab) RocketHideout2ArrowMovement32: ; 44fab (11:4fab)
db $40,$01 db D_UP,$01
db $FF db $FF
RocketHideout2ArrowMovement33: ; 44fae (11:4fae) RocketHideout2ArrowMovement33: ; 44fae (11:4fae)
db $40,$03 db D_UP,$03
db $FF db $FF
RocketHideout2ArrowMovement34: ; 44fb1 (11:4fb1) RocketHideout2ArrowMovement34: ; 44fb1 (11:4fb1)
db $40,$05 db D_UP,$05
db $FF db $FF
RocketHideout2ArrowMovement35: ; 44fb4 (11:4fb4) RocketHideout2ArrowMovement35: ; 44fb4 (11:4fb4)
db $10,$01 db D_RIGHT,$01
db $80,$02 db D_DOWN,$02
db $20,$04 db D_LEFT,$04
db $FF db $FF
RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb) RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb)
db $20,$0A db D_LEFT,$0A
db $40,$02 db D_UP,$02
db $20,$05 db D_LEFT,$05
db $FF db $FF
RocketHideout2Script3: ; 44fc2 (11:4fc2) RocketHideout2Script3: ; 44fc2 (11:4fc2)

48
scripts/rockethideout3.asm
View file

@ -72,67 +72,63 @@ RocketHideout3ArrowTilePlayerMovement: ; 4526b (11:526b)
db $FF db $FF
;format: direction, count ;format: direction, count
;right: $10
;left: $20
;up: $40
;down: $80
;each list is read starting from the $FF and working backwards ;each list is read starting from the $FF and working backwards
RocketHideout3ArrowMovement1: ; 452ac (11:52ac) RocketHideout3ArrowMovement1: ; 452ac (11:52ac)
db $10,$04 db D_RIGHT,$04
db $40,$04 db D_UP,$04
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout3ArrowMovement2: ; 452b3 (11:52b3) RocketHideout3ArrowMovement2: ; 452b3 (11:52b3)
db $80,$04 db D_DOWN,$04
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout3ArrowMovement3: ; 452b8 (11:52b8) RocketHideout3ArrowMovement3: ; 452b8 (11:52b8)
db $20,$02 db D_LEFT,$02
db $FF db $FF
RocketHideout3ArrowMovement4: ; 452bb (11:52bb) RocketHideout3ArrowMovement4: ; 452bb (11:52bb)
db $10,$04 db D_RIGHT,$04
db $40,$02 db D_UP,$02
db $10,$02 db D_RIGHT,$02
db $FF db $FF
RocketHideout3ArrowMovement5: ; 452c2 (11:52c2) RocketHideout3ArrowMovement5: ; 452c2 (11:52c2)
db $10,$04 db D_RIGHT,$04
db $40,$02 db D_UP,$02
db $10,$02 db D_RIGHT,$02
db $40,$03 db D_UP,$03
db $FF db $FF
RocketHideout3ArrowMovement6: ; 452cb (11:52cb) RocketHideout3ArrowMovement6: ; 452cb (11:52cb)
db $10,$04 db D_RIGHT,$04
db $FF db $FF
RocketHideout3ArrowMovement7: ; 452ce (11:52ce) RocketHideout3ArrowMovement7: ; 452ce (11:52ce)
db $10,$02 db D_RIGHT,$02
db $FF db $FF
RocketHideout3ArrowMovement8: ; 452d1 (11:52d1) RocketHideout3ArrowMovement8: ; 452d1 (11:52d1)
db $10,$04 db D_RIGHT,$04
db $40,$02 db D_UP,$02
db $FF db $FF
RocketHideout3ArrowMovement9: ; 452d6 (11:52d6) RocketHideout3ArrowMovement9: ; 452d6 (11:52d6)
db $10,$04 db D_RIGHT,$04
db $40,$04 db D_UP,$04
db $FF db $FF
RocketHideout3ArrowMovement10: ; 452db (11:52db) RocketHideout3ArrowMovement10: ; 452db (11:52db)
db $80,$04 db D_DOWN,$04
db $FF db $FF
RocketHideout3ArrowMovement11: ; 452de (11:52de) RocketHideout3ArrowMovement11: ; 452de (11:52de)
db $40,$02 db D_UP,$02
db $FF db $FF
RocketHideout3ArrowMovement12: ; 452e1 (11:52e1) RocketHideout3ArrowMovement12: ; 452e1 (11:52e1)
db $40,$01 db D_UP,$01
db $FF db $FF
RocketHideout3Script3: ; 452e4 (11:452e4) RocketHideout3Script3: ; 452e4 (11:452e4)

4
scripts/route16gate.asm
View file

@ -31,7 +31,7 @@ Route16GateScript0: ; 496d7 (12:56d7)
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld b, $0 ld b, $0
ld c, a ld c, a
ld a, $40 ld a, D_UP
ld hl, wSimulatedJoypadStatesEnd ld hl, wSimulatedJoypadStatesEnd
call FillMemory call FillMemory
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
@ -63,7 +63,7 @@ Route16GateScript2: ; 49727 (12:5727)
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $10 ld a, D_RIGHT
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
ld a, $3 ld a, $3

4
scripts/route18gate.asm
View file

@ -31,7 +31,7 @@ Route18GateScript0: ; 4988f (12:588f)
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld b, $0 ld b, $0
ld c, a ld c, a
ld a, $40 ld a, D_UP
ld hl, wSimulatedJoypadStatesEnd ld hl, wSimulatedJoypadStatesEnd
call FillMemory call FillMemory
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
@ -63,7 +63,7 @@ Route18GateScript2: ; 498df (12:58df)
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $10 ld a, D_RIGHT
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
ld a, $3 ld a, $3

34
scripts/route22.asm
View file

@ -48,7 +48,11 @@ Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
jp SetSpriteFacingDirectionAndDelay jp SetSpriteFacingDirectionAndDelay
Route22RivalMovementData: ; 50efb (14:4efb) Route22RivalMovementData: ; 50efb (14:4efb)
db $C0,$C0,$C0,$C0,$FF ; move right 4 times db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
Route22Script0: ; 50f00 (14:4f00) Route22Script0: ; 50f00 (14:4f00)
ld a, [wd7eb] ld a, [wd7eb]
@ -194,10 +198,27 @@ Route22MoveRival1: ; 51010 (14:5010)
jp MoveSprite jp MoveSprite
Route22RivalExitMovementData1: ; 51017 (14:5017) Route22RivalExitMovementData1: ; 51017 (14:5017)
db $C0,$C0,$00,$00,$00,$00,$00,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
Route22RivalExitMovementData2: ; 5101f (14:501f) Route22RivalExitMovementData2: ; 5101f (14:501f)
db $40,$C0,$C0,$C0,$00,$00,$00,$00,$00,$00,$FF db NPC_MOVEMENT_UP
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
Route22Script3: ; 5102a (14:502a) Route22Script3: ; 5102a (14:502a)
ld a, [wd730] ld a, [wd730]
@ -339,10 +360,13 @@ Route22MoveRival2: ; 51145 (14:5145)
jp MoveSprite jp MoveSprite
MovementData_5114c: ; 5114c (14:514c) MovementData_5114c: ; 5114c (14:514c)
db $80 ; left db NPC_MOVEMENT_LEFT
MovementData_5114d: ; 5114d (14:514d) MovementData_5114d: ; 5114d (14:514d)
db $80,$80,$80,$FF ; left x3 db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_LEFT
db $FF
Route22Script6: ; 51151 (14:5151) Route22Script6: ; 51151 (14:5151)
ld a, [wd730] ld a, [wd730]

2
scripts/route22gate.asm
View file

@ -35,7 +35,7 @@ Route22GateScriptCoords: ; 1e6b5 (7:66b5)
Route22GateScript_1e6ba: ; 1e6ba (7:66ba) Route22GateScript_1e6ba: ; 1e6ba (7:66ba)
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a ld [wJoyIgnore], a

2
scripts/route23.asm
View file

@ -119,7 +119,7 @@ CascadeBadgeText: ; 512cb (14:52cb)
Route23Script_512d8: ; 512d8 (14:52d8) Route23Script_512d8: ; 512d8 (14:52d8)
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
xor a xor a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a

2
scripts/route24.asm
View file

@ -37,7 +37,7 @@ Route24Script0: ; 513d5 (14:53d5)
bit 1, [hl] bit 1, [hl]
res 1, [hl] res 1, [hl]
ret z ret z
ld a, $80 ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a

2
scripts/route5gate.asm
View file

@ -9,7 +9,7 @@ Route5GateScriptPointers: ; 1df3f (7:5f3f)
dw Route5GateScript1 dw Route5GateScript1
Route5GateScript_1df43: ; 1df43 (7:5f43) Route5GateScript_1df43: ; 1df43 (7:5f43)
ld a, $40 ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a

4
scripts/safarizoneentrance-yellow.asm
View file

@ -61,7 +61,7 @@
ld [wSafariSteps],a ld [wSafariSteps],a
ld a,l ld a,l
ld [wSafariSteps + 1],a ld [wSafariSteps + 1],a
ld a,$40 ld a,D_UP
ld c,3 ld c,3
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld hl,wd790 ld hl,wd790
@ -75,7 +75,7 @@
ld hl,.PleaseComeAgainText ld hl,.PleaseComeAgainText
call PrintText call PrintText
.CantPayWalkDown .CantPayWalkDown
ld a,$80 ld a,D_DOWN
ld c,1 ld c,1
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld a,4 ld a,4

12
scripts/safarizoneentrance.asm
View file

@ -33,7 +33,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
ld [W_SAFARIZONEENTRANCECURSCRIPT], a ld [W_SAFARIZONEENTRANCECURSCRIPT], a
ret ret
.asm_7520f .asm_7520f
ld a, $10 ld a, D_RIGHT
ld c, $1 ld c, $1
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld a, $f0 ld a, $f0
@ -87,7 +87,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
call DisplayTextID call DisplayTextID
xor a xor a
ld [W_NUMSAFARIBALLS], a ld [W_NUMSAFARIBALLS], a
ld a, $80 ld a, D_DOWN
ld c, $3 ld c, $3
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld a, $4 ld a, $4
@ -188,7 +188,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
ld [wSafariSteps],a ld [wSafariSteps],a
ld a, 502 % $100 ld a, 502 % $100
ld [wSafariSteps + 1],a ld [wSafariSteps + 1],a
ld a,$40 ld a,D_UP
ld c,3 ld c,3
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld hl,wd790 ld hl,wd790
@ -202,7 +202,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
ld hl,.PleaseComeAgainText ld hl,.PleaseComeAgainText
call PrintText call PrintText
.CantPayWalkDown .CantPayWalkDown
ld a,$80 ld a,D_DOWN
ld c,1 ld c,1
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld a,4 ld a,4
@ -235,7 +235,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
call PrintText call PrintText
xor a xor a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld a, $80 ld a, D_DOWN
ld c, $3 ld c, $3
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld hl, wd790 ld hl, wd790
@ -249,7 +249,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
call PrintText call PrintText
ld a, SPRITE_FACING_UP ld a, SPRITE_FACING_UP
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld a, $40 ld a, D_UP
ld c, $1 ld c, $1
call SafariZoneEntranceAutoWalk call SafariZoneEntranceAutoWalk
ld a, $5 ld a, $5

17
scripts/seafoamislands4.asm
View file

@ -79,9 +79,9 @@ SeafoamIslands4Script0: ; 46603 (11:6603)
ret ret
RLEMovement46632: ; 46632 (11:6632) RLEMovement46632: ; 46632 (11:6632)
db $80,6 db D_DOWN,6
db $10,5 db D_RIGHT,5
db $80,3 db D_DOWN,3
db $ff db $ff
SeafoamIslands4Script1: ; 46639 (11:6639) SeafoamIslands4Script1: ; 46639 (11:6639)
@ -124,10 +124,17 @@ SeafoamIslands4Script2: ; 46644 (11:6644)
ret ret
RLEData_4667f: ; 4667f (11:667f) RLEData_4667f: ; 4667f (11:667f)
db $80,$06,$10,$02,$80,$04,$20,$01,$FF db D_DOWN,$06
db D_RIGHT,$02
db D_DOWN,$04
db D_LEFT,$01
db $FF
RLEData_46688: ; 46688 (11:6688) RLEData_46688: ; 46688 (11:6688)
db $80,$06,$10,$02,$80,$04,$FF db D_DOWN,$06
db D_RIGHT,$02
db D_DOWN,$04
db $FF
SeafoamIslands4Script3: ; 4668f (11:668f) SeafoamIslands4Script3: ; 4668f (11:668f)
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]

14
scripts/seafoamislands5.asm
View file

@ -45,7 +45,7 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7)
ld a, $1 ld a, $1
.asm_467e8 .asm_467e8
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $40 ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
ld hl, W_FLAGS_D733 ld hl, W_FLAGS_D733
@ -105,15 +105,15 @@ CoordsData_4684d: ; 4684d (11:684d)
db $FF db $FF
RLEMovementData_46852: ; 46852 (11:6852) RLEMovementData_46852: ; 46852 (11:6852)
db $40,$03 db D_UP,$03
db $10,$02 db D_RIGHT,$02
db $40,$01 db D_UP,$01
db $FF db $FF
RLEMovementData_46859: ; 46859 (11:6859) RLEMovementData_46859: ; 46859 (11:6859)
db $40,$03 db D_UP,$03
db $10,$03 db D_RIGHT,$03
db $40,$01 db D_UP,$01
db $FF db $FF
SeafoamIslands5Script3: ; 46860 (11:6860) SeafoamIslands5Script3: ; 46860 (11:6860)

5
scripts/silphco11.asm
View file

@ -193,7 +193,10 @@ CoordsData_62211: ; 62211 (18:6211)
db $FF db $FF
MovementData_62216: ; 62216 (18:6216) MovementData_62216: ; 62216 (18:6216)
db $00,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
SilphCo11Script_6221a: ; 6221a (18:621a) SilphCo11Script_6221a: ; 6221a (18:621a)
ld [wd528], a ld [wd528], a

19
scripts/silphco7.asm
View file

@ -160,7 +160,11 @@ CoordsData_51c78: ; 51c78 (14:5c78)
db $FF db $FF
MovementData_51c7d: ; 51c7d (14:5c7d) MovementData_51c7d: ; 51c7d (14:5c7d)
db $40,$40,$40,$40,$FF db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db $FF
SilphCo7Script3: ; 51c82 (14:5c82) SilphCo7Script3: ; 51c82 (14:5c82)
ld a, [wd730] ld a, [wd730]
@ -232,10 +236,19 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
jp SilphCo7Text_51c10 jp SilphCo7Text_51c10
MovementData_51d1a: ; 51d1a (14:5d1a) MovementData_51d1a: ; 51d1a (14:5d1a)
db $C0,$C0,$FF db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db $FF
MovementData_51d1d: ; 51d1d (14:5d1d) MovementData_51d1d: ; 51d1d (14:5d1d)
db $80,$40,$40,$C0,$C0,$C0,$00,$FF db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db $FF
SilphCo7Script5: ; 51d25 (14:5d25) SilphCo7Script5: ; 51d25 (14:5d25)
ld a, [wd730] ld a, [wd730]

22
scripts/ssanne2.asm
View file

@ -57,13 +57,18 @@ SSAnne2Script0: ; 613be (18:53be)
ret ret
MovementData_6140c: ; 6140c (18:540c) MovementData_6140c: ; 6140c (18:540c)
db $00 db NPC_MOVEMENT_DOWN
MovementData_6140d: ; 6140d (18:540d) MovementData_6140d: ; 6140d (18:540d)
db $00,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
CoordsData_61411: ; 61411 (18:5411) CoordsData_61411: ; 61411 (18:5411)
db $08,$24,$08,$25,$FF db $08,$24
db $08,$25
db $FF
SSAnne2Script_61416: ; 61416 (18:5416) SSAnne2Script_61416: ; 61416 (18:5416)
ld a, [W_XCOORD] ld a, [W_XCOORD]
@ -71,7 +76,7 @@ SSAnne2Script_61416: ; 61416 (18:5416)
jr nz, .asm_61426 jr nz, .asm_61426
ld a, $2 ld a, $2
ld [wd528], a ld [wd528], a
ld a, $c ld a, SPRITE_FACING_RIGHT
jr .asm_61427 jr .asm_61427
.asm_61426 .asm_61426
xor a xor a
@ -149,10 +154,15 @@ SSAnne2Script2: ; 6146d (18:546d)
ret ret
MovementData_614b7: ; 614b7 (18:54b7) MovementData_614b7: ; 614b7 (18:54b7)
db $C0,$00 db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
MovementData_614b9: ; 614b9 (18:54b9) MovementData_614b9: ; 614b9 (18:54b9)
db $00,$00,$00,$00,$FF db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db $FF
SSAnne2Script3: ; 614be (18:54be) SSAnne2Script3: ; 614be (18:54be)
ld a, [wd730] ld a, [wd730]

4
scripts/vermilioncity.asm
View file

@ -60,7 +60,7 @@ VermilionCityScript0: ; 197e6 (6:57e6)
and a and a
ret nz ret nz
.asm_19810 .asm_19810
ld a, $40 ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
@ -84,7 +84,7 @@ VermilionCityScript4: ; 19826 (6:5826)
VermilionCityScript2: ; 19833 (6:5833) VermilionCityScript2: ; 19833 (6:5833)
ld a, $ff ld a, $ff
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $40 ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
ld [wccd4], a ld [wccd4], a
ld a, $2 ld a, $2

2
scripts/viridiancity.asm
View file

@ -120,7 +120,7 @@ ViridianCityScript_190cf: ; 190cf (6:50cf)
call StartSimulatingJoypadStates call StartSimulatingJoypadStates
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
ld a, $80 ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
xor a xor a
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a

28
scripts/viridiangym.asm
View file

@ -80,45 +80,41 @@ ViridianGymArrowTilePlayerMovement: ; 74916 (1d:4916)
db $FF db $FF
;format: direction, count ;format: direction, count
;right: $10
;left: $20
;up: $40
;down: $80
ViridianGymArrowMovement1: ; 74947 (1d:4947) ViridianGymArrowMovement1: ; 74947 (1d:4947)
db $40,$09,$FF db D_UP,$09,$FF
ViridianGymArrowMovement2: ; 7494a (1d:494a) ViridianGymArrowMovement2: ; 7494a (1d:494a)
db $20,$08,$FF db D_LEFT,$08,$FF
ViridianGymArrowMovement3: ; 7494d (1d:494d) ViridianGymArrowMovement3: ; 7494d (1d:494d)
db $80,$09,$FF db D_DOWN,$09,$FF
ViridianGymArrowMovement4: ; 74950 (1d:4950) ViridianGymArrowMovement4: ; 74950 (1d:4950)
db $10,$06,$FF db D_RIGHT,$06,$FF
ViridianGymArrowMovement5: ; 74953 (1d:4953) ViridianGymArrowMovement5: ; 74953 (1d:4953)
db $80,$02,$FF db D_DOWN,$02,$FF
ViridianGymArrowMovement6: ; 74956 (1d:4956) ViridianGymArrowMovement6: ; 74956 (1d:4956)
db $80,$07,$FF db D_DOWN,$07,$FF
ViridianGymArrowMovement7: ; 74959 (1d:4959) ViridianGymArrowMovement7: ; 74959 (1d:4959)
db $10,$08,$FF db D_RIGHT,$08,$FF
ViridianGymArrowMovement8: ; 7495c (1d:495c) ViridianGymArrowMovement8: ; 7495c (1d:495c)
db $10,$09,$FF db D_RIGHT,$09,$FF
ViridianGymArrowMovement9: ; 7495f (1d:495f) ViridianGymArrowMovement9: ; 7495f (1d:495f)
db $40,$08,$FF db D_UP,$08,$FF
ViridianGymArrowMovement10: ; 74962 (1d:4962) ViridianGymArrowMovement10: ; 74962 (1d:4962)
db $40,$06,$FF db D_UP,$06,$FF
ViridianGymArrowMovement11: ; 74965 (1d:4965) ViridianGymArrowMovement11: ; 74965 (1d:4965)
db $20,$06,$FF db D_LEFT,$06,$FF
ViridianGymArrowMovement12: ; 74968 (1d:4968) ViridianGymArrowMovement12: ; 74968 (1d:4968)
db $20,$0C,$FF db D_LEFT,$0C,$FF
ViridianGymScript4: ; 7496b (1d:496b) ViridianGymScript4: ; 7496b (1d:496b)
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]

4
scripts/viridianmart.asm
View file

@ -41,8 +41,8 @@ ViridianMartScript0: ; 1d49b (7:549b)
ret ret
RLEMovement1d4bb: ; 1d4bb (7:54bb) RLEMovement1d4bb: ; 1d4bb (7:54bb)
db $20, $01 db D_LEFT, $01
db $40, $02 db D_UP, $02
db $ff db $ff
ViridianMartScript1: ; 1d4c0 (7:54c0) ViridianMartScript1: ; 1d4c0 (7:54c0)

2
wram.asm
View file

@ -1013,7 +1013,7 @@ wTilePlayerStandingOn:: ; cf0e
; used in CheckForTilePairCollisions2 to store the tile the player is on ; used in CheckForTilePairCollisions2 to store the tile the player is on
ds 1 ds 1
wcf0f:: ds 1 ; used with moving overworld sprites wNPCNumScriptedSteps:: ds 1 ; cf0f
wNPCMovementScriptFunctionNum:: ; cf10 wNPCMovementScriptFunctionNum:: ; cf10
; which script function within the pointer table indicated by ; which script function within the pointer table indicated by