summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/link.asm26
-rw-r--r--engine/map_objects.asm2
-rwxr-xr-xengine/menu.asm6
-rwxr-xr-xengine/pokecenter_pc.asm14
-rw-r--r--engine/predef.asm2
-rw-r--r--engine/scripting.asm16
-rwxr-xr-xengine/timeset.asm4
7 files changed, 35 insertions, 35 deletions
diff --git a/engine/link.asm b/engine/link.asm
index 9d21104f8..8ba1702e9 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -1378,7 +1378,7 @@ Function28926: ; 28926
hlcoord 0, 15
ld b, $1
ld c, $12
- call Function28eef
+ call Predef_LinkTextbox
hlcoord 2, 16
ld de, String28ab4
call PlaceString
@@ -1487,7 +1487,7 @@ Function28926: ; 28926
hlcoord 0, 12
ld b, $4
ld c, $12
- call Function28eef
+ call Predef_LinkTextbox
callba Function4d354
ld hl, UnknownText_0x28aaf
bccoord 1, 14
@@ -1509,7 +1509,7 @@ Function28926: ; 28926
hlcoord 0, 12
ld b, $4
ld c, $12
- call Function28eef
+ call Predef_LinkTextbox
callba Function4d354
ld hl, UnknownText_0x28ac4
bccoord 1, 14
@@ -1519,7 +1519,7 @@ Function28926: ; 28926
hlcoord 0, 12
ld b, $4
ld c, $12
- call Function28eef
+ call Predef_LinkTextbox
hlcoord 1, 14
ld de, String28ece
call PlaceString
@@ -1666,7 +1666,7 @@ Function28b87: ; 28b87
hlcoord 0, 12
ld b, $4
ld c, $12
- call Function28eef
+ call Predef_LinkTextbox
callba Function4d354
ld a, [wd002]
ld hl, PartySpecies
@@ -1695,7 +1695,7 @@ Function28b87: ; 28b87
hlcoord 10, 7
ld b, $3
ld c, $7
- call Function28eef
+ call Predef_LinkTextbox
ld de, String28eab
hlcoord 12, 8
call PlaceString
@@ -1735,7 +1735,7 @@ Function28b87: ; 28b87
hlcoord 0, 12
ld b, 4
ld c, 18
- call Function28eef
+ call Predef_LinkTextbox
hlcoord 1, 14
ld de, String28ece
call PlaceString
@@ -1752,7 +1752,7 @@ Function28b87: ; 28b87
hlcoord 0, 12
ld b, 4
ld c, 18
- call Function28eef
+ call Predef_LinkTextbox
hlcoord 1, 14
ld de, String28ece
call PlaceString
@@ -1982,7 +1982,7 @@ Function28b87: ; 28b87
hlcoord 0, 12
ld b, 4
ld c, 18
- call Function28eef
+ call Predef_LinkTextbox
hlcoord 1, 14
ld de, String28ebd
call PlaceString
@@ -2019,10 +2019,10 @@ String28ece: ; 28ece
next "was canceled!@"
-Function28eef: ; 28eef
+Predef_LinkTextbox: ; 28eef
ld d, h
ld e, l
- callba Function16d6ca
+ callba LinkTextbox
ret
; 28ef8
@@ -2041,11 +2041,11 @@ Function28f09: ; 28f09
hlcoord 0, 0
ld b, 6
ld c, 18
- call Function28eef
+ call Predef_LinkTextbox
hlcoord 0, 8
ld b, 6
ld c, 18
- call Function28eef
+ call Predef_LinkTextbox
callba Functionfb60d
ret
; 28f24
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 168c5389c..13e4f73bf 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2736,7 +2736,7 @@ Function5602: ; 5602, called at battle start
ld a, PLAYER
call Function5629 ; respawn player
- ld a, [wd459]
+ ld a, [wBattleScriptFlags]
bit 7, a
jr z, .ok
diff --git a/engine/menu.asm b/engine/menu.asm
index a1ec30b7a..6978a0e54 100755
--- a/engine/menu.asm
+++ b/engine/menu.asm
@@ -4,7 +4,7 @@ Function2400e:: ; 2400e
rst FarCall
call Function24085
call UpdateSprites
- call Function321c
+ call ApplyTilemap
call Function2408f
ret
; 24022
@@ -16,7 +16,7 @@ Function24022:: ; 24022
call Function24085
callba MobileTextBorder
call UpdateSprites
- call Function321c
+ call ApplyTilemap
call Function2408f
ret
; 2403c
@@ -28,7 +28,7 @@ Function2403c:: ; 2403c
call Function24085
callba MobileTextBorder
call UpdateSprites
- call Function321c
+ call ApplyTilemap
call Function2411a
ld hl, wcfa5
set 7, [hl]
diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm
index 4d296aab2..064b35a6c 100755
--- a/engine/pokecenter_pc.asm
+++ b/engine/pokecenter_pc.asm
@@ -188,7 +188,7 @@ _KrissHousePC: ; 156d9
and a
jr nz, .asm_156f9
call OverworldTextModeSwitch
- call Function321c
+ call ApplyTilemap
call UpdateSprites
call PC_PlayShutdownSound
ld c, $0
@@ -466,16 +466,16 @@ UnknownText_0x158c7: ; 0x158c7
Function158cc: ; 0x158cc
- ld a, [wc2ce]
+ ld a, [wSpriteUpdatesEnabled]
push af
ld a, $0
- ld [wc2ce], a
+ ld [wSpriteUpdatesEnabled], a
callba CheckItemMenu
ld a, [wItemAttributeParamBuffer]
ld hl, .jumptable
rst JumpTable
pop af
- ld [wc2ce], a
+ ld [wSpriteUpdatesEnabled], a
ret
; 0x158e7
@@ -577,10 +577,10 @@ Function15985: ; 0x15985
xor a
ld [wd0e3], a
.asm_15989
- ld a, [wc2ce]
+ ld a, [wSpriteUpdatesEnabled]
push af
ld a, $0
- ld [wc2ce], a
+ ld [wSpriteUpdatesEnabled], a
ld hl, MenuData15a08
call CopyMenuDataHeader
hlcoord 0, 0
@@ -597,7 +597,7 @@ Function15985: ; 0x15985
ld a, [MenuSelection2]
ld [wd0d7], a
pop af
- ld [wc2ce], a
+ ld [wSpriteUpdatesEnabled], a
ld a, [wd0e3]
and a
jr nz, .asm_159d8
diff --git a/engine/predef.asm b/engine/predef.asm
index c089215a6..680a6b4a0 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -46,7 +46,7 @@ PredefPointers:: ; 856b
add_predef CalcPkmnStatC
add_predef CanLearnTMHMMove
add_predef GetTMHMMove
- add_predef Function28eef ; $ 10
+ add_predef Predef_LinkTextbox ; $ 10
add_predef PrintMoveDesc
add_predef UpdatePlayerHUD
add_predef FillBox
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 945368e2b..c80343a4c 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -929,7 +929,7 @@ Script_winlosstext: ; 9714c
Script_talkaftercancel: ; 97163
; script command 0x66
- ld a, [wd04d]
+ ld a, [wRunningTrainerBattleScript]
and a
ret z
jp Script_end
@@ -940,7 +940,7 @@ Script_talkaftercheck: ; 9716b
ld a, 1
ld [ScriptVar], a
- ld a, [wd04d]
+ ld a, [wRunningTrainerBattleScript]
and a
ret nz
xor a
@@ -1485,7 +1485,7 @@ Script_battlecheck: ; 973fb
; script command 0x5b
xor a
- ld [wd459], a
+ ld [wBattleScriptFlags], a
ret
; 97400
@@ -1493,7 +1493,7 @@ Script_loadtrainerdata: ; 97400
; script command 0x5c
ld a, (1 << 7) | 1
- ld [wd459], a
+ ld [wBattleScriptFlags], a
ld a, [WalkingDirection]
ld [OtherTrainerClass], a
ld a, [FacingDirection]
@@ -1508,7 +1508,7 @@ Script_loadpokedata: ; 97412
; level (DecimalParam)
ld a, (1 << 7)
- ld [wd459], a
+ ld [wBattleScriptFlags], a
call GetScriptByte
ld [TempWildMonSpecies], a
call GetScriptByte
@@ -1523,7 +1523,7 @@ Script_loadtrainer: ; 97424
; trainer_id (TrainerIdParam)
ld a, (1 << 7) | 1
- ld [wd459], a
+ ld [wBattleScriptFlags], a
call GetScriptByte
ld [OtherTrainerClass], a
call GetScriptByte
@@ -1557,7 +1557,7 @@ Script_catchtutorial: ; 97447
Script_returnafterbattle: ; 97459
; script command 0x60
- ld hl, wd459
+ ld hl, wBattleScriptFlags
ld d, [hl]
ld [hl], $0
ld a, [wBattleResult]
@@ -1589,7 +1589,7 @@ Script_reloadmap: ; 97491
; script command 0x7b
xor a
- ld [wd459], a
+ ld [wBattleScriptFlags], a
ld a, MAPSETUP_RELOADMAP
ld [hMapEntryMethod], a
ld a, $1
diff --git a/engine/timeset.asm b/engine/timeset.asm
index 0b0f12718..1f82da884 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -6,7 +6,7 @@ InitClock: ; 90672 (24:4672)
ld [hInMenu], a
ld a, $0
- ld [wc2ce], a
+ ld [wSpriteUpdatesEnabled], a
ld a, $10
ld [MusicFade], a
ld a, MUSIC_NONE % $100
@@ -436,7 +436,7 @@ Special_SetDayOfWeek: ; 90913
ld [hl], $f5
hlcoord 10, 5
call Function909de
- call Function321c
+ call ApplyTilemap
ld c, 10
call DelayFrames
.asm_9096a
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 19:40:28 +0000