diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 8 | ||||
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 6 | ||||
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 5 | ||||
| -rw-r--r-- | engine/movie/intro.asm | 12 | ||||
| -rw-r--r-- | engine/printer/print_party.asm | 5 | ||||
| -rw-r--r-- | engine/tilesets/tileset_anims.asm | 36 |
6 files changed, 36 insertions, 36 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8d87e52b0..ff94859f3 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -158,7 +158,7 @@ WildFled_EnemyFled_LinkBattleCanceled: BattleTurn: .loop - call Stubbed_Function3c1bf + call Stubbed_Increments5_a89a call CheckContestBattleOver jp c, .quit @@ -228,11 +228,11 @@ BattleTurn: .quit ret -Stubbed_Function3c1bf: +Stubbed_Increments5_a89a: ret - ld a, BANK(s5_a89b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s5_a89a) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call OpenSRAM - ld hl, s5_a89b ; address of MBC30 bank + ld hl, s5_a89a + 1 ; address of MBC30 bank inc [hl] jr nz, .finish dec hl diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 2c8ff64dd..5f41d2314 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -26,11 +26,11 @@ _PlayBattleAnim: ld c, 1 ldh a, [rKEY1] - bit 7, a - jr nz, .asm_cc0ff + bit 7, a ; check CGB double speed mode + jr nz, .got_speed ld c, 3 -.asm_cc0ff +.got_speed ld hl, hVBlank ld a, [hl] push af diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 5382fa64b..5d1ca4844 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -5,6 +5,7 @@ BattleTowerRoomMenu: ret Function1700ba: +; special call InitBattleTowerChallengeRAM farcall Function11811a ret @@ -136,7 +137,7 @@ Function170139: ; unreferenced ld l, a ld a, [wcd4c] ld h, a - ld bc, $0006 + ld bc, 6 call CopyBytes ld a, l ld [wcd4b], a @@ -156,7 +157,7 @@ Function170139: ; unreferenced ld a, BANK(s5_a894) ; aka BANK(s5_a948) call OpenSRAM ld hl, s5_a894 - ld bc, NAME_LENGTH_JAPANESE + ld bc, 6 call CopyBytes ld hl, wc608 ld de, s5_a948 diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index f93c10c8e..2fcf20da6 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -693,30 +693,30 @@ IntroScene14: jr z, .done cp $60 jr z, .jump - jr nc, .asm_e4e1a + jr nc, .run_after_jump cp $40 - jr nc, .asm_e4e33 + jr nc, .run ret .jump ld de, SFX_INTRO_SUICUNE_4 call PlaySFX -.asm_e4e1a +.run_after_jump ld a, $1 ld [wIntroSceneTimer], a ld a, [wGlobalAnimXOffset] cp $88 - jr c, .asm_e4e2c + jr c, .disappear sub $8 ld [wGlobalAnimXOffset], a ret -.asm_e4e2c +.disappear farcall DeinitializeAllSprites ret -.asm_e4e33 +.run ld a, [wGlobalAnimXOffset] sub $2 ld [wGlobalAnimXOffset], a diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index c29142876..190249b6e 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -217,10 +217,9 @@ PrintPartyMonPage1: ld [hl], a ld a, [wCurPartySpecies] cp UNOWN - jr z, .asm_1dc469 + jr z, .got_alignment inc [hl] - -.asm_1dc469 +.got_alignment hlcoord 0, 0 call _PrepMonFrontpic call WaitBGMap diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 8ed05c625..c29ffdb50 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -477,11 +477,11 @@ ForestTreeLeftAnimation: ; Only during the Celebi event. ld a, [wCelebiEvent] bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a - jr nz, .asm_fc46c + jr nz, .do_animation ld hl, ForestTreeLeftFrames - jr .asm_fc47d + jr .got_frames -.asm_fc46c +.do_animation ld a, [wTileAnimationTimer] call GetForestTreeFrame add a @@ -493,7 +493,7 @@ ForestTreeLeftAnimation: adc HIGH(ForestTreeLeftFrames) ld h, a -.asm_fc47d +.got_frames ld sp, hl ld hl, vTiles2 tile $0c jp WriteTile @@ -514,11 +514,11 @@ ForestTreeRightAnimation: ; Only during the Celebi event. ld a, [wCelebiEvent] bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a - jr nz, .asm_fc4d4 + jr nz, .do_animation ld hl, ForestTreeRightFrames - jr .asm_fc4eb + jr .got_frames -.asm_fc4d4 +.do_animation ld a, [wTileAnimationTimer] call GetForestTreeFrame add a @@ -534,7 +534,7 @@ ForestTreeRightAnimation: add hl, bc pop bc -.asm_fc4eb +.got_frames ld sp, hl ld hl, vTiles2 tile $0f jp WriteTile @@ -547,14 +547,14 @@ ForestTreeLeftAnimation2: ; Only during the Celebi event. ld a, [wCelebiEvent] bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a - jr nz, .asm_fc502 + jr nz, .do_animation ld hl, ForestTreeLeftFrames - jr .asm_fc515 + jr .got_frames -.asm_fc502 +.do_animation ld a, [wTileAnimationTimer] call GetForestTreeFrame - xor 2 + xor %10 add a add a add a @@ -564,7 +564,7 @@ ForestTreeLeftAnimation2: adc HIGH(ForestTreeLeftFrames) ld h, a -.asm_fc515 +.got_frames ld sp, hl ld hl, vTiles2 tile $0c jp WriteTile @@ -577,14 +577,14 @@ ForestTreeRightAnimation2: ; Only during the Celebi event. ld a, [wCelebiEvent] bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a - jr nz, .asm_fc52c + jr nz, .do_animation ld hl, ForestTreeRightFrames - jr .asm_fc545 + jr .got_frames -.asm_fc52c +.do_animation ld a, [wTileAnimationTimer] call GetForestTreeFrame - xor 2 + xor %10 add a add a add a @@ -598,7 +598,7 @@ ForestTreeRightAnimation2: add hl, bc pop bc -.asm_fc545 +.got_frames ld sp, hl ld hl, vTiles2 tile $0f jp WriteTile |