diff options
| author | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
|---|---|---|
| committer | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
| commit | 26a342b104e48bede16b9e2324c2f8f57df5bd50 (patch) | |
| tree | 47dc8ca18fa2bbc8aee0f52c99d710d50ef45bd6 /scripts/GameCorner.asm | |
| parent | .calculateHPBarCoords incorrectly referenced OAM (diff) | |
| download | pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.gz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.xz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.zip | |
Identify more map script labels
Diffstat (limited to 'scripts/GameCorner.asm')
| -rw-r--r-- | scripts/GameCorner.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index 3944a2f9..68cdc333 100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -14,9 +14,9 @@ GameCornerSelectLuckySlotMachine: call Random ldh a, [hRandomAdd] cp $7 - jr nc, .asm_48be2 + jr nc, .not_max ld a, $8 -.asm_48be2 +.not_max srl a srl a srl a @@ -63,18 +63,18 @@ GameCornerRocketBattleScript: ld a, GAMECORNER_ROCKET ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld de, GameCornerMovement_Grunt_WalkAroundPlayer + ld de, GameCornerMovement_Rocket_WalkAroundPlayer ld a, [wYCoord] cp 6 - jr nz, .asm_48c43 - ld de, GameCornerMovement_Grunt_WalkDirect - jr .asm_48c4d -.asm_48c43 + jr nz, .not_direct_movement + ld de, GameCornerMovement_Rocket_WalkDirect + jr .got_rocket_movement +.not_direct_movement ld a, [wXCoord] cp 8 - jr nz, .asm_48c4d - ld de, GameCornerMovement_Grunt_WalkDirect -.asm_48c4d + jr nz, .got_rocket_movement + ld de, GameCornerMovement_Rocket_WalkDirect +.got_rocket_movement ld a, GAMECORNER_ROCKET ldh [hSpriteIndex], a call MoveSprite @@ -82,7 +82,7 @@ GameCornerRocketBattleScript: ld [wGameCornerCurScript], a ret -GameCornerMovement_Grunt_WalkAroundPlayer: +GameCornerMovement_Rocket_WalkAroundPlayer: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -93,7 +93,7 @@ GameCornerMovement_Grunt_WalkAroundPlayer: db NPC_MOVEMENT_RIGHT db -1 ; end -GameCornerMovement_Grunt_WalkDirect: +GameCornerMovement_Rocket_WalkDirect: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT |