diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/BillsHouse.asm | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanCity.asm | 4 | ||||
| -rwxr-xr-x | scripts/CinnabarIsland.asm | 4 | ||||
| -rwxr-xr-x | scripts/FightingDojo.asm | 4 | ||||
| -rwxr-xr-x | scripts/GameCorner.asm | 4 | ||||
| -rwxr-xr-x | scripts/MtMoonB2F.asm | 4 | ||||
| -rwxr-xr-x | scripts/Museum1F.asm | 12 | ||||
| -rwxr-xr-x | scripts/OaksLab.asm | 28 | ||||
| -rwxr-xr-x | scripts/PewterCity.asm | 8 | ||||
| -rwxr-xr-x | scripts/Route22Gate.asm | 2 | ||||
| -rwxr-xr-x | scripts/SSAnne2F.asm | 4 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB3F.asm | 8 | ||||
| -rwxr-xr-x | scripts/ViridianCity.asm | 8 |
13 files changed, 47 insertions, 47 deletions
diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 75594801..2085f417 100755 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -69,9 +69,9 @@ BillsHouseScript3: ldh [hSpriteScreenYCoord], a ld a, $40 ldh [hSpriteScreenXCoord], a - ld a, $6 + ld a, 6 ldh [hSpriteMapYCoord], a - ld a, $5 + ld a, 5 ldh [hSpriteMapXCoord], a call SetSpritePosition1 ld a, HS_BILL_1 diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index eef63536..5ac75075 100755 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -80,7 +80,7 @@ ENDC ld a, $f0 ld [wJoyIgnore], a ld a, [wXCoord] - cp $14 + cp 20 jr z, .asm_19535 ld a, $1 ldh [hSpriteIndex], a @@ -183,7 +183,7 @@ CeruleanCityScript2: ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wXCoord] - cp $14 + cp 20 jr nz, .asm_195f0 ld de, CeruleanCityMovement4 jr .asm_195f3 diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm index f74890e8..a1b20cd3 100755 --- a/scripts/CinnabarIsland.asm +++ b/scripts/CinnabarIsland.asm @@ -17,10 +17,10 @@ CinnabarIslandScript0: call IsItemInBag ret nz ld a, [wYCoord] - cp $4 + cp 4 ret nz ld a, [wXCoord] - cp $12 + cp 18 ret nz ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index 365e23e0..e5d0a0a7 100755 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -33,10 +33,10 @@ FightingDojoScript1: ldh [hJoyHeld], a ld [wcf0d], a ld a, [wYCoord] - cp $3 + cp 3 ret nz ld a, [wXCoord] - cp $4 + cp 4 ret nz ld a, $1 ld [wcf0d], a diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index c933fd63..94c35883 100755 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -64,13 +64,13 @@ CeladonGameCornerScript1: call SetSpriteMovementBytesToFF ld de, MovementData_48c5a ld a, [wYCoord] - cp $6 + cp 6 jr nz, .asm_48c43 ld de, MovementData_48c63 jr .asm_48c4d .asm_48c43 ld a, [wXCoord] - cp $8 + cp 8 jr nz, .asm_48c4d ld de, MovementData_48c63 .asm_48c4d diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index addfb2c2..9faf038a 100755 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -56,10 +56,10 @@ MtMoon3Script0: CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jp nz, MtMoon3Script_49d91 ld a, [wYCoord] - cp $8 + cp 8 jp nz, MtMoon3Script_49d91 ld a, [wXCoord] - cp $d + cp 13 jp nz, MtMoon3Script_49d91 xor a ldh [hJoyHeld], a diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm index b7240154..ee3473ff 100755 --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm @@ -13,13 +13,13 @@ Museum1F_ScriptPointers: Museum1FScript0: ld a, [wYCoord] - cp $4 + cp 4 ret nz ld a, [wXCoord] - cp $9 + cp 9 jr z, .asm_5c120 ld a, [wXCoord] - cp $a + cp 10 ret nz .asm_5c120 xor a @@ -41,17 +41,17 @@ Museum1F_TextPointers: Museum1FText1: text_asm ld a, [wYCoord] - cp $4 + cp 4 jr nz, .asm_8774b ld a, [wXCoord] - cp $d + cp 13 jp z, Museum1FScript_5c1f9 jr .asm_b8709 .asm_8774b cp $3 jr nz, .asm_d49e7 ld a, [wXCoord] - cp $c + cp 12 jp z, Museum1FScript_5c1f9 .asm_d49e7 CheckEvent EVENT_BOUGHT_MUSEUM_TICKET diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 9d60cc19..0eab35aa 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -152,7 +152,7 @@ OaksLabScript5: OaksLabScript6: ld a, [wYCoord] - cp $6 + cp 6 ret nz ld a, $5 ldh [hSpriteIndex], a @@ -200,7 +200,7 @@ OaksLabScript8: .Charmander ld de, .MiddleBallMovement1 ld a, [wYCoord] - cp $4 ; is the player standing below the table? + cp 4 ; is the player standing below the table? jr z, .moveBlue ld de, .MiddleBallMovement2 jr .moveBlue @@ -224,7 +224,7 @@ OaksLabScript8: .Squirtle ld de, .RightBallMovement1 ld a, [wYCoord] - cp $4 ; is the player standing below the table? + cp 4 ; is the player standing below the table? jr z, .moveBlue ld de, .RightBallMovement2 jr .moveBlue @@ -250,7 +250,7 @@ OaksLabScript8: .Bulbasaur ld de, .LeftBallMovement1 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 push hl ld a, $1 @@ -341,7 +341,7 @@ OaksLabScript9: OaksLabScript10: ld a, [wYCoord] - cp $6 + cp 6 ret nz ld a, $1 ldh [hSpriteIndex], a @@ -447,7 +447,7 @@ OaksLabScript13: ld de, .RivalExitMovement call MoveSprite ld a, [wXCoord] - cp $4 + cp 4 ; move left or right depending on where the player is standing jr nz, .moveLeft ld a, NPC_MOVEMENT_RIGHT @@ -489,7 +489,7 @@ OaksLabScript14: cp $5 jr nz, .turnPlayerDown ld a, [wXCoord] - cp $4 + cp 4 jr nz, .turnPlayerLeft ld a, SPRITE_FACING_RIGHT ld [wSpritePlayerStateData1FacingDirection], a @@ -673,30 +673,30 @@ OaksLabScript_RemoveParcel: OaksLabScript_1d02b: ld a, $7c ldh [hSpriteScreenYCoord], a - ld a, $8 + ld a, 8 ldh [hSpriteMapXCoord], a ld a, [wYCoord] - cp $3 + cp 3 jr nz, .asm_1d045 ld a, $4 ld [wNPCMovementDirections2Index], a ld a, $30 - ld b, $b + ld b, 11 jr .asm_1d068 .asm_1d045 - cp $1 + cp 1 jr nz, .asm_1d054 ld a, $2 ld [wNPCMovementDirections2Index], a ld a, $30 - ld b, $9 + ld b, 9 jr .asm_1d068 .asm_1d054 ld a, $3 ld [wNPCMovementDirections2Index], a - ld b, $a + ld b, 10 ld a, [wXCoord] - cp $4 + cp 4 jr nz, .asm_1d066 ld a, $40 jr .asm_1d068 diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm index f44d2de5..221834de 100755 --- a/scripts/PewterCity.asm +++ b/scripts/PewterCity.asm @@ -65,9 +65,9 @@ PewterCityScript1: ldh [hSpriteScreenYCoord], a ld a, $30 ldh [hSpriteScreenXCoord], a - ld a, $c + ld a, 12 ldh [hSpriteMapYCoord], a - ld a, $11 + ld a, 17 ldh [hSpriteMapXCoord], a ld a, $3 ld [wSpriteIndex], a @@ -133,9 +133,9 @@ PewterCityScript4: ldh [hSpriteScreenYCoord], a ld a, $40 ldh [hSpriteScreenXCoord], a - ld a, $16 + ld a, 22 ldh [hSpriteMapYCoord], a - ld a, $10 + ld a, 16 ldh [hSpriteMapXCoord], a ld a, $5 ld [wSpriteIndex], a diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index 78143481..5acc343c 100755 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -4,7 +4,7 @@ Route22Gate_Script: ld a, [wRoute22GateCurScript] call CallFunctionInTable ld a, [wYCoord] - cp $4 + cp 4 ld a, ROUTE_23 jr c, .asm_1e69a ld a, ROUTE_22 diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index b9f15b56..d15ec180 100755 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -71,7 +71,7 @@ CoordsData_61411: SSAnne2Script_61416: ld a, [wXCoord] - cp $25 + cp 37 jr nz, .asm_61426 ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a @@ -134,7 +134,7 @@ SSAnne2Script2: ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wXCoord] - cp $25 + cp 37 jr nz, .asm_61497 ld de, MovementData_614b9 jr .asm_6149a diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm index d735f824..9d1093e5 100755 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -59,10 +59,10 @@ SeafoamIslands4Script0: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wYCoord] - cp $8 + cp 8 ret nz ld a, [wXCoord] - cp $f + cp 15 ret nz ld hl, wSimulatedJoypadStatesEnd ld de, RLEMovement46632 @@ -94,9 +94,9 @@ SeafoamIslands4Script2: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wXCoord] - cp $12 + cp 18 jr z, .asm_4665e - cp $13 + cp 19 ld a, $0 jr nz, .asm_4667b ld de, RLEData_4667f diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 543ffa97..96e58a19 100755 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -24,10 +24,10 @@ ViridianCityScript_1900b: ret .gym_closed ld a, [wYCoord] - cp $8 + cp 8 ret nz ld a, [wXCoord] - cp $20 + cp 32 ret nz ld a, $e ldh [hSpriteIndexOrTextID], a @@ -43,10 +43,10 @@ ViridianCityScript_1903d: CheckEvent EVENT_GOT_POKEDEX ret nz ld a, [wYCoord] - cp $9 + cp 9 ret nz ld a, [wXCoord] - cp $13 + cp 19 ret nz ld a, $5 ldh [hSpriteIndexOrTextID], a |