diff options
| -rwxr-xr-x | engine/overworld/map_sprites.asm | 8 | ||||
| -rwxr-xr-x | scripts/MtMoonB2F.asm | 16 | ||||
| -rwxr-xr-x | scripts/OaksLab.asm | 8 | ||||
| -rwxr-xr-x | scripts/PalletTown.asm | 26 | ||||
| -rwxr-xr-x | scripts/PokemonFanClub.asm | 4 | ||||
| -rwxr-xr-x | scripts/PokemonTower7F.asm | 20 | ||||
| -rwxr-xr-x | scripts/RocketHideoutB4F.asm | 20 | ||||
| -rwxr-xr-x | scripts/Route22Gate.asm | 2 | ||||
| -rwxr-xr-x | scripts/SilphCo11F.asm | 20 |
9 files changed, 62 insertions, 62 deletions
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index ba412ab2..c0fb4863 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -4,10 +4,10 @@ ; This is also called after displaying text because loading ; text tile patterns overwrites half of the sprite tile pattern data. ; Note on notation: -; $C1X* and $C2X* are used to denote wSpriteStateData1-wSpriteStateData1 + $ff and wSpriteStateData2 + $00-wSpriteStateData2 + $ff sprite slot -; fields, respectively, within loops. The X is the loop index. -; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* -; denote fields of the sprite slots iterated over in the inner loop. +; x#SPRITESTATEDATA1_* and x#SPRITESTATEDATA2_* are used to denote wSpriteStateData1 and +; wSpriteStateData2 sprite slot, respectively, within loops. The X is the loop index. +; If there is an inner loop, Y is the inner loop index, i.e. y#SPRITESTATEDATA1_* and +; y#SPRITESTATEDATA2_* denote fields of the sprite slots iterated over in the inner loop. _InitMapSprites:: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index b2bed1a4..069fc1b3 100755 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -289,9 +289,9 @@ MtMoon3Script7: ret nz MtMoon3Script8: ld a, $2 - ld [wSpriteStateData1 + 2 * $10 + 1], a + ld [wSprite02StateData1MovementStatus], a ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 2 * $10 + 9], a + ld [wSprite02StateData1FacingDirection], a MtMoon3Script9: ld a, $6 ldh [hSpriteIndex], a @@ -311,9 +311,9 @@ MtMoon3Script10: ret nz MtMoon3Script11: ld a, $2 - ld [wSpriteStateData1 + 6 * $10 + 1], a + ld [wSprite06StateData1MovementStatus], a ld a, SPRITE_FACING_LEFT - ld [wSpriteStateData1 + 6 * $10 + 9], a + ld [wSprite06StateData1FacingDirection], a call Delay3 ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a @@ -346,11 +346,11 @@ MtMoon3Script13: cp $ff jp z, MtMoon3Script_49cd7 ld a, $2 - ld [wSpriteStateData1 + 2 * $10 + 1], a - ld [wSpriteStateData1 + 6 * $10 + 1], a + ld [wSprite02StateData1MovementStatus], a + ld [wSprite06StateData1MovementStatus], a xor a - ld [wSpriteStateData1 + 2 * $10 + 9], a - ld [wSpriteStateData1 + 6 * $10 + 9], a + ld [wSprite02StateData1FacingDirection], a + ld [wSprite06StateData1FacingDirection], a ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $1 diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index a369abed..0d995a66 100755 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -141,9 +141,9 @@ OaksLabScript5: call DisplayTextID call Delay3 ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a ld a, $f ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -387,9 +387,9 @@ OaksLabScript14: ld [wSpriteIndex], a call SetSpritePosition1 ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a xor a - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a predef HealParty SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB ld a, $f diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index db2de0d1..33d00c07 100755 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -60,20 +60,20 @@ PalletTownScript1: call DisplayTextID ld a, $FF ld [wJoyIgnore], a - ld hl, wSpriteStateData2 + 1 * $10 + 4 - ld a, $8 - ld [hli], a - ld a, $e - ld [hl], a + ld hl, wSprite01StateData2MapY + ld a, 8 + ld [hli], a ; SPRITESTATEDATA2_MAPY + ld a, 14 + ld [hl], a ; SPRITESTATEDATA2_MAPX ld a, HS_PALLET_TOWN_OAK ld [wMissableObjectIndex], a predef ShowObject ; trigger the next script ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a ld a, 2 ld [wPalletTownCurScript], a ret @@ -110,9 +110,9 @@ PalletTownScript3: ld a, 1 ld [wcf0d], a ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a ld a, 1 ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -120,13 +120,13 @@ PalletTownScript3: ld a, $FF ld [wJoyIgnore], a ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a CheckEvent EVENT_PLAYER_AT_RIGHT_EXIT_TO_PALLET_TOWN ld a, SPRITE_FACING_RIGHT jr z, .asm_18f01 ld a, SPRITE_FACING_LEFT .asm_18f01 - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a ; trigger the next script ld a, 4 @@ -158,9 +158,9 @@ PalletTownScript5: ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a ld a, $8 ldh [hSpriteIndexOrTextID], a call DisplayTextID diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm index c7990f19..e8e68a7f 100755 --- a/scripts/PokemonFanClub.asm +++ b/scripts/PokemonFanClub.asm @@ -52,9 +52,9 @@ FanClubScript_59a44: ld hl, PikachuMovementScript_59a8c call ApplyPikachuMovementData ld a, $2 - ld [wSpriteStateData1 + 3 * $10 + 1], a ; Seel + ld [wSprite03StateData1MovementStatus], a ; Seel xor a ; SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 3 * $10 + 9], a + ld [wSprite03StateData1FacingDirection], a callfar InitializePikachuTextID call DisablePikachuFollowingPlayer ret diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index 75e67a72..ed128b3d 100755 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -98,14 +98,14 @@ PokemonTower7Script2: ret nz PokemonTower7Script3: ld a, $0 - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 jr z, .asm_60dba ld a, $c - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a .asm_60dba ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a PokemonTower7Script4: ld de, PokemonTower7MovementData_60d7a CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 @@ -128,13 +128,13 @@ PokemonTower7Script5: ret nz PokemonTower7Script6: ld a, $2 - ld [wSpriteStateData1 + $2 * $10 + $1], a + ld [wSprite02StateData1MovementStatus], a ld a, $8 - ld [wSpriteStateData1 + $2 * $10 + $9], a + ld [wSprite02StateData1FacingDirection], a CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 jr z, .asm_60dff ld a, $0 - ld [wSpriteStateData1 + $2 * $10 + $9], a + ld [wSprite02StateData1FacingDirection], a .asm_60dff call Delay3 ld a, $FF ^ (A_BUTTON | B_BUTTON) @@ -167,11 +167,11 @@ PokemonTower7Script8: cp $ff jp z, PokemonTower7Script_60d01 ld a, $2 - ld [wSpriteStateData1 + 1 * $10 + 1], a - ld [wSpriteStateData1 + 2 * $10 + 1], a + ld [wSprite01StateData1MovementStatus], a + ld [wSprite02StateData1MovementStatus], a xor a - ld [wSpriteStateData1 + 1 * $10 + 9], a - ld [wSpriteStateData1 + 2 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a + ld [wSprite02StateData1FacingDirection], a ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a ld a, $1 diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index 564adc2a..663d9345 100755 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -148,13 +148,13 @@ RocketHideout4Script5: ret nz RocketHideout4Script6: ld a, $2 - ld [wSpriteStateData1 + 2 * $10 + 1], a + ld [wSprite02StateData1MovementStatus], a ld a, SPRITE_FACING_LEFT - ld [wSpriteStateData1 + 2 * $10 + 9], a + ld [wSprite02StateData1FacingDirection], a CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 jr z, .asm_4564a ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 2 * $10 + 9], a + ld [wSprite02StateData1FacingDirection], a .asm_4564a call Delay3 ld a, $fc @@ -184,13 +184,13 @@ RocketHideout4Script8: ld [wJoyIgnore], a RocketHideout4Script9: ld a, $2 - ld [wSpriteStateData1 + 3 * $10 + 1], a + ld [wSprite03StateData1MovementStatus], a ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 3 * $10 + 9], a + ld [wSprite03StateData1FacingDirection], a CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 jr z, .asm_45697 ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + 3 * $10 + 9], a + ld [wSprite03StateData1FacingDirection], a .asm_45697 call Delay3 ld a, $c @@ -222,11 +222,11 @@ RocketHideout4Script11: cp $ff jp z, RocketHideout4Script_45510 ld a, $2 - ld [wSpriteStateData1 + 2 * $10 + 1], a - ld [wSpriteStateData1 + 3 * $10 + 1], a + ld [wSprite02StateData1MovementStatus], a + ld [wSprite03StateData1MovementStatus], a xor a - ld [wSpriteStateData1 + 2 * $10 + 9], a - ld [wSpriteStateData1 + 3 * $10 + 9], a + ld [wSprite02StateData1FacingDirection], a + ld [wSprite03StateData1FacingDirection], a ld a, $fc ld [wJoyIgnore], a ld a, $1 diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index e9dab015..9711549f 100755 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -24,7 +24,7 @@ Route22GateScript0: xor a ldh [hJoyHeld], a ld a, SPRITE_FACING_LEFT - ld [wSpriteStateData1 + 1 * $10 + 9], a + ld [wSprite01StateData1FacingDirection], a ld a, $1 ldh [hSpriteIndexOrTextID], a call DisplayTextID diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 113ceecc..725a5ab3 100755 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -141,9 +141,9 @@ MovementData_62216: SilphCo11Script_621ff: ld [wPlayerMovingDirection], a ld a, b - ld [wSpriteStateData1 + 3 * $10 + 9], a + ld [wSprite03StateData1FacingDirection], a ld a, $2 - ld [wSpriteStateData1 + 3 * $10 + 1], a + ld [wSprite03StateData1MovementStatus], a ret SilphCo11Script3: @@ -324,8 +324,8 @@ SilphCo11Script6: ret nz SilphCo11Script7: ld a, $2 - ld [wSpriteStateData1 + 4 * $10 + 1], a - ld hl, wSpriteStateData1 + 4 * $10 + 9 + ld [wSprite04StateData1MovementStatus], a + ld hl, wSprite04StateData1FacingDirection ld [hl], SPRITE_FACING_RIGHT CheckEitherEventSet EVENT_780, EVENT_781 and a @@ -364,8 +364,8 @@ SilphCo11Script9: ld [wJoyIgnore], a SilphCo11Script10: ld a, $2 - ld [wSpriteStateData1 + 6 * $10 + 1], a - ld hl, wSpriteStateData1 + 6 * $10 + 9 + ld [wSprite06StateData1MovementStatus], a + ld hl, wSprite06StateData1FacingDirection ld [hl], SPRITE_FACING_UP CheckEitherEventSet EVENT_780, EVENT_781 and a @@ -401,11 +401,11 @@ SilphCo11Script12: cp $ff jp z, SilphCo11Script_62185 ld a, $2 - ld [wSpriteStateData1 + 4 * $10 + 1], a - ld [wSpriteStateData1 + 6 * $10 + 1], a + ld [wSprite04StateData1MovementStatus], a + ld [wSprite06StateData1MovementStatus], a xor a - ld [wSpriteStateData1 + 4 * $10 + 9], a - ld [wSpriteStateData1 + 6 * $10 + 9], a + ld [wSprite04StateData1FacingDirection], a + ld [wSprite06StateData1FacingDirection], a ld a, $fc ld [wJoyIgnore], a ld a, $1 |