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/menus/intro_menu.asm6
-rw-r--r--engine/overworld/npc_movement.asm44
4 files changed, 58 insertions, 58 deletions
diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm
index 4cc45d91..6a942f6c 100644
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@@ -1,19 +1,19 @@
LoadBattleMenu:
ld hl, BattleMenuHeader
call LoadMenuHeader
- jr Function24e78
+ jr CommonBattleMenu
SafariBattleMenu:
; untranslated
- ld hl, MenuHeader_0x24eae
+ ld hl, SafariBattleMenuHeader
call LoadMenuHeader
- jr Function24e78
+ jr CommonBattleMenu
ContestBattleMenu:
- ld hl, MenuHeader_0x24ee9
+ ld hl, ContestBattleMenuHeader
call LoadMenuHeader
; fallthrough
-Function24e78:
+CommonBattleMenu:
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
call _2DMenu
@@ -25,68 +25,68 @@ Function24e78:
BattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
- dw MenuData_0x24e93
+ dw .MenuData
db 1 ; default option
-MenuData_0x24e93:
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 6 ; spacing
- dba Strings24e9c
- dbw BANK(MenuData_0x24e93), 0
+ dba .Text
+ dbw BANK(@), NULL
-Strings24e9c:
+.Text:
db "FIGHT@"
db "<PK><MN>@"
db "PACK@"
db "RUN@"
-MenuHeader_0x24eae:
+SafariBattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
- dw MenuData_0x24eb6
+ dw .MenuData
db 1 ; default option
-MenuData_0x24eb6:
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 11 ; spacing
- dba Strings24ebf
- dba Function24edc
+ dba .Text
+ dba .PrintSafariBallsRemaining
-Strings24ebf:
+.Text:
db "サファりボール×　　@" ; "SAFARI BALL× @"
db "エサをなげる@" ; "THROW BAIT"
db "いしをなげる@" ; "THROW ROCK"
db "にげる@" ; "RUN"
-Function24edc:
+.PrintSafariBallsRemaining:
hlcoord 17, 13
ld de, wSafariBallsRemaining
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ret
-MenuHeader_0x24ee9:
+ContestBattleMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
- dw MenuData_0x24ef1
+ dw .MenuData
db 1 ; default option
-MenuData_0x24ef1:
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
dn 2, 2 ; rows, columns
db 12 ; spacing
- dba Strings24efa
- dba Strings24f13
+ dba .Text
+ dba .PrintParkBallsRemaining
-Strings24efa:
+.Text:
db "FIGHT@"
db "<PK><MN>@"
db "PARKBALL× @"
db "RUN@"
-Strings24f13:
+.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 62561b55..95b3a101 100644
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -858,7 +858,7 @@ BattleAnimFunction_RazorLeaf:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
- call Functioncd49c
+ call BattleAnim_ScatterHorizontal
ld hl, BATTLEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
@@ -951,8 +951,8 @@ BattleAnimFunction_RazorLeaf:
call BattleAnim_StepToTarget
ret
-Functioncd49c:
-; 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]
@@ -1037,7 +1037,7 @@ BattleAnimFunction_RockSmash:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
- call Functioncd49c
+ call BattleAnim_ScatterHorizontal
ld hl, BATTLEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
@@ -1680,7 +1680,7 @@ BattleAnimFunction_Gust:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
- ld [hl], $0
+ ld [hl], 0
.one
.three
call .GustWobble
@@ -1753,10 +1753,10 @@ BattleAnimFunction_Gust:
add hl, bc
ld a, [hl]
and a
- jr z, .asm_cd91c
+ jr z, .start_wobble
cp $c2
- jr c, .asm_cd927
-.asm_cd91c
+ jr c, .finish_wobble
+.start_wobble
dec a
ld [hl], a
and $7
@@ -1766,7 +1766,7 @@ BattleAnimFunction_Gust:
inc [hl]
ret
-.asm_cd927
+.finish_wobble
xor a
ld hl, BATTLEANIMSTRUCT_VAR2
add hl, bc
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 80db603f..2155bdc3 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -898,7 +898,7 @@ StartTitleScreen:
INCLUDE "engine/movie/title.asm"
RunTitleScreen:
- call Function63fe
+ call ScrollTitleScreenClouds
ld a, [wJumptableIndex]
bit 7, a
jr nz, .done_title
@@ -917,7 +917,7 @@ RunTitleScreen:
scf
ret
-Function63fe:
+ScrollTitleScreenClouds:
IF DEF(_GOLD)
ldh a, [hVBlankCounter]
and $7
@@ -926,7 +926,7 @@ ENDC
ld hl, wLYOverrides + $5f
ld a, [hl]
dec a
- ld bc, 2 * SCREEN_WIDTH
+ ld bc, $28
call ByteFill
ret
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index cc9cf0b8..bcc47a20 100644
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -58,7 +58,7 @@ CanObjectMoveInDirection:
ret
WillObjectBumpIntoWater:
- call Function703e
+ 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, Function7080
+ jp nz, WillObjectRemainOnWater
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
@@ -81,7 +81,7 @@ WillObjectBumpIntoWater:
ret
WillObjectBumpIntoLand:
- call Function703e
+ 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 Function705e
+ 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_703a
+ ld hl, .dir_masks
add hl, de
pop af
and [hl]
@@ -113,17 +113,17 @@ WillObjectBumpIntoTile:
scf
ret
-.data_703a
+.dir_masks
db DOWN_MASK ; DOWN
db UP_MASK ; UP
db RIGHT_MASK ; LEFT
db LEFT_MASK ; RIGHT
-Function703e:
+CanObjectLeaveTile:
ld hl, OBJECT_STANDING_TILE
add hl, bc
ld a, [hl]
- call Function705e
+ call GetSideWallDirectionMask
ret nc
push af
ld hl, OBJECT_DIRECTION_WALKING
@@ -131,7 +131,7 @@ Function703e:
maskbits NUM_DIRECTIONS
ld e, a
ld d, 0
- ld hl, .data_705a
+ ld hl, .dir_masks
add hl, de
pop af
and [hl]
@@ -139,13 +139,13 @@ Function703e:
scf
ret
-.data_705a
+.dir_masks
db UP_MASK ; DOWN
db DOWN_MASK ; UP
db LEFT_MASK ; LEFT
db RIGHT_MASK ; RIGHT
-Function705e:
+GetSideWallDirectionMask:
ld d, a
and $f0
cp HI_NYBBLE_SIDE_WALLS
@@ -157,16 +157,16 @@ Function705e:
.continue
ld a, d
- and 7
+ and $7
ld e, a
ld d, 0
- ld hl, .data_7078
+ ld hl, .side_wall_masks
add hl, de
ld a, [hl]
scf
ret
-.data_7078
+.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 @@ Function705e:
db DOWN_MASK | RIGHT_MASK ; COLL_UP_RIGHT_WALL/BUOY
db DOWN_MASK | LEFT_MASK ; COLL_UP_LEFT_WALL/BUOY
-Function7080:
+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_70d0
+ jr nz, .not_counter
ld a, [wPlayerStandingMapX]
sub d
@@ -247,7 +247,7 @@ CheckFacingObject::
add e
ld e, a
-.asm_70d0
+.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 Function7250
+ call WillObjectIntersectBigObject
jr nc, .ok
jr .ok2
@@ -489,7 +489,7 @@ Function71f2: ; unreferenced
ld a, [hl]
cp SPRITEMOVEDATA_BIGDOLLSYM
jr nz, .not_snorlax
- call Function7250
+ call WillObjectIntersectBigObject
jr c, .yes
jr .next
@@ -538,20 +538,20 @@ Function71f2: ; unreferenced
scf
ret
-Function7250:
+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-12 14:39:49 +0000