diff options
| -rwxr-xr-x | engine/evos_moves.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/elevator.asm | 22 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 7 | ||||
| -rw-r--r-- | home.asm | 4 | ||||
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/vcopy.asm | 2 | ||||
| -rw-r--r-- | scripts/safarizoneentrance-yellow.asm | 4 |
7 files changed, 23 insertions, 20 deletions
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 9a0f2d84..f8a4c234 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -145,7 +145,7 @@ Evolution_PartyMonLoop: ; loop over party mons call GetName push hl ld hl, IntoText - call Func_3c59 + call PrintText_NoCreatingTextBox ld a, (SFX_02_3b - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent call WaitForSoundToFinish diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index f5b1d14c..63e9d710 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -1,17 +1,16 @@ ShakeElevator: ; 7bf15 (1e:7f15) - ld de, $ffe0 - call Func_7bf64 - ld de, $240 - call Func_7bf64 + ld de, -$20 + call ShakeElevatorRedrawRow + ld de, SCREEN_HEIGHT * $20 + call ShakeElevatorRedrawRow call Delay3 ld a, $ff call PlaySound ld a, [hSCY] ld d, a ld e, $1 - ; number of times to play collision sfx ld b, 100 -.asm_7bf30 +.shakeLoop ; scroll the BG up and down and play a sound effect ld a, e xor $fe ld e, a @@ -25,7 +24,7 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld c, 2 call DelayFrames dec b - jr nz, .asm_7bf30 + jr nz, .shakeLoop ld a, d ld [hSCY], a ld a, $ff @@ -33,14 +32,17 @@ ShakeElevator: ; 7bf15 (1e:7f15) ld c, BANK(SFX_02_5f) ld a, (SFX_02_5f - SFX_Headers_02) / 3 call PlayMusic -.asm_7bf57 +.musicLoop ld a, [wc02a] cp $b9 - jr z, .asm_7bf57 + jr z, .musicLoop call UpdateSprites jp PlayDefaultMusic -Func_7bf64: ; 7bf64 (1e:7f64) +ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64) +; This function is used to redraw certain portions of the screen, but it does +; not appear to ever result in any visible effect, so this function seems to +; be pointless. ld hl, wMapViewVRAMPointer + 1 ld a, [hld] push af diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index d00bbc05..303449a1 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -14,7 +14,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld [rOBP1], a ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData - call Func_70503 + call CopyHealingMachineOAM ld a, $4 ld [wMusicHeaderPointer], a ld a, $ff @@ -27,7 +27,7 @@ AnimateHealingMachine: ; 70433 (1c:4433) ld a, [wPartyCount] ld b, a .asm_7046e - call Func_70503 + call CopyHealingMachineOAM ld a, (SFX_02_4a - SFX_Headers_02) / 3 call PlaySound ld c, 30 @@ -87,7 +87,8 @@ FlashSprite8Times: ; 704f3 (1c:44f3) jr nz, .loop ret -Func_70503: ; 70503 (1c:4503) +CopyHealingMachineOAM: ; 70503 (1c:4503) +; copy one OAM entry and advance the pointers ld a, [de] inc de ld [hli], a @@ -1140,7 +1140,7 @@ DisplayTextID:: ; 2920 (0:2920) callab CableClubNPC jr AfterDisplayingTextID .notSpecialCase - call Func_3c59 ; display the text + call PrintText_NoCreatingTextBox ; display the text ld a,[wDoNotWaitForButtonPressAfterDisplayingText] and a jr nz,HoldTextDisplayOpen @@ -4206,7 +4206,7 @@ PrintText:: ; 3c49 (0:3c49) call UpdateSprites call Delay3 pop hl -Func_3c59:: ; 3c59 (0:3c59) +PrintText_NoCreatingTextBox:: ; 3c59 (0:3c59) coord bc, 1, 14 jp TextCommandProcessor diff --git a/home/overworld.asm b/home/overworld.asm index 0485335a..97c46b0f 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1705,7 +1705,7 @@ ScheduleNorthRowRedraw:: ; 0e91 (0:0e91) CopyToScreenEdgeTiles:: ; 0ea6 (0:0ea6) ld de,wScreenEdgeTiles - ld c,2 * 20 + ld c,2 * SCREEN_WIDTH .loop ld a,[hli] ld [de],a diff --git a/home/vcopy.asm b/home/vcopy.asm index e90accb5..8de00e38 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -51,7 +51,7 @@ RedrawExposedScreenEdge:: ; 1d01 (0:1d01) ld e,a ld a,[H_SCREENEDGEREDRAWADDR + 1] ld d,a - ld c,18 ; screen height + ld c,SCREEN_HEIGHT .loop1 ld a,[hli] ld [de],a diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm index 294c5993..74ecaa54 100644 --- a/scripts/safarizoneentrance-yellow.asm +++ b/scripts/safarizoneentrance-yellow.asm @@ -155,8 +155,8 @@ SafariZoneEntranceAutoWalk: ld bc,3 call FillMemory ld hl,.OhAllRightText - call Func_3c59 - ld a,$13 + call PrintText_NoCreatingTextBox + ld a,MONEY_BOX ld a,[$d124] call DisplayTextBoxID ld hl,.CantGive30BallsText |