diff options
| author | Sanqui <gsanky@gmail.com> | 2016-08-08 16:01:49 +0200 |
|---|---|---|
| committer | Sanqui <gsanky@gmail.com> | 2016-08-08 16:01:49 +0200 |
| commit | e80447dd54b7c73c52c694f45bd94b2ecc0fbf48 (patch) | |
| tree | 2c7afec8a3e12ebe84f221ca27b47bb17a9c1570 | |
| parent | 33978fefdff9f9bf0b64dfa79566695177dac6a1 (diff) | |
Better names for a few Pikachu's Beach routines
| -rwxr-xr-x | engine/surfing_minigame.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm index 38e9ec45..4ac9f9e8 100755 --- a/engine/surfing_minigame.asm +++ b/engine/surfing_minigame.asm @@ -1003,11 +1003,11 @@ SurfingMinigame_TileInteraction: jr .action_0 .action_1 - call Subtract128FromwSurfingMinigamePikachuSpeed + call SufingMinigame_ReduceSpeedBy128 jr .action_3 .action_2 - call Subtract64FromwSurfingMinigamePikachuSpeed + call SufingMinigame_ReduceSpeedBy64 .action_3 xor a ld [wChannelSoundIDs + CH7], a @@ -1039,7 +1039,7 @@ SurfingMinigame_SpeedUpPikachu: ld [wSurfingMinigamePikachuSpeed], a ret -Subtract64FromwSurfingMinigamePikachuSpeed: +SufingMinigame_ReduceSpeedBy64: ld a, [wSurfingMinigamePikachuSpeed + 1] and a jr nz, .go @@ -1063,7 +1063,7 @@ Subtract64FromwSurfingMinigamePikachuSpeed: ld [wSurfingMinigamePikachuSpeed], a ret -Subtract128FromwSurfingMinigamePikachuSpeed: +SufingMinigame_ReduceSpeedBy128: ld a, [wSurfingMinigamePikachuSpeed + 1] and a jr nz, .go @@ -1097,7 +1097,7 @@ Func_f871e: ld a, [wSurfingMinigameBGMapReadBuffer] cp $14 jr nz, .asm_f8740 - call Func_f87a8 + call SufingMinigame_GetSpeedDividedBy32 cp $a jr c, .asm_f8740 ld [wc5ec], a @@ -1180,7 +1180,7 @@ Func_f8778: ld [wc5df], a ret -Func_f87a8: +SufingMinigame_GetSpeedDividedBy32: ld a, [wSurfingMinigamePikachuSpeed] ld l, a ld a, [wSurfingMinigamePikachuSpeed + 1] |