summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/games/slot_machine.asm20
-rw-r--r--engine/phone/phone.asm12
-rw-r--r--engine/pokegear/pokegear.asm10
-rw-r--r--engine/rtc/timeset.asm2
4 files changed, 22 insertions, 22 deletions
diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm
index d7062842..7c017a6a 100644
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -184,7 +184,7 @@ SlotsLoop:
ld [wCurSpriteOAMAddr], a
callfar DoNextFrameForFirst16Sprites
call .PrintCoinsAndPayout
- call .Stubbed_Function927d3
+ call .Stubbed_Function92d3c
call DelayFrame
and a
ret
@@ -193,7 +193,7 @@ SlotsLoop:
scf
ret
-.Stubbed_Function927d3:
+.Stubbed_Function92d3c:
; dummied out
ret
ld a, [wReel1ReelAction]
@@ -229,7 +229,7 @@ SlotsLoop:
call PrintNum
ret
-Unreferenced_Function92811:
+Unreferenced_Function92d7a:
; debug function?
ld a, [wSlotBias]
add 0
@@ -247,7 +247,7 @@ Unreferenced_Function92811:
ld [hl], a
ret
-Unreferenced_Function9282c:
+Unreferenced_Function92d95:
; animate OAM tiles?
ld hl, wSlotsCE66
ld a, [hl]
@@ -844,20 +844,20 @@ Slots_UpdateReelPositionAndOAM:
jr nz, .loop
ret
-Unreferenced_Function92bbe:
+Unreferenced_Function93127:
push hl
srl a
srl a
- add LOW(.Unknown_92bce)
+ add LOW(.Unknown_93137)
ld l, a
ld a, 0
- adc HIGH(.Unknown_92bce)
+ adc HIGH(.Unknown_93137)
ld h, a
ld a, [hl]
pop hl
ret
-.Unknown_92bce:
+.Unknown_93137:
db 0, 1, 2, 3, 4, 5
ReelActionJumptable:
@@ -1089,11 +1089,11 @@ ReelAction_WaitReel2SkipTo7:
add hl, bc
ld a, [hl]
and a
- jr z, .asm_92d02
+ jr z, .asm_9326b
dec [hl]
ret
-.asm_92d02
+.asm_9326b
ld a, SFX_THROW_BALL
call Slots_PlaySFX
ld hl, REEL_ACTION
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 8ae66def..7ee9d0f0 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -318,7 +318,7 @@ SpecialCallWhereverYouAre:
scf
ret
-Function90199:
+Function901a1:
; Don't do the call if you're in a link communication
ld a, [wLinkMode]
and a
@@ -469,7 +469,7 @@ RingTwice_StartCall:
Phone_CallerTextboxWithName:
ld a, [wCurCaller]
ld b, a
- call Function90363
+ call Function90357
ret
PhoneCall::
@@ -529,7 +529,7 @@ Phone_CallEnd:
call HangUp_Wait20Frames
ret
-Function90316:
+Function9030a:
ld de, SFX_SHUT_DOWN_PC
call PlaySFX
ret
@@ -576,7 +576,7 @@ Phone_Wait20Frames:
farcall PhoneRing_CopyTilemapAtOnce
ret
-Function90363:
+Function90357:
push bc
call Phone_CallerTextbox
hlcoord 1, 1
@@ -586,7 +586,7 @@ Function90363:
ld d, h
ld e, l
pop bc
- call Function90380
+ call Function90374
ret
Phone_CallerTextbox:
@@ -596,7 +596,7 @@ Phone_CallerTextbox:
call Textbox
ret
-Function90380:
+Function90374:
ld h, d
ld l, e
ld a, b
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
index 00eb4e92..5443889a 100644
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -900,7 +900,7 @@ PokegearPhone_MakePhoneCall:
call WaitSFX
ld a, [wPokegearPhoneSelectedPerson]
ld b, a
- call Function90199
+ call Function901a1
ld c, 10
call DelayFrames
ld hl, wOptions
@@ -1045,7 +1045,7 @@ PokegearPhone_UpdateDisplayList:
ld e, l
pop af
ld b, a
- call Function90380
+ call Function90374
pop hl
ld a, [wPokegearPhoneLoadNameBuffer]
inc a
@@ -2001,7 +2001,7 @@ _FlyMap:
lb bc, BANK(FlyMapLabelBorderGFX), 6
call Request1bpp
call FlyMap
- call ret_91c8f
+ call ret_91bfd
ld b, SCGB_POKEGEAR_PALS
call GetSGBLayout
call SetPalettes
@@ -2206,7 +2206,7 @@ HasVisitedSpawn:
INCLUDE "data/maps/flypoints.asm"
-ret_91c8f:
+ret_91bfd:
ret
FlyMap:
@@ -2748,7 +2748,7 @@ INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp"
FlyMapLabelBorderGFX:
INCBIN "gfx/pokegear/flymap_label_border.1bpp"
-Unreferenced_Function92311:
+Unreferenced_Function92264:
xor a
ld [wTownMapPlayerIconLandmark], a
call ClearBGPalettes
diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm
index 210c89a2..b89d1af7 100644
--- a/engine/rtc/timeset.asm
+++ b/engine/rtc/timeset.asm
@@ -193,7 +193,7 @@ DisplayHourOClock:
pop hl
ret
-UnreferencedFunction907f1:
+UnreferencedFunction907ba:
ld h, d
ld l, e
push hl