summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/menu.asm48
-rw-r--r--engine/battle_anims/functions.asm18
-rw-r--r--engine/overworld/npc_movement.asm44
3 files changed, 55 insertions, 55 deletions
diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm
index 12d65476b..a4955ec6a 100644
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@@ -11,15 +11,15 @@ LoadBattleMenu:
SafariBattleMenu:
; untranslated
- ld hl, MenuHeader_0x24f4e
+ ld hl, SafariBattleMenuHeader
call LoadMenuHeader
- jr Function24f19
+ jr CommonBattleMenu
ContestBattleMenu:
- ld hl, MenuHeader_0x24f89
+ ld hl, ContestBattleMenuHeader
call LoadMenuHeader
-
-Function24f19:
+; fallthrough
+CommonBattleMenu:
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
call _2DMenu
@@ -31,68 +31,68 @@ Function24f19:
BattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
- dw MenuData_0x24f34
+ dw .MenuData
db 1 ; default option
-MenuData_0x24f34:
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 6 ; spacing
- dba Strings24f3d
- dbw BANK(MenuData_0x24f34), 0
+ dba .Text
+ dbw BANK(@), NULL
-Strings24f3d:
+.Text:
db "FIGHT@"
db "<PKMN>@"
db "PACK@"
db "RUN@"
-MenuHeader_0x24f4e:
+SafariBattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
- dw MenuData_0x24f56
+ dw .MenuData
db 1 ; default option
-MenuData_0x24f56:
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 11 ; spacing
- dba Strings24f5f
- dba Function24f7c
+ dba .Text
+ dba .PrintSafariBallsRemaining
-Strings24f5f:
+.Text:
db "サファりボール×　　@" ; "SAFARI BALL× @"
db "エサをなげる@" ; "THROW BAIT"
db "いしをなげる@" ; "THROW ROCK"
db "にげる@" ; "RUN"
-Function24f7c:
+.PrintSafariBallsRemaining:
hlcoord 17, 13
ld de, wSafariBallsRemaining
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ret
-MenuHeader_0x24f89:
+ContestBattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
- dw MenuData_0x24f91
+ dw .MenuData
db 1 ; default option
-MenuData_0x24f91:
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 12 ; spacing
- dba Strings24f9a
- dba Function24fb2
+ dba .Text
+ dba .PrintParkBallsRemaining
-Strings24f9a:
+.Text:
db "FIGHT@"
db "<PKMN>@"
db "PARKBALL× @"
db "RUN@"
-Function24fb2:
+.PrintParkBallsRemaining:
hlcoord 13, 16
ld de, wParkBallsRemaining
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index ec1967e18..271c39252 100644
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -864,7 +864,7 @@ BattleAnimFunction_RazorLeaf:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
- call Functioncd557
+ call BattleAnim_ScatterHorizontal
ld hl, BATTLEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
@@ -957,8 +957,8 @@ BattleAnimFunction_RazorLeaf:
call BattleAnim_StepToTarget
ret
-Functioncd557:
-; Affects sine movement based on bit 7 of Obj Param
+BattleAnim_ScatterHorizontal:
+; Affects horizontal sine movement based on bit 7 of Obj Param
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
@@ -1043,7 +1043,7 @@ BattleAnimFunction_RockSmash:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
- call Functioncd557
+ call BattleAnim_ScatterHorizontal
ld hl, BATTLEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
@@ -1686,7 +1686,7 @@ BattleAnimFunction_Gust:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
- ld [hl], $0
+ ld [hl], 0
.one
.three
call .GustWobble
@@ -1759,10 +1759,10 @@ BattleAnimFunction_Gust:
add hl, bc
ld a, [hl]
and a
- jr z, .asm_cd9d7
+ jr z, .start_wobble
cp $c2
- jr c, .asm_cd9e2
-.asm_cd9d7
+ jr c, .finish_wobble
+.start_wobble
dec a
ld [hl], a
and $7
@@ -1772,7 +1772,7 @@ BattleAnimFunction_Gust:
inc [hl]
ret
-.asm_cd9e2
+.finish_wobble
xor a
ld hl, BATTLEANIMSTRUCT_VAR2
add hl, bc
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 1dc8b6fbd..a855ca714 100644
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -58,7 +58,7 @@ CanObjectMoveInDirection:
ret
WillObjectBumpIntoWater:
- call Function6f5f
+ call CanObjectLeaveTile
ret c
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
@@ -69,7 +69,7 @@ WillObjectBumpIntoWater:
ld hl, OBJECT_PALETTE
add hl, bc
bit OAM_PRIORITY, [hl]
- jp nz, Function6fa1
+ jp nz, WillObjectRemainOnWater
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
@@ -81,7 +81,7 @@ WillObjectBumpIntoWater:
ret
WillObjectBumpIntoLand:
- call Function6f5f
+ call CanObjectLeaveTile
ret c
ld hl, OBJECT_NEXT_TILE
add hl, bc
@@ -96,7 +96,7 @@ WillObjectBumpIntoTile:
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
- call Function6f7f
+ call GetSideWallDirectionMask
ret nc
push af
ld hl, OBJECT_DIRECTION_WALKING
@@ -105,7 +105,7 @@ WillObjectBumpIntoTile:
maskbits NUM_DIRECTIONS
ld e, a
ld d, 0
- ld hl, .data_6f5b
+ ld hl, .dir_masks
add hl, de
pop af
and [hl]
@@ -113,17 +113,17 @@ WillObjectBumpIntoTile:
scf
ret
-.data_6f5b
+.dir_masks
db DOWN_MASK ; DOWN
db UP_MASK ; UP
db RIGHT_MASK ; LEFT
db LEFT_MASK ; RIGHT
-Function6f5f:
+CanObjectLeaveTile:
ld hl, OBJECT_STANDING_TILE
add hl, bc
ld a, [hl]
- call Function6f7f
+ call GetSideWallDirectionMask
ret nc
push af
ld hl, OBJECT_DIRECTION_WALKING
@@ -131,7 +131,7 @@ Function6f5f:
maskbits NUM_DIRECTIONS
ld e, a
ld d, 0
- ld hl, .data_6f7b
+ ld hl, .dir_masks
add hl, de
pop af
and [hl]
@@ -139,13 +139,13 @@ Function6f5f:
scf
ret
-.data_6f7b
+.dir_masks
db UP_MASK ; DOWN
db DOWN_MASK ; UP
db LEFT_MASK ; LEFT
db RIGHT_MASK ; RIGHT
-Function6f7f:
+GetSideWallDirectionMask:
ld d, a
and $f0
cp HI_NYBBLE_SIDE_WALLS
@@ -157,16 +157,16 @@ Function6f7f:
.continue
ld a, d
- and 7
+ and $7
ld e, a
ld d, 0
- ld hl, .data_6f99
+ ld hl, .side_wall_masks
add hl, de
ld a, [hl]
scf
ret
-.data_6f99
+.side_wall_masks
db RIGHT_MASK ; COLL_RIGHT_WALL/BUOY
db LEFT_MASK ; COLL_LEFT_WALL/BUOY
db DOWN_MASK ; COLL_UP_WALL/BUOY
@@ -176,7 +176,7 @@ Function6f7f:
db DOWN_MASK | RIGHT_MASK ; COLL_UP_RIGHT_WALL/BUOY
db DOWN_MASK | LEFT_MASK ; COLL_UP_LEFT_WALL/BUOY
-Function6fa1:
+WillObjectRemainOnWater:
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld a, [hl]
@@ -231,7 +231,7 @@ CheckFacingObject::
; Double the distance for counter tiles.
call CheckCounterTile
- jr nz, .asm_6ff1
+ jr nz, .not_counter
ld a, [wPlayerStandingMapX]
sub d
@@ -247,7 +247,7 @@ CheckFacingObject::
add e
ld e, a
-.asm_6ff1
+.not_counter
ld bc, wObjectStructs ; redundant
ld a, 0
ldh [hMapObjectIndexBuffer], a
@@ -328,7 +328,7 @@ IsNPCAtCoord:
bit BIG_OBJECT_F, [hl]
jr z, .got
- call Function7171
+ call WillObjectIntersectBigObject
jr nc, .ok
jr .ok2
@@ -489,7 +489,7 @@ Function7113: ; unreferenced
ld a, [hl]
cp SPRITEMOVEDATA_BIGDOLLSYM
jr nz, .not_snorlax
- call Function7171
+ call WillObjectIntersectBigObject
jr c, .yes
jr .next
@@ -538,20 +538,20 @@ Function7113: ; unreferenced
scf
ret
-Function7171:
+WillObjectIntersectBigObject:
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld a, d
sub [hl]
jr c, .nope
- cp $2
+ cp 2 ; big doll width
jr nc, .nope
ld hl, OBJECT_NEXT_MAP_Y
add hl, bc
ld a, e
sub [hl]
jr c, .nope
- cp $2
+ cp 2 ; big doll height
jr nc, .nope
scf
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 10:49:44 +0000