thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 19:10:07 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use decimal, not hex, for sprite (object) coordinates in map scripts

Browse source
This commit is contained in:
Rangi 2020-08-28 12:10:55 -04:00
parent 407b813250
commit 637f38b139
13 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/BillsHouse.asm
View file

@ -69,9 +69,9 @@ BillsHouseScript3:
ldh [hSpriteScreenYCoord], a ldh [hSpriteScreenYCoord], a
ld a, $40 ld a, $40
ldh [hSpriteScreenXCoord], a ldh [hSpriteScreenXCoord], a
ld a, $6 ld a, 6
ldh [hSpriteMapYCoord], a ldh [hSpriteMapYCoord], a
ld a, $5 ld a, 5
ldh [hSpriteMapXCoord], a ldh [hSpriteMapXCoord], a
call SetSpritePosition1 call SetSpritePosition1
ld a, HS_BILL_1 ld a, HS_BILL_1

4
scripts/CeruleanCity.asm
View file

@ -80,7 +80,7 @@ ENDC
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, [wXCoord] ld a, [wXCoord]
cp $14 cp 20
jr z, .asm_19535 jr z, .asm_19535
ld a, $1 ld a, $1
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -183,7 +183,7 @@ CeruleanCityScript2:
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
ld a, [wXCoord] ld a, [wXCoord]
cp $14 cp 20
jr nz, .asm_195f0 jr nz, .asm_195f0
ld de, CeruleanCityMovement4 ld de, CeruleanCityMovement4
jr .asm_195f3 jr .asm_195f3

4
scripts/CinnabarIsland.asm
View file

@ -17,10 +17,10 @@ CinnabarIslandScript0:
call IsItemInBag call IsItemInBag
ret nz ret nz
ld a, [wYCoord] ld a, [wYCoord]
cp $4 cp 4
ret nz ret nz
ld a, [wXCoord] ld a, [wXCoord]
cp $12 cp 18
ret nz ret nz
ld a, PLAYER_DIR_UP ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a

4
scripts/FightingDojo.asm
View file

@ -33,10 +33,10 @@ FightingDojoScript1:
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld [wcf0d], a ld [wcf0d], a
ld a, [wYCoord] ld a, [wYCoord]
cp $3 cp 3
ret nz ret nz
ld a, [wXCoord] ld a, [wXCoord]
cp $4 cp 4
ret nz ret nz
ld a, $1 ld a, $1
ld [wcf0d], a ld [wcf0d], a

4
scripts/GameCorner.asm
View file

@ -64,13 +64,13 @@ CeladonGameCornerScript1:
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
ld de, MovementData_48c5a ld de, MovementData_48c5a
ld a, [wYCoord] ld a, [wYCoord]
cp $6 cp 6
jr nz, .asm_48c43 jr nz, .asm_48c43
ld de, MovementData_48c63 ld de, MovementData_48c63
jr .asm_48c4d jr .asm_48c4d
.asm_48c43 .asm_48c43
ld a, [wXCoord] ld a, [wXCoord]
cp $8 cp 8
jr nz, .asm_48c4d jr nz, .asm_48c4d
ld de, MovementData_48c63 ld de, MovementData_48c63
.asm_48c4d .asm_48c4d

4
scripts/MtMoonB2F.asm
View file

@ -56,10 +56,10 @@ MtMoon3Script0:
CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
jp nz, MtMoon3Script_49d91 jp nz, MtMoon3Script_49d91
ld a, [wYCoord] ld a, [wYCoord]
cp $8 cp 8
jp nz, MtMoon3Script_49d91 jp nz, MtMoon3Script_49d91
ld a, [wXCoord] ld a, [wXCoord]
cp $d cp 13
jp nz, MtMoon3Script_49d91 jp nz, MtMoon3Script_49d91
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a

12
scripts/Museum1F.asm
View file

@ -13,13 +13,13 @@ Museum1F_ScriptPointers:
Museum1FScript0: Museum1FScript0:
ld a, [wYCoord] ld a, [wYCoord]
cp $4 cp 4
ret nz ret nz
ld a, [wXCoord] ld a, [wXCoord]
cp $9 cp 9
jr z, .asm_5c120 jr z, .asm_5c120
ld a, [wXCoord] ld a, [wXCoord]
cp $a cp 10
ret nz ret nz
.asm_5c120 .asm_5c120
xor a xor a
@ -41,17 +41,17 @@ Museum1F_TextPointers:
Museum1FText1: Museum1FText1:
text_asm text_asm
ld a, [wYCoord] ld a, [wYCoord]
cp $4 cp 4
jr nz, .asm_8774b jr nz, .asm_8774b
ld a, [wXCoord] ld a, [wXCoord]
cp $d cp 13
jp z, Museum1FScript_5c1f9 jp z, Museum1FScript_5c1f9
jr .asm_b8709 jr .asm_b8709
.asm_8774b .asm_8774b
cp $3 cp $3
jr nz, .asm_d49e7 jr nz, .asm_d49e7
ld a, [wXCoord] ld a, [wXCoord]
cp $c cp 12
jp z, Museum1FScript_5c1f9 jp z, Museum1FScript_5c1f9
.asm_d49e7 .asm_d49e7
CheckEvent EVENT_BOUGHT_MUSEUM_TICKET CheckEvent EVENT_BOUGHT_MUSEUM_TICKET

28
scripts/OaksLab.asm
View file

@ -152,7 +152,7 @@ OaksLabScript5:
OaksLabScript6: OaksLabScript6:
ld a, [wYCoord] ld a, [wYCoord]
cp $6 cp 6
ret nz ret nz
ld a, $5 ld a, $5
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -200,7 +200,7 @@ OaksLabScript8:
.Charmander .Charmander
ld de, .MiddleBallMovement1 ld de, .MiddleBallMovement1
ld a, [wYCoord] ld a, [wYCoord]
cp $4 ; is the player standing below the table? cp 4 ; is the player standing below the table?
jr z, .moveBlue jr z, .moveBlue
ld de, .MiddleBallMovement2 ld de, .MiddleBallMovement2
jr .moveBlue jr .moveBlue
@ -224,7 +224,7 @@ OaksLabScript8:
.Squirtle .Squirtle
ld de, .RightBallMovement1 ld de, .RightBallMovement1
ld a, [wYCoord] ld a, [wYCoord]
cp $4 ; is the player standing below the table? cp 4 ; is the player standing below the table?
jr z, .moveBlue jr z, .moveBlue
ld de, .RightBallMovement2 ld de, .RightBallMovement2
jr .moveBlue jr .moveBlue
@ -250,7 +250,7 @@ OaksLabScript8:
.Bulbasaur .Bulbasaur
ld de, .LeftBallMovement1 ld de, .LeftBallMovement1
ld a, [wXCoord] ld a, [wXCoord]
cp $9 ; is the player standing to the right of the table? cp 9 ; is the player standing to the right of the table?
jr nz, .moveBlue jr nz, .moveBlue
push hl push hl
ld a, $1 ld a, $1
@ -341,7 +341,7 @@ OaksLabScript9:
OaksLabScript10: OaksLabScript10:
ld a, [wYCoord] ld a, [wYCoord]
cp $6 cp 6
ret nz ret nz
ld a, $1 ld a, $1
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -447,7 +447,7 @@ OaksLabScript13:
ld de, .RivalExitMovement ld de, .RivalExitMovement
call MoveSprite call MoveSprite
ld a, [wXCoord] ld a, [wXCoord]
cp $4 cp 4
; move left or right depending on where the player is standing ; move left or right depending on where the player is standing
jr nz, .moveLeft jr nz, .moveLeft
ld a, NPC_MOVEMENT_RIGHT ld a, NPC_MOVEMENT_RIGHT
@ -489,7 +489,7 @@ OaksLabScript14:
cp $5 cp $5
jr nz, .turnPlayerDown jr nz, .turnPlayerDown
ld a, [wXCoord] ld a, [wXCoord]
cp $4 cp 4
jr nz, .turnPlayerLeft jr nz, .turnPlayerLeft
ld a, SPRITE_FACING_RIGHT ld a, SPRITE_FACING_RIGHT
ld [wSpritePlayerStateData1FacingDirection], a ld [wSpritePlayerStateData1FacingDirection], a
@ -673,30 +673,30 @@ OaksLabScript_RemoveParcel:
OaksLabScript_1d02b: OaksLabScript_1d02b:
ld a, $7c ld a, $7c
ldh [hSpriteScreenYCoord], a ldh [hSpriteScreenYCoord], a
ld a, $8 ld a, 8
ldh [hSpriteMapXCoord], a ldh [hSpriteMapXCoord], a
ld a, [wYCoord] ld a, [wYCoord]
cp $3 cp 3
jr nz, .asm_1d045 jr nz, .asm_1d045
ld a, $4 ld a, $4
ld [wNPCMovementDirections2Index], a ld [wNPCMovementDirections2Index], a
ld a, $30 ld a, $30
ld b, $b ld b, 11
jr .asm_1d068 jr .asm_1d068
.asm_1d045 .asm_1d045
cp $1 cp 1
jr nz, .asm_1d054 jr nz, .asm_1d054
ld a, $2 ld a, $2
ld [wNPCMovementDirections2Index], a ld [wNPCMovementDirections2Index], a
ld a, $30 ld a, $30
ld b, $9 ld b, 9
jr .asm_1d068 jr .asm_1d068
.asm_1d054 .asm_1d054
ld a, $3 ld a, $3
ld [wNPCMovementDirections2Index], a ld [wNPCMovementDirections2Index], a
ld b, $a ld b, 10
ld a, [wXCoord] ld a, [wXCoord]
cp $4 cp 4
jr nz, .asm_1d066 jr nz, .asm_1d066
ld a, $40 ld a, $40
jr .asm_1d068 jr .asm_1d068

8
scripts/PewterCity.asm
View file

@ -65,9 +65,9 @@ PewterCityScript1:
ldh [hSpriteScreenYCoord], a ldh [hSpriteScreenYCoord], a
ld a, $30 ld a, $30
ldh [hSpriteScreenXCoord], a ldh [hSpriteScreenXCoord], a
ld a, $c ld a, 12
ldh [hSpriteMapYCoord], a ldh [hSpriteMapYCoord], a
ld a, $11 ld a, 17
ldh [hSpriteMapXCoord], a ldh [hSpriteMapXCoord], a
ld a, $3 ld a, $3
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -133,9 +133,9 @@ PewterCityScript4:
ldh [hSpriteScreenYCoord], a ldh [hSpriteScreenYCoord], a
ld a, $40 ld a, $40
ldh [hSpriteScreenXCoord], a ldh [hSpriteScreenXCoord], a
ld a, $16 ld a, 22
ldh [hSpriteMapYCoord], a ldh [hSpriteMapYCoord], a
ld a, $10 ld a, 16
ldh [hSpriteMapXCoord], a ldh [hSpriteMapXCoord], a
ld a, $5 ld a, $5
ld [wSpriteIndex], a ld [wSpriteIndex], a

2
scripts/Route22Gate.asm
View file

@ -4,7 +4,7 @@ Route22Gate_Script:
ld a, [wRoute22GateCurScript] ld a, [wRoute22GateCurScript]
call CallFunctionInTable call CallFunctionInTable
ld a, [wYCoord] ld a, [wYCoord]
cp $4 cp 4
ld a, ROUTE_23 ld a, ROUTE_23
jr c, .asm_1e69a jr c, .asm_1e69a
ld a, ROUTE_22 ld a, ROUTE_22

4
scripts/SSAnne2F.asm
View file

@ -71,7 +71,7 @@ CoordsData_61411:
SSAnne2Script_61416: SSAnne2Script_61416:
ld a, [wXCoord] ld a, [wXCoord]
cp $25 cp 37
jr nz, .asm_61426 jr nz, .asm_61426
ld a, PLAYER_DIR_LEFT ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a
@ -134,7 +134,7 @@ SSAnne2Script2:
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
ld a, [wXCoord] ld a, [wXCoord]
cp $25 cp 37
jr nz, .asm_61497 jr nz, .asm_61497
ld de, MovementData_614b9 ld de, MovementData_614b9
jr .asm_6149a jr .asm_6149a

8
scripts/SeafoamIslandsB3F.asm
View file

@ -59,10 +59,10 @@ SeafoamIslands4Script0:
CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
ret z ret z
ld a, [wYCoord] ld a, [wYCoord]
cp $8 cp 8
ret nz ret nz
ld a, [wXCoord] ld a, [wXCoord]
cp $f cp 15
ret nz ret nz
ld hl, wSimulatedJoypadStatesEnd ld hl, wSimulatedJoypadStatesEnd
ld de, RLEMovement46632 ld de, RLEMovement46632
@ -94,9 +94,9 @@ SeafoamIslands4Script2:
CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
ret z ret z
ld a, [wXCoord] ld a, [wXCoord]
cp $12 cp 18
jr z, .asm_4665e jr z, .asm_4665e
cp $13 cp 19
ld a, $0 ld a, $0
jr nz, .asm_4667b jr nz, .asm_4667b
ld de, RLEData_4667f ld de, RLEData_4667f

8
scripts/ViridianCity.asm
View file

@ -24,10 +24,10 @@ ViridianCityScript_1900b:
ret ret
.gym_closed .gym_closed
ld a, [wYCoord] ld a, [wYCoord]
cp $8 cp 8
ret nz ret nz
ld a, [wXCoord] ld a, [wXCoord]
cp $20 cp 32
ret nz ret nz
ld a, $e ld a, $e
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
@ -43,10 +43,10 @@ ViridianCityScript_1903d:
CheckEvent EVENT_GOT_POKEDEX CheckEvent EVENT_GOT_POKEDEX
ret nz ret nz
ld a, [wYCoord] ld a, [wYCoord]
cp $9 cp 9
ret nz ret nz
ld a, [wXCoord] ld a, [wXCoord]
cp $13 cp 19
ret nz ret nz
ld a, $5 ld a, $5
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a