diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rwxr-xr-x | engine/player_movement.asm | 20 | ||||
| -rwxr-xr-x | engine/time_capsule/conversion.asm | 4 | ||||
| -rwxr-xr-x | engine/tmhm2.asm | 10 |
4 files changed, 18 insertions, 18 deletions
diff --git a/engine/link.asm b/engine/link.asm index b101c7349..e425ce4d8 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -427,7 +427,7 @@ Gen2ToGen2LinkComms: ; 28177 or $3 ld [hl], a ld hl, OTPlayerName - ld de, OTName + ld de, OTClassName ld bc, NAME_LENGTH call CopyBytes call ReturnToMapFromSubmenu diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 0820bd11e..4bc4c483e 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -136,7 +136,7 @@ DoPlayerMovement:: ; 80000 jr z, .land2 cp $70 ; warps jr z, .warps - jr .asm_8013c + jr .no_walk .water ld a, c @@ -147,7 +147,7 @@ DoPlayerMovement:: ; 80000 add hl, bc ld a, [hl] ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk .water_table db RIGHT @@ -164,9 +164,9 @@ DoPlayerMovement:: ; 80000 add hl, bc ld a, [hl] cp STANDING - jr z, .asm_8013c + jr z, .no_walk ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk .land1_table db STANDING @@ -187,9 +187,9 @@ DoPlayerMovement:: ; 80000 add hl, bc ld a, [hl] cp STANDING - jr z, .asm_8013c + jr z, .no_walk ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk .land2_table db RIGHT @@ -210,18 +210,18 @@ DoPlayerMovement:: ; 80000 cp $7a ; stairs jr z, .down cp $7b ; cave - jr nz, .asm_8013c + jr nz, .no_walk .down ld a, DOWN ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk -.asm_8013c +.no_walk xor a ret -.asm_8013e +.continue_walk ld a, STEP_WALK call .DoStep ld a, 5 diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule/conversion.asm index e2c545c48..5d093d515 100755 --- a/engine/time_capsule/conversion.asm +++ b/engine/time_capsule/conversion.asm @@ -367,13 +367,13 @@ NewPokedexEntry: ; fb877 ld a, [hSCX] add -5 ; 251 ; NUM_POKEMON ld [hSCX], a - call Functionfb8c8 + call .ReturnFromDexRegistration pop af ld [hMapAnims], a ret ; fb8c8 -Functionfb8c8: ; fb8c8 +.ReturnFromDexRegistration: ; fb8c8 call ClearTileMap call LoadFontsExtra call LoadStandardFont diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index fdb829034..94de4f3e3 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -196,16 +196,16 @@ TMHM_PocketLoop: ; 2c8d3 (b:48d3) xor a ld [hBGMapMode], a call TMHM_DisplayPocketItems - ld a, $2 + ld a, 2 ld [w2DMenuCursorInitY], a - ld a, $7 + ld a, 7 ld [w2DMenuCursorInitX], a - ld a, $1 + ld a, 1 ld [w2DMenuNumCols], a - ld a, $5 + ld a, 5 sub d inc a - cp $6 + cp 6 jr nz, .okay dec a .okay |